Move :app to :app:android

MateriiApps · Feb 13, 2024 · 3183dfa · 3183dfa
1 parent 50f3e4f
commit 3183dfa
Show file tree

Hide file tree

Showing 71 changed files with 14 additions and 7,098 deletions.
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
@@ -34,9 +34,9 @@ jobs:
         uses: android-actions/setup-android@v2.0.10
 
       - name: Build APK
-        run: chmod +x ./gradlew && ./gradlew assembleDebug
+        run: chmod +x ./gradlew && ./gradlew :app:android:assembleDebug
 
       - name: Upload APK
         uses: actions/upload-artifact@v2
         with:
-          path: app/build/outputs/apk/debug/app-debug.apk
+          path: app/android/build/outputs/apk/debug/android-debug.apk
diff --git a/app/.gitignore → app/android/.gitignore b/app/.gitignore → app/android/.gitignore
diff --git a/app/build.gradle.kts → app/android/build.gradle.kts b/app/build.gradle.kts → app/android/build.gradle.kts
@@ -27,7 +27,7 @@ android {
             setProguardFiles(
                 listOf(
                     getDefaultProguardFile("proguard-android-optimize.txt"),
-                    "proguard-rules.pro"
+                    "../proguard-rules.pro"
                 )
             )
         }
@@ -53,7 +53,7 @@ android {
         freeCompilerArgs += "-Xexpect-actual-classes"
         freeCompilerArgs += listOf(
             "-P",
-            "plugin:androidx.compose.compiler.plugins.kotlin:stabilityConfigurationPath=${file("./stability.txt").absolutePath}"
+            "plugin:androidx.compose.compiler.plugins.kotlin:stabilityConfigurationPath=${file("../stability.txt").absolutePath}"
         )
     }
 

