Merge pull request #79 from fanzru/staging

Bump mobile to main
fanzru · Jun 15, 2022 · bbb11b1 · bbb11b1
2 parents 48f02ca + b955eb9
commit bbb11b1
Show file tree

Hide file tree

Showing 8 changed files with 90 additions and 4 deletions.
diff --git a/mobile/ios/Podfile b/mobile/ios/Podfile
@@ -37,5 +37,62 @@ end
 post_install do |installer|
   installer.pods_project.targets.each do |target|
     flutter_additional_ios_build_settings(target)
+    target.build_configurations.each do |config|
+      ... # Here are some configurations automatically generated by flutter
+
+      # You can enable the permissions needed here. For example to enable camera
+      # permission, just remove the `#` character in front so it looks like this:
+      #
+      # ## dart: PermissionGroup.camera
+      # 'PERMISSION_CAMERA=1'
+      #
+      #  Preprocessor definitions can be found in: https://github.com/Baseflow/flutter-permission-handler/blob/master/permission_handler/ios/Classes/PermissionHandlerEnums.h
+      config.build_settings['GCC_PREPROCESSOR_DEFINITIONS'] ||= [
+        '$(inherited)',
+
+        ## dart: PermissionGroup.calendar
+        # 'PERMISSION_EVENTS=1',
+
+        ## dart: PermissionGroup.reminders
+        # 'PERMISSION_REMINDERS=1',
+
+        ## dart: PermissionGroup.contacts
+        # 'PERMISSION_CONTACTS=1',
+
+        ## dart: PermissionGroup.camera
+        # 'PERMISSION_CAMERA=1',
+
+        ## dart: PermissionGroup.microphone
+        # 'PERMISSION_MICROPHONE=1',
+
+        ## dart: PermissionGroup.speech
+        # 'PERMISSION_SPEECH_RECOGNIZER=1',
+
+        ## dart: PermissionGroup.photos
+        # 'PERMISSION_PHOTOS=1',
+
+        # dart: [PermissionGroup.location, PermissionGroup.locationAlways, PermissionGroup.locationWhenInUse]
+        'PERMISSION_LOCATION=1',
+
+        ## dart: PermissionGroup.notification
+        # 'PERMISSION_NOTIFICATIONS=1',
+
+        ## dart: PermissionGroup.mediaLibrary
+        # 'PERMISSION_MEDIA_LIBRARY=1',
+
+        ## dart: PermissionGroup.sensors
+        # 'PERMISSION_SENSORS=1',   
+
+        ## dart: PermissionGroup.bluetooth
+        # 'PERMISSION_BLUETOOTH=1',
+
+        # dart: PermissionGroup.appTrackingTransparency
+        'PERMISSION_APP_TRACKING_TRANSPARENCY=1',
+
+        ## dart: PermissionGroup.criticalAlerts
+        # 'PERMISSION_CRITICAL_ALERTS=1'
+      ]
+
+    end
   end
 end
diff --git a/mobile/ios/Podfile.lock b/mobile/ios/Podfile.lock
@@ -34,8 +34,14 @@ PODS:
     - DKImagePickerController/PhotoGallery
     - Flutter
   - Flutter (1.0.0)
+  - flutter_native_splash (0.0.1):
+    - Flutter
   - geolocator_apple (1.2.0):
     - Flutter
+  - permission (0.0.1):
+    - Flutter
+  - permission_handler_apple (9.0.4):
+    - Flutter
   - SDWebImage (5.12.5):
     - SDWebImage/Core (= 5.12.5)
   - SDWebImage/Core (5.12.5)
@@ -48,7 +54,10 @@ PODS:
 DEPENDENCIES:
   - file_picker (from `.symlinks/plugins/file_picker/ios`)
   - Flutter (from `Flutter`)
+  - flutter_native_splash (from `.symlinks/plugins/flutter_native_splash/ios`)
   - geolocator_apple (from `.symlinks/plugins/geolocator_apple/ios`)
