From 89dfb4cf03bdadd6dc540d4224829d3a48766ff3 Mon Sep 17 00:00:00 2001 From: jihyunniiii Date: Tue, 15 Oct 2024 09:41:15 +0900 Subject: [PATCH 1/2] =?UTF-8?q?[chore]=20#278=20=ED=8C=A8=ED=82=A4?= =?UTF-8?q?=EC=A7=80=EB=AA=85=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle.kts | 4 +- .../ExampleInstrumentedTest.kt | 2 +- .../AdvertisementRemoteDataSource.kt | 10 -- .../datasource/ProfileRemoteDataSource.kt | 7 - .../datasource/TimelineRemoteDataSource.kt | 19 --- .../datasource/UserPointRemoteDataSource.kt | 14 -- .../ProfileRemoteDataSourceImpl.kt | 14 -- .../service/AdvertisementService.kt | 20 --- .../dataremote/service/MyCourseService.kt | 17 --- .../data/dataremote/service/ProfileService.kt | 12 -- .../dataremote/service/TimelineService.kt | 44 ------ .../dataremote/service/UserPointService.kt | 32 ----- .../data/mapper/toEntity/RegionMapper.kt | 16 --- .../data/mapper/todata/PlaceMapper.kt | 11 -- .../data/mapper/todata/ProfileMapper.kt | 10 -- .../data/mapper/todata/SignInMapper.kt | 8 -- .../dateroad/data/mapper/todata/TagMapper.kt | 5 - .../dateroad/data/mapper/todata/TagsMapper.kt | 7 - .../data/mapper/todata/UsePointMapper.kt | 10 -- .../mapper/todata/UserSignUpInfoMapper.kt | 9 -- .../ResponseAdvertisementDtoMapper.kt | 9 -- .../ResponseAdvertisementsDtoMapper.kt | 6 - .../mapper/todomain/ResponseAuthDtoMapper.kt | 9 -- .../todomain/ResponseCourseDtoMapper.kt | 17 --- .../todomain/ResponseCoursesDtoMapper.kt | 6 - .../todomain/ResponseEnrollCourseDtoMapper.kt | 9 -- .../ResponseEnrollTimelineDtoMapper.kt | 8 -- .../ResponseNearestTimelineDtoMapper.kt | 15 -- .../mapper/todomain/ResponsePlaceDtoMapper.kt | 10 -- .../todomain/ResponsePointHistoryDtoMapper.kt | 9 -- .../todomain/ResponseProfileDtoMapper.kt | 12 -- .../mapper/todomain/ResponseTagDtoMapper.kt | 6 - .../todomain/ResponseUserPointDtoMapper.kt | 11 -- .../repositoryimpl/ProfileRepositoryImpl.kt | 16 --- .../domain/repository/ProfileRepository.kt | 7 - .../domain/repository/UserPointRepository.kt | 14 -- .../ui/component/bottomsheet/model/Picker.kt | 9 -- .../presentation/util/base/UiEvent.kt | 3 - .../presentation/util/base/UiSideEffect.kt | 3 - .../presentation/util/base/UiState.kt | 3 - .../{dateroad => teamdateroad}/DateRoadApp.kt | 6 +- .../datasource/UserInfoLocalDataSource.kt | 2 +- .../UserInfoLocalDataSourceImpl.kt | 6 +- .../AdvertisementRemoteDataSource.kt | 10 ++ .../datasource/AuthRemoteDataSource.kt | 8 +- .../datasource/CourseRemoteDataSource.kt | 8 +- .../datasource/MyCourseRemoteDataSource.kt | 4 +- .../datasource/ProfileRemoteDataSource.kt | 7 + .../datasource/TimelineRemoteDataSource.kt | 19 +++ .../datasource/UserPointRemoteDataSource.kt | 14 ++ .../AdvertisementRemoteDataSourceImpl.kt | 10 +- .../AuthRemoteDataSourceImpl.kt | 12 +- .../CourseRemoteDataSourceImpl.kt | 12 +- .../MyCourseRemoteDataSourceImpl.kt | 8 +- .../ProfileRemoteDataSourceImpl.kt | 14 ++ .../TimelineRemoteDataSourceImpl.kt | 16 +-- .../UserPointRemoteDataSourceImpl.kt | 14 +- .../dataremote/interceptor/AuthInterceptor.kt | 16 +-- .../model/request/RequestCourseDto.kt | 2 +- .../model/request/RequestPlaceDto.kt | 2 +- .../model/request/RequestSignInDto.kt | 2 +- .../dataremote/model/request/RequestTagDto.kt | 2 +- .../model/request/RequestTagsDto.kt | 2 +- .../model/request/RequestTimelineDto.kt | 2 +- .../model/request/RequestUsePointDto.kt | 2 +- .../model/request/RequestUserSignUpInfoDto.kt | 2 +- .../model/request/RequestWithdrawDto.kt | 2 +- .../ResponseAdvertisementDetailDto.kt | 2 +- .../response/ResponseAdvertisementDto.kt | 2 +- .../response/ResponseAdvertisementsDto.kt | 2 +- .../model/response/ResponseAuthDto.kt | 2 +- .../model/response/ResponseCourseDetailDto.kt | 2 +- .../model/response/ResponseCourseDto.kt | 2 +- .../model/response/ResponseCoursesDto.kt | 2 +- .../model/response/ResponseEnrollCourseDto.kt | 2 +- .../response/ResponseEnrollTimelineDto.kt | 2 +- .../model/response/ResponseImageDto.kt | 2 +- .../response/ResponseNearestTimelineDto.kt | 2 +- .../model/response/ResponsePlaceDto.kt | 2 +- .../model/response/ResponsePointDto.kt | 2 +- .../model/response/ResponsePointHistoryDto.kt | 2 +- .../model/response/ResponsePointsDto.kt | 2 +- .../model/response/ResponseProfileDto.kt | 2 +- .../model/response/ResponseRefreshTokenDto.kt | 2 +- .../model/response/ResponseTagDto.kt | 2 +- .../response/ResponseTimelineDetailDto.kt | 2 +- .../model/response/ResponseTimelineDto.kt | 2 +- .../model/response/ResponseTimelinesDto.kt | 2 +- .../model/response/ResponseUserPointDto.kt | 2 +- .../model/response/ResponseUserUsePointDto.kt | 2 +- .../service/AdvertisementService.kt | 20 +++ .../data/dataremote/service/AuthService.kt | 36 ++--- .../data/dataremote/service/CourseService.kt | 34 ++--- .../dataremote/service/MyCourseService.kt | 17 +++ .../data/dataremote/service/ProfileService.kt | 12 ++ .../dataremote/service/TimelineService.kt | 44 ++++++ .../dataremote/service/UserPointService.kt | 32 +++++ .../data/dataremote/util/Constraints.kt | 2 +- .../dataremote/util/ContentUriRequestBody.kt | 2 +- .../data/mapper/toEntity/AreaMapper.kt | 14 +- .../data/mapper/toEntity/CostMapper.kt | 6 +- .../mapper/toEntity/CourseDetailMapper.kt | 6 +- .../data/mapper/toEntity/DurationMapper.kt | 4 +- .../data/mapper/toEntity/LikeMapper.kt | 4 +- .../data/mapper/toEntity/PointMapper.kt | 4 +- .../data/mapper/toEntity/RegionMapper.kt | 16 +++ .../mapper/toEntity/TimelineDetailMapper.kt | 6 +- .../data/mapper/toEntity/TimelineMapper.kt | 8 +- .../data/mapper/todata/EnrollMapper.kt | 10 +- .../data/mapper/todata/PlaceMapper.kt | 11 ++ .../data/mapper/todata/ProfileMapper.kt | 10 ++ .../data/mapper/todata/SignInMapper.kt | 8 ++ .../data/mapper/todata/TagMapper.kt | 5 + .../data/mapper/todata/TagsMapper.kt | 7 + .../data/mapper/todata/UsePointMapper.kt | 10 ++ .../mapper/todata/UserSignUpInfoMapper.kt | 9 ++ .../ResponseAdvertisementDetailDtoMapper.kt | 10 +- .../ResponseAdvertisementDtoMapper.kt | 9 ++ .../ResponseAdvertisementsDtoMapper.kt | 6 + .../mapper/todomain/ResponseAuthDtoMapper.kt | 9 ++ .../todomain/ResponseCourseDetailDtoMapper.kt | 16 +-- .../todomain/ResponseCourseDtoMapper.kt | 17 +++ .../todomain/ResponseCoursesDtoMapper.kt | 6 + .../todomain/ResponseEnrollCourseDtoMapper.kt | 9 ++ .../ResponseEnrollTimelineDtoMapper.kt | 8 ++ .../ResponseNearestTimelineDtoMapper.kt | 15 ++ .../mapper/todomain/ResponsePlaceDtoMapper.kt | 10 ++ .../mapper/todomain/ResponsePointDtoMapper.kt | 10 +- .../todomain/ResponsePointHistoryDtoMapper.kt | 9 ++ .../todomain/ResponsePointsDtoMapper.kt | 6 +- .../todomain/ResponseProfileDtoMapper.kt | 12 ++ .../mapper/todomain/ResponseTagDtoMapper.kt | 6 + .../ResponseTimelineDetailDtoMapper.kt | 12 +- .../todomain/ResponseTimelineDtoMapper.kt | 12 +- .../todomain/ResponseUserPointDtoMapper.kt | 11 ++ .../todomain/ResponseUserUsePointDtoMapper.kt | 6 +- .../AdvertisementRepositoryImpl.kt | 12 +- .../data/repositoryimpl/AuthRepositoryImpl.kt | 28 ++-- .../repositoryimpl/CourseRepositoryImpl.kt | 34 ++--- .../repositoryimpl/MyCourseRepositoryImpl.kt | 10 +- .../repositoryimpl/ProfileRepositoryImpl.kt | 16 +++ .../repositoryimpl/TimelineRepositoryImpl.kt | 26 ++-- .../repositoryimpl/UserInfoRepositoryImpl.kt | 6 +- .../repositoryimpl/UserPointRepositoryImpl.kt | 18 +-- .../di/ContentResolverModule.kt | 2 +- .../di/DataSourceModule.kt | 34 ++--- .../di/NetworkModule.kt | 12 +- .../di/RepositoryModule.kt | 34 ++--- .../di/ServiceModule.kt | 18 +-- .../di/qualifier/Qualifier.kt | 2 +- .../domain/model/Advertisement.kt | 2 +- .../domain/model/AdvertisementDetail.kt | 2 +- .../domain/model/Auth.kt | 2 +- .../domain/model/Course.kt | 2 +- .../domain/model/CourseDetail.kt | 2 +- .../domain/model/EditProfile.kt | 2 +- .../domain/model/Enroll.kt | 4 +- .../domain/model/EnrollCourseResult.kt | 2 +- .../domain/model/EnrollTimelineResult.kt | 2 +- .../domain/model/NearestTimeline.kt | 2 +- .../domain/model/Place.kt | 2 +- .../domain/model/Point.kt | 2 +- .../domain/model/PointHistory.kt | 2 +- .../domain/model/PointUseResult.kt | 2 +- .../domain/model/Profile.kt | 2 +- .../domain/model/SignIn.kt | 2 +- .../domain/model/SignUp.kt | 2 +- .../domain/model/Timeline.kt | 4 +- .../domain/model/TimelineDetail.kt | 2 +- .../domain/model/UsePoint.kt | 2 +- .../domain/model/UserPoint.kt | 2 +- .../domain/model/UserSignUpInfo.kt | 2 +- .../repository/AdvertisementRepository.kt | 6 +- .../domain/repository/AuthRepository.kt | 10 +- .../domain/repository/CourseRepository.kt | 18 +-- .../domain/repository/MyCourseRepository.kt | 4 +- .../domain/repository/ProfileRepository.kt | 7 + .../domain/repository/TimelineRepository.kt | 14 +- .../domain/repository/UserInfoRepository.kt | 2 +- .../domain/repository/UserPointRepository.kt | 14 ++ .../domain/type/AdvertisementTagType.kt | 4 +- .../domain/type/GyeonggiAreaType.kt | 4 +- .../domain/type/IncheonAreaType.kt | 4 +- .../domain/type/MoneyTagType.kt | 4 +- .../domain/type/MonthType.kt | 4 +- .../domain/type/RegionType.kt | 4 +- .../domain/type/SeoulAreaType.kt | 4 +- .../domain/type/SortByType.kt | 2 +- .../domain/type/TimelineTimeType.kt | 2 +- .../domain/usecase/ClearUserInfoUseCase.kt | 4 +- .../domain/usecase/DeleteCourseLikeUseCase.kt | 4 +- .../domain/usecase/DeleteCourseUseCase.kt | 4 +- .../domain/usecase/DeleteSignOutUseCase.kt | 4 +- .../domain/usecase/DeleteTimelineUseCase.kt | 4 +- .../domain/usecase/DeleteWithdrawUseCase.kt | 4 +- .../domain/usecase/GetAccessTokenUseCase.kt | 4 +- .../usecase/GetAdvertisementDetailUseCase.kt | 6 +- .../usecase/GetAdvertisementsUseCase.kt | 6 +- .../domain/usecase/GetCourseDetailUseCase.kt | 4 +- .../domain/usecase/GetFilteredCourses.kt | 10 +- .../usecase/GetMyCourseEnrollUseCase.kt | 6 +- .../domain/usecase/GetMyCourseReadUseCase.kt | 6 +- .../usecase/GetNearestTimelineUseCase.kt | 6 +- .../domain/usecase/GetNicknameCheckUseCase.kt | 4 +- .../domain/usecase/GetNicknameUseCase.kt | 4 +- .../domain/usecase/GetPointHistoryUseCase.kt | 6 +- .../domain/usecase/GetRefreshTokenUseCase.kt | 4 +- .../domain/usecase/GetSortedCoursesUseCase.kt | 8 +- .../usecase/GetTimelineDetailUseCase.kt | 6 +- .../domain/usecase/GetTimelinesUseCase.kt | 8 +- .../domain/usecase/GetUserPointUseCase.kt | 6 +- .../domain/usecase/GetUserUseCase.kt | 6 +- .../domain/usecase/PatchEditProfileUseCase.kt | 6 +- .../domain/usecase/PostCourseLikeUseCase.kt | 4 +- .../domain/usecase/PostCourseUseCase.kt | 8 +- .../domain/usecase/PostSignInUseCase.kt | 8 +- .../domain/usecase/PostSignUpUseCase.kt | 8 +- .../domain/usecase/PostTimelineUseCase.kt | 8 +- .../domain/usecase/PostUsePointUseCase.kt | 8 +- .../domain/usecase/SetAccessTokenUseCase.kt | 4 +- .../domain/usecase/SetNicknameUseCase.kt | 4 +- .../domain/usecase/SetRefreshTokenUseCase.kt | 4 +- .../domain/util/Constraints.kt | 2 +- .../presentation/model/RouteModel.kt | 2 +- .../presentation/type/ChipType.kt | 14 +- .../type/CourseDetailUnopenedDetailType.kt | 4 +- .../presentation/type/DateChipGroupType.kt | 6 +- .../type/DateRoadRegionBottomSheetType.kt | 2 +- .../presentation/type/DateTagType.kt | 4 +- .../presentation/type/EmptyViewType.kt | 4 +- .../presentation/type/EnrollScreenType.kt | 4 +- .../presentation/type/EnrollType.kt | 4 +- .../type/MainNavigationBarItemType.kt | 8 +- .../presentation/type/MyCourseType.kt | 4 +- .../presentation/type/MyPageMenuType.kt | 4 +- .../presentation/type/MyPagePointInfoType.kt | 4 +- .../presentation/type/OnboardingType.kt | 4 +- .../presentation/type/OneButtonDialogType.kt | 4 +- .../OneButtonDialogWithDescriptionType.kt | 4 +- .../presentation/type/PlaceCardType.kt | 4 +- .../presentation/type/PointHistoryTabType.kt | 8 +- .../presentation/type/PointSystemType.kt | 4 +- .../presentation/type/ProfileType.kt | 4 +- .../presentation/type/TagType.kt | 6 +- .../presentation/type/TimelineType.kt | 4 +- .../presentation/type/TwoButtonDialogType.kt | 4 +- .../TwoButtonDialogWithDescriptionType.kt | 4 +- .../ui/advertisement/AdvertisementContract.kt | 12 +- .../ui/advertisement/AdvertisementScreen.kt | 18 +-- .../advertisement/AdvertisementViewModel.kt | 8 +- .../component/AdvertisementDetail.kt | 8 +- .../navigation/AdvertisementNavigation.kt | 4 +- .../bottomsheet/DateRoadBasicBottomSheet.kt | 8 +- .../bottomsheet/DateRoadBottomSheet.kt | 9 +- .../bottomsheet/DateRoadPickerBottomSheet.kt | 8 +- .../bottomsheet/DateRoadRegionBottomSheet.kt | 22 +-- .../ui/component/bottomsheet/model/Picker.kt | 9 ++ .../ui/component/button/DateRoadAreaButton.kt | 8 +- .../component/button/DateRoadBasicButton.kt | 6 +- .../ui/component/button/DateRoadButton.kt | 4 +- .../component/button/DateRoadFilledButton.kt | 6 +- .../component/button/DateRoadImageButton.kt | 8 +- .../button/DateRoadKakaoLoginButton.kt | 8 +- .../button/DateRoadOutlinedButton.kt | 6 +- .../ui/component/button/DateRoadTextButton.kt | 6 +- .../ui/component/card/DateRoadCourseCard.kt | 14 +- .../ui/component/card/DateRoadPlaceCard.kt | 14 +- .../ui/component/chip/DateRoadChip.kt | 6 +- .../ui/component/chip/DateRoadImageChip.kt | 6 +- .../ui/component/chip/DateRoadTextChip.kt | 4 +- .../chipgroup/DateRoadDateChipGroup.kt | 14 +- .../ui/component/dialog/DateRoadDialog.kt | 10 +- .../dialog/DateRoadOneButtonDialog.kt | 8 +- .../DateRoadOneButtonDialogWithDescription.kt | 8 +- .../dialog/DateRoadTwoButtonDialog.kt | 8 +- .../DateRoadTwoButtonDialogWithDescription.kt | 8 +- .../component/dotsindicator/DotsIndicator.kt | 4 +- .../numberpicker/DateRoadNumberPicker.kt | 10 +- .../numberpicker/state/PickerState.kt | 2 +- .../ui/component/pager/DateRoadImagePager.kt | 10 +- .../partialcolortext/PartialColorText.kt | 2 +- .../ui/component/tabbar/DateRoadTabBar.kt | 8 +- .../ui/component/tag/DateRoadImageTag.kt | 10 +- .../ui/component/tag/DateRoadPointTag.kt | 10 +- .../ui/component/tag/DateRoadTag.kt | 4 +- .../ui/component/tag/DateRoadTextTag.kt | 6 +- .../textfield/DateRoadBasicTextField.kt | 10 +- .../component/textfield/DateRoadTextArea.kt | 8 +- .../textfield/DateRoadTextFieldWithButton.kt | 12 +- .../model/TextFieldValidateResult.kt | 2 +- .../component/topbar/DateRoadBasicTopBar.kt | 10 +- .../topbar/DateRoadLeftTitleTopBar.kt | 6 +- .../topbar/DateRoadScrollResponsiveTopBar.kt | 8 +- .../ui/component/view/DataRoadIdeView.kt | 4 +- .../ui/component/view/DateRoadEmptyView.kt | 8 +- .../ui/component/view/DateRoadErrorView.kt | 8 +- .../ui/component/view/DateRoadLoadingView.kt | 10 +- .../ui/component/view/DateRoadWebView.kt | 2 +- .../ui/coursedetail/CourseDetailContract.kt | 14 +- .../ui/coursedetail/CourseDetailScreen.kt | 66 ++++----- .../ui/coursedetail/CourseDetailViewModel.kt | 32 ++--- .../component/CourseDetailBasicInfo.kt | 4 +- .../component/CourseDetailBottomBar.kt | 10 +- .../component/CourseDetailCost.kt | 6 +- .../component/CourseDetailInfoBar.kt | 6 +- .../component/CourseDetailOpenedDetail.kt | 8 +- .../coursedetail/component/CourseDetailTag.kt | 12 +- .../component/CourseDetailTimeline.kt | 12 +- .../component/CourseDetailUnopenedDetail.kt | 10 +- .../navigation/CourseDetailNavigation.kt | 6 +- .../presentation/ui/enroll/EnrollContract.kt | 56 ++++---- .../ui/enroll/EnrollFirstScreen.kt | 24 ++-- .../presentation/ui/enroll/EnrollScreen.kt | 130 +++++++++--------- .../ui/enroll/EnrollSecondScreen.kt | 24 ++-- .../ui/enroll/EnrollThirdScreen.kt | 12 +- .../presentation/ui/enroll/EnrollViewModel.kt | 32 ++--- .../enroll/component/EnrollAddPhotoButton.kt | 10 +- .../component/EnrollPhotoPreviewCard.kt | 10 +- .../ui/enroll/component/EnrollPhotos.kt | 14 +- .../enroll/component/EnrollPlaceInsertBar.kt | 18 +-- .../ui/enroll/navigation/EnrollNavigation.kt | 10 +- .../presentation/ui/home/HomeContract.kt | 22 +-- .../presentation/ui/home/HomeScreen.kt | 68 ++++----- .../presentation/ui/home/HomeViewModel.kt | 20 +-- .../ui/home/component/HomeAdvertisement.kt | 6 +- .../ui/home/component/HomeHotCourseCard.kt | 14 +- .../ui/home/component/HomeTimeLineCard.kt | 14 +- .../ui/home/component/HomeTopBar.kt | 8 +- .../ui/home/navigation/HomeNavigation.kt | 12 +- .../presentation/ui/look/LookContract.kt | 16 +-- .../presentation/ui/look/LookScreen.kt | 50 +++---- .../presentation/ui/look/LookViewModel.kt | 12 +- .../ui/look/component/LookCourseCard.kt | 16 +-- .../ui/look/navigation/LookNavigation.kt | 8 +- .../ui/mycourse/MyCourseContract.kt | 14 +- .../ui/mycourse/MyCourseScreen.kt | 38 ++--- .../ui/mycourse/MyCourseViewModel.kt | 10 +- .../mycourse/navigation/MyCourseNavigation.kt | 10 +- .../presentation/ui/mypage/MyPageContract.kt | 12 +- .../presentation/ui/mypage/MyPageScreen.kt | 54 ++++---- .../presentation/ui/mypage/MyPageViewModel.kt | 14 +- .../ui/mypage/component/MyPageButton.kt | 8 +- .../ui/mypage/component/MyPagePointBox.kt | 10 +- .../ui/mypage/navigation/MyPageNavigation.kt | 10 +- .../presentation/ui/navigator/MainActivity.kt | 6 +- .../ui/navigator/MainNavigator.kt | 50 +++---- .../presentation/ui/navigator/MainScreen.kt | 10 +- .../ui/navigator/component/MainBottomBar.kt | 16 +-- .../ui/navigator/component/MainNavHost.kt | 42 +++--- .../ui/onboarding/OnBoardingContract.kt | 8 +- .../ui/onboarding/OnBoardingViewModel.kt | 4 +- .../ui/onboarding/OnboardingScreen.kt | 22 +-- .../navigation/OnboardingNavigation.kt | 6 +- .../presentation/ui/past/PastContract.kt | 14 +- .../presentation/ui/past/PastScreen.kt | 28 ++-- .../presentation/ui/past/PastViewModel.kt | 10 +- .../ui/past/component/PastCard.kt | 20 +-- .../ui/past/navigation/PastNavigation.kt | 6 +- .../ui/pointguide/PointGuideScreen.kt | 14 +- .../component/DateRoadMyPagePointInfo.kt | 6 +- .../navigation/PointGuideNavigation.kt | 4 +- .../ui/pointhistory/PointHistoryContract.kt | 16 +-- .../ui/pointhistory/PointHistoryScreen.kt | 38 ++--- .../ui/pointhistory/PointHistoryViewModel.kt | 10 +- .../component/PointHistoryCard.kt | 8 +- .../component/PointHistoryPointBox.kt | 8 +- .../navigation/PointHistoryNavigation.kt | 4 +- .../ui/profile/ProfileContract.kt | 20 +-- .../presentation/ui/profile/ProfileScreen.kt | 56 ++++---- .../ui/profile/ProfileViewModel.kt | 30 ++-- .../profile/navigation/ProfileNavigation.kt | 8 +- .../presentation/ui/read/ReadContract.kt | 12 +- .../presentation/ui/read/ReadScreen.kt | 30 ++-- .../presentation/ui/read/ReadViewModel.kt | 10 +- .../ui/read/navigation/ReadNavigation.kt | 8 +- .../presentation/ui/signin/SignInContract.kt | 10 +- .../presentation/ui/signin/SignInScreen.kt | 22 +-- .../presentation/ui/signin/SignInViewModel.kt | 20 +-- .../ui/signin/navigation/SignInNavigation.kt | 4 +- .../presentation/ui/splash/SplashScreen.kt | 6 +- .../ui/timeline/TimelineContract.kt | 14 +- .../ui/timeline/TimelineScreen.kt | 50 +++---- .../ui/timeline/TimelineViewModel.kt | 10 +- .../ui/timeline/component/TimelineCard.kt | 22 +-- .../timeline/navigation/TimelineNavigation.kt | 10 +- .../timelinedetail/TimelineDetailContract.kt | 12 +- .../ui/timelinedetail/TimelineDetailScreen.kt | 66 ++++----- .../timelinedetail/TimelineDetailViewModel.kt | 20 +-- .../navigation/TimelineDetailNavigation.kt | 6 +- .../presentation/util/Constraints.kt | 2 +- .../util/amplitude/AmplitudeUtils.kt | 4 +- .../presentation/util/base/BaseViewModel.kt | 2 +- .../presentation/util/base/UiEvent.kt | 3 + .../presentation/util/base/UiSideEffect.kt | 3 + .../presentation/util/base/UiState.kt | 3 + .../util/draganddrop/DragAndDropListState.kt | 8 +- .../presentation/util/lazylist/LazyListExt.kt | 2 +- .../presentation/util/modifier/ModifierExt.kt | 4 +- .../util/mutablelist/MutableListExt.kt | 2 +- .../presentation/util/view/LoadState.kt | 2 +- .../ui/theme/Color.kt | 2 +- .../ui/theme/Theme.kt | 2 +- .../ui/theme/Type.kt | 4 +- .../ExampleUnitTest.kt | 2 +- 404 files changed, 2086 insertions(+), 2087 deletions(-) rename app/src/androidTest/java/org/sopt/{dateroad => teamdateroad}/ExampleInstrumentedTest.kt (95%) delete mode 100644 app/src/main/java/org/sopt/dateroad/data/dataremote/datasource/AdvertisementRemoteDataSource.kt delete mode 100644 app/src/main/java/org/sopt/dateroad/data/dataremote/datasource/ProfileRemoteDataSource.kt delete mode 100644 app/src/main/java/org/sopt/dateroad/data/dataremote/datasource/TimelineRemoteDataSource.kt delete mode 100644 app/src/main/java/org/sopt/dateroad/data/dataremote/datasource/UserPointRemoteDataSource.kt delete mode 100644 app/src/main/java/org/sopt/dateroad/data/dataremote/datasourceimpl/ProfileRemoteDataSourceImpl.kt delete mode 100644 app/src/main/java/org/sopt/dateroad/data/dataremote/service/AdvertisementService.kt delete mode 100644 app/src/main/java/org/sopt/dateroad/data/dataremote/service/MyCourseService.kt delete mode 100644 app/src/main/java/org/sopt/dateroad/data/dataremote/service/ProfileService.kt delete mode 100644 app/src/main/java/org/sopt/dateroad/data/dataremote/service/TimelineService.kt delete mode 100644 app/src/main/java/org/sopt/dateroad/data/dataremote/service/UserPointService.kt delete mode 100644 app/src/main/java/org/sopt/dateroad/data/mapper/toEntity/RegionMapper.kt delete mode 100644 app/src/main/java/org/sopt/dateroad/data/mapper/todata/PlaceMapper.kt delete mode 100644 app/src/main/java/org/sopt/dateroad/data/mapper/todata/ProfileMapper.kt delete mode 100644 app/src/main/java/org/sopt/dateroad/data/mapper/todata/SignInMapper.kt delete mode 100644 app/src/main/java/org/sopt/dateroad/data/mapper/todata/TagMapper.kt delete mode 100644 app/src/main/java/org/sopt/dateroad/data/mapper/todata/TagsMapper.kt delete mode 100644 app/src/main/java/org/sopt/dateroad/data/mapper/todata/UsePointMapper.kt delete mode 100644 app/src/main/java/org/sopt/dateroad/data/mapper/todata/UserSignUpInfoMapper.kt delete mode 100644 app/src/main/java/org/sopt/dateroad/data/mapper/todomain/ResponseAdvertisementDtoMapper.kt delete mode 100644 app/src/main/java/org/sopt/dateroad/data/mapper/todomain/ResponseAdvertisementsDtoMapper.kt delete mode 100644 app/src/main/java/org/sopt/dateroad/data/mapper/todomain/ResponseAuthDtoMapper.kt delete mode 100644 app/src/main/java/org/sopt/dateroad/data/mapper/todomain/ResponseCourseDtoMapper.kt delete mode 100644 app/src/main/java/org/sopt/dateroad/data/mapper/todomain/ResponseCoursesDtoMapper.kt delete mode 100644 app/src/main/java/org/sopt/dateroad/data/mapper/todomain/ResponseEnrollCourseDtoMapper.kt delete mode 100644 app/src/main/java/org/sopt/dateroad/data/mapper/todomain/ResponseEnrollTimelineDtoMapper.kt delete mode 100644 app/src/main/java/org/sopt/dateroad/data/mapper/todomain/ResponseNearestTimelineDtoMapper.kt delete mode 100644 app/src/main/java/org/sopt/dateroad/data/mapper/todomain/ResponsePlaceDtoMapper.kt delete mode 100644 app/src/main/java/org/sopt/dateroad/data/mapper/todomain/ResponsePointHistoryDtoMapper.kt delete mode 100644 app/src/main/java/org/sopt/dateroad/data/mapper/todomain/ResponseProfileDtoMapper.kt delete mode 100644 app/src/main/java/org/sopt/dateroad/data/mapper/todomain/ResponseTagDtoMapper.kt delete mode 100644 app/src/main/java/org/sopt/dateroad/data/mapper/todomain/ResponseUserPointDtoMapper.kt delete mode 100644 app/src/main/java/org/sopt/dateroad/data/repositoryimpl/ProfileRepositoryImpl.kt delete mode 100644 app/src/main/java/org/sopt/dateroad/domain/repository/ProfileRepository.kt delete mode 100644 app/src/main/java/org/sopt/dateroad/domain/repository/UserPointRepository.kt delete mode 100644 app/src/main/java/org/sopt/dateroad/presentation/ui/component/bottomsheet/model/Picker.kt delete mode 100644 app/src/main/java/org/sopt/dateroad/presentation/util/base/UiEvent.kt delete mode 100644 app/src/main/java/org/sopt/dateroad/presentation/util/base/UiSideEffect.kt delete mode 100644 app/src/main/java/org/sopt/dateroad/presentation/util/base/UiState.kt rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/DateRoadApp.kt (79%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/data/datalocal/datasource/UserInfoLocalDataSource.kt (70%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/data/datalocal/datasourceimpl/UserInfoLocalDataSourceImpl.kt (91%) create mode 100644 app/src/main/java/org/sopt/teamdateroad/data/dataremote/datasource/AdvertisementRemoteDataSource.kt rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/data/dataremote/datasource/AuthRemoteDataSource.kt (67%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/data/dataremote/datasource/CourseRemoteDataSource.kt (67%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/data/dataremote/datasource/MyCourseRemoteDataSource.kt (52%) create mode 100644 app/src/main/java/org/sopt/teamdateroad/data/dataremote/datasource/ProfileRemoteDataSource.kt create mode 100644 app/src/main/java/org/sopt/teamdateroad/data/dataremote/datasource/TimelineRemoteDataSource.kt create mode 100644 app/src/main/java/org/sopt/teamdateroad/data/dataremote/datasource/UserPointRemoteDataSource.kt rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/data/dataremote/datasourceimpl/AdvertisementRemoteDataSourceImpl.kt (55%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/data/dataremote/datasourceimpl/AuthRemoteDataSourceImpl.kt (73%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/data/dataremote/datasourceimpl/CourseRemoteDataSourceImpl.kt (73%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/data/dataremote/datasourceimpl/MyCourseRemoteDataSourceImpl.kt (56%) create mode 100644 app/src/main/java/org/sopt/teamdateroad/data/dataremote/datasourceimpl/ProfileRemoteDataSourceImpl.kt rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/data/dataremote/datasourceimpl/TimelineRemoteDataSourceImpl.kt (58%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/data/dataremote/datasourceimpl/UserPointRemoteDataSourceImpl.kt (52%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/data/dataremote/interceptor/AuthInterceptor.kt (89%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/data/dataremote/model/request/RequestCourseDto.kt (88%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/data/dataremote/model/request/RequestPlaceDto.kt (82%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/data/dataremote/model/request/RequestSignInDto.kt (74%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/data/dataremote/model/request/RequestTagDto.kt (73%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/data/dataremote/model/request/RequestTagsDto.kt (74%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/data/dataremote/model/request/RequestTimelineDto.kt (89%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/data/dataremote/model/request/RequestUsePointDto.kt (82%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/data/dataremote/model/request/RequestUserSignUpInfoDto.kt (79%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/data/dataremote/model/request/RequestWithdrawDto.kt (76%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/data/dataremote/model/response/ResponseAdvertisementDetailDto.kt (87%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/data/dataremote/model/response/ResponseAdvertisementDto.kt (80%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/data/dataremote/model/response/ResponseAdvertisementsDto.kt (79%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/data/dataremote/model/response/ResponseAuthDto.kt (82%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/data/dataremote/model/response/ResponseCourseDetailDto.kt (94%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/data/dataremote/model/response/ResponseCourseDto.kt (88%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/data/dataremote/model/response/ResponseCoursesDto.kt (76%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/data/dataremote/model/response/ResponseEnrollCourseDto.kt (80%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/data/dataremote/model/response/ResponseEnrollTimelineDto.kt (76%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/data/dataremote/model/response/ResponseImageDto.kt (79%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/data/dataremote/model/response/ResponseNearestTimelineDto.kt (87%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/data/dataremote/model/response/ResponsePlaceDto.kt (82%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/data/dataremote/model/response/ResponsePointDto.kt (82%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/data/dataremote/model/response/ResponsePointHistoryDto.kt (80%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/data/dataremote/model/response/ResponsePointsDto.kt (76%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/data/dataremote/model/response/ResponseProfileDto.kt (84%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/data/dataremote/model/response/ResponseRefreshTokenDto.kt (82%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/data/dataremote/model/response/ResponseTagDto.kt (73%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/data/dataremote/model/response/ResponseTimelineDetailDto.kt (90%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/data/dataremote/model/response/ResponseTimelineDto.kt (87%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/data/dataremote/model/response/ResponseTimelinesDto.kt (76%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/data/dataremote/model/response/ResponseUserPointDto.kt (81%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/data/dataremote/model/response/ResponseUserUsePointDto.kt (84%) create mode 100644 app/src/main/java/org/sopt/teamdateroad/data/dataremote/service/AdvertisementService.kt rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/data/dataremote/service/AuthService.kt (51%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/data/dataremote/service/CourseService.kt (54%) create mode 100644 app/src/main/java/org/sopt/teamdateroad/data/dataremote/service/MyCourseService.kt create mode 100644 app/src/main/java/org/sopt/teamdateroad/data/dataremote/service/ProfileService.kt create mode 100644 app/src/main/java/org/sopt/teamdateroad/data/dataremote/service/TimelineService.kt create mode 100644 app/src/main/java/org/sopt/teamdateroad/data/dataremote/service/UserPointService.kt rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/data/dataremote/util/Constraints.kt (97%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/data/dataremote/util/ContentUriRequestBody.kt (96%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/data/mapper/toEntity/AreaMapper.kt (50%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/data/mapper/toEntity/CostMapper.kt (52%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/data/mapper/toEntity/CourseDetailMapper.kt (59%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/data/mapper/toEntity/DurationMapper.kt (55%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/data/mapper/toEntity/LikeMapper.kt (50%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/data/mapper/toEntity/PointMapper.kt (64%) create mode 100644 app/src/main/java/org/sopt/teamdateroad/data/mapper/toEntity/RegionMapper.kt rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/data/mapper/toEntity/TimelineDetailMapper.kt (63%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/data/mapper/toEntity/TimelineMapper.kt (85%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/data/mapper/todata/EnrollMapper.kt (67%) create mode 100644 app/src/main/java/org/sopt/teamdateroad/data/mapper/todata/PlaceMapper.kt create mode 100644 app/src/main/java/org/sopt/teamdateroad/data/mapper/todata/ProfileMapper.kt create mode 100644 app/src/main/java/org/sopt/teamdateroad/data/mapper/todata/SignInMapper.kt create mode 100644 app/src/main/java/org/sopt/teamdateroad/data/mapper/todata/TagMapper.kt create mode 100644 app/src/main/java/org/sopt/teamdateroad/data/mapper/todata/TagsMapper.kt create mode 100644 app/src/main/java/org/sopt/teamdateroad/data/mapper/todata/UsePointMapper.kt create mode 100644 app/src/main/java/org/sopt/teamdateroad/data/mapper/todata/UserSignUpInfoMapper.kt rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/data/mapper/todomain/ResponseAdvertisementDetailDtoMapper.kt (53%) create mode 100644 app/src/main/java/org/sopt/teamdateroad/data/mapper/todomain/ResponseAdvertisementDtoMapper.kt create mode 100644 app/src/main/java/org/sopt/teamdateroad/data/mapper/todomain/ResponseAdvertisementsDtoMapper.kt create mode 100644 app/src/main/java/org/sopt/teamdateroad/data/mapper/todomain/ResponseAuthDtoMapper.kt rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/data/mapper/todomain/ResponseCourseDetailDtoMapper.kt (64%) create mode 100644 app/src/main/java/org/sopt/teamdateroad/data/mapper/todomain/ResponseCourseDtoMapper.kt create mode 100644 app/src/main/java/org/sopt/teamdateroad/data/mapper/todomain/ResponseCoursesDtoMapper.kt create mode 100644 app/src/main/java/org/sopt/teamdateroad/data/mapper/todomain/ResponseEnrollCourseDtoMapper.kt create mode 100644 app/src/main/java/org/sopt/teamdateroad/data/mapper/todomain/ResponseEnrollTimelineDtoMapper.kt create mode 100644 app/src/main/java/org/sopt/teamdateroad/data/mapper/todomain/ResponseNearestTimelineDtoMapper.kt create mode 100644 app/src/main/java/org/sopt/teamdateroad/data/mapper/todomain/ResponsePlaceDtoMapper.kt rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/data/mapper/todomain/ResponsePointDtoMapper.kt (51%) create mode 100644 app/src/main/java/org/sopt/teamdateroad/data/mapper/todomain/ResponsePointHistoryDtoMapper.kt rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/data/mapper/todomain/ResponsePointsDtoMapper.kt (61%) create mode 100644 app/src/main/java/org/sopt/teamdateroad/data/mapper/todomain/ResponseProfileDtoMapper.kt create mode 100644 app/src/main/java/org/sopt/teamdateroad/data/mapper/todomain/ResponseTagDtoMapper.kt rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/data/mapper/todomain/ResponseTimelineDetailDtoMapper.kt (53%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/data/mapper/todomain/ResponseTimelineDtoMapper.kt (59%) create mode 100644 app/src/main/java/org/sopt/teamdateroad/data/mapper/todomain/ResponseUserPointDtoMapper.kt rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/data/mapper/todomain/ResponseUserUsePointDtoMapper.kt (51%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/data/repositoryimpl/AdvertisementRepositoryImpl.kt (60%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/data/repositoryimpl/AuthRepositoryImpl.kt (73%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/data/repositoryimpl/CourseRepositoryImpl.kt (73%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/data/repositoryimpl/MyCourseRepositoryImpl.kt (60%) create mode 100644 app/src/main/java/org/sopt/teamdateroad/data/repositoryimpl/ProfileRepositoryImpl.kt rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/data/repositoryimpl/TimelineRepositoryImpl.kt (61%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/data/repositoryimpl/UserInfoRepositoryImpl.kt (81%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/data/repositoryimpl/UserPointRepositoryImpl.kt (57%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/di/ContentResolverModule.kt (93%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/di/DataSourceModule.kt (53%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/di/NetworkModule.kt (88%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/di/RepositoryModule.kt (54%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/di/ServiceModule.kt (69%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/di/qualifier/Qualifier.kt (70%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/domain/model/Advertisement.kt (66%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/domain/model/AdvertisementDetail.kt (83%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/domain/model/Auth.kt (64%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/domain/model/Course.kt (81%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/domain/model/CourseDetail.kt (93%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/domain/model/EditProfile.kt (73%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/domain/model/Enroll.kt (78%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/domain/model/EnrollCourseResult.kt (67%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/domain/model/EnrollTimelineResult.kt (60%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/domain/model/NearestTimeline.kt (80%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/domain/model/Place.kt (64%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/domain/model/Point.kt (69%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/domain/model/PointHistory.kt (70%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/domain/model/PointUseResult.kt (73%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/domain/model/Profile.kt (77%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/domain/model/SignIn.kt (52%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/domain/model/SignUp.kt (77%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/domain/model/Timeline.kt (66%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/domain/model/TimelineDetail.kt (86%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/domain/model/UsePoint.kt (68%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/domain/model/UserPoint.kt (72%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/domain/model/UserSignUpInfo.kt (68%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/domain/repository/AdvertisementRepository.kt (54%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/domain/repository/AuthRepository.kt (62%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/domain/repository/CourseRepository.kt (56%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/domain/repository/MyCourseRepository.kt (60%) create mode 100644 app/src/main/java/org/sopt/teamdateroad/domain/repository/ProfileRepository.kt rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/domain/repository/TimelineRepository.kt (51%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/domain/repository/UserInfoRepository.kt (85%) create mode 100644 app/src/main/java/org/sopt/teamdateroad/domain/repository/UserPointRepository.kt rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/domain/type/AdvertisementTagType.kt (78%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/domain/type/GyeonggiAreaType.kt (94%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/domain/type/IncheonAreaType.kt (82%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/domain/type/MoneyTagType.kt (91%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/domain/type/MonthType.kt (87%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/domain/type/RegionType.kt (69%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/domain/type/SeoulAreaType.kt (94%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/domain/type/SortByType.kt (54%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/domain/type/TimelineTimeType.kt (56%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/domain/usecase/ClearUserInfoUseCase.kt (67%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/domain/usecase/DeleteCourseLikeUseCase.kt (73%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/domain/usecase/DeleteCourseUseCase.kt (72%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/domain/usecase/DeleteSignOutUseCase.kt (70%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/domain/usecase/DeleteTimelineUseCase.kt (73%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/domain/usecase/DeleteWithdrawUseCase.kt (72%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/domain/usecase/GetAccessTokenUseCase.kt (68%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/domain/usecase/GetAdvertisementDetailUseCase.kt (67%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/domain/usecase/GetAdvertisementsUseCase.kt (64%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/domain/usecase/GetCourseDetailUseCase.kt (71%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/domain/usecase/GetFilteredCourses.kt (58%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/domain/usecase/GetMyCourseEnrollUseCase.kt (63%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/domain/usecase/GetMyCourseReadUseCase.kt (63%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/domain/usecase/GetNearestTimelineUseCase.kt (59%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/domain/usecase/GetNicknameCheckUseCase.kt (71%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/domain/usecase/GetNicknameUseCase.kt (68%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/domain/usecase/GetPointHistoryUseCase.kt (62%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/domain/usecase/GetRefreshTokenUseCase.kt (68%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/domain/usecase/GetSortedCoursesUseCase.kt (59%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/domain/usecase/GetTimelineDetailUseCase.kt (62%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/domain/usecase/GetTimelinesUseCase.kt (57%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/domain/usecase/GetUserPointUseCase.kt (58%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/domain/usecase/GetUserUseCase.kt (61%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/domain/usecase/PatchEditProfileUseCase.kt (65%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/domain/usecase/PostCourseLikeUseCase.kt (72%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/domain/usecase/PostCourseUseCase.kt (57%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/domain/usecase/PostSignInUseCase.kt (62%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/domain/usecase/PostSignUpUseCase.kt (58%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/domain/usecase/PostTimelineUseCase.kt (57%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/domain/usecase/PostUsePointUseCase.kt (61%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/domain/usecase/SetAccessTokenUseCase.kt (72%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/domain/usecase/SetNicknameUseCase.kt (71%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/domain/usecase/SetRefreshTokenUseCase.kt (72%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/domain/util/Constraints.kt (98%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/presentation/model/RouteModel.kt (89%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/presentation/type/ChipType.kt (84%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/presentation/type/CourseDetailUnopenedDetailType.kt (86%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/presentation/type/DateChipGroupType.kt (78%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/presentation/type/DateRoadRegionBottomSheetType.kt (58%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/presentation/type/DateTagType.kt (95%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/presentation/type/EmptyViewType.kt (93%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/presentation/type/EnrollScreenType.kt (67%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/presentation/type/EnrollType.kt (77%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/presentation/type/MainNavigationBarItemType.kt (89%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/presentation/type/MyCourseType.kt (77%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/presentation/type/MyPageMenuType.kt (86%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/presentation/type/MyPagePointInfoType.kt (92%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/presentation/type/OnboardingType.kt (93%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/presentation/type/OneButtonDialogType.kt (79%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/presentation/type/OneButtonDialogWithDescriptionType.kt (90%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/presentation/type/PlaceCardType.kt (91%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/presentation/type/PointHistoryTabType.kt (60%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/presentation/type/PointSystemType.kt (92%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/presentation/type/ProfileType.kt (84%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/presentation/type/TagType.kt (96%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/presentation/type/TimelineType.kt (89%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/presentation/type/TwoButtonDialogType.kt (88%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/presentation/type/TwoButtonDialogWithDescriptionType.kt (96%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/presentation/ui/advertisement/AdvertisementContract.kt (59%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/presentation/ui/advertisement/AdvertisementScreen.kt (85%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/presentation/ui/advertisement/AdvertisementViewModel.kt (86%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/presentation/ui/advertisement/component/AdvertisementDetail.kt (85%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/presentation/ui/advertisement/navigation/AdvertisementNavigation.kt (87%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/presentation/ui/component/bottomsheet/DateRoadBasicBottomSheet.kt (93%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/presentation/ui/component/bottomsheet/DateRoadBottomSheet.kt (94%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/presentation/ui/component/bottomsheet/DateRoadPickerBottomSheet.kt (90%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/presentation/ui/component/bottomsheet/DateRoadRegionBottomSheet.kt (93%) create mode 100644 app/src/main/java/org/sopt/teamdateroad/presentation/ui/component/bottomsheet/model/Picker.kt rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/presentation/ui/component/button/DateRoadAreaButton.kt (90%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/presentation/ui/component/button/DateRoadBasicButton.kt (90%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/presentation/ui/component/button/DateRoadButton.kt (90%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/presentation/ui/component/button/DateRoadFilledButton.kt (95%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/presentation/ui/component/button/DateRoadImageButton.kt (92%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/presentation/ui/component/button/DateRoadKakaoLoginButton.kt (91%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/presentation/ui/component/button/DateRoadOutlinedButton.kt (91%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/presentation/ui/component/button/DateRoadTextButton.kt (93%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/presentation/ui/component/card/DateRoadCourseCard.kt (91%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/presentation/ui/component/card/DateRoadPlaceCard.kt (90%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/presentation/ui/component/chip/DateRoadChip.kt (84%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/presentation/ui/component/chip/DateRoadImageChip.kt (91%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/presentation/ui/component/chip/DateRoadTextChip.kt (93%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/presentation/ui/component/chipgroup/DateRoadDateChipGroup.kt (86%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/presentation/ui/component/dialog/DateRoadDialog.kt (91%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/presentation/ui/component/dialog/DateRoadOneButtonDialog.kt (88%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/presentation/ui/component/dialog/DateRoadOneButtonDialogWithDescription.kt (90%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/presentation/ui/component/dialog/DateRoadTwoButtonDialog.kt (91%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/presentation/ui/component/dialog/DateRoadTwoButtonDialogWithDescription.kt (92%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/presentation/ui/component/dotsindicator/DotsIndicator.kt (89%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/presentation/ui/component/numberpicker/DateRoadNumberPicker.kt (92%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/presentation/ui/component/numberpicker/state/PickerState.kt (82%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/presentation/ui/component/pager/DateRoadImagePager.kt (88%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/presentation/ui/component/partialcolortext/PartialColorText.kt (94%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/presentation/ui/component/tabbar/DateRoadTabBar.kt (95%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/presentation/ui/component/tag/DateRoadImageTag.kt (91%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/presentation/ui/component/tag/DateRoadPointTag.kt (91%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/presentation/ui/component/tag/DateRoadTag.kt (87%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/presentation/ui/component/tag/DateRoadTextTag.kt (91%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/presentation/ui/component/textfield/DateRoadBasicTextField.kt (95%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/presentation/ui/component/textfield/DateRoadTextArea.kt (95%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/presentation/ui/component/textfield/DateRoadTextFieldWithButton.kt (95%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/presentation/ui/component/textfield/model/TextFieldValidateResult.kt (78%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/presentation/ui/component/topbar/DateRoadBasicTopBar.kt (94%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/presentation/ui/component/topbar/DateRoadLeftTitleTopBar.kt (91%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/presentation/ui/component/topbar/DateRoadScrollResponsiveTopBar.kt (90%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/presentation/ui/component/view/DataRoadIdeView.kt (79%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/presentation/ui/component/view/DateRoadEmptyView.kt (88%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/presentation/ui/component/view/DateRoadErrorView.kt (91%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/presentation/ui/component/view/DateRoadLoadingView.kt (84%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/presentation/ui/component/view/DateRoadWebView.kt (96%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/presentation/ui/coursedetail/CourseDetailContract.kt (87%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/presentation/ui/coursedetail/CourseDetailScreen.kt (88%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/presentation/ui/coursedetail/CourseDetailViewModel.kt (87%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/presentation/ui/coursedetail/component/CourseDetailBasicInfo.kt (90%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/presentation/ui/coursedetail/component/CourseDetailBottomBar.kt (89%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/presentation/ui/coursedetail/component/CourseDetailCost.kt (89%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/presentation/ui/coursedetail/component/CourseDetailInfoBar.kt (94%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/presentation/ui/coursedetail/component/CourseDetailOpenedDetail.kt (81%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/presentation/ui/coursedetail/component/CourseDetailTag.kt (81%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/presentation/ui/coursedetail/component/CourseDetailTimeline.kt (80%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/presentation/ui/coursedetail/component/CourseDetailUnopenedDetail.kt (92%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/presentation/ui/coursedetail/navigation/CourseDetailNavigation.kt (84%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/presentation/ui/enroll/EnrollContract.kt (72%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/presentation/ui/enroll/EnrollFirstScreen.kt (82%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/presentation/ui/enroll/EnrollScreen.kt (84%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/presentation/ui/enroll/EnrollSecondScreen.kt (91%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/presentation/ui/enroll/EnrollThirdScreen.kt (85%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/presentation/ui/enroll/EnrollViewModel.kt (90%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/presentation/ui/enroll/component/EnrollAddPhotoButton.kt (89%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/presentation/ui/enroll/component/EnrollPhotoPreviewCard.kt (89%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/presentation/ui/enroll/component/EnrollPhotos.kt (87%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/presentation/ui/enroll/component/EnrollPlaceInsertBar.kt (88%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/presentation/ui/enroll/navigation/EnrollNavigation.kt (86%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/presentation/ui/home/HomeContract.kt (74%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/presentation/ui/home/HomeScreen.kt (85%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/presentation/ui/home/HomeViewModel.kt (88%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/presentation/ui/home/component/HomeAdvertisement.kt (89%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/presentation/ui/home/component/HomeHotCourseCard.kt (91%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/presentation/ui/home/component/HomeTimeLineCard.kt (94%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/presentation/ui/home/component/HomeTopBar.kt (86%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/presentation/ui/home/navigation/HomeNavigation.kt (76%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/presentation/ui/look/LookContract.kt (74%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/presentation/ui/look/LookScreen.kt (85%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/presentation/ui/look/LookViewModel.kt (88%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/presentation/ui/look/component/LookCourseCard.kt (92%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/presentation/ui/look/navigation/LookNavigation.kt (75%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/presentation/ui/mycourse/MyCourseContract.kt (67%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/presentation/ui/mycourse/MyCourseScreen.kt (85%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/presentation/ui/mycourse/MyCourseViewModel.kt (88%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/presentation/ui/mycourse/navigation/MyCourseNavigation.kt (80%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/presentation/ui/mypage/MyPageContract.kt (80%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/presentation/ui/mypage/MyPageScreen.kt (86%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/presentation/ui/mypage/MyPageViewModel.kt (88%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/presentation/ui/mypage/component/MyPageButton.kt (88%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/presentation/ui/mypage/component/MyPagePointBox.kt (91%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/presentation/ui/mypage/navigation/MyPageNavigation.kt (77%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/presentation/ui/navigator/MainActivity.kt (88%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/presentation/ui/navigator/MainNavigator.kt (71%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/presentation/ui/navigator/MainScreen.kt (77%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/presentation/ui/navigator/component/MainBottomBar.kt (89%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/presentation/ui/navigator/component/MainNavHost.kt (74%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/presentation/ui/onboarding/OnBoardingContract.kt (55%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/presentation/ui/onboarding/OnBoardingViewModel.kt (79%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/presentation/ui/onboarding/OnboardingScreen.kt (90%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/presentation/ui/onboarding/navigation/OnboardingNavigation.kt (75%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/presentation/ui/past/PastContract.kt (57%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/presentation/ui/past/PastScreen.kt (82%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/presentation/ui/past/PastViewModel.kt (81%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/presentation/ui/past/component/PastCard.kt (90%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/presentation/ui/past/navigation/PastNavigation.kt (79%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/presentation/ui/pointguide/PointGuideScreen.kt (85%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/presentation/ui/pointguide/component/DateRoadMyPagePointInfo.kt (93%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/presentation/ui/pointguide/navigation/PointGuideNavigation.kt (81%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/presentation/ui/pointhistory/PointHistoryContract.kt (63%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/presentation/ui/pointhistory/PointHistoryScreen.kt (83%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/presentation/ui/pointhistory/PointHistoryViewModel.kt (88%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/presentation/ui/pointhistory/component/PointHistoryCard.kt (88%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/presentation/ui/pointhistory/component/PointHistoryPointBox.kt (89%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/presentation/ui/pointhistory/navigation/PointHistoryNavigation.kt (80%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/presentation/ui/profile/ProfileContract.kt (78%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/presentation/ui/profile/ProfileScreen.kt (87%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/presentation/ui/profile/ProfileViewModel.kt (90%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/presentation/ui/profile/navigation/ProfileNavigation.kt (82%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/presentation/ui/read/ReadContract.kt (63%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/presentation/ui/read/ReadScreen.kt (84%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/presentation/ui/read/ReadViewModel.kt (84%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/presentation/ui/read/navigation/ReadNavigation.kt (76%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/presentation/ui/signin/SignInContract.kt (70%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/presentation/ui/signin/SignInScreen.kt (86%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/presentation/ui/signin/SignInViewModel.kt (78%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/presentation/ui/signin/navigation/SignInNavigation.kt (83%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/presentation/ui/splash/SplashScreen.kt (87%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/presentation/ui/timeline/TimelineContract.kt (67%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/presentation/ui/timeline/TimelineScreen.kt (82%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/presentation/ui/timeline/TimelineViewModel.kt (84%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/presentation/ui/timeline/component/TimelineCard.kt (92%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/presentation/ui/timeline/navigation/TimelineNavigation.kt (74%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/presentation/ui/timelinedetail/TimelineDetailContract.kt (79%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/presentation/ui/timelinedetail/TimelineDetailScreen.kt (86%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/presentation/ui/timelinedetail/TimelineDetailViewModel.kt (87%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/presentation/ui/timelinedetail/navigation/TimelineDetailNavigation.kt (88%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/presentation/util/Constraints.kt (99%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/presentation/util/amplitude/AmplitudeUtils.kt (92%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/presentation/util/base/BaseViewModel.kt (96%) create mode 100644 app/src/main/java/org/sopt/teamdateroad/presentation/util/base/UiEvent.kt create mode 100644 app/src/main/java/org/sopt/teamdateroad/presentation/util/base/UiSideEffect.kt create mode 100644 app/src/main/java/org/sopt/teamdateroad/presentation/util/base/UiState.kt rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/presentation/util/draganddrop/DragAndDropListState.kt (92%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/presentation/util/lazylist/LazyListExt.kt (87%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/presentation/util/modifier/ModifierExt.kt (91%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/presentation/util/mutablelist/MutableListExt.kt (74%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/presentation/util/view/LoadState.kt (57%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/ui/theme/Color.kt (98%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/ui/theme/Theme.kt (97%) rename app/src/main/java/org/sopt/{dateroad => teamdateroad}/ui/theme/Type.kt (98%) rename app/src/test/java/org/sopt/{dateroad => teamdateroad}/ExampleUnitTest.kt (91%) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 851bb4dfd..1b96dd121 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -17,11 +17,11 @@ val properties = Properties().apply { } android { - namespace = "org.sopt.dateroad" + namespace = "org.sopt.teamdateroad" compileSdk = libs.versions.compileSdk.get().toInt() defaultConfig { - applicationId = "org.sopt.dateroad" + applicationId = "org.sopt.teamdateroad" minSdk = libs.versions.minSdk.get().toInt() targetSdk = libs.versions.targetSdk.get().toInt() versionCode = libs.versions.versionCode.get().toInt() diff --git a/app/src/androidTest/java/org/sopt/dateroad/ExampleInstrumentedTest.kt b/app/src/androidTest/java/org/sopt/teamdateroad/ExampleInstrumentedTest.kt similarity index 95% rename from app/src/androidTest/java/org/sopt/dateroad/ExampleInstrumentedTest.kt rename to app/src/androidTest/java/org/sopt/teamdateroad/ExampleInstrumentedTest.kt index 4f17cfdac..f0c140db8 100644 --- a/app/src/androidTest/java/org/sopt/dateroad/ExampleInstrumentedTest.kt +++ b/app/src/androidTest/java/org/sopt/teamdateroad/ExampleInstrumentedTest.kt @@ -1,4 +1,4 @@ -package org.sopt.dateroad +package org.sopt.teamdateroad import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.platform.app.InstrumentationRegistry diff --git a/app/src/main/java/org/sopt/dateroad/data/dataremote/datasource/AdvertisementRemoteDataSource.kt b/app/src/main/java/org/sopt/dateroad/data/dataremote/datasource/AdvertisementRemoteDataSource.kt deleted file mode 100644 index 45c54c299..000000000 --- a/app/src/main/java/org/sopt/dateroad/data/dataremote/datasource/AdvertisementRemoteDataSource.kt +++ /dev/null @@ -1,10 +0,0 @@ -package org.sopt.dateroad.data.dataremote.datasource - -import org.sopt.dateroad.data.dataremote.model.response.ResponseAdvertisementDetailDto -import org.sopt.dateroad.data.dataremote.model.response.ResponseAdvertisementsDto - -interface AdvertisementRemoteDataSource { - suspend fun getAdvertisementDetail(advertisementId: Int): ResponseAdvertisementDetailDto - - suspend fun getHomeAdvertisements(): ResponseAdvertisementsDto -} diff --git a/app/src/main/java/org/sopt/dateroad/data/dataremote/datasource/ProfileRemoteDataSource.kt b/app/src/main/java/org/sopt/dateroad/data/dataremote/datasource/ProfileRemoteDataSource.kt deleted file mode 100644 index 42f1836dd..000000000 --- a/app/src/main/java/org/sopt/dateroad/data/dataremote/datasource/ProfileRemoteDataSource.kt +++ /dev/null @@ -1,7 +0,0 @@ -package org.sopt.dateroad.data.dataremote.datasource - -import org.sopt.dateroad.data.dataremote.model.response.ResponseProfileDto - -interface ProfileRemoteDataSource { - suspend fun getProfile(): ResponseProfileDto -} diff --git a/app/src/main/java/org/sopt/dateroad/data/dataremote/datasource/TimelineRemoteDataSource.kt b/app/src/main/java/org/sopt/dateroad/data/dataremote/datasource/TimelineRemoteDataSource.kt deleted file mode 100644 index b24f55919..000000000 --- a/app/src/main/java/org/sopt/dateroad/data/dataremote/datasource/TimelineRemoteDataSource.kt +++ /dev/null @@ -1,19 +0,0 @@ -package org.sopt.dateroad.data.dataremote.datasource - -import org.sopt.dateroad.data.dataremote.model.request.RequestTimelineDto -import org.sopt.dateroad.data.dataremote.model.response.ResponseEnrollTimelineDto -import org.sopt.dateroad.data.dataremote.model.response.ResponseNearestTimelineDto -import org.sopt.dateroad.data.dataremote.model.response.ResponseTimelineDetailDto -import org.sopt.dateroad.data.dataremote.model.response.ResponseTimelinesDto - -interface TimelineRemoteDataSource { - suspend fun deleteTimeline(timelineId: Int) - - suspend fun getTimelineDetail(timelineId: Int): ResponseTimelineDetailDto - - suspend fun getTimelines(timelineTimeType: String): ResponseTimelinesDto - - suspend fun getNearestTimeline(): ResponseNearestTimelineDto - - suspend fun postTimeline(requestTimelineDto: RequestTimelineDto): ResponseEnrollTimelineDto -} diff --git a/app/src/main/java/org/sopt/dateroad/data/dataremote/datasource/UserPointRemoteDataSource.kt b/app/src/main/java/org/sopt/dateroad/data/dataremote/datasource/UserPointRemoteDataSource.kt deleted file mode 100644 index 7a9b63291..000000000 --- a/app/src/main/java/org/sopt/dateroad/data/dataremote/datasource/UserPointRemoteDataSource.kt +++ /dev/null @@ -1,14 +0,0 @@ -package org.sopt.dateroad.data.dataremote.datasource - -import org.sopt.dateroad.data.dataremote.model.request.RequestUsePointDto -import org.sopt.dateroad.data.dataremote.model.response.ResponsePointHistoryDto -import org.sopt.dateroad.data.dataremote.model.response.ResponseUserPointDto -import org.sopt.dateroad.data.dataremote.model.response.ResponseUserUsePointDto - -interface UserPointRemoteDataSource { - suspend fun getUserPoint(): ResponseUserPointDto - - suspend fun getPointHistory(): ResponsePointHistoryDto - - suspend fun postUsePoint(courseId: Int, requestUsePointDto: RequestUsePointDto): ResponseUserUsePointDto -} diff --git a/app/src/main/java/org/sopt/dateroad/data/dataremote/datasourceimpl/ProfileRemoteDataSourceImpl.kt b/app/src/main/java/org/sopt/dateroad/data/dataremote/datasourceimpl/ProfileRemoteDataSourceImpl.kt deleted file mode 100644 index 856cd7562..000000000 --- a/app/src/main/java/org/sopt/dateroad/data/dataremote/datasourceimpl/ProfileRemoteDataSourceImpl.kt +++ /dev/null @@ -1,14 +0,0 @@ -package org.sopt.dateroad.data.dataremote.datasourceimpl - -import javax.inject.Inject -import org.sopt.dateroad.data.dataremote.datasource.ProfileRemoteDataSource -import org.sopt.dateroad.data.dataremote.model.response.ResponseProfileDto -import org.sopt.dateroad.data.dataremote.service.ProfileService - -class ProfileRemoteDataSourceImpl @Inject constructor( - private val profileService: ProfileService -) : ProfileRemoteDataSource { - - override suspend fun getProfile(): ResponseProfileDto = - profileService.getProfile() -} diff --git a/app/src/main/java/org/sopt/dateroad/data/dataremote/service/AdvertisementService.kt b/app/src/main/java/org/sopt/dateroad/data/dataremote/service/AdvertisementService.kt deleted file mode 100644 index 4e9005954..000000000 --- a/app/src/main/java/org/sopt/dateroad/data/dataremote/service/AdvertisementService.kt +++ /dev/null @@ -1,20 +0,0 @@ -package org.sopt.dateroad.data.dataremote.service - -import org.sopt.dateroad.data.dataremote.model.response.ResponseAdvertisementDetailDto -import org.sopt.dateroad.data.dataremote.model.response.ResponseAdvertisementsDto -import org.sopt.dateroad.data.dataremote.util.ApiConstraints.ADVERTISEMENTS -import org.sopt.dateroad.data.dataremote.util.ApiConstraints.ADVERTISEMENT_ID -import org.sopt.dateroad.data.dataremote.util.ApiConstraints.API -import org.sopt.dateroad.data.dataremote.util.ApiConstraints.VERSION -import retrofit2.http.GET -import retrofit2.http.Path - -interface AdvertisementService { - @GET("$API/$VERSION/$ADVERTISEMENTS/{$ADVERTISEMENT_ID}") - suspend fun getAdvertisementDetail( - @Path(ADVERTISEMENT_ID) advertisementId: Int - ): ResponseAdvertisementDetailDto - - @GET("$API/$VERSION/$ADVERTISEMENTS") - suspend fun getHomeAdvertisements(): ResponseAdvertisementsDto -} diff --git a/app/src/main/java/org/sopt/dateroad/data/dataremote/service/MyCourseService.kt b/app/src/main/java/org/sopt/dateroad/data/dataremote/service/MyCourseService.kt deleted file mode 100644 index f750f7ff5..000000000 --- a/app/src/main/java/org/sopt/dateroad/data/dataremote/service/MyCourseService.kt +++ /dev/null @@ -1,17 +0,0 @@ -package org.sopt.dateroad.data.dataremote.service - -import org.sopt.dateroad.data.dataremote.model.response.ResponseCoursesDto -import org.sopt.dateroad.data.dataremote.util.ApiConstraints.API -import org.sopt.dateroad.data.dataremote.util.ApiConstraints.COURSES -import org.sopt.dateroad.data.dataremote.util.ApiConstraints.DATE_ACCESS -import org.sopt.dateroad.data.dataremote.util.ApiConstraints.USERS -import org.sopt.dateroad.data.dataremote.util.ApiConstraints.VERSION -import retrofit2.http.GET - -interface MyCourseService { - @GET("$API/$VERSION/$COURSES/$USERS") - suspend fun getMyCourseEnroll(): ResponseCoursesDto - - @GET("$API/$VERSION/$COURSES/$DATE_ACCESS") - suspend fun getMyCourseRead(): ResponseCoursesDto -} diff --git a/app/src/main/java/org/sopt/dateroad/data/dataremote/service/ProfileService.kt b/app/src/main/java/org/sopt/dateroad/data/dataremote/service/ProfileService.kt deleted file mode 100644 index ed4dc9eb1..000000000 --- a/app/src/main/java/org/sopt/dateroad/data/dataremote/service/ProfileService.kt +++ /dev/null @@ -1,12 +0,0 @@ -package org.sopt.dateroad.data.dataremote.service - -import org.sopt.dateroad.data.dataremote.model.response.ResponseProfileDto -import org.sopt.dateroad.data.dataremote.util.ApiConstraints.API -import org.sopt.dateroad.data.dataremote.util.ApiConstraints.USERS -import org.sopt.dateroad.data.dataremote.util.ApiConstraints.VERSION -import retrofit2.http.GET - -interface ProfileService { - @GET("$API/$VERSION/$USERS") - suspend fun getProfile(): ResponseProfileDto -} diff --git a/app/src/main/java/org/sopt/dateroad/data/dataremote/service/TimelineService.kt b/app/src/main/java/org/sopt/dateroad/data/dataremote/service/TimelineService.kt deleted file mode 100644 index 107e25bd5..000000000 --- a/app/src/main/java/org/sopt/dateroad/data/dataremote/service/TimelineService.kt +++ /dev/null @@ -1,44 +0,0 @@ -package org.sopt.dateroad.data.dataremote.service - -import org.sopt.dateroad.data.dataremote.model.request.RequestTimelineDto -import org.sopt.dateroad.data.dataremote.model.response.ResponseEnrollTimelineDto -import org.sopt.dateroad.data.dataremote.model.response.ResponseNearestTimelineDto -import org.sopt.dateroad.data.dataremote.model.response.ResponseTimelineDetailDto -import org.sopt.dateroad.data.dataremote.model.response.ResponseTimelinesDto -import org.sopt.dateroad.data.dataremote.util.ApiConstraints.API -import org.sopt.dateroad.data.dataremote.util.ApiConstraints.DATES -import org.sopt.dateroad.data.dataremote.util.ApiConstraints.DATE_ID -import org.sopt.dateroad.data.dataremote.util.ApiConstraints.NEAREST -import org.sopt.dateroad.data.dataremote.util.ApiConstraints.TIME -import org.sopt.dateroad.data.dataremote.util.ApiConstraints.VERSION -import retrofit2.http.Body -import retrofit2.http.DELETE -import retrofit2.http.GET -import retrofit2.http.POST -import retrofit2.http.Path -import retrofit2.http.Query - -interface TimelineService { - @DELETE("$API/$VERSION/$DATES/{$DATE_ID}") - suspend fun deleteTimeline( - @Path(DATE_ID) timelineId: Int - ) - - @GET("$API/$VERSION/$DATES/{$DATE_ID}") - suspend fun getTimelineDetail( - @Path(DATE_ID) timelineId: Int - ): ResponseTimelineDetailDto - - @GET("$API/$VERSION/$DATES") - suspend fun getTimelines( - @Query(TIME) timelineTimeType: String - ): ResponseTimelinesDto - - @GET("$API/$VERSION/$DATES/$NEAREST") - suspend fun getNearestTimeline(): ResponseNearestTimelineDto - - @POST("$API/$VERSION/$DATES") - suspend fun postTimeline( - @Body requestTimelineDto: RequestTimelineDto - ): ResponseEnrollTimelineDto -} diff --git a/app/src/main/java/org/sopt/dateroad/data/dataremote/service/UserPointService.kt b/app/src/main/java/org/sopt/dateroad/data/dataremote/service/UserPointService.kt deleted file mode 100644 index b18baf549..000000000 --- a/app/src/main/java/org/sopt/dateroad/data/dataremote/service/UserPointService.kt +++ /dev/null @@ -1,32 +0,0 @@ -package org.sopt.dateroad.data.dataremote.service - -import org.sopt.dateroad.data.dataremote.model.request.RequestUsePointDto -import org.sopt.dateroad.data.dataremote.model.response.ResponsePointHistoryDto -import org.sopt.dateroad.data.dataremote.model.response.ResponseUserPointDto -import org.sopt.dateroad.data.dataremote.model.response.ResponseUserUsePointDto -import org.sopt.dateroad.data.dataremote.util.ApiConstraints.API -import org.sopt.dateroad.data.dataremote.util.ApiConstraints.COURSES -import org.sopt.dateroad.data.dataremote.util.ApiConstraints.COURSE_ID -import org.sopt.dateroad.data.dataremote.util.ApiConstraints.DATE_ACCESS -import org.sopt.dateroad.data.dataremote.util.ApiConstraints.MAIN -import org.sopt.dateroad.data.dataremote.util.ApiConstraints.POINTS -import org.sopt.dateroad.data.dataremote.util.ApiConstraints.USERS -import org.sopt.dateroad.data.dataremote.util.ApiConstraints.VERSION -import retrofit2.http.Body -import retrofit2.http.GET -import retrofit2.http.POST -import retrofit2.http.Path - -interface UserPointService { - @GET("$API/$VERSION/$USERS/$MAIN") - suspend fun getUserPoint(): ResponseUserPointDto - - @GET("$API/$VERSION/$POINTS") - suspend fun getPointHistory(): ResponsePointHistoryDto - - @POST("$API/$VERSION/$COURSES/{$COURSE_ID}/$DATE_ACCESS") - suspend fun postUsePoint( - @Path(COURSE_ID) courseId: Int, - @Body requestUsePointDto: RequestUsePointDto - ): ResponseUserUsePointDto -} diff --git a/app/src/main/java/org/sopt/dateroad/data/mapper/toEntity/RegionMapper.kt b/app/src/main/java/org/sopt/dateroad/data/mapper/toEntity/RegionMapper.kt deleted file mode 100644 index 68f04b952..000000000 --- a/app/src/main/java/org/sopt/dateroad/data/mapper/toEntity/RegionMapper.kt +++ /dev/null @@ -1,16 +0,0 @@ -package org.sopt.dateroad.data.mapper.toEntity - -import org.sopt.dateroad.domain.type.GyeonggiAreaType.Companion.fromTitleToGyeonggiAreaType -import org.sopt.dateroad.domain.type.IncheonAreaType.Companion.fromTitleToIncheonAreaType -import org.sopt.dateroad.domain.type.RegionType -import org.sopt.dateroad.domain.type.SeoulAreaType.Companion.fromTitleToSeoulAreaType - -fun String.toRegionType(): RegionType? = when { - this.fromTitleToSeoulAreaType() != null -> RegionType.SEOUL - - this.fromTitleToGyeonggiAreaType() != null -> RegionType.GYEONGGI - - this.fromTitleToIncheonAreaType() != null -> RegionType.INCHEON - - else -> null -} diff --git a/app/src/main/java/org/sopt/dateroad/data/mapper/todata/PlaceMapper.kt b/app/src/main/java/org/sopt/dateroad/data/mapper/todata/PlaceMapper.kt deleted file mode 100644 index 23b1add95..000000000 --- a/app/src/main/java/org/sopt/dateroad/data/mapper/todata/PlaceMapper.kt +++ /dev/null @@ -1,11 +0,0 @@ -package org.sopt.dateroad.data.mapper.todata - -import org.sopt.dateroad.data.dataremote.model.request.RequestPlaceDto -import org.sopt.dateroad.data.dataremote.util.Duration.DURATION -import org.sopt.dateroad.domain.model.Place - -fun Place.toData(sequence: Int): RequestPlaceDto = RequestPlaceDto( - sequence = sequence, - title = this.title, - duration = duration.substringBefore(DURATION).toFloat() -) diff --git a/app/src/main/java/org/sopt/dateroad/data/mapper/todata/ProfileMapper.kt b/app/src/main/java/org/sopt/dateroad/data/mapper/todata/ProfileMapper.kt deleted file mode 100644 index 05cb5cfe3..000000000 --- a/app/src/main/java/org/sopt/dateroad/data/mapper/todata/ProfileMapper.kt +++ /dev/null @@ -1,10 +0,0 @@ -package org.sopt.dateroad.data.mapper.todata - -import org.sopt.dateroad.domain.model.EditProfile -import org.sopt.dateroad.domain.model.Profile - -fun Profile.toEditProfile(): EditProfile = EditProfile( - name = this.name, - tags = this.tag, - image = this.imageUrl -) diff --git a/app/src/main/java/org/sopt/dateroad/data/mapper/todata/SignInMapper.kt b/app/src/main/java/org/sopt/dateroad/data/mapper/todata/SignInMapper.kt deleted file mode 100644 index 2eab91b42..000000000 --- a/app/src/main/java/org/sopt/dateroad/data/mapper/todata/SignInMapper.kt +++ /dev/null @@ -1,8 +0,0 @@ -package org.sopt.dateroad.data.mapper.todata - -import org.sopt.dateroad.data.dataremote.model.request.RequestSignInDto -import org.sopt.dateroad.domain.model.SignIn - -fun SignIn.toData(): RequestSignInDto = RequestSignInDto( - platform = this.platform -) diff --git a/app/src/main/java/org/sopt/dateroad/data/mapper/todata/TagMapper.kt b/app/src/main/java/org/sopt/dateroad/data/mapper/todata/TagMapper.kt deleted file mode 100644 index 7ad5b412f..000000000 --- a/app/src/main/java/org/sopt/dateroad/data/mapper/todata/TagMapper.kt +++ /dev/null @@ -1,5 +0,0 @@ -package org.sopt.dateroad.data.mapper.todata - -import org.sopt.dateroad.data.dataremote.model.request.RequestTagDto - -fun String.toData() = RequestTagDto(tag = this) diff --git a/app/src/main/java/org/sopt/dateroad/data/mapper/todata/TagsMapper.kt b/app/src/main/java/org/sopt/dateroad/data/mapper/todata/TagsMapper.kt deleted file mode 100644 index a8142bce9..000000000 --- a/app/src/main/java/org/sopt/dateroad/data/mapper/todata/TagsMapper.kt +++ /dev/null @@ -1,7 +0,0 @@ -package org.sopt.dateroad.data.mapper.todata - -import org.sopt.dateroad.data.dataremote.model.request.RequestTagsDto - -fun List.toData(): RequestTagsDto = RequestTagsDto( - tag = this -) diff --git a/app/src/main/java/org/sopt/dateroad/data/mapper/todata/UsePointMapper.kt b/app/src/main/java/org/sopt/dateroad/data/mapper/todata/UsePointMapper.kt deleted file mode 100644 index 462f89135..000000000 --- a/app/src/main/java/org/sopt/dateroad/data/mapper/todata/UsePointMapper.kt +++ /dev/null @@ -1,10 +0,0 @@ -package org.sopt.dateroad.data.mapper.todata - -import org.sopt.dateroad.data.dataremote.model.request.RequestUsePointDto -import org.sopt.dateroad.domain.model.UsePoint - -fun UsePoint.toData(): RequestUsePointDto = RequestUsePointDto( - point = this.point, - type = this.type, - description = this.description -) diff --git a/app/src/main/java/org/sopt/dateroad/data/mapper/todata/UserSignUpInfoMapper.kt b/app/src/main/java/org/sopt/dateroad/data/mapper/todata/UserSignUpInfoMapper.kt deleted file mode 100644 index b647aaea6..000000000 --- a/app/src/main/java/org/sopt/dateroad/data/mapper/todata/UserSignUpInfoMapper.kt +++ /dev/null @@ -1,9 +0,0 @@ -package org.sopt.dateroad.data.mapper.todata - -import org.sopt.dateroad.data.dataremote.model.request.RequestUserSignUpInfoDto -import org.sopt.dateroad.domain.model.UserSignUpInfo - -fun UserSignUpInfo.toData(): RequestUserSignUpInfoDto = RequestUserSignUpInfoDto( - name = this.name, - platform = this.platform -) diff --git a/app/src/main/java/org/sopt/dateroad/data/mapper/todomain/ResponseAdvertisementDtoMapper.kt b/app/src/main/java/org/sopt/dateroad/data/mapper/todomain/ResponseAdvertisementDtoMapper.kt deleted file mode 100644 index 16b850da4..000000000 --- a/app/src/main/java/org/sopt/dateroad/data/mapper/todomain/ResponseAdvertisementDtoMapper.kt +++ /dev/null @@ -1,9 +0,0 @@ -package org.sopt.dateroad.data.mapper.todomain - -import org.sopt.dateroad.data.dataremote.model.response.ResponseAdvertisementDto -import org.sopt.dateroad.domain.model.Advertisement - -fun ResponseAdvertisementDto.toDomain(): Advertisement = Advertisement( - advertisementId = this.advertisementId, - thumbnail = this.thumbnail -) diff --git a/app/src/main/java/org/sopt/dateroad/data/mapper/todomain/ResponseAdvertisementsDtoMapper.kt b/app/src/main/java/org/sopt/dateroad/data/mapper/todomain/ResponseAdvertisementsDtoMapper.kt deleted file mode 100644 index fe2108482..000000000 --- a/app/src/main/java/org/sopt/dateroad/data/mapper/todomain/ResponseAdvertisementsDtoMapper.kt +++ /dev/null @@ -1,6 +0,0 @@ -package org.sopt.dateroad.data.mapper.todomain - -import org.sopt.dateroad.data.dataremote.model.response.ResponseAdvertisementsDto -import org.sopt.dateroad.domain.model.Advertisement - -fun ResponseAdvertisementsDto.toDomain(): List = this.advertisements.map { responseAdvertisementDto -> responseAdvertisementDto.toDomain() } diff --git a/app/src/main/java/org/sopt/dateroad/data/mapper/todomain/ResponseAuthDtoMapper.kt b/app/src/main/java/org/sopt/dateroad/data/mapper/todomain/ResponseAuthDtoMapper.kt deleted file mode 100644 index 49882874b..000000000 --- a/app/src/main/java/org/sopt/dateroad/data/mapper/todomain/ResponseAuthDtoMapper.kt +++ /dev/null @@ -1,9 +0,0 @@ -package org.sopt.dateroad.data.mapper.todomain - -import org.sopt.dateroad.data.dataremote.model.response.ResponseAuthDto -import org.sopt.dateroad.domain.model.Auth - -fun ResponseAuthDto.toDomain(): Auth = Auth( - accessToken = this.accessToken, - refreshToken = this.refreshToken -) diff --git a/app/src/main/java/org/sopt/dateroad/data/mapper/todomain/ResponseCourseDtoMapper.kt b/app/src/main/java/org/sopt/dateroad/data/mapper/todomain/ResponseCourseDtoMapper.kt deleted file mode 100644 index fd0e3ac2f..000000000 --- a/app/src/main/java/org/sopt/dateroad/data/mapper/todomain/ResponseCourseDtoMapper.kt +++ /dev/null @@ -1,17 +0,0 @@ -package org.sopt.dateroad.data.mapper.todomain - -import org.sopt.dateroad.data.dataremote.model.response.ResponseCourseDto -import org.sopt.dateroad.data.mapper.toEntity.toDuration -import org.sopt.dateroad.data.mapper.toEntity.toLike -import org.sopt.dateroad.domain.model.Course -import org.sopt.dateroad.domain.type.MoneyTagType.Companion.toCostTagTitle - -fun ResponseCourseDto.toDomain(): Course = Course( - courseId = this.courseId, - thumbnail = this.thumbnail, - title = this.title, - city = this.city, - cost = this.cost.toCostTagTitle(), - duration = this.duration.toDuration(), - like = this.like.toLike() -) diff --git a/app/src/main/java/org/sopt/dateroad/data/mapper/todomain/ResponseCoursesDtoMapper.kt b/app/src/main/java/org/sopt/dateroad/data/mapper/todomain/ResponseCoursesDtoMapper.kt deleted file mode 100644 index 11f273854..000000000 --- a/app/src/main/java/org/sopt/dateroad/data/mapper/todomain/ResponseCoursesDtoMapper.kt +++ /dev/null @@ -1,6 +0,0 @@ -package org.sopt.dateroad.data.mapper.todomain - -import org.sopt.dateroad.data.dataremote.model.response.ResponseCoursesDto -import org.sopt.dateroad.domain.model.Course - -fun ResponseCoursesDto.toDomain(): List = this.courses.map { course -> course.toDomain() } diff --git a/app/src/main/java/org/sopt/dateroad/data/mapper/todomain/ResponseEnrollCourseDtoMapper.kt b/app/src/main/java/org/sopt/dateroad/data/mapper/todomain/ResponseEnrollCourseDtoMapper.kt deleted file mode 100644 index 182cabfce..000000000 --- a/app/src/main/java/org/sopt/dateroad/data/mapper/todomain/ResponseEnrollCourseDtoMapper.kt +++ /dev/null @@ -1,9 +0,0 @@ -package org.sopt.dateroad.data.mapper.todomain - -import org.sopt.dateroad.data.dataremote.model.response.ResponseEnrollCourseDto -import org.sopt.dateroad.domain.model.EnrollCourseResult - -fun ResponseEnrollCourseDto.toDomain(): EnrollCourseResult = EnrollCourseResult( - userPoint = this.userPoint, - userCourseCount = this.userCourseCount -) diff --git a/app/src/main/java/org/sopt/dateroad/data/mapper/todomain/ResponseEnrollTimelineDtoMapper.kt b/app/src/main/java/org/sopt/dateroad/data/mapper/todomain/ResponseEnrollTimelineDtoMapper.kt deleted file mode 100644 index 59fe13410..000000000 --- a/app/src/main/java/org/sopt/dateroad/data/mapper/todomain/ResponseEnrollTimelineDtoMapper.kt +++ /dev/null @@ -1,8 +0,0 @@ -package org.sopt.dateroad.data.mapper.todomain - -import org.sopt.dateroad.data.dataremote.model.response.ResponseEnrollTimelineDto -import org.sopt.dateroad.domain.model.EnrollTimelineResult - -fun ResponseEnrollTimelineDto.toDomain(): EnrollTimelineResult = EnrollTimelineResult( - dateScheduleNum = this.dateScheduleNum -) diff --git a/app/src/main/java/org/sopt/dateroad/data/mapper/todomain/ResponseNearestTimelineDtoMapper.kt b/app/src/main/java/org/sopt/dateroad/data/mapper/todomain/ResponseNearestTimelineDtoMapper.kt deleted file mode 100644 index 444e56971..000000000 --- a/app/src/main/java/org/sopt/dateroad/data/mapper/todomain/ResponseNearestTimelineDtoMapper.kt +++ /dev/null @@ -1,15 +0,0 @@ -package org.sopt.dateroad.data.mapper.todomain - -import org.sopt.dateroad.data.dataremote.model.response.ResponseNearestTimelineDto -import org.sopt.dateroad.data.mapper.toEntity.toDDayString -import org.sopt.dateroad.data.mapper.toEntity.toFormattedDate -import org.sopt.dateroad.data.mapper.toEntity.toStartAtString -import org.sopt.dateroad.domain.model.NearestTimeline - -fun ResponseNearestTimelineDto.toDomain(): NearestTimeline = NearestTimeline( - timelineId = this.timelineId, - dDay = this.dDay.toDDayString(), - dateName = this.dateName, - date = toFormattedDate(), - startAt = this.startAt.toStartAtString() -) diff --git a/app/src/main/java/org/sopt/dateroad/data/mapper/todomain/ResponsePlaceDtoMapper.kt b/app/src/main/java/org/sopt/dateroad/data/mapper/todomain/ResponsePlaceDtoMapper.kt deleted file mode 100644 index 063510b47..000000000 --- a/app/src/main/java/org/sopt/dateroad/data/mapper/todomain/ResponsePlaceDtoMapper.kt +++ /dev/null @@ -1,10 +0,0 @@ -package org.sopt.dateroad.data.mapper.todomain - -import org.sopt.dateroad.data.dataremote.model.response.ResponsePlaceDto -import org.sopt.dateroad.data.mapper.toEntity.toDuration -import org.sopt.dateroad.domain.model.Place - -fun ResponsePlaceDto.toDomain() = Place( - title = this.title, - duration = this.duration.toDuration() -) diff --git a/app/src/main/java/org/sopt/dateroad/data/mapper/todomain/ResponsePointHistoryDtoMapper.kt b/app/src/main/java/org/sopt/dateroad/data/mapper/todomain/ResponsePointHistoryDtoMapper.kt deleted file mode 100644 index bb7a4e572..000000000 --- a/app/src/main/java/org/sopt/dateroad/data/mapper/todomain/ResponsePointHistoryDtoMapper.kt +++ /dev/null @@ -1,9 +0,0 @@ -package org.sopt.dateroad.data.mapper.todomain - -import org.sopt.dateroad.data.dataremote.model.response.ResponsePointHistoryDto -import org.sopt.dateroad.domain.model.PointHistory - -fun ResponsePointHistoryDto.toDomain(): PointHistory = PointHistory( - gained = this.gained.toGainedPointDomain(), - used = this.used.toUsedPointDomain() -) diff --git a/app/src/main/java/org/sopt/dateroad/data/mapper/todomain/ResponseProfileDtoMapper.kt b/app/src/main/java/org/sopt/dateroad/data/mapper/todomain/ResponseProfileDtoMapper.kt deleted file mode 100644 index cdc89005c..000000000 --- a/app/src/main/java/org/sopt/dateroad/data/mapper/todomain/ResponseProfileDtoMapper.kt +++ /dev/null @@ -1,12 +0,0 @@ -package org.sopt.dateroad.data.mapper.todomain - -import org.sopt.dateroad.data.dataremote.model.response.ResponseProfileDto -import org.sopt.dateroad.data.mapper.toEntity.toPoint -import org.sopt.dateroad.domain.model.Profile - -fun ResponseProfileDto.toDomain(): Profile = Profile( - name = this.name, - tag = this.tags, - point = this.point.toPoint(), - imageUrl = this.imageUrl -) diff --git a/app/src/main/java/org/sopt/dateroad/data/mapper/todomain/ResponseTagDtoMapper.kt b/app/src/main/java/org/sopt/dateroad/data/mapper/todomain/ResponseTagDtoMapper.kt deleted file mode 100644 index df287c663..000000000 --- a/app/src/main/java/org/sopt/dateroad/data/mapper/todomain/ResponseTagDtoMapper.kt +++ /dev/null @@ -1,6 +0,0 @@ -package org.sopt.dateroad.data.mapper.todomain - -import org.sopt.dateroad.data.dataremote.model.response.ResponseTagDto -import org.sopt.dateroad.presentation.type.DateTagType - -fun ResponseTagDto.toDomain(): DateTagType = DateTagType.valueOf(this.tag) diff --git a/app/src/main/java/org/sopt/dateroad/data/mapper/todomain/ResponseUserPointDtoMapper.kt b/app/src/main/java/org/sopt/dateroad/data/mapper/todomain/ResponseUserPointDtoMapper.kt deleted file mode 100644 index dc2f1ddef..000000000 --- a/app/src/main/java/org/sopt/dateroad/data/mapper/todomain/ResponseUserPointDtoMapper.kt +++ /dev/null @@ -1,11 +0,0 @@ -package org.sopt.dateroad.data.mapper.todomain - -import org.sopt.dateroad.data.dataremote.model.response.ResponseUserPointDto -import org.sopt.dateroad.data.mapper.toEntity.toPoint -import org.sopt.dateroad.domain.model.UserPoint - -fun ResponseUserPointDto.toDomain(): UserPoint = UserPoint( - name = this.name, - point = this.point.toPoint(), - imageUrl = this.image -) diff --git a/app/src/main/java/org/sopt/dateroad/data/repositoryimpl/ProfileRepositoryImpl.kt b/app/src/main/java/org/sopt/dateroad/data/repositoryimpl/ProfileRepositoryImpl.kt deleted file mode 100644 index 91b18e4d6..000000000 --- a/app/src/main/java/org/sopt/dateroad/data/repositoryimpl/ProfileRepositoryImpl.kt +++ /dev/null @@ -1,16 +0,0 @@ - -package org.sopt.dateroad.data.repositoryimpl - -import javax.inject.Inject -import org.sopt.dateroad.data.dataremote.datasource.ProfileRemoteDataSource -import org.sopt.dateroad.data.mapper.todomain.toDomain -import org.sopt.dateroad.domain.model.Profile -import org.sopt.dateroad.domain.repository.ProfileRepository - -class ProfileRepositoryImpl @Inject constructor( - private val profileDataSource: ProfileRemoteDataSource -) : ProfileRepository { - override suspend fun getUsers(): Result = runCatching { - profileDataSource.getProfile().toDomain() - } -} diff --git a/app/src/main/java/org/sopt/dateroad/domain/repository/ProfileRepository.kt b/app/src/main/java/org/sopt/dateroad/domain/repository/ProfileRepository.kt deleted file mode 100644 index 215060a5a..000000000 --- a/app/src/main/java/org/sopt/dateroad/domain/repository/ProfileRepository.kt +++ /dev/null @@ -1,7 +0,0 @@ -package org.sopt.dateroad.domain.repository - -import org.sopt.dateroad.domain.model.Profile - -interface ProfileRepository { - suspend fun getUsers(): Result -} diff --git a/app/src/main/java/org/sopt/dateroad/domain/repository/UserPointRepository.kt b/app/src/main/java/org/sopt/dateroad/domain/repository/UserPointRepository.kt deleted file mode 100644 index 6da30ebe9..000000000 --- a/app/src/main/java/org/sopt/dateroad/domain/repository/UserPointRepository.kt +++ /dev/null @@ -1,14 +0,0 @@ -package org.sopt.dateroad.domain.repository - -import org.sopt.dateroad.domain.model.PointHistory -import org.sopt.dateroad.domain.model.PointUseResult -import org.sopt.dateroad.domain.model.UsePoint -import org.sopt.dateroad.domain.model.UserPoint - -interface UserPointRepository { - suspend fun getUserPoint(): Result - - suspend fun getPointHistory(): Result - - suspend fun postUsePoint(courseId: Int, usePoint: UsePoint): Result -} diff --git a/app/src/main/java/org/sopt/dateroad/presentation/ui/component/bottomsheet/model/Picker.kt b/app/src/main/java/org/sopt/dateroad/presentation/ui/component/bottomsheet/model/Picker.kt deleted file mode 100644 index f45054a5e..000000000 --- a/app/src/main/java/org/sopt/dateroad/presentation/ui/component/bottomsheet/model/Picker.kt +++ /dev/null @@ -1,9 +0,0 @@ -package org.sopt.dateroad.presentation.ui.component.bottomsheet.model - -import org.sopt.dateroad.presentation.ui.component.numberpicker.state.PickerState - -data class Picker( - val items: List, - val startIndex: Int = 0, - val pickerState: PickerState = PickerState() -) diff --git a/app/src/main/java/org/sopt/dateroad/presentation/util/base/UiEvent.kt b/app/src/main/java/org/sopt/dateroad/presentation/util/base/UiEvent.kt deleted file mode 100644 index ef1246c2c..000000000 --- a/app/src/main/java/org/sopt/dateroad/presentation/util/base/UiEvent.kt +++ /dev/null @@ -1,3 +0,0 @@ -package org.sopt.dateroad.presentation.util.base - -interface UiEvent diff --git a/app/src/main/java/org/sopt/dateroad/presentation/util/base/UiSideEffect.kt b/app/src/main/java/org/sopt/dateroad/presentation/util/base/UiSideEffect.kt deleted file mode 100644 index a869c3c3d..000000000 --- a/app/src/main/java/org/sopt/dateroad/presentation/util/base/UiSideEffect.kt +++ /dev/null @@ -1,3 +0,0 @@ -package org.sopt.dateroad.presentation.util.base - -interface UiSideEffect diff --git a/app/src/main/java/org/sopt/dateroad/presentation/util/base/UiState.kt b/app/src/main/java/org/sopt/dateroad/presentation/util/base/UiState.kt deleted file mode 100644 index f2f1b45b3..000000000 --- a/app/src/main/java/org/sopt/dateroad/presentation/util/base/UiState.kt +++ /dev/null @@ -1,3 +0,0 @@ -package org.sopt.dateroad.presentation.util.base - -interface UiState diff --git a/app/src/main/java/org/sopt/dateroad/DateRoadApp.kt b/app/src/main/java/org/sopt/teamdateroad/DateRoadApp.kt similarity index 79% rename from app/src/main/java/org/sopt/dateroad/DateRoadApp.kt rename to app/src/main/java/org/sopt/teamdateroad/DateRoadApp.kt index 245a42e39..29aeb173e 100644 --- a/app/src/main/java/org/sopt/dateroad/DateRoadApp.kt +++ b/app/src/main/java/org/sopt/teamdateroad/DateRoadApp.kt @@ -1,11 +1,11 @@ -package org.sopt.dateroad +package org.sopt.teamdateroad import android.app.Application import androidx.appcompat.app.AppCompatDelegate import com.kakao.sdk.common.KakaoSdk import dagger.hilt.android.HiltAndroidApp -import org.sopt.dateroad.BuildConfig.KAKAO_NATIVE_APP_KEY -import org.sopt.dateroad.presentation.util.amplitude.AmplitudeUtils.initAmplitude +import org.sopt.teamdateroad.BuildConfig.KAKAO_NATIVE_APP_KEY +import org.sopt.teamdateroad.presentation.util.amplitude.AmplitudeUtils.initAmplitude import timber.log.Timber @HiltAndroidApp diff --git a/app/src/main/java/org/sopt/dateroad/data/datalocal/datasource/UserInfoLocalDataSource.kt b/app/src/main/java/org/sopt/teamdateroad/data/datalocal/datasource/UserInfoLocalDataSource.kt similarity index 70% rename from app/src/main/java/org/sopt/dateroad/data/datalocal/datasource/UserInfoLocalDataSource.kt rename to app/src/main/java/org/sopt/teamdateroad/data/datalocal/datasource/UserInfoLocalDataSource.kt index 954932f82..a86132660 100644 --- a/app/src/main/java/org/sopt/dateroad/data/datalocal/datasource/UserInfoLocalDataSource.kt +++ b/app/src/main/java/org/sopt/teamdateroad/data/datalocal/datasource/UserInfoLocalDataSource.kt @@ -1,4 +1,4 @@ -package org.sopt.dateroad.data.datalocal.datasource +package org.sopt.teamdateroad.data.datalocal.datasource interface UserInfoLocalDataSource { var accessToken: String diff --git a/app/src/main/java/org/sopt/dateroad/data/datalocal/datasourceimpl/UserInfoLocalDataSourceImpl.kt b/app/src/main/java/org/sopt/teamdateroad/data/datalocal/datasourceimpl/UserInfoLocalDataSourceImpl.kt similarity index 91% rename from app/src/main/java/org/sopt/dateroad/data/datalocal/datasourceimpl/UserInfoLocalDataSourceImpl.kt rename to app/src/main/java/org/sopt/teamdateroad/data/datalocal/datasourceimpl/UserInfoLocalDataSourceImpl.kt index 5299fd28a..38794f242 100644 --- a/app/src/main/java/org/sopt/dateroad/data/datalocal/datasourceimpl/UserInfoLocalDataSourceImpl.kt +++ b/app/src/main/java/org/sopt/teamdateroad/data/datalocal/datasourceimpl/UserInfoLocalDataSourceImpl.kt @@ -1,4 +1,4 @@ -package org.sopt.dateroad.data.datalocal.datasourceimpl +package org.sopt.teamdateroad.data.datalocal.datasourceimpl import android.content.Context import android.content.SharedPreferences @@ -9,8 +9,8 @@ import com.kakao.sdk.auth.Constants.ACCESS_TOKEN import com.kakao.sdk.auth.Constants.REFRESH_TOKEN import dagger.hilt.android.qualifiers.ApplicationContext import javax.inject.Inject -import org.sopt.dateroad.BuildConfig -import org.sopt.dateroad.data.datalocal.datasource.UserInfoLocalDataSource +import org.sopt.teamdateroad.BuildConfig +import org.sopt.teamdateroad.data.datalocal.datasource.UserInfoLocalDataSource class UserInfoLocalDataSourceImpl @Inject constructor( @ApplicationContext context: Context diff --git a/app/src/main/java/org/sopt/teamdateroad/data/dataremote/datasource/AdvertisementRemoteDataSource.kt b/app/src/main/java/org/sopt/teamdateroad/data/dataremote/datasource/AdvertisementRemoteDataSource.kt new file mode 100644 index 000000000..0ebbc678a --- /dev/null +++ b/app/src/main/java/org/sopt/teamdateroad/data/dataremote/datasource/AdvertisementRemoteDataSource.kt @@ -0,0 +1,10 @@ +package org.sopt.teamdateroad.data.dataremote.datasource + +import org.sopt.teamdateroad.data.dataremote.model.response.ResponseAdvertisementDetailDto +import org.sopt.teamdateroad.data.dataremote.model.response.ResponseAdvertisementsDto + +interface AdvertisementRemoteDataSource { + suspend fun getAdvertisementDetail(advertisementId: Int): ResponseAdvertisementDetailDto + + suspend fun getHomeAdvertisements(): ResponseAdvertisementsDto +} diff --git a/app/src/main/java/org/sopt/dateroad/data/dataremote/datasource/AuthRemoteDataSource.kt b/app/src/main/java/org/sopt/teamdateroad/data/dataremote/datasource/AuthRemoteDataSource.kt similarity index 67% rename from app/src/main/java/org/sopt/dateroad/data/dataremote/datasource/AuthRemoteDataSource.kt rename to app/src/main/java/org/sopt/teamdateroad/data/dataremote/datasource/AuthRemoteDataSource.kt index 8819d33d6..3e3e70160 100644 --- a/app/src/main/java/org/sopt/dateroad/data/dataremote/datasource/AuthRemoteDataSource.kt +++ b/app/src/main/java/org/sopt/teamdateroad/data/dataremote/datasource/AuthRemoteDataSource.kt @@ -1,10 +1,10 @@ -package org.sopt.dateroad.data.dataremote.datasource +package org.sopt.teamdateroad.data.dataremote.datasource import okhttp3.MultipartBody import okhttp3.RequestBody -import org.sopt.dateroad.data.dataremote.model.request.RequestSignInDto -import org.sopt.dateroad.data.dataremote.model.request.RequestWithdrawDto -import org.sopt.dateroad.data.dataremote.model.response.ResponseAuthDto +import org.sopt.teamdateroad.data.dataremote.model.request.RequestSignInDto +import org.sopt.teamdateroad.data.dataremote.model.request.RequestWithdrawDto +import org.sopt.teamdateroad.data.dataremote.model.response.ResponseAuthDto interface AuthRemoteDataSource { suspend fun deleteSignOut() diff --git a/app/src/main/java/org/sopt/dateroad/data/dataremote/datasource/CourseRemoteDataSource.kt b/app/src/main/java/org/sopt/teamdateroad/data/dataremote/datasource/CourseRemoteDataSource.kt similarity index 67% rename from app/src/main/java/org/sopt/dateroad/data/dataremote/datasource/CourseRemoteDataSource.kt rename to app/src/main/java/org/sopt/teamdateroad/data/dataremote/datasource/CourseRemoteDataSource.kt index 1781a0335..e0b1d6799 100644 --- a/app/src/main/java/org/sopt/dateroad/data/dataremote/datasource/CourseRemoteDataSource.kt +++ b/app/src/main/java/org/sopt/teamdateroad/data/dataremote/datasource/CourseRemoteDataSource.kt @@ -1,10 +1,10 @@ -package org.sopt.dateroad.data.dataremote.datasource +package org.sopt.teamdateroad.data.dataremote.datasource import okhttp3.MultipartBody import okhttp3.RequestBody -import org.sopt.dateroad.data.dataremote.model.response.ResponseCourseDetailDto -import org.sopt.dateroad.data.dataremote.model.response.ResponseCoursesDto -import org.sopt.dateroad.data.dataremote.model.response.ResponseEnrollCourseDto +import org.sopt.teamdateroad.data.dataremote.model.response.ResponseCourseDetailDto +import org.sopt.teamdateroad.data.dataremote.model.response.ResponseCoursesDto +import org.sopt.teamdateroad.data.dataremote.model.response.ResponseEnrollCourseDto interface CourseRemoteDataSource { suspend fun deleteCourse(courseId: Int) diff --git a/app/src/main/java/org/sopt/dateroad/data/dataremote/datasource/MyCourseRemoteDataSource.kt b/app/src/main/java/org/sopt/teamdateroad/data/dataremote/datasource/MyCourseRemoteDataSource.kt similarity index 52% rename from app/src/main/java/org/sopt/dateroad/data/dataremote/datasource/MyCourseRemoteDataSource.kt rename to app/src/main/java/org/sopt/teamdateroad/data/dataremote/datasource/MyCourseRemoteDataSource.kt index f97d46661..99b282950 100644 --- a/app/src/main/java/org/sopt/dateroad/data/dataremote/datasource/MyCourseRemoteDataSource.kt +++ b/app/src/main/java/org/sopt/teamdateroad/data/dataremote/datasource/MyCourseRemoteDataSource.kt @@ -1,6 +1,6 @@ -package org.sopt.dateroad.data.dataremote.datasource +package org.sopt.teamdateroad.data.dataremote.datasource -import org.sopt.dateroad.data.dataremote.model.response.ResponseCoursesDto +import org.sopt.teamdateroad.data.dataremote.model.response.ResponseCoursesDto interface MyCourseRemoteDataSource { suspend fun getMyCourseEnroll(): ResponseCoursesDto diff --git a/app/src/main/java/org/sopt/teamdateroad/data/dataremote/datasource/ProfileRemoteDataSource.kt b/app/src/main/java/org/sopt/teamdateroad/data/dataremote/datasource/ProfileRemoteDataSource.kt new file mode 100644 index 000000000..16201e4b2 --- /dev/null +++ b/app/src/main/java/org/sopt/teamdateroad/data/dataremote/datasource/ProfileRemoteDataSource.kt @@ -0,0 +1,7 @@ +package org.sopt.teamdateroad.data.dataremote.datasource + +import org.sopt.teamdateroad.data.dataremote.model.response.ResponseProfileDto + +interface ProfileRemoteDataSource { + suspend fun getProfile(): ResponseProfileDto +} diff --git a/app/src/main/java/org/sopt/teamdateroad/data/dataremote/datasource/TimelineRemoteDataSource.kt b/app/src/main/java/org/sopt/teamdateroad/data/dataremote/datasource/TimelineRemoteDataSource.kt new file mode 100644 index 000000000..31a22bf2c --- /dev/null +++ b/app/src/main/java/org/sopt/teamdateroad/data/dataremote/datasource/TimelineRemoteDataSource.kt @@ -0,0 +1,19 @@ +package org.sopt.teamdateroad.data.dataremote.datasource + +import org.sopt.teamdateroad.data.dataremote.model.request.RequestTimelineDto +import org.sopt.teamdateroad.data.dataremote.model.response.ResponseEnrollTimelineDto +import org.sopt.teamdateroad.data.dataremote.model.response.ResponseNearestTimelineDto +import org.sopt.teamdateroad.data.dataremote.model.response.ResponseTimelineDetailDto +import org.sopt.teamdateroad.data.dataremote.model.response.ResponseTimelinesDto + +interface TimelineRemoteDataSource { + suspend fun deleteTimeline(timelineId: Int) + + suspend fun getTimelineDetail(timelineId: Int): ResponseTimelineDetailDto + + suspend fun getTimelines(timelineTimeType: String): ResponseTimelinesDto + + suspend fun getNearestTimeline(): ResponseNearestTimelineDto + + suspend fun postTimeline(requestTimelineDto: RequestTimelineDto): ResponseEnrollTimelineDto +} diff --git a/app/src/main/java/org/sopt/teamdateroad/data/dataremote/datasource/UserPointRemoteDataSource.kt b/app/src/main/java/org/sopt/teamdateroad/data/dataremote/datasource/UserPointRemoteDataSource.kt new file mode 100644 index 000000000..3e6d5820a --- /dev/null +++ b/app/src/main/java/org/sopt/teamdateroad/data/dataremote/datasource/UserPointRemoteDataSource.kt @@ -0,0 +1,14 @@ +package org.sopt.teamdateroad.data.dataremote.datasource + +import org.sopt.teamdateroad.data.dataremote.model.request.RequestUsePointDto +import org.sopt.teamdateroad.data.dataremote.model.response.ResponsePointHistoryDto +import org.sopt.teamdateroad.data.dataremote.model.response.ResponseUserPointDto +import org.sopt.teamdateroad.data.dataremote.model.response.ResponseUserUsePointDto + +interface UserPointRemoteDataSource { + suspend fun getUserPoint(): ResponseUserPointDto + + suspend fun getPointHistory(): ResponsePointHistoryDto + + suspend fun postUsePoint(courseId: Int, requestUsePointDto: RequestUsePointDto): ResponseUserUsePointDto +} diff --git a/app/src/main/java/org/sopt/dateroad/data/dataremote/datasourceimpl/AdvertisementRemoteDataSourceImpl.kt b/app/src/main/java/org/sopt/teamdateroad/data/dataremote/datasourceimpl/AdvertisementRemoteDataSourceImpl.kt similarity index 55% rename from app/src/main/java/org/sopt/dateroad/data/dataremote/datasourceimpl/AdvertisementRemoteDataSourceImpl.kt rename to app/src/main/java/org/sopt/teamdateroad/data/dataremote/datasourceimpl/AdvertisementRemoteDataSourceImpl.kt index 90615fe7d..27739c134 100644 --- a/app/src/main/java/org/sopt/dateroad/data/dataremote/datasourceimpl/AdvertisementRemoteDataSourceImpl.kt +++ b/app/src/main/java/org/sopt/teamdateroad/data/dataremote/datasourceimpl/AdvertisementRemoteDataSourceImpl.kt @@ -1,10 +1,10 @@ -package org.sopt.dateroad.data.dataremote.datasourceimpl +package org.sopt.teamdateroad.data.dataremote.datasourceimpl import javax.inject.Inject -import org.sopt.dateroad.data.dataremote.datasource.AdvertisementRemoteDataSource -import org.sopt.dateroad.data.dataremote.model.response.ResponseAdvertisementDetailDto -import org.sopt.dateroad.data.dataremote.model.response.ResponseAdvertisementsDto -import org.sopt.dateroad.data.dataremote.service.AdvertisementService +import org.sopt.teamdateroad.data.dataremote.datasource.AdvertisementRemoteDataSource +import org.sopt.teamdateroad.data.dataremote.model.response.ResponseAdvertisementDetailDto +import org.sopt.teamdateroad.data.dataremote.model.response.ResponseAdvertisementsDto +import org.sopt.teamdateroad.data.dataremote.service.AdvertisementService class AdvertisementRemoteDataSourceImpl @Inject constructor( private val advertisementService: AdvertisementService diff --git a/app/src/main/java/org/sopt/dateroad/data/dataremote/datasourceimpl/AuthRemoteDataSourceImpl.kt b/app/src/main/java/org/sopt/teamdateroad/data/dataremote/datasourceimpl/AuthRemoteDataSourceImpl.kt similarity index 73% rename from app/src/main/java/org/sopt/dateroad/data/dataremote/datasourceimpl/AuthRemoteDataSourceImpl.kt rename to app/src/main/java/org/sopt/teamdateroad/data/dataremote/datasourceimpl/AuthRemoteDataSourceImpl.kt index e36ddc3d0..28c7ccca3 100644 --- a/app/src/main/java/org/sopt/dateroad/data/dataremote/datasourceimpl/AuthRemoteDataSourceImpl.kt +++ b/app/src/main/java/org/sopt/teamdateroad/data/dataremote/datasourceimpl/AuthRemoteDataSourceImpl.kt @@ -1,13 +1,13 @@ -package org.sopt.dateroad.data.dataremote.datasourceimpl +package org.sopt.teamdateroad.data.dataremote.datasourceimpl import javax.inject.Inject import okhttp3.MultipartBody import okhttp3.RequestBody -import org.sopt.dateroad.data.dataremote.datasource.AuthRemoteDataSource -import org.sopt.dateroad.data.dataremote.model.request.RequestSignInDto -import org.sopt.dateroad.data.dataremote.model.request.RequestWithdrawDto -import org.sopt.dateroad.data.dataremote.model.response.ResponseAuthDto -import org.sopt.dateroad.data.dataremote.service.AuthService +import org.sopt.teamdateroad.data.dataremote.datasource.AuthRemoteDataSource +import org.sopt.teamdateroad.data.dataremote.model.request.RequestSignInDto +import org.sopt.teamdateroad.data.dataremote.model.request.RequestWithdrawDto +import org.sopt.teamdateroad.data.dataremote.model.response.ResponseAuthDto +import org.sopt.teamdateroad.data.dataremote.service.AuthService class AuthRemoteDataSourceImpl @Inject constructor( private val authService: AuthService diff --git a/app/src/main/java/org/sopt/dateroad/data/dataremote/datasourceimpl/CourseRemoteDataSourceImpl.kt b/app/src/main/java/org/sopt/teamdateroad/data/dataremote/datasourceimpl/CourseRemoteDataSourceImpl.kt similarity index 73% rename from app/src/main/java/org/sopt/dateroad/data/dataremote/datasourceimpl/CourseRemoteDataSourceImpl.kt rename to app/src/main/java/org/sopt/teamdateroad/data/dataremote/datasourceimpl/CourseRemoteDataSourceImpl.kt index a8d43b153..59d723a40 100644 --- a/app/src/main/java/org/sopt/dateroad/data/dataremote/datasourceimpl/CourseRemoteDataSourceImpl.kt +++ b/app/src/main/java/org/sopt/teamdateroad/data/dataremote/datasourceimpl/CourseRemoteDataSourceImpl.kt @@ -1,13 +1,13 @@ -package org.sopt.dateroad.data.dataremote.datasourceimpl +package org.sopt.teamdateroad.data.dataremote.datasourceimpl import javax.inject.Inject import okhttp3.MultipartBody import okhttp3.RequestBody -import org.sopt.dateroad.data.dataremote.datasource.CourseRemoteDataSource -import org.sopt.dateroad.data.dataremote.model.response.ResponseCourseDetailDto -import org.sopt.dateroad.data.dataremote.model.response.ResponseCoursesDto -import org.sopt.dateroad.data.dataremote.model.response.ResponseEnrollCourseDto -import org.sopt.dateroad.data.dataremote.service.CourseService +import org.sopt.teamdateroad.data.dataremote.datasource.CourseRemoteDataSource +import org.sopt.teamdateroad.data.dataremote.model.response.ResponseCourseDetailDto +import org.sopt.teamdateroad.data.dataremote.model.response.ResponseCoursesDto +import org.sopt.teamdateroad.data.dataremote.model.response.ResponseEnrollCourseDto +import org.sopt.teamdateroad.data.dataremote.service.CourseService class CourseRemoteDataSourceImpl @Inject constructor( private val courseService: CourseService diff --git a/app/src/main/java/org/sopt/dateroad/data/dataremote/datasourceimpl/MyCourseRemoteDataSourceImpl.kt b/app/src/main/java/org/sopt/teamdateroad/data/dataremote/datasourceimpl/MyCourseRemoteDataSourceImpl.kt similarity index 56% rename from app/src/main/java/org/sopt/dateroad/data/dataremote/datasourceimpl/MyCourseRemoteDataSourceImpl.kt rename to app/src/main/java/org/sopt/teamdateroad/data/dataremote/datasourceimpl/MyCourseRemoteDataSourceImpl.kt index b8490c0d1..cd6a29c9d 100644 --- a/app/src/main/java/org/sopt/dateroad/data/dataremote/datasourceimpl/MyCourseRemoteDataSourceImpl.kt +++ b/app/src/main/java/org/sopt/teamdateroad/data/dataremote/datasourceimpl/MyCourseRemoteDataSourceImpl.kt @@ -1,9 +1,9 @@ -package org.sopt.dateroad.data.dataremote.datasourceimpl +package org.sopt.teamdateroad.data.dataremote.datasourceimpl import javax.inject.Inject -import org.sopt.dateroad.data.dataremote.datasource.MyCourseRemoteDataSource -import org.sopt.dateroad.data.dataremote.model.response.ResponseCoursesDto -import org.sopt.dateroad.data.dataremote.service.MyCourseService +import org.sopt.teamdateroad.data.dataremote.datasource.MyCourseRemoteDataSource +import org.sopt.teamdateroad.data.dataremote.model.response.ResponseCoursesDto +import org.sopt.teamdateroad.data.dataremote.service.MyCourseService class MyCourseRemoteDataSourceImpl @Inject constructor( private val myCourseService: MyCourseService diff --git a/app/src/main/java/org/sopt/teamdateroad/data/dataremote/datasourceimpl/ProfileRemoteDataSourceImpl.kt b/app/src/main/java/org/sopt/teamdateroad/data/dataremote/datasourceimpl/ProfileRemoteDataSourceImpl.kt new file mode 100644 index 000000000..d5b540115 --- /dev/null +++ b/app/src/main/java/org/sopt/teamdateroad/data/dataremote/datasourceimpl/ProfileRemoteDataSourceImpl.kt @@ -0,0 +1,14 @@ +package org.sopt.teamdateroad.data.dataremote.datasourceimpl + +import javax.inject.Inject +import org.sopt.teamdateroad.data.dataremote.datasource.ProfileRemoteDataSource +import org.sopt.teamdateroad.data.dataremote.model.response.ResponseProfileDto +import org.sopt.teamdateroad.data.dataremote.service.ProfileService + +class ProfileRemoteDataSourceImpl @Inject constructor( + private val profileService: ProfileService +) : ProfileRemoteDataSource { + + override suspend fun getProfile(): ResponseProfileDto = + profileService.getProfile() +} diff --git a/app/src/main/java/org/sopt/dateroad/data/dataremote/datasourceimpl/TimelineRemoteDataSourceImpl.kt b/app/src/main/java/org/sopt/teamdateroad/data/dataremote/datasourceimpl/TimelineRemoteDataSourceImpl.kt similarity index 58% rename from app/src/main/java/org/sopt/dateroad/data/dataremote/datasourceimpl/TimelineRemoteDataSourceImpl.kt rename to app/src/main/java/org/sopt/teamdateroad/data/dataremote/datasourceimpl/TimelineRemoteDataSourceImpl.kt index e98ab11ea..e2fae4b61 100644 --- a/app/src/main/java/org/sopt/dateroad/data/dataremote/datasourceimpl/TimelineRemoteDataSourceImpl.kt +++ b/app/src/main/java/org/sopt/teamdateroad/data/dataremote/datasourceimpl/TimelineRemoteDataSourceImpl.kt @@ -1,13 +1,13 @@ -package org.sopt.dateroad.data.dataremote.datasourceimpl +package org.sopt.teamdateroad.data.dataremote.datasourceimpl import javax.inject.Inject -import org.sopt.dateroad.data.dataremote.datasource.TimelineRemoteDataSource -import org.sopt.dateroad.data.dataremote.model.request.RequestTimelineDto -import org.sopt.dateroad.data.dataremote.model.response.ResponseEnrollTimelineDto -import org.sopt.dateroad.data.dataremote.model.response.ResponseNearestTimelineDto -import org.sopt.dateroad.data.dataremote.model.response.ResponseTimelineDetailDto -import org.sopt.dateroad.data.dataremote.model.response.ResponseTimelinesDto -import org.sopt.dateroad.data.dataremote.service.TimelineService +import org.sopt.teamdateroad.data.dataremote.datasource.TimelineRemoteDataSource +import org.sopt.teamdateroad.data.dataremote.model.request.RequestTimelineDto +import org.sopt.teamdateroad.data.dataremote.model.response.ResponseEnrollTimelineDto +import org.sopt.teamdateroad.data.dataremote.model.response.ResponseNearestTimelineDto +import org.sopt.teamdateroad.data.dataremote.model.response.ResponseTimelineDetailDto +import org.sopt.teamdateroad.data.dataremote.model.response.ResponseTimelinesDto +import org.sopt.teamdateroad.data.dataremote.service.TimelineService class TimelineRemoteDataSourceImpl @Inject constructor( private val timelineService: TimelineService diff --git a/app/src/main/java/org/sopt/dateroad/data/dataremote/datasourceimpl/UserPointRemoteDataSourceImpl.kt b/app/src/main/java/org/sopt/teamdateroad/data/dataremote/datasourceimpl/UserPointRemoteDataSourceImpl.kt similarity index 52% rename from app/src/main/java/org/sopt/dateroad/data/dataremote/datasourceimpl/UserPointRemoteDataSourceImpl.kt rename to app/src/main/java/org/sopt/teamdateroad/data/dataremote/datasourceimpl/UserPointRemoteDataSourceImpl.kt index 03c877d81..4b877b50e 100644 --- a/app/src/main/java/org/sopt/dateroad/data/dataremote/datasourceimpl/UserPointRemoteDataSourceImpl.kt +++ b/app/src/main/java/org/sopt/teamdateroad/data/dataremote/datasourceimpl/UserPointRemoteDataSourceImpl.kt @@ -1,12 +1,12 @@ -package org.sopt.dateroad.data.dataremote.datasourceimpl +package org.sopt.teamdateroad.data.dataremote.datasourceimpl import javax.inject.Inject -import org.sopt.dateroad.data.dataremote.datasource.UserPointRemoteDataSource -import org.sopt.dateroad.data.dataremote.model.request.RequestUsePointDto -import org.sopt.dateroad.data.dataremote.model.response.ResponsePointHistoryDto -import org.sopt.dateroad.data.dataremote.model.response.ResponseUserPointDto -import org.sopt.dateroad.data.dataremote.model.response.ResponseUserUsePointDto -import org.sopt.dateroad.data.dataremote.service.UserPointService +import org.sopt.teamdateroad.data.dataremote.datasource.UserPointRemoteDataSource +import org.sopt.teamdateroad.data.dataremote.model.request.RequestUsePointDto +import org.sopt.teamdateroad.data.dataremote.model.response.ResponsePointHistoryDto +import org.sopt.teamdateroad.data.dataremote.model.response.ResponseUserPointDto +import org.sopt.teamdateroad.data.dataremote.model.response.ResponseUserUsePointDto +import org.sopt.teamdateroad.data.dataremote.service.UserPointService class UserPointRemoteDataSourceImpl @Inject constructor( private val userPointService: UserPointService diff --git a/app/src/main/java/org/sopt/dateroad/data/dataremote/interceptor/AuthInterceptor.kt b/app/src/main/java/org/sopt/teamdateroad/data/dataremote/interceptor/AuthInterceptor.kt similarity index 89% rename from app/src/main/java/org/sopt/dateroad/data/dataremote/interceptor/AuthInterceptor.kt rename to app/src/main/java/org/sopt/teamdateroad/data/dataremote/interceptor/AuthInterceptor.kt index 6aeb44c3e..3a45f1102 100644 --- a/app/src/main/java/org/sopt/dateroad/data/dataremote/interceptor/AuthInterceptor.kt +++ b/app/src/main/java/org/sopt/teamdateroad/data/dataremote/interceptor/AuthInterceptor.kt @@ -1,4 +1,4 @@ -package org.sopt.dateroad.data.dataremote.interceptor +package org.sopt.teamdateroad.data.dataremote.interceptor import android.app.Application import android.content.Intent @@ -14,13 +14,13 @@ import okhttp3.Interceptor import okhttp3.Request import okhttp3.RequestBody.Companion.toRequestBody import okhttp3.Response -import org.sopt.dateroad.BuildConfig -import org.sopt.dateroad.data.datalocal.datasource.UserInfoLocalDataSource -import org.sopt.dateroad.data.dataremote.model.response.ResponseRefreshTokenDto -import org.sopt.dateroad.data.dataremote.util.ApiConstraints.API -import org.sopt.dateroad.data.dataremote.util.ApiConstraints.REISSUE -import org.sopt.dateroad.data.dataremote.util.ApiConstraints.USERS -import org.sopt.dateroad.data.dataremote.util.ApiConstraints.VERSION +import org.sopt.teamdateroad.BuildConfig +import org.sopt.teamdateroad.data.datalocal.datasource.UserInfoLocalDataSource +import org.sopt.teamdateroad.data.dataremote.model.response.ResponseRefreshTokenDto +import org.sopt.teamdateroad.data.dataremote.util.ApiConstraints.API +import org.sopt.teamdateroad.data.dataremote.util.ApiConstraints.REISSUE +import org.sopt.teamdateroad.data.dataremote.util.ApiConstraints.USERS +import org.sopt.teamdateroad.data.dataremote.util.ApiConstraints.VERSION class AuthInterceptor @Inject constructor( private val json: Json, diff --git a/app/src/main/java/org/sopt/dateroad/data/dataremote/model/request/RequestCourseDto.kt b/app/src/main/java/org/sopt/teamdateroad/data/dataremote/model/request/RequestCourseDto.kt similarity index 88% rename from app/src/main/java/org/sopt/dateroad/data/dataremote/model/request/RequestCourseDto.kt rename to app/src/main/java/org/sopt/teamdateroad/data/dataremote/model/request/RequestCourseDto.kt index 9202191ab..ce8582314 100644 --- a/app/src/main/java/org/sopt/dateroad/data/dataremote/model/request/RequestCourseDto.kt +++ b/app/src/main/java/org/sopt/teamdateroad/data/dataremote/model/request/RequestCourseDto.kt @@ -1,4 +1,4 @@ -package org.sopt.dateroad.data.dataremote.model.request +package org.sopt.teamdateroad.data.dataremote.model.request import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/app/src/main/java/org/sopt/dateroad/data/dataremote/model/request/RequestPlaceDto.kt b/app/src/main/java/org/sopt/teamdateroad/data/dataremote/model/request/RequestPlaceDto.kt similarity index 82% rename from app/src/main/java/org/sopt/dateroad/data/dataremote/model/request/RequestPlaceDto.kt rename to app/src/main/java/org/sopt/teamdateroad/data/dataremote/model/request/RequestPlaceDto.kt index 16d48c8af..4c57c7a57 100644 --- a/app/src/main/java/org/sopt/dateroad/data/dataremote/model/request/RequestPlaceDto.kt +++ b/app/src/main/java/org/sopt/teamdateroad/data/dataremote/model/request/RequestPlaceDto.kt @@ -1,4 +1,4 @@ -package org.sopt.dateroad.data.dataremote.model.request +package org.sopt.teamdateroad.data.dataremote.model.request import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/app/src/main/java/org/sopt/dateroad/data/dataremote/model/request/RequestSignInDto.kt b/app/src/main/java/org/sopt/teamdateroad/data/dataremote/model/request/RequestSignInDto.kt similarity index 74% rename from app/src/main/java/org/sopt/dateroad/data/dataremote/model/request/RequestSignInDto.kt rename to app/src/main/java/org/sopt/teamdateroad/data/dataremote/model/request/RequestSignInDto.kt index 44e5c7bbf..c8b441133 100644 --- a/app/src/main/java/org/sopt/dateroad/data/dataremote/model/request/RequestSignInDto.kt +++ b/app/src/main/java/org/sopt/teamdateroad/data/dataremote/model/request/RequestSignInDto.kt @@ -1,4 +1,4 @@ -package org.sopt.dateroad.data.dataremote.model.request +package org.sopt.teamdateroad.data.dataremote.model.request import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/app/src/main/java/org/sopt/dateroad/data/dataremote/model/request/RequestTagDto.kt b/app/src/main/java/org/sopt/teamdateroad/data/dataremote/model/request/RequestTagDto.kt similarity index 73% rename from app/src/main/java/org/sopt/dateroad/data/dataremote/model/request/RequestTagDto.kt rename to app/src/main/java/org/sopt/teamdateroad/data/dataremote/model/request/RequestTagDto.kt index 096d865eb..5ee4c8ca6 100644 --- a/app/src/main/java/org/sopt/dateroad/data/dataremote/model/request/RequestTagDto.kt +++ b/app/src/main/java/org/sopt/teamdateroad/data/dataremote/model/request/RequestTagDto.kt @@ -1,4 +1,4 @@ -package org.sopt.dateroad.data.dataremote.model.request +package org.sopt.teamdateroad.data.dataremote.model.request import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/app/src/main/java/org/sopt/dateroad/data/dataremote/model/request/RequestTagsDto.kt b/app/src/main/java/org/sopt/teamdateroad/data/dataremote/model/request/RequestTagsDto.kt similarity index 74% rename from app/src/main/java/org/sopt/dateroad/data/dataremote/model/request/RequestTagsDto.kt rename to app/src/main/java/org/sopt/teamdateroad/data/dataremote/model/request/RequestTagsDto.kt index d3fb81079..a4df3cf94 100644 --- a/app/src/main/java/org/sopt/dateroad/data/dataremote/model/request/RequestTagsDto.kt +++ b/app/src/main/java/org/sopt/teamdateroad/data/dataremote/model/request/RequestTagsDto.kt @@ -1,4 +1,4 @@ -package org.sopt.dateroad.data.dataremote.model.request +package org.sopt.teamdateroad.data.dataremote.model.request import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/app/src/main/java/org/sopt/dateroad/data/dataremote/model/request/RequestTimelineDto.kt b/app/src/main/java/org/sopt/teamdateroad/data/dataremote/model/request/RequestTimelineDto.kt similarity index 89% rename from app/src/main/java/org/sopt/dateroad/data/dataremote/model/request/RequestTimelineDto.kt rename to app/src/main/java/org/sopt/teamdateroad/data/dataremote/model/request/RequestTimelineDto.kt index 8b95c2171..e284785c9 100644 --- a/app/src/main/java/org/sopt/dateroad/data/dataremote/model/request/RequestTimelineDto.kt +++ b/app/src/main/java/org/sopt/teamdateroad/data/dataremote/model/request/RequestTimelineDto.kt @@ -1,4 +1,4 @@ -package org.sopt.dateroad.data.dataremote.model.request +package org.sopt.teamdateroad.data.dataremote.model.request import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/app/src/main/java/org/sopt/dateroad/data/dataremote/model/request/RequestUsePointDto.kt b/app/src/main/java/org/sopt/teamdateroad/data/dataremote/model/request/RequestUsePointDto.kt similarity index 82% rename from app/src/main/java/org/sopt/dateroad/data/dataremote/model/request/RequestUsePointDto.kt rename to app/src/main/java/org/sopt/teamdateroad/data/dataremote/model/request/RequestUsePointDto.kt index 2f88c19d2..86261727a 100644 --- a/app/src/main/java/org/sopt/dateroad/data/dataremote/model/request/RequestUsePointDto.kt +++ b/app/src/main/java/org/sopt/teamdateroad/data/dataremote/model/request/RequestUsePointDto.kt @@ -1,4 +1,4 @@ -package org.sopt.dateroad.data.dataremote.model.request +package org.sopt.teamdateroad.data.dataremote.model.request import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/app/src/main/java/org/sopt/dateroad/data/dataremote/model/request/RequestUserSignUpInfoDto.kt b/app/src/main/java/org/sopt/teamdateroad/data/dataremote/model/request/RequestUserSignUpInfoDto.kt similarity index 79% rename from app/src/main/java/org/sopt/dateroad/data/dataremote/model/request/RequestUserSignUpInfoDto.kt rename to app/src/main/java/org/sopt/teamdateroad/data/dataremote/model/request/RequestUserSignUpInfoDto.kt index 0284125c9..3da582e71 100644 --- a/app/src/main/java/org/sopt/dateroad/data/dataremote/model/request/RequestUserSignUpInfoDto.kt +++ b/app/src/main/java/org/sopt/teamdateroad/data/dataremote/model/request/RequestUserSignUpInfoDto.kt @@ -1,4 +1,4 @@ -package org.sopt.dateroad.data.dataremote.model.request +package org.sopt.teamdateroad.data.dataremote.model.request import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/app/src/main/java/org/sopt/dateroad/data/dataremote/model/request/RequestWithdrawDto.kt b/app/src/main/java/org/sopt/teamdateroad/data/dataremote/model/request/RequestWithdrawDto.kt similarity index 76% rename from app/src/main/java/org/sopt/dateroad/data/dataremote/model/request/RequestWithdrawDto.kt rename to app/src/main/java/org/sopt/teamdateroad/data/dataremote/model/request/RequestWithdrawDto.kt index ff9d2c29a..68c0b65a1 100644 --- a/app/src/main/java/org/sopt/dateroad/data/dataremote/model/request/RequestWithdrawDto.kt +++ b/app/src/main/java/org/sopt/teamdateroad/data/dataremote/model/request/RequestWithdrawDto.kt @@ -1,4 +1,4 @@ -package org.sopt.dateroad.data.dataremote.model.request +package org.sopt.teamdateroad.data.dataremote.model.request import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/app/src/main/java/org/sopt/dateroad/data/dataremote/model/response/ResponseAdvertisementDetailDto.kt b/app/src/main/java/org/sopt/teamdateroad/data/dataremote/model/response/ResponseAdvertisementDetailDto.kt similarity index 87% rename from app/src/main/java/org/sopt/dateroad/data/dataremote/model/response/ResponseAdvertisementDetailDto.kt rename to app/src/main/java/org/sopt/teamdateroad/data/dataremote/model/response/ResponseAdvertisementDetailDto.kt index f8334742d..cb1599696 100644 --- a/app/src/main/java/org/sopt/dateroad/data/dataremote/model/response/ResponseAdvertisementDetailDto.kt +++ b/app/src/main/java/org/sopt/teamdateroad/data/dataremote/model/response/ResponseAdvertisementDetailDto.kt @@ -1,4 +1,4 @@ -package org.sopt.dateroad.data.dataremote.model.response +package org.sopt.teamdateroad.data.dataremote.model.response import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/app/src/main/java/org/sopt/dateroad/data/dataremote/model/response/ResponseAdvertisementDto.kt b/app/src/main/java/org/sopt/teamdateroad/data/dataremote/model/response/ResponseAdvertisementDto.kt similarity index 80% rename from app/src/main/java/org/sopt/dateroad/data/dataremote/model/response/ResponseAdvertisementDto.kt rename to app/src/main/java/org/sopt/teamdateroad/data/dataremote/model/response/ResponseAdvertisementDto.kt index f5ac2ca00..d681e1c9d 100644 --- a/app/src/main/java/org/sopt/dateroad/data/dataremote/model/response/ResponseAdvertisementDto.kt +++ b/app/src/main/java/org/sopt/teamdateroad/data/dataremote/model/response/ResponseAdvertisementDto.kt @@ -1,4 +1,4 @@ -package org.sopt.dateroad.data.dataremote.model.response +package org.sopt.teamdateroad.data.dataremote.model.response import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/app/src/main/java/org/sopt/dateroad/data/dataremote/model/response/ResponseAdvertisementsDto.kt b/app/src/main/java/org/sopt/teamdateroad/data/dataremote/model/response/ResponseAdvertisementsDto.kt similarity index 79% rename from app/src/main/java/org/sopt/dateroad/data/dataremote/model/response/ResponseAdvertisementsDto.kt rename to app/src/main/java/org/sopt/teamdateroad/data/dataremote/model/response/ResponseAdvertisementsDto.kt index b416efb94..7b4d9d832 100644 --- a/app/src/main/java/org/sopt/dateroad/data/dataremote/model/response/ResponseAdvertisementsDto.kt +++ b/app/src/main/java/org/sopt/teamdateroad/data/dataremote/model/response/ResponseAdvertisementsDto.kt @@ -1,4 +1,4 @@ -package org.sopt.dateroad.data.dataremote.model.response +package org.sopt.teamdateroad.data.dataremote.model.response import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/app/src/main/java/org/sopt/dateroad/data/dataremote/model/response/ResponseAuthDto.kt b/app/src/main/java/org/sopt/teamdateroad/data/dataremote/model/response/ResponseAuthDto.kt similarity index 82% rename from app/src/main/java/org/sopt/dateroad/data/dataremote/model/response/ResponseAuthDto.kt rename to app/src/main/java/org/sopt/teamdateroad/data/dataremote/model/response/ResponseAuthDto.kt index 23eb755de..8dc5fc9b6 100644 --- a/app/src/main/java/org/sopt/dateroad/data/dataremote/model/response/ResponseAuthDto.kt +++ b/app/src/main/java/org/sopt/teamdateroad/data/dataremote/model/response/ResponseAuthDto.kt @@ -1,4 +1,4 @@ -package org.sopt.dateroad.data.dataremote.model.response +package org.sopt.teamdateroad.data.dataremote.model.response import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/app/src/main/java/org/sopt/dateroad/data/dataremote/model/response/ResponseCourseDetailDto.kt b/app/src/main/java/org/sopt/teamdateroad/data/dataremote/model/response/ResponseCourseDetailDto.kt similarity index 94% rename from app/src/main/java/org/sopt/dateroad/data/dataremote/model/response/ResponseCourseDetailDto.kt rename to app/src/main/java/org/sopt/teamdateroad/data/dataremote/model/response/ResponseCourseDetailDto.kt index acc674248..947b13587 100644 --- a/app/src/main/java/org/sopt/dateroad/data/dataremote/model/response/ResponseCourseDetailDto.kt +++ b/app/src/main/java/org/sopt/teamdateroad/data/dataremote/model/response/ResponseCourseDetailDto.kt @@ -1,4 +1,4 @@ -package org.sopt.dateroad.data.dataremote.model.response +package org.sopt.teamdateroad.data.dataremote.model.response import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/app/src/main/java/org/sopt/dateroad/data/dataremote/model/response/ResponseCourseDto.kt b/app/src/main/java/org/sopt/teamdateroad/data/dataremote/model/response/ResponseCourseDto.kt similarity index 88% rename from app/src/main/java/org/sopt/dateroad/data/dataremote/model/response/ResponseCourseDto.kt rename to app/src/main/java/org/sopt/teamdateroad/data/dataremote/model/response/ResponseCourseDto.kt index 37ab0d23f..1c17fcaae 100644 --- a/app/src/main/java/org/sopt/dateroad/data/dataremote/model/response/ResponseCourseDto.kt +++ b/app/src/main/java/org/sopt/teamdateroad/data/dataremote/model/response/ResponseCourseDto.kt @@ -1,4 +1,4 @@ -package org.sopt.dateroad.data.dataremote.model.response +package org.sopt.teamdateroad.data.dataremote.model.response import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/app/src/main/java/org/sopt/dateroad/data/dataremote/model/response/ResponseCoursesDto.kt b/app/src/main/java/org/sopt/teamdateroad/data/dataremote/model/response/ResponseCoursesDto.kt similarity index 76% rename from app/src/main/java/org/sopt/dateroad/data/dataremote/model/response/ResponseCoursesDto.kt rename to app/src/main/java/org/sopt/teamdateroad/data/dataremote/model/response/ResponseCoursesDto.kt index 3772ef754..47fc55069 100644 --- a/app/src/main/java/org/sopt/dateroad/data/dataremote/model/response/ResponseCoursesDto.kt +++ b/app/src/main/java/org/sopt/teamdateroad/data/dataremote/model/response/ResponseCoursesDto.kt @@ -1,4 +1,4 @@ -package org.sopt.dateroad.data.dataremote.model.response +package org.sopt.teamdateroad.data.dataremote.model.response import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/app/src/main/java/org/sopt/dateroad/data/dataremote/model/response/ResponseEnrollCourseDto.kt b/app/src/main/java/org/sopt/teamdateroad/data/dataremote/model/response/ResponseEnrollCourseDto.kt similarity index 80% rename from app/src/main/java/org/sopt/dateroad/data/dataremote/model/response/ResponseEnrollCourseDto.kt rename to app/src/main/java/org/sopt/teamdateroad/data/dataremote/model/response/ResponseEnrollCourseDto.kt index e58b9c3c6..b987723df 100644 --- a/app/src/main/java/org/sopt/dateroad/data/dataremote/model/response/ResponseEnrollCourseDto.kt +++ b/app/src/main/java/org/sopt/teamdateroad/data/dataremote/model/response/ResponseEnrollCourseDto.kt @@ -1,4 +1,4 @@ -package org.sopt.dateroad.data.dataremote.model.response +package org.sopt.teamdateroad.data.dataremote.model.response import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/app/src/main/java/org/sopt/dateroad/data/dataremote/model/response/ResponseEnrollTimelineDto.kt b/app/src/main/java/org/sopt/teamdateroad/data/dataremote/model/response/ResponseEnrollTimelineDto.kt similarity index 76% rename from app/src/main/java/org/sopt/dateroad/data/dataremote/model/response/ResponseEnrollTimelineDto.kt rename to app/src/main/java/org/sopt/teamdateroad/data/dataremote/model/response/ResponseEnrollTimelineDto.kt index 8779af0a0..5edd522fe 100644 --- a/app/src/main/java/org/sopt/dateroad/data/dataremote/model/response/ResponseEnrollTimelineDto.kt +++ b/app/src/main/java/org/sopt/teamdateroad/data/dataremote/model/response/ResponseEnrollTimelineDto.kt @@ -1,4 +1,4 @@ -package org.sopt.dateroad.data.dataremote.model.response +package org.sopt.teamdateroad.data.dataremote.model.response import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/app/src/main/java/org/sopt/dateroad/data/dataremote/model/response/ResponseImageDto.kt b/app/src/main/java/org/sopt/teamdateroad/data/dataremote/model/response/ResponseImageDto.kt similarity index 79% rename from app/src/main/java/org/sopt/dateroad/data/dataremote/model/response/ResponseImageDto.kt rename to app/src/main/java/org/sopt/teamdateroad/data/dataremote/model/response/ResponseImageDto.kt index 8499aa7b8..812592527 100644 --- a/app/src/main/java/org/sopt/dateroad/data/dataremote/model/response/ResponseImageDto.kt +++ b/app/src/main/java/org/sopt/teamdateroad/data/dataremote/model/response/ResponseImageDto.kt @@ -1,4 +1,4 @@ -package org.sopt.dateroad.data.dataremote.model.response +package org.sopt.teamdateroad.data.dataremote.model.response import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/app/src/main/java/org/sopt/dateroad/data/dataremote/model/response/ResponseNearestTimelineDto.kt b/app/src/main/java/org/sopt/teamdateroad/data/dataremote/model/response/ResponseNearestTimelineDto.kt similarity index 87% rename from app/src/main/java/org/sopt/dateroad/data/dataremote/model/response/ResponseNearestTimelineDto.kt rename to app/src/main/java/org/sopt/teamdateroad/data/dataremote/model/response/ResponseNearestTimelineDto.kt index 1955fffd1..1d876d461 100644 --- a/app/src/main/java/org/sopt/dateroad/data/dataremote/model/response/ResponseNearestTimelineDto.kt +++ b/app/src/main/java/org/sopt/teamdateroad/data/dataremote/model/response/ResponseNearestTimelineDto.kt @@ -1,4 +1,4 @@ -package org.sopt.dateroad.data.dataremote.model.response +package org.sopt.teamdateroad.data.dataremote.model.response import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/app/src/main/java/org/sopt/dateroad/data/dataremote/model/response/ResponsePlaceDto.kt b/app/src/main/java/org/sopt/teamdateroad/data/dataremote/model/response/ResponsePlaceDto.kt similarity index 82% rename from app/src/main/java/org/sopt/dateroad/data/dataremote/model/response/ResponsePlaceDto.kt rename to app/src/main/java/org/sopt/teamdateroad/data/dataremote/model/response/ResponsePlaceDto.kt index 06a6a601a..5a9e437e8 100644 --- a/app/src/main/java/org/sopt/dateroad/data/dataremote/model/response/ResponsePlaceDto.kt +++ b/app/src/main/java/org/sopt/teamdateroad/data/dataremote/model/response/ResponsePlaceDto.kt @@ -1,4 +1,4 @@ -package org.sopt.dateroad.data.dataremote.model.response +package org.sopt.teamdateroad.data.dataremote.model.response import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/app/src/main/java/org/sopt/dateroad/data/dataremote/model/response/ResponsePointDto.kt b/app/src/main/java/org/sopt/teamdateroad/data/dataremote/model/response/ResponsePointDto.kt similarity index 82% rename from app/src/main/java/org/sopt/dateroad/data/dataremote/model/response/ResponsePointDto.kt rename to app/src/main/java/org/sopt/teamdateroad/data/dataremote/model/response/ResponsePointDto.kt index afcb8a1e6..96dbf272e 100644 --- a/app/src/main/java/org/sopt/dateroad/data/dataremote/model/response/ResponsePointDto.kt +++ b/app/src/main/java/org/sopt/teamdateroad/data/dataremote/model/response/ResponsePointDto.kt @@ -1,4 +1,4 @@ -package org.sopt.dateroad.data.dataremote.model.response +package org.sopt.teamdateroad.data.dataremote.model.response import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/app/src/main/java/org/sopt/dateroad/data/dataremote/model/response/ResponsePointHistoryDto.kt b/app/src/main/java/org/sopt/teamdateroad/data/dataremote/model/response/ResponsePointHistoryDto.kt similarity index 80% rename from app/src/main/java/org/sopt/dateroad/data/dataremote/model/response/ResponsePointHistoryDto.kt rename to app/src/main/java/org/sopt/teamdateroad/data/dataremote/model/response/ResponsePointHistoryDto.kt index a54bbe2a8..c847febe7 100644 --- a/app/src/main/java/org/sopt/dateroad/data/dataremote/model/response/ResponsePointHistoryDto.kt +++ b/app/src/main/java/org/sopt/teamdateroad/data/dataremote/model/response/ResponsePointHistoryDto.kt @@ -1,4 +1,4 @@ -package org.sopt.dateroad.data.dataremote.model.response +package org.sopt.teamdateroad.data.dataremote.model.response import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/app/src/main/java/org/sopt/dateroad/data/dataremote/model/response/ResponsePointsDto.kt b/app/src/main/java/org/sopt/teamdateroad/data/dataremote/model/response/ResponsePointsDto.kt similarity index 76% rename from app/src/main/java/org/sopt/dateroad/data/dataremote/model/response/ResponsePointsDto.kt rename to app/src/main/java/org/sopt/teamdateroad/data/dataremote/model/response/ResponsePointsDto.kt index 164d4c9c1..bca9d042a 100644 --- a/app/src/main/java/org/sopt/dateroad/data/dataremote/model/response/ResponsePointsDto.kt +++ b/app/src/main/java/org/sopt/teamdateroad/data/dataremote/model/response/ResponsePointsDto.kt @@ -1,4 +1,4 @@ -package org.sopt.dateroad.data.dataremote.model.response +package org.sopt.teamdateroad.data.dataremote.model.response import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/app/src/main/java/org/sopt/dateroad/data/dataremote/model/response/ResponseProfileDto.kt b/app/src/main/java/org/sopt/teamdateroad/data/dataremote/model/response/ResponseProfileDto.kt similarity index 84% rename from app/src/main/java/org/sopt/dateroad/data/dataremote/model/response/ResponseProfileDto.kt rename to app/src/main/java/org/sopt/teamdateroad/data/dataremote/model/response/ResponseProfileDto.kt index ce9b8b895..96e89679e 100644 --- a/app/src/main/java/org/sopt/dateroad/data/dataremote/model/response/ResponseProfileDto.kt +++ b/app/src/main/java/org/sopt/teamdateroad/data/dataremote/model/response/ResponseProfileDto.kt @@ -1,4 +1,4 @@ -package org.sopt.dateroad.data.dataremote.model.response +package org.sopt.teamdateroad.data.dataremote.model.response import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/app/src/main/java/org/sopt/dateroad/data/dataremote/model/response/ResponseRefreshTokenDto.kt b/app/src/main/java/org/sopt/teamdateroad/data/dataremote/model/response/ResponseRefreshTokenDto.kt similarity index 82% rename from app/src/main/java/org/sopt/dateroad/data/dataremote/model/response/ResponseRefreshTokenDto.kt rename to app/src/main/java/org/sopt/teamdateroad/data/dataremote/model/response/ResponseRefreshTokenDto.kt index df2d33d65..b154ae768 100644 --- a/app/src/main/java/org/sopt/dateroad/data/dataremote/model/response/ResponseRefreshTokenDto.kt +++ b/app/src/main/java/org/sopt/teamdateroad/data/dataremote/model/response/ResponseRefreshTokenDto.kt @@ -1,4 +1,4 @@ -package org.sopt.dateroad.data.dataremote.model.response +package org.sopt.teamdateroad.data.dataremote.model.response import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/app/src/main/java/org/sopt/dateroad/data/dataremote/model/response/ResponseTagDto.kt b/app/src/main/java/org/sopt/teamdateroad/data/dataremote/model/response/ResponseTagDto.kt similarity index 73% rename from app/src/main/java/org/sopt/dateroad/data/dataremote/model/response/ResponseTagDto.kt rename to app/src/main/java/org/sopt/teamdateroad/data/dataremote/model/response/ResponseTagDto.kt index 9a0f4788f..1316bccd1 100644 --- a/app/src/main/java/org/sopt/dateroad/data/dataremote/model/response/ResponseTagDto.kt +++ b/app/src/main/java/org/sopt/teamdateroad/data/dataremote/model/response/ResponseTagDto.kt @@ -1,4 +1,4 @@ -package org.sopt.dateroad.data.dataremote.model.response +package org.sopt.teamdateroad.data.dataremote.model.response import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/app/src/main/java/org/sopt/dateroad/data/dataremote/model/response/ResponseTimelineDetailDto.kt b/app/src/main/java/org/sopt/teamdateroad/data/dataremote/model/response/ResponseTimelineDetailDto.kt similarity index 90% rename from app/src/main/java/org/sopt/dateroad/data/dataremote/model/response/ResponseTimelineDetailDto.kt rename to app/src/main/java/org/sopt/teamdateroad/data/dataremote/model/response/ResponseTimelineDetailDto.kt index 1bcb40f94..f5305c6fc 100644 --- a/app/src/main/java/org/sopt/dateroad/data/dataremote/model/response/ResponseTimelineDetailDto.kt +++ b/app/src/main/java/org/sopt/teamdateroad/data/dataremote/model/response/ResponseTimelineDetailDto.kt @@ -1,4 +1,4 @@ -package org.sopt.dateroad.data.dataremote.model.response +package org.sopt.teamdateroad.data.dataremote.model.response import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/app/src/main/java/org/sopt/dateroad/data/dataremote/model/response/ResponseTimelineDto.kt b/app/src/main/java/org/sopt/teamdateroad/data/dataremote/model/response/ResponseTimelineDto.kt similarity index 87% rename from app/src/main/java/org/sopt/dateroad/data/dataremote/model/response/ResponseTimelineDto.kt rename to app/src/main/java/org/sopt/teamdateroad/data/dataremote/model/response/ResponseTimelineDto.kt index 7f64a8a1c..d277c2410 100644 --- a/app/src/main/java/org/sopt/dateroad/data/dataremote/model/response/ResponseTimelineDto.kt +++ b/app/src/main/java/org/sopt/teamdateroad/data/dataremote/model/response/ResponseTimelineDto.kt @@ -1,4 +1,4 @@ -package org.sopt.dateroad.data.dataremote.model.response +package org.sopt.teamdateroad.data.dataremote.model.response import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/app/src/main/java/org/sopt/dateroad/data/dataremote/model/response/ResponseTimelinesDto.kt b/app/src/main/java/org/sopt/teamdateroad/data/dataremote/model/response/ResponseTimelinesDto.kt similarity index 76% rename from app/src/main/java/org/sopt/dateroad/data/dataremote/model/response/ResponseTimelinesDto.kt rename to app/src/main/java/org/sopt/teamdateroad/data/dataremote/model/response/ResponseTimelinesDto.kt index bd9cc434b..a92ed3ff0 100644 --- a/app/src/main/java/org/sopt/dateroad/data/dataremote/model/response/ResponseTimelinesDto.kt +++ b/app/src/main/java/org/sopt/teamdateroad/data/dataremote/model/response/ResponseTimelinesDto.kt @@ -1,4 +1,4 @@ -package org.sopt.dateroad.data.dataremote.model.response +package org.sopt.teamdateroad.data.dataremote.model.response import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/app/src/main/java/org/sopt/dateroad/data/dataremote/model/response/ResponseUserPointDto.kt b/app/src/main/java/org/sopt/teamdateroad/data/dataremote/model/response/ResponseUserPointDto.kt similarity index 81% rename from app/src/main/java/org/sopt/dateroad/data/dataremote/model/response/ResponseUserPointDto.kt rename to app/src/main/java/org/sopt/teamdateroad/data/dataremote/model/response/ResponseUserPointDto.kt index b66e19374..1480f3e2e 100644 --- a/app/src/main/java/org/sopt/dateroad/data/dataremote/model/response/ResponseUserPointDto.kt +++ b/app/src/main/java/org/sopt/teamdateroad/data/dataremote/model/response/ResponseUserPointDto.kt @@ -1,4 +1,4 @@ -package org.sopt.dateroad.data.dataremote.model.response +package org.sopt.teamdateroad.data.dataremote.model.response import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/app/src/main/java/org/sopt/dateroad/data/dataremote/model/response/ResponseUserUsePointDto.kt b/app/src/main/java/org/sopt/teamdateroad/data/dataremote/model/response/ResponseUserUsePointDto.kt similarity index 84% rename from app/src/main/java/org/sopt/dateroad/data/dataremote/model/response/ResponseUserUsePointDto.kt rename to app/src/main/java/org/sopt/teamdateroad/data/dataremote/model/response/ResponseUserUsePointDto.kt index c67218c1b..9ad237261 100644 --- a/app/src/main/java/org/sopt/dateroad/data/dataremote/model/response/ResponseUserUsePointDto.kt +++ b/app/src/main/java/org/sopt/teamdateroad/data/dataremote/model/response/ResponseUserUsePointDto.kt @@ -1,4 +1,4 @@ -package org.sopt.dateroad.data.dataremote.model.response +package org.sopt.teamdateroad.data.dataremote.model.response import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/app/src/main/java/org/sopt/teamdateroad/data/dataremote/service/AdvertisementService.kt b/app/src/main/java/org/sopt/teamdateroad/data/dataremote/service/AdvertisementService.kt new file mode 100644 index 000000000..5418be917 --- /dev/null +++ b/app/src/main/java/org/sopt/teamdateroad/data/dataremote/service/AdvertisementService.kt @@ -0,0 +1,20 @@ +package org.sopt.teamdateroad.data.dataremote.service + +import org.sopt.teamdateroad.data.dataremote.model.response.ResponseAdvertisementDetailDto +import org.sopt.teamdateroad.data.dataremote.model.response.ResponseAdvertisementsDto +import org.sopt.teamdateroad.data.dataremote.util.ApiConstraints.ADVERTISEMENTS +import org.sopt.teamdateroad.data.dataremote.util.ApiConstraints.ADVERTISEMENT_ID +import org.sopt.teamdateroad.data.dataremote.util.ApiConstraints.API +import org.sopt.teamdateroad.data.dataremote.util.ApiConstraints.VERSION +import retrofit2.http.GET +import retrofit2.http.Path + +interface AdvertisementService { + @GET("$API/$VERSION/$ADVERTISEMENTS/{$ADVERTISEMENT_ID}") + suspend fun getAdvertisementDetail( + @Path(ADVERTISEMENT_ID) advertisementId: Int + ): ResponseAdvertisementDetailDto + + @GET("$API/$VERSION/$ADVERTISEMENTS") + suspend fun getHomeAdvertisements(): ResponseAdvertisementsDto +} diff --git a/app/src/main/java/org/sopt/dateroad/data/dataremote/service/AuthService.kt b/app/src/main/java/org/sopt/teamdateroad/data/dataremote/service/AuthService.kt similarity index 51% rename from app/src/main/java/org/sopt/dateroad/data/dataremote/service/AuthService.kt rename to app/src/main/java/org/sopt/teamdateroad/data/dataremote/service/AuthService.kt index 684287d27..be6db09cf 100644 --- a/app/src/main/java/org/sopt/dateroad/data/dataremote/service/AuthService.kt +++ b/app/src/main/java/org/sopt/teamdateroad/data/dataremote/service/AuthService.kt @@ -1,24 +1,24 @@ -package org.sopt.dateroad.data.dataremote.service +package org.sopt.teamdateroad.data.dataremote.service import okhttp3.MultipartBody import okhttp3.RequestBody -import org.sopt.dateroad.data.dataremote.model.request.RequestSignInDto -import org.sopt.dateroad.data.dataremote.model.request.RequestWithdrawDto -import org.sopt.dateroad.data.dataremote.model.response.ResponseAuthDto -import org.sopt.dateroad.data.dataremote.util.ApiConstraints.API -import org.sopt.dateroad.data.dataremote.util.ApiConstraints.CHECK -import org.sopt.dateroad.data.dataremote.util.ApiConstraints.DELETE_METHOD -import org.sopt.dateroad.data.dataremote.util.ApiConstraints.IS_DEFAULT_IMAGE -import org.sopt.dateroad.data.dataremote.util.ApiConstraints.NAME -import org.sopt.dateroad.data.dataremote.util.ApiConstraints.SIGNUP -import org.sopt.dateroad.data.dataremote.util.ApiConstraints.SIGN_IN -import org.sopt.dateroad.data.dataremote.util.ApiConstraints.SIGN_OUT -import org.sopt.dateroad.data.dataremote.util.ApiConstraints.TAG -import org.sopt.dateroad.data.dataremote.util.ApiConstraints.TAGS -import org.sopt.dateroad.data.dataremote.util.ApiConstraints.USERS -import org.sopt.dateroad.data.dataremote.util.ApiConstraints.USER_SIGN_UP_DATA -import org.sopt.dateroad.data.dataremote.util.ApiConstraints.VERSION -import org.sopt.dateroad.data.dataremote.util.ApiConstraints.WITHDRAW +import org.sopt.teamdateroad.data.dataremote.model.request.RequestSignInDto +import org.sopt.teamdateroad.data.dataremote.model.request.RequestWithdrawDto +import org.sopt.teamdateroad.data.dataremote.model.response.ResponseAuthDto +import org.sopt.teamdateroad.data.dataremote.util.ApiConstraints.API +import org.sopt.teamdateroad.data.dataremote.util.ApiConstraints.CHECK +import org.sopt.teamdateroad.data.dataremote.util.ApiConstraints.DELETE_METHOD +import org.sopt.teamdateroad.data.dataremote.util.ApiConstraints.IS_DEFAULT_IMAGE +import org.sopt.teamdateroad.data.dataremote.util.ApiConstraints.NAME +import org.sopt.teamdateroad.data.dataremote.util.ApiConstraints.SIGNUP +import org.sopt.teamdateroad.data.dataremote.util.ApiConstraints.SIGN_IN +import org.sopt.teamdateroad.data.dataremote.util.ApiConstraints.SIGN_OUT +import org.sopt.teamdateroad.data.dataremote.util.ApiConstraints.TAG +import org.sopt.teamdateroad.data.dataremote.util.ApiConstraints.TAGS +import org.sopt.teamdateroad.data.dataremote.util.ApiConstraints.USERS +import org.sopt.teamdateroad.data.dataremote.util.ApiConstraints.USER_SIGN_UP_DATA +import org.sopt.teamdateroad.data.dataremote.util.ApiConstraints.VERSION +import org.sopt.teamdateroad.data.dataremote.util.ApiConstraints.WITHDRAW import retrofit2.Response import retrofit2.http.Body import retrofit2.http.DELETE diff --git a/app/src/main/java/org/sopt/dateroad/data/dataremote/service/CourseService.kt b/app/src/main/java/org/sopt/teamdateroad/data/dataremote/service/CourseService.kt similarity index 54% rename from app/src/main/java/org/sopt/dateroad/data/dataremote/service/CourseService.kt rename to app/src/main/java/org/sopt/teamdateroad/data/dataremote/service/CourseService.kt index 8cdc4ccb0..f6379e757 100644 --- a/app/src/main/java/org/sopt/dateroad/data/dataremote/service/CourseService.kt +++ b/app/src/main/java/org/sopt/teamdateroad/data/dataremote/service/CourseService.kt @@ -1,23 +1,23 @@ -package org.sopt.dateroad.data.dataremote.service +package org.sopt.teamdateroad.data.dataremote.service import okhttp3.MultipartBody import okhttp3.RequestBody -import org.sopt.dateroad.data.dataremote.model.response.ResponseCourseDetailDto -import org.sopt.dateroad.data.dataremote.model.response.ResponseCoursesDto -import org.sopt.dateroad.data.dataremote.model.response.ResponseEnrollCourseDto -import org.sopt.dateroad.data.dataremote.util.ApiConstraints.API -import org.sopt.dateroad.data.dataremote.util.ApiConstraints.CITY -import org.sopt.dateroad.data.dataremote.util.ApiConstraints.COST -import org.sopt.dateroad.data.dataremote.util.ApiConstraints.COUNTRY -import org.sopt.dateroad.data.dataremote.util.ApiConstraints.COURSE -import org.sopt.dateroad.data.dataremote.util.ApiConstraints.COURSES -import org.sopt.dateroad.data.dataremote.util.ApiConstraints.COURSE_ID -import org.sopt.dateroad.data.dataremote.util.ApiConstraints.LIKES -import org.sopt.dateroad.data.dataremote.util.ApiConstraints.PLACES -import org.sopt.dateroad.data.dataremote.util.ApiConstraints.SORT -import org.sopt.dateroad.data.dataremote.util.ApiConstraints.SORT_BY -import org.sopt.dateroad.data.dataremote.util.ApiConstraints.TAGS -import org.sopt.dateroad.data.dataremote.util.ApiConstraints.VERSION +import org.sopt.teamdateroad.data.dataremote.model.response.ResponseCourseDetailDto +import org.sopt.teamdateroad.data.dataremote.model.response.ResponseCoursesDto +import org.sopt.teamdateroad.data.dataremote.model.response.ResponseEnrollCourseDto +import org.sopt.teamdateroad.data.dataremote.util.ApiConstraints.API +import org.sopt.teamdateroad.data.dataremote.util.ApiConstraints.CITY +import org.sopt.teamdateroad.data.dataremote.util.ApiConstraints.COST +import org.sopt.teamdateroad.data.dataremote.util.ApiConstraints.COUNTRY +import org.sopt.teamdateroad.data.dataremote.util.ApiConstraints.COURSE +import org.sopt.teamdateroad.data.dataremote.util.ApiConstraints.COURSES +import org.sopt.teamdateroad.data.dataremote.util.ApiConstraints.COURSE_ID +import org.sopt.teamdateroad.data.dataremote.util.ApiConstraints.LIKES +import org.sopt.teamdateroad.data.dataremote.util.ApiConstraints.PLACES +import org.sopt.teamdateroad.data.dataremote.util.ApiConstraints.SORT +import org.sopt.teamdateroad.data.dataremote.util.ApiConstraints.SORT_BY +import org.sopt.teamdateroad.data.dataremote.util.ApiConstraints.TAGS +import org.sopt.teamdateroad.data.dataremote.util.ApiConstraints.VERSION import retrofit2.http.DELETE import retrofit2.http.GET import retrofit2.http.Multipart diff --git a/app/src/main/java/org/sopt/teamdateroad/data/dataremote/service/MyCourseService.kt b/app/src/main/java/org/sopt/teamdateroad/data/dataremote/service/MyCourseService.kt new file mode 100644 index 000000000..a274fec28 --- /dev/null +++ b/app/src/main/java/org/sopt/teamdateroad/data/dataremote/service/MyCourseService.kt @@ -0,0 +1,17 @@ +package org.sopt.teamdateroad.data.dataremote.service + +import org.sopt.teamdateroad.data.dataremote.model.response.ResponseCoursesDto +import org.sopt.teamdateroad.data.dataremote.util.ApiConstraints.API +import org.sopt.teamdateroad.data.dataremote.util.ApiConstraints.COURSES +import org.sopt.teamdateroad.data.dataremote.util.ApiConstraints.DATE_ACCESS +import org.sopt.teamdateroad.data.dataremote.util.ApiConstraints.USERS +import org.sopt.teamdateroad.data.dataremote.util.ApiConstraints.VERSION +import retrofit2.http.GET + +interface MyCourseService { + @GET("$API/$VERSION/$COURSES/$USERS") + suspend fun getMyCourseEnroll(): ResponseCoursesDto + + @GET("$API/$VERSION/$COURSES/$DATE_ACCESS") + suspend fun getMyCourseRead(): ResponseCoursesDto +} diff --git a/app/src/main/java/org/sopt/teamdateroad/data/dataremote/service/ProfileService.kt b/app/src/main/java/org/sopt/teamdateroad/data/dataremote/service/ProfileService.kt new file mode 100644 index 000000000..c84ac6e34 --- /dev/null +++ b/app/src/main/java/org/sopt/teamdateroad/data/dataremote/service/ProfileService.kt @@ -0,0 +1,12 @@ +package org.sopt.teamdateroad.data.dataremote.service + +import org.sopt.teamdateroad.data.dataremote.model.response.ResponseProfileDto +import org.sopt.teamdateroad.data.dataremote.util.ApiConstraints.API +import org.sopt.teamdateroad.data.dataremote.util.ApiConstraints.USERS +import org.sopt.teamdateroad.data.dataremote.util.ApiConstraints.VERSION +import retrofit2.http.GET + +interface ProfileService { + @GET("$API/$VERSION/$USERS") + suspend fun getProfile(): ResponseProfileDto +} diff --git a/app/src/main/java/org/sopt/teamdateroad/data/dataremote/service/TimelineService.kt b/app/src/main/java/org/sopt/teamdateroad/data/dataremote/service/TimelineService.kt new file mode 100644 index 000000000..904283c2f --- /dev/null +++ b/app/src/main/java/org/sopt/teamdateroad/data/dataremote/service/TimelineService.kt @@ -0,0 +1,44 @@ +package org.sopt.teamdateroad.data.dataremote.service + +import org.sopt.teamdateroad.data.dataremote.model.request.RequestTimelineDto +import org.sopt.teamdateroad.data.dataremote.model.response.ResponseEnrollTimelineDto +import org.sopt.teamdateroad.data.dataremote.model.response.ResponseNearestTimelineDto +import org.sopt.teamdateroad.data.dataremote.model.response.ResponseTimelineDetailDto +import org.sopt.teamdateroad.data.dataremote.model.response.ResponseTimelinesDto +import org.sopt.teamdateroad.data.dataremote.util.ApiConstraints.API +import org.sopt.teamdateroad.data.dataremote.util.ApiConstraints.DATES +import org.sopt.teamdateroad.data.dataremote.util.ApiConstraints.DATE_ID +import org.sopt.teamdateroad.data.dataremote.util.ApiConstraints.NEAREST +import org.sopt.teamdateroad.data.dataremote.util.ApiConstraints.TIME +import org.sopt.teamdateroad.data.dataremote.util.ApiConstraints.VERSION +import retrofit2.http.Body +import retrofit2.http.DELETE +import retrofit2.http.GET +import retrofit2.http.POST +import retrofit2.http.Path +import retrofit2.http.Query + +interface TimelineService { + @DELETE("$API/$VERSION/$DATES/{$DATE_ID}") + suspend fun deleteTimeline( + @Path(DATE_ID) timelineId: Int + ) + + @GET("$API/$VERSION/$DATES/{$DATE_ID}") + suspend fun getTimelineDetail( + @Path(DATE_ID) timelineId: Int + ): ResponseTimelineDetailDto + + @GET("$API/$VERSION/$DATES") + suspend fun getTimelines( + @Query(TIME) timelineTimeType: String + ): ResponseTimelinesDto + + @GET("$API/$VERSION/$DATES/$NEAREST") + suspend fun getNearestTimeline(): ResponseNearestTimelineDto + + @POST("$API/$VERSION/$DATES") + suspend fun postTimeline( + @Body requestTimelineDto: RequestTimelineDto + ): ResponseEnrollTimelineDto +} diff --git a/app/src/main/java/org/sopt/teamdateroad/data/dataremote/service/UserPointService.kt b/app/src/main/java/org/sopt/teamdateroad/data/dataremote/service/UserPointService.kt new file mode 100644 index 000000000..cb2522575 --- /dev/null +++ b/app/src/main/java/org/sopt/teamdateroad/data/dataremote/service/UserPointService.kt @@ -0,0 +1,32 @@ +package org.sopt.teamdateroad.data.dataremote.service + +import org.sopt.teamdateroad.data.dataremote.model.request.RequestUsePointDto +import org.sopt.teamdateroad.data.dataremote.model.response.ResponsePointHistoryDto +import org.sopt.teamdateroad.data.dataremote.model.response.ResponseUserPointDto +import org.sopt.teamdateroad.data.dataremote.model.response.ResponseUserUsePointDto +import org.sopt.teamdateroad.data.dataremote.util.ApiConstraints.API +import org.sopt.teamdateroad.data.dataremote.util.ApiConstraints.COURSES +import org.sopt.teamdateroad.data.dataremote.util.ApiConstraints.COURSE_ID +import org.sopt.teamdateroad.data.dataremote.util.ApiConstraints.DATE_ACCESS +import org.sopt.teamdateroad.data.dataremote.util.ApiConstraints.MAIN +import org.sopt.teamdateroad.data.dataremote.util.ApiConstraints.POINTS +import org.sopt.teamdateroad.data.dataremote.util.ApiConstraints.USERS +import org.sopt.teamdateroad.data.dataremote.util.ApiConstraints.VERSION +import retrofit2.http.Body +import retrofit2.http.GET +import retrofit2.http.POST +import retrofit2.http.Path + +interface UserPointService { + @GET("$API/$VERSION/$USERS/$MAIN") + suspend fun getUserPoint(): ResponseUserPointDto + + @GET("$API/$VERSION/$POINTS") + suspend fun getPointHistory(): ResponsePointHistoryDto + + @POST("$API/$VERSION/$COURSES/{$COURSE_ID}/$DATE_ACCESS") + suspend fun postUsePoint( + @Path(COURSE_ID) courseId: Int, + @Body requestUsePointDto: RequestUsePointDto + ): ResponseUserUsePointDto +} diff --git a/app/src/main/java/org/sopt/dateroad/data/dataremote/util/Constraints.kt b/app/src/main/java/org/sopt/teamdateroad/data/dataremote/util/Constraints.kt similarity index 97% rename from app/src/main/java/org/sopt/dateroad/data/dataremote/util/Constraints.kt rename to app/src/main/java/org/sopt/teamdateroad/data/dataremote/util/Constraints.kt index ab0bbb382..5e2f2270b 100644 --- a/app/src/main/java/org/sopt/dateroad/data/dataremote/util/Constraints.kt +++ b/app/src/main/java/org/sopt/teamdateroad/data/dataremote/util/Constraints.kt @@ -1,4 +1,4 @@ -package org.sopt.dateroad.data.dataremote.util +package org.sopt.teamdateroad.data.dataremote.util object ApiConstraints { const val PROFILE_FORM_DATA_IMAGE = "image" diff --git a/app/src/main/java/org/sopt/dateroad/data/dataremote/util/ContentUriRequestBody.kt b/app/src/main/java/org/sopt/teamdateroad/data/dataremote/util/ContentUriRequestBody.kt similarity index 96% rename from app/src/main/java/org/sopt/dateroad/data/dataremote/util/ContentUriRequestBody.kt rename to app/src/main/java/org/sopt/teamdateroad/data/dataremote/util/ContentUriRequestBody.kt index 80774f9ac..5333f4112 100644 --- a/app/src/main/java/org/sopt/dateroad/data/dataremote/util/ContentUriRequestBody.kt +++ b/app/src/main/java/org/sopt/teamdateroad/data/dataremote/util/ContentUriRequestBody.kt @@ -1,4 +1,4 @@ -package org.sopt.dateroad.data.dataremote.util +package org.sopt.teamdateroad.data.dataremote.util import android.content.ContentResolver import android.net.Uri diff --git a/app/src/main/java/org/sopt/dateroad/data/mapper/toEntity/AreaMapper.kt b/app/src/main/java/org/sopt/teamdateroad/data/mapper/toEntity/AreaMapper.kt similarity index 50% rename from app/src/main/java/org/sopt/dateroad/data/mapper/toEntity/AreaMapper.kt rename to app/src/main/java/org/sopt/teamdateroad/data/mapper/toEntity/AreaMapper.kt index 74e51a82e..47741b492 100644 --- a/app/src/main/java/org/sopt/dateroad/data/mapper/toEntity/AreaMapper.kt +++ b/app/src/main/java/org/sopt/teamdateroad/data/mapper/toEntity/AreaMapper.kt @@ -1,11 +1,11 @@ -package org.sopt.dateroad.data.mapper.toEntity +package org.sopt.teamdateroad.data.mapper.toEntity -import org.sopt.dateroad.domain.type.GyeonggiAreaType -import org.sopt.dateroad.domain.type.GyeonggiAreaType.Companion.fromTitleToGyeonggiAreaType -import org.sopt.dateroad.domain.type.IncheonAreaType -import org.sopt.dateroad.domain.type.IncheonAreaType.Companion.fromTitleToIncheonAreaType -import org.sopt.dateroad.domain.type.SeoulAreaType -import org.sopt.dateroad.domain.type.SeoulAreaType.Companion.fromTitleToSeoulAreaType +import org.sopt.teamdateroad.domain.type.GyeonggiAreaType +import org.sopt.teamdateroad.domain.type.GyeonggiAreaType.Companion.fromTitleToGyeonggiAreaType +import org.sopt.teamdateroad.domain.type.IncheonAreaType +import org.sopt.teamdateroad.domain.type.IncheonAreaType.Companion.fromTitleToIncheonAreaType +import org.sopt.teamdateroad.domain.type.SeoulAreaType +import org.sopt.teamdateroad.domain.type.SeoulAreaType.Companion.fromTitleToSeoulAreaType fun Any?.toAreaTitle(): String = when (this) { is SeoulAreaType -> this.title diff --git a/app/src/main/java/org/sopt/dateroad/data/mapper/toEntity/CostMapper.kt b/app/src/main/java/org/sopt/teamdateroad/data/mapper/toEntity/CostMapper.kt similarity index 52% rename from app/src/main/java/org/sopt/dateroad/data/mapper/toEntity/CostMapper.kt rename to app/src/main/java/org/sopt/teamdateroad/data/mapper/toEntity/CostMapper.kt index f58dfdd70..2ef10da3f 100644 --- a/app/src/main/java/org/sopt/dateroad/data/mapper/toEntity/CostMapper.kt +++ b/app/src/main/java/org/sopt/teamdateroad/data/mapper/toEntity/CostMapper.kt @@ -1,9 +1,9 @@ -package org.sopt.dateroad.data.mapper.toEntity +package org.sopt.teamdateroad.data.mapper.toEntity import java.text.NumberFormat import java.util.Locale -import org.sopt.dateroad.data.dataremote.util.Cost -import org.sopt.dateroad.data.dataremote.util.TotalCostZero.ZERO_COST +import org.sopt.teamdateroad.data.dataremote.util.Cost +import org.sopt.teamdateroad.data.dataremote.util.TotalCostZero.ZERO_COST fun Int.toCost(): String = if (this == 0) { ZERO_COST diff --git a/app/src/main/java/org/sopt/dateroad/data/mapper/toEntity/CourseDetailMapper.kt b/app/src/main/java/org/sopt/teamdateroad/data/mapper/toEntity/CourseDetailMapper.kt similarity index 59% rename from app/src/main/java/org/sopt/dateroad/data/mapper/toEntity/CourseDetailMapper.kt rename to app/src/main/java/org/sopt/teamdateroad/data/mapper/toEntity/CourseDetailMapper.kt index 6e9b5e2f9..a79972539 100644 --- a/app/src/main/java/org/sopt/dateroad/data/mapper/toEntity/CourseDetailMapper.kt +++ b/app/src/main/java/org/sopt/teamdateroad/data/mapper/toEntity/CourseDetailMapper.kt @@ -1,7 +1,7 @@ -package org.sopt.dateroad.data.mapper.toEntity +package org.sopt.teamdateroad.data.mapper.toEntity -import org.sopt.dateroad.domain.model.CourseDetail -import org.sopt.dateroad.domain.model.Enroll +import org.sopt.teamdateroad.domain.model.CourseDetail +import org.sopt.teamdateroad.domain.model.Enroll fun CourseDetail.toEnroll() = Enroll( title = this.title, diff --git a/app/src/main/java/org/sopt/dateroad/data/mapper/toEntity/DurationMapper.kt b/app/src/main/java/org/sopt/teamdateroad/data/mapper/toEntity/DurationMapper.kt similarity index 55% rename from app/src/main/java/org/sopt/dateroad/data/mapper/toEntity/DurationMapper.kt rename to app/src/main/java/org/sopt/teamdateroad/data/mapper/toEntity/DurationMapper.kt index 429279494..87bd53f9e 100644 --- a/app/src/main/java/org/sopt/dateroad/data/mapper/toEntity/DurationMapper.kt +++ b/app/src/main/java/org/sopt/teamdateroad/data/mapper/toEntity/DurationMapper.kt @@ -1,6 +1,6 @@ -package org.sopt.dateroad.data.mapper.toEntity +package org.sopt.teamdateroad.data.mapper.toEntity -import org.sopt.dateroad.data.dataremote.util.Duration +import org.sopt.teamdateroad.data.dataremote.util.Duration fun Float.toDuration(): String = if (this % 1.0 == 0.0) { "%.0f".format(this) diff --git a/app/src/main/java/org/sopt/dateroad/data/mapper/toEntity/LikeMapper.kt b/app/src/main/java/org/sopt/teamdateroad/data/mapper/toEntity/LikeMapper.kt similarity index 50% rename from app/src/main/java/org/sopt/dateroad/data/mapper/toEntity/LikeMapper.kt rename to app/src/main/java/org/sopt/teamdateroad/data/mapper/toEntity/LikeMapper.kt index cbff53cba..3d6cc5fb4 100644 --- a/app/src/main/java/org/sopt/dateroad/data/mapper/toEntity/LikeMapper.kt +++ b/app/src/main/java/org/sopt/teamdateroad/data/mapper/toEntity/LikeMapper.kt @@ -1,6 +1,6 @@ -package org.sopt.dateroad.data.mapper.toEntity +package org.sopt.teamdateroad.data.mapper.toEntity -import org.sopt.dateroad.data.dataremote.util.Like +import org.sopt.teamdateroad.data.dataremote.util.Like fun Int.toLike(): String = when { this < Like.THRESHOLD -> this.toString() diff --git a/app/src/main/java/org/sopt/dateroad/data/mapper/toEntity/PointMapper.kt b/app/src/main/java/org/sopt/teamdateroad/data/mapper/toEntity/PointMapper.kt similarity index 64% rename from app/src/main/java/org/sopt/dateroad/data/mapper/toEntity/PointMapper.kt rename to app/src/main/java/org/sopt/teamdateroad/data/mapper/toEntity/PointMapper.kt index 89082d366..71c3db3ea 100644 --- a/app/src/main/java/org/sopt/dateroad/data/mapper/toEntity/PointMapper.kt +++ b/app/src/main/java/org/sopt/teamdateroad/data/mapper/toEntity/PointMapper.kt @@ -1,6 +1,6 @@ -package org.sopt.dateroad.data.mapper.toEntity +package org.sopt.teamdateroad.data.mapper.toEntity -import org.sopt.dateroad.data.dataremote.util.Point +import org.sopt.teamdateroad.data.dataremote.util.Point fun Int.toPoint(): String = this.toString() + Point.POINT diff --git a/app/src/main/java/org/sopt/teamdateroad/data/mapper/toEntity/RegionMapper.kt b/app/src/main/java/org/sopt/teamdateroad/data/mapper/toEntity/RegionMapper.kt new file mode 100644 index 000000000..709052f66 --- /dev/null +++ b/app/src/main/java/org/sopt/teamdateroad/data/mapper/toEntity/RegionMapper.kt @@ -0,0 +1,16 @@ +package org.sopt.teamdateroad.data.mapper.toEntity + +import org.sopt.teamdateroad.domain.type.GyeonggiAreaType.Companion.fromTitleToGyeonggiAreaType +import org.sopt.teamdateroad.domain.type.IncheonAreaType.Companion.fromTitleToIncheonAreaType +import org.sopt.teamdateroad.domain.type.RegionType +import org.sopt.teamdateroad.domain.type.SeoulAreaType.Companion.fromTitleToSeoulAreaType + +fun String.toRegionType(): RegionType? = when { + this.fromTitleToSeoulAreaType() != null -> RegionType.SEOUL + + this.fromTitleToGyeonggiAreaType() != null -> RegionType.GYEONGGI + + this.fromTitleToIncheonAreaType() != null -> RegionType.INCHEON + + else -> null +} diff --git a/app/src/main/java/org/sopt/dateroad/data/mapper/toEntity/TimelineDetailMapper.kt b/app/src/main/java/org/sopt/teamdateroad/data/mapper/toEntity/TimelineDetailMapper.kt similarity index 63% rename from app/src/main/java/org/sopt/dateroad/data/mapper/toEntity/TimelineDetailMapper.kt rename to app/src/main/java/org/sopt/teamdateroad/data/mapper/toEntity/TimelineDetailMapper.kt index 87ddadabf..3cc4e5b8b 100644 --- a/app/src/main/java/org/sopt/dateroad/data/mapper/toEntity/TimelineDetailMapper.kt +++ b/app/src/main/java/org/sopt/teamdateroad/data/mapper/toEntity/TimelineDetailMapper.kt @@ -1,7 +1,7 @@ -package org.sopt.dateroad.data.mapper.toEntity +package org.sopt.teamdateroad.data.mapper.toEntity -import org.sopt.dateroad.domain.model.Enroll -import org.sopt.dateroad.domain.model.TimelineDetail +import org.sopt.teamdateroad.domain.model.Enroll +import org.sopt.teamdateroad.domain.model.TimelineDetail fun TimelineDetail.toEnroll() = Enroll( title = this.title, diff --git a/app/src/main/java/org/sopt/dateroad/data/mapper/toEntity/TimelineMapper.kt b/app/src/main/java/org/sopt/teamdateroad/data/mapper/toEntity/TimelineMapper.kt similarity index 85% rename from app/src/main/java/org/sopt/dateroad/data/mapper/toEntity/TimelineMapper.kt rename to app/src/main/java/org/sopt/teamdateroad/data/mapper/toEntity/TimelineMapper.kt index fa8d10320..6ada6d3dd 100644 --- a/app/src/main/java/org/sopt/dateroad/data/mapper/toEntity/TimelineMapper.kt +++ b/app/src/main/java/org/sopt/teamdateroad/data/mapper/toEntity/TimelineMapper.kt @@ -1,12 +1,12 @@ -package org.sopt.dateroad.data.mapper.toEntity +package org.sopt.teamdateroad.data.mapper.toEntity import java.text.SimpleDateFormat import java.time.LocalDate import java.time.format.DateTimeFormatter import java.util.Locale -import org.sopt.dateroad.data.dataremote.model.response.ResponseNearestTimelineDto -import org.sopt.dateroad.data.dataremote.util.Date -import org.sopt.dateroad.domain.type.MonthType +import org.sopt.teamdateroad.data.dataremote.model.response.ResponseNearestTimelineDto +import org.sopt.teamdateroad.data.dataremote.util.Date +import org.sopt.teamdateroad.domain.type.MonthType fun String.toCourseDetailDate(): String = SimpleDateFormat(Date.INPUT_FORMAT, Locale.getDefault()).parse(this)?.let { SimpleDateFormat(Date.COURSE_DETAIL_OUTPUT_FORMAT, Locale.getDefault()).format(it) }.orEmpty() diff --git a/app/src/main/java/org/sopt/dateroad/data/mapper/todata/EnrollMapper.kt b/app/src/main/java/org/sopt/teamdateroad/data/mapper/todata/EnrollMapper.kt similarity index 67% rename from app/src/main/java/org/sopt/dateroad/data/mapper/todata/EnrollMapper.kt rename to app/src/main/java/org/sopt/teamdateroad/data/mapper/todata/EnrollMapper.kt index 5ff7ff0b7..e5577fe13 100644 --- a/app/src/main/java/org/sopt/dateroad/data/mapper/todata/EnrollMapper.kt +++ b/app/src/main/java/org/sopt/teamdateroad/data/mapper/todata/EnrollMapper.kt @@ -1,9 +1,9 @@ -package org.sopt.dateroad.data.mapper.todata +package org.sopt.teamdateroad.data.mapper.todata -import org.sopt.dateroad.data.dataremote.model.request.RequestCourseDto -import org.sopt.dateroad.data.dataremote.model.request.RequestTimelineDto -import org.sopt.dateroad.data.mapper.toEntity.toAreaTitle -import org.sopt.dateroad.domain.model.Enroll +import org.sopt.teamdateroad.data.dataremote.model.request.RequestCourseDto +import org.sopt.teamdateroad.data.dataremote.model.request.RequestTimelineDto +import org.sopt.teamdateroad.data.mapper.toEntity.toAreaTitle +import org.sopt.teamdateroad.domain.model.Enroll fun Enroll.toTimelineData(): RequestTimelineDto = RequestTimelineDto( title = this.title, diff --git a/app/src/main/java/org/sopt/teamdateroad/data/mapper/todata/PlaceMapper.kt b/app/src/main/java/org/sopt/teamdateroad/data/mapper/todata/PlaceMapper.kt new file mode 100644 index 000000000..01b76352b --- /dev/null +++ b/app/src/main/java/org/sopt/teamdateroad/data/mapper/todata/PlaceMapper.kt @@ -0,0 +1,11 @@ +package org.sopt.teamdateroad.data.mapper.todata + +import org.sopt.teamdateroad.data.dataremote.model.request.RequestPlaceDto +import org.sopt.teamdateroad.data.dataremote.util.Duration.DURATION +import org.sopt.teamdateroad.domain.model.Place + +fun Place.toData(sequence: Int): RequestPlaceDto = RequestPlaceDto( + sequence = sequence, + title = this.title, + duration = duration.substringBefore(DURATION).toFloat() +) diff --git a/app/src/main/java/org/sopt/teamdateroad/data/mapper/todata/ProfileMapper.kt b/app/src/main/java/org/sopt/teamdateroad/data/mapper/todata/ProfileMapper.kt new file mode 100644 index 000000000..d8a550ec4 --- /dev/null +++ b/app/src/main/java/org/sopt/teamdateroad/data/mapper/todata/ProfileMapper.kt @@ -0,0 +1,10 @@ +package org.sopt.teamdateroad.data.mapper.todata + +import org.sopt.teamdateroad.domain.model.EditProfile +import org.sopt.teamdateroad.domain.model.Profile + +fun Profile.toEditProfile(): EditProfile = EditProfile( + name = this.name, + tags = this.tag, + image = this.imageUrl +) diff --git a/app/src/main/java/org/sopt/teamdateroad/data/mapper/todata/SignInMapper.kt b/app/src/main/java/org/sopt/teamdateroad/data/mapper/todata/SignInMapper.kt new file mode 100644 index 000000000..f0d88a3b1 --- /dev/null +++ b/app/src/main/java/org/sopt/teamdateroad/data/mapper/todata/SignInMapper.kt @@ -0,0 +1,8 @@ +package org.sopt.teamdateroad.data.mapper.todata + +import org.sopt.teamdateroad.data.dataremote.model.request.RequestSignInDto +import org.sopt.teamdateroad.domain.model.SignIn + +fun SignIn.toData(): RequestSignInDto = RequestSignInDto( + platform = this.platform +) diff --git a/app/src/main/java/org/sopt/teamdateroad/data/mapper/todata/TagMapper.kt b/app/src/main/java/org/sopt/teamdateroad/data/mapper/todata/TagMapper.kt new file mode 100644 index 000000000..81bc2e253 --- /dev/null +++ b/app/src/main/java/org/sopt/teamdateroad/data/mapper/todata/TagMapper.kt @@ -0,0 +1,5 @@ +package org.sopt.teamdateroad.data.mapper.todata + +import org.sopt.teamdateroad.data.dataremote.model.request.RequestTagDto + +fun String.toData() = RequestTagDto(tag = this) diff --git a/app/src/main/java/org/sopt/teamdateroad/data/mapper/todata/TagsMapper.kt b/app/src/main/java/org/sopt/teamdateroad/data/mapper/todata/TagsMapper.kt new file mode 100644 index 000000000..c874a739b --- /dev/null +++ b/app/src/main/java/org/sopt/teamdateroad/data/mapper/todata/TagsMapper.kt @@ -0,0 +1,7 @@ +package org.sopt.teamdateroad.data.mapper.todata + +import org.sopt.teamdateroad.data.dataremote.model.request.RequestTagsDto + +fun List.toData(): RequestTagsDto = RequestTagsDto( + tag = this +) diff --git a/app/src/main/java/org/sopt/teamdateroad/data/mapper/todata/UsePointMapper.kt b/app/src/main/java/org/sopt/teamdateroad/data/mapper/todata/UsePointMapper.kt new file mode 100644 index 000000000..cf08c72f0 --- /dev/null +++ b/app/src/main/java/org/sopt/teamdateroad/data/mapper/todata/UsePointMapper.kt @@ -0,0 +1,10 @@ +package org.sopt.teamdateroad.data.mapper.todata + +import org.sopt.teamdateroad.data.dataremote.model.request.RequestUsePointDto +import org.sopt.teamdateroad.domain.model.UsePoint + +fun UsePoint.toData(): RequestUsePointDto = RequestUsePointDto( + point = this.point, + type = this.type, + description = this.description +) diff --git a/app/src/main/java/org/sopt/teamdateroad/data/mapper/todata/UserSignUpInfoMapper.kt b/app/src/main/java/org/sopt/teamdateroad/data/mapper/todata/UserSignUpInfoMapper.kt new file mode 100644 index 000000000..7773d792a --- /dev/null +++ b/app/src/main/java/org/sopt/teamdateroad/data/mapper/todata/UserSignUpInfoMapper.kt @@ -0,0 +1,9 @@ +package org.sopt.teamdateroad.data.mapper.todata + +import org.sopt.teamdateroad.data.dataremote.model.request.RequestUserSignUpInfoDto +import org.sopt.teamdateroad.domain.model.UserSignUpInfo + +fun UserSignUpInfo.toData(): RequestUserSignUpInfoDto = RequestUserSignUpInfoDto( + name = this.name, + platform = this.platform +) diff --git a/app/src/main/java/org/sopt/dateroad/data/mapper/todomain/ResponseAdvertisementDetailDtoMapper.kt b/app/src/main/java/org/sopt/teamdateroad/data/mapper/todomain/ResponseAdvertisementDetailDtoMapper.kt similarity index 53% rename from app/src/main/java/org/sopt/dateroad/data/mapper/todomain/ResponseAdvertisementDetailDtoMapper.kt rename to app/src/main/java/org/sopt/teamdateroad/data/mapper/todomain/ResponseAdvertisementDetailDtoMapper.kt index a0822e48d..02c50ef15 100644 --- a/app/src/main/java/org/sopt/dateroad/data/mapper/todomain/ResponseAdvertisementDetailDtoMapper.kt +++ b/app/src/main/java/org/sopt/teamdateroad/data/mapper/todomain/ResponseAdvertisementDetailDtoMapper.kt @@ -1,9 +1,9 @@ -package org.sopt.dateroad.data.mapper.todomain +package org.sopt.teamdateroad.data.mapper.todomain -import org.sopt.dateroad.data.dataremote.model.response.ResponseAdvertisementDetailDto -import org.sopt.dateroad.data.mapper.toEntity.toAdvertisementDetailDate -import org.sopt.dateroad.domain.model.AdvertisementDetail -import org.sopt.dateroad.domain.type.AdvertisementTagType.Companion.toAdvertisementTagTitle +import org.sopt.teamdateroad.data.dataremote.model.response.ResponseAdvertisementDetailDto +import org.sopt.teamdateroad.data.mapper.toEntity.toAdvertisementDetailDate +import org.sopt.teamdateroad.domain.model.AdvertisementDetail +import org.sopt.teamdateroad.domain.type.AdvertisementTagType.Companion.toAdvertisementTagTitle fun ResponseAdvertisementDetailDto.toDomain(): AdvertisementDetail = AdvertisementDetail( images = this.images.sortedBy { responseImageDto -> responseImageDto.sequence }.map { responseImageDto -> responseImageDto.imageUrl }, diff --git a/app/src/main/java/org/sopt/teamdateroad/data/mapper/todomain/ResponseAdvertisementDtoMapper.kt b/app/src/main/java/org/sopt/teamdateroad/data/mapper/todomain/ResponseAdvertisementDtoMapper.kt new file mode 100644 index 000000000..84eac532c --- /dev/null +++ b/app/src/main/java/org/sopt/teamdateroad/data/mapper/todomain/ResponseAdvertisementDtoMapper.kt @@ -0,0 +1,9 @@ +package org.sopt.teamdateroad.data.mapper.todomain + +import org.sopt.teamdateroad.data.dataremote.model.response.ResponseAdvertisementDto +import org.sopt.teamdateroad.domain.model.Advertisement + +fun ResponseAdvertisementDto.toDomain(): Advertisement = Advertisement( + advertisementId = this.advertisementId, + thumbnail = this.thumbnail +) diff --git a/app/src/main/java/org/sopt/teamdateroad/data/mapper/todomain/ResponseAdvertisementsDtoMapper.kt b/app/src/main/java/org/sopt/teamdateroad/data/mapper/todomain/ResponseAdvertisementsDtoMapper.kt new file mode 100644 index 000000000..822892f80 --- /dev/null +++ b/app/src/main/java/org/sopt/teamdateroad/data/mapper/todomain/ResponseAdvertisementsDtoMapper.kt @@ -0,0 +1,6 @@ +package org.sopt.teamdateroad.data.mapper.todomain + +import org.sopt.teamdateroad.data.dataremote.model.response.ResponseAdvertisementsDto +import org.sopt.teamdateroad.domain.model.Advertisement + +fun ResponseAdvertisementsDto.toDomain(): List = this.advertisements.map { responseAdvertisementDto -> responseAdvertisementDto.toDomain() } diff --git a/app/src/main/java/org/sopt/teamdateroad/data/mapper/todomain/ResponseAuthDtoMapper.kt b/app/src/main/java/org/sopt/teamdateroad/data/mapper/todomain/ResponseAuthDtoMapper.kt new file mode 100644 index 000000000..9e9428404 --- /dev/null +++ b/app/src/main/java/org/sopt/teamdateroad/data/mapper/todomain/ResponseAuthDtoMapper.kt @@ -0,0 +1,9 @@ +package org.sopt.teamdateroad.data.mapper.todomain + +import org.sopt.teamdateroad.data.dataremote.model.response.ResponseAuthDto +import org.sopt.teamdateroad.domain.model.Auth + +fun ResponseAuthDto.toDomain(): Auth = Auth( + accessToken = this.accessToken, + refreshToken = this.refreshToken +) diff --git a/app/src/main/java/org/sopt/dateroad/data/mapper/todomain/ResponseCourseDetailDtoMapper.kt b/app/src/main/java/org/sopt/teamdateroad/data/mapper/todomain/ResponseCourseDetailDtoMapper.kt similarity index 64% rename from app/src/main/java/org/sopt/dateroad/data/mapper/todomain/ResponseCourseDetailDtoMapper.kt rename to app/src/main/java/org/sopt/teamdateroad/data/mapper/todomain/ResponseCourseDetailDtoMapper.kt index 0563ead39..88c78f96a 100644 --- a/app/src/main/java/org/sopt/dateroad/data/mapper/todomain/ResponseCourseDetailDtoMapper.kt +++ b/app/src/main/java/org/sopt/teamdateroad/data/mapper/todomain/ResponseCourseDetailDtoMapper.kt @@ -1,12 +1,12 @@ -package org.sopt.dateroad.data.mapper.todomain +package org.sopt.teamdateroad.data.mapper.todomain -import org.sopt.dateroad.data.dataremote.model.response.ResponseCourseDetailDto -import org.sopt.dateroad.data.mapper.toEntity.toCost -import org.sopt.dateroad.data.mapper.toEntity.toCourseDetailDate -import org.sopt.dateroad.data.mapper.toEntity.toDuration -import org.sopt.dateroad.data.mapper.toEntity.toStartAtString -import org.sopt.dateroad.domain.model.CourseDetail -import org.sopt.dateroad.domain.type.MoneyTagType.Companion.toCostTagTitle +import org.sopt.teamdateroad.data.dataremote.model.response.ResponseCourseDetailDto +import org.sopt.teamdateroad.data.mapper.toEntity.toCost +import org.sopt.teamdateroad.data.mapper.toEntity.toCourseDetailDate +import org.sopt.teamdateroad.data.mapper.toEntity.toDuration +import org.sopt.teamdateroad.data.mapper.toEntity.toStartAtString +import org.sopt.teamdateroad.domain.model.CourseDetail +import org.sopt.teamdateroad.domain.type.MoneyTagType.Companion.toCostTagTitle fun ResponseCourseDetailDto.toDomain(): CourseDetail = CourseDetail( courseId = this.courseId, diff --git a/app/src/main/java/org/sopt/teamdateroad/data/mapper/todomain/ResponseCourseDtoMapper.kt b/app/src/main/java/org/sopt/teamdateroad/data/mapper/todomain/ResponseCourseDtoMapper.kt new file mode 100644 index 000000000..cf983d78e --- /dev/null +++ b/app/src/main/java/org/sopt/teamdateroad/data/mapper/todomain/ResponseCourseDtoMapper.kt @@ -0,0 +1,17 @@ +package org.sopt.teamdateroad.data.mapper.todomain + +import org.sopt.teamdateroad.data.dataremote.model.response.ResponseCourseDto +import org.sopt.teamdateroad.data.mapper.toEntity.toDuration +import org.sopt.teamdateroad.data.mapper.toEntity.toLike +import org.sopt.teamdateroad.domain.model.Course +import org.sopt.teamdateroad.domain.type.MoneyTagType.Companion.toCostTagTitle + +fun ResponseCourseDto.toDomain(): Course = Course( + courseId = this.courseId, + thumbnail = this.thumbnail, + title = this.title, + city = this.city, + cost = this.cost.toCostTagTitle(), + duration = this.duration.toDuration(), + like = this.like.toLike() +) diff --git a/app/src/main/java/org/sopt/teamdateroad/data/mapper/todomain/ResponseCoursesDtoMapper.kt b/app/src/main/java/org/sopt/teamdateroad/data/mapper/todomain/ResponseCoursesDtoMapper.kt new file mode 100644 index 000000000..7eb532bbf --- /dev/null +++ b/app/src/main/java/org/sopt/teamdateroad/data/mapper/todomain/ResponseCoursesDtoMapper.kt @@ -0,0 +1,6 @@ +package org.sopt.teamdateroad.data.mapper.todomain + +import org.sopt.teamdateroad.data.dataremote.model.response.ResponseCoursesDto +import org.sopt.teamdateroad.domain.model.Course + +fun ResponseCoursesDto.toDomain(): List = this.courses.map { course -> course.toDomain() } diff --git a/app/src/main/java/org/sopt/teamdateroad/data/mapper/todomain/ResponseEnrollCourseDtoMapper.kt b/app/src/main/java/org/sopt/teamdateroad/data/mapper/todomain/ResponseEnrollCourseDtoMapper.kt new file mode 100644 index 000000000..f56595eee --- /dev/null +++ b/app/src/main/java/org/sopt/teamdateroad/data/mapper/todomain/ResponseEnrollCourseDtoMapper.kt @@ -0,0 +1,9 @@ +package org.sopt.teamdateroad.data.mapper.todomain + +import org.sopt.teamdateroad.data.dataremote.model.response.ResponseEnrollCourseDto +import org.sopt.teamdateroad.domain.model.EnrollCourseResult + +fun ResponseEnrollCourseDto.toDomain(): EnrollCourseResult = EnrollCourseResult( + userPoint = this.userPoint, + userCourseCount = this.userCourseCount +) diff --git a/app/src/main/java/org/sopt/teamdateroad/data/mapper/todomain/ResponseEnrollTimelineDtoMapper.kt b/app/src/main/java/org/sopt/teamdateroad/data/mapper/todomain/ResponseEnrollTimelineDtoMapper.kt new file mode 100644 index 000000000..48a9cdc13 --- /dev/null +++ b/app/src/main/java/org/sopt/teamdateroad/data/mapper/todomain/ResponseEnrollTimelineDtoMapper.kt @@ -0,0 +1,8 @@ +package org.sopt.teamdateroad.data.mapper.todomain + +import org.sopt.teamdateroad.data.dataremote.model.response.ResponseEnrollTimelineDto +import org.sopt.teamdateroad.domain.model.EnrollTimelineResult + +fun ResponseEnrollTimelineDto.toDomain(): EnrollTimelineResult = EnrollTimelineResult( + dateScheduleNum = this.dateScheduleNum +) diff --git a/app/src/main/java/org/sopt/teamdateroad/data/mapper/todomain/ResponseNearestTimelineDtoMapper.kt b/app/src/main/java/org/sopt/teamdateroad/data/mapper/todomain/ResponseNearestTimelineDtoMapper.kt new file mode 100644 index 000000000..f4c35f266 --- /dev/null +++ b/app/src/main/java/org/sopt/teamdateroad/data/mapper/todomain/ResponseNearestTimelineDtoMapper.kt @@ -0,0 +1,15 @@ +package org.sopt.teamdateroad.data.mapper.todomain + +import org.sopt.teamdateroad.data.dataremote.model.response.ResponseNearestTimelineDto +import org.sopt.teamdateroad.data.mapper.toEntity.toDDayString +import org.sopt.teamdateroad.data.mapper.toEntity.toFormattedDate +import org.sopt.teamdateroad.data.mapper.toEntity.toStartAtString +import org.sopt.teamdateroad.domain.model.NearestTimeline + +fun ResponseNearestTimelineDto.toDomain(): NearestTimeline = NearestTimeline( + timelineId = this.timelineId, + dDay = this.dDay.toDDayString(), + dateName = this.dateName, + date = toFormattedDate(), + startAt = this.startAt.toStartAtString() +) diff --git a/app/src/main/java/org/sopt/teamdateroad/data/mapper/todomain/ResponsePlaceDtoMapper.kt b/app/src/main/java/org/sopt/teamdateroad/data/mapper/todomain/ResponsePlaceDtoMapper.kt new file mode 100644 index 000000000..5f4bac9da --- /dev/null +++ b/app/src/main/java/org/sopt/teamdateroad/data/mapper/todomain/ResponsePlaceDtoMapper.kt @@ -0,0 +1,10 @@ +package org.sopt.teamdateroad.data.mapper.todomain + +import org.sopt.teamdateroad.data.dataremote.model.response.ResponsePlaceDto +import org.sopt.teamdateroad.data.mapper.toEntity.toDuration +import org.sopt.teamdateroad.domain.model.Place + +fun ResponsePlaceDto.toDomain() = Place( + title = this.title, + duration = this.duration.toDuration() +) diff --git a/app/src/main/java/org/sopt/dateroad/data/mapper/todomain/ResponsePointDtoMapper.kt b/app/src/main/java/org/sopt/teamdateroad/data/mapper/todomain/ResponsePointDtoMapper.kt similarity index 51% rename from app/src/main/java/org/sopt/dateroad/data/mapper/todomain/ResponsePointDtoMapper.kt rename to app/src/main/java/org/sopt/teamdateroad/data/mapper/todomain/ResponsePointDtoMapper.kt index e074ef98e..b3bc6f228 100644 --- a/app/src/main/java/org/sopt/dateroad/data/mapper/todomain/ResponsePointDtoMapper.kt +++ b/app/src/main/java/org/sopt/teamdateroad/data/mapper/todomain/ResponsePointDtoMapper.kt @@ -1,9 +1,9 @@ -package org.sopt.dateroad.data.mapper.todomain +package org.sopt.teamdateroad.data.mapper.todomain -import org.sopt.dateroad.data.dataremote.model.response.ResponsePointDto -import org.sopt.dateroad.data.mapper.toEntity.toGainedPoint -import org.sopt.dateroad.data.mapper.toEntity.toUsedPoint -import org.sopt.dateroad.domain.model.Point +import org.sopt.teamdateroad.data.dataremote.model.response.ResponsePointDto +import org.sopt.teamdateroad.data.mapper.toEntity.toGainedPoint +import org.sopt.teamdateroad.data.mapper.toEntity.toUsedPoint +import org.sopt.teamdateroad.domain.model.Point fun ResponsePointDto.toGainedPointDomain() = Point( point = this.point.toGainedPoint(), diff --git a/app/src/main/java/org/sopt/teamdateroad/data/mapper/todomain/ResponsePointHistoryDtoMapper.kt b/app/src/main/java/org/sopt/teamdateroad/data/mapper/todomain/ResponsePointHistoryDtoMapper.kt new file mode 100644 index 000000000..72c82281b --- /dev/null +++ b/app/src/main/java/org/sopt/teamdateroad/data/mapper/todomain/ResponsePointHistoryDtoMapper.kt @@ -0,0 +1,9 @@ +package org.sopt.teamdateroad.data.mapper.todomain + +import org.sopt.teamdateroad.data.dataremote.model.response.ResponsePointHistoryDto +import org.sopt.teamdateroad.domain.model.PointHistory + +fun ResponsePointHistoryDto.toDomain(): PointHistory = PointHistory( + gained = this.gained.toGainedPointDomain(), + used = this.used.toUsedPointDomain() +) diff --git a/app/src/main/java/org/sopt/dateroad/data/mapper/todomain/ResponsePointsDtoMapper.kt b/app/src/main/java/org/sopt/teamdateroad/data/mapper/todomain/ResponsePointsDtoMapper.kt similarity index 61% rename from app/src/main/java/org/sopt/dateroad/data/mapper/todomain/ResponsePointsDtoMapper.kt rename to app/src/main/java/org/sopt/teamdateroad/data/mapper/todomain/ResponsePointsDtoMapper.kt index 50dcb1f10..43e8ca1a1 100644 --- a/app/src/main/java/org/sopt/dateroad/data/mapper/todomain/ResponsePointsDtoMapper.kt +++ b/app/src/main/java/org/sopt/teamdateroad/data/mapper/todomain/ResponsePointsDtoMapper.kt @@ -1,7 +1,7 @@ -package org.sopt.dateroad.data.mapper.todomain +package org.sopt.teamdateroad.data.mapper.todomain -import org.sopt.dateroad.data.dataremote.model.response.ResponsePointsDto -import org.sopt.dateroad.domain.model.Point +import org.sopt.teamdateroad.data.dataremote.model.response.ResponsePointsDto +import org.sopt.teamdateroad.domain.model.Point fun ResponsePointsDto.toGainedPointDomain(): List = this.points.map { responsePointDto -> responsePointDto.toGainedPointDomain() diff --git a/app/src/main/java/org/sopt/teamdateroad/data/mapper/todomain/ResponseProfileDtoMapper.kt b/app/src/main/java/org/sopt/teamdateroad/data/mapper/todomain/ResponseProfileDtoMapper.kt new file mode 100644 index 000000000..633d97a70 --- /dev/null +++ b/app/src/main/java/org/sopt/teamdateroad/data/mapper/todomain/ResponseProfileDtoMapper.kt @@ -0,0 +1,12 @@ +package org.sopt.teamdateroad.data.mapper.todomain + +import org.sopt.teamdateroad.data.dataremote.model.response.ResponseProfileDto +import org.sopt.teamdateroad.data.mapper.toEntity.toPoint +import org.sopt.teamdateroad.domain.model.Profile + +fun ResponseProfileDto.toDomain(): Profile = Profile( + name = this.name, + tag = this.tags, + point = this.point.toPoint(), + imageUrl = this.imageUrl +) diff --git a/app/src/main/java/org/sopt/teamdateroad/data/mapper/todomain/ResponseTagDtoMapper.kt b/app/src/main/java/org/sopt/teamdateroad/data/mapper/todomain/ResponseTagDtoMapper.kt new file mode 100644 index 000000000..38455dc54 --- /dev/null +++ b/app/src/main/java/org/sopt/teamdateroad/data/mapper/todomain/ResponseTagDtoMapper.kt @@ -0,0 +1,6 @@ +package org.sopt.teamdateroad.data.mapper.todomain + +import org.sopt.teamdateroad.data.dataremote.model.response.ResponseTagDto +import org.sopt.teamdateroad.presentation.type.DateTagType + +fun ResponseTagDto.toDomain(): DateTagType = DateTagType.valueOf(this.tag) diff --git a/app/src/main/java/org/sopt/dateroad/data/mapper/todomain/ResponseTimelineDetailDtoMapper.kt b/app/src/main/java/org/sopt/teamdateroad/data/mapper/todomain/ResponseTimelineDetailDtoMapper.kt similarity index 53% rename from app/src/main/java/org/sopt/dateroad/data/mapper/todomain/ResponseTimelineDetailDtoMapper.kt rename to app/src/main/java/org/sopt/teamdateroad/data/mapper/todomain/ResponseTimelineDetailDtoMapper.kt index 65fe05a1e..cbb52b6c4 100644 --- a/app/src/main/java/org/sopt/dateroad/data/mapper/todomain/ResponseTimelineDetailDtoMapper.kt +++ b/app/src/main/java/org/sopt/teamdateroad/data/mapper/todomain/ResponseTimelineDetailDtoMapper.kt @@ -1,10 +1,10 @@ -package org.sopt.dateroad.data.mapper.todomain +package org.sopt.teamdateroad.data.mapper.todomain -import org.sopt.dateroad.data.dataremote.model.response.ResponseTimelineDetailDto -import org.sopt.dateroad.data.mapper.toEntity.toBasicDates -import org.sopt.dateroad.data.mapper.toEntity.toDDayString -import org.sopt.dateroad.data.mapper.toEntity.toStartAtString -import org.sopt.dateroad.domain.model.TimelineDetail +import org.sopt.teamdateroad.data.dataremote.model.response.ResponseTimelineDetailDto +import org.sopt.teamdateroad.data.mapper.toEntity.toBasicDates +import org.sopt.teamdateroad.data.mapper.toEntity.toDDayString +import org.sopt.teamdateroad.data.mapper.toEntity.toStartAtString +import org.sopt.teamdateroad.domain.model.TimelineDetail fun ResponseTimelineDetailDto.toDomain(): TimelineDetail = TimelineDetail( timelineId = this.timelineId, diff --git a/app/src/main/java/org/sopt/dateroad/data/mapper/todomain/ResponseTimelineDtoMapper.kt b/app/src/main/java/org/sopt/teamdateroad/data/mapper/todomain/ResponseTimelineDtoMapper.kt similarity index 59% rename from app/src/main/java/org/sopt/dateroad/data/mapper/todomain/ResponseTimelineDtoMapper.kt rename to app/src/main/java/org/sopt/teamdateroad/data/mapper/todomain/ResponseTimelineDtoMapper.kt index 2835a0aee..95f9c7faa 100644 --- a/app/src/main/java/org/sopt/dateroad/data/mapper/todomain/ResponseTimelineDtoMapper.kt +++ b/app/src/main/java/org/sopt/teamdateroad/data/mapper/todomain/ResponseTimelineDtoMapper.kt @@ -1,10 +1,10 @@ -package org.sopt.dateroad.data.mapper.todomain +package org.sopt.teamdateroad.data.mapper.todomain -import org.sopt.dateroad.data.dataremote.model.response.ResponseTimelineDto -import org.sopt.dateroad.data.mapper.toEntity.toBasicDates -import org.sopt.dateroad.data.mapper.toEntity.toDDayString -import org.sopt.dateroad.data.mapper.toEntity.toFormattedDate -import org.sopt.dateroad.domain.model.Timeline +import org.sopt.teamdateroad.data.dataremote.model.response.ResponseTimelineDto +import org.sopt.teamdateroad.data.mapper.toEntity.toBasicDates +import org.sopt.teamdateroad.data.mapper.toEntity.toDDayString +import org.sopt.teamdateroad.data.mapper.toEntity.toFormattedDate +import org.sopt.teamdateroad.domain.model.Timeline fun ResponseTimelineDto.toFutureTimelineDomain(): Timeline = Timeline( timelineId = this.timelineId, diff --git a/app/src/main/java/org/sopt/teamdateroad/data/mapper/todomain/ResponseUserPointDtoMapper.kt b/app/src/main/java/org/sopt/teamdateroad/data/mapper/todomain/ResponseUserPointDtoMapper.kt new file mode 100644 index 000000000..b7d7c598f --- /dev/null +++ b/app/src/main/java/org/sopt/teamdateroad/data/mapper/todomain/ResponseUserPointDtoMapper.kt @@ -0,0 +1,11 @@ +package org.sopt.teamdateroad.data.mapper.todomain + +import org.sopt.teamdateroad.data.dataremote.model.response.ResponseUserPointDto +import org.sopt.teamdateroad.data.mapper.toEntity.toPoint +import org.sopt.teamdateroad.domain.model.UserPoint + +fun ResponseUserPointDto.toDomain(): UserPoint = UserPoint( + name = this.name, + point = this.point.toPoint(), + imageUrl = this.image +) diff --git a/app/src/main/java/org/sopt/dateroad/data/mapper/todomain/ResponseUserUsePointDtoMapper.kt b/app/src/main/java/org/sopt/teamdateroad/data/mapper/todomain/ResponseUserUsePointDtoMapper.kt similarity index 51% rename from app/src/main/java/org/sopt/dateroad/data/mapper/todomain/ResponseUserUsePointDtoMapper.kt rename to app/src/main/java/org/sopt/teamdateroad/data/mapper/todomain/ResponseUserUsePointDtoMapper.kt index 3e92e338d..86a10170a 100644 --- a/app/src/main/java/org/sopt/dateroad/data/mapper/todomain/ResponseUserUsePointDtoMapper.kt +++ b/app/src/main/java/org/sopt/teamdateroad/data/mapper/todomain/ResponseUserUsePointDtoMapper.kt @@ -1,7 +1,7 @@ -package org.sopt.dateroad.data.mapper.todomain +package org.sopt.teamdateroad.data.mapper.todomain -import org.sopt.dateroad.data.dataremote.model.response.ResponseUserUsePointDto -import org.sopt.dateroad.domain.model.PointUseResult +import org.sopt.teamdateroad.data.dataremote.model.response.ResponseUserUsePointDto +import org.sopt.teamdateroad.domain.model.PointUseResult fun ResponseUserUsePointDto.toDomain(): PointUseResult = PointUseResult( userPoint = this.userPoint, diff --git a/app/src/main/java/org/sopt/dateroad/data/repositoryimpl/AdvertisementRepositoryImpl.kt b/app/src/main/java/org/sopt/teamdateroad/data/repositoryimpl/AdvertisementRepositoryImpl.kt similarity index 60% rename from app/src/main/java/org/sopt/dateroad/data/repositoryimpl/AdvertisementRepositoryImpl.kt rename to app/src/main/java/org/sopt/teamdateroad/data/repositoryimpl/AdvertisementRepositoryImpl.kt index f938425b5..3049d202e 100644 --- a/app/src/main/java/org/sopt/dateroad/data/repositoryimpl/AdvertisementRepositoryImpl.kt +++ b/app/src/main/java/org/sopt/teamdateroad/data/repositoryimpl/AdvertisementRepositoryImpl.kt @@ -1,11 +1,11 @@ -package org.sopt.dateroad.data.repositoryimpl +package org.sopt.teamdateroad.data.repositoryimpl import javax.inject.Inject -import org.sopt.dateroad.data.dataremote.datasource.AdvertisementRemoteDataSource -import org.sopt.dateroad.data.mapper.todomain.toDomain -import org.sopt.dateroad.domain.model.Advertisement -import org.sopt.dateroad.domain.model.AdvertisementDetail -import org.sopt.dateroad.domain.repository.AdvertisementRepository +import org.sopt.teamdateroad.data.dataremote.datasource.AdvertisementRemoteDataSource +import org.sopt.teamdateroad.data.mapper.todomain.toDomain +import org.sopt.teamdateroad.domain.model.Advertisement +import org.sopt.teamdateroad.domain.model.AdvertisementDetail +import org.sopt.teamdateroad.domain.repository.AdvertisementRepository class AdvertisementRepositoryImpl @Inject constructor( private val advertisementRemoteDataSource: AdvertisementRemoteDataSource diff --git a/app/src/main/java/org/sopt/dateroad/data/repositoryimpl/AuthRepositoryImpl.kt b/app/src/main/java/org/sopt/teamdateroad/data/repositoryimpl/AuthRepositoryImpl.kt similarity index 73% rename from app/src/main/java/org/sopt/dateroad/data/repositoryimpl/AuthRepositoryImpl.kt rename to app/src/main/java/org/sopt/teamdateroad/data/repositoryimpl/AuthRepositoryImpl.kt index 97bc64d0b..297a49812 100644 --- a/app/src/main/java/org/sopt/dateroad/data/repositoryimpl/AuthRepositoryImpl.kt +++ b/app/src/main/java/org/sopt/teamdateroad/data/repositoryimpl/AuthRepositoryImpl.kt @@ -1,4 +1,4 @@ -package org.sopt.dateroad.data.repositoryimpl +package org.sopt.teamdateroad.data.repositoryimpl import android.content.ContentResolver import android.net.Uri @@ -7,19 +7,19 @@ import kotlinx.serialization.encodeToString import kotlinx.serialization.json.Json import okhttp3.MediaType.Companion.toMediaType import okhttp3.RequestBody.Companion.toRequestBody -import org.sopt.dateroad.data.dataremote.datasource.AuthRemoteDataSource -import org.sopt.dateroad.data.dataremote.model.request.RequestWithdrawDto -import org.sopt.dateroad.data.dataremote.util.ApiConstraints.APPLICATION_JSON -import org.sopt.dateroad.data.dataremote.util.ApiConstraints.HTTPS -import org.sopt.dateroad.data.dataremote.util.ApiConstraints.PROFILE_FORM_DATA_IMAGE -import org.sopt.dateroad.data.dataremote.util.ContentUriRequestBody -import org.sopt.dateroad.data.mapper.todata.toData -import org.sopt.dateroad.data.mapper.todomain.toDomain -import org.sopt.dateroad.domain.model.Auth -import org.sopt.dateroad.domain.model.EditProfile -import org.sopt.dateroad.domain.model.SignIn -import org.sopt.dateroad.domain.model.SignUp -import org.sopt.dateroad.domain.repository.AuthRepository +import org.sopt.teamdateroad.data.dataremote.datasource.AuthRemoteDataSource +import org.sopt.teamdateroad.data.dataremote.model.request.RequestWithdrawDto +import org.sopt.teamdateroad.data.dataremote.util.ApiConstraints.APPLICATION_JSON +import org.sopt.teamdateroad.data.dataremote.util.ApiConstraints.HTTPS +import org.sopt.teamdateroad.data.dataremote.util.ApiConstraints.PROFILE_FORM_DATA_IMAGE +import org.sopt.teamdateroad.data.dataremote.util.ContentUriRequestBody +import org.sopt.teamdateroad.data.mapper.todata.toData +import org.sopt.teamdateroad.data.mapper.todomain.toDomain +import org.sopt.teamdateroad.domain.model.Auth +import org.sopt.teamdateroad.domain.model.EditProfile +import org.sopt.teamdateroad.domain.model.SignIn +import org.sopt.teamdateroad.domain.model.SignUp +import org.sopt.teamdateroad.domain.repository.AuthRepository class AuthRepositoryImpl @Inject constructor( private val contentResolver: ContentResolver, diff --git a/app/src/main/java/org/sopt/dateroad/data/repositoryimpl/CourseRepositoryImpl.kt b/app/src/main/java/org/sopt/teamdateroad/data/repositoryimpl/CourseRepositoryImpl.kt similarity index 73% rename from app/src/main/java/org/sopt/dateroad/data/repositoryimpl/CourseRepositoryImpl.kt rename to app/src/main/java/org/sopt/teamdateroad/data/repositoryimpl/CourseRepositoryImpl.kt index c5cd18b68..53063c050 100644 --- a/app/src/main/java/org/sopt/dateroad/data/repositoryimpl/CourseRepositoryImpl.kt +++ b/app/src/main/java/org/sopt/teamdateroad/data/repositoryimpl/CourseRepositoryImpl.kt @@ -1,4 +1,4 @@ -package org.sopt.dateroad.data.repositoryimpl +package org.sopt.teamdateroad.data.repositoryimpl import android.content.ContentResolver import android.net.Uri @@ -7,22 +7,22 @@ import kotlinx.serialization.encodeToString import kotlinx.serialization.json.Json import okhttp3.MediaType.Companion.toMediaType import okhttp3.RequestBody.Companion.toRequestBody -import org.sopt.dateroad.data.dataremote.datasource.CourseRemoteDataSource -import org.sopt.dateroad.data.dataremote.util.ContentUriRequestBody -import org.sopt.dateroad.data.mapper.todata.toCourseData -import org.sopt.dateroad.data.mapper.todata.toData -import org.sopt.dateroad.data.mapper.todomain.toDomain -import org.sopt.dateroad.domain.model.Course -import org.sopt.dateroad.domain.model.CourseDetail -import org.sopt.dateroad.domain.model.Enroll -import org.sopt.dateroad.domain.model.EnrollCourseResult -import org.sopt.dateroad.domain.repository.CourseRepository -import org.sopt.dateroad.domain.type.GyeonggiAreaType -import org.sopt.dateroad.domain.type.IncheonAreaType -import org.sopt.dateroad.domain.type.MoneyTagType -import org.sopt.dateroad.domain.type.RegionType -import org.sopt.dateroad.domain.type.SeoulAreaType -import org.sopt.dateroad.domain.type.SortByType +import org.sopt.teamdateroad.data.dataremote.datasource.CourseRemoteDataSource +import org.sopt.teamdateroad.data.dataremote.util.ContentUriRequestBody +import org.sopt.teamdateroad.data.mapper.todata.toCourseData +import org.sopt.teamdateroad.data.mapper.todata.toData +import org.sopt.teamdateroad.data.mapper.todomain.toDomain +import org.sopt.teamdateroad.domain.model.Course +import org.sopt.teamdateroad.domain.model.CourseDetail +import org.sopt.teamdateroad.domain.model.Enroll +import org.sopt.teamdateroad.domain.model.EnrollCourseResult +import org.sopt.teamdateroad.domain.repository.CourseRepository +import org.sopt.teamdateroad.domain.type.GyeonggiAreaType +import org.sopt.teamdateroad.domain.type.IncheonAreaType +import org.sopt.teamdateroad.domain.type.MoneyTagType +import org.sopt.teamdateroad.domain.type.RegionType +import org.sopt.teamdateroad.domain.type.SeoulAreaType +import org.sopt.teamdateroad.domain.type.SortByType class CourseRepositoryImpl @Inject constructor( private val contentResolver: ContentResolver, diff --git a/app/src/main/java/org/sopt/dateroad/data/repositoryimpl/MyCourseRepositoryImpl.kt b/app/src/main/java/org/sopt/teamdateroad/data/repositoryimpl/MyCourseRepositoryImpl.kt similarity index 60% rename from app/src/main/java/org/sopt/dateroad/data/repositoryimpl/MyCourseRepositoryImpl.kt rename to app/src/main/java/org/sopt/teamdateroad/data/repositoryimpl/MyCourseRepositoryImpl.kt index 638dc178b..4eb472f65 100644 --- a/app/src/main/java/org/sopt/dateroad/data/repositoryimpl/MyCourseRepositoryImpl.kt +++ b/app/src/main/java/org/sopt/teamdateroad/data/repositoryimpl/MyCourseRepositoryImpl.kt @@ -1,10 +1,10 @@ -package org.sopt.dateroad.data.repositoryimpl +package org.sopt.teamdateroad.data.repositoryimpl import javax.inject.Inject -import org.sopt.dateroad.data.dataremote.datasource.MyCourseRemoteDataSource -import org.sopt.dateroad.data.mapper.todomain.toDomain -import org.sopt.dateroad.domain.model.Course -import org.sopt.dateroad.domain.repository.MyCourseRepository +import org.sopt.teamdateroad.data.dataremote.datasource.MyCourseRemoteDataSource +import org.sopt.teamdateroad.data.mapper.todomain.toDomain +import org.sopt.teamdateroad.domain.model.Course +import org.sopt.teamdateroad.domain.repository.MyCourseRepository class MyCourseRepositoryImpl @Inject constructor( private val myCourseRemoteDataSource: MyCourseRemoteDataSource diff --git a/app/src/main/java/org/sopt/teamdateroad/data/repositoryimpl/ProfileRepositoryImpl.kt b/app/src/main/java/org/sopt/teamdateroad/data/repositoryimpl/ProfileRepositoryImpl.kt new file mode 100644 index 000000000..a1643bbdf --- /dev/null +++ b/app/src/main/java/org/sopt/teamdateroad/data/repositoryimpl/ProfileRepositoryImpl.kt @@ -0,0 +1,16 @@ + +package org.sopt.teamdateroad.data.repositoryimpl + +import javax.inject.Inject +import org.sopt.teamdateroad.data.dataremote.datasource.ProfileRemoteDataSource +import org.sopt.teamdateroad.data.mapper.todomain.toDomain +import org.sopt.teamdateroad.domain.model.Profile +import org.sopt.teamdateroad.domain.repository.ProfileRepository + +class ProfileRepositoryImpl @Inject constructor( + private val profileDataSource: ProfileRemoteDataSource +) : ProfileRepository { + override suspend fun getUsers(): Result = runCatching { + profileDataSource.getProfile().toDomain() + } +} diff --git a/app/src/main/java/org/sopt/dateroad/data/repositoryimpl/TimelineRepositoryImpl.kt b/app/src/main/java/org/sopt/teamdateroad/data/repositoryimpl/TimelineRepositoryImpl.kt similarity index 61% rename from app/src/main/java/org/sopt/dateroad/data/repositoryimpl/TimelineRepositoryImpl.kt rename to app/src/main/java/org/sopt/teamdateroad/data/repositoryimpl/TimelineRepositoryImpl.kt index bbdf1914d..0d7809150 100644 --- a/app/src/main/java/org/sopt/dateroad/data/repositoryimpl/TimelineRepositoryImpl.kt +++ b/app/src/main/java/org/sopt/teamdateroad/data/repositoryimpl/TimelineRepositoryImpl.kt @@ -1,18 +1,18 @@ -package org.sopt.dateroad.data.repositoryimpl +package org.sopt.teamdateroad.data.repositoryimpl import javax.inject.Inject -import org.sopt.dateroad.data.dataremote.datasource.TimelineRemoteDataSource -import org.sopt.dateroad.data.mapper.todata.toTimelineData -import org.sopt.dateroad.data.mapper.todomain.toDomain -import org.sopt.dateroad.data.mapper.todomain.toFutureTimelineDomain -import org.sopt.dateroad.data.mapper.todomain.toPastTimelineDomain -import org.sopt.dateroad.domain.model.Enroll -import org.sopt.dateroad.domain.model.EnrollTimelineResult -import org.sopt.dateroad.domain.model.NearestTimeline -import org.sopt.dateroad.domain.model.Timeline -import org.sopt.dateroad.domain.model.TimelineDetail -import org.sopt.dateroad.domain.repository.TimelineRepository -import org.sopt.dateroad.domain.type.TimelineTimeType +import org.sopt.teamdateroad.data.dataremote.datasource.TimelineRemoteDataSource +import org.sopt.teamdateroad.data.mapper.todata.toTimelineData +import org.sopt.teamdateroad.data.mapper.todomain.toDomain +import org.sopt.teamdateroad.data.mapper.todomain.toFutureTimelineDomain +import org.sopt.teamdateroad.data.mapper.todomain.toPastTimelineDomain +import org.sopt.teamdateroad.domain.model.Enroll +import org.sopt.teamdateroad.domain.model.EnrollTimelineResult +import org.sopt.teamdateroad.domain.model.NearestTimeline +import org.sopt.teamdateroad.domain.model.Timeline +import org.sopt.teamdateroad.domain.model.TimelineDetail +import org.sopt.teamdateroad.domain.repository.TimelineRepository +import org.sopt.teamdateroad.domain.type.TimelineTimeType class TimelineRepositoryImpl @Inject constructor( private val timelineRemoteDataSource: TimelineRemoteDataSource diff --git a/app/src/main/java/org/sopt/dateroad/data/repositoryimpl/UserInfoRepositoryImpl.kt b/app/src/main/java/org/sopt/teamdateroad/data/repositoryimpl/UserInfoRepositoryImpl.kt similarity index 81% rename from app/src/main/java/org/sopt/dateroad/data/repositoryimpl/UserInfoRepositoryImpl.kt rename to app/src/main/java/org/sopt/teamdateroad/data/repositoryimpl/UserInfoRepositoryImpl.kt index 0ea6797cb..324249101 100644 --- a/app/src/main/java/org/sopt/dateroad/data/repositoryimpl/UserInfoRepositoryImpl.kt +++ b/app/src/main/java/org/sopt/teamdateroad/data/repositoryimpl/UserInfoRepositoryImpl.kt @@ -1,8 +1,8 @@ -package org.sopt.dateroad.data.repositoryimpl +package org.sopt.teamdateroad.data.repositoryimpl import javax.inject.Inject -import org.sopt.dateroad.data.datalocal.datasource.UserInfoLocalDataSource -import org.sopt.dateroad.domain.repository.UserInfoRepository +import org.sopt.teamdateroad.data.datalocal.datasource.UserInfoLocalDataSource +import org.sopt.teamdateroad.domain.repository.UserInfoRepository class UserInfoRepositoryImpl @Inject constructor( private val userInfoLocalDataSource: UserInfoLocalDataSource diff --git a/app/src/main/java/org/sopt/dateroad/data/repositoryimpl/UserPointRepositoryImpl.kt b/app/src/main/java/org/sopt/teamdateroad/data/repositoryimpl/UserPointRepositoryImpl.kt similarity index 57% rename from app/src/main/java/org/sopt/dateroad/data/repositoryimpl/UserPointRepositoryImpl.kt rename to app/src/main/java/org/sopt/teamdateroad/data/repositoryimpl/UserPointRepositoryImpl.kt index 459178fc3..f6ddaa85a 100644 --- a/app/src/main/java/org/sopt/dateroad/data/repositoryimpl/UserPointRepositoryImpl.kt +++ b/app/src/main/java/org/sopt/teamdateroad/data/repositoryimpl/UserPointRepositoryImpl.kt @@ -1,14 +1,14 @@ -package org.sopt.dateroad.data.repositoryimpl +package org.sopt.teamdateroad.data.repositoryimpl import javax.inject.Inject -import org.sopt.dateroad.data.dataremote.datasource.UserPointRemoteDataSource -import org.sopt.dateroad.data.mapper.todata.toData -import org.sopt.dateroad.data.mapper.todomain.toDomain -import org.sopt.dateroad.domain.model.PointHistory -import org.sopt.dateroad.domain.model.PointUseResult -import org.sopt.dateroad.domain.model.UsePoint -import org.sopt.dateroad.domain.model.UserPoint -import org.sopt.dateroad.domain.repository.UserPointRepository +import org.sopt.teamdateroad.data.dataremote.datasource.UserPointRemoteDataSource +import org.sopt.teamdateroad.data.mapper.todata.toData +import org.sopt.teamdateroad.data.mapper.todomain.toDomain +import org.sopt.teamdateroad.domain.model.PointHistory +import org.sopt.teamdateroad.domain.model.PointUseResult +import org.sopt.teamdateroad.domain.model.UsePoint +import org.sopt.teamdateroad.domain.model.UserPoint +import org.sopt.teamdateroad.domain.repository.UserPointRepository class UserPointRepositoryImpl @Inject constructor( private val userPointRemoteDataSource: UserPointRemoteDataSource diff --git a/app/src/main/java/org/sopt/dateroad/di/ContentResolverModule.kt b/app/src/main/java/org/sopt/teamdateroad/di/ContentResolverModule.kt similarity index 93% rename from app/src/main/java/org/sopt/dateroad/di/ContentResolverModule.kt rename to app/src/main/java/org/sopt/teamdateroad/di/ContentResolverModule.kt index db59fd779..50a8bdd79 100644 --- a/app/src/main/java/org/sopt/dateroad/di/ContentResolverModule.kt +++ b/app/src/main/java/org/sopt/teamdateroad/di/ContentResolverModule.kt @@ -1,4 +1,4 @@ -package org.sopt.dateroad.di +package org.sopt.teamdateroad.di import android.content.ContentResolver import android.content.Context diff --git a/app/src/main/java/org/sopt/dateroad/di/DataSourceModule.kt b/app/src/main/java/org/sopt/teamdateroad/di/DataSourceModule.kt similarity index 53% rename from app/src/main/java/org/sopt/dateroad/di/DataSourceModule.kt rename to app/src/main/java/org/sopt/teamdateroad/di/DataSourceModule.kt index 5f404e043..072b5b67c 100644 --- a/app/src/main/java/org/sopt/dateroad/di/DataSourceModule.kt +++ b/app/src/main/java/org/sopt/teamdateroad/di/DataSourceModule.kt @@ -1,26 +1,26 @@ -package org.sopt.dateroad.di +package org.sopt.teamdateroad.di import dagger.Binds import dagger.Module import dagger.hilt.InstallIn import dagger.hilt.components.SingletonComponent import javax.inject.Singleton -import org.sopt.dateroad.data.datalocal.datasource.UserInfoLocalDataSource -import org.sopt.dateroad.data.datalocal.datasourceimpl.UserInfoLocalDataSourceImpl -import org.sopt.dateroad.data.dataremote.datasource.AdvertisementRemoteDataSource -import org.sopt.dateroad.data.dataremote.datasource.AuthRemoteDataSource -import org.sopt.dateroad.data.dataremote.datasource.CourseRemoteDataSource -import org.sopt.dateroad.data.dataremote.datasource.MyCourseRemoteDataSource -import org.sopt.dateroad.data.dataremote.datasource.ProfileRemoteDataSource -import org.sopt.dateroad.data.dataremote.datasource.TimelineRemoteDataSource -import org.sopt.dateroad.data.dataremote.datasource.UserPointRemoteDataSource -import org.sopt.dateroad.data.dataremote.datasourceimpl.AdvertisementRemoteDataSourceImpl -import org.sopt.dateroad.data.dataremote.datasourceimpl.AuthRemoteDataSourceImpl -import org.sopt.dateroad.data.dataremote.datasourceimpl.CourseRemoteDataSourceImpl -import org.sopt.dateroad.data.dataremote.datasourceimpl.MyCourseRemoteDataSourceImpl -import org.sopt.dateroad.data.dataremote.datasourceimpl.ProfileRemoteDataSourceImpl -import org.sopt.dateroad.data.dataremote.datasourceimpl.TimelineRemoteDataSourceImpl -import org.sopt.dateroad.data.dataremote.datasourceimpl.UserPointRemoteDataSourceImpl +import org.sopt.teamdateroad.data.datalocal.datasource.UserInfoLocalDataSource +import org.sopt.teamdateroad.data.datalocal.datasourceimpl.UserInfoLocalDataSourceImpl +import org.sopt.teamdateroad.data.dataremote.datasource.AdvertisementRemoteDataSource +import org.sopt.teamdateroad.data.dataremote.datasource.AuthRemoteDataSource +import org.sopt.teamdateroad.data.dataremote.datasource.CourseRemoteDataSource +import org.sopt.teamdateroad.data.dataremote.datasource.MyCourseRemoteDataSource +import org.sopt.teamdateroad.data.dataremote.datasource.ProfileRemoteDataSource +import org.sopt.teamdateroad.data.dataremote.datasource.TimelineRemoteDataSource +import org.sopt.teamdateroad.data.dataremote.datasource.UserPointRemoteDataSource +import org.sopt.teamdateroad.data.dataremote.datasourceimpl.AdvertisementRemoteDataSourceImpl +import org.sopt.teamdateroad.data.dataremote.datasourceimpl.AuthRemoteDataSourceImpl +import org.sopt.teamdateroad.data.dataremote.datasourceimpl.CourseRemoteDataSourceImpl +import org.sopt.teamdateroad.data.dataremote.datasourceimpl.MyCourseRemoteDataSourceImpl +import org.sopt.teamdateroad.data.dataremote.datasourceimpl.ProfileRemoteDataSourceImpl +import org.sopt.teamdateroad.data.dataremote.datasourceimpl.TimelineRemoteDataSourceImpl +import org.sopt.teamdateroad.data.dataremote.datasourceimpl.UserPointRemoteDataSourceImpl @Module @InstallIn(SingletonComponent::class) diff --git a/app/src/main/java/org/sopt/dateroad/di/NetworkModule.kt b/app/src/main/java/org/sopt/teamdateroad/di/NetworkModule.kt similarity index 88% rename from app/src/main/java/org/sopt/dateroad/di/NetworkModule.kt rename to app/src/main/java/org/sopt/teamdateroad/di/NetworkModule.kt index 9c73fd052..e2639802e 100644 --- a/app/src/main/java/org/sopt/dateroad/di/NetworkModule.kt +++ b/app/src/main/java/org/sopt/teamdateroad/di/NetworkModule.kt @@ -1,4 +1,4 @@ -package org.sopt.dateroad.di +package org.sopt.teamdateroad.di import com.jakewharton.retrofit2.converter.kotlinx.serialization.asConverterFactory import dagger.Module @@ -13,11 +13,11 @@ import okhttp3.Interceptor import okhttp3.MediaType.Companion.toMediaTypeOrNull import okhttp3.OkHttpClient import okhttp3.logging.HttpLoggingInterceptor -import org.sopt.dateroad.BuildConfig -import org.sopt.dateroad.BuildConfig.DEBUG -import org.sopt.dateroad.data.dataremote.interceptor.AuthInterceptor -import org.sopt.dateroad.di.qualifier.Auth -import org.sopt.dateroad.di.qualifier.DateRoad +import org.sopt.teamdateroad.BuildConfig +import org.sopt.teamdateroad.BuildConfig.DEBUG +import org.sopt.teamdateroad.data.dataremote.interceptor.AuthInterceptor +import org.sopt.teamdateroad.di.qualifier.Auth +import org.sopt.teamdateroad.di.qualifier.DateRoad import retrofit2.Retrofit @Module diff --git a/app/src/main/java/org/sopt/dateroad/di/RepositoryModule.kt b/app/src/main/java/org/sopt/teamdateroad/di/RepositoryModule.kt similarity index 54% rename from app/src/main/java/org/sopt/dateroad/di/RepositoryModule.kt rename to app/src/main/java/org/sopt/teamdateroad/di/RepositoryModule.kt index 4959bf55f..7a35d9cd4 100644 --- a/app/src/main/java/org/sopt/dateroad/di/RepositoryModule.kt +++ b/app/src/main/java/org/sopt/teamdateroad/di/RepositoryModule.kt @@ -1,26 +1,26 @@ -package org.sopt.dateroad.di +package org.sopt.teamdateroad.di import dagger.Binds import dagger.Module import dagger.hilt.InstallIn import dagger.hilt.components.SingletonComponent import javax.inject.Singleton -import org.sopt.dateroad.data.repositoryimpl.AdvertisementRepositoryImpl -import org.sopt.dateroad.data.repositoryimpl.AuthRepositoryImpl -import org.sopt.dateroad.data.repositoryimpl.CourseRepositoryImpl -import org.sopt.dateroad.data.repositoryimpl.MyCourseRepositoryImpl -import org.sopt.dateroad.data.repositoryimpl.ProfileRepositoryImpl -import org.sopt.dateroad.data.repositoryimpl.TimelineRepositoryImpl -import org.sopt.dateroad.data.repositoryimpl.UserInfoRepositoryImpl -import org.sopt.dateroad.data.repositoryimpl.UserPointRepositoryImpl -import org.sopt.dateroad.domain.repository.AdvertisementRepository -import org.sopt.dateroad.domain.repository.AuthRepository -import org.sopt.dateroad.domain.repository.CourseRepository -import org.sopt.dateroad.domain.repository.MyCourseRepository -import org.sopt.dateroad.domain.repository.ProfileRepository -import org.sopt.dateroad.domain.repository.TimelineRepository -import org.sopt.dateroad.domain.repository.UserInfoRepository -import org.sopt.dateroad.domain.repository.UserPointRepository +import org.sopt.teamdateroad.data.repositoryimpl.AdvertisementRepositoryImpl +import org.sopt.teamdateroad.data.repositoryimpl.AuthRepositoryImpl +import org.sopt.teamdateroad.data.repositoryimpl.CourseRepositoryImpl +import org.sopt.teamdateroad.data.repositoryimpl.MyCourseRepositoryImpl +import org.sopt.teamdateroad.data.repositoryimpl.ProfileRepositoryImpl +import org.sopt.teamdateroad.data.repositoryimpl.TimelineRepositoryImpl +import org.sopt.teamdateroad.data.repositoryimpl.UserInfoRepositoryImpl +import org.sopt.teamdateroad.data.repositoryimpl.UserPointRepositoryImpl +import org.sopt.teamdateroad.domain.repository.AdvertisementRepository +import org.sopt.teamdateroad.domain.repository.AuthRepository +import org.sopt.teamdateroad.domain.repository.CourseRepository +import org.sopt.teamdateroad.domain.repository.MyCourseRepository +import org.sopt.teamdateroad.domain.repository.ProfileRepository +import org.sopt.teamdateroad.domain.repository.TimelineRepository +import org.sopt.teamdateroad.domain.repository.UserInfoRepository +import org.sopt.teamdateroad.domain.repository.UserPointRepository @Module @InstallIn(SingletonComponent::class) diff --git a/app/src/main/java/org/sopt/dateroad/di/ServiceModule.kt b/app/src/main/java/org/sopt/teamdateroad/di/ServiceModule.kt similarity index 69% rename from app/src/main/java/org/sopt/dateroad/di/ServiceModule.kt rename to app/src/main/java/org/sopt/teamdateroad/di/ServiceModule.kt index 784ebca85..5af0fafce 100644 --- a/app/src/main/java/org/sopt/dateroad/di/ServiceModule.kt +++ b/app/src/main/java/org/sopt/teamdateroad/di/ServiceModule.kt @@ -1,17 +1,17 @@ -package org.sopt.dateroad.di +package org.sopt.teamdateroad.di import dagger.Module import dagger.Provides import dagger.hilt.InstallIn import dagger.hilt.components.SingletonComponent -import org.sopt.dateroad.data.dataremote.service.AdvertisementService -import org.sopt.dateroad.data.dataremote.service.AuthService -import org.sopt.dateroad.data.dataremote.service.CourseService -import org.sopt.dateroad.data.dataremote.service.MyCourseService -import org.sopt.dateroad.data.dataremote.service.ProfileService -import org.sopt.dateroad.data.dataremote.service.TimelineService -import org.sopt.dateroad.data.dataremote.service.UserPointService -import org.sopt.dateroad.di.qualifier.DateRoad +import org.sopt.teamdateroad.data.dataremote.service.AdvertisementService +import org.sopt.teamdateroad.data.dataremote.service.AuthService +import org.sopt.teamdateroad.data.dataremote.service.CourseService +import org.sopt.teamdateroad.data.dataremote.service.MyCourseService +import org.sopt.teamdateroad.data.dataremote.service.ProfileService +import org.sopt.teamdateroad.data.dataremote.service.TimelineService +import org.sopt.teamdateroad.data.dataremote.service.UserPointService +import org.sopt.teamdateroad.di.qualifier.DateRoad import retrofit2.Retrofit @Module diff --git a/app/src/main/java/org/sopt/dateroad/di/qualifier/Qualifier.kt b/app/src/main/java/org/sopt/teamdateroad/di/qualifier/Qualifier.kt similarity index 70% rename from app/src/main/java/org/sopt/dateroad/di/qualifier/Qualifier.kt rename to app/src/main/java/org/sopt/teamdateroad/di/qualifier/Qualifier.kt index 73672ec91..4a103a508 100644 --- a/app/src/main/java/org/sopt/dateroad/di/qualifier/Qualifier.kt +++ b/app/src/main/java/org/sopt/teamdateroad/di/qualifier/Qualifier.kt @@ -1,4 +1,4 @@ -package org.sopt.dateroad.di.qualifier +package org.sopt.teamdateroad.di.qualifier import javax.inject.Qualifier diff --git a/app/src/main/java/org/sopt/dateroad/domain/model/Advertisement.kt b/app/src/main/java/org/sopt/teamdateroad/domain/model/Advertisement.kt similarity index 66% rename from app/src/main/java/org/sopt/dateroad/domain/model/Advertisement.kt rename to app/src/main/java/org/sopt/teamdateroad/domain/model/Advertisement.kt index cde88ba38..04630b550 100644 --- a/app/src/main/java/org/sopt/dateroad/domain/model/Advertisement.kt +++ b/app/src/main/java/org/sopt/teamdateroad/domain/model/Advertisement.kt @@ -1,4 +1,4 @@ -package org.sopt.dateroad.domain.model +package org.sopt.teamdateroad.domain.model data class Advertisement( val advertisementId: Int, diff --git a/app/src/main/java/org/sopt/dateroad/domain/model/AdvertisementDetail.kt b/app/src/main/java/org/sopt/teamdateroad/domain/model/AdvertisementDetail.kt similarity index 83% rename from app/src/main/java/org/sopt/dateroad/domain/model/AdvertisementDetail.kt rename to app/src/main/java/org/sopt/teamdateroad/domain/model/AdvertisementDetail.kt index 1f8c242a5..aa27c8692 100644 --- a/app/src/main/java/org/sopt/dateroad/domain/model/AdvertisementDetail.kt +++ b/app/src/main/java/org/sopt/teamdateroad/domain/model/AdvertisementDetail.kt @@ -1,4 +1,4 @@ -package org.sopt.dateroad.domain.model +package org.sopt.teamdateroad.domain.model data class AdvertisementDetail( val images: List = listOf(), diff --git a/app/src/main/java/org/sopt/dateroad/domain/model/Auth.kt b/app/src/main/java/org/sopt/teamdateroad/domain/model/Auth.kt similarity index 64% rename from app/src/main/java/org/sopt/dateroad/domain/model/Auth.kt rename to app/src/main/java/org/sopt/teamdateroad/domain/model/Auth.kt index c74b29279..b2fe3dc6f 100644 --- a/app/src/main/java/org/sopt/dateroad/domain/model/Auth.kt +++ b/app/src/main/java/org/sopt/teamdateroad/domain/model/Auth.kt @@ -1,4 +1,4 @@ -package org.sopt.dateroad.domain.model +package org.sopt.teamdateroad.domain.model data class Auth( val accessToken: String, diff --git a/app/src/main/java/org/sopt/dateroad/domain/model/Course.kt b/app/src/main/java/org/sopt/teamdateroad/domain/model/Course.kt similarity index 81% rename from app/src/main/java/org/sopt/dateroad/domain/model/Course.kt rename to app/src/main/java/org/sopt/teamdateroad/domain/model/Course.kt index 78cb95e62..9a763beda 100644 --- a/app/src/main/java/org/sopt/dateroad/domain/model/Course.kt +++ b/app/src/main/java/org/sopt/teamdateroad/domain/model/Course.kt @@ -1,4 +1,4 @@ -package org.sopt.dateroad.domain.model +package org.sopt.teamdateroad.domain.model data class Course( val courseId: Int, diff --git a/app/src/main/java/org/sopt/dateroad/domain/model/CourseDetail.kt b/app/src/main/java/org/sopt/teamdateroad/domain/model/CourseDetail.kt similarity index 93% rename from app/src/main/java/org/sopt/dateroad/domain/model/CourseDetail.kt rename to app/src/main/java/org/sopt/teamdateroad/domain/model/CourseDetail.kt index 7cfcab67f..5cdd85aab 100644 --- a/app/src/main/java/org/sopt/dateroad/domain/model/CourseDetail.kt +++ b/app/src/main/java/org/sopt/teamdateroad/domain/model/CourseDetail.kt @@ -1,4 +1,4 @@ -package org.sopt.dateroad.domain.model +package org.sopt.teamdateroad.domain.model data class CourseDetail( val courseId: Int = 0, diff --git a/app/src/main/java/org/sopt/dateroad/domain/model/EditProfile.kt b/app/src/main/java/org/sopt/teamdateroad/domain/model/EditProfile.kt similarity index 73% rename from app/src/main/java/org/sopt/dateroad/domain/model/EditProfile.kt rename to app/src/main/java/org/sopt/teamdateroad/domain/model/EditProfile.kt index 6a09be0f6..5efd99b1b 100644 --- a/app/src/main/java/org/sopt/dateroad/domain/model/EditProfile.kt +++ b/app/src/main/java/org/sopt/teamdateroad/domain/model/EditProfile.kt @@ -1,4 +1,4 @@ -package org.sopt.dateroad.domain.model +package org.sopt.teamdateroad.domain.model data class EditProfile( val name: String = "", diff --git a/app/src/main/java/org/sopt/dateroad/domain/model/Enroll.kt b/app/src/main/java/org/sopt/teamdateroad/domain/model/Enroll.kt similarity index 78% rename from app/src/main/java/org/sopt/dateroad/domain/model/Enroll.kt rename to app/src/main/java/org/sopt/teamdateroad/domain/model/Enroll.kt index 5e71969dc..b42ccb294 100644 --- a/app/src/main/java/org/sopt/dateroad/domain/model/Enroll.kt +++ b/app/src/main/java/org/sopt/teamdateroad/domain/model/Enroll.kt @@ -1,6 +1,6 @@ -package org.sopt.dateroad.domain.model +package org.sopt.teamdateroad.domain.model -import org.sopt.dateroad.domain.type.RegionType +import org.sopt.teamdateroad.domain.type.RegionType data class Enroll( val images: List = listOf(), diff --git a/app/src/main/java/org/sopt/dateroad/domain/model/EnrollCourseResult.kt b/app/src/main/java/org/sopt/teamdateroad/domain/model/EnrollCourseResult.kt similarity index 67% rename from app/src/main/java/org/sopt/dateroad/domain/model/EnrollCourseResult.kt rename to app/src/main/java/org/sopt/teamdateroad/domain/model/EnrollCourseResult.kt index dcd3f596e..9b73225b8 100644 --- a/app/src/main/java/org/sopt/dateroad/domain/model/EnrollCourseResult.kt +++ b/app/src/main/java/org/sopt/teamdateroad/domain/model/EnrollCourseResult.kt @@ -1,4 +1,4 @@ -package org.sopt.dateroad.domain.model +package org.sopt.teamdateroad.domain.model data class EnrollCourseResult( val userPoint: Int, diff --git a/app/src/main/java/org/sopt/dateroad/domain/model/EnrollTimelineResult.kt b/app/src/main/java/org/sopt/teamdateroad/domain/model/EnrollTimelineResult.kt similarity index 60% rename from app/src/main/java/org/sopt/dateroad/domain/model/EnrollTimelineResult.kt rename to app/src/main/java/org/sopt/teamdateroad/domain/model/EnrollTimelineResult.kt index 7f61470d4..1c8e602a7 100644 --- a/app/src/main/java/org/sopt/dateroad/domain/model/EnrollTimelineResult.kt +++ b/app/src/main/java/org/sopt/teamdateroad/domain/model/EnrollTimelineResult.kt @@ -1,4 +1,4 @@ -package org.sopt.dateroad.domain.model +package org.sopt.teamdateroad.domain.model data class EnrollTimelineResult( val dateScheduleNum: Long diff --git a/app/src/main/java/org/sopt/dateroad/domain/model/NearestTimeline.kt b/app/src/main/java/org/sopt/teamdateroad/domain/model/NearestTimeline.kt similarity index 80% rename from app/src/main/java/org/sopt/dateroad/domain/model/NearestTimeline.kt rename to app/src/main/java/org/sopt/teamdateroad/domain/model/NearestTimeline.kt index a24bbd824..98e9918c7 100644 --- a/app/src/main/java/org/sopt/dateroad/domain/model/NearestTimeline.kt +++ b/app/src/main/java/org/sopt/teamdateroad/domain/model/NearestTimeline.kt @@ -1,4 +1,4 @@ -package org.sopt.dateroad.domain.model +package org.sopt.teamdateroad.domain.model data class NearestTimeline( val timelineId: Int = 0, diff --git a/app/src/main/java/org/sopt/dateroad/domain/model/Place.kt b/app/src/main/java/org/sopt/teamdateroad/domain/model/Place.kt similarity index 64% rename from app/src/main/java/org/sopt/dateroad/domain/model/Place.kt rename to app/src/main/java/org/sopt/teamdateroad/domain/model/Place.kt index 1f956010d..60f8b9a06 100644 --- a/app/src/main/java/org/sopt/dateroad/domain/model/Place.kt +++ b/app/src/main/java/org/sopt/teamdateroad/domain/model/Place.kt @@ -1,4 +1,4 @@ -package org.sopt.dateroad.domain.model +package org.sopt.teamdateroad.domain.model data class Place( val title: String = "", diff --git a/app/src/main/java/org/sopt/dateroad/domain/model/Point.kt b/app/src/main/java/org/sopt/teamdateroad/domain/model/Point.kt similarity index 69% rename from app/src/main/java/org/sopt/dateroad/domain/model/Point.kt rename to app/src/main/java/org/sopt/teamdateroad/domain/model/Point.kt index 1f6933969..1263b06e7 100644 --- a/app/src/main/java/org/sopt/dateroad/domain/model/Point.kt +++ b/app/src/main/java/org/sopt/teamdateroad/domain/model/Point.kt @@ -1,4 +1,4 @@ -package org.sopt.dateroad.domain.model +package org.sopt.teamdateroad.domain.model data class Point( val point: String, diff --git a/app/src/main/java/org/sopt/dateroad/domain/model/PointHistory.kt b/app/src/main/java/org/sopt/teamdateroad/domain/model/PointHistory.kt similarity index 70% rename from app/src/main/java/org/sopt/dateroad/domain/model/PointHistory.kt rename to app/src/main/java/org/sopt/teamdateroad/domain/model/PointHistory.kt index ef7cb3f7c..3d2e6549a 100644 --- a/app/src/main/java/org/sopt/dateroad/domain/model/PointHistory.kt +++ b/app/src/main/java/org/sopt/teamdateroad/domain/model/PointHistory.kt @@ -1,4 +1,4 @@ -package org.sopt.dateroad.domain.model +package org.sopt.teamdateroad.domain.model data class PointHistory( val gained: List = listOf(), diff --git a/app/src/main/java/org/sopt/dateroad/domain/model/PointUseResult.kt b/app/src/main/java/org/sopt/teamdateroad/domain/model/PointUseResult.kt similarity index 73% rename from app/src/main/java/org/sopt/dateroad/domain/model/PointUseResult.kt rename to app/src/main/java/org/sopt/teamdateroad/domain/model/PointUseResult.kt index b2fa449c0..07973cf8b 100644 --- a/app/src/main/java/org/sopt/dateroad/domain/model/PointUseResult.kt +++ b/app/src/main/java/org/sopt/teamdateroad/domain/model/PointUseResult.kt @@ -1,4 +1,4 @@ -package org.sopt.dateroad.domain.model +package org.sopt.teamdateroad.domain.model data class PointUseResult( val userPoint: Int, diff --git a/app/src/main/java/org/sopt/dateroad/domain/model/Profile.kt b/app/src/main/java/org/sopt/teamdateroad/domain/model/Profile.kt similarity index 77% rename from app/src/main/java/org/sopt/dateroad/domain/model/Profile.kt rename to app/src/main/java/org/sopt/teamdateroad/domain/model/Profile.kt index 166056676..e51889305 100644 --- a/app/src/main/java/org/sopt/dateroad/domain/model/Profile.kt +++ b/app/src/main/java/org/sopt/teamdateroad/domain/model/Profile.kt @@ -1,4 +1,4 @@ -package org.sopt.dateroad.domain.model +package org.sopt.teamdateroad.domain.model data class Profile( val name: String = "", diff --git a/app/src/main/java/org/sopt/dateroad/domain/model/SignIn.kt b/app/src/main/java/org/sopt/teamdateroad/domain/model/SignIn.kt similarity index 52% rename from app/src/main/java/org/sopt/dateroad/domain/model/SignIn.kt rename to app/src/main/java/org/sopt/teamdateroad/domain/model/SignIn.kt index a30dca249..3fd5246f0 100644 --- a/app/src/main/java/org/sopt/dateroad/domain/model/SignIn.kt +++ b/app/src/main/java/org/sopt/teamdateroad/domain/model/SignIn.kt @@ -1,4 +1,4 @@ -package org.sopt.dateroad.domain.model +package org.sopt.teamdateroad.domain.model data class SignIn( val platform: String diff --git a/app/src/main/java/org/sopt/dateroad/domain/model/SignUp.kt b/app/src/main/java/org/sopt/teamdateroad/domain/model/SignUp.kt similarity index 77% rename from app/src/main/java/org/sopt/dateroad/domain/model/SignUp.kt rename to app/src/main/java/org/sopt/teamdateroad/domain/model/SignUp.kt index c2804fe6c..b61ea5b02 100644 --- a/app/src/main/java/org/sopt/dateroad/domain/model/SignUp.kt +++ b/app/src/main/java/org/sopt/teamdateroad/domain/model/SignUp.kt @@ -1,4 +1,4 @@ -package org.sopt.dateroad.domain.model +package org.sopt.teamdateroad.domain.model data class SignUp( val userSignUpInfo: UserSignUpInfo = UserSignUpInfo(), diff --git a/app/src/main/java/org/sopt/dateroad/domain/model/Timeline.kt b/app/src/main/java/org/sopt/teamdateroad/domain/model/Timeline.kt similarity index 66% rename from app/src/main/java/org/sopt/dateroad/domain/model/Timeline.kt rename to app/src/main/java/org/sopt/teamdateroad/domain/model/Timeline.kt index 8ab1469a0..58d82557b 100644 --- a/app/src/main/java/org/sopt/dateroad/domain/model/Timeline.kt +++ b/app/src/main/java/org/sopt/teamdateroad/domain/model/Timeline.kt @@ -1,6 +1,6 @@ -package org.sopt.dateroad.domain.model +package org.sopt.teamdateroad.domain.model -import org.sopt.dateroad.presentation.type.DateTagType +import org.sopt.teamdateroad.presentation.type.DateTagType data class Timeline( val timelineId: Int = 0, diff --git a/app/src/main/java/org/sopt/dateroad/domain/model/TimelineDetail.kt b/app/src/main/java/org/sopt/teamdateroad/domain/model/TimelineDetail.kt similarity index 86% rename from app/src/main/java/org/sopt/dateroad/domain/model/TimelineDetail.kt rename to app/src/main/java/org/sopt/teamdateroad/domain/model/TimelineDetail.kt index a43e7e3c1..d55dd8495 100644 --- a/app/src/main/java/org/sopt/dateroad/domain/model/TimelineDetail.kt +++ b/app/src/main/java/org/sopt/teamdateroad/domain/model/TimelineDetail.kt @@ -1,4 +1,4 @@ -package org.sopt.dateroad.domain.model +package org.sopt.teamdateroad.domain.model data class TimelineDetail( val timelineId: Int = 0, diff --git a/app/src/main/java/org/sopt/dateroad/domain/model/UsePoint.kt b/app/src/main/java/org/sopt/teamdateroad/domain/model/UsePoint.kt similarity index 68% rename from app/src/main/java/org/sopt/dateroad/domain/model/UsePoint.kt rename to app/src/main/java/org/sopt/teamdateroad/domain/model/UsePoint.kt index 80562846c..be628637a 100644 --- a/app/src/main/java/org/sopt/dateroad/domain/model/UsePoint.kt +++ b/app/src/main/java/org/sopt/teamdateroad/domain/model/UsePoint.kt @@ -1,4 +1,4 @@ -package org.sopt.dateroad.domain.model +package org.sopt.teamdateroad.domain.model data class UsePoint( val point: Int, diff --git a/app/src/main/java/org/sopt/dateroad/domain/model/UserPoint.kt b/app/src/main/java/org/sopt/teamdateroad/domain/model/UserPoint.kt similarity index 72% rename from app/src/main/java/org/sopt/dateroad/domain/model/UserPoint.kt rename to app/src/main/java/org/sopt/teamdateroad/domain/model/UserPoint.kt index b8adea83f..f9dbfc0cc 100644 --- a/app/src/main/java/org/sopt/dateroad/domain/model/UserPoint.kt +++ b/app/src/main/java/org/sopt/teamdateroad/domain/model/UserPoint.kt @@ -1,4 +1,4 @@ -package org.sopt.dateroad.domain.model +package org.sopt.teamdateroad.domain.model data class UserPoint( val name: String = "", diff --git a/app/src/main/java/org/sopt/dateroad/domain/model/UserSignUpInfo.kt b/app/src/main/java/org/sopt/teamdateroad/domain/model/UserSignUpInfo.kt similarity index 68% rename from app/src/main/java/org/sopt/dateroad/domain/model/UserSignUpInfo.kt rename to app/src/main/java/org/sopt/teamdateroad/domain/model/UserSignUpInfo.kt index d78a19561..c02db8d3a 100644 --- a/app/src/main/java/org/sopt/dateroad/domain/model/UserSignUpInfo.kt +++ b/app/src/main/java/org/sopt/teamdateroad/domain/model/UserSignUpInfo.kt @@ -1,4 +1,4 @@ -package org.sopt.dateroad.domain.model +package org.sopt.teamdateroad.domain.model data class UserSignUpInfo( val name: String = "", diff --git a/app/src/main/java/org/sopt/dateroad/domain/repository/AdvertisementRepository.kt b/app/src/main/java/org/sopt/teamdateroad/domain/repository/AdvertisementRepository.kt similarity index 54% rename from app/src/main/java/org/sopt/dateroad/domain/repository/AdvertisementRepository.kt rename to app/src/main/java/org/sopt/teamdateroad/domain/repository/AdvertisementRepository.kt index 369bd0b17..83ce2096f 100644 --- a/app/src/main/java/org/sopt/dateroad/domain/repository/AdvertisementRepository.kt +++ b/app/src/main/java/org/sopt/teamdateroad/domain/repository/AdvertisementRepository.kt @@ -1,7 +1,7 @@ -package org.sopt.dateroad.domain.repository +package org.sopt.teamdateroad.domain.repository -import org.sopt.dateroad.domain.model.Advertisement -import org.sopt.dateroad.domain.model.AdvertisementDetail +import org.sopt.teamdateroad.domain.model.Advertisement +import org.sopt.teamdateroad.domain.model.AdvertisementDetail interface AdvertisementRepository { suspend fun getAdvertisementDetail(advertisementId: Int): Result diff --git a/app/src/main/java/org/sopt/dateroad/domain/repository/AuthRepository.kt b/app/src/main/java/org/sopt/teamdateroad/domain/repository/AuthRepository.kt similarity index 62% rename from app/src/main/java/org/sopt/dateroad/domain/repository/AuthRepository.kt rename to app/src/main/java/org/sopt/teamdateroad/domain/repository/AuthRepository.kt index 2be2cc4da..d009d9709 100644 --- a/app/src/main/java/org/sopt/dateroad/domain/repository/AuthRepository.kt +++ b/app/src/main/java/org/sopt/teamdateroad/domain/repository/AuthRepository.kt @@ -1,9 +1,9 @@ -package org.sopt.dateroad.domain.repository +package org.sopt.teamdateroad.domain.repository -import org.sopt.dateroad.domain.model.Auth -import org.sopt.dateroad.domain.model.EditProfile -import org.sopt.dateroad.domain.model.SignIn -import org.sopt.dateroad.domain.model.SignUp +import org.sopt.teamdateroad.domain.model.Auth +import org.sopt.teamdateroad.domain.model.EditProfile +import org.sopt.teamdateroad.domain.model.SignIn +import org.sopt.teamdateroad.domain.model.SignUp interface AuthRepository { suspend fun deleteSignOut(): Result diff --git a/app/src/main/java/org/sopt/dateroad/domain/repository/CourseRepository.kt b/app/src/main/java/org/sopt/teamdateroad/domain/repository/CourseRepository.kt similarity index 56% rename from app/src/main/java/org/sopt/dateroad/domain/repository/CourseRepository.kt rename to app/src/main/java/org/sopt/teamdateroad/domain/repository/CourseRepository.kt index 8969c20d6..d86864bbf 100644 --- a/app/src/main/java/org/sopt/dateroad/domain/repository/CourseRepository.kt +++ b/app/src/main/java/org/sopt/teamdateroad/domain/repository/CourseRepository.kt @@ -1,12 +1,12 @@ -package org.sopt.dateroad.domain.repository - -import org.sopt.dateroad.domain.model.Course -import org.sopt.dateroad.domain.model.CourseDetail -import org.sopt.dateroad.domain.model.Enroll -import org.sopt.dateroad.domain.model.EnrollCourseResult -import org.sopt.dateroad.domain.type.MoneyTagType -import org.sopt.dateroad.domain.type.RegionType -import org.sopt.dateroad.domain.type.SortByType +package org.sopt.teamdateroad.domain.repository + +import org.sopt.teamdateroad.domain.model.Course +import org.sopt.teamdateroad.domain.model.CourseDetail +import org.sopt.teamdateroad.domain.model.Enroll +import org.sopt.teamdateroad.domain.model.EnrollCourseResult +import org.sopt.teamdateroad.domain.type.MoneyTagType +import org.sopt.teamdateroad.domain.type.RegionType +import org.sopt.teamdateroad.domain.type.SortByType interface CourseRepository { suspend fun deleteCourse(courseId: Int): Result diff --git a/app/src/main/java/org/sopt/dateroad/domain/repository/MyCourseRepository.kt b/app/src/main/java/org/sopt/teamdateroad/domain/repository/MyCourseRepository.kt similarity index 60% rename from app/src/main/java/org/sopt/dateroad/domain/repository/MyCourseRepository.kt rename to app/src/main/java/org/sopt/teamdateroad/domain/repository/MyCourseRepository.kt index cc6c62b9b..0ee8b96b3 100644 --- a/app/src/main/java/org/sopt/dateroad/domain/repository/MyCourseRepository.kt +++ b/app/src/main/java/org/sopt/teamdateroad/domain/repository/MyCourseRepository.kt @@ -1,6 +1,6 @@ -package org.sopt.dateroad.domain.repository +package org.sopt.teamdateroad.domain.repository -import org.sopt.dateroad.domain.model.Course +import org.sopt.teamdateroad.domain.model.Course interface MyCourseRepository { suspend fun getMyCourseEnroll(): Result> diff --git a/app/src/main/java/org/sopt/teamdateroad/domain/repository/ProfileRepository.kt b/app/src/main/java/org/sopt/teamdateroad/domain/repository/ProfileRepository.kt new file mode 100644 index 000000000..49557c9d4 --- /dev/null +++ b/app/src/main/java/org/sopt/teamdateroad/domain/repository/ProfileRepository.kt @@ -0,0 +1,7 @@ +package org.sopt.teamdateroad.domain.repository + +import org.sopt.teamdateroad.domain.model.Profile + +interface ProfileRepository { + suspend fun getUsers(): Result +} diff --git a/app/src/main/java/org/sopt/dateroad/domain/repository/TimelineRepository.kt b/app/src/main/java/org/sopt/teamdateroad/domain/repository/TimelineRepository.kt similarity index 51% rename from app/src/main/java/org/sopt/dateroad/domain/repository/TimelineRepository.kt rename to app/src/main/java/org/sopt/teamdateroad/domain/repository/TimelineRepository.kt index 9208d9bc0..38e700e6f 100644 --- a/app/src/main/java/org/sopt/dateroad/domain/repository/TimelineRepository.kt +++ b/app/src/main/java/org/sopt/teamdateroad/domain/repository/TimelineRepository.kt @@ -1,11 +1,11 @@ -package org.sopt.dateroad.domain.repository +package org.sopt.teamdateroad.domain.repository -import org.sopt.dateroad.domain.model.Enroll -import org.sopt.dateroad.domain.model.EnrollTimelineResult -import org.sopt.dateroad.domain.model.NearestTimeline -import org.sopt.dateroad.domain.model.Timeline -import org.sopt.dateroad.domain.model.TimelineDetail -import org.sopt.dateroad.domain.type.TimelineTimeType +import org.sopt.teamdateroad.domain.model.Enroll +import org.sopt.teamdateroad.domain.model.EnrollTimelineResult +import org.sopt.teamdateroad.domain.model.NearestTimeline +import org.sopt.teamdateroad.domain.model.Timeline +import org.sopt.teamdateroad.domain.model.TimelineDetail +import org.sopt.teamdateroad.domain.type.TimelineTimeType interface TimelineRepository { suspend fun deleteTimeline(timelineId: Int): Result diff --git a/app/src/main/java/org/sopt/dateroad/domain/repository/UserInfoRepository.kt b/app/src/main/java/org/sopt/teamdateroad/domain/repository/UserInfoRepository.kt similarity index 85% rename from app/src/main/java/org/sopt/dateroad/domain/repository/UserInfoRepository.kt rename to app/src/main/java/org/sopt/teamdateroad/domain/repository/UserInfoRepository.kt index 473d84ca9..b759c33e7 100644 --- a/app/src/main/java/org/sopt/dateroad/domain/repository/UserInfoRepository.kt +++ b/app/src/main/java/org/sopt/teamdateroad/domain/repository/UserInfoRepository.kt @@ -1,4 +1,4 @@ -package org.sopt.dateroad.domain.repository +package org.sopt.teamdateroad.domain.repository interface UserInfoRepository { fun setAccessToken(accessToken: String) diff --git a/app/src/main/java/org/sopt/teamdateroad/domain/repository/UserPointRepository.kt b/app/src/main/java/org/sopt/teamdateroad/domain/repository/UserPointRepository.kt new file mode 100644 index 000000000..b95e06975 --- /dev/null +++ b/app/src/main/java/org/sopt/teamdateroad/domain/repository/UserPointRepository.kt @@ -0,0 +1,14 @@ +package org.sopt.teamdateroad.domain.repository + +import org.sopt.teamdateroad.domain.model.PointHistory +import org.sopt.teamdateroad.domain.model.PointUseResult +import org.sopt.teamdateroad.domain.model.UsePoint +import org.sopt.teamdateroad.domain.model.UserPoint + +interface UserPointRepository { + suspend fun getUserPoint(): Result + + suspend fun getPointHistory(): Result + + suspend fun postUsePoint(courseId: Int, usePoint: UsePoint): Result +} diff --git a/app/src/main/java/org/sopt/dateroad/domain/type/AdvertisementTagType.kt b/app/src/main/java/org/sopt/teamdateroad/domain/type/AdvertisementTagType.kt similarity index 78% rename from app/src/main/java/org/sopt/dateroad/domain/type/AdvertisementTagType.kt rename to app/src/main/java/org/sopt/teamdateroad/domain/type/AdvertisementTagType.kt index c444bff04..fec93e23d 100644 --- a/app/src/main/java/org/sopt/dateroad/domain/type/AdvertisementTagType.kt +++ b/app/src/main/java/org/sopt/teamdateroad/domain/type/AdvertisementTagType.kt @@ -1,6 +1,6 @@ -package org.sopt.dateroad.domain.type +package org.sopt.teamdateroad.domain.type -import org.sopt.dateroad.domain.util.Advertisement +import org.sopt.teamdateroad.domain.util.Advertisement enum class AdvertisementTagType( val title: String diff --git a/app/src/main/java/org/sopt/dateroad/domain/type/GyeonggiAreaType.kt b/app/src/main/java/org/sopt/teamdateroad/domain/type/GyeonggiAreaType.kt similarity index 94% rename from app/src/main/java/org/sopt/dateroad/domain/type/GyeonggiAreaType.kt rename to app/src/main/java/org/sopt/teamdateroad/domain/type/GyeonggiAreaType.kt index 8668ae3f5..2bf0b406c 100644 --- a/app/src/main/java/org/sopt/dateroad/domain/type/GyeonggiAreaType.kt +++ b/app/src/main/java/org/sopt/teamdateroad/domain/type/GyeonggiAreaType.kt @@ -1,6 +1,6 @@ -package org.sopt.dateroad.domain.type +package org.sopt.teamdateroad.domain.type -import org.sopt.dateroad.domain.util.Gyeonggi +import org.sopt.teamdateroad.domain.util.Gyeonggi enum class GyeonggiAreaType( val title: String diff --git a/app/src/main/java/org/sopt/dateroad/domain/type/IncheonAreaType.kt b/app/src/main/java/org/sopt/teamdateroad/domain/type/IncheonAreaType.kt similarity index 82% rename from app/src/main/java/org/sopt/dateroad/domain/type/IncheonAreaType.kt rename to app/src/main/java/org/sopt/teamdateroad/domain/type/IncheonAreaType.kt index 1fb0a468a..f243dc694 100644 --- a/app/src/main/java/org/sopt/dateroad/domain/type/IncheonAreaType.kt +++ b/app/src/main/java/org/sopt/teamdateroad/domain/type/IncheonAreaType.kt @@ -1,6 +1,6 @@ -package org.sopt.dateroad.domain.type +package org.sopt.teamdateroad.domain.type -import org.sopt.dateroad.domain.util.Incheon +import org.sopt.teamdateroad.domain.util.Incheon enum class IncheonAreaType( val title: String diff --git a/app/src/main/java/org/sopt/dateroad/domain/type/MoneyTagType.kt b/app/src/main/java/org/sopt/teamdateroad/domain/type/MoneyTagType.kt similarity index 91% rename from app/src/main/java/org/sopt/dateroad/domain/type/MoneyTagType.kt rename to app/src/main/java/org/sopt/teamdateroad/domain/type/MoneyTagType.kt index f812171a7..1e6d3c19b 100644 --- a/app/src/main/java/org/sopt/dateroad/domain/type/MoneyTagType.kt +++ b/app/src/main/java/org/sopt/teamdateroad/domain/type/MoneyTagType.kt @@ -1,6 +1,6 @@ -package org.sopt.dateroad.domain.type +package org.sopt.teamdateroad.domain.type -import org.sopt.dateroad.domain.util.Cost +import org.sopt.teamdateroad.domain.util.Cost enum class MoneyTagType( val title: String, diff --git a/app/src/main/java/org/sopt/dateroad/domain/type/MonthType.kt b/app/src/main/java/org/sopt/teamdateroad/domain/type/MonthType.kt similarity index 87% rename from app/src/main/java/org/sopt/dateroad/domain/type/MonthType.kt rename to app/src/main/java/org/sopt/teamdateroad/domain/type/MonthType.kt index a647078a7..0390d5d1d 100644 --- a/app/src/main/java/org/sopt/dateroad/domain/type/MonthType.kt +++ b/app/src/main/java/org/sopt/teamdateroad/domain/type/MonthType.kt @@ -1,6 +1,6 @@ -package org.sopt.dateroad.domain.type +package org.sopt.teamdateroad.domain.type -import org.sopt.dateroad.domain.util.Month +import org.sopt.teamdateroad.domain.util.Month enum class MonthType(val title: String) { JANUARY(title = Month.JANUARY), diff --git a/app/src/main/java/org/sopt/dateroad/domain/type/RegionType.kt b/app/src/main/java/org/sopt/teamdateroad/domain/type/RegionType.kt similarity index 69% rename from app/src/main/java/org/sopt/dateroad/domain/type/RegionType.kt rename to app/src/main/java/org/sopt/teamdateroad/domain/type/RegionType.kt index 17fcb5f1b..ba2d0530f 100644 --- a/app/src/main/java/org/sopt/dateroad/domain/type/RegionType.kt +++ b/app/src/main/java/org/sopt/teamdateroad/domain/type/RegionType.kt @@ -1,6 +1,6 @@ -package org.sopt.dateroad.domain.type +package org.sopt.teamdateroad.domain.type -import org.sopt.dateroad.domain.util.Region +import org.sopt.teamdateroad.domain.util.Region enum class RegionType( val title: String diff --git a/app/src/main/java/org/sopt/dateroad/domain/type/SeoulAreaType.kt b/app/src/main/java/org/sopt/teamdateroad/domain/type/SeoulAreaType.kt similarity index 94% rename from app/src/main/java/org/sopt/dateroad/domain/type/SeoulAreaType.kt rename to app/src/main/java/org/sopt/teamdateroad/domain/type/SeoulAreaType.kt index c45000de2..37f7eb9a3 100644 --- a/app/src/main/java/org/sopt/dateroad/domain/type/SeoulAreaType.kt +++ b/app/src/main/java/org/sopt/teamdateroad/domain/type/SeoulAreaType.kt @@ -1,6 +1,6 @@ -package org.sopt.dateroad.domain.type +package org.sopt.teamdateroad.domain.type -import org.sopt.dateroad.domain.util.Seoul +import org.sopt.teamdateroad.domain.util.Seoul enum class SeoulAreaType( val title: String diff --git a/app/src/main/java/org/sopt/dateroad/domain/type/SortByType.kt b/app/src/main/java/org/sopt/teamdateroad/domain/type/SortByType.kt similarity index 54% rename from app/src/main/java/org/sopt/dateroad/domain/type/SortByType.kt rename to app/src/main/java/org/sopt/teamdateroad/domain/type/SortByType.kt index 3915a46fe..4f87c7b27 100644 --- a/app/src/main/java/org/sopt/dateroad/domain/type/SortByType.kt +++ b/app/src/main/java/org/sopt/teamdateroad/domain/type/SortByType.kt @@ -1,4 +1,4 @@ -package org.sopt.dateroad.domain.type +package org.sopt.teamdateroad.domain.type enum class SortByType { POPULAR, diff --git a/app/src/main/java/org/sopt/dateroad/domain/type/TimelineTimeType.kt b/app/src/main/java/org/sopt/teamdateroad/domain/type/TimelineTimeType.kt similarity index 56% rename from app/src/main/java/org/sopt/dateroad/domain/type/TimelineTimeType.kt rename to app/src/main/java/org/sopt/teamdateroad/domain/type/TimelineTimeType.kt index cd901aae7..411790055 100644 --- a/app/src/main/java/org/sopt/dateroad/domain/type/TimelineTimeType.kt +++ b/app/src/main/java/org/sopt/teamdateroad/domain/type/TimelineTimeType.kt @@ -1,4 +1,4 @@ -package org.sopt.dateroad.domain.type +package org.sopt.teamdateroad.domain.type enum class TimelineTimeType { FUTURE, diff --git a/app/src/main/java/org/sopt/dateroad/domain/usecase/ClearUserInfoUseCase.kt b/app/src/main/java/org/sopt/teamdateroad/domain/usecase/ClearUserInfoUseCase.kt similarity index 67% rename from app/src/main/java/org/sopt/dateroad/domain/usecase/ClearUserInfoUseCase.kt rename to app/src/main/java/org/sopt/teamdateroad/domain/usecase/ClearUserInfoUseCase.kt index df7c3e148..43162b580 100644 --- a/app/src/main/java/org/sopt/dateroad/domain/usecase/ClearUserInfoUseCase.kt +++ b/app/src/main/java/org/sopt/teamdateroad/domain/usecase/ClearUserInfoUseCase.kt @@ -1,8 +1,8 @@ -package org.sopt.dateroad.domain.usecase +package org.sopt.teamdateroad.domain.usecase import javax.inject.Inject import javax.inject.Singleton -import org.sopt.dateroad.domain.repository.UserInfoRepository +import org.sopt.teamdateroad.domain.repository.UserInfoRepository @Singleton class ClearUserInfoUseCase @Inject constructor( diff --git a/app/src/main/java/org/sopt/dateroad/domain/usecase/DeleteCourseLikeUseCase.kt b/app/src/main/java/org/sopt/teamdateroad/domain/usecase/DeleteCourseLikeUseCase.kt similarity index 73% rename from app/src/main/java/org/sopt/dateroad/domain/usecase/DeleteCourseLikeUseCase.kt rename to app/src/main/java/org/sopt/teamdateroad/domain/usecase/DeleteCourseLikeUseCase.kt index d2e3361d5..d8aa127c1 100644 --- a/app/src/main/java/org/sopt/dateroad/domain/usecase/DeleteCourseLikeUseCase.kt +++ b/app/src/main/java/org/sopt/teamdateroad/domain/usecase/DeleteCourseLikeUseCase.kt @@ -1,8 +1,8 @@ -package org.sopt.dateroad.domain.usecase +package org.sopt.teamdateroad.domain.usecase import javax.inject.Inject import javax.inject.Singleton -import org.sopt.dateroad.domain.repository.CourseRepository +import org.sopt.teamdateroad.domain.repository.CourseRepository @Singleton class DeleteCourseLikeUseCase @Inject constructor( diff --git a/app/src/main/java/org/sopt/dateroad/domain/usecase/DeleteCourseUseCase.kt b/app/src/main/java/org/sopt/teamdateroad/domain/usecase/DeleteCourseUseCase.kt similarity index 72% rename from app/src/main/java/org/sopt/dateroad/domain/usecase/DeleteCourseUseCase.kt rename to app/src/main/java/org/sopt/teamdateroad/domain/usecase/DeleteCourseUseCase.kt index 6549d2bf5..84b061466 100644 --- a/app/src/main/java/org/sopt/dateroad/domain/usecase/DeleteCourseUseCase.kt +++ b/app/src/main/java/org/sopt/teamdateroad/domain/usecase/DeleteCourseUseCase.kt @@ -1,8 +1,8 @@ -package org.sopt.dateroad.domain.usecase +package org.sopt.teamdateroad.domain.usecase import javax.inject.Inject import javax.inject.Singleton -import org.sopt.dateroad.domain.repository.CourseRepository +import org.sopt.teamdateroad.domain.repository.CourseRepository @Singleton class DeleteCourseUseCase @Inject constructor( diff --git a/app/src/main/java/org/sopt/dateroad/domain/usecase/DeleteSignOutUseCase.kt b/app/src/main/java/org/sopt/teamdateroad/domain/usecase/DeleteSignOutUseCase.kt similarity index 70% rename from app/src/main/java/org/sopt/dateroad/domain/usecase/DeleteSignOutUseCase.kt rename to app/src/main/java/org/sopt/teamdateroad/domain/usecase/DeleteSignOutUseCase.kt index 52080e688..3f28f6550 100644 --- a/app/src/main/java/org/sopt/dateroad/domain/usecase/DeleteSignOutUseCase.kt +++ b/app/src/main/java/org/sopt/teamdateroad/domain/usecase/DeleteSignOutUseCase.kt @@ -1,8 +1,8 @@ -package org.sopt.dateroad.domain.usecase +package org.sopt.teamdateroad.domain.usecase import javax.inject.Inject import javax.inject.Singleton -import org.sopt.dateroad.domain.repository.AuthRepository +import org.sopt.teamdateroad.domain.repository.AuthRepository @Singleton class DeleteSignOutUseCase @Inject constructor( diff --git a/app/src/main/java/org/sopt/dateroad/domain/usecase/DeleteTimelineUseCase.kt b/app/src/main/java/org/sopt/teamdateroad/domain/usecase/DeleteTimelineUseCase.kt similarity index 73% rename from app/src/main/java/org/sopt/dateroad/domain/usecase/DeleteTimelineUseCase.kt rename to app/src/main/java/org/sopt/teamdateroad/domain/usecase/DeleteTimelineUseCase.kt index 9be6a8b12..4128a4e39 100644 --- a/app/src/main/java/org/sopt/dateroad/domain/usecase/DeleteTimelineUseCase.kt +++ b/app/src/main/java/org/sopt/teamdateroad/domain/usecase/DeleteTimelineUseCase.kt @@ -1,8 +1,8 @@ -package org.sopt.dateroad.domain.usecase +package org.sopt.teamdateroad.domain.usecase import javax.inject.Inject import javax.inject.Singleton -import org.sopt.dateroad.domain.repository.TimelineRepository +import org.sopt.teamdateroad.domain.repository.TimelineRepository @Singleton class DeleteTimelineUseCase @Inject constructor( diff --git a/app/src/main/java/org/sopt/dateroad/domain/usecase/DeleteWithdrawUseCase.kt b/app/src/main/java/org/sopt/teamdateroad/domain/usecase/DeleteWithdrawUseCase.kt similarity index 72% rename from app/src/main/java/org/sopt/dateroad/domain/usecase/DeleteWithdrawUseCase.kt rename to app/src/main/java/org/sopt/teamdateroad/domain/usecase/DeleteWithdrawUseCase.kt index 2681c713b..10837a7a8 100644 --- a/app/src/main/java/org/sopt/dateroad/domain/usecase/DeleteWithdrawUseCase.kt +++ b/app/src/main/java/org/sopt/teamdateroad/domain/usecase/DeleteWithdrawUseCase.kt @@ -1,8 +1,8 @@ -package org.sopt.dateroad.domain.usecase +package org.sopt.teamdateroad.domain.usecase import javax.inject.Inject import javax.inject.Singleton -import org.sopt.dateroad.domain.repository.AuthRepository +import org.sopt.teamdateroad.domain.repository.AuthRepository @Singleton class DeleteWithdrawUseCase @Inject constructor( diff --git a/app/src/main/java/org/sopt/dateroad/domain/usecase/GetAccessTokenUseCase.kt b/app/src/main/java/org/sopt/teamdateroad/domain/usecase/GetAccessTokenUseCase.kt similarity index 68% rename from app/src/main/java/org/sopt/dateroad/domain/usecase/GetAccessTokenUseCase.kt rename to app/src/main/java/org/sopt/teamdateroad/domain/usecase/GetAccessTokenUseCase.kt index 6b86d00be..d98bba2b7 100644 --- a/app/src/main/java/org/sopt/dateroad/domain/usecase/GetAccessTokenUseCase.kt +++ b/app/src/main/java/org/sopt/teamdateroad/domain/usecase/GetAccessTokenUseCase.kt @@ -1,8 +1,8 @@ -package org.sopt.dateroad.domain.usecase +package org.sopt.teamdateroad.domain.usecase import javax.inject.Inject import javax.inject.Singleton -import org.sopt.dateroad.domain.repository.UserInfoRepository +import org.sopt.teamdateroad.domain.repository.UserInfoRepository @Singleton class GetAccessTokenUseCase @Inject constructor( diff --git a/app/src/main/java/org/sopt/dateroad/domain/usecase/GetAdvertisementDetailUseCase.kt b/app/src/main/java/org/sopt/teamdateroad/domain/usecase/GetAdvertisementDetailUseCase.kt similarity index 67% rename from app/src/main/java/org/sopt/dateroad/domain/usecase/GetAdvertisementDetailUseCase.kt rename to app/src/main/java/org/sopt/teamdateroad/domain/usecase/GetAdvertisementDetailUseCase.kt index a0037af5b..6224f5b11 100644 --- a/app/src/main/java/org/sopt/dateroad/domain/usecase/GetAdvertisementDetailUseCase.kt +++ b/app/src/main/java/org/sopt/teamdateroad/domain/usecase/GetAdvertisementDetailUseCase.kt @@ -1,9 +1,9 @@ -package org.sopt.dateroad.domain.usecase +package org.sopt.teamdateroad.domain.usecase import javax.inject.Inject import javax.inject.Singleton -import org.sopt.dateroad.domain.model.AdvertisementDetail -import org.sopt.dateroad.domain.repository.AdvertisementRepository +import org.sopt.teamdateroad.domain.model.AdvertisementDetail +import org.sopt.teamdateroad.domain.repository.AdvertisementRepository @Singleton class GetAdvertisementDetailUseCase @Inject constructor( diff --git a/app/src/main/java/org/sopt/dateroad/domain/usecase/GetAdvertisementsUseCase.kt b/app/src/main/java/org/sopt/teamdateroad/domain/usecase/GetAdvertisementsUseCase.kt similarity index 64% rename from app/src/main/java/org/sopt/dateroad/domain/usecase/GetAdvertisementsUseCase.kt rename to app/src/main/java/org/sopt/teamdateroad/domain/usecase/GetAdvertisementsUseCase.kt index 2c90e0732..59b34312f 100644 --- a/app/src/main/java/org/sopt/dateroad/domain/usecase/GetAdvertisementsUseCase.kt +++ b/app/src/main/java/org/sopt/teamdateroad/domain/usecase/GetAdvertisementsUseCase.kt @@ -1,9 +1,9 @@ -package org.sopt.dateroad.domain.usecase +package org.sopt.teamdateroad.domain.usecase import javax.inject.Inject import javax.inject.Singleton -import org.sopt.dateroad.domain.model.Advertisement -import org.sopt.dateroad.domain.repository.AdvertisementRepository +import org.sopt.teamdateroad.domain.model.Advertisement +import org.sopt.teamdateroad.domain.repository.AdvertisementRepository @Singleton class GetAdvertisementsUseCase @Inject constructor( diff --git a/app/src/main/java/org/sopt/dateroad/domain/usecase/GetCourseDetailUseCase.kt b/app/src/main/java/org/sopt/teamdateroad/domain/usecase/GetCourseDetailUseCase.kt similarity index 71% rename from app/src/main/java/org/sopt/dateroad/domain/usecase/GetCourseDetailUseCase.kt rename to app/src/main/java/org/sopt/teamdateroad/domain/usecase/GetCourseDetailUseCase.kt index afafc5015..4f89fc567 100644 --- a/app/src/main/java/org/sopt/dateroad/domain/usecase/GetCourseDetailUseCase.kt +++ b/app/src/main/java/org/sopt/teamdateroad/domain/usecase/GetCourseDetailUseCase.kt @@ -1,8 +1,8 @@ -package org.sopt.dateroad.domain.usecase +package org.sopt.teamdateroad.domain.usecase import javax.inject.Inject import javax.inject.Singleton -import org.sopt.dateroad.domain.repository.CourseRepository +import org.sopt.teamdateroad.domain.repository.CourseRepository @Singleton class GetCourseDetailUseCase @Inject constructor( diff --git a/app/src/main/java/org/sopt/dateroad/domain/usecase/GetFilteredCourses.kt b/app/src/main/java/org/sopt/teamdateroad/domain/usecase/GetFilteredCourses.kt similarity index 58% rename from app/src/main/java/org/sopt/dateroad/domain/usecase/GetFilteredCourses.kt rename to app/src/main/java/org/sopt/teamdateroad/domain/usecase/GetFilteredCourses.kt index 520dcd3e0..36c421072 100644 --- a/app/src/main/java/org/sopt/dateroad/domain/usecase/GetFilteredCourses.kt +++ b/app/src/main/java/org/sopt/teamdateroad/domain/usecase/GetFilteredCourses.kt @@ -1,11 +1,11 @@ -package org.sopt.dateroad.domain.usecase +package org.sopt.teamdateroad.domain.usecase import javax.inject.Inject import javax.inject.Singleton -import org.sopt.dateroad.domain.model.Course -import org.sopt.dateroad.domain.repository.CourseRepository -import org.sopt.dateroad.domain.type.MoneyTagType -import org.sopt.dateroad.domain.type.RegionType +import org.sopt.teamdateroad.domain.model.Course +import org.sopt.teamdateroad.domain.repository.CourseRepository +import org.sopt.teamdateroad.domain.type.MoneyTagType +import org.sopt.teamdateroad.domain.type.RegionType @Singleton class GetFilteredCourses @Inject constructor( diff --git a/app/src/main/java/org/sopt/dateroad/domain/usecase/GetMyCourseEnrollUseCase.kt b/app/src/main/java/org/sopt/teamdateroad/domain/usecase/GetMyCourseEnrollUseCase.kt similarity index 63% rename from app/src/main/java/org/sopt/dateroad/domain/usecase/GetMyCourseEnrollUseCase.kt rename to app/src/main/java/org/sopt/teamdateroad/domain/usecase/GetMyCourseEnrollUseCase.kt index 28b7bc99f..8d3a6a10b 100644 --- a/app/src/main/java/org/sopt/dateroad/domain/usecase/GetMyCourseEnrollUseCase.kt +++ b/app/src/main/java/org/sopt/teamdateroad/domain/usecase/GetMyCourseEnrollUseCase.kt @@ -1,9 +1,9 @@ -package org.sopt.dateroad.domain.usecase +package org.sopt.teamdateroad.domain.usecase import javax.inject.Inject import javax.inject.Singleton -import org.sopt.dateroad.domain.model.Course -import org.sopt.dateroad.domain.repository.MyCourseRepository +import org.sopt.teamdateroad.domain.model.Course +import org.sopt.teamdateroad.domain.repository.MyCourseRepository @Singleton class GetMyCourseEnrollUseCase @Inject constructor( diff --git a/app/src/main/java/org/sopt/dateroad/domain/usecase/GetMyCourseReadUseCase.kt b/app/src/main/java/org/sopt/teamdateroad/domain/usecase/GetMyCourseReadUseCase.kt similarity index 63% rename from app/src/main/java/org/sopt/dateroad/domain/usecase/GetMyCourseReadUseCase.kt rename to app/src/main/java/org/sopt/teamdateroad/domain/usecase/GetMyCourseReadUseCase.kt index 9d08a4402..feff904ed 100644 --- a/app/src/main/java/org/sopt/dateroad/domain/usecase/GetMyCourseReadUseCase.kt +++ b/app/src/main/java/org/sopt/teamdateroad/domain/usecase/GetMyCourseReadUseCase.kt @@ -1,9 +1,9 @@ -package org.sopt.dateroad.domain.usecase +package org.sopt.teamdateroad.domain.usecase import javax.inject.Inject import javax.inject.Singleton -import org.sopt.dateroad.domain.model.Course -import org.sopt.dateroad.domain.repository.MyCourseRepository +import org.sopt.teamdateroad.domain.model.Course +import org.sopt.teamdateroad.domain.repository.MyCourseRepository @Singleton class GetMyCourseReadUseCase @Inject constructor( diff --git a/app/src/main/java/org/sopt/dateroad/domain/usecase/GetNearestTimelineUseCase.kt b/app/src/main/java/org/sopt/teamdateroad/domain/usecase/GetNearestTimelineUseCase.kt similarity index 59% rename from app/src/main/java/org/sopt/dateroad/domain/usecase/GetNearestTimelineUseCase.kt rename to app/src/main/java/org/sopt/teamdateroad/domain/usecase/GetNearestTimelineUseCase.kt index 1e2a4df28..a141ac94c 100644 --- a/app/src/main/java/org/sopt/dateroad/domain/usecase/GetNearestTimelineUseCase.kt +++ b/app/src/main/java/org/sopt/teamdateroad/domain/usecase/GetNearestTimelineUseCase.kt @@ -1,8 +1,8 @@ -package org.sopt.dateroad.domain.usecase +package org.sopt.teamdateroad.domain.usecase import javax.inject.Inject -import org.sopt.dateroad.domain.model.NearestTimeline -import org.sopt.dateroad.domain.repository.TimelineRepository +import org.sopt.teamdateroad.domain.model.NearestTimeline +import org.sopt.teamdateroad.domain.repository.TimelineRepository class GetNearestTimelineUseCase @Inject constructor( private val timelineRepository: TimelineRepository diff --git a/app/src/main/java/org/sopt/dateroad/domain/usecase/GetNicknameCheckUseCase.kt b/app/src/main/java/org/sopt/teamdateroad/domain/usecase/GetNicknameCheckUseCase.kt similarity index 71% rename from app/src/main/java/org/sopt/dateroad/domain/usecase/GetNicknameCheckUseCase.kt rename to app/src/main/java/org/sopt/teamdateroad/domain/usecase/GetNicknameCheckUseCase.kt index b83c58449..8f7d57088 100644 --- a/app/src/main/java/org/sopt/dateroad/domain/usecase/GetNicknameCheckUseCase.kt +++ b/app/src/main/java/org/sopt/teamdateroad/domain/usecase/GetNicknameCheckUseCase.kt @@ -1,8 +1,8 @@ -package org.sopt.dateroad.domain.usecase +package org.sopt.teamdateroad.domain.usecase import javax.inject.Inject import javax.inject.Singleton -import org.sopt.dateroad.domain.repository.AuthRepository +import org.sopt.teamdateroad.domain.repository.AuthRepository @Singleton class GetNicknameCheckUseCase @Inject constructor( diff --git a/app/src/main/java/org/sopt/dateroad/domain/usecase/GetNicknameUseCase.kt b/app/src/main/java/org/sopt/teamdateroad/domain/usecase/GetNicknameUseCase.kt similarity index 68% rename from app/src/main/java/org/sopt/dateroad/domain/usecase/GetNicknameUseCase.kt rename to app/src/main/java/org/sopt/teamdateroad/domain/usecase/GetNicknameUseCase.kt index 57809d2f7..27a35c18e 100644 --- a/app/src/main/java/org/sopt/dateroad/domain/usecase/GetNicknameUseCase.kt +++ b/app/src/main/java/org/sopt/teamdateroad/domain/usecase/GetNicknameUseCase.kt @@ -1,8 +1,8 @@ -package org.sopt.dateroad.domain.usecase +package org.sopt.teamdateroad.domain.usecase import javax.inject.Inject import javax.inject.Singleton -import org.sopt.dateroad.domain.repository.UserInfoRepository +import org.sopt.teamdateroad.domain.repository.UserInfoRepository @Singleton class GetNicknameUseCase @Inject constructor( diff --git a/app/src/main/java/org/sopt/dateroad/domain/usecase/GetPointHistoryUseCase.kt b/app/src/main/java/org/sopt/teamdateroad/domain/usecase/GetPointHistoryUseCase.kt similarity index 62% rename from app/src/main/java/org/sopt/dateroad/domain/usecase/GetPointHistoryUseCase.kt rename to app/src/main/java/org/sopt/teamdateroad/domain/usecase/GetPointHistoryUseCase.kt index 509d13bc6..4f1a87d1b 100644 --- a/app/src/main/java/org/sopt/dateroad/domain/usecase/GetPointHistoryUseCase.kt +++ b/app/src/main/java/org/sopt/teamdateroad/domain/usecase/GetPointHistoryUseCase.kt @@ -1,9 +1,9 @@ -package org.sopt.dateroad.domain.usecase +package org.sopt.teamdateroad.domain.usecase import javax.inject.Inject import javax.inject.Singleton -import org.sopt.dateroad.domain.model.PointHistory -import org.sopt.dateroad.domain.repository.UserPointRepository +import org.sopt.teamdateroad.domain.model.PointHistory +import org.sopt.teamdateroad.domain.repository.UserPointRepository @Singleton class GetPointHistoryUseCase @Inject constructor( diff --git a/app/src/main/java/org/sopt/dateroad/domain/usecase/GetRefreshTokenUseCase.kt b/app/src/main/java/org/sopt/teamdateroad/domain/usecase/GetRefreshTokenUseCase.kt similarity index 68% rename from app/src/main/java/org/sopt/dateroad/domain/usecase/GetRefreshTokenUseCase.kt rename to app/src/main/java/org/sopt/teamdateroad/domain/usecase/GetRefreshTokenUseCase.kt index 3a97408de..d72c5986b 100644 --- a/app/src/main/java/org/sopt/dateroad/domain/usecase/GetRefreshTokenUseCase.kt +++ b/app/src/main/java/org/sopt/teamdateroad/domain/usecase/GetRefreshTokenUseCase.kt @@ -1,8 +1,8 @@ -package org.sopt.dateroad.domain.usecase +package org.sopt.teamdateroad.domain.usecase import javax.inject.Inject import javax.inject.Singleton -import org.sopt.dateroad.domain.repository.UserInfoRepository +import org.sopt.teamdateroad.domain.repository.UserInfoRepository @Singleton class GetRefreshTokenUseCase @Inject constructor( diff --git a/app/src/main/java/org/sopt/dateroad/domain/usecase/GetSortedCoursesUseCase.kt b/app/src/main/java/org/sopt/teamdateroad/domain/usecase/GetSortedCoursesUseCase.kt similarity index 59% rename from app/src/main/java/org/sopt/dateroad/domain/usecase/GetSortedCoursesUseCase.kt rename to app/src/main/java/org/sopt/teamdateroad/domain/usecase/GetSortedCoursesUseCase.kt index 6df3b1413..f0fb655f7 100644 --- a/app/src/main/java/org/sopt/dateroad/domain/usecase/GetSortedCoursesUseCase.kt +++ b/app/src/main/java/org/sopt/teamdateroad/domain/usecase/GetSortedCoursesUseCase.kt @@ -1,10 +1,10 @@ -package org.sopt.dateroad.domain.usecase +package org.sopt.teamdateroad.domain.usecase import javax.inject.Inject import javax.inject.Singleton -import org.sopt.dateroad.domain.model.Course -import org.sopt.dateroad.domain.repository.CourseRepository -import org.sopt.dateroad.domain.type.SortByType +import org.sopt.teamdateroad.domain.model.Course +import org.sopt.teamdateroad.domain.repository.CourseRepository +import org.sopt.teamdateroad.domain.type.SortByType @Singleton class GetSortedCoursesUseCase @Inject constructor( diff --git a/app/src/main/java/org/sopt/dateroad/domain/usecase/GetTimelineDetailUseCase.kt b/app/src/main/java/org/sopt/teamdateroad/domain/usecase/GetTimelineDetailUseCase.kt similarity index 62% rename from app/src/main/java/org/sopt/dateroad/domain/usecase/GetTimelineDetailUseCase.kt rename to app/src/main/java/org/sopt/teamdateroad/domain/usecase/GetTimelineDetailUseCase.kt index 24f8cf8bd..26c389c57 100644 --- a/app/src/main/java/org/sopt/dateroad/domain/usecase/GetTimelineDetailUseCase.kt +++ b/app/src/main/java/org/sopt/teamdateroad/domain/usecase/GetTimelineDetailUseCase.kt @@ -1,8 +1,8 @@ -package org.sopt.dateroad.domain.usecase +package org.sopt.teamdateroad.domain.usecase import javax.inject.Inject -import org.sopt.dateroad.domain.model.TimelineDetail -import org.sopt.dateroad.domain.repository.TimelineRepository +import org.sopt.teamdateroad.domain.model.TimelineDetail +import org.sopt.teamdateroad.domain.repository.TimelineRepository class GetTimelineDetailUseCase @Inject constructor( private val timelineRepository: TimelineRepository diff --git a/app/src/main/java/org/sopt/dateroad/domain/usecase/GetTimelinesUseCase.kt b/app/src/main/java/org/sopt/teamdateroad/domain/usecase/GetTimelinesUseCase.kt similarity index 57% rename from app/src/main/java/org/sopt/dateroad/domain/usecase/GetTimelinesUseCase.kt rename to app/src/main/java/org/sopt/teamdateroad/domain/usecase/GetTimelinesUseCase.kt index 7e4796225..6ad25025a 100644 --- a/app/src/main/java/org/sopt/dateroad/domain/usecase/GetTimelinesUseCase.kt +++ b/app/src/main/java/org/sopt/teamdateroad/domain/usecase/GetTimelinesUseCase.kt @@ -1,9 +1,9 @@ -package org.sopt.dateroad.domain.usecase +package org.sopt.teamdateroad.domain.usecase import javax.inject.Inject -import org.sopt.dateroad.domain.model.Timeline -import org.sopt.dateroad.domain.repository.TimelineRepository -import org.sopt.dateroad.domain.type.TimelineTimeType +import org.sopt.teamdateroad.domain.model.Timeline +import org.sopt.teamdateroad.domain.repository.TimelineRepository +import org.sopt.teamdateroad.domain.type.TimelineTimeType class GetTimelinesUseCase @Inject constructor( private val timelineRepository: TimelineRepository diff --git a/app/src/main/java/org/sopt/dateroad/domain/usecase/GetUserPointUseCase.kt b/app/src/main/java/org/sopt/teamdateroad/domain/usecase/GetUserPointUseCase.kt similarity index 58% rename from app/src/main/java/org/sopt/dateroad/domain/usecase/GetUserPointUseCase.kt rename to app/src/main/java/org/sopt/teamdateroad/domain/usecase/GetUserPointUseCase.kt index 36124f117..7898a847f 100644 --- a/app/src/main/java/org/sopt/dateroad/domain/usecase/GetUserPointUseCase.kt +++ b/app/src/main/java/org/sopt/teamdateroad/domain/usecase/GetUserPointUseCase.kt @@ -1,8 +1,8 @@ -package org.sopt.dateroad.domain.usecase +package org.sopt.teamdateroad.domain.usecase import javax.inject.Inject -import org.sopt.dateroad.domain.model.UserPoint -import org.sopt.dateroad.domain.repository.UserPointRepository +import org.sopt.teamdateroad.domain.model.UserPoint +import org.sopt.teamdateroad.domain.repository.UserPointRepository class GetUserPointUseCase @Inject constructor( private val userPointRepository: UserPointRepository diff --git a/app/src/main/java/org/sopt/dateroad/domain/usecase/GetUserUseCase.kt b/app/src/main/java/org/sopt/teamdateroad/domain/usecase/GetUserUseCase.kt similarity index 61% rename from app/src/main/java/org/sopt/dateroad/domain/usecase/GetUserUseCase.kt rename to app/src/main/java/org/sopt/teamdateroad/domain/usecase/GetUserUseCase.kt index 9463755a1..6fd64e85a 100644 --- a/app/src/main/java/org/sopt/dateroad/domain/usecase/GetUserUseCase.kt +++ b/app/src/main/java/org/sopt/teamdateroad/domain/usecase/GetUserUseCase.kt @@ -1,9 +1,9 @@ -package org.sopt.dateroad.domain.usecase +package org.sopt.teamdateroad.domain.usecase import javax.inject.Inject import javax.inject.Singleton -import org.sopt.dateroad.domain.model.Profile -import org.sopt.dateroad.domain.repository.ProfileRepository +import org.sopt.teamdateroad.domain.model.Profile +import org.sopt.teamdateroad.domain.repository.ProfileRepository @Singleton class GetUserUseCase @Inject constructor( diff --git a/app/src/main/java/org/sopt/dateroad/domain/usecase/PatchEditProfileUseCase.kt b/app/src/main/java/org/sopt/teamdateroad/domain/usecase/PatchEditProfileUseCase.kt similarity index 65% rename from app/src/main/java/org/sopt/dateroad/domain/usecase/PatchEditProfileUseCase.kt rename to app/src/main/java/org/sopt/teamdateroad/domain/usecase/PatchEditProfileUseCase.kt index 4847f0c43..fc520f899 100644 --- a/app/src/main/java/org/sopt/dateroad/domain/usecase/PatchEditProfileUseCase.kt +++ b/app/src/main/java/org/sopt/teamdateroad/domain/usecase/PatchEditProfileUseCase.kt @@ -1,9 +1,9 @@ -package org.sopt.dateroad.domain.usecase +package org.sopt.teamdateroad.domain.usecase import javax.inject.Inject import javax.inject.Singleton -import org.sopt.dateroad.domain.model.EditProfile -import org.sopt.dateroad.domain.repository.AuthRepository +import org.sopt.teamdateroad.domain.model.EditProfile +import org.sopt.teamdateroad.domain.repository.AuthRepository @Singleton class PatchEditProfileUseCase @Inject constructor( diff --git a/app/src/main/java/org/sopt/dateroad/domain/usecase/PostCourseLikeUseCase.kt b/app/src/main/java/org/sopt/teamdateroad/domain/usecase/PostCourseLikeUseCase.kt similarity index 72% rename from app/src/main/java/org/sopt/dateroad/domain/usecase/PostCourseLikeUseCase.kt rename to app/src/main/java/org/sopt/teamdateroad/domain/usecase/PostCourseLikeUseCase.kt index 7e213407c..23782a45e 100644 --- a/app/src/main/java/org/sopt/dateroad/domain/usecase/PostCourseLikeUseCase.kt +++ b/app/src/main/java/org/sopt/teamdateroad/domain/usecase/PostCourseLikeUseCase.kt @@ -1,8 +1,8 @@ -package org.sopt.dateroad.domain.usecase +package org.sopt.teamdateroad.domain.usecase import javax.inject.Inject import javax.inject.Singleton -import org.sopt.dateroad.domain.repository.CourseRepository +import org.sopt.teamdateroad.domain.repository.CourseRepository @Singleton class PostCourseLikeUseCase @Inject constructor( diff --git a/app/src/main/java/org/sopt/dateroad/domain/usecase/PostCourseUseCase.kt b/app/src/main/java/org/sopt/teamdateroad/domain/usecase/PostCourseUseCase.kt similarity index 57% rename from app/src/main/java/org/sopt/dateroad/domain/usecase/PostCourseUseCase.kt rename to app/src/main/java/org/sopt/teamdateroad/domain/usecase/PostCourseUseCase.kt index 3fb4981c6..aa0d22ad2 100644 --- a/app/src/main/java/org/sopt/dateroad/domain/usecase/PostCourseUseCase.kt +++ b/app/src/main/java/org/sopt/teamdateroad/domain/usecase/PostCourseUseCase.kt @@ -1,10 +1,10 @@ -package org.sopt.dateroad.domain.usecase +package org.sopt.teamdateroad.domain.usecase import javax.inject.Inject import javax.inject.Singleton -import org.sopt.dateroad.domain.model.Enroll -import org.sopt.dateroad.domain.model.EnrollCourseResult -import org.sopt.dateroad.domain.repository.CourseRepository +import org.sopt.teamdateroad.domain.model.Enroll +import org.sopt.teamdateroad.domain.model.EnrollCourseResult +import org.sopt.teamdateroad.domain.repository.CourseRepository @Singleton class PostCourseUseCase @Inject constructor( diff --git a/app/src/main/java/org/sopt/dateroad/domain/usecase/PostSignInUseCase.kt b/app/src/main/java/org/sopt/teamdateroad/domain/usecase/PostSignInUseCase.kt similarity index 62% rename from app/src/main/java/org/sopt/dateroad/domain/usecase/PostSignInUseCase.kt rename to app/src/main/java/org/sopt/teamdateroad/domain/usecase/PostSignInUseCase.kt index 7db32724c..076e08653 100644 --- a/app/src/main/java/org/sopt/dateroad/domain/usecase/PostSignInUseCase.kt +++ b/app/src/main/java/org/sopt/teamdateroad/domain/usecase/PostSignInUseCase.kt @@ -1,10 +1,10 @@ -package org.sopt.dateroad.domain.usecase +package org.sopt.teamdateroad.domain.usecase import javax.inject.Inject import javax.inject.Singleton -import org.sopt.dateroad.domain.model.Auth -import org.sopt.dateroad.domain.model.SignIn -import org.sopt.dateroad.domain.repository.AuthRepository +import org.sopt.teamdateroad.domain.model.Auth +import org.sopt.teamdateroad.domain.model.SignIn +import org.sopt.teamdateroad.domain.repository.AuthRepository @Singleton class PostSignInUseCase @Inject constructor( diff --git a/app/src/main/java/org/sopt/dateroad/domain/usecase/PostSignUpUseCase.kt b/app/src/main/java/org/sopt/teamdateroad/domain/usecase/PostSignUpUseCase.kt similarity index 58% rename from app/src/main/java/org/sopt/dateroad/domain/usecase/PostSignUpUseCase.kt rename to app/src/main/java/org/sopt/teamdateroad/domain/usecase/PostSignUpUseCase.kt index f5ba86e99..b3cce3091 100644 --- a/app/src/main/java/org/sopt/dateroad/domain/usecase/PostSignUpUseCase.kt +++ b/app/src/main/java/org/sopt/teamdateroad/domain/usecase/PostSignUpUseCase.kt @@ -1,10 +1,10 @@ -package org.sopt.dateroad.domain.usecase +package org.sopt.teamdateroad.domain.usecase import javax.inject.Inject import javax.inject.Singleton -import org.sopt.dateroad.domain.model.Auth -import org.sopt.dateroad.domain.model.SignUp -import org.sopt.dateroad.domain.repository.AuthRepository +import org.sopt.teamdateroad.domain.model.Auth +import org.sopt.teamdateroad.domain.model.SignUp +import org.sopt.teamdateroad.domain.repository.AuthRepository @Singleton class PostSignUpUseCase @Inject constructor( diff --git a/app/src/main/java/org/sopt/dateroad/domain/usecase/PostTimelineUseCase.kt b/app/src/main/java/org/sopt/teamdateroad/domain/usecase/PostTimelineUseCase.kt similarity index 57% rename from app/src/main/java/org/sopt/dateroad/domain/usecase/PostTimelineUseCase.kt rename to app/src/main/java/org/sopt/teamdateroad/domain/usecase/PostTimelineUseCase.kt index 91885b8a3..5cfc0ed3a 100644 --- a/app/src/main/java/org/sopt/dateroad/domain/usecase/PostTimelineUseCase.kt +++ b/app/src/main/java/org/sopt/teamdateroad/domain/usecase/PostTimelineUseCase.kt @@ -1,10 +1,10 @@ -package org.sopt.dateroad.domain.usecase +package org.sopt.teamdateroad.domain.usecase import javax.inject.Inject import javax.inject.Singleton -import org.sopt.dateroad.domain.model.Enroll -import org.sopt.dateroad.domain.model.EnrollTimelineResult -import org.sopt.dateroad.domain.repository.TimelineRepository +import org.sopt.teamdateroad.domain.model.Enroll +import org.sopt.teamdateroad.domain.model.EnrollTimelineResult +import org.sopt.teamdateroad.domain.repository.TimelineRepository @Singleton class PostTimelineUseCase @Inject constructor( diff --git a/app/src/main/java/org/sopt/dateroad/domain/usecase/PostUsePointUseCase.kt b/app/src/main/java/org/sopt/teamdateroad/domain/usecase/PostUsePointUseCase.kt similarity index 61% rename from app/src/main/java/org/sopt/dateroad/domain/usecase/PostUsePointUseCase.kt rename to app/src/main/java/org/sopt/teamdateroad/domain/usecase/PostUsePointUseCase.kt index d1dfe0f9c..b3d028901 100644 --- a/app/src/main/java/org/sopt/dateroad/domain/usecase/PostUsePointUseCase.kt +++ b/app/src/main/java/org/sopt/teamdateroad/domain/usecase/PostUsePointUseCase.kt @@ -1,10 +1,10 @@ -package org.sopt.dateroad.domain.usecase +package org.sopt.teamdateroad.domain.usecase import javax.inject.Inject import javax.inject.Singleton -import org.sopt.dateroad.domain.model.PointUseResult -import org.sopt.dateroad.domain.model.UsePoint -import org.sopt.dateroad.domain.repository.UserPointRepository +import org.sopt.teamdateroad.domain.model.PointUseResult +import org.sopt.teamdateroad.domain.model.UsePoint +import org.sopt.teamdateroad.domain.repository.UserPointRepository @Singleton class PostUsePointUseCase @Inject constructor( diff --git a/app/src/main/java/org/sopt/dateroad/domain/usecase/SetAccessTokenUseCase.kt b/app/src/main/java/org/sopt/teamdateroad/domain/usecase/SetAccessTokenUseCase.kt similarity index 72% rename from app/src/main/java/org/sopt/dateroad/domain/usecase/SetAccessTokenUseCase.kt rename to app/src/main/java/org/sopt/teamdateroad/domain/usecase/SetAccessTokenUseCase.kt index 51ef3b2f4..d321b529e 100644 --- a/app/src/main/java/org/sopt/dateroad/domain/usecase/SetAccessTokenUseCase.kt +++ b/app/src/main/java/org/sopt/teamdateroad/domain/usecase/SetAccessTokenUseCase.kt @@ -1,8 +1,8 @@ -package org.sopt.dateroad.domain.usecase +package org.sopt.teamdateroad.domain.usecase import javax.inject.Inject import javax.inject.Singleton -import org.sopt.dateroad.domain.repository.UserInfoRepository +import org.sopt.teamdateroad.domain.repository.UserInfoRepository @Singleton class SetAccessTokenUseCase @Inject constructor( diff --git a/app/src/main/java/org/sopt/dateroad/domain/usecase/SetNicknameUseCase.kt b/app/src/main/java/org/sopt/teamdateroad/domain/usecase/SetNicknameUseCase.kt similarity index 71% rename from app/src/main/java/org/sopt/dateroad/domain/usecase/SetNicknameUseCase.kt rename to app/src/main/java/org/sopt/teamdateroad/domain/usecase/SetNicknameUseCase.kt index 7bf17e500..41fe02a3d 100644 --- a/app/src/main/java/org/sopt/dateroad/domain/usecase/SetNicknameUseCase.kt +++ b/app/src/main/java/org/sopt/teamdateroad/domain/usecase/SetNicknameUseCase.kt @@ -1,8 +1,8 @@ -package org.sopt.dateroad.domain.usecase +package org.sopt.teamdateroad.domain.usecase import javax.inject.Inject import javax.inject.Singleton -import org.sopt.dateroad.domain.repository.UserInfoRepository +import org.sopt.teamdateroad.domain.repository.UserInfoRepository @Singleton class SetNicknameUseCase @Inject constructor( diff --git a/app/src/main/java/org/sopt/dateroad/domain/usecase/SetRefreshTokenUseCase.kt b/app/src/main/java/org/sopt/teamdateroad/domain/usecase/SetRefreshTokenUseCase.kt similarity index 72% rename from app/src/main/java/org/sopt/dateroad/domain/usecase/SetRefreshTokenUseCase.kt rename to app/src/main/java/org/sopt/teamdateroad/domain/usecase/SetRefreshTokenUseCase.kt index 7fd376a0f..e52b23480 100644 --- a/app/src/main/java/org/sopt/dateroad/domain/usecase/SetRefreshTokenUseCase.kt +++ b/app/src/main/java/org/sopt/teamdateroad/domain/usecase/SetRefreshTokenUseCase.kt @@ -1,8 +1,8 @@ -package org.sopt.dateroad.domain.usecase +package org.sopt.teamdateroad.domain.usecase import javax.inject.Inject import javax.inject.Singleton -import org.sopt.dateroad.domain.repository.UserInfoRepository +import org.sopt.teamdateroad.domain.repository.UserInfoRepository @Singleton class SetRefreshTokenUseCase @Inject constructor( diff --git a/app/src/main/java/org/sopt/dateroad/domain/util/Constraints.kt b/app/src/main/java/org/sopt/teamdateroad/domain/util/Constraints.kt similarity index 98% rename from app/src/main/java/org/sopt/dateroad/domain/util/Constraints.kt rename to app/src/main/java/org/sopt/teamdateroad/domain/util/Constraints.kt index 0b19662f6..c6a91c23b 100644 --- a/app/src/main/java/org/sopt/dateroad/domain/util/Constraints.kt +++ b/app/src/main/java/org/sopt/teamdateroad/domain/util/Constraints.kt @@ -1,4 +1,4 @@ -package org.sopt.dateroad.domain.util +package org.sopt.teamdateroad.domain.util object Advertisement { const val EDITOR = "에디터 픽" diff --git a/app/src/main/java/org/sopt/dateroad/presentation/model/RouteModel.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/model/RouteModel.kt similarity index 89% rename from app/src/main/java/org/sopt/dateroad/presentation/model/RouteModel.kt rename to app/src/main/java/org/sopt/teamdateroad/presentation/model/RouteModel.kt index ae3bf7df3..10c7493b1 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/model/RouteModel.kt +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/model/RouteModel.kt @@ -1,4 +1,4 @@ -package org.sopt.dateroad.presentation.model +package org.sopt.teamdateroad.presentation.model sealed interface Route diff --git a/app/src/main/java/org/sopt/dateroad/presentation/type/ChipType.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/type/ChipType.kt similarity index 84% rename from app/src/main/java/org/sopt/dateroad/presentation/type/ChipType.kt rename to app/src/main/java/org/sopt/teamdateroad/presentation/type/ChipType.kt index eae9dd39d..8381bd1cb 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/type/ChipType.kt +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/type/ChipType.kt @@ -1,15 +1,15 @@ -package org.sopt.dateroad.presentation.type +package org.sopt.teamdateroad.presentation.type import androidx.compose.ui.graphics.Color import androidx.compose.ui.text.TextStyle import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp -import org.sopt.dateroad.ui.theme.Black -import org.sopt.dateroad.ui.theme.Gray100 -import org.sopt.dateroad.ui.theme.Gray400 -import org.sopt.dateroad.ui.theme.Purple600 -import org.sopt.dateroad.ui.theme.White -import org.sopt.dateroad.ui.theme.defaultDateRoadTypography +import org.sopt.teamdateroad.ui.theme.Black +import org.sopt.teamdateroad.ui.theme.Gray100 +import org.sopt.teamdateroad.ui.theme.Gray400 +import org.sopt.teamdateroad.ui.theme.Purple600 +import org.sopt.teamdateroad.ui.theme.White +import org.sopt.teamdateroad.ui.theme.defaultDateRoadTypography enum class ChipType( val selectedBackgroundColor: Color, diff --git a/app/src/main/java/org/sopt/dateroad/presentation/type/CourseDetailUnopenedDetailType.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/type/CourseDetailUnopenedDetailType.kt similarity index 86% rename from app/src/main/java/org/sopt/dateroad/presentation/type/CourseDetailUnopenedDetailType.kt rename to app/src/main/java/org/sopt/teamdateroad/presentation/type/CourseDetailUnopenedDetailType.kt index d854a9404..ec032a949 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/type/CourseDetailUnopenedDetailType.kt +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/type/CourseDetailUnopenedDetailType.kt @@ -1,7 +1,7 @@ -package org.sopt.dateroad.presentation.type +package org.sopt.teamdateroad.presentation.type import androidx.annotation.StringRes -import org.sopt.dateroad.R +import org.sopt.teamdateroad.R enum class CourseDetailUnopenedDetailType( @StringRes val descriptionStringRes: Int, diff --git a/app/src/main/java/org/sopt/dateroad/presentation/type/DateChipGroupType.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/type/DateChipGroupType.kt similarity index 78% rename from app/src/main/java/org/sopt/dateroad/presentation/type/DateChipGroupType.kt rename to app/src/main/java/org/sopt/teamdateroad/presentation/type/DateChipGroupType.kt index d9465328f..9d0c0dcf8 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/type/DateChipGroupType.kt +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/type/DateChipGroupType.kt @@ -1,9 +1,9 @@ -package org.sopt.dateroad.presentation.type +package org.sopt.teamdateroad.presentation.type import androidx.annotation.StringRes import androidx.compose.ui.text.TextStyle -import org.sopt.dateroad.R -import org.sopt.dateroad.ui.theme.defaultDateRoadTypography +import org.sopt.teamdateroad.R +import org.sopt.teamdateroad.ui.theme.defaultDateRoadTypography enum class DateChipGroupType( @StringRes val titleRes: Int, diff --git a/app/src/main/java/org/sopt/dateroad/presentation/type/DateRoadRegionBottomSheetType.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/type/DateRoadRegionBottomSheetType.kt similarity index 58% rename from app/src/main/java/org/sopt/dateroad/presentation/type/DateRoadRegionBottomSheetType.kt rename to app/src/main/java/org/sopt/teamdateroad/presentation/type/DateRoadRegionBottomSheetType.kt index 111163c8f..3c6eb962f 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/type/DateRoadRegionBottomSheetType.kt +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/type/DateRoadRegionBottomSheetType.kt @@ -1,4 +1,4 @@ -package org.sopt.dateroad.presentation.type +package org.sopt.teamdateroad.presentation.type enum class DateRoadRegionBottomSheetType { ENROLL, diff --git a/app/src/main/java/org/sopt/dateroad/presentation/type/DateTagType.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/type/DateTagType.kt similarity index 95% rename from app/src/main/java/org/sopt/dateroad/presentation/type/DateTagType.kt rename to app/src/main/java/org/sopt/teamdateroad/presentation/type/DateTagType.kt index 8b4df2dad..a5ae1f61b 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/type/DateTagType.kt +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/type/DateTagType.kt @@ -1,8 +1,8 @@ -package org.sopt.dateroad.presentation.type +package org.sopt.teamdateroad.presentation.type import androidx.annotation.DrawableRes import androidx.annotation.StringRes -import org.sopt.dateroad.R +import org.sopt.teamdateroad.R enum class DateTagType( @StringRes val titleRes: Int, diff --git a/app/src/main/java/org/sopt/dateroad/presentation/type/EmptyViewType.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/type/EmptyViewType.kt similarity index 93% rename from app/src/main/java/org/sopt/dateroad/presentation/type/EmptyViewType.kt rename to app/src/main/java/org/sopt/teamdateroad/presentation/type/EmptyViewType.kt index 1e9be1de7..edb08246e 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/type/EmptyViewType.kt +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/type/EmptyViewType.kt @@ -1,8 +1,8 @@ -package org.sopt.dateroad.presentation.type +package org.sopt.teamdateroad.presentation.type import androidx.annotation.DrawableRes import androidx.annotation.StringRes -import org.sopt.dateroad.R +import org.sopt.teamdateroad.R enum class EmptyViewType( @StringRes val titleRes: Int, diff --git a/app/src/main/java/org/sopt/dateroad/presentation/type/EnrollScreenType.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/type/EnrollScreenType.kt similarity index 67% rename from app/src/main/java/org/sopt/dateroad/presentation/type/EnrollScreenType.kt rename to app/src/main/java/org/sopt/teamdateroad/presentation/type/EnrollScreenType.kt index e9e63bc7e..3ae23dbb3 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/type/EnrollScreenType.kt +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/type/EnrollScreenType.kt @@ -1,6 +1,6 @@ -package org.sopt.dateroad.presentation.type +package org.sopt.teamdateroad.presentation.type -import org.sopt.dateroad.presentation.util.EnrollScreen +import org.sopt.teamdateroad.presentation.util.EnrollScreen enum class EnrollScreenType( val position: Int diff --git a/app/src/main/java/org/sopt/dateroad/presentation/type/EnrollType.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/type/EnrollType.kt similarity index 77% rename from app/src/main/java/org/sopt/dateroad/presentation/type/EnrollType.kt rename to app/src/main/java/org/sopt/teamdateroad/presentation/type/EnrollType.kt index c4402e875..cf2f1889f 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/type/EnrollType.kt +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/type/EnrollType.kt @@ -1,7 +1,7 @@ -package org.sopt.dateroad.presentation.type +package org.sopt.teamdateroad.presentation.type import androidx.annotation.StringRes -import org.sopt.dateroad.R +import org.sopt.teamdateroad.R enum class EnrollType( @StringRes val topBarTitleRes: Int diff --git a/app/src/main/java/org/sopt/dateroad/presentation/type/MainNavigationBarItemType.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/type/MainNavigationBarItemType.kt similarity index 89% rename from app/src/main/java/org/sopt/dateroad/presentation/type/MainNavigationBarItemType.kt rename to app/src/main/java/org/sopt/teamdateroad/presentation/type/MainNavigationBarItemType.kt index 185b15872..a278eaccb 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/type/MainNavigationBarItemType.kt +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/type/MainNavigationBarItemType.kt @@ -1,11 +1,11 @@ -package org.sopt.dateroad.presentation.type +package org.sopt.teamdateroad.presentation.type import androidx.annotation.DrawableRes import androidx.annotation.StringRes import androidx.compose.runtime.Composable -import org.sopt.dateroad.R -import org.sopt.dateroad.presentation.model.MainNavigationBarRoute -import org.sopt.dateroad.presentation.model.Route +import org.sopt.teamdateroad.R +import org.sopt.teamdateroad.presentation.model.MainNavigationBarRoute +import org.sopt.teamdateroad.presentation.model.Route enum class MainNavigationBarItemType( @DrawableRes val iconRes: Int, diff --git a/app/src/main/java/org/sopt/dateroad/presentation/type/MyCourseType.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/type/MyCourseType.kt similarity index 77% rename from app/src/main/java/org/sopt/dateroad/presentation/type/MyCourseType.kt rename to app/src/main/java/org/sopt/teamdateroad/presentation/type/MyCourseType.kt index 5008d21a0..41276a7ca 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/type/MyCourseType.kt +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/type/MyCourseType.kt @@ -1,7 +1,7 @@ -package org.sopt.dateroad.presentation.type +package org.sopt.teamdateroad.presentation.type import androidx.annotation.StringRes -import org.sopt.dateroad.R +import org.sopt.teamdateroad.R enum class MyCourseType( @StringRes val topBarTitleRes: Int diff --git a/app/src/main/java/org/sopt/dateroad/presentation/type/MyPageMenuType.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/type/MyPageMenuType.kt similarity index 86% rename from app/src/main/java/org/sopt/dateroad/presentation/type/MyPageMenuType.kt rename to app/src/main/java/org/sopt/teamdateroad/presentation/type/MyPageMenuType.kt index 744dd66fd..7eb7dc7c7 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/type/MyPageMenuType.kt +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/type/MyPageMenuType.kt @@ -1,8 +1,8 @@ -package org.sopt.dateroad.presentation.type +package org.sopt.teamdateroad.presentation.type import androidx.annotation.DrawableRes import androidx.annotation.StringRes -import org.sopt.dateroad.R +import org.sopt.teamdateroad.R enum class MyPageMenuType( @StringRes val titleRes: Int, diff --git a/app/src/main/java/org/sopt/dateroad/presentation/type/MyPagePointInfoType.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/type/MyPagePointInfoType.kt similarity index 92% rename from app/src/main/java/org/sopt/dateroad/presentation/type/MyPagePointInfoType.kt rename to app/src/main/java/org/sopt/teamdateroad/presentation/type/MyPagePointInfoType.kt index 73ce9226b..9701b5a7e 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/type/MyPagePointInfoType.kt +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/type/MyPagePointInfoType.kt @@ -1,8 +1,8 @@ -package org.sopt.dateroad.presentation.type +package org.sopt.teamdateroad.presentation.type import androidx.annotation.DrawableRes import androidx.annotation.StringRes -import org.sopt.dateroad.R +import org.sopt.teamdateroad.R enum class MyPagePointInfoType( @StringRes val titleRes: Int, diff --git a/app/src/main/java/org/sopt/dateroad/presentation/type/OnboardingType.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/type/OnboardingType.kt similarity index 93% rename from app/src/main/java/org/sopt/dateroad/presentation/type/OnboardingType.kt rename to app/src/main/java/org/sopt/teamdateroad/presentation/type/OnboardingType.kt index aedc1cb3f..5bbe4820c 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/type/OnboardingType.kt +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/type/OnboardingType.kt @@ -1,9 +1,9 @@ -package org.sopt.dateroad.presentation.type +package org.sopt.teamdateroad.presentation.type import androidx.annotation.DrawableRes import androidx.annotation.StringRes -import org.sopt.dateroad.R +import org.sopt.teamdateroad.R enum class OnboardingType( @StringRes val titleRes: Int, diff --git a/app/src/main/java/org/sopt/dateroad/presentation/type/OneButtonDialogType.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/type/OneButtonDialogType.kt similarity index 79% rename from app/src/main/java/org/sopt/dateroad/presentation/type/OneButtonDialogType.kt rename to app/src/main/java/org/sopt/teamdateroad/presentation/type/OneButtonDialogType.kt index 208a77263..f58c25dc2 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/type/OneButtonDialogType.kt +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/type/OneButtonDialogType.kt @@ -1,7 +1,7 @@ -package org.sopt.dateroad.presentation.type +package org.sopt.teamdateroad.presentation.type import androidx.annotation.StringRes -import org.sopt.dateroad.R +import org.sopt.teamdateroad.R enum class OneButtonDialogType( @StringRes val titleRes: Int, diff --git a/app/src/main/java/org/sopt/dateroad/presentation/type/OneButtonDialogWithDescriptionType.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/type/OneButtonDialogWithDescriptionType.kt similarity index 90% rename from app/src/main/java/org/sopt/dateroad/presentation/type/OneButtonDialogWithDescriptionType.kt rename to app/src/main/java/org/sopt/teamdateroad/presentation/type/OneButtonDialogWithDescriptionType.kt index 212578e54..bf97509ba 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/type/OneButtonDialogWithDescriptionType.kt +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/type/OneButtonDialogWithDescriptionType.kt @@ -1,7 +1,7 @@ -package org.sopt.dateroad.presentation.type +package org.sopt.teamdateroad.presentation.type import androidx.annotation.StringRes -import org.sopt.dateroad.R +import org.sopt.teamdateroad.R enum class OneButtonDialogWithDescriptionType( @StringRes val titleRes: Int, diff --git a/app/src/main/java/org/sopt/dateroad/presentation/type/PlaceCardType.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/type/PlaceCardType.kt similarity index 91% rename from app/src/main/java/org/sopt/dateroad/presentation/type/PlaceCardType.kt rename to app/src/main/java/org/sopt/teamdateroad/presentation/type/PlaceCardType.kt index db8d9ee7a..0e74b7052 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/type/PlaceCardType.kt +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/type/PlaceCardType.kt @@ -1,9 +1,9 @@ -package org.sopt.dateroad.presentation.type +package org.sopt.teamdateroad.presentation.type import androidx.annotation.DrawableRes import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp -import org.sopt.dateroad.R +import org.sopt.teamdateroad.R enum class PlaceCardType( @DrawableRes val iconRes: Int? = null, diff --git a/app/src/main/java/org/sopt/dateroad/presentation/type/PointHistoryTabType.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/type/PointHistoryTabType.kt similarity index 60% rename from app/src/main/java/org/sopt/dateroad/presentation/type/PointHistoryTabType.kt rename to app/src/main/java/org/sopt/teamdateroad/presentation/type/PointHistoryTabType.kt index e96d753ba..150e2b4a4 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/type/PointHistoryTabType.kt +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/type/PointHistoryTabType.kt @@ -1,9 +1,9 @@ -package org.sopt.dateroad.presentation.type +package org.sopt.teamdateroad.presentation.type import androidx.annotation.StringRes -import org.sopt.dateroad.R -import org.sopt.dateroad.presentation.util.PointHistoryTab.GAINED_HISTORY_POSITION -import org.sopt.dateroad.presentation.util.PointHistoryTab.USED_HISTORY_POSITION +import org.sopt.teamdateroad.R +import org.sopt.teamdateroad.presentation.util.PointHistoryTab.GAINED_HISTORY_POSITION +import org.sopt.teamdateroad.presentation.util.PointHistoryTab.USED_HISTORY_POSITION enum class PointHistoryTabType( val position: Int, diff --git a/app/src/main/java/org/sopt/dateroad/presentation/type/PointSystemType.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/type/PointSystemType.kt similarity index 92% rename from app/src/main/java/org/sopt/dateroad/presentation/type/PointSystemType.kt rename to app/src/main/java/org/sopt/teamdateroad/presentation/type/PointSystemType.kt index 3957832d3..739b2271f 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/type/PointSystemType.kt +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/type/PointSystemType.kt @@ -1,8 +1,8 @@ -package org.sopt.dateroad.presentation.type +package org.sopt.teamdateroad.presentation.type import androidx.annotation.DrawableRes import androidx.annotation.StringRes -import org.sopt.dateroad.R +import org.sopt.teamdateroad.R enum class PointSystemType( @StringRes val titleRes: Int, diff --git a/app/src/main/java/org/sopt/dateroad/presentation/type/ProfileType.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/type/ProfileType.kt similarity index 84% rename from app/src/main/java/org/sopt/dateroad/presentation/type/ProfileType.kt rename to app/src/main/java/org/sopt/teamdateroad/presentation/type/ProfileType.kt index 529d5ded8..a0e5681ef 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/type/ProfileType.kt +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/type/ProfileType.kt @@ -1,7 +1,7 @@ -package org.sopt.dateroad.presentation.type +package org.sopt.teamdateroad.presentation.type import androidx.annotation.StringRes -import org.sopt.dateroad.R +import org.sopt.teamdateroad.R enum class ProfileType( @StringRes val topAppBarTitleRes: Int, diff --git a/app/src/main/java/org/sopt/dateroad/presentation/type/TagType.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/type/TagType.kt similarity index 96% rename from app/src/main/java/org/sopt/dateroad/presentation/type/TagType.kt rename to app/src/main/java/org/sopt/teamdateroad/presentation/type/TagType.kt index 15a74ea6e..438b1c95d 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/type/TagType.kt +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/type/TagType.kt @@ -1,9 +1,9 @@ -package org.sopt.dateroad.presentation.type +package org.sopt.teamdateroad.presentation.type import androidx.compose.ui.graphics.Color import androidx.compose.ui.text.TextStyle -import org.sopt.dateroad.ui.theme.defaultDateRoadColors -import org.sopt.dateroad.ui.theme.defaultDateRoadTypography +import org.sopt.teamdateroad.ui.theme.defaultDateRoadColors +import org.sopt.teamdateroad.ui.theme.defaultDateRoadTypography enum class TagType( val backgroundColor: Color, diff --git a/app/src/main/java/org/sopt/dateroad/presentation/type/TimelineType.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/type/TimelineType.kt similarity index 89% rename from app/src/main/java/org/sopt/dateroad/presentation/type/TimelineType.kt rename to app/src/main/java/org/sopt/teamdateroad/presentation/type/TimelineType.kt index 3ba2fd80a..e8ba9b8ff 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/type/TimelineType.kt +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/type/TimelineType.kt @@ -1,8 +1,8 @@ -package org.sopt.dateroad.presentation.type +package org.sopt.teamdateroad.presentation.type import androidx.annotation.ColorRes import androidx.compose.ui.graphics.Color -import org.sopt.dateroad.ui.theme.defaultDateRoadColors +import org.sopt.teamdateroad.ui.theme.defaultDateRoadColors enum class TimelineType( val index: Int, diff --git a/app/src/main/java/org/sopt/dateroad/presentation/type/TwoButtonDialogType.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/type/TwoButtonDialogType.kt similarity index 88% rename from app/src/main/java/org/sopt/dateroad/presentation/type/TwoButtonDialogType.kt rename to app/src/main/java/org/sopt/teamdateroad/presentation/type/TwoButtonDialogType.kt index b91457d5f..7fb5209c4 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/type/TwoButtonDialogType.kt +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/type/TwoButtonDialogType.kt @@ -1,7 +1,7 @@ -package org.sopt.dateroad.presentation.type +package org.sopt.teamdateroad.presentation.type import androidx.annotation.StringRes -import org.sopt.dateroad.R +import org.sopt.teamdateroad.R enum class TwoButtonDialogType( @StringRes val titleRes: Int, diff --git a/app/src/main/java/org/sopt/dateroad/presentation/type/TwoButtonDialogWithDescriptionType.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/type/TwoButtonDialogWithDescriptionType.kt similarity index 96% rename from app/src/main/java/org/sopt/dateroad/presentation/type/TwoButtonDialogWithDescriptionType.kt rename to app/src/main/java/org/sopt/teamdateroad/presentation/type/TwoButtonDialogWithDescriptionType.kt index 2f67f1add..7741e9dfb 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/type/TwoButtonDialogWithDescriptionType.kt +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/type/TwoButtonDialogWithDescriptionType.kt @@ -1,7 +1,7 @@ -package org.sopt.dateroad.presentation.type +package org.sopt.teamdateroad.presentation.type import androidx.annotation.StringRes -import org.sopt.dateroad.R +import org.sopt.teamdateroad.R enum class TwoButtonDialogWithDescriptionType( @StringRes val titleRes: Int, diff --git a/app/src/main/java/org/sopt/dateroad/presentation/ui/advertisement/AdvertisementContract.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/advertisement/AdvertisementContract.kt similarity index 59% rename from app/src/main/java/org/sopt/dateroad/presentation/ui/advertisement/AdvertisementContract.kt rename to app/src/main/java/org/sopt/teamdateroad/presentation/ui/advertisement/AdvertisementContract.kt index 76196a92b..2628199aa 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/ui/advertisement/AdvertisementContract.kt +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/advertisement/AdvertisementContract.kt @@ -1,10 +1,10 @@ -package org.sopt.dateroad.presentation.ui.advertisement +package org.sopt.teamdateroad.presentation.ui.advertisement -import org.sopt.dateroad.domain.model.AdvertisementDetail -import org.sopt.dateroad.presentation.util.base.UiEvent -import org.sopt.dateroad.presentation.util.base.UiSideEffect -import org.sopt.dateroad.presentation.util.base.UiState -import org.sopt.dateroad.presentation.util.view.LoadState +import org.sopt.teamdateroad.domain.model.AdvertisementDetail +import org.sopt.teamdateroad.presentation.util.base.UiEvent +import org.sopt.teamdateroad.presentation.util.base.UiSideEffect +import org.sopt.teamdateroad.presentation.util.base.UiState +import org.sopt.teamdateroad.presentation.util.view.LoadState class AdvertisementContract { data class AdvertisementUiState( diff --git a/app/src/main/java/org/sopt/dateroad/presentation/ui/advertisement/AdvertisementScreen.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/advertisement/AdvertisementScreen.kt similarity index 85% rename from app/src/main/java/org/sopt/dateroad/presentation/ui/advertisement/AdvertisementScreen.kt rename to app/src/main/java/org/sopt/teamdateroad/presentation/ui/advertisement/AdvertisementScreen.kt index acea7706c..84eca842e 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/ui/advertisement/AdvertisementScreen.kt +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/advertisement/AdvertisementScreen.kt @@ -1,4 +1,4 @@ -package org.sopt.dateroad.presentation.ui.advertisement +package org.sopt.teamdateroad.presentation.ui.advertisement import androidx.compose.foundation.background import androidx.compose.foundation.layout.Box @@ -20,14 +20,14 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle import androidx.lifecycle.flowWithLifecycle import com.google.accompanist.pager.ExperimentalPagerApi import com.google.accompanist.pager.PagerState -import org.sopt.dateroad.presentation.ui.advertisement.component.AdvertisementDetail -import org.sopt.dateroad.presentation.ui.component.pager.DateRoadImagePager -import org.sopt.dateroad.presentation.ui.component.topbar.DateRoadScrollResponsiveTopBar -import org.sopt.dateroad.presentation.ui.component.view.DateRoadErrorView -import org.sopt.dateroad.presentation.ui.component.view.DateRoadIdleView -import org.sopt.dateroad.presentation.ui.component.view.DateRoadLoadingView -import org.sopt.dateroad.presentation.util.view.LoadState -import org.sopt.dateroad.ui.theme.DateRoadTheme +import org.sopt.teamdateroad.presentation.ui.advertisement.component.AdvertisementDetail +import org.sopt.teamdateroad.presentation.ui.component.pager.DateRoadImagePager +import org.sopt.teamdateroad.presentation.ui.component.topbar.DateRoadScrollResponsiveTopBar +import org.sopt.teamdateroad.presentation.ui.component.view.DateRoadErrorView +import org.sopt.teamdateroad.presentation.ui.component.view.DateRoadIdleView +import org.sopt.teamdateroad.presentation.ui.component.view.DateRoadLoadingView +import org.sopt.teamdateroad.presentation.util.view.LoadState +import org.sopt.teamdateroad.ui.theme.DateRoadTheme @Composable fun AdvertisementRoute( diff --git a/app/src/main/java/org/sopt/dateroad/presentation/ui/advertisement/AdvertisementViewModel.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/advertisement/AdvertisementViewModel.kt similarity index 86% rename from app/src/main/java/org/sopt/dateroad/presentation/ui/advertisement/AdvertisementViewModel.kt rename to app/src/main/java/org/sopt/teamdateroad/presentation/ui/advertisement/AdvertisementViewModel.kt index 6a09f4d93..9b5354799 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/ui/advertisement/AdvertisementViewModel.kt +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/advertisement/AdvertisementViewModel.kt @@ -1,12 +1,12 @@ -package org.sopt.dateroad.presentation.ui.advertisement +package org.sopt.teamdateroad.presentation.ui.advertisement import androidx.lifecycle.viewModelScope import dagger.hilt.android.lifecycle.HiltViewModel import javax.inject.Inject import kotlinx.coroutines.launch -import org.sopt.dateroad.domain.usecase.GetAdvertisementDetailUseCase -import org.sopt.dateroad.presentation.util.base.BaseViewModel -import org.sopt.dateroad.presentation.util.view.LoadState +import org.sopt.teamdateroad.domain.usecase.GetAdvertisementDetailUseCase +import org.sopt.teamdateroad.presentation.util.base.BaseViewModel +import org.sopt.teamdateroad.presentation.util.view.LoadState @HiltViewModel class AdvertisementViewModel @Inject constructor( diff --git a/app/src/main/java/org/sopt/dateroad/presentation/ui/advertisement/component/AdvertisementDetail.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/advertisement/component/AdvertisementDetail.kt similarity index 85% rename from app/src/main/java/org/sopt/dateroad/presentation/ui/advertisement/component/AdvertisementDetail.kt rename to app/src/main/java/org/sopt/teamdateroad/presentation/ui/advertisement/component/AdvertisementDetail.kt index 743c61994..f29871401 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/ui/advertisement/component/AdvertisementDetail.kt +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/advertisement/component/AdvertisementDetail.kt @@ -1,4 +1,4 @@ -package org.sopt.dateroad.presentation.ui.advertisement.component +package org.sopt.teamdateroad.presentation.ui.advertisement.component import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Spacer @@ -8,9 +8,9 @@ import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp -import org.sopt.dateroad.presentation.type.TagType -import org.sopt.dateroad.presentation.ui.component.tag.DateRoadTextTag -import org.sopt.dateroad.ui.theme.DateRoadTheme +import org.sopt.teamdateroad.presentation.type.TagType +import org.sopt.teamdateroad.presentation.ui.component.tag.DateRoadTextTag +import org.sopt.teamdateroad.ui.theme.DateRoadTheme @Composable fun AdvertisementDetail( diff --git a/app/src/main/java/org/sopt/dateroad/presentation/ui/advertisement/navigation/AdvertisementNavigation.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/advertisement/navigation/AdvertisementNavigation.kt similarity index 87% rename from app/src/main/java/org/sopt/dateroad/presentation/ui/advertisement/navigation/AdvertisementNavigation.kt rename to app/src/main/java/org/sopt/teamdateroad/presentation/ui/advertisement/navigation/AdvertisementNavigation.kt index 377ac9365..e099e4643 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/ui/advertisement/navigation/AdvertisementNavigation.kt +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/advertisement/navigation/AdvertisementNavigation.kt @@ -1,11 +1,11 @@ -package org.sopt.dateroad.presentation.ui.advertisement.navigation +package org.sopt.teamdateroad.presentation.ui.advertisement.navigation import androidx.navigation.NavController import androidx.navigation.NavGraphBuilder import androidx.navigation.NavType import androidx.navigation.compose.composable import androidx.navigation.navArgument -import org.sopt.dateroad.presentation.ui.advertisement.AdvertisementRoute +import org.sopt.teamdateroad.presentation.ui.advertisement.AdvertisementRoute fun NavController.navigationAdvertisement(advertisementId: Int) { this.navigate(route = AdvertisementRoute.route(advertisementId = advertisementId)) diff --git a/app/src/main/java/org/sopt/dateroad/presentation/ui/component/bottomsheet/DateRoadBasicBottomSheet.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/component/bottomsheet/DateRoadBasicBottomSheet.kt similarity index 93% rename from app/src/main/java/org/sopt/dateroad/presentation/ui/component/bottomsheet/DateRoadBasicBottomSheet.kt rename to app/src/main/java/org/sopt/teamdateroad/presentation/ui/component/bottomsheet/DateRoadBasicBottomSheet.kt index d03d95fba..d69fde67a 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/ui/component/bottomsheet/DateRoadBasicBottomSheet.kt +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/component/bottomsheet/DateRoadBasicBottomSheet.kt @@ -1,4 +1,4 @@ -package org.sopt.dateroad.presentation.ui.component.bottomsheet +package org.sopt.teamdateroad.presentation.ui.component.bottomsheet import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column @@ -19,9 +19,9 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import org.sopt.dateroad.presentation.util.modifier.noRippleClickable -import org.sopt.dateroad.ui.theme.DATEROADTheme -import org.sopt.dateroad.ui.theme.DateRoadTheme +import org.sopt.teamdateroad.presentation.util.modifier.noRippleClickable +import org.sopt.teamdateroad.ui.theme.DATEROADTheme +import org.sopt.teamdateroad.ui.theme.DateRoadTheme @OptIn(ExperimentalMaterial3Api::class) @Composable diff --git a/app/src/main/java/org/sopt/dateroad/presentation/ui/component/bottomsheet/DateRoadBottomSheet.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/component/bottomsheet/DateRoadBottomSheet.kt similarity index 94% rename from app/src/main/java/org/sopt/dateroad/presentation/ui/component/bottomsheet/DateRoadBottomSheet.kt rename to app/src/main/java/org/sopt/teamdateroad/presentation/ui/component/bottomsheet/DateRoadBottomSheet.kt index b2708ae9a..31cb5dee4 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/ui/component/bottomsheet/DateRoadBottomSheet.kt +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/component/bottomsheet/DateRoadBottomSheet.kt @@ -1,4 +1,4 @@ -package org.sopt.dateroad.presentation.ui.component.bottomsheet +package org.sopt.teamdateroad.presentation.ui.component.bottomsheet import android.annotation.SuppressLint import androidx.compose.foundation.layout.Column @@ -25,11 +25,10 @@ import androidx.compose.runtime.setValue import androidx.compose.ui.Modifier import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import kotlinx.coroutines.coroutineScope import kotlinx.coroutines.launch -import org.sopt.dateroad.presentation.ui.component.button.DateRoadBasicButton -import org.sopt.dateroad.ui.theme.DATEROADTheme -import org.sopt.dateroad.ui.theme.DateRoadTheme +import org.sopt.teamdateroad.presentation.ui.component.button.DateRoadBasicButton +import org.sopt.teamdateroad.ui.theme.DATEROADTheme +import org.sopt.teamdateroad.ui.theme.DateRoadTheme @SuppressLint("CoroutineCreationDuringComposition") @OptIn(ExperimentalMaterial3Api::class, ExperimentalMaterialApi::class) diff --git a/app/src/main/java/org/sopt/dateroad/presentation/ui/component/bottomsheet/DateRoadPickerBottomSheet.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/component/bottomsheet/DateRoadPickerBottomSheet.kt similarity index 90% rename from app/src/main/java/org/sopt/dateroad/presentation/ui/component/bottomsheet/DateRoadPickerBottomSheet.kt rename to app/src/main/java/org/sopt/teamdateroad/presentation/ui/component/bottomsheet/DateRoadPickerBottomSheet.kt index 843d6adee..770fd3037 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/ui/component/bottomsheet/DateRoadPickerBottomSheet.kt +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/component/bottomsheet/DateRoadPickerBottomSheet.kt @@ -1,4 +1,4 @@ -package org.sopt.dateroad.presentation.ui.component.bottomsheet +package org.sopt.teamdateroad.presentation.ui.component.bottomsheet import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Row @@ -18,9 +18,9 @@ import androidx.compose.runtime.setValue import androidx.compose.ui.Modifier import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import org.sopt.dateroad.presentation.ui.component.bottomsheet.model.Picker -import org.sopt.dateroad.presentation.ui.component.numberpicker.DateRoadNumberPicker -import org.sopt.dateroad.ui.theme.DateRoadTheme +import org.sopt.teamdateroad.presentation.ui.component.bottomsheet.model.Picker +import org.sopt.teamdateroad.presentation.ui.component.numberpicker.DateRoadNumberPicker +import org.sopt.teamdateroad.ui.theme.DateRoadTheme @OptIn(ExperimentalMaterial3Api::class) @Composable diff --git a/app/src/main/java/org/sopt/dateroad/presentation/ui/component/bottomsheet/DateRoadRegionBottomSheet.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/component/bottomsheet/DateRoadRegionBottomSheet.kt similarity index 93% rename from app/src/main/java/org/sopt/dateroad/presentation/ui/component/bottomsheet/DateRoadRegionBottomSheet.kt rename to app/src/main/java/org/sopt/teamdateroad/presentation/ui/component/bottomsheet/DateRoadRegionBottomSheet.kt index a8a38b251..5a36e582c 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/ui/component/bottomsheet/DateRoadRegionBottomSheet.kt +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/component/bottomsheet/DateRoadRegionBottomSheet.kt @@ -1,4 +1,4 @@ -package org.sopt.dateroad.presentation.ui.component.bottomsheet +package org.sopt.teamdateroad.presentation.ui.component.bottomsheet import androidx.compose.foundation.Image import androidx.compose.foundation.layout.Arrangement @@ -32,16 +32,16 @@ import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import org.sopt.dateroad.R -import org.sopt.dateroad.domain.type.GyeonggiAreaType -import org.sopt.dateroad.domain.type.IncheonAreaType -import org.sopt.dateroad.domain.type.RegionType -import org.sopt.dateroad.domain.type.SeoulAreaType -import org.sopt.dateroad.presentation.type.ChipType -import org.sopt.dateroad.presentation.type.DateRoadRegionBottomSheetType -import org.sopt.dateroad.presentation.ui.component.chip.DateRoadTextChip -import org.sopt.dateroad.presentation.util.modifier.noRippleClickable -import org.sopt.dateroad.ui.theme.DateRoadTheme +import org.sopt.teamdateroad.R +import org.sopt.teamdateroad.domain.type.GyeonggiAreaType +import org.sopt.teamdateroad.domain.type.IncheonAreaType +import org.sopt.teamdateroad.domain.type.RegionType +import org.sopt.teamdateroad.domain.type.SeoulAreaType +import org.sopt.teamdateroad.presentation.type.ChipType +import org.sopt.teamdateroad.presentation.type.DateRoadRegionBottomSheetType +import org.sopt.teamdateroad.presentation.ui.component.chip.DateRoadTextChip +import org.sopt.teamdateroad.presentation.util.modifier.noRippleClickable +import org.sopt.teamdateroad.ui.theme.DateRoadTheme @OptIn(ExperimentalMaterial3Api::class, ExperimentalLayoutApi::class) @Composable diff --git a/app/src/main/java/org/sopt/teamdateroad/presentation/ui/component/bottomsheet/model/Picker.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/component/bottomsheet/model/Picker.kt new file mode 100644 index 000000000..8ccae52f2 --- /dev/null +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/component/bottomsheet/model/Picker.kt @@ -0,0 +1,9 @@ +package org.sopt.teamdateroad.presentation.ui.component.bottomsheet.model + +import org.sopt.teamdateroad.presentation.ui.component.numberpicker.state.PickerState + +data class Picker( + val items: List, + val startIndex: Int = 0, + val pickerState: PickerState = PickerState() +) diff --git a/app/src/main/java/org/sopt/dateroad/presentation/ui/component/button/DateRoadAreaButton.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/component/button/DateRoadAreaButton.kt similarity index 90% rename from app/src/main/java/org/sopt/dateroad/presentation/ui/component/button/DateRoadAreaButton.kt rename to app/src/main/java/org/sopt/teamdateroad/presentation/ui/component/button/DateRoadAreaButton.kt index 31f21f391..85afa5946 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/ui/component/button/DateRoadAreaButton.kt +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/component/button/DateRoadAreaButton.kt @@ -1,4 +1,4 @@ -package org.sopt.dateroad.presentation.ui.component.button +package org.sopt.teamdateroad.presentation.ui.component.button import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.Spacer @@ -12,9 +12,9 @@ import androidx.compose.ui.graphics.Color import androidx.compose.ui.res.painterResource import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import org.sopt.dateroad.R -import org.sopt.dateroad.ui.theme.DATEROADTheme -import org.sopt.dateroad.ui.theme.DateRoadTheme +import org.sopt.teamdateroad.R +import org.sopt.teamdateroad.ui.theme.DATEROADTheme +import org.sopt.teamdateroad.ui.theme.DateRoadTheme @Composable fun DateRoadAreaButton( diff --git a/app/src/main/java/org/sopt/dateroad/presentation/ui/component/button/DateRoadBasicButton.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/component/button/DateRoadBasicButton.kt similarity index 90% rename from app/src/main/java/org/sopt/dateroad/presentation/ui/component/button/DateRoadBasicButton.kt rename to app/src/main/java/org/sopt/teamdateroad/presentation/ui/component/button/DateRoadBasicButton.kt index 7d3c01def..148ec5fdb 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/ui/component/button/DateRoadBasicButton.kt +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/component/button/DateRoadBasicButton.kt @@ -1,4 +1,4 @@ -package org.sopt.dateroad.presentation.ui.component.button +package org.sopt.teamdateroad.presentation.ui.component.button import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.fillMaxWidth @@ -7,8 +7,8 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import org.sopt.dateroad.ui.theme.DATEROADTheme -import org.sopt.dateroad.ui.theme.DateRoadTheme +import org.sopt.teamdateroad.ui.theme.DATEROADTheme +import org.sopt.teamdateroad.ui.theme.DateRoadTheme @Composable fun DateRoadBasicButton( diff --git a/app/src/main/java/org/sopt/dateroad/presentation/ui/component/button/DateRoadButton.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/component/button/DateRoadButton.kt similarity index 90% rename from app/src/main/java/org/sopt/dateroad/presentation/ui/component/button/DateRoadButton.kt rename to app/src/main/java/org/sopt/teamdateroad/presentation/ui/component/button/DateRoadButton.kt index 3e5cbccb2..1363f5289 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/ui/component/button/DateRoadButton.kt +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/component/button/DateRoadButton.kt @@ -1,4 +1,4 @@ -package org.sopt.dateroad.presentation.ui.component.button +package org.sopt.teamdateroad.presentation.ui.component.button import androidx.compose.foundation.background import androidx.compose.foundation.border @@ -12,7 +12,7 @@ import androidx.compose.ui.draw.clip import androidx.compose.ui.graphics.Color import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp -import org.sopt.dateroad.presentation.util.modifier.noRippleDebounceClickable +import org.sopt.teamdateroad.presentation.util.modifier.noRippleDebounceClickable @Composable fun DateRoadButton( diff --git a/app/src/main/java/org/sopt/dateroad/presentation/ui/component/button/DateRoadFilledButton.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/component/button/DateRoadFilledButton.kt similarity index 95% rename from app/src/main/java/org/sopt/dateroad/presentation/ui/component/button/DateRoadFilledButton.kt rename to app/src/main/java/org/sopt/teamdateroad/presentation/ui/component/button/DateRoadFilledButton.kt index a0cd64162..2a17c8a13 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/ui/component/button/DateRoadFilledButton.kt +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/component/button/DateRoadFilledButton.kt @@ -1,4 +1,4 @@ -package org.sopt.dateroad.presentation.ui.component.button +package org.sopt.teamdateroad.presentation.ui.component.button import androidx.compose.foundation.layout.Column import androidx.compose.material3.Text @@ -10,8 +10,8 @@ import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp -import org.sopt.dateroad.ui.theme.DATEROADTheme -import org.sopt.dateroad.ui.theme.DateRoadTheme +import org.sopt.teamdateroad.ui.theme.DATEROADTheme +import org.sopt.teamdateroad.ui.theme.DateRoadTheme @Composable fun DateRoadFilledButton( diff --git a/app/src/main/java/org/sopt/dateroad/presentation/ui/component/button/DateRoadImageButton.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/component/button/DateRoadImageButton.kt similarity index 92% rename from app/src/main/java/org/sopt/dateroad/presentation/ui/component/button/DateRoadImageButton.kt rename to app/src/main/java/org/sopt/teamdateroad/presentation/ui/component/button/DateRoadImageButton.kt index f45a94264..7b562d4a9 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/ui/component/button/DateRoadImageButton.kt +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/component/button/DateRoadImageButton.kt @@ -1,4 +1,4 @@ -package org.sopt.dateroad.presentation.ui.component.button +package org.sopt.teamdateroad.presentation.ui.component.button import androidx.compose.foundation.layout.Column import androidx.compose.material3.Icon @@ -9,9 +9,9 @@ import androidx.compose.ui.res.painterResource import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp -import org.sopt.dateroad.R -import org.sopt.dateroad.ui.theme.DATEROADTheme -import org.sopt.dateroad.ui.theme.DateRoadTheme +import org.sopt.teamdateroad.R +import org.sopt.teamdateroad.ui.theme.DATEROADTheme +import org.sopt.teamdateroad.ui.theme.DateRoadTheme @Composable fun DateRoadImageButton( diff --git a/app/src/main/java/org/sopt/dateroad/presentation/ui/component/button/DateRoadKakaoLoginButton.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/component/button/DateRoadKakaoLoginButton.kt similarity index 91% rename from app/src/main/java/org/sopt/dateroad/presentation/ui/component/button/DateRoadKakaoLoginButton.kt rename to app/src/main/java/org/sopt/teamdateroad/presentation/ui/component/button/DateRoadKakaoLoginButton.kt index 9b92a774b..150f2f0bf 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/ui/component/button/DateRoadKakaoLoginButton.kt +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/component/button/DateRoadKakaoLoginButton.kt @@ -1,4 +1,4 @@ -package org.sopt.dateroad.presentation.ui.component.button +package org.sopt.teamdateroad.presentation.ui.component.button import androidx.compose.foundation.Image import androidx.compose.foundation.layout.Row @@ -20,9 +20,9 @@ import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.em import androidx.compose.ui.unit.sp -import org.sopt.dateroad.R -import org.sopt.dateroad.ui.theme.DATEROADTheme -import org.sopt.dateroad.ui.theme.DateRoadTheme +import org.sopt.teamdateroad.R +import org.sopt.teamdateroad.ui.theme.DATEROADTheme +import org.sopt.teamdateroad.ui.theme.DateRoadTheme @Composable fun DateRoadKakaoLoginButton( diff --git a/app/src/main/java/org/sopt/dateroad/presentation/ui/component/button/DateRoadOutlinedButton.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/component/button/DateRoadOutlinedButton.kt similarity index 91% rename from app/src/main/java/org/sopt/dateroad/presentation/ui/component/button/DateRoadOutlinedButton.kt rename to app/src/main/java/org/sopt/teamdateroad/presentation/ui/component/button/DateRoadOutlinedButton.kt index 13a005d44..87a9b3f0b 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/ui/component/button/DateRoadOutlinedButton.kt +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/component/button/DateRoadOutlinedButton.kt @@ -1,4 +1,4 @@ -package org.sopt.dateroad.presentation.ui.component.button +package org.sopt.teamdateroad.presentation.ui.component.button import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.material3.Text @@ -10,8 +10,8 @@ import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp -import org.sopt.dateroad.ui.theme.DATEROADTheme -import org.sopt.dateroad.ui.theme.DateRoadTheme +import org.sopt.teamdateroad.ui.theme.DATEROADTheme +import org.sopt.teamdateroad.ui.theme.DateRoadTheme @Composable fun DateRoadOutlinedButton( diff --git a/app/src/main/java/org/sopt/dateroad/presentation/ui/component/button/DateRoadTextButton.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/component/button/DateRoadTextButton.kt similarity index 93% rename from app/src/main/java/org/sopt/dateroad/presentation/ui/component/button/DateRoadTextButton.kt rename to app/src/main/java/org/sopt/teamdateroad/presentation/ui/component/button/DateRoadTextButton.kt index 02fb905c2..047fd9dcf 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/ui/component/button/DateRoadTextButton.kt +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/component/button/DateRoadTextButton.kt @@ -1,4 +1,4 @@ -package org.sopt.dateroad.presentation.ui.component.button +package org.sopt.teamdateroad.presentation.ui.component.button import androidx.compose.foundation.layout.Column import androidx.compose.material3.Text @@ -9,8 +9,8 @@ import androidx.compose.ui.text.TextStyle import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp -import org.sopt.dateroad.ui.theme.DATEROADTheme -import org.sopt.dateroad.ui.theme.DateRoadTheme +import org.sopt.teamdateroad.ui.theme.DATEROADTheme +import org.sopt.teamdateroad.ui.theme.DateRoadTheme @Composable fun DateRoadTextButton( diff --git a/app/src/main/java/org/sopt/dateroad/presentation/ui/component/card/DateRoadCourseCard.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/component/card/DateRoadCourseCard.kt similarity index 91% rename from app/src/main/java/org/sopt/dateroad/presentation/ui/component/card/DateRoadCourseCard.kt rename to app/src/main/java/org/sopt/teamdateroad/presentation/ui/component/card/DateRoadCourseCard.kt index 53f8de4e8..fc1f9c1eb 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/ui/component/card/DateRoadCourseCard.kt +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/component/card/DateRoadCourseCard.kt @@ -1,4 +1,4 @@ -package org.sopt.dateroad.presentation.ui.component.card +package org.sopt.teamdateroad.presentation.ui.component.card import androidx.compose.foundation.background import androidx.compose.foundation.layout.Box @@ -24,12 +24,12 @@ import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import coil.compose.AsyncImage import coil.request.ImageRequest -import org.sopt.dateroad.R -import org.sopt.dateroad.domain.model.Course -import org.sopt.dateroad.presentation.type.TagType -import org.sopt.dateroad.presentation.ui.component.tag.DateRoadImageTag -import org.sopt.dateroad.presentation.util.modifier.noRippleClickable -import org.sopt.dateroad.ui.theme.DateRoadTheme +import org.sopt.teamdateroad.R +import org.sopt.teamdateroad.domain.model.Course +import org.sopt.teamdateroad.presentation.type.TagType +import org.sopt.teamdateroad.presentation.ui.component.tag.DateRoadImageTag +import org.sopt.teamdateroad.presentation.util.modifier.noRippleClickable +import org.sopt.teamdateroad.ui.theme.DateRoadTheme @Composable fun DateRoadCourseCard( diff --git a/app/src/main/java/org/sopt/dateroad/presentation/ui/component/card/DateRoadPlaceCard.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/component/card/DateRoadPlaceCard.kt similarity index 90% rename from app/src/main/java/org/sopt/dateroad/presentation/ui/component/card/DateRoadPlaceCard.kt rename to app/src/main/java/org/sopt/teamdateroad/presentation/ui/component/card/DateRoadPlaceCard.kt index ba0028ef4..263fc0d86 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/ui/component/card/DateRoadPlaceCard.kt +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/component/card/DateRoadPlaceCard.kt @@ -1,4 +1,4 @@ -package org.sopt.dateroad.presentation.ui.component.card +package org.sopt.teamdateroad.presentation.ui.component.card import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement @@ -20,12 +20,12 @@ import androidx.compose.ui.res.painterResource import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import org.sopt.dateroad.domain.model.Place -import org.sopt.dateroad.presentation.type.PlaceCardType -import org.sopt.dateroad.presentation.type.TagType -import org.sopt.dateroad.presentation.ui.component.tag.DateRoadTextTag -import org.sopt.dateroad.presentation.util.modifier.noRippleClickable -import org.sopt.dateroad.ui.theme.DateRoadTheme +import org.sopt.teamdateroad.domain.model.Place +import org.sopt.teamdateroad.presentation.type.PlaceCardType +import org.sopt.teamdateroad.presentation.type.TagType +import org.sopt.teamdateroad.presentation.ui.component.tag.DateRoadTextTag +import org.sopt.teamdateroad.presentation.util.modifier.noRippleClickable +import org.sopt.teamdateroad.ui.theme.DateRoadTheme @Composable fun DateRoadPlaceCard( diff --git a/app/src/main/java/org/sopt/dateroad/presentation/ui/component/chip/DateRoadChip.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/component/chip/DateRoadChip.kt similarity index 84% rename from app/src/main/java/org/sopt/dateroad/presentation/ui/component/chip/DateRoadChip.kt rename to app/src/main/java/org/sopt/teamdateroad/presentation/ui/component/chip/DateRoadChip.kt index 301a3bc96..ca53c8808 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/ui/component/chip/DateRoadChip.kt +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/component/chip/DateRoadChip.kt @@ -1,4 +1,4 @@ -package org.sopt.dateroad.presentation.ui.component.chip +package org.sopt.teamdateroad.presentation.ui.component.chip import androidx.compose.foundation.background import androidx.compose.foundation.layout.Box @@ -8,8 +8,8 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip -import org.sopt.dateroad.presentation.type.ChipType -import org.sopt.dateroad.presentation.util.modifier.noRippleClickable +import org.sopt.teamdateroad.presentation.type.ChipType +import org.sopt.teamdateroad.presentation.util.modifier.noRippleClickable @Composable fun DateRoadChip( diff --git a/app/src/main/java/org/sopt/dateroad/presentation/ui/component/chip/DateRoadImageChip.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/component/chip/DateRoadImageChip.kt similarity index 91% rename from app/src/main/java/org/sopt/dateroad/presentation/ui/component/chip/DateRoadImageChip.kt rename to app/src/main/java/org/sopt/teamdateroad/presentation/ui/component/chip/DateRoadImageChip.kt index 3bd5426b6..4491bbee6 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/ui/component/chip/DateRoadImageChip.kt +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/component/chip/DateRoadImageChip.kt @@ -1,4 +1,4 @@ -package org.sopt.dateroad.presentation.ui.component.chip +package org.sopt.teamdateroad.presentation.ui.component.chip import androidx.annotation.DrawableRes import androidx.annotation.StringRes @@ -15,8 +15,8 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp -import org.sopt.dateroad.presentation.type.ChipType -import org.sopt.dateroad.presentation.type.DateTagType +import org.sopt.teamdateroad.presentation.type.ChipType +import org.sopt.teamdateroad.presentation.type.DateTagType @Composable fun DateRoadImageChip( diff --git a/app/src/main/java/org/sopt/dateroad/presentation/ui/component/chip/DateRoadTextChip.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/component/chip/DateRoadTextChip.kt similarity index 93% rename from app/src/main/java/org/sopt/dateroad/presentation/ui/component/chip/DateRoadTextChip.kt rename to app/src/main/java/org/sopt/teamdateroad/presentation/ui/component/chip/DateRoadTextChip.kt index 625ce0239..351cc774a 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/ui/component/chip/DateRoadTextChip.kt +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/component/chip/DateRoadTextChip.kt @@ -1,4 +1,4 @@ -package org.sopt.dateroad.presentation.ui.component.chip +package org.sopt.teamdateroad.presentation.ui.component.chip import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Spacer @@ -9,7 +9,7 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import org.sopt.dateroad.presentation.type.ChipType +import org.sopt.teamdateroad.presentation.type.ChipType @Composable fun DateRoadTextChip( diff --git a/app/src/main/java/org/sopt/dateroad/presentation/ui/component/chipgroup/DateRoadDateChipGroup.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/component/chipgroup/DateRoadDateChipGroup.kt similarity index 86% rename from app/src/main/java/org/sopt/dateroad/presentation/ui/component/chipgroup/DateRoadDateChipGroup.kt rename to app/src/main/java/org/sopt/teamdateroad/presentation/ui/component/chipgroup/DateRoadDateChipGroup.kt index 32967c01f..ab62d948a 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/ui/component/chipgroup/DateRoadDateChipGroup.kt +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/component/chipgroup/DateRoadDateChipGroup.kt @@ -1,4 +1,4 @@ -package org.sopt.dateroad.presentation.ui.component.chipgroup +package org.sopt.teamdateroad.presentation.ui.component.chipgroup import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column @@ -17,12 +17,12 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import org.sopt.dateroad.presentation.type.ChipType -import org.sopt.dateroad.presentation.type.DateChipGroupType -import org.sopt.dateroad.presentation.type.DateTagType -import org.sopt.dateroad.presentation.ui.component.chip.DateRoadImageChip -import org.sopt.dateroad.ui.theme.DATEROADTheme -import org.sopt.dateroad.ui.theme.DateRoadTheme +import org.sopt.teamdateroad.presentation.type.ChipType +import org.sopt.teamdateroad.presentation.type.DateChipGroupType +import org.sopt.teamdateroad.presentation.type.DateTagType +import org.sopt.teamdateroad.presentation.ui.component.chip.DateRoadImageChip +import org.sopt.teamdateroad.ui.theme.DATEROADTheme +import org.sopt.teamdateroad.ui.theme.DateRoadTheme @OptIn(ExperimentalLayoutApi::class) @Composable diff --git a/app/src/main/java/org/sopt/dateroad/presentation/ui/component/dialog/DateRoadDialog.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/component/dialog/DateRoadDialog.kt similarity index 91% rename from app/src/main/java/org/sopt/dateroad/presentation/ui/component/dialog/DateRoadDialog.kt rename to app/src/main/java/org/sopt/teamdateroad/presentation/ui/component/dialog/DateRoadDialog.kt index f693d21d1..dd6f3311d 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/ui/component/dialog/DateRoadDialog.kt +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/component/dialog/DateRoadDialog.kt @@ -1,4 +1,4 @@ -package org.sopt.dateroad.presentation.ui.component.dialog +package org.sopt.teamdateroad.presentation.ui.component.dialog import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column @@ -16,10 +16,10 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import androidx.compose.ui.window.Dialog -import org.sopt.dateroad.presentation.type.OneButtonDialogType -import org.sopt.dateroad.presentation.type.OneButtonDialogWithDescriptionType -import org.sopt.dateroad.presentation.type.TwoButtonDialogType -import org.sopt.dateroad.presentation.type.TwoButtonDialogWithDescriptionType +import org.sopt.teamdateroad.presentation.type.OneButtonDialogType +import org.sopt.teamdateroad.presentation.type.OneButtonDialogWithDescriptionType +import org.sopt.teamdateroad.presentation.type.TwoButtonDialogType +import org.sopt.teamdateroad.presentation.type.TwoButtonDialogWithDescriptionType @Composable fun DateRoadDialog( diff --git a/app/src/main/java/org/sopt/dateroad/presentation/ui/component/dialog/DateRoadOneButtonDialog.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/component/dialog/DateRoadOneButtonDialog.kt similarity index 88% rename from app/src/main/java/org/sopt/dateroad/presentation/ui/component/dialog/DateRoadOneButtonDialog.kt rename to app/src/main/java/org/sopt/teamdateroad/presentation/ui/component/dialog/DateRoadOneButtonDialog.kt index c5b3e6488..84a68d14d 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/ui/component/dialog/DateRoadOneButtonDialog.kt +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/component/dialog/DateRoadOneButtonDialog.kt @@ -1,4 +1,4 @@ -package org.sopt.dateroad.presentation.ui.component.dialog +package org.sopt.teamdateroad.presentation.ui.component.dialog import androidx.compose.foundation.background import androidx.compose.foundation.layout.Column @@ -15,9 +15,9 @@ import androidx.compose.ui.draw.clip import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp -import org.sopt.dateroad.presentation.type.OneButtonDialogType -import org.sopt.dateroad.presentation.ui.component.button.DateRoadBasicButton -import org.sopt.dateroad.ui.theme.DateRoadTheme +import org.sopt.teamdateroad.presentation.type.OneButtonDialogType +import org.sopt.teamdateroad.presentation.ui.component.button.DateRoadBasicButton +import org.sopt.teamdateroad.ui.theme.DateRoadTheme @Composable fun DateRoadOneButtonDialog( diff --git a/app/src/main/java/org/sopt/dateroad/presentation/ui/component/dialog/DateRoadOneButtonDialogWithDescription.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/component/dialog/DateRoadOneButtonDialogWithDescription.kt similarity index 90% rename from app/src/main/java/org/sopt/dateroad/presentation/ui/component/dialog/DateRoadOneButtonDialogWithDescription.kt rename to app/src/main/java/org/sopt/teamdateroad/presentation/ui/component/dialog/DateRoadOneButtonDialogWithDescription.kt index 33682f027..ce5bb7787 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/ui/component/dialog/DateRoadOneButtonDialogWithDescription.kt +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/component/dialog/DateRoadOneButtonDialogWithDescription.kt @@ -1,4 +1,4 @@ -package org.sopt.dateroad.presentation.ui.component.dialog +package org.sopt.teamdateroad.presentation.ui.component.dialog import androidx.compose.foundation.background import androidx.compose.foundation.layout.Column @@ -15,9 +15,9 @@ import androidx.compose.ui.draw.clip import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp -import org.sopt.dateroad.presentation.type.OneButtonDialogWithDescriptionType -import org.sopt.dateroad.presentation.ui.component.button.DateRoadBasicButton -import org.sopt.dateroad.ui.theme.DateRoadTheme +import org.sopt.teamdateroad.presentation.type.OneButtonDialogWithDescriptionType +import org.sopt.teamdateroad.presentation.ui.component.button.DateRoadBasicButton +import org.sopt.teamdateroad.ui.theme.DateRoadTheme @Composable fun DateRoadOneButtonDialogWithDescription( diff --git a/app/src/main/java/org/sopt/dateroad/presentation/ui/component/dialog/DateRoadTwoButtonDialog.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/component/dialog/DateRoadTwoButtonDialog.kt similarity index 91% rename from app/src/main/java/org/sopt/dateroad/presentation/ui/component/dialog/DateRoadTwoButtonDialog.kt rename to app/src/main/java/org/sopt/teamdateroad/presentation/ui/component/dialog/DateRoadTwoButtonDialog.kt index 6ea966795..155d76357 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/ui/component/dialog/DateRoadTwoButtonDialog.kt +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/component/dialog/DateRoadTwoButtonDialog.kt @@ -1,4 +1,4 @@ -package org.sopt.dateroad.presentation.ui.component.dialog +package org.sopt.teamdateroad.presentation.ui.component.dialog import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement @@ -17,9 +17,9 @@ import androidx.compose.ui.draw.clip import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp -import org.sopt.dateroad.presentation.type.TwoButtonDialogType -import org.sopt.dateroad.presentation.ui.component.button.DateRoadBasicButton -import org.sopt.dateroad.ui.theme.DateRoadTheme +import org.sopt.teamdateroad.presentation.type.TwoButtonDialogType +import org.sopt.teamdateroad.presentation.ui.component.button.DateRoadBasicButton +import org.sopt.teamdateroad.ui.theme.DateRoadTheme @Composable fun DateRoadTwoButtonDialog( diff --git a/app/src/main/java/org/sopt/dateroad/presentation/ui/component/dialog/DateRoadTwoButtonDialogWithDescription.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/component/dialog/DateRoadTwoButtonDialogWithDescription.kt similarity index 92% rename from app/src/main/java/org/sopt/dateroad/presentation/ui/component/dialog/DateRoadTwoButtonDialogWithDescription.kt rename to app/src/main/java/org/sopt/teamdateroad/presentation/ui/component/dialog/DateRoadTwoButtonDialogWithDescription.kt index d003950b5..f65b8db16 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/ui/component/dialog/DateRoadTwoButtonDialogWithDescription.kt +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/component/dialog/DateRoadTwoButtonDialogWithDescription.kt @@ -1,4 +1,4 @@ -package org.sopt.dateroad.presentation.ui.component.dialog +package org.sopt.teamdateroad.presentation.ui.component.dialog import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement @@ -17,9 +17,9 @@ import androidx.compose.ui.draw.clip import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp -import org.sopt.dateroad.presentation.type.TwoButtonDialogWithDescriptionType -import org.sopt.dateroad.presentation.ui.component.button.DateRoadBasicButton -import org.sopt.dateroad.ui.theme.DateRoadTheme +import org.sopt.teamdateroad.presentation.type.TwoButtonDialogWithDescriptionType +import org.sopt.teamdateroad.presentation.ui.component.button.DateRoadBasicButton +import org.sopt.teamdateroad.ui.theme.DateRoadTheme @Composable fun DateRoadTwoButtonDialogWithDescription( diff --git a/app/src/main/java/org/sopt/dateroad/presentation/ui/component/dotsindicator/DotsIndicator.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/component/dotsindicator/DotsIndicator.kt similarity index 89% rename from app/src/main/java/org/sopt/dateroad/presentation/ui/component/dotsindicator/DotsIndicator.kt rename to app/src/main/java/org/sopt/teamdateroad/presentation/ui/component/dotsindicator/DotsIndicator.kt index d0ecbca77..adfc59cda 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/ui/component/dotsindicator/DotsIndicator.kt +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/component/dotsindicator/DotsIndicator.kt @@ -1,4 +1,4 @@ -package org.sopt.dateroad.presentation.ui.component.dotsindicator +package org.sopt.teamdateroad.presentation.ui.component.dotsindicator import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement @@ -11,7 +11,7 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp -import org.sopt.dateroad.ui.theme.DateRoadTheme +import org.sopt.teamdateroad.ui.theme.DateRoadTheme @Composable fun DotsIndicator(totalDots: Int, selectedIndex: Int, modifier: Modifier = Modifier, indicatorSize: Dp) { diff --git a/app/src/main/java/org/sopt/dateroad/presentation/ui/component/numberpicker/DateRoadNumberPicker.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/component/numberpicker/DateRoadNumberPicker.kt similarity index 92% rename from app/src/main/java/org/sopt/dateroad/presentation/ui/component/numberpicker/DateRoadNumberPicker.kt rename to app/src/main/java/org/sopt/teamdateroad/presentation/ui/component/numberpicker/DateRoadNumberPicker.kt index 979a8fc18..09c42f23a 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/ui/component/numberpicker/DateRoadNumberPicker.kt +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/component/numberpicker/DateRoadNumberPicker.kt @@ -1,4 +1,4 @@ -package org.sopt.dateroad.presentation.ui.component.numberpicker +package org.sopt.teamdateroad.presentation.ui.component.numberpicker import androidx.compose.foundation.ExperimentalFoundationApi import androidx.compose.foundation.gestures.snapping.rememberSnapFlingBehavior @@ -31,10 +31,10 @@ import androidx.compose.ui.unit.IntSize import androidx.compose.ui.unit.dp import kotlinx.coroutines.flow.distinctUntilChanged import kotlinx.coroutines.flow.map -import org.sopt.dateroad.presentation.ui.component.numberpicker.state.PickerState -import org.sopt.dateroad.presentation.ui.component.numberpicker.state.rememberPickerState -import org.sopt.dateroad.ui.theme.DATEROADTheme -import org.sopt.dateroad.ui.theme.DateRoadTheme +import org.sopt.teamdateroad.presentation.ui.component.numberpicker.state.PickerState +import org.sopt.teamdateroad.presentation.ui.component.numberpicker.state.rememberPickerState +import org.sopt.teamdateroad.ui.theme.DATEROADTheme +import org.sopt.teamdateroad.ui.theme.DateRoadTheme @OptIn(ExperimentalFoundationApi::class) @Composable diff --git a/app/src/main/java/org/sopt/dateroad/presentation/ui/component/numberpicker/state/PickerState.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/component/numberpicker/state/PickerState.kt similarity index 82% rename from app/src/main/java/org/sopt/dateroad/presentation/ui/component/numberpicker/state/PickerState.kt rename to app/src/main/java/org/sopt/teamdateroad/presentation/ui/component/numberpicker/state/PickerState.kt index 7c3fc7ed6..f096c833b 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/ui/component/numberpicker/state/PickerState.kt +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/component/numberpicker/state/PickerState.kt @@ -1,4 +1,4 @@ -package org.sopt.dateroad.presentation.ui.component.numberpicker.state +package org.sopt.teamdateroad.presentation.ui.component.numberpicker.state import androidx.compose.runtime.Composable import androidx.compose.runtime.getValue diff --git a/app/src/main/java/org/sopt/dateroad/presentation/ui/component/pager/DateRoadImagePager.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/component/pager/DateRoadImagePager.kt similarity index 88% rename from app/src/main/java/org/sopt/dateroad/presentation/ui/component/pager/DateRoadImagePager.kt rename to app/src/main/java/org/sopt/teamdateroad/presentation/ui/component/pager/DateRoadImagePager.kt index de6c7eccd..e0ab66cce 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/ui/component/pager/DateRoadImagePager.kt +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/component/pager/DateRoadImagePager.kt @@ -1,4 +1,4 @@ -package org.sopt.dateroad.presentation.ui.component.pager +package org.sopt.teamdateroad.presentation.ui.component.pager import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.aspectRatio @@ -16,10 +16,10 @@ import coil.request.ImageRequest import com.google.accompanist.pager.ExperimentalPagerApi import com.google.accompanist.pager.HorizontalPager import com.google.accompanist.pager.PagerState -import org.sopt.dateroad.R -import org.sopt.dateroad.presentation.type.TagType -import org.sopt.dateroad.presentation.ui.component.tag.DateRoadImageTag -import org.sopt.dateroad.presentation.ui.component.tag.DateRoadTextTag +import org.sopt.teamdateroad.R +import org.sopt.teamdateroad.presentation.type.TagType +import org.sopt.teamdateroad.presentation.ui.component.tag.DateRoadImageTag +import org.sopt.teamdateroad.presentation.ui.component.tag.DateRoadTextTag @OptIn(ExperimentalPagerApi::class) @Composable diff --git a/app/src/main/java/org/sopt/dateroad/presentation/ui/component/partialcolortext/PartialColorText.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/component/partialcolortext/PartialColorText.kt similarity index 94% rename from app/src/main/java/org/sopt/dateroad/presentation/ui/component/partialcolortext/PartialColorText.kt rename to app/src/main/java/org/sopt/teamdateroad/presentation/ui/component/partialcolortext/PartialColorText.kt index 549358653..3a18300ca 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/ui/component/partialcolortext/PartialColorText.kt +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/component/partialcolortext/PartialColorText.kt @@ -1,4 +1,4 @@ -package org.sopt.dateroad.presentation.ui.component.partialcolortext +package org.sopt.teamdateroad.presentation.ui.component.partialcolortext import androidx.compose.runtime.Composable import androidx.compose.ui.graphics.Color diff --git a/app/src/main/java/org/sopt/dateroad/presentation/ui/component/tabbar/DateRoadTabBar.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/component/tabbar/DateRoadTabBar.kt similarity index 95% rename from app/src/main/java/org/sopt/dateroad/presentation/ui/component/tabbar/DateRoadTabBar.kt rename to app/src/main/java/org/sopt/teamdateroad/presentation/ui/component/tabbar/DateRoadTabBar.kt index d806a4aac..1eb2ba990 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/ui/component/tabbar/DateRoadTabBar.kt +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/component/tabbar/DateRoadTabBar.kt @@ -1,4 +1,4 @@ -package org.sopt.dateroad.presentation.ui.component.tabbar +package org.sopt.teamdateroad.presentation.ui.component.tabbar import androidx.compose.animation.core.AnimationSpec import androidx.compose.animation.core.FastOutSlowInEasing @@ -30,9 +30,9 @@ import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.Constraints import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp -import org.sopt.dateroad.presentation.util.modifier.noRippleClickable -import org.sopt.dateroad.ui.theme.DATEROADTheme -import org.sopt.dateroad.ui.theme.DateRoadTheme +import org.sopt.teamdateroad.presentation.util.modifier.noRippleClickable +import org.sopt.teamdateroad.ui.theme.DATEROADTheme +import org.sopt.teamdateroad.ui.theme.DateRoadTheme enum class SubComposeID { HEIGHT, diff --git a/app/src/main/java/org/sopt/dateroad/presentation/ui/component/tag/DateRoadImageTag.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/component/tag/DateRoadImageTag.kt similarity index 91% rename from app/src/main/java/org/sopt/dateroad/presentation/ui/component/tag/DateRoadImageTag.kt rename to app/src/main/java/org/sopt/teamdateroad/presentation/ui/component/tag/DateRoadImageTag.kt index 0847a5142..e779e5f3f 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/ui/component/tag/DateRoadImageTag.kt +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/component/tag/DateRoadImageTag.kt @@ -1,4 +1,4 @@ -package org.sopt.dateroad.presentation.ui.component.tag +package org.sopt.teamdateroad.presentation.ui.component.tag import androidx.annotation.DrawableRes import androidx.compose.foundation.Image @@ -14,10 +14,10 @@ import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import org.sopt.dateroad.R -import org.sopt.dateroad.presentation.type.DateTagType -import org.sopt.dateroad.presentation.type.TagType -import org.sopt.dateroad.ui.theme.DATEROADTheme +import org.sopt.teamdateroad.R +import org.sopt.teamdateroad.presentation.type.DateTagType +import org.sopt.teamdateroad.presentation.type.TagType +import org.sopt.teamdateroad.ui.theme.DATEROADTheme @Composable fun DateRoadImageTag( diff --git a/app/src/main/java/org/sopt/dateroad/presentation/ui/component/tag/DateRoadPointTag.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/component/tag/DateRoadPointTag.kt similarity index 91% rename from app/src/main/java/org/sopt/dateroad/presentation/ui/component/tag/DateRoadPointTag.kt rename to app/src/main/java/org/sopt/teamdateroad/presentation/ui/component/tag/DateRoadPointTag.kt index 1fbdb95ee..96de7b588 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/ui/component/tag/DateRoadPointTag.kt +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/component/tag/DateRoadPointTag.kt @@ -1,4 +1,4 @@ -package org.sopt.dateroad.presentation.ui.component.tag +package org.sopt.teamdateroad.presentation.ui.component.tag import androidx.compose.foundation.Image import androidx.compose.foundation.background @@ -21,10 +21,10 @@ import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import coil.compose.AsyncImage import coil.request.ImageRequest -import org.sopt.dateroad.R -import org.sopt.dateroad.presentation.util.modifier.noRippleClickable -import org.sopt.dateroad.ui.theme.DATEROADTheme -import org.sopt.dateroad.ui.theme.DateRoadTheme +import org.sopt.teamdateroad.R +import org.sopt.teamdateroad.presentation.util.modifier.noRippleClickable +import org.sopt.teamdateroad.ui.theme.DATEROADTheme +import org.sopt.teamdateroad.ui.theme.DateRoadTheme @Composable fun DateRoadPointTag( diff --git a/app/src/main/java/org/sopt/dateroad/presentation/ui/component/tag/DateRoadTag.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/component/tag/DateRoadTag.kt similarity index 87% rename from app/src/main/java/org/sopt/dateroad/presentation/ui/component/tag/DateRoadTag.kt rename to app/src/main/java/org/sopt/teamdateroad/presentation/ui/component/tag/DateRoadTag.kt index a0d9e888c..a132a2131 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/ui/component/tag/DateRoadTag.kt +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/component/tag/DateRoadTag.kt @@ -1,4 +1,4 @@ -package org.sopt.dateroad.presentation.ui.component.tag +package org.sopt.teamdateroad.presentation.ui.component.tag import androidx.compose.foundation.background import androidx.compose.foundation.layout.Box @@ -8,7 +8,7 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip import androidx.compose.ui.unit.dp -import org.sopt.dateroad.presentation.type.TagType +import org.sopt.teamdateroad.presentation.type.TagType @Composable fun DateRoadTag( diff --git a/app/src/main/java/org/sopt/dateroad/presentation/ui/component/tag/DateRoadTextTag.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/component/tag/DateRoadTextTag.kt similarity index 91% rename from app/src/main/java/org/sopt/dateroad/presentation/ui/component/tag/DateRoadTextTag.kt rename to app/src/main/java/org/sopt/teamdateroad/presentation/ui/component/tag/DateRoadTextTag.kt index 02356d1a4..cdf360daa 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/ui/component/tag/DateRoadTextTag.kt +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/component/tag/DateRoadTextTag.kt @@ -1,12 +1,12 @@ -package org.sopt.dateroad.presentation.ui.component.tag +package org.sopt.teamdateroad.presentation.ui.component.tag import androidx.compose.foundation.layout.Column import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.tooling.preview.Preview -import org.sopt.dateroad.presentation.type.TagType -import org.sopt.dateroad.ui.theme.DATEROADTheme +import org.sopt.teamdateroad.presentation.type.TagType +import org.sopt.teamdateroad.ui.theme.DATEROADTheme @Composable fun DateRoadTextTag( diff --git a/app/src/main/java/org/sopt/dateroad/presentation/ui/component/textfield/DateRoadBasicTextField.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/component/textfield/DateRoadBasicTextField.kt similarity index 95% rename from app/src/main/java/org/sopt/dateroad/presentation/ui/component/textfield/DateRoadBasicTextField.kt rename to app/src/main/java/org/sopt/teamdateroad/presentation/ui/component/textfield/DateRoadBasicTextField.kt index 164d68086..01d428505 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/ui/component/textfield/DateRoadBasicTextField.kt +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/component/textfield/DateRoadBasicTextField.kt @@ -1,4 +1,4 @@ -package org.sopt.dateroad.presentation.ui.component.textfield +package org.sopt.teamdateroad.presentation.ui.component.textfield import androidx.annotation.DrawableRes import androidx.compose.foundation.background @@ -31,10 +31,10 @@ import androidx.compose.ui.text.input.VisualTransformation import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import org.sopt.dateroad.presentation.ui.component.textfield.model.TextFieldValidateResult -import org.sopt.dateroad.presentation.util.modifier.noRippleClickable -import org.sopt.dateroad.ui.theme.DATEROADTheme -import org.sopt.dateroad.ui.theme.DateRoadTheme +import org.sopt.teamdateroad.presentation.ui.component.textfield.model.TextFieldValidateResult +import org.sopt.teamdateroad.presentation.util.modifier.noRippleClickable +import org.sopt.teamdateroad.ui.theme.DATEROADTheme +import org.sopt.teamdateroad.ui.theme.DateRoadTheme @Composable fun DateRoadBasicTextField( diff --git a/app/src/main/java/org/sopt/dateroad/presentation/ui/component/textfield/DateRoadTextArea.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/component/textfield/DateRoadTextArea.kt similarity index 95% rename from app/src/main/java/org/sopt/dateroad/presentation/ui/component/textfield/DateRoadTextArea.kt rename to app/src/main/java/org/sopt/teamdateroad/presentation/ui/component/textfield/DateRoadTextArea.kt index bb49dfe59..5cf959306 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/ui/component/textfield/DateRoadTextArea.kt +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/component/textfield/DateRoadTextArea.kt @@ -1,4 +1,4 @@ -package org.sopt.dateroad.presentation.ui.component.textfield +package org.sopt.teamdateroad.presentation.ui.component.textfield import androidx.compose.foundation.background import androidx.compose.foundation.layout.Column @@ -24,9 +24,9 @@ import androidx.compose.ui.text.input.VisualTransformation import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import org.sopt.dateroad.R -import org.sopt.dateroad.ui.theme.DATEROADTheme -import org.sopt.dateroad.ui.theme.DateRoadTheme +import org.sopt.teamdateroad.R +import org.sopt.teamdateroad.ui.theme.DATEROADTheme +import org.sopt.teamdateroad.ui.theme.DateRoadTheme @Composable fun DateRoadTextArea( diff --git a/app/src/main/java/org/sopt/dateroad/presentation/ui/component/textfield/DateRoadTextFieldWithButton.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/component/textfield/DateRoadTextFieldWithButton.kt similarity index 95% rename from app/src/main/java/org/sopt/dateroad/presentation/ui/component/textfield/DateRoadTextFieldWithButton.kt rename to app/src/main/java/org/sopt/teamdateroad/presentation/ui/component/textfield/DateRoadTextFieldWithButton.kt index bf7289e18..14f9350b4 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/ui/component/textfield/DateRoadTextFieldWithButton.kt +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/component/textfield/DateRoadTextFieldWithButton.kt @@ -1,4 +1,4 @@ -package org.sopt.dateroad.presentation.ui.component.textfield +package org.sopt.teamdateroad.presentation.ui.component.textfield import androidx.compose.foundation.background import androidx.compose.foundation.layout.Column @@ -26,11 +26,11 @@ import androidx.compose.ui.text.input.ImeAction import androidx.compose.ui.text.input.VisualTransformation import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import org.sopt.dateroad.R -import org.sopt.dateroad.presentation.ui.component.button.DateRoadFilledButton -import org.sopt.dateroad.presentation.ui.component.textfield.model.TextFieldValidateResult -import org.sopt.dateroad.ui.theme.DATEROADTheme -import org.sopt.dateroad.ui.theme.DateRoadTheme +import org.sopt.teamdateroad.R +import org.sopt.teamdateroad.presentation.ui.component.button.DateRoadFilledButton +import org.sopt.teamdateroad.presentation.ui.component.textfield.model.TextFieldValidateResult +import org.sopt.teamdateroad.ui.theme.DATEROADTheme +import org.sopt.teamdateroad.ui.theme.DateRoadTheme @Composable fun DateRoadTextFieldWithButton( diff --git a/app/src/main/java/org/sopt/dateroad/presentation/ui/component/textfield/model/TextFieldValidateResult.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/component/textfield/model/TextFieldValidateResult.kt similarity index 78% rename from app/src/main/java/org/sopt/dateroad/presentation/ui/component/textfield/model/TextFieldValidateResult.kt rename to app/src/main/java/org/sopt/teamdateroad/presentation/ui/component/textfield/model/TextFieldValidateResult.kt index 153372e1f..f753ddcc2 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/ui/component/textfield/model/TextFieldValidateResult.kt +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/component/textfield/model/TextFieldValidateResult.kt @@ -1,4 +1,4 @@ -package org.sopt.dateroad.presentation.ui.component.textfield.model +package org.sopt.teamdateroad.presentation.ui.component.textfield.model sealed class TextFieldValidateResult { data object Basic : TextFieldValidateResult() diff --git a/app/src/main/java/org/sopt/dateroad/presentation/ui/component/topbar/DateRoadBasicTopBar.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/component/topbar/DateRoadBasicTopBar.kt similarity index 94% rename from app/src/main/java/org/sopt/dateroad/presentation/ui/component/topbar/DateRoadBasicTopBar.kt rename to app/src/main/java/org/sopt/teamdateroad/presentation/ui/component/topbar/DateRoadBasicTopBar.kt index c81f763f9..527d14b49 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/ui/component/topbar/DateRoadBasicTopBar.kt +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/component/topbar/DateRoadBasicTopBar.kt @@ -1,4 +1,4 @@ -package org.sopt.dateroad.presentation.ui.component.topbar +package org.sopt.teamdateroad.presentation.ui.component.topbar import androidx.annotation.DrawableRes import androidx.compose.foundation.background @@ -23,10 +23,10 @@ import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import org.sopt.dateroad.R -import org.sopt.dateroad.presentation.ui.component.button.DateRoadFilledButton -import org.sopt.dateroad.presentation.util.modifier.noRippleClickable -import org.sopt.dateroad.ui.theme.DateRoadTheme +import org.sopt.teamdateroad.R +import org.sopt.teamdateroad.presentation.ui.component.button.DateRoadFilledButton +import org.sopt.teamdateroad.presentation.util.modifier.noRippleClickable +import org.sopt.teamdateroad.ui.theme.DateRoadTheme @Composable fun DateRoadBasicTopBar( diff --git a/app/src/main/java/org/sopt/dateroad/presentation/ui/component/topbar/DateRoadLeftTitleTopBar.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/component/topbar/DateRoadLeftTitleTopBar.kt similarity index 91% rename from app/src/main/java/org/sopt/dateroad/presentation/ui/component/topbar/DateRoadLeftTitleTopBar.kt rename to app/src/main/java/org/sopt/teamdateroad/presentation/ui/component/topbar/DateRoadLeftTitleTopBar.kt index b5208f8f2..3465d1cf8 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/ui/component/topbar/DateRoadLeftTitleTopBar.kt +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/component/topbar/DateRoadLeftTitleTopBar.kt @@ -1,4 +1,4 @@ -package org.sopt.dateroad.presentation.ui.component.topbar +package org.sopt.teamdateroad.presentation.ui.component.topbar import androidx.compose.foundation.background import androidx.compose.foundation.layout.Box @@ -13,8 +13,8 @@ import androidx.compose.ui.graphics.Color import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import org.sopt.dateroad.presentation.ui.component.button.DateRoadImageButton -import org.sopt.dateroad.ui.theme.DateRoadTheme +import org.sopt.teamdateroad.presentation.ui.component.button.DateRoadImageButton +import org.sopt.teamdateroad.ui.theme.DateRoadTheme @Composable fun DateRoadLeftTitleTopBar( diff --git a/app/src/main/java/org/sopt/dateroad/presentation/ui/component/topbar/DateRoadScrollResponsiveTopBar.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/component/topbar/DateRoadScrollResponsiveTopBar.kt similarity index 90% rename from app/src/main/java/org/sopt/dateroad/presentation/ui/component/topbar/DateRoadScrollResponsiveTopBar.kt rename to app/src/main/java/org/sopt/teamdateroad/presentation/ui/component/topbar/DateRoadScrollResponsiveTopBar.kt index afdd33eca..48416b9db 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/ui/component/topbar/DateRoadScrollResponsiveTopBar.kt +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/component/topbar/DateRoadScrollResponsiveTopBar.kt @@ -1,4 +1,4 @@ -package org.sopt.dateroad.presentation.ui.component.topbar +package org.sopt.teamdateroad.presentation.ui.component.topbar import androidx.annotation.DrawableRes import androidx.compose.foundation.background @@ -10,9 +10,9 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Brush import androidx.compose.ui.graphics.Color import androidx.compose.ui.res.painterResource -import org.sopt.dateroad.R -import org.sopt.dateroad.presentation.util.modifier.noRippleClickable -import org.sopt.dateroad.ui.theme.DateRoadTheme +import org.sopt.teamdateroad.R +import org.sopt.teamdateroad.presentation.util.modifier.noRippleClickable +import org.sopt.teamdateroad.ui.theme.DateRoadTheme @Composable fun DateRoadScrollResponsiveTopBar( diff --git a/app/src/main/java/org/sopt/dateroad/presentation/ui/component/view/DataRoadIdeView.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/component/view/DataRoadIdeView.kt similarity index 79% rename from app/src/main/java/org/sopt/dateroad/presentation/ui/component/view/DataRoadIdeView.kt rename to app/src/main/java/org/sopt/teamdateroad/presentation/ui/component/view/DataRoadIdeView.kt index aa87d367a..05d3b708a 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/ui/component/view/DataRoadIdeView.kt +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/component/view/DataRoadIdeView.kt @@ -1,11 +1,11 @@ -package org.sopt.dateroad.presentation.ui.component.view +package org.sopt.teamdateroad.presentation.ui.component.view import androidx.compose.foundation.background import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier -import org.sopt.dateroad.ui.theme.DateRoadTheme +import org.sopt.teamdateroad.ui.theme.DateRoadTheme @Composable fun DateRoadIdleView( diff --git a/app/src/main/java/org/sopt/dateroad/presentation/ui/component/view/DateRoadEmptyView.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/component/view/DateRoadEmptyView.kt similarity index 88% rename from app/src/main/java/org/sopt/dateroad/presentation/ui/component/view/DateRoadEmptyView.kt rename to app/src/main/java/org/sopt/teamdateroad/presentation/ui/component/view/DateRoadEmptyView.kt index 8238daa2b..459f5bc19 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/ui/component/view/DateRoadEmptyView.kt +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/component/view/DateRoadEmptyView.kt @@ -1,4 +1,4 @@ -package org.sopt.dateroad.presentation.ui.component.view +package org.sopt.teamdateroad.presentation.ui.component.view import androidx.compose.foundation.Image import androidx.compose.foundation.layout.Arrangement @@ -15,9 +15,9 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import org.sopt.dateroad.presentation.type.EmptyViewType -import org.sopt.dateroad.ui.theme.DATEROADTheme -import org.sopt.dateroad.ui.theme.DateRoadTheme +import org.sopt.teamdateroad.presentation.type.EmptyViewType +import org.sopt.teamdateroad.ui.theme.DATEROADTheme +import org.sopt.teamdateroad.ui.theme.DateRoadTheme @Composable fun DateRoadEmptyView( diff --git a/app/src/main/java/org/sopt/dateroad/presentation/ui/component/view/DateRoadErrorView.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/component/view/DateRoadErrorView.kt similarity index 91% rename from app/src/main/java/org/sopt/dateroad/presentation/ui/component/view/DateRoadErrorView.kt rename to app/src/main/java/org/sopt/teamdateroad/presentation/ui/component/view/DateRoadErrorView.kt index e01d78e6c..bf2991f7c 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/ui/component/view/DateRoadErrorView.kt +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/component/view/DateRoadErrorView.kt @@ -1,4 +1,4 @@ -package org.sopt.dateroad.presentation.ui.component.view +package org.sopt.teamdateroad.presentation.ui.component.view import androidx.activity.compose.LocalOnBackPressedDispatcherOwner import androidx.compose.foundation.Image @@ -17,9 +17,9 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import org.sopt.dateroad.R -import org.sopt.dateroad.presentation.ui.component.topbar.DateRoadBasicTopBar -import org.sopt.dateroad.ui.theme.DateRoadTheme +import org.sopt.teamdateroad.R +import org.sopt.teamdateroad.presentation.ui.component.topbar.DateRoadBasicTopBar +import org.sopt.teamdateroad.ui.theme.DateRoadTheme @Composable fun DateRoadErrorView() { diff --git a/app/src/main/java/org/sopt/dateroad/presentation/ui/component/view/DateRoadLoadingView.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/component/view/DateRoadLoadingView.kt similarity index 84% rename from app/src/main/java/org/sopt/dateroad/presentation/ui/component/view/DateRoadLoadingView.kt rename to app/src/main/java/org/sopt/teamdateroad/presentation/ui/component/view/DateRoadLoadingView.kt index dde0fbf44..3b088a724 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/ui/component/view/DateRoadLoadingView.kt +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/component/view/DateRoadLoadingView.kt @@ -1,4 +1,4 @@ -package org.sopt.dateroad.presentation.ui.component.view +package org.sopt.teamdateroad.presentation.ui.component.view import androidx.compose.foundation.background import androidx.compose.foundation.layout.Box @@ -16,10 +16,10 @@ import com.airbnb.lottie.compose.LottieCompositionSpec import com.airbnb.lottie.compose.LottieConstants import com.airbnb.lottie.compose.rememberLottieAnimatable import com.airbnb.lottie.compose.rememberLottieComposition -import org.sopt.dateroad.presentation.util.LoadingView.CLIP_MAX -import org.sopt.dateroad.presentation.util.LoadingView.CLIP_MIN -import org.sopt.dateroad.presentation.util.LoadingView.LOTTIE -import org.sopt.dateroad.ui.theme.DateRoadTheme +import org.sopt.teamdateroad.presentation.util.LoadingView.CLIP_MAX +import org.sopt.teamdateroad.presentation.util.LoadingView.CLIP_MIN +import org.sopt.teamdateroad.presentation.util.LoadingView.LOTTIE +import org.sopt.teamdateroad.ui.theme.DateRoadTheme @Composable fun DateRoadLoadingView() { diff --git a/app/src/main/java/org/sopt/dateroad/presentation/ui/component/view/DateRoadWebView.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/component/view/DateRoadWebView.kt similarity index 96% rename from app/src/main/java/org/sopt/dateroad/presentation/ui/component/view/DateRoadWebView.kt rename to app/src/main/java/org/sopt/teamdateroad/presentation/ui/component/view/DateRoadWebView.kt index 3364e6d20..13e65bb87 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/ui/component/view/DateRoadWebView.kt +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/component/view/DateRoadWebView.kt @@ -1,4 +1,4 @@ -package org.sopt.dateroad.presentation.ui.component.view +package org.sopt.teamdateroad.presentation.ui.component.view import android.webkit.WebViewClient import androidx.activity.compose.BackHandler diff --git a/app/src/main/java/org/sopt/dateroad/presentation/ui/coursedetail/CourseDetailContract.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/coursedetail/CourseDetailContract.kt similarity index 87% rename from app/src/main/java/org/sopt/dateroad/presentation/ui/coursedetail/CourseDetailContract.kt rename to app/src/main/java/org/sopt/teamdateroad/presentation/ui/coursedetail/CourseDetailContract.kt index 6f5842eb2..0b0c80710 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/ui/coursedetail/CourseDetailContract.kt +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/coursedetail/CourseDetailContract.kt @@ -1,11 +1,11 @@ -package org.sopt.dateroad.presentation.ui.coursedetail +package org.sopt.teamdateroad.presentation.ui.coursedetail -import org.sopt.dateroad.domain.model.CourseDetail -import org.sopt.dateroad.presentation.type.EnrollType -import org.sopt.dateroad.presentation.util.base.UiEvent -import org.sopt.dateroad.presentation.util.base.UiSideEffect -import org.sopt.dateroad.presentation.util.base.UiState -import org.sopt.dateroad.presentation.util.view.LoadState +import org.sopt.teamdateroad.domain.model.CourseDetail +import org.sopt.teamdateroad.presentation.type.EnrollType +import org.sopt.teamdateroad.presentation.util.base.UiEvent +import org.sopt.teamdateroad.presentation.util.base.UiSideEffect +import org.sopt.teamdateroad.presentation.util.base.UiState +import org.sopt.teamdateroad.presentation.util.view.LoadState class CourseDetailContract { data class CourseDetailUiState( diff --git a/app/src/main/java/org/sopt/dateroad/presentation/ui/coursedetail/CourseDetailScreen.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/coursedetail/CourseDetailScreen.kt similarity index 88% rename from app/src/main/java/org/sopt/dateroad/presentation/ui/coursedetail/CourseDetailScreen.kt rename to app/src/main/java/org/sopt/teamdateroad/presentation/ui/coursedetail/CourseDetailScreen.kt index 0d19125dc..a8c22b973 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/ui/coursedetail/CourseDetailScreen.kt +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/coursedetail/CourseDetailScreen.kt @@ -1,4 +1,4 @@ -package org.sopt.dateroad.presentation.ui.coursedetail +package org.sopt.teamdateroad.presentation.ui.coursedetail import androidx.compose.foundation.background import androidx.compose.foundation.layout.Box @@ -26,38 +26,38 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle import androidx.lifecycle.flowWithLifecycle import com.google.accompanist.pager.ExperimentalPagerApi import com.google.accompanist.pager.PagerState -import org.sopt.dateroad.R -import org.sopt.dateroad.domain.model.CourseDetail -import org.sopt.dateroad.domain.model.Place -import org.sopt.dateroad.presentation.type.CourseDetailUnopenedDetailType -import org.sopt.dateroad.presentation.type.DateTagType.Companion.getDateTagTypeByName -import org.sopt.dateroad.presentation.type.EnrollType -import org.sopt.dateroad.presentation.type.TwoButtonDialogWithDescriptionType -import org.sopt.dateroad.presentation.ui.component.bottomsheet.DateRoadBasicBottomSheet -import org.sopt.dateroad.presentation.ui.component.dialog.DateRoadTwoButtonDialogWithDescription -import org.sopt.dateroad.presentation.ui.component.pager.DateRoadImagePager -import org.sopt.dateroad.presentation.ui.component.topbar.DateRoadScrollResponsiveTopBar -import org.sopt.dateroad.presentation.ui.component.view.DateRoadErrorView -import org.sopt.dateroad.presentation.ui.component.view.DateRoadIdleView -import org.sopt.dateroad.presentation.ui.component.view.DateRoadLoadingView -import org.sopt.dateroad.presentation.ui.component.view.DateRoadWebView -import org.sopt.dateroad.presentation.ui.coursedetail.component.CourseDetailBasicInfo -import org.sopt.dateroad.presentation.ui.coursedetail.component.CourseDetailBottomBar -import org.sopt.dateroad.presentation.ui.coursedetail.component.CourseDetailUnopenedDetail -import org.sopt.dateroad.presentation.ui.coursedetail.component.courseDetailOpenedDetail -import org.sopt.dateroad.presentation.util.CourseDetail.POINT_LACK -import org.sopt.dateroad.presentation.util.CourseDetailAmplitude.CLICK_COURSE_BACK -import org.sopt.dateroad.presentation.util.CourseDetailAmplitude.CLICK_COURSE_PURCHASE -import org.sopt.dateroad.presentation.util.CourseDetailAmplitude.COURSE_LIST_ID -import org.sopt.dateroad.presentation.util.CourseDetailAmplitude.COURSE_LIST_TITLE -import org.sopt.dateroad.presentation.util.CourseDetailAmplitude.PURCHASE_SUCCESS -import org.sopt.dateroad.presentation.util.CourseDetailAmplitude.VIEW_COURSE_DETAILS -import org.sopt.dateroad.presentation.util.ViewPath.COURSE_DETAIL -import org.sopt.dateroad.presentation.util.WebViewUrl.REPORT_URL -import org.sopt.dateroad.presentation.util.amplitude.AmplitudeUtils -import org.sopt.dateroad.presentation.util.view.LoadState -import org.sopt.dateroad.ui.theme.DATEROADTheme -import org.sopt.dateroad.ui.theme.DateRoadTheme +import org.sopt.teamdateroad.R +import org.sopt.teamdateroad.domain.model.CourseDetail +import org.sopt.teamdateroad.domain.model.Place +import org.sopt.teamdateroad.presentation.type.CourseDetailUnopenedDetailType +import org.sopt.teamdateroad.presentation.type.DateTagType.Companion.getDateTagTypeByName +import org.sopt.teamdateroad.presentation.type.EnrollType +import org.sopt.teamdateroad.presentation.type.TwoButtonDialogWithDescriptionType +import org.sopt.teamdateroad.presentation.ui.component.bottomsheet.DateRoadBasicBottomSheet +import org.sopt.teamdateroad.presentation.ui.component.dialog.DateRoadTwoButtonDialogWithDescription +import org.sopt.teamdateroad.presentation.ui.component.pager.DateRoadImagePager +import org.sopt.teamdateroad.presentation.ui.component.topbar.DateRoadScrollResponsiveTopBar +import org.sopt.teamdateroad.presentation.ui.component.view.DateRoadErrorView +import org.sopt.teamdateroad.presentation.ui.component.view.DateRoadIdleView +import org.sopt.teamdateroad.presentation.ui.component.view.DateRoadLoadingView +import org.sopt.teamdateroad.presentation.ui.component.view.DateRoadWebView +import org.sopt.teamdateroad.presentation.ui.coursedetail.component.CourseDetailBasicInfo +import org.sopt.teamdateroad.presentation.ui.coursedetail.component.CourseDetailBottomBar +import org.sopt.teamdateroad.presentation.ui.coursedetail.component.CourseDetailUnopenedDetail +import org.sopt.teamdateroad.presentation.ui.coursedetail.component.courseDetailOpenedDetail +import org.sopt.teamdateroad.presentation.util.CourseDetail.POINT_LACK +import org.sopt.teamdateroad.presentation.util.CourseDetailAmplitude.CLICK_COURSE_BACK +import org.sopt.teamdateroad.presentation.util.CourseDetailAmplitude.CLICK_COURSE_PURCHASE +import org.sopt.teamdateroad.presentation.util.CourseDetailAmplitude.COURSE_LIST_ID +import org.sopt.teamdateroad.presentation.util.CourseDetailAmplitude.COURSE_LIST_TITLE +import org.sopt.teamdateroad.presentation.util.CourseDetailAmplitude.PURCHASE_SUCCESS +import org.sopt.teamdateroad.presentation.util.CourseDetailAmplitude.VIEW_COURSE_DETAILS +import org.sopt.teamdateroad.presentation.util.ViewPath.COURSE_DETAIL +import org.sopt.teamdateroad.presentation.util.WebViewUrl.REPORT_URL +import org.sopt.teamdateroad.presentation.util.amplitude.AmplitudeUtils +import org.sopt.teamdateroad.presentation.util.view.LoadState +import org.sopt.teamdateroad.ui.theme.DATEROADTheme +import org.sopt.teamdateroad.ui.theme.DateRoadTheme @Composable fun CourseDetailRoute( diff --git a/app/src/main/java/org/sopt/dateroad/presentation/ui/coursedetail/CourseDetailViewModel.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/coursedetail/CourseDetailViewModel.kt similarity index 87% rename from app/src/main/java/org/sopt/dateroad/presentation/ui/coursedetail/CourseDetailViewModel.kt rename to app/src/main/java/org/sopt/teamdateroad/presentation/ui/coursedetail/CourseDetailViewModel.kt index e672944cf..d922ec447 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/ui/coursedetail/CourseDetailViewModel.kt +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/coursedetail/CourseDetailViewModel.kt @@ -1,24 +1,24 @@ -package org.sopt.dateroad.presentation.ui.coursedetail +package org.sopt.teamdateroad.presentation.ui.coursedetail import androidx.lifecycle.viewModelScope import dagger.hilt.android.lifecycle.HiltViewModel import javax.inject.Inject import kotlinx.coroutines.launch -import org.sopt.dateroad.domain.model.UsePoint -import org.sopt.dateroad.domain.usecase.DeleteCourseLikeUseCase -import org.sopt.dateroad.domain.usecase.DeleteCourseUseCase -import org.sopt.dateroad.domain.usecase.GetCourseDetailUseCase -import org.sopt.dateroad.domain.usecase.PostCourseLikeUseCase -import org.sopt.dateroad.domain.usecase.PostUsePointUseCase -import org.sopt.dateroad.presentation.util.CourseDetailAmplitude.CLICK_COURSE_LIKES -import org.sopt.dateroad.presentation.util.CourseDetailAmplitude.COURSE_LIST_LIKE -import org.sopt.dateroad.presentation.util.Point -import org.sopt.dateroad.presentation.util.UserPropertyAmplitude.USER_FREE_REMAINED -import org.sopt.dateroad.presentation.util.UserPropertyAmplitude.USER_POINT -import org.sopt.dateroad.presentation.util.UserPropertyAmplitude.USER_PURCHASE_COUNT -import org.sopt.dateroad.presentation.util.amplitude.AmplitudeUtils -import org.sopt.dateroad.presentation.util.base.BaseViewModel -import org.sopt.dateroad.presentation.util.view.LoadState +import org.sopt.teamdateroad.domain.model.UsePoint +import org.sopt.teamdateroad.domain.usecase.DeleteCourseLikeUseCase +import org.sopt.teamdateroad.domain.usecase.DeleteCourseUseCase +import org.sopt.teamdateroad.domain.usecase.GetCourseDetailUseCase +import org.sopt.teamdateroad.domain.usecase.PostCourseLikeUseCase +import org.sopt.teamdateroad.domain.usecase.PostUsePointUseCase +import org.sopt.teamdateroad.presentation.util.CourseDetailAmplitude.CLICK_COURSE_LIKES +import org.sopt.teamdateroad.presentation.util.CourseDetailAmplitude.COURSE_LIST_LIKE +import org.sopt.teamdateroad.presentation.util.Point +import org.sopt.teamdateroad.presentation.util.UserPropertyAmplitude.USER_FREE_REMAINED +import org.sopt.teamdateroad.presentation.util.UserPropertyAmplitude.USER_POINT +import org.sopt.teamdateroad.presentation.util.UserPropertyAmplitude.USER_PURCHASE_COUNT +import org.sopt.teamdateroad.presentation.util.amplitude.AmplitudeUtils +import org.sopt.teamdateroad.presentation.util.base.BaseViewModel +import org.sopt.teamdateroad.presentation.util.view.LoadState @HiltViewModel class CourseDetailViewModel @Inject constructor( diff --git a/app/src/main/java/org/sopt/dateroad/presentation/ui/coursedetail/component/CourseDetailBasicInfo.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/coursedetail/component/CourseDetailBasicInfo.kt similarity index 90% rename from app/src/main/java/org/sopt/dateroad/presentation/ui/coursedetail/component/CourseDetailBasicInfo.kt rename to app/src/main/java/org/sopt/teamdateroad/presentation/ui/coursedetail/component/CourseDetailBasicInfo.kt index adb335cc3..fc236fd04 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/ui/coursedetail/component/CourseDetailBasicInfo.kt +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/coursedetail/component/CourseDetailBasicInfo.kt @@ -1,4 +1,4 @@ -package org.sopt.dateroad.presentation.ui.coursedetail.component +package org.sopt.teamdateroad.presentation.ui.coursedetail.component import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Spacer @@ -8,7 +8,7 @@ import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp -import org.sopt.dateroad.ui.theme.DateRoadTheme +import org.sopt.teamdateroad.ui.theme.DateRoadTheme @Composable fun CourseDetailBasicInfo( diff --git a/app/src/main/java/org/sopt/dateroad/presentation/ui/coursedetail/component/CourseDetailBottomBar.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/coursedetail/component/CourseDetailBottomBar.kt similarity index 89% rename from app/src/main/java/org/sopt/dateroad/presentation/ui/coursedetail/component/CourseDetailBottomBar.kt rename to app/src/main/java/org/sopt/teamdateroad/presentation/ui/coursedetail/component/CourseDetailBottomBar.kt index d5750d661..554195a31 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/ui/coursedetail/component/CourseDetailBottomBar.kt +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/coursedetail/component/CourseDetailBottomBar.kt @@ -1,4 +1,4 @@ -package org.sopt.dateroad.presentation.ui.coursedetail.component +package org.sopt.teamdateroad.presentation.ui.coursedetail.component import androidx.compose.foundation.background import androidx.compose.foundation.layout.Box @@ -20,10 +20,10 @@ import androidx.compose.ui.platform.LocalDensity import androidx.compose.ui.res.stringResource import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import org.sopt.dateroad.R -import org.sopt.dateroad.presentation.ui.component.button.DateRoadBasicButton -import org.sopt.dateroad.presentation.ui.component.button.DateRoadImageButton -import org.sopt.dateroad.ui.theme.DateRoadTheme +import org.sopt.teamdateroad.R +import org.sopt.teamdateroad.presentation.ui.component.button.DateRoadBasicButton +import org.sopt.teamdateroad.presentation.ui.component.button.DateRoadImageButton +import org.sopt.teamdateroad.ui.theme.DateRoadTheme @Composable fun CourseDetailBottomBar( diff --git a/app/src/main/java/org/sopt/dateroad/presentation/ui/coursedetail/component/CourseDetailCost.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/coursedetail/component/CourseDetailCost.kt similarity index 89% rename from app/src/main/java/org/sopt/dateroad/presentation/ui/coursedetail/component/CourseDetailCost.kt rename to app/src/main/java/org/sopt/teamdateroad/presentation/ui/coursedetail/component/CourseDetailCost.kt index c9c024f00..cbba74976 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/ui/coursedetail/component/CourseDetailCost.kt +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/coursedetail/component/CourseDetailCost.kt @@ -1,4 +1,4 @@ -package org.sopt.dateroad.presentation.ui.coursedetail.component +package org.sopt.teamdateroad.presentation.ui.coursedetail.component import androidx.compose.foundation.background import androidx.compose.foundation.layout.Spacer @@ -12,8 +12,8 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp -import org.sopt.dateroad.R -import org.sopt.dateroad.ui.theme.DateRoadTheme +import org.sopt.teamdateroad.R +import org.sopt.teamdateroad.ui.theme.DateRoadTheme @Composable fun CourseDetailCost( diff --git a/app/src/main/java/org/sopt/dateroad/presentation/ui/coursedetail/component/CourseDetailInfoBar.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/coursedetail/component/CourseDetailInfoBar.kt similarity index 94% rename from app/src/main/java/org/sopt/dateroad/presentation/ui/coursedetail/component/CourseDetailInfoBar.kt rename to app/src/main/java/org/sopt/teamdateroad/presentation/ui/coursedetail/component/CourseDetailInfoBar.kt index b5b7430fc..56fa387fe 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/ui/coursedetail/component/CourseDetailInfoBar.kt +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/coursedetail/component/CourseDetailInfoBar.kt @@ -1,4 +1,4 @@ -package org.sopt.dateroad.presentation.ui.coursedetail.component +package org.sopt.teamdateroad.presentation.ui.coursedetail.component import androidx.compose.foundation.Image import androidx.compose.foundation.layout.Row @@ -12,8 +12,8 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.res.painterResource import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import org.sopt.dateroad.R -import org.sopt.dateroad.ui.theme.DateRoadTheme +import org.sopt.teamdateroad.R +import org.sopt.teamdateroad.ui.theme.DateRoadTheme @Composable fun CourseDetailInfoBar( diff --git a/app/src/main/java/org/sopt/dateroad/presentation/ui/coursedetail/component/CourseDetailOpenedDetail.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/coursedetail/component/CourseDetailOpenedDetail.kt similarity index 81% rename from app/src/main/java/org/sopt/dateroad/presentation/ui/coursedetail/component/CourseDetailOpenedDetail.kt rename to app/src/main/java/org/sopt/teamdateroad/presentation/ui/coursedetail/component/CourseDetailOpenedDetail.kt index 53d808d52..4a46c9412 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/ui/coursedetail/component/CourseDetailOpenedDetail.kt +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/coursedetail/component/CourseDetailOpenedDetail.kt @@ -1,4 +1,4 @@ -package org.sopt.dateroad.presentation.ui.coursedetail.component +package org.sopt.teamdateroad.presentation.ui.coursedetail.component import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.height @@ -7,9 +7,9 @@ import androidx.compose.foundation.lazy.LazyListScope import androidx.compose.material3.Text import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp -import org.sopt.dateroad.domain.model.Place -import org.sopt.dateroad.presentation.type.DateTagType -import org.sopt.dateroad.ui.theme.DateRoadTheme +import org.sopt.teamdateroad.domain.model.Place +import org.sopt.teamdateroad.presentation.type.DateTagType +import org.sopt.teamdateroad.ui.theme.DateRoadTheme fun LazyListScope.courseDetailOpenedDetail( description: String, diff --git a/app/src/main/java/org/sopt/dateroad/presentation/ui/coursedetail/component/CourseDetailTag.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/coursedetail/component/CourseDetailTag.kt similarity index 81% rename from app/src/main/java/org/sopt/dateroad/presentation/ui/coursedetail/component/CourseDetailTag.kt rename to app/src/main/java/org/sopt/teamdateroad/presentation/ui/coursedetail/component/CourseDetailTag.kt index f0b01c965..2c2fbd362 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/ui/coursedetail/component/CourseDetailTag.kt +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/coursedetail/component/CourseDetailTag.kt @@ -1,4 +1,4 @@ -package org.sopt.dateroad.presentation.ui.coursedetail.component +package org.sopt.teamdateroad.presentation.ui.coursedetail.component import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column @@ -13,11 +13,11 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp -import org.sopt.dateroad.R -import org.sopt.dateroad.presentation.type.ChipType -import org.sopt.dateroad.presentation.type.DateTagType -import org.sopt.dateroad.presentation.ui.component.chip.DateRoadImageChip -import org.sopt.dateroad.ui.theme.DateRoadTheme +import org.sopt.teamdateroad.R +import org.sopt.teamdateroad.presentation.type.ChipType +import org.sopt.teamdateroad.presentation.type.DateTagType +import org.sopt.teamdateroad.presentation.ui.component.chip.DateRoadImageChip +import org.sopt.teamdateroad.ui.theme.DateRoadTheme @Composable fun CourseDetailTag( diff --git a/app/src/main/java/org/sopt/dateroad/presentation/ui/coursedetail/component/CourseDetailTimeline.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/coursedetail/component/CourseDetailTimeline.kt similarity index 80% rename from app/src/main/java/org/sopt/dateroad/presentation/ui/coursedetail/component/CourseDetailTimeline.kt rename to app/src/main/java/org/sopt/teamdateroad/presentation/ui/coursedetail/component/CourseDetailTimeline.kt index 0cbdb6b1d..9141bf5e4 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/ui/coursedetail/component/CourseDetailTimeline.kt +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/coursedetail/component/CourseDetailTimeline.kt @@ -1,4 +1,4 @@ -package org.sopt.dateroad.presentation.ui.coursedetail.component +package org.sopt.teamdateroad.presentation.ui.coursedetail.component import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.height @@ -8,11 +8,11 @@ import androidx.compose.material3.Text import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp -import org.sopt.dateroad.R -import org.sopt.dateroad.domain.model.Place -import org.sopt.dateroad.presentation.type.PlaceCardType -import org.sopt.dateroad.presentation.ui.component.card.DateRoadPlaceCard -import org.sopt.dateroad.ui.theme.DateRoadTheme +import org.sopt.teamdateroad.R +import org.sopt.teamdateroad.domain.model.Place +import org.sopt.teamdateroad.presentation.type.PlaceCardType +import org.sopt.teamdateroad.presentation.ui.component.card.DateRoadPlaceCard +import org.sopt.teamdateroad.ui.theme.DateRoadTheme fun LazyListScope.courseDetailTimeline( startAt: String, diff --git a/app/src/main/java/org/sopt/dateroad/presentation/ui/coursedetail/component/CourseDetailUnopenedDetail.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/coursedetail/component/CourseDetailUnopenedDetail.kt similarity index 92% rename from app/src/main/java/org/sopt/dateroad/presentation/ui/coursedetail/component/CourseDetailUnopenedDetail.kt rename to app/src/main/java/org/sopt/teamdateroad/presentation/ui/coursedetail/component/CourseDetailUnopenedDetail.kt index 1c288ea63..4274c68d4 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/ui/coursedetail/component/CourseDetailUnopenedDetail.kt +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/coursedetail/component/CourseDetailUnopenedDetail.kt @@ -1,4 +1,4 @@ -package org.sopt.dateroad.presentation.ui.coursedetail.component +package org.sopt.teamdateroad.presentation.ui.coursedetail.component import androidx.compose.foundation.Image import androidx.compose.foundation.background @@ -17,10 +17,10 @@ import androidx.compose.ui.graphics.Color import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp -import org.sopt.dateroad.R -import org.sopt.dateroad.presentation.type.CourseDetailUnopenedDetailType -import org.sopt.dateroad.presentation.ui.component.button.DateRoadFilledButton -import org.sopt.dateroad.ui.theme.DateRoadTheme +import org.sopt.teamdateroad.R +import org.sopt.teamdateroad.presentation.type.CourseDetailUnopenedDetailType +import org.sopt.teamdateroad.presentation.ui.component.button.DateRoadFilledButton +import org.sopt.teamdateroad.ui.theme.DateRoadTheme @Composable fun CourseDetailUnopenedDetail( diff --git a/app/src/main/java/org/sopt/dateroad/presentation/ui/coursedetail/navigation/CourseDetailNavigation.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/coursedetail/navigation/CourseDetailNavigation.kt similarity index 84% rename from app/src/main/java/org/sopt/dateroad/presentation/ui/coursedetail/navigation/CourseDetailNavigation.kt rename to app/src/main/java/org/sopt/teamdateroad/presentation/ui/coursedetail/navigation/CourseDetailNavigation.kt index df15b7ae3..aa054abbf 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/ui/coursedetail/navigation/CourseDetailNavigation.kt +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/coursedetail/navigation/CourseDetailNavigation.kt @@ -1,12 +1,12 @@ -package org.sopt.dateroad.presentation.ui.coursedetail.navigation +package org.sopt.teamdateroad.presentation.ui.coursedetail.navigation import androidx.navigation.NavController import androidx.navigation.NavGraphBuilder import androidx.navigation.NavType import androidx.navigation.compose.composable import androidx.navigation.navArgument -import org.sopt.dateroad.presentation.type.EnrollType -import org.sopt.dateroad.presentation.ui.coursedetail.CourseDetailRoute +import org.sopt.teamdateroad.presentation.type.EnrollType +import org.sopt.teamdateroad.presentation.ui.coursedetail.CourseDetailRoute fun NavController.navigationCourseDetail(courseId: Int) { this.navigate(route = CourseDetailRoute.route(courseId = courseId)) diff --git a/app/src/main/java/org/sopt/dateroad/presentation/ui/enroll/EnrollContract.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/enroll/EnrollContract.kt similarity index 72% rename from app/src/main/java/org/sopt/dateroad/presentation/ui/enroll/EnrollContract.kt rename to app/src/main/java/org/sopt/teamdateroad/presentation/ui/enroll/EnrollContract.kt index 550944ffa..e1a6261ab 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/ui/enroll/EnrollContract.kt +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/enroll/EnrollContract.kt @@ -1,32 +1,32 @@ -package org.sopt.dateroad.presentation.ui.enroll +package org.sopt.teamdateroad.presentation.ui.enroll -import org.sopt.dateroad.domain.model.CourseDetail -import org.sopt.dateroad.domain.model.Enroll -import org.sopt.dateroad.domain.model.Place -import org.sopt.dateroad.domain.model.TimelineDetail -import org.sopt.dateroad.domain.type.RegionType -import org.sopt.dateroad.presentation.type.EnrollScreenType -import org.sopt.dateroad.presentation.type.EnrollType -import org.sopt.dateroad.presentation.ui.component.bottomsheet.model.Picker -import org.sopt.dateroad.presentation.ui.component.textfield.model.TextFieldValidateResult -import org.sopt.dateroad.presentation.util.DatePicker.DAY_END -import org.sopt.dateroad.presentation.util.DatePicker.DAY_START -import org.sopt.dateroad.presentation.util.DatePicker.MONTH_END -import org.sopt.dateroad.presentation.util.DatePicker.MONTH_START -import org.sopt.dateroad.presentation.util.DatePicker.YEAR_END -import org.sopt.dateroad.presentation.util.DatePicker.YEAR_START -import org.sopt.dateroad.presentation.util.DatePicker.YEAR_START_INDEX -import org.sopt.dateroad.presentation.util.DurationPicker.DURATION_END -import org.sopt.dateroad.presentation.util.DurationPicker.DURATION_START -import org.sopt.dateroad.presentation.util.TimePicker -import org.sopt.dateroad.presentation.util.TimePicker.HOUR_END -import org.sopt.dateroad.presentation.util.TimePicker.HOUR_START -import org.sopt.dateroad.presentation.util.TimePicker.MINUTE_END -import org.sopt.dateroad.presentation.util.TimePicker.MINUTE_START -import org.sopt.dateroad.presentation.util.base.UiEvent -import org.sopt.dateroad.presentation.util.base.UiSideEffect -import org.sopt.dateroad.presentation.util.base.UiState -import org.sopt.dateroad.presentation.util.view.LoadState +import org.sopt.teamdateroad.domain.model.CourseDetail +import org.sopt.teamdateroad.domain.model.Enroll +import org.sopt.teamdateroad.domain.model.Place +import org.sopt.teamdateroad.domain.model.TimelineDetail +import org.sopt.teamdateroad.domain.type.RegionType +import org.sopt.teamdateroad.presentation.type.EnrollScreenType +import org.sopt.teamdateroad.presentation.type.EnrollType +import org.sopt.teamdateroad.presentation.ui.component.bottomsheet.model.Picker +import org.sopt.teamdateroad.presentation.ui.component.textfield.model.TextFieldValidateResult +import org.sopt.teamdateroad.presentation.util.DatePicker.DAY_END +import org.sopt.teamdateroad.presentation.util.DatePicker.DAY_START +import org.sopt.teamdateroad.presentation.util.DatePicker.MONTH_END +import org.sopt.teamdateroad.presentation.util.DatePicker.MONTH_START +import org.sopt.teamdateroad.presentation.util.DatePicker.YEAR_END +import org.sopt.teamdateroad.presentation.util.DatePicker.YEAR_START +import org.sopt.teamdateroad.presentation.util.DatePicker.YEAR_START_INDEX +import org.sopt.teamdateroad.presentation.util.DurationPicker.DURATION_END +import org.sopt.teamdateroad.presentation.util.DurationPicker.DURATION_START +import org.sopt.teamdateroad.presentation.util.TimePicker +import org.sopt.teamdateroad.presentation.util.TimePicker.HOUR_END +import org.sopt.teamdateroad.presentation.util.TimePicker.HOUR_START +import org.sopt.teamdateroad.presentation.util.TimePicker.MINUTE_END +import org.sopt.teamdateroad.presentation.util.TimePicker.MINUTE_START +import org.sopt.teamdateroad.presentation.util.base.UiEvent +import org.sopt.teamdateroad.presentation.util.base.UiSideEffect +import org.sopt.teamdateroad.presentation.util.base.UiState +import org.sopt.teamdateroad.presentation.util.view.LoadState class EnrollContract { data class EnrollUiState( diff --git a/app/src/main/java/org/sopt/dateroad/presentation/ui/enroll/EnrollFirstScreen.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/enroll/EnrollFirstScreen.kt similarity index 82% rename from app/src/main/java/org/sopt/dateroad/presentation/ui/enroll/EnrollFirstScreen.kt rename to app/src/main/java/org/sopt/teamdateroad/presentation/ui/enroll/EnrollFirstScreen.kt index ab73e0405..ff31161b4 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/ui/enroll/EnrollFirstScreen.kt +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/enroll/EnrollFirstScreen.kt @@ -1,4 +1,4 @@ -package org.sopt.dateroad.presentation.ui.enroll +package org.sopt.teamdateroad.presentation.ui.enroll import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Spacer @@ -12,17 +12,17 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import org.sopt.dateroad.R -import org.sopt.dateroad.domain.type.GyeonggiAreaType -import org.sopt.dateroad.domain.type.IncheonAreaType -import org.sopt.dateroad.domain.type.SeoulAreaType -import org.sopt.dateroad.presentation.type.DateChipGroupType -import org.sopt.dateroad.presentation.type.DateTagType -import org.sopt.dateroad.presentation.type.DateTagType.Companion.getDateTagTypeByName -import org.sopt.dateroad.presentation.ui.component.chipgroup.DateRoadDateChipGroup -import org.sopt.dateroad.presentation.ui.component.textfield.DateRoadBasicTextField -import org.sopt.dateroad.presentation.util.view.LoadState -import org.sopt.dateroad.ui.theme.DATEROADTheme +import org.sopt.teamdateroad.R +import org.sopt.teamdateroad.domain.type.GyeonggiAreaType +import org.sopt.teamdateroad.domain.type.IncheonAreaType +import org.sopt.teamdateroad.domain.type.SeoulAreaType +import org.sopt.teamdateroad.presentation.type.DateChipGroupType +import org.sopt.teamdateroad.presentation.type.DateTagType +import org.sopt.teamdateroad.presentation.type.DateTagType.Companion.getDateTagTypeByName +import org.sopt.teamdateroad.presentation.ui.component.chipgroup.DateRoadDateChipGroup +import org.sopt.teamdateroad.presentation.ui.component.textfield.DateRoadBasicTextField +import org.sopt.teamdateroad.presentation.util.view.LoadState +import org.sopt.teamdateroad.ui.theme.DATEROADTheme @Composable fun EnrollFirstScreen( diff --git a/app/src/main/java/org/sopt/dateroad/presentation/ui/enroll/EnrollScreen.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/enroll/EnrollScreen.kt similarity index 84% rename from app/src/main/java/org/sopt/dateroad/presentation/ui/enroll/EnrollScreen.kt rename to app/src/main/java/org/sopt/teamdateroad/presentation/ui/enroll/EnrollScreen.kt index d25ae3d92..be4f76936 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/ui/enroll/EnrollScreen.kt +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/enroll/EnrollScreen.kt @@ -1,4 +1,4 @@ -package org.sopt.dateroad.presentation.ui.enroll +package org.sopt.teamdateroad.presentation.ui.enroll import android.net.Uri import android.os.Build @@ -31,70 +31,70 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle import androidx.lifecycle.flowWithLifecycle import java.time.LocalDate import java.time.format.DateTimeFormatter -import org.sopt.dateroad.R -import org.sopt.dateroad.domain.model.Place -import org.sopt.dateroad.domain.type.RegionType -import org.sopt.dateroad.presentation.type.DateRoadRegionBottomSheetType -import org.sopt.dateroad.presentation.type.DateTagType -import org.sopt.dateroad.presentation.type.EnrollScreenType -import org.sopt.dateroad.presentation.type.EnrollType -import org.sopt.dateroad.presentation.type.MyCourseType -import org.sopt.dateroad.presentation.type.OneButtonDialogType -import org.sopt.dateroad.presentation.type.OneButtonDialogWithDescriptionType -import org.sopt.dateroad.presentation.ui.component.bottomsheet.DateRoadPickerBottomSheet -import org.sopt.dateroad.presentation.ui.component.bottomsheet.DateRoadRegionBottomSheet -import org.sopt.dateroad.presentation.ui.component.button.DateRoadBasicButton -import org.sopt.dateroad.presentation.ui.component.button.DateRoadFilledButton -import org.sopt.dateroad.presentation.ui.component.dialog.DateRoadOneButtonDialog -import org.sopt.dateroad.presentation.ui.component.dialog.DateRoadOneButtonDialogWithDescription -import org.sopt.dateroad.presentation.ui.component.textfield.model.TextFieldValidateResult -import org.sopt.dateroad.presentation.ui.component.topbar.DateRoadBasicTopBar -import org.sopt.dateroad.presentation.ui.component.view.DateRoadErrorView -import org.sopt.dateroad.presentation.ui.component.view.DateRoadLoadingView -import org.sopt.dateroad.presentation.ui.enroll.component.EnrollPhotos -import org.sopt.dateroad.presentation.util.DatePicker -import org.sopt.dateroad.presentation.util.DatePicker.SEPARATOR -import org.sopt.dateroad.presentation.util.EnrollAmplitude.CLICK_BRING_COURSE -import org.sopt.dateroad.presentation.util.EnrollAmplitude.CLICK_COURSE1_BACK -import org.sopt.dateroad.presentation.util.EnrollAmplitude.CLICK_COURSE2_BACK -import org.sopt.dateroad.presentation.util.EnrollAmplitude.CLICK_COURSE3_BACK -import org.sopt.dateroad.presentation.util.EnrollAmplitude.CLICK_SCHEDULE1_BACK -import org.sopt.dateroad.presentation.util.EnrollAmplitude.CLICK_SCHEDULE2_BACK -import org.sopt.dateroad.presentation.util.EnrollAmplitude.COURSE_CONTENT_BOOL -import org.sopt.dateroad.presentation.util.EnrollAmplitude.COURSE_CONTENT_NUM -import org.sopt.dateroad.presentation.util.EnrollAmplitude.COURSE_COST -import org.sopt.dateroad.presentation.util.EnrollAmplitude.COURSE_DATE -import org.sopt.dateroad.presentation.util.EnrollAmplitude.COURSE_IMAGE -import org.sopt.dateroad.presentation.util.EnrollAmplitude.COURSE_LOCATION -import org.sopt.dateroad.presentation.util.EnrollAmplitude.COURSE_START_TIME -import org.sopt.dateroad.presentation.util.EnrollAmplitude.COURSE_TAGS -import org.sopt.dateroad.presentation.util.EnrollAmplitude.COURSE_TITLE -import org.sopt.dateroad.presentation.util.EnrollAmplitude.DATE_AREA -import org.sopt.dateroad.presentation.util.EnrollAmplitude.DATE_COURSE_NUM -import org.sopt.dateroad.presentation.util.EnrollAmplitude.DATE_DATE -import org.sopt.dateroad.presentation.util.EnrollAmplitude.DATE_DETAIL_LOCATION -import org.sopt.dateroad.presentation.util.EnrollAmplitude.DATE_DETAIL_TIME -import org.sopt.dateroad.presentation.util.EnrollAmplitude.DATE_LOCATION -import org.sopt.dateroad.presentation.util.EnrollAmplitude.DATE_SPEND_TIME -import org.sopt.dateroad.presentation.util.EnrollAmplitude.DATE_TAG_NUM -import org.sopt.dateroad.presentation.util.EnrollAmplitude.DATE_TIME -import org.sopt.dateroad.presentation.util.EnrollAmplitude.DATE_TITLE -import org.sopt.dateroad.presentation.util.EnrollAmplitude.LOCATION_NUM -import org.sopt.dateroad.presentation.util.EnrollAmplitude.VIEW_ADD_BRING_COURSE -import org.sopt.dateroad.presentation.util.EnrollAmplitude.VIEW_ADD_BRING_COURSE2 -import org.sopt.dateroad.presentation.util.EnrollAmplitude.VIEW_ADD_SCHEDULE -import org.sopt.dateroad.presentation.util.EnrollAmplitude.VIEW_ADD_SCHEDULE2 -import org.sopt.dateroad.presentation.util.EnrollAmplitude.VIEW_COURSE1 -import org.sopt.dateroad.presentation.util.EnrollAmplitude.VIEW_PATH -import org.sopt.dateroad.presentation.util.EnrollScreen.MAX_ITEMS -import org.sopt.dateroad.presentation.util.EnrollScreen.TITLE_MIN_LENGTH -import org.sopt.dateroad.presentation.util.GalleryLauncher.INPUT -import org.sopt.dateroad.presentation.util.TimePicker -import org.sopt.dateroad.presentation.util.TimelineAmplitude.CLICK_ADD_SCHEDULE -import org.sopt.dateroad.presentation.util.amplitude.AmplitudeUtils -import org.sopt.dateroad.presentation.util.view.LoadState -import org.sopt.dateroad.ui.theme.DATEROADTheme -import org.sopt.dateroad.ui.theme.DateRoadTheme +import org.sopt.teamdateroad.R +import org.sopt.teamdateroad.domain.model.Place +import org.sopt.teamdateroad.domain.type.RegionType +import org.sopt.teamdateroad.presentation.type.DateRoadRegionBottomSheetType +import org.sopt.teamdateroad.presentation.type.DateTagType +import org.sopt.teamdateroad.presentation.type.EnrollScreenType +import org.sopt.teamdateroad.presentation.type.EnrollType +import org.sopt.teamdateroad.presentation.type.MyCourseType +import org.sopt.teamdateroad.presentation.type.OneButtonDialogType +import org.sopt.teamdateroad.presentation.type.OneButtonDialogWithDescriptionType +import org.sopt.teamdateroad.presentation.ui.component.bottomsheet.DateRoadPickerBottomSheet +import org.sopt.teamdateroad.presentation.ui.component.bottomsheet.DateRoadRegionBottomSheet +import org.sopt.teamdateroad.presentation.ui.component.button.DateRoadBasicButton +import org.sopt.teamdateroad.presentation.ui.component.button.DateRoadFilledButton +import org.sopt.teamdateroad.presentation.ui.component.dialog.DateRoadOneButtonDialog +import org.sopt.teamdateroad.presentation.ui.component.dialog.DateRoadOneButtonDialogWithDescription +import org.sopt.teamdateroad.presentation.ui.component.textfield.model.TextFieldValidateResult +import org.sopt.teamdateroad.presentation.ui.component.topbar.DateRoadBasicTopBar +import org.sopt.teamdateroad.presentation.ui.component.view.DateRoadErrorView +import org.sopt.teamdateroad.presentation.ui.component.view.DateRoadLoadingView +import org.sopt.teamdateroad.presentation.ui.enroll.component.EnrollPhotos +import org.sopt.teamdateroad.presentation.util.DatePicker +import org.sopt.teamdateroad.presentation.util.DatePicker.SEPARATOR +import org.sopt.teamdateroad.presentation.util.EnrollAmplitude.CLICK_BRING_COURSE +import org.sopt.teamdateroad.presentation.util.EnrollAmplitude.CLICK_COURSE1_BACK +import org.sopt.teamdateroad.presentation.util.EnrollAmplitude.CLICK_COURSE2_BACK +import org.sopt.teamdateroad.presentation.util.EnrollAmplitude.CLICK_COURSE3_BACK +import org.sopt.teamdateroad.presentation.util.EnrollAmplitude.CLICK_SCHEDULE1_BACK +import org.sopt.teamdateroad.presentation.util.EnrollAmplitude.CLICK_SCHEDULE2_BACK +import org.sopt.teamdateroad.presentation.util.EnrollAmplitude.COURSE_CONTENT_BOOL +import org.sopt.teamdateroad.presentation.util.EnrollAmplitude.COURSE_CONTENT_NUM +import org.sopt.teamdateroad.presentation.util.EnrollAmplitude.COURSE_COST +import org.sopt.teamdateroad.presentation.util.EnrollAmplitude.COURSE_DATE +import org.sopt.teamdateroad.presentation.util.EnrollAmplitude.COURSE_IMAGE +import org.sopt.teamdateroad.presentation.util.EnrollAmplitude.COURSE_LOCATION +import org.sopt.teamdateroad.presentation.util.EnrollAmplitude.COURSE_START_TIME +import org.sopt.teamdateroad.presentation.util.EnrollAmplitude.COURSE_TAGS +import org.sopt.teamdateroad.presentation.util.EnrollAmplitude.COURSE_TITLE +import org.sopt.teamdateroad.presentation.util.EnrollAmplitude.DATE_AREA +import org.sopt.teamdateroad.presentation.util.EnrollAmplitude.DATE_COURSE_NUM +import org.sopt.teamdateroad.presentation.util.EnrollAmplitude.DATE_DATE +import org.sopt.teamdateroad.presentation.util.EnrollAmplitude.DATE_DETAIL_LOCATION +import org.sopt.teamdateroad.presentation.util.EnrollAmplitude.DATE_DETAIL_TIME +import org.sopt.teamdateroad.presentation.util.EnrollAmplitude.DATE_LOCATION +import org.sopt.teamdateroad.presentation.util.EnrollAmplitude.DATE_SPEND_TIME +import org.sopt.teamdateroad.presentation.util.EnrollAmplitude.DATE_TAG_NUM +import org.sopt.teamdateroad.presentation.util.EnrollAmplitude.DATE_TIME +import org.sopt.teamdateroad.presentation.util.EnrollAmplitude.DATE_TITLE +import org.sopt.teamdateroad.presentation.util.EnrollAmplitude.LOCATION_NUM +import org.sopt.teamdateroad.presentation.util.EnrollAmplitude.VIEW_ADD_BRING_COURSE +import org.sopt.teamdateroad.presentation.util.EnrollAmplitude.VIEW_ADD_BRING_COURSE2 +import org.sopt.teamdateroad.presentation.util.EnrollAmplitude.VIEW_ADD_SCHEDULE +import org.sopt.teamdateroad.presentation.util.EnrollAmplitude.VIEW_ADD_SCHEDULE2 +import org.sopt.teamdateroad.presentation.util.EnrollAmplitude.VIEW_COURSE1 +import org.sopt.teamdateroad.presentation.util.EnrollAmplitude.VIEW_PATH +import org.sopt.teamdateroad.presentation.util.EnrollScreen.MAX_ITEMS +import org.sopt.teamdateroad.presentation.util.EnrollScreen.TITLE_MIN_LENGTH +import org.sopt.teamdateroad.presentation.util.GalleryLauncher.INPUT +import org.sopt.teamdateroad.presentation.util.TimePicker +import org.sopt.teamdateroad.presentation.util.TimelineAmplitude.CLICK_ADD_SCHEDULE +import org.sopt.teamdateroad.presentation.util.amplitude.AmplitudeUtils +import org.sopt.teamdateroad.presentation.util.view.LoadState +import org.sopt.teamdateroad.ui.theme.DATEROADTheme +import org.sopt.teamdateroad.ui.theme.DateRoadTheme @Composable fun EnrollRoute( diff --git a/app/src/main/java/org/sopt/dateroad/presentation/ui/enroll/EnrollSecondScreen.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/enroll/EnrollSecondScreen.kt similarity index 91% rename from app/src/main/java/org/sopt/dateroad/presentation/ui/enroll/EnrollSecondScreen.kt rename to app/src/main/java/org/sopt/teamdateroad/presentation/ui/enroll/EnrollSecondScreen.kt index 348bfb0a4..c5c1e7d60 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/ui/enroll/EnrollSecondScreen.kt +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/enroll/EnrollSecondScreen.kt @@ -1,4 +1,4 @@ -package org.sopt.dateroad.presentation.ui.enroll +package org.sopt.teamdateroad.presentation.ui.enroll import android.annotation.SuppressLint import androidx.compose.animation.core.animateFloatAsState @@ -33,17 +33,17 @@ import androidx.compose.ui.unit.dp import androidx.compose.ui.zIndex import kotlinx.coroutines.Job import kotlinx.coroutines.launch -import org.sopt.dateroad.R -import org.sopt.dateroad.domain.model.Place -import org.sopt.dateroad.presentation.type.PlaceCardType -import org.sopt.dateroad.presentation.ui.component.button.DateRoadTextButton -import org.sopt.dateroad.presentation.ui.component.card.DateRoadPlaceCard -import org.sopt.dateroad.presentation.ui.enroll.component.EnrollPlaceInsertBar -import org.sopt.dateroad.presentation.util.Time -import org.sopt.dateroad.presentation.util.draganddrop.rememberDragAndDropListState -import org.sopt.dateroad.presentation.util.mutablelist.move -import org.sopt.dateroad.ui.theme.DATEROADTheme -import org.sopt.dateroad.ui.theme.DateRoadTheme +import org.sopt.teamdateroad.R +import org.sopt.teamdateroad.domain.model.Place +import org.sopt.teamdateroad.presentation.type.PlaceCardType +import org.sopt.teamdateroad.presentation.ui.component.button.DateRoadTextButton +import org.sopt.teamdateroad.presentation.ui.component.card.DateRoadPlaceCard +import org.sopt.teamdateroad.presentation.ui.enroll.component.EnrollPlaceInsertBar +import org.sopt.teamdateroad.presentation.util.Time +import org.sopt.teamdateroad.presentation.util.draganddrop.rememberDragAndDropListState +import org.sopt.teamdateroad.presentation.util.mutablelist.move +import org.sopt.teamdateroad.ui.theme.DATEROADTheme +import org.sopt.teamdateroad.ui.theme.DateRoadTheme @SuppressLint("UnrememberedMutableState", "UnnecessaryComposedModifier") @Composable diff --git a/app/src/main/java/org/sopt/dateroad/presentation/ui/enroll/EnrollThirdScreen.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/enroll/EnrollThirdScreen.kt similarity index 85% rename from app/src/main/java/org/sopt/dateroad/presentation/ui/enroll/EnrollThirdScreen.kt rename to app/src/main/java/org/sopt/teamdateroad/presentation/ui/enroll/EnrollThirdScreen.kt index 55ba14310..58415bbb0 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/ui/enroll/EnrollThirdScreen.kt +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/enroll/EnrollThirdScreen.kt @@ -1,4 +1,4 @@ -package org.sopt.dateroad.presentation.ui.enroll +package org.sopt.teamdateroad.presentation.ui.enroll import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Spacer @@ -13,11 +13,11 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.input.KeyboardType import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import org.sopt.dateroad.R -import org.sopt.dateroad.presentation.ui.component.textfield.DateRoadBasicTextField -import org.sopt.dateroad.presentation.ui.component.textfield.DateRoadTextArea -import org.sopt.dateroad.presentation.util.view.LoadState -import org.sopt.dateroad.ui.theme.DATEROADTheme +import org.sopt.teamdateroad.R +import org.sopt.teamdateroad.presentation.ui.component.textfield.DateRoadBasicTextField +import org.sopt.teamdateroad.presentation.ui.component.textfield.DateRoadTextArea +import org.sopt.teamdateroad.presentation.util.view.LoadState +import org.sopt.teamdateroad.ui.theme.DATEROADTheme @Composable fun EnrollThirdScreen( diff --git a/app/src/main/java/org/sopt/dateroad/presentation/ui/enroll/EnrollViewModel.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/enroll/EnrollViewModel.kt similarity index 90% rename from app/src/main/java/org/sopt/dateroad/presentation/ui/enroll/EnrollViewModel.kt rename to app/src/main/java/org/sopt/teamdateroad/presentation/ui/enroll/EnrollViewModel.kt index e62022ee9..5b8489e9e 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/ui/enroll/EnrollViewModel.kt +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/enroll/EnrollViewModel.kt @@ -1,24 +1,24 @@ -package org.sopt.dateroad.presentation.ui.enroll +package org.sopt.teamdateroad.presentation.ui.enroll import androidx.lifecycle.viewModelScope import dagger.hilt.android.lifecycle.HiltViewModel import javax.inject.Inject import kotlinx.coroutines.launch -import org.sopt.dateroad.data.dataremote.util.Date.NEAREST_DATE_START_OUTPUT_FORMAT -import org.sopt.dateroad.data.mapper.toEntity.toEnroll -import org.sopt.dateroad.domain.type.RegionType -import org.sopt.dateroad.domain.usecase.GetCourseDetailUseCase -import org.sopt.dateroad.domain.usecase.GetTimelineDetailUseCase -import org.sopt.dateroad.domain.usecase.PostCourseUseCase -import org.sopt.dateroad.domain.usecase.PostTimelineUseCase -import org.sopt.dateroad.presentation.type.EnrollScreenType -import org.sopt.dateroad.presentation.type.EnrollType -import org.sopt.dateroad.presentation.util.UserPropertyAmplitude.DATE_SCHEDULE_NUM -import org.sopt.dateroad.presentation.util.UserPropertyAmplitude.USER_COURSE_COUNT -import org.sopt.dateroad.presentation.util.UserPropertyAmplitude.USER_POINT -import org.sopt.dateroad.presentation.util.amplitude.AmplitudeUtils -import org.sopt.dateroad.presentation.util.base.BaseViewModel -import org.sopt.dateroad.presentation.util.view.LoadState +import org.sopt.teamdateroad.data.dataremote.util.Date.NEAREST_DATE_START_OUTPUT_FORMAT +import org.sopt.teamdateroad.data.mapper.toEntity.toEnroll +import org.sopt.teamdateroad.domain.type.RegionType +import org.sopt.teamdateroad.domain.usecase.GetCourseDetailUseCase +import org.sopt.teamdateroad.domain.usecase.GetTimelineDetailUseCase +import org.sopt.teamdateroad.domain.usecase.PostCourseUseCase +import org.sopt.teamdateroad.domain.usecase.PostTimelineUseCase +import org.sopt.teamdateroad.presentation.type.EnrollScreenType +import org.sopt.teamdateroad.presentation.type.EnrollType +import org.sopt.teamdateroad.presentation.util.UserPropertyAmplitude.DATE_SCHEDULE_NUM +import org.sopt.teamdateroad.presentation.util.UserPropertyAmplitude.USER_COURSE_COUNT +import org.sopt.teamdateroad.presentation.util.UserPropertyAmplitude.USER_POINT +import org.sopt.teamdateroad.presentation.util.amplitude.AmplitudeUtils +import org.sopt.teamdateroad.presentation.util.base.BaseViewModel +import org.sopt.teamdateroad.presentation.util.view.LoadState @HiltViewModel class EnrollViewModel @Inject constructor( diff --git a/app/src/main/java/org/sopt/dateroad/presentation/ui/enroll/component/EnrollAddPhotoButton.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/enroll/component/EnrollAddPhotoButton.kt similarity index 89% rename from app/src/main/java/org/sopt/dateroad/presentation/ui/enroll/component/EnrollAddPhotoButton.kt rename to app/src/main/java/org/sopt/teamdateroad/presentation/ui/enroll/component/EnrollAddPhotoButton.kt index 75388a6ce..fabe70332 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/ui/enroll/component/EnrollAddPhotoButton.kt +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/enroll/component/EnrollAddPhotoButton.kt @@ -1,4 +1,4 @@ -package org.sopt.dateroad.presentation.ui.enroll.component +package org.sopt.teamdateroad.presentation.ui.enroll.component import androidx.compose.foundation.Image import androidx.compose.foundation.background @@ -21,10 +21,10 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import org.sopt.dateroad.R -import org.sopt.dateroad.presentation.util.modifier.noRippleClickable -import org.sopt.dateroad.ui.theme.DATEROADTheme -import org.sopt.dateroad.ui.theme.DateRoadTheme +import org.sopt.teamdateroad.R +import org.sopt.teamdateroad.presentation.util.modifier.noRippleClickable +import org.sopt.teamdateroad.ui.theme.DATEROADTheme +import org.sopt.teamdateroad.ui.theme.DateRoadTheme @Composable fun EnrollAddPhotoButton( diff --git a/app/src/main/java/org/sopt/dateroad/presentation/ui/enroll/component/EnrollPhotoPreviewCard.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/enroll/component/EnrollPhotoPreviewCard.kt similarity index 89% rename from app/src/main/java/org/sopt/dateroad/presentation/ui/enroll/component/EnrollPhotoPreviewCard.kt rename to app/src/main/java/org/sopt/teamdateroad/presentation/ui/enroll/component/EnrollPhotoPreviewCard.kt index edb1c05ef..f2151a220 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/ui/enroll/component/EnrollPhotoPreviewCard.kt +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/enroll/component/EnrollPhotoPreviewCard.kt @@ -1,4 +1,4 @@ -package org.sopt.dateroad.presentation.ui.enroll.component +package org.sopt.teamdateroad.presentation.ui.enroll.component import android.content.Context import androidx.compose.foundation.Image @@ -21,10 +21,10 @@ import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import coil.compose.AsyncImage import coil.request.ImageRequest -import org.sopt.dateroad.R -import org.sopt.dateroad.presentation.util.modifier.noRippleClickable -import org.sopt.dateroad.ui.theme.DATEROADTheme -import org.sopt.dateroad.ui.theme.DateRoadTheme +import org.sopt.teamdateroad.R +import org.sopt.teamdateroad.presentation.util.modifier.noRippleClickable +import org.sopt.teamdateroad.ui.theme.DATEROADTheme +import org.sopt.teamdateroad.ui.theme.DateRoadTheme @Composable fun EnrollPhotoPreviewCard( diff --git a/app/src/main/java/org/sopt/dateroad/presentation/ui/enroll/component/EnrollPhotos.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/enroll/component/EnrollPhotos.kt similarity index 87% rename from app/src/main/java/org/sopt/dateroad/presentation/ui/enroll/component/EnrollPhotos.kt rename to app/src/main/java/org/sopt/teamdateroad/presentation/ui/enroll/component/EnrollPhotos.kt index 991d0d8fe..2faba1b98 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/ui/enroll/component/EnrollPhotos.kt +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/enroll/component/EnrollPhotos.kt @@ -1,4 +1,4 @@ -package org.sopt.dateroad.presentation.ui.enroll.component +package org.sopt.teamdateroad.presentation.ui.enroll.component import androidx.compose.foundation.Image import androidx.compose.foundation.background @@ -17,12 +17,12 @@ import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import org.sopt.dateroad.R -import org.sopt.dateroad.presentation.type.TagType -import org.sopt.dateroad.presentation.ui.component.tag.DateRoadTextTag -import org.sopt.dateroad.presentation.util.modifier.noRippleClickable -import org.sopt.dateroad.ui.theme.DATEROADTheme -import org.sopt.dateroad.ui.theme.DateRoadTheme +import org.sopt.teamdateroad.R +import org.sopt.teamdateroad.presentation.type.TagType +import org.sopt.teamdateroad.presentation.ui.component.tag.DateRoadTextTag +import org.sopt.teamdateroad.presentation.util.modifier.noRippleClickable +import org.sopt.teamdateroad.ui.theme.DATEROADTheme +import org.sopt.teamdateroad.ui.theme.DateRoadTheme @Composable fun EnrollPhotos( diff --git a/app/src/main/java/org/sopt/dateroad/presentation/ui/enroll/component/EnrollPlaceInsertBar.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/enroll/component/EnrollPlaceInsertBar.kt similarity index 88% rename from app/src/main/java/org/sopt/dateroad/presentation/ui/enroll/component/EnrollPlaceInsertBar.kt rename to app/src/main/java/org/sopt/teamdateroad/presentation/ui/enroll/component/EnrollPlaceInsertBar.kt index 2568b243f..86200b3eb 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/ui/enroll/component/EnrollPlaceInsertBar.kt +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/enroll/component/EnrollPlaceInsertBar.kt @@ -1,4 +1,4 @@ -package org.sopt.dateroad.presentation.ui.enroll.component +package org.sopt.teamdateroad.presentation.ui.enroll.component import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement @@ -22,14 +22,14 @@ import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import org.sopt.dateroad.R -import org.sopt.dateroad.presentation.ui.component.bottomsheet.DateRoadPickerBottomSheet -import org.sopt.dateroad.presentation.ui.component.bottomsheet.model.Picker -import org.sopt.dateroad.presentation.ui.component.button.DateRoadImageButton -import org.sopt.dateroad.presentation.ui.component.textfield.DateRoadBasicTextField -import org.sopt.dateroad.presentation.util.modifier.noRippleClickable -import org.sopt.dateroad.ui.theme.DATEROADTheme -import org.sopt.dateroad.ui.theme.DateRoadTheme +import org.sopt.teamdateroad.R +import org.sopt.teamdateroad.presentation.ui.component.bottomsheet.DateRoadPickerBottomSheet +import org.sopt.teamdateroad.presentation.ui.component.bottomsheet.model.Picker +import org.sopt.teamdateroad.presentation.ui.component.button.DateRoadImageButton +import org.sopt.teamdateroad.presentation.ui.component.textfield.DateRoadBasicTextField +import org.sopt.teamdateroad.presentation.util.modifier.noRippleClickable +import org.sopt.teamdateroad.ui.theme.DATEROADTheme +import org.sopt.teamdateroad.ui.theme.DateRoadTheme @Composable fun EnrollPlaceInsertBar( diff --git a/app/src/main/java/org/sopt/dateroad/presentation/ui/enroll/navigation/EnrollNavigation.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/enroll/navigation/EnrollNavigation.kt similarity index 86% rename from app/src/main/java/org/sopt/dateroad/presentation/ui/enroll/navigation/EnrollNavigation.kt rename to app/src/main/java/org/sopt/teamdateroad/presentation/ui/enroll/navigation/EnrollNavigation.kt index 73dc3b753..3712c26bb 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/ui/enroll/navigation/EnrollNavigation.kt +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/enroll/navigation/EnrollNavigation.kt @@ -1,4 +1,4 @@ -package org.sopt.dateroad.presentation.ui.enroll.navigation +package org.sopt.teamdateroad.presentation.ui.enroll.navigation import androidx.compose.foundation.layout.PaddingValues import androidx.navigation.NavController @@ -6,10 +6,10 @@ import androidx.navigation.NavGraphBuilder import androidx.navigation.NavType import androidx.navigation.compose.composable import androidx.navigation.navArgument -import org.sopt.dateroad.presentation.type.EnrollType -import org.sopt.dateroad.presentation.type.MyCourseType -import org.sopt.dateroad.presentation.ui.enroll.EnrollRoute -import org.sopt.dateroad.presentation.ui.mycourse.navigation.MyCourseRoute +import org.sopt.teamdateroad.presentation.type.EnrollType +import org.sopt.teamdateroad.presentation.type.MyCourseType +import org.sopt.teamdateroad.presentation.ui.enroll.EnrollRoute +import org.sopt.teamdateroad.presentation.ui.mycourse.navigation.MyCourseRoute fun NavController.navigationEnroll(enrollType: EnrollType, viewPath: String, courseId: Int? = null) { navigate( diff --git a/app/src/main/java/org/sopt/dateroad/presentation/ui/home/HomeContract.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/home/HomeContract.kt similarity index 74% rename from app/src/main/java/org/sopt/dateroad/presentation/ui/home/HomeContract.kt rename to app/src/main/java/org/sopt/teamdateroad/presentation/ui/home/HomeContract.kt index a60308d06..24afdf18a 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/ui/home/HomeContract.kt +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/home/HomeContract.kt @@ -1,15 +1,15 @@ -package org.sopt.dateroad.presentation.ui.home +package org.sopt.teamdateroad.presentation.ui.home -import org.sopt.dateroad.domain.model.Advertisement -import org.sopt.dateroad.domain.model.Course -import org.sopt.dateroad.domain.model.NearestTimeline -import org.sopt.dateroad.domain.model.UserPoint -import org.sopt.dateroad.presentation.type.EnrollType -import org.sopt.dateroad.presentation.type.TimelineType -import org.sopt.dateroad.presentation.util.base.UiEvent -import org.sopt.dateroad.presentation.util.base.UiSideEffect -import org.sopt.dateroad.presentation.util.base.UiState -import org.sopt.dateroad.presentation.util.view.LoadState +import org.sopt.teamdateroad.domain.model.Advertisement +import org.sopt.teamdateroad.domain.model.Course +import org.sopt.teamdateroad.domain.model.NearestTimeline +import org.sopt.teamdateroad.domain.model.UserPoint +import org.sopt.teamdateroad.presentation.type.EnrollType +import org.sopt.teamdateroad.presentation.type.TimelineType +import org.sopt.teamdateroad.presentation.util.base.UiEvent +import org.sopt.teamdateroad.presentation.util.base.UiSideEffect +import org.sopt.teamdateroad.presentation.util.base.UiState +import org.sopt.teamdateroad.presentation.util.view.LoadState class HomeContract { data class HomeUiState( diff --git a/app/src/main/java/org/sopt/dateroad/presentation/ui/home/HomeScreen.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/home/HomeScreen.kt similarity index 85% rename from app/src/main/java/org/sopt/dateroad/presentation/ui/home/HomeScreen.kt rename to app/src/main/java/org/sopt/teamdateroad/presentation/ui/home/HomeScreen.kt index d9ce2b15a..9e33fdb16 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/ui/home/HomeScreen.kt +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/home/HomeScreen.kt @@ -1,4 +1,4 @@ -package org.sopt.dateroad.presentation.ui.home +package org.sopt.teamdateroad.presentation.ui.home import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement @@ -36,39 +36,39 @@ import com.google.accompanist.pager.PagerState import com.google.accompanist.pager.rememberPagerState import kotlinx.coroutines.delay import kotlinx.coroutines.launch -import org.sopt.dateroad.R -import org.sopt.dateroad.domain.model.NearestTimeline -import org.sopt.dateroad.domain.type.SortByType -import org.sopt.dateroad.presentation.type.EnrollType -import org.sopt.dateroad.presentation.type.MainNavigationBarItemType -import org.sopt.dateroad.presentation.type.TagType -import org.sopt.dateroad.presentation.type.TimelineType -import org.sopt.dateroad.presentation.ui.component.button.DateRoadImageButton -import org.sopt.dateroad.presentation.ui.component.button.DateRoadTextButton -import org.sopt.dateroad.presentation.ui.component.card.DateRoadCourseCard -import org.sopt.dateroad.presentation.ui.component.partialcolortext.PartialColorText -import org.sopt.dateroad.presentation.ui.component.tag.DateRoadTextTag -import org.sopt.dateroad.presentation.ui.component.view.DateRoadErrorView -import org.sopt.dateroad.presentation.ui.component.view.DateRoadIdleView -import org.sopt.dateroad.presentation.ui.component.view.DateRoadLoadingView -import org.sopt.dateroad.presentation.ui.home.component.DateRoadHomeTopBar -import org.sopt.dateroad.presentation.ui.home.component.HomeAdvertisement -import org.sopt.dateroad.presentation.ui.home.component.HomeHotCourseCard -import org.sopt.dateroad.presentation.ui.home.component.HomeTimeLineCard -import org.sopt.dateroad.presentation.util.Home.ADVERTISEMENT_DELAY -import org.sopt.dateroad.presentation.util.HomeAmplitude.COURSE_LIST_COST -import org.sopt.dateroad.presentation.util.HomeAmplitude.COURSE_LIST_ID -import org.sopt.dateroad.presentation.util.HomeAmplitude.COURSE_LIST_LOCATION -import org.sopt.dateroad.presentation.util.HomeAmplitude.COURSE_LIST_TITLE -import org.sopt.dateroad.presentation.util.HomeAmplitude.HOT -import org.sopt.dateroad.presentation.util.HomeAmplitude.NEW -import org.sopt.dateroad.presentation.util.HomeAmplitude.USER_NAME -import org.sopt.dateroad.presentation.util.HomeAmplitude.USER_POINT -import org.sopt.dateroad.presentation.util.HomeAmplitude.VIEW_MAIN -import org.sopt.dateroad.presentation.util.ViewPath.HOME -import org.sopt.dateroad.presentation.util.amplitude.AmplitudeUtils -import org.sopt.dateroad.presentation.util.view.LoadState -import org.sopt.dateroad.ui.theme.DateRoadTheme +import org.sopt.teamdateroad.R +import org.sopt.teamdateroad.domain.model.NearestTimeline +import org.sopt.teamdateroad.domain.type.SortByType +import org.sopt.teamdateroad.presentation.type.EnrollType +import org.sopt.teamdateroad.presentation.type.MainNavigationBarItemType +import org.sopt.teamdateroad.presentation.type.TagType +import org.sopt.teamdateroad.presentation.type.TimelineType +import org.sopt.teamdateroad.presentation.ui.component.button.DateRoadImageButton +import org.sopt.teamdateroad.presentation.ui.component.button.DateRoadTextButton +import org.sopt.teamdateroad.presentation.ui.component.card.DateRoadCourseCard +import org.sopt.teamdateroad.presentation.ui.component.partialcolortext.PartialColorText +import org.sopt.teamdateroad.presentation.ui.component.tag.DateRoadTextTag +import org.sopt.teamdateroad.presentation.ui.component.view.DateRoadErrorView +import org.sopt.teamdateroad.presentation.ui.component.view.DateRoadIdleView +import org.sopt.teamdateroad.presentation.ui.component.view.DateRoadLoadingView +import org.sopt.teamdateroad.presentation.ui.home.component.DateRoadHomeTopBar +import org.sopt.teamdateroad.presentation.ui.home.component.HomeAdvertisement +import org.sopt.teamdateroad.presentation.ui.home.component.HomeHotCourseCard +import org.sopt.teamdateroad.presentation.ui.home.component.HomeTimeLineCard +import org.sopt.teamdateroad.presentation.util.Home.ADVERTISEMENT_DELAY +import org.sopt.teamdateroad.presentation.util.HomeAmplitude.COURSE_LIST_COST +import org.sopt.teamdateroad.presentation.util.HomeAmplitude.COURSE_LIST_ID +import org.sopt.teamdateroad.presentation.util.HomeAmplitude.COURSE_LIST_LOCATION +import org.sopt.teamdateroad.presentation.util.HomeAmplitude.COURSE_LIST_TITLE +import org.sopt.teamdateroad.presentation.util.HomeAmplitude.HOT +import org.sopt.teamdateroad.presentation.util.HomeAmplitude.NEW +import org.sopt.teamdateroad.presentation.util.HomeAmplitude.USER_NAME +import org.sopt.teamdateroad.presentation.util.HomeAmplitude.USER_POINT +import org.sopt.teamdateroad.presentation.util.HomeAmplitude.VIEW_MAIN +import org.sopt.teamdateroad.presentation.util.ViewPath.HOME +import org.sopt.teamdateroad.presentation.util.amplitude.AmplitudeUtils +import org.sopt.teamdateroad.presentation.util.view.LoadState +import org.sopt.teamdateroad.ui.theme.DateRoadTheme @OptIn(ExperimentalPagerApi::class) @Composable diff --git a/app/src/main/java/org/sopt/dateroad/presentation/ui/home/HomeViewModel.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/home/HomeViewModel.kt similarity index 88% rename from app/src/main/java/org/sopt/dateroad/presentation/ui/home/HomeViewModel.kt rename to app/src/main/java/org/sopt/teamdateroad/presentation/ui/home/HomeViewModel.kt index fd988fda9..502b2939b 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/ui/home/HomeViewModel.kt +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/home/HomeViewModel.kt @@ -1,18 +1,18 @@ -package org.sopt.dateroad.presentation.ui.home +package org.sopt.teamdateroad.presentation.ui.home import androidx.lifecycle.viewModelScope import dagger.hilt.android.lifecycle.HiltViewModel import javax.inject.Inject import kotlinx.coroutines.launch -import org.sopt.dateroad.domain.model.NearestTimeline -import org.sopt.dateroad.domain.type.SortByType -import org.sopt.dateroad.domain.usecase.GetAdvertisementsUseCase -import org.sopt.dateroad.domain.usecase.GetNearestTimelineUseCase -import org.sopt.dateroad.domain.usecase.GetSortedCoursesUseCase -import org.sopt.dateroad.domain.usecase.GetUserPointUseCase -import org.sopt.dateroad.domain.usecase.SetNicknameUseCase -import org.sopt.dateroad.presentation.util.base.BaseViewModel -import org.sopt.dateroad.presentation.util.view.LoadState +import org.sopt.teamdateroad.domain.model.NearestTimeline +import org.sopt.teamdateroad.domain.type.SortByType +import org.sopt.teamdateroad.domain.usecase.GetAdvertisementsUseCase +import org.sopt.teamdateroad.domain.usecase.GetNearestTimelineUseCase +import org.sopt.teamdateroad.domain.usecase.GetSortedCoursesUseCase +import org.sopt.teamdateroad.domain.usecase.GetUserPointUseCase +import org.sopt.teamdateroad.domain.usecase.SetNicknameUseCase +import org.sopt.teamdateroad.presentation.util.base.BaseViewModel +import org.sopt.teamdateroad.presentation.util.view.LoadState @HiltViewModel class HomeViewModel @Inject constructor( diff --git a/app/src/main/java/org/sopt/dateroad/presentation/ui/home/component/HomeAdvertisement.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/home/component/HomeAdvertisement.kt similarity index 89% rename from app/src/main/java/org/sopt/dateroad/presentation/ui/home/component/HomeAdvertisement.kt rename to app/src/main/java/org/sopt/teamdateroad/presentation/ui/home/component/HomeAdvertisement.kt index 9e34a2dde..981ea815b 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/ui/home/component/HomeAdvertisement.kt +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/home/component/HomeAdvertisement.kt @@ -1,4 +1,4 @@ -package org.sopt.dateroad.presentation.ui.home.component +package org.sopt.teamdateroad.presentation.ui.home.component import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column @@ -14,8 +14,8 @@ import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import coil.compose.AsyncImage import coil.request.ImageRequest -import org.sopt.dateroad.domain.model.Advertisement -import org.sopt.dateroad.presentation.util.modifier.noRippleClickable +import org.sopt.teamdateroad.domain.model.Advertisement +import org.sopt.teamdateroad.presentation.util.modifier.noRippleClickable @Composable fun HomeAdvertisement( diff --git a/app/src/main/java/org/sopt/dateroad/presentation/ui/home/component/HomeHotCourseCard.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/home/component/HomeHotCourseCard.kt similarity index 91% rename from app/src/main/java/org/sopt/dateroad/presentation/ui/home/component/HomeHotCourseCard.kt rename to app/src/main/java/org/sopt/teamdateroad/presentation/ui/home/component/HomeHotCourseCard.kt index 074287cd2..bd839809a 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/ui/home/component/HomeHotCourseCard.kt +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/home/component/HomeHotCourseCard.kt @@ -1,4 +1,4 @@ -package org.sopt.dateroad.presentation.ui.home.component +package org.sopt.teamdateroad.presentation.ui.home.component import androidx.compose.foundation.background import androidx.compose.foundation.layout.Box @@ -23,12 +23,12 @@ import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import coil.compose.AsyncImage import coil.request.ImageRequest -import org.sopt.dateroad.R -import org.sopt.dateroad.domain.model.Course -import org.sopt.dateroad.presentation.type.TagType -import org.sopt.dateroad.presentation.ui.component.tag.DateRoadImageTag -import org.sopt.dateroad.presentation.util.modifier.noRippleClickable -import org.sopt.dateroad.ui.theme.DateRoadTheme +import org.sopt.teamdateroad.R +import org.sopt.teamdateroad.domain.model.Course +import org.sopt.teamdateroad.presentation.type.TagType +import org.sopt.teamdateroad.presentation.ui.component.tag.DateRoadImageTag +import org.sopt.teamdateroad.presentation.util.modifier.noRippleClickable +import org.sopt.teamdateroad.ui.theme.DateRoadTheme @Composable fun HomeHotCourseCard( diff --git a/app/src/main/java/org/sopt/dateroad/presentation/ui/home/component/HomeTimeLineCard.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/home/component/HomeTimeLineCard.kt similarity index 94% rename from app/src/main/java/org/sopt/dateroad/presentation/ui/home/component/HomeTimeLineCard.kt rename to app/src/main/java/org/sopt/teamdateroad/presentation/ui/home/component/HomeTimeLineCard.kt index 65c8aaeb1..4cf3c75b4 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/ui/home/component/HomeTimeLineCard.kt +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/home/component/HomeTimeLineCard.kt @@ -1,4 +1,4 @@ -package org.sopt.dateroad.presentation.ui.home.component +package org.sopt.teamdateroad.presentation.ui.home.component import androidx.compose.foundation.Canvas import androidx.compose.foundation.Image @@ -27,12 +27,12 @@ import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import org.sopt.dateroad.R -import org.sopt.dateroad.domain.model.NearestTimeline -import org.sopt.dateroad.presentation.type.TagType -import org.sopt.dateroad.presentation.ui.component.tag.DateRoadTextTag -import org.sopt.dateroad.presentation.util.modifier.noRippleClickable -import org.sopt.dateroad.ui.theme.DateRoadTheme +import org.sopt.teamdateroad.R +import org.sopt.teamdateroad.domain.model.NearestTimeline +import org.sopt.teamdateroad.presentation.type.TagType +import org.sopt.teamdateroad.presentation.ui.component.tag.DateRoadTextTag +import org.sopt.teamdateroad.presentation.util.modifier.noRippleClickable +import org.sopt.teamdateroad.ui.theme.DateRoadTheme @Composable fun HomeTimeLineCard( diff --git a/app/src/main/java/org/sopt/dateroad/presentation/ui/home/component/HomeTopBar.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/home/component/HomeTopBar.kt similarity index 86% rename from app/src/main/java/org/sopt/dateroad/presentation/ui/home/component/HomeTopBar.kt rename to app/src/main/java/org/sopt/teamdateroad/presentation/ui/home/component/HomeTopBar.kt index f9f6d0ed1..f94162d5c 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/ui/home/component/HomeTopBar.kt +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/home/component/HomeTopBar.kt @@ -1,4 +1,4 @@ -package org.sopt.dateroad.presentation.ui.home.component +package org.sopt.teamdateroad.presentation.ui.home.component import androidx.compose.foundation.background import androidx.compose.foundation.layout.Column @@ -14,9 +14,9 @@ import androidx.compose.ui.graphics.Color import androidx.compose.ui.res.painterResource import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import org.sopt.dateroad.R -import org.sopt.dateroad.presentation.ui.component.tag.DateRoadPointTag -import org.sopt.dateroad.ui.theme.DateRoadTheme +import org.sopt.teamdateroad.R +import org.sopt.teamdateroad.presentation.ui.component.tag.DateRoadPointTag +import org.sopt.teamdateroad.ui.theme.DateRoadTheme @Composable fun DateRoadHomeTopBar( diff --git a/app/src/main/java/org/sopt/dateroad/presentation/ui/home/navigation/HomeNavigation.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/home/navigation/HomeNavigation.kt similarity index 76% rename from app/src/main/java/org/sopt/dateroad/presentation/ui/home/navigation/HomeNavigation.kt rename to app/src/main/java/org/sopt/teamdateroad/presentation/ui/home/navigation/HomeNavigation.kt index 0f4d121f2..f46fe1536 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/ui/home/navigation/HomeNavigation.kt +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/home/navigation/HomeNavigation.kt @@ -1,15 +1,15 @@ -package org.sopt.dateroad.presentation.ui.home.navigation +package org.sopt.teamdateroad.presentation.ui.home.navigation import androidx.compose.foundation.layout.PaddingValues import androidx.navigation.NavController import androidx.navigation.NavGraphBuilder import androidx.navigation.NavOptions import androidx.navigation.compose.composable -import org.sopt.dateroad.presentation.model.MainNavigationBarRoute -import org.sopt.dateroad.presentation.type.EnrollType -import org.sopt.dateroad.presentation.type.MainNavigationBarItemType -import org.sopt.dateroad.presentation.type.TimelineType -import org.sopt.dateroad.presentation.ui.home.HomeRoute +import org.sopt.teamdateroad.presentation.model.MainNavigationBarRoute +import org.sopt.teamdateroad.presentation.type.EnrollType +import org.sopt.teamdateroad.presentation.type.MainNavigationBarItemType +import org.sopt.teamdateroad.presentation.type.TimelineType +import org.sopt.teamdateroad.presentation.ui.home.HomeRoute fun NavController.navigationHome(navOptions: NavOptions) { navigate( diff --git a/app/src/main/java/org/sopt/dateroad/presentation/ui/look/LookContract.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/look/LookContract.kt similarity index 74% rename from app/src/main/java/org/sopt/dateroad/presentation/ui/look/LookContract.kt rename to app/src/main/java/org/sopt/teamdateroad/presentation/ui/look/LookContract.kt index 26833292f..e7c4d71b3 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/ui/look/LookContract.kt +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/look/LookContract.kt @@ -1,12 +1,12 @@ -package org.sopt.dateroad.presentation.ui.look +package org.sopt.teamdateroad.presentation.ui.look -import org.sopt.dateroad.domain.model.Course -import org.sopt.dateroad.domain.type.MoneyTagType -import org.sopt.dateroad.domain.type.RegionType -import org.sopt.dateroad.presentation.util.base.UiEvent -import org.sopt.dateroad.presentation.util.base.UiSideEffect -import org.sopt.dateroad.presentation.util.base.UiState -import org.sopt.dateroad.presentation.util.view.LoadState +import org.sopt.teamdateroad.domain.model.Course +import org.sopt.teamdateroad.domain.type.MoneyTagType +import org.sopt.teamdateroad.domain.type.RegionType +import org.sopt.teamdateroad.presentation.util.base.UiEvent +import org.sopt.teamdateroad.presentation.util.base.UiSideEffect +import org.sopt.teamdateroad.presentation.util.base.UiState +import org.sopt.teamdateroad.presentation.util.view.LoadState class LookContract { data class LookUiState( diff --git a/app/src/main/java/org/sopt/dateroad/presentation/ui/look/LookScreen.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/look/LookScreen.kt similarity index 85% rename from app/src/main/java/org/sopt/dateroad/presentation/ui/look/LookScreen.kt rename to app/src/main/java/org/sopt/teamdateroad/presentation/ui/look/LookScreen.kt index abf4ea273..b29c0234a 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/ui/look/LookScreen.kt +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/look/LookScreen.kt @@ -1,4 +1,4 @@ -package org.sopt.dateroad.presentation.ui.look +package org.sopt.teamdateroad.presentation.ui.look import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement @@ -29,30 +29,30 @@ import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.compose.LocalLifecycleOwner import androidx.lifecycle.compose.collectAsStateWithLifecycle import androidx.lifecycle.flowWithLifecycle -import org.sopt.dateroad.R -import org.sopt.dateroad.domain.type.GyeonggiAreaType -import org.sopt.dateroad.domain.type.IncheonAreaType -import org.sopt.dateroad.domain.type.MoneyTagType -import org.sopt.dateroad.domain.type.RegionType -import org.sopt.dateroad.domain.type.SeoulAreaType -import org.sopt.dateroad.presentation.type.ChipType -import org.sopt.dateroad.presentation.type.EmptyViewType -import org.sopt.dateroad.presentation.type.EnrollType -import org.sopt.dateroad.presentation.ui.component.bottomsheet.DateRoadRegionBottomSheet -import org.sopt.dateroad.presentation.ui.component.button.DateRoadAreaButton -import org.sopt.dateroad.presentation.ui.component.button.DateRoadImageButton -import org.sopt.dateroad.presentation.ui.component.chip.DateRoadTextChip -import org.sopt.dateroad.presentation.ui.component.topbar.DateRoadLeftTitleTopBar -import org.sopt.dateroad.presentation.ui.component.view.DateRoadEmptyView -import org.sopt.dateroad.presentation.ui.component.view.DateRoadErrorView -import org.sopt.dateroad.presentation.ui.component.view.DateRoadLoadingView -import org.sopt.dateroad.presentation.ui.look.component.LookCourseCard -import org.sopt.dateroad.presentation.util.Default -import org.sopt.dateroad.presentation.util.ViewPath.LOOK -import org.sopt.dateroad.presentation.util.modifier.noRippleClickable -import org.sopt.dateroad.presentation.util.view.LoadState -import org.sopt.dateroad.ui.theme.DATEROADTheme -import org.sopt.dateroad.ui.theme.DateRoadTheme +import org.sopt.teamdateroad.R +import org.sopt.teamdateroad.domain.type.GyeonggiAreaType +import org.sopt.teamdateroad.domain.type.IncheonAreaType +import org.sopt.teamdateroad.domain.type.MoneyTagType +import org.sopt.teamdateroad.domain.type.RegionType +import org.sopt.teamdateroad.domain.type.SeoulAreaType +import org.sopt.teamdateroad.presentation.type.ChipType +import org.sopt.teamdateroad.presentation.type.EmptyViewType +import org.sopt.teamdateroad.presentation.type.EnrollType +import org.sopt.teamdateroad.presentation.ui.component.bottomsheet.DateRoadRegionBottomSheet +import org.sopt.teamdateroad.presentation.ui.component.button.DateRoadAreaButton +import org.sopt.teamdateroad.presentation.ui.component.button.DateRoadImageButton +import org.sopt.teamdateroad.presentation.ui.component.chip.DateRoadTextChip +import org.sopt.teamdateroad.presentation.ui.component.topbar.DateRoadLeftTitleTopBar +import org.sopt.teamdateroad.presentation.ui.component.view.DateRoadEmptyView +import org.sopt.teamdateroad.presentation.ui.component.view.DateRoadErrorView +import org.sopt.teamdateroad.presentation.ui.component.view.DateRoadLoadingView +import org.sopt.teamdateroad.presentation.ui.look.component.LookCourseCard +import org.sopt.teamdateroad.presentation.util.Default +import org.sopt.teamdateroad.presentation.util.ViewPath.LOOK +import org.sopt.teamdateroad.presentation.util.modifier.noRippleClickable +import org.sopt.teamdateroad.presentation.util.view.LoadState +import org.sopt.teamdateroad.ui.theme.DATEROADTheme +import org.sopt.teamdateroad.ui.theme.DateRoadTheme @Composable fun LookRoute( diff --git a/app/src/main/java/org/sopt/dateroad/presentation/ui/look/LookViewModel.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/look/LookViewModel.kt similarity index 88% rename from app/src/main/java/org/sopt/dateroad/presentation/ui/look/LookViewModel.kt rename to app/src/main/java/org/sopt/teamdateroad/presentation/ui/look/LookViewModel.kt index 343e88292..2886aa5a8 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/ui/look/LookViewModel.kt +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/look/LookViewModel.kt @@ -1,14 +1,14 @@ -package org.sopt.dateroad.presentation.ui.look +package org.sopt.teamdateroad.presentation.ui.look import androidx.lifecycle.viewModelScope import dagger.hilt.android.lifecycle.HiltViewModel import javax.inject.Inject import kotlinx.coroutines.launch -import org.sopt.dateroad.domain.type.MoneyTagType -import org.sopt.dateroad.domain.type.RegionType -import org.sopt.dateroad.domain.usecase.GetFilteredCourses -import org.sopt.dateroad.presentation.util.base.BaseViewModel -import org.sopt.dateroad.presentation.util.view.LoadState +import org.sopt.teamdateroad.domain.type.MoneyTagType +import org.sopt.teamdateroad.domain.type.RegionType +import org.sopt.teamdateroad.domain.usecase.GetFilteredCourses +import org.sopt.teamdateroad.presentation.util.base.BaseViewModel +import org.sopt.teamdateroad.presentation.util.view.LoadState @HiltViewModel class LookViewModel @Inject constructor( diff --git a/app/src/main/java/org/sopt/dateroad/presentation/ui/look/component/LookCourseCard.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/look/component/LookCourseCard.kt similarity index 92% rename from app/src/main/java/org/sopt/dateroad/presentation/ui/look/component/LookCourseCard.kt rename to app/src/main/java/org/sopt/teamdateroad/presentation/ui/look/component/LookCourseCard.kt index 2941cd549..8e81ef989 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/ui/look/component/LookCourseCard.kt +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/look/component/LookCourseCard.kt @@ -1,4 +1,4 @@ -package org.sopt.dateroad.presentation.ui.look.component +package org.sopt.teamdateroad.presentation.ui.look.component import android.content.Context import androidx.compose.foundation.Image @@ -30,13 +30,13 @@ import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import coil.compose.AsyncImage import coil.request.ImageRequest -import org.sopt.dateroad.R -import org.sopt.dateroad.domain.model.Course -import org.sopt.dateroad.presentation.type.TagType -import org.sopt.dateroad.presentation.ui.component.tag.DateRoadImageTag -import org.sopt.dateroad.presentation.util.modifier.noRippleClickable -import org.sopt.dateroad.ui.theme.DATEROADTheme -import org.sopt.dateroad.ui.theme.DateRoadTheme +import org.sopt.teamdateroad.R +import org.sopt.teamdateroad.domain.model.Course +import org.sopt.teamdateroad.presentation.type.TagType +import org.sopt.teamdateroad.presentation.ui.component.tag.DateRoadImageTag +import org.sopt.teamdateroad.presentation.util.modifier.noRippleClickable +import org.sopt.teamdateroad.ui.theme.DATEROADTheme +import org.sopt.teamdateroad.ui.theme.DateRoadTheme @Composable fun LookCourseCard( diff --git a/app/src/main/java/org/sopt/dateroad/presentation/ui/look/navigation/LookNavigation.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/look/navigation/LookNavigation.kt similarity index 75% rename from app/src/main/java/org/sopt/dateroad/presentation/ui/look/navigation/LookNavigation.kt rename to app/src/main/java/org/sopt/teamdateroad/presentation/ui/look/navigation/LookNavigation.kt index 4e6dabf23..4dff2a0a4 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/ui/look/navigation/LookNavigation.kt +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/look/navigation/LookNavigation.kt @@ -1,13 +1,13 @@ -package org.sopt.dateroad.presentation.ui.look.navigation +package org.sopt.teamdateroad.presentation.ui.look.navigation import androidx.compose.foundation.layout.PaddingValues import androidx.navigation.NavController import androidx.navigation.NavGraphBuilder import androidx.navigation.NavOptions import androidx.navigation.compose.composable -import org.sopt.dateroad.presentation.model.MainNavigationBarRoute -import org.sopt.dateroad.presentation.type.EnrollType -import org.sopt.dateroad.presentation.ui.look.LookRoute +import org.sopt.teamdateroad.presentation.model.MainNavigationBarRoute +import org.sopt.teamdateroad.presentation.type.EnrollType +import org.sopt.teamdateroad.presentation.ui.look.LookRoute fun NavController.navigationLook(navOptions: NavOptions) { navigate( diff --git a/app/src/main/java/org/sopt/dateroad/presentation/ui/mycourse/MyCourseContract.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/mycourse/MyCourseContract.kt similarity index 67% rename from app/src/main/java/org/sopt/dateroad/presentation/ui/mycourse/MyCourseContract.kt rename to app/src/main/java/org/sopt/teamdateroad/presentation/ui/mycourse/MyCourseContract.kt index ac3a89586..732683c34 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/ui/mycourse/MyCourseContract.kt +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/mycourse/MyCourseContract.kt @@ -1,11 +1,11 @@ -package org.sopt.dateroad.presentation.ui.mycourse +package org.sopt.teamdateroad.presentation.ui.mycourse -import org.sopt.dateroad.domain.model.Course -import org.sopt.dateroad.presentation.type.MyCourseType -import org.sopt.dateroad.presentation.util.base.UiEvent -import org.sopt.dateroad.presentation.util.base.UiSideEffect -import org.sopt.dateroad.presentation.util.base.UiState -import org.sopt.dateroad.presentation.util.view.LoadState +import org.sopt.teamdateroad.domain.model.Course +import org.sopt.teamdateroad.presentation.type.MyCourseType +import org.sopt.teamdateroad.presentation.util.base.UiEvent +import org.sopt.teamdateroad.presentation.util.base.UiSideEffect +import org.sopt.teamdateroad.presentation.util.base.UiState +import org.sopt.teamdateroad.presentation.util.view.LoadState class MyCourseContract { data class MyCourseUiState( diff --git a/app/src/main/java/org/sopt/dateroad/presentation/ui/mycourse/MyCourseScreen.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/mycourse/MyCourseScreen.kt similarity index 85% rename from app/src/main/java/org/sopt/dateroad/presentation/ui/mycourse/MyCourseScreen.kt rename to app/src/main/java/org/sopt/teamdateroad/presentation/ui/mycourse/MyCourseScreen.kt index c17f294db..428fa0b31 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/ui/mycourse/MyCourseScreen.kt +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/mycourse/MyCourseScreen.kt @@ -1,4 +1,4 @@ -package org.sopt.dateroad.presentation.ui.mycourse +package org.sopt.teamdateroad.presentation.ui.mycourse import androidx.compose.foundation.background import androidx.compose.foundation.layout.Column @@ -18,24 +18,24 @@ import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.compose.LocalLifecycleOwner import androidx.lifecycle.compose.collectAsStateWithLifecycle import androidx.lifecycle.flowWithLifecycle -import org.sopt.dateroad.R -import org.sopt.dateroad.domain.model.Course -import org.sopt.dateroad.presentation.type.EmptyViewType -import org.sopt.dateroad.presentation.type.EnrollType -import org.sopt.dateroad.presentation.type.MyCourseType -import org.sopt.dateroad.presentation.ui.component.card.DateRoadCourseCard -import org.sopt.dateroad.presentation.ui.component.topbar.DateRoadBasicTopBar -import org.sopt.dateroad.presentation.ui.component.view.DateRoadEmptyView -import org.sopt.dateroad.presentation.ui.component.view.DateRoadErrorView -import org.sopt.dateroad.presentation.ui.component.view.DateRoadIdleView -import org.sopt.dateroad.presentation.ui.component.view.DateRoadLoadingView -import org.sopt.dateroad.presentation.util.MyCourseAmplitude.CLICK_PURCHASED_BACK -import org.sopt.dateroad.presentation.util.MyCourseAmplitude.VIEW_PURCHASED_COURSE -import org.sopt.dateroad.presentation.util.ViewPath.MY_COURSE_READ -import org.sopt.dateroad.presentation.util.amplitude.AmplitudeUtils -import org.sopt.dateroad.presentation.util.view.LoadState -import org.sopt.dateroad.ui.theme.DATEROADTheme -import org.sopt.dateroad.ui.theme.DateRoadTheme +import org.sopt.teamdateroad.R +import org.sopt.teamdateroad.domain.model.Course +import org.sopt.teamdateroad.presentation.type.EmptyViewType +import org.sopt.teamdateroad.presentation.type.EnrollType +import org.sopt.teamdateroad.presentation.type.MyCourseType +import org.sopt.teamdateroad.presentation.ui.component.card.DateRoadCourseCard +import org.sopt.teamdateroad.presentation.ui.component.topbar.DateRoadBasicTopBar +import org.sopt.teamdateroad.presentation.ui.component.view.DateRoadEmptyView +import org.sopt.teamdateroad.presentation.ui.component.view.DateRoadErrorView +import org.sopt.teamdateroad.presentation.ui.component.view.DateRoadIdleView +import org.sopt.teamdateroad.presentation.ui.component.view.DateRoadLoadingView +import org.sopt.teamdateroad.presentation.util.MyCourseAmplitude.CLICK_PURCHASED_BACK +import org.sopt.teamdateroad.presentation.util.MyCourseAmplitude.VIEW_PURCHASED_COURSE +import org.sopt.teamdateroad.presentation.util.ViewPath.MY_COURSE_READ +import org.sopt.teamdateroad.presentation.util.amplitude.AmplitudeUtils +import org.sopt.teamdateroad.presentation.util.view.LoadState +import org.sopt.teamdateroad.ui.theme.DATEROADTheme +import org.sopt.teamdateroad.ui.theme.DateRoadTheme @Composable fun MyCourseRoute( diff --git a/app/src/main/java/org/sopt/dateroad/presentation/ui/mycourse/MyCourseViewModel.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/mycourse/MyCourseViewModel.kt similarity index 88% rename from app/src/main/java/org/sopt/dateroad/presentation/ui/mycourse/MyCourseViewModel.kt rename to app/src/main/java/org/sopt/teamdateroad/presentation/ui/mycourse/MyCourseViewModel.kt index 1085a8995..5c80c3d14 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/ui/mycourse/MyCourseViewModel.kt +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/mycourse/MyCourseViewModel.kt @@ -1,13 +1,13 @@ -package org.sopt.dateroad.presentation.ui.mycourse +package org.sopt.teamdateroad.presentation.ui.mycourse import androidx.lifecycle.viewModelScope import dagger.hilt.android.lifecycle.HiltViewModel import javax.inject.Inject import kotlinx.coroutines.launch -import org.sopt.dateroad.domain.usecase.GetMyCourseEnrollUseCase -import org.sopt.dateroad.domain.usecase.GetMyCourseReadUseCase -import org.sopt.dateroad.presentation.util.base.BaseViewModel -import org.sopt.dateroad.presentation.util.view.LoadState +import org.sopt.teamdateroad.domain.usecase.GetMyCourseEnrollUseCase +import org.sopt.teamdateroad.domain.usecase.GetMyCourseReadUseCase +import org.sopt.teamdateroad.presentation.util.base.BaseViewModel +import org.sopt.teamdateroad.presentation.util.view.LoadState @HiltViewModel class MyCourseViewModel @Inject constructor( diff --git a/app/src/main/java/org/sopt/dateroad/presentation/ui/mycourse/navigation/MyCourseNavigation.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/mycourse/navigation/MyCourseNavigation.kt similarity index 80% rename from app/src/main/java/org/sopt/dateroad/presentation/ui/mycourse/navigation/MyCourseNavigation.kt rename to app/src/main/java/org/sopt/teamdateroad/presentation/ui/mycourse/navigation/MyCourseNavigation.kt index 40b56cae9..255f58a17 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/ui/mycourse/navigation/MyCourseNavigation.kt +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/mycourse/navigation/MyCourseNavigation.kt @@ -1,4 +1,4 @@ -package org.sopt.dateroad.presentation.ui.mycourse.navigation +package org.sopt.teamdateroad.presentation.ui.mycourse.navigation import androidx.compose.foundation.layout.PaddingValues import androidx.navigation.NavController @@ -6,10 +6,10 @@ import androidx.navigation.NavGraphBuilder import androidx.navigation.NavType import androidx.navigation.compose.composable import androidx.navigation.navArgument -import org.sopt.dateroad.presentation.type.EnrollType -import org.sopt.dateroad.presentation.type.MyCourseType -import org.sopt.dateroad.presentation.ui.mycourse.MyCourseRoute -import org.sopt.dateroad.presentation.ui.mycourse.navigation.MyCourseRoute.ROUTE_WITH_ARGUMENT +import org.sopt.teamdateroad.presentation.type.EnrollType +import org.sopt.teamdateroad.presentation.type.MyCourseType +import org.sopt.teamdateroad.presentation.ui.mycourse.MyCourseRoute +import org.sopt.teamdateroad.presentation.ui.mycourse.navigation.MyCourseRoute.ROUTE_WITH_ARGUMENT fun NavController.navigateMyCourses(myCourseType: MyCourseType) { this.navigate(route = MyCourseRoute.route(myCourseType = myCourseType)) diff --git a/app/src/main/java/org/sopt/dateroad/presentation/ui/mypage/MyPageContract.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/mypage/MyPageContract.kt similarity index 80% rename from app/src/main/java/org/sopt/dateroad/presentation/ui/mypage/MyPageContract.kt rename to app/src/main/java/org/sopt/teamdateroad/presentation/ui/mypage/MyPageContract.kt index 564b78bab..1a90a8013 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/ui/mypage/MyPageContract.kt +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/mypage/MyPageContract.kt @@ -1,10 +1,10 @@ -package org.sopt.dateroad.presentation.ui.mypage +package org.sopt.teamdateroad.presentation.ui.mypage -import org.sopt.dateroad.domain.model.Profile -import org.sopt.dateroad.presentation.util.base.UiEvent -import org.sopt.dateroad.presentation.util.base.UiSideEffect -import org.sopt.dateroad.presentation.util.base.UiState -import org.sopt.dateroad.presentation.util.view.LoadState +import org.sopt.teamdateroad.domain.model.Profile +import org.sopt.teamdateroad.presentation.util.base.UiEvent +import org.sopt.teamdateroad.presentation.util.base.UiSideEffect +import org.sopt.teamdateroad.presentation.util.base.UiState +import org.sopt.teamdateroad.presentation.util.view.LoadState class MyPageContract { data class MyPageUiState( diff --git a/app/src/main/java/org/sopt/dateroad/presentation/ui/mypage/MyPageScreen.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/mypage/MyPageScreen.kt similarity index 86% rename from app/src/main/java/org/sopt/dateroad/presentation/ui/mypage/MyPageScreen.kt rename to app/src/main/java/org/sopt/teamdateroad/presentation/ui/mypage/MyPageScreen.kt index 1c729926a..e508e97a3 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/ui/mypage/MyPageScreen.kt +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/mypage/MyPageScreen.kt @@ -1,4 +1,4 @@ -package org.sopt.dateroad.presentation.ui.mypage +package org.sopt.teamdateroad.presentation.ui.mypage import androidx.compose.foundation.Image import androidx.compose.foundation.background @@ -36,32 +36,32 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle import androidx.lifecycle.flowWithLifecycle import coil.compose.AsyncImage import coil.request.ImageRequest -import org.sopt.dateroad.R -import org.sopt.dateroad.data.dataremote.util.Point -import org.sopt.dateroad.domain.model.Profile -import org.sopt.dateroad.presentation.type.DateTagType.Companion.getDateTagTypeByName -import org.sopt.dateroad.presentation.type.MyCourseType -import org.sopt.dateroad.presentation.type.MyPageMenuType -import org.sopt.dateroad.presentation.type.ProfileType -import org.sopt.dateroad.presentation.type.TagType -import org.sopt.dateroad.presentation.type.TwoButtonDialogType -import org.sopt.dateroad.presentation.type.TwoButtonDialogWithDescriptionType -import org.sopt.dateroad.presentation.ui.component.button.DateRoadTextButton -import org.sopt.dateroad.presentation.ui.component.dialog.DateRoadTwoButtonDialog -import org.sopt.dateroad.presentation.ui.component.dialog.DateRoadTwoButtonDialogWithDescription -import org.sopt.dateroad.presentation.ui.component.tag.DateRoadImageTag -import org.sopt.dateroad.presentation.ui.component.topbar.DateRoadLeftTitleTopBar -import org.sopt.dateroad.presentation.ui.component.view.DateRoadErrorView -import org.sopt.dateroad.presentation.ui.component.view.DateRoadIdleView -import org.sopt.dateroad.presentation.ui.component.view.DateRoadLoadingView -import org.sopt.dateroad.presentation.ui.component.view.DateRoadWebView -import org.sopt.dateroad.presentation.ui.mypage.component.MyPageButton -import org.sopt.dateroad.presentation.ui.mypage.component.MyPagePointBox -import org.sopt.dateroad.presentation.util.WebViewUrl.ASK_URL -import org.sopt.dateroad.presentation.util.modifier.noRippleClickable -import org.sopt.dateroad.presentation.util.view.LoadState -import org.sopt.dateroad.ui.theme.DATEROADTheme -import org.sopt.dateroad.ui.theme.DateRoadTheme +import org.sopt.teamdateroad.R +import org.sopt.teamdateroad.data.dataremote.util.Point +import org.sopt.teamdateroad.domain.model.Profile +import org.sopt.teamdateroad.presentation.type.DateTagType.Companion.getDateTagTypeByName +import org.sopt.teamdateroad.presentation.type.MyCourseType +import org.sopt.teamdateroad.presentation.type.MyPageMenuType +import org.sopt.teamdateroad.presentation.type.ProfileType +import org.sopt.teamdateroad.presentation.type.TagType +import org.sopt.teamdateroad.presentation.type.TwoButtonDialogType +import org.sopt.teamdateroad.presentation.type.TwoButtonDialogWithDescriptionType +import org.sopt.teamdateroad.presentation.ui.component.button.DateRoadTextButton +import org.sopt.teamdateroad.presentation.ui.component.dialog.DateRoadTwoButtonDialog +import org.sopt.teamdateroad.presentation.ui.component.dialog.DateRoadTwoButtonDialogWithDescription +import org.sopt.teamdateroad.presentation.ui.component.tag.DateRoadImageTag +import org.sopt.teamdateroad.presentation.ui.component.topbar.DateRoadLeftTitleTopBar +import org.sopt.teamdateroad.presentation.ui.component.view.DateRoadErrorView +import org.sopt.teamdateroad.presentation.ui.component.view.DateRoadIdleView +import org.sopt.teamdateroad.presentation.ui.component.view.DateRoadLoadingView +import org.sopt.teamdateroad.presentation.ui.component.view.DateRoadWebView +import org.sopt.teamdateroad.presentation.ui.mypage.component.MyPageButton +import org.sopt.teamdateroad.presentation.ui.mypage.component.MyPagePointBox +import org.sopt.teamdateroad.presentation.util.WebViewUrl.ASK_URL +import org.sopt.teamdateroad.presentation.util.modifier.noRippleClickable +import org.sopt.teamdateroad.presentation.util.view.LoadState +import org.sopt.teamdateroad.ui.theme.DATEROADTheme +import org.sopt.teamdateroad.ui.theme.DateRoadTheme @Composable fun MyPageRoute( diff --git a/app/src/main/java/org/sopt/dateroad/presentation/ui/mypage/MyPageViewModel.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/mypage/MyPageViewModel.kt similarity index 88% rename from app/src/main/java/org/sopt/dateroad/presentation/ui/mypage/MyPageViewModel.kt rename to app/src/main/java/org/sopt/teamdateroad/presentation/ui/mypage/MyPageViewModel.kt index 1b6606715..cd36726c5 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/ui/mypage/MyPageViewModel.kt +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/mypage/MyPageViewModel.kt @@ -1,15 +1,15 @@ -package org.sopt.dateroad.presentation.ui.mypage +package org.sopt.teamdateroad.presentation.ui.mypage import androidx.lifecycle.viewModelScope import dagger.hilt.android.lifecycle.HiltViewModel import javax.inject.Inject import kotlinx.coroutines.launch -import org.sopt.dateroad.domain.usecase.ClearUserInfoUseCase -import org.sopt.dateroad.domain.usecase.DeleteSignOutUseCase -import org.sopt.dateroad.domain.usecase.DeleteWithdrawUseCase -import org.sopt.dateroad.domain.usecase.GetUserUseCase -import org.sopt.dateroad.presentation.util.base.BaseViewModel -import org.sopt.dateroad.presentation.util.view.LoadState +import org.sopt.teamdateroad.domain.usecase.ClearUserInfoUseCase +import org.sopt.teamdateroad.domain.usecase.DeleteSignOutUseCase +import org.sopt.teamdateroad.domain.usecase.DeleteWithdrawUseCase +import org.sopt.teamdateroad.domain.usecase.GetUserUseCase +import org.sopt.teamdateroad.presentation.util.base.BaseViewModel +import org.sopt.teamdateroad.presentation.util.view.LoadState @HiltViewModel class MyPageViewModel @Inject constructor( diff --git a/app/src/main/java/org/sopt/dateroad/presentation/ui/mypage/component/MyPageButton.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/mypage/component/MyPageButton.kt similarity index 88% rename from app/src/main/java/org/sopt/dateroad/presentation/ui/mypage/component/MyPageButton.kt rename to app/src/main/java/org/sopt/teamdateroad/presentation/ui/mypage/component/MyPageButton.kt index 4e0ca7056..3e295d85b 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/ui/mypage/component/MyPageButton.kt +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/mypage/component/MyPageButton.kt @@ -1,4 +1,4 @@ -package org.sopt.dateroad.presentation.ui.mypage.component +package org.sopt.teamdateroad.presentation.ui.mypage.component import androidx.compose.foundation.background import androidx.compose.foundation.layout.Column @@ -18,9 +18,9 @@ import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import org.sopt.dateroad.presentation.type.MyPageMenuType -import org.sopt.dateroad.presentation.util.modifier.noRippleClickable -import org.sopt.dateroad.ui.theme.DateRoadTheme +import org.sopt.teamdateroad.presentation.type.MyPageMenuType +import org.sopt.teamdateroad.presentation.util.modifier.noRippleClickable +import org.sopt.teamdateroad.ui.theme.DateRoadTheme @Composable fun MyPageButton( diff --git a/app/src/main/java/org/sopt/dateroad/presentation/ui/mypage/component/MyPagePointBox.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/mypage/component/MyPagePointBox.kt similarity index 91% rename from app/src/main/java/org/sopt/dateroad/presentation/ui/mypage/component/MyPagePointBox.kt rename to app/src/main/java/org/sopt/teamdateroad/presentation/ui/mypage/component/MyPagePointBox.kt index 131640b68..9610fa876 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/ui/mypage/component/MyPagePointBox.kt +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/mypage/component/MyPagePointBox.kt @@ -1,4 +1,4 @@ -package org.sopt.dateroad.presentation.ui.mypage.component +package org.sopt.teamdateroad.presentation.ui.mypage.component import androidx.compose.foundation.background import androidx.compose.foundation.layout.Column @@ -20,10 +20,10 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import org.sopt.dateroad.R -import org.sopt.dateroad.data.dataremote.util.Point.POINT -import org.sopt.dateroad.presentation.util.modifier.noRippleClickable -import org.sopt.dateroad.ui.theme.DateRoadTheme +import org.sopt.teamdateroad.R +import org.sopt.teamdateroad.data.dataremote.util.Point.POINT +import org.sopt.teamdateroad.presentation.util.modifier.noRippleClickable +import org.sopt.teamdateroad.ui.theme.DateRoadTheme @Composable fun MyPagePointBox( diff --git a/app/src/main/java/org/sopt/dateroad/presentation/ui/mypage/navigation/MyPageNavigation.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/mypage/navigation/MyPageNavigation.kt similarity index 77% rename from app/src/main/java/org/sopt/dateroad/presentation/ui/mypage/navigation/MyPageNavigation.kt rename to app/src/main/java/org/sopt/teamdateroad/presentation/ui/mypage/navigation/MyPageNavigation.kt index 346af9d0f..193366fec 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/ui/mypage/navigation/MyPageNavigation.kt +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/mypage/navigation/MyPageNavigation.kt @@ -1,14 +1,14 @@ -package org.sopt.dateroad.presentation.ui.mypage.navigation +package org.sopt.teamdateroad.presentation.ui.mypage.navigation import androidx.compose.foundation.layout.PaddingValues import androidx.navigation.NavController import androidx.navigation.NavGraphBuilder import androidx.navigation.NavOptions import androidx.navigation.compose.composable -import org.sopt.dateroad.presentation.model.MainNavigationBarRoute -import org.sopt.dateroad.presentation.type.MyCourseType -import org.sopt.dateroad.presentation.type.ProfileType -import org.sopt.dateroad.presentation.ui.mypage.MyPageRoute +import org.sopt.teamdateroad.presentation.model.MainNavigationBarRoute +import org.sopt.teamdateroad.presentation.type.MyCourseType +import org.sopt.teamdateroad.presentation.type.ProfileType +import org.sopt.teamdateroad.presentation.ui.mypage.MyPageRoute fun NavController.navigationMyPage(navOptions: NavOptions) { navigate( diff --git a/app/src/main/java/org/sopt/dateroad/presentation/ui/navigator/MainActivity.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/navigator/MainActivity.kt similarity index 88% rename from app/src/main/java/org/sopt/dateroad/presentation/ui/navigator/MainActivity.kt rename to app/src/main/java/org/sopt/teamdateroad/presentation/ui/navigator/MainActivity.kt index 19e5129ed..3d5b41f61 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/ui/navigator/MainActivity.kt +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/navigator/MainActivity.kt @@ -1,4 +1,4 @@ -package org.sopt.dateroad.presentation.ui.navigator +package org.sopt.teamdateroad.presentation.ui.navigator import android.os.Bundle import androidx.activity.ComponentActivity @@ -11,8 +11,8 @@ import androidx.compose.runtime.setValue import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen import dagger.hilt.android.AndroidEntryPoint import kotlinx.coroutines.delay -import org.sopt.dateroad.presentation.ui.splash.SplashScreen -import org.sopt.dateroad.ui.theme.DATEROADTheme +import org.sopt.teamdateroad.presentation.ui.splash.SplashScreen +import org.sopt.teamdateroad.ui.theme.DATEROADTheme @AndroidEntryPoint class MainActivity : ComponentActivity() { diff --git a/app/src/main/java/org/sopt/dateroad/presentation/ui/navigator/MainNavigator.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/navigator/MainNavigator.kt similarity index 71% rename from app/src/main/java/org/sopt/dateroad/presentation/ui/navigator/MainNavigator.kt rename to app/src/main/java/org/sopt/teamdateroad/presentation/ui/navigator/MainNavigator.kt index d9002019d..a58b06a0b 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/ui/navigator/MainNavigator.kt +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/navigator/MainNavigator.kt @@ -1,4 +1,4 @@ -package org.sopt.dateroad.presentation.ui.navigator +package org.sopt.teamdateroad.presentation.ui.navigator import androidx.compose.runtime.Composable import androidx.compose.runtime.remember @@ -9,30 +9,30 @@ import androidx.navigation.NavOptions import androidx.navigation.compose.currentBackStackEntryAsState import androidx.navigation.compose.rememberNavController import androidx.navigation.navOptions -import org.sopt.dateroad.presentation.model.MainNavigationBarRoute -import org.sopt.dateroad.presentation.model.Route -import org.sopt.dateroad.presentation.type.EnrollType -import org.sopt.dateroad.presentation.type.MainNavigationBarItemType -import org.sopt.dateroad.presentation.type.MyCourseType -import org.sopt.dateroad.presentation.type.ProfileType -import org.sopt.dateroad.presentation.type.TimelineType -import org.sopt.dateroad.presentation.ui.advertisement.navigation.navigationAdvertisement -import org.sopt.dateroad.presentation.ui.coursedetail.navigation.navigationCourseDetail -import org.sopt.dateroad.presentation.ui.enroll.navigation.navigationEnroll -import org.sopt.dateroad.presentation.ui.home.navigation.navigationHome -import org.sopt.dateroad.presentation.ui.look.navigation.navigationLook -import org.sopt.dateroad.presentation.ui.mycourse.navigation.navigateMyCourses -import org.sopt.dateroad.presentation.ui.mypage.navigation.navigationMyPage -import org.sopt.dateroad.presentation.ui.onboarding.navigation.navigationOnboarding -import org.sopt.dateroad.presentation.ui.past.navigation.navigationPast -import org.sopt.dateroad.presentation.ui.pointguide.navigation.navigationPointGuide -import org.sopt.dateroad.presentation.ui.pointhistory.navigation.navigationPointHistory -import org.sopt.dateroad.presentation.ui.profile.navigation.navigationProfile -import org.sopt.dateroad.presentation.ui.read.navigation.navigationRead -import org.sopt.dateroad.presentation.ui.signin.navigation.SignInRoute -import org.sopt.dateroad.presentation.ui.signin.navigation.navigationSignIn -import org.sopt.dateroad.presentation.ui.timeline.navigation.navigationTimeline -import org.sopt.dateroad.presentation.ui.timelinedetail.navigation.navigateToTimelineDetail +import org.sopt.teamdateroad.presentation.model.MainNavigationBarRoute +import org.sopt.teamdateroad.presentation.model.Route +import org.sopt.teamdateroad.presentation.type.EnrollType +import org.sopt.teamdateroad.presentation.type.MainNavigationBarItemType +import org.sopt.teamdateroad.presentation.type.MyCourseType +import org.sopt.teamdateroad.presentation.type.ProfileType +import org.sopt.teamdateroad.presentation.type.TimelineType +import org.sopt.teamdateroad.presentation.ui.advertisement.navigation.navigationAdvertisement +import org.sopt.teamdateroad.presentation.ui.coursedetail.navigation.navigationCourseDetail +import org.sopt.teamdateroad.presentation.ui.enroll.navigation.navigationEnroll +import org.sopt.teamdateroad.presentation.ui.home.navigation.navigationHome +import org.sopt.teamdateroad.presentation.ui.look.navigation.navigationLook +import org.sopt.teamdateroad.presentation.ui.mycourse.navigation.navigateMyCourses +import org.sopt.teamdateroad.presentation.ui.mypage.navigation.navigationMyPage +import org.sopt.teamdateroad.presentation.ui.onboarding.navigation.navigationOnboarding +import org.sopt.teamdateroad.presentation.ui.past.navigation.navigationPast +import org.sopt.teamdateroad.presentation.ui.pointguide.navigation.navigationPointGuide +import org.sopt.teamdateroad.presentation.ui.pointhistory.navigation.navigationPointHistory +import org.sopt.teamdateroad.presentation.ui.profile.navigation.navigationProfile +import org.sopt.teamdateroad.presentation.ui.read.navigation.navigationRead +import org.sopt.teamdateroad.presentation.ui.signin.navigation.SignInRoute +import org.sopt.teamdateroad.presentation.ui.signin.navigation.navigationSignIn +import org.sopt.teamdateroad.presentation.ui.timeline.navigation.navigationTimeline +import org.sopt.teamdateroad.presentation.ui.timelinedetail.navigation.navigateToTimelineDetail class MainNavigator( val navHostController: NavHostController diff --git a/app/src/main/java/org/sopt/dateroad/presentation/ui/navigator/MainScreen.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/navigator/MainScreen.kt similarity index 77% rename from app/src/main/java/org/sopt/dateroad/presentation/ui/navigator/MainScreen.kt rename to app/src/main/java/org/sopt/teamdateroad/presentation/ui/navigator/MainScreen.kt index 9e78684d2..826f07c48 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/ui/navigator/MainScreen.kt +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/navigator/MainScreen.kt @@ -1,13 +1,13 @@ -package org.sopt.dateroad.presentation.ui.navigator +package org.sopt.teamdateroad.presentation.ui.navigator import androidx.compose.material3.Scaffold import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.tooling.preview.Preview -import org.sopt.dateroad.presentation.type.MainNavigationBarItemType -import org.sopt.dateroad.presentation.ui.navigator.component.MainBottomBar -import org.sopt.dateroad.presentation.ui.navigator.component.MainNavHost -import org.sopt.dateroad.ui.theme.DATEROADTheme +import org.sopt.teamdateroad.presentation.type.MainNavigationBarItemType +import org.sopt.teamdateroad.presentation.ui.navigator.component.MainBottomBar +import org.sopt.teamdateroad.presentation.ui.navigator.component.MainNavHost +import org.sopt.teamdateroad.ui.theme.DATEROADTheme @Composable fun MainScreen( diff --git a/app/src/main/java/org/sopt/dateroad/presentation/ui/navigator/component/MainBottomBar.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/navigator/component/MainBottomBar.kt similarity index 89% rename from app/src/main/java/org/sopt/dateroad/presentation/ui/navigator/component/MainBottomBar.kt rename to app/src/main/java/org/sopt/teamdateroad/presentation/ui/navigator/component/MainBottomBar.kt index a37d40f36..1bebc23ae 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/ui/navigator/component/MainBottomBar.kt +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/navigator/component/MainBottomBar.kt @@ -1,4 +1,4 @@ -package org.sopt.dateroad.presentation.ui.navigator.component +package org.sopt.teamdateroad.presentation.ui.navigator.component import android.content.Context import androidx.compose.animation.AnimatedVisibility @@ -21,13 +21,13 @@ import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.painterResource import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import org.sopt.dateroad.presentation.type.MainNavigationBarItemType -import org.sopt.dateroad.ui.theme.Black -import org.sopt.dateroad.ui.theme.DATEROADTheme -import org.sopt.dateroad.ui.theme.DateRoadTheme -import org.sopt.dateroad.ui.theme.Gray200 -import org.sopt.dateroad.ui.theme.Gray300 -import org.sopt.dateroad.ui.theme.White +import org.sopt.teamdateroad.presentation.type.MainNavigationBarItemType +import org.sopt.teamdateroad.ui.theme.Black +import org.sopt.teamdateroad.ui.theme.DATEROADTheme +import org.sopt.teamdateroad.ui.theme.DateRoadTheme +import org.sopt.teamdateroad.ui.theme.Gray200 +import org.sopt.teamdateroad.ui.theme.Gray300 +import org.sopt.teamdateroad.ui.theme.White @Composable fun CustomNavigationBarItem( diff --git a/app/src/main/java/org/sopt/dateroad/presentation/ui/navigator/component/MainNavHost.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/navigator/component/MainNavHost.kt similarity index 74% rename from app/src/main/java/org/sopt/dateroad/presentation/ui/navigator/component/MainNavHost.kt rename to app/src/main/java/org/sopt/teamdateroad/presentation/ui/navigator/component/MainNavHost.kt index 3d0a776e7..1226133da 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/ui/navigator/component/MainNavHost.kt +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/navigator/component/MainNavHost.kt @@ -1,4 +1,4 @@ -package org.sopt.dateroad.presentation.ui.navigator.component +package org.sopt.teamdateroad.presentation.ui.navigator.component import androidx.compose.foundation.background import androidx.compose.foundation.layout.Box @@ -7,26 +7,26 @@ import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.navigation.compose.NavHost -import org.sopt.dateroad.presentation.ui.advertisement.navigation.advertisementGraph -import org.sopt.dateroad.presentation.ui.coursedetail.navigation.courseDetailGraph -import org.sopt.dateroad.presentation.ui.enroll.navigation.enrollNavGraph -import org.sopt.dateroad.presentation.ui.home.navigation.homeNavGraph -import org.sopt.dateroad.presentation.ui.look.navigation.lookNavGraph -import org.sopt.dateroad.presentation.ui.mycourse.navigation.myCoursesNavGraph -import org.sopt.dateroad.presentation.ui.mypage.navigation.myPageNavGraph -import org.sopt.dateroad.presentation.ui.navigator.MainNavigator -import org.sopt.dateroad.presentation.ui.onboarding.navigation.onboardingNavGraph -import org.sopt.dateroad.presentation.ui.past.navigation.pastNavGraph -import org.sopt.dateroad.presentation.ui.pointguide.navigation.pointGuideGraph -import org.sopt.dateroad.presentation.ui.pointhistory.navigation.pointHistoryGraph -import org.sopt.dateroad.presentation.ui.profile.navigation.profileNavGraph -import org.sopt.dateroad.presentation.ui.read.navigation.readNavGraph -import org.sopt.dateroad.presentation.ui.signin.navigation.signInGraph -import org.sopt.dateroad.presentation.ui.timeline.navigation.timelineNavGraph -import org.sopt.dateroad.presentation.ui.timelinedetail.navigation.timelineDetailGraph -import org.sopt.dateroad.presentation.util.ViewPath.HOME -import org.sopt.dateroad.presentation.util.ViewPath.TIMELINE -import org.sopt.dateroad.ui.theme.DateRoadTheme +import org.sopt.teamdateroad.presentation.ui.advertisement.navigation.advertisementGraph +import org.sopt.teamdateroad.presentation.ui.coursedetail.navigation.courseDetailGraph +import org.sopt.teamdateroad.presentation.ui.enroll.navigation.enrollNavGraph +import org.sopt.teamdateroad.presentation.ui.home.navigation.homeNavGraph +import org.sopt.teamdateroad.presentation.ui.look.navigation.lookNavGraph +import org.sopt.teamdateroad.presentation.ui.mycourse.navigation.myCoursesNavGraph +import org.sopt.teamdateroad.presentation.ui.mypage.navigation.myPageNavGraph +import org.sopt.teamdateroad.presentation.ui.navigator.MainNavigator +import org.sopt.teamdateroad.presentation.ui.onboarding.navigation.onboardingNavGraph +import org.sopt.teamdateroad.presentation.ui.past.navigation.pastNavGraph +import org.sopt.teamdateroad.presentation.ui.pointguide.navigation.pointGuideGraph +import org.sopt.teamdateroad.presentation.ui.pointhistory.navigation.pointHistoryGraph +import org.sopt.teamdateroad.presentation.ui.profile.navigation.profileNavGraph +import org.sopt.teamdateroad.presentation.ui.read.navigation.readNavGraph +import org.sopt.teamdateroad.presentation.ui.signin.navigation.signInGraph +import org.sopt.teamdateroad.presentation.ui.timeline.navigation.timelineNavGraph +import org.sopt.teamdateroad.presentation.ui.timelinedetail.navigation.timelineDetailGraph +import org.sopt.teamdateroad.presentation.util.ViewPath.HOME +import org.sopt.teamdateroad.presentation.util.ViewPath.TIMELINE +import org.sopt.teamdateroad.ui.theme.DateRoadTheme @Composable fun MainNavHost( diff --git a/app/src/main/java/org/sopt/dateroad/presentation/ui/onboarding/OnBoardingContract.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/onboarding/OnBoardingContract.kt similarity index 55% rename from app/src/main/java/org/sopt/dateroad/presentation/ui/onboarding/OnBoardingContract.kt rename to app/src/main/java/org/sopt/teamdateroad/presentation/ui/onboarding/OnBoardingContract.kt index e5387a838..1845675b7 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/ui/onboarding/OnBoardingContract.kt +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/onboarding/OnBoardingContract.kt @@ -1,8 +1,8 @@ -package org.sopt.dateroad.presentation.ui.onboarding +package org.sopt.teamdateroad.presentation.ui.onboarding -import org.sopt.dateroad.presentation.util.base.UiEvent -import org.sopt.dateroad.presentation.util.base.UiSideEffect -import org.sopt.dateroad.presentation.util.base.UiState +import org.sopt.teamdateroad.presentation.util.base.UiEvent +import org.sopt.teamdateroad.presentation.util.base.UiSideEffect +import org.sopt.teamdateroad.presentation.util.base.UiState class OnBoardingContract { class OnBoardingUiState : UiState diff --git a/app/src/main/java/org/sopt/dateroad/presentation/ui/onboarding/OnBoardingViewModel.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/onboarding/OnBoardingViewModel.kt similarity index 79% rename from app/src/main/java/org/sopt/dateroad/presentation/ui/onboarding/OnBoardingViewModel.kt rename to app/src/main/java/org/sopt/teamdateroad/presentation/ui/onboarding/OnBoardingViewModel.kt index 6acf7bac9..984f7165a 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/ui/onboarding/OnBoardingViewModel.kt +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/onboarding/OnBoardingViewModel.kt @@ -1,8 +1,8 @@ -package org.sopt.dateroad.presentation.ui.onboarding +package org.sopt.teamdateroad.presentation.ui.onboarding import dagger.hilt.android.lifecycle.HiltViewModel import javax.inject.Inject -import org.sopt.dateroad.presentation.util.base.BaseViewModel +import org.sopt.teamdateroad.presentation.util.base.BaseViewModel @HiltViewModel class OnBoardingViewModel @Inject constructor() : BaseViewModel() { diff --git a/app/src/main/java/org/sopt/dateroad/presentation/ui/onboarding/OnboardingScreen.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/onboarding/OnboardingScreen.kt similarity index 90% rename from app/src/main/java/org/sopt/dateroad/presentation/ui/onboarding/OnboardingScreen.kt rename to app/src/main/java/org/sopt/teamdateroad/presentation/ui/onboarding/OnboardingScreen.kt index 1610ae74d..a289ce50d 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/ui/onboarding/OnboardingScreen.kt +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/onboarding/OnboardingScreen.kt @@ -1,4 +1,4 @@ -package org.sopt.dateroad.presentation.ui.onboarding +package org.sopt.teamdateroad.presentation.ui.onboarding import androidx.activity.compose.BackHandler import androidx.compose.foundation.Image @@ -29,16 +29,16 @@ import com.google.accompanist.pager.PagerState import com.google.accompanist.pager.rememberPagerState import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.launch -import org.sopt.dateroad.R -import org.sopt.dateroad.presentation.type.OnboardingType -import org.sopt.dateroad.presentation.type.ProfileType -import org.sopt.dateroad.presentation.ui.component.button.DateRoadFilledButton -import org.sopt.dateroad.presentation.ui.component.dotsindicator.DotsIndicator -import org.sopt.dateroad.presentation.ui.component.partialcolortext.PartialColorText -import org.sopt.dateroad.presentation.util.Onboarding.FIRST -import org.sopt.dateroad.presentation.util.Onboarding.FIRST_PAGE_KEYWORD -import org.sopt.dateroad.presentation.util.Onboarding.KEYWORD -import org.sopt.dateroad.ui.theme.DateRoadTheme +import org.sopt.teamdateroad.R +import org.sopt.teamdateroad.presentation.type.OnboardingType +import org.sopt.teamdateroad.presentation.type.ProfileType +import org.sopt.teamdateroad.presentation.ui.component.button.DateRoadFilledButton +import org.sopt.teamdateroad.presentation.ui.component.dotsindicator.DotsIndicator +import org.sopt.teamdateroad.presentation.ui.component.partialcolortext.PartialColorText +import org.sopt.teamdateroad.presentation.util.Onboarding.FIRST +import org.sopt.teamdateroad.presentation.util.Onboarding.FIRST_PAGE_KEYWORD +import org.sopt.teamdateroad.presentation.util.Onboarding.KEYWORD +import org.sopt.teamdateroad.ui.theme.DateRoadTheme @OptIn(ExperimentalPagerApi::class) @Composable diff --git a/app/src/main/java/org/sopt/dateroad/presentation/ui/onboarding/navigation/OnboardingNavigation.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/onboarding/navigation/OnboardingNavigation.kt similarity index 75% rename from app/src/main/java/org/sopt/dateroad/presentation/ui/onboarding/navigation/OnboardingNavigation.kt rename to app/src/main/java/org/sopt/teamdateroad/presentation/ui/onboarding/navigation/OnboardingNavigation.kt index 9d118fad4..b60b2e473 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/ui/onboarding/navigation/OnboardingNavigation.kt +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/onboarding/navigation/OnboardingNavigation.kt @@ -1,10 +1,10 @@ -package org.sopt.dateroad.presentation.ui.onboarding.navigation +package org.sopt.teamdateroad.presentation.ui.onboarding.navigation import androidx.navigation.NavController import androidx.navigation.NavGraphBuilder import androidx.navigation.compose.composable -import org.sopt.dateroad.presentation.type.ProfileType -import org.sopt.dateroad.presentation.ui.onboarding.OnboardingRoute +import org.sopt.teamdateroad.presentation.type.ProfileType +import org.sopt.teamdateroad.presentation.ui.onboarding.OnboardingRoute fun NavController.navigationOnboarding() { navigate( diff --git a/app/src/main/java/org/sopt/dateroad/presentation/ui/past/PastContract.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/past/PastContract.kt similarity index 57% rename from app/src/main/java/org/sopt/dateroad/presentation/ui/past/PastContract.kt rename to app/src/main/java/org/sopt/teamdateroad/presentation/ui/past/PastContract.kt index cdaeeb93b..3d3f4e692 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/ui/past/PastContract.kt +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/past/PastContract.kt @@ -1,11 +1,11 @@ -package org.sopt.dateroad.presentation.ui.past +package org.sopt.teamdateroad.presentation.ui.past -import org.sopt.dateroad.domain.model.Timeline -import org.sopt.dateroad.presentation.type.TimelineType -import org.sopt.dateroad.presentation.util.base.UiEvent -import org.sopt.dateroad.presentation.util.base.UiSideEffect -import org.sopt.dateroad.presentation.util.base.UiState -import org.sopt.dateroad.presentation.util.view.LoadState +import org.sopt.teamdateroad.domain.model.Timeline +import org.sopt.teamdateroad.presentation.type.TimelineType +import org.sopt.teamdateroad.presentation.util.base.UiEvent +import org.sopt.teamdateroad.presentation.util.base.UiSideEffect +import org.sopt.teamdateroad.presentation.util.base.UiState +import org.sopt.teamdateroad.presentation.util.view.LoadState class PastContract { data class PastUiState( diff --git a/app/src/main/java/org/sopt/dateroad/presentation/ui/past/PastScreen.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/past/PastScreen.kt similarity index 82% rename from app/src/main/java/org/sopt/dateroad/presentation/ui/past/PastScreen.kt rename to app/src/main/java/org/sopt/teamdateroad/presentation/ui/past/PastScreen.kt index 2966406ae..e5c6ff3fc 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/ui/past/PastScreen.kt +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/past/PastScreen.kt @@ -1,4 +1,4 @@ -package org.sopt.dateroad.presentation.ui.past +package org.sopt.teamdateroad.presentation.ui.past import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement @@ -18,19 +18,19 @@ import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.compose.LocalLifecycleOwner import androidx.lifecycle.compose.collectAsStateWithLifecycle import androidx.lifecycle.flowWithLifecycle -import org.sopt.dateroad.R -import org.sopt.dateroad.domain.type.TimelineTimeType -import org.sopt.dateroad.presentation.type.EmptyViewType -import org.sopt.dateroad.presentation.type.TimelineType -import org.sopt.dateroad.presentation.ui.component.topbar.DateRoadBasicTopBar -import org.sopt.dateroad.presentation.ui.component.view.DateRoadEmptyView -import org.sopt.dateroad.presentation.ui.component.view.DateRoadErrorView -import org.sopt.dateroad.presentation.ui.component.view.DateRoadIdleView -import org.sopt.dateroad.presentation.ui.component.view.DateRoadLoadingView -import org.sopt.dateroad.presentation.ui.past.component.PastCard -import org.sopt.dateroad.presentation.util.view.LoadState -import org.sopt.dateroad.ui.theme.DATEROADTheme -import org.sopt.dateroad.ui.theme.DateRoadTheme +import org.sopt.teamdateroad.R +import org.sopt.teamdateroad.domain.type.TimelineTimeType +import org.sopt.teamdateroad.presentation.type.EmptyViewType +import org.sopt.teamdateroad.presentation.type.TimelineType +import org.sopt.teamdateroad.presentation.ui.component.topbar.DateRoadBasicTopBar +import org.sopt.teamdateroad.presentation.ui.component.view.DateRoadEmptyView +import org.sopt.teamdateroad.presentation.ui.component.view.DateRoadErrorView +import org.sopt.teamdateroad.presentation.ui.component.view.DateRoadIdleView +import org.sopt.teamdateroad.presentation.ui.component.view.DateRoadLoadingView +import org.sopt.teamdateroad.presentation.ui.past.component.PastCard +import org.sopt.teamdateroad.presentation.util.view.LoadState +import org.sopt.teamdateroad.ui.theme.DATEROADTheme +import org.sopt.teamdateroad.ui.theme.DateRoadTheme @Composable fun PastRoute( diff --git a/app/src/main/java/org/sopt/dateroad/presentation/ui/past/PastViewModel.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/past/PastViewModel.kt similarity index 81% rename from app/src/main/java/org/sopt/dateroad/presentation/ui/past/PastViewModel.kt rename to app/src/main/java/org/sopt/teamdateroad/presentation/ui/past/PastViewModel.kt index e95affac0..365576053 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/ui/past/PastViewModel.kt +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/past/PastViewModel.kt @@ -1,13 +1,13 @@ -package org.sopt.dateroad.presentation.ui.past +package org.sopt.teamdateroad.presentation.ui.past import androidx.lifecycle.viewModelScope import dagger.hilt.android.lifecycle.HiltViewModel import javax.inject.Inject import kotlinx.coroutines.launch -import org.sopt.dateroad.domain.type.TimelineTimeType -import org.sopt.dateroad.domain.usecase.GetTimelinesUseCase -import org.sopt.dateroad.presentation.util.base.BaseViewModel -import org.sopt.dateroad.presentation.util.view.LoadState +import org.sopt.teamdateroad.domain.type.TimelineTimeType +import org.sopt.teamdateroad.domain.usecase.GetTimelinesUseCase +import org.sopt.teamdateroad.presentation.util.base.BaseViewModel +import org.sopt.teamdateroad.presentation.util.view.LoadState @HiltViewModel class PastViewModel @Inject constructor( diff --git a/app/src/main/java/org/sopt/dateroad/presentation/ui/past/component/PastCard.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/past/component/PastCard.kt similarity index 90% rename from app/src/main/java/org/sopt/dateroad/presentation/ui/past/component/PastCard.kt rename to app/src/main/java/org/sopt/teamdateroad/presentation/ui/past/component/PastCard.kt index 3ee936984..9cbf163cb 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/ui/past/component/PastCard.kt +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/past/component/PastCard.kt @@ -1,4 +1,4 @@ -package org.sopt.dateroad.presentation.ui.past.component +package org.sopt.teamdateroad.presentation.ui.past.component import androidx.compose.foundation.Canvas import androidx.compose.foundation.background @@ -26,15 +26,15 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import org.sopt.dateroad.R -import org.sopt.dateroad.domain.model.Timeline -import org.sopt.dateroad.presentation.type.DateTagType -import org.sopt.dateroad.presentation.type.TimelineType -import org.sopt.dateroad.presentation.ui.component.tag.DateRoadImageTag -import org.sopt.dateroad.presentation.util.modifier.noRippleClickable -import org.sopt.dateroad.ui.theme.DATEROADTheme -import org.sopt.dateroad.ui.theme.DateRoadTheme -import org.sopt.dateroad.ui.theme.defaultDateRoadColors +import org.sopt.teamdateroad.R +import org.sopt.teamdateroad.domain.model.Timeline +import org.sopt.teamdateroad.presentation.type.DateTagType +import org.sopt.teamdateroad.presentation.type.TimelineType +import org.sopt.teamdateroad.presentation.ui.component.tag.DateRoadImageTag +import org.sopt.teamdateroad.presentation.util.modifier.noRippleClickable +import org.sopt.teamdateroad.ui.theme.DATEROADTheme +import org.sopt.teamdateroad.ui.theme.DateRoadTheme +import org.sopt.teamdateroad.ui.theme.defaultDateRoadColors @Composable fun PastCard( diff --git a/app/src/main/java/org/sopt/dateroad/presentation/ui/past/navigation/PastNavigation.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/past/navigation/PastNavigation.kt similarity index 79% rename from app/src/main/java/org/sopt/dateroad/presentation/ui/past/navigation/PastNavigation.kt rename to app/src/main/java/org/sopt/teamdateroad/presentation/ui/past/navigation/PastNavigation.kt index daeb2da69..b08a9734b 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/ui/past/navigation/PastNavigation.kt +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/past/navigation/PastNavigation.kt @@ -1,11 +1,11 @@ -package org.sopt.dateroad.presentation.ui.past.navigation +package org.sopt.teamdateroad.presentation.ui.past.navigation import androidx.compose.foundation.layout.PaddingValues import androidx.navigation.NavController import androidx.navigation.NavGraphBuilder import androidx.navigation.compose.composable -import org.sopt.dateroad.presentation.type.TimelineType -import org.sopt.dateroad.presentation.ui.past.PastRoute +import org.sopt.teamdateroad.presentation.type.TimelineType +import org.sopt.teamdateroad.presentation.ui.past.PastRoute fun NavController.navigationPast() { navigate( diff --git a/app/src/main/java/org/sopt/dateroad/presentation/ui/pointguide/PointGuideScreen.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/pointguide/PointGuideScreen.kt similarity index 85% rename from app/src/main/java/org/sopt/dateroad/presentation/ui/pointguide/PointGuideScreen.kt rename to app/src/main/java/org/sopt/teamdateroad/presentation/ui/pointguide/PointGuideScreen.kt index a2955e179..7491c0fd2 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/ui/pointguide/PointGuideScreen.kt +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/pointguide/PointGuideScreen.kt @@ -1,4 +1,4 @@ -package org.sopt.dateroad.presentation.ui.pointguide +package org.sopt.teamdateroad.presentation.ui.pointguide import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement @@ -15,12 +15,12 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import org.sopt.dateroad.R -import org.sopt.dateroad.presentation.type.MyPagePointInfoType -import org.sopt.dateroad.presentation.ui.component.partialcolortext.PartialColorText -import org.sopt.dateroad.presentation.ui.component.topbar.DateRoadBasicTopBar -import org.sopt.dateroad.presentation.ui.pointguide.component.DateRoadMyPagePointInfo -import org.sopt.dateroad.ui.theme.DateRoadTheme +import org.sopt.teamdateroad.R +import org.sopt.teamdateroad.presentation.type.MyPagePointInfoType +import org.sopt.teamdateroad.presentation.ui.component.partialcolortext.PartialColorText +import org.sopt.teamdateroad.presentation.ui.component.topbar.DateRoadBasicTopBar +import org.sopt.teamdateroad.presentation.ui.pointguide.component.DateRoadMyPagePointInfo +import org.sopt.teamdateroad.ui.theme.DateRoadTheme @Composable fun ProfileGuideRoute( diff --git a/app/src/main/java/org/sopt/dateroad/presentation/ui/pointguide/component/DateRoadMyPagePointInfo.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/pointguide/component/DateRoadMyPagePointInfo.kt similarity index 93% rename from app/src/main/java/org/sopt/dateroad/presentation/ui/pointguide/component/DateRoadMyPagePointInfo.kt rename to app/src/main/java/org/sopt/teamdateroad/presentation/ui/pointguide/component/DateRoadMyPagePointInfo.kt index 350019121..dcaaceede 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/ui/pointguide/component/DateRoadMyPagePointInfo.kt +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/pointguide/component/DateRoadMyPagePointInfo.kt @@ -1,4 +1,4 @@ -package org.sopt.dateroad.presentation.ui.pointguide.component +package org.sopt.teamdateroad.presentation.ui.pointguide.component import androidx.compose.foundation.Image import androidx.compose.foundation.background @@ -21,8 +21,8 @@ import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import org.sopt.dateroad.presentation.type.MyPagePointInfoType -import org.sopt.dateroad.ui.theme.DateRoadTheme +import org.sopt.teamdateroad.presentation.type.MyPagePointInfoType +import org.sopt.teamdateroad.ui.theme.DateRoadTheme @Composable fun DateRoadMyPagePointInfo(myPagePointInfoType: MyPagePointInfoType) { diff --git a/app/src/main/java/org/sopt/dateroad/presentation/ui/pointguide/navigation/PointGuideNavigation.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/pointguide/navigation/PointGuideNavigation.kt similarity index 81% rename from app/src/main/java/org/sopt/dateroad/presentation/ui/pointguide/navigation/PointGuideNavigation.kt rename to app/src/main/java/org/sopt/teamdateroad/presentation/ui/pointguide/navigation/PointGuideNavigation.kt index 287d676c6..bd25e068b 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/ui/pointguide/navigation/PointGuideNavigation.kt +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/pointguide/navigation/PointGuideNavigation.kt @@ -1,10 +1,10 @@ -package org.sopt.dateroad.presentation.ui.pointguide.navigation +package org.sopt.teamdateroad.presentation.ui.pointguide.navigation import androidx.compose.foundation.layout.PaddingValues import androidx.navigation.NavController import androidx.navigation.NavGraphBuilder import androidx.navigation.compose.composable -import org.sopt.dateroad.presentation.ui.pointguide.ProfileGuideRoute +import org.sopt.teamdateroad.presentation.ui.pointguide.ProfileGuideRoute fun NavController.navigationPointGuide() { navigate( diff --git a/app/src/main/java/org/sopt/dateroad/presentation/ui/pointhistory/PointHistoryContract.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/pointhistory/PointHistoryContract.kt similarity index 63% rename from app/src/main/java/org/sopt/dateroad/presentation/ui/pointhistory/PointHistoryContract.kt rename to app/src/main/java/org/sopt/teamdateroad/presentation/ui/pointhistory/PointHistoryContract.kt index 5b8b92df1..07d07ae4c 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/ui/pointhistory/PointHistoryContract.kt +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/pointhistory/PointHistoryContract.kt @@ -1,12 +1,12 @@ -package org.sopt.dateroad.presentation.ui.pointhistory +package org.sopt.teamdateroad.presentation.ui.pointhistory -import org.sopt.dateroad.domain.model.PointHistory -import org.sopt.dateroad.domain.model.UserPoint -import org.sopt.dateroad.presentation.type.PointHistoryTabType -import org.sopt.dateroad.presentation.util.base.UiEvent -import org.sopt.dateroad.presentation.util.base.UiSideEffect -import org.sopt.dateroad.presentation.util.base.UiState -import org.sopt.dateroad.presentation.util.view.LoadState +import org.sopt.teamdateroad.domain.model.PointHistory +import org.sopt.teamdateroad.domain.model.UserPoint +import org.sopt.teamdateroad.presentation.type.PointHistoryTabType +import org.sopt.teamdateroad.presentation.util.base.UiEvent +import org.sopt.teamdateroad.presentation.util.base.UiSideEffect +import org.sopt.teamdateroad.presentation.util.base.UiState +import org.sopt.teamdateroad.presentation.util.view.LoadState class PointHistoryContract { data class PointHistoryUiState( diff --git a/app/src/main/java/org/sopt/dateroad/presentation/ui/pointhistory/PointHistoryScreen.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/pointhistory/PointHistoryScreen.kt similarity index 83% rename from app/src/main/java/org/sopt/dateroad/presentation/ui/pointhistory/PointHistoryScreen.kt rename to app/src/main/java/org/sopt/teamdateroad/presentation/ui/pointhistory/PointHistoryScreen.kt index ca89cc52e..0768afcac 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/ui/pointhistory/PointHistoryScreen.kt +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/pointhistory/PointHistoryScreen.kt @@ -1,4 +1,4 @@ -package org.sopt.dateroad.presentation.ui.pointhistory +package org.sopt.teamdateroad.presentation.ui.pointhistory import androidx.compose.foundation.background import androidx.compose.foundation.layout.Box @@ -21,24 +21,24 @@ import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.compose.LocalLifecycleOwner import androidx.lifecycle.compose.collectAsStateWithLifecycle import androidx.lifecycle.flowWithLifecycle -import org.sopt.dateroad.R -import org.sopt.dateroad.domain.model.Point -import org.sopt.dateroad.domain.model.PointHistory -import org.sopt.dateroad.domain.model.UserPoint -import org.sopt.dateroad.presentation.type.EmptyViewType -import org.sopt.dateroad.presentation.type.PointHistoryTabType -import org.sopt.dateroad.presentation.ui.component.tabbar.DateRoadTabBar -import org.sopt.dateroad.presentation.ui.component.tabbar.DateRoadTabTitle -import org.sopt.dateroad.presentation.ui.component.topbar.DateRoadBasicTopBar -import org.sopt.dateroad.presentation.ui.component.view.DateRoadEmptyView -import org.sopt.dateroad.presentation.ui.component.view.DateRoadErrorView -import org.sopt.dateroad.presentation.ui.component.view.DateRoadIdleView -import org.sopt.dateroad.presentation.ui.component.view.DateRoadLoadingView -import org.sopt.dateroad.presentation.ui.pointhistory.component.PointHistoryCard -import org.sopt.dateroad.presentation.ui.pointhistory.component.PointHistoryPointBox -import org.sopt.dateroad.presentation.util.view.LoadState -import org.sopt.dateroad.ui.theme.DATEROADTheme -import org.sopt.dateroad.ui.theme.DateRoadTheme +import org.sopt.teamdateroad.R +import org.sopt.teamdateroad.domain.model.Point +import org.sopt.teamdateroad.domain.model.PointHistory +import org.sopt.teamdateroad.domain.model.UserPoint +import org.sopt.teamdateroad.presentation.type.EmptyViewType +import org.sopt.teamdateroad.presentation.type.PointHistoryTabType +import org.sopt.teamdateroad.presentation.ui.component.tabbar.DateRoadTabBar +import org.sopt.teamdateroad.presentation.ui.component.tabbar.DateRoadTabTitle +import org.sopt.teamdateroad.presentation.ui.component.topbar.DateRoadBasicTopBar +import org.sopt.teamdateroad.presentation.ui.component.view.DateRoadEmptyView +import org.sopt.teamdateroad.presentation.ui.component.view.DateRoadErrorView +import org.sopt.teamdateroad.presentation.ui.component.view.DateRoadIdleView +import org.sopt.teamdateroad.presentation.ui.component.view.DateRoadLoadingView +import org.sopt.teamdateroad.presentation.ui.pointhistory.component.PointHistoryCard +import org.sopt.teamdateroad.presentation.ui.pointhistory.component.PointHistoryPointBox +import org.sopt.teamdateroad.presentation.util.view.LoadState +import org.sopt.teamdateroad.ui.theme.DATEROADTheme +import org.sopt.teamdateroad.ui.theme.DateRoadTheme @Composable fun PointHistoryRoute( diff --git a/app/src/main/java/org/sopt/dateroad/presentation/ui/pointhistory/PointHistoryViewModel.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/pointhistory/PointHistoryViewModel.kt similarity index 88% rename from app/src/main/java/org/sopt/dateroad/presentation/ui/pointhistory/PointHistoryViewModel.kt rename to app/src/main/java/org/sopt/teamdateroad/presentation/ui/pointhistory/PointHistoryViewModel.kt index 4335d27c2..8ca13b37a 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/ui/pointhistory/PointHistoryViewModel.kt +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/pointhistory/PointHistoryViewModel.kt @@ -1,13 +1,13 @@ -package org.sopt.dateroad.presentation.ui.pointhistory +package org.sopt.teamdateroad.presentation.ui.pointhistory import androidx.lifecycle.viewModelScope import dagger.hilt.android.lifecycle.HiltViewModel import javax.inject.Inject import kotlinx.coroutines.launch -import org.sopt.dateroad.domain.usecase.GetPointHistoryUseCase -import org.sopt.dateroad.domain.usecase.GetUserPointUseCase -import org.sopt.dateroad.presentation.util.base.BaseViewModel -import org.sopt.dateroad.presentation.util.view.LoadState +import org.sopt.teamdateroad.domain.usecase.GetPointHistoryUseCase +import org.sopt.teamdateroad.domain.usecase.GetUserPointUseCase +import org.sopt.teamdateroad.presentation.util.base.BaseViewModel +import org.sopt.teamdateroad.presentation.util.view.LoadState @HiltViewModel class PointHistoryViewModel @Inject constructor( diff --git a/app/src/main/java/org/sopt/dateroad/presentation/ui/pointhistory/component/PointHistoryCard.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/pointhistory/component/PointHistoryCard.kt similarity index 88% rename from app/src/main/java/org/sopt/dateroad/presentation/ui/pointhistory/component/PointHistoryCard.kt rename to app/src/main/java/org/sopt/teamdateroad/presentation/ui/pointhistory/component/PointHistoryCard.kt index 72deb40cd..aab1bcd77 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/ui/pointhistory/component/PointHistoryCard.kt +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/pointhistory/component/PointHistoryCard.kt @@ -1,4 +1,4 @@ -package org.sopt.dateroad.presentation.ui.pointhistory.component +package org.sopt.teamdateroad.presentation.ui.pointhistory.component import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Row @@ -10,9 +10,9 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import org.sopt.dateroad.domain.model.Point -import org.sopt.dateroad.ui.theme.DATEROADTheme -import org.sopt.dateroad.ui.theme.DateRoadTheme +import org.sopt.teamdateroad.domain.model.Point +import org.sopt.teamdateroad.ui.theme.DATEROADTheme +import org.sopt.teamdateroad.ui.theme.DateRoadTheme @Composable fun PointHistoryCard( diff --git a/app/src/main/java/org/sopt/dateroad/presentation/ui/pointhistory/component/PointHistoryPointBox.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/pointhistory/component/PointHistoryPointBox.kt similarity index 89% rename from app/src/main/java/org/sopt/dateroad/presentation/ui/pointhistory/component/PointHistoryPointBox.kt rename to app/src/main/java/org/sopt/teamdateroad/presentation/ui/pointhistory/component/PointHistoryPointBox.kt index ab6c75536..7e0e16466 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/ui/pointhistory/component/PointHistoryPointBox.kt +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/pointhistory/component/PointHistoryPointBox.kt @@ -1,4 +1,4 @@ -package org.sopt.dateroad.presentation.ui.pointhistory.component +package org.sopt.teamdateroad.presentation.ui.pointhistory.component import androidx.compose.foundation.background import androidx.compose.foundation.layout.Column @@ -15,9 +15,9 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import org.sopt.dateroad.R -import org.sopt.dateroad.domain.model.UserPoint -import org.sopt.dateroad.ui.theme.DateRoadTheme +import org.sopt.teamdateroad.R +import org.sopt.teamdateroad.domain.model.UserPoint +import org.sopt.teamdateroad.ui.theme.DateRoadTheme @Composable fun PointHistoryPointBox( diff --git a/app/src/main/java/org/sopt/dateroad/presentation/ui/pointhistory/navigation/PointHistoryNavigation.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/pointhistory/navigation/PointHistoryNavigation.kt similarity index 80% rename from app/src/main/java/org/sopt/dateroad/presentation/ui/pointhistory/navigation/PointHistoryNavigation.kt rename to app/src/main/java/org/sopt/teamdateroad/presentation/ui/pointhistory/navigation/PointHistoryNavigation.kt index 3f92c96d8..3ab626bb6 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/ui/pointhistory/navigation/PointHistoryNavigation.kt +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/pointhistory/navigation/PointHistoryNavigation.kt @@ -1,10 +1,10 @@ -package org.sopt.dateroad.presentation.ui.pointhistory.navigation +package org.sopt.teamdateroad.presentation.ui.pointhistory.navigation import androidx.compose.foundation.layout.PaddingValues import androidx.navigation.NavController import androidx.navigation.NavGraphBuilder import androidx.navigation.compose.composable -import org.sopt.dateroad.presentation.ui.pointhistory.PointHistoryRoute +import org.sopt.teamdateroad.presentation.ui.pointhistory.PointHistoryRoute fun NavController.navigationPointHistory() { navigate( diff --git a/app/src/main/java/org/sopt/dateroad/presentation/ui/profile/ProfileContract.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/profile/ProfileContract.kt similarity index 78% rename from app/src/main/java/org/sopt/dateroad/presentation/ui/profile/ProfileContract.kt rename to app/src/main/java/org/sopt/teamdateroad/presentation/ui/profile/ProfileContract.kt index 6f02740a6..6d2dae6ab 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/ui/profile/ProfileContract.kt +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/profile/ProfileContract.kt @@ -1,14 +1,14 @@ -package org.sopt.dateroad.presentation.ui.profile +package org.sopt.teamdateroad.presentation.ui.profile -import org.sopt.dateroad.domain.model.EditProfile -import org.sopt.dateroad.domain.model.Profile -import org.sopt.dateroad.domain.model.SignUp -import org.sopt.dateroad.presentation.type.ProfileType -import org.sopt.dateroad.presentation.ui.component.textfield.model.TextFieldValidateResult -import org.sopt.dateroad.presentation.util.base.UiEvent -import org.sopt.dateroad.presentation.util.base.UiSideEffect -import org.sopt.dateroad.presentation.util.base.UiState -import org.sopt.dateroad.presentation.util.view.LoadState +import org.sopt.teamdateroad.domain.model.EditProfile +import org.sopt.teamdateroad.domain.model.Profile +import org.sopt.teamdateroad.domain.model.SignUp +import org.sopt.teamdateroad.presentation.type.ProfileType +import org.sopt.teamdateroad.presentation.ui.component.textfield.model.TextFieldValidateResult +import org.sopt.teamdateroad.presentation.util.base.UiEvent +import org.sopt.teamdateroad.presentation.util.base.UiSideEffect +import org.sopt.teamdateroad.presentation.util.base.UiState +import org.sopt.teamdateroad.presentation.util.view.LoadState class ProfileContract { data class ProfileUiState( diff --git a/app/src/main/java/org/sopt/dateroad/presentation/ui/profile/ProfileScreen.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/profile/ProfileScreen.kt similarity index 87% rename from app/src/main/java/org/sopt/dateroad/presentation/ui/profile/ProfileScreen.kt rename to app/src/main/java/org/sopt/teamdateroad/presentation/ui/profile/ProfileScreen.kt index 9963d58d7..320a6e374 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/ui/profile/ProfileScreen.kt +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/profile/ProfileScreen.kt @@ -1,4 +1,4 @@ -package org.sopt.dateroad.presentation.ui.profile +package org.sopt.teamdateroad.presentation.ui.profile import android.annotation.SuppressLint import android.net.Uri @@ -35,33 +35,33 @@ import androidx.lifecycle.compose.LocalLifecycleOwner import androidx.lifecycle.compose.collectAsStateWithLifecycle import androidx.lifecycle.flowWithLifecycle import coil.compose.rememberAsyncImagePainter -import org.sopt.dateroad.R -import org.sopt.dateroad.data.mapper.todata.toEditProfile -import org.sopt.dateroad.presentation.type.DateChipGroupType -import org.sopt.dateroad.presentation.type.DateTagType -import org.sopt.dateroad.presentation.type.DateTagType.Companion.getDateTagTypeByName -import org.sopt.dateroad.presentation.type.ProfileType -import org.sopt.dateroad.presentation.ui.component.bottomsheet.DateRoadBasicBottomSheet -import org.sopt.dateroad.presentation.ui.component.button.DateRoadBasicButton -import org.sopt.dateroad.presentation.ui.component.chipgroup.DateRoadDateChipGroup -import org.sopt.dateroad.presentation.ui.component.textfield.DateRoadTextFieldWithButton -import org.sopt.dateroad.presentation.ui.component.textfield.model.TextFieldValidateResult -import org.sopt.dateroad.presentation.ui.component.topbar.DateRoadBasicTopBar -import org.sopt.dateroad.presentation.ui.component.view.DateRoadErrorView -import org.sopt.dateroad.presentation.ui.component.view.DateRoadLoadingView -import org.sopt.dateroad.presentation.util.GalleryLauncher.DELETE_IMAGE -import org.sopt.dateroad.presentation.util.GalleryLauncher.INPUT -import org.sopt.dateroad.presentation.util.Pattern.NICKNAME_REGEX -import org.sopt.dateroad.presentation.util.TimelineAmplitude.DATE_SCHEDULE_NUM -import org.sopt.dateroad.presentation.util.UserPropertyAmplitude.USER_COURSE_COUNT -import org.sopt.dateroad.presentation.util.UserPropertyAmplitude.USER_FREE_REMAINED -import org.sopt.dateroad.presentation.util.UserPropertyAmplitude.USER_NAME -import org.sopt.dateroad.presentation.util.UserPropertyAmplitude.USER_POINT -import org.sopt.dateroad.presentation.util.UserPropertyAmplitude.USER_PURCHASE_COUNT -import org.sopt.dateroad.presentation.util.amplitude.AmplitudeUtils -import org.sopt.dateroad.presentation.util.modifier.noRippleClickable -import org.sopt.dateroad.presentation.util.view.LoadState -import org.sopt.dateroad.ui.theme.DateRoadTheme +import org.sopt.teamdateroad.R +import org.sopt.teamdateroad.data.mapper.todata.toEditProfile +import org.sopt.teamdateroad.presentation.type.DateChipGroupType +import org.sopt.teamdateroad.presentation.type.DateTagType +import org.sopt.teamdateroad.presentation.type.DateTagType.Companion.getDateTagTypeByName +import org.sopt.teamdateroad.presentation.type.ProfileType +import org.sopt.teamdateroad.presentation.ui.component.bottomsheet.DateRoadBasicBottomSheet +import org.sopt.teamdateroad.presentation.ui.component.button.DateRoadBasicButton +import org.sopt.teamdateroad.presentation.ui.component.chipgroup.DateRoadDateChipGroup +import org.sopt.teamdateroad.presentation.ui.component.textfield.DateRoadTextFieldWithButton +import org.sopt.teamdateroad.presentation.ui.component.textfield.model.TextFieldValidateResult +import org.sopt.teamdateroad.presentation.ui.component.topbar.DateRoadBasicTopBar +import org.sopt.teamdateroad.presentation.ui.component.view.DateRoadErrorView +import org.sopt.teamdateroad.presentation.ui.component.view.DateRoadLoadingView +import org.sopt.teamdateroad.presentation.util.GalleryLauncher.DELETE_IMAGE +import org.sopt.teamdateroad.presentation.util.GalleryLauncher.INPUT +import org.sopt.teamdateroad.presentation.util.Pattern.NICKNAME_REGEX +import org.sopt.teamdateroad.presentation.util.TimelineAmplitude.DATE_SCHEDULE_NUM +import org.sopt.teamdateroad.presentation.util.UserPropertyAmplitude.USER_COURSE_COUNT +import org.sopt.teamdateroad.presentation.util.UserPropertyAmplitude.USER_FREE_REMAINED +import org.sopt.teamdateroad.presentation.util.UserPropertyAmplitude.USER_NAME +import org.sopt.teamdateroad.presentation.util.UserPropertyAmplitude.USER_POINT +import org.sopt.teamdateroad.presentation.util.UserPropertyAmplitude.USER_PURCHASE_COUNT +import org.sopt.teamdateroad.presentation.util.amplitude.AmplitudeUtils +import org.sopt.teamdateroad.presentation.util.modifier.noRippleClickable +import org.sopt.teamdateroad.presentation.util.view.LoadState +import org.sopt.teamdateroad.ui.theme.DateRoadTheme @SuppressLint("StateFlowValueCalledInComposition") @Composable diff --git a/app/src/main/java/org/sopt/dateroad/presentation/ui/profile/ProfileViewModel.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/profile/ProfileViewModel.kt similarity index 90% rename from app/src/main/java/org/sopt/dateroad/presentation/ui/profile/ProfileViewModel.kt rename to app/src/main/java/org/sopt/teamdateroad/presentation/ui/profile/ProfileViewModel.kt index b11224d7e..07dd56413 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/ui/profile/ProfileViewModel.kt +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/profile/ProfileViewModel.kt @@ -1,23 +1,23 @@ -package org.sopt.dateroad.presentation.ui.profile +package org.sopt.teamdateroad.presentation.ui.profile import androidx.lifecycle.viewModelScope import dagger.hilt.android.lifecycle.HiltViewModel import javax.inject.Inject import kotlinx.coroutines.launch -import org.sopt.dateroad.data.mapper.todata.toEditProfile -import org.sopt.dateroad.domain.model.EditProfile -import org.sopt.dateroad.domain.model.SignUp -import org.sopt.dateroad.domain.usecase.GetNicknameCheckUseCase -import org.sopt.dateroad.domain.usecase.GetUserUseCase -import org.sopt.dateroad.domain.usecase.PatchEditProfileUseCase -import org.sopt.dateroad.domain.usecase.PostSignUpUseCase -import org.sopt.dateroad.domain.usecase.SetAccessTokenUseCase -import org.sopt.dateroad.domain.usecase.SetRefreshTokenUseCase -import org.sopt.dateroad.presentation.type.ProfileType -import org.sopt.dateroad.presentation.ui.component.textfield.model.TextFieldValidateResult -import org.sopt.dateroad.presentation.util.Token -import org.sopt.dateroad.presentation.util.base.BaseViewModel -import org.sopt.dateroad.presentation.util.view.LoadState +import org.sopt.teamdateroad.data.mapper.todata.toEditProfile +import org.sopt.teamdateroad.domain.model.EditProfile +import org.sopt.teamdateroad.domain.model.SignUp +import org.sopt.teamdateroad.domain.usecase.GetNicknameCheckUseCase +import org.sopt.teamdateroad.domain.usecase.GetUserUseCase +import org.sopt.teamdateroad.domain.usecase.PatchEditProfileUseCase +import org.sopt.teamdateroad.domain.usecase.PostSignUpUseCase +import org.sopt.teamdateroad.domain.usecase.SetAccessTokenUseCase +import org.sopt.teamdateroad.domain.usecase.SetRefreshTokenUseCase +import org.sopt.teamdateroad.presentation.type.ProfileType +import org.sopt.teamdateroad.presentation.ui.component.textfield.model.TextFieldValidateResult +import org.sopt.teamdateroad.presentation.util.Token +import org.sopt.teamdateroad.presentation.util.base.BaseViewModel +import org.sopt.teamdateroad.presentation.util.view.LoadState @HiltViewModel class ProfileViewModel @Inject constructor( diff --git a/app/src/main/java/org/sopt/dateroad/presentation/ui/profile/navigation/ProfileNavigation.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/profile/navigation/ProfileNavigation.kt similarity index 82% rename from app/src/main/java/org/sopt/dateroad/presentation/ui/profile/navigation/ProfileNavigation.kt rename to app/src/main/java/org/sopt/teamdateroad/presentation/ui/profile/navigation/ProfileNavigation.kt index 1aa444dd7..3e0be2b64 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/ui/profile/navigation/ProfileNavigation.kt +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/profile/navigation/ProfileNavigation.kt @@ -1,13 +1,13 @@ -package org.sopt.dateroad.presentation.ui.profile.navigation +package org.sopt.teamdateroad.presentation.ui.profile.navigation import androidx.navigation.NavController import androidx.navigation.NavGraphBuilder import androidx.navigation.NavType import androidx.navigation.compose.composable import androidx.navigation.navArgument -import org.sopt.dateroad.presentation.type.ProfileType -import org.sopt.dateroad.presentation.ui.profile.ProfileRoute -import org.sopt.dateroad.presentation.ui.profile.navigation.ProfileRoute.ROUTE_WITH_ARGUMENT +import org.sopt.teamdateroad.presentation.type.ProfileType +import org.sopt.teamdateroad.presentation.ui.profile.ProfileRoute +import org.sopt.teamdateroad.presentation.ui.profile.navigation.ProfileRoute.ROUTE_WITH_ARGUMENT fun NavController.navigationProfile(profileType: ProfileType) { navigate( diff --git a/app/src/main/java/org/sopt/dateroad/presentation/ui/read/ReadContract.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/read/ReadContract.kt similarity index 63% rename from app/src/main/java/org/sopt/dateroad/presentation/ui/read/ReadContract.kt rename to app/src/main/java/org/sopt/teamdateroad/presentation/ui/read/ReadContract.kt index 720c7ed08..ef6677f2b 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/ui/read/ReadContract.kt +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/read/ReadContract.kt @@ -1,10 +1,10 @@ -package org.sopt.dateroad.presentation.ui.read +package org.sopt.teamdateroad.presentation.ui.read -import org.sopt.dateroad.domain.model.Course -import org.sopt.dateroad.presentation.util.base.UiEvent -import org.sopt.dateroad.presentation.util.base.UiSideEffect -import org.sopt.dateroad.presentation.util.base.UiState -import org.sopt.dateroad.presentation.util.view.LoadState +import org.sopt.teamdateroad.domain.model.Course +import org.sopt.teamdateroad.presentation.util.base.UiEvent +import org.sopt.teamdateroad.presentation.util.base.UiSideEffect +import org.sopt.teamdateroad.presentation.util.base.UiState +import org.sopt.teamdateroad.presentation.util.view.LoadState class ReadContract { data class ReadUiState( diff --git a/app/src/main/java/org/sopt/dateroad/presentation/ui/read/ReadScreen.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/read/ReadScreen.kt similarity index 84% rename from app/src/main/java/org/sopt/dateroad/presentation/ui/read/ReadScreen.kt rename to app/src/main/java/org/sopt/teamdateroad/presentation/ui/read/ReadScreen.kt index 97ee380ec..e817e799c 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/ui/read/ReadScreen.kt +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/read/ReadScreen.kt @@ -1,4 +1,4 @@ -package org.sopt.dateroad.presentation.ui.read +package org.sopt.teamdateroad.presentation.ui.read import androidx.compose.foundation.Image import androidx.compose.foundation.background @@ -27,20 +27,20 @@ import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.compose.LocalLifecycleOwner import androidx.lifecycle.compose.collectAsStateWithLifecycle import androidx.lifecycle.flowWithLifecycle -import org.sopt.dateroad.R -import org.sopt.dateroad.presentation.type.EmptyViewType -import org.sopt.dateroad.presentation.type.EnrollType -import org.sopt.dateroad.presentation.ui.component.card.DateRoadCourseCard -import org.sopt.dateroad.presentation.ui.component.partialcolortext.PartialColorText -import org.sopt.dateroad.presentation.ui.component.view.DateRoadEmptyView -import org.sopt.dateroad.presentation.ui.component.view.DateRoadErrorView -import org.sopt.dateroad.presentation.ui.component.view.DateRoadIdleView -import org.sopt.dateroad.presentation.ui.component.view.DateRoadLoadingView -import org.sopt.dateroad.presentation.util.ViewPath.MY_COURSE_READ -import org.sopt.dateroad.presentation.util.modifier.noRippleClickable -import org.sopt.dateroad.presentation.util.view.LoadState -import org.sopt.dateroad.ui.theme.DATEROADTheme -import org.sopt.dateroad.ui.theme.DateRoadTheme +import org.sopt.teamdateroad.R +import org.sopt.teamdateroad.presentation.type.EmptyViewType +import org.sopt.teamdateroad.presentation.type.EnrollType +import org.sopt.teamdateroad.presentation.ui.component.card.DateRoadCourseCard +import org.sopt.teamdateroad.presentation.ui.component.partialcolortext.PartialColorText +import org.sopt.teamdateroad.presentation.ui.component.view.DateRoadEmptyView +import org.sopt.teamdateroad.presentation.ui.component.view.DateRoadErrorView +import org.sopt.teamdateroad.presentation.ui.component.view.DateRoadIdleView +import org.sopt.teamdateroad.presentation.ui.component.view.DateRoadLoadingView +import org.sopt.teamdateroad.presentation.util.ViewPath.MY_COURSE_READ +import org.sopt.teamdateroad.presentation.util.modifier.noRippleClickable +import org.sopt.teamdateroad.presentation.util.view.LoadState +import org.sopt.teamdateroad.ui.theme.DATEROADTheme +import org.sopt.teamdateroad.ui.theme.DateRoadTheme @Composable fun ReadRoute( diff --git a/app/src/main/java/org/sopt/dateroad/presentation/ui/read/ReadViewModel.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/read/ReadViewModel.kt similarity index 84% rename from app/src/main/java/org/sopt/dateroad/presentation/ui/read/ReadViewModel.kt rename to app/src/main/java/org/sopt/teamdateroad/presentation/ui/read/ReadViewModel.kt index 5555f7e63..fb3c0c7e4 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/ui/read/ReadViewModel.kt +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/read/ReadViewModel.kt @@ -1,13 +1,13 @@ -package org.sopt.dateroad.presentation.ui.read +package org.sopt.teamdateroad.presentation.ui.read import androidx.lifecycle.viewModelScope import dagger.hilt.android.lifecycle.HiltViewModel import javax.inject.Inject import kotlinx.coroutines.launch -import org.sopt.dateroad.domain.usecase.GetMyCourseReadUseCase -import org.sopt.dateroad.domain.usecase.GetNicknameUseCase -import org.sopt.dateroad.presentation.util.base.BaseViewModel -import org.sopt.dateroad.presentation.util.view.LoadState +import org.sopt.teamdateroad.domain.usecase.GetMyCourseReadUseCase +import org.sopt.teamdateroad.domain.usecase.GetNicknameUseCase +import org.sopt.teamdateroad.presentation.util.base.BaseViewModel +import org.sopt.teamdateroad.presentation.util.view.LoadState @HiltViewModel class ReadViewModel @Inject constructor( diff --git a/app/src/main/java/org/sopt/dateroad/presentation/ui/read/navigation/ReadNavigation.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/read/navigation/ReadNavigation.kt similarity index 76% rename from app/src/main/java/org/sopt/dateroad/presentation/ui/read/navigation/ReadNavigation.kt rename to app/src/main/java/org/sopt/teamdateroad/presentation/ui/read/navigation/ReadNavigation.kt index d25c3fded..3b8bd856a 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/ui/read/navigation/ReadNavigation.kt +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/read/navigation/ReadNavigation.kt @@ -1,13 +1,13 @@ -package org.sopt.dateroad.presentation.ui.read.navigation +package org.sopt.teamdateroad.presentation.ui.read.navigation import androidx.compose.foundation.layout.PaddingValues import androidx.navigation.NavController import androidx.navigation.NavGraphBuilder import androidx.navigation.NavOptions import androidx.navigation.compose.composable -import org.sopt.dateroad.presentation.model.MainNavigationBarRoute -import org.sopt.dateroad.presentation.type.EnrollType -import org.sopt.dateroad.presentation.ui.read.ReadRoute +import org.sopt.teamdateroad.presentation.model.MainNavigationBarRoute +import org.sopt.teamdateroad.presentation.type.EnrollType +import org.sopt.teamdateroad.presentation.ui.read.ReadRoute fun NavController.navigationRead(navOptions: NavOptions) { navigate( diff --git a/app/src/main/java/org/sopt/dateroad/presentation/ui/signin/SignInContract.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/signin/SignInContract.kt similarity index 70% rename from app/src/main/java/org/sopt/dateroad/presentation/ui/signin/SignInContract.kt rename to app/src/main/java/org/sopt/teamdateroad/presentation/ui/signin/SignInContract.kt index e979dd206..905e21198 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/ui/signin/SignInContract.kt +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/signin/SignInContract.kt @@ -1,9 +1,9 @@ -package org.sopt.dateroad.presentation.ui.signin +package org.sopt.teamdateroad.presentation.ui.signin -import org.sopt.dateroad.presentation.util.base.UiEvent -import org.sopt.dateroad.presentation.util.base.UiSideEffect -import org.sopt.dateroad.presentation.util.base.UiState -import org.sopt.dateroad.presentation.util.view.LoadState +import org.sopt.teamdateroad.presentation.util.base.UiEvent +import org.sopt.teamdateroad.presentation.util.base.UiSideEffect +import org.sopt.teamdateroad.presentation.util.base.UiState +import org.sopt.teamdateroad.presentation.util.view.LoadState class SignInContract { data class SignInUiState( diff --git a/app/src/main/java/org/sopt/dateroad/presentation/ui/signin/SignInScreen.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/signin/SignInScreen.kt similarity index 86% rename from app/src/main/java/org/sopt/dateroad/presentation/ui/signin/SignInScreen.kt rename to app/src/main/java/org/sopt/teamdateroad/presentation/ui/signin/SignInScreen.kt index c2021ddcd..3ecca34a2 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/ui/signin/SignInScreen.kt +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/signin/SignInScreen.kt @@ -1,4 +1,4 @@ -package org.sopt.dateroad.presentation.ui.signin +package org.sopt.teamdateroad.presentation.ui.signin import android.content.Context import androidx.compose.foundation.Image @@ -23,16 +23,16 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle import androidx.lifecycle.flowWithLifecycle import com.kakao.sdk.auth.model.OAuthToken import com.kakao.sdk.user.UserApiClient -import org.sopt.dateroad.R -import org.sopt.dateroad.domain.model.SignIn -import org.sopt.dateroad.presentation.ui.component.button.DateRoadKakaoLoginButton -import org.sopt.dateroad.presentation.ui.component.view.DateRoadLoadingView -import org.sopt.dateroad.presentation.ui.component.view.DateRoadWebView -import org.sopt.dateroad.presentation.util.SignIn.PLATFORM -import org.sopt.dateroad.presentation.util.WebViewUrl.PRIVACY_POLICY_URL -import org.sopt.dateroad.presentation.util.modifier.noRippleClickable -import org.sopt.dateroad.presentation.util.view.LoadState -import org.sopt.dateroad.ui.theme.DateRoadTheme +import org.sopt.teamdateroad.R +import org.sopt.teamdateroad.domain.model.SignIn +import org.sopt.teamdateroad.presentation.ui.component.button.DateRoadKakaoLoginButton +import org.sopt.teamdateroad.presentation.ui.component.view.DateRoadLoadingView +import org.sopt.teamdateroad.presentation.ui.component.view.DateRoadWebView +import org.sopt.teamdateroad.presentation.util.SignIn.PLATFORM +import org.sopt.teamdateroad.presentation.util.WebViewUrl.PRIVACY_POLICY_URL +import org.sopt.teamdateroad.presentation.util.modifier.noRippleClickable +import org.sopt.teamdateroad.presentation.util.view.LoadState +import org.sopt.teamdateroad.ui.theme.DateRoadTheme fun setLayoutLoginKakaoClickListener(context: Context, callback: (OAuthToken?, Throwable?) -> Unit) { if (UserApiClient.instance.isKakaoTalkLoginAvailable(context)) { diff --git a/app/src/main/java/org/sopt/dateroad/presentation/ui/signin/SignInViewModel.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/signin/SignInViewModel.kt similarity index 78% rename from app/src/main/java/org/sopt/dateroad/presentation/ui/signin/SignInViewModel.kt rename to app/src/main/java/org/sopt/teamdateroad/presentation/ui/signin/SignInViewModel.kt index 491c9b909..87606e4a3 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/ui/signin/SignInViewModel.kt +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/signin/SignInViewModel.kt @@ -1,18 +1,18 @@ -package org.sopt.dateroad.presentation.ui.signin +package org.sopt.teamdateroad.presentation.ui.signin import androidx.lifecycle.viewModelScope import dagger.hilt.android.lifecycle.HiltViewModel import javax.inject.Inject import kotlinx.coroutines.launch -import org.sopt.dateroad.domain.model.SignIn -import org.sopt.dateroad.domain.usecase.GetAccessTokenUseCase -import org.sopt.dateroad.domain.usecase.GetRefreshTokenUseCase -import org.sopt.dateroad.domain.usecase.PostSignInUseCase -import org.sopt.dateroad.domain.usecase.SetAccessTokenUseCase -import org.sopt.dateroad.domain.usecase.SetRefreshTokenUseCase -import org.sopt.dateroad.presentation.util.Token -import org.sopt.dateroad.presentation.util.base.BaseViewModel -import org.sopt.dateroad.presentation.util.view.LoadState +import org.sopt.teamdateroad.domain.model.SignIn +import org.sopt.teamdateroad.domain.usecase.GetAccessTokenUseCase +import org.sopt.teamdateroad.domain.usecase.GetRefreshTokenUseCase +import org.sopt.teamdateroad.domain.usecase.PostSignInUseCase +import org.sopt.teamdateroad.domain.usecase.SetAccessTokenUseCase +import org.sopt.teamdateroad.domain.usecase.SetRefreshTokenUseCase +import org.sopt.teamdateroad.presentation.util.Token +import org.sopt.teamdateroad.presentation.util.base.BaseViewModel +import org.sopt.teamdateroad.presentation.util.view.LoadState @HiltViewModel class SignInViewModel @Inject constructor( diff --git a/app/src/main/java/org/sopt/dateroad/presentation/ui/signin/navigation/SignInNavigation.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/signin/navigation/SignInNavigation.kt similarity index 83% rename from app/src/main/java/org/sopt/dateroad/presentation/ui/signin/navigation/SignInNavigation.kt rename to app/src/main/java/org/sopt/teamdateroad/presentation/ui/signin/navigation/SignInNavigation.kt index 9bd2c3ee8..4b89dc6d9 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/ui/signin/navigation/SignInNavigation.kt +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/signin/navigation/SignInNavigation.kt @@ -1,9 +1,9 @@ -package org.sopt.dateroad.presentation.ui.signin.navigation +package org.sopt.teamdateroad.presentation.ui.signin.navigation import androidx.navigation.NavController import androidx.navigation.NavGraphBuilder import androidx.navigation.compose.composable -import org.sopt.dateroad.presentation.ui.signin.SignInRoute +import org.sopt.teamdateroad.presentation.ui.signin.SignInRoute fun NavController.navigationSignIn() { navigate( diff --git a/app/src/main/java/org/sopt/dateroad/presentation/ui/splash/SplashScreen.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/splash/SplashScreen.kt similarity index 87% rename from app/src/main/java/org/sopt/dateroad/presentation/ui/splash/SplashScreen.kt rename to app/src/main/java/org/sopt/teamdateroad/presentation/ui/splash/SplashScreen.kt index 8085b3790..7f679d29c 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/ui/splash/SplashScreen.kt +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/splash/SplashScreen.kt @@ -1,4 +1,4 @@ -package org.sopt.dateroad.presentation.ui.splash +package org.sopt.teamdateroad.presentation.ui.splash import androidx.compose.foundation.Image import androidx.compose.foundation.background @@ -10,8 +10,8 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.res.painterResource import androidx.compose.ui.tooling.preview.Preview -import org.sopt.dateroad.R -import org.sopt.dateroad.ui.theme.DateRoadTheme +import org.sopt.teamdateroad.R +import org.sopt.teamdateroad.ui.theme.DateRoadTheme @Composable fun SplashScreen() { diff --git a/app/src/main/java/org/sopt/dateroad/presentation/ui/timeline/TimelineContract.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/timeline/TimelineContract.kt similarity index 67% rename from app/src/main/java/org/sopt/dateroad/presentation/ui/timeline/TimelineContract.kt rename to app/src/main/java/org/sopt/teamdateroad/presentation/ui/timeline/TimelineContract.kt index 0a593cb3f..d9ef96eb1 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/ui/timeline/TimelineContract.kt +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/timeline/TimelineContract.kt @@ -1,11 +1,11 @@ -package org.sopt.dateroad.presentation.ui.timeline +package org.sopt.teamdateroad.presentation.ui.timeline -import org.sopt.dateroad.domain.model.Timeline -import org.sopt.dateroad.presentation.type.TimelineType -import org.sopt.dateroad.presentation.util.base.UiEvent -import org.sopt.dateroad.presentation.util.base.UiSideEffect -import org.sopt.dateroad.presentation.util.base.UiState -import org.sopt.dateroad.presentation.util.view.LoadState +import org.sopt.teamdateroad.domain.model.Timeline +import org.sopt.teamdateroad.presentation.type.TimelineType +import org.sopt.teamdateroad.presentation.util.base.UiEvent +import org.sopt.teamdateroad.presentation.util.base.UiSideEffect +import org.sopt.teamdateroad.presentation.util.base.UiState +import org.sopt.teamdateroad.presentation.util.view.LoadState class TimelineContract { data class TimelineUiState( diff --git a/app/src/main/java/org/sopt/dateroad/presentation/ui/timeline/TimelineScreen.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/timeline/TimelineScreen.kt similarity index 82% rename from app/src/main/java/org/sopt/dateroad/presentation/ui/timeline/TimelineScreen.kt rename to app/src/main/java/org/sopt/teamdateroad/presentation/ui/timeline/TimelineScreen.kt index e08a1d78f..a66917bd5 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/ui/timeline/TimelineScreen.kt +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/timeline/TimelineScreen.kt @@ -1,4 +1,4 @@ -package org.sopt.dateroad.presentation.ui.timeline +package org.sopt.teamdateroad.presentation.ui.timeline import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement @@ -24,30 +24,30 @@ import com.google.accompanist.pager.ExperimentalPagerApi import com.google.accompanist.pager.HorizontalPager import com.google.accompanist.pager.PagerState import com.google.accompanist.pager.rememberPagerState -import org.sopt.dateroad.R -import org.sopt.dateroad.domain.type.TimelineTimeType -import org.sopt.dateroad.presentation.type.EmptyViewType -import org.sopt.dateroad.presentation.type.EnrollType -import org.sopt.dateroad.presentation.type.OneButtonDialogWithDescriptionType -import org.sopt.dateroad.presentation.type.TimelineType -import org.sopt.dateroad.presentation.ui.component.button.DateRoadFilledButton -import org.sopt.dateroad.presentation.ui.component.button.DateRoadImageButton -import org.sopt.dateroad.presentation.ui.component.dialog.DateRoadOneButtonDialogWithDescription -import org.sopt.dateroad.presentation.ui.component.dotsindicator.DotsIndicator -import org.sopt.dateroad.presentation.ui.component.topbar.DateRoadLeftTitleTopBar -import org.sopt.dateroad.presentation.ui.component.view.DateRoadEmptyView -import org.sopt.dateroad.presentation.ui.component.view.DateRoadErrorView -import org.sopt.dateroad.presentation.ui.component.view.DateRoadIdleView -import org.sopt.dateroad.presentation.ui.component.view.DateRoadLoadingView -import org.sopt.dateroad.presentation.ui.timeline.component.TimelineCard -import org.sopt.dateroad.presentation.util.TimelineAmplitude.COUNT_DATE_SCHEDULE -import org.sopt.dateroad.presentation.util.TimelineAmplitude.DATE_SCHEDULE_NUM -import org.sopt.dateroad.presentation.util.TimelineAmplitude.VIEW_DATE_SCHEDULE -import org.sopt.dateroad.presentation.util.ViewPath.TIMELINE -import org.sopt.dateroad.presentation.util.amplitude.AmplitudeUtils -import org.sopt.dateroad.presentation.util.view.LoadState -import org.sopt.dateroad.ui.theme.DATEROADTheme -import org.sopt.dateroad.ui.theme.DateRoadTheme +import org.sopt.teamdateroad.R +import org.sopt.teamdateroad.domain.type.TimelineTimeType +import org.sopt.teamdateroad.presentation.type.EmptyViewType +import org.sopt.teamdateroad.presentation.type.EnrollType +import org.sopt.teamdateroad.presentation.type.OneButtonDialogWithDescriptionType +import org.sopt.teamdateroad.presentation.type.TimelineType +import org.sopt.teamdateroad.presentation.ui.component.button.DateRoadFilledButton +import org.sopt.teamdateroad.presentation.ui.component.button.DateRoadImageButton +import org.sopt.teamdateroad.presentation.ui.component.dialog.DateRoadOneButtonDialogWithDescription +import org.sopt.teamdateroad.presentation.ui.component.dotsindicator.DotsIndicator +import org.sopt.teamdateroad.presentation.ui.component.topbar.DateRoadLeftTitleTopBar +import org.sopt.teamdateroad.presentation.ui.component.view.DateRoadEmptyView +import org.sopt.teamdateroad.presentation.ui.component.view.DateRoadErrorView +import org.sopt.teamdateroad.presentation.ui.component.view.DateRoadIdleView +import org.sopt.teamdateroad.presentation.ui.component.view.DateRoadLoadingView +import org.sopt.teamdateroad.presentation.ui.timeline.component.TimelineCard +import org.sopt.teamdateroad.presentation.util.TimelineAmplitude.COUNT_DATE_SCHEDULE +import org.sopt.teamdateroad.presentation.util.TimelineAmplitude.DATE_SCHEDULE_NUM +import org.sopt.teamdateroad.presentation.util.TimelineAmplitude.VIEW_DATE_SCHEDULE +import org.sopt.teamdateroad.presentation.util.ViewPath.TIMELINE +import org.sopt.teamdateroad.presentation.util.amplitude.AmplitudeUtils +import org.sopt.teamdateroad.presentation.util.view.LoadState +import org.sopt.teamdateroad.ui.theme.DATEROADTheme +import org.sopt.teamdateroad.ui.theme.DateRoadTheme @OptIn(ExperimentalPagerApi::class) @Composable diff --git a/app/src/main/java/org/sopt/dateroad/presentation/ui/timeline/TimelineViewModel.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/timeline/TimelineViewModel.kt similarity index 84% rename from app/src/main/java/org/sopt/dateroad/presentation/ui/timeline/TimelineViewModel.kt rename to app/src/main/java/org/sopt/teamdateroad/presentation/ui/timeline/TimelineViewModel.kt index c43346e9f..bd326c80f 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/ui/timeline/TimelineViewModel.kt +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/timeline/TimelineViewModel.kt @@ -1,13 +1,13 @@ -package org.sopt.dateroad.presentation.ui.timeline +package org.sopt.teamdateroad.presentation.ui.timeline import androidx.lifecycle.viewModelScope import dagger.hilt.android.lifecycle.HiltViewModel import javax.inject.Inject import kotlinx.coroutines.launch -import org.sopt.dateroad.domain.type.TimelineTimeType -import org.sopt.dateroad.domain.usecase.GetTimelinesUseCase -import org.sopt.dateroad.presentation.util.base.BaseViewModel -import org.sopt.dateroad.presentation.util.view.LoadState +import org.sopt.teamdateroad.domain.type.TimelineTimeType +import org.sopt.teamdateroad.domain.usecase.GetTimelinesUseCase +import org.sopt.teamdateroad.presentation.util.base.BaseViewModel +import org.sopt.teamdateroad.presentation.util.view.LoadState @HiltViewModel class TimelineViewModel @Inject constructor( diff --git a/app/src/main/java/org/sopt/dateroad/presentation/ui/timeline/component/TimelineCard.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/timeline/component/TimelineCard.kt similarity index 92% rename from app/src/main/java/org/sopt/dateroad/presentation/ui/timeline/component/TimelineCard.kt rename to app/src/main/java/org/sopt/teamdateroad/presentation/ui/timeline/component/TimelineCard.kt index 429c500a9..6c43fbf71 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/ui/timeline/component/TimelineCard.kt +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/timeline/component/TimelineCard.kt @@ -1,4 +1,4 @@ -package org.sopt.dateroad.presentation.ui.timeline.component +package org.sopt.teamdateroad.presentation.ui.timeline.component import androidx.compose.foundation.Canvas import androidx.compose.foundation.background @@ -29,16 +29,16 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import org.sopt.dateroad.R -import org.sopt.dateroad.domain.model.Timeline -import org.sopt.dateroad.presentation.type.DateTagType -import org.sopt.dateroad.presentation.type.TagType -import org.sopt.dateroad.presentation.type.TimelineType -import org.sopt.dateroad.presentation.ui.component.tag.DateRoadImageTag -import org.sopt.dateroad.presentation.ui.component.tag.DateRoadTextTag -import org.sopt.dateroad.presentation.util.modifier.noRippleClickable -import org.sopt.dateroad.ui.theme.DateRoadTheme -import org.sopt.dateroad.ui.theme.defaultDateRoadColors +import org.sopt.teamdateroad.R +import org.sopt.teamdateroad.domain.model.Timeline +import org.sopt.teamdateroad.presentation.type.DateTagType +import org.sopt.teamdateroad.presentation.type.TagType +import org.sopt.teamdateroad.presentation.type.TimelineType +import org.sopt.teamdateroad.presentation.ui.component.tag.DateRoadImageTag +import org.sopt.teamdateroad.presentation.ui.component.tag.DateRoadTextTag +import org.sopt.teamdateroad.presentation.util.modifier.noRippleClickable +import org.sopt.teamdateroad.ui.theme.DateRoadTheme +import org.sopt.teamdateroad.ui.theme.defaultDateRoadColors @Composable fun TimelineCard( diff --git a/app/src/main/java/org/sopt/dateroad/presentation/ui/timeline/navigation/TimelineNavigation.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/timeline/navigation/TimelineNavigation.kt similarity index 74% rename from app/src/main/java/org/sopt/dateroad/presentation/ui/timeline/navigation/TimelineNavigation.kt rename to app/src/main/java/org/sopt/teamdateroad/presentation/ui/timeline/navigation/TimelineNavigation.kt index dce874073..da1a4517d 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/ui/timeline/navigation/TimelineNavigation.kt +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/timeline/navigation/TimelineNavigation.kt @@ -1,14 +1,14 @@ -package org.sopt.dateroad.presentation.ui.timeline.navigation +package org.sopt.teamdateroad.presentation.ui.timeline.navigation import androidx.compose.foundation.layout.PaddingValues import androidx.navigation.NavController import androidx.navigation.NavGraphBuilder import androidx.navigation.NavOptions import androidx.navigation.compose.composable -import org.sopt.dateroad.presentation.model.MainNavigationBarRoute -import org.sopt.dateroad.presentation.type.EnrollType -import org.sopt.dateroad.presentation.type.TimelineType -import org.sopt.dateroad.presentation.ui.timeline.TimelineRoute +import org.sopt.teamdateroad.presentation.model.MainNavigationBarRoute +import org.sopt.teamdateroad.presentation.type.EnrollType +import org.sopt.teamdateroad.presentation.type.TimelineType +import org.sopt.teamdateroad.presentation.ui.timeline.TimelineRoute fun NavController.navigationTimeline(navOptions: NavOptions) { navigate( diff --git a/app/src/main/java/org/sopt/dateroad/presentation/ui/timelinedetail/TimelineDetailContract.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/timelinedetail/TimelineDetailContract.kt similarity index 79% rename from app/src/main/java/org/sopt/dateroad/presentation/ui/timelinedetail/TimelineDetailContract.kt rename to app/src/main/java/org/sopt/teamdateroad/presentation/ui/timelinedetail/TimelineDetailContract.kt index aab51df94..020e09973 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/ui/timelinedetail/TimelineDetailContract.kt +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/timelinedetail/TimelineDetailContract.kt @@ -1,11 +1,11 @@ -package org.sopt.dateroad.presentation.ui.timelinedetail +package org.sopt.teamdateroad.presentation.ui.timelinedetail import android.content.Context -import org.sopt.dateroad.domain.model.TimelineDetail -import org.sopt.dateroad.presentation.util.base.UiEvent -import org.sopt.dateroad.presentation.util.base.UiSideEffect -import org.sopt.dateroad.presentation.util.base.UiState -import org.sopt.dateroad.presentation.util.view.LoadState +import org.sopt.teamdateroad.domain.model.TimelineDetail +import org.sopt.teamdateroad.presentation.util.base.UiEvent +import org.sopt.teamdateroad.presentation.util.base.UiSideEffect +import org.sopt.teamdateroad.presentation.util.base.UiState +import org.sopt.teamdateroad.presentation.util.view.LoadState class TimelineDetailContract { data class TimelineDetailUiState( diff --git a/app/src/main/java/org/sopt/dateroad/presentation/ui/timelinedetail/TimelineDetailScreen.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/timelinedetail/TimelineDetailScreen.kt similarity index 86% rename from app/src/main/java/org/sopt/dateroad/presentation/ui/timelinedetail/TimelineDetailScreen.kt rename to app/src/main/java/org/sopt/teamdateroad/presentation/ui/timelinedetail/TimelineDetailScreen.kt index 32ca7fae8..c05bf898f 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/ui/timelinedetail/TimelineDetailScreen.kt +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/timelinedetail/TimelineDetailScreen.kt @@ -1,4 +1,4 @@ -package org.sopt.dateroad.presentation.ui.timelinedetail +package org.sopt.teamdateroad.presentation.ui.timelinedetail import androidx.compose.foundation.Image import androidx.compose.foundation.background @@ -35,38 +35,38 @@ import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.compose.LocalLifecycleOwner import androidx.lifecycle.compose.collectAsStateWithLifecycle import androidx.lifecycle.flowWithLifecycle -import org.sopt.dateroad.R -import org.sopt.dateroad.domain.model.Place -import org.sopt.dateroad.domain.model.TimelineDetail -import org.sopt.dateroad.presentation.type.DateTagType.Companion.getDateTagTypeByName -import org.sopt.dateroad.presentation.type.PlaceCardType -import org.sopt.dateroad.presentation.type.TagType -import org.sopt.dateroad.presentation.type.TimelineType -import org.sopt.dateroad.presentation.type.TwoButtonDialogType -import org.sopt.dateroad.presentation.type.TwoButtonDialogWithDescriptionType -import org.sopt.dateroad.presentation.ui.component.bottomsheet.DateRoadBasicBottomSheet -import org.sopt.dateroad.presentation.ui.component.card.DateRoadPlaceCard -import org.sopt.dateroad.presentation.ui.component.dialog.DateRoadTwoButtonDialog -import org.sopt.dateroad.presentation.ui.component.dialog.DateRoadTwoButtonDialogWithDescription -import org.sopt.dateroad.presentation.ui.component.tag.DateRoadImageTag -import org.sopt.dateroad.presentation.ui.component.tag.DateRoadTextTag -import org.sopt.dateroad.presentation.ui.component.topbar.DateRoadBasicTopBar -import org.sopt.dateroad.presentation.ui.component.view.DateRoadErrorView -import org.sopt.dateroad.presentation.ui.component.view.DateRoadIdleView -import org.sopt.dateroad.presentation.ui.component.view.DateRoadLoadingView -import org.sopt.dateroad.presentation.util.TimelineAmplitude.DURATION -import org.sopt.dateroad.presentation.util.TimelineDetailAmplitude.CLICK_CLOSE_KAKAO -import org.sopt.dateroad.presentation.util.TimelineDetailAmplitude.CLICK_KAKAO_SHARE -import org.sopt.dateroad.presentation.util.TimelineDetailAmplitude.CLICK_OPEN_KAKAO -import org.sopt.dateroad.presentation.util.TimelineDetailAmplitude.DATE_COURSE_NUM -import org.sopt.dateroad.presentation.util.TimelineDetailAmplitude.DATE_TOTAL_DURATION -import org.sopt.dateroad.presentation.util.TimelineDetailAmplitude.VIEW_PATH -import org.sopt.dateroad.presentation.util.TimelineDetailAmplitude.VIEW_SCHEDULE_DETAILS -import org.sopt.dateroad.presentation.util.amplitude.AmplitudeUtils -import org.sopt.dateroad.presentation.util.modifier.noRippleClickable -import org.sopt.dateroad.presentation.util.view.LoadState -import org.sopt.dateroad.ui.theme.DATEROADTheme -import org.sopt.dateroad.ui.theme.DateRoadTheme +import org.sopt.teamdateroad.R +import org.sopt.teamdateroad.domain.model.Place +import org.sopt.teamdateroad.domain.model.TimelineDetail +import org.sopt.teamdateroad.presentation.type.DateTagType.Companion.getDateTagTypeByName +import org.sopt.teamdateroad.presentation.type.PlaceCardType +import org.sopt.teamdateroad.presentation.type.TagType +import org.sopt.teamdateroad.presentation.type.TimelineType +import org.sopt.teamdateroad.presentation.type.TwoButtonDialogType +import org.sopt.teamdateroad.presentation.type.TwoButtonDialogWithDescriptionType +import org.sopt.teamdateroad.presentation.ui.component.bottomsheet.DateRoadBasicBottomSheet +import org.sopt.teamdateroad.presentation.ui.component.card.DateRoadPlaceCard +import org.sopt.teamdateroad.presentation.ui.component.dialog.DateRoadTwoButtonDialog +import org.sopt.teamdateroad.presentation.ui.component.dialog.DateRoadTwoButtonDialogWithDescription +import org.sopt.teamdateroad.presentation.ui.component.tag.DateRoadImageTag +import org.sopt.teamdateroad.presentation.ui.component.tag.DateRoadTextTag +import org.sopt.teamdateroad.presentation.ui.component.topbar.DateRoadBasicTopBar +import org.sopt.teamdateroad.presentation.ui.component.view.DateRoadErrorView +import org.sopt.teamdateroad.presentation.ui.component.view.DateRoadIdleView +import org.sopt.teamdateroad.presentation.ui.component.view.DateRoadLoadingView +import org.sopt.teamdateroad.presentation.util.TimelineAmplitude.DURATION +import org.sopt.teamdateroad.presentation.util.TimelineDetailAmplitude.CLICK_CLOSE_KAKAO +import org.sopt.teamdateroad.presentation.util.TimelineDetailAmplitude.CLICK_KAKAO_SHARE +import org.sopt.teamdateroad.presentation.util.TimelineDetailAmplitude.CLICK_OPEN_KAKAO +import org.sopt.teamdateroad.presentation.util.TimelineDetailAmplitude.DATE_COURSE_NUM +import org.sopt.teamdateroad.presentation.util.TimelineDetailAmplitude.DATE_TOTAL_DURATION +import org.sopt.teamdateroad.presentation.util.TimelineDetailAmplitude.VIEW_PATH +import org.sopt.teamdateroad.presentation.util.TimelineDetailAmplitude.VIEW_SCHEDULE_DETAILS +import org.sopt.teamdateroad.presentation.util.amplitude.AmplitudeUtils +import org.sopt.teamdateroad.presentation.util.modifier.noRippleClickable +import org.sopt.teamdateroad.presentation.util.view.LoadState +import org.sopt.teamdateroad.ui.theme.DATEROADTheme +import org.sopt.teamdateroad.ui.theme.DateRoadTheme @Composable fun TimelineDetailRoute( diff --git a/app/src/main/java/org/sopt/dateroad/presentation/ui/timelinedetail/TimelineDetailViewModel.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/timelinedetail/TimelineDetailViewModel.kt similarity index 87% rename from app/src/main/java/org/sopt/dateroad/presentation/ui/timelinedetail/TimelineDetailViewModel.kt rename to app/src/main/java/org/sopt/teamdateroad/presentation/ui/timelinedetail/TimelineDetailViewModel.kt index c533b6141..71efd6fbd 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/ui/timelinedetail/TimelineDetailViewModel.kt +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/timelinedetail/TimelineDetailViewModel.kt @@ -1,4 +1,4 @@ -package org.sopt.dateroad.presentation.ui.timelinedetail +package org.sopt.teamdateroad.presentation.ui.timelinedetail import android.content.Context import androidx.lifecycle.viewModelScope @@ -8,15 +8,15 @@ import com.kakao.sdk.share.WebSharerClient import dagger.hilt.android.lifecycle.HiltViewModel import javax.inject.Inject import kotlinx.coroutines.launch -import org.sopt.dateroad.domain.model.TimelineDetail -import org.sopt.dateroad.domain.usecase.DeleteTimelineUseCase -import org.sopt.dateroad.domain.usecase.GetNicknameUseCase -import org.sopt.dateroad.domain.usecase.GetTimelineDetailUseCase -import org.sopt.dateroad.presentation.util.ShareKakao.START_AT -import org.sopt.dateroad.presentation.util.ShareKakao.TEMPLATE_ID -import org.sopt.dateroad.presentation.util.ShareKakao.USER_NAME -import org.sopt.dateroad.presentation.util.base.BaseViewModel -import org.sopt.dateroad.presentation.util.view.LoadState +import org.sopt.teamdateroad.domain.model.TimelineDetail +import org.sopt.teamdateroad.domain.usecase.DeleteTimelineUseCase +import org.sopt.teamdateroad.domain.usecase.GetNicknameUseCase +import org.sopt.teamdateroad.domain.usecase.GetTimelineDetailUseCase +import org.sopt.teamdateroad.presentation.util.ShareKakao.START_AT +import org.sopt.teamdateroad.presentation.util.ShareKakao.TEMPLATE_ID +import org.sopt.teamdateroad.presentation.util.ShareKakao.USER_NAME +import org.sopt.teamdateroad.presentation.util.base.BaseViewModel +import org.sopt.teamdateroad.presentation.util.view.LoadState @HiltViewModel class TimelineDetailViewModel @Inject constructor( diff --git a/app/src/main/java/org/sopt/dateroad/presentation/ui/timelinedetail/navigation/TimelineDetailNavigation.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/timelinedetail/navigation/TimelineDetailNavigation.kt similarity index 88% rename from app/src/main/java/org/sopt/dateroad/presentation/ui/timelinedetail/navigation/TimelineDetailNavigation.kt rename to app/src/main/java/org/sopt/teamdateroad/presentation/ui/timelinedetail/navigation/TimelineDetailNavigation.kt index 117af5b8a..c88e8b6b7 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/ui/timelinedetail/navigation/TimelineDetailNavigation.kt +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/timelinedetail/navigation/TimelineDetailNavigation.kt @@ -1,4 +1,4 @@ -package org.sopt.dateroad.presentation.ui.timelinedetail.navigation +package org.sopt.teamdateroad.presentation.ui.timelinedetail.navigation import androidx.navigation.NavController import androidx.navigation.NavGraphBuilder @@ -6,8 +6,8 @@ import androidx.navigation.NavOptions import androidx.navigation.NavType import androidx.navigation.compose.composable import androidx.navigation.navArgument -import org.sopt.dateroad.presentation.type.TimelineType -import org.sopt.dateroad.presentation.ui.timelinedetail.TimelineDetailRoute +import org.sopt.teamdateroad.presentation.type.TimelineType +import org.sopt.teamdateroad.presentation.ui.timelinedetail.TimelineDetailRoute fun NavController.navigateToTimelineDetail(timelineType: TimelineType, timelineId: Int, navOptions: NavOptions? = null) { navigate(TimelineDetailRoutes.route(timelineType, timelineId), navOptions) diff --git a/app/src/main/java/org/sopt/dateroad/presentation/util/Constraints.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/util/Constraints.kt similarity index 99% rename from app/src/main/java/org/sopt/dateroad/presentation/util/Constraints.kt rename to app/src/main/java/org/sopt/teamdateroad/presentation/util/Constraints.kt index 0ab8b7dae..c6984b880 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/util/Constraints.kt +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/util/Constraints.kt @@ -1,4 +1,4 @@ -package org.sopt.dateroad.presentation.util +package org.sopt.teamdateroad.presentation.util object CourseDetail { const val POINT_LACK = 50 diff --git a/app/src/main/java/org/sopt/dateroad/presentation/util/amplitude/AmplitudeUtils.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/util/amplitude/AmplitudeUtils.kt similarity index 92% rename from app/src/main/java/org/sopt/dateroad/presentation/util/amplitude/AmplitudeUtils.kt rename to app/src/main/java/org/sopt/teamdateroad/presentation/util/amplitude/AmplitudeUtils.kt index 3cbe4630e..666329db8 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/util/amplitude/AmplitudeUtils.kt +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/util/amplitude/AmplitudeUtils.kt @@ -1,10 +1,10 @@ -package org.sopt.dateroad.presentation.util.amplitude +package org.sopt.teamdateroad.presentation.util.amplitude import android.content.Context import com.amplitude.android.Amplitude import com.amplitude.android.Configuration import com.amplitude.core.events.Identify -import org.sopt.dateroad.BuildConfig +import org.sopt.teamdateroad.BuildConfig object AmplitudeUtils { private lateinit var amplitude: Amplitude diff --git a/app/src/main/java/org/sopt/dateroad/presentation/util/base/BaseViewModel.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/util/base/BaseViewModel.kt similarity index 96% rename from app/src/main/java/org/sopt/dateroad/presentation/util/base/BaseViewModel.kt rename to app/src/main/java/org/sopt/teamdateroad/presentation/util/base/BaseViewModel.kt index 6c38467fb..ea513903a 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/util/base/BaseViewModel.kt +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/util/base/BaseViewModel.kt @@ -1,4 +1,4 @@ -package org.sopt.dateroad.presentation.util.base +package org.sopt.teamdateroad.presentation.util.base import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope diff --git a/app/src/main/java/org/sopt/teamdateroad/presentation/util/base/UiEvent.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/util/base/UiEvent.kt new file mode 100644 index 000000000..beab109b1 --- /dev/null +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/util/base/UiEvent.kt @@ -0,0 +1,3 @@ +package org.sopt.teamdateroad.presentation.util.base + +interface UiEvent diff --git a/app/src/main/java/org/sopt/teamdateroad/presentation/util/base/UiSideEffect.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/util/base/UiSideEffect.kt new file mode 100644 index 000000000..9681f158a --- /dev/null +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/util/base/UiSideEffect.kt @@ -0,0 +1,3 @@ +package org.sopt.teamdateroad.presentation.util.base + +interface UiSideEffect diff --git a/app/src/main/java/org/sopt/teamdateroad/presentation/util/base/UiState.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/util/base/UiState.kt new file mode 100644 index 000000000..a42d99464 --- /dev/null +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/util/base/UiState.kt @@ -0,0 +1,3 @@ +package org.sopt.teamdateroad.presentation.util.base + +interface UiState diff --git a/app/src/main/java/org/sopt/dateroad/presentation/util/draganddrop/DragAndDropListState.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/util/draganddrop/DragAndDropListState.kt similarity index 92% rename from app/src/main/java/org/sopt/dateroad/presentation/util/draganddrop/DragAndDropListState.kt rename to app/src/main/java/org/sopt/teamdateroad/presentation/util/draganddrop/DragAndDropListState.kt index 27c53ec6e..4990ec804 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/util/draganddrop/DragAndDropListState.kt +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/util/draganddrop/DragAndDropListState.kt @@ -1,4 +1,4 @@ -package org.sopt.dateroad.presentation.util.draganddrop +package org.sopt.teamdateroad.presentation.util.draganddrop import androidx.compose.foundation.lazy.LazyListItemInfo import androidx.compose.foundation.lazy.LazyListState @@ -11,9 +11,9 @@ import androidx.compose.runtime.remember import androidx.compose.runtime.setValue import androidx.compose.ui.geometry.Offset import kotlinx.coroutines.Job -import org.sopt.dateroad.presentation.util.Default.DRAGGED_DISTANCE -import org.sopt.dateroad.presentation.util.lazylist.getVisibleItemInfoFor -import org.sopt.dateroad.presentation.util.lazylist.offsetEnd +import org.sopt.teamdateroad.presentation.util.Default.DRAGGED_DISTANCE +import org.sopt.teamdateroad.presentation.util.lazylist.getVisibleItemInfoFor +import org.sopt.teamdateroad.presentation.util.lazylist.offsetEnd class DragAndDropListState( val lazyListState: LazyListState, diff --git a/app/src/main/java/org/sopt/dateroad/presentation/util/lazylist/LazyListExt.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/util/lazylist/LazyListExt.kt similarity index 87% rename from app/src/main/java/org/sopt/dateroad/presentation/util/lazylist/LazyListExt.kt rename to app/src/main/java/org/sopt/teamdateroad/presentation/util/lazylist/LazyListExt.kt index b5fc809cd..d327d6734 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/util/lazylist/LazyListExt.kt +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/util/lazylist/LazyListExt.kt @@ -1,4 +1,4 @@ -package org.sopt.dateroad.presentation.util.lazylist +package org.sopt.teamdateroad.presentation.util.lazylist import androidx.compose.foundation.lazy.LazyListItemInfo import androidx.compose.foundation.lazy.LazyListState diff --git a/app/src/main/java/org/sopt/dateroad/presentation/util/modifier/ModifierExt.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/util/modifier/ModifierExt.kt similarity index 91% rename from app/src/main/java/org/sopt/dateroad/presentation/util/modifier/ModifierExt.kt rename to app/src/main/java/org/sopt/teamdateroad/presentation/util/modifier/ModifierExt.kt index 6fe1c886a..9c0a8b380 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/util/modifier/ModifierExt.kt +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/util/modifier/ModifierExt.kt @@ -1,4 +1,4 @@ -package org.sopt.dateroad.presentation.util.modifier +package org.sopt.teamdateroad.presentation.util.modifier import androidx.compose.foundation.clickable import androidx.compose.foundation.interaction.MutableInteractionSource @@ -15,7 +15,7 @@ import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.delay import kotlinx.coroutines.launch -import org.sopt.dateroad.presentation.util.Default.CLICKABLE_DELAY +import org.sopt.teamdateroad.presentation.util.Default.CLICKABLE_DELAY inline fun Modifier.noRippleClickable( crossinline onClick: () -> Unit = {} diff --git a/app/src/main/java/org/sopt/dateroad/presentation/util/mutablelist/MutableListExt.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/util/mutablelist/MutableListExt.kt similarity index 74% rename from app/src/main/java/org/sopt/dateroad/presentation/util/mutablelist/MutableListExt.kt rename to app/src/main/java/org/sopt/teamdateroad/presentation/util/mutablelist/MutableListExt.kt index 33d1b73b8..d1e68f168 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/util/mutablelist/MutableListExt.kt +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/util/mutablelist/MutableListExt.kt @@ -1,4 +1,4 @@ -package org.sopt.dateroad.presentation.util.mutablelist +package org.sopt.teamdateroad.presentation.util.mutablelist fun MutableList.move(from: Int, to: Int): MutableList { if (from == to) return this diff --git a/app/src/main/java/org/sopt/dateroad/presentation/util/view/LoadState.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/util/view/LoadState.kt similarity index 57% rename from app/src/main/java/org/sopt/dateroad/presentation/util/view/LoadState.kt rename to app/src/main/java/org/sopt/teamdateroad/presentation/util/view/LoadState.kt index e02e0f0bf..10e74c71f 100644 --- a/app/src/main/java/org/sopt/dateroad/presentation/util/view/LoadState.kt +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/util/view/LoadState.kt @@ -1,4 +1,4 @@ -package org.sopt.dateroad.presentation.util.view +package org.sopt.teamdateroad.presentation.util.view enum class LoadState { Idle, diff --git a/app/src/main/java/org/sopt/dateroad/ui/theme/Color.kt b/app/src/main/java/org/sopt/teamdateroad/ui/theme/Color.kt similarity index 98% rename from app/src/main/java/org/sopt/dateroad/ui/theme/Color.kt rename to app/src/main/java/org/sopt/teamdateroad/ui/theme/Color.kt index bd477e94f..adb1ba2d1 100644 --- a/app/src/main/java/org/sopt/dateroad/ui/theme/Color.kt +++ b/app/src/main/java/org/sopt/teamdateroad/ui/theme/Color.kt @@ -1,4 +1,4 @@ -package org.sopt.dateroad.ui.theme +package org.sopt.teamdateroad.ui.theme import androidx.compose.runtime.Immutable import androidx.compose.runtime.staticCompositionLocalOf diff --git a/app/src/main/java/org/sopt/dateroad/ui/theme/Theme.kt b/app/src/main/java/org/sopt/teamdateroad/ui/theme/Theme.kt similarity index 97% rename from app/src/main/java/org/sopt/dateroad/ui/theme/Theme.kt rename to app/src/main/java/org/sopt/teamdateroad/ui/theme/Theme.kt index 29fadb183..1f64dd9fc 100644 --- a/app/src/main/java/org/sopt/dateroad/ui/theme/Theme.kt +++ b/app/src/main/java/org/sopt/teamdateroad/ui/theme/Theme.kt @@ -1,4 +1,4 @@ -package org.sopt.dateroad.ui.theme +package org.sopt.teamdateroad.ui.theme import android.app.Activity import androidx.compose.material3.MaterialTheme diff --git a/app/src/main/java/org/sopt/dateroad/ui/theme/Type.kt b/app/src/main/java/org/sopt/teamdateroad/ui/theme/Type.kt similarity index 98% rename from app/src/main/java/org/sopt/dateroad/ui/theme/Type.kt rename to app/src/main/java/org/sopt/teamdateroad/ui/theme/Type.kt index 7cba31067..0dad377dc 100644 --- a/app/src/main/java/org/sopt/dateroad/ui/theme/Type.kt +++ b/app/src/main/java/org/sopt/teamdateroad/ui/theme/Type.kt @@ -1,4 +1,4 @@ -package org.sopt.dateroad.ui.theme +package org.sopt.teamdateroad.ui.theme import androidx.compose.runtime.Immutable import androidx.compose.runtime.staticCompositionLocalOf @@ -6,7 +6,7 @@ import androidx.compose.ui.text.TextStyle import androidx.compose.ui.text.font.Font import androidx.compose.ui.text.font.FontFamily import androidx.compose.ui.unit.sp -import org.sopt.dateroad.R +import org.sopt.teamdateroad.R val SuitBold = FontFamily(Font(R.font.suit_bold)) val SuitExtraBold = FontFamily(Font(R.font.suit_extrabold)) diff --git a/app/src/test/java/org/sopt/dateroad/ExampleUnitTest.kt b/app/src/test/java/org/sopt/teamdateroad/ExampleUnitTest.kt similarity index 91% rename from app/src/test/java/org/sopt/dateroad/ExampleUnitTest.kt rename to app/src/test/java/org/sopt/teamdateroad/ExampleUnitTest.kt index de092c029..0e0575736 100644 --- a/app/src/test/java/org/sopt/dateroad/ExampleUnitTest.kt +++ b/app/src/test/java/org/sopt/teamdateroad/ExampleUnitTest.kt @@ -1,4 +1,4 @@ -package org.sopt.dateroad +package org.sopt.teamdateroad import junit.framework.TestCase.assertEquals import org.junit.Test From d8dea5e5e8d5b34469831949fcf83e9c5a2aeb54 Mon Sep 17 00:00:00 2001 From: jihyunniiii Date: Tue, 15 Oct 2024 10:22:16 +0900 Subject: [PATCH 2/2] =?UTF-8?q?[chore]=20#278=20=EC=83=81=EC=88=98?= =?UTF-8?q?=ED=99=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../teamdateroad/presentation/ui/profile/ProfileViewModel.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/org/sopt/teamdateroad/presentation/ui/profile/ProfileViewModel.kt b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/profile/ProfileViewModel.kt index 07dd56413..41558573c 100644 --- a/app/src/main/java/org/sopt/teamdateroad/presentation/ui/profile/ProfileViewModel.kt +++ b/app/src/main/java/org/sopt/teamdateroad/presentation/ui/profile/ProfileViewModel.kt @@ -75,7 +75,7 @@ class ProfileViewModel @Inject constructor( signUp = currentState.signUp.copy(userSignUpInfo = currentState.signUp.userSignUpInfo.copy(name = event.name)), isNicknameButtonEnabled = event.name.length in MIN_NICKNAME_LENGTH..MAX_NICKNAME_LENGTH, nicknameValidateResult = when { - event.name.length < 2 -> TextFieldValidateResult.ValidationError + event.name.length < MIN_NICKNAME_LENGTH -> TextFieldValidateResult.ValidationError else -> TextFieldValidateResult.Basic } ) @@ -84,7 +84,7 @@ class ProfileViewModel @Inject constructor( editProfile = currentState.editProfile.copy(name = event.name), isNicknameButtonEnabled = event.name.length in MIN_NICKNAME_LENGTH..MAX_NICKNAME_LENGTH, nicknameValidateResult = when { - event.name.length < 2 -> TextFieldValidateResult.ValidationError + event.name.length < MIN_NICKNAME_LENGTH -> TextFieldValidateResult.ValidationError else -> TextFieldValidateResult.Basic } )