diff --git a/.gitignore b/.gitignore index 0fa6b675..46d54457 100644 --- a/.gitignore +++ b/.gitignore @@ -44,3 +44,6 @@ app.*.map.json /android/app/debug /android/app/profile /android/app/release + +# Excluding environment file +.env diff --git a/android/app/build.gradle b/android/app/build.gradle index 3c13d761..d65abf27 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -27,7 +27,7 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { - compileSdkVersion 30 + compileSdkVersion 31 buildToolsVersion '29.0.0' sourceSets { diff --git a/android/build.gradle b/android/build.gradle index c505a863..714549c2 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -1,5 +1,5 @@ buildscript { - ext.kotlin_version = '1.3.50' + ext.kotlin_version = '1.6.10' repositories { google() jcenter() diff --git a/ios/Flutter/AppFrameworkInfo.plist b/ios/Flutter/AppFrameworkInfo.plist index 9367d483..9625e105 100644 --- a/ios/Flutter/AppFrameworkInfo.plist +++ b/ios/Flutter/AppFrameworkInfo.plist @@ -21,6 +21,6 @@ CFBundleVersion 1.0 MinimumOSVersion - 8.0 + 11.0 diff --git a/ios/Flutter/Debug.xcconfig b/ios/Flutter/Debug.xcconfig index 592ceee8..ec97fc6f 100644 --- a/ios/Flutter/Debug.xcconfig +++ b/ios/Flutter/Debug.xcconfig @@ -1 +1,2 @@ +#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig" #include "Generated.xcconfig" diff --git a/ios/Flutter/Release.xcconfig b/ios/Flutter/Release.xcconfig index 592ceee8..c4855bfe 100644 --- a/ios/Flutter/Release.xcconfig +++ b/ios/Flutter/Release.xcconfig @@ -1 +1,2 @@ +#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig" #include "Generated.xcconfig" diff --git a/ios/Podfile b/ios/Podfile new file mode 100644 index 00000000..88359b22 --- /dev/null +++ b/ios/Podfile @@ -0,0 +1,41 @@ +# Uncomment this line to define a global platform for your project +# platform :ios, '11.0' + +# CocoaPods analytics sends network stats synchronously affecting flutter build latency. +ENV['COCOAPODS_DISABLE_STATS'] = 'true' + +project 'Runner', { + 'Debug' => :debug, + 'Profile' => :release, + 'Release' => :release, +} + +def flutter_root + generated_xcode_build_settings_path = File.expand_path(File.join('..', 'Flutter', 'Generated.xcconfig'), __FILE__) + unless File.exist?(generated_xcode_build_settings_path) + raise "#{generated_xcode_build_settings_path} must exist. If you're running pod install manually, make sure flutter pub get is executed first" + end + + File.foreach(generated_xcode_build_settings_path) do |line| + matches = line.match(/FLUTTER_ROOT\=(.*)/) + return matches[1].strip if matches + end + raise "FLUTTER_ROOT not found in #{generated_xcode_build_settings_path}. Try deleting Generated.xcconfig, then run flutter pub get" +end + +require File.expand_path(File.join('packages', 'flutter_tools', 'bin', 'podhelper'), flutter_root) + +flutter_ios_podfile_setup + +target 'Runner' do + use_frameworks! + use_modular_headers! + + flutter_install_all_ios_pods File.dirname(File.realpath(__FILE__)) +end + +post_install do |installer| + installer.pods_project.targets.each do |target| + flutter_additional_ios_build_settings(target) + end +end diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index d7b80c99..7c4a18e1 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -3,13 +3,14 @@ archiveVersion = 1; classes = { }; - objectVersion = 46; + objectVersion = 50; objects = { /* Begin PBXBuildFile section */ 1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; }; 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; }; 74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; }; + 7618B578FA92685D95319752 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 02680857308493E94BB398D5 /* Pods_Runner.framework */; }; 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; }; 97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; }; 97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; }; @@ -29,9 +30,11 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ + 02680857308493E94BB398D5 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = ""; }; 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = ""; }; 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = ""; }; + 730D75D1781F133D85BA866B /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = ""; }; 74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = ""; }; 74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = ""; }; @@ -42,6 +45,8 @@ 97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; 97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + 9BE2D24DBEA87803E62D4A56 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = ""; }; + E2075DDFEE228A9134C57360 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -49,12 +54,24 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 7618B578FA92685D95319752 /* Pods_Runner.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ + 4B1C0EC23CC5233E2ACB4CDE /* Pods */ = { + isa = PBXGroup; + children = ( + 730D75D1781F133D85BA866B /* Pods-Runner.debug.xcconfig */, + E2075DDFEE228A9134C57360 /* Pods-Runner.release.xcconfig */, + 9BE2D24DBEA87803E62D4A56 /* Pods-Runner.profile.xcconfig */, + ); + name = Pods; + path = Pods; + sourceTree = ""; + }; 9740EEB11CF90186004384FC /* Flutter */ = { isa = PBXGroup; children = ( @@ -72,6 +89,8 @@ 9740EEB11CF90186004384FC /* Flutter */, 97C146F01CF9000F007C117D /* Runner */, 97C146EF1CF9000F007C117D /* Products */, + 4B1C0EC23CC5233E2ACB4CDE /* Pods */, + 9F593B3785F85A0488034123 /* Frameworks */, ); sourceTree = ""; }; @@ -98,6 +117,14 @@ path = Runner; sourceTree = ""; }; + 9F593B3785F85A0488034123 /* Frameworks */ = { + isa = PBXGroup; + children = ( + 02680857308493E94BB398D5 /* Pods_Runner.framework */, + ); + name = Frameworks; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -105,12 +132,15 @@ isa = PBXNativeTarget; buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */; buildPhases = ( + B8ED5E3EC864FD4FB9D20671 /* [CP] Check Pods Manifest.lock */, 9740EEB61CF901F6004384FC /* Run Script */, 97C146EA1CF9000F007C117D /* Sources */, 97C146EB1CF9000F007C117D /* Frameworks */, 97C146EC1CF9000F007C117D /* Resources */, 9705A1C41CF9048500538489 /* Embed Frameworks */, 3B06AD1E1E4923F5004D2608 /* Thin Binary */, + 2D53FF3560F033947E346E06 /* [CP] Embed Pods Frameworks */, + 99C554A886773DE681117B79 /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -127,7 +157,7 @@ 97C146E61CF9000F007C117D /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 1020; + LastUpgradeCheck = 1300; ORGANIZATIONNAME = ""; TargetAttributes = { 97C146ED1CF9000F007C117D = { @@ -169,6 +199,23 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ + 2D53FF3560F033947E346E06 /* [CP] Embed Pods Frameworks */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist", + ); + name = "[CP] Embed Pods Frameworks"; + outputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n"; + showEnvVarsInLog = 0; + }; 3B06AD1E1E4923F5004D2608 /* Thin Binary */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; @@ -197,6 +244,45 @@ shellPath = /bin/sh; shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build"; }; + 99C554A886773DE681117B79 /* [CP] Copy Pods Resources */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-input-files.xcfilelist", + ); + name = "[CP] Copy Pods Resources"; + outputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-output-files.xcfilelist", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n"; + showEnvVarsInLog = 0; + }; + B8ED5E3EC864FD4FB9D20671 /* [CP] Check Pods Manifest.lock */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + ); + inputPaths = ( + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", + ); + name = "[CP] Check Pods Manifest.lock"; + outputFileListPaths = ( + ); + outputPaths = ( + "$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; + showEnvVarsInLog = 0; + }; /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ @@ -272,7 +358,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SUPPORTED_PLATFORMS = iphoneos; @@ -290,7 +376,10 @@ CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; ENABLE_BITCODE = NO; INFOPLIST_FILE = Runner/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); PRODUCT_BUNDLE_IDENTIFIER = com.example.beacon; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; @@ -346,7 +435,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -395,7 +484,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SUPPORTED_PLATFORMS = iphoneos; @@ -414,7 +503,10 @@ CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; ENABLE_BITCODE = NO; INFOPLIST_FILE = Runner/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); PRODUCT_BUNDLE_IDENTIFIER = com.example.beacon; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; @@ -433,7 +525,10 @@ CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; ENABLE_BITCODE = NO; INFOPLIST_FILE = Runner/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); PRODUCT_BUNDLE_IDENTIFIER = com.example.beacon; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; @@ -468,4 +563,4 @@ /* End XCConfigurationList section */ }; rootObject = 97C146E61CF9000F007C117D /* Project object */; -} \ No newline at end of file +} diff --git a/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme index a28140cf..3db53b6e 100644 --- a/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ b/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -1,6 +1,6 @@ + + diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist index 6d16928c..98709a8d 100644 --- a/ios/Runner/Info.plist +++ b/ios/Runner/Info.plist @@ -41,5 +41,7 @@ UIViewControllerBasedStatusBarAppearance + CADisableMinimumFrameDurationOnPhone + diff --git a/lib/components/beacon_card.dart b/lib/components/beacon_card.dart index 3151e0f6..a4032cce 100644 --- a/lib/components/beacon_card.dart +++ b/lib/components/beacon_card.dart @@ -1,15 +1,10 @@ -import 'dart:io'; - import 'package:beacon/locator.dart'; import 'package:beacon/models/beacon/beacon.dart'; import 'package:beacon/utilities/constants.dart'; -import 'package:beacon/view_model/home_view_model.dart'; import 'package:beacon/views/hike_screen.dart'; import 'package:flutter/material.dart'; -import 'package:geocoder/geocoder.dart'; -import 'package:google_maps_flutter/google_maps_flutter.dart'; -import 'package:skeleton_text/skeleton_text.dart'; import 'package:intl/intl.dart'; +import 'package:skeleton_text/skeleton_text.dart'; class BeaconCustomWidgets { static final Color textColor = Color(0xFFAFAFAF); diff --git a/lib/components/create_join_dialog.dart b/lib/components/create_join_dialog.dart index 58b657f2..777305df 100644 --- a/lib/components/create_join_dialog.dart +++ b/lib/components/create_join_dialog.dart @@ -1,12 +1,11 @@ +import 'package:beacon/components/hike_button.dart'; import 'package:beacon/locator.dart'; import 'package:beacon/models/landmarks/landmark.dart'; import 'package:beacon/services/validators.dart'; -import 'package:date_time_picker/date_time_picker.dart'; -import 'package:beacon/components/hike_button.dart'; import 'package:beacon/utilities/constants.dart'; import 'package:beacon/view_model/home_view_model.dart'; +import 'package:duration_picker/duration_picker.dart'; import 'package:flutter/material.dart'; -import 'package:flutter_duration_picker/flutter_duration_picker.dart'; import 'package:google_maps_flutter/google_maps_flutter.dart'; class CreateJoinBeaconDialog { diff --git a/lib/components/hike_button.dart b/lib/components/hike_button.dart index 7e0a361c..598c70b3 100644 --- a/lib/components/hike_button.dart +++ b/lib/components/hike_button.dart @@ -24,7 +24,7 @@ class HikeButton extends StatelessWidget { Widget build(BuildContext context) { return ElevatedButton( style: ElevatedButton.styleFrom( - primary: buttonColor, + backgroundColor: buttonColor, shape: RoundedRectangleBorder( borderRadius: new BorderRadius.circular(50.0), side: BorderSide(color: borderColor)), diff --git a/lib/components/hike_screen_widget.dart b/lib/components/hike_screen_widget.dart index c382d0b6..352903ba 100644 --- a/lib/components/hike_screen_widget.dart +++ b/lib/components/hike_screen_widget.dart @@ -1,4 +1,3 @@ -import 'package:beacon/components/dialog_boxes.dart'; import 'package:beacon/components/hike_button.dart'; import 'package:beacon/locator.dart'; import 'package:beacon/utilities/constants.dart'; diff --git a/lib/models/beacon/beacon.dart b/lib/models/beacon/beacon.dart index 25753039..65641e8c 100644 --- a/lib/models/beacon/beacon.dart +++ b/lib/models/beacon/beacon.dart @@ -1,10 +1,9 @@ -import 'dart:ffi'; - import 'package:beacon/models/landmarks/landmark.dart'; import 'package:beacon/models/location/location.dart'; import 'package:beacon/models/user/user_info.dart'; import 'package:flutter/material.dart'; import 'package:hive/hive.dart'; + part 'beacon.g.dart'; @HiveType(typeId: 3) diff --git a/lib/models/landmarks/landmark.dart b/lib/models/landmarks/landmark.dart index 53520a7a..c640f77b 100644 --- a/lib/models/landmarks/landmark.dart +++ b/lib/models/landmarks/landmark.dart @@ -1,9 +1,7 @@ -import 'dart:ffi'; - import 'package:beacon/models/location/location.dart'; -import 'package:beacon/models/user/user_info.dart'; import 'package:flutter/material.dart'; import 'package:hive/hive.dart'; + part 'landmark.g.dart'; @HiveType(typeId: 4) diff --git a/lib/models/location/location.dart b/lib/models/location/location.dart index afc59615..360f732f 100644 --- a/lib/models/location/location.dart +++ b/lib/models/location/location.dart @@ -1,7 +1,6 @@ -import 'dart:ffi'; - import 'package:flutter/material.dart'; import 'package:hive/hive.dart'; + part 'location.g.dart'; @HiveType(typeId: 2) diff --git a/lib/models/user/user_info.dart b/lib/models/user/user_info.dart index 40d37211..ed56238e 100644 --- a/lib/models/user/user_info.dart +++ b/lib/models/user/user_info.dart @@ -1,9 +1,8 @@ -import 'dart:ffi'; - import 'package:beacon/models/beacon/beacon.dart'; import 'package:beacon/models/location/location.dart'; import 'package:flutter/material.dart'; import 'package:hive/hive.dart'; + part 'user_info.g.dart'; @HiveType(typeId: 1) diff --git a/lib/queries/auth.dart b/lib/queries/auth.dart index 85731230..c8c95ccb 100644 --- a/lib/queries/auth.dart +++ b/lib/queries/auth.dart @@ -1,5 +1,3 @@ -import 'dart:ffi'; - class AuthQueries { String registerUser(String name, String email, String password) { return ''' diff --git a/lib/queries/beacon.dart b/lib/queries/beacon.dart index f093c564..b4e21eab 100644 --- a/lib/queries/beacon.dart +++ b/lib/queries/beacon.dart @@ -1,5 +1,3 @@ -import 'dart:ffi'; - class BeaconQueries { String createBeacon(String title, int expiresAt, String lat, String lon) { return ''' diff --git a/lib/router.dart b/lib/router.dart index 8f81bd15..2754d967 100644 --- a/lib/router.dart +++ b/lib/router.dart @@ -1,11 +1,9 @@ -import 'package:beacon/models/beacon/beacon.dart'; import 'package:beacon/splash_screen.dart'; -import 'package:flutter/cupertino.dart'; -import 'package:flutter/material.dart'; import 'package:beacon/utilities/constants.dart'; import 'package:beacon/views/auth_screen.dart'; -import 'package:beacon/views/home.dart'; import 'package:beacon/views/hike_screen.dart'; +import 'package:beacon/views/home.dart'; +import 'package:flutter/material.dart'; Route generateRoute(RouteSettings settings) { switch (settings.name) { diff --git a/lib/services/database_mutation_functions.dart b/lib/services/database_mutation_functions.dart index 0def2267..13098795 100644 --- a/lib/services/database_mutation_functions.dart +++ b/lib/services/database_mutation_functions.dart @@ -1,16 +1,16 @@ import 'dart:async'; -import 'dart:ffi'; + import 'package:beacon/models/beacon/beacon.dart'; import 'package:beacon/models/landmarks/landmark.dart'; import 'package:beacon/models/location/location.dart'; +import 'package:beacon/models/user/user_info.dart'; import 'package:beacon/queries/auth.dart'; import 'package:beacon/queries/beacon.dart'; -import 'package:beacon/services/navigation_service.dart'; import 'package:beacon/utilities/constants.dart'; import 'package:flutter/material.dart'; import 'package:google_maps_flutter/google_maps_flutter.dart'; import 'package:graphql_flutter/graphql_flutter.dart'; -import 'package:beacon/models/user/user_info.dart'; + import '../locator.dart'; class DataBaseMutationFunctions { diff --git a/lib/services/graphql_config.dart b/lib/services/graphql_config.dart index c664b9e0..b915de87 100644 --- a/lib/services/graphql_config.dart +++ b/lib/services/graphql_config.dart @@ -1,8 +1,6 @@ import 'package:beacon/locator.dart'; import 'package:flutter/material.dart'; import 'package:graphql_flutter/graphql_flutter.dart'; -import 'package:web_socket_channel/web_socket_channel.dart'; -import 'package:web_socket_channel/io.dart'; class GraphQLConfig { static String token; diff --git a/lib/services/navigation_service.dart b/lib/services/navigation_service.dart index 938b7936..f0400af4 100644 --- a/lib/services/navigation_service.dart +++ b/lib/services/navigation_service.dart @@ -1,4 +1,3 @@ -import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; class NavigationService { diff --git a/lib/services/validators.dart b/lib/services/validators.dart index d6749d7e..bb141d8f 100644 --- a/lib/services/validators.dart +++ b/lib/services/validators.dart @@ -1,6 +1,3 @@ -import 'package:flutter/cupertino.dart'; -import 'package:http/http.dart' as http; - class Validator { static String validateEmail(String email) { // If email is empty return. diff --git a/lib/view_model/hike_screen_model.dart b/lib/view_model/hike_screen_model.dart index b402ad1b..90c01125 100644 --- a/lib/view_model/hike_screen_model.dart +++ b/lib/view_model/hike_screen_model.dart @@ -1,18 +1,15 @@ import 'dart:async'; +import 'package:beacon/enums/view_state.dart'; +import 'package:beacon/models/beacon/beacon.dart'; import 'package:beacon/models/location/location.dart'; +import 'package:beacon/models/user/user_info.dart'; +import 'package:beacon/view_model/base_view_model.dart'; import 'package:flutter/material.dart'; -import 'package:flutter/services.dart'; import 'package:fluttertoast/fluttertoast.dart'; import 'package:geocoder/geocoder.dart'; import 'package:google_maps_flutter/google_maps_flutter.dart'; - -import 'package:beacon/components/dialog_boxes.dart'; -import 'package:beacon/enums/view_state.dart'; import 'package:share/share.dart'; -import 'package:beacon/models/beacon/beacon.dart'; -import 'package:beacon/models/user/user_info.dart'; -import 'package:beacon/view_model/base_view_model.dart'; class HikeScreenViewModel extends BaseModel { double screenHeight, screenWidth, lat, long; diff --git a/lib/view_model/home_view_model.dart b/lib/view_model/home_view_model.dart index 8a5e7348..0ac64224 100644 --- a/lib/view_model/home_view_model.dart +++ b/lib/view_model/home_view_model.dart @@ -12,7 +12,6 @@ class HomeViewModel extends BaseModel { AutovalidateMode validate = AutovalidateMode.onUserInteraction; bool isCreatingHike = false; String title; - TextEditingController _titleController = new TextEditingController(); TextEditingController durationController = new TextEditingController(); String enteredPasskey = ''; diff --git a/lib/views/auth_screen.dart b/lib/views/auth_screen.dart index 455b7d28..e28263c9 100644 --- a/lib/views/auth_screen.dart +++ b/lib/views/auth_screen.dart @@ -5,7 +5,6 @@ import 'package:beacon/utilities/indication_painter.dart'; import 'package:beacon/view_model/auth_screen_model.dart'; import 'package:beacon/views/base_view.dart'; import 'package:flutter/material.dart'; -import 'package:flutter/services.dart'; class AuthScreen extends StatefulWidget { const AuthScreen({Key key}) : super(key: key); @@ -100,9 +99,9 @@ class _AuthScreenState extends State mainAxisAlignment: MainAxisAlignment.spaceEvenly, children: [ Expanded( - child: FlatButton( - splashColor: Colors.white, - highlightColor: Colors.white, + child: TextButton( + // splashColor: Colors.white, + // highlightColor: Colors.white, onPressed: model.onSignInButtonPress, child: Text( "Existing", @@ -115,9 +114,9 @@ class _AuthScreenState extends State ), //Container(height: 33.0, width: 1.0, color: Colors.white), Expanded( - child: FlatButton( - splashColor: Colors.transparent, - highlightColor: Colors.transparent, + child: TextButton( + // splashColor: Colors.transparent, + // highlightColor: Colors.transparent, onPressed: model.onSignUpButtonPress, child: Text( "New", diff --git a/lib/views/hike_screen.dart b/lib/views/hike_screen.dart index 019746a2..65ec2d0c 100644 --- a/lib/views/hike_screen.dart +++ b/lib/views/hike_screen.dart @@ -1,12 +1,17 @@ import 'dart:async'; + +import 'package:beacon/components/dialog_boxes.dart'; import 'package:beacon/components/hike_button.dart'; -import 'package:flutter/rendering.dart'; -import 'package:beacon/components/create_join_dialog.dart'; -import 'package:beacon/models/landmarks/landmark.dart'; +import 'package:beacon/components/hike_screen_widget.dart'; +import 'package:beacon/components/shape_painter.dart'; +import 'package:beacon/locator.dart'; +import 'package:beacon/models/beacon/beacon.dart'; +import 'package:beacon/models/user/user_info.dart'; import 'package:beacon/queries/beacon.dart'; -import 'package:flutter/foundation.dart'; -import 'package:flutter/gestures.dart'; +import 'package:beacon/services/graphql_config.dart'; +import 'package:beacon/utilities/constants.dart'; import 'package:flutter/material.dart'; +import 'package:flutter_polyline_points/flutter_polyline_points.dart'; import 'package:fluttertoast/fluttertoast.dart'; import 'package:geocoder/geocoder.dart'; import 'package:google_maps_flutter/google_maps_flutter.dart'; @@ -14,15 +19,6 @@ import 'package:graphql_flutter/graphql_flutter.dart'; import 'package:intl/intl.dart'; import 'package:location/location.dart'; import 'package:modal_progress_hud/modal_progress_hud.dart'; -import 'package:flutter_polyline_points/flutter_polyline_points.dart'; -import 'package:beacon/components/dialog_boxes.dart'; -import 'package:beacon/components/hike_screen_widget.dart'; -import 'package:beacon/components/shape_painter.dart'; -import 'package:beacon/locator.dart'; -import 'package:beacon/models/beacon/beacon.dart'; -import 'package:beacon/models/user/user_info.dart'; -import 'package:beacon/services/graphql_config.dart'; -import 'package:beacon/utilities/constants.dart'; import 'package:rxdart/rxdart.dart'; import 'package:sliding_up_panel/sliding_up_panel.dart'; diff --git a/lib/views/home.dart b/lib/views/home.dart index 74039c86..6a17e08b 100644 --- a/lib/views/home.dart +++ b/lib/views/home.dart @@ -1,6 +1,5 @@ import 'package:beacon/components/beacon_card.dart'; import 'package:beacon/components/create_join_dialog.dart'; -import 'package:beacon/components/dialog_boxes.dart'; import 'package:beacon/components/hike_button.dart'; import 'package:beacon/components/shape_painter.dart'; import 'package:beacon/locator.dart'; diff --git a/pubspec.lock b/pubspec.lock index d9554d96..5bc7db62 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -7,35 +7,35 @@ packages: name: _fe_analyzer_shared url: "https://pub.dartlang.org" source: hosted - version: "22.0.0" + version: "47.0.0" analyzer: dependency: transitive description: name: analyzer url: "https://pub.dartlang.org" source: hosted - version: "1.7.1" + version: "4.7.0" archive: dependency: transitive description: name: archive url: "https://pub.dartlang.org" source: hosted - version: "3.1.2" + version: "3.3.6" args: dependency: transitive description: name: args url: "https://pub.dartlang.org" source: hosted - version: "2.2.0" + version: "2.4.0" async: dependency: transitive description: name: async url: "https://pub.dartlang.org" source: hosted - version: "2.6.1" + version: "2.9.0" boolean_selector: dependency: transitive description: @@ -49,245 +49,208 @@ packages: name: build url: "https://pub.dartlang.org" source: hosted - version: "2.0.2" + version: "2.3.1" build_config: dependency: transitive description: name: build_config url: "https://pub.dartlang.org" source: hosted - version: "1.0.0" + version: "1.1.1" build_daemon: dependency: transitive description: name: build_daemon url: "https://pub.dartlang.org" source: hosted - version: "3.0.0" + version: "3.1.0" build_resolvers: dependency: transitive description: name: build_resolvers url: "https://pub.dartlang.org" source: hosted - version: "2.0.3" + version: "2.0.10" build_runner: dependency: "direct dev" description: name: build_runner url: "https://pub.dartlang.org" source: hosted - version: "2.0.4" + version: "2.3.3" build_runner_core: dependency: transitive description: name: build_runner_core url: "https://pub.dartlang.org" source: hosted - version: "7.0.0" + version: "7.2.7" built_collection: dependency: transitive description: name: built_collection url: "https://pub.dartlang.org" source: hosted - version: "5.1.0" + version: "5.1.1" built_value: dependency: transitive description: name: built_value url: "https://pub.dartlang.org" source: hosted - version: "8.0.6" + version: "8.4.3" characters: dependency: transitive description: name: characters url: "https://pub.dartlang.org" source: hosted - version: "1.1.0" - charcode: - dependency: transitive - description: - name: charcode - url: "https://pub.dartlang.org" - source: hosted - version: "1.2.0" + version: "1.2.1" checked_yaml: dependency: transitive description: name: checked_yaml url: "https://pub.dartlang.org" source: hosted - version: "2.0.1" - cli_util: - dependency: transitive - description: - name: cli_util - url: "https://pub.dartlang.org" - source: hosted - version: "0.3.0" + version: "2.0.2" clock: dependency: transitive description: name: clock url: "https://pub.dartlang.org" source: hosted - version: "1.1.0" + version: "1.1.1" code_builder: dependency: transitive description: name: code_builder url: "https://pub.dartlang.org" source: hosted - version: "4.0.0" + version: "4.4.0" collection: dependency: transitive description: name: collection url: "https://pub.dartlang.org" source: hosted - version: "1.15.0" + version: "1.16.0" connectivity_plus: dependency: "direct main" description: name: connectivity_plus url: "https://pub.dartlang.org" source: hosted - version: "1.0.3" - connectivity_plus_linux: - dependency: transitive - description: - name: connectivity_plus_linux - url: "https://pub.dartlang.org" - source: hosted - version: "1.0.3" - connectivity_plus_macos: - dependency: transitive - description: - name: connectivity_plus_macos - url: "https://pub.dartlang.org" - source: hosted - version: "1.0.2" + version: "3.0.3" connectivity_plus_platform_interface: dependency: transitive description: name: connectivity_plus_platform_interface url: "https://pub.dartlang.org" source: hosted - version: "1.0.2" - connectivity_plus_web: - dependency: transitive - description: - name: connectivity_plus_web - url: "https://pub.dartlang.org" - source: hosted - version: "1.0.2" - connectivity_plus_windows: - dependency: transitive - description: - name: connectivity_plus_windows - url: "https://pub.dartlang.org" - source: hosted - version: "1.0.2" + version: "1.2.4" convert: dependency: transitive description: name: convert url: "https://pub.dartlang.org" source: hosted - version: "3.0.0" + version: "3.1.1" crypto: dependency: transitive description: name: crypto url: "https://pub.dartlang.org" source: hosted - version: "3.0.1" + version: "3.0.2" cupertino_icons: dependency: "direct main" description: name: cupertino_icons url: "https://pub.dartlang.org" source: hosted - version: "1.0.2" + version: "1.0.5" dart_style: dependency: transitive description: name: dart_style url: "https://pub.dartlang.org" source: hosted - version: "2.0.1" + version: "2.2.4" date_time_picker: dependency: "direct main" description: name: date_time_picker url: "https://pub.dartlang.org" source: hosted - version: "2.0.0" + version: "2.1.0" dbus: dependency: transitive description: name: dbus url: "https://pub.dartlang.org" source: hosted - version: "0.5.2" + version: "0.7.8" + duration_picker: + dependency: "direct main" + description: + name: duration_picker + url: "https://pub.dartlang.org" + source: hosted + version: "1.1.1" fake_async: dependency: transitive description: name: fake_async url: "https://pub.dartlang.org" source: hosted - version: "1.2.0" + version: "1.3.1" ffi: dependency: transitive description: name: ffi url: "https://pub.dartlang.org" source: hosted - version: "1.1.2" + version: "2.0.1" file: dependency: transitive description: name: file url: "https://pub.dartlang.org" source: hosted - version: "6.1.2" + version: "6.1.4" fixnum: dependency: transitive description: name: fixnum url: "https://pub.dartlang.org" source: hosted - version: "1.0.0" + version: "1.0.1" flutter: dependency: "direct main" description: flutter source: sdk version: "0.0.0" - flutter_duration_picker: - dependency: "direct main" + flutter_hooks: + dependency: transitive description: - path: "." - ref: HEAD - resolved-ref: "285ff19ad8b440fb6b8727ea849b7ce679d67c75" - url: "https://github.com/bartektartanus/flutter_duration_picker" - source: git - version: "1.0.4" + name: flutter_hooks + url: "https://pub.dartlang.org" + source: hosted + version: "0.18.6" flutter_launcher_icons: dependency: "direct dev" description: name: flutter_launcher_icons url: "https://pub.dartlang.org" source: hosted - version: "0.9.1" + version: "0.9.3" flutter_plugin_android_lifecycle: dependency: transitive description: name: flutter_plugin_android_lifecycle url: "https://pub.dartlang.org" source: hosted - version: "2.0.1" + version: "2.0.7" flutter_polyline_points: dependency: "direct main" description: @@ -311,14 +274,14 @@ packages: name: fluttertoast url: "https://pub.dartlang.org" source: hosted - version: "8.0.3" + version: "8.2.1" frontend_server_client: dependency: transitive description: name: frontend_server_client url: "https://pub.dartlang.org" source: hosted - version: "2.1.0" + version: "3.2.0" geocoder: dependency: "direct main" description: @@ -332,161 +295,189 @@ packages: name: geolocator url: "https://pub.dartlang.org" source: hosted - version: "7.0.1" + version: "7.7.1" + geolocator_android: + dependency: transitive + description: + name: geolocator_android + url: "https://pub.dartlang.org" + source: hosted + version: "2.1.0" + geolocator_apple: + dependency: transitive + description: + name: geolocator_apple + url: "https://pub.dartlang.org" + source: hosted + version: "1.2.2" geolocator_platform_interface: dependency: transitive description: name: geolocator_platform_interface url: "https://pub.dartlang.org" source: hosted - version: "2.0.0" + version: "2.3.6" geolocator_web: dependency: transitive description: name: geolocator_web url: "https://pub.dartlang.org" source: hosted - version: "2.0.3" + version: "2.0.6" get_it: dependency: "direct main" description: name: get_it url: "https://pub.dartlang.org" source: hosted - version: "7.1.3" + version: "7.2.0" glob: dependency: transitive description: name: glob url: "https://pub.dartlang.org" source: hosted - version: "2.0.1" + version: "2.1.1" google_maps_flutter: dependency: "direct main" description: name: google_maps_flutter url: "https://pub.dartlang.org" source: hosted - version: "2.0.6" + version: "2.2.3" + google_maps_flutter_android: + dependency: transitive + description: + name: google_maps_flutter_android + url: "https://pub.dartlang.org" + source: hosted + version: "2.4.5" + google_maps_flutter_ios: + dependency: transitive + description: + name: google_maps_flutter_ios + url: "https://pub.dartlang.org" + source: hosted + version: "2.1.13" google_maps_flutter_platform_interface: dependency: transitive description: name: google_maps_flutter_platform_interface url: "https://pub.dartlang.org" source: hosted - version: "2.0.4" + version: "2.2.5" gql: dependency: transitive description: name: gql url: "https://pub.dartlang.org" source: hosted - version: "0.13.0" + version: "0.14.0" gql_dedupe_link: dependency: transitive description: name: gql_dedupe_link url: "https://pub.dartlang.org" source: hosted - version: "2.0.0" + version: "2.0.3+1" gql_error_link: dependency: transitive description: name: gql_error_link url: "https://pub.dartlang.org" source: hosted - version: "0.2.0" + version: "0.2.3+1" gql_exec: dependency: transitive description: name: gql_exec url: "https://pub.dartlang.org" source: hosted - version: "0.3.0" + version: "0.4.3" gql_http_link: dependency: transitive description: name: gql_http_link url: "https://pub.dartlang.org" source: hosted - version: "0.4.0" + version: "0.4.5" gql_link: dependency: transitive description: name: gql_link url: "https://pub.dartlang.org" source: hosted - version: "0.4.0" + version: "0.5.1" gql_transform_link: dependency: transitive description: name: gql_transform_link url: "https://pub.dartlang.org" source: hosted - version: "0.2.0" + version: "0.2.2+1" graphql: dependency: transitive description: name: graphql url: "https://pub.dartlang.org" source: hosted - version: "5.0.0" + version: "5.1.3" graphql_flutter: dependency: "direct main" description: name: graphql_flutter url: "https://pub.dartlang.org" source: hosted - version: "5.0.0" + version: "5.1.2" graphs: dependency: transitive description: name: graphs url: "https://pub.dartlang.org" source: hosted - version: "2.0.0" + version: "2.2.0" hive: dependency: "direct main" description: name: hive url: "https://pub.dartlang.org" source: hosted - version: "2.0.4" + version: "2.2.3" hive_generator: dependency: "direct dev" description: name: hive_generator url: "https://pub.dartlang.org" source: hosted - version: "1.1.0" + version: "1.1.3" http: dependency: transitive description: name: http url: "https://pub.dartlang.org" source: hosted - version: "0.13.3" + version: "0.13.5" http_multi_server: dependency: transitive description: name: http_multi_server url: "https://pub.dartlang.org" source: hosted - version: "3.0.1" + version: "3.2.1" http_parser: dependency: transitive description: name: http_parser url: "https://pub.dartlang.org" source: hosted - version: "4.0.0" + version: "4.0.2" image: dependency: transitive description: name: image url: "https://pub.dartlang.org" source: hosted - version: "3.0.2" + version: "3.3.0" intl: dependency: "direct main" description: @@ -500,28 +491,28 @@ packages: name: io url: "https://pub.dartlang.org" source: hosted - version: "1.0.0" + version: "1.0.4" js: dependency: transitive description: name: js url: "https://pub.dartlang.org" source: hosted - version: "0.6.3" + version: "0.6.4" json_annotation: dependency: transitive description: name: json_annotation url: "https://pub.dartlang.org" source: hosted - version: "4.0.1" + version: "4.8.0" location: dependency: "direct main" description: name: location url: "https://pub.dartlang.org" source: hosted - version: "4.3.0" + version: "4.4.0" location_platform_interface: dependency: transitive description: @@ -542,28 +533,35 @@ packages: name: logging url: "https://pub.dartlang.org" source: hosted - version: "1.0.1" + version: "1.1.1" matcher: dependency: transitive description: name: matcher url: "https://pub.dartlang.org" source: hosted - version: "0.12.10" + version: "0.12.12" + material_color_utilities: + dependency: transitive + description: + name: material_color_utilities + url: "https://pub.dartlang.org" + source: hosted + version: "0.1.5" meta: dependency: transitive description: name: meta url: "https://pub.dartlang.org" source: hosted - version: "1.3.0" + version: "1.8.0" mime: dependency: transitive description: name: mime url: "https://pub.dartlang.org" source: hosted - version: "1.0.0" + version: "1.0.4" modal_progress_hud: dependency: "direct main" description: @@ -578,104 +576,118 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "1.0.0" + nm: + dependency: transitive + description: + name: nm + url: "https://pub.dartlang.org" + source: hosted + version: "0.5.0" normalize: dependency: transitive description: name: normalize url: "https://pub.dartlang.org" source: hosted - version: "0.5.4" + version: "0.7.2" package_config: dependency: transitive description: name: package_config url: "https://pub.dartlang.org" source: hosted - version: "2.0.0" + version: "2.1.0" path: dependency: transitive description: name: path url: "https://pub.dartlang.org" source: hosted - version: "1.8.0" + version: "1.8.2" path_provider: dependency: "direct main" description: name: path_provider url: "https://pub.dartlang.org" source: hosted - version: "2.0.2" - path_provider_linux: + version: "2.0.12" + path_provider_android: dependency: transitive description: - name: path_provider_linux + name: path_provider_android url: "https://pub.dartlang.org" source: hosted - version: "2.0.0" - path_provider_macos: + version: "2.0.22" + path_provider_foundation: dependency: transitive description: - name: path_provider_macos + name: path_provider_foundation url: "https://pub.dartlang.org" source: hosted - version: "2.0.0" - path_provider_platform_interface: + version: "2.1.1" + path_provider_linux: dependency: transitive description: - name: path_provider_platform_interface + name: path_provider_linux url: "https://pub.dartlang.org" source: hosted - version: "2.0.1" - path_provider_windows: + version: "2.1.8" + path_provider_platform_interface: dependency: transitive description: - name: path_provider_windows + name: path_provider_platform_interface url: "https://pub.dartlang.org" source: hosted - version: "2.0.1" - pedantic: + version: "2.0.5" + path_provider_windows: dependency: transitive description: - name: pedantic + name: path_provider_windows url: "https://pub.dartlang.org" source: hosted - version: "1.11.0" + version: "2.1.3" petitparser: dependency: transitive description: name: petitparser url: "https://pub.dartlang.org" source: hosted - version: "4.1.0" + version: "5.1.0" platform: dependency: transitive description: name: platform url: "https://pub.dartlang.org" source: hosted - version: "3.0.0" + version: "3.1.0" plugin_platform_interface: dependency: transitive description: name: plugin_platform_interface url: "https://pub.dartlang.org" source: hosted - version: "2.0.0" + version: "2.1.3" + pointycastle: + dependency: transitive + description: + name: pointycastle + url: "https://pub.dartlang.org" + source: hosted + version: "3.6.2" pool: dependency: transitive description: name: pool url: "https://pub.dartlang.org" source: hosted - version: "1.5.0" + version: "1.5.1" process: dependency: transitive description: name: process url: "https://pub.dartlang.org" source: hosted - version: "4.2.1" + version: "4.2.4" provider: dependency: "direct main" description: @@ -689,21 +701,21 @@ packages: name: pub_semver url: "https://pub.dartlang.org" source: hosted - version: "2.0.0" + version: "2.1.3" pubspec_parse: dependency: transitive description: name: pubspec_parse url: "https://pub.dartlang.org" source: hosted - version: "1.0.0" + version: "1.2.1" rxdart: dependency: "direct main" description: name: rxdart url: "https://pub.dartlang.org" source: hosted - version: "0.26.0" + version: "0.27.7" share: dependency: "direct main" description: @@ -717,56 +729,63 @@ packages: name: shared_preferences url: "https://pub.dartlang.org" source: hosted - version: "2.0.6" - shared_preferences_linux: + version: "2.0.17" + shared_preferences_android: dependency: transitive description: - name: shared_preferences_linux + name: shared_preferences_android url: "https://pub.dartlang.org" source: hosted - version: "2.0.0" - shared_preferences_macos: + version: "2.0.15" + shared_preferences_foundation: dependency: transitive description: - name: shared_preferences_macos + name: shared_preferences_foundation url: "https://pub.dartlang.org" source: hosted - version: "2.0.0" + version: "2.1.3" + shared_preferences_linux: + dependency: transitive + description: + name: shared_preferences_linux + url: "https://pub.dartlang.org" + source: hosted + version: "2.1.3" shared_preferences_platform_interface: dependency: transitive description: name: shared_preferences_platform_interface url: "https://pub.dartlang.org" source: hosted - version: "2.0.0" + version: "2.1.0" shared_preferences_web: dependency: transitive description: name: shared_preferences_web url: "https://pub.dartlang.org" source: hosted - version: "2.0.0" + version: "2.0.4" shared_preferences_windows: dependency: transitive description: name: shared_preferences_windows url: "https://pub.dartlang.org" source: hosted - version: "2.0.0" + version: "2.1.3" shelf: dependency: transitive description: name: shelf url: "https://pub.dartlang.org" source: hosted - version: "1.1.4" + version: "1.4.0" shelf_web_socket: dependency: transitive description: name: shelf_web_socket url: "https://pub.dartlang.org" source: hosted - version: "1.0.1" + version: "1.0.3" skeleton_text: dependency: "direct main" description: @@ -792,21 +811,21 @@ packages: name: source_gen url: "https://pub.dartlang.org" source: hosted - version: "1.0.2" + version: "1.2.6" source_helper: dependency: transitive description: name: source_helper url: "https://pub.dartlang.org" source: hosted - version: "1.1.0" + version: "1.3.3" source_span: dependency: transitive description: name: source_span url: "https://pub.dartlang.org" source: hosted - version: "1.8.1" + version: "1.9.0" stack_trace: dependency: transitive description: @@ -827,42 +846,42 @@ packages: name: stream_transform url: "https://pub.dartlang.org" source: hosted - version: "2.0.0" + version: "2.1.0" string_scanner: dependency: transitive description: name: string_scanner url: "https://pub.dartlang.org" source: hosted - version: "1.1.0" + version: "1.1.1" term_glyph: dependency: transitive description: name: term_glyph url: "https://pub.dartlang.org" source: hosted - version: "1.2.0" + version: "1.2.1" test_api: dependency: transitive description: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.3.0" + version: "0.4.12" timing: dependency: transitive description: name: timing url: "https://pub.dartlang.org" source: hosted - version: "1.0.0" + version: "1.0.1" typed_data: dependency: transitive description: name: typed_data url: "https://pub.dartlang.org" source: hosted - version: "1.3.0" + version: "1.3.1" uni_links: dependency: "direct main" description: @@ -890,56 +909,56 @@ packages: name: uuid url: "https://pub.dartlang.org" source: hosted - version: "3.0.4" + version: "3.0.7" vector_math: dependency: transitive description: name: vector_math url: "https://pub.dartlang.org" source: hosted - version: "2.1.0" + version: "2.1.2" watcher: dependency: transitive description: name: watcher url: "https://pub.dartlang.org" source: hosted - version: "1.0.0" + version: "1.0.2" web_socket_channel: dependency: transitive description: name: web_socket_channel url: "https://pub.dartlang.org" source: hosted - version: "2.1.0" + version: "2.2.0" win32: dependency: transitive description: name: win32 url: "https://pub.dartlang.org" source: hosted - version: "2.1.5" + version: "3.1.3" xdg_directories: dependency: transitive description: name: xdg_directories url: "https://pub.dartlang.org" source: hosted - version: "0.2.0" + version: "1.0.0" xml: dependency: transitive description: name: xml url: "https://pub.dartlang.org" source: hosted - version: "5.1.2" + version: "6.1.0" yaml: dependency: transitive description: name: yaml url: "https://pub.dartlang.org" source: hosted - version: "3.1.0" + version: "3.1.1" sdks: - dart: ">=2.13.0 <3.0.0" - flutter: ">=1.22.0" + dart: ">=2.18.0 <3.0.0" + flutter: ">=3.0.0" diff --git a/pubspec.yaml b/pubspec.yaml index 45fdab00..0a2ccf1e 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -12,7 +12,7 @@ dependencies: cupertino_icons: ^1.0.2 fluttertoast: ^8.0.3 - connectivity_plus: ^1.0.2 + connectivity_plus: ^3.0.3 geolocator: ^7.0.1 google_maps_flutter: ^2.0.6 intl: ^0.17.0 @@ -21,19 +21,18 @@ dependencies: hive: ^2.0.4 path_provider: ^2.0.2 shared_preferences: ^2.0.6 - graphql_flutter: ^5.0.0 + graphql_flutter: ^5.1.2 get_it: ^7.1.3 provider: ^5.0.0 uni_links: ^0.5.1 geocoder: ^0.2.1 share: ^2.0.4 location: ^4.3.0 - rxdart: ^0.26.0 + rxdart: ^0.27.7 flutter_polyline_points: ^1.0.0 sliding_up_panel: ^2.0.0+1 skeleton_text: ^1.0.0 - flutter_duration_picker: - git: https://github.com/bartektartanus/flutter_duration_picker + duration_picker: ^1.1.1 dev_dependencies: flutter_test: