Revert "1.0.3+18 (#66)" (#67)

This reverts commit 088d1de.
bsideproject · Nov 8, 2023 · 2840437 · 2840437
1 parent 088d1de
commit 2840437
Show file tree

Hide file tree

Showing 28 changed files with 241 additions and 309 deletions.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
diff --git a/.gitignore b/.gitignore
@@ -32,6 +32,7 @@
 /build/
 
 # Web related
+lib/generated_plugin_registrant.dart
 
 # Symbolication related
 app.*.symbols
@@ -52,4 +53,4 @@ coverage
 .fvm
 
 sqflite_sw.js
-sqlite3.wasm
+sqlite3.wasm
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -7,8 +7,7 @@
         {
           "name": "moa_app",
           "request": "launch",
-          "type": "dart",
-          "flutterMode": "debug"
+          "type": "dart"
         },
         {
           "name": "moa_app (profile mode)",

diff --git a/analysis_options.yaml b/analysis_options.yaml
@@ -27,10 +27,6 @@ linter:
     - comment_references
     - prefer_void_to_null
     - use_key_in_widget_constructors
-    - prefer_const_literals_to_create_immutables
-    - prefer_typing_uninitialized_variables
-    - unnecessary_getters_setters
-    - no_leading_underscores_for_local_identifiers
 
 analyzer:
   strong-mode:

diff --git a/ios/Podfile.lock b/ios/Podfile.lock
@@ -5,7 +5,7 @@ PODS:
   - AppAuth/Core (1.6.2)
   - AppAuth/ExternalUserAgent (1.6.2):
     - AppAuth/Core
-  - BranchSDK (2.2.1)
+  - BranchSDK (2.2.0)
   - Firebase/CoreOnly (10.12.0):
     - FirebaseCore (= 10.12.0)
   - firebase_core (2.15.1):
@@ -15,7 +15,7 @@ PODS:
     - FirebaseCoreInternal (~> 10.0)
     - GoogleUtilities/Environment (~> 7.8)
     - GoogleUtilities/Logger (~> 7.8)
-  - FirebaseCoreInternal (10.15.0):
+  - FirebaseCoreInternal (10.12.0):
     - "GoogleUtilities/NSData+zlib (~> 7.8)"
   - Flutter (1.0.0)
   - flutter_branch_sdk (6.4.0):
@@ -40,11 +40,11 @@ PODS:
     - AppAuth (~> 1.5)
     - GTMAppAuth (~> 1.3)
     - GTMSessionFetcher/Core (< 3.0, >= 1.1)
-  - GoogleUtilities/Environment (7.11.5):
+  - GoogleUtilities/Environment (7.11.4):
     - PromisesObjC (< 3.0, >= 1.2)
-  - GoogleUtilities/Logger (7.11.5):
+  - GoogleUtilities/Logger (7.11.4):
     - GoogleUtilities/Environment
-  - "GoogleUtilities/NSData+zlib (7.11.5)"
+  - "GoogleUtilities/NSData+zlib (7.11.4)"
   - GTMAppAuth (1.3.1):
     - AppAuth/Core (~> 1.6)
     - GTMSessionFetcher/Core (< 3.0, >= 1.5)
@@ -160,11 +160,11 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   AppAuth: 3bb1d1cd9340bd09f5ed189fb00b1cc28e1e8570
-  BranchSDK: cb046c2714b03e573484ce9e349e2ddbad7016e8
+  BranchSDK: 8749d10e30725d08b6c188ab90e6fd6223d204db
   Firebase: 07150e75d142fb9399f6777fa56a187b17f833a0
   firebase_core: 4a3246a02f828a01c74a2c26427037786d90f17f
   FirebaseCore: f86a1394906b97ac445ae49c92552a9425831bed
-  FirebaseCoreInternal: 2f4bee5ed00301b5e56da0849268797a2dd31fb4
+  FirebaseCoreInternal: 950500ad8a08963657f6d8c67b579740c06d6aa1
   Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854
   flutter_branch_sdk: da3bece1a03160a8a021ef4ec3d426e89c6da169
   flutter_native_splash: 52501b97d1c0a5f898d687f1646226c1f93c56ef
@@ -174,7 +174,7 @@ SPEC CHECKSUMS:
   FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a
   google_sign_in_ios: 1256ff9d941db546373826966720b0c24804bcdd
   GoogleSignIn: 5651ce3a61e56ca864160e79b484cd9ed3f49b7a
-  GoogleUtilities: 13e2c67ede716b8741c7989e26893d151b2b2084
+  GoogleUtilities: c63691989bf362ba0505507da00eeb326192e83e
   GTMAppAuth: 0ff230db599948a9ad7470ca667337803b3fc4dd
   GTMSessionFetcher: 3a63d75eecd6aa32c2fc79f578064e1214dfdec2
   image_picker_ios: 4a8aadfbb6dc30ad5141a2ce3832af9214a705b5
@@ -194,4 +194,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: 8eb7cecb637c8d903f411e7008dc4a94863ea0c3
 
-COCOAPODS: 1.13.0
+COCOAPODS: 1.12.1
diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj
@@ -210,10 +210,10 @@
 				97C146EA1CF9000F007C117D /* Sources */,
 				97C146EB1CF9000F007C117D /* Frameworks */,
 				97C146EC1CF9000F007C117D /* Resources */,
-				6DCA4EFC2A15E5C200B62F90 /* Embed Foundation Extensions */,
 				9705A1C41CF9048500538489 /* Embed Frameworks */,
 				3B06AD1E1E4923F5004D2608 /* Thin Binary */,
 				03396E302AF4D338AAAA8637 /* [CP] Embed Pods Frameworks */,
+				6DCA4EFC2A15E5C200B62F90 /* Embed Foundation Extensions */,
 			);
 			buildRules = (
 			);

diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist
@@ -60,16 +60,6 @@
 				<string>com.googleusercontent.apps.152179311533-2lsvtrj7junkos93nd2oekpropcv8929</string>
 			</array>
 		</dict>
-		<dict>
-			<key>CFBundleTypeRole</key>
-			<string>Editor</string>
-			<key>CFBundleURLName</key>
-			<string>com.beside.moa</string>
-			<key>CFBundleURLSchemes</key>
-			<array>
-				<string>https</string>
-			</array>
-		</dict>
 	</array>
 	<key>CFBundleVersion</key>
 	<string>$(FLUTTER_BUILD_NUMBER)</string>
@@ -119,8 +109,6 @@
 	<string>Need location when in use</string>
 	<key>NSPhotoLibraryUsageDescription</key>
 	<string>To upload photos, please allow permission to access your photo library, Pictures are displayed for the purpose of displaying and identifying stored content.</string>
-	<key>NSUserTrackingUsageDescription</key>
-	<string>App would like to access IDFA for tracking purpose</string>
 	<key>UIApplicationSupportsIndirectInputEvents</key>
 	<true/>
 	<key>UILaunchStoryboardName</key>
@@ -144,18 +132,6 @@
 	</array>
 	<key>UIViewControllerBasedStatusBarAppearance</key>
 	<false/>
-	<key>branch_key</key>
-	<dict>
-		<key>live</key>
-		<string>key_live_cAdCkiozDTmbHUBKiCWYplbhrqfE9TOt</string>
-		<key>test</key>
-		<string>key_test_eunAdbdqxMhgMHBOaCXYobdouujyZVVL</string>
-	</dict>
-	<key>branch_universal_link_domains</key>
-	<array>
-		<string>moayo.app.link</string>
-		<string>moayo-alternate.app.link</string>
-	</array>
 	<key>naverConsumerKey</key>
 	<string>K10uUCEMBAnAY0ZtJMeo</string>
 	<key>naverConsumerSecret</key>

diff --git a/ios/Runner/Runner.entitlements b/ios/Runner/Runner.entitlements
@@ -10,8 +10,7 @@
 	</array>
 	<key>com.apple.developer.associated-domains</key>
 	<array>
-		<string>moa:moayo.app.link</string>
-		<string>moa:moayo-alternate.app.link</string>
+		<string>moa:example.com</string>
 	</array>
 	<key>com.apple.security.application-groups</key>
 	<array>

diff --git a/ios/Runner/RunnerDebug.entitlements b/ios/Runner/RunnerDebug.entitlements
@@ -10,8 +10,7 @@
 	</array>
 	<key>com.apple.developer.associated-domains</key>
 	<array>
-		<string>moa:moayo.app.link</string>
-		<string>moa:moayo-alternate.app.link</string>
+		<string>moa:example.com</string>
 	</array>
 	<key>com.apple.security.application-groups</key>
 	<array>

diff --git a/ios/fastlane/report.xml b/ios/fastlane/report.xml
@@ -5,17 +5,17 @@
 
 
 
-      <testcase classname="fastlane.lanes" name="0: default_platform" time="0.000161">
+      <testcase classname="fastlane.lanes" name="0: default_platform" time="0.000217">
 
       </testcase>
 
 
-      <testcase classname="fastlane.lanes" name="1: build_app" time="112.271341">
+      <testcase classname="fastlane.lanes" name="1: build_app" time="140.259886">
 
       </testcase>
 
 
-      <testcase classname="fastlane.lanes" name="2: upload_to_testflight" time="111.922112">
+      <testcase classname="fastlane.lanes" name="2: upload_to_testflight" time="105.992855">
 
       </testcase>
 

diff --git a/lib/providers/content_detail_provider.dart b/lib/providers/content_detail_provider.dart
@@ -37,8 +37,8 @@ class ContentDetail extends _$ContentDetail {
   }
 
   @override
-  Future<ContentModel?> build({required String id}) async {
-    return fetchItem(contentId: id);
+  Future<ContentModel?> build() async {
+    return null;
   }
 
   Future<void> editContent({
@@ -56,8 +56,8 @@ class ContentDetail extends _$ContentDetail {
         contentMemo: contentMemo,
         hashTagStringList: hashTagStringList,
       );
-
-      return fetchItem(contentId: contentId);
+      var data = await fetchItem(contentId: contentId);
+      return data;
     });
   }
 }
