refactor: split out stuff into sub projects

Yash-Garg · Jul 1, 2024 · 61825ca · 61825ca
1 parent 31975a9
commit 61825ca
Show file tree

Hide file tree

Showing 76 changed files with 35 additions and 4 deletions.
diff --git a/app/.gitignore → android/.gitignore b/app/.gitignore → android/.gitignore
diff --git a/app/build.gradle.kts → android/build.gradle.kts b/app/build.gradle.kts → android/build.gradle.kts
@@ -134,4 +134,6 @@ dependencies {
     debugImplementation(libs.chucker)
     releaseImplementation(libs.chucker.no.op)
     testImplementation(libs.junit)
+
+    implementation(projects.data)
 }
diff --git a/app/ic_launcher-playstore.png → android/ic_launcher-playstore.png b/app/ic_launcher-playstore.png → android/ic_launcher-playstore.png
diff --git a/app/proguard-rules.pro → android/proguard-rules.pro b/app/proguard-rules.pro → android/proguard-rules.pro
diff --git a/app/src/main/AndroidManifest.xml → android/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml → android/src/main/AndroidManifest.xml
diff --git a/.../yash/keymanager/KeyManagerApplication.kt → .../yash/keymanager/KeyManagerApplication.kt b/.../yash/keymanager/KeyManagerApplication.kt → .../yash/keymanager/KeyManagerApplication.kt
diff --git a/...otlin/dev/yash/keymanager/MainActivity.kt → ...otlin/dev/yash/keymanager/MainActivity.kt b/...otlin/dev/yash/keymanager/MainActivity.kt → ...otlin/dev/yash/keymanager/MainActivity.kt
diff --git a/...lin/dev/yash/keymanager/data/AppModule.kt → ...otlin/dev/yash/keymanager/di/AppModule.kt b/...lin/dev/yash/keymanager/data/AppModule.kt → ...otlin/dev/yash/keymanager/di/AppModule.kt
@@ -1,4 +1,4 @@
-package dev.yash.keymanager.data
+package dev.yash.keymanager.di
 
 import android.content.Context
 import android.content.SharedPreferences