+  - permission (from `.symlinks/plugins/permission/ios`)
+  - permission_handler_apple (from `.symlinks/plugins/permission_handler_apple/ios`)
   - shared_preferences_ios (from `.symlinks/plugins/shared_preferences_ios/ios`)
   - url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`)
 
@@ -64,8 +73,14 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/file_picker/ios"
   Flutter:
     :path: Flutter
+  flutter_native_splash:
+    :path: ".symlinks/plugins/flutter_native_splash/ios"
   geolocator_apple:
     :path: ".symlinks/plugins/geolocator_apple/ios"
+  permission:
+    :path: ".symlinks/plugins/permission/ios"
+  permission_handler_apple:
+    :path: ".symlinks/plugins/permission_handler_apple/ios"
   shared_preferences_ios:
     :path: ".symlinks/plugins/shared_preferences_ios/ios"
   url_launcher_ios:
@@ -76,12 +91,15 @@ SPEC CHECKSUMS:
   DKPhotoGallery: fdfad5125a9fdda9cc57df834d49df790dbb4179
   file_picker: 3e6c3790de664ccf9b882732d9db5eaf6b8d4eb1
   Flutter: 50d75fe2f02b26cc09d224853bb45737f8b3214a
+  flutter_native_splash: 52501b97d1c0a5f898d687f1646226c1f93c56ef
   geolocator_apple: cc556e6844d508c95df1e87e3ea6fa4e58c50401
+  permission: c186483e23779d53def6b55986323494927c22c8
+  permission_handler_apple: 44366e37eaf29454a1e7b1b7d736c2cceaeb17ce
   SDWebImage: 0905f1b7760fc8ac4198cae0036600d67478751e
   shared_preferences_ios: 548a61f8053b9b8a49ac19c1ffbc8b92c50d68ad
   SwiftyGif: 6c3eafd0ce693cad58bb63d2b2fb9bacb8552780
   url_launcher_ios: 839c58cdb4279282219f5e248c3321761ff3c4de
 
-PODFILE CHECKSUM: aafe91acc616949ddb318b77800a7f51bffa2a4c
+PODFILE CHECKSUM: eb3c20a1ceaeac1c2c9370901ca126f9deeed840
 
 COCOAPODS: 1.11.3
diff --git a/mobile/lib/screen/home/components/tikum/my_tikum.dart b/mobile/lib/screen/home/components/tikum/my_tikum.dart
@@ -24,6 +24,7 @@ class _MyTikumState extends State<MyTikum> {
   @override
   Widget build(BuildContext context) {
     return Scaffold(
+      backgroundColor: Colors.white,
       body: FutureBuilder<SecureProfile>(
         future: futureProfile,
         builder: (context, snapshot) {

diff --git a/mobile/lib/screen/home/components/tikum/mytikum_card.dart b/mobile/lib/screen/home/components/tikum/mytikum_card.dart
@@ -152,7 +152,8 @@ class MyTikumCard extends StatelessWidget {
                   )
                 ],
               ),
-            if (tikum.linkGroup != null)
+            if (tikum.linkGroup != null &&
+                Uri.tryParse(tikum.linkGroup!)!.isAbsolute)
               ElevatedButton(
                   style: ButtonStyle(
                       backgroundColor: MaterialStateProperty.all(Colors.black)),

diff --git a/mobile/lib/screen/home/components/tikum/tikum_card.dart b/mobile/lib/screen/home/components/tikum/tikum_card.dart
@@ -101,7 +101,8 @@ class TikumCard extends StatelessWidget {
                   )
                 ],
               ),
-            if (tikum.linkGroup != null)
+            if (tikum.linkGroup != null &&
+                Uri.tryParse(tikum.linkGroup!)!.isAbsolute)
               ElevatedButton(
                   style: ButtonStyle(
                       backgroundColor: MaterialStateProperty.all(Colors.black)),

diff --git a/mobile/lib/screen/permission/permission_screen.dart b/mobile/lib/screen/permission/permission_screen.dart
@@ -170,7 +170,7 @@ class _PermissionScreenState extends State<PermissionScreen> {
               children: [
                 _requestPermissionBox(
                     !(_permissionLocation && _permissionStroage)),
-                _lanjutkanBox(_permissionLocation && _permissionStroage)
+                _lanjutkanBox(_permissionStroage)
               ],
             )
           ],

diff --git a/mobile/pubspec.lock b/mobile/pubspec.lock
@@ -289,6 +289,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "2.0.6"
+  permission:
+    dependency: "direct main"
+    description:
+      name: permission
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.1.7"
   permission_handler:
     dependency: "direct main"
     description:

diff --git a/mobile/pubspec.yaml b/mobile/pubspec.yaml
@@ -44,6 +44,7 @@ dependencies:
   flutter_native_splash: ^2.2.3
   provider: ^6.0.3
   permission_handler: ^9.2.0
+  permission: ^0.1.7
 
 dev_dependencies:
   flutter_test: