From cf4c123b834ad112dd153f4dd9365a3777c0265a Mon Sep 17 00:00:00 2001 From: leeeha Date: Fri, 1 Sep 2023 17:34:23 +0900 Subject: [PATCH 1/6] =?UTF-8?q?[mod]=20=ED=8C=A8=ED=82=A4=EC=A7=80=20?= =?UTF-8?q?=EC=9D=B4=EB=A6=84=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/release/output-metadata.json | 4 +- .../go/sopt/winey/ExampleInstrumentedTest.kt | 4 +- .../go/sopt/winey/WineyApplication.kt | 4 +- .../winey/data/interceptor/AuthInterceptor.kt | 18 +++---- .../remote/request/RequestCreateGoalDto.kt | 2 +- .../model/remote/request/RequestLoginDto.kt | 2 +- .../remote/request/RequestPatchNicknameDto.kt | 2 +- .../remote/request/RequestPostCommentDto.kt | 2 +- .../remote/request/RequestPostLikeDto.kt | 2 +- .../remote/response/ResponseCreateGoalDto.kt | 4 +- .../response/ResponseDeleteCommentDto.kt | 2 +- .../response/ResponseGetFeedDetailDto.kt | 6 +-- .../ResponseGetNicknameDuplicateCheckDto.kt | 2 +- .../response/ResponseGetNotificationDto.kt | 4 +- .../response/ResponseGetRecommendListDto.kt | 4 +- .../remote/response/ResponseGetUserDto.kt | 4 +- .../response/ResponseGetWineyFeedListDto.kt | 4 +- .../response/ResponseHasNewNotificationDto.kt | 2 +- .../model/remote/response/ResponseLoginDto.kt | 2 +- .../remote/response/ResponseLogoutDto.kt | 2 +- .../remote/response/ResponsePostCommentDto.kt | 4 +- .../remote/response/ResponsePostLikeDto.kt | 4 +- .../response/ResponsePostWineyFeedDto.kt | 2 +- .../response/ResponseReIssueTokenDto.kt | 2 +- .../remote/response/base/BaseResponse.kt | 2 +- .../data/repository/AuthRepositoryImpl.kt | 26 ++++----- .../repository/DataStoreRepositoryImpl.kt | 6 +-- .../data/repository/FeedRepositoryImpl.kt | 28 +++++----- .../repository/KakaoLoginRepositoryImpl.kt | 6 +-- .../repository/NotificationRepositoryImpl.kt | 10 ++-- .../repository/RecommendRepositoryImpl.kt | 8 +-- .../go/sopt/winey/data/service/AuthService.kt | 24 ++++----- .../go/sopt/winey/data/service/FeedService.kt | 20 +++---- .../winey/data/service/KakaoLoginService.kt | 2 +- .../winey/data/service/NotificationService.kt | 8 +-- .../winey/data/service/RecommendService.kt | 6 +-- .../sopt/winey/data/source/AuthDataSource.kt | 26 ++++----- .../sopt/winey/data/source/FeedDataSource.kt | 20 +++---- .../winey/data/source/KakaoLoginDataSource.kt | 4 +- .../data/source/NotificationDataSource.kt | 10 ++-- .../winey/data/source/RecommendDataSource.kt | 8 +-- .../data/source/paging/BasePagingSource.kt | 6 +-- .../data/source/paging/MyFeedPagingSource.kt | 6 +-- .../source/paging/WineyFeedPagingSource.kt | 6 +-- .../go/sopt/winey/di/AmplitudeModule.kt | 4 +- .../go/sopt/winey/di/DataStoreModule.kt | 2 +- .../go/sopt/winey/di/KakaoModule.kt | 2 +- .../go/sopt/winey/di/RepositoryModule.kt | 26 ++++----- .../go/sopt/winey/di/RetrofitModule.kt | 10 ++-- .../go/sopt/winey/di/ServiceModule.kt | 12 ++--- .../di/qualifier/InterceptorQualifier.kt | 2 +- .../go/sopt/winey/domain/entity/DetailFeed.kt | 2 +- .../go/sopt/winey/domain/entity/Goal.kt | 2 +- .../go/sopt/winey/domain/entity/Like.kt | 2 +- .../go/sopt/winey/domain/entity/Login.kt | 2 +- .../sopt/winey/domain/entity/Notification.kt | 2 +- .../sopt/winey/domain/entity/ReIssueToken.kt | 2 +- .../go/sopt/winey/domain/entity/Recommend.kt | 2 +- .../go/sopt/winey/domain/entity/User.kt | 2 +- .../go/sopt/winey/domain/entity/WineyFeed.kt | 2 +- .../winey/domain/repository/AuthRepository.kt | 22 ++++---- .../domain/repository/DataStoreRepository.kt | 4 +- .../winey/domain/repository/FeedRepository.kt | 18 +++---- .../domain/repository/KakaoLoginRepository.kt | 2 +- .../repository/NotificationRepository.kt | 6 +-- .../domain/repository/RecommendRepository.kt | 4 +- .../winey/presentation/main/MainActivity.kt | 24 ++++----- .../winey/presentation/main/MainViewModel.kt | 14 ++--- .../main/feed/WineyFeedAdapter.kt | 10 ++-- .../main/feed/WineyFeedFragment.kt | 50 ++++++++--------- .../main/feed/WineyFeedHeaderAdapter.kt | 12 ++--- .../main/feed/WineyFeedLoadAdapter.kt | 4 +- .../main/feed/WineyFeedViewModel.kt | 12 ++--- .../main/feed/detail/CommentAdapter.kt | 8 +-- .../main/feed/detail/CommentEmptyAdapter.kt | 5 +- .../main/feed/detail/DetailActivity.kt | 37 +++++++------ .../main/feed/detail/DetailFeedAdapter.kt | 8 +-- .../main/feed/detail/DetailViewModel.kt | 18 +++---- .../main/feed/upload/AmountFragment.kt | 42 ++++++++------- .../main/feed/upload/ContentFragment.kt | 12 ++--- .../main/feed/upload/PhotoFragment.kt | 14 ++--- .../main/feed/upload/UploadActivity.kt | 8 +-- .../main/feed/upload/UploadViewModel.kt | 20 +++---- .../feed/upload/loading/LoadingActivity.kt | 10 ++-- .../main/mypage/MyPageFragment.kt | 38 ++++++------- .../mypage/MyPageNotOverDialogFragment.kt | 8 +-- .../main/mypage/MyPageViewModel.kt | 8 +-- .../main/mypage/MypageHelpActivity.kt | 10 ++-- .../mypage/TargetAmountBottomSheetFragment.kt | 22 ++++---- .../main/mypage/TargetAmountViewModel.kt | 10 ++-- .../main/mypage/myfeed/MyFeedAdapter.kt | 10 ++-- .../main/mypage/myfeed/MyFeedFragment.kt | 34 ++++++------ .../main/mypage/myfeed/MyFeedViewModel.kt | 12 ++--- .../main/notification/NotificationActivity.kt | 18 +++---- .../main/notification/NotificationAdapter.kt | 8 +-- .../notification/NotificationViewModel.kt | 8 +-- .../main/recommend/RecommendAdapter.kt | 10 ++-- .../main/recommend/RecommendFragment.kt | 18 +++---- .../main/recommend/RecommendHeaderAdapter.kt | 4 +- .../main/recommend/RecommendViewModel.kt | 8 +-- .../presentation/nickname/NicknameActivity.kt | 26 ++++----- .../nickname/NicknameViewModel.kt | 20 ++++--- .../onboarding/guide/GuideActivity.kt | 14 ++--- .../guide/GuideFragmentStateAdapter.kt | 2 +- .../onboarding/guide/LevelGuideFragment.kt | 8 +-- .../guide/RecommendGuideFragment.kt | 8 +-- .../guide/WineyFeedGuideFragment.kt | 8 +-- .../onboarding/login/KakaoLoginCallback.kt | 2 +- .../onboarding/login/LoginActivity.kt | 34 ++++++------ .../onboarding/login/LoginViewModel.kt | 14 ++--- .../onboarding/story/FirstStoryFragment.kt | 8 +-- .../onboarding/story/SecondStoryFragment.kt | 8 +-- .../onboarding/story/StoryActivity.kt | 16 +++--- .../onboarding/story/StoryViewModel.kt | 2 +- .../onboarding/story/ThirdStoryFragment.kt | 8 +-- .../presentation/splash/SplashActivity.kt | 16 +++--- .../sopt/winey/util/activity/ActivityExt.kt | 4 +- .../winey/util/amplitude/AmplitudeUtils.kt | 2 +- .../winey/util/amplitude/type/EventType.kt | 2 +- .../winey/util/binding/BindingActivity.kt | 2 +- .../sopt/winey/util/binding/BindingAdapter.kt | 23 ++++---- .../BindingBottomSheetDialogFragment.kt | 2 +- .../util/binding/BindingDialogFragment.kt | 2 +- .../winey/util/binding/BindingFragment.kt | 2 +- .../go/sopt/winey/util/code/ErrorCode.kt | 2 +- .../go/sopt/winey/util/context/ContextExt.kt | 4 +- .../sopt/winey/util/fragment/FragmentExt.kt | 4 +- .../util/fragment/WineyDialogFragment.kt | 8 +-- .../go/sopt/winey/util/intent/ArgsExt.kt | 2 +- .../go/sopt/winey/util/intent/ExtraExt.kt | 2 +- .../winey/util/multipart/BitmapRequestBody.kt | 2 +- .../winey/util/multipart/ImageCompressor.kt | 53 ++++++++----------- .../winey/util/multipart/UriToRequestBody.kt | 2 +- .../go/sopt/winey/util/view/InputUiState.kt | 4 +- .../go/sopt/winey/util/view/UiState.kt | 2 +- .../go/sopt/winey/util/view/ViewExt.kt | 2 +- .../go/sopt/winey/util/view/WineyPopupMenu.kt | 10 ++-- .../go/sopt/winey/util/view/WineySnackbar.kt | 10 ++-- app/src/main/res/layout/activity_detail.xml | 2 +- app/src/main/res/layout/activity_nickname.xml | 4 +- app/src/main/res/layout/activity_story.xml | 2 +- app/src/main/res/layout/fragment_amount.xml | 2 +- app/src/main/res/layout/fragment_content.xml | 2 +- app/src/main/res/layout/fragment_my_page.xml | 6 +-- app/src/main/res/layout/fragment_photo.xml | 2 +- .../main/res/layout/fragment_recommend.xml | 2 +- .../fragment_target_amount_bottom_sheet.xml | 2 +- .../main/res/layout/fragment_winey_feed.xml | 2 +- .../main/res/layout/item_detail_comment.xml | 2 +- app/src/main/res/layout/item_detail_feed.xml | 2 +- app/src/main/res/layout/item_myfeed_post.xml | 2 +- .../res/layout/item_notification_post.xml | 2 +- .../main/res/layout/item_recommend_post.xml | 2 +- .../main/res/layout/item_wineyfeed_post.xml | 2 +- .../go/sopt/winey/ExampleUnitTest.kt | 2 +- buildSrc/src/main/java/DefaultConfig.kt | 4 +- 156 files changed, 679 insertions(+), 691 deletions(-) rename app/src/androidTest/java/{com => org}/go/sopt/winey/ExampleInstrumentedTest.kt (83%) rename app/src/main/java/{com => org}/go/sopt/winey/WineyApplication.kt (82%) rename app/src/main/java/{com => org}/go/sopt/winey/data/interceptor/AuthInterceptor.kt (81%) rename app/src/main/java/{com => org}/go/sopt/winey/data/model/remote/request/RequestCreateGoalDto.kt (82%) rename app/src/main/java/{com => org}/go/sopt/winey/data/model/remote/request/RequestLoginDto.kt (78%) rename app/src/main/java/{com => org}/go/sopt/winey/data/model/remote/request/RequestPatchNicknameDto.kt (78%) rename app/src/main/java/{com => org}/go/sopt/winey/data/model/remote/request/RequestPostCommentDto.kt (78%) rename app/src/main/java/{com => org}/go/sopt/winey/data/model/remote/request/RequestPostLikeDto.kt (78%) rename app/src/main/java/{com => org}/go/sopt/winey/data/model/remote/response/ResponseCreateGoalDto.kt (84%) rename app/src/main/java/{com => org}/go/sopt/winey/data/model/remote/response/ResponseDeleteCommentDto.kt (78%) rename app/src/main/java/{com => org}/go/sopt/winey/data/model/remote/response/ResponseGetFeedDetailDto.kt (94%) rename app/src/main/java/{com => org}/go/sopt/winey/data/model/remote/response/ResponseGetNicknameDuplicateCheckDto.kt (79%) rename app/src/main/java/{com => org}/go/sopt/winey/data/model/remote/response/ResponseGetNotificationDto.kt (91%) rename app/src/main/java/{com => org}/go/sopt/winey/data/model/remote/response/ResponseGetRecommendListDto.kt (93%) rename app/src/main/java/{com => org}/go/sopt/winey/data/model/remote/response/ResponseGetUserDto.kt (94%) rename app/src/main/java/{com => org}/go/sopt/winey/data/model/remote/response/ResponseGetWineyFeedListDto.kt (95%) rename app/src/main/java/{com => org}/go/sopt/winey/data/model/remote/response/ResponseHasNewNotificationDto.kt (80%) rename app/src/main/java/{com => org}/go/sopt/winey/data/model/remote/response/ResponseLoginDto.kt (87%) rename app/src/main/java/{com => org}/go/sopt/winey/data/model/remote/response/ResponseLogoutDto.kt (80%) rename app/src/main/java/{com => org}/go/sopt/winey/data/model/remote/response/ResponsePostCommentDto.kt (87%) rename app/src/main/java/{com => org}/go/sopt/winey/data/model/remote/response/ResponsePostLikeDto.kt (86%) rename app/src/main/java/{com => org}/go/sopt/winey/data/model/remote/response/ResponsePostWineyFeedDto.kt (84%) rename app/src/main/java/{com => org}/go/sopt/winey/data/model/remote/response/ResponseReIssueTokenDto.kt (82%) rename app/src/main/java/{com => org}/go/sopt/winey/data/model/remote/response/base/BaseResponse.kt (82%) rename app/src/main/java/{com => org}/go/sopt/winey/data/repository/AuthRepositoryImpl.kt (71%) rename app/src/main/java/{com => org}/go/sopt/winey/data/repository/DataStoreRepositoryImpl.kt (96%) rename app/src/main/java/{com => org}/go/sopt/winey/data/repository/FeedRepositoryImpl.kt (74%) rename app/src/main/java/{com => org}/go/sopt/winey/data/repository/KakaoLoginRepositoryImpl.kt (81%) rename app/src/main/java/{com => org}/go/sopt/winey/data/repository/NotificationRepositoryImpl.kt (72%) rename app/src/main/java/{com => org}/go/sopt/winey/data/repository/RecommendRepositoryImpl.kt (63%) rename app/src/main/java/{com => org}/go/sopt/winey/data/service/AuthService.kt (66%) rename app/src/main/java/{com => org}/go/sopt/winey/data/service/FeedService.kt (73%) rename app/src/main/java/{com => org}/go/sopt/winey/data/service/KakaoLoginService.kt (89%) rename app/src/main/java/{com => org}/go/sopt/winey/data/service/NotificationService.kt (64%) rename app/src/main/java/{com => org}/go/sopt/winey/data/service/RecommendService.kt (59%) rename app/src/main/java/{com => org}/go/sopt/winey/data/source/AuthDataSource.kt (64%) rename app/src/main/java/{com => org}/go/sopt/winey/data/source/FeedDataSource.kt (67%) rename app/src/main/java/{com => org}/go/sopt/winey/data/source/KakaoLoginDataSource.kt (87%) rename app/src/main/java/{com => org}/go/sopt/winey/data/source/NotificationDataSource.kt (65%) rename app/src/main/java/{com => org}/go/sopt/winey/data/source/RecommendDataSource.kt (56%) rename app/src/main/java/{com => org}/go/sopt/winey/data/source/paging/BasePagingSource.kt (90%) rename app/src/main/java/{com => org}/go/sopt/winey/data/source/paging/MyFeedPagingSource.kt (66%) rename app/src/main/java/{com => org}/go/sopt/winey/data/source/paging/WineyFeedPagingSource.kt (66%) rename app/src/main/java/{com => org}/go/sopt/winey/di/AmplitudeModule.kt (91%) rename app/src/main/java/{com => org}/go/sopt/winey/di/DataStoreModule.kt (95%) rename app/src/main/java/{com => org}/go/sopt/winey/di/KakaoModule.kt (92%) rename app/src/main/java/{com => org}/go/sopt/winey/di/RepositoryModule.kt (59%) rename app/src/main/java/{com => org}/go/sopt/winey/di/RetrofitModule.kt (88%) rename app/src/main/java/{com => org}/go/sopt/winey/di/ServiceModule.kt (89%) rename app/src/main/java/{com => org}/go/sopt/winey/di/qualifier/InterceptorQualifier.kt (82%) rename app/src/main/java/{com => org}/go/sopt/winey/domain/entity/DetailFeed.kt (92%) rename app/src/main/java/{com => org}/go/sopt/winey/domain/entity/Goal.kt (62%) rename app/src/main/java/{com => org}/go/sopt/winey/domain/entity/Like.kt (82%) rename app/src/main/java/{com => org}/go/sopt/winey/domain/entity/Login.kt (76%) rename app/src/main/java/{com => org}/go/sopt/winey/domain/entity/Notification.kt (83%) rename app/src/main/java/{com => org}/go/sopt/winey/domain/entity/ReIssueToken.kt (68%) rename app/src/main/java/{com => org}/go/sopt/winey/domain/entity/Recommend.kt (80%) rename app/src/main/java/{com => org}/go/sopt/winey/domain/entity/User.kt (88%) rename app/src/main/java/{com => org}/go/sopt/winey/domain/entity/WineyFeed.kt (89%) rename app/src/main/java/{com => org}/go/sopt/winey/domain/repository/AuthRepository.kt (56%) rename app/src/main/java/{com => org}/go/sopt/winey/domain/repository/DataStoreRepository.kt (89%) rename app/src/main/java/{com => org}/go/sopt/winey/domain/repository/FeedRepository.kt (64%) rename app/src/main/java/{com => org}/go/sopt/winey/domain/repository/KakaoLoginRepository.kt (88%) rename app/src/main/java/{com => org}/go/sopt/winey/domain/repository/NotificationRepository.kt (61%) rename app/src/main/java/{com => org}/go/sopt/winey/domain/repository/RecommendRepository.kt (53%) rename app/src/main/java/{com => org}/go/sopt/winey/presentation/main/MainActivity.kt (87%) rename app/src/main/java/{com => org}/go/sopt/winey/presentation/main/MainViewModel.kt (91%) rename app/src/main/java/{com => org}/go/sopt/winey/presentation/main/feed/WineyFeedAdapter.kt (90%) rename app/src/main/java/{com => org}/go/sopt/winey/presentation/main/feed/WineyFeedFragment.kt (91%) rename app/src/main/java/{com => org}/go/sopt/winey/presentation/main/feed/WineyFeedHeaderAdapter.kt (90%) rename app/src/main/java/{com => org}/go/sopt/winey/presentation/main/feed/WineyFeedLoadAdapter.kt (90%) rename app/src/main/java/{com => org}/go/sopt/winey/presentation/main/feed/WineyFeedViewModel.kt (91%) rename app/src/main/java/{com => org}/go/sopt/winey/presentation/main/feed/detail/CommentAdapter.kt (89%) rename app/src/main/java/{com => org}/go/sopt/winey/presentation/main/feed/detail/CommentEmptyAdapter.kt (87%) rename app/src/main/java/{com => org}/go/sopt/winey/presentation/main/feed/detail/DetailActivity.kt (94%) rename app/src/main/java/{com => org}/go/sopt/winey/presentation/main/feed/detail/DetailFeedAdapter.kt (90%) rename app/src/main/java/{com => org}/go/sopt/winey/presentation/main/feed/detail/DetailViewModel.kt (92%) rename app/src/main/java/{com => org}/go/sopt/winey/presentation/main/feed/upload/AmountFragment.kt (78%) rename app/src/main/java/{com => org}/go/sopt/winey/presentation/main/feed/upload/ContentFragment.kt (86%) rename app/src/main/java/{com => org}/go/sopt/winey/presentation/main/feed/upload/PhotoFragment.kt (91%) rename app/src/main/java/{com => org}/go/sopt/winey/presentation/main/feed/upload/UploadActivity.kt (75%) rename app/src/main/java/{com => org}/go/sopt/winey/presentation/main/feed/upload/UploadViewModel.kt (91%) rename app/src/main/java/{com => org}/go/sopt/winey/presentation/main/feed/upload/loading/LoadingActivity.kt (91%) rename app/src/main/java/{com => org}/go/sopt/winey/presentation/main/mypage/MyPageFragment.kt (90%) rename app/src/main/java/{com => org}/go/sopt/winey/presentation/main/mypage/MyPageNotOverDialogFragment.kt (76%) rename app/src/main/java/{com => org}/go/sopt/winey/presentation/main/mypage/MyPageViewModel.kt (87%) rename app/src/main/java/{com => org}/go/sopt/winey/presentation/main/mypage/MypageHelpActivity.kt (65%) rename app/src/main/java/{com => org}/go/sopt/winey/presentation/main/mypage/TargetAmountBottomSheetFragment.kt (94%) rename app/src/main/java/{com => org}/go/sopt/winey/presentation/main/mypage/TargetAmountViewModel.kt (93%) rename app/src/main/java/{com => org}/go/sopt/winey/presentation/main/mypage/myfeed/MyFeedAdapter.kt (89%) rename app/src/main/java/{com => org}/go/sopt/winey/presentation/main/mypage/myfeed/MyFeedFragment.kt (90%) rename app/src/main/java/{com => org}/go/sopt/winey/presentation/main/mypage/myfeed/MyFeedViewModel.kt (91%) rename app/src/main/java/{com => org}/go/sopt/winey/presentation/main/notification/NotificationActivity.kt (85%) rename app/src/main/java/{com => org}/go/sopt/winey/presentation/main/notification/NotificationAdapter.kt (91%) rename app/src/main/java/{com => org}/go/sopt/winey/presentation/main/notification/NotificationViewModel.kt (86%) rename app/src/main/java/{com => org}/go/sopt/winey/presentation/main/recommend/RecommendAdapter.kt (84%) rename app/src/main/java/{com => org}/go/sopt/winey/presentation/main/recommend/RecommendFragment.kt (87%) rename app/src/main/java/{com => org}/go/sopt/winey/presentation/main/recommend/RecommendHeaderAdapter.kt (87%) rename app/src/main/java/{com => org}/go/sopt/winey/presentation/main/recommend/RecommendViewModel.kt (86%) rename app/src/main/java/{com => org}/go/sopt/winey/presentation/nickname/NicknameActivity.kt (89%) rename app/src/main/java/{com => org}/go/sopt/winey/presentation/nickname/NicknameViewModel.kt (89%) rename app/src/main/java/{com => org}/go/sopt/winey/presentation/onboarding/guide/GuideActivity.kt (87%) rename app/src/main/java/{com => org}/go/sopt/winey/presentation/onboarding/guide/GuideFragmentStateAdapter.kt (89%) rename app/src/main/java/{com => org}/go/sopt/winey/presentation/onboarding/guide/LevelGuideFragment.kt (59%) rename app/src/main/java/{com => org}/go/sopt/winey/presentation/onboarding/guide/RecommendGuideFragment.kt (60%) rename app/src/main/java/{com => org}/go/sopt/winey/presentation/onboarding/guide/WineyFeedGuideFragment.kt (60%) rename app/src/main/java/{com => org}/go/sopt/winey/presentation/onboarding/login/KakaoLoginCallback.kt (98%) rename app/src/main/java/{com => org}/go/sopt/winey/presentation/onboarding/login/LoginActivity.kt (72%) rename app/src/main/java/{com => org}/go/sopt/winey/presentation/onboarding/login/LoginViewModel.kt (90%) rename app/src/main/java/{com => org}/go/sopt/winey/presentation/onboarding/story/FirstStoryFragment.kt (73%) rename app/src/main/java/{com => org}/go/sopt/winey/presentation/onboarding/story/SecondStoryFragment.kt (73%) rename app/src/main/java/{com => org}/go/sopt/winey/presentation/onboarding/story/StoryActivity.kt (90%) rename app/src/main/java/{com => org}/go/sopt/winey/presentation/onboarding/story/StoryViewModel.kt (92%) rename app/src/main/java/{com => org}/go/sopt/winey/presentation/onboarding/story/ThirdStoryFragment.kt (73%) rename app/src/main/java/{com => org}/go/sopt/winey/presentation/splash/SplashActivity.kt (86%) rename app/src/main/java/{com => org}/go/sopt/winey/util/activity/ActivityExt.kt (65%) rename app/src/main/java/{com => org}/go/sopt/winey/util/amplitude/AmplitudeUtils.kt (95%) rename app/src/main/java/{com => org}/go/sopt/winey/util/amplitude/type/EventType.kt (71%) rename app/src/main/java/{com => org}/go/sopt/winey/util/binding/BindingActivity.kt (93%) rename app/src/main/java/{com => org}/go/sopt/winey/util/binding/BindingAdapter.kt (93%) rename app/src/main/java/{com => org}/go/sopt/winey/util/binding/BindingBottomSheetDialogFragment.kt (96%) rename app/src/main/java/{com => org}/go/sopt/winey/util/binding/BindingDialogFragment.kt (97%) rename app/src/main/java/{com => org}/go/sopt/winey/util/binding/BindingFragment.kt (96%) rename app/src/main/java/{com => org}/go/sopt/winey/util/code/ErrorCode.kt (78%) rename app/src/main/java/{com => org}/go/sopt/winey/util/context/ContextExt.kt (93%) rename app/src/main/java/{com => org}/go/sopt/winey/util/fragment/FragmentExt.kt (93%) rename app/src/main/java/{com => org}/go/sopt/winey/util/fragment/WineyDialogFragment.kt (89%) rename app/src/main/java/{com => org}/go/sopt/winey/util/intent/ArgsExt.kt (95%) rename app/src/main/java/{com => org}/go/sopt/winey/util/intent/ExtraExt.kt (97%) rename app/src/main/java/{com => org}/go/sopt/winey/util/multipart/BitmapRequestBody.kt (97%) rename app/src/main/java/{com => org}/go/sopt/winey/util/multipart/ImageCompressor.kt (65%) rename app/src/main/java/{com => org}/go/sopt/winey/util/multipart/UriToRequestBody.kt (97%) rename app/src/main/java/{com => org}/go/sopt/winey/util/view/InputUiState.kt (66%) rename app/src/main/java/{com => org}/go/sopt/winey/util/view/UiState.kt (87%) rename app/src/main/java/{com => org}/go/sopt/winey/util/view/ViewExt.kt (95%) rename app/src/main/java/{com => org}/go/sopt/winey/util/view/WineyPopupMenu.kt (89%) rename app/src/main/java/{com => org}/go/sopt/winey/util/view/WineySnackbar.kt (89%) rename app/src/test/java/{com => org}/go/sopt/winey/ExampleUnitTest.kt (92%) diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json index b1a5c9d3..2730678d 100644 --- a/app/release/output-metadata.json +++ b/app/release/output-metadata.json @@ -4,14 +4,14 @@ "type": "APK", "kind": "Directory" }, - "applicationId": "com.go.sopt.winey", + "applicationId": "org.go.sopt.winey", "variantName": "release", "elements": [ { "type": "SINGLE", "filters": [], "attributes": [], - "versionCode": 10100, + "versionCode": 100, "versionName": "1.0.0", "outputFile": "app-release.apk" } diff --git a/app/src/androidTest/java/com/go/sopt/winey/ExampleInstrumentedTest.kt b/app/src/androidTest/java/org/go/sopt/winey/ExampleInstrumentedTest.kt similarity index 83% rename from app/src/androidTest/java/com/go/sopt/winey/ExampleInstrumentedTest.kt rename to app/src/androidTest/java/org/go/sopt/winey/ExampleInstrumentedTest.kt index 5d981085..8f939a99 100644 --- a/app/src/androidTest/java/com/go/sopt/winey/ExampleInstrumentedTest.kt +++ b/app/src/androidTest/java/org/go/sopt/winey/ExampleInstrumentedTest.kt @@ -1,4 +1,4 @@ -package com.go.sopt.winey +package org.go.sopt.winey import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.platform.app.InstrumentationRegistry @@ -17,6 +17,6 @@ class ExampleInstrumentedTest { fun useAppContext() { // Context of the app under test. val appContext = InstrumentationRegistry.getInstrumentation().targetContext - Assert.assertEquals("com.go.sopt.com.go.sopt.winey", appContext.packageName) + Assert.assertEquals("org.go.sopt.winey", appContext.packageName) } } diff --git a/app/src/main/java/com/go/sopt/winey/WineyApplication.kt b/app/src/main/java/org/go/sopt/winey/WineyApplication.kt similarity index 82% rename from app/src/main/java/com/go/sopt/winey/WineyApplication.kt rename to app/src/main/java/org/go/sopt/winey/WineyApplication.kt index 2ffcfd3f..9639193c 100644 --- a/app/src/main/java/com/go/sopt/winey/WineyApplication.kt +++ b/app/src/main/java/org/go/sopt/winey/WineyApplication.kt @@ -1,9 +1,9 @@ -package com.go.sopt.winey +package org.go.sopt.winey import android.app.Application -import com.go.sopt.winey.BuildConfig.KAKAO_NATIVE_KEY import com.kakao.sdk.common.KakaoSdk import dagger.hilt.android.HiltAndroidApp +import org.go.sopt.winey.BuildConfig.KAKAO_NATIVE_KEY import timber.log.Timber @HiltAndroidApp diff --git a/app/src/main/java/com/go/sopt/winey/data/interceptor/AuthInterceptor.kt b/app/src/main/java/org/go/sopt/winey/data/interceptor/AuthInterceptor.kt similarity index 81% rename from app/src/main/java/com/go/sopt/winey/data/interceptor/AuthInterceptor.kt rename to app/src/main/java/org/go/sopt/winey/data/interceptor/AuthInterceptor.kt index 55a4d3a9..33b89061 100644 --- a/app/src/main/java/com/go/sopt/winey/data/interceptor/AuthInterceptor.kt +++ b/app/src/main/java/org/go/sopt/winey/data/interceptor/AuthInterceptor.kt @@ -1,10 +1,6 @@ -package com.go.sopt.winey.data.interceptor +package org.go.sopt.winey.data.interceptor import android.content.Context -import com.go.sopt.winey.BuildConfig.AUTH_BASE_URL -import com.go.sopt.winey.data.model.remote.response.ResponseReIssueTokenDto -import com.go.sopt.winey.data.model.remote.response.base.BaseResponse -import com.go.sopt.winey.domain.repository.DataStoreRepository import dagger.hilt.android.qualifiers.ApplicationContext import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.first @@ -14,6 +10,10 @@ import okhttp3.Interceptor import okhttp3.Request import okhttp3.RequestBody.Companion.toRequestBody import okhttp3.Response +import org.go.sopt.winey.BuildConfig.AUTH_BASE_URL +import org.go.sopt.winey.data.model.remote.response.ResponseReIssueTokenDto +import org.go.sopt.winey.data.model.remote.response.base.BaseResponse +import org.go.sopt.winey.domain.repository.DataStoreRepository import timber.log.Timber import javax.inject.Inject @@ -32,7 +32,7 @@ class AuthInterceptor @Inject constructor( val response = chain.proceed(headerRequest) when (response.code) { - com.go.sopt.winey.data.interceptor.AuthInterceptor.Companion.CODE_TOKEN_EXPIRED -> { + CODE_TOKEN_EXPIRED -> { try { Timber.e("액세스 토큰 만료, 토큰 재발급 합니다.") response.close() @@ -43,7 +43,7 @@ class AuthInterceptor @Inject constructor( } } - com.go.sopt.winey.data.interceptor.AuthInterceptor.Companion.CODE_INVALID_USER -> { + CODE_INVALID_USER -> { saveAccessToken("", "") } } @@ -51,7 +51,7 @@ class AuthInterceptor @Inject constructor( } private fun Request.newAuthBuilder() = - this.newBuilder().addHeader(com.go.sopt.winey.data.interceptor.AuthInterceptor.Companion.HEADER_TOKEN, runBlocking(Dispatchers.IO) { getAccessToken() }) + this.newBuilder().addHeader(HEADER_TOKEN, runBlocking(Dispatchers.IO) { getAccessToken() }) private suspend fun getAccessToken(): String { return dataStoreRepository.getAccessToken().first() ?: "" @@ -69,7 +69,7 @@ class AuthInterceptor @Inject constructor( private fun handleTokenExpired(chain: Interceptor.Chain, originalRequest: Request, headerRequest: Request): Response { val refreshTokenRequest = originalRequest.newBuilder().post("".toRequestBody()) .url("$AUTH_BASE_URL/auth/token") - .addHeader(com.go.sopt.winey.data.interceptor.AuthInterceptor.Companion.REFRESH_TOKEN, runBlocking(Dispatchers.IO) { getRefreshToken() }) + .addHeader(REFRESH_TOKEN, runBlocking(Dispatchers.IO) { getRefreshToken() }) .build() val refreshTokenResponse = chain.proceed(refreshTokenRequest) Timber.e("리프레시 토큰 : $refreshTokenResponse") diff --git a/app/src/main/java/com/go/sopt/winey/data/model/remote/request/RequestCreateGoalDto.kt b/app/src/main/java/org/go/sopt/winey/data/model/remote/request/RequestCreateGoalDto.kt similarity index 82% rename from app/src/main/java/com/go/sopt/winey/data/model/remote/request/RequestCreateGoalDto.kt rename to app/src/main/java/org/go/sopt/winey/data/model/remote/request/RequestCreateGoalDto.kt index a70d1e7c..1eb2f852 100644 --- a/app/src/main/java/com/go/sopt/winey/data/model/remote/request/RequestCreateGoalDto.kt +++ b/app/src/main/java/org/go/sopt/winey/data/model/remote/request/RequestCreateGoalDto.kt @@ -1,4 +1,4 @@ -package com.go.sopt.winey.data.model.remote.request +package org.go.sopt.winey.data.model.remote.request import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/app/src/main/java/com/go/sopt/winey/data/model/remote/request/RequestLoginDto.kt b/app/src/main/java/org/go/sopt/winey/data/model/remote/request/RequestLoginDto.kt similarity index 78% rename from app/src/main/java/com/go/sopt/winey/data/model/remote/request/RequestLoginDto.kt rename to app/src/main/java/org/go/sopt/winey/data/model/remote/request/RequestLoginDto.kt index c5368f7c..d169184c 100644 --- a/app/src/main/java/com/go/sopt/winey/data/model/remote/request/RequestLoginDto.kt +++ b/app/src/main/java/org/go/sopt/winey/data/model/remote/request/RequestLoginDto.kt @@ -1,4 +1,4 @@ -package com.go.sopt.winey.data.model.remote.request +package org.go.sopt.winey.data.model.remote.request import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/app/src/main/java/com/go/sopt/winey/data/model/remote/request/RequestPatchNicknameDto.kt b/app/src/main/java/org/go/sopt/winey/data/model/remote/request/RequestPatchNicknameDto.kt similarity index 78% rename from app/src/main/java/com/go/sopt/winey/data/model/remote/request/RequestPatchNicknameDto.kt rename to app/src/main/java/org/go/sopt/winey/data/model/remote/request/RequestPatchNicknameDto.kt index 66bf998d..258ec348 100644 --- a/app/src/main/java/com/go/sopt/winey/data/model/remote/request/RequestPatchNicknameDto.kt +++ b/app/src/main/java/org/go/sopt/winey/data/model/remote/request/RequestPatchNicknameDto.kt @@ -1,4 +1,4 @@ -package com.go.sopt.winey.data.model.remote.request +package org.go.sopt.winey.data.model.remote.request import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/app/src/main/java/com/go/sopt/winey/data/model/remote/request/RequestPostCommentDto.kt b/app/src/main/java/org/go/sopt/winey/data/model/remote/request/RequestPostCommentDto.kt similarity index 78% rename from app/src/main/java/com/go/sopt/winey/data/model/remote/request/RequestPostCommentDto.kt rename to app/src/main/java/org/go/sopt/winey/data/model/remote/request/RequestPostCommentDto.kt index 5244b4d9..7c958c2e 100644 --- a/app/src/main/java/com/go/sopt/winey/data/model/remote/request/RequestPostCommentDto.kt +++ b/app/src/main/java/org/go/sopt/winey/data/model/remote/request/RequestPostCommentDto.kt @@ -1,4 +1,4 @@ -package com.go.sopt.winey.data.model.remote.request +package org.go.sopt.winey.data.model.remote.request import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/app/src/main/java/com/go/sopt/winey/data/model/remote/request/RequestPostLikeDto.kt b/app/src/main/java/org/go/sopt/winey/data/model/remote/request/RequestPostLikeDto.kt similarity index 78% rename from app/src/main/java/com/go/sopt/winey/data/model/remote/request/RequestPostLikeDto.kt rename to app/src/main/java/org/go/sopt/winey/data/model/remote/request/RequestPostLikeDto.kt index 6f672cbc..d4b5d03e 100644 --- a/app/src/main/java/com/go/sopt/winey/data/model/remote/request/RequestPostLikeDto.kt +++ b/app/src/main/java/org/go/sopt/winey/data/model/remote/request/RequestPostLikeDto.kt @@ -1,4 +1,4 @@ -package com.go.sopt.winey.data.model.remote.request +package org.go.sopt.winey.data.model.remote.request import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/app/src/main/java/com/go/sopt/winey/data/model/remote/response/ResponseCreateGoalDto.kt b/app/src/main/java/org/go/sopt/winey/data/model/remote/response/ResponseCreateGoalDto.kt similarity index 84% rename from app/src/main/java/com/go/sopt/winey/data/model/remote/response/ResponseCreateGoalDto.kt rename to app/src/main/java/org/go/sopt/winey/data/model/remote/response/ResponseCreateGoalDto.kt index 9f102e7d..f8e4396a 100644 --- a/app/src/main/java/com/go/sopt/winey/data/model/remote/response/ResponseCreateGoalDto.kt +++ b/app/src/main/java/org/go/sopt/winey/data/model/remote/response/ResponseCreateGoalDto.kt @@ -1,8 +1,8 @@ -package com.go.sopt.winey.data.model.remote.response +package org.go.sopt.winey.data.model.remote.response -import com.go.sopt.winey.domain.entity.Goal import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable +import org.go.sopt.winey.domain.entity.Goal @Serializable data class ResponseCreateGoalDto( diff --git a/app/src/main/java/com/go/sopt/winey/data/model/remote/response/ResponseDeleteCommentDto.kt b/app/src/main/java/org/go/sopt/winey/data/model/remote/response/ResponseDeleteCommentDto.kt similarity index 78% rename from app/src/main/java/com/go/sopt/winey/data/model/remote/response/ResponseDeleteCommentDto.kt rename to app/src/main/java/org/go/sopt/winey/data/model/remote/response/ResponseDeleteCommentDto.kt index bfbd309a..0ee72767 100644 --- a/app/src/main/java/com/go/sopt/winey/data/model/remote/response/ResponseDeleteCommentDto.kt +++ b/app/src/main/java/org/go/sopt/winey/data/model/remote/response/ResponseDeleteCommentDto.kt @@ -1,4 +1,4 @@ -package com.go.sopt.winey.data.model.remote.response +package org.go.sopt.winey.data.model.remote.response import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/app/src/main/java/com/go/sopt/winey/data/model/remote/response/ResponseGetFeedDetailDto.kt b/app/src/main/java/org/go/sopt/winey/data/model/remote/response/ResponseGetFeedDetailDto.kt similarity index 94% rename from app/src/main/java/com/go/sopt/winey/data/model/remote/response/ResponseGetFeedDetailDto.kt rename to app/src/main/java/org/go/sopt/winey/data/model/remote/response/ResponseGetFeedDetailDto.kt index 71b9850d..fe0b4a94 100644 --- a/app/src/main/java/com/go/sopt/winey/data/model/remote/response/ResponseGetFeedDetailDto.kt +++ b/app/src/main/java/org/go/sopt/winey/data/model/remote/response/ResponseGetFeedDetailDto.kt @@ -1,9 +1,9 @@ -package com.go.sopt.winey.data.model.remote.response +package org.go.sopt.winey.data.model.remote.response -import com.go.sopt.winey.domain.entity.Comment -import com.go.sopt.winey.domain.entity.DetailFeed import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable +import org.go.sopt.winey.domain.entity.Comment +import org.go.sopt.winey.domain.entity.DetailFeed @Serializable data class ResponseGetFeedDetailDto( diff --git a/app/src/main/java/com/go/sopt/winey/data/model/remote/response/ResponseGetNicknameDuplicateCheckDto.kt b/app/src/main/java/org/go/sopt/winey/data/model/remote/response/ResponseGetNicknameDuplicateCheckDto.kt similarity index 79% rename from app/src/main/java/com/go/sopt/winey/data/model/remote/response/ResponseGetNicknameDuplicateCheckDto.kt rename to app/src/main/java/org/go/sopt/winey/data/model/remote/response/ResponseGetNicknameDuplicateCheckDto.kt index def137ee..a503c7a7 100644 --- a/app/src/main/java/com/go/sopt/winey/data/model/remote/response/ResponseGetNicknameDuplicateCheckDto.kt +++ b/app/src/main/java/org/go/sopt/winey/data/model/remote/response/ResponseGetNicknameDuplicateCheckDto.kt @@ -1,4 +1,4 @@ -package com.go.sopt.winey.data.model.remote.response +package org.go.sopt.winey.data.model.remote.response import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/app/src/main/java/com/go/sopt/winey/data/model/remote/response/ResponseGetNotificationDto.kt b/app/src/main/java/org/go/sopt/winey/data/model/remote/response/ResponseGetNotificationDto.kt similarity index 91% rename from app/src/main/java/com/go/sopt/winey/data/model/remote/response/ResponseGetNotificationDto.kt rename to app/src/main/java/org/go/sopt/winey/data/model/remote/response/ResponseGetNotificationDto.kt index f34196c2..b79e00b7 100644 --- a/app/src/main/java/com/go/sopt/winey/data/model/remote/response/ResponseGetNotificationDto.kt +++ b/app/src/main/java/org/go/sopt/winey/data/model/remote/response/ResponseGetNotificationDto.kt @@ -1,6 +1,6 @@ -package com.go.sopt.winey.data.model.remote.response +package org.go.sopt.winey.data.model.remote.response -import com.go.sopt.winey.domain.entity.Notification +import org.go.sopt.winey.domain.entity.Notification import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/app/src/main/java/com/go/sopt/winey/data/model/remote/response/ResponseGetRecommendListDto.kt b/app/src/main/java/org/go/sopt/winey/data/model/remote/response/ResponseGetRecommendListDto.kt similarity index 93% rename from app/src/main/java/com/go/sopt/winey/data/model/remote/response/ResponseGetRecommendListDto.kt rename to app/src/main/java/org/go/sopt/winey/data/model/remote/response/ResponseGetRecommendListDto.kt index e20d6794..3cc6851a 100644 --- a/app/src/main/java/com/go/sopt/winey/data/model/remote/response/ResponseGetRecommendListDto.kt +++ b/app/src/main/java/org/go/sopt/winey/data/model/remote/response/ResponseGetRecommendListDto.kt @@ -1,8 +1,8 @@ -package com.go.sopt.winey.data.model.remote.response +package org.go.sopt.winey.data.model.remote.response -import com.go.sopt.winey.domain.entity.Recommend import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable +import org.go.sopt.winey.domain.entity.Recommend @Serializable data class ResponseGetRecommendListDto( diff --git a/app/src/main/java/com/go/sopt/winey/data/model/remote/response/ResponseGetUserDto.kt b/app/src/main/java/org/go/sopt/winey/data/model/remote/response/ResponseGetUserDto.kt similarity index 94% rename from app/src/main/java/com/go/sopt/winey/data/model/remote/response/ResponseGetUserDto.kt rename to app/src/main/java/org/go/sopt/winey/data/model/remote/response/ResponseGetUserDto.kt index 569e3b2a..e06bfb92 100644 --- a/app/src/main/java/com/go/sopt/winey/data/model/remote/response/ResponseGetUserDto.kt +++ b/app/src/main/java/org/go/sopt/winey/data/model/remote/response/ResponseGetUserDto.kt @@ -1,6 +1,6 @@ -package com.go.sopt.winey.data.model.remote.response +package org.go.sopt.winey.data.model.remote.response -import com.go.sopt.winey.domain.entity.User +import org.go.sopt.winey.domain.entity.User import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/app/src/main/java/com/go/sopt/winey/data/model/remote/response/ResponseGetWineyFeedListDto.kt b/app/src/main/java/org/go/sopt/winey/data/model/remote/response/ResponseGetWineyFeedListDto.kt similarity index 95% rename from app/src/main/java/com/go/sopt/winey/data/model/remote/response/ResponseGetWineyFeedListDto.kt rename to app/src/main/java/org/go/sopt/winey/data/model/remote/response/ResponseGetWineyFeedListDto.kt index 45f2a7aa..9d7b6280 100644 --- a/app/src/main/java/com/go/sopt/winey/data/model/remote/response/ResponseGetWineyFeedListDto.kt +++ b/app/src/main/java/org/go/sopt/winey/data/model/remote/response/ResponseGetWineyFeedListDto.kt @@ -1,8 +1,8 @@ -package com.go.sopt.winey.data.model.remote.response +package org.go.sopt.winey.data.model.remote.response -import com.go.sopt.winey.domain.entity.WineyFeed import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable +import org.go.sopt.winey.domain.entity.WineyFeed @Serializable data class ResponseGetWineyFeedListDto( diff --git a/app/src/main/java/com/go/sopt/winey/data/model/remote/response/ResponseHasNewNotificationDto.kt b/app/src/main/java/org/go/sopt/winey/data/model/remote/response/ResponseHasNewNotificationDto.kt similarity index 80% rename from app/src/main/java/com/go/sopt/winey/data/model/remote/response/ResponseHasNewNotificationDto.kt rename to app/src/main/java/org/go/sopt/winey/data/model/remote/response/ResponseHasNewNotificationDto.kt index ae034963..58553c6d 100644 --- a/app/src/main/java/com/go/sopt/winey/data/model/remote/response/ResponseHasNewNotificationDto.kt +++ b/app/src/main/java/org/go/sopt/winey/data/model/remote/response/ResponseHasNewNotificationDto.kt @@ -1,4 +1,4 @@ -package com.go.sopt.winey.data.model.remote.response +package org.go.sopt.winey.data.model.remote.response import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/app/src/main/java/com/go/sopt/winey/data/model/remote/response/ResponseLoginDto.kt b/app/src/main/java/org/go/sopt/winey/data/model/remote/response/ResponseLoginDto.kt similarity index 87% rename from app/src/main/java/com/go/sopt/winey/data/model/remote/response/ResponseLoginDto.kt rename to app/src/main/java/org/go/sopt/winey/data/model/remote/response/ResponseLoginDto.kt index 8c9af43c..fbc81058 100644 --- a/app/src/main/java/com/go/sopt/winey/data/model/remote/response/ResponseLoginDto.kt +++ b/app/src/main/java/org/go/sopt/winey/data/model/remote/response/ResponseLoginDto.kt @@ -1,4 +1,4 @@ -package com.go.sopt.winey.data.model.remote.response +package org.go.sopt.winey.data.model.remote.response import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/app/src/main/java/com/go/sopt/winey/data/model/remote/response/ResponseLogoutDto.kt b/app/src/main/java/org/go/sopt/winey/data/model/remote/response/ResponseLogoutDto.kt similarity index 80% rename from app/src/main/java/com/go/sopt/winey/data/model/remote/response/ResponseLogoutDto.kt rename to app/src/main/java/org/go/sopt/winey/data/model/remote/response/ResponseLogoutDto.kt index a38ee68f..bc0a8609 100644 --- a/app/src/main/java/com/go/sopt/winey/data/model/remote/response/ResponseLogoutDto.kt +++ b/app/src/main/java/org/go/sopt/winey/data/model/remote/response/ResponseLogoutDto.kt @@ -1,4 +1,4 @@ -package com.go.sopt.winey.data.model.remote.response +package org.go.sopt.winey.data.model.remote.response import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/app/src/main/java/com/go/sopt/winey/data/model/remote/response/ResponsePostCommentDto.kt b/app/src/main/java/org/go/sopt/winey/data/model/remote/response/ResponsePostCommentDto.kt similarity index 87% rename from app/src/main/java/com/go/sopt/winey/data/model/remote/response/ResponsePostCommentDto.kt rename to app/src/main/java/org/go/sopt/winey/data/model/remote/response/ResponsePostCommentDto.kt index 6a8e3bdb..b44011de 100644 --- a/app/src/main/java/com/go/sopt/winey/data/model/remote/response/ResponsePostCommentDto.kt +++ b/app/src/main/java/org/go/sopt/winey/data/model/remote/response/ResponsePostCommentDto.kt @@ -1,9 +1,9 @@ -package com.go.sopt.winey.data.model.remote.response +package org.go.sopt.winey.data.model.remote.response -import com.go.sopt.winey.domain.entity.Comment import kotlinx.datetime.LocalDateTime import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable +import org.go.sopt.winey.domain.entity.Comment @Serializable data class ResponsePostCommentDto( diff --git a/app/src/main/java/com/go/sopt/winey/data/model/remote/response/ResponsePostLikeDto.kt b/app/src/main/java/org/go/sopt/winey/data/model/remote/response/ResponsePostLikeDto.kt similarity index 86% rename from app/src/main/java/com/go/sopt/winey/data/model/remote/response/ResponsePostLikeDto.kt rename to app/src/main/java/org/go/sopt/winey/data/model/remote/response/ResponsePostLikeDto.kt index b4b453eb..7e87e950 100644 --- a/app/src/main/java/com/go/sopt/winey/data/model/remote/response/ResponsePostLikeDto.kt +++ b/app/src/main/java/org/go/sopt/winey/data/model/remote/response/ResponsePostLikeDto.kt @@ -1,8 +1,8 @@ -package com.go.sopt.winey.data.model.remote.response +package org.go.sopt.winey.data.model.remote.response -import com.go.sopt.winey.domain.entity.Like import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable +import org.go.sopt.winey.domain.entity.Like @Serializable data class ResponsePostLikeDto( diff --git a/app/src/main/java/com/go/sopt/winey/data/model/remote/response/ResponsePostWineyFeedDto.kt b/app/src/main/java/org/go/sopt/winey/data/model/remote/response/ResponsePostWineyFeedDto.kt similarity index 84% rename from app/src/main/java/com/go/sopt/winey/data/model/remote/response/ResponsePostWineyFeedDto.kt rename to app/src/main/java/org/go/sopt/winey/data/model/remote/response/ResponsePostWineyFeedDto.kt index 01775757..d9bf5c8c 100644 --- a/app/src/main/java/com/go/sopt/winey/data/model/remote/response/ResponsePostWineyFeedDto.kt +++ b/app/src/main/java/org/go/sopt/winey/data/model/remote/response/ResponsePostWineyFeedDto.kt @@ -1,4 +1,4 @@ -package com.go.sopt.winey.data.model.remote.response +package org.go.sopt.winey.data.model.remote.response import kotlinx.datetime.LocalDateTime import kotlinx.serialization.SerialName diff --git a/app/src/main/java/com/go/sopt/winey/data/model/remote/response/ResponseReIssueTokenDto.kt b/app/src/main/java/org/go/sopt/winey/data/model/remote/response/ResponseReIssueTokenDto.kt similarity index 82% rename from app/src/main/java/com/go/sopt/winey/data/model/remote/response/ResponseReIssueTokenDto.kt rename to app/src/main/java/org/go/sopt/winey/data/model/remote/response/ResponseReIssueTokenDto.kt index f9481c8f..61d79004 100644 --- a/app/src/main/java/com/go/sopt/winey/data/model/remote/response/ResponseReIssueTokenDto.kt +++ b/app/src/main/java/org/go/sopt/winey/data/model/remote/response/ResponseReIssueTokenDto.kt @@ -1,4 +1,4 @@ -package com.go.sopt.winey.data.model.remote.response +package org.go.sopt.winey.data.model.remote.response import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/app/src/main/java/com/go/sopt/winey/data/model/remote/response/base/BaseResponse.kt b/app/src/main/java/org/go/sopt/winey/data/model/remote/response/base/BaseResponse.kt similarity index 82% rename from app/src/main/java/com/go/sopt/winey/data/model/remote/response/base/BaseResponse.kt rename to app/src/main/java/org/go/sopt/winey/data/model/remote/response/base/BaseResponse.kt index 2f541798..f909600c 100644 --- a/app/src/main/java/com/go/sopt/winey/data/model/remote/response/base/BaseResponse.kt +++ b/app/src/main/java/org/go/sopt/winey/data/model/remote/response/base/BaseResponse.kt @@ -1,4 +1,4 @@ -package com.go.sopt.winey.data.model.remote.response.base +package org.go.sopt.winey.data.model.remote.response.base import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/app/src/main/java/com/go/sopt/winey/data/repository/AuthRepositoryImpl.kt b/app/src/main/java/org/go/sopt/winey/data/repository/AuthRepositoryImpl.kt similarity index 71% rename from app/src/main/java/com/go/sopt/winey/data/repository/AuthRepositoryImpl.kt rename to app/src/main/java/org/go/sopt/winey/data/repository/AuthRepositoryImpl.kt index 32893d24..16d20ccf 100644 --- a/app/src/main/java/com/go/sopt/winey/data/repository/AuthRepositoryImpl.kt +++ b/app/src/main/java/org/go/sopt/winey/data/repository/AuthRepositoryImpl.kt @@ -1,16 +1,16 @@ -package com.go.sopt.winey.data.repository - -import com.go.sopt.winey.data.model.remote.request.RequestCreateGoalDto -import com.go.sopt.winey.data.model.remote.request.RequestLoginDto -import com.go.sopt.winey.data.model.remote.request.RequestPatchNicknameDto -import com.go.sopt.winey.data.model.remote.response.ResponseGetNicknameDuplicateCheckDto -import com.go.sopt.winey.data.model.remote.response.ResponseLoginDto -import com.go.sopt.winey.data.model.remote.response.ResponseLogoutDto -import com.go.sopt.winey.data.model.remote.response.ResponseReIssueTokenDto -import com.go.sopt.winey.data.source.AuthDataSource -import com.go.sopt.winey.domain.entity.Goal -import com.go.sopt.winey.domain.entity.User -import com.go.sopt.winey.domain.repository.AuthRepository +package org.go.sopt.winey.data.repository + +import org.go.sopt.winey.data.model.remote.request.RequestCreateGoalDto +import org.go.sopt.winey.data.model.remote.request.RequestLoginDto +import org.go.sopt.winey.data.model.remote.request.RequestPatchNicknameDto +import org.go.sopt.winey.data.model.remote.response.ResponseGetNicknameDuplicateCheckDto +import org.go.sopt.winey.data.model.remote.response.ResponseLoginDto +import org.go.sopt.winey.data.model.remote.response.ResponseLogoutDto +import org.go.sopt.winey.data.model.remote.response.ResponseReIssueTokenDto +import org.go.sopt.winey.data.source.AuthDataSource +import org.go.sopt.winey.domain.entity.Goal +import org.go.sopt.winey.domain.entity.User +import org.go.sopt.winey.domain.repository.AuthRepository import javax.inject.Inject class AuthRepositoryImpl @Inject constructor( diff --git a/app/src/main/java/com/go/sopt/winey/data/repository/DataStoreRepositoryImpl.kt b/app/src/main/java/org/go/sopt/winey/data/repository/DataStoreRepositoryImpl.kt similarity index 96% rename from app/src/main/java/com/go/sopt/winey/data/repository/DataStoreRepositoryImpl.kt rename to app/src/main/java/org/go/sopt/winey/data/repository/DataStoreRepositoryImpl.kt index d465d433..434dfab5 100644 --- a/app/src/main/java/com/go/sopt/winey/data/repository/DataStoreRepositoryImpl.kt +++ b/app/src/main/java/org/go/sopt/winey/data/repository/DataStoreRepositoryImpl.kt @@ -1,4 +1,4 @@ -package com.go.sopt.winey.data.repository +package org.go.sopt.winey.data.repository import androidx.datastore.core.DataStore import androidx.datastore.preferences.core.Preferences @@ -6,12 +6,12 @@ import androidx.datastore.preferences.core.edit import androidx.datastore.preferences.core.emptyPreferences import androidx.datastore.preferences.core.intPreferencesKey import androidx.datastore.preferences.core.stringPreferencesKey -import com.go.sopt.winey.domain.entity.User -import com.go.sopt.winey.domain.repository.DataStoreRepository import com.google.gson.Gson import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.catch import kotlinx.coroutines.flow.map +import org.go.sopt.winey.domain.entity.User +import org.go.sopt.winey.domain.repository.DataStoreRepository import java.io.IOException import javax.inject.Inject diff --git a/app/src/main/java/com/go/sopt/winey/data/repository/FeedRepositoryImpl.kt b/app/src/main/java/org/go/sopt/winey/data/repository/FeedRepositoryImpl.kt similarity index 74% rename from app/src/main/java/com/go/sopt/winey/data/repository/FeedRepositoryImpl.kt rename to app/src/main/java/org/go/sopt/winey/data/repository/FeedRepositoryImpl.kt index 60f0ee9e..7438c2f2 100644 --- a/app/src/main/java/com/go/sopt/winey/data/repository/FeedRepositoryImpl.kt +++ b/app/src/main/java/org/go/sopt/winey/data/repository/FeedRepositoryImpl.kt @@ -1,24 +1,24 @@ -package com.go.sopt.winey.data.repository +package org.go.sopt.winey.data.repository import androidx.paging.Pager import androidx.paging.PagingConfig import androidx.paging.PagingData -import com.go.sopt.winey.data.model.remote.request.RequestPostCommentDto -import com.go.sopt.winey.data.model.remote.request.RequestPostLikeDto -import com.go.sopt.winey.data.model.remote.response.ResponseDeleteCommentDto -import com.go.sopt.winey.data.model.remote.response.ResponsePostWineyFeedDto -import com.go.sopt.winey.data.service.FeedService -import com.go.sopt.winey.data.source.FeedDataSource -import com.go.sopt.winey.data.source.paging.MyFeedPagingSource -import com.go.sopt.winey.data.source.paging.WineyFeedPagingSource -import com.go.sopt.winey.domain.entity.Comment -import com.go.sopt.winey.domain.entity.DetailFeed -import com.go.sopt.winey.domain.entity.Like -import com.go.sopt.winey.domain.entity.WineyFeed -import com.go.sopt.winey.domain.repository.FeedRepository import kotlinx.coroutines.flow.Flow import okhttp3.MultipartBody import okhttp3.RequestBody +import org.go.sopt.winey.data.model.remote.request.RequestPostCommentDto +import org.go.sopt.winey.data.model.remote.request.RequestPostLikeDto +import org.go.sopt.winey.data.model.remote.response.ResponseDeleteCommentDto +import org.go.sopt.winey.data.model.remote.response.ResponsePostWineyFeedDto +import org.go.sopt.winey.data.service.FeedService +import org.go.sopt.winey.data.source.FeedDataSource +import org.go.sopt.winey.data.source.paging.MyFeedPagingSource +import org.go.sopt.winey.data.source.paging.WineyFeedPagingSource +import org.go.sopt.winey.domain.entity.Comment +import org.go.sopt.winey.domain.entity.DetailFeed +import org.go.sopt.winey.domain.entity.Like +import org.go.sopt.winey.domain.entity.WineyFeed +import org.go.sopt.winey.domain.repository.FeedRepository import javax.inject.Inject class FeedRepositoryImpl @Inject constructor( diff --git a/app/src/main/java/com/go/sopt/winey/data/repository/KakaoLoginRepositoryImpl.kt b/app/src/main/java/org/go/sopt/winey/data/repository/KakaoLoginRepositoryImpl.kt similarity index 81% rename from app/src/main/java/com/go/sopt/winey/data/repository/KakaoLoginRepositoryImpl.kt rename to app/src/main/java/org/go/sopt/winey/data/repository/KakaoLoginRepositoryImpl.kt index 5f3473af..1ee1524f 100644 --- a/app/src/main/java/com/go/sopt/winey/data/repository/KakaoLoginRepositoryImpl.kt +++ b/app/src/main/java/org/go/sopt/winey/data/repository/KakaoLoginRepositoryImpl.kt @@ -1,9 +1,9 @@ -package com.go.sopt.winey.data.repository +package org.go.sopt.winey.data.repository import android.content.Context -import com.go.sopt.winey.data.source.KakaoLoginDataSource -import com.go.sopt.winey.domain.repository.KakaoLoginRepository import com.kakao.sdk.auth.model.OAuthToken +import org.go.sopt.winey.data.source.KakaoLoginDataSource +import org.go.sopt.winey.domain.repository.KakaoLoginRepository import javax.inject.Inject class KakaoLoginRepositoryImpl @Inject constructor( diff --git a/app/src/main/java/com/go/sopt/winey/data/repository/NotificationRepositoryImpl.kt b/app/src/main/java/org/go/sopt/winey/data/repository/NotificationRepositoryImpl.kt similarity index 72% rename from app/src/main/java/com/go/sopt/winey/data/repository/NotificationRepositoryImpl.kt rename to app/src/main/java/org/go/sopt/winey/data/repository/NotificationRepositoryImpl.kt index 8292e238..c0172db4 100644 --- a/app/src/main/java/com/go/sopt/winey/data/repository/NotificationRepositoryImpl.kt +++ b/app/src/main/java/org/go/sopt/winey/data/repository/NotificationRepositoryImpl.kt @@ -1,9 +1,9 @@ -package com.go.sopt.winey.data.repository +package org.go.sopt.winey.data.repository -import com.go.sopt.winey.data.model.remote.response.ResponseHasNewNotificationDto -import com.go.sopt.winey.data.source.NotificationDataSource -import com.go.sopt.winey.domain.entity.Notification -import com.go.sopt.winey.domain.repository.NotificationRepository +import org.go.sopt.winey.data.model.remote.response.ResponseHasNewNotificationDto +import org.go.sopt.winey.data.source.NotificationDataSource +import org.go.sopt.winey.domain.entity.Notification +import org.go.sopt.winey.domain.repository.NotificationRepository import javax.inject.Inject class NotificationRepositoryImpl @Inject constructor( diff --git a/app/src/main/java/com/go/sopt/winey/data/repository/RecommendRepositoryImpl.kt b/app/src/main/java/org/go/sopt/winey/data/repository/RecommendRepositoryImpl.kt similarity index 63% rename from app/src/main/java/com/go/sopt/winey/data/repository/RecommendRepositoryImpl.kt rename to app/src/main/java/org/go/sopt/winey/data/repository/RecommendRepositoryImpl.kt index 5990688d..e514ad6f 100644 --- a/app/src/main/java/com/go/sopt/winey/data/repository/RecommendRepositoryImpl.kt +++ b/app/src/main/java/org/go/sopt/winey/data/repository/RecommendRepositoryImpl.kt @@ -1,8 +1,8 @@ -package com.go.sopt.winey.data.repository +package org.go.sopt.winey.data.repository -import com.go.sopt.winey.data.source.RecommendDataSource -import com.go.sopt.winey.domain.entity.Recommend -import com.go.sopt.winey.domain.repository.RecommendRepository +import org.go.sopt.winey.data.source.RecommendDataSource +import org.go.sopt.winey.domain.entity.Recommend +import org.go.sopt.winey.domain.repository.RecommendRepository import javax.inject.Inject class RecommendRepositoryImpl @Inject constructor( diff --git a/app/src/main/java/com/go/sopt/winey/data/service/AuthService.kt b/app/src/main/java/org/go/sopt/winey/data/service/AuthService.kt similarity index 66% rename from app/src/main/java/com/go/sopt/winey/data/service/AuthService.kt rename to app/src/main/java/org/go/sopt/winey/data/service/AuthService.kt index 516b486e..ca4600b4 100644 --- a/app/src/main/java/com/go/sopt/winey/data/service/AuthService.kt +++ b/app/src/main/java/org/go/sopt/winey/data/service/AuthService.kt @@ -1,15 +1,15 @@ -package com.go.sopt.winey.data.service - -import com.go.sopt.winey.data.model.remote.request.RequestCreateGoalDto -import com.go.sopt.winey.data.model.remote.request.RequestLoginDto -import com.go.sopt.winey.data.model.remote.request.RequestPatchNicknameDto -import com.go.sopt.winey.data.model.remote.response.ResponseCreateGoalDto -import com.go.sopt.winey.data.model.remote.response.ResponseGetNicknameDuplicateCheckDto -import com.go.sopt.winey.data.model.remote.response.ResponseGetUserDto -import com.go.sopt.winey.data.model.remote.response.ResponseLoginDto -import com.go.sopt.winey.data.model.remote.response.ResponseLogoutDto -import com.go.sopt.winey.data.model.remote.response.ResponseReIssueTokenDto -import com.go.sopt.winey.data.model.remote.response.base.BaseResponse +package org.go.sopt.winey.data.service + +import org.go.sopt.winey.data.model.remote.request.RequestCreateGoalDto +import org.go.sopt.winey.data.model.remote.request.RequestLoginDto +import org.go.sopt.winey.data.model.remote.request.RequestPatchNicknameDto +import org.go.sopt.winey.data.model.remote.response.ResponseCreateGoalDto +import org.go.sopt.winey.data.model.remote.response.ResponseGetNicknameDuplicateCheckDto +import org.go.sopt.winey.data.model.remote.response.ResponseGetUserDto +import org.go.sopt.winey.data.model.remote.response.ResponseLoginDto +import org.go.sopt.winey.data.model.remote.response.ResponseLogoutDto +import org.go.sopt.winey.data.model.remote.response.ResponseReIssueTokenDto +import org.go.sopt.winey.data.model.remote.response.base.BaseResponse import retrofit2.http.Body import retrofit2.http.DELETE import retrofit2.http.GET diff --git a/app/src/main/java/com/go/sopt/winey/data/service/FeedService.kt b/app/src/main/java/org/go/sopt/winey/data/service/FeedService.kt similarity index 73% rename from app/src/main/java/com/go/sopt/winey/data/service/FeedService.kt rename to app/src/main/java/org/go/sopt/winey/data/service/FeedService.kt index 5048ee6a..46fa68e7 100644 --- a/app/src/main/java/com/go/sopt/winey/data/service/FeedService.kt +++ b/app/src/main/java/org/go/sopt/winey/data/service/FeedService.kt @@ -1,16 +1,16 @@ -package com.go.sopt.winey.data.service +package org.go.sopt.winey.data.service -import com.go.sopt.winey.data.model.remote.request.RequestPostCommentDto -import com.go.sopt.winey.data.model.remote.request.RequestPostLikeDto -import com.go.sopt.winey.data.model.remote.response.ResponseDeleteCommentDto -import com.go.sopt.winey.data.model.remote.response.ResponseGetFeedDetailDto -import com.go.sopt.winey.data.model.remote.response.ResponseGetWineyFeedListDto -import com.go.sopt.winey.data.model.remote.response.ResponsePostCommentDto -import com.go.sopt.winey.data.model.remote.response.ResponsePostLikeDto -import com.go.sopt.winey.data.model.remote.response.ResponsePostWineyFeedDto -import com.go.sopt.winey.data.model.remote.response.base.BaseResponse import okhttp3.MultipartBody import okhttp3.RequestBody +import org.go.sopt.winey.data.model.remote.request.RequestPostCommentDto +import org.go.sopt.winey.data.model.remote.request.RequestPostLikeDto +import org.go.sopt.winey.data.model.remote.response.ResponseDeleteCommentDto +import org.go.sopt.winey.data.model.remote.response.ResponseGetFeedDetailDto +import org.go.sopt.winey.data.model.remote.response.ResponseGetWineyFeedListDto +import org.go.sopt.winey.data.model.remote.response.ResponsePostCommentDto +import org.go.sopt.winey.data.model.remote.response.ResponsePostLikeDto +import org.go.sopt.winey.data.model.remote.response.ResponsePostWineyFeedDto +import org.go.sopt.winey.data.model.remote.response.base.BaseResponse import retrofit2.http.Body import retrofit2.http.DELETE import retrofit2.http.GET diff --git a/app/src/main/java/com/go/sopt/winey/data/service/KakaoLoginService.kt b/app/src/main/java/org/go/sopt/winey/data/service/KakaoLoginService.kt similarity index 89% rename from app/src/main/java/com/go/sopt/winey/data/service/KakaoLoginService.kt rename to app/src/main/java/org/go/sopt/winey/data/service/KakaoLoginService.kt index ee454ba5..4dbfa679 100644 --- a/app/src/main/java/com/go/sopt/winey/data/service/KakaoLoginService.kt +++ b/app/src/main/java/org/go/sopt/winey/data/service/KakaoLoginService.kt @@ -1,4 +1,4 @@ -package com.go.sopt.winey.data.service +package org.go.sopt.winey.data.service import android.content.Context import com.kakao.sdk.auth.model.OAuthToken diff --git a/app/src/main/java/com/go/sopt/winey/data/service/NotificationService.kt b/app/src/main/java/org/go/sopt/winey/data/service/NotificationService.kt similarity index 64% rename from app/src/main/java/com/go/sopt/winey/data/service/NotificationService.kt rename to app/src/main/java/org/go/sopt/winey/data/service/NotificationService.kt index 5eebe6d7..c4f30edc 100644 --- a/app/src/main/java/com/go/sopt/winey/data/service/NotificationService.kt +++ b/app/src/main/java/org/go/sopt/winey/data/service/NotificationService.kt @@ -1,8 +1,8 @@ -package com.go.sopt.winey.data.service +package org.go.sopt.winey.data.service -import com.go.sopt.winey.data.model.remote.response.ResponseGetNotificationDto -import com.go.sopt.winey.data.model.remote.response.ResponseHasNewNotificationDto -import com.go.sopt.winey.data.model.remote.response.base.BaseResponse +import org.go.sopt.winey.data.model.remote.response.ResponseGetNotificationDto +import org.go.sopt.winey.data.model.remote.response.ResponseHasNewNotificationDto +import org.go.sopt.winey.data.model.remote.response.base.BaseResponse import retrofit2.http.GET import retrofit2.http.PATCH diff --git a/app/src/main/java/com/go/sopt/winey/data/service/RecommendService.kt b/app/src/main/java/org/go/sopt/winey/data/service/RecommendService.kt similarity index 59% rename from app/src/main/java/com/go/sopt/winey/data/service/RecommendService.kt rename to app/src/main/java/org/go/sopt/winey/data/service/RecommendService.kt index 22e1183e..8185aedc 100644 --- a/app/src/main/java/com/go/sopt/winey/data/service/RecommendService.kt +++ b/app/src/main/java/org/go/sopt/winey/data/service/RecommendService.kt @@ -1,7 +1,7 @@ -package com.go.sopt.winey.data.service +package org.go.sopt.winey.data.service -import com.go.sopt.winey.data.model.remote.response.ResponseGetRecommendListDto -import com.go.sopt.winey.data.model.remote.response.base.BaseResponse +import org.go.sopt.winey.data.model.remote.response.ResponseGetRecommendListDto +import org.go.sopt.winey.data.model.remote.response.base.BaseResponse import retrofit2.http.GET import retrofit2.http.Query diff --git a/app/src/main/java/com/go/sopt/winey/data/source/AuthDataSource.kt b/app/src/main/java/org/go/sopt/winey/data/source/AuthDataSource.kt similarity index 64% rename from app/src/main/java/com/go/sopt/winey/data/source/AuthDataSource.kt rename to app/src/main/java/org/go/sopt/winey/data/source/AuthDataSource.kt index 44d54f18..a53068fa 100644 --- a/app/src/main/java/com/go/sopt/winey/data/source/AuthDataSource.kt +++ b/app/src/main/java/org/go/sopt/winey/data/source/AuthDataSource.kt @@ -1,16 +1,16 @@ -package com.go.sopt.winey.data.source - -import com.go.sopt.winey.data.model.remote.request.RequestCreateGoalDto -import com.go.sopt.winey.data.model.remote.request.RequestLoginDto -import com.go.sopt.winey.data.model.remote.request.RequestPatchNicknameDto -import com.go.sopt.winey.data.model.remote.response.ResponseCreateGoalDto -import com.go.sopt.winey.data.model.remote.response.ResponseGetNicknameDuplicateCheckDto -import com.go.sopt.winey.data.model.remote.response.ResponseGetUserDto -import com.go.sopt.winey.data.model.remote.response.ResponseLoginDto -import com.go.sopt.winey.data.model.remote.response.ResponseLogoutDto -import com.go.sopt.winey.data.model.remote.response.ResponseReIssueTokenDto -import com.go.sopt.winey.data.model.remote.response.base.BaseResponse -import com.go.sopt.winey.data.service.AuthService +package org.go.sopt.winey.data.source + +import org.go.sopt.winey.data.model.remote.request.RequestCreateGoalDto +import org.go.sopt.winey.data.model.remote.request.RequestLoginDto +import org.go.sopt.winey.data.model.remote.request.RequestPatchNicknameDto +import org.go.sopt.winey.data.model.remote.response.ResponseCreateGoalDto +import org.go.sopt.winey.data.model.remote.response.ResponseGetNicknameDuplicateCheckDto +import org.go.sopt.winey.data.model.remote.response.ResponseGetUserDto +import org.go.sopt.winey.data.model.remote.response.ResponseLoginDto +import org.go.sopt.winey.data.model.remote.response.ResponseLogoutDto +import org.go.sopt.winey.data.model.remote.response.ResponseReIssueTokenDto +import org.go.sopt.winey.data.model.remote.response.base.BaseResponse +import org.go.sopt.winey.data.service.AuthService import javax.inject.Inject class AuthDataSource @Inject constructor( diff --git a/app/src/main/java/com/go/sopt/winey/data/source/FeedDataSource.kt b/app/src/main/java/org/go/sopt/winey/data/source/FeedDataSource.kt similarity index 67% rename from app/src/main/java/com/go/sopt/winey/data/source/FeedDataSource.kt rename to app/src/main/java/org/go/sopt/winey/data/source/FeedDataSource.kt index b4995a10..ae329dc1 100644 --- a/app/src/main/java/com/go/sopt/winey/data/source/FeedDataSource.kt +++ b/app/src/main/java/org/go/sopt/winey/data/source/FeedDataSource.kt @@ -1,16 +1,16 @@ -package com.go.sopt.winey.data.source +package org.go.sopt.winey.data.source -import com.go.sopt.winey.data.model.remote.request.RequestPostCommentDto -import com.go.sopt.winey.data.model.remote.request.RequestPostLikeDto -import com.go.sopt.winey.data.model.remote.response.ResponseDeleteCommentDto -import com.go.sopt.winey.data.model.remote.response.ResponseGetFeedDetailDto -import com.go.sopt.winey.data.model.remote.response.ResponsePostCommentDto -import com.go.sopt.winey.data.model.remote.response.ResponsePostLikeDto -import com.go.sopt.winey.data.model.remote.response.ResponsePostWineyFeedDto -import com.go.sopt.winey.data.model.remote.response.base.BaseResponse -import com.go.sopt.winey.data.service.FeedService import okhttp3.MultipartBody import okhttp3.RequestBody +import org.go.sopt.winey.data.model.remote.request.RequestPostCommentDto +import org.go.sopt.winey.data.model.remote.request.RequestPostLikeDto +import org.go.sopt.winey.data.model.remote.response.ResponseDeleteCommentDto +import org.go.sopt.winey.data.model.remote.response.ResponseGetFeedDetailDto +import org.go.sopt.winey.data.model.remote.response.ResponsePostCommentDto +import org.go.sopt.winey.data.model.remote.response.ResponsePostLikeDto +import org.go.sopt.winey.data.model.remote.response.ResponsePostWineyFeedDto +import org.go.sopt.winey.data.model.remote.response.base.BaseResponse +import org.go.sopt.winey.data.service.FeedService import javax.inject.Inject class FeedDataSource @Inject constructor( diff --git a/app/src/main/java/com/go/sopt/winey/data/source/KakaoLoginDataSource.kt b/app/src/main/java/org/go/sopt/winey/data/source/KakaoLoginDataSource.kt similarity index 87% rename from app/src/main/java/com/go/sopt/winey/data/source/KakaoLoginDataSource.kt rename to app/src/main/java/org/go/sopt/winey/data/source/KakaoLoginDataSource.kt index 7ba26fb8..e57bb9a0 100644 --- a/app/src/main/java/com/go/sopt/winey/data/source/KakaoLoginDataSource.kt +++ b/app/src/main/java/org/go/sopt/winey/data/source/KakaoLoginDataSource.kt @@ -1,8 +1,8 @@ -package com.go.sopt.winey.data.source +package org.go.sopt.winey.data.source import android.content.Context -import com.go.sopt.winey.data.service.KakaoLoginService import com.kakao.sdk.auth.model.OAuthToken +import org.go.sopt.winey.data.service.KakaoLoginService import javax.inject.Inject class KakaoLoginDataSource @Inject constructor( diff --git a/app/src/main/java/com/go/sopt/winey/data/source/NotificationDataSource.kt b/app/src/main/java/org/go/sopt/winey/data/source/NotificationDataSource.kt similarity index 65% rename from app/src/main/java/com/go/sopt/winey/data/source/NotificationDataSource.kt rename to app/src/main/java/org/go/sopt/winey/data/source/NotificationDataSource.kt index e31b584b..f623b357 100644 --- a/app/src/main/java/com/go/sopt/winey/data/source/NotificationDataSource.kt +++ b/app/src/main/java/org/go/sopt/winey/data/source/NotificationDataSource.kt @@ -1,9 +1,9 @@ -package com.go.sopt.winey.data.source +package org.go.sopt.winey.data.source -import com.go.sopt.winey.data.model.remote.response.ResponseGetNotificationDto -import com.go.sopt.winey.data.model.remote.response.ResponseHasNewNotificationDto -import com.go.sopt.winey.data.model.remote.response.base.BaseResponse -import com.go.sopt.winey.data.service.NotificationService +import org.go.sopt.winey.data.model.remote.response.ResponseGetNotificationDto +import org.go.sopt.winey.data.model.remote.response.ResponseHasNewNotificationDto +import org.go.sopt.winey.data.model.remote.response.base.BaseResponse +import org.go.sopt.winey.data.service.NotificationService import javax.inject.Inject class NotificationDataSource @Inject constructor( diff --git a/app/src/main/java/com/go/sopt/winey/data/source/RecommendDataSource.kt b/app/src/main/java/org/go/sopt/winey/data/source/RecommendDataSource.kt similarity index 56% rename from app/src/main/java/com/go/sopt/winey/data/source/RecommendDataSource.kt rename to app/src/main/java/org/go/sopt/winey/data/source/RecommendDataSource.kt index a3646608..d431bef7 100644 --- a/app/src/main/java/com/go/sopt/winey/data/source/RecommendDataSource.kt +++ b/app/src/main/java/org/go/sopt/winey/data/source/RecommendDataSource.kt @@ -1,8 +1,8 @@ -package com.go.sopt.winey.data.source +package org.go.sopt.winey.data.source -import com.go.sopt.winey.data.model.remote.response.ResponseGetRecommendListDto -import com.go.sopt.winey.data.model.remote.response.base.BaseResponse -import com.go.sopt.winey.data.service.RecommendService +import org.go.sopt.winey.data.model.remote.response.ResponseGetRecommendListDto +import org.go.sopt.winey.data.model.remote.response.base.BaseResponse +import org.go.sopt.winey.data.service.RecommendService import javax.inject.Inject class RecommendDataSource @Inject constructor( diff --git a/app/src/main/java/com/go/sopt/winey/data/source/paging/BasePagingSource.kt b/app/src/main/java/org/go/sopt/winey/data/source/paging/BasePagingSource.kt similarity index 90% rename from app/src/main/java/com/go/sopt/winey/data/source/paging/BasePagingSource.kt rename to app/src/main/java/org/go/sopt/winey/data/source/paging/BasePagingSource.kt index 427e02ac..5f93ee20 100644 --- a/app/src/main/java/com/go/sopt/winey/data/source/paging/BasePagingSource.kt +++ b/app/src/main/java/org/go/sopt/winey/data/source/paging/BasePagingSource.kt @@ -1,10 +1,10 @@ -package com.go.sopt.winey.data.source.paging +package org.go.sopt.winey.data.source.paging import androidx.paging.PagingSource import androidx.paging.PagingState -import com.go.sopt.winey.data.service.FeedService -import com.go.sopt.winey.domain.entity.WineyFeed import kotlinx.coroutines.delay +import org.go.sopt.winey.data.service.FeedService +import org.go.sopt.winey.domain.entity.WineyFeed import java.io.IOException abstract class BasePagingSource( diff --git a/app/src/main/java/com/go/sopt/winey/data/source/paging/MyFeedPagingSource.kt b/app/src/main/java/org/go/sopt/winey/data/source/paging/MyFeedPagingSource.kt similarity index 66% rename from app/src/main/java/com/go/sopt/winey/data/source/paging/MyFeedPagingSource.kt rename to app/src/main/java/org/go/sopt/winey/data/source/paging/MyFeedPagingSource.kt index e2d4188c..6922e8a6 100644 --- a/app/src/main/java/com/go/sopt/winey/data/source/paging/MyFeedPagingSource.kt +++ b/app/src/main/java/org/go/sopt/winey/data/source/paging/MyFeedPagingSource.kt @@ -1,7 +1,7 @@ -package com.go.sopt.winey.data.source.paging +package org.go.sopt.winey.data.source.paging -import com.go.sopt.winey.data.service.FeedService -import com.go.sopt.winey.domain.entity.WineyFeed +import org.go.sopt.winey.data.service.FeedService +import org.go.sopt.winey.domain.entity.WineyFeed import javax.inject.Inject class MyFeedPagingSource @Inject constructor( diff --git a/app/src/main/java/com/go/sopt/winey/data/source/paging/WineyFeedPagingSource.kt b/app/src/main/java/org/go/sopt/winey/data/source/paging/WineyFeedPagingSource.kt similarity index 66% rename from app/src/main/java/com/go/sopt/winey/data/source/paging/WineyFeedPagingSource.kt rename to app/src/main/java/org/go/sopt/winey/data/source/paging/WineyFeedPagingSource.kt index e6bdcba3..17041718 100644 --- a/app/src/main/java/com/go/sopt/winey/data/source/paging/WineyFeedPagingSource.kt +++ b/app/src/main/java/org/go/sopt/winey/data/source/paging/WineyFeedPagingSource.kt @@ -1,7 +1,7 @@ -package com.go.sopt.winey.data.source.paging +package org.go.sopt.winey.data.source.paging -import com.go.sopt.winey.data.service.FeedService -import com.go.sopt.winey.domain.entity.WineyFeed +import org.go.sopt.winey.data.service.FeedService +import org.go.sopt.winey.domain.entity.WineyFeed import javax.inject.Inject class WineyFeedPagingSource @Inject constructor( diff --git a/app/src/main/java/com/go/sopt/winey/di/AmplitudeModule.kt b/app/src/main/java/org/go/sopt/winey/di/AmplitudeModule.kt similarity index 91% rename from app/src/main/java/com/go/sopt/winey/di/AmplitudeModule.kt rename to app/src/main/java/org/go/sopt/winey/di/AmplitudeModule.kt index 02df5a8a..9a62e5dd 100644 --- a/app/src/main/java/com/go/sopt/winey/di/AmplitudeModule.kt +++ b/app/src/main/java/org/go/sopt/winey/di/AmplitudeModule.kt @@ -1,15 +1,15 @@ -package com.go.sopt.winey.di +package org.go.sopt.winey.di import android.app.Application import android.content.Context import com.amplitude.api.Amplitude import com.amplitude.api.AmplitudeClient -import com.go.sopt.winey.BuildConfig import dagger.Module import dagger.Provides import dagger.hilt.InstallIn import dagger.hilt.android.qualifiers.ApplicationContext import dagger.hilt.components.SingletonComponent +import org.go.sopt.winey.BuildConfig import javax.inject.Singleton @Module diff --git a/app/src/main/java/com/go/sopt/winey/di/DataStoreModule.kt b/app/src/main/java/org/go/sopt/winey/di/DataStoreModule.kt similarity index 95% rename from app/src/main/java/com/go/sopt/winey/di/DataStoreModule.kt rename to app/src/main/java/org/go/sopt/winey/di/DataStoreModule.kt index 246c60fd..7c37a098 100644 --- a/app/src/main/java/com/go/sopt/winey/di/DataStoreModule.kt +++ b/app/src/main/java/org/go/sopt/winey/di/DataStoreModule.kt @@ -1,4 +1,4 @@ -package com.go.sopt.winey.di +package org.go.sopt.winey.di import android.content.Context import androidx.datastore.core.DataStore diff --git a/app/src/main/java/com/go/sopt/winey/di/KakaoModule.kt b/app/src/main/java/org/go/sopt/winey/di/KakaoModule.kt similarity index 92% rename from app/src/main/java/com/go/sopt/winey/di/KakaoModule.kt rename to app/src/main/java/org/go/sopt/winey/di/KakaoModule.kt index 59e53c7c..fc1adbbb 100644 --- a/app/src/main/java/com/go/sopt/winey/di/KakaoModule.kt +++ b/app/src/main/java/org/go/sopt/winey/di/KakaoModule.kt @@ -1,4 +1,4 @@ -package com.go.sopt.winey.di +package org.go.sopt.winey.di import com.kakao.sdk.user.UserApiClient import dagger.Module diff --git a/app/src/main/java/com/go/sopt/winey/di/RepositoryModule.kt b/app/src/main/java/org/go/sopt/winey/di/RepositoryModule.kt similarity index 59% rename from app/src/main/java/com/go/sopt/winey/di/RepositoryModule.kt rename to app/src/main/java/org/go/sopt/winey/di/RepositoryModule.kt index 49f4328e..939cd1fa 100644 --- a/app/src/main/java/com/go/sopt/winey/di/RepositoryModule.kt +++ b/app/src/main/java/org/go/sopt/winey/di/RepositoryModule.kt @@ -1,21 +1,21 @@ -package com.go.sopt.winey.di +package org.go.sopt.winey.di -import com.go.sopt.winey.data.repository.AuthRepositoryImpl -import com.go.sopt.winey.data.repository.DataStoreRepositoryImpl -import com.go.sopt.winey.data.repository.FeedRepositoryImpl -import com.go.sopt.winey.data.repository.KakaoLoginRepositoryImpl -import com.go.sopt.winey.data.repository.NotificationRepositoryImpl -import com.go.sopt.winey.data.repository.RecommendRepositoryImpl -import com.go.sopt.winey.domain.repository.AuthRepository -import com.go.sopt.winey.domain.repository.DataStoreRepository -import com.go.sopt.winey.domain.repository.FeedRepository -import com.go.sopt.winey.domain.repository.KakaoLoginRepository -import com.go.sopt.winey.domain.repository.NotificationRepository -import com.go.sopt.winey.domain.repository.RecommendRepository import dagger.Binds import dagger.Module import dagger.hilt.InstallIn import dagger.hilt.components.SingletonComponent +import org.go.sopt.winey.data.repository.AuthRepositoryImpl +import org.go.sopt.winey.data.repository.DataStoreRepositoryImpl +import org.go.sopt.winey.data.repository.FeedRepositoryImpl +import org.go.sopt.winey.data.repository.KakaoLoginRepositoryImpl +import org.go.sopt.winey.data.repository.NotificationRepositoryImpl +import org.go.sopt.winey.data.repository.RecommendRepositoryImpl +import org.go.sopt.winey.domain.repository.AuthRepository +import org.go.sopt.winey.domain.repository.DataStoreRepository +import org.go.sopt.winey.domain.repository.FeedRepository +import org.go.sopt.winey.domain.repository.KakaoLoginRepository +import org.go.sopt.winey.domain.repository.NotificationRepository +import org.go.sopt.winey.domain.repository.RecommendRepository import javax.inject.Singleton @Module diff --git a/app/src/main/java/com/go/sopt/winey/di/RetrofitModule.kt b/app/src/main/java/org/go/sopt/winey/di/RetrofitModule.kt similarity index 88% rename from app/src/main/java/com/go/sopt/winey/di/RetrofitModule.kt rename to app/src/main/java/org/go/sopt/winey/di/RetrofitModule.kt index a7259987..6686049e 100644 --- a/app/src/main/java/com/go/sopt/winey/di/RetrofitModule.kt +++ b/app/src/main/java/org/go/sopt/winey/di/RetrofitModule.kt @@ -1,9 +1,5 @@ -package com.go.sopt.winey.di +package org.go.sopt.winey.di -import com.go.sopt.winey.BuildConfig.AUTH_BASE_URL -import com.go.sopt.winey.data.interceptor.AuthInterceptor -import com.go.sopt.winey.di.qualifier.Auth -import com.go.sopt.winey.di.qualifier.Logger import com.jakewharton.retrofit2.converter.kotlinx.serialization.asConverterFactory import dagger.Module import dagger.Provides @@ -14,6 +10,10 @@ import okhttp3.Interceptor import okhttp3.MediaType.Companion.toMediaType import okhttp3.OkHttpClient import okhttp3.logging.HttpLoggingInterceptor +import org.go.sopt.winey.BuildConfig.AUTH_BASE_URL +import org.go.sopt.winey.data.interceptor.AuthInterceptor +import org.go.sopt.winey.di.qualifier.Auth +import org.go.sopt.winey.di.qualifier.Logger import retrofit2.Converter import retrofit2.Retrofit import javax.inject.Singleton diff --git a/app/src/main/java/com/go/sopt/winey/di/ServiceModule.kt b/app/src/main/java/org/go/sopt/winey/di/ServiceModule.kt similarity index 89% rename from app/src/main/java/com/go/sopt/winey/di/ServiceModule.kt rename to app/src/main/java/org/go/sopt/winey/di/ServiceModule.kt index e3286b74..caa550f4 100644 --- a/app/src/main/java/com/go/sopt/winey/di/ServiceModule.kt +++ b/app/src/main/java/org/go/sopt/winey/di/ServiceModule.kt @@ -1,17 +1,17 @@ -package com.go.sopt.winey.di +package org.go.sopt.winey.di import android.content.Context -import com.go.sopt.winey.data.service.AuthService -import com.go.sopt.winey.data.service.FeedService -import com.go.sopt.winey.data.service.KakaoLoginService -import com.go.sopt.winey.data.service.NotificationService -import com.go.sopt.winey.data.service.RecommendService import com.kakao.sdk.auth.model.OAuthToken import com.kakao.sdk.user.UserApiClient import dagger.Module import dagger.Provides import dagger.hilt.InstallIn import dagger.hilt.components.SingletonComponent +import org.go.sopt.winey.data.service.AuthService +import org.go.sopt.winey.data.service.FeedService +import org.go.sopt.winey.data.service.KakaoLoginService +import org.go.sopt.winey.data.service.NotificationService +import org.go.sopt.winey.data.service.RecommendService import retrofit2.Retrofit import javax.inject.Singleton diff --git a/app/src/main/java/com/go/sopt/winey/di/qualifier/InterceptorQualifier.kt b/app/src/main/java/org/go/sopt/winey/di/qualifier/InterceptorQualifier.kt similarity index 82% rename from app/src/main/java/com/go/sopt/winey/di/qualifier/InterceptorQualifier.kt rename to app/src/main/java/org/go/sopt/winey/di/qualifier/InterceptorQualifier.kt index 5594b92f..fa8cc69b 100644 --- a/app/src/main/java/com/go/sopt/winey/di/qualifier/InterceptorQualifier.kt +++ b/app/src/main/java/org/go/sopt/winey/di/qualifier/InterceptorQualifier.kt @@ -1,4 +1,4 @@ -package com.go.sopt.winey.di.qualifier +package org.go.sopt.winey.di.qualifier import javax.inject.Qualifier diff --git a/app/src/main/java/com/go/sopt/winey/domain/entity/DetailFeed.kt b/app/src/main/java/org/go/sopt/winey/domain/entity/DetailFeed.kt similarity index 92% rename from app/src/main/java/com/go/sopt/winey/domain/entity/DetailFeed.kt rename to app/src/main/java/org/go/sopt/winey/domain/entity/DetailFeed.kt index 7aea4dca..aeb363e1 100644 --- a/app/src/main/java/com/go/sopt/winey/domain/entity/DetailFeed.kt +++ b/app/src/main/java/org/go/sopt/winey/domain/entity/DetailFeed.kt @@ -1,4 +1,4 @@ -package com.go.sopt.winey.domain.entity +package org.go.sopt.winey.domain.entity data class DetailFeed( val feedId: Int, diff --git a/app/src/main/java/com/go/sopt/winey/domain/entity/Goal.kt b/app/src/main/java/org/go/sopt/winey/domain/entity/Goal.kt similarity index 62% rename from app/src/main/java/com/go/sopt/winey/domain/entity/Goal.kt rename to app/src/main/java/org/go/sopt/winey/domain/entity/Goal.kt index 8a56a13c..9d98bd03 100644 --- a/app/src/main/java/com/go/sopt/winey/domain/entity/Goal.kt +++ b/app/src/main/java/org/go/sopt/winey/domain/entity/Goal.kt @@ -1,4 +1,4 @@ -package com.go.sopt.winey.domain.entity +package org.go.sopt.winey.domain.entity data class Goal( val userId: Int, diff --git a/app/src/main/java/com/go/sopt/winey/domain/entity/Like.kt b/app/src/main/java/org/go/sopt/winey/domain/entity/Like.kt similarity index 82% rename from app/src/main/java/com/go/sopt/winey/domain/entity/Like.kt rename to app/src/main/java/org/go/sopt/winey/domain/entity/Like.kt index 5d82b94b..acd1931d 100644 --- a/app/src/main/java/com/go/sopt/winey/domain/entity/Like.kt +++ b/app/src/main/java/org/go/sopt/winey/domain/entity/Like.kt @@ -1,4 +1,4 @@ -package com.go.sopt.winey.domain.entity +package org.go.sopt.winey.domain.entity data class Like( val code: Int, diff --git a/app/src/main/java/com/go/sopt/winey/domain/entity/Login.kt b/app/src/main/java/org/go/sopt/winey/domain/entity/Login.kt similarity index 76% rename from app/src/main/java/com/go/sopt/winey/domain/entity/Login.kt rename to app/src/main/java/org/go/sopt/winey/domain/entity/Login.kt index 702c71af..540d6aae 100644 --- a/app/src/main/java/com/go/sopt/winey/domain/entity/Login.kt +++ b/app/src/main/java/org/go/sopt/winey/domain/entity/Login.kt @@ -1,4 +1,4 @@ -package com.go.sopt.winey.domain.entity +package org.go.sopt.winey.domain.entity data class Login( val userId: Int, diff --git a/app/src/main/java/com/go/sopt/winey/domain/entity/Notification.kt b/app/src/main/java/org/go/sopt/winey/domain/entity/Notification.kt similarity index 83% rename from app/src/main/java/com/go/sopt/winey/domain/entity/Notification.kt rename to app/src/main/java/org/go/sopt/winey/domain/entity/Notification.kt index 9b69cdf0..1eac455c 100644 --- a/app/src/main/java/com/go/sopt/winey/domain/entity/Notification.kt +++ b/app/src/main/java/org/go/sopt/winey/domain/entity/Notification.kt @@ -1,4 +1,4 @@ -package com.go.sopt.winey.domain.entity +package org.go.sopt.winey.domain.entity data class Notification( val notiId: Int, diff --git a/app/src/main/java/com/go/sopt/winey/domain/entity/ReIssueToken.kt b/app/src/main/java/org/go/sopt/winey/domain/entity/ReIssueToken.kt similarity index 68% rename from app/src/main/java/com/go/sopt/winey/domain/entity/ReIssueToken.kt rename to app/src/main/java/org/go/sopt/winey/domain/entity/ReIssueToken.kt index 4708566a..6da0e4fc 100644 --- a/app/src/main/java/com/go/sopt/winey/domain/entity/ReIssueToken.kt +++ b/app/src/main/java/org/go/sopt/winey/domain/entity/ReIssueToken.kt @@ -1,4 +1,4 @@ -package com.go.sopt.winey.domain.entity +package org.go.sopt.winey.domain.entity data class ReIssueToken( val accessToken: String, diff --git a/app/src/main/java/com/go/sopt/winey/domain/entity/Recommend.kt b/app/src/main/java/org/go/sopt/winey/domain/entity/Recommend.kt similarity index 80% rename from app/src/main/java/com/go/sopt/winey/domain/entity/Recommend.kt rename to app/src/main/java/org/go/sopt/winey/domain/entity/Recommend.kt index 0dd71f20..ce0895bc 100644 --- a/app/src/main/java/com/go/sopt/winey/domain/entity/Recommend.kt +++ b/app/src/main/java/org/go/sopt/winey/domain/entity/Recommend.kt @@ -1,4 +1,4 @@ -package com.go.sopt.winey.domain.entity +package org.go.sopt.winey.domain.entity data class Recommend( val id: Int, diff --git a/app/src/main/java/com/go/sopt/winey/domain/entity/User.kt b/app/src/main/java/org/go/sopt/winey/domain/entity/User.kt similarity index 88% rename from app/src/main/java/com/go/sopt/winey/domain/entity/User.kt rename to app/src/main/java/org/go/sopt/winey/domain/entity/User.kt index 87fc2988..6301cec3 100644 --- a/app/src/main/java/com/go/sopt/winey/domain/entity/User.kt +++ b/app/src/main/java/org/go/sopt/winey/domain/entity/User.kt @@ -1,4 +1,4 @@ -package com.go.sopt.winey.domain.entity +package org.go.sopt.winey.domain.entity data class User( val nickname: String = "", diff --git a/app/src/main/java/com/go/sopt/winey/domain/entity/WineyFeed.kt b/app/src/main/java/org/go/sopt/winey/domain/entity/WineyFeed.kt similarity index 89% rename from app/src/main/java/com/go/sopt/winey/domain/entity/WineyFeed.kt rename to app/src/main/java/org/go/sopt/winey/domain/entity/WineyFeed.kt index b9815831..d17b23ba 100644 --- a/app/src/main/java/com/go/sopt/winey/domain/entity/WineyFeed.kt +++ b/app/src/main/java/org/go/sopt/winey/domain/entity/WineyFeed.kt @@ -1,4 +1,4 @@ -package com.go.sopt.winey.domain.entity +package org.go.sopt.winey.domain.entity data class WineyFeed( val feedId: Int, diff --git a/app/src/main/java/com/go/sopt/winey/domain/repository/AuthRepository.kt b/app/src/main/java/org/go/sopt/winey/domain/repository/AuthRepository.kt similarity index 56% rename from app/src/main/java/com/go/sopt/winey/domain/repository/AuthRepository.kt rename to app/src/main/java/org/go/sopt/winey/domain/repository/AuthRepository.kt index 9f0ad5de..2819df03 100644 --- a/app/src/main/java/com/go/sopt/winey/domain/repository/AuthRepository.kt +++ b/app/src/main/java/org/go/sopt/winey/domain/repository/AuthRepository.kt @@ -1,14 +1,14 @@ -package com.go.sopt.winey.domain.repository - -import com.go.sopt.winey.data.model.remote.request.RequestCreateGoalDto -import com.go.sopt.winey.data.model.remote.request.RequestLoginDto -import com.go.sopt.winey.data.model.remote.request.RequestPatchNicknameDto -import com.go.sopt.winey.data.model.remote.response.ResponseGetNicknameDuplicateCheckDto -import com.go.sopt.winey.data.model.remote.response.ResponseLoginDto -import com.go.sopt.winey.data.model.remote.response.ResponseLogoutDto -import com.go.sopt.winey.data.model.remote.response.ResponseReIssueTokenDto -import com.go.sopt.winey.domain.entity.Goal -import com.go.sopt.winey.domain.entity.User +package org.go.sopt.winey.domain.repository + +import org.go.sopt.winey.data.model.remote.request.RequestCreateGoalDto +import org.go.sopt.winey.data.model.remote.request.RequestLoginDto +import org.go.sopt.winey.data.model.remote.request.RequestPatchNicknameDto +import org.go.sopt.winey.data.model.remote.response.ResponseGetNicknameDuplicateCheckDto +import org.go.sopt.winey.data.model.remote.response.ResponseLoginDto +import org.go.sopt.winey.data.model.remote.response.ResponseLogoutDto +import org.go.sopt.winey.data.model.remote.response.ResponseReIssueTokenDto +import org.go.sopt.winey.domain.entity.Goal +import org.go.sopt.winey.domain.entity.User interface AuthRepository { suspend fun getUser(): Result diff --git a/app/src/main/java/com/go/sopt/winey/domain/repository/DataStoreRepository.kt b/app/src/main/java/org/go/sopt/winey/domain/repository/DataStoreRepository.kt similarity index 89% rename from app/src/main/java/com/go/sopt/winey/domain/repository/DataStoreRepository.kt rename to app/src/main/java/org/go/sopt/winey/domain/repository/DataStoreRepository.kt index deb29a9e..1d993b63 100644 --- a/app/src/main/java/com/go/sopt/winey/domain/repository/DataStoreRepository.kt +++ b/app/src/main/java/org/go/sopt/winey/domain/repository/DataStoreRepository.kt @@ -1,8 +1,8 @@ -package com.go.sopt.winey.domain.repository +package org.go.sopt.winey.domain.repository import androidx.datastore.preferences.core.Preferences -import com.go.sopt.winey.domain.entity.User import kotlinx.coroutines.flow.Flow +import org.go.sopt.winey.domain.entity.User interface DataStoreRepository { suspend fun saveSocialToken(socialAccessToken: String, socialRefreshToken: String) diff --git a/app/src/main/java/com/go/sopt/winey/domain/repository/FeedRepository.kt b/app/src/main/java/org/go/sopt/winey/domain/repository/FeedRepository.kt similarity index 64% rename from app/src/main/java/com/go/sopt/winey/domain/repository/FeedRepository.kt rename to app/src/main/java/org/go/sopt/winey/domain/repository/FeedRepository.kt index 020d6838..3f35809a 100644 --- a/app/src/main/java/com/go/sopt/winey/domain/repository/FeedRepository.kt +++ b/app/src/main/java/org/go/sopt/winey/domain/repository/FeedRepository.kt @@ -1,17 +1,17 @@ -package com.go.sopt.winey.domain.repository +package org.go.sopt.winey.domain.repository import androidx.paging.PagingData -import com.go.sopt.winey.data.model.remote.request.RequestPostCommentDto -import com.go.sopt.winey.data.model.remote.request.RequestPostLikeDto -import com.go.sopt.winey.data.model.remote.response.ResponseDeleteCommentDto -import com.go.sopt.winey.data.model.remote.response.ResponsePostWineyFeedDto -import com.go.sopt.winey.domain.entity.Comment -import com.go.sopt.winey.domain.entity.DetailFeed -import com.go.sopt.winey.domain.entity.Like -import com.go.sopt.winey.domain.entity.WineyFeed import kotlinx.coroutines.flow.Flow import okhttp3.MultipartBody import okhttp3.RequestBody +import org.go.sopt.winey.data.model.remote.request.RequestPostCommentDto +import org.go.sopt.winey.data.model.remote.request.RequestPostLikeDto +import org.go.sopt.winey.data.model.remote.response.ResponseDeleteCommentDto +import org.go.sopt.winey.data.model.remote.response.ResponsePostWineyFeedDto +import org.go.sopt.winey.domain.entity.Comment +import org.go.sopt.winey.domain.entity.DetailFeed +import org.go.sopt.winey.domain.entity.Like +import org.go.sopt.winey.domain.entity.WineyFeed interface FeedRepository { suspend fun getWineyFeedList(): Flow> diff --git a/app/src/main/java/com/go/sopt/winey/domain/repository/KakaoLoginRepository.kt b/app/src/main/java/org/go/sopt/winey/domain/repository/KakaoLoginRepository.kt similarity index 88% rename from app/src/main/java/com/go/sopt/winey/domain/repository/KakaoLoginRepository.kt rename to app/src/main/java/org/go/sopt/winey/domain/repository/KakaoLoginRepository.kt index e5b10dc3..5c51624d 100644 --- a/app/src/main/java/com/go/sopt/winey/domain/repository/KakaoLoginRepository.kt +++ b/app/src/main/java/org/go/sopt/winey/domain/repository/KakaoLoginRepository.kt @@ -1,4 +1,4 @@ -package com.go.sopt.winey.domain.repository +package org.go.sopt.winey.domain.repository import android.content.Context import com.kakao.sdk.auth.model.OAuthToken diff --git a/app/src/main/java/com/go/sopt/winey/domain/repository/NotificationRepository.kt b/app/src/main/java/org/go/sopt/winey/domain/repository/NotificationRepository.kt similarity index 61% rename from app/src/main/java/com/go/sopt/winey/domain/repository/NotificationRepository.kt rename to app/src/main/java/org/go/sopt/winey/domain/repository/NotificationRepository.kt index f78ca510..00251d9b 100644 --- a/app/src/main/java/com/go/sopt/winey/domain/repository/NotificationRepository.kt +++ b/app/src/main/java/org/go/sopt/winey/domain/repository/NotificationRepository.kt @@ -1,7 +1,7 @@ -package com.go.sopt.winey.domain.repository +package org.go.sopt.winey.domain.repository -import com.go.sopt.winey.data.model.remote.response.ResponseHasNewNotificationDto -import com.go.sopt.winey.domain.entity.Notification +import org.go.sopt.winey.data.model.remote.response.ResponseHasNewNotificationDto +import org.go.sopt.winey.domain.entity.Notification interface NotificationRepository { suspend fun getNotification(): Result?> diff --git a/app/src/main/java/com/go/sopt/winey/domain/repository/RecommendRepository.kt b/app/src/main/java/org/go/sopt/winey/domain/repository/RecommendRepository.kt similarity index 53% rename from app/src/main/java/com/go/sopt/winey/domain/repository/RecommendRepository.kt rename to app/src/main/java/org/go/sopt/winey/domain/repository/RecommendRepository.kt index d7c9aa8a..6f707615 100644 --- a/app/src/main/java/com/go/sopt/winey/domain/repository/RecommendRepository.kt +++ b/app/src/main/java/org/go/sopt/winey/domain/repository/RecommendRepository.kt @@ -1,6 +1,6 @@ -package com.go.sopt.winey.domain.repository +package org.go.sopt.winey.domain.repository -import com.go.sopt.winey.domain.entity.Recommend +import org.go.sopt.winey.domain.entity.Recommend interface RecommendRepository { suspend fun getRecommendList(page: Int): Result?> diff --git a/app/src/main/java/com/go/sopt/winey/presentation/main/MainActivity.kt b/app/src/main/java/org/go/sopt/winey/presentation/main/MainActivity.kt similarity index 87% rename from app/src/main/java/com/go/sopt/winey/presentation/main/MainActivity.kt rename to app/src/main/java/org/go/sopt/winey/presentation/main/MainActivity.kt index 669691cb..5b308aaa 100644 --- a/app/src/main/java/com/go/sopt/winey/presentation/main/MainActivity.kt +++ b/app/src/main/java/org/go/sopt/winey/presentation/main/MainActivity.kt @@ -1,4 +1,4 @@ -package com.go.sopt.winey.presentation.main +package org.go.sopt.winey.presentation.main import android.content.Intent import android.os.Bundle @@ -8,20 +8,20 @@ import androidx.fragment.app.commit import androidx.fragment.app.replace import androidx.lifecycle.flowWithLifecycle import androidx.lifecycle.lifecycleScope -import com.go.sopt.winey.R -import com.go.sopt.winey.databinding.ActivityMainBinding -import com.go.sopt.winey.presentation.main.feed.WineyFeedFragment -import com.go.sopt.winey.presentation.main.mypage.MyPageFragment -import com.go.sopt.winey.presentation.main.recommend.RecommendFragment -import com.go.sopt.winey.presentation.onboarding.login.LoginActivity -import com.go.sopt.winey.util.binding.BindingActivity -import com.go.sopt.winey.util.context.snackBar -import com.go.sopt.winey.util.context.stringOf -import com.go.sopt.winey.util.context.wineySnackbar -import com.go.sopt.winey.util.view.UiState import dagger.hilt.android.AndroidEntryPoint import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.onEach +import org.go.sopt.winey.R +import org.go.sopt.winey.databinding.ActivityMainBinding +import org.go.sopt.winey.presentation.main.feed.WineyFeedFragment +import org.go.sopt.winey.presentation.main.mypage.MyPageFragment +import org.go.sopt.winey.presentation.main.recommend.RecommendFragment +import org.go.sopt.winey.presentation.onboarding.login.LoginActivity +import org.go.sopt.winey.util.binding.BindingActivity +import org.go.sopt.winey.util.context.snackBar +import org.go.sopt.winey.util.context.stringOf +import org.go.sopt.winey.util.context.wineySnackbar +import org.go.sopt.winey.util.view.UiState @AndroidEntryPoint class MainActivity : BindingActivity(R.layout.activity_main) { diff --git a/app/src/main/java/com/go/sopt/winey/presentation/main/MainViewModel.kt b/app/src/main/java/org/go/sopt/winey/presentation/main/MainViewModel.kt similarity index 91% rename from app/src/main/java/com/go/sopt/winey/presentation/main/MainViewModel.kt rename to app/src/main/java/org/go/sopt/winey/presentation/main/MainViewModel.kt index c002ae93..32e74a0f 100644 --- a/app/src/main/java/com/go/sopt/winey/presentation/main/MainViewModel.kt +++ b/app/src/main/java/org/go/sopt/winey/presentation/main/MainViewModel.kt @@ -1,20 +1,20 @@ -package com.go.sopt.winey.presentation.main +package org.go.sopt.winey.presentation.main import androidx.lifecycle.LiveData import androidx.lifecycle.ViewModel import androidx.lifecycle.asLiveData import androidx.lifecycle.viewModelScope -import com.go.sopt.winey.data.model.remote.response.ResponseLogoutDto -import com.go.sopt.winey.domain.entity.User -import com.go.sopt.winey.domain.repository.AuthRepository -import com.go.sopt.winey.domain.repository.DataStoreRepository -import com.go.sopt.winey.domain.repository.NotificationRepository -import com.go.sopt.winey.util.view.UiState import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.asStateFlow import kotlinx.coroutines.launch +import org.go.sopt.winey.data.model.remote.response.ResponseLogoutDto +import org.go.sopt.winey.domain.entity.User +import org.go.sopt.winey.domain.repository.AuthRepository +import org.go.sopt.winey.domain.repository.DataStoreRepository +import org.go.sopt.winey.domain.repository.NotificationRepository +import org.go.sopt.winey.util.view.UiState import retrofit2.HttpException import timber.log.Timber import javax.inject.Inject diff --git a/app/src/main/java/com/go/sopt/winey/presentation/main/feed/WineyFeedAdapter.kt b/app/src/main/java/org/go/sopt/winey/presentation/main/feed/WineyFeedAdapter.kt similarity index 90% rename from app/src/main/java/com/go/sopt/winey/presentation/main/feed/WineyFeedAdapter.kt rename to app/src/main/java/org/go/sopt/winey/presentation/main/feed/WineyFeedAdapter.kt index 9397adc2..324a68bc 100644 --- a/app/src/main/java/com/go/sopt/winey/presentation/main/feed/WineyFeedAdapter.kt +++ b/app/src/main/java/org/go/sopt/winey/presentation/main/feed/WineyFeedAdapter.kt @@ -1,14 +1,14 @@ -package com.go.sopt.winey.presentation.main.feed +package org.go.sopt.winey.presentation.main.feed import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import androidx.paging.PagingDataAdapter import androidx.recyclerview.widget.RecyclerView -import com.go.sopt.winey.databinding.ItemWineyfeedPostBinding -import com.go.sopt.winey.domain.entity.WineyFeed -import com.go.sopt.winey.util.view.ItemDiffCallback -import com.go.sopt.winey.util.view.setOnSingleClickListener +import org.go.sopt.winey.databinding.ItemWineyfeedPostBinding +import org.go.sopt.winey.domain.entity.WineyFeed +import org.go.sopt.winey.util.view.ItemDiffCallback +import org.go.sopt.winey.util.view.setOnSingleClickListener class WineyFeedAdapter( private val onlikeButtonClicked: (WineyFeed) -> Unit, diff --git a/app/src/main/java/com/go/sopt/winey/presentation/main/feed/WineyFeedFragment.kt b/app/src/main/java/org/go/sopt/winey/presentation/main/feed/WineyFeedFragment.kt similarity index 91% rename from app/src/main/java/com/go/sopt/winey/presentation/main/feed/WineyFeedFragment.kt rename to app/src/main/java/org/go/sopt/winey/presentation/main/feed/WineyFeedFragment.kt index 9bb41d09..6c1a5578 100644 --- a/app/src/main/java/com/go/sopt/winey/presentation/main/feed/WineyFeedFragment.kt +++ b/app/src/main/java/org/go/sopt/winey/presentation/main/feed/WineyFeedFragment.kt @@ -1,4 +1,4 @@ -package com.go.sopt.winey.presentation.main.feed +package org.go.sopt.winey.presentation.main.feed import android.content.Intent import android.os.Bundle @@ -19,30 +19,6 @@ import androidx.paging.LoadState import androidx.paging.PagingData import androidx.recyclerview.widget.ConcatAdapter import androidx.recyclerview.widget.SimpleItemAnimator -import com.go.sopt.winey.R -import com.go.sopt.winey.databinding.FragmentWineyFeedBinding -import com.go.sopt.winey.domain.entity.User -import com.go.sopt.winey.domain.entity.WineyFeed -import com.go.sopt.winey.domain.repository.DataStoreRepository -import com.go.sopt.winey.presentation.main.MainViewModel -import com.go.sopt.winey.presentation.main.feed.detail.DetailActivity -import com.go.sopt.winey.presentation.main.feed.upload.UploadActivity -import com.go.sopt.winey.presentation.main.mypage.MyPageFragment -import com.go.sopt.winey.presentation.main.notification.NotificationActivity -import com.go.sopt.winey.util.amplitude.AmplitudeUtils -import com.go.sopt.winey.util.amplitude.type.EventType -import com.go.sopt.winey.util.amplitude.type.EventType.TYPE_CLICK_FEED_ITEM -import com.go.sopt.winey.util.amplitude.type.EventType.TYPE_CLICK_LIKE -import com.go.sopt.winey.util.binding.BindingFragment -import com.go.sopt.winey.util.fragment.WineyDialogFragment -import com.go.sopt.winey.util.fragment.snackBar -import com.go.sopt.winey.util.fragment.stringOf -import com.go.sopt.winey.util.fragment.viewLifeCycle -import com.go.sopt.winey.util.fragment.viewLifeCycleScope -import com.go.sopt.winey.util.fragment.wineySnackbar -import com.go.sopt.winey.util.view.UiState -import com.go.sopt.winey.util.view.WineyPopupMenu -import com.go.sopt.winey.util.view.setOnSingleClickListener import com.google.android.material.bottomnavigation.BottomNavigationView import dagger.hilt.android.AndroidEntryPoint import kotlinx.coroutines.flow.collectLatest @@ -51,6 +27,30 @@ import kotlinx.coroutines.flow.firstOrNull import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.onEach import kotlinx.coroutines.launch +import org.go.sopt.winey.R +import org.go.sopt.winey.databinding.FragmentWineyFeedBinding +import org.go.sopt.winey.domain.entity.User +import org.go.sopt.winey.domain.entity.WineyFeed +import org.go.sopt.winey.domain.repository.DataStoreRepository +import org.go.sopt.winey.presentation.main.MainViewModel +import org.go.sopt.winey.presentation.main.feed.detail.DetailActivity +import org.go.sopt.winey.presentation.main.feed.upload.UploadActivity +import org.go.sopt.winey.presentation.main.mypage.MyPageFragment +import org.go.sopt.winey.presentation.main.notification.NotificationActivity +import org.go.sopt.winey.util.amplitude.AmplitudeUtils +import org.go.sopt.winey.util.amplitude.type.EventType +import org.go.sopt.winey.util.amplitude.type.EventType.TYPE_CLICK_FEED_ITEM +import org.go.sopt.winey.util.amplitude.type.EventType.TYPE_CLICK_LIKE +import org.go.sopt.winey.util.binding.BindingFragment +import org.go.sopt.winey.util.fragment.WineyDialogFragment +import org.go.sopt.winey.util.fragment.snackBar +import org.go.sopt.winey.util.fragment.stringOf +import org.go.sopt.winey.util.fragment.viewLifeCycle +import org.go.sopt.winey.util.fragment.viewLifeCycleScope +import org.go.sopt.winey.util.fragment.wineySnackbar +import org.go.sopt.winey.util.view.UiState +import org.go.sopt.winey.util.view.WineyPopupMenu +import org.go.sopt.winey.util.view.setOnSingleClickListener import org.json.JSONException import org.json.JSONObject import timber.log.Timber diff --git a/app/src/main/java/com/go/sopt/winey/presentation/main/feed/WineyFeedHeaderAdapter.kt b/app/src/main/java/org/go/sopt/winey/presentation/main/feed/WineyFeedHeaderAdapter.kt similarity index 90% rename from app/src/main/java/com/go/sopt/winey/presentation/main/feed/WineyFeedHeaderAdapter.kt rename to app/src/main/java/org/go/sopt/winey/presentation/main/feed/WineyFeedHeaderAdapter.kt index 54893a4d..a7ca1ed7 100644 --- a/app/src/main/java/com/go/sopt/winey/presentation/main/feed/WineyFeedHeaderAdapter.kt +++ b/app/src/main/java/org/go/sopt/winey/presentation/main/feed/WineyFeedHeaderAdapter.kt @@ -1,13 +1,13 @@ -package com.go.sopt.winey.presentation.main.feed +package org.go.sopt.winey.presentation.main.feed import android.view.LayoutInflater import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView -import com.go.sopt.winey.databinding.ItemWineyfeedHeaderBinding -import com.go.sopt.winey.databinding.LayoutWineyfeedBanner1Binding -import com.go.sopt.winey.databinding.LayoutWineyfeedBanner2Binding -import com.go.sopt.winey.databinding.LayoutWineyfeedBanner3Binding -import com.go.sopt.winey.databinding.LayoutWineyfeedBanner4Binding +import org.go.sopt.winey.databinding.ItemWineyfeedHeaderBinding +import org.go.sopt.winey.databinding.LayoutWineyfeedBanner1Binding +import org.go.sopt.winey.databinding.LayoutWineyfeedBanner2Binding +import org.go.sopt.winey.databinding.LayoutWineyfeedBanner3Binding +import org.go.sopt.winey.databinding.LayoutWineyfeedBanner4Binding import java.util.Random class WineyFeedHeaderAdapter : RecyclerView.Adapter() { diff --git a/app/src/main/java/com/go/sopt/winey/presentation/main/feed/WineyFeedLoadAdapter.kt b/app/src/main/java/org/go/sopt/winey/presentation/main/feed/WineyFeedLoadAdapter.kt similarity index 90% rename from app/src/main/java/com/go/sopt/winey/presentation/main/feed/WineyFeedLoadAdapter.kt rename to app/src/main/java/org/go/sopt/winey/presentation/main/feed/WineyFeedLoadAdapter.kt index 166697ef..a1c433a9 100644 --- a/app/src/main/java/com/go/sopt/winey/presentation/main/feed/WineyFeedLoadAdapter.kt +++ b/app/src/main/java/org/go/sopt/winey/presentation/main/feed/WineyFeedLoadAdapter.kt @@ -1,4 +1,4 @@ -package com.go.sopt.winey.presentation.main.feed +package org.go.sopt.winey.presentation.main.feed import android.view.LayoutInflater import android.view.ViewGroup @@ -6,7 +6,7 @@ import androidx.core.view.isVisible import androidx.paging.LoadState import androidx.paging.LoadStateAdapter import androidx.recyclerview.widget.RecyclerView -import com.go.sopt.winey.databinding.ItemFeedLoadingFooterBinding +import org.go.sopt.winey.databinding.ItemFeedLoadingFooterBinding class WineyFeedLoadAdapter() : LoadStateAdapter() { diff --git a/app/src/main/java/com/go/sopt/winey/presentation/main/feed/WineyFeedViewModel.kt b/app/src/main/java/org/go/sopt/winey/presentation/main/feed/WineyFeedViewModel.kt similarity index 91% rename from app/src/main/java/com/go/sopt/winey/presentation/main/feed/WineyFeedViewModel.kt rename to app/src/main/java/org/go/sopt/winey/presentation/main/feed/WineyFeedViewModel.kt index b32826f2..867a81a7 100644 --- a/app/src/main/java/com/go/sopt/winey/presentation/main/feed/WineyFeedViewModel.kt +++ b/app/src/main/java/org/go/sopt/winey/presentation/main/feed/WineyFeedViewModel.kt @@ -1,20 +1,20 @@ -package com.go.sopt.winey.presentation.main.feed +package org.go.sopt.winey.presentation.main.feed import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import androidx.paging.PagingData import androidx.paging.cachedIn -import com.go.sopt.winey.data.model.remote.request.RequestPostLikeDto -import com.go.sopt.winey.domain.entity.Like -import com.go.sopt.winey.domain.entity.WineyFeed -import com.go.sopt.winey.domain.repository.FeedRepository -import com.go.sopt.winey.util.view.UiState import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.asStateFlow import kotlinx.coroutines.flow.collectLatest import kotlinx.coroutines.launch +import org.go.sopt.winey.data.model.remote.request.RequestPostLikeDto +import org.go.sopt.winey.domain.entity.Like +import org.go.sopt.winey.domain.entity.WineyFeed +import org.go.sopt.winey.domain.repository.FeedRepository +import org.go.sopt.winey.util.view.UiState import retrofit2.HttpException import timber.log.Timber import javax.inject.Inject diff --git a/app/src/main/java/com/go/sopt/winey/presentation/main/feed/detail/CommentAdapter.kt b/app/src/main/java/org/go/sopt/winey/presentation/main/feed/detail/CommentAdapter.kt similarity index 89% rename from app/src/main/java/com/go/sopt/winey/presentation/main/feed/detail/CommentAdapter.kt rename to app/src/main/java/org/go/sopt/winey/presentation/main/feed/detail/CommentAdapter.kt index c49ac356..4b6ff2c7 100644 --- a/app/src/main/java/com/go/sopt/winey/presentation/main/feed/detail/CommentAdapter.kt +++ b/app/src/main/java/org/go/sopt/winey/presentation/main/feed/detail/CommentAdapter.kt @@ -1,11 +1,13 @@ +package org.go.sopt.winey.presentation.main.feed.detail + import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import androidx.recyclerview.widget.ListAdapter import androidx.recyclerview.widget.RecyclerView -import com.go.sopt.winey.databinding.ItemDetailCommentBinding -import com.go.sopt.winey.domain.entity.Comment -import com.go.sopt.winey.util.view.ItemDiffCallback +import org.go.sopt.winey.databinding.ItemDetailCommentBinding +import org.go.sopt.winey.domain.entity.Comment +import org.go.sopt.winey.util.view.ItemDiffCallback class CommentAdapter( private val onPopupMenuClicked: (View, Int, Long) -> Unit diff --git a/app/src/main/java/com/go/sopt/winey/presentation/main/feed/detail/CommentEmptyAdapter.kt b/app/src/main/java/org/go/sopt/winey/presentation/main/feed/detail/CommentEmptyAdapter.kt similarity index 87% rename from app/src/main/java/com/go/sopt/winey/presentation/main/feed/detail/CommentEmptyAdapter.kt rename to app/src/main/java/org/go/sopt/winey/presentation/main/feed/detail/CommentEmptyAdapter.kt index dd986d5a..d0de7611 100644 --- a/app/src/main/java/com/go/sopt/winey/presentation/main/feed/detail/CommentEmptyAdapter.kt +++ b/app/src/main/java/org/go/sopt/winey/presentation/main/feed/detail/CommentEmptyAdapter.kt @@ -1,12 +1,11 @@ -package com.go.sopt.winey.presentation.main.feed.detail +package org.go.sopt.winey.presentation.main.feed.detail import android.view.LayoutInflater import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView -import com.go.sopt.winey.databinding.LayoutCommentEmptyBinding +import org.go.sopt.winey.databinding.LayoutCommentEmptyBinding class CommentEmptyAdapter : RecyclerView.Adapter() { - class CommentEmptyViewHolder(binding: LayoutCommentEmptyBinding) : RecyclerView.ViewHolder(binding.root) diff --git a/app/src/main/java/com/go/sopt/winey/presentation/main/feed/detail/DetailActivity.kt b/app/src/main/java/org/go/sopt/winey/presentation/main/feed/detail/DetailActivity.kt similarity index 94% rename from app/src/main/java/com/go/sopt/winey/presentation/main/feed/detail/DetailActivity.kt rename to app/src/main/java/org/go/sopt/winey/presentation/main/feed/detail/DetailActivity.kt index 245d0c4b..042a4c80 100644 --- a/app/src/main/java/com/go/sopt/winey/presentation/main/feed/detail/DetailActivity.kt +++ b/app/src/main/java/org/go/sopt/winey/presentation/main/feed/detail/DetailActivity.kt @@ -1,6 +1,5 @@ -package com.go.sopt.winey.presentation.main.feed.detail +package org.go.sopt.winey.presentation.main.feed.detail -import CommentAdapter import android.content.Intent import android.os.Bundle import android.view.Gravity @@ -11,28 +10,28 @@ import androidx.lifecycle.flowWithLifecycle import androidx.lifecycle.lifecycleScope import androidx.recyclerview.widget.ConcatAdapter import androidx.recyclerview.widget.SimpleItemAnimator -import com.go.sopt.winey.R -import com.go.sopt.winey.databinding.ActivityDetailBinding -import com.go.sopt.winey.domain.entity.Comment -import com.go.sopt.winey.domain.entity.DetailFeed -import com.go.sopt.winey.domain.repository.DataStoreRepository -import com.go.sopt.winey.presentation.main.MainActivity -import com.go.sopt.winey.util.activity.hideKeyboard -import com.go.sopt.winey.util.amplitude.AmplitudeUtils -import com.go.sopt.winey.util.amplitude.type.EventType -import com.go.sopt.winey.util.binding.BindingActivity -import com.go.sopt.winey.util.context.colorOf -import com.go.sopt.winey.util.context.snackBar -import com.go.sopt.winey.util.context.stringOf -import com.go.sopt.winey.util.context.wineySnackbar -import com.go.sopt.winey.util.fragment.WineyDialogFragment -import com.go.sopt.winey.util.view.UiState -import com.go.sopt.winey.util.view.WineyPopupMenu import dagger.hilt.android.AndroidEntryPoint import kotlinx.coroutines.flow.first import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.onEach import kotlinx.coroutines.launch +import org.go.sopt.winey.R +import org.go.sopt.winey.databinding.ActivityDetailBinding +import org.go.sopt.winey.domain.entity.Comment +import org.go.sopt.winey.domain.entity.DetailFeed +import org.go.sopt.winey.domain.repository.DataStoreRepository +import org.go.sopt.winey.presentation.main.MainActivity +import org.go.sopt.winey.util.activity.hideKeyboard +import org.go.sopt.winey.util.amplitude.AmplitudeUtils +import org.go.sopt.winey.util.amplitude.type.EventType +import org.go.sopt.winey.util.binding.BindingActivity +import org.go.sopt.winey.util.context.colorOf +import org.go.sopt.winey.util.context.snackBar +import org.go.sopt.winey.util.context.stringOf +import org.go.sopt.winey.util.context.wineySnackbar +import org.go.sopt.winey.util.fragment.WineyDialogFragment +import org.go.sopt.winey.util.view.UiState +import org.go.sopt.winey.util.view.WineyPopupMenu import org.json.JSONException import org.json.JSONObject import timber.log.Timber diff --git a/app/src/main/java/com/go/sopt/winey/presentation/main/feed/detail/DetailFeedAdapter.kt b/app/src/main/java/org/go/sopt/winey/presentation/main/feed/detail/DetailFeedAdapter.kt similarity index 90% rename from app/src/main/java/com/go/sopt/winey/presentation/main/feed/detail/DetailFeedAdapter.kt rename to app/src/main/java/org/go/sopt/winey/presentation/main/feed/detail/DetailFeedAdapter.kt index 8368e917..a7422f38 100644 --- a/app/src/main/java/com/go/sopt/winey/presentation/main/feed/detail/DetailFeedAdapter.kt +++ b/app/src/main/java/org/go/sopt/winey/presentation/main/feed/detail/DetailFeedAdapter.kt @@ -1,12 +1,12 @@ -package com.go.sopt.winey.presentation.main.feed.detail +package org.go.sopt.winey.presentation.main.feed.detail import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView -import com.go.sopt.winey.databinding.ItemDetailFeedBinding -import com.go.sopt.winey.domain.entity.DetailFeed -import com.go.sopt.winey.util.view.setOnSingleClickListener +import org.go.sopt.winey.databinding.ItemDetailFeedBinding +import org.go.sopt.winey.domain.entity.DetailFeed +import org.go.sopt.winey.util.view.setOnSingleClickListener class DetailFeedAdapter( private val detailFeed: DetailFeed, diff --git a/app/src/main/java/com/go/sopt/winey/presentation/main/feed/detail/DetailViewModel.kt b/app/src/main/java/org/go/sopt/winey/presentation/main/feed/detail/DetailViewModel.kt similarity index 92% rename from app/src/main/java/com/go/sopt/winey/presentation/main/feed/detail/DetailViewModel.kt rename to app/src/main/java/org/go/sopt/winey/presentation/main/feed/detail/DetailViewModel.kt index 247fcd9c..3e623f15 100644 --- a/app/src/main/java/com/go/sopt/winey/presentation/main/feed/detail/DetailViewModel.kt +++ b/app/src/main/java/org/go/sopt/winey/presentation/main/feed/detail/DetailViewModel.kt @@ -1,15 +1,7 @@ -package com.go.sopt.winey.presentation.main.feed.detail +package org.go.sopt.winey.presentation.main.feed.detail import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import com.go.sopt.winey.data.model.remote.request.RequestPostCommentDto -import com.go.sopt.winey.data.model.remote.request.RequestPostLikeDto -import com.go.sopt.winey.data.model.remote.response.ResponseDeleteCommentDto -import com.go.sopt.winey.domain.entity.Comment -import com.go.sopt.winey.domain.entity.DetailFeed -import com.go.sopt.winey.domain.entity.Like -import com.go.sopt.winey.domain.repository.FeedRepository -import com.go.sopt.winey.util.view.UiState import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.SharingStarted @@ -18,6 +10,14 @@ import kotlinx.coroutines.flow.asStateFlow import kotlinx.coroutines.flow.map import kotlinx.coroutines.flow.stateIn import kotlinx.coroutines.launch +import org.go.sopt.winey.data.model.remote.request.RequestPostCommentDto +import org.go.sopt.winey.data.model.remote.request.RequestPostLikeDto +import org.go.sopt.winey.data.model.remote.response.ResponseDeleteCommentDto +import org.go.sopt.winey.domain.entity.Comment +import org.go.sopt.winey.domain.entity.DetailFeed +import org.go.sopt.winey.domain.entity.Like +import org.go.sopt.winey.domain.repository.FeedRepository +import org.go.sopt.winey.util.view.UiState import retrofit2.HttpException import timber.log.Timber import javax.inject.Inject diff --git a/app/src/main/java/com/go/sopt/winey/presentation/main/feed/upload/AmountFragment.kt b/app/src/main/java/org/go/sopt/winey/presentation/main/feed/upload/AmountFragment.kt similarity index 78% rename from app/src/main/java/com/go/sopt/winey/presentation/main/feed/upload/AmountFragment.kt rename to app/src/main/java/org/go/sopt/winey/presentation/main/feed/upload/AmountFragment.kt index fd9f32c4..8a1011ba 100644 --- a/app/src/main/java/com/go/sopt/winey/presentation/main/feed/upload/AmountFragment.kt +++ b/app/src/main/java/org/go/sopt/winey/presentation/main/feed/upload/AmountFragment.kt @@ -1,4 +1,4 @@ -package com.go.sopt.winey.presentation.main.feed.upload +package org.go.sopt.winey.presentation.main.feed.upload import android.content.Intent import android.os.Bundle @@ -7,21 +7,22 @@ import android.text.TextWatcher import android.view.View import androidx.fragment.app.activityViewModels import androidx.lifecycle.flowWithLifecycle -import com.go.sopt.winey.R -import com.go.sopt.winey.databinding.FragmentAmountBinding -import com.go.sopt.winey.presentation.main.feed.upload.loading.LoadingActivity -import com.go.sopt.winey.util.binding.BindingFragment -import com.go.sopt.winey.util.context.hideKeyboard -import com.go.sopt.winey.util.fragment.stringOf -import com.go.sopt.winey.util.fragment.viewLifeCycle -import com.go.sopt.winey.util.fragment.viewLifeCycleScope -import com.go.sopt.winey.util.fragment.wineySnackbar -import com.go.sopt.winey.util.multipart.UriToRequestBody -import com.go.sopt.winey.util.view.UiState -import com.go.sopt.winey.util.view.setOnSingleClickListener import dagger.hilt.android.AndroidEntryPoint import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.onEach +import org.go.sopt.winey.R +import org.go.sopt.winey.databinding.FragmentAmountBinding +import org.go.sopt.winey.presentation.main.feed.upload.loading.LoadingActivity +import org.go.sopt.winey.util.binding.BindingFragment +import org.go.sopt.winey.util.context.hideKeyboard +import org.go.sopt.winey.util.fragment.stringOf +import org.go.sopt.winey.util.fragment.viewLifeCycle +import org.go.sopt.winey.util.fragment.viewLifeCycleScope +import org.go.sopt.winey.util.fragment.wineySnackbar +import org.go.sopt.winey.util.multipart.BitmapRequestBody +import org.go.sopt.winey.util.multipart.ImageCompressor +import org.go.sopt.winey.util.view.UiState +import org.go.sopt.winey.util.view.setOnSingleClickListener import java.text.DecimalFormat @AndroidEntryPoint @@ -42,14 +43,15 @@ class AmountFragment : BindingFragment(R.layout.fragment_ } private fun updateRequestBody() { -// val compressor = ImageCompressor(requireContext(), imageUriArg!!) -// val adjustedImageBitmap = compressor.adjustImageFormat() -// val bitmapRequestBody = -// BitmapRequestBody(requireContext(), imageUriArg, adjustedImageBitmap) - val imageUri = uploadViewModel.imageUri.value ?: return - val requestBody = UriToRequestBody(requireContext(), imageUri) - uploadViewModel.updateRequestBody(requestBody) +// val requestBody = UriToRequestBody(requireContext(), imageUri) + + val compressor = ImageCompressor(requireContext(), imageUri) + val adjustedImageBitmap = compressor.adjustImageFormat() + val bitmapRequestBody = + BitmapRequestBody(requireContext(), imageUri, adjustedImageBitmap) + + uploadViewModel.updateRequestBody(bitmapRequestBody) } private fun initUploadButtonClickListener() { diff --git a/app/src/main/java/com/go/sopt/winey/presentation/main/feed/upload/ContentFragment.kt b/app/src/main/java/org/go/sopt/winey/presentation/main/feed/upload/ContentFragment.kt similarity index 86% rename from app/src/main/java/com/go/sopt/winey/presentation/main/feed/upload/ContentFragment.kt rename to app/src/main/java/org/go/sopt/winey/presentation/main/feed/upload/ContentFragment.kt index 8693e05d..d171db19 100644 --- a/app/src/main/java/com/go/sopt/winey/presentation/main/feed/upload/ContentFragment.kt +++ b/app/src/main/java/org/go/sopt/winey/presentation/main/feed/upload/ContentFragment.kt @@ -1,15 +1,15 @@ -package com.go.sopt.winey.presentation.main.feed.upload +package org.go.sopt.winey.presentation.main.feed.upload import android.os.Bundle import android.view.View import androidx.fragment.app.activityViewModels import androidx.fragment.app.commit -import com.go.sopt.winey.R -import com.go.sopt.winey.databinding.FragmentContentBinding -import com.go.sopt.winey.util.amplitude.AmplitudeUtils -import com.go.sopt.winey.util.binding.BindingFragment -import com.go.sopt.winey.util.context.hideKeyboard import dagger.hilt.android.AndroidEntryPoint +import org.go.sopt.winey.R +import org.go.sopt.winey.databinding.FragmentContentBinding +import org.go.sopt.winey.util.amplitude.AmplitudeUtils +import org.go.sopt.winey.util.binding.BindingFragment +import org.go.sopt.winey.util.context.hideKeyboard import org.json.JSONException import org.json.JSONObject import javax.inject.Inject diff --git a/app/src/main/java/com/go/sopt/winey/presentation/main/feed/upload/PhotoFragment.kt b/app/src/main/java/org/go/sopt/winey/presentation/main/feed/upload/PhotoFragment.kt similarity index 91% rename from app/src/main/java/com/go/sopt/winey/presentation/main/feed/upload/PhotoFragment.kt rename to app/src/main/java/org/go/sopt/winey/presentation/main/feed/upload/PhotoFragment.kt index cb728d00..2db42862 100644 --- a/app/src/main/java/com/go/sopt/winey/presentation/main/feed/upload/PhotoFragment.kt +++ b/app/src/main/java/org/go/sopt/winey/presentation/main/feed/upload/PhotoFragment.kt @@ -1,4 +1,4 @@ -package com.go.sopt.winey.presentation.main.feed.upload +package org.go.sopt.winey.presentation.main.feed.upload import android.os.Bundle import android.view.View @@ -6,13 +6,13 @@ import androidx.activity.OnBackPressedCallback import androidx.activity.result.contract.ActivityResultContracts import androidx.fragment.app.activityViewModels import androidx.fragment.app.commit -import com.go.sopt.winey.R -import com.go.sopt.winey.databinding.FragmentPhotoBinding -import com.go.sopt.winey.util.amplitude.AmplitudeUtils -import com.go.sopt.winey.util.binding.BindingFragment -import com.go.sopt.winey.util.fragment.WineyDialogFragment -import com.go.sopt.winey.util.fragment.stringOf import dagger.hilt.android.AndroidEntryPoint +import org.go.sopt.winey.R +import org.go.sopt.winey.databinding.FragmentPhotoBinding +import org.go.sopt.winey.util.amplitude.AmplitudeUtils +import org.go.sopt.winey.util.binding.BindingFragment +import org.go.sopt.winey.util.fragment.WineyDialogFragment +import org.go.sopt.winey.util.fragment.stringOf import org.json.JSONException import org.json.JSONObject import javax.inject.Inject diff --git a/app/src/main/java/com/go/sopt/winey/presentation/main/feed/upload/UploadActivity.kt b/app/src/main/java/org/go/sopt/winey/presentation/main/feed/upload/UploadActivity.kt similarity index 75% rename from app/src/main/java/com/go/sopt/winey/presentation/main/feed/upload/UploadActivity.kt rename to app/src/main/java/org/go/sopt/winey/presentation/main/feed/upload/UploadActivity.kt index 7504ba7c..7e50e30c 100644 --- a/app/src/main/java/com/go/sopt/winey/presentation/main/feed/upload/UploadActivity.kt +++ b/app/src/main/java/org/go/sopt/winey/presentation/main/feed/upload/UploadActivity.kt @@ -1,11 +1,11 @@ -package com.go.sopt.winey.presentation.main.feed.upload +package org.go.sopt.winey.presentation.main.feed.upload import android.os.Bundle import androidx.fragment.app.commit -import com.go.sopt.winey.R -import com.go.sopt.winey.databinding.ActivityUploadBinding -import com.go.sopt.winey.util.binding.BindingActivity import dagger.hilt.android.AndroidEntryPoint +import org.go.sopt.winey.R +import org.go.sopt.winey.databinding.ActivityUploadBinding +import org.go.sopt.winey.util.binding.BindingActivity @AndroidEntryPoint class UploadActivity : BindingActivity(R.layout.activity_upload) { diff --git a/app/src/main/java/com/go/sopt/winey/presentation/main/feed/upload/UploadViewModel.kt b/app/src/main/java/org/go/sopt/winey/presentation/main/feed/upload/UploadViewModel.kt similarity index 91% rename from app/src/main/java/com/go/sopt/winey/presentation/main/feed/upload/UploadViewModel.kt rename to app/src/main/java/org/go/sopt/winey/presentation/main/feed/upload/UploadViewModel.kt index 7a2c9dcc..ed52587e 100644 --- a/app/src/main/java/com/go/sopt/winey/presentation/main/feed/upload/UploadViewModel.kt +++ b/app/src/main/java/org/go/sopt/winey/presentation/main/feed/upload/UploadViewModel.kt @@ -1,14 +1,8 @@ -package com.go.sopt.winey.presentation.main.feed.upload +package org.go.sopt.winey.presentation.main.feed.upload import android.net.Uri import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import com.go.sopt.winey.data.model.remote.response.ResponsePostWineyFeedDto -import com.go.sopt.winey.domain.repository.FeedRepository -import com.go.sopt.winey.util.code.ErrorCode.CODE_INVALID_LENGTH -import com.go.sopt.winey.util.multipart.UriToRequestBody -import com.go.sopt.winey.util.view.InputUiState -import com.go.sopt.winey.util.view.UiState import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.SharingStarted @@ -21,6 +15,12 @@ import okhttp3.MediaType.Companion.toMediaTypeOrNull import okhttp3.MultipartBody import okhttp3.RequestBody import okhttp3.RequestBody.Companion.toRequestBody +import org.go.sopt.winey.data.model.remote.response.ResponsePostWineyFeedDto +import org.go.sopt.winey.domain.repository.FeedRepository +import org.go.sopt.winey.util.code.ErrorCode +import org.go.sopt.winey.util.multipart.BitmapRequestBody +import org.go.sopt.winey.util.view.InputUiState +import org.go.sopt.winey.util.view.UiState import retrofit2.HttpException import timber.log.Timber import javax.inject.Inject @@ -65,7 +65,7 @@ class UploadViewModel @Inject constructor( private fun updateInputUiState(content: String): InputUiState { if (content.isBlank()) return InputUiState.Empty if (!checkContentLength((content))) { - return InputUiState.Failure(CODE_INVALID_LENGTH) + return InputUiState.Failure(ErrorCode.CODE_INVALID_LENGTH) } return InputUiState.Success } @@ -96,13 +96,13 @@ class UploadViewModel @Inject constructor( private fun checkAmountRange(amountNumber: Long) = amountNumber in MIN_AMOUNT..MAX_AMOUNT /** Multipart */ - private var imageRequestBody: UriToRequestBody? = null + private var imageRequestBody: BitmapRequestBody? = null private val _postWineyFeedState = MutableStateFlow>(UiState.Empty) val postWineyFeedState: StateFlow> = _postWineyFeedState.asStateFlow() - fun updateRequestBody(requestBody: UriToRequestBody) { + fun updateRequestBody(requestBody: BitmapRequestBody) { this.imageRequestBody = requestBody } diff --git a/app/src/main/java/com/go/sopt/winey/presentation/main/feed/upload/loading/LoadingActivity.kt b/app/src/main/java/org/go/sopt/winey/presentation/main/feed/upload/loading/LoadingActivity.kt similarity index 91% rename from app/src/main/java/com/go/sopt/winey/presentation/main/feed/upload/loading/LoadingActivity.kt rename to app/src/main/java/org/go/sopt/winey/presentation/main/feed/upload/loading/LoadingActivity.kt index afe4857d..be19616b 100644 --- a/app/src/main/java/com/go/sopt/winey/presentation/main/feed/upload/loading/LoadingActivity.kt +++ b/app/src/main/java/org/go/sopt/winey/presentation/main/feed/upload/loading/LoadingActivity.kt @@ -1,15 +1,15 @@ -package com.go.sopt.winey.presentation.main.feed.upload.loading +package org.go.sopt.winey.presentation.main.feed.upload.loading import android.content.Intent import android.os.Bundle import android.view.View import androidx.lifecycle.lifecycleScope -import com.go.sopt.winey.R -import com.go.sopt.winey.databinding.ActivityLoadingBinding -import com.go.sopt.winey.presentation.main.MainActivity -import com.go.sopt.winey.util.binding.BindingActivity import kotlinx.coroutines.delay import kotlinx.coroutines.launch +import org.go.sopt.winey.R +import org.go.sopt.winey.databinding.ActivityLoadingBinding +import org.go.sopt.winey.presentation.main.MainActivity +import org.go.sopt.winey.util.binding.BindingActivity class LoadingActivity : BindingActivity(R.layout.activity_loading) { private val amountString by lazy { intent.extras?.getString(EXTRA_AMOUNT_KEY, "") } diff --git a/app/src/main/java/com/go/sopt/winey/presentation/main/mypage/MyPageFragment.kt b/app/src/main/java/org/go/sopt/winey/presentation/main/mypage/MyPageFragment.kt similarity index 90% rename from app/src/main/java/com/go/sopt/winey/presentation/main/mypage/MyPageFragment.kt rename to app/src/main/java/org/go/sopt/winey/presentation/main/mypage/MyPageFragment.kt index ce838525..09559145 100644 --- a/app/src/main/java/com/go/sopt/winey/presentation/main/mypage/MyPageFragment.kt +++ b/app/src/main/java/org/go/sopt/winey/presentation/main/mypage/MyPageFragment.kt @@ -1,4 +1,4 @@ -package com.go.sopt.winey.presentation.main.mypage +package org.go.sopt.winey.presentation.main.mypage import android.content.Intent import android.net.Uri @@ -12,28 +12,28 @@ import androidx.fragment.app.replace import androidx.fragment.app.viewModels import androidx.lifecycle.flowWithLifecycle import androidx.lifecycle.lifecycleScope -import com.go.sopt.winey.R -import com.go.sopt.winey.databinding.FragmentMyPageBinding -import com.go.sopt.winey.domain.entity.User -import com.go.sopt.winey.domain.repository.DataStoreRepository -import com.go.sopt.winey.presentation.main.MainViewModel -import com.go.sopt.winey.presentation.main.mypage.myfeed.MyFeedFragment -import com.go.sopt.winey.presentation.main.notification.NotificationActivity -import com.go.sopt.winey.presentation.nickname.NicknameActivity -import com.go.sopt.winey.presentation.onboarding.guide.GuideActivity -import com.go.sopt.winey.util.amplitude.AmplitudeUtils -import com.go.sopt.winey.util.binding.BindingFragment -import com.go.sopt.winey.util.fragment.WineyDialogFragment -import com.go.sopt.winey.util.fragment.snackBar -import com.go.sopt.winey.util.fragment.stringOf -import com.go.sopt.winey.util.fragment.viewLifeCycle -import com.go.sopt.winey.util.fragment.viewLifeCycleScope -import com.go.sopt.winey.util.view.UiState -import com.go.sopt.winey.util.view.setOnSingleClickListener import dagger.hilt.android.AndroidEntryPoint import kotlinx.coroutines.flow.first import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.onEach +import org.go.sopt.winey.R +import org.go.sopt.winey.databinding.FragmentMyPageBinding +import org.go.sopt.winey.domain.entity.User +import org.go.sopt.winey.domain.repository.DataStoreRepository +import org.go.sopt.winey.presentation.main.MainViewModel +import org.go.sopt.winey.presentation.main.mypage.myfeed.MyFeedFragment +import org.go.sopt.winey.presentation.main.notification.NotificationActivity +import org.go.sopt.winey.presentation.nickname.NicknameActivity +import org.go.sopt.winey.presentation.onboarding.guide.GuideActivity +import org.go.sopt.winey.util.amplitude.AmplitudeUtils +import org.go.sopt.winey.util.binding.BindingFragment +import org.go.sopt.winey.util.fragment.WineyDialogFragment +import org.go.sopt.winey.util.fragment.snackBar +import org.go.sopt.winey.util.fragment.stringOf +import org.go.sopt.winey.util.fragment.viewLifeCycle +import org.go.sopt.winey.util.fragment.viewLifeCycleScope +import org.go.sopt.winey.util.view.UiState +import org.go.sopt.winey.util.view.setOnSingleClickListener import javax.inject.Inject @AndroidEntryPoint diff --git a/app/src/main/java/com/go/sopt/winey/presentation/main/mypage/MyPageNotOverDialogFragment.kt b/app/src/main/java/org/go/sopt/winey/presentation/main/mypage/MyPageNotOverDialogFragment.kt similarity index 76% rename from app/src/main/java/com/go/sopt/winey/presentation/main/mypage/MyPageNotOverDialogFragment.kt rename to app/src/main/java/org/go/sopt/winey/presentation/main/mypage/MyPageNotOverDialogFragment.kt index f6a0cbbb..455459cb 100644 --- a/app/src/main/java/com/go/sopt/winey/presentation/main/mypage/MyPageNotOverDialogFragment.kt +++ b/app/src/main/java/org/go/sopt/winey/presentation/main/mypage/MyPageNotOverDialogFragment.kt @@ -1,10 +1,10 @@ -package com.go.sopt.winey.presentation.main.mypage +package org.go.sopt.winey.presentation.main.mypage import android.os.Bundle import android.view.View -import com.go.sopt.winey.R -import com.go.sopt.winey.databinding.FragmentMypageNotOverDialogBinding -import com.go.sopt.winey.util.binding.BindingDialogFragment +import org.go.sopt.winey.R +import org.go.sopt.winey.databinding.FragmentMypageNotOverDialogBinding +import org.go.sopt.winey.util.binding.BindingDialogFragment class MyPageNotOverDialogFragment : BindingDialogFragment(R.layout.fragment_mypage_not_over_dialog) { diff --git a/app/src/main/java/com/go/sopt/winey/presentation/main/mypage/MyPageViewModel.kt b/app/src/main/java/org/go/sopt/winey/presentation/main/mypage/MyPageViewModel.kt similarity index 87% rename from app/src/main/java/com/go/sopt/winey/presentation/main/mypage/MyPageViewModel.kt rename to app/src/main/java/org/go/sopt/winey/presentation/main/mypage/MyPageViewModel.kt index 92ad4c99..6ff87f59 100644 --- a/app/src/main/java/com/go/sopt/winey/presentation/main/mypage/MyPageViewModel.kt +++ b/app/src/main/java/org/go/sopt/winey/presentation/main/mypage/MyPageViewModel.kt @@ -1,15 +1,15 @@ -package com.go.sopt.winey.presentation.main.mypage +package org.go.sopt.winey.presentation.main.mypage import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import com.go.sopt.winey.domain.repository.AuthRepository -import com.go.sopt.winey.domain.repository.DataStoreRepository -import com.go.sopt.winey.util.view.UiState import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.asStateFlow import kotlinx.coroutines.launch +import org.go.sopt.winey.domain.repository.AuthRepository +import org.go.sopt.winey.domain.repository.DataStoreRepository +import org.go.sopt.winey.util.view.UiState import retrofit2.HttpException import timber.log.Timber import javax.inject.Inject diff --git a/app/src/main/java/com/go/sopt/winey/presentation/main/mypage/MypageHelpActivity.kt b/app/src/main/java/org/go/sopt/winey/presentation/main/mypage/MypageHelpActivity.kt similarity index 65% rename from app/src/main/java/com/go/sopt/winey/presentation/main/mypage/MypageHelpActivity.kt rename to app/src/main/java/org/go/sopt/winey/presentation/main/mypage/MypageHelpActivity.kt index ed49c92d..35380876 100644 --- a/app/src/main/java/com/go/sopt/winey/presentation/main/mypage/MypageHelpActivity.kt +++ b/app/src/main/java/org/go/sopt/winey/presentation/main/mypage/MypageHelpActivity.kt @@ -1,9 +1,9 @@ -package com.go.sopt.winey.presentation.main.mypage +package org.go.sopt.winey.presentation.main.mypage import android.os.Bundle -import com.go.sopt.winey.R -import com.go.sopt.winey.databinding.ActivityMypageHelpBinding -import com.go.sopt.winey.util.binding.BindingActivity +import org.go.sopt.winey.R +import org.go.sopt.winey.databinding.ActivityMypageHelpBinding +import org.go.sopt.winey.util.binding.BindingActivity class MypageHelpActivity : BindingActivity(R.layout.activity_mypage_help) { @@ -14,7 +14,7 @@ class MypageHelpActivity : initBtnEvent() } - fun initBtnEvent() { + private fun initBtnEvent() { binding.btnHelpBack.setOnClickListener { finish() } diff --git a/app/src/main/java/com/go/sopt/winey/presentation/main/mypage/TargetAmountBottomSheetFragment.kt b/app/src/main/java/org/go/sopt/winey/presentation/main/mypage/TargetAmountBottomSheetFragment.kt similarity index 94% rename from app/src/main/java/com/go/sopt/winey/presentation/main/mypage/TargetAmountBottomSheetFragment.kt rename to app/src/main/java/org/go/sopt/winey/presentation/main/mypage/TargetAmountBottomSheetFragment.kt index 19c2ed9d..f41ca80b 100644 --- a/app/src/main/java/com/go/sopt/winey/presentation/main/mypage/TargetAmountBottomSheetFragment.kt +++ b/app/src/main/java/org/go/sopt/winey/presentation/main/mypage/TargetAmountBottomSheetFragment.kt @@ -1,4 +1,4 @@ -package com.go.sopt.winey.presentation.main.mypage +package org.go.sopt.winey.presentation.main.mypage import android.graphics.Color import android.os.Bundle @@ -10,20 +10,20 @@ import androidx.coordinatorlayout.widget.CoordinatorLayout import androidx.fragment.app.activityViewModels import androidx.fragment.app.viewModels import androidx.lifecycle.flowWithLifecycle -import com.go.sopt.winey.R -import com.go.sopt.winey.databinding.FragmentTargetAmountBottomSheetBinding -import com.go.sopt.winey.presentation.main.MainViewModel -import com.go.sopt.winey.util.binding.BindingBottomSheetDialogFragment -import com.go.sopt.winey.util.context.colorOf -import com.go.sopt.winey.util.context.hideKeyboard -import com.go.sopt.winey.util.fragment.snackBar -import com.go.sopt.winey.util.fragment.viewLifeCycle -import com.go.sopt.winey.util.fragment.viewLifeCycleScope -import com.go.sopt.winey.util.view.UiState import com.google.android.material.bottomsheet.BottomSheetBehavior import dagger.hilt.android.AndroidEntryPoint import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.onEach +import org.go.sopt.winey.R +import org.go.sopt.winey.databinding.FragmentTargetAmountBottomSheetBinding +import org.go.sopt.winey.presentation.main.MainViewModel +import org.go.sopt.winey.util.binding.BindingBottomSheetDialogFragment +import org.go.sopt.winey.util.context.colorOf +import org.go.sopt.winey.util.context.hideKeyboard +import org.go.sopt.winey.util.fragment.snackBar +import org.go.sopt.winey.util.fragment.viewLifeCycle +import org.go.sopt.winey.util.fragment.viewLifeCycleScope +import org.go.sopt.winey.util.view.UiState import java.text.DecimalFormat @AndroidEntryPoint diff --git a/app/src/main/java/com/go/sopt/winey/presentation/main/mypage/TargetAmountViewModel.kt b/app/src/main/java/org/go/sopt/winey/presentation/main/mypage/TargetAmountViewModel.kt similarity index 93% rename from app/src/main/java/com/go/sopt/winey/presentation/main/mypage/TargetAmountViewModel.kt rename to app/src/main/java/org/go/sopt/winey/presentation/main/mypage/TargetAmountViewModel.kt index ad5530dd..0c37dc8a 100644 --- a/app/src/main/java/com/go/sopt/winey/presentation/main/mypage/TargetAmountViewModel.kt +++ b/app/src/main/java/org/go/sopt/winey/presentation/main/mypage/TargetAmountViewModel.kt @@ -1,18 +1,18 @@ -package com.go.sopt.winey.presentation.main.mypage +package org.go.sopt.winey.presentation.main.mypage import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import com.go.sopt.winey.data.model.remote.request.RequestCreateGoalDto -import com.go.sopt.winey.domain.entity.Goal -import com.go.sopt.winey.domain.repository.AuthRepository -import com.go.sopt.winey.util.view.UiState import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.asStateFlow import kotlinx.coroutines.launch +import org.go.sopt.winey.data.model.remote.request.RequestCreateGoalDto +import org.go.sopt.winey.domain.entity.Goal +import org.go.sopt.winey.domain.repository.AuthRepository +import org.go.sopt.winey.util.view.UiState import retrofit2.HttpException import timber.log.Timber import javax.inject.Inject diff --git a/app/src/main/java/com/go/sopt/winey/presentation/main/mypage/myfeed/MyFeedAdapter.kt b/app/src/main/java/org/go/sopt/winey/presentation/main/mypage/myfeed/MyFeedAdapter.kt similarity index 89% rename from app/src/main/java/com/go/sopt/winey/presentation/main/mypage/myfeed/MyFeedAdapter.kt rename to app/src/main/java/org/go/sopt/winey/presentation/main/mypage/myfeed/MyFeedAdapter.kt index c57554b4..7b817fea 100644 --- a/app/src/main/java/com/go/sopt/winey/presentation/main/mypage/myfeed/MyFeedAdapter.kt +++ b/app/src/main/java/org/go/sopt/winey/presentation/main/mypage/myfeed/MyFeedAdapter.kt @@ -1,14 +1,14 @@ -package com.go.sopt.winey.presentation.main.mypage.myfeed +package org.go.sopt.winey.presentation.main.mypage.myfeed import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import androidx.paging.PagingDataAdapter import androidx.recyclerview.widget.RecyclerView -import com.go.sopt.winey.databinding.ItemMyfeedPostBinding -import com.go.sopt.winey.domain.entity.WineyFeed -import com.go.sopt.winey.util.view.ItemDiffCallback -import com.go.sopt.winey.util.view.setOnSingleClickListener +import org.go.sopt.winey.databinding.ItemMyfeedPostBinding +import org.go.sopt.winey.domain.entity.WineyFeed +import org.go.sopt.winey.util.view.ItemDiffCallback +import org.go.sopt.winey.util.view.setOnSingleClickListener class MyFeedAdapter( private val onlikeButtonClicked: (WineyFeed) -> Unit, diff --git a/app/src/main/java/com/go/sopt/winey/presentation/main/mypage/myfeed/MyFeedFragment.kt b/app/src/main/java/org/go/sopt/winey/presentation/main/mypage/myfeed/MyFeedFragment.kt similarity index 90% rename from app/src/main/java/com/go/sopt/winey/presentation/main/mypage/myfeed/MyFeedFragment.kt rename to app/src/main/java/org/go/sopt/winey/presentation/main/mypage/myfeed/MyFeedFragment.kt index dfce263f..8d2dd317 100644 --- a/app/src/main/java/com/go/sopt/winey/presentation/main/mypage/myfeed/MyFeedFragment.kt +++ b/app/src/main/java/org/go/sopt/winey/presentation/main/mypage/myfeed/MyFeedFragment.kt @@ -1,4 +1,4 @@ -package com.go.sopt.winey.presentation.main.mypage.myfeed +package org.go.sopt.winey.presentation.main.mypage.myfeed import android.content.Intent import android.os.Bundle @@ -17,28 +17,28 @@ import androidx.lifecycle.repeatOnLifecycle import androidx.paging.LoadState import androidx.paging.PagingData import androidx.recyclerview.widget.SimpleItemAnimator -import com.go.sopt.winey.R -import com.go.sopt.winey.databinding.FragmentMyfeedBinding -import com.go.sopt.winey.domain.entity.WineyFeed -import com.go.sopt.winey.presentation.main.feed.WineyFeedLoadAdapter -import com.go.sopt.winey.presentation.main.feed.detail.DetailActivity -import com.go.sopt.winey.presentation.main.mypage.MyPageFragment -import com.go.sopt.winey.util.binding.BindingFragment -import com.go.sopt.winey.util.fragment.WineyDialogFragment -import com.go.sopt.winey.util.fragment.snackBar -import com.go.sopt.winey.util.fragment.stringOf -import com.go.sopt.winey.util.fragment.viewLifeCycle -import com.go.sopt.winey.util.fragment.viewLifeCycleScope -import com.go.sopt.winey.util.fragment.wineySnackbar -import com.go.sopt.winey.util.view.UiState -import com.go.sopt.winey.util.view.WineyPopupMenu -import com.go.sopt.winey.util.view.setOnSingleClickListener import com.google.android.material.bottomnavigation.BottomNavigationView import dagger.hilt.android.AndroidEntryPoint import kotlinx.coroutines.flow.collectLatest import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.onEach import kotlinx.coroutines.launch +import org.go.sopt.winey.R +import org.go.sopt.winey.databinding.FragmentMyfeedBinding +import org.go.sopt.winey.domain.entity.WineyFeed +import org.go.sopt.winey.presentation.main.feed.WineyFeedLoadAdapter +import org.go.sopt.winey.presentation.main.feed.detail.DetailActivity +import org.go.sopt.winey.presentation.main.mypage.MyPageFragment +import org.go.sopt.winey.util.binding.BindingFragment +import org.go.sopt.winey.util.fragment.WineyDialogFragment +import org.go.sopt.winey.util.fragment.snackBar +import org.go.sopt.winey.util.fragment.stringOf +import org.go.sopt.winey.util.fragment.viewLifeCycle +import org.go.sopt.winey.util.fragment.viewLifeCycleScope +import org.go.sopt.winey.util.fragment.wineySnackbar +import org.go.sopt.winey.util.view.UiState +import org.go.sopt.winey.util.view.WineyPopupMenu +import org.go.sopt.winey.util.view.setOnSingleClickListener import timber.log.Timber @AndroidEntryPoint diff --git a/app/src/main/java/com/go/sopt/winey/presentation/main/mypage/myfeed/MyFeedViewModel.kt b/app/src/main/java/org/go/sopt/winey/presentation/main/mypage/myfeed/MyFeedViewModel.kt similarity index 91% rename from app/src/main/java/com/go/sopt/winey/presentation/main/mypage/myfeed/MyFeedViewModel.kt rename to app/src/main/java/org/go/sopt/winey/presentation/main/mypage/myfeed/MyFeedViewModel.kt index ccacee6d..831554a9 100644 --- a/app/src/main/java/com/go/sopt/winey/presentation/main/mypage/myfeed/MyFeedViewModel.kt +++ b/app/src/main/java/org/go/sopt/winey/presentation/main/mypage/myfeed/MyFeedViewModel.kt @@ -1,20 +1,20 @@ -package com.go.sopt.winey.presentation.main.mypage.myfeed +package org.go.sopt.winey.presentation.main.mypage.myfeed import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import androidx.paging.PagingData import androidx.paging.cachedIn -import com.go.sopt.winey.data.model.remote.request.RequestPostLikeDto -import com.go.sopt.winey.domain.entity.Like -import com.go.sopt.winey.domain.entity.WineyFeed -import com.go.sopt.winey.domain.repository.FeedRepository -import com.go.sopt.winey.util.view.UiState import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.asStateFlow import kotlinx.coroutines.flow.collectLatest import kotlinx.coroutines.launch +import org.go.sopt.winey.data.model.remote.request.RequestPostLikeDto +import org.go.sopt.winey.domain.entity.Like +import org.go.sopt.winey.domain.entity.WineyFeed +import org.go.sopt.winey.domain.repository.FeedRepository +import org.go.sopt.winey.util.view.UiState import retrofit2.HttpException import timber.log.Timber import javax.inject.Inject diff --git a/app/src/main/java/com/go/sopt/winey/presentation/main/notification/NotificationActivity.kt b/app/src/main/java/org/go/sopt/winey/presentation/main/notification/NotificationActivity.kt similarity index 85% rename from app/src/main/java/com/go/sopt/winey/presentation/main/notification/NotificationActivity.kt rename to app/src/main/java/org/go/sopt/winey/presentation/main/notification/NotificationActivity.kt index fc6ae723..a2d033ea 100644 --- a/app/src/main/java/com/go/sopt/winey/presentation/main/notification/NotificationActivity.kt +++ b/app/src/main/java/org/go/sopt/winey/presentation/main/notification/NotificationActivity.kt @@ -1,21 +1,21 @@ -package com.go.sopt.winey.presentation.main.notification +package org.go.sopt.winey.presentation.main.notification import android.content.Intent import android.os.Bundle import androidx.activity.viewModels import androidx.lifecycle.flowWithLifecycle import androidx.lifecycle.lifecycleScope -import com.go.sopt.winey.R -import com.go.sopt.winey.databinding.ActivityNotificationBinding -import com.go.sopt.winey.presentation.main.MainActivity -import com.go.sopt.winey.presentation.main.feed.detail.DetailActivity -import com.go.sopt.winey.presentation.main.mypage.MypageHelpActivity -import com.go.sopt.winey.util.binding.BindingActivity -import com.go.sopt.winey.util.context.snackBar -import com.go.sopt.winey.util.view.UiState import dagger.hilt.android.AndroidEntryPoint import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.onEach +import org.go.sopt.winey.R +import org.go.sopt.winey.databinding.ActivityNotificationBinding +import org.go.sopt.winey.presentation.main.MainActivity +import org.go.sopt.winey.presentation.main.feed.detail.DetailActivity +import org.go.sopt.winey.presentation.main.mypage.MypageHelpActivity +import org.go.sopt.winey.util.binding.BindingActivity +import org.go.sopt.winey.util.context.snackBar +import org.go.sopt.winey.util.view.UiState @AndroidEntryPoint class NotificationActivity : diff --git a/app/src/main/java/com/go/sopt/winey/presentation/main/notification/NotificationAdapter.kt b/app/src/main/java/org/go/sopt/winey/presentation/main/notification/NotificationAdapter.kt similarity index 91% rename from app/src/main/java/com/go/sopt/winey/presentation/main/notification/NotificationAdapter.kt rename to app/src/main/java/org/go/sopt/winey/presentation/main/notification/NotificationAdapter.kt index 0cf57a11..fc64b61a 100644 --- a/app/src/main/java/com/go/sopt/winey/presentation/main/notification/NotificationAdapter.kt +++ b/app/src/main/java/org/go/sopt/winey/presentation/main/notification/NotificationAdapter.kt @@ -1,12 +1,12 @@ -package com.go.sopt.winey.presentation.main.notification +package org.go.sopt.winey.presentation.main.notification import android.view.LayoutInflater import android.view.ViewGroup import androidx.recyclerview.widget.ListAdapter import androidx.recyclerview.widget.RecyclerView -import com.go.sopt.winey.databinding.ItemNotificationPostBinding -import com.go.sopt.winey.domain.entity.Notification -import com.go.sopt.winey.util.view.ItemDiffCallback +import org.go.sopt.winey.databinding.ItemNotificationPostBinding +import org.go.sopt.winey.domain.entity.Notification +import org.go.sopt.winey.util.view.ItemDiffCallback class NotificationAdapter( private val navigateFeedDetail: (feedId: Int?) -> Unit, diff --git a/app/src/main/java/com/go/sopt/winey/presentation/main/notification/NotificationViewModel.kt b/app/src/main/java/org/go/sopt/winey/presentation/main/notification/NotificationViewModel.kt similarity index 86% rename from app/src/main/java/com/go/sopt/winey/presentation/main/notification/NotificationViewModel.kt rename to app/src/main/java/org/go/sopt/winey/presentation/main/notification/NotificationViewModel.kt index d1e9b84a..384ee3e7 100644 --- a/app/src/main/java/com/go/sopt/winey/presentation/main/notification/NotificationViewModel.kt +++ b/app/src/main/java/org/go/sopt/winey/presentation/main/notification/NotificationViewModel.kt @@ -1,15 +1,15 @@ -package com.go.sopt.winey.presentation.main.notification +package org.go.sopt.winey.presentation.main.notification import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import com.go.sopt.winey.domain.entity.Notification -import com.go.sopt.winey.domain.repository.NotificationRepository -import com.go.sopt.winey.util.view.UiState import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.asStateFlow import kotlinx.coroutines.launch +import org.go.sopt.winey.domain.entity.Notification +import org.go.sopt.winey.domain.repository.NotificationRepository +import org.go.sopt.winey.util.view.UiState import retrofit2.HttpException import timber.log.Timber import javax.inject.Inject diff --git a/app/src/main/java/com/go/sopt/winey/presentation/main/recommend/RecommendAdapter.kt b/app/src/main/java/org/go/sopt/winey/presentation/main/recommend/RecommendAdapter.kt similarity index 84% rename from app/src/main/java/com/go/sopt/winey/presentation/main/recommend/RecommendAdapter.kt rename to app/src/main/java/org/go/sopt/winey/presentation/main/recommend/RecommendAdapter.kt index 9204c1cd..73ead67b 100644 --- a/app/src/main/java/com/go/sopt/winey/presentation/main/recommend/RecommendAdapter.kt +++ b/app/src/main/java/org/go/sopt/winey/presentation/main/recommend/RecommendAdapter.kt @@ -1,13 +1,13 @@ -package com.go.sopt.winey.presentation.main.recommend +package org.go.sopt.winey.presentation.main.recommend import android.view.LayoutInflater import android.view.ViewGroup import androidx.recyclerview.widget.ListAdapter import androidx.recyclerview.widget.RecyclerView -import com.go.sopt.winey.databinding.ItemRecommendPostBinding -import com.go.sopt.winey.domain.entity.Recommend -import com.go.sopt.winey.util.view.ItemDiffCallback -import com.go.sopt.winey.util.view.setOnSingleClickListener +import org.go.sopt.winey.databinding.ItemRecommendPostBinding +import org.go.sopt.winey.domain.entity.Recommend +import org.go.sopt.winey.util.view.ItemDiffCallback +import org.go.sopt.winey.util.view.setOnSingleClickListener class RecommendAdapter( private val onItemLinkClicked: (Int, String) -> Unit diff --git a/app/src/main/java/com/go/sopt/winey/presentation/main/recommend/RecommendFragment.kt b/app/src/main/java/org/go/sopt/winey/presentation/main/recommend/RecommendFragment.kt similarity index 87% rename from app/src/main/java/com/go/sopt/winey/presentation/main/recommend/RecommendFragment.kt rename to app/src/main/java/org/go/sopt/winey/presentation/main/recommend/RecommendFragment.kt index 7508465d..8c990383 100644 --- a/app/src/main/java/com/go/sopt/winey/presentation/main/recommend/RecommendFragment.kt +++ b/app/src/main/java/org/go/sopt/winey/presentation/main/recommend/RecommendFragment.kt @@ -1,4 +1,4 @@ -package com.go.sopt.winey.presentation.main.recommend +package org.go.sopt.winey.presentation.main.recommend import android.content.Intent import android.net.Uri @@ -9,17 +9,17 @@ import androidx.fragment.app.viewModels import androidx.lifecycle.flowWithLifecycle import androidx.lifecycle.lifecycleScope import androidx.recyclerview.widget.ConcatAdapter -import com.go.sopt.winey.R -import com.go.sopt.winey.databinding.FragmentRecommendBinding -import com.go.sopt.winey.presentation.main.MainViewModel -import com.go.sopt.winey.presentation.main.notification.NotificationActivity -import com.go.sopt.winey.util.amplitude.AmplitudeUtils -import com.go.sopt.winey.util.binding.BindingFragment -import com.go.sopt.winey.util.fragment.snackBar -import com.go.sopt.winey.util.view.UiState import dagger.hilt.android.AndroidEntryPoint import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.onEach +import org.go.sopt.winey.R +import org.go.sopt.winey.databinding.FragmentRecommendBinding +import org.go.sopt.winey.presentation.main.MainViewModel +import org.go.sopt.winey.presentation.main.notification.NotificationActivity +import org.go.sopt.winey.util.amplitude.AmplitudeUtils +import org.go.sopt.winey.util.binding.BindingFragment +import org.go.sopt.winey.util.fragment.snackBar +import org.go.sopt.winey.util.view.UiState import org.json.JSONException import org.json.JSONObject import javax.inject.Inject diff --git a/app/src/main/java/com/go/sopt/winey/presentation/main/recommend/RecommendHeaderAdapter.kt b/app/src/main/java/org/go/sopt/winey/presentation/main/recommend/RecommendHeaderAdapter.kt similarity index 87% rename from app/src/main/java/com/go/sopt/winey/presentation/main/recommend/RecommendHeaderAdapter.kt rename to app/src/main/java/org/go/sopt/winey/presentation/main/recommend/RecommendHeaderAdapter.kt index 18e5f98e..0ff52a69 100644 --- a/app/src/main/java/com/go/sopt/winey/presentation/main/recommend/RecommendHeaderAdapter.kt +++ b/app/src/main/java/org/go/sopt/winey/presentation/main/recommend/RecommendHeaderAdapter.kt @@ -1,9 +1,9 @@ -package com.go.sopt.winey.presentation.main.recommend +package org.go.sopt.winey.presentation.main.recommend import android.view.LayoutInflater import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView -import com.go.sopt.winey.databinding.ItemRecommendHeaderBinding +import org.go.sopt.winey.databinding.ItemRecommendHeaderBinding class RecommendHeaderAdapter : RecyclerView.Adapter() { diff --git a/app/src/main/java/com/go/sopt/winey/presentation/main/recommend/RecommendViewModel.kt b/app/src/main/java/org/go/sopt/winey/presentation/main/recommend/RecommendViewModel.kt similarity index 86% rename from app/src/main/java/com/go/sopt/winey/presentation/main/recommend/RecommendViewModel.kt rename to app/src/main/java/org/go/sopt/winey/presentation/main/recommend/RecommendViewModel.kt index b8bd8ddb..e5735364 100644 --- a/app/src/main/java/com/go/sopt/winey/presentation/main/recommend/RecommendViewModel.kt +++ b/app/src/main/java/org/go/sopt/winey/presentation/main/recommend/RecommendViewModel.kt @@ -1,15 +1,15 @@ -package com.go.sopt.winey.presentation.main.recommend +package org.go.sopt.winey.presentation.main.recommend import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import com.go.sopt.winey.domain.entity.Recommend -import com.go.sopt.winey.domain.repository.RecommendRepository -import com.go.sopt.winey.util.view.UiState import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.asStateFlow import kotlinx.coroutines.launch +import org.go.sopt.winey.domain.entity.Recommend +import org.go.sopt.winey.domain.repository.RecommendRepository +import org.go.sopt.winey.util.view.UiState import retrofit2.HttpException import timber.log.Timber import javax.inject.Inject diff --git a/app/src/main/java/com/go/sopt/winey/presentation/nickname/NicknameActivity.kt b/app/src/main/java/org/go/sopt/winey/presentation/nickname/NicknameActivity.kt similarity index 89% rename from app/src/main/java/com/go/sopt/winey/presentation/nickname/NicknameActivity.kt rename to app/src/main/java/org/go/sopt/winey/presentation/nickname/NicknameActivity.kt index 471c4120..5ae59af9 100644 --- a/app/src/main/java/com/go/sopt/winey/presentation/nickname/NicknameActivity.kt +++ b/app/src/main/java/org/go/sopt/winey/presentation/nickname/NicknameActivity.kt @@ -1,4 +1,4 @@ -package com.go.sopt.winey.presentation.nickname +package org.go.sopt.winey.presentation.nickname import android.app.Activity import android.content.Intent @@ -8,23 +8,23 @@ import android.text.TextWatcher import androidx.activity.viewModels import androidx.lifecycle.flowWithLifecycle import androidx.lifecycle.lifecycleScope -import com.go.sopt.winey.R -import com.go.sopt.winey.databinding.ActivityNicknameBinding -import com.go.sopt.winey.domain.repository.DataStoreRepository -import com.go.sopt.winey.presentation.main.MainActivity -import com.go.sopt.winey.util.amplitude.AmplitudeUtils -import com.go.sopt.winey.util.binding.BindingActivity -import com.go.sopt.winey.util.code.ErrorCode -import com.go.sopt.winey.util.context.hideKeyboard -import com.go.sopt.winey.util.context.snackBar -import com.go.sopt.winey.util.context.stringOf -import com.go.sopt.winey.util.view.InputUiState -import com.go.sopt.winey.util.view.UiState import dagger.hilt.android.AndroidEntryPoint import kotlinx.coroutines.flow.first import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.onEach import kotlinx.coroutines.launch +import org.go.sopt.winey.R +import org.go.sopt.winey.databinding.ActivityNicknameBinding +import org.go.sopt.winey.domain.repository.DataStoreRepository +import org.go.sopt.winey.presentation.main.MainActivity +import org.go.sopt.winey.util.amplitude.AmplitudeUtils +import org.go.sopt.winey.util.binding.BindingActivity +import org.go.sopt.winey.util.code.ErrorCode +import org.go.sopt.winey.util.context.hideKeyboard +import org.go.sopt.winey.util.context.snackBar +import org.go.sopt.winey.util.context.stringOf +import org.go.sopt.winey.util.view.InputUiState +import org.go.sopt.winey.util.view.UiState import org.json.JSONException import org.json.JSONObject import javax.inject.Inject diff --git a/app/src/main/java/com/go/sopt/winey/presentation/nickname/NicknameViewModel.kt b/app/src/main/java/org/go/sopt/winey/presentation/nickname/NicknameViewModel.kt similarity index 89% rename from app/src/main/java/com/go/sopt/winey/presentation/nickname/NicknameViewModel.kt rename to app/src/main/java/org/go/sopt/winey/presentation/nickname/NicknameViewModel.kt index c833f447..d577d4ae 100644 --- a/app/src/main/java/com/go/sopt/winey/presentation/nickname/NicknameViewModel.kt +++ b/app/src/main/java/org/go/sopt/winey/presentation/nickname/NicknameViewModel.kt @@ -1,14 +1,7 @@ -package com.go.sopt.winey.presentation.nickname +package org.go.sopt.winey.presentation.nickname import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import com.go.sopt.winey.data.model.remote.request.RequestPatchNicknameDto -import com.go.sopt.winey.domain.repository.AuthRepository -import com.go.sopt.winey.util.code.ErrorCode.CODE_DUPLICATE -import com.go.sopt.winey.util.code.ErrorCode.CODE_INVALID_LENGTH -import com.go.sopt.winey.util.code.ErrorCode.CODE_SPACE_SPECIAL_CHAR -import com.go.sopt.winey.util.view.InputUiState -import com.go.sopt.winey.util.view.UiState import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.flow.Flow @@ -19,6 +12,11 @@ import kotlinx.coroutines.flow.asStateFlow import kotlinx.coroutines.flow.map import kotlinx.coroutines.flow.stateIn import kotlinx.coroutines.launch +import org.go.sopt.winey.data.model.remote.request.RequestPatchNicknameDto +import org.go.sopt.winey.domain.repository.AuthRepository +import org.go.sopt.winey.util.code.ErrorCode +import org.go.sopt.winey.util.view.InputUiState +import org.go.sopt.winey.util.view.UiState import retrofit2.HttpException import timber.log.Timber import javax.inject.Inject @@ -108,7 +106,7 @@ class NicknameViewModel @Inject constructor( private fun showDuplicateCheckResult(isDuplicated: Boolean) { _inputUiState.value = if (isDuplicated) { - InputUiState.Failure(CODE_DUPLICATE) + InputUiState.Failure(ErrorCode.CODE_DUPLICATE) } else { InputUiState.Success } @@ -120,9 +118,9 @@ class NicknameViewModel @Inject constructor( private fun checkInputUiState(nickname: String): InputUiState { if (nickname.isEmpty()) return InputUiState.Empty - if (!checkLength(nickname)) return InputUiState.Failure(CODE_INVALID_LENGTH) + if (!checkLength(nickname)) return InputUiState.Failure(ErrorCode.CODE_INVALID_LENGTH) if (containsSpaceOrSpecialChar(nickname)) { - return InputUiState.Failure(CODE_SPACE_SPECIAL_CHAR) + return InputUiState.Failure(ErrorCode.CODE_SPACE_SPECIAL_CHAR) } return InputUiState.Empty } diff --git a/app/src/main/java/com/go/sopt/winey/presentation/onboarding/guide/GuideActivity.kt b/app/src/main/java/org/go/sopt/winey/presentation/onboarding/guide/GuideActivity.kt similarity index 87% rename from app/src/main/java/com/go/sopt/winey/presentation/onboarding/guide/GuideActivity.kt rename to app/src/main/java/org/go/sopt/winey/presentation/onboarding/guide/GuideActivity.kt index b11182a6..fe00587b 100644 --- a/app/src/main/java/com/go/sopt/winey/presentation/onboarding/guide/GuideActivity.kt +++ b/app/src/main/java/org/go/sopt/winey/presentation/onboarding/guide/GuideActivity.kt @@ -1,15 +1,15 @@ -package com.go.sopt.winey.presentation.onboarding.guide +package org.go.sopt.winey.presentation.onboarding.guide import android.content.Intent import android.os.Bundle import androidx.viewpager2.widget.ViewPager2 -import com.go.sopt.winey.R -import com.go.sopt.winey.databinding.ActivityGuideBinding -import com.go.sopt.winey.presentation.onboarding.login.LoginActivity -import com.go.sopt.winey.util.amplitude.AmplitudeUtils -import com.go.sopt.winey.util.binding.BindingActivity -import com.go.sopt.winey.util.context.stringOf import dagger.hilt.android.AndroidEntryPoint +import org.go.sopt.winey.R +import org.go.sopt.winey.databinding.ActivityGuideBinding +import org.go.sopt.winey.presentation.onboarding.login.LoginActivity +import org.go.sopt.winey.util.amplitude.AmplitudeUtils +import org.go.sopt.winey.util.binding.BindingActivity +import org.go.sopt.winey.util.context.stringOf import org.json.JSONException import org.json.JSONObject import javax.inject.Inject diff --git a/app/src/main/java/com/go/sopt/winey/presentation/onboarding/guide/GuideFragmentStateAdapter.kt b/app/src/main/java/org/go/sopt/winey/presentation/onboarding/guide/GuideFragmentStateAdapter.kt similarity index 89% rename from app/src/main/java/com/go/sopt/winey/presentation/onboarding/guide/GuideFragmentStateAdapter.kt rename to app/src/main/java/org/go/sopt/winey/presentation/onboarding/guide/GuideFragmentStateAdapter.kt index abf3d664..9e5dad81 100644 --- a/app/src/main/java/com/go/sopt/winey/presentation/onboarding/guide/GuideFragmentStateAdapter.kt +++ b/app/src/main/java/org/go/sopt/winey/presentation/onboarding/guide/GuideFragmentStateAdapter.kt @@ -1,4 +1,4 @@ -package com.go.sopt.winey.presentation.onboarding.guide +package org.go.sopt.winey.presentation.onboarding.guide import androidx.fragment.app.Fragment import androidx.fragment.app.FragmentActivity diff --git a/app/src/main/java/com/go/sopt/winey/presentation/onboarding/guide/LevelGuideFragment.kt b/app/src/main/java/org/go/sopt/winey/presentation/onboarding/guide/LevelGuideFragment.kt similarity index 59% rename from app/src/main/java/com/go/sopt/winey/presentation/onboarding/guide/LevelGuideFragment.kt rename to app/src/main/java/org/go/sopt/winey/presentation/onboarding/guide/LevelGuideFragment.kt index 46fdf3bb..1e9bd11e 100644 --- a/app/src/main/java/com/go/sopt/winey/presentation/onboarding/guide/LevelGuideFragment.kt +++ b/app/src/main/java/org/go/sopt/winey/presentation/onboarding/guide/LevelGuideFragment.kt @@ -1,10 +1,10 @@ -package com.go.sopt.winey.presentation.onboarding.guide +package org.go.sopt.winey.presentation.onboarding.guide import android.os.Bundle import android.view.View -import com.go.sopt.winey.R -import com.go.sopt.winey.databinding.FragmentLevelGuideBinding -import com.go.sopt.winey.util.binding.BindingFragment +import org.go.sopt.winey.R +import org.go.sopt.winey.databinding.FragmentLevelGuideBinding +import org.go.sopt.winey.util.binding.BindingFragment class LevelGuideFragment : BindingFragment(R.layout.fragment_level_guide) { diff --git a/app/src/main/java/com/go/sopt/winey/presentation/onboarding/guide/RecommendGuideFragment.kt b/app/src/main/java/org/go/sopt/winey/presentation/onboarding/guide/RecommendGuideFragment.kt similarity index 60% rename from app/src/main/java/com/go/sopt/winey/presentation/onboarding/guide/RecommendGuideFragment.kt rename to app/src/main/java/org/go/sopt/winey/presentation/onboarding/guide/RecommendGuideFragment.kt index eea8f735..ec29dcda 100644 --- a/app/src/main/java/com/go/sopt/winey/presentation/onboarding/guide/RecommendGuideFragment.kt +++ b/app/src/main/java/org/go/sopt/winey/presentation/onboarding/guide/RecommendGuideFragment.kt @@ -1,10 +1,10 @@ -package com.go.sopt.winey.presentation.onboarding.guide +package org.go.sopt.winey.presentation.onboarding.guide import android.os.Bundle import android.view.View -import com.go.sopt.winey.R -import com.go.sopt.winey.databinding.FragmentRecommendGuideBinding -import com.go.sopt.winey.util.binding.BindingFragment +import org.go.sopt.winey.R +import org.go.sopt.winey.databinding.FragmentRecommendGuideBinding +import org.go.sopt.winey.util.binding.BindingFragment class RecommendGuideFragment : BindingFragment(R.layout.fragment_recommend_guide) { override fun onViewCreated(view: View, savedInstanceState: Bundle?) { diff --git a/app/src/main/java/com/go/sopt/winey/presentation/onboarding/guide/WineyFeedGuideFragment.kt b/app/src/main/java/org/go/sopt/winey/presentation/onboarding/guide/WineyFeedGuideFragment.kt similarity index 60% rename from app/src/main/java/com/go/sopt/winey/presentation/onboarding/guide/WineyFeedGuideFragment.kt rename to app/src/main/java/org/go/sopt/winey/presentation/onboarding/guide/WineyFeedGuideFragment.kt index dc0c0a5f..08bf0049 100644 --- a/app/src/main/java/com/go/sopt/winey/presentation/onboarding/guide/WineyFeedGuideFragment.kt +++ b/app/src/main/java/org/go/sopt/winey/presentation/onboarding/guide/WineyFeedGuideFragment.kt @@ -1,10 +1,10 @@ -package com.go.sopt.winey.presentation.onboarding.guide +package org.go.sopt.winey.presentation.onboarding.guide import android.os.Bundle import android.view.View -import com.go.sopt.winey.R -import com.go.sopt.winey.databinding.FragmentWineyFeedGuideBinding -import com.go.sopt.winey.util.binding.BindingFragment +import org.go.sopt.winey.R +import org.go.sopt.winey.databinding.FragmentWineyFeedGuideBinding +import org.go.sopt.winey.util.binding.BindingFragment class WineyFeedGuideFragment : BindingFragment(R.layout.fragment_winey_feed_guide) { override fun onViewCreated(view: View, savedInstanceState: Bundle?) { diff --git a/app/src/main/java/com/go/sopt/winey/presentation/onboarding/login/KakaoLoginCallback.kt b/app/src/main/java/org/go/sopt/winey/presentation/onboarding/login/KakaoLoginCallback.kt similarity index 98% rename from app/src/main/java/com/go/sopt/winey/presentation/onboarding/login/KakaoLoginCallback.kt rename to app/src/main/java/org/go/sopt/winey/presentation/onboarding/login/KakaoLoginCallback.kt index 8e47b2e5..fa6ac492 100644 --- a/app/src/main/java/com/go/sopt/winey/presentation/onboarding/login/KakaoLoginCallback.kt +++ b/app/src/main/java/org/go/sopt/winey/presentation/onboarding/login/KakaoLoginCallback.kt @@ -1,4 +1,4 @@ -package com.go.sopt.winey.presentation.onboarding.login +package org.go.sopt.winey.presentation.onboarding.login import com.kakao.sdk.auth.model.OAuthToken import com.kakao.sdk.common.model.AuthErrorCause diff --git a/app/src/main/java/com/go/sopt/winey/presentation/onboarding/login/LoginActivity.kt b/app/src/main/java/org/go/sopt/winey/presentation/onboarding/login/LoginActivity.kt similarity index 72% rename from app/src/main/java/com/go/sopt/winey/presentation/onboarding/login/LoginActivity.kt rename to app/src/main/java/org/go/sopt/winey/presentation/onboarding/login/LoginActivity.kt index e8c06173..1ac2f5d4 100644 --- a/app/src/main/java/com/go/sopt/winey/presentation/onboarding/login/LoginActivity.kt +++ b/app/src/main/java/org/go/sopt/winey/presentation/onboarding/login/LoginActivity.kt @@ -1,4 +1,4 @@ -package com.go.sopt.winey.presentation.onboarding.login +package org.go.sopt.winey.presentation.onboarding.login import android.app.Activity import android.content.Intent @@ -6,20 +6,18 @@ import android.os.Bundle import androidx.activity.viewModels import androidx.lifecycle.flowWithLifecycle import androidx.lifecycle.lifecycleScope -import com.go.sopt.winey.R -import com.go.sopt.winey.databinding.ActivityLoginBinding -import com.go.sopt.winey.presentation.main.MainActivity -import com.go.sopt.winey.presentation.onboarding.story.StoryActivity -import com.go.sopt.winey.util.amplitude.AmplitudeUtils -import com.go.sopt.winey.util.amplitude.type.EventType -import com.go.sopt.winey.util.amplitude.type.EventType.TYPE_CLICK_BUTTON -import com.go.sopt.winey.util.amplitude.type.EventType.TYPE_VIEW_SCREEN -import com.go.sopt.winey.util.binding.BindingActivity -import com.go.sopt.winey.util.context.snackBar -import com.go.sopt.winey.util.view.UiState import dagger.hilt.android.AndroidEntryPoint import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.onEach +import org.go.sopt.winey.R +import org.go.sopt.winey.databinding.ActivityLoginBinding +import org.go.sopt.winey.presentation.main.MainActivity +import org.go.sopt.winey.presentation.onboarding.story.StoryActivity +import org.go.sopt.winey.util.amplitude.AmplitudeUtils +import org.go.sopt.winey.util.amplitude.type.EventType +import org.go.sopt.winey.util.binding.BindingActivity +import org.go.sopt.winey.util.context.snackBar +import org.go.sopt.winey.util.view.UiState import org.json.JSONException import org.json.JSONObject import timber.log.Timber @@ -35,7 +33,7 @@ class LoginActivity : override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - sendEventToAmplitude(TYPE_VIEW_SCREEN) + sendEventToAmplitude(EventType.TYPE_VIEW_SCREEN) initKakaoLoginButtonClickListener() initLoginObserver() @@ -43,7 +41,7 @@ class LoginActivity : private fun initKakaoLoginButtonClickListener() { binding.btnLoginKakao.setOnClickListener { - sendEventToAmplitude(TYPE_CLICK_BUTTON) + sendEventToAmplitude(EventType.TYPE_CLICK_BUTTON) viewModel.loginKakao(this) } } @@ -53,8 +51,8 @@ class LoginActivity : try { when (type) { - TYPE_VIEW_SCREEN -> eventProperties.put("screen_name", "sign_up") - TYPE_CLICK_BUTTON -> { + EventType.TYPE_VIEW_SCREEN -> eventProperties.put("screen_name", "sign_up") + EventType.TYPE_CLICK_BUTTON -> { eventProperties.put("button_name", "kakao_signup_button") .put("paging_number", 1) } @@ -66,8 +64,8 @@ class LoginActivity : } when (type) { - TYPE_VIEW_SCREEN -> amplitudeUtils.logEvent("view_signup", eventProperties) - TYPE_CLICK_BUTTON -> amplitudeUtils.logEvent("click_button", eventProperties) + EventType.TYPE_VIEW_SCREEN -> amplitudeUtils.logEvent("view_signup", eventProperties) + EventType.TYPE_CLICK_BUTTON -> amplitudeUtils.logEvent("click_button", eventProperties) else -> {} } } diff --git a/app/src/main/java/com/go/sopt/winey/presentation/onboarding/login/LoginViewModel.kt b/app/src/main/java/org/go/sopt/winey/presentation/onboarding/login/LoginViewModel.kt similarity index 90% rename from app/src/main/java/com/go/sopt/winey/presentation/onboarding/login/LoginViewModel.kt rename to app/src/main/java/org/go/sopt/winey/presentation/onboarding/login/LoginViewModel.kt index 1e899773..ad367e93 100644 --- a/app/src/main/java/com/go/sopt/winey/presentation/onboarding/login/LoginViewModel.kt +++ b/app/src/main/java/org/go/sopt/winey/presentation/onboarding/login/LoginViewModel.kt @@ -1,14 +1,8 @@ -package com.go.sopt.winey.presentation.onboarding.login +package org.go.sopt.winey.presentation.onboarding.login import android.content.Context import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import com.go.sopt.winey.data.model.remote.request.RequestLoginDto -import com.go.sopt.winey.data.model.remote.response.ResponseLoginDto -import com.go.sopt.winey.domain.repository.AuthRepository -import com.go.sopt.winey.domain.repository.DataStoreRepository -import com.go.sopt.winey.domain.repository.KakaoLoginRepository -import com.go.sopt.winey.util.view.UiState import com.kakao.sdk.auth.model.OAuthToken import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.Dispatchers @@ -18,6 +12,12 @@ import kotlinx.coroutines.flow.asStateFlow import kotlinx.coroutines.flow.first import kotlinx.coroutines.launch import kotlinx.coroutines.withContext +import org.go.sopt.winey.data.model.remote.request.RequestLoginDto +import org.go.sopt.winey.data.model.remote.response.ResponseLoginDto +import org.go.sopt.winey.domain.repository.AuthRepository +import org.go.sopt.winey.domain.repository.DataStoreRepository +import org.go.sopt.winey.domain.repository.KakaoLoginRepository +import org.go.sopt.winey.util.view.UiState import retrofit2.HttpException import timber.log.Timber import javax.inject.Inject diff --git a/app/src/main/java/com/go/sopt/winey/presentation/onboarding/story/FirstStoryFragment.kt b/app/src/main/java/org/go/sopt/winey/presentation/onboarding/story/FirstStoryFragment.kt similarity index 73% rename from app/src/main/java/com/go/sopt/winey/presentation/onboarding/story/FirstStoryFragment.kt rename to app/src/main/java/org/go/sopt/winey/presentation/onboarding/story/FirstStoryFragment.kt index 39ea109b..66af6fe7 100644 --- a/app/src/main/java/com/go/sopt/winey/presentation/onboarding/story/FirstStoryFragment.kt +++ b/app/src/main/java/org/go/sopt/winey/presentation/onboarding/story/FirstStoryFragment.kt @@ -1,10 +1,10 @@ -package com.go.sopt.winey.presentation.onboarding.story +package org.go.sopt.winey.presentation.onboarding.story import android.os.Bundle import android.view.View -import com.go.sopt.winey.R -import com.go.sopt.winey.databinding.FragmentFirstStoryBinding -import com.go.sopt.winey.util.binding.BindingFragment +import org.go.sopt.winey.R +import org.go.sopt.winey.databinding.FragmentFirstStoryBinding +import org.go.sopt.winey.util.binding.BindingFragment class FirstStoryFragment : BindingFragment(R.layout.fragment_first_story) { diff --git a/app/src/main/java/com/go/sopt/winey/presentation/onboarding/story/SecondStoryFragment.kt b/app/src/main/java/org/go/sopt/winey/presentation/onboarding/story/SecondStoryFragment.kt similarity index 73% rename from app/src/main/java/com/go/sopt/winey/presentation/onboarding/story/SecondStoryFragment.kt rename to app/src/main/java/org/go/sopt/winey/presentation/onboarding/story/SecondStoryFragment.kt index e5b24c17..41a0f4de 100644 --- a/app/src/main/java/com/go/sopt/winey/presentation/onboarding/story/SecondStoryFragment.kt +++ b/app/src/main/java/org/go/sopt/winey/presentation/onboarding/story/SecondStoryFragment.kt @@ -1,10 +1,10 @@ -package com.go.sopt.winey.presentation.onboarding.story +package org.go.sopt.winey.presentation.onboarding.story import android.os.Bundle import android.view.View -import com.go.sopt.winey.R -import com.go.sopt.winey.databinding.FragmentSecondStoryBinding -import com.go.sopt.winey.util.binding.BindingFragment +import org.go.sopt.winey.R +import org.go.sopt.winey.databinding.FragmentSecondStoryBinding +import org.go.sopt.winey.util.binding.BindingFragment class SecondStoryFragment : BindingFragment(R.layout.fragment_second_story) { diff --git a/app/src/main/java/com/go/sopt/winey/presentation/onboarding/story/StoryActivity.kt b/app/src/main/java/org/go/sopt/winey/presentation/onboarding/story/StoryActivity.kt similarity index 90% rename from app/src/main/java/com/go/sopt/winey/presentation/onboarding/story/StoryActivity.kt rename to app/src/main/java/org/go/sopt/winey/presentation/onboarding/story/StoryActivity.kt index cf5ecd85..192bf817 100644 --- a/app/src/main/java/com/go/sopt/winey/presentation/onboarding/story/StoryActivity.kt +++ b/app/src/main/java/org/go/sopt/winey/presentation/onboarding/story/StoryActivity.kt @@ -1,4 +1,4 @@ -package com.go.sopt.winey.presentation.onboarding.story +package org.go.sopt.winey.presentation.onboarding.story import android.content.Intent import android.icu.lang.UCharacter.GraphemeClusterBreak.T @@ -8,14 +8,14 @@ import androidx.annotation.StringRes import androidx.fragment.app.Fragment import androidx.fragment.app.commit import androidx.fragment.app.replace -import com.go.sopt.winey.R -import com.go.sopt.winey.databinding.ActivityStoryBinding -import com.go.sopt.winey.presentation.nickname.NicknameActivity -import com.go.sopt.winey.util.amplitude.AmplitudeUtils -import com.go.sopt.winey.util.binding.BindingActivity -import com.go.sopt.winey.util.context.colorOf -import com.go.sopt.winey.util.context.stringOf import dagger.hilt.android.AndroidEntryPoint +import org.go.sopt.winey.R +import org.go.sopt.winey.databinding.ActivityStoryBinding +import org.go.sopt.winey.presentation.nickname.NicknameActivity +import org.go.sopt.winey.util.amplitude.AmplitudeUtils +import org.go.sopt.winey.util.binding.BindingActivity +import org.go.sopt.winey.util.context.colorOf +import org.go.sopt.winey.util.context.stringOf import org.json.JSONException import org.json.JSONObject import javax.inject.Inject diff --git a/app/src/main/java/com/go/sopt/winey/presentation/onboarding/story/StoryViewModel.kt b/app/src/main/java/org/go/sopt/winey/presentation/onboarding/story/StoryViewModel.kt similarity index 92% rename from app/src/main/java/com/go/sopt/winey/presentation/onboarding/story/StoryViewModel.kt rename to app/src/main/java/org/go/sopt/winey/presentation/onboarding/story/StoryViewModel.kt index 654358a6..01928d14 100644 --- a/app/src/main/java/com/go/sopt/winey/presentation/onboarding/story/StoryViewModel.kt +++ b/app/src/main/java/org/go/sopt/winey/presentation/onboarding/story/StoryViewModel.kt @@ -1,4 +1,4 @@ -package com.go.sopt.winey.presentation.onboarding.story +package org.go.sopt.winey.presentation.onboarding.story import androidx.lifecycle.ViewModel import kotlinx.coroutines.flow.MutableStateFlow diff --git a/app/src/main/java/com/go/sopt/winey/presentation/onboarding/story/ThirdStoryFragment.kt b/app/src/main/java/org/go/sopt/winey/presentation/onboarding/story/ThirdStoryFragment.kt similarity index 73% rename from app/src/main/java/com/go/sopt/winey/presentation/onboarding/story/ThirdStoryFragment.kt rename to app/src/main/java/org/go/sopt/winey/presentation/onboarding/story/ThirdStoryFragment.kt index 63e15eab..8317d963 100644 --- a/app/src/main/java/com/go/sopt/winey/presentation/onboarding/story/ThirdStoryFragment.kt +++ b/app/src/main/java/org/go/sopt/winey/presentation/onboarding/story/ThirdStoryFragment.kt @@ -1,10 +1,10 @@ -package com.go.sopt.winey.presentation.onboarding.story +package org.go.sopt.winey.presentation.onboarding.story import android.os.Bundle import android.view.View -import com.go.sopt.winey.R -import com.go.sopt.winey.databinding.FragmentThirdStoryBinding -import com.go.sopt.winey.util.binding.BindingFragment +import org.go.sopt.winey.R +import org.go.sopt.winey.databinding.FragmentThirdStoryBinding +import org.go.sopt.winey.util.binding.BindingFragment class ThirdStoryFragment : BindingFragment(R.layout.fragment_third_story) { diff --git a/app/src/main/java/com/go/sopt/winey/presentation/splash/SplashActivity.kt b/app/src/main/java/org/go/sopt/winey/presentation/splash/SplashActivity.kt similarity index 86% rename from app/src/main/java/com/go/sopt/winey/presentation/splash/SplashActivity.kt rename to app/src/main/java/org/go/sopt/winey/presentation/splash/SplashActivity.kt index a1d193ae..2e8f49c0 100644 --- a/app/src/main/java/com/go/sopt/winey/presentation/splash/SplashActivity.kt +++ b/app/src/main/java/org/go/sopt/winey/presentation/splash/SplashActivity.kt @@ -1,4 +1,4 @@ -package com.go.sopt.winey.presentation.splash +package org.go.sopt.winey.presentation.splash import android.app.Activity import android.content.Intent @@ -9,17 +9,17 @@ import android.view.WindowInsetsController import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen import androidx.core.view.ViewCompat import androidx.lifecycle.lifecycleScope -import com.go.sopt.winey.R -import com.go.sopt.winey.databinding.ActivitySplashBinding -import com.go.sopt.winey.domain.repository.DataStoreRepository -import com.go.sopt.winey.presentation.main.MainActivity -import com.go.sopt.winey.presentation.onboarding.guide.GuideActivity -import com.go.sopt.winey.util.binding.BindingActivity -import com.go.sopt.winey.util.context.colorOf import dagger.hilt.android.AndroidEntryPoint import kotlinx.coroutines.delay import kotlinx.coroutines.flow.firstOrNull import kotlinx.coroutines.launch +import org.go.sopt.winey.R +import org.go.sopt.winey.databinding.ActivitySplashBinding +import org.go.sopt.winey.domain.repository.DataStoreRepository +import org.go.sopt.winey.presentation.main.MainActivity +import org.go.sopt.winey.presentation.onboarding.guide.GuideActivity +import org.go.sopt.winey.util.binding.BindingActivity +import org.go.sopt.winey.util.context.colorOf import javax.inject.Inject @AndroidEntryPoint diff --git a/app/src/main/java/com/go/sopt/winey/util/activity/ActivityExt.kt b/app/src/main/java/org/go/sopt/winey/util/activity/ActivityExt.kt similarity index 65% rename from app/src/main/java/com/go/sopt/winey/util/activity/ActivityExt.kt rename to app/src/main/java/org/go/sopt/winey/util/activity/ActivityExt.kt index 6746c2fc..3e6f2f86 100644 --- a/app/src/main/java/com/go/sopt/winey/util/activity/ActivityExt.kt +++ b/app/src/main/java/org/go/sopt/winey/util/activity/ActivityExt.kt @@ -1,8 +1,8 @@ -package com.go.sopt.winey.util.activity +package org.go.sopt.winey.util.activity import android.app.Activity import android.view.View -import com.go.sopt.winey.util.context.hideKeyboard +import org.go.sopt.winey.util.context.hideKeyboard /** Hide keyboard from activity window */ fun Activity.hideKeyboard() { diff --git a/app/src/main/java/com/go/sopt/winey/util/amplitude/AmplitudeUtils.kt b/app/src/main/java/org/go/sopt/winey/util/amplitude/AmplitudeUtils.kt similarity index 95% rename from app/src/main/java/com/go/sopt/winey/util/amplitude/AmplitudeUtils.kt rename to app/src/main/java/org/go/sopt/winey/util/amplitude/AmplitudeUtils.kt index 3e95adbd..4c0a7dc1 100644 --- a/app/src/main/java/com/go/sopt/winey/util/amplitude/AmplitudeUtils.kt +++ b/app/src/main/java/org/go/sopt/winey/util/amplitude/AmplitudeUtils.kt @@ -1,4 +1,4 @@ -package com.go.sopt.winey.util.amplitude +package org.go.sopt.winey.util.amplitude import com.amplitude.api.AmplitudeClient import com.amplitude.api.Identify diff --git a/app/src/main/java/com/go/sopt/winey/util/amplitude/type/EventType.kt b/app/src/main/java/org/go/sopt/winey/util/amplitude/type/EventType.kt similarity index 71% rename from app/src/main/java/com/go/sopt/winey/util/amplitude/type/EventType.kt rename to app/src/main/java/org/go/sopt/winey/util/amplitude/type/EventType.kt index edc23036..681e93bb 100644 --- a/app/src/main/java/com/go/sopt/winey/util/amplitude/type/EventType.kt +++ b/app/src/main/java/org/go/sopt/winey/util/amplitude/type/EventType.kt @@ -1,4 +1,4 @@ -package com.go.sopt.winey.util.amplitude.type +package org.go.sopt.winey.util.amplitude.type enum class EventType { TYPE_VIEW_SCREEN, diff --git a/app/src/main/java/com/go/sopt/winey/util/binding/BindingActivity.kt b/app/src/main/java/org/go/sopt/winey/util/binding/BindingActivity.kt similarity index 93% rename from app/src/main/java/com/go/sopt/winey/util/binding/BindingActivity.kt rename to app/src/main/java/org/go/sopt/winey/util/binding/BindingActivity.kt index f48516c3..1244cbd8 100644 --- a/app/src/main/java/com/go/sopt/winey/util/binding/BindingActivity.kt +++ b/app/src/main/java/org/go/sopt/winey/util/binding/BindingActivity.kt @@ -1,4 +1,4 @@ -package com.go.sopt.winey.util.binding +package org.go.sopt.winey.util.binding import android.os.Bundle import androidx.annotation.LayoutRes diff --git a/app/src/main/java/com/go/sopt/winey/util/binding/BindingAdapter.kt b/app/src/main/java/org/go/sopt/winey/util/binding/BindingAdapter.kt similarity index 93% rename from app/src/main/java/com/go/sopt/winey/util/binding/BindingAdapter.kt rename to app/src/main/java/org/go/sopt/winey/util/binding/BindingAdapter.kt index 8957d3f0..82d887d4 100644 --- a/app/src/main/java/com/go/sopt/winey/util/binding/BindingAdapter.kt +++ b/app/src/main/java/org/go/sopt/winey/util/binding/BindingAdapter.kt @@ -1,4 +1,4 @@ -package com.go.sopt.winey.util.binding +package org.go.sopt.winey.util.binding import android.net.Uri import android.view.View @@ -9,16 +9,17 @@ import androidx.appcompat.widget.AppCompatButton import androidx.databinding.BindingAdapter import coil.load import coil.transform.RoundedCornersTransformation -import com.go.sopt.winey.R -import com.go.sopt.winey.presentation.nickname.NicknameActivity.Companion.MY_PAGE_SCREEN -import com.go.sopt.winey.presentation.nickname.NicknameActivity.Companion.STORY_SCREEN -import com.go.sopt.winey.util.code.ErrorCode.* -import com.go.sopt.winey.util.context.colorOf -import com.go.sopt.winey.util.context.drawableOf -import com.go.sopt.winey.util.context.stringOf -import com.go.sopt.winey.util.view.InputUiState -import com.go.sopt.winey.util.view.InputUiState.* import de.hdodenhof.circleimageview.CircleImageView +import org.go.sopt.winey.R +import org.go.sopt.winey.presentation.nickname.NicknameActivity.Companion.MY_PAGE_SCREEN +import org.go.sopt.winey.presentation.nickname.NicknameActivity.Companion.STORY_SCREEN +import org.go.sopt.winey.util.code.ErrorCode +import org.go.sopt.winey.util.code.ErrorCode.* +import org.go.sopt.winey.util.context.colorOf +import org.go.sopt.winey.util.context.drawableOf +import org.go.sopt.winey.util.context.stringOf +import org.go.sopt.winey.util.view.InputUiState +import org.go.sopt.winey.util.view.InputUiState.* import java.text.DecimalFormat @BindingAdapter("likedAmount") @@ -83,7 +84,7 @@ fun TextView.setUploadContentHelperText(inputUiState: InputUiState) { if (inputUiState is Failure) { visibility = View.VISIBLE - if (inputUiState.code == CODE_INVALID_LENGTH) { + if (inputUiState.code == ErrorCode.CODE_INVALID_LENGTH) { text = context.stringOf(R.string.upload_content_error_text) } } diff --git a/app/src/main/java/com/go/sopt/winey/util/binding/BindingBottomSheetDialogFragment.kt b/app/src/main/java/org/go/sopt/winey/util/binding/BindingBottomSheetDialogFragment.kt similarity index 96% rename from app/src/main/java/com/go/sopt/winey/util/binding/BindingBottomSheetDialogFragment.kt rename to app/src/main/java/org/go/sopt/winey/util/binding/BindingBottomSheetDialogFragment.kt index c63852f4..0bc1611a 100644 --- a/app/src/main/java/com/go/sopt/winey/util/binding/BindingBottomSheetDialogFragment.kt +++ b/app/src/main/java/org/go/sopt/winey/util/binding/BindingBottomSheetDialogFragment.kt @@ -1,4 +1,4 @@ -package com.go.sopt.winey.util.binding +package org.go.sopt.winey.util.binding import android.app.Dialog import android.os.Bundle diff --git a/app/src/main/java/com/go/sopt/winey/util/binding/BindingDialogFragment.kt b/app/src/main/java/org/go/sopt/winey/util/binding/BindingDialogFragment.kt similarity index 97% rename from app/src/main/java/com/go/sopt/winey/util/binding/BindingDialogFragment.kt rename to app/src/main/java/org/go/sopt/winey/util/binding/BindingDialogFragment.kt index e7a5fbec..651c8e1e 100644 --- a/app/src/main/java/com/go/sopt/winey/util/binding/BindingDialogFragment.kt +++ b/app/src/main/java/org/go/sopt/winey/util/binding/BindingDialogFragment.kt @@ -1,4 +1,4 @@ -package com.go.sopt.winey.util.binding +package org.go.sopt.winey.util.binding import android.os.Bundle import android.view.LayoutInflater diff --git a/app/src/main/java/com/go/sopt/winey/util/binding/BindingFragment.kt b/app/src/main/java/org/go/sopt/winey/util/binding/BindingFragment.kt similarity index 96% rename from app/src/main/java/com/go/sopt/winey/util/binding/BindingFragment.kt rename to app/src/main/java/org/go/sopt/winey/util/binding/BindingFragment.kt index 39a6b42c..9791b767 100644 --- a/app/src/main/java/com/go/sopt/winey/util/binding/BindingFragment.kt +++ b/app/src/main/java/org/go/sopt/winey/util/binding/BindingFragment.kt @@ -1,4 +1,4 @@ -package com.go.sopt.winey.util.binding +package org.go.sopt.winey.util.binding import android.os.Bundle import android.view.LayoutInflater diff --git a/app/src/main/java/com/go/sopt/winey/util/code/ErrorCode.kt b/app/src/main/java/org/go/sopt/winey/util/code/ErrorCode.kt similarity index 78% rename from app/src/main/java/com/go/sopt/winey/util/code/ErrorCode.kt rename to app/src/main/java/org/go/sopt/winey/util/code/ErrorCode.kt index a960cd74..86e3f795 100644 --- a/app/src/main/java/com/go/sopt/winey/util/code/ErrorCode.kt +++ b/app/src/main/java/org/go/sopt/winey/util/code/ErrorCode.kt @@ -1,4 +1,4 @@ -package com.go.sopt.winey.util.code +package org.go.sopt.winey.util.code enum class ErrorCode { CODE_INVALID_LENGTH, diff --git a/app/src/main/java/com/go/sopt/winey/util/context/ContextExt.kt b/app/src/main/java/org/go/sopt/winey/util/context/ContextExt.kt similarity index 93% rename from app/src/main/java/com/go/sopt/winey/util/context/ContextExt.kt rename to app/src/main/java/org/go/sopt/winey/util/context/ContextExt.kt index 2cd9a4d5..e89c2ec0 100644 --- a/app/src/main/java/com/go/sopt/winey/util/context/ContextExt.kt +++ b/app/src/main/java/org/go/sopt/winey/util/context/ContextExt.kt @@ -1,4 +1,4 @@ -package com.go.sopt.winey.util.context +package org.go.sopt.winey.util.context import android.app.Activity import android.content.Context @@ -9,8 +9,8 @@ import androidx.annotation.ColorRes import androidx.annotation.DrawableRes import androidx.annotation.StringRes import androidx.core.content.ContextCompat -import com.go.sopt.winey.util.view.WineySnackbar import com.google.android.material.snackbar.Snackbar +import org.go.sopt.winey.util.view.WineySnackbar /** Hide keyboard from window */ fun Context.hideKeyboard(view: View) { diff --git a/app/src/main/java/com/go/sopt/winey/util/fragment/FragmentExt.kt b/app/src/main/java/org/go/sopt/winey/util/fragment/FragmentExt.kt similarity index 93% rename from app/src/main/java/com/go/sopt/winey/util/fragment/FragmentExt.kt rename to app/src/main/java/org/go/sopt/winey/util/fragment/FragmentExt.kt index 2022e823..aca98dd5 100644 --- a/app/src/main/java/com/go/sopt/winey/util/fragment/FragmentExt.kt +++ b/app/src/main/java/org/go/sopt/winey/util/fragment/FragmentExt.kt @@ -1,4 +1,4 @@ -package com.go.sopt.winey.util.fragment +package org.go.sopt.winey.util.fragment import android.view.View import android.widget.Toast @@ -8,8 +8,8 @@ import androidx.annotation.StringRes import androidx.core.content.ContextCompat import androidx.fragment.app.Fragment import androidx.lifecycle.lifecycleScope -import com.go.sopt.winey.util.view.WineySnackbar import com.google.android.material.snackbar.Snackbar +import org.go.sopt.winey.util.view.WineySnackbar fun Fragment.toast(message: String) { Toast.makeText(requireContext(), message, Toast.LENGTH_SHORT).show() diff --git a/app/src/main/java/com/go/sopt/winey/util/fragment/WineyDialogFragment.kt b/app/src/main/java/org/go/sopt/winey/util/fragment/WineyDialogFragment.kt similarity index 89% rename from app/src/main/java/com/go/sopt/winey/util/fragment/WineyDialogFragment.kt rename to app/src/main/java/org/go/sopt/winey/util/fragment/WineyDialogFragment.kt index fd653b79..4acd4853 100644 --- a/app/src/main/java/com/go/sopt/winey/util/fragment/WineyDialogFragment.kt +++ b/app/src/main/java/org/go/sopt/winey/util/fragment/WineyDialogFragment.kt @@ -1,10 +1,10 @@ -package com.go.sopt.winey.util.fragment +package org.go.sopt.winey.util.fragment import android.os.Bundle import android.view.View -import com.go.sopt.winey.R -import com.go.sopt.winey.databinding.FragmentAlertDialogBinding -import com.go.sopt.winey.util.binding.BindingDialogFragment +import org.go.sopt.winey.R +import org.go.sopt.winey.databinding.FragmentAlertDialogBinding +import org.go.sopt.winey.util.binding.BindingDialogFragment class WineyDialogFragment( private val title: String, diff --git a/app/src/main/java/com/go/sopt/winey/util/intent/ArgsExt.kt b/app/src/main/java/org/go/sopt/winey/util/intent/ArgsExt.kt similarity index 95% rename from app/src/main/java/com/go/sopt/winey/util/intent/ArgsExt.kt rename to app/src/main/java/org/go/sopt/winey/util/intent/ArgsExt.kt index 3fb8029a..54238498 100644 --- a/app/src/main/java/com/go/sopt/winey/util/intent/ArgsExt.kt +++ b/app/src/main/java/org/go/sopt/winey/util/intent/ArgsExt.kt @@ -1,4 +1,4 @@ -package com.go.sopt.winey.util.intent +package org.go.sopt.winey.util.intent import android.os.Parcelable import androidx.fragment.app.Fragment diff --git a/app/src/main/java/com/go/sopt/winey/util/intent/ExtraExt.kt b/app/src/main/java/org/go/sopt/winey/util/intent/ExtraExt.kt similarity index 97% rename from app/src/main/java/com/go/sopt/winey/util/intent/ExtraExt.kt rename to app/src/main/java/org/go/sopt/winey/util/intent/ExtraExt.kt index 06dc10c7..bc4f4560 100644 --- a/app/src/main/java/com/go/sopt/winey/util/intent/ExtraExt.kt +++ b/app/src/main/java/org/go/sopt/winey/util/intent/ExtraExt.kt @@ -1,4 +1,4 @@ -package com.go.sopt.winey.util.intent +package org.go.sopt.winey.util.intent import android.app.Activity import android.os.Parcelable diff --git a/app/src/main/java/com/go/sopt/winey/util/multipart/BitmapRequestBody.kt b/app/src/main/java/org/go/sopt/winey/util/multipart/BitmapRequestBody.kt similarity index 97% rename from app/src/main/java/com/go/sopt/winey/util/multipart/BitmapRequestBody.kt rename to app/src/main/java/org/go/sopt/winey/util/multipart/BitmapRequestBody.kt index 40927592..a51862ac 100644 --- a/app/src/main/java/com/go/sopt/winey/util/multipart/BitmapRequestBody.kt +++ b/app/src/main/java/org/go/sopt/winey/util/multipart/BitmapRequestBody.kt @@ -1,4 +1,4 @@ -package com.go.sopt.winey.util.multipart +package org.go.sopt.winey.util.multipart import android.content.Context import android.graphics.Bitmap diff --git a/app/src/main/java/com/go/sopt/winey/util/multipart/ImageCompressor.kt b/app/src/main/java/org/go/sopt/winey/util/multipart/ImageCompressor.kt similarity index 65% rename from app/src/main/java/com/go/sopt/winey/util/multipart/ImageCompressor.kt rename to app/src/main/java/org/go/sopt/winey/util/multipart/ImageCompressor.kt index 6ea5322e..95487e8f 100644 --- a/app/src/main/java/com/go/sopt/winey/util/multipart/ImageCompressor.kt +++ b/app/src/main/java/org/go/sopt/winey/util/multipart/ImageCompressor.kt @@ -1,4 +1,4 @@ -package com.go.sopt.winey.util.multipart +package org.go.sopt.winey.util.multipart import android.content.Context import android.graphics.Bitmap @@ -14,28 +14,36 @@ class ImageCompressor( private val context: Context, private val imageUri: Uri ) { - /** 이미지 압축 -> 크기 축소 -> 회전 */ fun adjustImageFormat(): Bitmap? { try { - val outputStream = ByteArrayOutputStream() val inputStream = context.contentResolver.openInputStream(imageUri) + val outputStream = ByteArrayOutputStream() - // 이미지 80% 압축 val originalBitmap = BitmapFactory.decodeStream(inputStream) - originalBitmap.compress(Bitmap.CompressFormat.JPEG, 80, outputStream) - - // 압축한 파일 크기가 700KB 넘으면, 크기 축소 - val resizedBitmap = reduceImageIfRequired(outputStream, originalBitmap) + val resizedBitmap = reduceImageSizeIfRequired(outputStream, originalBitmap) - // 회전 각도 조정 return rotateImageIfRequired(resizedBitmap) } catch (e: Exception) { Timber.e(e.message) } - return null } + private fun reduceImageSizeIfRequired( + outputStream: ByteArrayOutputStream, + originalBitmap: Bitmap + ): Bitmap { + // 서버에서 수용 가능한 최대 이미지 사이즈 보다 크면 80 퍼센트 압축하기 + if (isOverMaxSize(outputStream)) { + originalBitmap.compress(Bitmap.CompressFormat.JPEG, COMPRESS_QUALITY, outputStream) + } + + return originalBitmap + } + + private fun isOverMaxSize(outputStream: ByteArrayOutputStream) = + outputStream.toByteArray().size / KB_PER_ONE_MB > MAX_IMAGE_SIZE + private fun rotateImageIfRequired(bitmap: Bitmap): Bitmap { val inputStream = context.contentResolver.openInputStream(imageUri) @@ -60,28 +68,9 @@ class ImageCompressor( return bitmap } - private fun reduceImageIfRequired( - outputStream: ByteArrayOutputStream, - originalBitmap: Bitmap - ): Bitmap { - if (outputStream.toByteArray().size / ONE_MB_TO_KB > MAX_IMAGE_SIZE) { - return reduceImageSize(originalBitmap) - } - return originalBitmap - } - - private fun reduceImageSize(bitmap: Bitmap): Bitmap { - val originalWidth = bitmap.width - val originalHeight = bitmap.height - val aspectRatio = originalWidth / originalHeight - - val compressedWidth = MAX_IMAGE_SIZE - val compressedHeight = compressedWidth * aspectRatio - return Bitmap.createScaledBitmap(bitmap, compressedWidth, compressedHeight, false) - } - companion object { - private const val MAX_IMAGE_SIZE = 700 // KB - private const val ONE_MB_TO_KB = 1024 + private const val COMPRESS_QUALITY = 80 + private const val MAX_IMAGE_SIZE = 5000 // 5MB + private const val KB_PER_ONE_MB = 1024 } } diff --git a/app/src/main/java/com/go/sopt/winey/util/multipart/UriToRequestBody.kt b/app/src/main/java/org/go/sopt/winey/util/multipart/UriToRequestBody.kt similarity index 97% rename from app/src/main/java/com/go/sopt/winey/util/multipart/UriToRequestBody.kt rename to app/src/main/java/org/go/sopt/winey/util/multipart/UriToRequestBody.kt index cb37dcfb..1571ef4f 100644 --- a/app/src/main/java/com/go/sopt/winey/util/multipart/UriToRequestBody.kt +++ b/app/src/main/java/org/go/sopt/winey/util/multipart/UriToRequestBody.kt @@ -1,4 +1,4 @@ -package com.go.sopt.winey.util.multipart +package org.go.sopt.winey.util.multipart import android.content.Context import android.database.sqlite.SQLiteBindOrColumnIndexOutOfRangeException diff --git a/app/src/main/java/com/go/sopt/winey/util/view/InputUiState.kt b/app/src/main/java/org/go/sopt/winey/util/view/InputUiState.kt similarity index 66% rename from app/src/main/java/com/go/sopt/winey/util/view/InputUiState.kt rename to app/src/main/java/org/go/sopt/winey/util/view/InputUiState.kt index ee72d0d3..a5565ebc 100644 --- a/app/src/main/java/com/go/sopt/winey/util/view/InputUiState.kt +++ b/app/src/main/java/org/go/sopt/winey/util/view/InputUiState.kt @@ -1,6 +1,6 @@ -package com.go.sopt.winey.util.view +package org.go.sopt.winey.util.view -import com.go.sopt.winey.util.code.ErrorCode +import org.go.sopt.winey.util.code.ErrorCode sealed class InputUiState { object Empty : InputUiState() diff --git a/app/src/main/java/com/go/sopt/winey/util/view/UiState.kt b/app/src/main/java/org/go/sopt/winey/util/view/UiState.kt similarity index 87% rename from app/src/main/java/com/go/sopt/winey/util/view/UiState.kt rename to app/src/main/java/org/go/sopt/winey/util/view/UiState.kt index 7c1947ed..c2a1cdd2 100644 --- a/app/src/main/java/com/go/sopt/winey/util/view/UiState.kt +++ b/app/src/main/java/org/go/sopt/winey/util/view/UiState.kt @@ -1,4 +1,4 @@ -package com.go.sopt.winey.util.view +package org.go.sopt.winey.util.view sealed interface UiState { object Empty : UiState diff --git a/app/src/main/java/com/go/sopt/winey/util/view/ViewExt.kt b/app/src/main/java/org/go/sopt/winey/util/view/ViewExt.kt similarity index 95% rename from app/src/main/java/com/go/sopt/winey/util/view/ViewExt.kt rename to app/src/main/java/org/go/sopt/winey/util/view/ViewExt.kt index 5a43741e..cd9ead68 100644 --- a/app/src/main/java/com/go/sopt/winey/util/view/ViewExt.kt +++ b/app/src/main/java/org/go/sopt/winey/util/view/ViewExt.kt @@ -1,4 +1,4 @@ -package com.go.sopt.winey.util.view +package org.go.sopt.winey.util.view import android.view.View import androidx.recyclerview.widget.DiffUtil diff --git a/app/src/main/java/com/go/sopt/winey/util/view/WineyPopupMenu.kt b/app/src/main/java/org/go/sopt/winey/util/view/WineyPopupMenu.kt similarity index 89% rename from app/src/main/java/com/go/sopt/winey/util/view/WineyPopupMenu.kt rename to app/src/main/java/org/go/sopt/winey/util/view/WineyPopupMenu.kt index 8b3a8c2a..405a3412 100644 --- a/app/src/main/java/com/go/sopt/winey/util/view/WineyPopupMenu.kt +++ b/app/src/main/java/org/go/sopt/winey/util/view/WineyPopupMenu.kt @@ -1,4 +1,4 @@ -package com.go.sopt.winey.util.view +package org.go.sopt.winey.util.view import android.content.Context import android.util.TypedValue @@ -6,10 +6,10 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import android.widget.PopupWindow -import com.go.sopt.winey.R -import com.go.sopt.winey.databinding.ItemWineyPopupBinding -import com.go.sopt.winey.databinding.LayoutWineyPopupBinding -import com.go.sopt.winey.util.context.drawableOf +import org.go.sopt.winey.R +import org.go.sopt.winey.databinding.ItemWineyPopupBinding +import org.go.sopt.winey.databinding.LayoutWineyPopupBinding +import org.go.sopt.winey.util.context.drawableOf class WineyPopupMenu( private val context: Context, diff --git a/app/src/main/java/com/go/sopt/winey/util/view/WineySnackbar.kt b/app/src/main/java/org/go/sopt/winey/util/view/WineySnackbar.kt similarity index 89% rename from app/src/main/java/com/go/sopt/winey/util/view/WineySnackbar.kt rename to app/src/main/java/org/go/sopt/winey/util/view/WineySnackbar.kt index 6934b303..58c6814c 100644 --- a/app/src/main/java/com/go/sopt/winey/util/view/WineySnackbar.kt +++ b/app/src/main/java/org/go/sopt/winey/util/view/WineySnackbar.kt @@ -1,15 +1,15 @@ -package com.go.sopt.winey.util.view +package org.go.sopt.winey.util.view import android.view.Gravity import android.view.LayoutInflater import android.view.View import android.widget.FrameLayout import androidx.databinding.DataBindingUtil -import com.go.sopt.winey.R -import com.go.sopt.winey.databinding.LayoutWineySnackbarBinding -import com.go.sopt.winey.util.context.colorOf -import com.go.sopt.winey.util.context.drawableOf import com.google.android.material.snackbar.Snackbar +import org.go.sopt.winey.R +import org.go.sopt.winey.databinding.LayoutWineySnackbarBinding +import org.go.sopt.winey.util.context.colorOf +import org.go.sopt.winey.util.context.drawableOf class WineySnackbar( anchorView: View, diff --git a/app/src/main/res/layout/activity_detail.xml b/app/src/main/res/layout/activity_detail.xml index b50e2346..41a2e4ad 100644 --- a/app/src/main/res/layout/activity_detail.xml +++ b/app/src/main/res/layout/activity_detail.xml @@ -7,7 +7,7 @@ + type="org.go.sopt.winey.presentation.main.feed.detail.DetailViewModel" /> diff --git a/app/src/main/res/layout/activity_nickname.xml b/app/src/main/res/layout/activity_nickname.xml index 0fdf6e80..3cce72b4 100644 --- a/app/src/main/res/layout/activity_nickname.xml +++ b/app/src/main/res/layout/activity_nickname.xml @@ -7,11 +7,11 @@ + type="org.go.sopt.winey.presentation.nickname.NicknameViewModel" /> - + + type="org.go.sopt.winey.presentation.onboarding.story.StoryViewModel" /> + type="org.go.sopt.winey.presentation.main.feed.upload.UploadViewModel" /> diff --git a/app/src/main/res/layout/fragment_content.xml b/app/src/main/res/layout/fragment_content.xml index d30d8edc..caf6f813 100644 --- a/app/src/main/res/layout/fragment_content.xml +++ b/app/src/main/res/layout/fragment_content.xml @@ -7,7 +7,7 @@ + type="org.go.sopt.winey.presentation.main.feed.upload.UploadViewModel" /> diff --git a/app/src/main/res/layout/fragment_my_page.xml b/app/src/main/res/layout/fragment_my_page.xml index ba0d91b0..71d7428d 100644 --- a/app/src/main/res/layout/fragment_my_page.xml +++ b/app/src/main/res/layout/fragment_my_page.xml @@ -7,15 +7,15 @@ + type="org.go.sopt.winey.domain.entity.User" /> + type="org.go.sopt.winey.domain.entity.User" /> + type="org.go.sopt.winey.domain.entity.User" /> + type="org.go.sopt.winey.presentation.main.feed.upload.UploadViewModel" /> diff --git a/app/src/main/res/layout/fragment_recommend.xml b/app/src/main/res/layout/fragment_recommend.xml index 6afe8ec5..663406c7 100644 --- a/app/src/main/res/layout/fragment_recommend.xml +++ b/app/src/main/res/layout/fragment_recommend.xml @@ -6,7 +6,7 @@ + type="org.go.sopt.winey.presentation.main.MainViewModel" /> + type="org.go.sopt.winey.presentation.main.mypage.TargetAmountViewModel" /> + type="org.go.sopt.winey.presentation.main.MainViewModel" /> + type="org.go.sopt.winey.domain.entity.Comment" /> + type="org.go.sopt.winey.domain.entity.DetailFeed" /> + type="org.go.sopt.winey.domain.entity.WineyFeed" /> + type="org.go.sopt.winey.domain.entity.Notification" /> + type="org.go.sopt.winey.domain.entity.Recommend" /> + type="org.go.sopt.winey.domain.entity.WineyFeed" /> Date: Fri, 1 Sep 2023 19:00:23 +0900 Subject: [PATCH 2/6] =?UTF-8?q?[feat]=20#179=20=EC=9D=B4=EB=AF=B8=EC=A7=80?= =?UTF-8?q?=20=ED=9A=8C=EC=A0=84=20=EB=B0=8F=20=EC=95=95=EC=B6=95=20?= =?UTF-8?q?=EA=B8=B0=EB=8A=A5=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/feed/upload/AmountFragment.kt | 15 ++- .../main/feed/upload/UploadViewModel.kt | 6 +- .../winey/util/multipart/UriToRequestBody.kt | 91 ++++++++++++++++--- 3 files changed, 87 insertions(+), 25 deletions(-) diff --git a/app/src/main/java/org/go/sopt/winey/presentation/main/feed/upload/AmountFragment.kt b/app/src/main/java/org/go/sopt/winey/presentation/main/feed/upload/AmountFragment.kt index 8a1011ba..050ffd9a 100644 --- a/app/src/main/java/org/go/sopt/winey/presentation/main/feed/upload/AmountFragment.kt +++ b/app/src/main/java/org/go/sopt/winey/presentation/main/feed/upload/AmountFragment.kt @@ -19,8 +19,7 @@ import org.go.sopt.winey.util.fragment.stringOf import org.go.sopt.winey.util.fragment.viewLifeCycle import org.go.sopt.winey.util.fragment.viewLifeCycleScope import org.go.sopt.winey.util.fragment.wineySnackbar -import org.go.sopt.winey.util.multipart.BitmapRequestBody -import org.go.sopt.winey.util.multipart.ImageCompressor +import org.go.sopt.winey.util.multipart.UriToRequestBody import org.go.sopt.winey.util.view.UiState import org.go.sopt.winey.util.view.setOnSingleClickListener import java.text.DecimalFormat @@ -44,14 +43,14 @@ class AmountFragment : BindingFragment(R.layout.fragment_ private fun updateRequestBody() { val imageUri = uploadViewModel.imageUri.value ?: return -// val requestBody = UriToRequestBody(requireContext(), imageUri) + val requestBody = UriToRequestBody(requireContext(), imageUri) - val compressor = ImageCompressor(requireContext(), imageUri) - val adjustedImageBitmap = compressor.adjustImageFormat() - val bitmapRequestBody = - BitmapRequestBody(requireContext(), imageUri, adjustedImageBitmap) +// val compressor = ImageCompressor(requireContext(), imageUri) +// val adjustedImageBitmap = compressor.adjustImageFormat() +// val bitmapRequestBody = +// BitmapRequestBody(requireContext(), imageUri, adjustedImageBitmap) - uploadViewModel.updateRequestBody(bitmapRequestBody) + uploadViewModel.updateRequestBody(requestBody) } private fun initUploadButtonClickListener() { diff --git a/app/src/main/java/org/go/sopt/winey/presentation/main/feed/upload/UploadViewModel.kt b/app/src/main/java/org/go/sopt/winey/presentation/main/feed/upload/UploadViewModel.kt index ed52587e..094a76fa 100644 --- a/app/src/main/java/org/go/sopt/winey/presentation/main/feed/upload/UploadViewModel.kt +++ b/app/src/main/java/org/go/sopt/winey/presentation/main/feed/upload/UploadViewModel.kt @@ -18,7 +18,7 @@ import okhttp3.RequestBody.Companion.toRequestBody import org.go.sopt.winey.data.model.remote.response.ResponsePostWineyFeedDto import org.go.sopt.winey.domain.repository.FeedRepository import org.go.sopt.winey.util.code.ErrorCode -import org.go.sopt.winey.util.multipart.BitmapRequestBody +import org.go.sopt.winey.util.multipart.UriToRequestBody import org.go.sopt.winey.util.view.InputUiState import org.go.sopt.winey.util.view.UiState import retrofit2.HttpException @@ -96,13 +96,13 @@ class UploadViewModel @Inject constructor( private fun checkAmountRange(amountNumber: Long) = amountNumber in MIN_AMOUNT..MAX_AMOUNT /** Multipart */ - private var imageRequestBody: BitmapRequestBody? = null + private var imageRequestBody: UriToRequestBody? = null private val _postWineyFeedState = MutableStateFlow>(UiState.Empty) val postWineyFeedState: StateFlow> = _postWineyFeedState.asStateFlow() - fun updateRequestBody(requestBody: BitmapRequestBody) { + fun updateRequestBody(requestBody: UriToRequestBody) { this.imageRequestBody = requestBody } diff --git a/app/src/main/java/org/go/sopt/winey/util/multipart/UriToRequestBody.kt b/app/src/main/java/org/go/sopt/winey/util/multipart/UriToRequestBody.kt index 1571ef4f..d15e5491 100644 --- a/app/src/main/java/org/go/sopt/winey/util/multipart/UriToRequestBody.kt +++ b/app/src/main/java/org/go/sopt/winey/util/multipart/UriToRequestBody.kt @@ -2,15 +2,19 @@ package org.go.sopt.winey.util.multipart import android.content.Context import android.database.sqlite.SQLiteBindOrColumnIndexOutOfRangeException +import android.graphics.Bitmap +import android.graphics.BitmapFactory +import android.graphics.Matrix import android.net.Uri import android.provider.MediaStore +import androidx.exifinterface.media.ExifInterface import okhttp3.MediaType import okhttp3.MediaType.Companion.toMediaTypeOrNull import okhttp3.MultipartBody import okhttp3.RequestBody import okio.BufferedSink -import okio.source import timber.log.Timber +import java.io.ByteArrayOutputStream class UriToRequestBody( context: Context, @@ -18,7 +22,8 @@ class UriToRequestBody( ) : RequestBody() { private val contentResolver = context.contentResolver private var fileName = "" - private var size = -1L + private var fileSize = -1L + private lateinit var compressedImage: ByteArray init { try { @@ -30,34 +35,92 @@ class UriToRequestBody( null )?.use { cursor -> if (cursor.moveToFirst()) { - size = cursor.getLong(cursor.getColumnIndexOrThrow(MediaStore.Images.Media.SIZE)) - fileName = cursor.getString(cursor.getColumnIndexOrThrow(MediaStore.Images.Media.DISPLAY_NAME)) + fileSize = + cursor.getLong(cursor.getColumnIndexOrThrow(MediaStore.Images.Media.SIZE)) + fileName = + cursor.getString(cursor.getColumnIndexOrThrow(MediaStore.Images.Media.DISPLAY_NAME)) } } } catch (e: SQLiteBindOrColumnIndexOutOfRangeException) { Timber.e(e.message) } + + compressImage() } - override fun contentType(): MediaType? = - contentResolver.getType(imageUri)?.toMediaTypeOrNull() + private fun compressImage() { + val inputStream = contentResolver.openInputStream(imageUri) + val originalBitmap = BitmapFactory.decodeStream(inputStream) + val rotatedBitmap = rotateImageIfRequired(originalBitmap) - override fun writeTo(sink: BufferedSink) { - try { - contentResolver.openInputStream(imageUri).use { inputStream -> - val source = inputStream?.source() - if (source != null) sink.writeAll(source) + val outputStream = ByteArrayOutputStream() + val imageSizeMb = fileSize / (KB_PER_ONE_MB * KB_PER_ONE_MB).toDouble() + + Timber.e("$imageSizeMb") + + // 최대 크기를 넘지 않도록 이미지 파일을 압축한다. + outputStream.use { byteArrayOutputStream -> + val compressRate = calcCompressRate(imageSizeMb) + rotatedBitmap.compress( + Bitmap.CompressFormat.JPEG, + if (imageSizeMb >= MAX_MB_SIZE) compressRate else 100, + byteArrayOutputStream + ) + } + + compressedImage = outputStream.toByteArray() + fileSize = compressedImage.size.toLong() + } + + private fun rotateImageIfRequired(originalBitmap: Bitmap): Bitmap { + val inputStream = contentResolver.openInputStream(imageUri) + + inputStream?.use { + val exif = ExifInterface(inputStream) + val orientation = exif.getAttributeInt( + ExifInterface.TAG_ORIENTATION, + ExifInterface.ORIENTATION_NORMAL + ) + + val matrix = Matrix() + when (orientation) { + ExifInterface.ORIENTATION_ROTATE_90 -> matrix.setRotate(90F) + ExifInterface.ORIENTATION_ROTATE_180 -> matrix.setRotate(180F) + ExifInterface.ORIENTATION_ROTATE_270 -> matrix.setRotate(270F) + else -> return originalBitmap } - } catch (e: IllegalStateException) { - "Couldn't open content URI for reading: $imageUri" + + return Bitmap.createBitmap( + originalBitmap, + 0, + 0, + originalBitmap.width, + originalBitmap.height, + matrix, + true + ) } + + return originalBitmap } - override fun contentLength(): Long = size + private fun calcCompressRate(imageSizeMb: Double) = + ((MAX_MB_SIZE / imageSizeMb) * 100).toInt() + + override fun contentLength(): Long = fileSize + + override fun contentType(): MediaType? = + contentResolver.getType(imageUri)?.toMediaTypeOrNull() + + override fun writeTo(sink: BufferedSink) { + compressedImage.let(sink::write) + } fun toFormData() = MultipartBody.Part.createFormData(KEY_NAME, fileName, this) companion object { private const val KEY_NAME = "feedImage" + private const val KB_PER_ONE_MB = 1024 + private const val MAX_MB_SIZE = 5 } } From 6289a712041f2537bff4c4b149455f5db56b4a97 Mon Sep 17 00:00:00 2001 From: leeeha Date: Fri, 1 Sep 2023 19:01:48 +0900 Subject: [PATCH 3/6] =?UTF-8?q?[del]=20#179=20=EC=82=AC=EC=9A=A9=ED=95=98?= =?UTF-8?q?=EC=A7=80=20=EC=95=8A=EB=8A=94=20=EC=BD=94=EB=93=9C=20=EC=82=AD?= =?UTF-8?q?=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/feed/upload/AmountFragment.kt | 6 -- .../winey/util/multipart/BitmapRequestBody.kt | 63 --------------- .../winey/util/multipart/ImageCompressor.kt | 76 ------------------- 3 files changed, 145 deletions(-) delete mode 100644 app/src/main/java/org/go/sopt/winey/util/multipart/BitmapRequestBody.kt delete mode 100644 app/src/main/java/org/go/sopt/winey/util/multipart/ImageCompressor.kt diff --git a/app/src/main/java/org/go/sopt/winey/presentation/main/feed/upload/AmountFragment.kt b/app/src/main/java/org/go/sopt/winey/presentation/main/feed/upload/AmountFragment.kt index 050ffd9a..19dbb918 100644 --- a/app/src/main/java/org/go/sopt/winey/presentation/main/feed/upload/AmountFragment.kt +++ b/app/src/main/java/org/go/sopt/winey/presentation/main/feed/upload/AmountFragment.kt @@ -44,12 +44,6 @@ class AmountFragment : BindingFragment(R.layout.fragment_ private fun updateRequestBody() { val imageUri = uploadViewModel.imageUri.value ?: return val requestBody = UriToRequestBody(requireContext(), imageUri) - -// val compressor = ImageCompressor(requireContext(), imageUri) -// val adjustedImageBitmap = compressor.adjustImageFormat() -// val bitmapRequestBody = -// BitmapRequestBody(requireContext(), imageUri, adjustedImageBitmap) - uploadViewModel.updateRequestBody(requestBody) } diff --git a/app/src/main/java/org/go/sopt/winey/util/multipart/BitmapRequestBody.kt b/app/src/main/java/org/go/sopt/winey/util/multipart/BitmapRequestBody.kt deleted file mode 100644 index a51862ac..00000000 --- a/app/src/main/java/org/go/sopt/winey/util/multipart/BitmapRequestBody.kt +++ /dev/null @@ -1,63 +0,0 @@ -package org.go.sopt.winey.util.multipart - -import android.content.Context -import android.graphics.Bitmap -import android.net.Uri -import android.provider.MediaStore -import okhttp3.MediaType -import okhttp3.MediaType.Companion.toMediaType -import okhttp3.MultipartBody -import okhttp3.RequestBody -import okio.BufferedSink -import timber.log.Timber - -/** file name, resized bitmap -> request body */ -class BitmapRequestBody( - private val context: Context, - private val uri: Uri?, - private val bitmap: Bitmap? -) : RequestBody() { - - override fun contentType(): MediaType = IMAGE_CONTENT_TYPE.toMediaType() - - override fun writeTo(sink: BufferedSink) { - bitmap?.compress(Bitmap.CompressFormat.JPEG, 50, sink.outputStream()) - } - - fun toFormData(): MultipartBody.Part { - return MultipartBody.Part.createFormData(FEED_IMAGE_KEY, getFileNameFromUri(), this) - } - - private fun getFileNameFromUri(): String { - var fileName = "" - val filePathColumn = arrayOf(MediaStore.Images.Media.DISPLAY_NAME) - - try { - if (uri == null) { - throw IllegalArgumentException() - } - - context.contentResolver.query( - uri, - filePathColumn, - null, - null, - null - )?.use { cursor -> - if (cursor.moveToFirst()) { - val columnIndex: Int = cursor.getColumnIndexOrThrow(filePathColumn[0]) - fileName = cursor.getString(columnIndex) - } - } - } catch (e: Exception) { - Timber.e(e.message) - } - - return fileName - } - - companion object { - private const val IMAGE_CONTENT_TYPE = "image/jpeg" - private const val FEED_IMAGE_KEY = "feedImage" - } -} diff --git a/app/src/main/java/org/go/sopt/winey/util/multipart/ImageCompressor.kt b/app/src/main/java/org/go/sopt/winey/util/multipart/ImageCompressor.kt deleted file mode 100644 index 95487e8f..00000000 --- a/app/src/main/java/org/go/sopt/winey/util/multipart/ImageCompressor.kt +++ /dev/null @@ -1,76 +0,0 @@ -package org.go.sopt.winey.util.multipart - -import android.content.Context -import android.graphics.Bitmap -import android.graphics.BitmapFactory -import android.graphics.Matrix -import android.net.Uri -import androidx.exifinterface.media.ExifInterface -import timber.log.Timber -import java.io.ByteArrayOutputStream - -/** context, uri -> bitmap resize */ -class ImageCompressor( - private val context: Context, - private val imageUri: Uri -) { - fun adjustImageFormat(): Bitmap? { - try { - val inputStream = context.contentResolver.openInputStream(imageUri) - val outputStream = ByteArrayOutputStream() - - val originalBitmap = BitmapFactory.decodeStream(inputStream) - val resizedBitmap = reduceImageSizeIfRequired(outputStream, originalBitmap) - - return rotateImageIfRequired(resizedBitmap) - } catch (e: Exception) { - Timber.e(e.message) - } - return null - } - - private fun reduceImageSizeIfRequired( - outputStream: ByteArrayOutputStream, - originalBitmap: Bitmap - ): Bitmap { - // 서버에서 수용 가능한 최대 이미지 사이즈 보다 크면 80 퍼센트 압축하기 - if (isOverMaxSize(outputStream)) { - originalBitmap.compress(Bitmap.CompressFormat.JPEG, COMPRESS_QUALITY, outputStream) - } - - return originalBitmap - } - - private fun isOverMaxSize(outputStream: ByteArrayOutputStream) = - outputStream.toByteArray().size / KB_PER_ONE_MB > MAX_IMAGE_SIZE - - private fun rotateImageIfRequired(bitmap: Bitmap): Bitmap { - val inputStream = context.contentResolver.openInputStream(imageUri) - - inputStream?.use { - val exif = ExifInterface(inputStream) - val orientation = exif.getAttributeInt( - ExifInterface.TAG_ORIENTATION, - ExifInterface.ORIENTATION_NORMAL - ) - - val matrix = Matrix() - when (orientation) { - ExifInterface.ORIENTATION_ROTATE_90 -> matrix.setRotate(90F) - ExifInterface.ORIENTATION_ROTATE_180 -> matrix.setRotate(180F) - ExifInterface.ORIENTATION_ROTATE_270 -> matrix.setRotate(270F) - else -> return bitmap - } - - return Bitmap.createBitmap(bitmap, 0, 0, bitmap.width, bitmap.height, matrix, true) - } - - return bitmap - } - - companion object { - private const val COMPRESS_QUALITY = 80 - private const val MAX_IMAGE_SIZE = 5000 // 5MB - private const val KB_PER_ONE_MB = 1024 - } -} From 03c661615b1badd59f92da39461023d4a76942ba Mon Sep 17 00:00:00 2001 From: leeeha Date: Fri, 1 Sep 2023 19:02:57 +0900 Subject: [PATCH 4/6] =?UTF-8?q?[chore]=20#179=20=ED=9A=8C=EC=A0=84=20?= =?UTF-8?q?=ED=9B=84=20=EC=95=95=EC=B6=95=ED=95=98=EB=8A=94=20=EC=BD=94?= =?UTF-8?q?=EB=93=9C=EC=97=90=20=EC=A3=BC=EC=84=9D=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/go/sopt/winey/util/multipart/UriToRequestBody.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/org/go/sopt/winey/util/multipart/UriToRequestBody.kt b/app/src/main/java/org/go/sopt/winey/util/multipart/UriToRequestBody.kt index d15e5491..088f6eff 100644 --- a/app/src/main/java/org/go/sopt/winey/util/multipart/UriToRequestBody.kt +++ b/app/src/main/java/org/go/sopt/winey/util/multipart/UriToRequestBody.kt @@ -51,13 +51,13 @@ class UriToRequestBody( private fun compressImage() { val inputStream = contentResolver.openInputStream(imageUri) val originalBitmap = BitmapFactory.decodeStream(inputStream) + + // 필요한 경우 회전 각도를 조정한다. val rotatedBitmap = rotateImageIfRequired(originalBitmap) val outputStream = ByteArrayOutputStream() val imageSizeMb = fileSize / (KB_PER_ONE_MB * KB_PER_ONE_MB).toDouble() - Timber.e("$imageSizeMb") - // 최대 크기를 넘지 않도록 이미지 파일을 압축한다. outputStream.use { byteArrayOutputStream -> val compressRate = calcCompressRate(imageSizeMb) From 7ea25ad9ccda314318ece152a25864bd0f578724 Mon Sep 17 00:00:00 2001 From: leeeha Date: Fri, 1 Sep 2023 19:42:41 +0900 Subject: [PATCH 5/6] =?UTF-8?q?[mod]=20=EB=B2=84=EC=A0=84=20=EC=BD=94?= =?UTF-8?q?=EB=93=9C=20=EC=B5=9C=EC=A2=85=EC=A0=81=EC=9C=BC=EB=A1=9C=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/release/output-metadata.json | 2 +- buildSrc/src/main/java/DefaultConfig.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json index 2730678d..def46f20 100644 --- a/app/release/output-metadata.json +++ b/app/release/output-metadata.json @@ -11,7 +11,7 @@ "type": "SINGLE", "filters": [], "attributes": [], - "versionCode": 100, + "versionCode": 2, "versionName": "1.0.0", "outputFile": "app-release.apk" } diff --git a/buildSrc/src/main/java/DefaultConfig.kt b/buildSrc/src/main/java/DefaultConfig.kt index 2d2b6a55..9f5b950a 100644 --- a/buildSrc/src/main/java/DefaultConfig.kt +++ b/buildSrc/src/main/java/DefaultConfig.kt @@ -3,6 +3,6 @@ object DefaultConfig { const val compileSdk = 33 const val minSdk = 28 const val targetSdk = 33 - const val versionCode = 100 + const val versionCode = 2 const val versionName = "1.0.0" } From e6465cd0e4a9624ac4a71a9ef0687b715e993e5e Mon Sep 17 00:00:00 2001 From: leeeha Date: Sat, 2 Sep 2023 00:09:22 +0900 Subject: [PATCH 6/6] =?UTF-8?q?[del]=20=EC=8A=A4=ED=94=8C=EB=9E=98?= =?UTF-8?q?=EC=8B=9C=20=ED=99=94=EB=A9=B4=EC=97=90=EC=84=9C=20=EC=82=AC?= =?UTF-8?q?=EC=9A=A9=ED=95=98=EC=A7=80=20=EC=95=8A=EB=8A=94=20=ED=95=A8?= =?UTF-8?q?=EC=88=98=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sopt/winey/presentation/splash/SplashActivity.kt | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/app/src/main/java/org/go/sopt/winey/presentation/splash/SplashActivity.kt b/app/src/main/java/org/go/sopt/winey/presentation/splash/SplashActivity.kt index 2e8f49c0..110b47f4 100644 --- a/app/src/main/java/org/go/sopt/winey/presentation/splash/SplashActivity.kt +++ b/app/src/main/java/org/go/sopt/winey/presentation/splash/SplashActivity.kt @@ -4,7 +4,6 @@ import android.app.Activity import android.content.Intent import android.os.Build import android.os.Bundle -import android.view.View import android.view.WindowInsetsController import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen import androidx.core.view.ViewCompat @@ -54,17 +53,6 @@ class SplashActivity : BindingActivity(R.layout.activity_ } } - @Suppress("DEPRECATION") - fun setLightStatusBar(view: View, isLight: Boolean) { - var flags = view.systemUiVisibility - flags = if (isLight) { - flags or View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR - } else { - flags and View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR.inv() - } - view.systemUiVisibility = flags - } - private suspend fun checkAutoLogin() { val accessToken = dataStoreRepository.getAccessToken().firstOrNull() if (accessToken.isNullOrBlank()) {