Flatten android modules. Get rid of android directory and move module…

…s to root dir.
thomaskioko · Feb 9, 2025 · 798f2df · 798f2df
1 parent dfc5e76
commit 798f2df
Show file tree

Hide file tree

Showing 61 changed files with 28 additions and 28 deletions.
diff --git 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
@@ -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 → android-designsystem/build.gradle.kts b/android/designsystem/build.gradle.kts → 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/...tvmaniac/compose/components/Background.kt → ...tvmaniac/compose/components/Background.kt b/...tvmaniac/compose/components/Background.kt → ...tvmaniac/compose/components/Background.kt
diff --git a/...ko/tvmaniac/compose/components/Buttons.kt → ...ko/tvmaniac/compose/components/Buttons.kt b/...ko/tvmaniac/compose/components/Buttons.kt → ...ko/tvmaniac/compose/components/Buttons.kt
diff --git a/...kioko/tvmaniac/compose/components/Card.kt → ...kioko/tvmaniac/compose/components/Card.kt b/...kioko/tvmaniac/compose/components/Card.kt → ...kioko/tvmaniac/compose/components/Card.kt
diff --git a/...kioko/tvmaniac/compose/components/Chip.kt → ...kioko/tvmaniac/compose/components/Chip.kt b/...kioko/tvmaniac/compose/components/Chip.kt → ...kioko/tvmaniac/compose/components/Chip.kt
diff --git a/...ko/tvmaniac/compose/components/Dialogs.kt → ...ko/tvmaniac/compose/components/Dialogs.kt b/...ko/tvmaniac/compose/components/Dialogs.kt → ...ko/tvmaniac/compose/components/Dialogs.kt
diff --git a/...vmaniac/compose/components/EmptyLayout.kt → ...vmaniac/compose/components/EmptyLayout.kt b/...vmaniac/compose/components/EmptyLayout.kt → ...vmaniac/compose/components/EmptyLayout.kt
diff --git a/...vmaniac/compose/components/ErrorLayout.kt → ...vmaniac/compose/components/ErrorLayout.kt b/...vmaniac/compose/components/ErrorLayout.kt → ...vmaniac/compose/components/ErrorLayout.kt
diff --git a/...aniac/compose/components/GradientScrim.kt → ...aniac/compose/components/GradientScrim.kt b/...aniac/compose/components/GradientScrim.kt → ...aniac/compose/components/GradientScrim.kt
diff --git a/...ioko/tvmaniac/compose/components/Image.kt → ...ioko/tvmaniac/compose/components/Image.kt b/...ioko/tvmaniac/compose/components/Image.kt → ...ioko/tvmaniac/compose/components/Image.kt
diff --git a/...aniac/compose/components/NavigationBar.kt → ...aniac/compose/components/NavigationBar.kt b/...aniac/compose/components/NavigationBar.kt → ...aniac/compose/components/NavigationBar.kt
diff --git a/...c/compose/components/ProgressIndicator.kt → ...c/compose/components/ProgressIndicator.kt b/...c/compose/components/ProgressIndicator.kt → ...c/compose/components/ProgressIndicator.kt
diff --git a/...iac/compose/components/SheetDragHandle.kt → ...iac/compose/components/SheetDragHandle.kt b/...iac/compose/components/SheetDragHandle.kt → ...iac/compose/components/SheetDragHandle.kt
diff --git a/...o/tvmaniac/compose/components/Snackbar.kt → ...o/tvmaniac/compose/components/Snackbar.kt b/...o/tvmaniac/compose/components/Snackbar.kt → ...o/tvmaniac/compose/components/Snackbar.kt
diff --git a/...kioko/tvmaniac/compose/components/Text.kt → ...kioko/tvmaniac/compose/components/Text.kt b/...kioko/tvmaniac/compose/components/Text.kt → ...kioko/tvmaniac/compose/components/Text.kt
diff --git a/...oko/tvmaniac/compose/components/TopBar.kt → ...oko/tvmaniac/compose/components/TopBar.kt b/...oko/tvmaniac/compose/components/TopBar.kt → ...oko/tvmaniac/compose/components/TopBar.kt
diff --git a/...compose/components/TvManiacBottomSheet.kt → ...compose/components/TvManiacBottomSheet.kt b/...compose/components/TvManiacBottomSheet.kt → ...compose/components/TvManiacBottomSheet.kt
diff --git a/.../compose/extensions/GradientExtensions.kt → .../compose/extensions/GradientExtensions.kt b/.../compose/extensions/GradientExtensions.kt → .../compose/extensions/GradientExtensions.kt
diff --git a/...ose/extensions/PaddingValuesExtentions.kt → ...ose/extensions/PaddingValuesExtentions.kt b/...ose/extensions/PaddingValuesExtentions.kt → ...ose/extensions/PaddingValuesExtentions.kt
diff --git a/...iac/compose/extensions/ScrimExtentions.kt → ...iac/compose/extensions/ScrimExtentions.kt b/...iac/compose/extensions/ScrimExtentions.kt → ...iac/compose/extensions/ScrimExtentions.kt
diff --git a/...ioko/tvmaniac/compose/theme/Background.kt → ...ioko/tvmaniac/compose/theme/Background.kt b/...ioko/tvmaniac/compose/theme/Background.kt → ...ioko/tvmaniac/compose/theme/Background.kt
diff --git a/...maskioko/tvmaniac/compose/theme/Colors.kt → ...maskioko/tvmaniac/compose/theme/Colors.kt b/...maskioko/tvmaniac/compose/theme/Colors.kt → ...maskioko/tvmaniac/compose/theme/Colors.kt
diff --git a/...omaskioko/tvmaniac/compose/theme/Shape.kt → ...omaskioko/tvmaniac/compose/theme/Shape.kt b/...omaskioko/tvmaniac/compose/theme/Shape.kt → ...omaskioko/tvmaniac/compose/theme/Shape.kt
diff --git a/...omaskioko/tvmaniac/compose/theme/Theme.kt → ...omaskioko/tvmaniac/compose/theme/Theme.kt b/...omaskioko/tvmaniac/compose/theme/Theme.kt → ...omaskioko/tvmaniac/compose/theme/Theme.kt
diff --git a/...homaskioko/tvmaniac/compose/theme/Type.kt → ...homaskioko/tvmaniac/compose/theme/Type.kt b/...homaskioko/tvmaniac/compose/theme/Type.kt → ...homaskioko/tvmaniac/compose/theme/Type.kt
diff --git a/...o/tvmaniac/compose/util/DynamicTheming.kt → ...o/tvmaniac/compose/util/DynamicTheming.kt b/...o/tvmaniac/compose/util/DynamicTheming.kt → ...o/tvmaniac/compose/util/DynamicTheming.kt
diff --git a/android/resources/build.gradle.kts → android-resources/build.gradle.kts b/android/resources/build.gradle.kts → android-resources/build.gradle.kts
diff --git a/.../src/main/res/drawable/trakt_icon_red.xml → .../src/main/res/drawable/trakt_icon_red.xml b/.../src/main/res/drawable/trakt_icon_red.xml → .../src/main/res/drawable/trakt_icon_red.xml
diff --git a/...resources/src/main/res/font/work_sans.ttf → ...resources/src/main/res/font/work_sans.ttf b/...resources/src/main/res/font/work_sans.ttf → ...resources/src/main/res/font/work_sans.ttf
diff --git a/...rces/src/main/res/font/work_sans_bold.ttf → ...rces/src/main/res/font/work_sans_bold.ttf b/...rces/src/main/res/font/work_sans_bold.ttf → ...rces/src/main/res/font/work_sans_bold.ttf
diff --git a/...src/main/res/font/work_sans_extrabold.ttf → ...src/main/res/font/work_sans_extrabold.ttf b/...src/main/res/font/work_sans_extrabold.ttf → ...src/main/res/font/work_sans_extrabold.ttf
diff --git a/...ces/src/main/res/font/work_sans_light.ttf → ...ces/src/main/res/font/work_sans_light.ttf b/...ces/src/main/res/font/work_sans_light.ttf → ...ces/src/main/res/font/work_sans_light.ttf
diff --git a/...es/src/main/res/font/work_sans_medium.ttf → ...es/src/main/res/font/work_sans_medium.ttf b/...es/src/main/res/font/work_sans_medium.ttf → ...es/src/main/res/font/work_sans_medium.ttf
diff --git a/.../src/main/res/font/work_sans_semibold.ttf → .../src/main/res/font/work_sans_semibold.ttf b/.../src/main/res/font/work_sans_semibold.ttf → .../src/main/res/font/work_sans_semibold.ttf
diff --git a/...rces/src/main/res/font/work_sans_thin.ttf → ...rces/src/main/res/font/work_sans_thin.ttf b/...rces/src/main/res/font/work_sans_thin.ttf → ...rces/src/main/res/font/work_sans_thin.ttf
diff --git a/...resources/src/main/res/values/plurals.xml → ...resources/src/main/res/values/plurals.xml b/...resources/src/main/res/values/plurals.xml → ...resources/src/main/res/values/plurals.xml
diff --git a/...resources/src/main/res/values/strings.xml → ...resources/src/main/res/values/strings.xml b/...resources/src/main/res/values/strings.xml → ...resources/src/main/res/values/strings.xml
diff --git a/android/app/benchmark-rules.pro → app/benchmark-rules.pro b/android/app/benchmark-rules.pro → app/benchmark-rules.pro
diff --git a/android/app/build.gradle.kts → app/build.gradle.kts b/android/app/build.gradle.kts → 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 → app/proguard-rules.pro b/android/app/proguard-rules.pro → app/proguard-rules.pro
diff --git a/android/app/src/main/AndroidManifest.xml → app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml → app/src/main/AndroidManifest.xml
diff --git a/...erated/baselineProfiles/baseline-prof.txt → ...erated/baselineProfiles/baseline-prof.txt b/...erated/baselineProfiles/baseline-prof.txt → ...erated/baselineProfiles/baseline-prof.txt
diff --git a/...nerated/baselineProfiles/startup-prof.txt → ...nerated/baselineProfiles/startup-prof.txt b/...nerated/baselineProfiles/startup-prof.txt → ...nerated/baselineProfiles/startup-prof.txt
diff --git a/.../com/thomaskioko/tvmaniac/MainActivity.kt → .../com/thomaskioko/tvmaniac/MainActivity.kt b/.../com/thomaskioko/tvmaniac/MainActivity.kt → .../com/thomaskioko/tvmaniac/MainActivity.kt
diff --git a/...in/com/thomaskioko/tvmaniac/RootScreen.kt → ...in/com/thomaskioko/tvmaniac/RootScreen.kt b/...in/com/thomaskioko/tvmaniac/RootScreen.kt → ...in/com/thomaskioko/tvmaniac/RootScreen.kt
diff --git a/...homaskioko/tvmaniac/TvManicApplication.kt → ...homaskioko/tvmaniac/TvManicApplication.kt b/...homaskioko/tvmaniac/TvManicApplication.kt → ...homaskioko/tvmaniac/TvManicApplication.kt
diff --git a/...ioko/tvmaniac/inject/ActivityComponent.kt → ...ioko/tvmaniac/inject/ActivityComponent.kt b/...ioko/tvmaniac/inject/ActivityComponent.kt → ...ioko/tvmaniac/inject/ActivityComponent.kt
diff --git a/...o/tvmaniac/inject/ApplicationComponent.kt → ...o/tvmaniac/inject/ApplicationComponent.kt b/...o/tvmaniac/inject/ApplicationComponent.kt → ...o/tvmaniac/inject/ApplicationComponent.kt
diff --git a/...src/main/res/drawable/ic_app_launcher.xml → ...src/main/res/drawable/ic_app_launcher.xml b/...src/main/res/drawable/ic_app_launcher.xml → ...src/main/res/drawable/ic_app_launcher.xml
diff --git a/.../app/src/main/res/values-night/colors.xml → app/src/main/res/values-night/colors.xml b/.../app/src/main/res/values-night/colors.xml → app/src/main/res/values-night/colors.xml
diff --git a/.../app/src/main/res/values-night/themes.xml → app/src/main/res/values-night/themes.xml b/.../app/src/main/res/values-night/themes.xml → app/src/main/res/values-night/themes.xml
diff --git a/android/app/src/main/res/values/colors.xml → app/src/main/res/values/colors.xml b/android/app/src/main/res/values/colors.xml → app/src/main/res/values/colors.xml
diff --git a/android/app/src/main/res/values/themes.xml → app/src/main/res/values/themes.xml b/android/app/src/main/res/values/themes.xml → app/src/main/res/values/themes.xml
diff --git a/android/benchmark/build.gradle.kts → benchmark/build.gradle.kts b/android/benchmark/build.gradle.kts → benchmark/build.gradle.kts
@@ -30,7 +30,7 @@ android {
     }
   }
 
