Переименован пакет

app/build.gradle.kts

@@ -2,16 +2,16 @@ plugins {
     alias(libs.plugins.android.application)
     alias(libs.plugins.kotlin.android)
     alias(libs.plugins.compose.compiler)
-    alias(libs.plugins.ksp)
     alias(libs.plugins.dagger.hilt)
+    alias(libs.plugins.ksp)
 }
 
 android {
-    namespace = "ru.freedominc.wallenc"
+    namespace = "com.github.nullptroma.wallenc"
     compileSdk = 34
 
     defaultConfig {
-        applicationId = "ru.freedominc.wallenc"
+        applicationId = "com.github.nullptroma.wallenc"
         minSdk = 24
         targetSdk = 34
         versionCode = 1
@@ -53,7 +53,8 @@ android {
 }
 
 dependencies {
-    implementation(libs.androidx.navigation)
+    implementation(libs.navigation)
+    implementation(libs.navigation.hilt.compose)
 
     // Yandex
     implementation(libs.yandex.oauth)
@@ -91,4 +92,7 @@ dependencies {
     androidTestImplementation(libs.androidx.espresso.core)
     androidTestImplementation(platform(libs.androidx.compose.bom))
     androidTestImplementation(libs.androidx.ui.test.junit4)
+
+    implementation(project(":domain"))
+    implementation(project(":data"))
 }

app/release/output-metadata.json

@@ -1,37 +0,0 @@
-{
-  "version": 3,
-  "artifactType": {
-    "type": "APK",
-    "kind": "Directory"
-  },
-  "applicationId": "ru.freedominc.wallenc",
-  "variantName": "release",
-  "elements": [
-    {
-      "type": "SINGLE",
-      "filters": [],
-      "attributes": [],
-      "versionCode": 1,
-      "versionName": "1.0",
-      "outputFile": "app-release.apk"
-    }
-  ],
-  "elementType": "File",
-  "baselineProfiles": [
-    {
-      "minApi": 28,
-      "maxApi": 30,
-      "baselineProfiles": [
-        "baselineProfiles/1/app-release.dm"
-      ]
-    },
-    {
-      "minApi": 31,
-      "maxApi": 2147483647,
-      "baselineProfiles": [
-        "baselineProfiles/0/app-release.dm"
-      ]
-    }
-  ],
-  "minSdkVersionForDexing": 24
-}

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

@@ -0,0 +1,24 @@
+package com.github.nullptroma.wallenc
+
+import androidx.test.platform.app.InstrumentationRegistry
+import androidx.test.ext.junit.runners.AndroidJUnit4
+
+import org.junit.Test
+import org.junit.runner.RunWith
+
+import org.junit.Assert.*
+
+/**
+ * Instrumented test, which will execute on an Android device.
+ *
+ * See [testing documentation](http://d.android.com/tools/testing).
+ */
+@RunWith(AndroidJUnit4::class)
+class ExampleInstrumentedTest {
+    @Test
+    fun useAppContext() {
+        // Context of the app under test.
+        val appContext = InstrumentationRegistry.getInstrumentation().targetContext
+        assertEquals("com.github.nullptroma.wallenc", appContext.packageName)
+    }
+}

app/src/main/AndroidManifest.xml

@@ -16,6 +16,7 @@
         <activity
             android:name=".MainActivity"
             android:exported="true"
+            android:windowSoftInputMode="adjustNothing"
             android:theme="@style/Theme.Wallenc">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />

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

@@ -1,4 +1,4 @@
-package ru.freedominc.wallenc
+package com.github.nullptroma.wallenc
 
 import android.os.Bundle
 import android.widget.Toast
@@ -18,13 +18,17 @@ 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.yandex.authsdk.YandexAuthLoginOptions
 import com.yandex.authsdk.YandexAuthOptions
 import com.yandex.authsdk.YandexAuthResult
 import com.yandex.authsdk.YandexAuthSdk
 import com.yandex.authsdk.internal.strategy.LoginType
 import dagger.hilt.android.AndroidEntryPoint
-import ru.freedominc.wallenc.ui.theme.WallencTheme
+
 
 @AndroidEntryPoint
 class MainActivity : ComponentActivity() {
@@ -40,9 +44,8 @@ class MainActivity : ComponentActivity() {
         setContent {
             WallencTheme {
                 Scaffold(modifier = Modifier.fillMaxSize()) { innerPadding ->
-                    Greeting(modifier = Modifier.padding(innerPadding)) {
-                        launcher.launch(loginOptions)
-                    }
+                    val vm : MainViewModel = hiltViewModel()
+                    MainScreen(Modifier.padding(innerPadding), vm)
                 }
             }
         }

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

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

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

@@ -0,0 +1,27 @@
+package com.github.nullptroma.wallenc.ui.screens.main
+
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.imePadding
+import androidx.compose.material3.Text
+import androidx.compose.material3.TextField
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.hilt.navigation.compose.hiltViewModel
+
+
+@Composable
+fun MainScreen(modifier: Modifier = Modifier, viewModel: MainViewModel = hiltViewModel()) {
+    val state = viewModel.stateFlow
+    Column(modifier = modifier.imePadding()) {
+
+        Text(text = state.value)
+        Box(modifier = Modifier.fillMaxSize(), contentAlignment = Alignment.BottomCenter) {
+            TextField("", onValueChange = {
+
+            })
+        }
+    }
+}

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

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

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

@@ -0,0 +1,11 @@
+package com.github.nullptroma.wallenc.ui.screens.main
+
+import androidx.lifecycle.ViewModel
+import dagger.hilt.android.lifecycle.HiltViewModel
+import javax.inject.Inject
+
+@HiltViewModel
+class MainViewModel @Inject constructor(
+): ViewModel() {
+    val stateFlow = MainScreenState("hello")
+}

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

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

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

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

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

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

app/src/main/java/ru/freedominc/wallenc/ui/screens/main/MainScreen.kt

@@ -1,8 +0,0 @@
-package ru.freedominc.wallenc.ui.screens.main
-
-import androidx.compose.runtime.Composable
-
-@Composable
-fun MainScreen(viewModel: MainViewModel) {
-
-}

app/src/main/java/ru/freedominc/wallenc/ui/screens/main/MainScreenState.kt

@@ -1,3 +0,0 @@
-package ru.freedominc.wallenc.ui.screens.main
-
-data class MainScreenState(val value: Int)

app/src/main/java/ru/freedominc/wallenc/ui/screens/main/MainViewModel.kt

@@ -1,9 +0,0 @@
-package ru.freedominc.wallenc.ui.screens.main
-
-import androidx.lifecycle.ViewModel
-import dagger.hilt.android.lifecycle.HiltViewModel
-
-@HiltViewModel
-class MainViewModel : ViewModel() {
-
-}

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

@@ -0,0 +1,17 @@
+package com.github.nullptroma.wallenc
+
+import org.junit.Test
+
+import org.junit.Assert.*
+
+/**
+ * Example local unit test, which will execute on the development machine (host).
+ *
+ * See [testing documentation](http://d.android.com/tools/testing).
+ */
+class ExampleUnitTest {
+    @Test
+    fun addition_isCorrect() {
+        assertEquals(4, 2 + 2)
+    }
+}

build.gradle.kts

@@ -5,4 +5,5 @@ plugins {
     alias(libs.plugins.compose.compiler) apply false
     alias(libs.plugins.ksp) apply false
     alias(libs.plugins.dagger.hilt) apply false
+    alias(libs.plugins.android.library) apply false
 }

data/.gitignore

@@ -0,0 +1 @@
+/build

data/build.gradle.kts

@@ -0,0 +1,47 @@
+plugins {
+    alias(libs.plugins.android.library)
+    alias(libs.plugins.kotlin.android)
+    alias(libs.plugins.dagger.hilt)
+    alias(libs.plugins.ksp)
+}
+
+android {
+    namespace = "com.github.nullptroma.data"
+    compileSdk = 34
+
+    defaultConfig {
+        minSdk = 24
+
+        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+        consumerProguardFiles("consumer-rules.pro")
+    }
+
+    buildTypes {
+        release {
+            isMinifyEnabled = false
+            proguardFiles(
+                getDefaultProguardFile("proguard-android-optimize.txt"),
+                "proguard-rules.pro"
+            )
+        }
+    }
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
+    }
+    kotlinOptions {
+        jvmTarget = "1.8"
+    }
+}
+
+dependencies {
+    implementation(libs.dagger.hilt)
+    ksp(libs.dagger.hilt.compiler)
+
+    implementation(libs.androidx.core.ktx)
+    implementation(libs.androidx.appcompat)
+    implementation(libs.material)
+    testImplementation(libs.junit)
+    androidTestImplementation(libs.androidx.junit)
+    androidTestImplementation(libs.androidx.espresso.core)
+}

data/proguard-rules.pro

@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile

data/src/androidTest/java/com/github/nullptroma/data/ExampleInstrumentedTest.kt

@@ -1,4 +1,4 @@
-package ru.freedominc.wallenc
+package com.github.nullptroma.data
 
 import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.ext.junit.runners.AndroidJUnit4
@@ -19,6 +19,6 @@ class ExampleInstrumentedTest {
     fun useAppContext() {
         // Context of the app under test.
         val appContext = InstrumentationRegistry.getInstrumentation().targetContext
-        assertEquals("ru.freedominc.wallenc", appContext.packageName)
+        assertEquals("com.github.nullptroma.data.test", appContext.packageName)
     }
 }

data/src/main/AndroidManifest.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+
+</manifest>

data/src/test/java/com/github/nullptroma/data/ExampleUnitTest.kt

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

domain/.gitignore

@@ -0,0 +1 @@
+/build

domain/build.gradle.kts

@@ -0,0 +1,47 @@
+plugins {
+    alias(libs.plugins.android.library)
+    alias(libs.plugins.kotlin.android)
+    alias(libs.plugins.dagger.hilt)
+    alias(libs.plugins.ksp)
+}
+
+android {
+    namespace = "com.github.nullptroma.domain"
+    compileSdk = 34
+
+    defaultConfig {
+        minSdk = 24
+
+        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+        consumerProguardFiles("consumer-rules.pro")
+    }
+
+    buildTypes {
+        release {
+            isMinifyEnabled = false
+            proguardFiles(
+                getDefaultProguardFile("proguard-android-optimize.txt"),
+                "proguard-rules.pro"
+            )
+        }
+    }
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
+    }
+    kotlinOptions {
+        jvmTarget = "1.8"
+    }
+}
+
+dependencies {
+    implementation(libs.dagger.hilt)
+    ksp(libs.dagger.hilt.compiler)
+
+    implementation(libs.androidx.core.ktx)
+    implementation(libs.androidx.appcompat)
+    implementation(libs.material)
+    testImplementation(libs.junit)
+    androidTestImplementation(libs.androidx.junit)
+    androidTestImplementation(libs.androidx.espresso.core)
+}

domain/proguard-rules.pro

@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile

domain/src/androidTest/java/com/github/nullptroma/domain/ExampleInstrumentedTest.kt

@@ -0,0 +1,24 @@
+package com.github.nullptroma.domain
+
+import androidx.test.platform.app.InstrumentationRegistry
+import androidx.test.ext.junit.runners.AndroidJUnit4
+
+import org.junit.Test
+import org.junit.runner.RunWith
+
+import org.junit.Assert.*
+
+/**
+ * Instrumented test, which will execute on an Android device.
+ *
+ * See [testing documentation](http://d.android.com/tools/testing).
+ */
+@RunWith(AndroidJUnit4::class)
+class ExampleInstrumentedTest {
+    @Test
+    fun useAppContext() {
+        // Context of the app under test.
+        val appContext = InstrumentationRegistry.getInstrumentation().targetContext
+        assertEquals("com.github.nullptroma.domain.test", appContext.packageName)
+    }
+}

domain/src/main/AndroidManifest.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+
+</manifest>

domain/src/test/java/com/github/nullptroma/domain/ExampleUnitTest.kt

@@ -0,0 +1,17 @@
+package com.github.nullptroma.domain
+
+import org.junit.Test
+
+import org.junit.Assert.*
+
+/**
+ * Example local unit test, which will execute on the development machine (host).
+ *
+ * See [testing documentation](http://d.android.com/tools/testing).
+ */
+class ExampleUnitTest {
+    @Test
+    fun addition_isCorrect() {
+        assertEquals(4, 2 + 2)
+    }
+}

gradle/libs.versions.toml

@@ -1,23 +1,27 @@
 [versions]
-agp = "8.6.0"
+agp = "8.6.1"
 kotlin = "2.0.20"
 coreKtx = "1.13.1"
 junit = "4.13.2"
 junitVersion = "1.2.1"
 espressoCore = "3.6.1"
-lifecycleRuntimeKtx = "2.8.5"
+lifecycleRuntimeKtx = "2.8.6"
 activityCompose = "1.9.2"
-composeBom = "2024.09.00"
-navigation = "2.8.0"
+composeBom = "2024.09.02"
+navigation = "2.8.1"
+hiltNavigation = "1.2.0"
 yandexAuthSdk = "3.1.1"
-daggerHilt = "2.47"
+daggerHilt = "2.49"
 ksp = "2.0.20-1.0.24"
 room = "2.6.1"
 retrofit = "2.9.0"
 gson = "2.10.1"
+appcompat = "1.7.0"
+material = "1.12.0"
 
 [libraries]
-androidx-navigation = { group = "androidx.navigation", name = "navigation-compose", version.ref = "navigation" }
+navigation = { group = "androidx.navigation", name = "navigation-compose", version.ref = "navigation" }
+navigation-hilt-compose = { group = "androidx.hilt", name = "hilt-navigation-compose", version.ref = "hiltNavigation" }
 
 # Yandex
 yandex-oauth = { group = "com.yandex.android", name = "authsdk", version.ref = "yandexAuthSdk" }
@@ -52,6 +56,8 @@ androidx-ui-tooling = { group = "androidx.compose.ui", name = "ui-tooling" }
 androidx-ui-tooling-preview = { group = "androidx.compose.ui", name = "ui-tooling-preview" }
 androidx-ui-test-manifest = { group = "androidx.compose.ui", name = "ui-test-manifest" }
 androidx-ui-test-junit4 = { group = "androidx.compose.ui", name = "ui-test-junit4" }
+androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "appcompat" }
+material = { group = "com.google.android.material", name = "material", version.ref = "material" }
 
 
 [plugins]
@@ -60,4 +66,5 @@ kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
 compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
 dagger-hilt = { id = "com.google.dagger.hilt.android", version.ref = "daggerHilt" }
 ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
+android-library = { id = "com.android.library", version.ref = "agp" }
 

settings.gradle.kts

@@ -21,4 +21,5 @@ dependencyResolutionManagement {
 
 rootProject.name = "Wallenc"
 include(":app")
- 
+include(":domain")
+include(":data")