feat: 기본해시태그, 폴더,해시 상세 새로고침,페이지네이션 적용

android/app/src/main/res/values/strings.xml

@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">moa_app</string>
+    <string name="app_name">모아</string>
     <string name="client_id">K10uUCEMBAnAY0ZtJMeo</string>
     <string name="client_secret">qtCW1qORKI</string>
     <string name="client_name">Moa-app</string>
-    <string name="default_web_client_id">152179311533-i1kbu0metfct55ga0a3elf21ddihjcfd.apps.googleusercontent.com</string>
 </resources>

ios/Runner/Info.plist

@@ -7,7 +7,7 @@
 	<key>CFBundleDevelopmentRegion</key>
 	<string>$(DEVELOPMENT_LANGUAGE)</string>
 	<key>CFBundleDisplayName</key>
-	<string>Moa</string>
+	<string>모아</string>
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>

lib/navigations/main_bottom_tab.dart

@@ -64,7 +64,8 @@ class MainBottomTab extends HookConsumerWidget {
 
     useEffect(() {
       /// 외부에서 url 공유로 들어왔을경우 폴더선택화면으로 이동
-      if (receiveUrl.value.isNotEmpty &&
+      if (context.mounted &&
+          receiveUrl.value.isNotEmpty &&
           lifeCycle == AppLifecycleState.resumed) {
         context.go(
           GoRoutes.folderSelect.fullPath,

lib/providers/folder_detail_provider.dart

@@ -10,7 +10,11 @@ part 'folder_detail_provider.g.dart';
 // @Riverpod(keepAlive: true)
 @riverpod
 class FolderDetail extends _$FolderDetail {
-  Future<List<ContentModel>> fetchItem({required String folderName}) async {
+  Future<List<ContentModel>> fetchItem({
+    required String folderName,
+    int? page,
+    int? size,
+  }) async {
     // get the [KeepAliveLink]
     var link = ref.keepAlive();
     // a timer to be used by the callbacks below
@@ -33,11 +37,16 @@ class FolderDetail extends _$FolderDetail {
       timer?.cancel();
     });
 
-    var data =
-        FolderRepository.instance.getFolderDetailList(folderName: folderName);
+    var data = FolderRepository.instance.getFolderDetailList(
+      folderName: folderName,
+      page: page,
+      size: size,
+    );
     return data;
   }
 
   @override
-  Future<void> build() async {}
+  Future<List<ContentModel>?> build() async {
+    return null;
+  }
 }

lib/providers/hashtag_provider.dart

@@ -10,13 +10,13 @@ part 'hashtag_provider.g.dart';
 // @Riverpod(keepAlive: true)
 @riverpod
 class Hashtag extends _$Hashtag {
-  Future<List<HashtagModel>> fetchItem() async {
+  Future<(List<HashtagModel>, List<HashtagModel>)> fetchItem() async {
     var data = HashtagRepository.instance.getHashtagList();
     return data;
   }
 
   @override
-  Future<List<HashtagModel>> build() async {
+  Future<(List<HashtagModel>, List<HashtagModel>)> build() async {
     return fetchItem();
   }
 
@@ -50,7 +50,7 @@ class Hashtag extends _$Hashtag {
     });
   }
 
-  Future<List<HashtagModel>?> addHashtag({
+  Future<void> addHashtag({
     required String hashtag,
   }) async {
     state = const AsyncValue.loading();
@@ -60,7 +60,8 @@ class Hashtag extends _$Hashtag {
       var data = await fetchItem();
       return data;
     });
+    return;
 
-    return state.value;
+    // return state.value;
   }
 }

lib/providers/hashtag_view_provider.dart

@@ -12,7 +12,11 @@ part 'hashtag_view_provider.g.dart';
 // @Riverpod(keepAlive: true)
 @riverpod
 class HashtagView extends _$HashtagView {
-  Future<(List<ContentModel>, int)> fetchItem({String? hashtag}) async {
+  Future<(List<ContentModel>, int)> fetchItem({
+    int? page,
+    int? size,
+    String? hashtag,
+  }) async {
     var token = ref.watch(tokenStateProvider).value;
 
     // get the [KeepAliveLink]
@@ -38,7 +42,7 @@ class HashtagView extends _$HashtagView {
     });
 
     var data = await HashtagRepository.instance
-        .getHashtagView(tag: hashtag, token: token);
+        .getHashtagView(tag: hashtag, token: token, page: page, size: size);
     return data;
   }
 

lib/repositories/content_repository.dart

@@ -9,7 +9,7 @@ abstract class IContentRepository {
   Future<void> addContent({
     required AddContentType contentType,
     required ContentModel content,
-    required String hashTagStringList,
+    String? hashTagStringList,
   });
 
   Future<ContentModel> getContentDetail({
@@ -41,7 +41,7 @@ class ContentRepository implements IContentRepository {
   Future<void> addContent({
     required AddContentType contentType,
     required ContentModel content,
-    required String hashTagStringList,
+    String? hashTagStringList,
   }) async {
     var token = await TokenRepository.instance.getToken();
     if (contentType == AddContentType.image) {
@@ -55,9 +55,7 @@ class ContentRepository implements IContentRepository {
           'hashTag': hashTagStringList,
           'contentType': 'IMAGE',
           'originalFileName': '${content.contentName}.png',
-          'image': content.thumbnailImageUrl == ''
-              ? ''
-              : 'image/png:base64:${content.thumbnailImageUrl}',
+          'image': 'image/png:base64:${content.thumbnailImageUrl}',
         },
         options: Options(
           headers: {
@@ -79,7 +77,9 @@ class ContentRepository implements IContentRepository {
           'contentType': 'URL',
           'url': content.contentUrl,
           'originalFileName': '${content.contentName}.png',
-          'image': 'image/png:base64:${content.thumbnailImageUrl}',
+          'image': content.thumbnailImageUrl == ''
+              ? ''
+              : 'image/png:base64:${content.thumbnailImageUrl}',
         },
         options: Options(
           headers: {

lib/repositories/folder_repository.dart

@@ -87,12 +87,15 @@ class FolderRepository implements IFolderRepository {
   }
 
   @override
-  Future<List<ContentModel>> getFolderDetailList(
-      {required String folderName}) async {
+  Future<List<ContentModel>> getFolderDetailList({
+    required String folderName,
+    int? page = 1,
+    int? size = 10,
+  }) async {
     var token = await TokenRepository.instance.getToken();
 
     var res = await dio.get(
-      '/api/v1/folder/detail/view?folderName=$folderName',
+      '/api/v1/folder/detail/view?page=$page&size=$size&folderName=$folderName',
       options: Options(
         headers: {
           'Authorization': 'Bearer $token',

lib/repositories/hashtag_repository.dart

@@ -11,7 +11,7 @@ abstract class IHashtagRepository {
     int? size,
     String? tag,
   });
-  Future<List<HashtagModel>> getHashtagList();
+  Future<(List<HashtagModel>, List<HashtagModel>)> getHashtagList();
   Future<void> editHashtag({
     required String tagId,
     required String hashtags,
@@ -59,7 +59,7 @@ class HashtagRepository implements IHashtagRepository {
   }
 
   @override
-  Future<List<HashtagModel>> getHashtagList() async {
+  Future<(List<HashtagModel>, List<HashtagModel>)> getHashtagList() async {
     var token = await TokenRepository.instance.getToken();
 
     var res = await dio.get(
@@ -71,9 +71,14 @@ class HashtagRepository implements IHashtagRepository {
       ),
     );
 
-    return res.data['data']['users']
-        .map<HashtagModel>((e) => HashtagModel.fromJson(e))
-        .toList();
+    return (
+      res.data['data']['users']
+          .map<HashtagModel>((e) => HashtagModel.fromJson(e))
+          .toList() as List<HashtagModel>,
+      res.data['data']['default']
+          .map<HashtagModel>((e) => HashtagModel.fromJson(e))
+          .toList() as List<HashtagModel>
+    );
   }
 
   @override

lib/screens/add_content/add_image_content.dart

@@ -63,9 +63,7 @@ class AddImageContent extends HookConsumerWidget {
     }
 
     void completeAddContent() async {
-      if (imageFile.value == null ||
-          title.value.isEmpty ||
-          selectedTagList.value.where((e) => e.isSelected).isEmpty) {
+      if (imageFile.value == null || title.value.isEmpty) {
         if (imageFile.value == null) {
           imageError.value = '이미지를 선택해주세요.';
         }
@@ -74,10 +72,6 @@ class AddImageContent extends HookConsumerWidget {
           titleError.value = '제목을 입력해주세요.';
         }
 
-        if (selectedTagList.value.where((e) => e.isSelected).isEmpty) {
-          tagError.value = '태그를 선택해주세요.';
-        }
-
         return;
       }
 
@@ -92,7 +86,7 @@ class AddImageContent extends HookConsumerWidget {
         }
       }).toList();
 
-      var hashTagStringList = selectTag.join(',');
+      var hashTagStringList = selectTag.isEmpty ? selectTag.join(',') : null;
 
       try {
         await ContentRepository.instance.addContent(
@@ -161,10 +155,16 @@ class AddImageContent extends HookConsumerWidget {
 
     useEffect(() {
       if (hashtagAsync.hasValue) {
-        selectedTagList.value = hashtagAsync.value!
-            .map((e) => SelectedTagModel(
-                tagId: e.tagId, name: e.hashTag, isSelected: false))
-            .toList();
+        selectedTagList.value = [
+          ...hashtagAsync.value!.$2
+              .map((e) => SelectedTagModel(
+                  tagId: e.tagId, name: e.hashTag, isSelected: false))
+              .toList(),
+          ...hashtagAsync.value!.$1
+              .map((e) => SelectedTagModel(
+                  tagId: e.tagId, name: e.hashTag, isSelected: false))
+              .toList()
+        ];
       }
       return null;
     }, [hashtagAsync.isLoading]);

lib/screens/add_content/add_link_content.dart

@@ -86,9 +86,7 @@ class AddLinkContent extends HookConsumerWidget {
     }
 
     void completeAddContent() async {
-      if (link.value.isEmpty ||
-          title.value.isEmpty ||
-          selectedTagList.value.where((e) => e.isSelected).isEmpty) {
+      if (link.value.isEmpty || title.value.isEmpty) {
         if (link.value.isEmpty) {
           linkError.value = '링크를 입력해주세요.';
         }
@@ -97,10 +95,6 @@ class AddLinkContent extends HookConsumerWidget {
           titleError.value = '제목을 입력해주세요.';
         }
 
-        if (selectedTagList.value.where((e) => e.isSelected).isEmpty) {
-          tagError.value = '태그를 선택해주세요.';
-        }
-
         return;
       }
       loading.value = true;
@@ -120,7 +114,7 @@ class AddLinkContent extends HookConsumerWidget {
         }
       }).toList();
 
-      var hashTagStringList = selectTag.join(',');
+      var hashTagStringList = selectTag.isEmpty ? selectTag.join(',') : null;
 
       try {
         await ContentRepository.instance.addContent(
@@ -196,9 +190,16 @@ class AddLinkContent extends HookConsumerWidget {
 
     useEffect(() {
       if (hashtagAsync.hasValue) {
-        selectedTagList.value = hashtagAsync.value!
-            .map((e) => SelectedTagModel(name: e.hashTag, isSelected: false))
-            .toList();
+        selectedTagList.value = [
+          ...hashtagAsync.value!.$2
+              .map((e) => SelectedTagModel(
+                  tagId: e.tagId, name: e.hashTag, isSelected: false))
+              .toList(),
+          ...hashtagAsync.value!.$1
+              .map((e) => SelectedTagModel(
+                  tagId: e.tagId, name: e.hashTag, isSelected: false))
+              .toList()
+        ];
       }
       return null;
     }, [hashtagAsync.isLoading]);

lib/screens/home/content_view.dart

@@ -49,7 +49,9 @@ class ContentView extends HookConsumerWidget {
       }
     }
 
-    void pressConfirm() {}
+    void pressConfirm() {
+      context.pop();
+    }
 
     void editContent() {
       isEditMode.value = true;

lib/screens/home/edit_content_view.dart

@@ -276,7 +276,7 @@ class ChangeHashtagList extends HookConsumerWidget {
             hashtagAsync.when(
               data: (data) {
                 if (selectedTagList.value.isEmpty) {
-                  selectedTagList.value = data.map((e) {
+                  selectedTagList.value = data.$1.map((e) {
                     if (hashtagList.value.contains(e.hashTag)) {
                       return SelectedTagModel(
                           name: e.hashTag, isSelected: true);