From 798f2dfc590ea9119580ac4dd3b0a3e9e4a3ecbf Mon Sep 17 00:00:00 2001 From: Thomas Kioko Date: Sun, 9 Feb 2025 14:30:37 +0100 Subject: [PATCH] Flatten android modules. Get rid of android directory and move modules to root dir. --- .github/workflows/baseline-profile.yml | 4 +-- .github/workflows/ci.yml | 6 ++-- .../build.gradle.kts | 2 +- .../tvmaniac/compose/components/Background.kt | 0 .../tvmaniac/compose/components/Buttons.kt | 0 .../tvmaniac/compose/components/Card.kt | 0 .../tvmaniac/compose/components/Chip.kt | 0 .../tvmaniac/compose/components/Dialogs.kt | 0 .../compose/components/EmptyLayout.kt | 0 .../compose/components/ErrorLayout.kt | 0 .../compose/components/GradientScrim.kt | 0 .../tvmaniac/compose/components/Image.kt | 0 .../compose/components/NavigationBar.kt | 0 .../compose/components/ProgressIndicator.kt | 0 .../compose/components/SheetDragHandle.kt | 0 .../tvmaniac/compose/components/Snackbar.kt | 0 .../tvmaniac/compose/components/Text.kt | 0 .../tvmaniac/compose/components/TopBar.kt | 0 .../compose/components/TvManiacBottomSheet.kt | 0 .../compose/extensions/GradientExtensions.kt | 0 .../extensions/PaddingValuesExtentions.kt | 0 .../compose/extensions/ScrimExtentions.kt | 0 .../tvmaniac/compose/theme/Background.kt | 0 .../tvmaniac/compose/theme/Colors.kt | 0 .../tvmaniac/compose/theme/Shape.kt | 0 .../tvmaniac/compose/theme/Theme.kt | 0 .../tvmaniac/compose/theme/Type.kt | 0 .../tvmaniac/compose/util/DynamicTheming.kt | 0 .../build.gradle.kts | 0 .../src/main/res/drawable/trakt_icon_red.xml | 0 .../src/main/res/font/work_sans.ttf | Bin .../src/main/res/font/work_sans_bold.ttf | Bin .../src/main/res/font/work_sans_extrabold.ttf | Bin .../src/main/res/font/work_sans_light.ttf | Bin .../src/main/res/font/work_sans_medium.ttf | Bin .../src/main/res/font/work_sans_semibold.ttf | Bin .../src/main/res/font/work_sans_thin.ttf | Bin .../src/main/res/values/plurals.xml | 0 .../src/main/res/values/strings.xml | 0 {android/app => app}/benchmark-rules.pro | 0 {android/app => app}/build.gradle.kts | 14 ++++----- {android/app => app}/proguard-rules.pro | 0 .../app => app}/src/main/AndroidManifest.xml | 0 .../baselineProfiles/baseline-prof.txt | 0 .../baselineProfiles/startup-prof.txt | 0 .../com/thomaskioko/tvmaniac/MainActivity.kt | 0 .../com/thomaskioko/tvmaniac/RootScreen.kt | 0 .../tvmaniac/TvManicApplication.kt | 0 .../tvmaniac/inject/ActivityComponent.kt | 0 .../tvmaniac/inject/ApplicationComponent.kt | 0 .../src/main/res/drawable/ic_app_launcher.xml | 0 .../src/main/res/values-night/colors.xml | 0 .../src/main/res/values-night/themes.xml | 0 .../src/main/res/values/colors.xml | 0 .../src/main/res/values/themes.xml | 0 .../benchmark => benchmark}/build.gradle.kts | 2 +- .../src/main/AndroidManifest.xml | 0 .../thomaskioko/tvmaniac/benchmark/Common.kt | 0 .../BaselineProfileGenerator.kt | 0 .../benchmark/benchmark/StartupBenchmarks.kt | 0 settings.gradle.kts | 28 +++++++++--------- 61 files changed, 28 insertions(+), 28 deletions(-) rename {android/designsystem => android-designsystem}/build.gradle.kts (94%) rename {android/designsystem => android-designsystem}/src/main/kotlin/com/thomaskioko/tvmaniac/compose/components/Background.kt (100%) rename {android/designsystem => android-designsystem}/src/main/kotlin/com/thomaskioko/tvmaniac/compose/components/Buttons.kt (100%) rename {android/designsystem => android-designsystem}/src/main/kotlin/com/thomaskioko/tvmaniac/compose/components/Card.kt (100%) rename {android/designsystem => android-designsystem}/src/main/kotlin/com/thomaskioko/tvmaniac/compose/components/Chip.kt (100%) rename {android/designsystem => android-designsystem}/src/main/kotlin/com/thomaskioko/tvmaniac/compose/components/Dialogs.kt (100%) rename {android/designsystem => android-designsystem}/src/main/kotlin/com/thomaskioko/tvmaniac/compose/components/EmptyLayout.kt (100%) rename {android/designsystem => android-designsystem}/src/main/kotlin/com/thomaskioko/tvmaniac/compose/components/ErrorLayout.kt (100%) rename {android/designsystem => android-designsystem}/src/main/kotlin/com/thomaskioko/tvmaniac/compose/components/GradientScrim.kt (100%) rename {android/designsystem => android-designsystem}/src/main/kotlin/com/thomaskioko/tvmaniac/compose/components/Image.kt (100%) rename {android/designsystem => android-designsystem}/src/main/kotlin/com/thomaskioko/tvmaniac/compose/components/NavigationBar.kt (100%) rename {android/designsystem => android-designsystem}/src/main/kotlin/com/thomaskioko/tvmaniac/compose/components/ProgressIndicator.kt (100%) rename {android/designsystem => android-designsystem}/src/main/kotlin/com/thomaskioko/tvmaniac/compose/components/SheetDragHandle.kt (100%) rename {android/designsystem => android-designsystem}/src/main/kotlin/com/thomaskioko/tvmaniac/compose/components/Snackbar.kt (100%) rename {android/designsystem => android-designsystem}/src/main/kotlin/com/thomaskioko/tvmaniac/compose/components/Text.kt (100%) rename {android/designsystem => android-designsystem}/src/main/kotlin/com/thomaskioko/tvmaniac/compose/components/TopBar.kt (100%) rename {android/designsystem => android-designsystem}/src/main/kotlin/com/thomaskioko/tvmaniac/compose/components/TvManiacBottomSheet.kt (100%) rename {android/designsystem => android-designsystem}/src/main/kotlin/com/thomaskioko/tvmaniac/compose/extensions/GradientExtensions.kt (100%) rename {android/designsystem => android-designsystem}/src/main/kotlin/com/thomaskioko/tvmaniac/compose/extensions/PaddingValuesExtentions.kt (100%) rename {android/designsystem => android-designsystem}/src/main/kotlin/com/thomaskioko/tvmaniac/compose/extensions/ScrimExtentions.kt (100%) rename {android/designsystem => android-designsystem}/src/main/kotlin/com/thomaskioko/tvmaniac/compose/theme/Background.kt (100%) rename {android/designsystem => android-designsystem}/src/main/kotlin/com/thomaskioko/tvmaniac/compose/theme/Colors.kt (100%) rename {android/designsystem => android-designsystem}/src/main/kotlin/com/thomaskioko/tvmaniac/compose/theme/Shape.kt (100%) rename {android/designsystem => android-designsystem}/src/main/kotlin/com/thomaskioko/tvmaniac/compose/theme/Theme.kt (100%) rename {android/designsystem => android-designsystem}/src/main/kotlin/com/thomaskioko/tvmaniac/compose/theme/Type.kt (100%) rename {android/designsystem => android-designsystem}/src/main/kotlin/com/thomaskioko/tvmaniac/compose/util/DynamicTheming.kt (100%) rename {android/resources => android-resources}/build.gradle.kts (100%) rename {android/resources => android-resources}/src/main/res/drawable/trakt_icon_red.xml (100%) rename {android/resources => android-resources}/src/main/res/font/work_sans.ttf (100%) rename {android/resources => android-resources}/src/main/res/font/work_sans_bold.ttf (100%) rename {android/resources => android-resources}/src/main/res/font/work_sans_extrabold.ttf (100%) rename {android/resources => android-resources}/src/main/res/font/work_sans_light.ttf (100%) rename {android/resources => android-resources}/src/main/res/font/work_sans_medium.ttf (100%) rename {android/resources => android-resources}/src/main/res/font/work_sans_semibold.ttf (100%) rename {android/resources => android-resources}/src/main/res/font/work_sans_thin.ttf (100%) rename {android/resources => android-resources}/src/main/res/values/plurals.xml (100%) rename {android/resources => android-resources}/src/main/res/values/strings.xml (100%) rename {android/app => app}/benchmark-rules.pro (100%) rename {android/app => app}/build.gradle.kts (92%) rename {android/app => app}/proguard-rules.pro (100%) rename {android/app => app}/src/main/AndroidManifest.xml (100%) rename {android/app => app}/src/main/generated/baselineProfiles/baseline-prof.txt (100%) rename {android/app => app}/src/main/generated/baselineProfiles/startup-prof.txt (100%) rename {android/app => app}/src/main/kotlin/com/thomaskioko/tvmaniac/MainActivity.kt (100%) rename {android/app => app}/src/main/kotlin/com/thomaskioko/tvmaniac/RootScreen.kt (100%) rename {android/app => app}/src/main/kotlin/com/thomaskioko/tvmaniac/TvManicApplication.kt (100%) rename {android/app => app}/src/main/kotlin/com/thomaskioko/tvmaniac/inject/ActivityComponent.kt (100%) rename {android/app => app}/src/main/kotlin/com/thomaskioko/tvmaniac/inject/ApplicationComponent.kt (100%) rename {android/app => app}/src/main/res/drawable/ic_app_launcher.xml (100%) rename {android/app => app}/src/main/res/values-night/colors.xml (100%) rename {android/app => app}/src/main/res/values-night/themes.xml (100%) rename {android/app => app}/src/main/res/values/colors.xml (100%) rename {android/app => app}/src/main/res/values/themes.xml (100%) rename {android/benchmark => benchmark}/build.gradle.kts (97%) rename {android/benchmark => benchmark}/src/main/AndroidManifest.xml (100%) rename {android/benchmark => benchmark}/src/main/kotlin/com/thomaskioko/tvmaniac/benchmark/Common.kt (100%) rename {android/benchmark => benchmark}/src/main/kotlin/com/thomaskioko/tvmaniac/benchmark/baselineprofile/BaselineProfileGenerator.kt (100%) rename {android/benchmark => benchmark}/src/main/kotlin/com/thomaskioko/tvmaniac/benchmark/benchmark/StartupBenchmarks.kt (100%) diff --git a/.github/workflows/baseline-profile.yml b/.github/workflows/baseline-profile.yml index 33e174ea3..5f54a99d7 100644 --- a/.github/workflows/baseline-profile.yml +++ b/.github/workflows/baseline-profile.yml @@ -39,7 +39,7 @@ jobs: uses: android-actions/setup-android@v3 - name: Accept licenses - run: yes | sdkmanager --licenses || true + run: yes | sdkmanager --licenses || trueMovr - name: Build app and benchmark run: ./gradlew assembleNonMinifiedRelease @@ -48,7 +48,7 @@ jobs: run: ./gradlew cleanManagedDevices - name: Generate Baseline Profile - run: ./gradlew :android:app:generateBaselineProfile + run: ./gradlew :app:generateBaselineProfile -Pandroid.testInstrumentationRunnerArguments.androidx.benchmark.enabledRules=baselineprofile -Pandroid.testoptions.manageddevices.emulator.gpu="swiftshader_indirect" --no-configuration-cache diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fc7e2d61c..03d954e5f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -67,8 +67,8 @@ jobs: - name: 🤖 Build Android App run: | ./gradlew check \ - :android:app:assemble \ - :android:app:bundle \ + :app:assemble \ + :app:bundle \ -x assembleNonMinifiedRelease \ -x bundleNonMinifiedRelease \ -Pandroidx.baselineprofile.skipgeneration=true \ @@ -157,7 +157,7 @@ jobs: ${{ runner.os }}-gradle- - name: Lint Project - run: ./gradlew :android:app:lintRelease + run: ./gradlew :app:lintRelease - name: Upload Lint Report if: ${{ !cancelled() }} diff --git a/android/designsystem/build.gradle.kts b/android-designsystem/build.gradle.kts similarity index 94% rename from android/designsystem/build.gradle.kts rename to android-designsystem/build.gradle.kts index 3b79028c5..9a3737e0a 100644 --- a/android/designsystem/build.gradle.kts +++ b/android-designsystem/build.gradle.kts @@ -11,7 +11,7 @@ dependencies { api(libs.androidx.compose.material.icons) api(libs.androidx.compose.runtime) - implementation(projects.android.resources) + implementation(projects.androidResources) implementation(libs.androidx.annotation) implementation(libs.androidx.collections) diff --git a/android/designsystem/src/main/kotlin/com/thomaskioko/tvmaniac/compose/components/Background.kt b/android-designsystem/src/main/kotlin/com/thomaskioko/tvmaniac/compose/components/Background.kt similarity index 100% rename from android/designsystem/src/main/kotlin/com/thomaskioko/tvmaniac/compose/components/Background.kt rename to android-designsystem/src/main/kotlin/com/thomaskioko/tvmaniac/compose/components/Background.kt diff --git a/android/designsystem/src/main/kotlin/com/thomaskioko/tvmaniac/compose/components/Buttons.kt b/android-designsystem/src/main/kotlin/com/thomaskioko/tvmaniac/compose/components/Buttons.kt similarity index 100% rename from android/designsystem/src/main/kotlin/com/thomaskioko/tvmaniac/compose/components/Buttons.kt rename to android-designsystem/src/main/kotlin/com/thomaskioko/tvmaniac/compose/components/Buttons.kt diff --git a/android/designsystem/src/main/kotlin/com/thomaskioko/tvmaniac/compose/components/Card.kt b/android-designsystem/src/main/kotlin/com/thomaskioko/tvmaniac/compose/components/Card.kt similarity index 100% rename from android/designsystem/src/main/kotlin/com/thomaskioko/tvmaniac/compose/components/Card.kt rename to android-designsystem/src/main/kotlin/com/thomaskioko/tvmaniac/compose/components/Card.kt diff --git a/android/designsystem/src/main/kotlin/com/thomaskioko/tvmaniac/compose/components/Chip.kt b/android-designsystem/src/main/kotlin/com/thomaskioko/tvmaniac/compose/components/Chip.kt similarity index 100% rename from android/designsystem/src/main/kotlin/com/thomaskioko/tvmaniac/compose/components/Chip.kt rename to android-designsystem/src/main/kotlin/com/thomaskioko/tvmaniac/compose/components/Chip.kt diff --git a/android/designsystem/src/main/kotlin/com/thomaskioko/tvmaniac/compose/components/Dialogs.kt b/android-designsystem/src/main/kotlin/com/thomaskioko/tvmaniac/compose/components/Dialogs.kt similarity index 100% rename from android/designsystem/src/main/kotlin/com/thomaskioko/tvmaniac/compose/components/Dialogs.kt rename to android-designsystem/src/main/kotlin/com/thomaskioko/tvmaniac/compose/components/Dialogs.kt diff --git a/android/designsystem/src/main/kotlin/com/thomaskioko/tvmaniac/compose/components/EmptyLayout.kt b/android-designsystem/src/main/kotlin/com/thomaskioko/tvmaniac/compose/components/EmptyLayout.kt similarity index 100% rename from android/designsystem/src/main/kotlin/com/thomaskioko/tvmaniac/compose/components/EmptyLayout.kt rename to android-designsystem/src/main/kotlin/com/thomaskioko/tvmaniac/compose/components/EmptyLayout.kt diff --git a/android/designsystem/src/main/kotlin/com/thomaskioko/tvmaniac/compose/components/ErrorLayout.kt b/android-designsystem/src/main/kotlin/com/thomaskioko/tvmaniac/compose/components/ErrorLayout.kt similarity index 100% rename from android/designsystem/src/main/kotlin/com/thomaskioko/tvmaniac/compose/components/ErrorLayout.kt rename to android-designsystem/src/main/kotlin/com/thomaskioko/tvmaniac/compose/components/ErrorLayout.kt diff --git a/android/designsystem/src/main/kotlin/com/thomaskioko/tvmaniac/compose/components/GradientScrim.kt b/android-designsystem/src/main/kotlin/com/thomaskioko/tvmaniac/compose/components/GradientScrim.kt similarity index 100% rename from android/designsystem/src/main/kotlin/com/thomaskioko/tvmaniac/compose/components/GradientScrim.kt rename to android-designsystem/src/main/kotlin/com/thomaskioko/tvmaniac/compose/components/GradientScrim.kt diff --git a/android/designsystem/src/main/kotlin/com/thomaskioko/tvmaniac/compose/components/Image.kt b/android-designsystem/src/main/kotlin/com/thomaskioko/tvmaniac/compose/components/Image.kt similarity index 100% rename from android/designsystem/src/main/kotlin/com/thomaskioko/tvmaniac/compose/components/Image.kt rename to android-designsystem/src/main/kotlin/com/thomaskioko/tvmaniac/compose/components/Image.kt diff --git a/android/designsystem/src/main/kotlin/com/thomaskioko/tvmaniac/compose/components/NavigationBar.kt b/android-designsystem/src/main/kotlin/com/thomaskioko/tvmaniac/compose/components/NavigationBar.kt similarity index 100% rename from android/designsystem/src/main/kotlin/com/thomaskioko/tvmaniac/compose/components/NavigationBar.kt rename to android-designsystem/src/main/kotlin/com/thomaskioko/tvmaniac/compose/components/NavigationBar.kt diff --git a/android/designsystem/src/main/kotlin/com/thomaskioko/tvmaniac/compose/components/ProgressIndicator.kt b/android-designsystem/src/main/kotlin/com/thomaskioko/tvmaniac/compose/components/ProgressIndicator.kt similarity index 100% rename from android/designsystem/src/main/kotlin/com/thomaskioko/tvmaniac/compose/components/ProgressIndicator.kt rename to android-designsystem/src/main/kotlin/com/thomaskioko/tvmaniac/compose/components/ProgressIndicator.kt diff --git a/android/designsystem/src/main/kotlin/com/thomaskioko/tvmaniac/compose/components/SheetDragHandle.kt b/android-designsystem/src/main/kotlin/com/thomaskioko/tvmaniac/compose/components/SheetDragHandle.kt similarity index 100% rename from android/designsystem/src/main/kotlin/com/thomaskioko/tvmaniac/compose/components/SheetDragHandle.kt rename to android-designsystem/src/main/kotlin/com/thomaskioko/tvmaniac/compose/components/SheetDragHandle.kt diff --git a/android/designsystem/src/main/kotlin/com/thomaskioko/tvmaniac/compose/components/Snackbar.kt b/android-designsystem/src/main/kotlin/com/thomaskioko/tvmaniac/compose/components/Snackbar.kt similarity index 100% rename from android/designsystem/src/main/kotlin/com/thomaskioko/tvmaniac/compose/components/Snackbar.kt rename to android-designsystem/src/main/kotlin/com/thomaskioko/tvmaniac/compose/components/Snackbar.kt diff --git a/android/designsystem/src/main/kotlin/com/thomaskioko/tvmaniac/compose/components/Text.kt b/android-designsystem/src/main/kotlin/com/thomaskioko/tvmaniac/compose/components/Text.kt similarity index 100% rename from android/designsystem/src/main/kotlin/com/thomaskioko/tvmaniac/compose/components/Text.kt rename to android-designsystem/src/main/kotlin/com/thomaskioko/tvmaniac/compose/components/Text.kt diff --git a/android/designsystem/src/main/kotlin/com/thomaskioko/tvmaniac/compose/components/TopBar.kt b/android-designsystem/src/main/kotlin/com/thomaskioko/tvmaniac/compose/components/TopBar.kt similarity index 100% rename from android/designsystem/src/main/kotlin/com/thomaskioko/tvmaniac/compose/components/TopBar.kt rename to android-designsystem/src/main/kotlin/com/thomaskioko/tvmaniac/compose/components/TopBar.kt diff --git a/android/designsystem/src/main/kotlin/com/thomaskioko/tvmaniac/compose/components/TvManiacBottomSheet.kt b/android-designsystem/src/main/kotlin/com/thomaskioko/tvmaniac/compose/components/TvManiacBottomSheet.kt similarity index 100% rename from android/designsystem/src/main/kotlin/com/thomaskioko/tvmaniac/compose/components/TvManiacBottomSheet.kt rename to android-designsystem/src/main/kotlin/com/thomaskioko/tvmaniac/compose/components/TvManiacBottomSheet.kt diff --git a/android/designsystem/src/main/kotlin/com/thomaskioko/tvmaniac/compose/extensions/GradientExtensions.kt b/android-designsystem/src/main/kotlin/com/thomaskioko/tvmaniac/compose/extensions/GradientExtensions.kt similarity index 100% rename from android/designsystem/src/main/kotlin/com/thomaskioko/tvmaniac/compose/extensions/GradientExtensions.kt rename to android-designsystem/src/main/kotlin/com/thomaskioko/tvmaniac/compose/extensions/GradientExtensions.kt diff --git a/android/designsystem/src/main/kotlin/com/thomaskioko/tvmaniac/compose/extensions/PaddingValuesExtentions.kt b/android-designsystem/src/main/kotlin/com/thomaskioko/tvmaniac/compose/extensions/PaddingValuesExtentions.kt similarity index 100% rename from android/designsystem/src/main/kotlin/com/thomaskioko/tvmaniac/compose/extensions/PaddingValuesExtentions.kt rename to android-designsystem/src/main/kotlin/com/thomaskioko/tvmaniac/compose/extensions/PaddingValuesExtentions.kt diff --git a/android/designsystem/src/main/kotlin/com/thomaskioko/tvmaniac/compose/extensions/ScrimExtentions.kt b/android-designsystem/src/main/kotlin/com/thomaskioko/tvmaniac/compose/extensions/ScrimExtentions.kt similarity index 100% rename from android/designsystem/src/main/kotlin/com/thomaskioko/tvmaniac/compose/extensions/ScrimExtentions.kt rename to android-designsystem/src/main/kotlin/com/thomaskioko/tvmaniac/compose/extensions/ScrimExtentions.kt diff --git a/android/designsystem/src/main/kotlin/com/thomaskioko/tvmaniac/compose/theme/Background.kt b/android-designsystem/src/main/kotlin/com/thomaskioko/tvmaniac/compose/theme/Background.kt similarity index 100% rename from android/designsystem/src/main/kotlin/com/thomaskioko/tvmaniac/compose/theme/Background.kt rename to android-designsystem/src/main/kotlin/com/thomaskioko/tvmaniac/compose/theme/Background.kt diff --git a/android/designsystem/src/main/kotlin/com/thomaskioko/tvmaniac/compose/theme/Colors.kt b/android-designsystem/src/main/kotlin/com/thomaskioko/tvmaniac/compose/theme/Colors.kt similarity index 100% rename from android/designsystem/src/main/kotlin/com/thomaskioko/tvmaniac/compose/theme/Colors.kt rename to android-designsystem/src/main/kotlin/com/thomaskioko/tvmaniac/compose/theme/Colors.kt diff --git a/android/designsystem/src/main/kotlin/com/thomaskioko/tvmaniac/compose/theme/Shape.kt b/android-designsystem/src/main/kotlin/com/thomaskioko/tvmaniac/compose/theme/Shape.kt similarity index 100% rename from android/designsystem/src/main/kotlin/com/thomaskioko/tvmaniac/compose/theme/Shape.kt rename to android-designsystem/src/main/kotlin/com/thomaskioko/tvmaniac/compose/theme/Shape.kt diff --git a/android/designsystem/src/main/kotlin/com/thomaskioko/tvmaniac/compose/theme/Theme.kt b/android-designsystem/src/main/kotlin/com/thomaskioko/tvmaniac/compose/theme/Theme.kt similarity index 100% rename from android/designsystem/src/main/kotlin/com/thomaskioko/tvmaniac/compose/theme/Theme.kt rename to android-designsystem/src/main/kotlin/com/thomaskioko/tvmaniac/compose/theme/Theme.kt diff --git a/android/designsystem/src/main/kotlin/com/thomaskioko/tvmaniac/compose/theme/Type.kt b/android-designsystem/src/main/kotlin/com/thomaskioko/tvmaniac/compose/theme/Type.kt similarity index 100% rename from android/designsystem/src/main/kotlin/com/thomaskioko/tvmaniac/compose/theme/Type.kt rename to android-designsystem/src/main/kotlin/com/thomaskioko/tvmaniac/compose/theme/Type.kt diff --git a/android/designsystem/src/main/kotlin/com/thomaskioko/tvmaniac/compose/util/DynamicTheming.kt b/android-designsystem/src/main/kotlin/com/thomaskioko/tvmaniac/compose/util/DynamicTheming.kt similarity index 100% rename from android/designsystem/src/main/kotlin/com/thomaskioko/tvmaniac/compose/util/DynamicTheming.kt rename to android-designsystem/src/main/kotlin/com/thomaskioko/tvmaniac/compose/util/DynamicTheming.kt diff --git a/android/resources/build.gradle.kts b/android-resources/build.gradle.kts similarity index 100% rename from android/resources/build.gradle.kts rename to android-resources/build.gradle.kts diff --git a/android/resources/src/main/res/drawable/trakt_icon_red.xml b/android-resources/src/main/res/drawable/trakt_icon_red.xml similarity index 100% rename from android/resources/src/main/res/drawable/trakt_icon_red.xml rename to android-resources/src/main/res/drawable/trakt_icon_red.xml diff --git a/android/resources/src/main/res/font/work_sans.ttf b/android-resources/src/main/res/font/work_sans.ttf similarity index 100% rename from android/resources/src/main/res/font/work_sans.ttf rename to android-resources/src/main/res/font/work_sans.ttf diff --git a/android/resources/src/main/res/font/work_sans_bold.ttf b/android-resources/src/main/res/font/work_sans_bold.ttf similarity index 100% rename from android/resources/src/main/res/font/work_sans_bold.ttf rename to android-resources/src/main/res/font/work_sans_bold.ttf diff --git a/android/resources/src/main/res/font/work_sans_extrabold.ttf b/android-resources/src/main/res/font/work_sans_extrabold.ttf similarity index 100% rename from android/resources/src/main/res/font/work_sans_extrabold.ttf rename to android-resources/src/main/res/font/work_sans_extrabold.ttf diff --git a/android/resources/src/main/res/font/work_sans_light.ttf b/android-resources/src/main/res/font/work_sans_light.ttf similarity index 100% rename from android/resources/src/main/res/font/work_sans_light.ttf rename to android-resources/src/main/res/font/work_sans_light.ttf diff --git a/android/resources/src/main/res/font/work_sans_medium.ttf b/android-resources/src/main/res/font/work_sans_medium.ttf similarity index 100% rename from android/resources/src/main/res/font/work_sans_medium.ttf rename to android-resources/src/main/res/font/work_sans_medium.ttf diff --git a/android/resources/src/main/res/font/work_sans_semibold.ttf b/android-resources/src/main/res/font/work_sans_semibold.ttf similarity index 100% rename from android/resources/src/main/res/font/work_sans_semibold.ttf rename to android-resources/src/main/res/font/work_sans_semibold.ttf diff --git a/android/resources/src/main/res/font/work_sans_thin.ttf b/android-resources/src/main/res/font/work_sans_thin.ttf similarity index 100% rename from android/resources/src/main/res/font/work_sans_thin.ttf rename to android-resources/src/main/res/font/work_sans_thin.ttf diff --git a/android/resources/src/main/res/values/plurals.xml b/android-resources/src/main/res/values/plurals.xml similarity index 100% rename from android/resources/src/main/res/values/plurals.xml rename to android-resources/src/main/res/values/plurals.xml diff --git a/android/resources/src/main/res/values/strings.xml b/android-resources/src/main/res/values/strings.xml similarity index 100% rename from android/resources/src/main/res/values/strings.xml rename to android-resources/src/main/res/values/strings.xml diff --git a/android/app/benchmark-rules.pro b/app/benchmark-rules.pro similarity index 100% rename from android/app/benchmark-rules.pro rename to app/benchmark-rules.pro diff --git a/android/app/build.gradle.kts b/app/build.gradle.kts similarity index 92% rename from android/app/build.gradle.kts rename to app/build.gradle.kts index e1d450805..dd5d9f184 100644 --- a/android/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -7,12 +7,12 @@ android { } dependencies { - implementation(projects.android.designsystem) - implementation(projects.android.ui.home) - implementation(projects.android.ui.moreShows) - implementation(projects.android.ui.seasonDetails) - implementation(projects.android.ui.showDetails) - implementation(projects.android.ui.trailers) + implementation(projects.androidDesignsystem) + implementation(projects.androidFeature.home) + implementation(projects.androidFeature.moreShows) + implementation(projects.androidFeature.seasonDetails) + implementation(projects.androidFeature.showDetails) + implementation(projects.androidFeature.trailers) implementation(projects.core.base) implementation(projects.core.util) implementation(projects.traktAuth.api) @@ -97,7 +97,7 @@ dependencies { implementation(libs.coroutines.core) implementation(libs.ktor.core) - baselineProfile(projects.android.benchmark) + baselineProfile(projects.benchmark) runtimeOnly(libs.androidx.profileinstaller) } diff --git a/android/app/proguard-rules.pro b/app/proguard-rules.pro similarity index 100% rename from android/app/proguard-rules.pro rename to app/proguard-rules.pro diff --git a/android/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml similarity index 100% rename from android/app/src/main/AndroidManifest.xml rename to app/src/main/AndroidManifest.xml diff --git a/android/app/src/main/generated/baselineProfiles/baseline-prof.txt b/app/src/main/generated/baselineProfiles/baseline-prof.txt similarity index 100% rename from android/app/src/main/generated/baselineProfiles/baseline-prof.txt rename to app/src/main/generated/baselineProfiles/baseline-prof.txt diff --git a/android/app/src/main/generated/baselineProfiles/startup-prof.txt b/app/src/main/generated/baselineProfiles/startup-prof.txt similarity index 100% rename from android/app/src/main/generated/baselineProfiles/startup-prof.txt rename to app/src/main/generated/baselineProfiles/startup-prof.txt diff --git a/android/app/src/main/kotlin/com/thomaskioko/tvmaniac/MainActivity.kt b/app/src/main/kotlin/com/thomaskioko/tvmaniac/MainActivity.kt similarity index 100% rename from android/app/src/main/kotlin/com/thomaskioko/tvmaniac/MainActivity.kt rename to app/src/main/kotlin/com/thomaskioko/tvmaniac/MainActivity.kt diff --git a/android/app/src/main/kotlin/com/thomaskioko/tvmaniac/RootScreen.kt b/app/src/main/kotlin/com/thomaskioko/tvmaniac/RootScreen.kt similarity index 100% rename from android/app/src/main/kotlin/com/thomaskioko/tvmaniac/RootScreen.kt rename to app/src/main/kotlin/com/thomaskioko/tvmaniac/RootScreen.kt diff --git a/android/app/src/main/kotlin/com/thomaskioko/tvmaniac/TvManicApplication.kt b/app/src/main/kotlin/com/thomaskioko/tvmaniac/TvManicApplication.kt similarity index 100% rename from android/app/src/main/kotlin/com/thomaskioko/tvmaniac/TvManicApplication.kt rename to app/src/main/kotlin/com/thomaskioko/tvmaniac/TvManicApplication.kt diff --git a/android/app/src/main/kotlin/com/thomaskioko/tvmaniac/inject/ActivityComponent.kt b/app/src/main/kotlin/com/thomaskioko/tvmaniac/inject/ActivityComponent.kt similarity index 100% rename from android/app/src/main/kotlin/com/thomaskioko/tvmaniac/inject/ActivityComponent.kt rename to app/src/main/kotlin/com/thomaskioko/tvmaniac/inject/ActivityComponent.kt diff --git a/android/app/src/main/kotlin/com/thomaskioko/tvmaniac/inject/ApplicationComponent.kt b/app/src/main/kotlin/com/thomaskioko/tvmaniac/inject/ApplicationComponent.kt similarity index 100% rename from android/app/src/main/kotlin/com/thomaskioko/tvmaniac/inject/ApplicationComponent.kt rename to app/src/main/kotlin/com/thomaskioko/tvmaniac/inject/ApplicationComponent.kt diff --git a/android/app/src/main/res/drawable/ic_app_launcher.xml b/app/src/main/res/drawable/ic_app_launcher.xml similarity index 100% rename from android/app/src/main/res/drawable/ic_app_launcher.xml rename to app/src/main/res/drawable/ic_app_launcher.xml diff --git a/android/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml similarity index 100% rename from android/app/src/main/res/values-night/colors.xml rename to app/src/main/res/values-night/colors.xml diff --git a/android/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml similarity index 100% rename from android/app/src/main/res/values-night/themes.xml rename to app/src/main/res/values-night/themes.xml diff --git a/android/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml similarity index 100% rename from android/app/src/main/res/values/colors.xml rename to app/src/main/res/values/colors.xml diff --git a/android/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml similarity index 100% rename from android/app/src/main/res/values/themes.xml rename to app/src/main/res/values/themes.xml diff --git a/android/benchmark/build.gradle.kts b/benchmark/build.gradle.kts similarity index 97% rename from android/benchmark/build.gradle.kts rename to benchmark/build.gradle.kts index 3a0311fa5..2d26c5a87 100644 --- a/android/benchmark/build.gradle.kts +++ b/benchmark/build.gradle.kts @@ -30,7 +30,7 @@ android { } } - targetProjectPath = ":android:app" + targetProjectPath = ":app" } @Suppress("UnstableApiUsage") diff --git a/android/benchmark/src/main/AndroidManifest.xml b/benchmark/src/main/AndroidManifest.xml similarity index 100% rename from android/benchmark/src/main/AndroidManifest.xml rename to benchmark/src/main/AndroidManifest.xml diff --git a/android/benchmark/src/main/kotlin/com/thomaskioko/tvmaniac/benchmark/Common.kt b/benchmark/src/main/kotlin/com/thomaskioko/tvmaniac/benchmark/Common.kt similarity index 100% rename from android/benchmark/src/main/kotlin/com/thomaskioko/tvmaniac/benchmark/Common.kt rename to benchmark/src/main/kotlin/com/thomaskioko/tvmaniac/benchmark/Common.kt diff --git a/android/benchmark/src/main/kotlin/com/thomaskioko/tvmaniac/benchmark/baselineprofile/BaselineProfileGenerator.kt b/benchmark/src/main/kotlin/com/thomaskioko/tvmaniac/benchmark/baselineprofile/BaselineProfileGenerator.kt similarity index 100% rename from android/benchmark/src/main/kotlin/com/thomaskioko/tvmaniac/benchmark/baselineprofile/BaselineProfileGenerator.kt rename to benchmark/src/main/kotlin/com/thomaskioko/tvmaniac/benchmark/baselineprofile/BaselineProfileGenerator.kt diff --git a/android/benchmark/src/main/kotlin/com/thomaskioko/tvmaniac/benchmark/benchmark/StartupBenchmarks.kt b/benchmark/src/main/kotlin/com/thomaskioko/tvmaniac/benchmark/benchmark/StartupBenchmarks.kt similarity index 100% rename from android/benchmark/src/main/kotlin/com/thomaskioko/tvmaniac/benchmark/benchmark/StartupBenchmarks.kt rename to benchmark/src/main/kotlin/com/thomaskioko/tvmaniac/benchmark/benchmark/StartupBenchmarks.kt diff --git a/settings.gradle.kts b/settings.gradle.kts index 1ef36581f..526f39030 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -44,24 +44,24 @@ develocity { } include( - ":android:app", - ":android:designsystem", - ":android:benchmark", - ":android:ui:discover", - ":android:ui:home", - ":android:ui:more-shows", - ":android:resources", - ":android:screenshot-tests", - ":android:ui:search", - ":android:ui:season-details", - ":android:ui:settings", - ":android:ui:show-details", - ":android:ui:trailers", - ":android:ui:watchlist", + ":app", + ":android-designsystem", + ":android-feature:discover", + ":android-feature:home", + ":android-feature:more-shows", + ":android-feature:search", + ":android-feature:season-details", + ":android-feature:settings", + ":android-feature:show-details", + ":android-feature:trailers", + ":android-feature:watchlist", + ":android-resources", + ":benchmark", ":core:base", ":core:logger", ":core:network-util", ":core:paging", + ":core:screenshot-tests", ":core:util", ":core:util:testing", ":database",