-  targetProjectPath = ":android:app"
+  targetProjectPath = ":app"
 }
 
 @Suppress("UnstableApiUsage")

diff --git a/...id/benchmark/src/main/AndroidManifest.xml → benchmark/src/main/AndroidManifest.xml b/...id/benchmark/src/main/AndroidManifest.xml → benchmark/src/main/AndroidManifest.xml
diff --git a/.../thomaskioko/tvmaniac/benchmark/Common.kt → .../thomaskioko/tvmaniac/benchmark/Common.kt b/.../thomaskioko/tvmaniac/benchmark/Common.kt → .../thomaskioko/tvmaniac/benchmark/Common.kt
diff --git a/...selineprofile/BaselineProfileGenerator.kt → ...selineprofile/BaselineProfileGenerator.kt b/...selineprofile/BaselineProfileGenerator.kt → ...selineprofile/BaselineProfileGenerator.kt
diff --git a/.../benchmark/benchmark/StartupBenchmarks.kt → .../benchmark/benchmark/StartupBenchmarks.kt b/.../benchmark/benchmark/StartupBenchmarks.kt → .../benchmark/benchmark/StartupBenchmarks.kt
diff --git 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",
-Original file line number
+Diff line change
@@ Expand Up / @@ -30,7 +30,7 @@ android { @@
         }
       }
-      targetProjectPath = ":android:app"
+      targetProjectPath = ":app"
     }
     @Suppress("UnstableApiUsage")
@@ Expand Down @@