Merge pull request #65 from SWM-M3PRO/develop

V.1.0.2
SWM-M3PRO · Aug 6, 2024 · 0f25f23 · 0f25f23
2 parents e889ced + b7ca46e
commit 0f25f23
Show file tree

Hide file tree

Showing 42 changed files with 1,417 additions and 649 deletions.
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
@@ -8,6 +8,7 @@
     <uses-permission android:name="android.permission.ACTIVITY_RECOGNITION" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE_REMOTE_MESSAGING" />
+    <uses-permission android:name="android.permission.INTERNET" />
 
     <application
         android:label="ground_flip"

diff --git a/assets/images/default_profile_image.png b/assets/images/default_profile_image.png
diff --git a/ios/Podfile.lock b/ios/Podfile.lock
@@ -1,4 +1,7 @@
 PODS:
+  - connectivity_plus (0.0.1):
+    - Flutter
+    - FlutterMacOS
   - device_info_plus (0.0.1):
     - Flutter
   - Flutter (1.0.0)
@@ -22,6 +25,8 @@ PODS:
     - Flutter
   - image_picker_ios (0.0.1):
     - Flutter
+  - in_app_review (0.2.0):
+    - Flutter
   - kakao_flutter_sdk_common (1.9.3):
     - Flutter
   - location (0.0.1):
@@ -44,6 +49,7 @@ PODS:
     - Flutter
 
 DEPENDENCIES:
+  - connectivity_plus (from `.symlinks/plugins/connectivity_plus/darwin`)
   - device_info_plus (from `.symlinks/plugins/device_info_plus/ios`)
   - Flutter (from `Flutter`)
   - flutter_config (from `.symlinks/plugins/flutter_config/ios`)
@@ -53,6 +59,7 @@ DEPENDENCIES:
   - google_maps_flutter_ios (from `.symlinks/plugins/google_maps_flutter_ios/ios`)
   - health (from `.symlinks/plugins/health/ios`)
   - image_picker_ios (from `.symlinks/plugins/image_picker_ios/ios`)
