From 84995641f3a716f5f8e495d013435d1f5d4259f9 Mon Sep 17 00:00:00 2001 From: null Date: Tue, 16 Jun 2026 20:03:58 -0500 Subject: [PATCH] refactor: package rename from com.couplesconnect.app to app.closer, update build config and firebase setup --- app/build.gradle.kts | 4 +- app/src/main/AndroidManifest.xml | 6 +- .../app/App.kt => app/closer/CloserApp.kt} | 6 +- .../app => app/closer}/MainActivity.kt | 8 +-- .../closer}/core/analytics/.gitkeep | 0 .../core/analytics/AnalyticsTracker.kt | 2 +- .../analytics/FirebaseAnalyticsTracker.kt | 2 +- .../app => app/closer}/core/billing/.gitkeep | 0 .../core/billing/EntitlementChecker.kt | 2 +- .../closer}/core/crash/CrashReporter.kt | 2 +- .../core/crash/FirebaseCrashReporter.kt | 2 +- .../closer}/core/feature/FeatureFlag.kt | 2 +- .../closer}/core/feature/FeaturePriority.kt | 2 +- .../closer}/core/feature/FeatureRegistry.kt | 2 +- .../closer}/core/feature/FeatureStatus.kt | 2 +- .../core/firebase/FirebaseInitializer.kt | 4 +- .../closer}/core/navigation/.gitkeep | 0 .../closer}/core/navigation/AppNavigation.kt | 64 +++++++++---------- .../closer}/core/navigation/AppRoute.kt | 2 +- .../closer}/core/navigation/ExternalLinks.kt | 2 +- .../closer}/core/notifications/.gitkeep | 0 .../core/notifications/AppMessagingService.kt | 6 +- .../core/notifications/NotificationHelper.kt | 6 +- .../app => app/closer}/data/local/.gitkeep | 0 .../closer}/data/local/AppDatabase.kt | 8 +-- .../closer}/data/local/CategoryDao.kt | 4 +- .../closer}/data/local/QuestionDao.kt | 4 +- .../closer}/data/local/SettingsDataStore.kt | 6 +- .../data/local/converters/Converters.kt | 2 +- .../data/local/entity/CategoryEntity.kt | 2 +- .../data/local/entity/QuestionEntity.kt | 2 +- .../data/local/mapper/QuestionMapper.kt | 28 ++++---- .../data/questions/QuestionJsonParser.kt | 4 +- .../app => app/closer}/data/remote/.gitkeep | 0 .../data/remote/FirebaseAuthDataSource.kt | 4 +- .../data/remote/FirestoreCoupleDataSource.kt | 4 +- .../data/remote/FirestoreInviteDataSource.kt | 4 +- .../FirestoreQuestionThreadDataSource.kt | 12 ++-- .../data/remote/FirestoreUserDataSource.kt | 4 +- .../closer}/data/repository/.gitkeep | 0 .../data/repository/CoupleRepositoryImpl.kt | 10 +-- .../data/repository/FakeQuestionRepository.kt | 8 +-- .../repository/FirebaseAuthRepositoryImpl.kt | 8 +-- .../data/repository/InviteRepositoryImpl.kt | 8 +-- .../QuestionSessionRepositoryImpl.kt | 6 +- .../QuestionThreadRepositoryImpl.kt | 18 +++--- .../data/repository/RoomQuestionRepository.kt | 16 ++--- .../SharedPreferencesLocalAnswerRepository.kt | 6 +- .../data/repository/UserRepositoryImpl.kt | 8 +-- .../app => app/closer}/di/DatabaseModule.kt | 4 +- .../closer}/di/ObservabilityModule.kt | 10 +-- .../app => app/closer}/di/RepositoryModule.kt | 42 ++++++------ .../app => app/closer}/domain/model/Answer.kt | 2 +- .../closer}/domain/model/AuthState.kt | 2 +- .../app => app/closer}/domain/model/Couple.kt | 2 +- .../closer}/domain/model/Entitlement.kt | 2 +- .../app => app/closer}/domain/model/Invite.kt | 2 +- .../closer}/domain/model/InviteStatus.kt | 2 +- .../closer}/domain/model/LocalAnswer.kt | 2 +- .../closer}/domain/model/Question.kt | 2 +- .../closer}/domain/model/QuestionAnswer.kt | 2 +- .../closer}/domain/model/QuestionCategory.kt | 2 +- .../closer}/domain/model/QuestionMessage.kt | 2 +- .../closer}/domain/model/QuestionPack.kt | 2 +- .../closer}/domain/model/QuestionReaction.kt | 2 +- .../closer}/domain/model/QuestionSession.kt | 2 +- .../domain/model/QuestionSessionStatus.kt | 2 +- .../closer}/domain/model/QuestionThread.kt | 2 +- .../app => app/closer}/domain/model/User.kt | 2 +- .../closer}/domain/repository/.gitkeep | 0 .../domain/repository/AuthRepository.kt | 4 +- .../domain/repository/CoupleRepository.kt | 4 +- .../domain/repository/InviteRepository.kt | 4 +- .../repository/LocalAnswerRepository.kt | 4 +- .../domain/repository/QuestionRepository.kt | 6 +- .../repository/QuestionSessionRepository.kt | 4 +- .../repository/QuestionThreadRepository.kt | 10 +-- .../domain/repository/SettingsRepository.kt | 2 +- .../domain/repository/UserRepository.kt | 4 +- .../closer}/domain/usecase/.gitkeep | 0 .../app => app/closer}/ui/answers/.gitkeep | 0 .../closer}/ui/answers/AnswerHistoryScreen.kt | 10 +-- .../ui/answers/AnswerHistoryViewModel.kt | 6 +- .../closer}/ui/answers/AnswerRevealScreen.kt | 12 ++-- .../ui/answers/AnswerRevealViewModel.kt | 10 +-- .../app => app/closer}/ui/auth/.gitkeep | 0 .../app => app/closer}/ui/auth/AuthVisuals.kt | 2 +- .../closer}/ui/auth/ForgotPasswordScreen.kt | 4 +- .../ui/auth/ForgotPasswordViewModel.kt | 4 +- .../app => app/closer}/ui/auth/LoginScreen.kt | 4 +- .../closer}/ui/auth/LoginViewModel.kt | 4 +- .../closer}/ui/auth/SignUpScreen.kt | 4 +- .../closer}/ui/auth/SignUpViewModel.kt | 4 +- .../app => app/closer}/ui/components/.gitkeep | 0 .../closer}/ui/components/EmptyState.kt | 2 +- .../closer}/ui/components/ErrorState.kt | 2 +- .../closer}/ui/components/LoadingState.kt | 2 +- .../ui/components/PlaceholderScreen.kt | 2 +- .../ui/components/SpecialDatesSection.kt | 2 +- .../app => app/closer}/ui/home/.gitkeep | 0 .../app => app/closer}/ui/home/HomeScreen.kt | 10 +-- .../closer}/ui/home/HomeViewModel.kt | 18 +++--- .../closer}/ui/home/PartnerHomeScreen.kt | 8 +-- .../app => app/closer}/ui/onboarding/.gitkeep | 0 .../ui/onboarding/CreateProfileScreen.kt | 16 ++--- .../ui/onboarding/CreateProfileViewModel.kt | 8 +-- .../closer}/ui/onboarding/OnboardingScreen.kt | 56 ++++++++++++---- .../ui/onboarding/OnboardingViewModel.kt | 8 +-- .../app => app/closer}/ui/pairing/.gitkeep | 0 .../closer}/ui/pairing/AcceptInviteScreen.kt | 20 +++--- .../ui/pairing/AcceptInviteViewModel.kt | 6 +- .../closer}/ui/pairing/CreateInviteScreen.kt | 18 +++--- .../ui/pairing/CreateInviteViewModel.kt | 10 +-- .../closer}/ui/pairing/EmailInviteScreen.kt | 8 +-- .../closer}/ui/pairing/InviteConfirmScreen.kt | 16 ++--- .../ui/pairing/InviteConfirmViewModel.kt | 14 ++-- .../app => app/closer}/ui/paywall/.gitkeep | 0 .../closer}/ui/paywall/PaywallScreen.kt | 4 +- .../app => app/closer}/ui/questions/.gitkeep | 0 .../ui/questions/DailyQuestionScreen.kt | 6 +- .../ui/questions/DailyQuestionViewModel.kt | 14 ++-- .../ui/questions/LocalAnswerMapping.kt | 10 +-- .../ui/questions/LocalQuestionContent.kt | 18 +++--- .../ui/questions/QuestionCategoryScreen.kt | 8 +-- .../ui/questions/QuestionCategoryViewModel.kt | 8 +-- .../ui/questions/QuestionComposerScreen.kt | 8 +-- .../ui/questions/QuestionDetailViewModel.kt | 6 +- .../ui/questions/QuestionPackLibraryScreen.kt | 6 +- .../questions/QuestionPackLibraryViewModel.kt | 8 +-- .../ui/questions/QuestionThreadScreen.kt | 6 +- .../ui/questions/QuestionThreadViewModel.kt | 16 ++--- .../ui/questions/components/AnswerBubble.kt | 14 ++-- .../components/QuestionAnswerInput.kt | 12 ++-- .../components/QuestionDiscussionThread.kt | 4 +- .../ui/questions/components/QuestionHeader.kt | 4 +- .../components/QuestionHelpExpandable.kt | 4 +- .../components/QuestionNavigationBar.kt | 2 +- .../app => app/closer}/ui/settings/.gitkeep | 0 .../closer}/ui/settings/AccountScreen.kt | 8 +-- .../ui/settings/DeleteAccountScreen.kt | 8 +-- .../ui/settings/NotificationSettingsScreen.kt | 4 +- .../closer}/ui/settings/PrivacyScreen.kt | 4 +- .../ui/settings/RelationshipSettingsScreen.kt | 8 +-- .../closer}/ui/settings/SettingsScreen.kt | 4 +- .../closer}/ui/settings/SettingsViewModel.kt | 10 +-- .../closer}/ui/settings/SettingsVisuals.kt | 2 +- .../closer}/ui/settings/SubscriptionScreen.kt | 8 +-- .../app => app/closer}/ui/theme/Color.kt | 2 +- .../app => app/closer}/ui/theme/Theme.kt | 4 +- .../app => app/closer}/ui/theme/Type.kt | 2 +- .../app => app/closer}/ui/wheel/.gitkeep | 0 .../closer}/ui/wheel/CategoryPickerScreen.kt | 8 +-- .../ui/wheel/CategoryPickerViewModel.kt | 8 +-- .../ui/wheel/LocalWheelSessionStore.kt | 4 +- .../closer}/ui/wheel/SpinWheelScreen.kt | 2 +- .../closer}/ui/wheel/SpinWheelViewModel.kt | 6 +- .../closer}/ui/wheel/WheelCompleteScreen.kt | 12 ++-- .../closer}/ui/wheel/WheelHistoryScreen.kt | 14 ++-- .../closer}/ui/wheel/WheelHistoryViewModel.kt | 12 ++-- .../closer}/ui/wheel/WheelSessionScreen.kt | 4 +- .../closer}/ui/wheel/WheelSessionViewModel.kt | 6 +- app/src/main/res/values/strings.xml | 2 +- app/src/main/res/values/themes.xml | 2 +- gradlew | 4 +- gradlew.bat | 2 +- seed_generator.py | 4 +- settings.gradle.kts | 2 +- 167 files changed, 533 insertions(+), 505 deletions(-) rename app/src/main/java/{com/couplesconnect/app/App.kt => app/closer/CloserApp.kt} (67%) rename app/src/main/java/{com/couplesconnect/app => app/closer}/MainActivity.kt (80%) rename app/src/main/java/{com/couplesconnect/app => app/closer}/core/analytics/.gitkeep (100%) rename app/src/main/java/{com/couplesconnect/app => app/closer}/core/analytics/AnalyticsTracker.kt (93%) rename app/src/main/java/{com/couplesconnect/app => app/closer}/core/analytics/FirebaseAnalyticsTracker.kt (98%) rename app/src/main/java/{com/couplesconnect/app => app/closer}/core/billing/.gitkeep (100%) rename app/src/main/java/{com/couplesconnect/app => app/closer}/core/billing/EntitlementChecker.kt (85%) rename app/src/main/java/{com/couplesconnect/app => app/closer}/core/crash/CrashReporter.kt (78%) rename app/src/main/java/{com/couplesconnect/app => app/closer}/core/crash/FirebaseCrashReporter.kt (93%) rename app/src/main/java/{com/couplesconnect/app => app/closer}/core/feature/FeatureFlag.kt (99%) rename app/src/main/java/{com/couplesconnect/app => app/closer}/core/feature/FeaturePriority.kt (83%) rename app/src/main/java/{com/couplesconnect/app => app/closer}/core/feature/FeatureRegistry.kt (97%) rename app/src/main/java/{com/couplesconnect/app => app/closer}/core/feature/FeatureStatus.kt (80%) rename app/src/main/java/{com/couplesconnect/app => app/closer}/core/firebase/FirebaseInitializer.kt (89%) rename app/src/main/java/{com/couplesconnect/app => app/closer}/core/navigation/.gitkeep (100%) rename app/src/main/java/{com/couplesconnect/app => app/closer}/core/navigation/AppNavigation.kt (86%) rename app/src/main/java/{com/couplesconnect/app => app/closer}/core/navigation/AppRoute.kt (99%) rename app/src/main/java/{com/couplesconnect/app => app/closer}/core/navigation/ExternalLinks.kt (86%) rename app/src/main/java/{com/couplesconnect/app => app/closer}/core/notifications/.gitkeep (100%) rename app/src/main/java/{com/couplesconnect/app => app/closer}/core/notifications/AppMessagingService.kt (90%) rename app/src/main/java/{com/couplesconnect/app => app/closer}/core/notifications/NotificationHelper.kt (94%) rename app/src/main/java/{com/couplesconnect/app => app/closer}/data/local/.gitkeep (100%) rename app/src/main/java/{com/couplesconnect/app => app/closer}/data/local/AppDatabase.kt (62%) rename app/src/main/java/{com/couplesconnect/app => app/closer}/data/local/CategoryDao.kt (89%) rename app/src/main/java/{com/couplesconnect/app => app/closer}/data/local/QuestionDao.kt (92%) rename app/src/main/java/{com/couplesconnect/app => app/closer}/data/local/SettingsDataStore.kt (91%) rename app/src/main/java/{com/couplesconnect/app => app/closer}/data/local/converters/Converters.kt (86%) rename app/src/main/java/{com/couplesconnect/app => app/closer}/data/local/entity/CategoryEntity.kt (88%) rename app/src/main/java/{com/couplesconnect/app => app/closer}/data/local/entity/QuestionEntity.kt (93%) rename app/src/main/java/{com/couplesconnect/app => app/closer}/data/local/mapper/QuestionMapper.kt (78%) rename app/src/main/java/{com/couplesconnect/app => app/closer}/data/questions/QuestionJsonParser.kt (98%) rename app/src/main/java/{com/couplesconnect/app => app/closer}/data/remote/.gitkeep (100%) rename app/src/main/java/{com/couplesconnect/app => app/closer}/data/remote/FirebaseAuthDataSource.kt (96%) rename app/src/main/java/{com/couplesconnect/app => app/closer}/data/remote/FirestoreCoupleDataSource.kt (98%) rename app/src/main/java/{com/couplesconnect/app => app/closer}/data/remote/FirestoreInviteDataSource.kt (97%) rename app/src/main/java/{com/couplesconnect/app => app/closer}/data/remote/FirestoreQuestionThreadDataSource.kt (96%) rename app/src/main/java/{com/couplesconnect/app => app/closer}/data/remote/FirestoreUserDataSource.kt (97%) rename app/src/main/java/{com/couplesconnect/app => app/closer}/data/repository/.gitkeep (100%) rename app/src/main/java/{com/couplesconnect/app => app/closer}/data/repository/CoupleRepositoryImpl.kt (77%) rename app/src/main/java/{com/couplesconnect/app => app/closer}/data/repository/FakeQuestionRepository.kt (70%) rename app/src/main/java/{com/couplesconnect/app => app/closer}/data/repository/FirebaseAuthRepositoryImpl.kt (84%) rename app/src/main/java/{com/couplesconnect/app => app/closer}/data/repository/InviteRepositoryImpl.kt (76%) rename app/src/main/java/{com/couplesconnect/app => app/closer}/data/repository/QuestionSessionRepositoryImpl.kt (93%) rename app/src/main/java/{com/couplesconnect/app => app/closer}/data/repository/QuestionThreadRepositoryImpl.kt (80%) rename app/src/main/java/{com/couplesconnect/app => app/closer}/data/repository/RoomQuestionRepository.kt (70%) rename app/src/main/java/{com/couplesconnect/app => app/closer}/data/repository/SharedPreferencesLocalAnswerRepository.kt (96%) rename app/src/main/java/{com/couplesconnect/app => app/closer}/data/repository/UserRepositoryImpl.kt (79%) rename app/src/main/java/{com/couplesconnect/app => app/closer}/di/DatabaseModule.kt (94%) rename app/src/main/java/{com/couplesconnect/app => app/closer}/di/ObservabilityModule.kt (74%) rename app/src/main/java/{com/couplesconnect/app => app/closer}/di/RepositoryModule.kt (50%) rename app/src/main/java/{com/couplesconnect/app => app/closer}/domain/model/Answer.kt (85%) rename app/src/main/java/{com/couplesconnect/app => app/closer}/domain/model/AuthState.kt (81%) rename app/src/main/java/{com/couplesconnect/app => app/closer}/domain/model/Couple.kt (88%) rename app/src/main/java/{com/couplesconnect/app => app/closer}/domain/model/Entitlement.kt (85%) rename app/src/main/java/{com/couplesconnect/app => app/closer}/domain/model/Invite.kt (90%) rename app/src/main/java/{com/couplesconnect/app => app/closer}/domain/model/InviteStatus.kt (65%) rename app/src/main/java/{com/couplesconnect/app => app/closer}/domain/model/LocalAnswer.kt (91%) rename app/src/main/java/{com/couplesconnect/app => app/closer}/domain/model/Question.kt (97%) rename app/src/main/java/{com/couplesconnect/app => app/closer}/domain/model/QuestionAnswer.kt (87%) rename app/src/main/java/{com/couplesconnect/app => app/closer}/domain/model/QuestionCategory.kt (83%) rename app/src/main/java/{com/couplesconnect/app => app/closer}/domain/model/QuestionMessage.kt (76%) rename app/src/main/java/{com/couplesconnect/app => app/closer}/domain/model/QuestionPack.kt (84%) rename app/src/main/java/{com/couplesconnect/app => app/closer}/domain/model/QuestionReaction.kt (80%) rename app/src/main/java/{com/couplesconnect/app => app/closer}/domain/model/QuestionSession.kt (89%) rename app/src/main/java/{com/couplesconnect/app => app/closer}/domain/model/QuestionSessionStatus.kt (59%) rename app/src/main/java/{com/couplesconnect/app => app/closer}/domain/model/QuestionThread.kt (94%) rename app/src/main/java/{com/couplesconnect/app => app/closer}/domain/model/User.kt (88%) rename app/src/main/java/{com/couplesconnect/app => app/closer}/domain/repository/.gitkeep (100%) rename app/src/main/java/{com/couplesconnect/app => app/closer}/domain/repository/AuthRepository.kt (84%) rename app/src/main/java/{com/couplesconnect/app => app/closer}/domain/repository/CoupleRepository.kt (76%) rename app/src/main/java/{com/couplesconnect/app => app/closer}/domain/repository/InviteRepository.kt (72%) rename app/src/main/java/{com/couplesconnect/app => app/closer}/domain/repository/LocalAnswerRepository.kt (79%) rename app/src/main/java/{com/couplesconnect/app => app/closer}/domain/repository/QuestionRepository.kt (71%) rename app/src/main/java/{com/couplesconnect/app => app/closer}/domain/repository/QuestionSessionRepository.kt (64%) rename app/src/main/java/{com/couplesconnect/app => app/closer}/domain/repository/QuestionThreadRepository.kt (74%) rename app/src/main/java/{com/couplesconnect/app => app/closer}/domain/repository/SettingsRepository.kt (92%) rename app/src/main/java/{com/couplesconnect/app => app/closer}/domain/repository/UserRepository.kt (79%) rename app/src/main/java/{com/couplesconnect/app => app/closer}/domain/usecase/.gitkeep (100%) rename app/src/main/java/{com/couplesconnect/app => app/closer}/ui/answers/.gitkeep (100%) rename app/src/main/java/{com/couplesconnect/app => app/closer}/ui/answers/AnswerHistoryScreen.kt (96%) rename app/src/main/java/{com/couplesconnect/app => app/closer}/ui/answers/AnswerHistoryViewModel.kt (87%) rename app/src/main/java/{com/couplesconnect/app => app/closer}/ui/answers/AnswerRevealScreen.kt (97%) rename app/src/main/java/{com/couplesconnect/app => app/closer}/ui/answers/AnswerRevealViewModel.kt (88%) rename app/src/main/java/{com/couplesconnect/app => app/closer}/ui/auth/.gitkeep (100%) rename app/src/main/java/{com/couplesconnect/app => app/closer}/ui/auth/AuthVisuals.kt (96%) rename app/src/main/java/{com/couplesconnect/app => app/closer}/ui/auth/ForgotPasswordScreen.kt (98%) rename app/src/main/java/{com/couplesconnect/app => app/closer}/ui/auth/ForgotPasswordViewModel.kt (94%) rename app/src/main/java/{com/couplesconnect/app => app/closer}/ui/auth/LoginScreen.kt (98%) rename app/src/main/java/{com/couplesconnect/app => app/closer}/ui/auth/LoginViewModel.kt (96%) rename app/src/main/java/{com/couplesconnect/app => app/closer}/ui/auth/SignUpScreen.kt (98%) rename app/src/main/java/{com/couplesconnect/app => app/closer}/ui/auth/SignUpViewModel.kt (96%) rename app/src/main/java/{com/couplesconnect/app => app/closer}/ui/components/.gitkeep (100%) rename app/src/main/java/{com/couplesconnect/app => app/closer}/ui/components/EmptyState.kt (97%) rename app/src/main/java/{com/couplesconnect/app => app/closer}/ui/components/ErrorState.kt (97%) rename app/src/main/java/{com/couplesconnect/app => app/closer}/ui/components/LoadingState.kt (97%) rename app/src/main/java/{com/couplesconnect/app => app/closer}/ui/components/PlaceholderScreen.kt (99%) rename app/src/main/java/{com/couplesconnect/app => app/closer}/ui/components/SpecialDatesSection.kt (99%) rename app/src/main/java/{com/couplesconnect/app => app/closer}/ui/home/.gitkeep (100%) rename app/src/main/java/{com/couplesconnect/app => app/closer}/ui/home/HomeScreen.kt (98%) rename app/src/main/java/{com/couplesconnect/app => app/closer}/ui/home/HomeViewModel.kt (94%) rename app/src/main/java/{com/couplesconnect/app => app/closer}/ui/home/PartnerHomeScreen.kt (82%) rename app/src/main/java/{com/couplesconnect/app => app/closer}/ui/onboarding/.gitkeep (100%) rename app/src/main/java/{com/couplesconnect/app => app/closer}/ui/onboarding/CreateProfileScreen.kt (92%) rename app/src/main/java/{com/couplesconnect/app => app/closer}/ui/onboarding/CreateProfileViewModel.kt (91%) rename app/src/main/java/{com/couplesconnect/app => app/closer}/ui/onboarding/OnboardingScreen.kt (69%) rename app/src/main/java/{com/couplesconnect/app => app/closer}/ui/onboarding/OnboardingViewModel.kt (88%) rename app/src/main/java/{com/couplesconnect/app => app/closer}/ui/pairing/.gitkeep (100%) rename app/src/main/java/{com/couplesconnect/app => app/closer}/ui/pairing/AcceptInviteScreen.kt (94%) rename app/src/main/java/{com/couplesconnect/app => app/closer}/ui/pairing/AcceptInviteViewModel.kt (94%) rename app/src/main/java/{com/couplesconnect/app => app/closer}/ui/pairing/CreateInviteScreen.kt (93%) rename app/src/main/java/{com/couplesconnect/app => app/closer}/ui/pairing/CreateInviteViewModel.kt (86%) rename app/src/main/java/{com/couplesconnect/app => app/closer}/ui/pairing/EmailInviteScreen.kt (82%) rename app/src/main/java/{com/couplesconnect/app => app/closer}/ui/pairing/InviteConfirmScreen.kt (93%) rename app/src/main/java/{com/couplesconnect/app => app/closer}/ui/pairing/InviteConfirmViewModel.kt (88%) rename app/src/main/java/{com/couplesconnect/app => app/closer}/ui/paywall/.gitkeep (100%) rename app/src/main/java/{com/couplesconnect/app => app/closer}/ui/paywall/PaywallScreen.kt (98%) rename app/src/main/java/{com/couplesconnect/app => app/closer}/ui/questions/.gitkeep (100%) rename app/src/main/java/{com/couplesconnect/app => app/closer}/ui/questions/DailyQuestionScreen.kt (93%) rename app/src/main/java/{com/couplesconnect/app => app/closer}/ui/questions/DailyQuestionViewModel.kt (89%) rename app/src/main/java/{com/couplesconnect/app => app/closer}/ui/questions/LocalAnswerMapping.kt (86%) rename app/src/main/java/{com/couplesconnect/app => app/closer}/ui/questions/LocalQuestionContent.kt (95%) rename app/src/main/java/{com/couplesconnect/app => app/closer}/ui/questions/QuestionCategoryScreen.kt (98%) rename app/src/main/java/{com/couplesconnect/app => app/closer}/ui/questions/QuestionCategoryViewModel.kt (88%) rename app/src/main/java/{com/couplesconnect/app => app/closer}/ui/questions/QuestionComposerScreen.kt (82%) rename app/src/main/java/{com/couplesconnect/app => app/closer}/ui/questions/QuestionDetailViewModel.kt (94%) rename app/src/main/java/{com/couplesconnect/app => app/closer}/ui/questions/QuestionPackLibraryScreen.kt (98%) rename app/src/main/java/{com/couplesconnect/app => app/closer}/ui/questions/QuestionPackLibraryViewModel.kt (89%) rename app/src/main/java/{com/couplesconnect/app => app/closer}/ui/questions/QuestionThreadScreen.kt (94%) rename app/src/main/java/{com/couplesconnect/app => app/closer}/ui/questions/QuestionThreadViewModel.kt (95%) rename app/src/main/java/{com/couplesconnect/app => app/closer}/ui/questions/components/AnswerBubble.kt (94%) rename app/src/main/java/{com/couplesconnect/app => app/closer}/ui/questions/components/QuestionAnswerInput.kt (97%) rename app/src/main/java/{com/couplesconnect/app => app/closer}/ui/questions/components/QuestionDiscussionThread.kt (98%) rename app/src/main/java/{com/couplesconnect/app => app/closer}/ui/questions/components/QuestionHeader.kt (94%) rename app/src/main/java/{com/couplesconnect/app => app/closer}/ui/questions/components/QuestionHelpExpandable.kt (97%) rename app/src/main/java/{com/couplesconnect/app => app/closer}/ui/questions/components/QuestionNavigationBar.kt (98%) rename app/src/main/java/{com/couplesconnect/app => app/closer}/ui/settings/.gitkeep (100%) rename app/src/main/java/{com/couplesconnect/app => app/closer}/ui/settings/AccountScreen.kt (82%) rename app/src/main/java/{com/couplesconnect/app => app/closer}/ui/settings/DeleteAccountScreen.kt (97%) rename app/src/main/java/{com/couplesconnect/app => app/closer}/ui/settings/NotificationSettingsScreen.kt (98%) rename app/src/main/java/{com/couplesconnect/app => app/closer}/ui/settings/PrivacyScreen.kt (98%) rename app/src/main/java/{com/couplesconnect/app => app/closer}/ui/settings/RelationshipSettingsScreen.kt (97%) rename app/src/main/java/{com/couplesconnect/app => app/closer}/ui/settings/SettingsScreen.kt (99%) rename app/src/main/java/{com/couplesconnect/app => app/closer}/ui/settings/SettingsViewModel.kt (89%) rename app/src/main/java/{com/couplesconnect/app => app/closer}/ui/settings/SettingsVisuals.kt (96%) rename app/src/main/java/{com/couplesconnect/app => app/closer}/ui/settings/SubscriptionScreen.kt (82%) rename app/src/main/java/{com/couplesconnect/app => app/closer}/ui/theme/Color.kt (94%) rename app/src/main/java/{com/couplesconnect/app => app/closer}/ui/theme/Theme.kt (97%) rename app/src/main/java/{com/couplesconnect/app => app/closer}/ui/theme/Type.kt (98%) rename app/src/main/java/{com/couplesconnect/app => app/closer}/ui/wheel/.gitkeep (100%) rename app/src/main/java/{com/couplesconnect/app => app/closer}/ui/wheel/CategoryPickerScreen.kt (97%) rename app/src/main/java/{com/couplesconnect/app => app/closer}/ui/wheel/CategoryPickerViewModel.kt (89%) rename app/src/main/java/{com/couplesconnect/app => app/closer}/ui/wheel/LocalWheelSessionStore.kt (79%) rename app/src/main/java/{com/couplesconnect/app => app/closer}/ui/wheel/SpinWheelScreen.kt (99%) rename app/src/main/java/{com/couplesconnect/app => app/closer}/ui/wheel/SpinWheelViewModel.kt (94%) rename app/src/main/java/{com/couplesconnect/app => app/closer}/ui/wheel/WheelCompleteScreen.kt (95%) rename app/src/main/java/{com/couplesconnect/app => app/closer}/ui/wheel/WheelHistoryScreen.kt (95%) rename app/src/main/java/{com/couplesconnect/app => app/closer}/ui/wheel/WheelHistoryViewModel.kt (83%) rename app/src/main/java/{com/couplesconnect/app => app/closer}/ui/wheel/WheelSessionScreen.kt (98%) rename app/src/main/java/{com/couplesconnect/app => app/closer}/ui/wheel/WheelSessionViewModel.kt (93%) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index bbad470e..aa27deff 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -9,11 +9,11 @@ plugins { } android { - namespace = "com.couplesconnect.app" + namespace = "app.closer" compileSdk = 35 defaultConfig { - applicationId = "couples.connect.dev" + applicationId = "app.closer" minSdk = 26 targetSdk = 35 versionCode = 1 diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 0614cbff..8f46930c 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -5,21 +5,21 @@ + android:theme="@style/Theme.Closer"> diff --git a/app/src/main/java/com/couplesconnect/app/App.kt b/app/src/main/java/app/closer/CloserApp.kt similarity index 67% rename from app/src/main/java/com/couplesconnect/app/App.kt rename to app/src/main/java/app/closer/CloserApp.kt index a42f08d3..389a531a 100644 --- a/app/src/main/java/com/couplesconnect/app/App.kt +++ b/app/src/main/java/app/closer/CloserApp.kt @@ -1,12 +1,12 @@ -package com.couplesconnect.app +package app.closer import android.app.Application -import com.couplesconnect.app.core.firebase.FirebaseInitializer +import app.closer.core.firebase.FirebaseInitializer import dagger.hilt.android.HiltAndroidApp import javax.inject.Inject @HiltAndroidApp -class CouplesConnectApp : Application() { +class CloserApp : Application() { @Inject lateinit var firebaseInitializer: FirebaseInitializer diff --git a/app/src/main/java/com/couplesconnect/app/MainActivity.kt b/app/src/main/java/app/closer/MainActivity.kt similarity index 80% rename from app/src/main/java/com/couplesconnect/app/MainActivity.kt rename to app/src/main/java/app/closer/MainActivity.kt index 5559eccb..f3232d78 100644 --- a/app/src/main/java/com/couplesconnect/app/MainActivity.kt +++ b/app/src/main/java/app/closer/MainActivity.kt @@ -1,4 +1,4 @@ -package com.couplesconnect.app +package app.closer import android.os.Bundle import androidx.activity.ComponentActivity @@ -7,8 +7,8 @@ import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Surface import androidx.compose.ui.Modifier -import com.couplesconnect.app.core.navigation.AppNavigation -import com.couplesconnect.app.ui.theme.CouplesConnectTheme +import app.closer.core.navigation.AppNavigation +import app.closer.ui.theme.CloserTheme import dagger.hilt.android.AndroidEntryPoint @AndroidEntryPoint @@ -16,7 +16,7 @@ class MainActivity : ComponentActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) setContent { - CouplesConnectTheme { + CloserTheme { Surface( modifier = Modifier.fillMaxSize(), color = MaterialTheme.colorScheme.background diff --git a/app/src/main/java/com/couplesconnect/app/core/analytics/.gitkeep b/app/src/main/java/app/closer/core/analytics/.gitkeep similarity index 100% rename from app/src/main/java/com/couplesconnect/app/core/analytics/.gitkeep rename to app/src/main/java/app/closer/core/analytics/.gitkeep diff --git a/app/src/main/java/com/couplesconnect/app/core/analytics/AnalyticsTracker.kt b/app/src/main/java/app/closer/core/analytics/AnalyticsTracker.kt similarity index 93% rename from app/src/main/java/com/couplesconnect/app/core/analytics/AnalyticsTracker.kt rename to app/src/main/java/app/closer/core/analytics/AnalyticsTracker.kt index a04d5945..6cbfa008 100644 --- a/app/src/main/java/com/couplesconnect/app/core/analytics/AnalyticsTracker.kt +++ b/app/src/main/java/app/closer/core/analytics/AnalyticsTracker.kt @@ -1,4 +1,4 @@ -package com.couplesconnect.app.core.analytics +package app.closer.core.analytics interface AnalyticsTracker { fun trackScreenViewed(screenName: String) diff --git a/app/src/main/java/com/couplesconnect/app/core/analytics/FirebaseAnalyticsTracker.kt b/app/src/main/java/app/closer/core/analytics/FirebaseAnalyticsTracker.kt similarity index 98% rename from app/src/main/java/com/couplesconnect/app/core/analytics/FirebaseAnalyticsTracker.kt rename to app/src/main/java/app/closer/core/analytics/FirebaseAnalyticsTracker.kt index 833fdfe5..0561d56c 100644 --- a/app/src/main/java/com/couplesconnect/app/core/analytics/FirebaseAnalyticsTracker.kt +++ b/app/src/main/java/app/closer/core/analytics/FirebaseAnalyticsTracker.kt @@ -1,4 +1,4 @@ -package com.couplesconnect.app.core.analytics +package app.closer.core.analytics import android.os.Bundle import com.google.firebase.analytics.FirebaseAnalytics diff --git a/app/src/main/java/com/couplesconnect/app/core/billing/.gitkeep b/app/src/main/java/app/closer/core/billing/.gitkeep similarity index 100% rename from app/src/main/java/com/couplesconnect/app/core/billing/.gitkeep rename to app/src/main/java/app/closer/core/billing/.gitkeep diff --git a/app/src/main/java/com/couplesconnect/app/core/billing/EntitlementChecker.kt b/app/src/main/java/app/closer/core/billing/EntitlementChecker.kt similarity index 85% rename from app/src/main/java/com/couplesconnect/app/core/billing/EntitlementChecker.kt rename to app/src/main/java/app/closer/core/billing/EntitlementChecker.kt index 1f18c4b3..7f0227b1 100644 --- a/app/src/main/java/com/couplesconnect/app/core/billing/EntitlementChecker.kt +++ b/app/src/main/java/app/closer/core/billing/EntitlementChecker.kt @@ -1,4 +1,4 @@ -package com.couplesconnect.app.core.billing +package app.closer.core.billing import javax.inject.Inject import javax.inject.Singleton diff --git a/app/src/main/java/com/couplesconnect/app/core/crash/CrashReporter.kt b/app/src/main/java/app/closer/core/crash/CrashReporter.kt similarity index 78% rename from app/src/main/java/com/couplesconnect/app/core/crash/CrashReporter.kt rename to app/src/main/java/app/closer/core/crash/CrashReporter.kt index eee72489..4bed8bcb 100644 --- a/app/src/main/java/com/couplesconnect/app/core/crash/CrashReporter.kt +++ b/app/src/main/java/app/closer/core/crash/CrashReporter.kt @@ -1,4 +1,4 @@ -package com.couplesconnect.app.core.crash +package app.closer.core.crash interface CrashReporter { fun setUserId(uid: String) diff --git a/app/src/main/java/com/couplesconnect/app/core/crash/FirebaseCrashReporter.kt b/app/src/main/java/app/closer/core/crash/FirebaseCrashReporter.kt similarity index 93% rename from app/src/main/java/com/couplesconnect/app/core/crash/FirebaseCrashReporter.kt rename to app/src/main/java/app/closer/core/crash/FirebaseCrashReporter.kt index 8d14149d..96c823ab 100644 --- a/app/src/main/java/com/couplesconnect/app/core/crash/FirebaseCrashReporter.kt +++ b/app/src/main/java/app/closer/core/crash/FirebaseCrashReporter.kt @@ -1,4 +1,4 @@ -package com.couplesconnect.app.core.crash +package app.closer.core.crash import com.google.firebase.crashlytics.FirebaseCrashlytics import javax.inject.Inject diff --git a/app/src/main/java/com/couplesconnect/app/core/feature/FeatureFlag.kt b/app/src/main/java/app/closer/core/feature/FeatureFlag.kt similarity index 99% rename from app/src/main/java/com/couplesconnect/app/core/feature/FeatureFlag.kt rename to app/src/main/java/app/closer/core/feature/FeatureFlag.kt index 75c220a3..83682ab1 100644 --- a/app/src/main/java/com/couplesconnect/app/core/feature/FeatureFlag.kt +++ b/app/src/main/java/app/closer/core/feature/FeatureFlag.kt @@ -1,4 +1,4 @@ -package com.couplesconnect.app.core.feature +package app.closer.core.feature /** * Feature flag definition. diff --git a/app/src/main/java/com/couplesconnect/app/core/feature/FeaturePriority.kt b/app/src/main/java/app/closer/core/feature/FeaturePriority.kt similarity index 83% rename from app/src/main/java/com/couplesconnect/app/core/feature/FeaturePriority.kt rename to app/src/main/java/app/closer/core/feature/FeaturePriority.kt index 3d0d9393..bfd7ede4 100644 --- a/app/src/main/java/com/couplesconnect/app/core/feature/FeaturePriority.kt +++ b/app/src/main/java/app/closer/core/feature/FeaturePriority.kt @@ -1,4 +1,4 @@ -package com.couplesconnect.app.core.feature +package app.closer.core.feature /** * Feature implementation priority. diff --git a/app/src/main/java/com/couplesconnect/app/core/feature/FeatureRegistry.kt b/app/src/main/java/app/closer/core/feature/FeatureRegistry.kt similarity index 97% rename from app/src/main/java/com/couplesconnect/app/core/feature/FeatureRegistry.kt rename to app/src/main/java/app/closer/core/feature/FeatureRegistry.kt index 5e45556c..2cff6da3 100644 --- a/app/src/main/java/com/couplesconnect/app/core/feature/FeatureRegistry.kt +++ b/app/src/main/java/app/closer/core/feature/FeatureRegistry.kt @@ -1,4 +1,4 @@ -package com.couplesconnect.app.core.feature +package app.closer.core.feature /** * Central registry for all feature flags. diff --git a/app/src/main/java/com/couplesconnect/app/core/feature/FeatureStatus.kt b/app/src/main/java/app/closer/core/feature/FeatureStatus.kt similarity index 80% rename from app/src/main/java/com/couplesconnect/app/core/feature/FeatureStatus.kt rename to app/src/main/java/app/closer/core/feature/FeatureStatus.kt index f6088da5..9e581c06 100644 --- a/app/src/main/java/com/couplesconnect/app/core/feature/FeatureStatus.kt +++ b/app/src/main/java/app/closer/core/feature/FeatureStatus.kt @@ -1,4 +1,4 @@ -package com.couplesconnect.app.core.feature +package app.closer.core.feature /** * Feature billing status. diff --git a/app/src/main/java/com/couplesconnect/app/core/firebase/FirebaseInitializer.kt b/app/src/main/java/app/closer/core/firebase/FirebaseInitializer.kt similarity index 89% rename from app/src/main/java/com/couplesconnect/app/core/firebase/FirebaseInitializer.kt rename to app/src/main/java/app/closer/core/firebase/FirebaseInitializer.kt index 6a349c36..9a7099ee 100644 --- a/app/src/main/java/com/couplesconnect/app/core/firebase/FirebaseInitializer.kt +++ b/app/src/main/java/app/closer/core/firebase/FirebaseInitializer.kt @@ -1,6 +1,6 @@ -package com.couplesconnect.app.core.firebase +package app.closer.core.firebase -import com.couplesconnect.app.BuildConfig // generated by buildFeatures { buildConfig = true } +import app.closer.BuildConfig // generated by buildFeatures { buildConfig = true } import com.google.firebase.appcheck.FirebaseAppCheck import com.google.firebase.appcheck.playintegrity.PlayIntegrityAppCheckProviderFactory import javax.inject.Inject diff --git a/app/src/main/java/com/couplesconnect/app/core/navigation/.gitkeep b/app/src/main/java/app/closer/core/navigation/.gitkeep similarity index 100% rename from app/src/main/java/com/couplesconnect/app/core/navigation/.gitkeep rename to app/src/main/java/app/closer/core/navigation/.gitkeep diff --git a/app/src/main/java/com/couplesconnect/app/core/navigation/AppNavigation.kt b/app/src/main/java/app/closer/core/navigation/AppNavigation.kt similarity index 86% rename from app/src/main/java/com/couplesconnect/app/core/navigation/AppNavigation.kt rename to app/src/main/java/app/closer/core/navigation/AppNavigation.kt index 24d71027..d01972cb 100644 --- a/app/src/main/java/com/couplesconnect/app/core/navigation/AppNavigation.kt +++ b/app/src/main/java/app/closer/core/navigation/AppNavigation.kt @@ -1,4 +1,4 @@ -package com.couplesconnect.app.core.navigation +package app.closer.core.navigation import androidx.compose.foundation.layout.padding import androidx.compose.material.icons.Icons @@ -29,37 +29,37 @@ import androidx.navigation.compose.composable import androidx.navigation.compose.rememberNavController import androidx.navigation.NavGraph.Companion.findStartDestination import androidx.navigation.navArgument -import com.couplesconnect.app.ui.auth.ForgotPasswordScreen -import com.couplesconnect.app.ui.answers.AnswerHistoryScreen -import com.couplesconnect.app.ui.answers.AnswerRevealScreen -import com.couplesconnect.app.ui.auth.LoginScreen -import com.couplesconnect.app.ui.auth.SignUpScreen -import com.couplesconnect.app.ui.home.HomeScreen -import com.couplesconnect.app.ui.home.PartnerHomeScreen -import com.couplesconnect.app.ui.onboarding.CreateProfileScreen -import com.couplesconnect.app.ui.onboarding.OnboardingScreen -import com.couplesconnect.app.ui.pairing.AcceptInviteScreen -import com.couplesconnect.app.ui.pairing.CreateInviteScreen -import com.couplesconnect.app.ui.pairing.EmailInviteScreen -import com.couplesconnect.app.ui.pairing.InviteConfirmScreen -import com.couplesconnect.app.ui.paywall.PaywallScreen -import com.couplesconnect.app.ui.questions.DailyQuestionScreen -import com.couplesconnect.app.ui.questions.QuestionCategoryScreen -import com.couplesconnect.app.ui.questions.QuestionComposerScreen -import com.couplesconnect.app.ui.questions.QuestionPackLibraryScreen -import com.couplesconnect.app.ui.questions.QuestionThreadScreen -import com.couplesconnect.app.ui.settings.AccountScreen -import com.couplesconnect.app.ui.settings.DeleteAccountScreen -import com.couplesconnect.app.ui.settings.NotificationSettingsScreen -import com.couplesconnect.app.ui.settings.PrivacyScreen -import com.couplesconnect.app.ui.settings.RelationshipSettingsScreen -import com.couplesconnect.app.ui.settings.SettingsScreen -import com.couplesconnect.app.ui.settings.SubscriptionScreen -import com.couplesconnect.app.ui.wheel.CategoryPickerScreen -import com.couplesconnect.app.ui.wheel.SpinWheelScreen -import com.couplesconnect.app.ui.wheel.WheelCompleteScreen -import com.couplesconnect.app.ui.wheel.WheelHistoryScreen -import com.couplesconnect.app.ui.wheel.WheelSessionScreen +import app.closer.ui.auth.ForgotPasswordScreen +import app.closer.ui.answers.AnswerHistoryScreen +import app.closer.ui.answers.AnswerRevealScreen +import app.closer.ui.auth.LoginScreen +import app.closer.ui.auth.SignUpScreen +import app.closer.ui.home.HomeScreen +import app.closer.ui.home.PartnerHomeScreen +import app.closer.ui.onboarding.CreateProfileScreen +import app.closer.ui.onboarding.OnboardingScreen +import app.closer.ui.pairing.AcceptInviteScreen +import app.closer.ui.pairing.CreateInviteScreen +import app.closer.ui.pairing.EmailInviteScreen +import app.closer.ui.pairing.InviteConfirmScreen +import app.closer.ui.paywall.PaywallScreen +import app.closer.ui.questions.DailyQuestionScreen +import app.closer.ui.questions.QuestionCategoryScreen +import app.closer.ui.questions.QuestionComposerScreen +import app.closer.ui.questions.QuestionPackLibraryScreen +import app.closer.ui.questions.QuestionThreadScreen +import app.closer.ui.settings.AccountScreen +import app.closer.ui.settings.DeleteAccountScreen +import app.closer.ui.settings.NotificationSettingsScreen +import app.closer.ui.settings.PrivacyScreen +import app.closer.ui.settings.RelationshipSettingsScreen +import app.closer.ui.settings.SettingsScreen +import app.closer.ui.settings.SubscriptionScreen +import app.closer.ui.wheel.CategoryPickerScreen +import app.closer.ui.wheel.SpinWheelScreen +import app.closer.ui.wheel.WheelCompleteScreen +import app.closer.ui.wheel.WheelHistoryScreen +import app.closer.ui.wheel.WheelSessionScreen @OptIn(ExperimentalMaterial3Api::class) @Composable diff --git a/app/src/main/java/com/couplesconnect/app/core/navigation/AppRoute.kt b/app/src/main/java/app/closer/core/navigation/AppRoute.kt similarity index 99% rename from app/src/main/java/com/couplesconnect/app/core/navigation/AppRoute.kt rename to app/src/main/java/app/closer/core/navigation/AppRoute.kt index eb2a9346..1449ad97 100644 --- a/app/src/main/java/com/couplesconnect/app/core/navigation/AppRoute.kt +++ b/app/src/main/java/app/closer/core/navigation/AppRoute.kt @@ -1,4 +1,4 @@ -package com.couplesconnect.app.core.navigation +package app.closer.core.navigation import android.net.Uri diff --git a/app/src/main/java/com/couplesconnect/app/core/navigation/ExternalLinks.kt b/app/src/main/java/app/closer/core/navigation/ExternalLinks.kt similarity index 86% rename from app/src/main/java/com/couplesconnect/app/core/navigation/ExternalLinks.kt rename to app/src/main/java/app/closer/core/navigation/ExternalLinks.kt index d91b1f5e..ac8ff44b 100644 --- a/app/src/main/java/com/couplesconnect/app/core/navigation/ExternalLinks.kt +++ b/app/src/main/java/app/closer/core/navigation/ExternalLinks.kt @@ -1,4 +1,4 @@ -package com.couplesconnect.app.core.navigation +package app.closer.core.navigation object ExternalLinks { const val PRIVACY_POLICY = "https://couplesconnect.app/privacy" diff --git a/app/src/main/java/com/couplesconnect/app/core/notifications/.gitkeep b/app/src/main/java/app/closer/core/notifications/.gitkeep similarity index 100% rename from app/src/main/java/com/couplesconnect/app/core/notifications/.gitkeep rename to app/src/main/java/app/closer/core/notifications/.gitkeep diff --git a/app/src/main/java/com/couplesconnect/app/core/notifications/AppMessagingService.kt b/app/src/main/java/app/closer/core/notifications/AppMessagingService.kt similarity index 90% rename from app/src/main/java/com/couplesconnect/app/core/notifications/AppMessagingService.kt rename to app/src/main/java/app/closer/core/notifications/AppMessagingService.kt index 5218d827..f643ee69 100644 --- a/app/src/main/java/com/couplesconnect/app/core/notifications/AppMessagingService.kt +++ b/app/src/main/java/app/closer/core/notifications/AppMessagingService.kt @@ -1,7 +1,7 @@ -package com.couplesconnect.app.core.notifications +package app.closer.core.notifications -import com.couplesconnect.app.domain.repository.AuthRepository -import com.couplesconnect.app.domain.repository.UserRepository +import app.closer.domain.repository.AuthRepository +import app.closer.domain.repository.UserRepository import com.google.firebase.messaging.FirebaseMessagingService import com.google.firebase.messaging.RemoteMessage import dagger.hilt.android.AndroidEntryPoint diff --git a/app/src/main/java/com/couplesconnect/app/core/notifications/NotificationHelper.kt b/app/src/main/java/app/closer/core/notifications/NotificationHelper.kt similarity index 94% rename from app/src/main/java/com/couplesconnect/app/core/notifications/NotificationHelper.kt rename to app/src/main/java/app/closer/core/notifications/NotificationHelper.kt index f6214a80..ba38d027 100644 --- a/app/src/main/java/com/couplesconnect/app/core/notifications/NotificationHelper.kt +++ b/app/src/main/java/app/closer/core/notifications/NotificationHelper.kt @@ -1,4 +1,4 @@ -package com.couplesconnect.app.core.notifications +package app.closer.core.notifications import android.app.NotificationChannel import android.app.NotificationManager @@ -7,8 +7,8 @@ import android.content.Context import android.content.Intent import androidx.core.app.NotificationCompat import androidx.core.app.NotificationManagerCompat -import com.couplesconnect.app.MainActivity -import com.couplesconnect.app.R +import app.closer.MainActivity +import app.closer.R object NotificationHelper { diff --git a/app/src/main/java/com/couplesconnect/app/data/local/.gitkeep b/app/src/main/java/app/closer/data/local/.gitkeep similarity index 100% rename from app/src/main/java/com/couplesconnect/app/data/local/.gitkeep rename to app/src/main/java/app/closer/data/local/.gitkeep diff --git a/app/src/main/java/com/couplesconnect/app/data/local/AppDatabase.kt b/app/src/main/java/app/closer/data/local/AppDatabase.kt similarity index 62% rename from app/src/main/java/com/couplesconnect/app/data/local/AppDatabase.kt rename to app/src/main/java/app/closer/data/local/AppDatabase.kt index c9dcc7d2..767ca249 100644 --- a/app/src/main/java/com/couplesconnect/app/data/local/AppDatabase.kt +++ b/app/src/main/java/app/closer/data/local/AppDatabase.kt @@ -1,11 +1,11 @@ -package com.couplesconnect.app.data.local +package app.closer.data.local import androidx.room.Database import androidx.room.RoomDatabase import androidx.room.TypeConverters -import com.couplesconnect.app.data.local.converters.Converters -import com.couplesconnect.app.data.local.entity.CategoryEntity -import com.couplesconnect.app.data.local.entity.QuestionEntity +import app.closer.data.local.converters.Converters +import app.closer.data.local.entity.CategoryEntity +import app.closer.data.local.entity.QuestionEntity @Database( entities = [QuestionEntity::class, CategoryEntity::class], diff --git a/app/src/main/java/com/couplesconnect/app/data/local/CategoryDao.kt b/app/src/main/java/app/closer/data/local/CategoryDao.kt similarity index 89% rename from app/src/main/java/com/couplesconnect/app/data/local/CategoryDao.kt rename to app/src/main/java/app/closer/data/local/CategoryDao.kt index a7b5e995..6d776fba 100644 --- a/app/src/main/java/com/couplesconnect/app/data/local/CategoryDao.kt +++ b/app/src/main/java/app/closer/data/local/CategoryDao.kt @@ -1,11 +1,11 @@ -package com.couplesconnect.app.data.local +package app.closer.data.local import androidx.room.Dao import androidx.room.Delete import androidx.room.Insert import androidx.room.OnConflictStrategy import androidx.room.Query -import com.couplesconnect.app.data.local.entity.CategoryEntity +import app.closer.data.local.entity.CategoryEntity @Dao interface CategoryDao { diff --git a/app/src/main/java/com/couplesconnect/app/data/local/QuestionDao.kt b/app/src/main/java/app/closer/data/local/QuestionDao.kt similarity index 92% rename from app/src/main/java/com/couplesconnect/app/data/local/QuestionDao.kt rename to app/src/main/java/app/closer/data/local/QuestionDao.kt index a19697f6..0a4e3483 100644 --- a/app/src/main/java/com/couplesconnect/app/data/local/QuestionDao.kt +++ b/app/src/main/java/app/closer/data/local/QuestionDao.kt @@ -1,11 +1,11 @@ -package com.couplesconnect.app.data.local +package app.closer.data.local import androidx.room.Dao import androidx.room.Delete import androidx.room.Insert import androidx.room.OnConflictStrategy import androidx.room.Query -import com.couplesconnect.app.data.local.entity.QuestionEntity +import app.closer.data.local.entity.QuestionEntity @Dao interface QuestionDao { diff --git a/app/src/main/java/com/couplesconnect/app/data/local/SettingsDataStore.kt b/app/src/main/java/app/closer/data/local/SettingsDataStore.kt similarity index 91% rename from app/src/main/java/com/couplesconnect/app/data/local/SettingsDataStore.kt rename to app/src/main/java/app/closer/data/local/SettingsDataStore.kt index c277869f..3156c44d 100644 --- a/app/src/main/java/com/couplesconnect/app/data/local/SettingsDataStore.kt +++ b/app/src/main/java/app/closer/data/local/SettingsDataStore.kt @@ -1,11 +1,11 @@ -package com.couplesconnect.app.data.local +package app.closer.data.local import androidx.datastore.core.DataStore import androidx.datastore.preferences.core.Preferences import androidx.datastore.preferences.core.booleanPreferencesKey import androidx.datastore.preferences.core.edit -import com.couplesconnect.app.domain.repository.AppSettings -import com.couplesconnect.app.domain.repository.SettingsRepository +import app.closer.domain.repository.AppSettings +import app.closer.domain.repository.SettingsRepository import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.map import javax.inject.Inject diff --git a/app/src/main/java/com/couplesconnect/app/data/local/converters/Converters.kt b/app/src/main/java/app/closer/data/local/converters/Converters.kt similarity index 86% rename from app/src/main/java/com/couplesconnect/app/data/local/converters/Converters.kt rename to app/src/main/java/app/closer/data/local/converters/Converters.kt index 18c7a368..47ea7559 100644 --- a/app/src/main/java/com/couplesconnect/app/data/local/converters/Converters.kt +++ b/app/src/main/java/app/closer/data/local/converters/Converters.kt @@ -1,4 +1,4 @@ -package com.couplesconnect.app.data.local.converters +package app.closer.data.local.converters import androidx.room.TypeConverter diff --git a/app/src/main/java/com/couplesconnect/app/data/local/entity/CategoryEntity.kt b/app/src/main/java/app/closer/data/local/entity/CategoryEntity.kt similarity index 88% rename from app/src/main/java/com/couplesconnect/app/data/local/entity/CategoryEntity.kt rename to app/src/main/java/app/closer/data/local/entity/CategoryEntity.kt index 66270844..e53c2881 100644 --- a/app/src/main/java/com/couplesconnect/app/data/local/entity/CategoryEntity.kt +++ b/app/src/main/java/app/closer/data/local/entity/CategoryEntity.kt @@ -1,4 +1,4 @@ -package com.couplesconnect.app.data.local.entity +package app.closer.data.local.entity import androidx.room.ColumnInfo import androidx.room.Entity diff --git a/app/src/main/java/com/couplesconnect/app/data/local/entity/QuestionEntity.kt b/app/src/main/java/app/closer/data/local/entity/QuestionEntity.kt similarity index 93% rename from app/src/main/java/com/couplesconnect/app/data/local/entity/QuestionEntity.kt rename to app/src/main/java/app/closer/data/local/entity/QuestionEntity.kt index e087714e..da34f90c 100644 --- a/app/src/main/java/com/couplesconnect/app/data/local/entity/QuestionEntity.kt +++ b/app/src/main/java/app/closer/data/local/entity/QuestionEntity.kt @@ -1,4 +1,4 @@ -package com.couplesconnect.app.data.local.entity +package app.closer.data.local.entity import androidx.room.ColumnInfo import androidx.room.Entity diff --git a/app/src/main/java/com/couplesconnect/app/data/local/mapper/QuestionMapper.kt b/app/src/main/java/app/closer/data/local/mapper/QuestionMapper.kt similarity index 78% rename from app/src/main/java/com/couplesconnect/app/data/local/mapper/QuestionMapper.kt rename to app/src/main/java/app/closer/data/local/mapper/QuestionMapper.kt index 0a010276..241e3d9b 100644 --- a/app/src/main/java/com/couplesconnect/app/data/local/mapper/QuestionMapper.kt +++ b/app/src/main/java/app/closer/data/local/mapper/QuestionMapper.kt @@ -1,18 +1,18 @@ -package com.couplesconnect.app.data.local.mapper +package app.closer.data.local.mapper -import com.couplesconnect.app.data.local.entity.QuestionEntity -import com.couplesconnect.app.data.local.entity.CategoryEntity -import com.couplesconnect.app.domain.model.ChoiceAnswerConfig -import com.couplesconnect.app.domain.model.ChoiceAnswerConfigImpl -import com.couplesconnect.app.domain.model.ChoiceOption -import com.couplesconnect.app.domain.model.Question -import com.couplesconnect.app.domain.model.QuestionCategory -import com.couplesconnect.app.domain.model.ScaleAnswerConfig -import com.couplesconnect.app.domain.model.ScaleAnswerConfigImpl -import com.couplesconnect.app.domain.model.ThisOrThatAnswerConfig -import com.couplesconnect.app.domain.model.ThisOrThatAnswerConfigImpl -import com.couplesconnect.app.domain.model.WrittenAnswerConfig -import com.couplesconnect.app.domain.model.WrittenAnswerConfigImpl +import app.closer.data.local.entity.QuestionEntity +import app.closer.data.local.entity.CategoryEntity +import app.closer.domain.model.ChoiceAnswerConfig +import app.closer.domain.model.ChoiceAnswerConfigImpl +import app.closer.domain.model.ChoiceOption +import app.closer.domain.model.Question +import app.closer.domain.model.QuestionCategory +import app.closer.domain.model.ScaleAnswerConfig +import app.closer.domain.model.ScaleAnswerConfigImpl +import app.closer.domain.model.ThisOrThatAnswerConfig +import app.closer.domain.model.ThisOrThatAnswerConfigImpl +import app.closer.domain.model.WrittenAnswerConfig +import app.closer.domain.model.WrittenAnswerConfigImpl import org.json.JSONArray import org.json.JSONObject diff --git a/app/src/main/java/com/couplesconnect/app/data/questions/QuestionJsonParser.kt b/app/src/main/java/app/closer/data/questions/QuestionJsonParser.kt similarity index 98% rename from app/src/main/java/com/couplesconnect/app/data/questions/QuestionJsonParser.kt rename to app/src/main/java/app/closer/data/questions/QuestionJsonParser.kt index fd323080..61472fbb 100644 --- a/app/src/main/java/com/couplesconnect/app/data/questions/QuestionJsonParser.kt +++ b/app/src/main/java/app/closer/data/questions/QuestionJsonParser.kt @@ -1,6 +1,6 @@ -package com.couplesconnect.app.data.questions +package app.closer.data.questions -import com.couplesconnect.app.domain.model.* +import app.closer.domain.model.* import org.json.JSONArray import org.json.JSONObject diff --git a/app/src/main/java/com/couplesconnect/app/data/remote/.gitkeep b/app/src/main/java/app/closer/data/remote/.gitkeep similarity index 100% rename from app/src/main/java/com/couplesconnect/app/data/remote/.gitkeep rename to app/src/main/java/app/closer/data/remote/.gitkeep diff --git a/app/src/main/java/com/couplesconnect/app/data/remote/FirebaseAuthDataSource.kt b/app/src/main/java/app/closer/data/remote/FirebaseAuthDataSource.kt similarity index 96% rename from app/src/main/java/com/couplesconnect/app/data/remote/FirebaseAuthDataSource.kt rename to app/src/main/java/app/closer/data/remote/FirebaseAuthDataSource.kt index 82146cc7..54e7fa7a 100644 --- a/app/src/main/java/com/couplesconnect/app/data/remote/FirebaseAuthDataSource.kt +++ b/app/src/main/java/app/closer/data/remote/FirebaseAuthDataSource.kt @@ -1,6 +1,6 @@ -package com.couplesconnect.app.data.remote +package app.closer.data.remote -import com.couplesconnect.app.domain.model.AuthState +import app.closer.domain.model.AuthState import com.google.firebase.auth.FirebaseAuth import kotlinx.coroutines.channels.awaitClose import kotlinx.coroutines.flow.Flow diff --git a/app/src/main/java/com/couplesconnect/app/data/remote/FirestoreCoupleDataSource.kt b/app/src/main/java/app/closer/data/remote/FirestoreCoupleDataSource.kt similarity index 98% rename from app/src/main/java/com/couplesconnect/app/data/remote/FirestoreCoupleDataSource.kt rename to app/src/main/java/app/closer/data/remote/FirestoreCoupleDataSource.kt index 62903f7c..bfed2307 100644 --- a/app/src/main/java/com/couplesconnect/app/data/remote/FirestoreCoupleDataSource.kt +++ b/app/src/main/java/app/closer/data/remote/FirestoreCoupleDataSource.kt @@ -1,6 +1,6 @@ -package com.couplesconnect.app.data.remote +package app.closer.data.remote -import com.couplesconnect.app.domain.model.Couple +import app.closer.domain.model.Couple import com.google.firebase.firestore.DocumentSnapshot import com.google.firebase.firestore.FirebaseFirestore import com.google.firebase.firestore.SetOptions diff --git a/app/src/main/java/com/couplesconnect/app/data/remote/FirestoreInviteDataSource.kt b/app/src/main/java/app/closer/data/remote/FirestoreInviteDataSource.kt similarity index 97% rename from app/src/main/java/com/couplesconnect/app/data/remote/FirestoreInviteDataSource.kt rename to app/src/main/java/app/closer/data/remote/FirestoreInviteDataSource.kt index 74954d64..4c3b984d 100644 --- a/app/src/main/java/com/couplesconnect/app/data/remote/FirestoreInviteDataSource.kt +++ b/app/src/main/java/app/closer/data/remote/FirestoreInviteDataSource.kt @@ -1,6 +1,6 @@ -package com.couplesconnect.app.data.remote +package app.closer.data.remote -import com.couplesconnect.app.domain.model.Invite +import app.closer.domain.model.Invite import com.google.firebase.firestore.FirebaseFirestore import com.google.firebase.firestore.SetOptions import kotlinx.coroutines.suspendCancellableCoroutine diff --git a/app/src/main/java/com/couplesconnect/app/data/remote/FirestoreQuestionThreadDataSource.kt b/app/src/main/java/app/closer/data/remote/FirestoreQuestionThreadDataSource.kt similarity index 96% rename from app/src/main/java/com/couplesconnect/app/data/remote/FirestoreQuestionThreadDataSource.kt rename to app/src/main/java/app/closer/data/remote/FirestoreQuestionThreadDataSource.kt index ce1ef183..abf33671 100644 --- a/app/src/main/java/com/couplesconnect/app/data/remote/FirestoreQuestionThreadDataSource.kt +++ b/app/src/main/java/app/closer/data/remote/FirestoreQuestionThreadDataSource.kt @@ -1,10 +1,10 @@ -package com.couplesconnect.app.data.remote +package app.closer.data.remote -import com.couplesconnect.app.domain.model.QuestionAnswer -import com.couplesconnect.app.domain.model.QuestionMessage -import com.couplesconnect.app.domain.model.QuestionReaction -import com.couplesconnect.app.domain.model.QuestionThread -import com.couplesconnect.app.domain.model.QuestionThreadStatus +import app.closer.domain.model.QuestionAnswer +import app.closer.domain.model.QuestionMessage +import app.closer.domain.model.QuestionReaction +import app.closer.domain.model.QuestionThread +import app.closer.domain.model.QuestionThreadStatus import com.google.firebase.firestore.DocumentSnapshot import com.google.firebase.firestore.FieldValue import com.google.firebase.firestore.FirebaseFirestore diff --git a/app/src/main/java/com/couplesconnect/app/data/remote/FirestoreUserDataSource.kt b/app/src/main/java/app/closer/data/remote/FirestoreUserDataSource.kt similarity index 97% rename from app/src/main/java/com/couplesconnect/app/data/remote/FirestoreUserDataSource.kt rename to app/src/main/java/app/closer/data/remote/FirestoreUserDataSource.kt index 158cef3b..b64bdb54 100644 --- a/app/src/main/java/com/couplesconnect/app/data/remote/FirestoreUserDataSource.kt +++ b/app/src/main/java/app/closer/data/remote/FirestoreUserDataSource.kt @@ -1,6 +1,6 @@ -package com.couplesconnect.app.data.remote +package app.closer.data.remote -import com.couplesconnect.app.domain.model.User +import app.closer.domain.model.User import com.google.firebase.firestore.FirebaseFirestore import com.google.firebase.firestore.SetOptions import kotlinx.coroutines.suspendCancellableCoroutine diff --git a/app/src/main/java/com/couplesconnect/app/data/repository/.gitkeep b/app/src/main/java/app/closer/data/repository/.gitkeep similarity index 100% rename from app/src/main/java/com/couplesconnect/app/data/repository/.gitkeep rename to app/src/main/java/app/closer/data/repository/.gitkeep diff --git a/app/src/main/java/com/couplesconnect/app/data/repository/CoupleRepositoryImpl.kt b/app/src/main/java/app/closer/data/repository/CoupleRepositoryImpl.kt similarity index 77% rename from app/src/main/java/com/couplesconnect/app/data/repository/CoupleRepositoryImpl.kt rename to app/src/main/java/app/closer/data/repository/CoupleRepositoryImpl.kt index 5e63d073..de7a6a79 100644 --- a/app/src/main/java/com/couplesconnect/app/data/repository/CoupleRepositoryImpl.kt +++ b/app/src/main/java/app/closer/data/repository/CoupleRepositoryImpl.kt @@ -1,9 +1,9 @@ -package com.couplesconnect.app.data.repository +package app.closer.data.repository -import com.couplesconnect.app.data.remote.FirestoreCoupleDataSource -import com.couplesconnect.app.data.remote.FirestoreUserDataSource -import com.couplesconnect.app.domain.model.Couple -import com.couplesconnect.app.domain.repository.CoupleRepository +import app.closer.data.remote.FirestoreCoupleDataSource +import app.closer.data.remote.FirestoreUserDataSource +import app.closer.domain.model.Couple +import app.closer.domain.repository.CoupleRepository import javax.inject.Inject import javax.inject.Singleton diff --git a/app/src/main/java/com/couplesconnect/app/data/repository/FakeQuestionRepository.kt b/app/src/main/java/app/closer/data/repository/FakeQuestionRepository.kt similarity index 70% rename from app/src/main/java/com/couplesconnect/app/data/repository/FakeQuestionRepository.kt rename to app/src/main/java/app/closer/data/repository/FakeQuestionRepository.kt index 93f61f7e..b8e7a5cf 100644 --- a/app/src/main/java/com/couplesconnect/app/data/repository/FakeQuestionRepository.kt +++ b/app/src/main/java/app/closer/data/repository/FakeQuestionRepository.kt @@ -1,8 +1,8 @@ -package com.couplesconnect.app.data.repository +package app.closer.data.repository -import com.couplesconnect.app.domain.model.Question -import com.couplesconnect.app.domain.model.QuestionCategory -import com.couplesconnect.app.domain.repository.QuestionRepository +import app.closer.domain.model.Question +import app.closer.domain.model.QuestionCategory +import app.closer.domain.repository.QuestionRepository class FakeQuestionRepository : QuestionRepository { override suspend fun getDailyQuestion(): Question? = null diff --git a/app/src/main/java/com/couplesconnect/app/data/repository/FirebaseAuthRepositoryImpl.kt b/app/src/main/java/app/closer/data/repository/FirebaseAuthRepositoryImpl.kt similarity index 84% rename from app/src/main/java/com/couplesconnect/app/data/repository/FirebaseAuthRepositoryImpl.kt rename to app/src/main/java/app/closer/data/repository/FirebaseAuthRepositoryImpl.kt index 8b0e4b07..37fe6389 100644 --- a/app/src/main/java/com/couplesconnect/app/data/repository/FirebaseAuthRepositoryImpl.kt +++ b/app/src/main/java/app/closer/data/repository/FirebaseAuthRepositoryImpl.kt @@ -1,8 +1,8 @@ -package com.couplesconnect.app.data.repository +package app.closer.data.repository -import com.couplesconnect.app.data.remote.FirebaseAuthDataSource -import com.couplesconnect.app.domain.model.AuthState -import com.couplesconnect.app.domain.repository.AuthRepository +import app.closer.data.remote.FirebaseAuthDataSource +import app.closer.domain.model.AuthState +import app.closer.domain.repository.AuthRepository import kotlinx.coroutines.flow.Flow import javax.inject.Inject import javax.inject.Singleton diff --git a/app/src/main/java/com/couplesconnect/app/data/repository/InviteRepositoryImpl.kt b/app/src/main/java/app/closer/data/repository/InviteRepositoryImpl.kt similarity index 76% rename from app/src/main/java/com/couplesconnect/app/data/repository/InviteRepositoryImpl.kt rename to app/src/main/java/app/closer/data/repository/InviteRepositoryImpl.kt index 54522803..14c82825 100644 --- a/app/src/main/java/com/couplesconnect/app/data/repository/InviteRepositoryImpl.kt +++ b/app/src/main/java/app/closer/data/repository/InviteRepositoryImpl.kt @@ -1,8 +1,8 @@ -package com.couplesconnect.app.data.repository +package app.closer.data.repository -import com.couplesconnect.app.data.remote.FirestoreInviteDataSource -import com.couplesconnect.app.domain.model.Invite -import com.couplesconnect.app.domain.repository.InviteRepository +import app.closer.data.remote.FirestoreInviteDataSource +import app.closer.domain.model.Invite +import app.closer.domain.repository.InviteRepository import javax.inject.Inject import javax.inject.Singleton diff --git a/app/src/main/java/com/couplesconnect/app/data/repository/QuestionSessionRepositoryImpl.kt b/app/src/main/java/app/closer/data/repository/QuestionSessionRepositoryImpl.kt similarity index 93% rename from app/src/main/java/com/couplesconnect/app/data/repository/QuestionSessionRepositoryImpl.kt rename to app/src/main/java/app/closer/data/repository/QuestionSessionRepositoryImpl.kt index 270c3bc0..79edeff7 100644 --- a/app/src/main/java/com/couplesconnect/app/data/repository/QuestionSessionRepositoryImpl.kt +++ b/app/src/main/java/app/closer/data/repository/QuestionSessionRepositoryImpl.kt @@ -1,7 +1,7 @@ -package com.couplesconnect.app.data.repository +package app.closer.data.repository -import com.couplesconnect.app.domain.model.QuestionSession -import com.couplesconnect.app.domain.repository.QuestionSessionRepository +import app.closer.domain.model.QuestionSession +import app.closer.domain.repository.QuestionSessionRepository import com.google.firebase.firestore.FirebaseFirestore import kotlinx.coroutines.tasks.await import javax.inject.Inject diff --git a/app/src/main/java/com/couplesconnect/app/data/repository/QuestionThreadRepositoryImpl.kt b/app/src/main/java/app/closer/data/repository/QuestionThreadRepositoryImpl.kt similarity index 80% rename from app/src/main/java/com/couplesconnect/app/data/repository/QuestionThreadRepositoryImpl.kt rename to app/src/main/java/app/closer/data/repository/QuestionThreadRepositoryImpl.kt index 82dce628..f1b7eb2b 100644 --- a/app/src/main/java/com/couplesconnect/app/data/repository/QuestionThreadRepositoryImpl.kt +++ b/app/src/main/java/app/closer/data/repository/QuestionThreadRepositoryImpl.kt @@ -1,13 +1,13 @@ -package com.couplesconnect.app.data.repository +package app.closer.data.repository -import com.couplesconnect.app.data.remote.FirestoreQuestionThreadDataSource -import com.couplesconnect.app.domain.model.QuestionAnswer -import com.couplesconnect.app.domain.model.QuestionMessage -import com.couplesconnect.app.domain.model.QuestionReaction -import com.couplesconnect.app.domain.model.QuestionThread -import com.couplesconnect.app.domain.model.QuestionThreadStatus -import com.couplesconnect.app.domain.repository.CoupleRepository -import com.couplesconnect.app.domain.repository.QuestionThreadRepository +import app.closer.data.remote.FirestoreQuestionThreadDataSource +import app.closer.domain.model.QuestionAnswer +import app.closer.domain.model.QuestionMessage +import app.closer.domain.model.QuestionReaction +import app.closer.domain.model.QuestionThread +import app.closer.domain.model.QuestionThreadStatus +import app.closer.domain.repository.CoupleRepository +import app.closer.domain.repository.QuestionThreadRepository import kotlinx.coroutines.flow.Flow import javax.inject.Inject import javax.inject.Singleton diff --git a/app/src/main/java/com/couplesconnect/app/data/repository/RoomQuestionRepository.kt b/app/src/main/java/app/closer/data/repository/RoomQuestionRepository.kt similarity index 70% rename from app/src/main/java/com/couplesconnect/app/data/repository/RoomQuestionRepository.kt rename to app/src/main/java/app/closer/data/repository/RoomQuestionRepository.kt index 36847012..97519a9b 100644 --- a/app/src/main/java/com/couplesconnect/app/data/repository/RoomQuestionRepository.kt +++ b/app/src/main/java/app/closer/data/repository/RoomQuestionRepository.kt @@ -1,12 +1,12 @@ -package com.couplesconnect.app.data.repository +package app.closer.data.repository -import com.couplesconnect.app.data.local.CategoryDao -import com.couplesconnect.app.data.local.QuestionDao -import com.couplesconnect.app.data.local.mapper.toQuestion -import com.couplesconnect.app.data.local.mapper.toQuestionCategory -import com.couplesconnect.app.domain.model.Question -import com.couplesconnect.app.domain.model.QuestionCategory -import com.couplesconnect.app.domain.repository.QuestionRepository +import app.closer.data.local.CategoryDao +import app.closer.data.local.QuestionDao +import app.closer.data.local.mapper.toQuestion +import app.closer.data.local.mapper.toQuestionCategory +import app.closer.domain.model.Question +import app.closer.domain.model.QuestionCategory +import app.closer.domain.repository.QuestionRepository import javax.inject.Inject import javax.inject.Singleton diff --git a/app/src/main/java/com/couplesconnect/app/data/repository/SharedPreferencesLocalAnswerRepository.kt b/app/src/main/java/app/closer/data/repository/SharedPreferencesLocalAnswerRepository.kt similarity index 96% rename from app/src/main/java/com/couplesconnect/app/data/repository/SharedPreferencesLocalAnswerRepository.kt rename to app/src/main/java/app/closer/data/repository/SharedPreferencesLocalAnswerRepository.kt index f34b0b56..74b75ad8 100644 --- a/app/src/main/java/com/couplesconnect/app/data/repository/SharedPreferencesLocalAnswerRepository.kt +++ b/app/src/main/java/app/closer/data/repository/SharedPreferencesLocalAnswerRepository.kt @@ -1,8 +1,8 @@ -package com.couplesconnect.app.data.repository +package app.closer.data.repository import android.content.Context -import com.couplesconnect.app.domain.model.LocalAnswer -import com.couplesconnect.app.domain.repository.LocalAnswerRepository +import app.closer.domain.model.LocalAnswer +import app.closer.domain.repository.LocalAnswerRepository import dagger.hilt.android.qualifiers.ApplicationContext import javax.inject.Inject import javax.inject.Singleton diff --git a/app/src/main/java/com/couplesconnect/app/data/repository/UserRepositoryImpl.kt b/app/src/main/java/app/closer/data/repository/UserRepositoryImpl.kt similarity index 79% rename from app/src/main/java/com/couplesconnect/app/data/repository/UserRepositoryImpl.kt rename to app/src/main/java/app/closer/data/repository/UserRepositoryImpl.kt index 49ff1cb3..9554376a 100644 --- a/app/src/main/java/com/couplesconnect/app/data/repository/UserRepositoryImpl.kt +++ b/app/src/main/java/app/closer/data/repository/UserRepositoryImpl.kt @@ -1,8 +1,8 @@ -package com.couplesconnect.app.data.repository +package app.closer.data.repository -import com.couplesconnect.app.data.remote.FirestoreUserDataSource -import com.couplesconnect.app.domain.model.User -import com.couplesconnect.app.domain.repository.UserRepository +import app.closer.data.remote.FirestoreUserDataSource +import app.closer.domain.model.User +import app.closer.domain.repository.UserRepository import javax.inject.Inject import javax.inject.Singleton diff --git a/app/src/main/java/com/couplesconnect/app/di/DatabaseModule.kt b/app/src/main/java/app/closer/di/DatabaseModule.kt similarity index 94% rename from app/src/main/java/com/couplesconnect/app/di/DatabaseModule.kt rename to app/src/main/java/app/closer/di/DatabaseModule.kt index edf00deb..34d12cfe 100644 --- a/app/src/main/java/com/couplesconnect/app/di/DatabaseModule.kt +++ b/app/src/main/java/app/closer/di/DatabaseModule.kt @@ -1,4 +1,4 @@ -package com.couplesconnect.app.di +package app.closer.di import android.content.Context import androidx.datastore.core.DataStore @@ -6,7 +6,7 @@ import androidx.datastore.preferences.core.Preferences import androidx.datastore.preferences.preferencesDataStoreFile import androidx.datastore.preferences.core.PreferenceDataStoreFactory import androidx.room.Room -import com.couplesconnect.app.data.local.AppDatabase +import app.closer.data.local.AppDatabase import com.google.firebase.firestore.FirebaseFirestore import dagger.Module import dagger.Provides diff --git a/app/src/main/java/com/couplesconnect/app/di/ObservabilityModule.kt b/app/src/main/java/app/closer/di/ObservabilityModule.kt similarity index 74% rename from app/src/main/java/com/couplesconnect/app/di/ObservabilityModule.kt rename to app/src/main/java/app/closer/di/ObservabilityModule.kt index a06a98d4..3558f141 100644 --- a/app/src/main/java/com/couplesconnect/app/di/ObservabilityModule.kt +++ b/app/src/main/java/app/closer/di/ObservabilityModule.kt @@ -1,10 +1,10 @@ -package com.couplesconnect.app.di +package app.closer.di import android.content.Context -import com.couplesconnect.app.core.analytics.AnalyticsTracker -import com.couplesconnect.app.core.analytics.FirebaseAnalyticsTracker -import com.couplesconnect.app.core.crash.CrashReporter -import com.couplesconnect.app.core.crash.FirebaseCrashReporter +import app.closer.core.analytics.AnalyticsTracker +import app.closer.core.analytics.FirebaseAnalyticsTracker +import app.closer.core.crash.CrashReporter +import app.closer.core.crash.FirebaseCrashReporter import com.google.firebase.analytics.FirebaseAnalytics import dagger.Binds import dagger.Module diff --git a/app/src/main/java/com/couplesconnect/app/di/RepositoryModule.kt b/app/src/main/java/app/closer/di/RepositoryModule.kt similarity index 50% rename from app/src/main/java/com/couplesconnect/app/di/RepositoryModule.kt rename to app/src/main/java/app/closer/di/RepositoryModule.kt index 83240531..c1b32297 100644 --- a/app/src/main/java/com/couplesconnect/app/di/RepositoryModule.kt +++ b/app/src/main/java/app/closer/di/RepositoryModule.kt @@ -1,25 +1,25 @@ -package com.couplesconnect.app.di +package app.closer.di -import com.couplesconnect.app.core.billing.EntitlementChecker -import com.couplesconnect.app.core.billing.FakeEntitlementChecker -import com.couplesconnect.app.data.local.SettingsDataStore -import com.couplesconnect.app.data.repository.CoupleRepositoryImpl -import com.couplesconnect.app.data.repository.QuestionSessionRepositoryImpl -import com.couplesconnect.app.data.repository.FirebaseAuthRepositoryImpl -import com.couplesconnect.app.data.repository.InviteRepositoryImpl -import com.couplesconnect.app.data.repository.SharedPreferencesLocalAnswerRepository -import com.couplesconnect.app.data.repository.RoomQuestionRepository -import com.couplesconnect.app.data.repository.QuestionThreadRepositoryImpl -import com.couplesconnect.app.data.repository.UserRepositoryImpl -import com.couplesconnect.app.domain.repository.AuthRepository -import com.couplesconnect.app.domain.repository.CoupleRepository -import com.couplesconnect.app.domain.repository.QuestionSessionRepository -import com.couplesconnect.app.domain.repository.InviteRepository -import com.couplesconnect.app.domain.repository.LocalAnswerRepository -import com.couplesconnect.app.domain.repository.QuestionRepository -import com.couplesconnect.app.domain.repository.QuestionThreadRepository -import com.couplesconnect.app.domain.repository.SettingsRepository -import com.couplesconnect.app.domain.repository.UserRepository +import app.closer.core.billing.EntitlementChecker +import app.closer.core.billing.FakeEntitlementChecker +import app.closer.data.local.SettingsDataStore +import app.closer.data.repository.CoupleRepositoryImpl +import app.closer.data.repository.QuestionSessionRepositoryImpl +import app.closer.data.repository.FirebaseAuthRepositoryImpl +import app.closer.data.repository.InviteRepositoryImpl +import app.closer.data.repository.SharedPreferencesLocalAnswerRepository +import app.closer.data.repository.RoomQuestionRepository +import app.closer.data.repository.QuestionThreadRepositoryImpl +import app.closer.data.repository.UserRepositoryImpl +import app.closer.domain.repository.AuthRepository +import app.closer.domain.repository.CoupleRepository +import app.closer.domain.repository.QuestionSessionRepository +import app.closer.domain.repository.InviteRepository +import app.closer.domain.repository.LocalAnswerRepository +import app.closer.domain.repository.QuestionRepository +import app.closer.domain.repository.QuestionThreadRepository +import app.closer.domain.repository.SettingsRepository +import app.closer.domain.repository.UserRepository import dagger.Binds import dagger.Module import dagger.hilt.InstallIn diff --git a/app/src/main/java/com/couplesconnect/app/domain/model/Answer.kt b/app/src/main/java/app/closer/domain/model/Answer.kt similarity index 85% rename from app/src/main/java/com/couplesconnect/app/domain/model/Answer.kt rename to app/src/main/java/app/closer/domain/model/Answer.kt index bf0dbb57..b5e57726 100644 --- a/app/src/main/java/com/couplesconnect/app/domain/model/Answer.kt +++ b/app/src/main/java/app/closer/domain/model/Answer.kt @@ -1,4 +1,4 @@ -package com.couplesconnect.app.domain.model +package app.closer.domain.model data class Answer( val id: String = "", diff --git a/app/src/main/java/com/couplesconnect/app/domain/model/AuthState.kt b/app/src/main/java/app/closer/domain/model/AuthState.kt similarity index 81% rename from app/src/main/java/com/couplesconnect/app/domain/model/AuthState.kt rename to app/src/main/java/app/closer/domain/model/AuthState.kt index e924f2ff..130f4f46 100644 --- a/app/src/main/java/com/couplesconnect/app/domain/model/AuthState.kt +++ b/app/src/main/java/app/closer/domain/model/AuthState.kt @@ -1,4 +1,4 @@ -package com.couplesconnect.app.domain.model +package app.closer.domain.model sealed class AuthState { object Loading : AuthState() diff --git a/app/src/main/java/com/couplesconnect/app/domain/model/Couple.kt b/app/src/main/java/app/closer/domain/model/Couple.kt similarity index 88% rename from app/src/main/java/com/couplesconnect/app/domain/model/Couple.kt rename to app/src/main/java/app/closer/domain/model/Couple.kt index 264a924b..49af7d94 100644 --- a/app/src/main/java/com/couplesconnect/app/domain/model/Couple.kt +++ b/app/src/main/java/app/closer/domain/model/Couple.kt @@ -1,4 +1,4 @@ -package com.couplesconnect.app.domain.model +package app.closer.domain.model data class Couple( val id: String = "", diff --git a/app/src/main/java/com/couplesconnect/app/domain/model/Entitlement.kt b/app/src/main/java/app/closer/domain/model/Entitlement.kt similarity index 85% rename from app/src/main/java/com/couplesconnect/app/domain/model/Entitlement.kt rename to app/src/main/java/app/closer/domain/model/Entitlement.kt index 78740330..bee2685b 100644 --- a/app/src/main/java/com/couplesconnect/app/domain/model/Entitlement.kt +++ b/app/src/main/java/app/closer/domain/model/Entitlement.kt @@ -1,4 +1,4 @@ -package com.couplesconnect.app.domain.model +package app.closer.domain.model data class Entitlement( val id: String = "", diff --git a/app/src/main/java/com/couplesconnect/app/domain/model/Invite.kt b/app/src/main/java/app/closer/domain/model/Invite.kt similarity index 90% rename from app/src/main/java/com/couplesconnect/app/domain/model/Invite.kt rename to app/src/main/java/app/closer/domain/model/Invite.kt index fcf33c02..dd4af3cc 100644 --- a/app/src/main/java/com/couplesconnect/app/domain/model/Invite.kt +++ b/app/src/main/java/app/closer/domain/model/Invite.kt @@ -1,4 +1,4 @@ -package com.couplesconnect.app.domain.model +package app.closer.domain.model data class Invite( val id: String = "", diff --git a/app/src/main/java/com/couplesconnect/app/domain/model/InviteStatus.kt b/app/src/main/java/app/closer/domain/model/InviteStatus.kt similarity index 65% rename from app/src/main/java/com/couplesconnect/app/domain/model/InviteStatus.kt rename to app/src/main/java/app/closer/domain/model/InviteStatus.kt index 79737500..72db2278 100644 --- a/app/src/main/java/com/couplesconnect/app/domain/model/InviteStatus.kt +++ b/app/src/main/java/app/closer/domain/model/InviteStatus.kt @@ -1,4 +1,4 @@ -package com.couplesconnect.app.domain.model +package app.closer.domain.model enum class InviteStatus { PENDING, diff --git a/app/src/main/java/com/couplesconnect/app/domain/model/LocalAnswer.kt b/app/src/main/java/app/closer/domain/model/LocalAnswer.kt similarity index 91% rename from app/src/main/java/com/couplesconnect/app/domain/model/LocalAnswer.kt rename to app/src/main/java/app/closer/domain/model/LocalAnswer.kt index f70380d6..51b7bc39 100644 --- a/app/src/main/java/com/couplesconnect/app/domain/model/LocalAnswer.kt +++ b/app/src/main/java/app/closer/domain/model/LocalAnswer.kt @@ -1,4 +1,4 @@ -package com.couplesconnect.app.domain.model +package app.closer.domain.model data class LocalAnswer( val questionId: String, diff --git a/app/src/main/java/com/couplesconnect/app/domain/model/Question.kt b/app/src/main/java/app/closer/domain/model/Question.kt similarity index 97% rename from app/src/main/java/com/couplesconnect/app/domain/model/Question.kt rename to app/src/main/java/app/closer/domain/model/Question.kt index 09e752b7..3c89f554 100644 --- a/app/src/main/java/com/couplesconnect/app/domain/model/Question.kt +++ b/app/src/main/java/app/closer/domain/model/Question.kt @@ -1,4 +1,4 @@ -package com.couplesconnect.app.domain.model +package app.closer.domain.model // Answer config for different question types data class WrittenAnswerConfig( diff --git a/app/src/main/java/com/couplesconnect/app/domain/model/QuestionAnswer.kt b/app/src/main/java/app/closer/domain/model/QuestionAnswer.kt similarity index 87% rename from app/src/main/java/com/couplesconnect/app/domain/model/QuestionAnswer.kt rename to app/src/main/java/app/closer/domain/model/QuestionAnswer.kt index 39505319..a7e9251f 100644 --- a/app/src/main/java/com/couplesconnect/app/domain/model/QuestionAnswer.kt +++ b/app/src/main/java/app/closer/domain/model/QuestionAnswer.kt @@ -1,4 +1,4 @@ -package com.couplesconnect.app.domain.model +package app.closer.domain.model data class QuestionAnswer( val userId: String = "", diff --git a/app/src/main/java/com/couplesconnect/app/domain/model/QuestionCategory.kt b/app/src/main/java/app/closer/domain/model/QuestionCategory.kt similarity index 83% rename from app/src/main/java/com/couplesconnect/app/domain/model/QuestionCategory.kt rename to app/src/main/java/app/closer/domain/model/QuestionCategory.kt index 9b2801e4..0ab90d04 100644 --- a/app/src/main/java/com/couplesconnect/app/domain/model/QuestionCategory.kt +++ b/app/src/main/java/app/closer/domain/model/QuestionCategory.kt @@ -1,4 +1,4 @@ -package com.couplesconnect.app.domain.model +package app.closer.domain.model data class QuestionCategory( val id: String = "", diff --git a/app/src/main/java/com/couplesconnect/app/domain/model/QuestionMessage.kt b/app/src/main/java/app/closer/domain/model/QuestionMessage.kt similarity index 76% rename from app/src/main/java/com/couplesconnect/app/domain/model/QuestionMessage.kt rename to app/src/main/java/app/closer/domain/model/QuestionMessage.kt index e7fe7e57..12eb935d 100644 --- a/app/src/main/java/com/couplesconnect/app/domain/model/QuestionMessage.kt +++ b/app/src/main/java/app/closer/domain/model/QuestionMessage.kt @@ -1,4 +1,4 @@ -package com.couplesconnect.app.domain.model +package app.closer.domain.model data class QuestionMessage( val id: String = "", diff --git a/app/src/main/java/com/couplesconnect/app/domain/model/QuestionPack.kt b/app/src/main/java/app/closer/domain/model/QuestionPack.kt similarity index 84% rename from app/src/main/java/com/couplesconnect/app/domain/model/QuestionPack.kt rename to app/src/main/java/app/closer/domain/model/QuestionPack.kt index 306929cf..f9850bf0 100644 --- a/app/src/main/java/com/couplesconnect/app/domain/model/QuestionPack.kt +++ b/app/src/main/java/app/closer/domain/model/QuestionPack.kt @@ -1,4 +1,4 @@ -package com.couplesconnect.app.domain.model +package app.closer.domain.model data class QuestionPack( val id: String = "", diff --git a/app/src/main/java/com/couplesconnect/app/domain/model/QuestionReaction.kt b/app/src/main/java/app/closer/domain/model/QuestionReaction.kt similarity index 80% rename from app/src/main/java/com/couplesconnect/app/domain/model/QuestionReaction.kt rename to app/src/main/java/app/closer/domain/model/QuestionReaction.kt index 7c97aeb3..16d8e287 100644 --- a/app/src/main/java/com/couplesconnect/app/domain/model/QuestionReaction.kt +++ b/app/src/main/java/app/closer/domain/model/QuestionReaction.kt @@ -1,4 +1,4 @@ -package com.couplesconnect.app.domain.model +package app.closer.domain.model data class QuestionReaction( val id: String = "", diff --git a/app/src/main/java/com/couplesconnect/app/domain/model/QuestionSession.kt b/app/src/main/java/app/closer/domain/model/QuestionSession.kt similarity index 89% rename from app/src/main/java/com/couplesconnect/app/domain/model/QuestionSession.kt rename to app/src/main/java/app/closer/domain/model/QuestionSession.kt index 6ac852f2..03f17add 100644 --- a/app/src/main/java/com/couplesconnect/app/domain/model/QuestionSession.kt +++ b/app/src/main/java/app/closer/domain/model/QuestionSession.kt @@ -1,4 +1,4 @@ -package com.couplesconnect.app.domain.model +package app.closer.domain.model data class QuestionSession( val id: String = "", diff --git a/app/src/main/java/com/couplesconnect/app/domain/model/QuestionSessionStatus.kt b/app/src/main/java/app/closer/domain/model/QuestionSessionStatus.kt similarity index 59% rename from app/src/main/java/com/couplesconnect/app/domain/model/QuestionSessionStatus.kt rename to app/src/main/java/app/closer/domain/model/QuestionSessionStatus.kt index 3c9ed145..63e95a84 100644 --- a/app/src/main/java/com/couplesconnect/app/domain/model/QuestionSessionStatus.kt +++ b/app/src/main/java/app/closer/domain/model/QuestionSessionStatus.kt @@ -1,4 +1,4 @@ -package com.couplesconnect.app.domain.model +package app.closer.domain.model enum class QuestionSessionStatus { ACTIVE, diff --git a/app/src/main/java/com/couplesconnect/app/domain/model/QuestionThread.kt b/app/src/main/java/app/closer/domain/model/QuestionThread.kt similarity index 94% rename from app/src/main/java/com/couplesconnect/app/domain/model/QuestionThread.kt rename to app/src/main/java/app/closer/domain/model/QuestionThread.kt index c3ca0a0c..83195a7e 100644 --- a/app/src/main/java/com/couplesconnect/app/domain/model/QuestionThread.kt +++ b/app/src/main/java/app/closer/domain/model/QuestionThread.kt @@ -1,4 +1,4 @@ -package com.couplesconnect.app.domain.model +package app.closer.domain.model data class QuestionThread( val id: String = "", diff --git a/app/src/main/java/com/couplesconnect/app/domain/model/User.kt b/app/src/main/java/app/closer/domain/model/User.kt similarity index 88% rename from app/src/main/java/com/couplesconnect/app/domain/model/User.kt rename to app/src/main/java/app/closer/domain/model/User.kt index 50f13390..caa676f5 100644 --- a/app/src/main/java/com/couplesconnect/app/domain/model/User.kt +++ b/app/src/main/java/app/closer/domain/model/User.kt @@ -1,4 +1,4 @@ -package com.couplesconnect.app.domain.model +package app.closer.domain.model data class User( val id: String = "", diff --git a/app/src/main/java/com/couplesconnect/app/domain/repository/.gitkeep b/app/src/main/java/app/closer/domain/repository/.gitkeep similarity index 100% rename from app/src/main/java/com/couplesconnect/app/domain/repository/.gitkeep rename to app/src/main/java/app/closer/domain/repository/.gitkeep diff --git a/app/src/main/java/com/couplesconnect/app/domain/repository/AuthRepository.kt b/app/src/main/java/app/closer/domain/repository/AuthRepository.kt similarity index 84% rename from app/src/main/java/com/couplesconnect/app/domain/repository/AuthRepository.kt rename to app/src/main/java/app/closer/domain/repository/AuthRepository.kt index 280cb3ca..b07c8563 100644 --- a/app/src/main/java/com/couplesconnect/app/domain/repository/AuthRepository.kt +++ b/app/src/main/java/app/closer/domain/repository/AuthRepository.kt @@ -1,6 +1,6 @@ -package com.couplesconnect.app.domain.repository +package app.closer.domain.repository -import com.couplesconnect.app.domain.model.AuthState +import app.closer.domain.model.AuthState import kotlinx.coroutines.flow.Flow interface AuthRepository { diff --git a/app/src/main/java/com/couplesconnect/app/domain/repository/CoupleRepository.kt b/app/src/main/java/app/closer/domain/repository/CoupleRepository.kt similarity index 76% rename from app/src/main/java/com/couplesconnect/app/domain/repository/CoupleRepository.kt rename to app/src/main/java/app/closer/domain/repository/CoupleRepository.kt index 5b55ac2e..1e55915f 100644 --- a/app/src/main/java/com/couplesconnect/app/domain/repository/CoupleRepository.kt +++ b/app/src/main/java/app/closer/domain/repository/CoupleRepository.kt @@ -1,6 +1,6 @@ -package com.couplesconnect.app.domain.repository +package app.closer.domain.repository -import com.couplesconnect.app.domain.model.Couple +import app.closer.domain.model.Couple interface CoupleRepository { suspend fun getCoupleForUser(userId: String): Couple? diff --git a/app/src/main/java/com/couplesconnect/app/domain/repository/InviteRepository.kt b/app/src/main/java/app/closer/domain/repository/InviteRepository.kt similarity index 72% rename from app/src/main/java/com/couplesconnect/app/domain/repository/InviteRepository.kt rename to app/src/main/java/app/closer/domain/repository/InviteRepository.kt index 396a992c..90a65e5d 100644 --- a/app/src/main/java/com/couplesconnect/app/domain/repository/InviteRepository.kt +++ b/app/src/main/java/app/closer/domain/repository/InviteRepository.kt @@ -1,6 +1,6 @@ -package com.couplesconnect.app.domain.repository +package app.closer.domain.repository -import com.couplesconnect.app.domain.model.Invite +import app.closer.domain.model.Invite interface InviteRepository { suspend fun createInvite(inviterUserId: String): Result diff --git a/app/src/main/java/com/couplesconnect/app/domain/repository/LocalAnswerRepository.kt b/app/src/main/java/app/closer/domain/repository/LocalAnswerRepository.kt similarity index 79% rename from app/src/main/java/com/couplesconnect/app/domain/repository/LocalAnswerRepository.kt rename to app/src/main/java/app/closer/domain/repository/LocalAnswerRepository.kt index c5a8714b..6472b0f9 100644 --- a/app/src/main/java/com/couplesconnect/app/domain/repository/LocalAnswerRepository.kt +++ b/app/src/main/java/app/closer/domain/repository/LocalAnswerRepository.kt @@ -1,6 +1,6 @@ -package com.couplesconnect.app.domain.repository +package app.closer.domain.repository -import com.couplesconnect.app.domain.model.LocalAnswer +import app.closer.domain.model.LocalAnswer import kotlinx.coroutines.flow.Flow interface LocalAnswerRepository { diff --git a/app/src/main/java/com/couplesconnect/app/domain/repository/QuestionRepository.kt b/app/src/main/java/app/closer/domain/repository/QuestionRepository.kt similarity index 71% rename from app/src/main/java/com/couplesconnect/app/domain/repository/QuestionRepository.kt rename to app/src/main/java/app/closer/domain/repository/QuestionRepository.kt index db0033b3..9ec840cc 100644 --- a/app/src/main/java/com/couplesconnect/app/domain/repository/QuestionRepository.kt +++ b/app/src/main/java/app/closer/domain/repository/QuestionRepository.kt @@ -1,7 +1,7 @@ -package com.couplesconnect.app.domain.repository +package app.closer.domain.repository -import com.couplesconnect.app.domain.model.Question -import com.couplesconnect.app.domain.model.QuestionCategory +import app.closer.domain.model.Question +import app.closer.domain.model.QuestionCategory interface QuestionRepository { suspend fun getDailyQuestion(): Question? diff --git a/app/src/main/java/com/couplesconnect/app/domain/repository/QuestionSessionRepository.kt b/app/src/main/java/app/closer/domain/repository/QuestionSessionRepository.kt similarity index 64% rename from app/src/main/java/com/couplesconnect/app/domain/repository/QuestionSessionRepository.kt rename to app/src/main/java/app/closer/domain/repository/QuestionSessionRepository.kt index 4df77747..f6fc56ba 100644 --- a/app/src/main/java/com/couplesconnect/app/domain/repository/QuestionSessionRepository.kt +++ b/app/src/main/java/app/closer/domain/repository/QuestionSessionRepository.kt @@ -1,6 +1,6 @@ -package com.couplesconnect.app.domain.repository +package app.closer.domain.repository -import com.couplesconnect.app.domain.model.QuestionSession +import app.closer.domain.model.QuestionSession interface QuestionSessionRepository { suspend fun saveSession(session: QuestionSession): Result diff --git a/app/src/main/java/com/couplesconnect/app/domain/repository/QuestionThreadRepository.kt b/app/src/main/java/app/closer/domain/repository/QuestionThreadRepository.kt similarity index 74% rename from app/src/main/java/com/couplesconnect/app/domain/repository/QuestionThreadRepository.kt rename to app/src/main/java/app/closer/domain/repository/QuestionThreadRepository.kt index 2b6dc32c..967b133a 100644 --- a/app/src/main/java/com/couplesconnect/app/domain/repository/QuestionThreadRepository.kt +++ b/app/src/main/java/app/closer/domain/repository/QuestionThreadRepository.kt @@ -1,9 +1,9 @@ -package com.couplesconnect.app.domain.repository +package app.closer.domain.repository -import com.couplesconnect.app.domain.model.QuestionAnswer -import com.couplesconnect.app.domain.model.QuestionMessage -import com.couplesconnect.app.domain.model.QuestionReaction -import com.couplesconnect.app.domain.model.QuestionThread +import app.closer.domain.model.QuestionAnswer +import app.closer.domain.model.QuestionMessage +import app.closer.domain.model.QuestionReaction +import app.closer.domain.model.QuestionThread import kotlinx.coroutines.flow.Flow interface QuestionThreadRepository { diff --git a/app/src/main/java/com/couplesconnect/app/domain/repository/SettingsRepository.kt b/app/src/main/java/app/closer/domain/repository/SettingsRepository.kt similarity index 92% rename from app/src/main/java/com/couplesconnect/app/domain/repository/SettingsRepository.kt rename to app/src/main/java/app/closer/domain/repository/SettingsRepository.kt index 6aba184c..7efba785 100644 --- a/app/src/main/java/com/couplesconnect/app/domain/repository/SettingsRepository.kt +++ b/app/src/main/java/app/closer/domain/repository/SettingsRepository.kt @@ -1,4 +1,4 @@ -package com.couplesconnect.app.domain.repository +package app.closer.domain.repository import kotlinx.coroutines.flow.Flow diff --git a/app/src/main/java/com/couplesconnect/app/domain/repository/UserRepository.kt b/app/src/main/java/app/closer/domain/repository/UserRepository.kt similarity index 79% rename from app/src/main/java/com/couplesconnect/app/domain/repository/UserRepository.kt rename to app/src/main/java/app/closer/domain/repository/UserRepository.kt index 6b0a9379..e7f25bdb 100644 --- a/app/src/main/java/com/couplesconnect/app/domain/repository/UserRepository.kt +++ b/app/src/main/java/app/closer/domain/repository/UserRepository.kt @@ -1,6 +1,6 @@ -package com.couplesconnect.app.domain.repository +package app.closer.domain.repository -import com.couplesconnect.app.domain.model.User +import app.closer.domain.model.User interface UserRepository { suspend fun getUser(uid: String): User? diff --git a/app/src/main/java/com/couplesconnect/app/domain/usecase/.gitkeep b/app/src/main/java/app/closer/domain/usecase/.gitkeep similarity index 100% rename from app/src/main/java/com/couplesconnect/app/domain/usecase/.gitkeep rename to app/src/main/java/app/closer/domain/usecase/.gitkeep diff --git a/app/src/main/java/com/couplesconnect/app/ui/answers/.gitkeep b/app/src/main/java/app/closer/ui/answers/.gitkeep similarity index 100% rename from app/src/main/java/com/couplesconnect/app/ui/answers/.gitkeep rename to app/src/main/java/app/closer/ui/answers/.gitkeep diff --git a/app/src/main/java/com/couplesconnect/app/ui/answers/AnswerHistoryScreen.kt b/app/src/main/java/app/closer/ui/answers/AnswerHistoryScreen.kt similarity index 96% rename from app/src/main/java/com/couplesconnect/app/ui/answers/AnswerHistoryScreen.kt rename to app/src/main/java/app/closer/ui/answers/AnswerHistoryScreen.kt index 73ae264b..74abe845 100644 --- a/app/src/main/java/com/couplesconnect/app/ui/answers/AnswerHistoryScreen.kt +++ b/app/src/main/java/app/closer/ui/answers/AnswerHistoryScreen.kt @@ -1,4 +1,4 @@ -package com.couplesconnect.app.ui.answers +package app.closer.ui.answers import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement @@ -37,10 +37,10 @@ import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import androidx.hilt.navigation.compose.hiltViewModel -import com.couplesconnect.app.core.navigation.AppRoute -import com.couplesconnect.app.domain.model.LocalAnswer -import com.couplesconnect.app.ui.components.EmptyState -import com.couplesconnect.app.ui.questions.displayCategoryName +import app.closer.core.navigation.AppRoute +import app.closer.domain.model.LocalAnswer +import app.closer.ui.components.EmptyState +import app.closer.ui.questions.displayCategoryName @Composable fun AnswerHistoryScreen( diff --git a/app/src/main/java/com/couplesconnect/app/ui/answers/AnswerHistoryViewModel.kt b/app/src/main/java/app/closer/ui/answers/AnswerHistoryViewModel.kt similarity index 87% rename from app/src/main/java/com/couplesconnect/app/ui/answers/AnswerHistoryViewModel.kt rename to app/src/main/java/app/closer/ui/answers/AnswerHistoryViewModel.kt index a89e73f3..9a74d826 100644 --- a/app/src/main/java/com/couplesconnect/app/ui/answers/AnswerHistoryViewModel.kt +++ b/app/src/main/java/app/closer/ui/answers/AnswerHistoryViewModel.kt @@ -1,9 +1,9 @@ -package com.couplesconnect.app.ui.answers +package app.closer.ui.answers import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import com.couplesconnect.app.domain.model.LocalAnswer -import com.couplesconnect.app.domain.repository.LocalAnswerRepository +import app.closer.domain.model.LocalAnswer +import app.closer.domain.repository.LocalAnswerRepository import dagger.hilt.android.lifecycle.HiltViewModel import javax.inject.Inject import kotlinx.coroutines.flow.MutableStateFlow diff --git a/app/src/main/java/com/couplesconnect/app/ui/answers/AnswerRevealScreen.kt b/app/src/main/java/app/closer/ui/answers/AnswerRevealScreen.kt similarity index 97% rename from app/src/main/java/com/couplesconnect/app/ui/answers/AnswerRevealScreen.kt rename to app/src/main/java/app/closer/ui/answers/AnswerRevealScreen.kt index 3a87d30e..9719a86a 100644 --- a/app/src/main/java/com/couplesconnect/app/ui/answers/AnswerRevealScreen.kt +++ b/app/src/main/java/app/closer/ui/answers/AnswerRevealScreen.kt @@ -1,4 +1,4 @@ -package com.couplesconnect.app.ui.answers +package app.closer.ui.answers import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement @@ -34,11 +34,11 @@ import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import androidx.hilt.navigation.compose.hiltViewModel -import com.couplesconnect.app.core.navigation.AppRoute -import com.couplesconnect.app.domain.model.LocalAnswer -import com.couplesconnect.app.domain.model.Question -import com.couplesconnect.app.ui.questions.displayCategoryName -import com.couplesconnect.app.ui.questions.displayQuestionType +import app.closer.core.navigation.AppRoute +import app.closer.domain.model.LocalAnswer +import app.closer.domain.model.Question +import app.closer.ui.questions.displayCategoryName +import app.closer.ui.questions.displayQuestionType @Composable fun AnswerRevealScreen( diff --git a/app/src/main/java/com/couplesconnect/app/ui/answers/AnswerRevealViewModel.kt b/app/src/main/java/app/closer/ui/answers/AnswerRevealViewModel.kt similarity index 88% rename from app/src/main/java/com/couplesconnect/app/ui/answers/AnswerRevealViewModel.kt rename to app/src/main/java/app/closer/ui/answers/AnswerRevealViewModel.kt index fed43f3f..583c0526 100644 --- a/app/src/main/java/com/couplesconnect/app/ui/answers/AnswerRevealViewModel.kt +++ b/app/src/main/java/app/closer/ui/answers/AnswerRevealViewModel.kt @@ -1,12 +1,12 @@ -package com.couplesconnect.app.ui.answers +package app.closer.ui.answers import androidx.lifecycle.SavedStateHandle import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import com.couplesconnect.app.domain.model.LocalAnswer -import com.couplesconnect.app.domain.model.Question -import com.couplesconnect.app.domain.repository.LocalAnswerRepository -import com.couplesconnect.app.domain.repository.QuestionRepository +import app.closer.domain.model.LocalAnswer +import app.closer.domain.model.Question +import app.closer.domain.repository.LocalAnswerRepository +import app.closer.domain.repository.QuestionRepository import dagger.hilt.android.lifecycle.HiltViewModel import javax.inject.Inject import kotlinx.coroutines.flow.MutableStateFlow diff --git a/app/src/main/java/com/couplesconnect/app/ui/auth/.gitkeep b/app/src/main/java/app/closer/ui/auth/.gitkeep similarity index 100% rename from app/src/main/java/com/couplesconnect/app/ui/auth/.gitkeep rename to app/src/main/java/app/closer/ui/auth/.gitkeep diff --git a/app/src/main/java/com/couplesconnect/app/ui/auth/AuthVisuals.kt b/app/src/main/java/app/closer/ui/auth/AuthVisuals.kt similarity index 96% rename from app/src/main/java/com/couplesconnect/app/ui/auth/AuthVisuals.kt rename to app/src/main/java/app/closer/ui/auth/AuthVisuals.kt index fdda354e..1f031c03 100644 --- a/app/src/main/java/com/couplesconnect/app/ui/auth/AuthVisuals.kt +++ b/app/src/main/java/app/closer/ui/auth/AuthVisuals.kt @@ -1,4 +1,4 @@ -package com.couplesconnect.app.ui.auth +package app.closer.ui.auth import androidx.compose.material3.OutlinedTextFieldDefaults import androidx.compose.runtime.Composable diff --git a/app/src/main/java/com/couplesconnect/app/ui/auth/ForgotPasswordScreen.kt b/app/src/main/java/app/closer/ui/auth/ForgotPasswordScreen.kt similarity index 98% rename from app/src/main/java/com/couplesconnect/app/ui/auth/ForgotPasswordScreen.kt rename to app/src/main/java/app/closer/ui/auth/ForgotPasswordScreen.kt index 526bb458..e96fadfd 100644 --- a/app/src/main/java/com/couplesconnect/app/ui/auth/ForgotPasswordScreen.kt +++ b/app/src/main/java/app/closer/ui/auth/ForgotPasswordScreen.kt @@ -1,4 +1,4 @@ -package com.couplesconnect.app.ui.auth +package app.closer.ui.auth import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement @@ -46,7 +46,7 @@ import androidx.compose.ui.text.input.KeyboardType import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import androidx.hilt.navigation.compose.hiltViewModel -import com.couplesconnect.app.core.navigation.AppRoute +import app.closer.core.navigation.AppRoute @OptIn(ExperimentalMaterial3Api::class) @Composable diff --git a/app/src/main/java/com/couplesconnect/app/ui/auth/ForgotPasswordViewModel.kt b/app/src/main/java/app/closer/ui/auth/ForgotPasswordViewModel.kt similarity index 94% rename from app/src/main/java/com/couplesconnect/app/ui/auth/ForgotPasswordViewModel.kt rename to app/src/main/java/app/closer/ui/auth/ForgotPasswordViewModel.kt index b7e88aaa..064e806b 100644 --- a/app/src/main/java/com/couplesconnect/app/ui/auth/ForgotPasswordViewModel.kt +++ b/app/src/main/java/app/closer/ui/auth/ForgotPasswordViewModel.kt @@ -1,8 +1,8 @@ -package com.couplesconnect.app.ui.auth +package app.closer.ui.auth import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import com.couplesconnect.app.domain.repository.AuthRepository +import app.closer.domain.repository.AuthRepository import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow diff --git a/app/src/main/java/com/couplesconnect/app/ui/auth/LoginScreen.kt b/app/src/main/java/app/closer/ui/auth/LoginScreen.kt similarity index 98% rename from app/src/main/java/com/couplesconnect/app/ui/auth/LoginScreen.kt rename to app/src/main/java/app/closer/ui/auth/LoginScreen.kt index e33f3c9f..0af6c15c 100644 --- a/app/src/main/java/com/couplesconnect/app/ui/auth/LoginScreen.kt +++ b/app/src/main/java/app/closer/ui/auth/LoginScreen.kt @@ -1,4 +1,4 @@ -package com.couplesconnect.app.ui.auth +package app.closer.ui.auth import androidx.compose.foundation.background import androidx.compose.foundation.BorderStroke @@ -48,7 +48,7 @@ import androidx.compose.ui.text.input.VisualTransformation import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import androidx.hilt.navigation.compose.hiltViewModel -import com.couplesconnect.app.core.navigation.AppRoute +import app.closer.core.navigation.AppRoute @Composable fun LoginScreen( diff --git a/app/src/main/java/com/couplesconnect/app/ui/auth/LoginViewModel.kt b/app/src/main/java/app/closer/ui/auth/LoginViewModel.kt similarity index 96% rename from app/src/main/java/com/couplesconnect/app/ui/auth/LoginViewModel.kt rename to app/src/main/java/app/closer/ui/auth/LoginViewModel.kt index 080152f3..b4923dd4 100644 --- a/app/src/main/java/com/couplesconnect/app/ui/auth/LoginViewModel.kt +++ b/app/src/main/java/app/closer/ui/auth/LoginViewModel.kt @@ -1,8 +1,8 @@ -package com.couplesconnect.app.ui.auth +package app.closer.ui.auth import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import com.couplesconnect.app.domain.repository.AuthRepository +import app.closer.domain.repository.AuthRepository import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow diff --git a/app/src/main/java/com/couplesconnect/app/ui/auth/SignUpScreen.kt b/app/src/main/java/app/closer/ui/auth/SignUpScreen.kt similarity index 98% rename from app/src/main/java/com/couplesconnect/app/ui/auth/SignUpScreen.kt rename to app/src/main/java/app/closer/ui/auth/SignUpScreen.kt index 72651647..ed8894d8 100644 --- a/app/src/main/java/com/couplesconnect/app/ui/auth/SignUpScreen.kt +++ b/app/src/main/java/app/closer/ui/auth/SignUpScreen.kt @@ -1,4 +1,4 @@ -package com.couplesconnect.app.ui.auth +package app.closer.ui.auth import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement @@ -50,7 +50,7 @@ import androidx.compose.ui.text.input.VisualTransformation import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import androidx.hilt.navigation.compose.hiltViewModel -import com.couplesconnect.app.core.navigation.AppRoute +import app.closer.core.navigation.AppRoute @OptIn(ExperimentalMaterial3Api::class) @Composable diff --git a/app/src/main/java/com/couplesconnect/app/ui/auth/SignUpViewModel.kt b/app/src/main/java/app/closer/ui/auth/SignUpViewModel.kt similarity index 96% rename from app/src/main/java/com/couplesconnect/app/ui/auth/SignUpViewModel.kt rename to app/src/main/java/app/closer/ui/auth/SignUpViewModel.kt index eea798d1..d2d97b6e 100644 --- a/app/src/main/java/com/couplesconnect/app/ui/auth/SignUpViewModel.kt +++ b/app/src/main/java/app/closer/ui/auth/SignUpViewModel.kt @@ -1,8 +1,8 @@ -package com.couplesconnect.app.ui.auth +package app.closer.ui.auth import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import com.couplesconnect.app.domain.repository.AuthRepository +import app.closer.domain.repository.AuthRepository import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow diff --git a/app/src/main/java/com/couplesconnect/app/ui/components/.gitkeep b/app/src/main/java/app/closer/ui/components/.gitkeep similarity index 100% rename from app/src/main/java/com/couplesconnect/app/ui/components/.gitkeep rename to app/src/main/java/app/closer/ui/components/.gitkeep diff --git a/app/src/main/java/com/couplesconnect/app/ui/components/EmptyState.kt b/app/src/main/java/app/closer/ui/components/EmptyState.kt similarity index 97% rename from app/src/main/java/com/couplesconnect/app/ui/components/EmptyState.kt rename to app/src/main/java/app/closer/ui/components/EmptyState.kt index 2732679e..2aac9d45 100644 --- a/app/src/main/java/com/couplesconnect/app/ui/components/EmptyState.kt +++ b/app/src/main/java/app/closer/ui/components/EmptyState.kt @@ -1,4 +1,4 @@ -package com.couplesconnect.app.ui.components +package app.closer.ui.components import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column diff --git a/app/src/main/java/com/couplesconnect/app/ui/components/ErrorState.kt b/app/src/main/java/app/closer/ui/components/ErrorState.kt similarity index 97% rename from app/src/main/java/com/couplesconnect/app/ui/components/ErrorState.kt rename to app/src/main/java/app/closer/ui/components/ErrorState.kt index 10b97930..3e6b7857 100644 --- a/app/src/main/java/com/couplesconnect/app/ui/components/ErrorState.kt +++ b/app/src/main/java/app/closer/ui/components/ErrorState.kt @@ -1,4 +1,4 @@ -package com.couplesconnect.app.ui.components +package app.closer.ui.components import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column diff --git a/app/src/main/java/com/couplesconnect/app/ui/components/LoadingState.kt b/app/src/main/java/app/closer/ui/components/LoadingState.kt similarity index 97% rename from app/src/main/java/com/couplesconnect/app/ui/components/LoadingState.kt rename to app/src/main/java/app/closer/ui/components/LoadingState.kt index 4bb21537..6b66235b 100644 --- a/app/src/main/java/com/couplesconnect/app/ui/components/LoadingState.kt +++ b/app/src/main/java/app/closer/ui/components/LoadingState.kt @@ -1,4 +1,4 @@ -package com.couplesconnect.app.ui.components +package app.closer.ui.components import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column diff --git a/app/src/main/java/com/couplesconnect/app/ui/components/PlaceholderScreen.kt b/app/src/main/java/app/closer/ui/components/PlaceholderScreen.kt similarity index 99% rename from app/src/main/java/com/couplesconnect/app/ui/components/PlaceholderScreen.kt rename to app/src/main/java/app/closer/ui/components/PlaceholderScreen.kt index cc58dc06..efa634e0 100644 --- a/app/src/main/java/com/couplesconnect/app/ui/components/PlaceholderScreen.kt +++ b/app/src/main/java/app/closer/ui/components/PlaceholderScreen.kt @@ -1,4 +1,4 @@ -package com.couplesconnect.app.ui.components +package app.closer.ui.components import androidx.compose.foundation.Canvas import androidx.compose.foundation.background diff --git a/app/src/main/java/com/couplesconnect/app/ui/components/SpecialDatesSection.kt b/app/src/main/java/app/closer/ui/components/SpecialDatesSection.kt similarity index 99% rename from app/src/main/java/com/couplesconnect/app/ui/components/SpecialDatesSection.kt rename to app/src/main/java/app/closer/ui/components/SpecialDatesSection.kt index d48890e2..65f021bd 100644 --- a/app/src/main/java/com/couplesconnect/app/ui/components/SpecialDatesSection.kt +++ b/app/src/main/java/app/closer/ui/components/SpecialDatesSection.kt @@ -1,4 +1,4 @@ -package com.couplesconnect.app.ui.components +package app.closer.ui.components import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement diff --git a/app/src/main/java/com/couplesconnect/app/ui/home/.gitkeep b/app/src/main/java/app/closer/ui/home/.gitkeep similarity index 100% rename from app/src/main/java/com/couplesconnect/app/ui/home/.gitkeep rename to app/src/main/java/app/closer/ui/home/.gitkeep diff --git a/app/src/main/java/com/couplesconnect/app/ui/home/HomeScreen.kt b/app/src/main/java/app/closer/ui/home/HomeScreen.kt similarity index 98% rename from app/src/main/java/com/couplesconnect/app/ui/home/HomeScreen.kt rename to app/src/main/java/app/closer/ui/home/HomeScreen.kt index 1d8be0a0..55e8b85b 100644 --- a/app/src/main/java/com/couplesconnect/app/ui/home/HomeScreen.kt +++ b/app/src/main/java/app/closer/ui/home/HomeScreen.kt @@ -1,4 +1,4 @@ -package com.couplesconnect.app.ui.home +package app.closer.ui.home import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement @@ -40,10 +40,10 @@ import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import androidx.hilt.navigation.compose.hiltViewModel -import com.couplesconnect.app.core.navigation.AppRoute -import com.couplesconnect.app.domain.model.Question -import com.couplesconnect.app.domain.model.QuestionCategory -import com.couplesconnect.app.ui.questions.displayCategoryName +import app.closer.core.navigation.AppRoute +import app.closer.domain.model.Question +import app.closer.domain.model.QuestionCategory +import app.closer.ui.questions.displayCategoryName @Composable fun HomeScreen( diff --git a/app/src/main/java/com/couplesconnect/app/ui/home/HomeViewModel.kt b/app/src/main/java/app/closer/ui/home/HomeViewModel.kt similarity index 94% rename from app/src/main/java/com/couplesconnect/app/ui/home/HomeViewModel.kt rename to app/src/main/java/app/closer/ui/home/HomeViewModel.kt index cc605a6a..808c5534 100644 --- a/app/src/main/java/com/couplesconnect/app/ui/home/HomeViewModel.kt +++ b/app/src/main/java/app/closer/ui/home/HomeViewModel.kt @@ -1,15 +1,15 @@ -package com.couplesconnect.app.ui.home +package app.closer.ui.home import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import com.couplesconnect.app.domain.model.LocalAnswer -import com.couplesconnect.app.domain.model.Question -import com.couplesconnect.app.domain.model.QuestionCategory -import com.couplesconnect.app.domain.repository.AuthRepository -import com.couplesconnect.app.domain.repository.CoupleRepository -import com.couplesconnect.app.domain.repository.LocalAnswerRepository -import com.couplesconnect.app.domain.repository.QuestionRepository -import com.couplesconnect.app.domain.repository.UserRepository +import app.closer.domain.model.LocalAnswer +import app.closer.domain.model.Question +import app.closer.domain.model.QuestionCategory +import app.closer.domain.repository.AuthRepository +import app.closer.domain.repository.CoupleRepository +import app.closer.domain.repository.LocalAnswerRepository +import app.closer.domain.repository.QuestionRepository +import app.closer.domain.repository.UserRepository import dagger.hilt.android.lifecycle.HiltViewModel import javax.inject.Inject import kotlinx.coroutines.flow.MutableStateFlow diff --git a/app/src/main/java/com/couplesconnect/app/ui/home/PartnerHomeScreen.kt b/app/src/main/java/app/closer/ui/home/PartnerHomeScreen.kt similarity index 82% rename from app/src/main/java/com/couplesconnect/app/ui/home/PartnerHomeScreen.kt rename to app/src/main/java/app/closer/ui/home/PartnerHomeScreen.kt index 0600db62..200b6086 100644 --- a/app/src/main/java/com/couplesconnect/app/ui/home/PartnerHomeScreen.kt +++ b/app/src/main/java/app/closer/ui/home/PartnerHomeScreen.kt @@ -1,11 +1,11 @@ -package com.couplesconnect.app.ui.home +package app.closer.ui.home import androidx.compose.runtime.Composable import androidx.compose.ui.graphics.Color import androidx.compose.ui.tooling.preview.Preview -import com.couplesconnect.app.core.navigation.AppRoute -import com.couplesconnect.app.ui.components.PlaceholderAction -import com.couplesconnect.app.ui.components.PlaceholderScreen +import app.closer.core.navigation.AppRoute +import app.closer.ui.components.PlaceholderAction +import app.closer.ui.components.PlaceholderScreen @Composable fun PartnerHomeScreen( diff --git a/app/src/main/java/com/couplesconnect/app/ui/onboarding/.gitkeep b/app/src/main/java/app/closer/ui/onboarding/.gitkeep similarity index 100% rename from app/src/main/java/com/couplesconnect/app/ui/onboarding/.gitkeep rename to app/src/main/java/app/closer/ui/onboarding/.gitkeep diff --git a/app/src/main/java/com/couplesconnect/app/ui/onboarding/CreateProfileScreen.kt b/app/src/main/java/app/closer/ui/onboarding/CreateProfileScreen.kt similarity index 92% rename from app/src/main/java/com/couplesconnect/app/ui/onboarding/CreateProfileScreen.kt rename to app/src/main/java/app/closer/ui/onboarding/CreateProfileScreen.kt index 1d25c81f..d6248e4c 100644 --- a/app/src/main/java/com/couplesconnect/app/ui/onboarding/CreateProfileScreen.kt +++ b/app/src/main/java/app/closer/ui/onboarding/CreateProfileScreen.kt @@ -1,4 +1,4 @@ -package com.couplesconnect.app.ui.onboarding +package app.closer.ui.onboarding import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement @@ -38,13 +38,13 @@ import androidx.compose.ui.text.input.KeyboardType import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import androidx.hilt.navigation.compose.hiltViewModel -import com.couplesconnect.app.core.navigation.AppRoute -import com.couplesconnect.app.ui.auth.AuthBackgroundBrush -import com.couplesconnect.app.ui.auth.AuthInk -import com.couplesconnect.app.ui.auth.AuthMuted -import com.couplesconnect.app.ui.auth.AuthOnPrimary -import com.couplesconnect.app.ui.auth.AuthPrimary -import com.couplesconnect.app.ui.auth.authTextFieldColors +import app.closer.core.navigation.AppRoute +import app.closer.ui.auth.AuthBackgroundBrush +import app.closer.ui.auth.AuthInk +import app.closer.ui.auth.AuthMuted +import app.closer.ui.auth.AuthOnPrimary +import app.closer.ui.auth.AuthPrimary +import app.closer.ui.auth.authTextFieldColors @Composable fun CreateProfileScreen( diff --git a/app/src/main/java/com/couplesconnect/app/ui/onboarding/CreateProfileViewModel.kt b/app/src/main/java/app/closer/ui/onboarding/CreateProfileViewModel.kt similarity index 91% rename from app/src/main/java/com/couplesconnect/app/ui/onboarding/CreateProfileViewModel.kt rename to app/src/main/java/app/closer/ui/onboarding/CreateProfileViewModel.kt index 6e9488eb..6e98dfa7 100644 --- a/app/src/main/java/com/couplesconnect/app/ui/onboarding/CreateProfileViewModel.kt +++ b/app/src/main/java/app/closer/ui/onboarding/CreateProfileViewModel.kt @@ -1,10 +1,10 @@ -package com.couplesconnect.app.ui.onboarding +package app.closer.ui.onboarding import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import com.couplesconnect.app.domain.model.User -import com.couplesconnect.app.domain.repository.AuthRepository -import com.couplesconnect.app.domain.repository.UserRepository +import app.closer.domain.model.User +import app.closer.domain.repository.AuthRepository +import app.closer.domain.repository.UserRepository import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow diff --git a/app/src/main/java/com/couplesconnect/app/ui/onboarding/OnboardingScreen.kt b/app/src/main/java/app/closer/ui/onboarding/OnboardingScreen.kt similarity index 69% rename from app/src/main/java/com/couplesconnect/app/ui/onboarding/OnboardingScreen.kt rename to app/src/main/java/app/closer/ui/onboarding/OnboardingScreen.kt index fe07852b..81817c31 100644 --- a/app/src/main/java/com/couplesconnect/app/ui/onboarding/OnboardingScreen.kt +++ b/app/src/main/java/app/closer/ui/onboarding/OnboardingScreen.kt @@ -1,6 +1,7 @@ -package com.couplesconnect.app.ui.onboarding +package app.closer.ui.onboarding import androidx.compose.foundation.background +import androidx.compose.foundation.Image import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column @@ -11,6 +12,7 @@ import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.safeDrawingPadding import androidx.compose.foundation.layout.size +import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material3.Button import androidx.compose.material3.ButtonDefaults import androidx.compose.material3.CircularProgressIndicator @@ -23,16 +25,22 @@ import androidx.compose.runtime.collectAsState import androidx.compose.runtime.getValue import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.alpha +import androidx.compose.ui.draw.clip +import androidx.compose.ui.draw.shadow +import androidx.compose.ui.layout.ContentScale +import androidx.compose.ui.res.painterResource import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import androidx.hilt.navigation.compose.hiltViewModel -import com.couplesconnect.app.core.navigation.AppRoute -import com.couplesconnect.app.ui.auth.AuthBackgroundBrush -import com.couplesconnect.app.ui.auth.AuthInk -import com.couplesconnect.app.ui.auth.AuthMuted -import com.couplesconnect.app.ui.auth.AuthOnPrimary -import com.couplesconnect.app.ui.auth.AuthPrimary -import com.couplesconnect.app.ui.auth.AuthPrimaryDeep +import app.closer.R +import app.closer.core.navigation.AppRoute +import app.closer.ui.auth.AuthBackgroundBrush +import app.closer.ui.auth.AuthInk +import app.closer.ui.auth.AuthMuted +import app.closer.ui.auth.AuthOnPrimary +import app.closer.ui.auth.AuthPrimary +import app.closer.ui.auth.AuthPrimaryDeep @Composable fun OnboardingScreen( @@ -74,12 +82,32 @@ fun OnboardingScreen( Column(horizontalAlignment = Alignment.CenterHorizontally) { Spacer(Modifier.height(80.dp)) - Text( - text = "♡", - style = MaterialTheme.typography.displayLarge, - color = AuthPrimaryDeep - ) - Spacer(Modifier.height(24.dp)) + Box( + modifier = Modifier + .size(96.dp) + .shadow( + elevation = 14.dp, + shape = RoundedCornerShape(24.dp), + clip = false + ) + .clip(RoundedCornerShape(24.dp)) + ) { + Image( + painter = painterResource(R.drawable.ic_launcher_background), + contentDescription = null, + contentScale = ContentScale.Crop, + modifier = Modifier.matchParentSize() + ) + Image( + painter = painterResource(R.drawable.ic_launcher_foreground), + contentDescription = null, + contentScale = ContentScale.Fit, + modifier = Modifier + .matchParentSize() + .alpha(0.96f) + ) + } + Spacer(Modifier.height(28.dp)) Text( text = "Closer", style = MaterialTheme.typography.displayMedium, diff --git a/app/src/main/java/com/couplesconnect/app/ui/onboarding/OnboardingViewModel.kt b/app/src/main/java/app/closer/ui/onboarding/OnboardingViewModel.kt similarity index 88% rename from app/src/main/java/com/couplesconnect/app/ui/onboarding/OnboardingViewModel.kt rename to app/src/main/java/app/closer/ui/onboarding/OnboardingViewModel.kt index 6af15275..d64816fa 100644 --- a/app/src/main/java/com/couplesconnect/app/ui/onboarding/OnboardingViewModel.kt +++ b/app/src/main/java/app/closer/ui/onboarding/OnboardingViewModel.kt @@ -1,10 +1,10 @@ -package com.couplesconnect.app.ui.onboarding +package app.closer.ui.onboarding import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import com.couplesconnect.app.domain.model.AuthState -import com.couplesconnect.app.domain.repository.AuthRepository -import com.couplesconnect.app.domain.repository.UserRepository +import app.closer.domain.model.AuthState +import app.closer.domain.repository.AuthRepository +import app.closer.domain.repository.UserRepository import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow diff --git a/app/src/main/java/com/couplesconnect/app/ui/pairing/.gitkeep b/app/src/main/java/app/closer/ui/pairing/.gitkeep similarity index 100% rename from app/src/main/java/com/couplesconnect/app/ui/pairing/.gitkeep rename to app/src/main/java/app/closer/ui/pairing/.gitkeep diff --git a/app/src/main/java/com/couplesconnect/app/ui/pairing/AcceptInviteScreen.kt b/app/src/main/java/app/closer/ui/pairing/AcceptInviteScreen.kt similarity index 94% rename from app/src/main/java/com/couplesconnect/app/ui/pairing/AcceptInviteScreen.kt rename to app/src/main/java/app/closer/ui/pairing/AcceptInviteScreen.kt index f08bbaa1..fe54e237 100644 --- a/app/src/main/java/com/couplesconnect/app/ui/pairing/AcceptInviteScreen.kt +++ b/app/src/main/java/app/closer/ui/pairing/AcceptInviteScreen.kt @@ -1,4 +1,4 @@ -package com.couplesconnect.app.ui.pairing +package app.closer.ui.pairing import androidx.compose.foundation.background import androidx.compose.foundation.layout.Box @@ -55,15 +55,15 @@ import androidx.compose.ui.text.input.VisualTransformation import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import androidx.hilt.navigation.compose.hiltViewModel -import com.couplesconnect.app.core.navigation.AppRoute -import com.couplesconnect.app.ui.settings.SettingsBackgroundBrush -import com.couplesconnect.app.ui.settings.SettingsDanger -import com.couplesconnect.app.ui.settings.SettingsInk -import com.couplesconnect.app.ui.settings.SettingsMuted -import com.couplesconnect.app.ui.settings.SettingsOnPrimary -import com.couplesconnect.app.ui.settings.SettingsPrimary -import com.couplesconnect.app.ui.settings.SettingsPrimaryDeep -import com.couplesconnect.app.ui.settings.SettingsSoft +import app.closer.core.navigation.AppRoute +import app.closer.ui.settings.SettingsBackgroundBrush +import app.closer.ui.settings.SettingsDanger +import app.closer.ui.settings.SettingsInk +import app.closer.ui.settings.SettingsMuted +import app.closer.ui.settings.SettingsOnPrimary +import app.closer.ui.settings.SettingsPrimary +import app.closer.ui.settings.SettingsPrimaryDeep +import app.closer.ui.settings.SettingsSoft @OptIn(ExperimentalMaterial3Api::class) @Composable diff --git a/app/src/main/java/com/couplesconnect/app/ui/pairing/AcceptInviteViewModel.kt b/app/src/main/java/app/closer/ui/pairing/AcceptInviteViewModel.kt similarity index 94% rename from app/src/main/java/com/couplesconnect/app/ui/pairing/AcceptInviteViewModel.kt rename to app/src/main/java/app/closer/ui/pairing/AcceptInviteViewModel.kt index be6bd2b7..e4de42b9 100644 --- a/app/src/main/java/com/couplesconnect/app/ui/pairing/AcceptInviteViewModel.kt +++ b/app/src/main/java/app/closer/ui/pairing/AcceptInviteViewModel.kt @@ -1,9 +1,9 @@ -package com.couplesconnect.app.ui.pairing +package app.closer.ui.pairing import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import com.couplesconnect.app.core.navigation.AppRoute -import com.couplesconnect.app.domain.repository.InviteRepository +import app.closer.core.navigation.AppRoute +import app.closer.domain.repository.InviteRepository import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow diff --git a/app/src/main/java/com/couplesconnect/app/ui/pairing/CreateInviteScreen.kt b/app/src/main/java/app/closer/ui/pairing/CreateInviteScreen.kt similarity index 93% rename from app/src/main/java/com/couplesconnect/app/ui/pairing/CreateInviteScreen.kt rename to app/src/main/java/app/closer/ui/pairing/CreateInviteScreen.kt index 43bcfd13..9f1d8049 100644 --- a/app/src/main/java/com/couplesconnect/app/ui/pairing/CreateInviteScreen.kt +++ b/app/src/main/java/app/closer/ui/pairing/CreateInviteScreen.kt @@ -1,4 +1,4 @@ -package com.couplesconnect.app.ui.pairing +package app.closer.ui.pairing import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement @@ -48,14 +48,14 @@ import androidx.compose.ui.text.AnnotatedString import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import androidx.hilt.navigation.compose.hiltViewModel -import com.couplesconnect.app.core.navigation.AppRoute -import com.couplesconnect.app.ui.settings.SettingsBackgroundBrush -import com.couplesconnect.app.ui.settings.SettingsInk -import com.couplesconnect.app.ui.settings.SettingsMuted -import com.couplesconnect.app.ui.settings.SettingsOnPrimary -import com.couplesconnect.app.ui.settings.SettingsPrimary -import com.couplesconnect.app.ui.settings.SettingsPrimaryDeep -import com.couplesconnect.app.ui.settings.SettingsSoft +import app.closer.core.navigation.AppRoute +import app.closer.ui.settings.SettingsBackgroundBrush +import app.closer.ui.settings.SettingsInk +import app.closer.ui.settings.SettingsMuted +import app.closer.ui.settings.SettingsOnPrimary +import app.closer.ui.settings.SettingsPrimary +import app.closer.ui.settings.SettingsPrimaryDeep +import app.closer.ui.settings.SettingsSoft import kotlinx.coroutines.launch @OptIn(ExperimentalMaterial3Api::class) diff --git a/app/src/main/java/com/couplesconnect/app/ui/pairing/CreateInviteViewModel.kt b/app/src/main/java/app/closer/ui/pairing/CreateInviteViewModel.kt similarity index 86% rename from app/src/main/java/com/couplesconnect/app/ui/pairing/CreateInviteViewModel.kt rename to app/src/main/java/app/closer/ui/pairing/CreateInviteViewModel.kt index 8739272e..d9c620c9 100644 --- a/app/src/main/java/com/couplesconnect/app/ui/pairing/CreateInviteViewModel.kt +++ b/app/src/main/java/app/closer/ui/pairing/CreateInviteViewModel.kt @@ -1,11 +1,11 @@ -package com.couplesconnect.app.ui.pairing +package app.closer.ui.pairing import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import com.couplesconnect.app.core.navigation.AppRoute -import com.couplesconnect.app.domain.repository.AuthRepository -import com.couplesconnect.app.domain.repository.CoupleRepository -import com.couplesconnect.app.domain.repository.InviteRepository +import app.closer.core.navigation.AppRoute +import app.closer.domain.repository.AuthRepository +import app.closer.domain.repository.CoupleRepository +import app.closer.domain.repository.InviteRepository import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow diff --git a/app/src/main/java/com/couplesconnect/app/ui/pairing/EmailInviteScreen.kt b/app/src/main/java/app/closer/ui/pairing/EmailInviteScreen.kt similarity index 82% rename from app/src/main/java/com/couplesconnect/app/ui/pairing/EmailInviteScreen.kt rename to app/src/main/java/app/closer/ui/pairing/EmailInviteScreen.kt index 2699b728..e3007a20 100644 --- a/app/src/main/java/com/couplesconnect/app/ui/pairing/EmailInviteScreen.kt +++ b/app/src/main/java/app/closer/ui/pairing/EmailInviteScreen.kt @@ -1,11 +1,11 @@ -package com.couplesconnect.app.ui.pairing +package app.closer.ui.pairing import androidx.compose.runtime.Composable import androidx.compose.ui.graphics.Color import androidx.compose.ui.tooling.preview.Preview -import com.couplesconnect.app.core.navigation.AppRoute -import com.couplesconnect.app.ui.components.PlaceholderAction -import com.couplesconnect.app.ui.components.PlaceholderScreen +import app.closer.core.navigation.AppRoute +import app.closer.ui.components.PlaceholderAction +import app.closer.ui.components.PlaceholderScreen @Composable fun EmailInviteScreen( diff --git a/app/src/main/java/com/couplesconnect/app/ui/pairing/InviteConfirmScreen.kt b/app/src/main/java/app/closer/ui/pairing/InviteConfirmScreen.kt similarity index 93% rename from app/src/main/java/com/couplesconnect/app/ui/pairing/InviteConfirmScreen.kt rename to app/src/main/java/app/closer/ui/pairing/InviteConfirmScreen.kt index 15726537..70f39e6c 100644 --- a/app/src/main/java/com/couplesconnect/app/ui/pairing/InviteConfirmScreen.kt +++ b/app/src/main/java/app/closer/ui/pairing/InviteConfirmScreen.kt @@ -1,4 +1,4 @@ -package com.couplesconnect.app.ui.pairing +package app.closer.ui.pairing import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement @@ -39,13 +39,13 @@ import androidx.compose.ui.graphics.Color import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import androidx.hilt.navigation.compose.hiltViewModel -import com.couplesconnect.app.core.navigation.AppRoute -import com.couplesconnect.app.ui.settings.SettingsBackgroundBrush -import com.couplesconnect.app.ui.settings.SettingsInk -import com.couplesconnect.app.ui.settings.SettingsMuted -import com.couplesconnect.app.ui.settings.SettingsOnPrimary -import com.couplesconnect.app.ui.settings.SettingsPrimary -import com.couplesconnect.app.ui.settings.SettingsPrimaryDeep +import app.closer.core.navigation.AppRoute +import app.closer.ui.settings.SettingsBackgroundBrush +import app.closer.ui.settings.SettingsInk +import app.closer.ui.settings.SettingsMuted +import app.closer.ui.settings.SettingsOnPrimary +import app.closer.ui.settings.SettingsPrimary +import app.closer.ui.settings.SettingsPrimaryDeep @OptIn(ExperimentalMaterial3Api::class) @Composable diff --git a/app/src/main/java/com/couplesconnect/app/ui/pairing/InviteConfirmViewModel.kt b/app/src/main/java/app/closer/ui/pairing/InviteConfirmViewModel.kt similarity index 88% rename from app/src/main/java/com/couplesconnect/app/ui/pairing/InviteConfirmViewModel.kt rename to app/src/main/java/app/closer/ui/pairing/InviteConfirmViewModel.kt index 13b6710f..75108bf6 100644 --- a/app/src/main/java/com/couplesconnect/app/ui/pairing/InviteConfirmViewModel.kt +++ b/app/src/main/java/app/closer/ui/pairing/InviteConfirmViewModel.kt @@ -1,14 +1,14 @@ -package com.couplesconnect.app.ui.pairing +package app.closer.ui.pairing import androidx.lifecycle.SavedStateHandle import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import com.couplesconnect.app.core.navigation.AppRoute -import com.couplesconnect.app.domain.model.Invite -import com.couplesconnect.app.domain.repository.AuthRepository -import com.couplesconnect.app.domain.repository.CoupleRepository -import com.couplesconnect.app.domain.repository.InviteRepository -import com.couplesconnect.app.domain.repository.UserRepository +import app.closer.core.navigation.AppRoute +import app.closer.domain.model.Invite +import app.closer.domain.repository.AuthRepository +import app.closer.domain.repository.CoupleRepository +import app.closer.domain.repository.InviteRepository +import app.closer.domain.repository.UserRepository import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow diff --git a/app/src/main/java/com/couplesconnect/app/ui/paywall/.gitkeep b/app/src/main/java/app/closer/ui/paywall/.gitkeep similarity index 100% rename from app/src/main/java/com/couplesconnect/app/ui/paywall/.gitkeep rename to app/src/main/java/app/closer/ui/paywall/.gitkeep diff --git a/app/src/main/java/com/couplesconnect/app/ui/paywall/PaywallScreen.kt b/app/src/main/java/app/closer/ui/paywall/PaywallScreen.kt similarity index 98% rename from app/src/main/java/com/couplesconnect/app/ui/paywall/PaywallScreen.kt rename to app/src/main/java/app/closer/ui/paywall/PaywallScreen.kt index 9e5a7f85..e41b23ba 100644 --- a/app/src/main/java/com/couplesconnect/app/ui/paywall/PaywallScreen.kt +++ b/app/src/main/java/app/closer/ui/paywall/PaywallScreen.kt @@ -1,4 +1,4 @@ -package com.couplesconnect.app.ui.paywall +package app.closer.ui.paywall import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement @@ -27,7 +27,7 @@ import androidx.compose.material3.TextButton import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.platform.LocalUriHandler -import com.couplesconnect.app.core.navigation.ExternalLinks +import app.closer.core.navigation.ExternalLinks import androidx.compose.ui.Modifier import androidx.compose.ui.geometry.Offset import androidx.compose.ui.graphics.Brush diff --git a/app/src/main/java/com/couplesconnect/app/ui/questions/.gitkeep b/app/src/main/java/app/closer/ui/questions/.gitkeep similarity index 100% rename from app/src/main/java/com/couplesconnect/app/ui/questions/.gitkeep rename to app/src/main/java/app/closer/ui/questions/.gitkeep diff --git a/app/src/main/java/com/couplesconnect/app/ui/questions/DailyQuestionScreen.kt b/app/src/main/java/app/closer/ui/questions/DailyQuestionScreen.kt similarity index 93% rename from app/src/main/java/com/couplesconnect/app/ui/questions/DailyQuestionScreen.kt rename to app/src/main/java/app/closer/ui/questions/DailyQuestionScreen.kt index dcf087d9..662f8b18 100644 --- a/app/src/main/java/com/couplesconnect/app/ui/questions/DailyQuestionScreen.kt +++ b/app/src/main/java/app/closer/ui/questions/DailyQuestionScreen.kt @@ -1,12 +1,12 @@ -package com.couplesconnect.app.ui.questions +package app.closer.ui.questions import androidx.compose.runtime.Composable import androidx.compose.runtime.collectAsState import androidx.compose.runtime.getValue import androidx.compose.ui.tooling.preview.Preview import androidx.hilt.navigation.compose.hiltViewModel -import com.couplesconnect.app.core.navigation.AppRoute -import com.couplesconnect.app.domain.model.Question +import app.closer.core.navigation.AppRoute +import app.closer.domain.model.Question @Composable fun DailyQuestionScreen( diff --git a/app/src/main/java/com/couplesconnect/app/ui/questions/DailyQuestionViewModel.kt b/app/src/main/java/app/closer/ui/questions/DailyQuestionViewModel.kt similarity index 89% rename from app/src/main/java/com/couplesconnect/app/ui/questions/DailyQuestionViewModel.kt rename to app/src/main/java/app/closer/ui/questions/DailyQuestionViewModel.kt index 47508763..a4aa0d97 100644 --- a/app/src/main/java/com/couplesconnect/app/ui/questions/DailyQuestionViewModel.kt +++ b/app/src/main/java/app/closer/ui/questions/DailyQuestionViewModel.kt @@ -1,12 +1,12 @@ -package com.couplesconnect.app.ui.questions +package app.closer.ui.questions import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import com.couplesconnect.app.domain.model.Question -import com.couplesconnect.app.domain.repository.AuthRepository -import com.couplesconnect.app.domain.repository.CoupleRepository -import com.couplesconnect.app.domain.repository.LocalAnswerRepository -import com.couplesconnect.app.domain.repository.QuestionRepository +import app.closer.domain.model.Question +import app.closer.domain.repository.AuthRepository +import app.closer.domain.repository.CoupleRepository +import app.closer.domain.repository.LocalAnswerRepository +import app.closer.domain.repository.QuestionRepository import dagger.hilt.android.lifecycle.HiltViewModel import javax.inject.Inject import kotlinx.coroutines.flow.MutableStateFlow @@ -117,7 +117,7 @@ class DailyQuestionViewModel @Inject constructor( } fun defaultScaleValue(question: Question?): Int { - val cfg = question?.answerConfig as? com.couplesconnect.app.domain.model.ScaleAnswerConfigImpl + val cfg = question?.answerConfig as? app.closer.domain.model.ScaleAnswerConfigImpl val min = cfg?.config?.minScale ?: 1 val max = cfg?.config?.maxScale ?: 5 return ((min + max) / 2).coerceIn(min, max) diff --git a/app/src/main/java/com/couplesconnect/app/ui/questions/LocalAnswerMapping.kt b/app/src/main/java/app/closer/ui/questions/LocalAnswerMapping.kt similarity index 86% rename from app/src/main/java/com/couplesconnect/app/ui/questions/LocalAnswerMapping.kt rename to app/src/main/java/app/closer/ui/questions/LocalAnswerMapping.kt index 355aff27..727ac243 100644 --- a/app/src/main/java/com/couplesconnect/app/ui/questions/LocalAnswerMapping.kt +++ b/app/src/main/java/app/closer/ui/questions/LocalAnswerMapping.kt @@ -1,9 +1,9 @@ -package com.couplesconnect.app.ui.questions +package app.closer.ui.questions -import com.couplesconnect.app.domain.model.ChoiceAnswerConfigImpl -import com.couplesconnect.app.domain.model.LocalAnswer -import com.couplesconnect.app.domain.model.Question -import com.couplesconnect.app.domain.model.ThisOrThatAnswerConfigImpl +import app.closer.domain.model.ChoiceAnswerConfigImpl +import app.closer.domain.model.LocalAnswer +import app.closer.domain.model.Question +import app.closer.domain.model.ThisOrThatAnswerConfigImpl fun LocalQuestionUiState.withLocalAnswer(answer: LocalAnswer?): LocalQuestionUiState { answer ?: return copy(submitted = false) diff --git a/app/src/main/java/com/couplesconnect/app/ui/questions/LocalQuestionContent.kt b/app/src/main/java/app/closer/ui/questions/LocalQuestionContent.kt similarity index 95% rename from app/src/main/java/com/couplesconnect/app/ui/questions/LocalQuestionContent.kt rename to app/src/main/java/app/closer/ui/questions/LocalQuestionContent.kt index c63338ab..f4a08003 100644 --- a/app/src/main/java/com/couplesconnect/app/ui/questions/LocalQuestionContent.kt +++ b/app/src/main/java/app/closer/ui/questions/LocalQuestionContent.kt @@ -1,4 +1,4 @@ -package com.couplesconnect.app.ui.questions +package app.closer.ui.questions import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement @@ -40,14 +40,14 @@ import androidx.compose.ui.graphics.Color import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp -import com.couplesconnect.app.domain.model.ChoiceAnswerConfigImpl -import com.couplesconnect.app.domain.model.Question -import com.couplesconnect.app.domain.model.ThisOrThatAnswerConfigImpl -import com.couplesconnect.app.ui.components.EmptyState -import com.couplesconnect.app.ui.components.ErrorState -import com.couplesconnect.app.ui.components.LoadingState -import com.couplesconnect.app.ui.questions.components.QuestionAnswerInput -import com.couplesconnect.app.ui.questions.components.QuestionHeader +import app.closer.domain.model.ChoiceAnswerConfigImpl +import app.closer.domain.model.Question +import app.closer.domain.model.ThisOrThatAnswerConfigImpl +import app.closer.ui.components.EmptyState +import app.closer.ui.components.ErrorState +import app.closer.ui.components.LoadingState +import app.closer.ui.questions.components.QuestionAnswerInput +import app.closer.ui.questions.components.QuestionHeader @Composable fun LocalQuestionContent( diff --git a/app/src/main/java/com/couplesconnect/app/ui/questions/QuestionCategoryScreen.kt b/app/src/main/java/app/closer/ui/questions/QuestionCategoryScreen.kt similarity index 98% rename from app/src/main/java/com/couplesconnect/app/ui/questions/QuestionCategoryScreen.kt rename to app/src/main/java/app/closer/ui/questions/QuestionCategoryScreen.kt index 629b0bc1..633cc5b7 100644 --- a/app/src/main/java/com/couplesconnect/app/ui/questions/QuestionCategoryScreen.kt +++ b/app/src/main/java/app/closer/ui/questions/QuestionCategoryScreen.kt @@ -1,4 +1,4 @@ -package com.couplesconnect.app.ui.questions +package app.closer.ui.questions import androidx.compose.foundation.background import androidx.compose.foundation.clickable @@ -38,9 +38,9 @@ import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import androidx.hilt.navigation.compose.hiltViewModel -import com.couplesconnect.app.core.navigation.AppRoute -import com.couplesconnect.app.domain.model.Question -import com.couplesconnect.app.domain.model.QuestionCategory +import app.closer.core.navigation.AppRoute +import app.closer.domain.model.Question +import app.closer.domain.model.QuestionCategory @Composable fun QuestionCategoryScreen( diff --git a/app/src/main/java/com/couplesconnect/app/ui/questions/QuestionCategoryViewModel.kt b/app/src/main/java/app/closer/ui/questions/QuestionCategoryViewModel.kt similarity index 88% rename from app/src/main/java/com/couplesconnect/app/ui/questions/QuestionCategoryViewModel.kt rename to app/src/main/java/app/closer/ui/questions/QuestionCategoryViewModel.kt index 6462803d..73da66bf 100644 --- a/app/src/main/java/com/couplesconnect/app/ui/questions/QuestionCategoryViewModel.kt +++ b/app/src/main/java/app/closer/ui/questions/QuestionCategoryViewModel.kt @@ -1,11 +1,11 @@ -package com.couplesconnect.app.ui.questions +package app.closer.ui.questions import androidx.lifecycle.SavedStateHandle import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import com.couplesconnect.app.domain.model.Question -import com.couplesconnect.app.domain.model.QuestionCategory -import com.couplesconnect.app.domain.repository.QuestionRepository +import app.closer.domain.model.Question +import app.closer.domain.model.QuestionCategory +import app.closer.domain.repository.QuestionRepository import dagger.hilt.android.lifecycle.HiltViewModel import javax.inject.Inject import kotlinx.coroutines.flow.MutableStateFlow diff --git a/app/src/main/java/com/couplesconnect/app/ui/questions/QuestionComposerScreen.kt b/app/src/main/java/app/closer/ui/questions/QuestionComposerScreen.kt similarity index 82% rename from app/src/main/java/com/couplesconnect/app/ui/questions/QuestionComposerScreen.kt rename to app/src/main/java/app/closer/ui/questions/QuestionComposerScreen.kt index a34ca5af..ac02e820 100644 --- a/app/src/main/java/com/couplesconnect/app/ui/questions/QuestionComposerScreen.kt +++ b/app/src/main/java/app/closer/ui/questions/QuestionComposerScreen.kt @@ -1,11 +1,11 @@ -package com.couplesconnect.app.ui.questions +package app.closer.ui.questions import androidx.compose.runtime.Composable import androidx.compose.ui.graphics.Color import androidx.compose.ui.tooling.preview.Preview -import com.couplesconnect.app.core.navigation.AppRoute -import com.couplesconnect.app.ui.components.PlaceholderAction -import com.couplesconnect.app.ui.components.PlaceholderScreen +import app.closer.core.navigation.AppRoute +import app.closer.ui.components.PlaceholderAction +import app.closer.ui.components.PlaceholderScreen @Composable fun QuestionComposerScreen( diff --git a/app/src/main/java/com/couplesconnect/app/ui/questions/QuestionDetailViewModel.kt b/app/src/main/java/app/closer/ui/questions/QuestionDetailViewModel.kt similarity index 94% rename from app/src/main/java/com/couplesconnect/app/ui/questions/QuestionDetailViewModel.kt rename to app/src/main/java/app/closer/ui/questions/QuestionDetailViewModel.kt index 97614911..a5dfae81 100644 --- a/app/src/main/java/com/couplesconnect/app/ui/questions/QuestionDetailViewModel.kt +++ b/app/src/main/java/app/closer/ui/questions/QuestionDetailViewModel.kt @@ -1,10 +1,10 @@ -package com.couplesconnect.app.ui.questions +package app.closer.ui.questions import androidx.lifecycle.SavedStateHandle import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import com.couplesconnect.app.domain.repository.LocalAnswerRepository -import com.couplesconnect.app.domain.repository.QuestionRepository +import app.closer.domain.repository.LocalAnswerRepository +import app.closer.domain.repository.QuestionRepository import dagger.hilt.android.lifecycle.HiltViewModel import javax.inject.Inject import kotlinx.coroutines.flow.MutableStateFlow diff --git a/app/src/main/java/com/couplesconnect/app/ui/questions/QuestionPackLibraryScreen.kt b/app/src/main/java/app/closer/ui/questions/QuestionPackLibraryScreen.kt similarity index 98% rename from app/src/main/java/com/couplesconnect/app/ui/questions/QuestionPackLibraryScreen.kt rename to app/src/main/java/app/closer/ui/questions/QuestionPackLibraryScreen.kt index b620d3e3..83cfba95 100644 --- a/app/src/main/java/com/couplesconnect/app/ui/questions/QuestionPackLibraryScreen.kt +++ b/app/src/main/java/app/closer/ui/questions/QuestionPackLibraryScreen.kt @@ -1,4 +1,4 @@ -package com.couplesconnect.app.ui.questions +package app.closer.ui.questions import androidx.compose.foundation.background import androidx.compose.foundation.clickable @@ -41,8 +41,8 @@ import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import androidx.hilt.navigation.compose.hiltViewModel -import com.couplesconnect.app.core.navigation.AppRoute -import com.couplesconnect.app.domain.model.QuestionCategory +import app.closer.core.navigation.AppRoute +import app.closer.domain.model.QuestionCategory private enum class PackFilter(val label: String) { ALL("All"), diff --git a/app/src/main/java/com/couplesconnect/app/ui/questions/QuestionPackLibraryViewModel.kt b/app/src/main/java/app/closer/ui/questions/QuestionPackLibraryViewModel.kt similarity index 89% rename from app/src/main/java/com/couplesconnect/app/ui/questions/QuestionPackLibraryViewModel.kt rename to app/src/main/java/app/closer/ui/questions/QuestionPackLibraryViewModel.kt index 8f4f1d02..bb870ad0 100644 --- a/app/src/main/java/com/couplesconnect/app/ui/questions/QuestionPackLibraryViewModel.kt +++ b/app/src/main/java/app/closer/ui/questions/QuestionPackLibraryViewModel.kt @@ -1,10 +1,10 @@ -package com.couplesconnect.app.ui.questions +package app.closer.ui.questions import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import com.couplesconnect.app.core.billing.EntitlementChecker -import com.couplesconnect.app.domain.model.QuestionCategory -import com.couplesconnect.app.domain.repository.QuestionRepository +import app.closer.core.billing.EntitlementChecker +import app.closer.domain.model.QuestionCategory +import app.closer.domain.repository.QuestionRepository import dagger.hilt.android.lifecycle.HiltViewModel import javax.inject.Inject import kotlinx.coroutines.flow.MutableStateFlow diff --git a/app/src/main/java/com/couplesconnect/app/ui/questions/QuestionThreadScreen.kt b/app/src/main/java/app/closer/ui/questions/QuestionThreadScreen.kt similarity index 94% rename from app/src/main/java/com/couplesconnect/app/ui/questions/QuestionThreadScreen.kt rename to app/src/main/java/app/closer/ui/questions/QuestionThreadScreen.kt index 70685430..9bbd901f 100644 --- a/app/src/main/java/com/couplesconnect/app/ui/questions/QuestionThreadScreen.kt +++ b/app/src/main/java/app/closer/ui/questions/QuestionThreadScreen.kt @@ -1,12 +1,12 @@ -package com.couplesconnect.app.ui.questions +package app.closer.ui.questions import androidx.compose.runtime.Composable import androidx.compose.runtime.collectAsState import androidx.compose.runtime.getValue import androidx.compose.ui.tooling.preview.Preview import androidx.hilt.navigation.compose.hiltViewModel -import com.couplesconnect.app.core.navigation.AppRoute -import com.couplesconnect.app.domain.model.Question +import app.closer.core.navigation.AppRoute +import app.closer.domain.model.Question @Composable fun QuestionThreadScreen( diff --git a/app/src/main/java/com/couplesconnect/app/ui/questions/QuestionThreadViewModel.kt b/app/src/main/java/app/closer/ui/questions/QuestionThreadViewModel.kt similarity index 95% rename from app/src/main/java/com/couplesconnect/app/ui/questions/QuestionThreadViewModel.kt rename to app/src/main/java/app/closer/ui/questions/QuestionThreadViewModel.kt index d9960f5b..b3511fe7 100644 --- a/app/src/main/java/com/couplesconnect/app/ui/questions/QuestionThreadViewModel.kt +++ b/app/src/main/java/app/closer/ui/questions/QuestionThreadViewModel.kt @@ -1,15 +1,15 @@ -package com.couplesconnect.app.ui.questions +package app.closer.ui.questions import androidx.lifecycle.SavedStateHandle import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import com.couplesconnect.app.data.local.QuestionDao -import com.couplesconnect.app.data.local.mapper.toQuestion -import com.couplesconnect.app.domain.model.Question -import com.couplesconnect.app.domain.model.QuestionAnswer -import com.couplesconnect.app.domain.model.QuestionMessage -import com.couplesconnect.app.domain.model.QuestionReaction -import com.couplesconnect.app.domain.repository.QuestionThreadRepository +import app.closer.data.local.QuestionDao +import app.closer.data.local.mapper.toQuestion +import app.closer.domain.model.Question +import app.closer.domain.model.QuestionAnswer +import app.closer.domain.model.QuestionMessage +import app.closer.domain.model.QuestionReaction +import app.closer.domain.repository.QuestionThreadRepository import com.google.firebase.auth.FirebaseAuth import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.flow.MutableStateFlow diff --git a/app/src/main/java/com/couplesconnect/app/ui/questions/components/AnswerBubble.kt b/app/src/main/java/app/closer/ui/questions/components/AnswerBubble.kt similarity index 94% rename from app/src/main/java/com/couplesconnect/app/ui/questions/components/AnswerBubble.kt rename to app/src/main/java/app/closer/ui/questions/components/AnswerBubble.kt index c6f870ff..bc93354b 100644 --- a/app/src/main/java/com/couplesconnect/app/ui/questions/components/AnswerBubble.kt +++ b/app/src/main/java/app/closer/ui/questions/components/AnswerBubble.kt @@ -1,4 +1,4 @@ -package com.couplesconnect.app.ui.questions.components +package app.closer.ui.questions.components import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement @@ -30,9 +30,9 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.dp -import com.couplesconnect.app.domain.model.Question -import com.couplesconnect.app.domain.model.QuestionAnswer -import com.couplesconnect.app.domain.model.QuestionReaction +import app.closer.domain.model.Question +import app.closer.domain.model.QuestionAnswer +import app.closer.domain.model.QuestionReaction private val REACTION_EMOJIS = listOf("❤️", "😊", "😂", "😮", "👏", "🥺") @@ -229,7 +229,7 @@ private fun answerSummary(answer: QuestionAnswer, question: Question): String { return when (question.type) { "written" -> answer.writtenText ?: "" "scale" -> { - val cfg = (question.answerConfig as? com.couplesconnect.app.domain.model.ScaleAnswerConfigImpl)?.config + val cfg = (question.answerConfig as? app.closer.domain.model.ScaleAnswerConfigImpl)?.config val value = answer.scaleValue ?: 0 if (cfg != null && cfg.maxLabel.isNotBlank()) { "$value / ${cfg.maxScale} — ${cfg.maxLabel}" @@ -238,12 +238,12 @@ private fun answerSummary(answer: QuestionAnswer, question: Question): String { } } "single_choice", "this_or_that" -> { - val cfg = (question.answerConfig as? com.couplesconnect.app.domain.model.ChoiceAnswerConfigImpl)?.config + val cfg = (question.answerConfig as? app.closer.domain.model.ChoiceAnswerConfigImpl)?.config val id = answer.selectedOptionIds.firstOrNull() ?: return "" cfg?.options?.find { it.id == id }?.text ?: id } "multi_choice" -> { - val cfg = (question.answerConfig as? com.couplesconnect.app.domain.model.ChoiceAnswerConfigImpl)?.config + val cfg = (question.answerConfig as? app.closer.domain.model.ChoiceAnswerConfigImpl)?.config answer.selectedOptionIds.mapNotNull { id -> cfg?.options?.find { it.id == id }?.text }.joinToString(", ") diff --git a/app/src/main/java/com/couplesconnect/app/ui/questions/components/QuestionAnswerInput.kt b/app/src/main/java/app/closer/ui/questions/components/QuestionAnswerInput.kt similarity index 97% rename from app/src/main/java/com/couplesconnect/app/ui/questions/components/QuestionAnswerInput.kt rename to app/src/main/java/app/closer/ui/questions/components/QuestionAnswerInput.kt index f6cb34d0..5a10ec5a 100644 --- a/app/src/main/java/com/couplesconnect/app/ui/questions/components/QuestionAnswerInput.kt +++ b/app/src/main/java/app/closer/ui/questions/components/QuestionAnswerInput.kt @@ -1,4 +1,4 @@ -package com.couplesconnect.app.ui.questions.components +package app.closer.ui.questions.components import androidx.compose.foundation.BorderStroke import androidx.compose.foundation.layout.Arrangement @@ -28,11 +28,11 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.dp -import com.couplesconnect.app.domain.model.ChoiceAnswerConfigImpl -import com.couplesconnect.app.domain.model.Question -import com.couplesconnect.app.domain.model.ScaleAnswerConfigImpl -import com.couplesconnect.app.domain.model.ThisOrThatAnswerConfigImpl -import com.couplesconnect.app.domain.model.WrittenAnswerConfigImpl +import app.closer.domain.model.ChoiceAnswerConfigImpl +import app.closer.domain.model.Question +import app.closer.domain.model.ScaleAnswerConfigImpl +import app.closer.domain.model.ThisOrThatAnswerConfigImpl +import app.closer.domain.model.WrittenAnswerConfigImpl @Composable fun QuestionAnswerInput( diff --git a/app/src/main/java/com/couplesconnect/app/ui/questions/components/QuestionDiscussionThread.kt b/app/src/main/java/app/closer/ui/questions/components/QuestionDiscussionThread.kt similarity index 98% rename from app/src/main/java/com/couplesconnect/app/ui/questions/components/QuestionDiscussionThread.kt rename to app/src/main/java/app/closer/ui/questions/components/QuestionDiscussionThread.kt index 21b5dcfc..7aa35acc 100644 --- a/app/src/main/java/com/couplesconnect/app/ui/questions/components/QuestionDiscussionThread.kt +++ b/app/src/main/java/app/closer/ui/questions/components/QuestionDiscussionThread.kt @@ -1,4 +1,4 @@ -package com.couplesconnect.app.ui.questions.components +package app.closer.ui.questions.components import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column @@ -25,7 +25,7 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.dp -import com.couplesconnect.app.domain.model.QuestionMessage +import app.closer.domain.model.QuestionMessage @Composable fun QuestionDiscussionThread( diff --git a/app/src/main/java/com/couplesconnect/app/ui/questions/components/QuestionHeader.kt b/app/src/main/java/app/closer/ui/questions/components/QuestionHeader.kt similarity index 94% rename from app/src/main/java/com/couplesconnect/app/ui/questions/components/QuestionHeader.kt rename to app/src/main/java/app/closer/ui/questions/components/QuestionHeader.kt index 8398a889..e7ed59a0 100644 --- a/app/src/main/java/com/couplesconnect/app/ui/questions/components/QuestionHeader.kt +++ b/app/src/main/java/app/closer/ui/questions/components/QuestionHeader.kt @@ -1,4 +1,4 @@ -package com.couplesconnect.app.ui.questions.components +package app.closer.ui.questions.components import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.fillMaxWidth @@ -14,7 +14,7 @@ import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import com.couplesconnect.app.domain.model.Question +import app.closer.domain.model.Question @Composable fun QuestionHeader( diff --git a/app/src/main/java/com/couplesconnect/app/ui/questions/components/QuestionHelpExpandable.kt b/app/src/main/java/app/closer/ui/questions/components/QuestionHelpExpandable.kt similarity index 97% rename from app/src/main/java/com/couplesconnect/app/ui/questions/components/QuestionHelpExpandable.kt rename to app/src/main/java/app/closer/ui/questions/components/QuestionHelpExpandable.kt index e31f64e3..25e27326 100644 --- a/app/src/main/java/com/couplesconnect/app/ui/questions/components/QuestionHelpExpandable.kt +++ b/app/src/main/java/app/closer/ui/questions/components/QuestionHelpExpandable.kt @@ -1,4 +1,4 @@ -package com.couplesconnect.app.ui.questions.components +package app.closer.ui.questions.components import androidx.compose.animation.AnimatedVisibility import androidx.compose.animation.expandVertically @@ -24,7 +24,7 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip import androidx.compose.ui.unit.dp -import com.couplesconnect.app.domain.model.Question +import app.closer.domain.model.Question @Composable fun QuestionHelpExpandable( diff --git a/app/src/main/java/com/couplesconnect/app/ui/questions/components/QuestionNavigationBar.kt b/app/src/main/java/app/closer/ui/questions/components/QuestionNavigationBar.kt similarity index 98% rename from app/src/main/java/com/couplesconnect/app/ui/questions/components/QuestionNavigationBar.kt rename to app/src/main/java/app/closer/ui/questions/components/QuestionNavigationBar.kt index b055449a..1df711c3 100644 --- a/app/src/main/java/com/couplesconnect/app/ui/questions/components/QuestionNavigationBar.kt +++ b/app/src/main/java/app/closer/ui/questions/components/QuestionNavigationBar.kt @@ -1,4 +1,4 @@ -package com.couplesconnect.app.ui.questions.components +package app.closer.ui.questions.components import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Row diff --git a/app/src/main/java/com/couplesconnect/app/ui/settings/.gitkeep b/app/src/main/java/app/closer/ui/settings/.gitkeep similarity index 100% rename from app/src/main/java/com/couplesconnect/app/ui/settings/.gitkeep rename to app/src/main/java/app/closer/ui/settings/.gitkeep diff --git a/app/src/main/java/com/couplesconnect/app/ui/settings/AccountScreen.kt b/app/src/main/java/app/closer/ui/settings/AccountScreen.kt similarity index 82% rename from app/src/main/java/com/couplesconnect/app/ui/settings/AccountScreen.kt rename to app/src/main/java/app/closer/ui/settings/AccountScreen.kt index 58bbd349..23044cc7 100644 --- a/app/src/main/java/com/couplesconnect/app/ui/settings/AccountScreen.kt +++ b/app/src/main/java/app/closer/ui/settings/AccountScreen.kt @@ -1,11 +1,11 @@ -package com.couplesconnect.app.ui.settings +package app.closer.ui.settings import androidx.compose.runtime.Composable import androidx.compose.ui.graphics.Color import androidx.compose.ui.tooling.preview.Preview -import com.couplesconnect.app.core.navigation.AppRoute -import com.couplesconnect.app.ui.components.PlaceholderAction -import com.couplesconnect.app.ui.components.PlaceholderScreen +import app.closer.core.navigation.AppRoute +import app.closer.ui.components.PlaceholderAction +import app.closer.ui.components.PlaceholderScreen @Composable fun AccountScreen( diff --git a/app/src/main/java/com/couplesconnect/app/ui/settings/DeleteAccountScreen.kt b/app/src/main/java/app/closer/ui/settings/DeleteAccountScreen.kt similarity index 97% rename from app/src/main/java/com/couplesconnect/app/ui/settings/DeleteAccountScreen.kt rename to app/src/main/java/app/closer/ui/settings/DeleteAccountScreen.kt index 4c462fa5..7c25af52 100644 --- a/app/src/main/java/com/couplesconnect/app/ui/settings/DeleteAccountScreen.kt +++ b/app/src/main/java/app/closer/ui/settings/DeleteAccountScreen.kt @@ -1,11 +1,11 @@ -package com.couplesconnect.app.ui.settings +package app.closer.ui.settings import androidx.compose.foundation.background import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import com.couplesconnect.app.core.navigation.AppRoute -import com.couplesconnect.app.domain.repository.AuthRepository -import com.couplesconnect.app.domain.repository.UserRepository +import app.closer.core.navigation.AppRoute +import app.closer.domain.repository.AuthRepository +import app.closer.domain.repository.UserRepository import dagger.hilt.android.lifecycle.HiltViewModel import javax.inject.Inject import kotlinx.coroutines.flow.MutableStateFlow diff --git a/app/src/main/java/com/couplesconnect/app/ui/settings/NotificationSettingsScreen.kt b/app/src/main/java/app/closer/ui/settings/NotificationSettingsScreen.kt similarity index 98% rename from app/src/main/java/com/couplesconnect/app/ui/settings/NotificationSettingsScreen.kt rename to app/src/main/java/app/closer/ui/settings/NotificationSettingsScreen.kt index 086da327..7f942fe5 100644 --- a/app/src/main/java/com/couplesconnect/app/ui/settings/NotificationSettingsScreen.kt +++ b/app/src/main/java/app/closer/ui/settings/NotificationSettingsScreen.kt @@ -1,8 +1,8 @@ -package com.couplesconnect.app.ui.settings +package app.closer.ui.settings import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import com.couplesconnect.app.domain.repository.SettingsRepository +import app.closer.domain.repository.SettingsRepository import dagger.hilt.android.lifecycle.HiltViewModel import javax.inject.Inject import kotlinx.coroutines.flow.SharingStarted diff --git a/app/src/main/java/com/couplesconnect/app/ui/settings/PrivacyScreen.kt b/app/src/main/java/app/closer/ui/settings/PrivacyScreen.kt similarity index 98% rename from app/src/main/java/com/couplesconnect/app/ui/settings/PrivacyScreen.kt rename to app/src/main/java/app/closer/ui/settings/PrivacyScreen.kt index 8050a6c7..445b12c7 100644 --- a/app/src/main/java/com/couplesconnect/app/ui/settings/PrivacyScreen.kt +++ b/app/src/main/java/app/closer/ui/settings/PrivacyScreen.kt @@ -1,4 +1,4 @@ -package com.couplesconnect.app.ui.settings +package app.closer.ui.settings import androidx.compose.foundation.background import androidx.compose.foundation.clickable @@ -36,7 +36,7 @@ import androidx.compose.ui.platform.LocalUriHandler import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import com.couplesconnect.app.core.navigation.ExternalLinks +import app.closer.core.navigation.ExternalLinks @OptIn(ExperimentalMaterial3Api::class) @Composable diff --git a/app/src/main/java/com/couplesconnect/app/ui/settings/RelationshipSettingsScreen.kt b/app/src/main/java/app/closer/ui/settings/RelationshipSettingsScreen.kt similarity index 97% rename from app/src/main/java/com/couplesconnect/app/ui/settings/RelationshipSettingsScreen.kt rename to app/src/main/java/app/closer/ui/settings/RelationshipSettingsScreen.kt index 1f744387..2e2132a5 100644 --- a/app/src/main/java/com/couplesconnect/app/ui/settings/RelationshipSettingsScreen.kt +++ b/app/src/main/java/app/closer/ui/settings/RelationshipSettingsScreen.kt @@ -1,11 +1,11 @@ -package com.couplesconnect.app.ui.settings +package app.closer.ui.settings import androidx.compose.foundation.background import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import com.couplesconnect.app.core.navigation.AppRoute -import com.couplesconnect.app.domain.repository.AuthRepository -import com.couplesconnect.app.domain.repository.CoupleRepository +import app.closer.core.navigation.AppRoute +import app.closer.domain.repository.AuthRepository +import app.closer.domain.repository.CoupleRepository import dagger.hilt.android.lifecycle.HiltViewModel import javax.inject.Inject import kotlinx.coroutines.flow.MutableStateFlow diff --git a/app/src/main/java/com/couplesconnect/app/ui/settings/SettingsScreen.kt b/app/src/main/java/app/closer/ui/settings/SettingsScreen.kt similarity index 99% rename from app/src/main/java/com/couplesconnect/app/ui/settings/SettingsScreen.kt rename to app/src/main/java/app/closer/ui/settings/SettingsScreen.kt index b80d87e6..80c5d771 100644 --- a/app/src/main/java/com/couplesconnect/app/ui/settings/SettingsScreen.kt +++ b/app/src/main/java/app/closer/ui/settings/SettingsScreen.kt @@ -1,4 +1,4 @@ -package com.couplesconnect.app.ui.settings +package app.closer.ui.settings import androidx.compose.foundation.background import androidx.compose.foundation.clickable @@ -50,7 +50,7 @@ import androidx.compose.ui.graphics.vector.ImageVector import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.dp import androidx.hilt.navigation.compose.hiltViewModel -import com.couplesconnect.app.core.navigation.AppRoute +import app.closer.core.navigation.AppRoute @OptIn(ExperimentalMaterial3Api::class) @Composable diff --git a/app/src/main/java/com/couplesconnect/app/ui/settings/SettingsViewModel.kt b/app/src/main/java/app/closer/ui/settings/SettingsViewModel.kt similarity index 89% rename from app/src/main/java/com/couplesconnect/app/ui/settings/SettingsViewModel.kt rename to app/src/main/java/app/closer/ui/settings/SettingsViewModel.kt index 140ed10f..486523f3 100644 --- a/app/src/main/java/com/couplesconnect/app/ui/settings/SettingsViewModel.kt +++ b/app/src/main/java/app/closer/ui/settings/SettingsViewModel.kt @@ -1,11 +1,11 @@ -package com.couplesconnect.app.ui.settings +package app.closer.ui.settings import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import com.couplesconnect.app.core.navigation.AppRoute -import com.couplesconnect.app.domain.repository.AuthRepository -import com.couplesconnect.app.domain.repository.CoupleRepository -import com.couplesconnect.app.domain.repository.UserRepository +import app.closer.core.navigation.AppRoute +import app.closer.domain.repository.AuthRepository +import app.closer.domain.repository.CoupleRepository +import app.closer.domain.repository.UserRepository import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow diff --git a/app/src/main/java/com/couplesconnect/app/ui/settings/SettingsVisuals.kt b/app/src/main/java/app/closer/ui/settings/SettingsVisuals.kt similarity index 96% rename from app/src/main/java/com/couplesconnect/app/ui/settings/SettingsVisuals.kt rename to app/src/main/java/app/closer/ui/settings/SettingsVisuals.kt index b6e44f90..08204598 100644 --- a/app/src/main/java/com/couplesconnect/app/ui/settings/SettingsVisuals.kt +++ b/app/src/main/java/app/closer/ui/settings/SettingsVisuals.kt @@ -1,4 +1,4 @@ -package com.couplesconnect.app.ui.settings +package app.closer.ui.settings import androidx.compose.material3.SwitchDefaults import androidx.compose.runtime.Composable diff --git a/app/src/main/java/com/couplesconnect/app/ui/settings/SubscriptionScreen.kt b/app/src/main/java/app/closer/ui/settings/SubscriptionScreen.kt similarity index 82% rename from app/src/main/java/com/couplesconnect/app/ui/settings/SubscriptionScreen.kt rename to app/src/main/java/app/closer/ui/settings/SubscriptionScreen.kt index d37bb734..1b214911 100644 --- a/app/src/main/java/com/couplesconnect/app/ui/settings/SubscriptionScreen.kt +++ b/app/src/main/java/app/closer/ui/settings/SubscriptionScreen.kt @@ -1,11 +1,11 @@ -package com.couplesconnect.app.ui.settings +package app.closer.ui.settings import androidx.compose.runtime.Composable import androidx.compose.ui.graphics.Color import androidx.compose.ui.tooling.preview.Preview -import com.couplesconnect.app.core.navigation.AppRoute -import com.couplesconnect.app.ui.components.PlaceholderAction -import com.couplesconnect.app.ui.components.PlaceholderScreen +import app.closer.core.navigation.AppRoute +import app.closer.ui.components.PlaceholderAction +import app.closer.ui.components.PlaceholderScreen @Composable fun SubscriptionScreen( diff --git a/app/src/main/java/com/couplesconnect/app/ui/theme/Color.kt b/app/src/main/java/app/closer/ui/theme/Color.kt similarity index 94% rename from app/src/main/java/com/couplesconnect/app/ui/theme/Color.kt rename to app/src/main/java/app/closer/ui/theme/Color.kt index 896a207f..e4231c20 100644 --- a/app/src/main/java/com/couplesconnect/app/ui/theme/Color.kt +++ b/app/src/main/java/app/closer/ui/theme/Color.kt @@ -1,4 +1,4 @@ -package com.couplesconnect.app.ui.theme +package app.closer.ui.theme import androidx.compose.ui.graphics.Color diff --git a/app/src/main/java/com/couplesconnect/app/ui/theme/Theme.kt b/app/src/main/java/app/closer/ui/theme/Theme.kt similarity index 97% rename from app/src/main/java/com/couplesconnect/app/ui/theme/Theme.kt rename to app/src/main/java/app/closer/ui/theme/Theme.kt index 35075f16..9ed1e0a7 100644 --- a/app/src/main/java/com/couplesconnect/app/ui/theme/Theme.kt +++ b/app/src/main/java/app/closer/ui/theme/Theme.kt @@ -1,4 +1,4 @@ -package com.couplesconnect.app.ui.theme +package app.closer.ui.theme import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Typography @@ -8,7 +8,7 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.graphics.Color @Composable -fun CouplesConnectTheme( +fun CloserTheme( darkTheme: Boolean = false, content: @Composable () -> Unit ) { diff --git a/app/src/main/java/com/couplesconnect/app/ui/theme/Type.kt b/app/src/main/java/app/closer/ui/theme/Type.kt similarity index 98% rename from app/src/main/java/com/couplesconnect/app/ui/theme/Type.kt rename to app/src/main/java/app/closer/ui/theme/Type.kt index 08a51c41..482f17f6 100644 --- a/app/src/main/java/com/couplesconnect/app/ui/theme/Type.kt +++ b/app/src/main/java/app/closer/ui/theme/Type.kt @@ -1,4 +1,4 @@ -package com.couplesconnect.app.ui.theme +package app.closer.ui.theme import androidx.compose.material3.Typography import androidx.compose.ui.text.TextStyle diff --git a/app/src/main/java/com/couplesconnect/app/ui/wheel/.gitkeep b/app/src/main/java/app/closer/ui/wheel/.gitkeep similarity index 100% rename from app/src/main/java/com/couplesconnect/app/ui/wheel/.gitkeep rename to app/src/main/java/app/closer/ui/wheel/.gitkeep diff --git a/app/src/main/java/com/couplesconnect/app/ui/wheel/CategoryPickerScreen.kt b/app/src/main/java/app/closer/ui/wheel/CategoryPickerScreen.kt similarity index 97% rename from app/src/main/java/com/couplesconnect/app/ui/wheel/CategoryPickerScreen.kt rename to app/src/main/java/app/closer/ui/wheel/CategoryPickerScreen.kt index 505693e6..5bdb7ac0 100644 --- a/app/src/main/java/com/couplesconnect/app/ui/wheel/CategoryPickerScreen.kt +++ b/app/src/main/java/app/closer/ui/wheel/CategoryPickerScreen.kt @@ -1,4 +1,4 @@ -package com.couplesconnect.app.ui.wheel +package app.closer.ui.wheel import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement @@ -36,9 +36,9 @@ import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import androidx.hilt.navigation.compose.hiltViewModel -import com.couplesconnect.app.core.navigation.AppRoute -import com.couplesconnect.app.domain.model.QuestionCategory -import com.couplesconnect.app.ui.questions.displayCategoryName +import app.closer.core.navigation.AppRoute +import app.closer.domain.model.QuestionCategory +import app.closer.ui.questions.displayCategoryName @Composable fun CategoryPickerScreen( diff --git a/app/src/main/java/com/couplesconnect/app/ui/wheel/CategoryPickerViewModel.kt b/app/src/main/java/app/closer/ui/wheel/CategoryPickerViewModel.kt similarity index 89% rename from app/src/main/java/com/couplesconnect/app/ui/wheel/CategoryPickerViewModel.kt rename to app/src/main/java/app/closer/ui/wheel/CategoryPickerViewModel.kt index 48ff5b8e..3479ce12 100644 --- a/app/src/main/java/com/couplesconnect/app/ui/wheel/CategoryPickerViewModel.kt +++ b/app/src/main/java/app/closer/ui/wheel/CategoryPickerViewModel.kt @@ -1,10 +1,10 @@ -package com.couplesconnect.app.ui.wheel +package app.closer.ui.wheel import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import com.couplesconnect.app.core.billing.EntitlementChecker -import com.couplesconnect.app.domain.model.QuestionCategory -import com.couplesconnect.app.domain.repository.QuestionRepository +import app.closer.core.billing.EntitlementChecker +import app.closer.domain.model.QuestionCategory +import app.closer.domain.repository.QuestionRepository import dagger.hilt.android.lifecycle.HiltViewModel import javax.inject.Inject import kotlinx.coroutines.flow.MutableStateFlow diff --git a/app/src/main/java/com/couplesconnect/app/ui/wheel/LocalWheelSessionStore.kt b/app/src/main/java/app/closer/ui/wheel/LocalWheelSessionStore.kt similarity index 79% rename from app/src/main/java/com/couplesconnect/app/ui/wheel/LocalWheelSessionStore.kt rename to app/src/main/java/app/closer/ui/wheel/LocalWheelSessionStore.kt index f580ff4f..d89c300b 100644 --- a/app/src/main/java/com/couplesconnect/app/ui/wheel/LocalWheelSessionStore.kt +++ b/app/src/main/java/app/closer/ui/wheel/LocalWheelSessionStore.kt @@ -1,6 +1,6 @@ -package com.couplesconnect.app.ui.wheel +package app.closer.ui.wheel -import com.couplesconnect.app.domain.model.Question +import app.closer.domain.model.Question import javax.inject.Inject import javax.inject.Singleton diff --git a/app/src/main/java/com/couplesconnect/app/ui/wheel/SpinWheelScreen.kt b/app/src/main/java/app/closer/ui/wheel/SpinWheelScreen.kt similarity index 99% rename from app/src/main/java/com/couplesconnect/app/ui/wheel/SpinWheelScreen.kt rename to app/src/main/java/app/closer/ui/wheel/SpinWheelScreen.kt index 6e6cc1c0..6f9c8f78 100644 --- a/app/src/main/java/com/couplesconnect/app/ui/wheel/SpinWheelScreen.kt +++ b/app/src/main/java/app/closer/ui/wheel/SpinWheelScreen.kt @@ -1,4 +1,4 @@ -package com.couplesconnect.app.ui.wheel +package app.closer.ui.wheel import androidx.compose.animation.core.LinearEasing import androidx.compose.animation.core.RepeatMode diff --git a/app/src/main/java/com/couplesconnect/app/ui/wheel/SpinWheelViewModel.kt b/app/src/main/java/app/closer/ui/wheel/SpinWheelViewModel.kt similarity index 94% rename from app/src/main/java/com/couplesconnect/app/ui/wheel/SpinWheelViewModel.kt rename to app/src/main/java/app/closer/ui/wheel/SpinWheelViewModel.kt index 053b0761..a1f6919e 100644 --- a/app/src/main/java/com/couplesconnect/app/ui/wheel/SpinWheelViewModel.kt +++ b/app/src/main/java/app/closer/ui/wheel/SpinWheelViewModel.kt @@ -1,10 +1,10 @@ -package com.couplesconnect.app.ui.wheel +package app.closer.ui.wheel import androidx.lifecycle.SavedStateHandle import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import com.couplesconnect.app.core.navigation.AppRoute -import com.couplesconnect.app.domain.repository.QuestionRepository +import app.closer.core.navigation.AppRoute +import app.closer.domain.repository.QuestionRepository import dagger.hilt.android.lifecycle.HiltViewModel import javax.inject.Inject import kotlinx.coroutines.flow.MutableStateFlow diff --git a/app/src/main/java/com/couplesconnect/app/ui/wheel/WheelCompleteScreen.kt b/app/src/main/java/app/closer/ui/wheel/WheelCompleteScreen.kt similarity index 95% rename from app/src/main/java/com/couplesconnect/app/ui/wheel/WheelCompleteScreen.kt rename to app/src/main/java/app/closer/ui/wheel/WheelCompleteScreen.kt index 0d625e8c..5bbab4f5 100644 --- a/app/src/main/java/com/couplesconnect/app/ui/wheel/WheelCompleteScreen.kt +++ b/app/src/main/java/app/closer/ui/wheel/WheelCompleteScreen.kt @@ -1,12 +1,12 @@ -package com.couplesconnect.app.ui.wheel +package app.closer.ui.wheel import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import com.couplesconnect.app.core.navigation.AppRoute -import com.couplesconnect.app.domain.model.QuestionSession -import com.couplesconnect.app.domain.repository.AuthRepository -import com.couplesconnect.app.domain.repository.CoupleRepository -import com.couplesconnect.app.domain.repository.QuestionSessionRepository +import app.closer.core.navigation.AppRoute +import app.closer.domain.model.QuestionSession +import app.closer.domain.repository.AuthRepository +import app.closer.domain.repository.CoupleRepository +import app.closer.domain.repository.QuestionSessionRepository import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.launch import javax.inject.Inject diff --git a/app/src/main/java/com/couplesconnect/app/ui/wheel/WheelHistoryScreen.kt b/app/src/main/java/app/closer/ui/wheel/WheelHistoryScreen.kt similarity index 95% rename from app/src/main/java/com/couplesconnect/app/ui/wheel/WheelHistoryScreen.kt rename to app/src/main/java/app/closer/ui/wheel/WheelHistoryScreen.kt index 5b25bb17..7e36e775 100644 --- a/app/src/main/java/com/couplesconnect/app/ui/wheel/WheelHistoryScreen.kt +++ b/app/src/main/java/app/closer/ui/wheel/WheelHistoryScreen.kt @@ -1,4 +1,4 @@ -package com.couplesconnect.app.ui.wheel +package app.closer.ui.wheel import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement @@ -40,12 +40,12 @@ import androidx.compose.ui.graphics.Color import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.dp import androidx.hilt.navigation.compose.hiltViewModel -import com.couplesconnect.app.core.navigation.AppRoute -import com.couplesconnect.app.domain.model.QuestionSession -import com.couplesconnect.app.ui.components.EmptyState -import com.couplesconnect.app.ui.components.ErrorState -import com.couplesconnect.app.ui.components.LoadingState -import com.couplesconnect.app.ui.questions.displayCategoryName +import app.closer.core.navigation.AppRoute +import app.closer.domain.model.QuestionSession +import app.closer.ui.components.EmptyState +import app.closer.ui.components.ErrorState +import app.closer.ui.components.LoadingState +import app.closer.ui.questions.displayCategoryName import java.text.SimpleDateFormat import java.util.Date import java.util.Locale diff --git a/app/src/main/java/com/couplesconnect/app/ui/wheel/WheelHistoryViewModel.kt b/app/src/main/java/app/closer/ui/wheel/WheelHistoryViewModel.kt similarity index 83% rename from app/src/main/java/com/couplesconnect/app/ui/wheel/WheelHistoryViewModel.kt rename to app/src/main/java/app/closer/ui/wheel/WheelHistoryViewModel.kt index 532ef9b8..4e9bb12d 100644 --- a/app/src/main/java/com/couplesconnect/app/ui/wheel/WheelHistoryViewModel.kt +++ b/app/src/main/java/app/closer/ui/wheel/WheelHistoryViewModel.kt @@ -1,12 +1,12 @@ -package com.couplesconnect.app.ui.wheel +package app.closer.ui.wheel import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import com.couplesconnect.app.core.billing.EntitlementChecker -import com.couplesconnect.app.domain.model.QuestionSession -import com.couplesconnect.app.domain.repository.AuthRepository -import com.couplesconnect.app.domain.repository.CoupleRepository -import com.couplesconnect.app.domain.repository.QuestionSessionRepository +import app.closer.core.billing.EntitlementChecker +import app.closer.domain.model.QuestionSession +import app.closer.domain.repository.AuthRepository +import app.closer.domain.repository.CoupleRepository +import app.closer.domain.repository.QuestionSessionRepository import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow diff --git a/app/src/main/java/com/couplesconnect/app/ui/wheel/WheelSessionScreen.kt b/app/src/main/java/app/closer/ui/wheel/WheelSessionScreen.kt similarity index 98% rename from app/src/main/java/com/couplesconnect/app/ui/wheel/WheelSessionScreen.kt rename to app/src/main/java/app/closer/ui/wheel/WheelSessionScreen.kt index 2f9b5cd5..23a95f6c 100644 --- a/app/src/main/java/com/couplesconnect/app/ui/wheel/WheelSessionScreen.kt +++ b/app/src/main/java/app/closer/ui/wheel/WheelSessionScreen.kt @@ -1,4 +1,4 @@ -package com.couplesconnect.app.ui.wheel +package app.closer.ui.wheel import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement @@ -35,7 +35,7 @@ import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import androidx.hilt.navigation.compose.hiltViewModel -import com.couplesconnect.app.domain.model.Question +import app.closer.domain.model.Question @Composable fun WheelSessionScreen( diff --git a/app/src/main/java/com/couplesconnect/app/ui/wheel/WheelSessionViewModel.kt b/app/src/main/java/app/closer/ui/wheel/WheelSessionViewModel.kt similarity index 93% rename from app/src/main/java/com/couplesconnect/app/ui/wheel/WheelSessionViewModel.kt rename to app/src/main/java/app/closer/ui/wheel/WheelSessionViewModel.kt index 7dd4b4d7..b2d02990 100644 --- a/app/src/main/java/com/couplesconnect/app/ui/wheel/WheelSessionViewModel.kt +++ b/app/src/main/java/app/closer/ui/wheel/WheelSessionViewModel.kt @@ -1,8 +1,8 @@ -package com.couplesconnect.app.ui.wheel +package app.closer.ui.wheel import androidx.lifecycle.ViewModel -import com.couplesconnect.app.core.navigation.AppRoute -import com.couplesconnect.app.domain.model.Question +import app.closer.core.navigation.AppRoute +import app.closer.domain.model.Question import dagger.hilt.android.lifecycle.HiltViewModel import javax.inject.Inject import kotlinx.coroutines.flow.MutableStateFlow diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 766beb48..9bddc250 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,4 +1,4 @@ - Couples Connect + Closer diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml index 97dee23e..7d75ce1b 100644 --- a/app/src/main/res/values/themes.xml +++ b/app/src/main/res/values/themes.xml @@ -1,4 +1,4 @@ -