From b39fc6ddb990a5748bbee77ea873ea57fc33aede Mon Sep 17 00:00:00 2001
From: KP9lKk <devdmitriizhukov@gmail.com>
Date: Tue, 11 Mar 2025 11:39:14 +0300
Subject: [PATCH] add data

---
 .idea/gradle.xml                                 |  1 +
 .idea/misc.xml                                   |  1 -
 .../networksample/data/local/AuthLocalStore.kt   |  9 +++++++++
 .../data/local/datastore/LocalDataStore.kt       | 16 ++++++++++++++++
 .../User.kt => model/RegistrationRequest.kt}     |  4 ++--
 .../networksample/data/model/SaveTokenRequest.kt |  3 +++
 .../networksample/data/model/TokenResponse.kt    |  3 +++
 .../example/networksample/data/remote/Auth.kt    | 11 -----------
 .../data/remote/AuthRemoteSource.kt              |  8 ++++++++
 .../networksample/data/remote/retrofit/Auth.kt   | 12 ++++++++++++
 .../data/remote/{ => retrofit}/RetrofitClient.kt |  4 ++--
 .../data/repository/AuthRepository.kt            |  6 ++++++
 .../data/repository/AuthRepositoryImpl.kt        | 16 ++++++++++++++++
 .../networksample/screen/RegistrationScreen.kt   |  7 +++----
 14 files changed, 81 insertions(+), 20 deletions(-)
 create mode 100644 app/src/main/java/com/example/networksample/data/local/AuthLocalStore.kt
 create mode 100644 app/src/main/java/com/example/networksample/data/local/datastore/LocalDataStore.kt
 rename app/src/main/java/com/example/networksample/data/{remote/User.kt => model/RegistrationRequest.kt} (50%)
 create mode 100644 app/src/main/java/com/example/networksample/data/model/SaveTokenRequest.kt
 create mode 100644 app/src/main/java/com/example/networksample/data/model/TokenResponse.kt
 delete mode 100644 app/src/main/java/com/example/networksample/data/remote/Auth.kt
 create mode 100644 app/src/main/java/com/example/networksample/data/remote/AuthRemoteSource.kt
 create mode 100644 app/src/main/java/com/example/networksample/data/remote/retrofit/Auth.kt
 rename app/src/main/java/com/example/networksample/data/remote/{ => retrofit}/RetrofitClient.kt (76%)
 create mode 100644 app/src/main/java/com/example/networksample/data/repository/AuthRepository.kt
 create mode 100644 app/src/main/java/com/example/networksample/data/repository/AuthRepositoryImpl.kt

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index ae733f1..7b3006b 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="GradleMigrationSettings" migrationVersion="1" />
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 74dd639..b2c751a 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ExternalStorageConfigurationManager" enabled="true" />
   <component name="ProjectRootManager" version="2" languageLevel="JDK_21" default="true" project-jdk-name="jbr-21" project-jdk-type="JavaSDK">
