From 641da8391a522d16d84aae0eeed8529ad0b8e63d Mon Sep 17 00:00:00 2001 From: AndroidPoet Date: Thu, 27 Oct 2022 09:27:25 +0530 Subject: [PATCH 1/2] core and features modules moved to sub-folders --- app/build.gradle.kts | 14 +++++------ .../kotlin/AndroidFeatureConventionPlugin.kt | 8 +++---- {core-data => core/data}/.gitignore | 0 {core-data => core/data}/build.gradle.kts | 6 ++--- .../data}/src/main/AndroidManifest.xml | 0 .../coroutines/WhileSubscribedOrRetained.kt | 0 .../whatsappclone/data/di/DataModule.kt | 0 .../whatsappclone/data/model/Mappers.kt | 0 .../data/repository/CallHistoryRepository.kt | 0 .../repository/CallHistoryRepositoryImpl.kt | 0 {core-database => core/database}/.gitignore | 0 .../database}/build.gradle.kts | 2 +- .../1.json | 0 .../database}/src/main/AndroidManifest.xml | 0 .../database/WhatsAppCloneDataBase.kt | 0 .../database/dao/WhatsAppUserDao.kt | 0 .../database/di/DatabaseModule.kt | 0 .../database/entity/WhatsAppUserEntity.kt | 0 .../designsystem}/.gitignore | 0 .../designsystem}/build.gradle.kts | 0 .../src/main/AndroidManifest.xml | 0 .../designsystem/component/Background.kt | 0 .../designsystem/component/WhatsAppError.kt | 0 .../component/WhatsAppLoadingColumn.kt | 0 .../component/WhatsAppLoadingIndicator.kt | 0 .../designsystem/icon/WhatsAppIcons.kt | 0 .../designsystem/theme/Background.kt | 0 .../whatsappclone/designsystem/theme/Color.kt | 0 .../whatsappclone/designsystem/theme/Theme.kt | 0 .../designsystem/theme/Typography.kt | 0 .../src/main/res/drawable/placeholder.jpeg | Bin .../src/main/res/drawable/stream_logo.jpg | Bin .../src/main/res/values/strings.xml | 0 {core-model => core/model}/.gitignore | 0 {core-model => core/model}/build.gradle.kts | 0 .../model}/src/main/AndroidManifest.xml | 0 .../whatsappclone/model/WhatsAppUser.kt | 0 .../navigation}/.gitignore | 0 .../navigation}/build.gradle.kts | 2 +- .../navigation}/src/main/AndroidManifest.xml | 0 .../navigation/NavigationCommand.kt | 0 .../navigation/NavigationModule.kt | 0 .../whatsappclone/navigation/Navigator.kt | 0 .../WhatsAppCloneComposeNavigator.kt | 0 .../navigation/WhatsAppScreens.kt | 0 .../navigation/navtypes/WhatsAppUserType.kt | 0 {core-network => core/network}/.gitignore | 0 .../network}/build.gradle.kts | 2 +- .../network}/src/main/AndroidManifest.xml | 0 .../network/WhatsAppDispatchers.kt | 0 .../network/di/DispatchersModule.kt | 0 .../whatsappclone/network/di/NetworkModule.kt | 0 .../network/service/WhatsAppUserService.kt | 0 {core-uistate => core/uistate}/.gitignore | 0 .../uistate}/build.gradle.kts | 2 +- .../uistate}/src/main/AndroidManifest.xml | 0 .../whatsappclone/uistate/UiState.kt | 0 .../uistate/WhatsAppUserExtensive.kt | 0 {feature-calls => feature/calls}/.gitignore | 0 .../calls}/build.gradle.kts | 4 ++-- .../calls}/src/main/AndroidManifest.xml | 0 .../calls/WhatsAppCallHistory.kt | 0 .../whatsappclone/calls/WhatsAppCalls.kt | 0 .../calls/WhatsAppCallsViewModel.kt | 0 .../calls/info/WhatsAppCallHistoryInfo.kt | 0 .../calls/info/WhatsAppCallHistoryInfoBody.kt | 0 .../calls/info/WhatsAppCallHistoryTopBar.kt | 0 .../calls}/src/main/res/values/strings.xml | 0 {feature-camera => feature/camera}/.gitignore | 0 .../camera}/build.gradle.kts | 0 .../camera}/src/main/AndroidManifest.xml | 0 .../whatsappclone/camera/WhatsAppCamera.kt | 0 {feature-chats => feature/chats}/.gitignore | 0 .../chats}/build.gradle.kts | 6 ++--- .../chats}/src/main/AndroidManifest.xml | 0 .../whatsappclone/chats/WhatsAppChannels.kt | 0 .../whatsappclone/chats/di/ChatModule.kt | 0 .../initializer/StreamChatInitializer.kt | 0 .../chats/initializer/TimberInitializer.kt | 0 .../chats/messages/WhatsAppMessageTopBar.kt | 0 .../chats/messages/WhatsAppMessages.kt | 0 .../messages/WhatsAppMessagesViewModel.kt | 0 .../reactions/WhatsAppCloneReactionFactory.kt | 0 .../chats/theme/WhatsAppChatTheme.kt | 0 .../chats}/src/main/res/drawable/joy.png | Bin .../chats}/src/main/res/drawable/love.png | Bin .../chats}/src/main/res/drawable/smile.png | Bin .../chats}/src/main/res/drawable/thumbsup.png | Bin .../chats}/src/main/res/drawable/wink.png | Bin .../chats}/src/main/res/values/strings.xml | 0 {feature-status => feature/status}/.gitignore | 0 .../status}/build.gradle.kts | 0 .../status}/src/main/AndroidManifest.xml | 0 .../whatsappclone/status/WhatsAppStatus.kt | 0 .../status}/src/main/res/values/strings.xml | 0 settings.gradle.kts | 22 +++++++++--------- 96 files changed, 34 insertions(+), 34 deletions(-) rename {core-data => core/data}/.gitignore (100%) rename {core-data => core/data}/build.gradle.kts (88%) rename {core-data => core/data}/src/main/AndroidManifest.xml (100%) rename {core-data => core/data}/src/main/kotlin/io/getstream/whatsappclone/data/coroutines/WhileSubscribedOrRetained.kt (100%) rename {core-data => core/data}/src/main/kotlin/io/getstream/whatsappclone/data/di/DataModule.kt (100%) rename {core-data => core/data}/src/main/kotlin/io/getstream/whatsappclone/data/model/Mappers.kt (100%) rename {core-data => core/data}/src/main/kotlin/io/getstream/whatsappclone/data/repository/CallHistoryRepository.kt (100%) rename {core-data => core/data}/src/main/kotlin/io/getstream/whatsappclone/data/repository/CallHistoryRepositoryImpl.kt (100%) rename {core-database => core/database}/.gitignore (100%) rename {core-database => core/database}/build.gradle.kts (96%) rename {core-database => core/database}/schemas/io.getstream.whatsappclone.database.WhatsAppCloneDataBase/1.json (100%) rename {core-database => core/database}/src/main/AndroidManifest.xml (100%) rename {core-database => core/database}/src/main/kotlin/io/getstream/whatsappclone/database/WhatsAppCloneDataBase.kt (100%) rename {core-database => core/database}/src/main/kotlin/io/getstream/whatsappclone/database/dao/WhatsAppUserDao.kt (100%) rename {core-database => core/database}/src/main/kotlin/io/getstream/whatsappclone/database/di/DatabaseModule.kt (100%) rename {core-database => core/database}/src/main/kotlin/io/getstream/whatsappclone/database/entity/WhatsAppUserEntity.kt (100%) rename {core-designsystem => core/designsystem}/.gitignore (100%) rename {core-designsystem => core/designsystem}/build.gradle.kts (100%) rename {core-designsystem => core/designsystem}/src/main/AndroidManifest.xml (100%) rename {core-designsystem => core/designsystem}/src/main/kotlin/io/getstream/whatsappclone/designsystem/component/Background.kt (100%) rename {core-designsystem => core/designsystem}/src/main/kotlin/io/getstream/whatsappclone/designsystem/component/WhatsAppError.kt (100%) rename {core-designsystem => core/designsystem}/src/main/kotlin/io/getstream/whatsappclone/designsystem/component/WhatsAppLoadingColumn.kt (100%) rename {core-designsystem => core/designsystem}/src/main/kotlin/io/getstream/whatsappclone/designsystem/component/WhatsAppLoadingIndicator.kt (100%) rename {core-designsystem => core/designsystem}/src/main/kotlin/io/getstream/whatsappclone/designsystem/icon/WhatsAppIcons.kt (100%) rename {core-designsystem => core/designsystem}/src/main/kotlin/io/getstream/whatsappclone/designsystem/theme/Background.kt (100%) rename {core-designsystem => core/designsystem}/src/main/kotlin/io/getstream/whatsappclone/designsystem/theme/Color.kt (100%) rename {core-designsystem => core/designsystem}/src/main/kotlin/io/getstream/whatsappclone/designsystem/theme/Theme.kt (100%) rename {core-designsystem => core/designsystem}/src/main/kotlin/io/getstream/whatsappclone/designsystem/theme/Typography.kt (100%) rename {core-designsystem => core/designsystem}/src/main/res/drawable/placeholder.jpeg (100%) rename {core-designsystem => core/designsystem}/src/main/res/drawable/stream_logo.jpg (100%) rename {core-designsystem => core/designsystem}/src/main/res/values/strings.xml (100%) rename {core-model => core/model}/.gitignore (100%) rename {core-model => core/model}/build.gradle.kts (100%) rename {core-model => core/model}/src/main/AndroidManifest.xml (100%) rename {core-model => core/model}/src/main/kotlin/io/getstream/whatsappclone/model/WhatsAppUser.kt (100%) rename {core-navigation => core/navigation}/.gitignore (100%) rename {core-navigation => core/navigation}/build.gradle.kts (95%) rename {core-navigation => core/navigation}/src/main/AndroidManifest.xml (100%) rename {core-navigation => core/navigation}/src/main/kotlin/io/getstream/whatsappclone/navigation/NavigationCommand.kt (100%) rename {core-navigation => core/navigation}/src/main/kotlin/io/getstream/whatsappclone/navigation/NavigationModule.kt (100%) rename {core-navigation => core/navigation}/src/main/kotlin/io/getstream/whatsappclone/navigation/Navigator.kt (100%) rename {core-navigation => core/navigation}/src/main/kotlin/io/getstream/whatsappclone/navigation/WhatsAppCloneComposeNavigator.kt (100%) rename {core-navigation => core/navigation}/src/main/kotlin/io/getstream/whatsappclone/navigation/WhatsAppScreens.kt (100%) rename {core-navigation => core/navigation}/src/main/kotlin/io/getstream/whatsappclone/navigation/navtypes/WhatsAppUserType.kt (100%) rename {core-network => core/network}/.gitignore (100%) rename {core-network => core/network}/build.gradle.kts (95%) rename {core-network => core/network}/src/main/AndroidManifest.xml (100%) rename {core-network => core/network}/src/main/kotlin/io/getstream/whatsappclone/network/WhatsAppDispatchers.kt (100%) rename {core-network => core/network}/src/main/kotlin/io/getstream/whatsappclone/network/di/DispatchersModule.kt (100%) rename {core-network => core/network}/src/main/kotlin/io/getstream/whatsappclone/network/di/NetworkModule.kt (100%) rename {core-network => core/network}/src/main/kotlin/io/getstream/whatsappclone/network/service/WhatsAppUserService.kt (100%) rename {core-uistate => core/uistate}/.gitignore (100%) rename {core-uistate => core/uistate}/build.gradle.kts (96%) rename {core-uistate => core/uistate}/src/main/AndroidManifest.xml (100%) rename {core-uistate => core/uistate}/src/main/kotlin/io/getstream/whatsappclone/uistate/UiState.kt (100%) rename {core-uistate => core/uistate}/src/main/kotlin/io/getstream/whatsappclone/uistate/WhatsAppUserExtensive.kt (100%) rename {feature-calls => feature/calls}/.gitignore (100%) rename {feature-calls => feature/calls}/build.gradle.kts (92%) rename {feature-calls => feature/calls}/src/main/AndroidManifest.xml (100%) rename {feature-calls => feature/calls}/src/main/kotlin/io/getstream/whatsappclone/calls/WhatsAppCallHistory.kt (100%) rename {feature-calls => feature/calls}/src/main/kotlin/io/getstream/whatsappclone/calls/WhatsAppCalls.kt (100%) rename {feature-calls => feature/calls}/src/main/kotlin/io/getstream/whatsappclone/calls/WhatsAppCallsViewModel.kt (100%) rename {feature-calls => feature/calls}/src/main/kotlin/io/getstream/whatsappclone/calls/info/WhatsAppCallHistoryInfo.kt (100%) rename {feature-calls => feature/calls}/src/main/kotlin/io/getstream/whatsappclone/calls/info/WhatsAppCallHistoryInfoBody.kt (100%) rename {feature-calls => feature/calls}/src/main/kotlin/io/getstream/whatsappclone/calls/info/WhatsAppCallHistoryTopBar.kt (100%) rename {feature-calls => feature/calls}/src/main/res/values/strings.xml (100%) rename {feature-camera => feature/camera}/.gitignore (100%) rename {feature-camera => feature/camera}/build.gradle.kts (100%) rename {feature-camera => feature/camera}/src/main/AndroidManifest.xml (100%) rename {feature-camera => feature/camera}/src/main/kotlin/io/getstream/whatsappclone/camera/WhatsAppCamera.kt (100%) rename {feature-chats => feature/chats}/.gitignore (100%) rename {feature-chats => feature/chats}/build.gradle.kts (89%) rename {feature-chats => feature/chats}/src/main/AndroidManifest.xml (100%) rename {feature-chats => feature/chats}/src/main/kotlin/io/getstream/whatsappclone/chats/WhatsAppChannels.kt (100%) rename {feature-chats => feature/chats}/src/main/kotlin/io/getstream/whatsappclone/chats/di/ChatModule.kt (100%) rename {feature-chats => feature/chats}/src/main/kotlin/io/getstream/whatsappclone/chats/initializer/StreamChatInitializer.kt (100%) rename {feature-chats => feature/chats}/src/main/kotlin/io/getstream/whatsappclone/chats/initializer/TimberInitializer.kt (100%) rename {feature-chats => feature/chats}/src/main/kotlin/io/getstream/whatsappclone/chats/messages/WhatsAppMessageTopBar.kt (100%) rename {feature-chats => feature/chats}/src/main/kotlin/io/getstream/whatsappclone/chats/messages/WhatsAppMessages.kt (100%) rename {feature-chats => feature/chats}/src/main/kotlin/io/getstream/whatsappclone/chats/messages/WhatsAppMessagesViewModel.kt (100%) rename {feature-chats => feature/chats}/src/main/kotlin/io/getstream/whatsappclone/chats/reactions/WhatsAppCloneReactionFactory.kt (100%) rename {feature-chats => feature/chats}/src/main/kotlin/io/getstream/whatsappclone/chats/theme/WhatsAppChatTheme.kt (100%) rename {feature-chats => feature/chats}/src/main/res/drawable/joy.png (100%) rename {feature-chats => feature/chats}/src/main/res/drawable/love.png (100%) rename {feature-chats => feature/chats}/src/main/res/drawable/smile.png (100%) rename {feature-chats => feature/chats}/src/main/res/drawable/thumbsup.png (100%) rename {feature-chats => feature/chats}/src/main/res/drawable/wink.png (100%) rename {feature-chats => feature/chats}/src/main/res/values/strings.xml (100%) rename {feature-status => feature/status}/.gitignore (100%) rename {feature-status => feature/status}/build.gradle.kts (100%) rename {feature-status => feature/status}/src/main/AndroidManifest.xml (100%) rename {feature-status => feature/status}/src/main/kotlin/io/getstream/whatsappclone/status/WhatsAppStatus.kt (100%) rename {feature-status => feature/status}/src/main/res/values/strings.xml (100%) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 220c680..78aa980 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -51,15 +51,15 @@ android { dependencies { // core modules - implementation(project(":core-designsystem")) - implementation(project(":core-navigation")) - implementation(project(":core-data")) + implementation(project(":core:designsystem")) + implementation(project(":core:navigation")) + implementation(project(":core:data")) // feature modules - implementation(project(":feature-camera")) - implementation(project(":feature-chats")) - implementation(project(":feature-status")) - implementation(project(":feature-calls")) + implementation(project(":feature:camera")) + implementation(project(":feature:chats")) + implementation(project(":feature:status")) + implementation(project(":feature:calls")) // material implementation(libs.androidx.appcompat) diff --git a/build-logic/convention/src/main/kotlin/AndroidFeatureConventionPlugin.kt b/build-logic/convention/src/main/kotlin/AndroidFeatureConventionPlugin.kt index d956335..dc579a9 100644 --- a/build-logic/convention/src/main/kotlin/AndroidFeatureConventionPlugin.kt +++ b/build-logic/convention/src/main/kotlin/AndroidFeatureConventionPlugin.kt @@ -15,10 +15,10 @@ class AndroidFeatureConventionPlugin : Plugin { val libs = extensions.getByType().named("libs") dependencies { - add("implementation", project(":core-designsystem")) - add("implementation", project(":core-navigation")) - add("implementation", project(":core-uistate")) - add("implementation", project(":core-data")) + add("implementation", project(":core:designsystem")) + add("implementation", project(":core:navigation")) + add("implementation", project(":core:uistate")) + add("implementation", project(":core:data")) add("implementation", libs.findLibrary("kotlinx.coroutines.android").get()) } diff --git a/core-data/.gitignore b/core/data/.gitignore similarity index 100% rename from core-data/.gitignore rename to core/data/.gitignore diff --git a/core-data/build.gradle.kts b/core/data/build.gradle.kts similarity index 88% rename from core-data/build.gradle.kts rename to core/data/build.gradle.kts index 9065d7c..a7d64ee 100644 --- a/core-data/build.gradle.kts +++ b/core/data/build.gradle.kts @@ -20,7 +20,7 @@ plugins { } dependencies { - api(project(":core-model")) - api(project(":core-network")) - api(project(":core-database")) + api(project(":core:model")) + api(project(":core:network")) + api(project(":core:database")) } diff --git a/core-data/src/main/AndroidManifest.xml b/core/data/src/main/AndroidManifest.xml similarity index 100% rename from core-data/src/main/AndroidManifest.xml rename to core/data/src/main/AndroidManifest.xml diff --git a/core-data/src/main/kotlin/io/getstream/whatsappclone/data/coroutines/WhileSubscribedOrRetained.kt b/core/data/src/main/kotlin/io/getstream/whatsappclone/data/coroutines/WhileSubscribedOrRetained.kt similarity index 100% rename from core-data/src/main/kotlin/io/getstream/whatsappclone/data/coroutines/WhileSubscribedOrRetained.kt rename to core/data/src/main/kotlin/io/getstream/whatsappclone/data/coroutines/WhileSubscribedOrRetained.kt diff --git a/core-data/src/main/kotlin/io/getstream/whatsappclone/data/di/DataModule.kt b/core/data/src/main/kotlin/io/getstream/whatsappclone/data/di/DataModule.kt similarity index 100% rename from core-data/src/main/kotlin/io/getstream/whatsappclone/data/di/DataModule.kt rename to core/data/src/main/kotlin/io/getstream/whatsappclone/data/di/DataModule.kt diff --git a/core-data/src/main/kotlin/io/getstream/whatsappclone/data/model/Mappers.kt b/core/data/src/main/kotlin/io/getstream/whatsappclone/data/model/Mappers.kt similarity index 100% rename from core-data/src/main/kotlin/io/getstream/whatsappclone/data/model/Mappers.kt rename to core/data/src/main/kotlin/io/getstream/whatsappclone/data/model/Mappers.kt diff --git a/core-data/src/main/kotlin/io/getstream/whatsappclone/data/repository/CallHistoryRepository.kt b/core/data/src/main/kotlin/io/getstream/whatsappclone/data/repository/CallHistoryRepository.kt similarity index 100% rename from core-data/src/main/kotlin/io/getstream/whatsappclone/data/repository/CallHistoryRepository.kt rename to core/data/src/main/kotlin/io/getstream/whatsappclone/data/repository/CallHistoryRepository.kt diff --git a/core-data/src/main/kotlin/io/getstream/whatsappclone/data/repository/CallHistoryRepositoryImpl.kt b/core/data/src/main/kotlin/io/getstream/whatsappclone/data/repository/CallHistoryRepositoryImpl.kt similarity index 100% rename from core-data/src/main/kotlin/io/getstream/whatsappclone/data/repository/CallHistoryRepositoryImpl.kt rename to core/data/src/main/kotlin/io/getstream/whatsappclone/data/repository/CallHistoryRepositoryImpl.kt diff --git a/core-database/.gitignore b/core/database/.gitignore similarity index 100% rename from core-database/.gitignore rename to core/database/.gitignore diff --git a/core-database/build.gradle.kts b/core/database/build.gradle.kts similarity index 96% rename from core-database/build.gradle.kts rename to core/database/build.gradle.kts index 4074141..2428ce5 100644 --- a/core-database/build.gradle.kts +++ b/core/database/build.gradle.kts @@ -32,7 +32,7 @@ android { } dependencies { - implementation(project(":core-model")) + implementation(project(":core:model")) implementation(libs.androidx.room.runtime) implementation(libs.androidx.room.ktx) diff --git a/core-database/schemas/io.getstream.whatsappclone.database.WhatsAppCloneDataBase/1.json b/core/database/schemas/io.getstream.whatsappclone.database.WhatsAppCloneDataBase/1.json similarity index 100% rename from core-database/schemas/io.getstream.whatsappclone.database.WhatsAppCloneDataBase/1.json rename to core/database/schemas/io.getstream.whatsappclone.database.WhatsAppCloneDataBase/1.json diff --git a/core-database/src/main/AndroidManifest.xml b/core/database/src/main/AndroidManifest.xml similarity index 100% rename from core-database/src/main/AndroidManifest.xml rename to core/database/src/main/AndroidManifest.xml diff --git a/core-database/src/main/kotlin/io/getstream/whatsappclone/database/WhatsAppCloneDataBase.kt b/core/database/src/main/kotlin/io/getstream/whatsappclone/database/WhatsAppCloneDataBase.kt similarity index 100% rename from core-database/src/main/kotlin/io/getstream/whatsappclone/database/WhatsAppCloneDataBase.kt rename to core/database/src/main/kotlin/io/getstream/whatsappclone/database/WhatsAppCloneDataBase.kt diff --git a/core-database/src/main/kotlin/io/getstream/whatsappclone/database/dao/WhatsAppUserDao.kt b/core/database/src/main/kotlin/io/getstream/whatsappclone/database/dao/WhatsAppUserDao.kt similarity index 100% rename from core-database/src/main/kotlin/io/getstream/whatsappclone/database/dao/WhatsAppUserDao.kt rename to core/database/src/main/kotlin/io/getstream/whatsappclone/database/dao/WhatsAppUserDao.kt diff --git a/core-database/src/main/kotlin/io/getstream/whatsappclone/database/di/DatabaseModule.kt b/core/database/src/main/kotlin/io/getstream/whatsappclone/database/di/DatabaseModule.kt similarity index 100% rename from core-database/src/main/kotlin/io/getstream/whatsappclone/database/di/DatabaseModule.kt rename to core/database/src/main/kotlin/io/getstream/whatsappclone/database/di/DatabaseModule.kt diff --git a/core-database/src/main/kotlin/io/getstream/whatsappclone/database/entity/WhatsAppUserEntity.kt b/core/database/src/main/kotlin/io/getstream/whatsappclone/database/entity/WhatsAppUserEntity.kt similarity index 100% rename from core-database/src/main/kotlin/io/getstream/whatsappclone/database/entity/WhatsAppUserEntity.kt rename to core/database/src/main/kotlin/io/getstream/whatsappclone/database/entity/WhatsAppUserEntity.kt diff --git a/core-designsystem/.gitignore b/core/designsystem/.gitignore similarity index 100% rename from core-designsystem/.gitignore rename to core/designsystem/.gitignore diff --git a/core-designsystem/build.gradle.kts b/core/designsystem/build.gradle.kts similarity index 100% rename from core-designsystem/build.gradle.kts rename to core/designsystem/build.gradle.kts diff --git a/core-designsystem/src/main/AndroidManifest.xml b/core/designsystem/src/main/AndroidManifest.xml similarity index 100% rename from core-designsystem/src/main/AndroidManifest.xml rename to core/designsystem/src/main/AndroidManifest.xml diff --git a/core-designsystem/src/main/kotlin/io/getstream/whatsappclone/designsystem/component/Background.kt b/core/designsystem/src/main/kotlin/io/getstream/whatsappclone/designsystem/component/Background.kt similarity index 100% rename from core-designsystem/src/main/kotlin/io/getstream/whatsappclone/designsystem/component/Background.kt rename to core/designsystem/src/main/kotlin/io/getstream/whatsappclone/designsystem/component/Background.kt diff --git a/core-designsystem/src/main/kotlin/io/getstream/whatsappclone/designsystem/component/WhatsAppError.kt b/core/designsystem/src/main/kotlin/io/getstream/whatsappclone/designsystem/component/WhatsAppError.kt similarity index 100% rename from core-designsystem/src/main/kotlin/io/getstream/whatsappclone/designsystem/component/WhatsAppError.kt rename to core/designsystem/src/main/kotlin/io/getstream/whatsappclone/designsystem/component/WhatsAppError.kt diff --git a/core-designsystem/src/main/kotlin/io/getstream/whatsappclone/designsystem/component/WhatsAppLoadingColumn.kt b/core/designsystem/src/main/kotlin/io/getstream/whatsappclone/designsystem/component/WhatsAppLoadingColumn.kt similarity index 100% rename from core-designsystem/src/main/kotlin/io/getstream/whatsappclone/designsystem/component/WhatsAppLoadingColumn.kt rename to core/designsystem/src/main/kotlin/io/getstream/whatsappclone/designsystem/component/WhatsAppLoadingColumn.kt diff --git a/core-designsystem/src/main/kotlin/io/getstream/whatsappclone/designsystem/component/WhatsAppLoadingIndicator.kt b/core/designsystem/src/main/kotlin/io/getstream/whatsappclone/designsystem/component/WhatsAppLoadingIndicator.kt similarity index 100% rename from core-designsystem/src/main/kotlin/io/getstream/whatsappclone/designsystem/component/WhatsAppLoadingIndicator.kt rename to core/designsystem/src/main/kotlin/io/getstream/whatsappclone/designsystem/component/WhatsAppLoadingIndicator.kt diff --git a/core-designsystem/src/main/kotlin/io/getstream/whatsappclone/designsystem/icon/WhatsAppIcons.kt b/core/designsystem/src/main/kotlin/io/getstream/whatsappclone/designsystem/icon/WhatsAppIcons.kt similarity index 100% rename from core-designsystem/src/main/kotlin/io/getstream/whatsappclone/designsystem/icon/WhatsAppIcons.kt rename to core/designsystem/src/main/kotlin/io/getstream/whatsappclone/designsystem/icon/WhatsAppIcons.kt diff --git a/core-designsystem/src/main/kotlin/io/getstream/whatsappclone/designsystem/theme/Background.kt b/core/designsystem/src/main/kotlin/io/getstream/whatsappclone/designsystem/theme/Background.kt similarity index 100% rename from core-designsystem/src/main/kotlin/io/getstream/whatsappclone/designsystem/theme/Background.kt rename to core/designsystem/src/main/kotlin/io/getstream/whatsappclone/designsystem/theme/Background.kt diff --git a/core-designsystem/src/main/kotlin/io/getstream/whatsappclone/designsystem/theme/Color.kt b/core/designsystem/src/main/kotlin/io/getstream/whatsappclone/designsystem/theme/Color.kt similarity index 100% rename from core-designsystem/src/main/kotlin/io/getstream/whatsappclone/designsystem/theme/Color.kt rename to core/designsystem/src/main/kotlin/io/getstream/whatsappclone/designsystem/theme/Color.kt diff --git a/core-designsystem/src/main/kotlin/io/getstream/whatsappclone/designsystem/theme/Theme.kt b/core/designsystem/src/main/kotlin/io/getstream/whatsappclone/designsystem/theme/Theme.kt similarity index 100% rename from core-designsystem/src/main/kotlin/io/getstream/whatsappclone/designsystem/theme/Theme.kt rename to core/designsystem/src/main/kotlin/io/getstream/whatsappclone/designsystem/theme/Theme.kt diff --git a/core-designsystem/src/main/kotlin/io/getstream/whatsappclone/designsystem/theme/Typography.kt b/core/designsystem/src/main/kotlin/io/getstream/whatsappclone/designsystem/theme/Typography.kt similarity index 100% rename from core-designsystem/src/main/kotlin/io/getstream/whatsappclone/designsystem/theme/Typography.kt rename to core/designsystem/src/main/kotlin/io/getstream/whatsappclone/designsystem/theme/Typography.kt diff --git a/core-designsystem/src/main/res/drawable/placeholder.jpeg b/core/designsystem/src/main/res/drawable/placeholder.jpeg similarity index 100% rename from core-designsystem/src/main/res/drawable/placeholder.jpeg rename to core/designsystem/src/main/res/drawable/placeholder.jpeg diff --git a/core-designsystem/src/main/res/drawable/stream_logo.jpg b/core/designsystem/src/main/res/drawable/stream_logo.jpg similarity index 100% rename from core-designsystem/src/main/res/drawable/stream_logo.jpg rename to core/designsystem/src/main/res/drawable/stream_logo.jpg diff --git a/core-designsystem/src/main/res/values/strings.xml b/core/designsystem/src/main/res/values/strings.xml similarity index 100% rename from core-designsystem/src/main/res/values/strings.xml rename to core/designsystem/src/main/res/values/strings.xml diff --git a/core-model/.gitignore b/core/model/.gitignore similarity index 100% rename from core-model/.gitignore rename to core/model/.gitignore diff --git a/core-model/build.gradle.kts b/core/model/build.gradle.kts similarity index 100% rename from core-model/build.gradle.kts rename to core/model/build.gradle.kts diff --git a/core-model/src/main/AndroidManifest.xml b/core/model/src/main/AndroidManifest.xml similarity index 100% rename from core-model/src/main/AndroidManifest.xml rename to core/model/src/main/AndroidManifest.xml diff --git a/core-model/src/main/kotlin/io/getstream/whatsappclone/model/WhatsAppUser.kt b/core/model/src/main/kotlin/io/getstream/whatsappclone/model/WhatsAppUser.kt similarity index 100% rename from core-model/src/main/kotlin/io/getstream/whatsappclone/model/WhatsAppUser.kt rename to core/model/src/main/kotlin/io/getstream/whatsappclone/model/WhatsAppUser.kt diff --git a/core-navigation/.gitignore b/core/navigation/.gitignore similarity index 100% rename from core-navigation/.gitignore rename to core/navigation/.gitignore diff --git a/core-navigation/build.gradle.kts b/core/navigation/build.gradle.kts similarity index 95% rename from core-navigation/build.gradle.kts rename to core/navigation/build.gradle.kts index 4973e2d..d9777b0 100644 --- a/core-navigation/build.gradle.kts +++ b/core/navigation/build.gradle.kts @@ -21,7 +21,7 @@ plugins { } dependencies { - implementation(project(":core-model")) + implementation(project(":core:model")) implementation(libs.kotlinx.coroutines.android) api(libs.androidx.navigation.compose) diff --git a/core-navigation/src/main/AndroidManifest.xml b/core/navigation/src/main/AndroidManifest.xml similarity index 100% rename from core-navigation/src/main/AndroidManifest.xml rename to core/navigation/src/main/AndroidManifest.xml diff --git a/core-navigation/src/main/kotlin/io/getstream/whatsappclone/navigation/NavigationCommand.kt b/core/navigation/src/main/kotlin/io/getstream/whatsappclone/navigation/NavigationCommand.kt similarity index 100% rename from core-navigation/src/main/kotlin/io/getstream/whatsappclone/navigation/NavigationCommand.kt rename to core/navigation/src/main/kotlin/io/getstream/whatsappclone/navigation/NavigationCommand.kt diff --git a/core-navigation/src/main/kotlin/io/getstream/whatsappclone/navigation/NavigationModule.kt b/core/navigation/src/main/kotlin/io/getstream/whatsappclone/navigation/NavigationModule.kt similarity index 100% rename from core-navigation/src/main/kotlin/io/getstream/whatsappclone/navigation/NavigationModule.kt rename to core/navigation/src/main/kotlin/io/getstream/whatsappclone/navigation/NavigationModule.kt diff --git a/core-navigation/src/main/kotlin/io/getstream/whatsappclone/navigation/Navigator.kt b/core/navigation/src/main/kotlin/io/getstream/whatsappclone/navigation/Navigator.kt similarity index 100% rename from core-navigation/src/main/kotlin/io/getstream/whatsappclone/navigation/Navigator.kt rename to core/navigation/src/main/kotlin/io/getstream/whatsappclone/navigation/Navigator.kt diff --git a/core-navigation/src/main/kotlin/io/getstream/whatsappclone/navigation/WhatsAppCloneComposeNavigator.kt b/core/navigation/src/main/kotlin/io/getstream/whatsappclone/navigation/WhatsAppCloneComposeNavigator.kt similarity index 100% rename from core-navigation/src/main/kotlin/io/getstream/whatsappclone/navigation/WhatsAppCloneComposeNavigator.kt rename to core/navigation/src/main/kotlin/io/getstream/whatsappclone/navigation/WhatsAppCloneComposeNavigator.kt diff --git a/core-navigation/src/main/kotlin/io/getstream/whatsappclone/navigation/WhatsAppScreens.kt b/core/navigation/src/main/kotlin/io/getstream/whatsappclone/navigation/WhatsAppScreens.kt similarity index 100% rename from core-navigation/src/main/kotlin/io/getstream/whatsappclone/navigation/WhatsAppScreens.kt rename to core/navigation/src/main/kotlin/io/getstream/whatsappclone/navigation/WhatsAppScreens.kt diff --git a/core-navigation/src/main/kotlin/io/getstream/whatsappclone/navigation/navtypes/WhatsAppUserType.kt b/core/navigation/src/main/kotlin/io/getstream/whatsappclone/navigation/navtypes/WhatsAppUserType.kt similarity index 100% rename from core-navigation/src/main/kotlin/io/getstream/whatsappclone/navigation/navtypes/WhatsAppUserType.kt rename to core/navigation/src/main/kotlin/io/getstream/whatsappclone/navigation/navtypes/WhatsAppUserType.kt diff --git a/core-network/.gitignore b/core/network/.gitignore similarity index 100% rename from core-network/.gitignore rename to core/network/.gitignore diff --git a/core-network/build.gradle.kts b/core/network/build.gradle.kts similarity index 95% rename from core-network/build.gradle.kts rename to core/network/build.gradle.kts index 443e8cf..5c198f6 100644 --- a/core-network/build.gradle.kts +++ b/core/network/build.gradle.kts @@ -21,7 +21,7 @@ plugins { } dependencies { - implementation(project(":core-model")) + implementation(project(":core:model")) api(libs.okhttp.logging) api(libs.retrofit.core) diff --git a/core-network/src/main/AndroidManifest.xml b/core/network/src/main/AndroidManifest.xml similarity index 100% rename from core-network/src/main/AndroidManifest.xml rename to core/network/src/main/AndroidManifest.xml diff --git a/core-network/src/main/kotlin/io/getstream/whatsappclone/network/WhatsAppDispatchers.kt b/core/network/src/main/kotlin/io/getstream/whatsappclone/network/WhatsAppDispatchers.kt similarity index 100% rename from core-network/src/main/kotlin/io/getstream/whatsappclone/network/WhatsAppDispatchers.kt rename to core/network/src/main/kotlin/io/getstream/whatsappclone/network/WhatsAppDispatchers.kt diff --git a/core-network/src/main/kotlin/io/getstream/whatsappclone/network/di/DispatchersModule.kt b/core/network/src/main/kotlin/io/getstream/whatsappclone/network/di/DispatchersModule.kt similarity index 100% rename from core-network/src/main/kotlin/io/getstream/whatsappclone/network/di/DispatchersModule.kt rename to core/network/src/main/kotlin/io/getstream/whatsappclone/network/di/DispatchersModule.kt diff --git a/core-network/src/main/kotlin/io/getstream/whatsappclone/network/di/NetworkModule.kt b/core/network/src/main/kotlin/io/getstream/whatsappclone/network/di/NetworkModule.kt similarity index 100% rename from core-network/src/main/kotlin/io/getstream/whatsappclone/network/di/NetworkModule.kt rename to core/network/src/main/kotlin/io/getstream/whatsappclone/network/di/NetworkModule.kt diff --git a/core-network/src/main/kotlin/io/getstream/whatsappclone/network/service/WhatsAppUserService.kt b/core/network/src/main/kotlin/io/getstream/whatsappclone/network/service/WhatsAppUserService.kt similarity index 100% rename from core-network/src/main/kotlin/io/getstream/whatsappclone/network/service/WhatsAppUserService.kt rename to core/network/src/main/kotlin/io/getstream/whatsappclone/network/service/WhatsAppUserService.kt diff --git a/core-uistate/.gitignore b/core/uistate/.gitignore similarity index 100% rename from core-uistate/.gitignore rename to core/uistate/.gitignore diff --git a/core-uistate/build.gradle.kts b/core/uistate/build.gradle.kts similarity index 96% rename from core-uistate/build.gradle.kts rename to core/uistate/build.gradle.kts index 8c25887..5062e64 100644 --- a/core-uistate/build.gradle.kts +++ b/core/uistate/build.gradle.kts @@ -27,7 +27,7 @@ kotlin { } dependencies { - implementation(project(":core-model")) + implementation(project(":core:model")) implementation(libs.androidx.compose.runtime) diff --git a/core-uistate/src/main/AndroidManifest.xml b/core/uistate/src/main/AndroidManifest.xml similarity index 100% rename from core-uistate/src/main/AndroidManifest.xml rename to core/uistate/src/main/AndroidManifest.xml diff --git a/core-uistate/src/main/kotlin/io/getstream/whatsappclone/uistate/UiState.kt b/core/uistate/src/main/kotlin/io/getstream/whatsappclone/uistate/UiState.kt similarity index 100% rename from core-uistate/src/main/kotlin/io/getstream/whatsappclone/uistate/UiState.kt rename to core/uistate/src/main/kotlin/io/getstream/whatsappclone/uistate/UiState.kt diff --git a/core-uistate/src/main/kotlin/io/getstream/whatsappclone/uistate/WhatsAppUserExtensive.kt b/core/uistate/src/main/kotlin/io/getstream/whatsappclone/uistate/WhatsAppUserExtensive.kt similarity index 100% rename from core-uistate/src/main/kotlin/io/getstream/whatsappclone/uistate/WhatsAppUserExtensive.kt rename to core/uistate/src/main/kotlin/io/getstream/whatsappclone/uistate/WhatsAppUserExtensive.kt diff --git a/feature-calls/.gitignore b/feature/calls/.gitignore similarity index 100% rename from feature-calls/.gitignore rename to feature/calls/.gitignore diff --git a/feature-calls/build.gradle.kts b/feature/calls/build.gradle.kts similarity index 92% rename from feature-calls/build.gradle.kts rename to feature/calls/build.gradle.kts index 07609d4..92bada1 100644 --- a/feature-calls/build.gradle.kts +++ b/feature/calls/build.gradle.kts @@ -23,8 +23,8 @@ plugins { dependencies { // core modules - implementation(project(":core-uistate")) - implementation(project(":core-data")) + implementation(project(":core:uistate")) + implementation(project(":core:data")) implementation(libs.androidx.lifecycle.runtimeCompose) implementation(libs.androidx.lifecycle.viewModelCompose) diff --git a/feature-calls/src/main/AndroidManifest.xml b/feature/calls/src/main/AndroidManifest.xml similarity index 100% rename from feature-calls/src/main/AndroidManifest.xml rename to feature/calls/src/main/AndroidManifest.xml diff --git a/feature-calls/src/main/kotlin/io/getstream/whatsappclone/calls/WhatsAppCallHistory.kt b/feature/calls/src/main/kotlin/io/getstream/whatsappclone/calls/WhatsAppCallHistory.kt similarity index 100% rename from feature-calls/src/main/kotlin/io/getstream/whatsappclone/calls/WhatsAppCallHistory.kt rename to feature/calls/src/main/kotlin/io/getstream/whatsappclone/calls/WhatsAppCallHistory.kt diff --git a/feature-calls/src/main/kotlin/io/getstream/whatsappclone/calls/WhatsAppCalls.kt b/feature/calls/src/main/kotlin/io/getstream/whatsappclone/calls/WhatsAppCalls.kt similarity index 100% rename from feature-calls/src/main/kotlin/io/getstream/whatsappclone/calls/WhatsAppCalls.kt rename to feature/calls/src/main/kotlin/io/getstream/whatsappclone/calls/WhatsAppCalls.kt diff --git a/feature-calls/src/main/kotlin/io/getstream/whatsappclone/calls/WhatsAppCallsViewModel.kt b/feature/calls/src/main/kotlin/io/getstream/whatsappclone/calls/WhatsAppCallsViewModel.kt similarity index 100% rename from feature-calls/src/main/kotlin/io/getstream/whatsappclone/calls/WhatsAppCallsViewModel.kt rename to feature/calls/src/main/kotlin/io/getstream/whatsappclone/calls/WhatsAppCallsViewModel.kt diff --git a/feature-calls/src/main/kotlin/io/getstream/whatsappclone/calls/info/WhatsAppCallHistoryInfo.kt b/feature/calls/src/main/kotlin/io/getstream/whatsappclone/calls/info/WhatsAppCallHistoryInfo.kt similarity index 100% rename from feature-calls/src/main/kotlin/io/getstream/whatsappclone/calls/info/WhatsAppCallHistoryInfo.kt rename to feature/calls/src/main/kotlin/io/getstream/whatsappclone/calls/info/WhatsAppCallHistoryInfo.kt diff --git a/feature-calls/src/main/kotlin/io/getstream/whatsappclone/calls/info/WhatsAppCallHistoryInfoBody.kt b/feature/calls/src/main/kotlin/io/getstream/whatsappclone/calls/info/WhatsAppCallHistoryInfoBody.kt similarity index 100% rename from feature-calls/src/main/kotlin/io/getstream/whatsappclone/calls/info/WhatsAppCallHistoryInfoBody.kt rename to feature/calls/src/main/kotlin/io/getstream/whatsappclone/calls/info/WhatsAppCallHistoryInfoBody.kt diff --git a/feature-calls/src/main/kotlin/io/getstream/whatsappclone/calls/info/WhatsAppCallHistoryTopBar.kt b/feature/calls/src/main/kotlin/io/getstream/whatsappclone/calls/info/WhatsAppCallHistoryTopBar.kt similarity index 100% rename from feature-calls/src/main/kotlin/io/getstream/whatsappclone/calls/info/WhatsAppCallHistoryTopBar.kt rename to feature/calls/src/main/kotlin/io/getstream/whatsappclone/calls/info/WhatsAppCallHistoryTopBar.kt diff --git a/feature-calls/src/main/res/values/strings.xml b/feature/calls/src/main/res/values/strings.xml similarity index 100% rename from feature-calls/src/main/res/values/strings.xml rename to feature/calls/src/main/res/values/strings.xml diff --git a/feature-camera/.gitignore b/feature/camera/.gitignore similarity index 100% rename from feature-camera/.gitignore rename to feature/camera/.gitignore diff --git a/feature-camera/build.gradle.kts b/feature/camera/build.gradle.kts similarity index 100% rename from feature-camera/build.gradle.kts rename to feature/camera/build.gradle.kts diff --git a/feature-camera/src/main/AndroidManifest.xml b/feature/camera/src/main/AndroidManifest.xml similarity index 100% rename from feature-camera/src/main/AndroidManifest.xml rename to feature/camera/src/main/AndroidManifest.xml diff --git a/feature-camera/src/main/kotlin/io/getstream/whatsappclone/camera/WhatsAppCamera.kt b/feature/camera/src/main/kotlin/io/getstream/whatsappclone/camera/WhatsAppCamera.kt similarity index 100% rename from feature-camera/src/main/kotlin/io/getstream/whatsappclone/camera/WhatsAppCamera.kt rename to feature/camera/src/main/kotlin/io/getstream/whatsappclone/camera/WhatsAppCamera.kt diff --git a/feature-chats/.gitignore b/feature/chats/.gitignore similarity index 100% rename from feature-chats/.gitignore rename to feature/chats/.gitignore diff --git a/feature-chats/build.gradle.kts b/feature/chats/build.gradle.kts similarity index 89% rename from feature-chats/build.gradle.kts rename to feature/chats/build.gradle.kts index a6f0aba..9253574 100644 --- a/feature-chats/build.gradle.kts +++ b/feature/chats/build.gradle.kts @@ -23,9 +23,9 @@ plugins { dependencies { // core modules - implementation(project(":core-uistate")) - implementation(project(":core-network")) - implementation(project(":core-data")) + implementation(project(":core:uistate")) + implementation(project(":core:network")) + implementation(project(":core:data")) // Stream chat Compose api(libs.stream.compose) diff --git a/feature-chats/src/main/AndroidManifest.xml b/feature/chats/src/main/AndroidManifest.xml similarity index 100% rename from feature-chats/src/main/AndroidManifest.xml rename to feature/chats/src/main/AndroidManifest.xml diff --git a/feature-chats/src/main/kotlin/io/getstream/whatsappclone/chats/WhatsAppChannels.kt b/feature/chats/src/main/kotlin/io/getstream/whatsappclone/chats/WhatsAppChannels.kt similarity index 100% rename from feature-chats/src/main/kotlin/io/getstream/whatsappclone/chats/WhatsAppChannels.kt rename to feature/chats/src/main/kotlin/io/getstream/whatsappclone/chats/WhatsAppChannels.kt diff --git a/feature-chats/src/main/kotlin/io/getstream/whatsappclone/chats/di/ChatModule.kt b/feature/chats/src/main/kotlin/io/getstream/whatsappclone/chats/di/ChatModule.kt similarity index 100% rename from feature-chats/src/main/kotlin/io/getstream/whatsappclone/chats/di/ChatModule.kt rename to feature/chats/src/main/kotlin/io/getstream/whatsappclone/chats/di/ChatModule.kt diff --git a/feature-chats/src/main/kotlin/io/getstream/whatsappclone/chats/initializer/StreamChatInitializer.kt b/feature/chats/src/main/kotlin/io/getstream/whatsappclone/chats/initializer/StreamChatInitializer.kt similarity index 100% rename from feature-chats/src/main/kotlin/io/getstream/whatsappclone/chats/initializer/StreamChatInitializer.kt rename to feature/chats/src/main/kotlin/io/getstream/whatsappclone/chats/initializer/StreamChatInitializer.kt diff --git a/feature-chats/src/main/kotlin/io/getstream/whatsappclone/chats/initializer/TimberInitializer.kt b/feature/chats/src/main/kotlin/io/getstream/whatsappclone/chats/initializer/TimberInitializer.kt similarity index 100% rename from feature-chats/src/main/kotlin/io/getstream/whatsappclone/chats/initializer/TimberInitializer.kt rename to feature/chats/src/main/kotlin/io/getstream/whatsappclone/chats/initializer/TimberInitializer.kt diff --git a/feature-chats/src/main/kotlin/io/getstream/whatsappclone/chats/messages/WhatsAppMessageTopBar.kt b/feature/chats/src/main/kotlin/io/getstream/whatsappclone/chats/messages/WhatsAppMessageTopBar.kt similarity index 100% rename from feature-chats/src/main/kotlin/io/getstream/whatsappclone/chats/messages/WhatsAppMessageTopBar.kt rename to feature/chats/src/main/kotlin/io/getstream/whatsappclone/chats/messages/WhatsAppMessageTopBar.kt diff --git a/feature-chats/src/main/kotlin/io/getstream/whatsappclone/chats/messages/WhatsAppMessages.kt b/feature/chats/src/main/kotlin/io/getstream/whatsappclone/chats/messages/WhatsAppMessages.kt similarity index 100% rename from feature-chats/src/main/kotlin/io/getstream/whatsappclone/chats/messages/WhatsAppMessages.kt rename to feature/chats/src/main/kotlin/io/getstream/whatsappclone/chats/messages/WhatsAppMessages.kt diff --git a/feature-chats/src/main/kotlin/io/getstream/whatsappclone/chats/messages/WhatsAppMessagesViewModel.kt b/feature/chats/src/main/kotlin/io/getstream/whatsappclone/chats/messages/WhatsAppMessagesViewModel.kt similarity index 100% rename from feature-chats/src/main/kotlin/io/getstream/whatsappclone/chats/messages/WhatsAppMessagesViewModel.kt rename to feature/chats/src/main/kotlin/io/getstream/whatsappclone/chats/messages/WhatsAppMessagesViewModel.kt diff --git a/feature-chats/src/main/kotlin/io/getstream/whatsappclone/chats/reactions/WhatsAppCloneReactionFactory.kt b/feature/chats/src/main/kotlin/io/getstream/whatsappclone/chats/reactions/WhatsAppCloneReactionFactory.kt similarity index 100% rename from feature-chats/src/main/kotlin/io/getstream/whatsappclone/chats/reactions/WhatsAppCloneReactionFactory.kt rename to feature/chats/src/main/kotlin/io/getstream/whatsappclone/chats/reactions/WhatsAppCloneReactionFactory.kt diff --git a/feature-chats/src/main/kotlin/io/getstream/whatsappclone/chats/theme/WhatsAppChatTheme.kt b/feature/chats/src/main/kotlin/io/getstream/whatsappclone/chats/theme/WhatsAppChatTheme.kt similarity index 100% rename from feature-chats/src/main/kotlin/io/getstream/whatsappclone/chats/theme/WhatsAppChatTheme.kt rename to feature/chats/src/main/kotlin/io/getstream/whatsappclone/chats/theme/WhatsAppChatTheme.kt diff --git a/feature-chats/src/main/res/drawable/joy.png b/feature/chats/src/main/res/drawable/joy.png similarity index 100% rename from feature-chats/src/main/res/drawable/joy.png rename to feature/chats/src/main/res/drawable/joy.png diff --git a/feature-chats/src/main/res/drawable/love.png b/feature/chats/src/main/res/drawable/love.png similarity index 100% rename from feature-chats/src/main/res/drawable/love.png rename to feature/chats/src/main/res/drawable/love.png diff --git a/feature-chats/src/main/res/drawable/smile.png b/feature/chats/src/main/res/drawable/smile.png similarity index 100% rename from feature-chats/src/main/res/drawable/smile.png rename to feature/chats/src/main/res/drawable/smile.png diff --git a/feature-chats/src/main/res/drawable/thumbsup.png b/feature/chats/src/main/res/drawable/thumbsup.png similarity index 100% rename from feature-chats/src/main/res/drawable/thumbsup.png rename to feature/chats/src/main/res/drawable/thumbsup.png diff --git a/feature-chats/src/main/res/drawable/wink.png b/feature/chats/src/main/res/drawable/wink.png similarity index 100% rename from feature-chats/src/main/res/drawable/wink.png rename to feature/chats/src/main/res/drawable/wink.png diff --git a/feature-chats/src/main/res/values/strings.xml b/feature/chats/src/main/res/values/strings.xml similarity index 100% rename from feature-chats/src/main/res/values/strings.xml rename to feature/chats/src/main/res/values/strings.xml diff --git a/feature-status/.gitignore b/feature/status/.gitignore similarity index 100% rename from feature-status/.gitignore rename to feature/status/.gitignore diff --git a/feature-status/build.gradle.kts b/feature/status/build.gradle.kts similarity index 100% rename from feature-status/build.gradle.kts rename to feature/status/build.gradle.kts diff --git a/feature-status/src/main/AndroidManifest.xml b/feature/status/src/main/AndroidManifest.xml similarity index 100% rename from feature-status/src/main/AndroidManifest.xml rename to feature/status/src/main/AndroidManifest.xml diff --git a/feature-status/src/main/kotlin/io/getstream/whatsappclone/status/WhatsAppStatus.kt b/feature/status/src/main/kotlin/io/getstream/whatsappclone/status/WhatsAppStatus.kt similarity index 100% rename from feature-status/src/main/kotlin/io/getstream/whatsappclone/status/WhatsAppStatus.kt rename to feature/status/src/main/kotlin/io/getstream/whatsappclone/status/WhatsAppStatus.kt diff --git a/feature-status/src/main/res/values/strings.xml b/feature/status/src/main/res/values/strings.xml similarity index 100% rename from feature-status/src/main/res/values/strings.xml rename to feature/status/src/main/res/values/strings.xml diff --git a/settings.gradle.kts b/settings.gradle.kts index dfbb638..6e985de 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -19,15 +19,15 @@ dependencyResolutionManagement { } rootProject.name = "WhatsAppCloneCompose" include(":app") -include(":core-designsystem") -include(":core-navigation") -include(":core-model") -include(":core-network") -include(":core-database") -include(":core-data") -include(":core-uistate") -include(":feature-camera") -include(":feature-chats") -include(":feature-status") -include(":feature-calls") +include(":core:designsystem") +include(":core:navigation") +include(":core:model") +include(":core:network") +include(":core:database") +include(":core:data") +include(":core:uistate") +include(":feature:camera") +include(":feature:chats") +include(":feature:status") +include(":feature:calls") include(":benchmark") From 0132eecbe687a4c4b8502e05d406108fea868bd5 Mon Sep 17 00:00:00 2001 From: AndroidPoet Date: Thu, 27 Oct 2022 09:39:39 +0530 Subject: [PATCH 2/2] core and features modules moved to sub-folders --- app/build.gradle.kts | 8 ++++---- {feature => features}/calls/.gitignore | 0 {feature => features}/calls/build.gradle.kts | 0 .../calls/src/main/AndroidManifest.xml | 0 .../whatsappclone/calls/WhatsAppCallHistory.kt | 0 .../getstream/whatsappclone/calls/WhatsAppCalls.kt | 0 .../whatsappclone/calls/WhatsAppCallsViewModel.kt | 0 .../calls/info/WhatsAppCallHistoryInfo.kt | 0 .../calls/info/WhatsAppCallHistoryInfoBody.kt | 0 .../calls/info/WhatsAppCallHistoryTopBar.kt | 0 .../calls/src/main/res/values/strings.xml | 0 {feature => features}/camera/.gitignore | 0 {feature => features}/camera/build.gradle.kts | 0 .../camera/src/main/AndroidManifest.xml | 0 .../whatsappclone/camera/WhatsAppCamera.kt | 0 {feature => features}/chats/.gitignore | 0 {feature => features}/chats/build.gradle.kts | 0 .../chats/src/main/AndroidManifest.xml | 0 .../whatsappclone/chats/WhatsAppChannels.kt | 0 .../getstream/whatsappclone/chats/di/ChatModule.kt | 0 .../chats/initializer/StreamChatInitializer.kt | 0 .../chats/initializer/TimberInitializer.kt | 0 .../chats/messages/WhatsAppMessageTopBar.kt | 0 .../chats/messages/WhatsAppMessages.kt | 0 .../chats/messages/WhatsAppMessagesViewModel.kt | 0 .../chats/reactions/WhatsAppCloneReactionFactory.kt | 0 .../whatsappclone/chats/theme/WhatsAppChatTheme.kt | 0 .../chats/src/main/res/drawable/joy.png | Bin .../chats/src/main/res/drawable/love.png | Bin .../chats/src/main/res/drawable/smile.png | Bin .../chats/src/main/res/drawable/thumbsup.png | Bin .../chats/src/main/res/drawable/wink.png | Bin .../chats/src/main/res/values/strings.xml | 0 {feature => features}/status/.gitignore | 0 {feature => features}/status/build.gradle.kts | 0 .../status/src/main/AndroidManifest.xml | 0 .../whatsappclone/status/WhatsAppStatus.kt | 0 .../status/src/main/res/values/strings.xml | 0 settings.gradle.kts | 8 ++++---- 39 files changed, 8 insertions(+), 8 deletions(-) rename {feature => features}/calls/.gitignore (100%) rename {feature => features}/calls/build.gradle.kts (100%) rename {feature => features}/calls/src/main/AndroidManifest.xml (100%) rename {feature => features}/calls/src/main/kotlin/io/getstream/whatsappclone/calls/WhatsAppCallHistory.kt (100%) rename {feature => features}/calls/src/main/kotlin/io/getstream/whatsappclone/calls/WhatsAppCalls.kt (100%) rename {feature => features}/calls/src/main/kotlin/io/getstream/whatsappclone/calls/WhatsAppCallsViewModel.kt (100%) rename {feature => features}/calls/src/main/kotlin/io/getstream/whatsappclone/calls/info/WhatsAppCallHistoryInfo.kt (100%) rename {feature => features}/calls/src/main/kotlin/io/getstream/whatsappclone/calls/info/WhatsAppCallHistoryInfoBody.kt (100%) rename {feature => features}/calls/src/main/kotlin/io/getstream/whatsappclone/calls/info/WhatsAppCallHistoryTopBar.kt (100%) rename {feature => features}/calls/src/main/res/values/strings.xml (100%) rename {feature => features}/camera/.gitignore (100%) rename {feature => features}/camera/build.gradle.kts (100%) rename {feature => features}/camera/src/main/AndroidManifest.xml (100%) rename {feature => features}/camera/src/main/kotlin/io/getstream/whatsappclone/camera/WhatsAppCamera.kt (100%) rename {feature => features}/chats/.gitignore (100%) rename {feature => features}/chats/build.gradle.kts (100%) rename {feature => features}/chats/src/main/AndroidManifest.xml (100%) rename {feature => features}/chats/src/main/kotlin/io/getstream/whatsappclone/chats/WhatsAppChannels.kt (100%) rename {feature => features}/chats/src/main/kotlin/io/getstream/whatsappclone/chats/di/ChatModule.kt (100%) rename {feature => features}/chats/src/main/kotlin/io/getstream/whatsappclone/chats/initializer/StreamChatInitializer.kt (100%) rename {feature => features}/chats/src/main/kotlin/io/getstream/whatsappclone/chats/initializer/TimberInitializer.kt (100%) rename {feature => features}/chats/src/main/kotlin/io/getstream/whatsappclone/chats/messages/WhatsAppMessageTopBar.kt (100%) rename {feature => features}/chats/src/main/kotlin/io/getstream/whatsappclone/chats/messages/WhatsAppMessages.kt (100%) rename {feature => features}/chats/src/main/kotlin/io/getstream/whatsappclone/chats/messages/WhatsAppMessagesViewModel.kt (100%) rename {feature => features}/chats/src/main/kotlin/io/getstream/whatsappclone/chats/reactions/WhatsAppCloneReactionFactory.kt (100%) rename {feature => features}/chats/src/main/kotlin/io/getstream/whatsappclone/chats/theme/WhatsAppChatTheme.kt (100%) rename {feature => features}/chats/src/main/res/drawable/joy.png (100%) rename {feature => features}/chats/src/main/res/drawable/love.png (100%) rename {feature => features}/chats/src/main/res/drawable/smile.png (100%) rename {feature => features}/chats/src/main/res/drawable/thumbsup.png (100%) rename {feature => features}/chats/src/main/res/drawable/wink.png (100%) rename {feature => features}/chats/src/main/res/values/strings.xml (100%) rename {feature => features}/status/.gitignore (100%) rename {feature => features}/status/build.gradle.kts (100%) rename {feature => features}/status/src/main/AndroidManifest.xml (100%) rename {feature => features}/status/src/main/kotlin/io/getstream/whatsappclone/status/WhatsAppStatus.kt (100%) rename {feature => features}/status/src/main/res/values/strings.xml (100%) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 78aa980..f627b7b 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -56,10 +56,10 @@ dependencies { implementation(project(":core:data")) // feature modules - implementation(project(":feature:camera")) - implementation(project(":feature:chats")) - implementation(project(":feature:status")) - implementation(project(":feature:calls")) + implementation(project(":features:camera")) + implementation(project(":features:chats")) + implementation(project(":features:status")) + implementation(project(":features:calls")) // material implementation(libs.androidx.appcompat) diff --git a/feature/calls/.gitignore b/features/calls/.gitignore similarity index 100% rename from feature/calls/.gitignore rename to features/calls/.gitignore diff --git a/feature/calls/build.gradle.kts b/features/calls/build.gradle.kts similarity index 100% rename from feature/calls/build.gradle.kts rename to features/calls/build.gradle.kts diff --git a/feature/calls/src/main/AndroidManifest.xml b/features/calls/src/main/AndroidManifest.xml similarity index 100% rename from feature/calls/src/main/AndroidManifest.xml rename to features/calls/src/main/AndroidManifest.xml diff --git a/feature/calls/src/main/kotlin/io/getstream/whatsappclone/calls/WhatsAppCallHistory.kt b/features/calls/src/main/kotlin/io/getstream/whatsappclone/calls/WhatsAppCallHistory.kt similarity index 100% rename from feature/calls/src/main/kotlin/io/getstream/whatsappclone/calls/WhatsAppCallHistory.kt rename to features/calls/src/main/kotlin/io/getstream/whatsappclone/calls/WhatsAppCallHistory.kt diff --git a/feature/calls/src/main/kotlin/io/getstream/whatsappclone/calls/WhatsAppCalls.kt b/features/calls/src/main/kotlin/io/getstream/whatsappclone/calls/WhatsAppCalls.kt similarity index 100% rename from feature/calls/src/main/kotlin/io/getstream/whatsappclone/calls/WhatsAppCalls.kt rename to features/calls/src/main/kotlin/io/getstream/whatsappclone/calls/WhatsAppCalls.kt diff --git a/feature/calls/src/main/kotlin/io/getstream/whatsappclone/calls/WhatsAppCallsViewModel.kt b/features/calls/src/main/kotlin/io/getstream/whatsappclone/calls/WhatsAppCallsViewModel.kt similarity index 100% rename from feature/calls/src/main/kotlin/io/getstream/whatsappclone/calls/WhatsAppCallsViewModel.kt rename to features/calls/src/main/kotlin/io/getstream/whatsappclone/calls/WhatsAppCallsViewModel.kt diff --git a/feature/calls/src/main/kotlin/io/getstream/whatsappclone/calls/info/WhatsAppCallHistoryInfo.kt b/features/calls/src/main/kotlin/io/getstream/whatsappclone/calls/info/WhatsAppCallHistoryInfo.kt similarity index 100% rename from feature/calls/src/main/kotlin/io/getstream/whatsappclone/calls/info/WhatsAppCallHistoryInfo.kt rename to features/calls/src/main/kotlin/io/getstream/whatsappclone/calls/info/WhatsAppCallHistoryInfo.kt diff --git a/feature/calls/src/main/kotlin/io/getstream/whatsappclone/calls/info/WhatsAppCallHistoryInfoBody.kt b/features/calls/src/main/kotlin/io/getstream/whatsappclone/calls/info/WhatsAppCallHistoryInfoBody.kt similarity index 100% rename from feature/calls/src/main/kotlin/io/getstream/whatsappclone/calls/info/WhatsAppCallHistoryInfoBody.kt rename to features/calls/src/main/kotlin/io/getstream/whatsappclone/calls/info/WhatsAppCallHistoryInfoBody.kt diff --git a/feature/calls/src/main/kotlin/io/getstream/whatsappclone/calls/info/WhatsAppCallHistoryTopBar.kt b/features/calls/src/main/kotlin/io/getstream/whatsappclone/calls/info/WhatsAppCallHistoryTopBar.kt similarity index 100% rename from feature/calls/src/main/kotlin/io/getstream/whatsappclone/calls/info/WhatsAppCallHistoryTopBar.kt rename to features/calls/src/main/kotlin/io/getstream/whatsappclone/calls/info/WhatsAppCallHistoryTopBar.kt diff --git a/feature/calls/src/main/res/values/strings.xml b/features/calls/src/main/res/values/strings.xml similarity index 100% rename from feature/calls/src/main/res/values/strings.xml rename to features/calls/src/main/res/values/strings.xml diff --git a/feature/camera/.gitignore b/features/camera/.gitignore similarity index 100% rename from feature/camera/.gitignore rename to features/camera/.gitignore diff --git a/feature/camera/build.gradle.kts b/features/camera/build.gradle.kts similarity index 100% rename from feature/camera/build.gradle.kts rename to features/camera/build.gradle.kts diff --git a/feature/camera/src/main/AndroidManifest.xml b/features/camera/src/main/AndroidManifest.xml similarity index 100% rename from feature/camera/src/main/AndroidManifest.xml rename to features/camera/src/main/AndroidManifest.xml diff --git a/feature/camera/src/main/kotlin/io/getstream/whatsappclone/camera/WhatsAppCamera.kt b/features/camera/src/main/kotlin/io/getstream/whatsappclone/camera/WhatsAppCamera.kt similarity index 100% rename from feature/camera/src/main/kotlin/io/getstream/whatsappclone/camera/WhatsAppCamera.kt rename to features/camera/src/main/kotlin/io/getstream/whatsappclone/camera/WhatsAppCamera.kt diff --git a/feature/chats/.gitignore b/features/chats/.gitignore similarity index 100% rename from feature/chats/.gitignore rename to features/chats/.gitignore diff --git a/feature/chats/build.gradle.kts b/features/chats/build.gradle.kts similarity index 100% rename from feature/chats/build.gradle.kts rename to features/chats/build.gradle.kts diff --git a/feature/chats/src/main/AndroidManifest.xml b/features/chats/src/main/AndroidManifest.xml similarity index 100% rename from feature/chats/src/main/AndroidManifest.xml rename to features/chats/src/main/AndroidManifest.xml diff --git a/feature/chats/src/main/kotlin/io/getstream/whatsappclone/chats/WhatsAppChannels.kt b/features/chats/src/main/kotlin/io/getstream/whatsappclone/chats/WhatsAppChannels.kt similarity index 100% rename from feature/chats/src/main/kotlin/io/getstream/whatsappclone/chats/WhatsAppChannels.kt rename to features/chats/src/main/kotlin/io/getstream/whatsappclone/chats/WhatsAppChannels.kt diff --git a/feature/chats/src/main/kotlin/io/getstream/whatsappclone/chats/di/ChatModule.kt b/features/chats/src/main/kotlin/io/getstream/whatsappclone/chats/di/ChatModule.kt similarity index 100% rename from feature/chats/src/main/kotlin/io/getstream/whatsappclone/chats/di/ChatModule.kt rename to features/chats/src/main/kotlin/io/getstream/whatsappclone/chats/di/ChatModule.kt diff --git a/feature/chats/src/main/kotlin/io/getstream/whatsappclone/chats/initializer/StreamChatInitializer.kt b/features/chats/src/main/kotlin/io/getstream/whatsappclone/chats/initializer/StreamChatInitializer.kt similarity index 100% rename from feature/chats/src/main/kotlin/io/getstream/whatsappclone/chats/initializer/StreamChatInitializer.kt rename to features/chats/src/main/kotlin/io/getstream/whatsappclone/chats/initializer/StreamChatInitializer.kt diff --git a/feature/chats/src/main/kotlin/io/getstream/whatsappclone/chats/initializer/TimberInitializer.kt b/features/chats/src/main/kotlin/io/getstream/whatsappclone/chats/initializer/TimberInitializer.kt similarity index 100% rename from feature/chats/src/main/kotlin/io/getstream/whatsappclone/chats/initializer/TimberInitializer.kt rename to features/chats/src/main/kotlin/io/getstream/whatsappclone/chats/initializer/TimberInitializer.kt diff --git a/feature/chats/src/main/kotlin/io/getstream/whatsappclone/chats/messages/WhatsAppMessageTopBar.kt b/features/chats/src/main/kotlin/io/getstream/whatsappclone/chats/messages/WhatsAppMessageTopBar.kt similarity index 100% rename from feature/chats/src/main/kotlin/io/getstream/whatsappclone/chats/messages/WhatsAppMessageTopBar.kt rename to features/chats/src/main/kotlin/io/getstream/whatsappclone/chats/messages/WhatsAppMessageTopBar.kt diff --git a/feature/chats/src/main/kotlin/io/getstream/whatsappclone/chats/messages/WhatsAppMessages.kt b/features/chats/src/main/kotlin/io/getstream/whatsappclone/chats/messages/WhatsAppMessages.kt similarity index 100% rename from feature/chats/src/main/kotlin/io/getstream/whatsappclone/chats/messages/WhatsAppMessages.kt rename to features/chats/src/main/kotlin/io/getstream/whatsappclone/chats/messages/WhatsAppMessages.kt diff --git a/feature/chats/src/main/kotlin/io/getstream/whatsappclone/chats/messages/WhatsAppMessagesViewModel.kt b/features/chats/src/main/kotlin/io/getstream/whatsappclone/chats/messages/WhatsAppMessagesViewModel.kt similarity index 100% rename from feature/chats/src/main/kotlin/io/getstream/whatsappclone/chats/messages/WhatsAppMessagesViewModel.kt rename to features/chats/src/main/kotlin/io/getstream/whatsappclone/chats/messages/WhatsAppMessagesViewModel.kt diff --git a/feature/chats/src/main/kotlin/io/getstream/whatsappclone/chats/reactions/WhatsAppCloneReactionFactory.kt b/features/chats/src/main/kotlin/io/getstream/whatsappclone/chats/reactions/WhatsAppCloneReactionFactory.kt similarity index 100% rename from feature/chats/src/main/kotlin/io/getstream/whatsappclone/chats/reactions/WhatsAppCloneReactionFactory.kt rename to features/chats/src/main/kotlin/io/getstream/whatsappclone/chats/reactions/WhatsAppCloneReactionFactory.kt diff --git a/feature/chats/src/main/kotlin/io/getstream/whatsappclone/chats/theme/WhatsAppChatTheme.kt b/features/chats/src/main/kotlin/io/getstream/whatsappclone/chats/theme/WhatsAppChatTheme.kt similarity index 100% rename from feature/chats/src/main/kotlin/io/getstream/whatsappclone/chats/theme/WhatsAppChatTheme.kt rename to features/chats/src/main/kotlin/io/getstream/whatsappclone/chats/theme/WhatsAppChatTheme.kt diff --git a/feature/chats/src/main/res/drawable/joy.png b/features/chats/src/main/res/drawable/joy.png similarity index 100% rename from feature/chats/src/main/res/drawable/joy.png rename to features/chats/src/main/res/drawable/joy.png diff --git a/feature/chats/src/main/res/drawable/love.png b/features/chats/src/main/res/drawable/love.png similarity index 100% rename from feature/chats/src/main/res/drawable/love.png rename to features/chats/src/main/res/drawable/love.png diff --git a/feature/chats/src/main/res/drawable/smile.png b/features/chats/src/main/res/drawable/smile.png similarity index 100% rename from feature/chats/src/main/res/drawable/smile.png rename to features/chats/src/main/res/drawable/smile.png diff --git a/feature/chats/src/main/res/drawable/thumbsup.png b/features/chats/src/main/res/drawable/thumbsup.png similarity index 100% rename from feature/chats/src/main/res/drawable/thumbsup.png rename to features/chats/src/main/res/drawable/thumbsup.png diff --git a/feature/chats/src/main/res/drawable/wink.png b/features/chats/src/main/res/drawable/wink.png similarity index 100% rename from feature/chats/src/main/res/drawable/wink.png rename to features/chats/src/main/res/drawable/wink.png diff --git a/feature/chats/src/main/res/values/strings.xml b/features/chats/src/main/res/values/strings.xml similarity index 100% rename from feature/chats/src/main/res/values/strings.xml rename to features/chats/src/main/res/values/strings.xml diff --git a/feature/status/.gitignore b/features/status/.gitignore similarity index 100% rename from feature/status/.gitignore rename to features/status/.gitignore diff --git a/feature/status/build.gradle.kts b/features/status/build.gradle.kts similarity index 100% rename from feature/status/build.gradle.kts rename to features/status/build.gradle.kts diff --git a/feature/status/src/main/AndroidManifest.xml b/features/status/src/main/AndroidManifest.xml similarity index 100% rename from feature/status/src/main/AndroidManifest.xml rename to features/status/src/main/AndroidManifest.xml diff --git a/feature/status/src/main/kotlin/io/getstream/whatsappclone/status/WhatsAppStatus.kt b/features/status/src/main/kotlin/io/getstream/whatsappclone/status/WhatsAppStatus.kt similarity index 100% rename from feature/status/src/main/kotlin/io/getstream/whatsappclone/status/WhatsAppStatus.kt rename to features/status/src/main/kotlin/io/getstream/whatsappclone/status/WhatsAppStatus.kt diff --git a/feature/status/src/main/res/values/strings.xml b/features/status/src/main/res/values/strings.xml similarity index 100% rename from feature/status/src/main/res/values/strings.xml rename to features/status/src/main/res/values/strings.xml diff --git a/settings.gradle.kts b/settings.gradle.kts index 6e985de..a019352 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -26,8 +26,8 @@ include(":core:network") include(":core:database") include(":core:data") include(":core:uistate") -include(":feature:camera") -include(":feature:chats") -include(":feature:status") -include(":feature:calls") +include(":features:camera") +include(":features:chats") +include(":features:status") +include(":features:calls") include(":benchmark")