diff --git a/app/src/main/AndroidManifest.xml → app/android/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml → app/android/src/main/AndroidManifest.xml
diff --git a/.../main/java/com/materiiapps/gloom/Gloom.kt → .../main/java/com/materiiapps/gloom/Gloom.kt b/.../main/java/com/materiiapps/gloom/Gloom.kt → .../main/java/com/materiiapps/gloom/Gloom.kt
diff --git a/...com/materiiapps/gloom/ui/GloomActivity.kt → ...com/materiiapps/gloom/ui/GloomActivity.kt b/...com/materiiapps/gloom/ui/GloomActivity.kt → ...com/materiiapps/gloom/ui/GloomActivity.kt
diff --git a/...gloom/ui/viewmodels/main/MainViewModel.kt → ...gloom/ui/viewmodels/main/MainViewModel.kt b/...gloom/ui/viewmodels/main/MainViewModel.kt → ...gloom/ui/viewmodels/main/MainViewModel.kt
diff --git a/...com/materiiapps/gloom/utils/OAuthUtils.kt → ...com/materiiapps/gloom/utils/OAuthUtils.kt b/...com/materiiapps/gloom/utils/OAuthUtils.kt → ...com/materiiapps/gloom/utils/OAuthUtils.kt
diff --git a/.../gloom/utils/deeplinks/DeepLinkHandler.kt → .../gloom/utils/deeplinks/DeepLinkHandler.kt b/.../gloom/utils/deeplinks/DeepLinkHandler.kt → .../gloom/utils/deeplinks/DeepLinkHandler.kt
diff --git a/...ps/gloom/utils/deeplinks/DeepLinkUtils.kt → ...ps/gloom/utils/deeplinks/DeepLinkUtils.kt b/...ps/gloom/utils/deeplinks/DeepLinkUtils.kt → ...ps/gloom/utils/deeplinks/DeepLinkUtils.kt
diff --git a/.../gloom/utils/deeplinks/DeepLinkWrapper.kt → .../gloom/utils/deeplinks/DeepLinkWrapper.kt b/.../gloom/utils/deeplinks/DeepLinkWrapper.kt → .../gloom/utils/deeplinks/DeepLinkWrapper.kt
diff --git a/...m/utils/deeplinks/LocalDeepLinkHandler.kt → ...m/utils/deeplinks/LocalDeepLinkHandler.kt b/...m/utils/deeplinks/LocalDeepLinkHandler.kt → ...m/utils/deeplinks/LocalDeepLinkHandler.kt
diff --git a/...src/main/res/drawable-v26/ic_launcher.xml → ...src/main/res/drawable-v26/ic_launcher.xml b/...src/main/res/drawable-v26/ic_launcher.xml → ...src/main/res/drawable-v26/ic_launcher.xml
diff --git a/...s/drawable-v26/ic_launcher_foreground.xml → ...s/drawable-v26/ic_launcher_foreground.xml b/...s/drawable-v26/ic_launcher_foreground.xml → ...s/drawable-v26/ic_launcher_foreground.xml
diff --git a/app/src/main/res/drawable/ic_balance_24.xml → ...d/src/main/res/drawable/ic_balance_24.xml b/app/src/main/res/drawable/ic_balance_24.xml → ...d/src/main/res/drawable/ic_balance_24.xml
diff --git a/app/src/main/res/drawable/ic_commit_24.xml → ...id/src/main/res/drawable/ic_commit_24.xml b/app/src/main/res/drawable/ic_commit_24.xml → ...id/src/main/res/drawable/ic_commit_24.xml
diff --git a/app/src/main/res/drawable/ic_facebook_24.xml → .../src/main/res/drawable/ic_facebook_24.xml b/app/src/main/res/drawable/ic_facebook_24.xml → .../src/main/res/drawable/ic_facebook_24.xml
diff --git a/app/src/main/res/drawable/ic_fork_24.xml → ...roid/src/main/res/drawable/ic_fork_24.xml b/app/src/main/res/drawable/ic_fork_24.xml → ...roid/src/main/res/drawable/ic_fork_24.xml
diff --git a/app/src/main/res/drawable/ic_github_24.xml → ...id/src/main/res/drawable/ic_github_24.xml b/app/src/main/res/drawable/ic_github_24.xml → ...id/src/main/res/drawable/ic_github_24.xml
diff --git a/app/src/main/res/drawable/ic_gloom.xml → ...ndroid/src/main/res/drawable/ic_gloom.xml b/app/src/main/res/drawable/ic_gloom.xml → ...ndroid/src/main/res/drawable/ic_gloom.xml
diff --git a/...main/res/drawable/ic_gloom_monochrome.xml → ...main/res/drawable/ic_gloom_monochrome.xml b/...main/res/drawable/ic_gloom_monochrome.xml → ...main/res/drawable/ic_gloom_monochrome.xml
diff --git a/app/src/main/res/drawable/ic_hometown_24.xml → .../src/main/res/drawable/ic_hometown_24.xml b/app/src/main/res/drawable/ic_hometown_24.xml → .../src/main/res/drawable/ic_hometown_24.xml
diff --git a/...src/main/res/drawable/ic_instagram_24.xml → ...src/main/res/drawable/ic_instagram_24.xml b/...src/main/res/drawable/ic_instagram_24.xml → ...src/main/res/drawable/ic_instagram_24.xml
diff --git a/app/src/main/res/drawable/ic_launcher.png → ...oid/src/main/res/drawable/ic_launcher.png b/app/src/main/res/drawable/ic_launcher.png → ...oid/src/main/res/drawable/ic_launcher.png
diff --git a/app/src/main/res/drawable/ic_link_24.xml → ...roid/src/main/res/drawable/ic_link_24.xml b/app/src/main/res/drawable/ic_link_24.xml → ...roid/src/main/res/drawable/ic_link_24.xml
diff --git a/app/src/main/res/drawable/ic_linkedin_24.xml → .../src/main/res/drawable/ic_linkedin_24.xml b/app/src/main/res/drawable/ic_linkedin_24.xml → .../src/main/res/drawable/ic_linkedin_24.xml
diff --git a/app/src/main/res/drawable/ic_mastodon_24.xml → .../src/main/res/drawable/ic_mastodon_24.xml b/app/src/main/res/drawable/ic_mastodon_24.xml → .../src/main/res/drawable/ic_mastodon_24.xml
diff --git a/app/src/main/res/drawable/ic_reddit_24.xml → ...id/src/main/res/drawable/ic_reddit_24.xml b/app/src/main/res/drawable/ic_reddit_24.xml → ...id/src/main/res/drawable/ic_reddit_24.xml
diff --git a/app/src/main/res/drawable/ic_twitch_24.xml → ...id/src/main/res/drawable/ic_twitch_24.xml b/app/src/main/res/drawable/ic_twitch_24.xml → ...id/src/main/res/drawable/ic_twitch_24.xml
diff --git a/app/src/main/res/drawable/ic_twitter_24.xml → ...d/src/main/res/drawable/ic_twitter_24.xml b/app/src/main/res/drawable/ic_twitter_24.xml → ...d/src/main/res/drawable/ic_twitter_24.xml
diff --git a/app/src/main/res/drawable/ic_youtube_24.xml → ...d/src/main/res/drawable/ic_youtube_24.xml b/app/src/main/res/drawable/ic_youtube_24.xml → ...d/src/main/res/drawable/ic_youtube_24.xml
diff --git a/app/android/src/main/res/values/colors.xml b/app/android/src/main/res/values/colors.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="ic_launcher_background">#242424</color>
+</resources>
diff --git a/app/android/src/main/res/values/strings.xml b/app/android/src/main/res/values/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">Gloom</string>
+</resources>
diff --git a/app/src/main/res/values/themes.xml → app/android/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml → app/android/src/main/res/values/themes.xml
diff --git a/app/src/main/res/xml/backup_rules.xml → ...android/src/main/res/xml/backup_rules.xml b/app/src/main/res/xml/backup_rules.xml → ...android/src/main/res/xml/backup_rules.xml
diff --git a/...rc/main/res/xml/data_extraction_rules.xml → ...rc/main/res/xml/data_extraction_rules.xml b/...rc/main/res/xml/data_extraction_rules.xml → ...rc/main/res/xml/data_extraction_rules.xml
diff --git a/app/src/main/assets/data/emoji.json b/app/src/main/assets/data/emoji.json
diff --git a/app/src/main/res/values-af-rZA/strings.xml b/app/src/main/res/values-af-rZA/strings.xml