diff --git a/lib/providers/folder_detail_provider.dart b/lib/providers/folder_detail_provider.dart
@@ -11,40 +11,43 @@ part 'folder_detail_provider.g.dart';
 @riverpod
 class FolderDetail extends _$FolderDetail {
   Future<List<ContentModel>> fetchItem({
-    required String folderId,
+    required String folderName,
     int? page,
     int? size,
   }) async {
-    // todo 처음에 불러오는 page==1 일때 데이터만 캐싱하는 방법을 찾아보자
+    // get the [KeepAliveLink]
+    var link = ref.keepAlive();
+    // a timer to be used by the callbacks below
+    Timer? timer;
+    // An object from package:dio that allows cancelling http requests
+    // When the provider is destroyed, cancel the http request and the timer
+    ref.onDispose(() {
+      timer?.cancel();
+    });
+    // When the last listener is removed, start a timer to dispose the cached data
+    ref.onCancel(() {
+      // start a 30 second timer
+      timer = Timer(const Duration(seconds: 30), () {
+        // dispose on timeout
+        link.close();
+      });
+    });
+    // If the provider is listened again after it was paused, cancel the timer
+    ref.onResume(() {
+      timer?.cancel();
+    });
+
     var data = await FolderRepository.instance.getFolderDetailList(
-      folderId: folderId,
+      folderName: folderName,
       page: page,
       size: size,
     );
     return data;
   }
 
   @override
-  Future<List<ContentModel>?> build({required String folderId}) async {
-    return fetchItem(folderId: folderId);
-  }
-
-  Future<int> loadMore({
-    required String folderId,
-    required int page,
-  }) async {
-    List<ContentModel> res = [];
-
-    state = await AsyncValue.guard(() async {
-      res = await fetchItem(
-        folderId: folderId,
-        page: page,
-      );
-
-      return [...state.value!, ...res];
-    });
-
-    return res.length;
+  Future<List<ContentModel>?> build() async {
+    return null;
   }
 
   Future<void> refresh({required String folderName}) async {

diff --git a/lib/repositories/folder_repository.dart b/lib/repositories/folder_repository.dart
@@ -11,7 +11,7 @@ abstract class IFolderRepository {
   Future<void> editFolderName(
       {required String currentFolderName, required String editFolderName});
   Future<List<ContentModel>> getFolderDetailList({
-    required String folderId,
+    required String folderName,
     int? page,
     int? size,
   });
@@ -92,14 +92,14 @@ class FolderRepository implements IFolderRepository {
 
   @override
   Future<List<ContentModel>> getFolderDetailList({
-    required String folderId,
+    required String folderName,
     int? page = 0,
     int? size = 10,
   }) async {
     var token = await TokenRepository.instance.getToken();
 
     var res = await dio.get(
-      '/api/v1/folder/detail/view?folderId=$folderId&page=$page&size=$size',
+      '/api/v1/folder/detail/view?folderName=$folderName&page=$page&size=$size',
       options: Options(
         headers: {
           'Authorization': 'Bearer $token',