diff --git a/...h/keymanager/paging/GithubPagingSource.kt → ...h/keymanager/paging/GithubPagingSource.kt b/...h/keymanager/paging/GithubPagingSource.kt → ...h/keymanager/paging/GithubPagingSource.kt
diff --git a/...n/dev/yash/keymanager/ui/KeyManagerApp.kt → ...n/dev/yash/keymanager/ui/KeyManagerApp.kt b/...n/dev/yash/keymanager/ui/KeyManagerApp.kt → ...n/dev/yash/keymanager/ui/KeyManagerApp.kt
diff --git a/...dev/yash/keymanager/ui/auth/AuthScreen.kt → ...dev/yash/keymanager/ui/auth/AuthScreen.kt b/...dev/yash/keymanager/ui/auth/AuthScreen.kt → ...dev/yash/keymanager/ui/auth/AuthScreen.kt
diff --git a/.../dev/yash/keymanager/ui/auth/AuthState.kt → .../dev/yash/keymanager/ui/auth/AuthState.kt b/.../dev/yash/keymanager/ui/auth/AuthState.kt → .../dev/yash/keymanager/ui/auth/AuthState.kt
diff --git a/.../yash/keymanager/ui/auth/AuthViewModel.kt → .../yash/keymanager/ui/auth/AuthViewModel.kt b/.../yash/keymanager/ui/auth/AuthViewModel.kt → .../yash/keymanager/ui/auth/AuthViewModel.kt
diff --git a/...ager/ui/common/CustomOutlinedTextField.kt → ...ager/ui/common/CustomOutlinedTextField.kt b/...ager/ui/common/CustomOutlinedTextField.kt → ...ager/ui/common/CustomOutlinedTextField.kt
diff --git a/...ymanager/ui/common/DialogWithTextField.kt → ...ymanager/ui/common/DialogWithTextField.kt b/...ymanager/ui/common/DialogWithTextField.kt → ...ymanager/ui/common/DialogWithTextField.kt
diff --git a/...nager/ui/common/KeyDialogWithTextField.kt → ...nager/ui/common/KeyDialogWithTextField.kt b/...nager/ui/common/KeyDialogWithTextField.kt → ...nager/ui/common/KeyDialogWithTextField.kt
diff --git a/...ev/yash/keymanager/ui/common/LoadError.kt → ...ev/yash/keymanager/ui/common/LoadError.kt b/...ev/yash/keymanager/ui/common/LoadError.kt → ...ev/yash/keymanager/ui/common/LoadError.kt
diff --git a/...main/kotlin/dev/yash/keymanager/ui/ext.kt → ...main/kotlin/dev/yash/keymanager/ui/ext.kt b/...main/kotlin/dev/yash/keymanager/ui/ext.kt → ...main/kotlin/dev/yash/keymanager/ui/ext.kt
diff --git a/...v/yash/keymanager/ui/home/HomeNavGraph.kt → ...v/yash/keymanager/ui/home/HomeNavGraph.kt b/...v/yash/keymanager/ui/home/HomeNavGraph.kt → ...v/yash/keymanager/ui/home/HomeNavGraph.kt
diff --git a/...dev/yash/keymanager/ui/home/HomeScreen.kt → ...dev/yash/keymanager/ui/home/HomeScreen.kt b/...dev/yash/keymanager/ui/home/HomeScreen.kt → ...dev/yash/keymanager/ui/home/HomeScreen.kt
diff --git a/.../yash/keymanager/ui/home/HomeViewModel.kt → .../yash/keymanager/ui/home/HomeViewModel.kt b/.../yash/keymanager/ui/home/HomeViewModel.kt → .../yash/keymanager/ui/home/HomeViewModel.kt
diff --git a/...sh/keymanager/ui/keys/GpgKeyListScreen.kt → ...sh/keymanager/ui/keys/GpgKeyListScreen.kt b/...sh/keymanager/ui/keys/GpgKeyListScreen.kt → ...sh/keymanager/ui/keys/GpgKeyListScreen.kt
diff --git a/...sh/keymanager/ui/keys/KeyDetailsScreen.kt → ...sh/keymanager/ui/keys/KeyDetailsScreen.kt b/...sh/keymanager/ui/keys/KeyDetailsScreen.kt → ...sh/keymanager/ui/keys/KeyDetailsScreen.kt
diff --git a/...sh/keymanager/ui/keys/SshKeyListScreen.kt → ...sh/keymanager/ui/keys/SshKeyListScreen.kt b/...sh/keymanager/ui/keys/SshKeyListScreen.kt → ...sh/keymanager/ui/keys/SshKeyListScreen.kt
diff --git a/...lin/dev/yash/keymanager/ui/theme/Color.kt → ...lin/dev/yash/keymanager/ui/theme/Color.kt b/...lin/dev/yash/keymanager/ui/theme/Color.kt → ...lin/dev/yash/keymanager/ui/theme/Color.kt
diff --git a/...lin/dev/yash/keymanager/ui/theme/Theme.kt → ...lin/dev/yash/keymanager/ui/theme/Theme.kt b/...lin/dev/yash/keymanager/ui/theme/Theme.kt → ...lin/dev/yash/keymanager/ui/theme/Theme.kt
diff --git a/...tlin/dev/yash/keymanager/ui/theme/Type.kt → ...tlin/dev/yash/keymanager/ui/theme/Type.kt b/...tlin/dev/yash/keymanager/ui/theme/Type.kt → ...tlin/dev/yash/keymanager/ui/theme/Type.kt
diff --git a/app/src/main/res/drawable/ic_github.xml → android/src/main/res/drawable/ic_github.xml b/app/src/main/res/drawable/ic_github.xml → android/src/main/res/drawable/ic_github.xml
diff --git a/app/src/main/res/drawable/ic_key.xml → android/src/main/res/drawable/ic_key.xml b/app/src/main/res/drawable/ic_key.xml → android/src/main/res/drawable/ic_key.xml
diff --git a/app/src/main/res/drawable/key_inset.xml → android/src/main/res/drawable/key_inset.xml b/app/src/main/res/drawable/key_inset.xml → android/src/main/res/drawable/key_inset.xml
diff --git a/...ain/res/mipmap-anydpi-v26/ic_launcher.xml → ...ain/res/mipmap-anydpi-v26/ic_launcher.xml b/...ain/res/mipmap-anydpi-v26/ic_launcher.xml → ...ain/res/mipmap-anydpi-v26/ic_launcher.xml
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png → .../src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png → .../src/main/res/mipmap-hdpi/ic_launcher.png
diff --git a/...es/mipmap-hdpi/ic_launcher_background.png → ...es/mipmap-hdpi/ic_launcher_background.png b/...es/mipmap-hdpi/ic_launcher_background.png → ...es/mipmap-hdpi/ic_launcher_background.png
diff --git a/...es/mipmap-hdpi/ic_launcher_foreground.png → ...es/mipmap-hdpi/ic_launcher_foreground.png b/...es/mipmap-hdpi/ic_launcher_foreground.png → ...es/mipmap-hdpi/ic_launcher_foreground.png
diff --git a/...es/mipmap-hdpi/ic_launcher_monochrome.png → ...es/mipmap-hdpi/ic_launcher_monochrome.png b/...es/mipmap-hdpi/ic_launcher_monochrome.png → ...es/mipmap-hdpi/ic_launcher_monochrome.png
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png → .../src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png → .../src/main/res/mipmap-mdpi/ic_launcher.png
diff --git a/...es/mipmap-mdpi/ic_launcher_background.png → ...es/mipmap-mdpi/ic_launcher_background.png b/...es/mipmap-mdpi/ic_launcher_background.png → ...es/mipmap-mdpi/ic_launcher_background.png
diff --git a/...es/mipmap-mdpi/ic_launcher_foreground.png → ...es/mipmap-mdpi/ic_launcher_foreground.png b/...es/mipmap-mdpi/ic_launcher_foreground.png → ...es/mipmap-mdpi/ic_launcher_foreground.png
diff --git a/...es/mipmap-mdpi/ic_launcher_monochrome.png → ...es/mipmap-mdpi/ic_launcher_monochrome.png b/...es/mipmap-mdpi/ic_launcher_monochrome.png → ...es/mipmap-mdpi/ic_launcher_monochrome.png
diff --git a/...src/main/res/mipmap-xhdpi/ic_launcher.png → ...src/main/res/mipmap-xhdpi/ic_launcher.png b/...src/main/res/mipmap-xhdpi/ic_launcher.png → ...src/main/res/mipmap-xhdpi/ic_launcher.png
diff --git a/...s/mipmap-xhdpi/ic_launcher_background.png → ...s/mipmap-xhdpi/ic_launcher_background.png b/...s/mipmap-xhdpi/ic_launcher_background.png → ...s/mipmap-xhdpi/ic_launcher_background.png
diff --git a/...s/mipmap-xhdpi/ic_launcher_foreground.png → ...s/mipmap-xhdpi/ic_launcher_foreground.png b/...s/mipmap-xhdpi/ic_launcher_foreground.png → ...s/mipmap-xhdpi/ic_launcher_foreground.png
diff --git a/...s/mipmap-xhdpi/ic_launcher_monochrome.png → ...s/mipmap-xhdpi/ic_launcher_monochrome.png b/...s/mipmap-xhdpi/ic_launcher_monochrome.png → ...s/mipmap-xhdpi/ic_launcher_monochrome.png
diff --git a/...rc/main/res/mipmap-xxhdpi/ic_launcher.png → ...rc/main/res/mipmap-xxhdpi/ic_launcher.png b/...rc/main/res/mipmap-xxhdpi/ic_launcher.png → ...rc/main/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/.../mipmap-xxhdpi/ic_launcher_background.png → .../mipmap-xxhdpi/ic_launcher_background.png b/.../mipmap-xxhdpi/ic_launcher_background.png → .../mipmap-xxhdpi/ic_launcher_background.png
diff --git a/.../mipmap-xxhdpi/ic_launcher_foreground.png → .../mipmap-xxhdpi/ic_launcher_foreground.png b/.../mipmap-xxhdpi/ic_launcher_foreground.png → .../mipmap-xxhdpi/ic_launcher_foreground.png
diff --git a/.../mipmap-xxhdpi/ic_launcher_monochrome.png → .../mipmap-xxhdpi/ic_launcher_monochrome.png b/.../mipmap-xxhdpi/ic_launcher_monochrome.png → .../mipmap-xxhdpi/ic_launcher_monochrome.png
diff --git a/...c/main/res/mipmap-xxxhdpi/ic_launcher.png → ...c/main/res/mipmap-xxxhdpi/ic_launcher.png b/...c/main/res/mipmap-xxxhdpi/ic_launcher.png → ...c/main/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/...mipmap-xxxhdpi/ic_launcher_background.png → ...mipmap-xxxhdpi/ic_launcher_background.png b/...mipmap-xxxhdpi/ic_launcher_background.png → ...mipmap-xxxhdpi/ic_launcher_background.png
diff --git a/...mipmap-xxxhdpi/ic_launcher_foreground.png → ...mipmap-xxxhdpi/ic_launcher_foreground.png b/...mipmap-xxxhdpi/ic_launcher_foreground.png → ...mipmap-xxxhdpi/ic_launcher_foreground.png
diff --git a/...mipmap-xxxhdpi/ic_launcher_monochrome.png → ...mipmap-xxxhdpi/ic_launcher_monochrome.png b/...mipmap-xxxhdpi/ic_launcher_monochrome.png → ...mipmap-xxxhdpi/ic_launcher_monochrome.png
diff --git a/app/src/main/res/values/colors.xml → android/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml → android/src/main/res/values/colors.xml
diff --git a/app/src/main/res/values/strings.xml → android/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml → android/src/main/res/values/strings.xml
diff --git a/app/src/main/res/values/themes.xml → android/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml → 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/data/build.gradle.kts b/data/build.gradle.kts
@@ -0,0 +1,29 @@
+@file:Suppress("UnstableApiUsage", "DSL_SCOPE_VIOLATION")
+
+plugins {
+    alias(libs.plugins.android.library)
+    alias(libs.plugins.kotlin.android)
+}
+
+android {
+    namespace = "dev.yash.keymanager.data"
+    compileSdk = 34
+
+    defaultConfig { minSdk = 26 }
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
+    }
+}
+
+dependencies {
+    implementation(libs.androidx.core.ktx)
+    implementation(libs.google.dagger.hilt)
+
+    implementation(libs.appauth)
+    implementation(libs.square.moshi)
+    implementation(libs.square.moshi.converter)
+    implementation(libs.square.moshi.metadata.reflect)
+    implementation(libs.square.okhttp.logging)
+}
diff --git a/...lin/dev/yash/keymanager/data/Constants.kt → ...lin/dev/yash/keymanager/data/Constants.kt b/...lin/dev/yash/keymanager/data/Constants.kt → ...lin/dev/yash/keymanager/data/Constants.kt
diff --git a/...dev/yash/keymanager/data/api/GithubApi.kt → ...dev/yash/keymanager/data/api/GithubApi.kt b/...dev/yash/keymanager/data/api/GithubApi.kt → ...dev/yash/keymanager/data/api/GithubApi.kt
diff --git a/...h/keymanager/data/api/GithubRepository.kt → ...h/keymanager/data/api/GithubRepository.kt b/...h/keymanager/data/api/GithubRepository.kt → ...h/keymanager/data/api/GithubRepository.kt
diff --git a/...yash/keymanager/data/models/Encryption.kt → ...yash/keymanager/data/models/Encryption.kt b/...yash/keymanager/data/models/Encryption.kt → ...yash/keymanager/data/models/Encryption.kt
diff --git a/...dev/yash/keymanager/data/models/GpgKey.kt → ...dev/yash/keymanager/data/models/GpgKey.kt b/...dev/yash/keymanager/data/models/GpgKey.kt → ...dev/yash/keymanager/data/models/GpgKey.kt
diff --git a/...in/dev/yash/keymanager/data/models/Key.kt → ...in/dev/yash/keymanager/data/models/Key.kt b/...in/dev/yash/keymanager/data/models/Key.kt → ...in/dev/yash/keymanager/data/models/Key.kt
diff --git a/...v/yash/keymanager/data/models/KeyEmail.kt → ...v/yash/keymanager/data/models/KeyEmail.kt b/...v/yash/keymanager/data/models/KeyEmail.kt → ...v/yash/keymanager/data/models/KeyEmail.kt
diff --git a/...ev/yash/keymanager/data/models/KeyType.kt → ...ev/yash/keymanager/data/models/KeyType.kt b/...ev/yash/keymanager/data/models/KeyType.kt → ...ev/yash/keymanager/data/models/KeyType.kt
diff --git a/...keymanager/data/models/NavDestinations.kt → ...keymanager/data/models/NavDestinations.kt b/...keymanager/data/models/NavDestinations.kt → ...keymanager/data/models/NavDestinations.kt
diff --git a/...dev/yash/keymanager/data/models/SshKey.kt → ...dev/yash/keymanager/data/models/SshKey.kt b/...dev/yash/keymanager/data/models/SshKey.kt → ...dev/yash/keymanager/data/models/SshKey.kt
diff --git a/.../yash/keymanager/data/utils/AuthConfig.kt → .../yash/keymanager/data/utils/AuthConfig.kt b/.../yash/keymanager/data/utils/AuthConfig.kt → .../yash/keymanager/data/utils/AuthConfig.kt
diff --git a/...keymanager/data/utils/ExceptionHandler.kt → ...keymanager/data/utils/ExceptionHandler.kt b/...keymanager/data/utils/ExceptionHandler.kt → ...keymanager/data/utils/ExceptionHandler.kt
diff --git a/...dev/yash/keymanager/data/utils/Secrets.kt → ...dev/yash/keymanager/data/utils/Secrets.kt b/...dev/yash/keymanager/data/utils/Secrets.kt → ...dev/yash/keymanager/data/utils/Secrets.kt
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -2,7 +2,7 @@
 
 pluginManagement {
     repositories {
-        includeBuild("build-logic")
+        includeBuild("spotless")
         google()
         mavenCentral()
         gradlePluginPortal()
@@ -24,4 +24,4 @@ enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")
 
 rootProject.name = "KeyManager"
 
-include(":app")
+include(":android", ":data")
diff --git a/build-logic/.gitignore → spotless/.gitignore b/build-logic/.gitignore → spotless/.gitignore
diff --git a/build-logic/build.gradle.kts → spotless/build.gradle.kts b/build-logic/build.gradle.kts → spotless/build.gradle.kts
diff --git a/build-logic/settings.gradle.kts → spotless/settings.gradle.kts b/build-logic/settings.gradle.kts → spotless/settings.gradle.kts
@@ -1,6 +1,6 @@
 @file:Suppress("UnstableApiUsage")
 
-rootProject.name = "build-logic"
+rootProject.name = "spotless"
 
 pluginManagement {
     repositories {

diff --git a/.../yash/keymanager/gradle/GitHooksPlugin.kt → .../yash/keymanager/gradle/GitHooksPlugin.kt b/.../yash/keymanager/gradle/GitHooksPlugin.kt → .../yash/keymanager/gradle/GitHooksPlugin.kt
diff --git a/.../yash/keymanager/gradle/SpotlessPlugin.kt → .../yash/keymanager/gradle/SpotlessPlugin.kt b/.../yash/keymanager/gradle/SpotlessPlugin.kt → .../yash/keymanager/gradle/SpotlessPlugin.kt