diff --git a/app/src/main/java/com/example/networksample/data/local/AuthLocalStore.kt b/app/src/main/java/com/example/networksample/data/local/AuthLocalStore.kt
new file mode 100644
index 0000000..f23cbe5
--- /dev/null
+++ b/app/src/main/java/com/example/networksample/data/local/AuthLocalStore.kt
@@ -0,0 +1,9 @@
+package com.example.networksample.data.local
+
+import com.example.networksample.data.model.SaveTokenRequest
+import com.example.networksample.data.model.TokenResponse
+
+interface AuthLocalStore {
+    suspend fun getToken(): TokenResponse
+    suspend fun setToken(saveTokenRequest: SaveTokenRequest): Boolean
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/networksample/data/local/datastore/LocalDataStore.kt b/app/src/main/java/com/example/networksample/data/local/datastore/LocalDataStore.kt
new file mode 100644
index 0000000..f92086b
--- /dev/null
+++ b/app/src/main/java/com/example/networksample/data/local/datastore/LocalDataStore.kt
@@ -0,0 +1,16 @@
+package com.example.networksample.data.local.datastore
+
+import android.content.Context
+import com.example.networksample.data.local.AuthLocalStore
+import com.example.networksample.data.model.SaveTokenRequest
+import com.example.networksample.data.model.TokenResponse
+
+class LocalDataStore(context: Context):AuthLocalStore {
+    override suspend fun getToken(): TokenResponse {
+        TODO("Not yet implemented")
+    }
+
+    override suspend fun setToken(saveTokenRequest: SaveTokenRequest): Boolean {
+        TODO("Not yet implemented")
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/networksample/data/remote/User.kt b/app/src/main/java/com/example/networksample/data/model/RegistrationRequest.kt
similarity index 50%
rename from app/src/main/java/com/example/networksample/data/remote/User.kt
rename to app/src/main/java/com/example/networksample/data/model/RegistrationRequest.kt
index a5bac58..dfb9a99 100644
--- a/app/src/main/java/com/example/networksample/data/remote/User.kt
+++ b/app/src/main/java/com/example/networksample/data/model/RegistrationRequest.kt
@@ -1,6 +1,6 @@
-package com.example.networksample.data.remote
+package com.example.networksample.data.model
 
-data class User(
+data class RegistrationRequest(
     val userName: String,
     val email: String,
     val password: String
diff --git a/app/src/main/java/com/example/networksample/data/model/SaveTokenRequest.kt b/app/src/main/java/com/example/networksample/data/model/SaveTokenRequest.kt
new file mode 100644
index 0000000..2949497
--- /dev/null
+++ b/app/src/main/java/com/example/networksample/data/model/SaveTokenRequest.kt
@@ -0,0 +1,3 @@
+package com.example.networksample.data.model
+
+data class SaveTokenRequest(val tokenAuthentication:String)
diff --git a/app/src/main/java/com/example/networksample/data/model/TokenResponse.kt b/app/src/main/java/com/example/networksample/data/model/TokenResponse.kt
new file mode 100644
index 0000000..dda488f
--- /dev/null
+++ b/app/src/main/java/com/example/networksample/data/model/TokenResponse.kt
@@ -0,0 +1,3 @@
+package com.example.networksample.data.model
+
+data class TokenResponse(val tokenAuthentication:String)
\ No newline at end of file
diff --git a/app/src/main/java/com/example/networksample/data/remote/Auth.kt b/app/src/main/java/com/example/networksample/data/remote/Auth.kt
deleted file mode 100644
index 7604bda..0000000
--- a/app/src/main/java/com/example/networksample/data/remote/Auth.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.example.networksample.data.remote
-
-import retrofit2.Response
-import retrofit2.http.Body
-import retrofit2.http.GET
-import retrofit2.http.POST
-
-interface Auth {
-    @POST("/registration")
-    suspend fun registration(@Body user: User)
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/networksample/data/remote/AuthRemoteSource.kt b/app/src/main/java/com/example/networksample/data/remote/AuthRemoteSource.kt
new file mode 100644
index 0000000..66aa7f2
--- /dev/null
+++ b/app/src/main/java/com/example/networksample/data/remote/AuthRemoteSource.kt
@@ -0,0 +1,8 @@
+package com.example.networksample.data.remote
+
+import com.example.networksample.data.model.RegistrationRequest
+import com.example.networksample.data.model.TokenResponse
+
+interface AuthRemoteSource {
+    suspend fun registration(registrationRequest: RegistrationRequest): TokenResponse
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/networksample/data/remote/retrofit/Auth.kt b/app/src/main/java/com/example/networksample/data/remote/retrofit/Auth.kt
new file mode 100644
index 0000000..04927d7
--- /dev/null
+++ b/app/src/main/java/com/example/networksample/data/remote/retrofit/Auth.kt
@@ -0,0 +1,12 @@
+package com.example.networksample.data.remote.retrofit
+
+import com.example.networksample.data.model.RegistrationRequest
+import com.example.networksample.data.model.TokenResponse
+import com.example.networksample.data.remote.AuthRemoteSource
+import retrofit2.http.Body
+import retrofit2.http.POST
+
+interface Auth: AuthRemoteSource {
+    @POST("/registration")
+    override suspend fun registration(@Body registrationRequest: RegistrationRequest): TokenResponse
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/networksample/data/remote/RetrofitClient.kt b/app/src/main/java/com/example/networksample/data/remote/retrofit/RetrofitClient.kt
similarity index 76%
rename from app/src/main/java/com/example/networksample/data/remote/RetrofitClient.kt
rename to app/src/main/java/com/example/networksample/data/remote/retrofit/RetrofitClient.kt
index c5a4ada..f5f8472 100644
--- a/app/src/main/java/com/example/networksample/data/remote/RetrofitClient.kt
+++ b/app/src/main/java/com/example/networksample/data/remote/retrofit/RetrofitClient.kt
@@ -1,9 +1,9 @@
-package com.example.networksample.data.remote
+package com.example.networksample.data.remote.retrofit
 
 import retrofit2.Retrofit
 import retrofit2.converter.gson.GsonConverterFactory
 
-private const val URL = "http://10.108.98.60:8080"
+private const val URL = "http://10.242.177.60:8080"
 object RetrofitClient {
    private val retrofitBuilder = Retrofit.Builder()
         .baseUrl(URL)
diff --git a/app/src/main/java/com/example/networksample/data/repository/AuthRepository.kt b/app/src/main/java/com/example/networksample/data/repository/AuthRepository.kt
new file mode 100644
index 0000000..325b64a
--- /dev/null
+++ b/app/src/main/java/com/example/networksample/data/repository/AuthRepository.kt
@@ -0,0 +1,6 @@
+package com.example.networksample.data.repository
+
+interface AuthRepository {
+    suspend fun registration()
+    suspend fun login()
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/networksample/data/repository/AuthRepositoryImpl.kt b/app/src/main/java/com/example/networksample/data/repository/AuthRepositoryImpl.kt
new file mode 100644
index 0000000..0e8c741
--- /dev/null
+++ b/app/src/main/java/com/example/networksample/data/repository/AuthRepositoryImpl.kt
@@ -0,0 +1,16 @@
+package com.example.networksample.data.repository
+
+import com.example.networksample.data.local.AuthLocalStore
+import com.example.networksample.data.remote.AuthRemoteSource
+
+class AuthRepositoryImpl(authLocalStore: AuthLocalStore,
+                         authRemoteSource: AuthRemoteSource): AuthRepository {
+    override suspend fun registration() {
+        TODO("Not yet implemented")
+    }
+
+    override suspend fun login() {
+        TODO("Not yet implemented")
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/networksample/screen/RegistrationScreen.kt b/app/src/main/java/com/example/networksample/screen/RegistrationScreen.kt
index 92e2d5c..67cba24 100644
--- a/app/src/main/java/com/example/networksample/screen/RegistrationScreen.kt
+++ b/app/src/main/java/com/example/networksample/screen/RegistrationScreen.kt
@@ -9,11 +9,10 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
-import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
-import com.example.networksample.data.remote.RetrofitClient
-import com.example.networksample.data.remote.User
+import com.example.networksample.data.model.RegistrationRequest
+import com.example.networksample.data.remote.retrofit.RetrofitClient
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 
@@ -48,7 +47,7 @@ fun RegistrationScreen(){
         )
         Button(
             onClick = {
-                val user = User(
+                val user = RegistrationRequest(
                     userName = name.value,
                     email = email.value,
                     password = password.value)