From 10326df207517f7bf083248fe94a4cb262f800bc Mon Sep 17 00:00:00 2001
From: "Luong Vo (Lucas)" <luong@nimblehq.co>
Date: Tue, 29 Aug 2023 11:13:59 +0700
Subject: [PATCH] [#29] Rename Android's app id

---
 android/build.gradle.kts                                  | 4 ++--
 .../nimblehq/kmm/template/{android => }/util/LogUtil.kt   | 2 +-
 android/src/main/AndroidManifest.xml                      | 4 ++--
 .../{android/MyApplication.kt => MainApplication.kt}      | 8 ++++----
 .../co/nimblehq/kmm/template/android/lib/TypeAlias.kt     | 3 ---
 .../kmm/template/{android => }/di/ViewModelModule.kt      | 2 +-
 .../main/java/co/nimblehq/kmm/template/lib/TypeAlias.kt   | 3 +++
 .../kmm/template/{android => }/ui/base/BaseViewModel.kt   | 6 +++---
 .../{android => }/ui/navigation/AppDestination.kt         | 2 +-
 .../template/{android => }/ui/navigation/AppNavigation.kt | 4 ++--
 .../kmm/template/{android => }/ui/screens/MainActivity.kt | 6 +++---
 .../template/{android => }/ui/screens/home/HomeScreen.kt  | 4 ++--
 .../kmm/template/{android => }/ui/theme/AppColors.kt      | 2 +-
 .../kmm/template/{android => }/ui/theme/AppDimensions.kt  | 2 +-
 .../kmm/template/{android => }/ui/theme/AppStyles.kt      | 2 +-
 .../nimblehq/kmm/template/{android => }/ui/theme/Theme.kt | 2 +-
 .../template/{android => }/util/DispatchersProvider.kt    | 2 +-
 .../nimblehq/kmm/template/{android => }/util/LogUtil.kt   | 2 +-
 .../kmm/template/{android => }/test/CoroutineTestRule.kt  | 2 +-
 19 files changed, 31 insertions(+), 31 deletions(-)
 rename android/src/debug/java/co/nimblehq/kmm/template/{android => }/util/LogUtil.kt (72%)
 rename android/src/main/java/co/nimblehq/kmm/template/{android/MyApplication.kt => MainApplication.kt} (63%)
 delete mode 100644 android/src/main/java/co/nimblehq/kmm/template/android/lib/TypeAlias.kt
 rename android/src/main/java/co/nimblehq/kmm/template/{android => }/di/ViewModelModule.kt (77%)
 create mode 100644 android/src/main/java/co/nimblehq/kmm/template/lib/TypeAlias.kt
 rename android/src/main/java/co/nimblehq/kmm/template/{android => }/ui/base/BaseViewModel.kt (88%)
 rename android/src/main/java/co/nimblehq/kmm/template/{android => }/ui/navigation/AppDestination.kt (86%)
 rename android/src/main/java/co/nimblehq/kmm/template/{android => }/ui/navigation/AppNavigation.kt (90%)
 rename android/src/main/java/co/nimblehq/kmm/template/{android => }/ui/screens/MainActivity.kt (67%)
 rename android/src/main/java/co/nimblehq/kmm/template/{android => }/ui/screens/home/HomeScreen.kt (82%)
 rename android/src/main/java/co/nimblehq/kmm/template/{android => }/ui/theme/AppColors.kt (93%)
 rename android/src/main/java/co/nimblehq/kmm/template/{android => }/ui/theme/AppDimensions.kt (79%)
 rename android/src/main/java/co/nimblehq/kmm/template/{android => }/ui/theme/AppStyles.kt (77%)
 rename android/src/main/java/co/nimblehq/kmm/template/{android => }/ui/theme/Theme.kt (97%)
 rename android/src/main/java/co/nimblehq/kmm/template/{android => }/util/DispatchersProvider.kt (89%)
 rename android/src/release/java/co/nimblehq/kmm/template/{android => }/util/LogUtil.kt (68%)
 rename android/src/test/java/co/nimblehq/kmm/template/{android => }/test/CoroutineTestRule.kt (92%)

diff --git a/android/build.gradle.kts b/android/build.gradle.kts
index 4a0c03fc..b077b599 100644
--- a/android/build.gradle.kts
+++ b/android/build.gradle.kts
@@ -9,10 +9,10 @@ plugins {
 val keystoreProperties = loadProperties("$rootDir/signing.properties")
 
 android {
-    namespace = "co.nimblehq.kmm.template.android"
+    namespace = "co.nimblehq.kmm.template"
     compileSdk = Versions.ANDROID_COMPILE_SDK
     defaultConfig {
-        applicationId = "co.nimblehq.kmm.template.android"
+        applicationId = "co.nimblehq.kmm.template"
         minSdk = Versions.ANDROID_MIN_SDK
         targetSdk = Versions.ANDROID_TARGET_SDK
         versionCode = Versions.ANDROID_VERSION_CODE
diff --git a/android/src/debug/java/co/nimblehq/kmm/template/android/util/LogUtil.kt b/android/src/debug/java/co/nimblehq/kmm/template/util/LogUtil.kt
similarity index 72%
rename from android/src/debug/java/co/nimblehq/kmm/template/android/util/LogUtil.kt
rename to android/src/debug/java/co/nimblehq/kmm/template/util/LogUtil.kt
index 441bd848..d6aa6e3b 100644
--- a/android/src/debug/java/co/nimblehq/kmm/template/android/util/LogUtil.kt
+++ b/android/src/debug/java/co/nimblehq/kmm/template/util/LogUtil.kt
@@ -1,4 +1,4 @@
-package co.nimblehq.kmm.template.android.util
+package co.nimblehq.kmm.template.util
 
 import timber.log.Timber
 
diff --git a/android/src/main/AndroidManifest.xml b/android/src/main/AndroidManifest.xml
index 7bc2f159..44c41ed3 100644
--- a/android/src/main/AndroidManifest.xml
+++ b/android/src/main/AndroidManifest.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="co.nimblehq.kmm.template.android">
+    package="co.nimblehq.kmm.template">
 
     <uses-permission android:name="android.permission.INTERNET"/>
 
     <application
-        android:name=".MyApplication"
+        android:name=".MainApplication"
         android:allowBackup="false"
         android:label="@string/app_name"
         android:supportsRtl="true"
diff --git a/android/src/main/java/co/nimblehq/kmm/template/android/MyApplication.kt b/android/src/main/java/co/nimblehq/kmm/template/MainApplication.kt
similarity index 63%
rename from android/src/main/java/co/nimblehq/kmm/template/android/MyApplication.kt
rename to android/src/main/java/co/nimblehq/kmm/template/MainApplication.kt
index 10cb8e7f..ee71fa08 100644
--- a/android/src/main/java/co/nimblehq/kmm/template/android/MyApplication.kt
+++ b/android/src/main/java/co/nimblehq/kmm/template/MainApplication.kt
@@ -1,12 +1,12 @@
-package co.nimblehq.kmm.template.android
+package co.nimblehq.kmm.template
 
 import android.app.Application
-import co.nimblehq.kmm.template.android.di.androidViewModelModule
-import co.nimblehq.kmm.template.android.util.LogUtil
+import co.nimblehq.kmm.template.di.androidViewModelModule
+import co.nimblehq.kmm.template.util.LogUtil
 import co.nimblehq.kmm.template.di.initKoin
 import org.koin.android.ext.koin.androidContext
 
-class MyApplication : Application() {
+class MainApplication : Application() {
 
     override fun onCreate() {
         super.onCreate()
diff --git a/android/src/main/java/co/nimblehq/kmm/template/android/lib/TypeAlias.kt b/android/src/main/java/co/nimblehq/kmm/template/android/lib/TypeAlias.kt
deleted file mode 100644
index 26f26925..00000000
--- a/android/src/main/java/co/nimblehq/kmm/template/android/lib/TypeAlias.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package co.nimblehq.kmm.template.android.lib
-
-typealias IsLoading = Boolean
diff --git a/android/src/main/java/co/nimblehq/kmm/template/android/di/ViewModelModule.kt b/android/src/main/java/co/nimblehq/kmm/template/di/ViewModelModule.kt
similarity index 77%
rename from android/src/main/java/co/nimblehq/kmm/template/android/di/ViewModelModule.kt
rename to android/src/main/java/co/nimblehq/kmm/template/di/ViewModelModule.kt
index 8e36f054..69875337 100644
--- a/android/src/main/java/co/nimblehq/kmm/template/android/di/ViewModelModule.kt
+++ b/android/src/main/java/co/nimblehq/kmm/template/di/ViewModelModule.kt
@@ -1,4 +1,4 @@
-package co.nimblehq.kmm.template.android.di
+package co.nimblehq.kmm.template.di
 
 import org.koin.core.module.Module
 import org.koin.dsl.module
diff --git a/android/src/main/java/co/nimblehq/kmm/template/lib/TypeAlias.kt b/android/src/main/java/co/nimblehq/kmm/template/lib/TypeAlias.kt
new file mode 100644
index 00000000..5e6a53c9
--- /dev/null
+++ b/android/src/main/java/co/nimblehq/kmm/template/lib/TypeAlias.kt
@@ -0,0 +1,3 @@
+package co.nimblehq.kmm.template.lib
+
+typealias IsLoading = Boolean
diff --git a/android/src/main/java/co/nimblehq/kmm/template/android/ui/base/BaseViewModel.kt b/android/src/main/java/co/nimblehq/kmm/template/ui/base/BaseViewModel.kt
similarity index 88%
rename from android/src/main/java/co/nimblehq/kmm/template/android/ui/base/BaseViewModel.kt
rename to android/src/main/java/co/nimblehq/kmm/template/ui/base/BaseViewModel.kt
index 77725d60..65ac5a84 100644
--- a/android/src/main/java/co/nimblehq/kmm/template/android/ui/base/BaseViewModel.kt
+++ b/android/src/main/java/co/nimblehq/kmm/template/ui/base/BaseViewModel.kt
@@ -1,12 +1,12 @@
-package co.nimblehq.kmm.template.android.ui.base
+package co.nimblehq.kmm.template.ui.base
 
 import androidx.compose.runtime.*
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import kotlinx.coroutines.flow.*
 import kotlinx.coroutines.launch
-import co.nimblehq.kmm.template.android.lib.IsLoading
-import co.nimblehq.kmm.template.android.ui.navigation.AppDestination
+import co.nimblehq.kmm.template.lib.IsLoading
+import co.nimblehq.kmm.template.ui.navigation.AppDestination
 
 @Suppress("PropertyName")
 abstract class BaseViewModel : ViewModel() {
diff --git a/android/src/main/java/co/nimblehq/kmm/template/android/ui/navigation/AppDestination.kt b/android/src/main/java/co/nimblehq/kmm/template/ui/navigation/AppDestination.kt
similarity index 86%
rename from android/src/main/java/co/nimblehq/kmm/template/android/ui/navigation/AppDestination.kt
rename to android/src/main/java/co/nimblehq/kmm/template/ui/navigation/AppDestination.kt
index 25e4191b..22017549 100644
--- a/android/src/main/java/co/nimblehq/kmm/template/android/ui/navigation/AppDestination.kt
+++ b/android/src/main/java/co/nimblehq/kmm/template/ui/navigation/AppDestination.kt
@@ -1,4 +1,4 @@
-package co.nimblehq.kmm.template.android.ui.navigation
+package co.nimblehq.kmm.template.ui.navigation
 
 import androidx.navigation.NamedNavArgument
 
diff --git a/android/src/main/java/co/nimblehq/kmm/template/android/ui/navigation/AppNavigation.kt b/android/src/main/java/co/nimblehq/kmm/template/ui/navigation/AppNavigation.kt
similarity index 90%
rename from android/src/main/java/co/nimblehq/kmm/template/android/ui/navigation/AppNavigation.kt
rename to android/src/main/java/co/nimblehq/kmm/template/ui/navigation/AppNavigation.kt
index c685bd34..2b064b81 100644
--- a/android/src/main/java/co/nimblehq/kmm/template/android/ui/navigation/AppNavigation.kt
+++ b/android/src/main/java/co/nimblehq/kmm/template/ui/navigation/AppNavigation.kt
@@ -1,9 +1,9 @@
-package co.nimblehq.kmm.template.android.ui.navigation
+package co.nimblehq.kmm.template.ui.navigation
 
 import androidx.compose.runtime.Composable
 import androidx.navigation.*
 import androidx.navigation.compose.*
-import co.nimblehq.kmm.template.android.ui.screens.home.HomeScreen
+import co.nimblehq.kmm.template.ui.screens.home.HomeScreen
 
 @Composable
 fun AppNavigation(
diff --git a/android/src/main/java/co/nimblehq/kmm/template/android/ui/screens/MainActivity.kt b/android/src/main/java/co/nimblehq/kmm/template/ui/screens/MainActivity.kt
similarity index 67%
rename from android/src/main/java/co/nimblehq/kmm/template/android/ui/screens/MainActivity.kt
rename to android/src/main/java/co/nimblehq/kmm/template/ui/screens/MainActivity.kt
index 344bb022..75d6bbc1 100644
--- a/android/src/main/java/co/nimblehq/kmm/template/android/ui/screens/MainActivity.kt
+++ b/android/src/main/java/co/nimblehq/kmm/template/ui/screens/MainActivity.kt
@@ -1,10 +1,10 @@
-package co.nimblehq.kmm.template.android.ui.screens
+package co.nimblehq.kmm.template.ui.screens
 
 import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
-import co.nimblehq.kmm.template.android.ui.navigation.AppNavigation
-import co.nimblehq.kmm.template.android.ui.theme.ComposeTheme
+import co.nimblehq.kmm.template.ui.navigation.AppNavigation
+import co.nimblehq.kmm.template.ui.theme.ComposeTheme
 
 class MainActivity : ComponentActivity() {
 
diff --git a/android/src/main/java/co/nimblehq/kmm/template/android/ui/screens/home/HomeScreen.kt b/android/src/main/java/co/nimblehq/kmm/template/ui/screens/home/HomeScreen.kt
similarity index 82%
rename from android/src/main/java/co/nimblehq/kmm/template/android/ui/screens/home/HomeScreen.kt
rename to android/src/main/java/co/nimblehq/kmm/template/ui/screens/home/HomeScreen.kt
index 5a1b8ea1..800e2bc7 100644
--- a/android/src/main/java/co/nimblehq/kmm/template/android/ui/screens/home/HomeScreen.kt
+++ b/android/src/main/java/co/nimblehq/kmm/template/ui/screens/home/HomeScreen.kt
@@ -1,4 +1,4 @@
-package co.nimblehq.kmm.template.android.ui.screens.home
+package co.nimblehq.kmm.template.ui.screens.home
 
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.material.*
@@ -6,7 +6,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.tooling.preview.Preview
 import co.nimblehq.kmm.template.Greeting
-import co.nimblehq.kmm.template.android.ui.theme.ComposeTheme
+import co.nimblehq.kmm.template.ui.theme.ComposeTheme
 
 @Composable
 fun HomeScreen() {
diff --git a/android/src/main/java/co/nimblehq/kmm/template/android/ui/theme/AppColors.kt b/android/src/main/java/co/nimblehq/kmm/template/ui/theme/AppColors.kt
similarity index 93%
rename from android/src/main/java/co/nimblehq/kmm/template/android/ui/theme/AppColors.kt
rename to android/src/main/java/co/nimblehq/kmm/template/ui/theme/AppColors.kt
index 869c452c..37eca4df 100644
--- a/android/src/main/java/co/nimblehq/kmm/template/android/ui/theme/AppColors.kt
+++ b/android/src/main/java/co/nimblehq/kmm/template/ui/theme/AppColors.kt
@@ -1,4 +1,4 @@
-package co.nimblehq.kmm.template.android.ui.theme
+package co.nimblehq.kmm.template.ui.theme
 
 import androidx.compose.material.*
 import androidx.compose.runtime.staticCompositionLocalOf
diff --git a/android/src/main/java/co/nimblehq/kmm/template/android/ui/theme/AppDimensions.kt b/android/src/main/java/co/nimblehq/kmm/template/ui/theme/AppDimensions.kt
similarity index 79%
rename from android/src/main/java/co/nimblehq/kmm/template/android/ui/theme/AppDimensions.kt
rename to android/src/main/java/co/nimblehq/kmm/template/ui/theme/AppDimensions.kt
index 6a71b671..3875be76 100644
--- a/android/src/main/java/co/nimblehq/kmm/template/android/ui/theme/AppDimensions.kt
+++ b/android/src/main/java/co/nimblehq/kmm/template/ui/theme/AppDimensions.kt
@@ -1,4 +1,4 @@
-package co.nimblehq.kmm.template.android.ui.theme
+package co.nimblehq.kmm.template.ui.theme
 
 import androidx.compose.runtime.staticCompositionLocalOf
 
diff --git a/android/src/main/java/co/nimblehq/kmm/template/android/ui/theme/AppStyles.kt b/android/src/main/java/co/nimblehq/kmm/template/ui/theme/AppStyles.kt
similarity index 77%
rename from android/src/main/java/co/nimblehq/kmm/template/android/ui/theme/AppStyles.kt
rename to android/src/main/java/co/nimblehq/kmm/template/ui/theme/AppStyles.kt
index 295ca2ff..b6568d36 100644
--- a/android/src/main/java/co/nimblehq/kmm/template/android/ui/theme/AppStyles.kt
+++ b/android/src/main/java/co/nimblehq/kmm/template/ui/theme/AppStyles.kt
@@ -1,4 +1,4 @@
-package co.nimblehq.kmm.template.android.ui.theme
+package co.nimblehq.kmm.template.ui.theme
 
 import androidx.compose.runtime.staticCompositionLocalOf
 
diff --git a/android/src/main/java/co/nimblehq/kmm/template/android/ui/theme/Theme.kt b/android/src/main/java/co/nimblehq/kmm/template/ui/theme/Theme.kt
similarity index 97%
rename from android/src/main/java/co/nimblehq/kmm/template/android/ui/theme/Theme.kt
rename to android/src/main/java/co/nimblehq/kmm/template/ui/theme/Theme.kt
index 118c3ed1..ae5e06ad 100644
--- a/android/src/main/java/co/nimblehq/kmm/template/android/ui/theme/Theme.kt
+++ b/android/src/main/java/co/nimblehq/kmm/template/ui/theme/Theme.kt
@@ -1,5 +1,5 @@
 @file:Suppress("MatchingDeclarationName")
-package co.nimblehq.kmm.template.android.ui.theme
+package co.nimblehq.kmm.template.ui.theme
 
 import androidx.compose.foundation.isSystemInDarkTheme
 import androidx.compose.foundation.shape.RoundedCornerShape
diff --git a/android/src/main/java/co/nimblehq/kmm/template/android/util/DispatchersProvider.kt b/android/src/main/java/co/nimblehq/kmm/template/util/DispatchersProvider.kt
similarity index 89%
rename from android/src/main/java/co/nimblehq/kmm/template/android/util/DispatchersProvider.kt
rename to android/src/main/java/co/nimblehq/kmm/template/util/DispatchersProvider.kt
index 060dfece..caa9ec78 100644
--- a/android/src/main/java/co/nimblehq/kmm/template/android/util/DispatchersProvider.kt
+++ b/android/src/main/java/co/nimblehq/kmm/template/util/DispatchersProvider.kt
@@ -1,4 +1,4 @@
-package co.nimblehq.kmm.template.android.util
+package co.nimblehq.kmm.template.util
 
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.Dispatchers
diff --git a/android/src/release/java/co/nimblehq/kmm/template/android/util/LogUtil.kt b/android/src/release/java/co/nimblehq/kmm/template/util/LogUtil.kt
similarity index 68%
rename from android/src/release/java/co/nimblehq/kmm/template/android/util/LogUtil.kt
rename to android/src/release/java/co/nimblehq/kmm/template/util/LogUtil.kt
index d7e5952f..2ee5a119 100644
--- a/android/src/release/java/co/nimblehq/kmm/template/android/util/LogUtil.kt
+++ b/android/src/release/java/co/nimblehq/kmm/template/util/LogUtil.kt
@@ -1,4 +1,4 @@
-package co.nimblehq.kmm.template.android.util
+package co.nimblehq.kmm.template.util
 
 import timber.log.Timber
 
diff --git a/android/src/test/java/co/nimblehq/kmm/template/android/test/CoroutineTestRule.kt b/android/src/test/java/co/nimblehq/kmm/template/test/CoroutineTestRule.kt
similarity index 92%
rename from android/src/test/java/co/nimblehq/kmm/template/android/test/CoroutineTestRule.kt
rename to android/src/test/java/co/nimblehq/kmm/template/test/CoroutineTestRule.kt
index e729598b..6288cf1c 100644
--- a/android/src/test/java/co/nimblehq/kmm/template/android/test/CoroutineTestRule.kt
+++ b/android/src/test/java/co/nimblehq/kmm/template/test/CoroutineTestRule.kt
@@ -1,4 +1,4 @@
-package co.nimblehq.kmm.template.android.test
+package co.nimblehq.kmm.template.test
 
 import kotlinx.coroutines.*
 import kotlinx.coroutines.test.*