Реструктуризация проекта

app/build.gradle.kts

@@ -7,11 +7,11 @@ plugins {
 }
 
 android {
-    namespace = "com.github.nullptroma.wallenc"
+    namespace = "com.github.nullptroma.wallenc.app"
     compileSdk = 35
 
     defaultConfig {
-        applicationId = "com.github.nullptroma.wallenc"
+        applicationId = "com.github.nullptroma.wallenc.app"
         minSdk = 24
         targetSdk = 34
         versionCode = 1
@@ -63,18 +63,6 @@ dependencies {
     implementation(libs.dagger.hilt)
     ksp(libs.dagger.hilt.compiler)
 
-    // Room
-    implementation(libs.room.ktx)
-    implementation(libs.room.runtime)
-    annotationProcessor(libs.room.compiler)
-    ksp(libs.room.compiler)
-
-    // Retrofit
-    implementation(libs.retrofit)
-    implementation(libs.retrofit.converter.gson)
-    implementation(libs.retrofit.converter.scalars)
-    implementation(libs.google.gson)
-
     implementation(libs.androidx.core.ktx)
     implementation(libs.androidx.lifecycle.runtime.ktx)
     implementation(libs.androidx.activity.compose)
@@ -93,6 +81,6 @@ dependencies {
     androidTestImplementation(platform(libs.androidx.compose.bom))
     androidTestImplementation(libs.androidx.ui.test.junit4)
 
-    implementation(project(":domain"))
     implementation(project(":data"))
+    implementation(project(":domain"))
 }

app/src/androidTest/java/com/github/nullptroma/wallenc/app/ExampleInstrumentedTest.kt

@@ -1,4 +1,4 @@
-package com.github.nullptroma.wallenc
+package com.github.nullptroma.wallenc.app
 
 import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.ext.junit.runners.AndroidJUnit4

app/src/main/java/com/github/nullptroma/wallenc/app/MainActivity.kt

@@ -1,4 +1,4 @@
-package com.github.nullptroma.wallenc
+package com.github.nullptroma.wallenc.app
 
 import android.os.Bundle
 import android.widget.Toast
@@ -18,10 +18,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.tooling.preview.Preview
-import androidx.hilt.navigation.compose.hiltViewModel
-import com.github.nullptroma.wallenc.ui.screens.main.MainScreen
-import com.github.nullptroma.wallenc.ui.screens.main.MainViewModel
-import com.github.nullptroma.wallenc.ui.theme.WallencTheme
+import com.github.nullptroma.wallenc.app.ui.theme.WallencTheme
 import com.yandex.authsdk.YandexAuthLoginOptions
 import com.yandex.authsdk.YandexAuthOptions
 import com.yandex.authsdk.YandexAuthResult

app/src/main/java/com/github/nullptroma/wallenc/app/WallencApplication.kt

@@ -1,4 +1,4 @@
-package com.github.nullptroma.wallenc
+package com.github.nullptroma.wallenc.app
 
 import android.app.Application
 import dagger.hilt.android.HiltAndroidApp

app/src/main/java/com/github/nullptroma/wallenc/app/ui/screens/main/MainScreen.kt

@@ -1,4 +1,4 @@
-package com.github.nullptroma.wallenc.ui.screens.main
+package com.github.nullptroma.wallenc.app.ui.screens.main
 
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column

app/src/main/java/com/github/nullptroma/wallenc/app/ui/screens/main/MainScreenState.kt

@@ -0,0 +1,3 @@
+package com.github.nullptroma.wallenc.app.ui.screens.main
+
+data class MainScreenState(val value: String)

app/src/main/java/com/github/nullptroma/wallenc/app/ui/screens/main/MainViewModel.kt

@@ -1,4 +1,4 @@
-package com.github.nullptroma.wallenc.ui.screens.main
+package com.github.nullptroma.wallenc.app.ui.screens.main
 
 import androidx.lifecycle.ViewModel
 import dagger.hilt.android.lifecycle.HiltViewModel

app/src/main/java/com/github/nullptroma/wallenc/app/ui/screens/theme/Color.kt

@@ -1,4 +1,4 @@
-package com.github.nullptroma.wallenc.ui.theme
+package com.github.nullptroma.wallenc.app.ui.theme
 
 import androidx.compose.ui.graphics.Color
 

app/src/main/java/com/github/nullptroma/wallenc/app/ui/screens/theme/Theme.kt

@@ -1,4 +1,4 @@
-package com.github.nullptroma.wallenc.ui.theme
+package com.github.nullptroma.wallenc.app.ui.theme
 
 import android.os.Build
 import androidx.compose.foundation.isSystemInDarkTheme

app/src/main/java/com/github/nullptroma/wallenc/app/ui/screens/theme/Type.kt

@@ -1,4 +1,4 @@
-package com.github.nullptroma.wallenc.ui.theme
+package com.github.nullptroma.wallenc.app.ui.theme
 
 import androidx.compose.material3.Typography
 import androidx.compose.ui.text.TextStyle

app/src/main/java/com/github/nullptroma/wallenc/ui/screens/main/MainScreenState.kt

@@ -1,3 +0,0 @@
-package com.github.nullptroma.wallenc.ui.screens.main
-
-data class MainScreenState(val value: String)

app/src/test/java/com/github/nullptroma/wallenc/app/ExampleUnitTest.kt

@@ -1,4 +1,4 @@
-package com.github.nullptroma.wallenc
+package com.github.nullptroma.wallenc.app
 
 import org.junit.Test