Skip to content

Commit 1499cb1

Browse files
winstonsungwinstonsung
committed
chore: Clean up namespaces
Bug: #97 Change-Id: I75ed527107135285322fd7c74a86de2ac6a56940
1 parent 325fc14 commit 1499cb1

37 files changed

Lines changed: 68 additions & 66 deletions

File tree

‎androidApp/build.gradle.kts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ kotlin {
1515
}
1616

1717
android {
18-
namespace = "app.icampuspass"
18+
namespace = "app.icampuspass.android"
1919
compileSdk = libs.versions.android.compileSdk.get().toInt()
2020
defaultConfig {
21-
applicationId = "app.icampuspass"
21+
applicationId = "app.icampuspass.android"
2222
minSdk = libs.versions.android.minSdk.get().toInt()
2323
targetSdk = libs.versions.android.targetSdk.get().toInt()
2424
versionCode = 1

androidApp/src/androidTest/kotlin/app/icampuspass/tests/AndroidAppInstrumentedTest.kt renamed to androidApp/src/androidTest/kotlin/app/icampuspass/android/AndroidAppInstrumentedTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package app.icampuspass.tests
1+
package app.icampuspass.android
22

33
import androidx.test.ext.junit.runners.AndroidJUnit4
44
import androidx.test.platform.app.InstrumentationRegistry

‎androidApp/src/main/AndroidManifest.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
android:theme="@style/Theme.AppCompat.DayNight.NoActionBar"
1111
>
1212
<activity
13-
android:name=".MainActivity"
13+
android:name=".app.MainActivity"
1414
android:exported="true"
1515
android:configChanges="orientation|screenSize|screenLayout|keyboardHidden|mnc|colorMode|density|fontScale|fontWeightAdjustment|keyboard|layoutDirection|locale|mcc|navigation|smallestScreenSize|touchscreen|uiMode"
1616
android:windowSoftInputMode="adjustResize"

androidApp/src/main/kotlin/app/icampuspass/AndroidApp.kt renamed to androidApp/src/main/kotlin/app/icampuspass/android/AndroidApp.kt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
package app.icampuspass
1+
package app.icampuspass.android
22

33
import android.app.Application
4-
import app.icampuspass.viewmodels.GreetingScreenViewModel
5-
import app.icampuspass.viewmodels.MainScreenViewModel
4+
import app.icampuspass.shared.initKoin
5+
import app.icampuspass.shared.viewmodels.GreetingScreenViewModel
6+
import app.icampuspass.shared.viewmodels.MainScreenViewModel
67
import org.koin.dsl.module
78

89
class AndroidApp : Application() {

androidApp/src/main/kotlin/app/icampuspass/App.kt renamed to androidApp/src/main/kotlin/app/icampuspass/android/app/App.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
package app.icampuspass
1+
package app.icampuspass.android.app
22

33
import androidx.compose.foundation.layout.safeDrawingPadding
44
import androidx.compose.material3.Surface
55
import androidx.compose.runtime.Composable
66
import androidx.compose.ui.Modifier
77
import androidx.compose.ui.graphics.Color
8-
import app.icampuspass.views.screens.GreetingScreen
9-
import app.icampuspass.views.theme.Theme
8+
import app.icampuspass.android.app.views.screens.GreetingScreen
9+
import app.icampuspass.android.app.views.theme.Theme
1010

1111
@Composable
1212
fun App() {

androidApp/src/main/kotlin/app/icampuspass/MainActivity.kt renamed to androidApp/src/main/kotlin/app/icampuspass/android/app/MainActivity.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package app.icampuspass
1+
package app.icampuspass.android.app
22

33
import android.os.Bundle
44
import androidx.activity.SystemBarStyle

androidApp/src/main/kotlin/app/icampuspass/views/screens/GreetingScreen.kt renamed to androidApp/src/main/kotlin/app/icampuspass/android/app/views/screens/GreetingScreen.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package app.icampuspass.views.screens
1+
package app.icampuspass.android.app.views.screens
22

33
import android.content.res.Configuration.UI_MODE_NIGHT_YES
44
import android.content.res.Configuration.UI_MODE_TYPE_NORMAL
@@ -26,11 +26,11 @@ import androidx.compose.ui.tooling.preview.Wallpapers.BLUE_DOMINATED_EXAMPLE
2626
import androidx.compose.ui.tooling.preview.Wallpapers.GREEN_DOMINATED_EXAMPLE
2727
import androidx.compose.ui.tooling.preview.Wallpapers.RED_DOMINATED_EXAMPLE
2828
import androidx.compose.ui.tooling.preview.Wallpapers.YELLOW_DOMINATED_EXAMPLE
29-
import app.icampuspass.models.Greeting
29+
import app.icampuspass.android.app.views.theme.Theme
30+
import app.icampuspass.shared.models.Greeting
3031
import app.icampuspass.shared.generated.resources.Res
3132
import app.icampuspass.shared.generated.resources.compose_multiplatform
32-
import app.icampuspass.viewmodels.GreetingScreenViewModel
33-
import app.icampuspass.views.theme.Theme
33+
import app.icampuspass.shared.viewmodels.GreetingScreenViewModel
3434
import org.jetbrains.compose.resources.painterResource
3535
import org.koin.androidx.compose.koinViewModel
3636

androidApp/src/main/kotlin/app/icampuspass/views/screens/MainScreen.kt renamed to androidApp/src/main/kotlin/app/icampuspass/android/app/views/screens/MainScreen.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package app.icampuspass.views.screens
1+
package app.icampuspass.android.app.views.screens
22

33
import android.content.res.Configuration.UI_MODE_NIGHT_YES
44
import android.content.res.Configuration.UI_MODE_TYPE_NORMAL
@@ -10,8 +10,8 @@ import androidx.compose.ui.tooling.preview.Wallpapers.BLUE_DOMINATED_EXAMPLE
1010
import androidx.compose.ui.tooling.preview.Wallpapers.GREEN_DOMINATED_EXAMPLE
1111
import androidx.compose.ui.tooling.preview.Wallpapers.RED_DOMINATED_EXAMPLE
1212
import androidx.compose.ui.tooling.preview.Wallpapers.YELLOW_DOMINATED_EXAMPLE
13-
import app.icampuspass.viewmodels.MainScreenViewModel
14-
import app.icampuspass.views.theme.Theme
13+
import app.icampuspass.android.app.views.theme.Theme
14+
import app.icampuspass.shared.viewmodels.MainScreenViewModel
1515
import org.koin.androidx.compose.koinViewModel
1616

1717
@Composable

androidApp/src/main/kotlin/app/icampuspass/views/theme/ColorScheme.kt renamed to androidApp/src/main/kotlin/app/icampuspass/android/app/views/theme/ColorScheme.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package app.icampuspass.views.theme
1+
package app.icampuspass.android.app.views.theme
22

33
import android.os.Build
44
import androidx.compose.foundation.isSystemInDarkTheme

androidApp/src/main/kotlin/app/icampuspass/views/theme/Theme.kt renamed to androidApp/src/main/kotlin/app/icampuspass/android/app/views/theme/Theme.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package app.icampuspass.views.theme
1+
package app.icampuspass.android.app.views.theme
22

33
import androidx.compose.foundation.isSystemInDarkTheme
44
import androidx.compose.material3.MaterialTheme

0 commit comments

Comments
 (0)