+  - in_app_review (from `.symlinks/plugins/in_app_review/ios`)
   - kakao_flutter_sdk_common (from `.symlinks/plugins/kakao_flutter_sdk_common/ios`)
   - location (from `.symlinks/plugins/location/ios`)
   - path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`)
@@ -68,6 +75,8 @@ SPEC REPOS:
     - GoogleMaps
 
 EXTERNAL SOURCES:
+  connectivity_plus:
+    :path: ".symlinks/plugins/connectivity_plus/darwin"
   device_info_plus:
     :path: ".symlinks/plugins/device_info_plus/ios"
   Flutter:
@@ -86,6 +95,8 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/health/ios"
   image_picker_ios:
     :path: ".symlinks/plugins/image_picker_ios/ios"
+  in_app_review:
+    :path: ".symlinks/plugins/in_app_review/ios"
   kakao_flutter_sdk_common:
     :path: ".symlinks/plugins/kakao_flutter_sdk_common/ios"
   location:
@@ -106,6 +117,7 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/webview_flutter_wkwebview/ios"
 
 SPEC CHECKSUMS:
+  connectivity_plus: ddd7f30999e1faaef5967c23d5b6d503d10434db
   device_info_plus: 97af1d7e84681a90d0693e63169a5d50e0839a0d
   Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
   flutter_config: f48f0d47a284f1791aacce2687eabb3309ba7a41
@@ -116,6 +128,7 @@ SPEC CHECKSUMS:
   GoogleMaps: 8939898920281c649150e0af74aa291c60f2e77d
   health: 5a380c0f6c4f619535845992993964293962e99e
   image_picker_ios: c560581cceedb403a6ff17f2f816d7fea1421fc1
+  in_app_review: 318597b3a06c22bb46dc454d56828c85f444f99d
   kakao_flutter_sdk_common: 80c3308f209f3d6cc74e338ffea3a51d17501d77
   location: d5cf8598915965547c3f36761ae9cc4f4e87d22e
   path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46

diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj
@@ -493,14 +493,16 @@
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
 				DEVELOPMENT_TEAM = 3BD2BV9TRM;
 				ENABLE_BITCODE = NO;
+				FLUTTER_BUILD_NAME = 1.0.2;
 				INFOPLIST_FILE = Runner/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = "Ground Flip";
+				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.healthcare-fitness";
 				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0.0;
+				MARKETING_VERSION = 1.0.2;
 				PRODUCT_BUNDLE_IDENTIFIER = com.m3pro.groundFlip;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
@@ -681,14 +683,16 @@
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
 				DEVELOPMENT_TEAM = 3BD2BV9TRM;
 				ENABLE_BITCODE = NO;
+				FLUTTER_BUILD_NAME = 1.0.2;
 				INFOPLIST_FILE = Runner/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = "Ground Flip";
+				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.healthcare-fitness";
 				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0.0;
+				MARKETING_VERSION = 1.0.2;
 				PRODUCT_BUNDLE_IDENTIFIER = com.m3pro.groundFlip;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
@@ -709,14 +713,16 @@
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
 				DEVELOPMENT_TEAM = 3BD2BV9TRM;
 				ENABLE_BITCODE = NO;
+				FLUTTER_BUILD_NAME = 1.0.2;
 				INFOPLIST_FILE = Runner/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = "Ground Flip";
+				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.healthcare-fitness";
 				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0.0;
+				MARKETING_VERSION = 1.0.2;
 				PRODUCT_BUNDLE_IDENTIFIER = com.m3pro.groundFlip;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";

diff --git a/ios/Runner/Runner.entitlements b/ios/Runner/Runner.entitlements
@@ -10,6 +10,8 @@
 	</array>
 	<key>com.apple.developer.healthkit</key>
 	<true/>
+	<key>com.apple.security.network.client</key>
+    <true/>
 	<key>com.apple.developer.healthkit.access</key>
 	<array/>
 </dict>

diff --git a/lib/constants/text_styles.dart b/lib/constants/text_styles.dart
@@ -75,6 +75,12 @@ class TextStyles {
     fontWeight: FontWeight.w800,
   );
 
+  static TextStyle fs15w800cTextPrimary = TextStyle(
+    color: AppColors.textPrimary,
+    fontSize: 15,
+    fontWeight: FontWeight.w800,
+  );
+
   static TextStyle fs14w500cTextSecondary = TextStyle(
     color: AppColors.textSecondary,
     fontSize: 14,

diff --git a/lib/controllers/bottom_sheet_controller.dart b/lib/controllers/bottom_sheet_controller.dart
@@ -9,11 +9,13 @@ import '../widgets/map/bottom_sheet/individual_history_list.dart';
 import '../widgets/map/bottom_sheet/pixel_info_header.dart';
 import '../widgets/map/bottom_sheet/step_stats.dart';
 import '../widgets/map/bottom_sheet/visited_user_list.dart';
+import 'map_controller.dart';
 
 class BottomSheetController extends GetxController {
   final PixelService pixelService = PixelService();
   final DraggableScrollableController draggableController =
       DraggableScrollableController();
+
   Widget currentBody = StepStatsBody();
   Widget currentHeader = StepStats();
   RxInt mode = 0.obs;
@@ -28,7 +30,7 @@ class BottomSheetController extends GetxController {
     changeVar.value = changeVar.value ? false : true;
     draggableController.animateTo(
       0.6,
-      duration: Duration(milliseconds: 500),
+      duration: Duration(milliseconds: 200),
       curve: Curves.easeInOut,
     );
     currentHeader = PixelInfoHeader(
@@ -51,7 +53,7 @@ class BottomSheetController extends GetxController {
     changeVar.value = changeVar.value ? false : true;
     draggableController.animateTo(
       0.6,
-      duration: Duration(milliseconds: 300),
+      duration: Duration(milliseconds: 200),
       curve: Curves.easeInOut,
     );
     currentHeader = PixelInfoHeader(
@@ -73,16 +75,20 @@ class BottomSheetController extends GetxController {
     mode.value = 0;
     draggableController.animateTo(
       0.1,
-      duration: Duration(milliseconds: 500),
+      duration: Duration(milliseconds: 200),
       curve: Curves.easeInOut,
     );
+
   }
 
   void changeStepStatIfMinimized() {
     if (draggableController.size <= 0.111 && size > draggableController.size) {
       currentHeader = StepStats();
       currentBody = StepStatsBody();
       mode.value = 0;
+
+      Get.find<MapController>().changePixelToNormalState();
+      Get.find<MapController>().isBottomSheetShowUp = false;
     }
     size = draggableController.size;
   }