From 2777304cafc3600347ed1a29a66437cc86df8121 Mon Sep 17 00:00:00 2001
From: nikolay <nazarov.nikolay15@wb.ru>
Date: Sat, 10 Aug 2024 18:17:11 +0300
Subject: [PATCH 01/36] =?UTF-8?q?=D0=9F=D1=80=D0=BE=D0=B1=D1=83=D1=8E=20?=
 =?UTF-8?q?=D1=81=D0=B4=D0=B5=D0=BB=D0=B0=D1=82=D1=8C=20=D1=82=D0=BE=D0=BB?=
 =?UTF-8?q?=D1=8C=D0=BA=D0=BE=20=D0=BE=D0=B4=D0=BD=D1=83=20=D0=B2=D1=8C?=
 =?UTF-8?q?=D1=8E=D0=BC=D0=BE=D0=B4=D0=B5=D0=BB=D1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle                              |  9 +++++-
 app/src/main/AndroidManifest.xml              | 10 +++++--
 .../ru/otus/basicarchitecture/MainActivity.kt | 11 --------
 .../presentation/Fragment1.kt                 | 28 +++++++++++++++++++
 .../presentation/Fragment1ViewModel.kt        | 10 +++++++
 .../presentation/MainActivity.kt              | 24 ++++++++++++++++
 .../presentation/MainViewModel.kt             | 13 +++++++++
 .../presentation/MainViewState.kt             |  5 ++++
 app/src/main/res/layout/activity_main.xml     |  7 ++++-
 .../main/res/layout/fragment_fragment1.xml    | 13 +++++++++
 app/src/main/res/values/themes.xml            |  2 +-
 11 files changed, 116 insertions(+), 16 deletions(-)
 delete mode 100644 app/src/main/java/ru/otus/basicarchitecture/MainActivity.kt
 create mode 100644 app/src/main/java/ru/otus/basicarchitecture/presentation/Fragment1.kt
 create mode 100644 app/src/main/java/ru/otus/basicarchitecture/presentation/Fragment1ViewModel.kt
 create mode 100644 app/src/main/java/ru/otus/basicarchitecture/presentation/MainActivity.kt
 create mode 100644 app/src/main/java/ru/otus/basicarchitecture/presentation/MainViewModel.kt
 create mode 100644 app/src/main/java/ru/otus/basicarchitecture/presentation/MainViewState.kt
 create mode 100644 app/src/main/res/layout/fragment_fragment1.xml

diff --git a/app/build.gradle b/app/build.gradle
index 9c99d98..1a8dc56 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -5,7 +5,7 @@ plugins {
 
 android {
     namespace 'ru.otus.basicarchitecture'
-    compileSdk 33
+    compileSdk 34
 
     defaultConfig {
         applicationId "ru.otus.basicarchitecture"
@@ -38,7 +38,14 @@ dependencies {
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'com.google.android.material:material:1.9.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
+    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
+    implementation 'androidx.fragment:fragment-ktx:1.5.6'
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.5'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
+
+    def lifecycle_version = "2.6.1"
+    implementation "androidx.lifecycle:lifecycle-runtime-ktx:$lifecycle_version"
+    implementation "androidx.lifecycle:lifecycle-viewmodel-savedstate:$lifecycle_version"
+    implementation 'androidx.activity:activity-ktx:1.7.2'
 }
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 1e81fea..49031df 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -13,8 +13,14 @@
         android:theme="@style/Theme.BasicArchitecture"
         tools:targetApi="31">
         <activity
-            android:name=".MainActivity"
-            android:exported="false" />
+            android:name=".presentation.MainActivity"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/ru/otus/basicarchitecture/MainActivity.kt b/app/src/main/java/ru/otus/basicarchitecture/MainActivity.kt
deleted file mode 100644
index 623aba9..0000000
--- a/app/src/main/java/ru/otus/basicarchitecture/MainActivity.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-package ru.otus.basicarchitecture
-
-import androidx.appcompat.app.AppCompatActivity
-import android.os.Bundle
-
-class MainActivity : AppCompatActivity() {
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_main)
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/ru/otus/basicarchitecture/presentation/Fragment1.kt b/app/src/main/java/ru/otus/basicarchitecture/presentation/Fragment1.kt
new file mode 100644
index 0000000..3cc6bfd
--- /dev/null
+++ b/app/src/main/java/ru/otus/basicarchitecture/presentation/Fragment1.kt
@@ -0,0 +1,28 @@
+package ru.otus.basicarchitecture.presentation
+
+import androidx.fragment.app.viewModels
+import android.os.Bundle
+import androidx.fragment.app.Fragment
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import ru.otus.basicarchitecture.R
+
+class Fragment1 : Fragment() {
+
+    private val viewModel: Fragment1ViewModel by viewModels()
+
+
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+    }
+
+    override fun onCreateView(
+        inflater: LayoutInflater, container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View {
+        return inflater.inflate(R.layout.fragment_fragment1, container, false)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/ru/otus/basicarchitecture/presentation/Fragment1ViewModel.kt b/app/src/main/java/ru/otus/basicarchitecture/presentation/Fragment1ViewModel.kt
new file mode 100644
index 0000000..ea40adf
--- /dev/null
+++ b/app/src/main/java/ru/otus/basicarchitecture/presentation/Fragment1ViewModel.kt
@@ -0,0 +1,10 @@
+package ru.otus.basicarchitecture.presentation
+
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.ViewModel
+
+class Fragment1ViewModel : ViewModel() {
+    private val _state = MutableLiveData<MainViewState>()
+    val viewState: LiveData<MainViewState> = _state
+}
\ No newline at end of file
diff --git a/app/src/main/java/ru/otus/basicarchitecture/presentation/MainActivity.kt b/app/src/main/java/ru/otus/basicarchitecture/presentation/MainActivity.kt
new file mode 100644
index 0000000..52b151a
--- /dev/null
+++ b/app/src/main/java/ru/otus/basicarchitecture/presentation/MainActivity.kt
@@ -0,0 +1,24 @@
+package ru.otus.basicarchitecture.presentation
+
+import androidx.appcompat.app.AppCompatActivity
+import android.os.Bundle
+import androidx.activity.viewModels
+import androidx.fragment.app.Fragment
+import ru.otus.basicarchitecture.R
+
+class MainActivity : AppCompatActivity() {
+
+    private val viewModel: MainViewModel by viewModels()
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_main)
+        loadFragment(Fragment1())
+
+    }
+    private fun loadFragment(fragment: Fragment) {
+        val transaction = supportFragmentManager.beginTransaction()
+        transaction.replace(R.id.fragment_container, fragment)
+        transaction.addToBackStack("af") // Добавляем в стек для навигации
+        transaction.commit()
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/ru/otus/basicarchitecture/presentation/MainViewModel.kt b/app/src/main/java/ru/otus/basicarchitecture/presentation/MainViewModel.kt
new file mode 100644
index 0000000..4d55ed7
--- /dev/null
+++ b/app/src/main/java/ru/otus/basicarchitecture/presentation/MainViewModel.kt
@@ -0,0 +1,13 @@
+package ru.otus.basicarchitecture.presentation
+
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.ViewModel
+
+class MainViewModel : ViewModel() {
+    private val _state = MutableLiveData<MainViewState>()
+    val viewState: LiveData<MainViewState> = _state
+//    private val _state = MutableLiveData<MainViewState>()
+//    val viewState: LiveData<MainViewState> = _state
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/ru/otus/basicarchitecture/presentation/MainViewState.kt b/app/src/main/java/ru/otus/basicarchitecture/presentation/MainViewState.kt
new file mode 100644
index 0000000..ec616b3
--- /dev/null
+++ b/app/src/main/java/ru/otus/basicarchitecture/presentation/MainViewState.kt
@@ -0,0 +1,5 @@
+package ru.otus.basicarchitecture.presentation
+data class MainViewState(
+    val isProgress: Boolean = false,
+    val currentWater: String = ""
+)
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 0b15a20..5e17fd7 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -4,6 +4,11 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".MainActivity">
+    tools:context=".presentation.MainActivity">
+
+    <FrameLayout
+        android:id="@+id/fragment_container"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_fragment1.xml b/app/src/main/res/layout/fragment_fragment1.xml
new file mode 100644
index 0000000..c139a4e
--- /dev/null
+++ b/app/src/main/res/layout/fragment_fragment1.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".presentation.Fragment1">
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:text="Hello" />
+
+</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 0ab4563..c333b04 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -1,6 +1,6 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
     <!-- Base application theme. -->
-    <style name="Theme.BasicArchitecture" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
+    <style name="Theme.BasicArchitecture" parent="Theme.MaterialComponents.DayNight.NoActionBar">
         <!-- Primary brand color. -->
         <item name="colorPrimary">@color/purple_500</item>
         <item name="colorPrimaryVariant">@color/purple_700</item>

From 521dcf7a829eb48220ec522f9b681c101782b3af Mon Sep 17 00:00:00 2001
From: nikolay <nazarov.nikolay15@wb.ru>
Date: Sat, 10 Aug 2024 18:51:38 +0300
Subject: [PATCH 02/36] =?UTF-8?q?=D0=9F=D1=80=D0=BE=D0=B1=D1=83=D1=8E=20?=
 =?UTF-8?q?=D1=81=D0=B4=D0=B5=D0=BB=D0=B0=D1=82=D1=8C=20=D1=82=D0=BE=D0=BB?=
 =?UTF-8?q?=D1=8C=D0=BA=D0=BE=20=D0=BE=D0=B4=D0=BD=D1=83=20=D0=B2=D1=8C?=
 =?UTF-8?q?=D1=8E=D0=BC=D0=BE=D0=B4=D0=B5=D0=BB=D1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../presentation/Fragment1.kt                 |  4 +--
 .../presentation/Fragment1ViewModel.kt        | 10 --------
 .../main/res/layout/fragment_fragment1.xml    | 25 +++++++++++++++----
 3 files changed, 21 insertions(+), 18 deletions(-)
 delete mode 100644 app/src/main/java/ru/otus/basicarchitecture/presentation/Fragment1ViewModel.kt

diff --git a/app/src/main/java/ru/otus/basicarchitecture/presentation/Fragment1.kt b/app/src/main/java/ru/otus/basicarchitecture/presentation/Fragment1.kt
index 3cc6bfd..467c54f 100644
--- a/app/src/main/java/ru/otus/basicarchitecture/presentation/Fragment1.kt
+++ b/app/src/main/java/ru/otus/basicarchitecture/presentation/Fragment1.kt
@@ -10,9 +10,7 @@ import ru.otus.basicarchitecture.R
 
 class Fragment1 : Fragment() {
 
-    private val viewModel: Fragment1ViewModel by viewModels()
-
-
+    private val viewModel: MainViewModel by viewModels()
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
diff --git a/app/src/main/java/ru/otus/basicarchitecture/presentation/Fragment1ViewModel.kt b/app/src/main/java/ru/otus/basicarchitecture/presentation/Fragment1ViewModel.kt
deleted file mode 100644
index ea40adf..0000000
--- a/app/src/main/java/ru/otus/basicarchitecture/presentation/Fragment1ViewModel.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-package ru.otus.basicarchitecture.presentation
-
-import androidx.lifecycle.LiveData
-import androidx.lifecycle.MutableLiveData
-import androidx.lifecycle.ViewModel
-
-class Fragment1ViewModel : ViewModel() {
-    private val _state = MutableLiveData<MainViewState>()
-    val viewState: LiveData<MainViewState> = _state
-}
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_fragment1.xml b/app/src/main/res/layout/fragment_fragment1.xml
index c139a4e..6e2dcf7 100644
--- a/app/src/main/res/layout/fragment_fragment1.xml
+++ b/app/src/main/res/layout/fragment_fragment1.xml
@@ -1,13 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context=".presentation.Fragment1">
 
-    <TextView
+    <com.google.android.material.textfield.TextInputLayout
+        android:id="@+id/editTextText"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:text="Hello" />
+        android:layout_height="54dp"
+        android:layout_marginStart="24dp"
+        android:layout_marginTop="24dp"
+        android:layout_marginEnd="24dp"
+        android:hint="Name"
+        android:inputType="text"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
 
-</FrameLayout>
\ No newline at end of file
+        <com.google.android.material.textfield.TextInputEditText
+            android:id="@+id/name"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
+    </com.google.android.material.textfield.TextInputLayout>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

From fe356b1bf2e0bd9cedb1bad326e2f8678c05fa38 Mon Sep 17 00:00:00 2001
From: nikolay <nazarov.nikolay15@wb.ru>
Date: Sat, 10 Aug 2024 19:05:49 +0300
Subject: [PATCH 03/36] =?UTF-8?q?=D0=9D=D0=B0=D1=81=D1=82=D1=80=D0=BE?=
 =?UTF-8?q?=D0=B8=D0=BB=20=D0=B8=D0=B5=D1=80=D0=B0=D1=80=D1=85=D0=B8=D1=8E?=
 =?UTF-8?q?=20=D0=BF=D0=B0=D0=BF=D0=BE=D0=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/AndroidManifest.xml                              | 2 +-
 .../basicarchitecture/{presentation => ui}/MainActivity.kt    | 4 +++-
 .../{presentation => ui/fragments}/Fragment1.kt               | 3 ++-
 .../{presentation => viewmodels}/MainViewModel.kt             | 2 +-
 .../{presentation => viewmodels}/MainViewState.kt             | 2 +-
 app/src/main/res/layout/activity_main.xml                     | 2 +-
 app/src/main/res/layout/fragment_fragment1.xml                | 2 +-
 7 files changed, 10 insertions(+), 7 deletions(-)
 rename app/src/main/java/ru/otus/basicarchitecture/{presentation => ui}/MainActivity.kt (83%)
 rename app/src/main/java/ru/otus/basicarchitecture/{presentation => ui/fragments}/Fragment1.kt (86%)
 rename app/src/main/java/ru/otus/basicarchitecture/{presentation => viewmodels}/MainViewModel.kt (88%)
 rename app/src/main/java/ru/otus/basicarchitecture/{presentation => viewmodels}/MainViewState.kt (67%)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 49031df..aaa3bbe 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -13,7 +13,7 @@
         android:theme="@style/Theme.BasicArchitecture"
         tools:targetApi="31">
         <activity
-            android:name=".presentation.MainActivity"
+            android:name=".ui.MainActivity"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
diff --git a/app/src/main/java/ru/otus/basicarchitecture/presentation/MainActivity.kt b/app/src/main/java/ru/otus/basicarchitecture/ui/MainActivity.kt
similarity index 83%
rename from app/src/main/java/ru/otus/basicarchitecture/presentation/MainActivity.kt
rename to app/src/main/java/ru/otus/basicarchitecture/ui/MainActivity.kt
index 52b151a..6bc65f9 100644
--- a/app/src/main/java/ru/otus/basicarchitecture/presentation/MainActivity.kt
+++ b/app/src/main/java/ru/otus/basicarchitecture/ui/MainActivity.kt
@@ -1,10 +1,12 @@
-package ru.otus.basicarchitecture.presentation
+package ru.otus.basicarchitecture.ui
 
 import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
 import androidx.activity.viewModels
 import androidx.fragment.app.Fragment
+import ru.otus.basicarchitecture.ui.fragments.Fragment1
 import ru.otus.basicarchitecture.R
+import ru.otus.basicarchitecture.viewmodels.MainViewModel
 
 class MainActivity : AppCompatActivity() {
 
diff --git a/app/src/main/java/ru/otus/basicarchitecture/presentation/Fragment1.kt b/app/src/main/java/ru/otus/basicarchitecture/ui/fragments/Fragment1.kt
similarity index 86%
rename from app/src/main/java/ru/otus/basicarchitecture/presentation/Fragment1.kt
rename to app/src/main/java/ru/otus/basicarchitecture/ui/fragments/Fragment1.kt
index 467c54f..6766ff0 100644
--- a/app/src/main/java/ru/otus/basicarchitecture/presentation/Fragment1.kt
+++ b/app/src/main/java/ru/otus/basicarchitecture/ui/fragments/Fragment1.kt
@@ -1,4 +1,4 @@
-package ru.otus.basicarchitecture.presentation
+package ru.otus.basicarchitecture.ui.fragments
 
 import androidx.fragment.app.viewModels
 import android.os.Bundle
@@ -7,6 +7,7 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import ru.otus.basicarchitecture.R
+import ru.otus.basicarchitecture.viewmodels.MainViewModel
 
 class Fragment1 : Fragment() {
 
diff --git a/app/src/main/java/ru/otus/basicarchitecture/presentation/MainViewModel.kt b/app/src/main/java/ru/otus/basicarchitecture/viewmodels/MainViewModel.kt
similarity index 88%
rename from app/src/main/java/ru/otus/basicarchitecture/presentation/MainViewModel.kt
rename to app/src/main/java/ru/otus/basicarchitecture/viewmodels/MainViewModel.kt
index 4d55ed7..66939b6 100644
--- a/app/src/main/java/ru/otus/basicarchitecture/presentation/MainViewModel.kt
+++ b/app/src/main/java/ru/otus/basicarchitecture/viewmodels/MainViewModel.kt
@@ -1,4 +1,4 @@
-package ru.otus.basicarchitecture.presentation
+package ru.otus.basicarchitecture.viewmodels
 
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
diff --git a/app/src/main/java/ru/otus/basicarchitecture/presentation/MainViewState.kt b/app/src/main/java/ru/otus/basicarchitecture/viewmodels/MainViewState.kt
similarity index 67%
rename from app/src/main/java/ru/otus/basicarchitecture/presentation/MainViewState.kt
rename to app/src/main/java/ru/otus/basicarchitecture/viewmodels/MainViewState.kt
index ec616b3..0b9c642 100644
--- a/app/src/main/java/ru/otus/basicarchitecture/presentation/MainViewState.kt
+++ b/app/src/main/java/ru/otus/basicarchitecture/viewmodels/MainViewState.kt
@@ -1,4 +1,4 @@
-package ru.otus.basicarchitecture.presentation
+package ru.otus.basicarchitecture.viewmodels
 data class MainViewState(
     val isProgress: Boolean = false,
     val currentWater: String = ""
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 5e17fd7..0510d5b 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".presentation.MainActivity">
+    tools:context=".ui.MainActivity">
 
     <FrameLayout
         android:id="@+id/fragment_container"
diff --git a/app/src/main/res/layout/fragment_fragment1.xml b/app/src/main/res/layout/fragment_fragment1.xml
index 6e2dcf7..592b254 100644
--- a/app/src/main/res/layout/fragment_fragment1.xml
+++ b/app/src/main/res/layout/fragment_fragment1.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".presentation.Fragment1">
+    tools:context=".ui.fragments.Fragment1">
 
     <com.google.android.material.textfield.TextInputLayout
         android:id="@+id/editTextText"

From 599380f83fcd33189b407d4cd3cdee7030843e2a Mon Sep 17 00:00:00 2001
From: nikolay <nazarov.nikolay15@wb.ru>
Date: Sat, 10 Aug 2024 19:44:34 +0300
Subject: [PATCH 04/36] =?UTF-8?q?=D0=A1=D0=BE=D0=B7=D0=B4=D0=B0=D0=BB=201?=
 =?UTF-8?q?=20=D0=B8=202=20=D1=84=D1=80=D0=B0=D0=B3=D0=BC=D0=B5=D0=BD?=
 =?UTF-8?q?=D1=82=20(=D0=B2=D0=B5=D1=80=D1=81=D1=82=D0=BA=D0=B0)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ui/fragments/Fragment2.kt                 | 27 ++++++
 .../main/res/layout/fragment_fragment1.xml    | 63 ++++++++++++-
 .../main/res/layout/fragment_fragment2.xml    | 89 +++++++++++++++++++
 3 files changed, 178 insertions(+), 1 deletion(-)
 create mode 100644 app/src/main/java/ru/otus/basicarchitecture/ui/fragments/Fragment2.kt
 create mode 100644 app/src/main/res/layout/fragment_fragment2.xml

diff --git a/app/src/main/java/ru/otus/basicarchitecture/ui/fragments/Fragment2.kt b/app/src/main/java/ru/otus/basicarchitecture/ui/fragments/Fragment2.kt
new file mode 100644
index 0000000..d9d6355
--- /dev/null
+++ b/app/src/main/java/ru/otus/basicarchitecture/ui/fragments/Fragment2.kt
@@ -0,0 +1,27 @@
+package ru.otus.basicarchitecture.ui.fragments
+
+import androidx.fragment.app.viewModels
+import android.os.Bundle
+import androidx.fragment.app.Fragment
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import ru.otus.basicarchitecture.R
+import ru.otus.basicarchitecture.viewmodels.MainViewModel
+
+class Fragment2 : Fragment() {
+
+    private val viewModel: MainViewModel by viewModels()
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+    }
+
+    override fun onCreateView(
+        inflater: LayoutInflater, container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View {
+        return inflater.inflate(R.layout.fragment_fragment2, container, false)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_fragment1.xml b/app/src/main/res/layout/fragment_fragment1.xml
index 592b254..38ad8f8 100644
--- a/app/src/main/res/layout/fragment_fragment1.xml
+++ b/app/src/main/res/layout/fragment_fragment1.xml
@@ -7,7 +7,7 @@
     tools:context=".ui.fragments.Fragment1">
 
     <com.google.android.material.textfield.TextInputLayout
-        android:id="@+id/editTextText"
+        android:id="@+id/nameEditText"
         android:layout_width="match_parent"
         android:layout_height="54dp"
         android:layout_marginStart="24dp"
@@ -22,7 +22,68 @@
         <com.google.android.material.textfield.TextInputEditText
             android:id="@+id/name"
             android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:inputType="text"
+            android:maxLines="1"/>
+    </com.google.android.material.textfield.TextInputLayout>
+
+    <com.google.android.material.textfield.TextInputLayout
+        android:id="@+id/surnameEditText"
+        android:layout_width="match_parent"
+        android:layout_height="54dp"
+        android:layout_marginStart="24dp"
+        android:layout_marginTop="32dp"
+        android:layout_marginEnd="24dp"
+        android:hint="Surname"
+        android:inputType="text"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/nameEditText">
+
+        <com.google.android.material.textfield.TextInputEditText
+            android:id="@+id/surname"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:inputType="text"
+            android:maxLines="1"/>
+    </com.google.android.material.textfield.TextInputLayout>
+
+    <com.google.android.material.textfield.TextInputLayout
+        android:id="@+id/birthdateEditText"
+        android:layout_width="match_parent"
+        android:layout_height="54dp"
+        android:layout_marginStart="24dp"
+        android:layout_marginTop="32dp"
+        android:layout_marginEnd="24dp"
+        android:hint="Date of birth"
+        android:inputType="text"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/surnameEditText">
+
+        <com.google.android.material.textfield.TextInputEditText
+            android:inputType="date"
+            android:id="@+id/birthdate"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content" />
     </com.google.android.material.textfield.TextInputLayout>
 
+    <Button
+        android:id="@+id/fragment1Btn"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginHorizontal="16dp"
+        android:layout_marginStart="16dp"
+        android:layout_marginEnd="16dp"
+        android:layout_marginBottom="28dp"
+        android:insetTop="0dp"
+        android:insetBottom="0dp"
+        android:text="Next"
+        android:textAllCaps="true"
+        android:textSize="14sp"
+        android:textStyle="bold"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent" />
+
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_fragment2.xml b/app/src/main/res/layout/fragment_fragment2.xml
new file mode 100644
index 0000000..44c4cfe
--- /dev/null
+++ b/app/src/main/res/layout/fragment_fragment2.xml
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".ui.fragments.Fragment1">
+
+    <com.google.android.material.textfield.TextInputLayout
+        android:id="@+id/countryEditText"
+        android:layout_width="match_parent"
+        android:layout_height="54dp"
+        android:layout_marginStart="24dp"
+        android:layout_marginTop="24dp"
+        android:layout_marginEnd="24dp"
+        android:hint="Country"
+        android:inputType="text"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <com.google.android.material.textfield.TextInputEditText
+            android:id="@+id/country"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:inputType="text"
+            android:maxLines="1"/>
+    </com.google.android.material.textfield.TextInputLayout>
+
+    <com.google.android.material.textfield.TextInputLayout
+        android:id="@+id/cityEditText"
+        android:layout_width="match_parent"
+        android:layout_height="54dp"
+        android:layout_marginStart="24dp"
+        android:layout_marginTop="32dp"
+        android:layout_marginEnd="24dp"
+        android:hint="City"
+        android:inputType="text"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/countryEditText">
+
+        <com.google.android.material.textfield.TextInputEditText
+            android:id="@+id/city"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:inputType="text"
+            android:maxLines="1" />
+    </com.google.android.material.textfield.TextInputLayout>
+
+    <com.google.android.material.textfield.TextInputLayout
+        android:id="@+id/addressEditText"
+        android:layout_width="match_parent"
+        android:layout_height="54dp"
+        android:layout_marginStart="24dp"
+        android:layout_marginTop="32dp"
+        android:layout_marginEnd="24dp"
+        android:hint="Address"
+        android:inputType="text"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/cityEditText">
+
+        <com.google.android.material.textfield.TextInputEditText
+            android:id="@+id/address"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:inputType="date" />
+    </com.google.android.material.textfield.TextInputLayout>
+
+    <Button
+        android:id="@+id/fragment2Btn"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginHorizontal="16dp"
+        android:layout_marginStart="16dp"
+        android:layout_marginEnd="16dp"
+        android:layout_marginBottom="28dp"
+        android:insetTop="0dp"
+        android:insetBottom="0dp"
+        android:text="Next"
+        android:textAllCaps="true"
+        android:textSize="14sp"
+        android:textStyle="bold"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

From 4b67eddee4898ec890e5911f52147a0d4151ff01 Mon Sep 17 00:00:00 2001
From: nikolay <nazarov.nikolay15@wb.ru>
Date: Sat, 10 Aug 2024 20:20:22 +0300
Subject: [PATCH 05/36] =?UTF-8?q?=D0=A1=D0=BE=D0=B7=D0=B4=D0=B0=D0=BB=201?=
 =?UTF-8?q?=20=D0=B8=202=20=D1=84=D1=80=D0=B0=D0=B3=D0=BC=D0=B5=D0=BD?=
 =?UTF-8?q?=D1=82=20(=D0=B2=D0=B5=D1=80=D1=81=D1=82=D0=BA=D0=B0)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ru/otus/basicarchitecture/model/Tag.kt    |  3 ++
 .../repository/TagRepository.kt               | 15 ++++++++
 .../ui/fragments/Fragment3.kt                 | 27 +++++++++++++++
 .../viewmodels/Fragment3ViewModel.kt          | 34 +++++++++++++++++++
 .../main/res/layout/fragment_fragment3.xml    |  9 +++++
 5 files changed, 88 insertions(+)
 create mode 100644 app/src/main/java/ru/otus/basicarchitecture/model/Tag.kt
 create mode 100644 app/src/main/java/ru/otus/basicarchitecture/repository/TagRepository.kt
 create mode 100644 app/src/main/java/ru/otus/basicarchitecture/ui/fragments/Fragment3.kt
 create mode 100644 app/src/main/java/ru/otus/basicarchitecture/viewmodels/Fragment3ViewModel.kt
 create mode 100644 app/src/main/res/layout/fragment_fragment3.xml

diff --git a/app/src/main/java/ru/otus/basicarchitecture/model/Tag.kt b/app/src/main/java/ru/otus/basicarchitecture/model/Tag.kt
new file mode 100644
index 0000000..7117864
--- /dev/null
+++ b/app/src/main/java/ru/otus/basicarchitecture/model/Tag.kt
@@ -0,0 +1,3 @@
+package ru.otus.basicarchitecture.model
+
+data class Tag(val id: Int, val name: String)
\ No newline at end of file
diff --git a/app/src/main/java/ru/otus/basicarchitecture/repository/TagRepository.kt b/app/src/main/java/ru/otus/basicarchitecture/repository/TagRepository.kt
new file mode 100644
index 0000000..e48b286
--- /dev/null
+++ b/app/src/main/java/ru/otus/basicarchitecture/repository/TagRepository.kt
@@ -0,0 +1,15 @@
+package ru.otus.basicarchitecture.repository
+
+import ru.otus.basicarchitecture.model.Tag
+
+class TagRepository {
+    fun getTags(): List<Tag> {
+        return listOf(
+            Tag(1, "Музыка"),
+            Tag(2, "Кошки"),
+            Tag(3, "Кино"),
+            Tag(4, "Фотография"),
+            Tag(5, "Театр")
+        )
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/ru/otus/basicarchitecture/ui/fragments/Fragment3.kt b/app/src/main/java/ru/otus/basicarchitecture/ui/fragments/Fragment3.kt
new file mode 100644
index 0000000..2ff4ca1
--- /dev/null
+++ b/app/src/main/java/ru/otus/basicarchitecture/ui/fragments/Fragment3.kt
@@ -0,0 +1,27 @@
+package ru.otus.basicarchitecture.ui.fragments
+
+import androidx.fragment.app.viewModels
+import android.os.Bundle
+import androidx.fragment.app.Fragment
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import ru.otus.basicarchitecture.R
+import ru.otus.basicarchitecture.viewmodels.MainViewModel
+
+class Fragment3 : Fragment() {
+
+    private val viewModel: MainViewModel by viewModels()
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+    }
+
+    override fun onCreateView(
+        inflater: LayoutInflater, container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View {
+        return inflater.inflate(R.layout.fragment_fragment3, container, false)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/ru/otus/basicarchitecture/viewmodels/Fragment3ViewModel.kt b/app/src/main/java/ru/otus/basicarchitecture/viewmodels/Fragment3ViewModel.kt
new file mode 100644
index 0000000..50eb6c9
--- /dev/null
+++ b/app/src/main/java/ru/otus/basicarchitecture/viewmodels/Fragment3ViewModel.kt
@@ -0,0 +1,34 @@
+package ru.otus.basicarchitecture.viewmodels
+
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.ViewModel
+import ru.otus.basicarchitecture.model.Tag
+import ru.otus.basicarchitecture.repository.TagRepository
+
+class Fragment3ViewModel : ViewModel() {
+    private val repository = TagRepository()
+
+    private val _tags = MutableLiveData<List<Tag>>()
+    val tags: LiveData<List<Tag>> get() = _tags
+
+    private val _selectedTags = MutableLiveData<Set<Tag>>(setOf())
+    val selectedTags: LiveData<Set<Tag>> get() = _selectedTags
+
+    init {
+        loadTags()
+    }
+
+    private fun loadTags() {
+        _tags.value = repository.getTags()
+    }
+
+    fun toggleTagSelection(tag: Tag) {
+        val currentSelection = _selectedTags.value ?: setOf()
+        if (currentSelection.contains(tag)) {
+            _selectedTags.value = currentSelection - tag
+        } else {
+            _selectedTags.value = currentSelection + tag
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_fragment3.xml b/app/src/main/res/layout/fragment_fragment3.xml
new file mode 100644
index 0000000..c063601
--- /dev/null
+++ b/app/src/main/res/layout/fragment_fragment3.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".ui.fragments.Fragment1">
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

From 95e5c8e340a41b97aaad1204d49a53ca25d23da0 Mon Sep 17 00:00:00 2001
From: nikolay <nazarov.nikolay15@wb.ru>
Date: Sun, 11 Aug 2024 22:02:43 +0300
Subject: [PATCH 06/36] =?UTF-8?q?=D0=94=D0=B5=D0=BB=D0=B0=D1=8E=20=D0=BF?=
 =?UTF-8?q?=D0=B5=D1=80=D0=B5=D1=85=D0=BE=D0=B4=20=D0=BF=D0=BE=20=D0=BA?=
 =?UTF-8?q?=D0=BD=D0=BE=D0=BF=D0=BA=D0=B0=D0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle                              |  2 +
 .../otus/basicarchitecture/ui/MainActivity.kt |  2 +-
 .../ui/fragments/Fragment3.kt                 | 46 +++++++++++++++++--
 .../viewmodels/MainViewModel.kt               |  2 -
 .../main/res/layout/fragment_fragment3.xml    | 14 +++++-
 5 files changed, 58 insertions(+), 8 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 1a8dc56..288bea2 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -44,6 +44,8 @@ dependencies {
     androidTestImplementation 'androidx.test.ext:junit:1.1.5'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
 
+    implementation 'com.google.android.flexbox:flexbox:3.0.0'
+
     def lifecycle_version = "2.6.1"
     implementation "androidx.lifecycle:lifecycle-runtime-ktx:$lifecycle_version"
     implementation "androidx.lifecycle:lifecycle-viewmodel-savedstate:$lifecycle_version"
diff --git a/app/src/main/java/ru/otus/basicarchitecture/ui/MainActivity.kt b/app/src/main/java/ru/otus/basicarchitecture/ui/MainActivity.kt
index 6bc65f9..f9b329b 100644
--- a/app/src/main/java/ru/otus/basicarchitecture/ui/MainActivity.kt
+++ b/app/src/main/java/ru/otus/basicarchitecture/ui/MainActivity.kt
@@ -20,7 +20,7 @@ class MainActivity : AppCompatActivity() {
     private fun loadFragment(fragment: Fragment) {
         val transaction = supportFragmentManager.beginTransaction()
         transaction.replace(R.id.fragment_container, fragment)
-        transaction.addToBackStack("af") // Добавляем в стек для навигации
+        transaction.addToBackStack("null") // Добавляем в стек для навигации
         transaction.commit()
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/ru/otus/basicarchitecture/ui/fragments/Fragment3.kt b/app/src/main/java/ru/otus/basicarchitecture/ui/fragments/Fragment3.kt
index 2ff4ca1..943e3f6 100644
--- a/app/src/main/java/ru/otus/basicarchitecture/ui/fragments/Fragment3.kt
+++ b/app/src/main/java/ru/otus/basicarchitecture/ui/fragments/Fragment3.kt
@@ -1,21 +1,24 @@
 package ru.otus.basicarchitecture.ui.fragments
 
-import androidx.fragment.app.viewModels
 import android.os.Bundle
 import androidx.fragment.app.Fragment
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.Button
+import androidx.lifecycle.ViewModelProvider
+import com.google.android.flexbox.FlexboxLayout
 import ru.otus.basicarchitecture.R
-import ru.otus.basicarchitecture.viewmodels.MainViewModel
+import ru.otus.basicarchitecture.model.Tag
+import ru.otus.basicarchitecture.viewmodels.Fragment3ViewModel
 
 class Fragment3 : Fragment() {
+    private lateinit var viewModel: Fragment3ViewModel
+    private lateinit var tagFlexboxLayout: FlexboxLayout
 
-    private val viewModel: MainViewModel by viewModels()
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-
     }
 
     override fun onCreateView(
@@ -24,4 +27,39 @@ class Fragment3 : Fragment() {
     ): View {
         return inflater.inflate(R.layout.fragment_fragment3, container, false)
     }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        viewModel = ViewModelProvider(this).get(Fragment3ViewModel::class.java)
+        tagFlexboxLayout = view.findViewById(R.id.tagFlexboxLayout)
+
+        viewModel.tags.observe(viewLifecycleOwner) { tags ->
+            setupTagCloud(tags)
+        }
+
+        viewModel.selectedTags.observe(viewLifecycleOwner) { selectedTags ->
+            updateSelectedTags(selectedTags)
+        }
+    }
+
+    private fun setupTagCloud(tags: List<Tag>) {
+        tagFlexboxLayout.removeAllViews()
+        for (tag in tags) {
+            val tagButton = Button(context).apply {
+                text = tag.name
+                setOnClickListener {
+                    viewModel.toggleTagSelection(tag)
+                }
+            }
+            tagFlexboxLayout.addView(tagButton)
+        }
+    }
+
+    private fun updateSelectedTags(selectedTags: Set<Tag>) {
+        for (i in 0 until tagFlexboxLayout.childCount) {
+            val button = tagFlexboxLayout.getChildAt(i) as Button
+            button.isSelected = selectedTags.any { it.name == button.text }
+        }
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/ru/otus/basicarchitecture/viewmodels/MainViewModel.kt b/app/src/main/java/ru/otus/basicarchitecture/viewmodels/MainViewModel.kt
index 66939b6..67ca044 100644
--- a/app/src/main/java/ru/otus/basicarchitecture/viewmodels/MainViewModel.kt
+++ b/app/src/main/java/ru/otus/basicarchitecture/viewmodels/MainViewModel.kt
@@ -7,7 +7,5 @@ import androidx.lifecycle.ViewModel
 class MainViewModel : ViewModel() {
     private val _state = MutableLiveData<MainViewState>()
     val viewState: LiveData<MainViewState> = _state
-//    private val _state = MutableLiveData<MainViewState>()
-//    val viewState: LiveData<MainViewState> = _state
 
 }
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_fragment3.xml b/app/src/main/res/layout/fragment_fragment3.xml
index c063601..071f038 100644
--- a/app/src/main/res/layout/fragment_fragment3.xml
+++ b/app/src/main/res/layout/fragment_fragment3.xml
@@ -5,5 +5,17 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context=".ui.fragments.Fragment1">
-
+    
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+        <com.google.android.flexbox.FlexboxLayout
+            android:id="@+id/tagFlexboxLayout"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:padding="16dp"
+            app:flexWrap="wrap"
+            app:justifyContent="flex_start" />
+    </LinearLayout>
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

From 7c9148c3bede81a3b40b14bc28ca63d1bc825bad Mon Sep 17 00:00:00 2001
From: nikolay <nazarov.nikolay15@wb.ru>
Date: Sun, 11 Aug 2024 23:11:03 +0300
Subject: [PATCH 07/36] =?UTF-8?q?=D0=98=D0=BC=D0=BF=D0=BE=D1=80=D1=82?=
 =?UTF-8?q?=D0=BD=D1=83=D0=BB=20Hilt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle                              | 11 ++++++
 .../basicarchitecture/di/MyApplication.kt     |  8 +++++
 .../otus/basicarchitecture/model/InputData.kt |  3 ++
 .../otus/basicarchitecture/ui/MainActivity.kt |  3 +-
 .../ui/fragments/Fragment1.kt                 | 36 +++++++++++++++++--
 .../viewmodels/Fragment1ViewModel.kt          | 14 ++++++++
 .../viewmodels/MainViewModel.kt               | 11 ++++--
 .../{MainViewState.kt => ViewState.kt}        |  2 +-
 build.gradle                                  |  5 ++-
 9 files changed, 84 insertions(+), 9 deletions(-)
 create mode 100644 app/src/main/java/ru/otus/basicarchitecture/di/MyApplication.kt
 create mode 100644 app/src/main/java/ru/otus/basicarchitecture/model/InputData.kt
 create mode 100644 app/src/main/java/ru/otus/basicarchitecture/viewmodels/Fragment1ViewModel.kt
 rename app/src/main/java/ru/otus/basicarchitecture/viewmodels/{MainViewState.kt => ViewState.kt} (81%)

diff --git a/app/build.gradle b/app/build.gradle
index 288bea2..f71616d 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,6 +1,8 @@
 plugins {
     id 'com.android.application'
     id 'org.jetbrains.kotlin.android'
+    id 'com.google.dagger.hilt.android'
+    id 'kotlin-kapt'
 }
 
 android {
@@ -46,8 +48,17 @@ dependencies {
 
     implementation 'com.google.android.flexbox:flexbox:3.0.0'
 
+
+    // Hilt
+    implementation 'com.google.dagger:hilt-android:2.52'
+    kapt 'com.google.dagger:hilt-compiler:2.52'
+
     def lifecycle_version = "2.6.1"
     implementation "androidx.lifecycle:lifecycle-runtime-ktx:$lifecycle_version"
     implementation "androidx.lifecycle:lifecycle-viewmodel-savedstate:$lifecycle_version"
     implementation 'androidx.activity:activity-ktx:1.7.2'
+}
+
+kapt {
+    correctErrorTypes true
 }
\ No newline at end of file
diff --git a/app/src/main/java/ru/otus/basicarchitecture/di/MyApplication.kt b/app/src/main/java/ru/otus/basicarchitecture/di/MyApplication.kt
new file mode 100644
index 0000000..9ce7446
--- /dev/null
+++ b/app/src/main/java/ru/otus/basicarchitecture/di/MyApplication.kt
@@ -0,0 +1,8 @@
+package ru.otus.basicarchitecture.di
+
+import android.app.Application
+import dagger.hilt.android.HiltAndroidApp
+
+@HiltAndroidApp
+class MyApplication : Application() {
+}
\ No newline at end of file
diff --git a/app/src/main/java/ru/otus/basicarchitecture/model/InputData.kt b/app/src/main/java/ru/otus/basicarchitecture/model/InputData.kt
new file mode 100644
index 0000000..803040e
--- /dev/null
+++ b/app/src/main/java/ru/otus/basicarchitecture/model/InputData.kt
@@ -0,0 +1,3 @@
+package ru.otus.basicarchitecture.model
+
+data class InputData(val textInput: String)
\ No newline at end of file
diff --git a/app/src/main/java/ru/otus/basicarchitecture/ui/MainActivity.kt b/app/src/main/java/ru/otus/basicarchitecture/ui/MainActivity.kt
index f9b329b..f33a223 100644
--- a/app/src/main/java/ru/otus/basicarchitecture/ui/MainActivity.kt
+++ b/app/src/main/java/ru/otus/basicarchitecture/ui/MainActivity.kt
@@ -15,12 +15,13 @@ class MainActivity : AppCompatActivity() {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main)
         loadFragment(Fragment1())
-
     }
+
     private fun loadFragment(fragment: Fragment) {
         val transaction = supportFragmentManager.beginTransaction()
         transaction.replace(R.id.fragment_container, fragment)
         transaction.addToBackStack("null") // Добавляем в стек для навигации
         transaction.commit()
     }
+
 }
\ No newline at end of file
diff --git a/app/src/main/java/ru/otus/basicarchitecture/ui/fragments/Fragment1.kt b/app/src/main/java/ru/otus/basicarchitecture/ui/fragments/Fragment1.kt
index 6766ff0..fadd85a 100644
--- a/app/src/main/java/ru/otus/basicarchitecture/ui/fragments/Fragment1.kt
+++ b/app/src/main/java/ru/otus/basicarchitecture/ui/fragments/Fragment1.kt
@@ -6,22 +6,52 @@ import androidx.fragment.app.Fragment
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.Button
+import android.widget.EditText
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
 import ru.otus.basicarchitecture.R
+import ru.otus.basicarchitecture.model.InputData
+import ru.otus.basicarchitecture.ui.MainActivity
+import ru.otus.basicarchitecture.viewmodels.Fragment1ViewModel
 import ru.otus.basicarchitecture.viewmodels.MainViewModel
+import ru.otus.basicarchitecture.viewmodels.ViewState
 
 class Fragment1 : Fragment() {
 
-    private val viewModel: MainViewModel by viewModels()
+    private val _state = MutableLiveData<ViewState>()
+    val viewState: LiveData<ViewState> = _state
+
+    private val viewModel: Fragment1ViewModel by viewModels()
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-
     }
 
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View {
-        return inflater.inflate(R.layout.fragment_fragment1, container, false)
+
+        val view = inflater.inflate(R.layout.fragment_fragment1, container, false)
+
+        val editText = view.findViewById<EditText>(R.id.nameEditText)
+        val button = view.findViewById<Button>(R.id.fragment1Btn)
+
+        button.setOnClickListener {
+            val inputData = InputData(editText.text.toString())
+            viewModel.setInputData(inputData)
+
+            // Переход ко второму фрагменту
+            parentFragmentManager.beginTransaction()
+                .replace(R.id.fragment_container, SecondFragment())
+                .addToBackStack(null)
+                .commit()
+        }
+        return view
+    }
+
+    fun onNextButtonClicked() {
+
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/ru/otus/basicarchitecture/viewmodels/Fragment1ViewModel.kt b/app/src/main/java/ru/otus/basicarchitecture/viewmodels/Fragment1ViewModel.kt
new file mode 100644
index 0000000..44291a1
--- /dev/null
+++ b/app/src/main/java/ru/otus/basicarchitecture/viewmodels/Fragment1ViewModel.kt
@@ -0,0 +1,14 @@
+package ru.otus.basicarchitecture.viewmodels
+
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.ViewModel
+import ru.otus.basicarchitecture.model.Tag
+import ru.otus.basicarchitecture.repository.TagRepository
+
+class Fragment1ViewModel : ViewModel() {
+    private fun onNextButtonClicked() {
+
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/ru/otus/basicarchitecture/viewmodels/MainViewModel.kt b/app/src/main/java/ru/otus/basicarchitecture/viewmodels/MainViewModel.kt
index 67ca044..45babd5 100644
--- a/app/src/main/java/ru/otus/basicarchitecture/viewmodels/MainViewModel.kt
+++ b/app/src/main/java/ru/otus/basicarchitecture/viewmodels/MainViewModel.kt
@@ -3,9 +3,14 @@ package ru.otus.basicarchitecture.viewmodels
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
+import ru.otus.basicarchitecture.model.InputData
+import javax.inject.Inject
 
-class MainViewModel : ViewModel() {
-    private val _state = MutableLiveData<MainViewState>()
-    val viewState: LiveData<MainViewState> = _state
+class MainViewModel @Inject constructor() : ViewModel() {
+    private val _inputData = MutableLiveData<InputData>()
+    val inputData: LiveData<InputData> get() = _inputData
 
+    fun setInputData(data: InputData) {
+        _inputData.value = data
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/ru/otus/basicarchitecture/viewmodels/MainViewState.kt b/app/src/main/java/ru/otus/basicarchitecture/viewmodels/ViewState.kt
similarity index 81%
rename from app/src/main/java/ru/otus/basicarchitecture/viewmodels/MainViewState.kt
rename to app/src/main/java/ru/otus/basicarchitecture/viewmodels/ViewState.kt
index 0b9c642..50b30a9 100644
--- a/app/src/main/java/ru/otus/basicarchitecture/viewmodels/MainViewState.kt
+++ b/app/src/main/java/ru/otus/basicarchitecture/viewmodels/ViewState.kt
@@ -1,5 +1,5 @@
 package ru.otus.basicarchitecture.viewmodels
-data class MainViewState(
+data class ViewState(
     val isProgress: Boolean = false,
     val currentWater: String = ""
 )
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index c84cccf..ca152b9 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,6 +1,9 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
+
 plugins {
     id 'com.android.application' version '8.0.0' apply false
     id 'com.android.library' version '8.0.0' apply false
     id 'org.jetbrains.kotlin.android' version '1.8.0' apply false
-}
\ No newline at end of file
+    id 'com.google.dagger.hilt.android' version '2.52' apply false
+}
+

From c5c8a89389d583360121f581bf57b46c1ee28c97 Mon Sep 17 00:00:00 2001
From: nikolay <nazarov.nikolay15@wb.ru>
Date: Sun, 11 Aug 2024 23:17:34 +0300
Subject: [PATCH 08/36] =?UTF-8?q?=D0=9F=D0=BE=D1=87=D0=B8=D0=BD=D0=B8?=
 =?UTF-8?q?=D0=BB=20Hilt,=20=D1=81=D0=B4=D0=B5=D0=BB=D0=B0=D0=BB=20=D0=BF?=
 =?UTF-8?q?=D0=B5=D1=80=D0=B5=D1=85=D0=BE=D0=B4=20=D0=BD=D0=B0=20=D0=B2?=
 =?UTF-8?q?=D1=82=D0=BE=D1=80=D0=BE=D0=B9=20=D1=84=D1=80=D0=B0=D0=B3=D0=BC?=
 =?UTF-8?q?=D0=B5=D0=BD=D1=82=20=D0=B8=20=D0=B4=D0=B0=D0=B6=D0=B5=20=D1=81?=
 =?UTF-8?q?=D0=BE=D0=B7=D1=80=D0=B0=D0=BD=D1=8F=D1=8E=20=D0=B2=D0=B2=D0=B5?=
 =?UTF-8?q?=D0=B4=D0=B5=D0=BD=D0=BD=D1=8B=D0=B5=20=D0=B4=D0=B0=D0=BD=D0=BD?=
 =?UTF-8?q?=D1=8B=D0=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle                                           | 6 +++---
 .../ru/otus/basicarchitecture/ui/fragments/Fragment1.kt    | 7 ++++---
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index f71616d..9242091 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -26,11 +26,11 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
     kotlinOptions {
-        jvmTarget = '1.8'
+        jvmTarget = '17'
     }
 }
 
diff --git a/app/src/main/java/ru/otus/basicarchitecture/ui/fragments/Fragment1.kt b/app/src/main/java/ru/otus/basicarchitecture/ui/fragments/Fragment1.kt
index fadd85a..944cc61 100644
--- a/app/src/main/java/ru/otus/basicarchitecture/ui/fragments/Fragment1.kt
+++ b/app/src/main/java/ru/otus/basicarchitecture/ui/fragments/Fragment1.kt
@@ -10,6 +10,7 @@ import android.widget.Button
 import android.widget.EditText
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
+import com.google.android.material.textfield.TextInputEditText
 import ru.otus.basicarchitecture.R
 import ru.otus.basicarchitecture.model.InputData
 import ru.otus.basicarchitecture.ui.MainActivity
@@ -22,7 +23,7 @@ class Fragment1 : Fragment() {
     private val _state = MutableLiveData<ViewState>()
     val viewState: LiveData<ViewState> = _state
 
-    private val viewModel: Fragment1ViewModel by viewModels()
+    private val viewModel: MainViewModel by viewModels()
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -35,7 +36,7 @@ class Fragment1 : Fragment() {
 
         val view = inflater.inflate(R.layout.fragment_fragment1, container, false)
 
-        val editText = view.findViewById<EditText>(R.id.nameEditText)
+        val editText = view.findViewById<TextInputEditText>(R.id.name)
         val button = view.findViewById<Button>(R.id.fragment1Btn)
 
         button.setOnClickListener {
@@ -44,7 +45,7 @@ class Fragment1 : Fragment() {
 
             // Переход ко второму фрагменту
             parentFragmentManager.beginTransaction()
-                .replace(R.id.fragment_container, SecondFragment())
+                .replace(R.id.fragment_container, Fragment2())
                 .addToBackStack(null)
                 .commit()
         }

From 4f84405039545ed09700bb39322faa0a85115962 Mon Sep 17 00:00:00 2001
From: nikolay <nazarov.nikolay15@wb.ru>
Date: Wed, 14 Aug 2024 21:49:45 +0300
Subject: [PATCH 09/36] =?UTF-8?q?=D0=A1=D0=BE=D0=B7=D0=B4=D0=B0=D0=BB=20Wi?=
 =?UTF-8?q?zardCache?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../otus/basicarchitecture/di/MyApplication.kt   | 16 ++++++++++++++++
 .../basicarchitecture/repository/WizardCache.kt  | 13 +++++++++++++
 .../viewmodels/Fragment1ViewModel.kt             |  7 +++----
 3 files changed, 32 insertions(+), 4 deletions(-)
 create mode 100644 app/src/main/java/ru/otus/basicarchitecture/repository/WizardCache.kt

diff --git a/app/src/main/java/ru/otus/basicarchitecture/di/MyApplication.kt b/app/src/main/java/ru/otus/basicarchitecture/di/MyApplication.kt
index 9ce7446..9bba04d 100644
--- a/app/src/main/java/ru/otus/basicarchitecture/di/MyApplication.kt
+++ b/app/src/main/java/ru/otus/basicarchitecture/di/MyApplication.kt
@@ -1,8 +1,24 @@
 package ru.otus.basicarchitecture.di
 
 import android.app.Application
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
 import dagger.hilt.android.HiltAndroidApp
+import dagger.hilt.components.SingletonComponent
+import ru.otus.basicarchitecture.repository.WizardCache
+import javax.inject.Singleton
 
 @HiltAndroidApp
 class MyApplication : Application() {
+}
+
+@InstallIn(SingletonComponent::class)
+@Module
+object CacheModule {
+    @Provides
+    @Singleton
+    fun provideWizardCache(): WizardCache {
+        return WizardCache()
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/ru/otus/basicarchitecture/repository/WizardCache.kt b/app/src/main/java/ru/otus/basicarchitecture/repository/WizardCache.kt
new file mode 100644
index 0000000..2b999c4
--- /dev/null
+++ b/app/src/main/java/ru/otus/basicarchitecture/repository/WizardCache.kt
@@ -0,0 +1,13 @@
+package ru.otus.basicarchitecture.repository
+
+import javax.inject.Inject
+
+class WizardCache @Inject constructor() {
+    var firstName: String? = null
+    var lastName: String? = null
+    var birthDate: String? = null // Лучше использовать Date или LocalDate
+    var country: String? = null
+    var city: String? = null
+    var address: String? = null
+    var interests: List<String> = emptyList()
+}
\ No newline at end of file
diff --git a/app/src/main/java/ru/otus/basicarchitecture/viewmodels/Fragment1ViewModel.kt b/app/src/main/java/ru/otus/basicarchitecture/viewmodels/Fragment1ViewModel.kt
index 44291a1..2874a71 100644
--- a/app/src/main/java/ru/otus/basicarchitecture/viewmodels/Fragment1ViewModel.kt
+++ b/app/src/main/java/ru/otus/basicarchitecture/viewmodels/Fragment1ViewModel.kt
@@ -5,10 +5,9 @@ import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import ru.otus.basicarchitecture.model.Tag
 import ru.otus.basicarchitecture.repository.TagRepository
+import ru.otus.basicarchitecture.repository.WizardCache
+import javax.inject.Inject
 
-class Fragment1ViewModel : ViewModel() {
-    private fun onNextButtonClicked() {
+class Fragment1ViewModel @Inject constructor(private val wizardCache: WizardCache) : ViewModel() {
 
-
-    }
 }
\ No newline at end of file

From f95b268f41ab83bc3b604809dbf81322d44c1d73 Mon Sep 17 00:00:00 2001
From: nikolay <nazarov.nikolay15@wb.ru>
Date: Wed, 14 Aug 2024 21:49:56 +0300
Subject: [PATCH 10/36] =?UTF-8?q?=D0=A1=D0=BE=D0=B7=D0=B4=D0=B0=D0=BB=20Wi?=
 =?UTF-8?q?zardCache?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/ru/otus/basicarchitecture/repository/WizardCache.kt     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/java/ru/otus/basicarchitecture/repository/WizardCache.kt b/app/src/main/java/ru/otus/basicarchitecture/repository/WizardCache.kt
index 2b999c4..a10093e 100644
--- a/app/src/main/java/ru/otus/basicarchitecture/repository/WizardCache.kt
+++ b/app/src/main/java/ru/otus/basicarchitecture/repository/WizardCache.kt
@@ -10,4 +10,5 @@ class WizardCache @Inject constructor() {
     var city: String? = null
     var address: String? = null
     var interests: List<String> = emptyList()
+
 }
\ No newline at end of file

From c15cc5dd4b5d17211d247a0b677398a971c337df Mon Sep 17 00:00:00 2001
From: nikolay <nazarov.nikolay15@wb.ru>
Date: Wed, 14 Aug 2024 22:16:16 +0300
Subject: [PATCH 11/36] =?UTF-8?q?=D0=A1=D0=B4=D0=B5=D0=BB=D0=B0=D0=BB=20?=
 =?UTF-8?q?=D1=81=D0=BE=D1=85=D1=80=D0=B0=D0=BD=D0=B5=D0=BD=D0=B8=D0=B5=20?=
 =?UTF-8?q?=D0=B8=20=D0=B2=D0=B0=D0=BB=D0=B8=D0=B4=D0=B0=D1=86=D0=B8=D1=8E?=
 =?UTF-8?q?=20=D0=B4=D0=B0=D0=BD=D0=BD=D1=8B=D1=85=20=D0=BD=D0=BE=20=D1=8D?=
 =?UTF-8?q?=D1=82=D0=BE=20=D0=BD=D0=B5=20=D1=80=D0=B0=D0=B1=D0=BE=D1=82?=
 =?UTF-8?q?=D0=B0=D0=B5=D1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/AndroidManifest.xml              |  1 +
 .../otus/basicarchitecture/ui/MainActivity.kt |  3 +-
 .../ui/fragments/Fragment1.kt                 | 58 +++++++++++++------
 .../viewmodels/Fragment1ViewModel.kt          | 23 +++++++-
 4 files changed, 65 insertions(+), 20 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index aaa3bbe..23b8553 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -3,6 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools">
 
     <application
+        android:name=".di.MyApplication"
         android:allowBackup="true"
         android:dataExtractionRules="@xml/data_extraction_rules"
         android:fullBackupContent="@xml/backup_rules"
diff --git a/app/src/main/java/ru/otus/basicarchitecture/ui/MainActivity.kt b/app/src/main/java/ru/otus/basicarchitecture/ui/MainActivity.kt
index f33a223..69ea9ac 100644
--- a/app/src/main/java/ru/otus/basicarchitecture/ui/MainActivity.kt
+++ b/app/src/main/java/ru/otus/basicarchitecture/ui/MainActivity.kt
@@ -4,10 +4,11 @@ import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
 import androidx.activity.viewModels
 import androidx.fragment.app.Fragment
+import dagger.hilt.android.AndroidEntryPoint
 import ru.otus.basicarchitecture.ui.fragments.Fragment1
 import ru.otus.basicarchitecture.R
 import ru.otus.basicarchitecture.viewmodels.MainViewModel
-
+@AndroidEntryPoint
 class MainActivity : AppCompatActivity() {
 
     private val viewModel: MainViewModel by viewModels()
diff --git a/app/src/main/java/ru/otus/basicarchitecture/ui/fragments/Fragment1.kt b/app/src/main/java/ru/otus/basicarchitecture/ui/fragments/Fragment1.kt
index 944cc61..7f91570 100644
--- a/app/src/main/java/ru/otus/basicarchitecture/ui/fragments/Fragment1.kt
+++ b/app/src/main/java/ru/otus/basicarchitecture/ui/fragments/Fragment1.kt
@@ -11,6 +11,7 @@ import android.widget.EditText
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import com.google.android.material.textfield.TextInputEditText
+import dagger.hilt.android.AndroidEntryPoint
 import ru.otus.basicarchitecture.R
 import ru.otus.basicarchitecture.model.InputData
 import ru.otus.basicarchitecture.ui.MainActivity
@@ -18,41 +19,62 @@ import ru.otus.basicarchitecture.viewmodels.Fragment1ViewModel
 import ru.otus.basicarchitecture.viewmodels.MainViewModel
 import ru.otus.basicarchitecture.viewmodels.ViewState
 
+@AndroidEntryPoint
 class Fragment1 : Fragment() {
 
     private val _state = MutableLiveData<ViewState>()
     val viewState: LiveData<ViewState> = _state
 
-    private val viewModel: MainViewModel by viewModels()
+    private val viewModel: Fragment1ViewModel by viewModels()
 
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-    }
+    private lateinit var firstNameEditText: EditText
+    private lateinit var lastNameEditText: EditText
+    private lateinit var birthDateEditText: EditText
+    private lateinit var nextBtn: Button
 
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View {
-
         val view = inflater.inflate(R.layout.fragment_fragment1, container, false)
+        return view
+    }
 
-        val editText = view.findViewById<TextInputEditText>(R.id.name)
-        val button = view.findViewById<Button>(R.id.fragment1Btn)
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
 
-        button.setOnClickListener {
-            val inputData = InputData(editText.text.toString())
-            viewModel.setInputData(inputData)
+        firstNameEditText = view.findViewById(R.id.name)
+        lastNameEditText = view.findViewById(R.id.surname)
+        birthDateEditText = view.findViewById(R.id.birthdate)
+        nextBtn = view.findViewById(R.id.fragment1Btn)
 
-            // Переход ко второму фрагменту
-            parentFragmentManager.beginTransaction()
-                .replace(R.id.fragment_container, Fragment2())
-                .addToBackStack(null)
-                .commit()
+        // Устанавливаем наблюдателей для LiveData
+        viewModel.firstName.observe(viewLifecycleOwner) {
+            firstNameEditText.setText(it)
         }
-        return view
-    }
 
-    fun onNextButtonClicked() {
+        viewModel.lastName.observe(viewLifecycleOwner) {
+            lastNameEditText.setText(it)
+        }
+
+        viewModel.birthDate.observe(viewLifecycleOwner) {
+            birthDateEditText.setText(it)
+        }
 
+        nextBtn.setOnClickListener {
+            // Сохраняем данные из EditText в LiveData
+            viewModel.firstName.value = firstNameEditText.text.toString()
+            viewModel.lastName.value = lastNameEditText.text.toString()
+            viewModel.birthDate.value = birthDateEditText.text.toString()
+
+            // Выполняем валидацию и сохраняем данные в кэш
+            if (viewModel.validateInput()) {
+                viewModel.saveData()
+                // Можно добавить уведомление об успешном сохранении
+            } else {
+                // Обработка ошибки валидации (например, показать сообщение пользователю)
+            }
+        }
     }
+
 }
\ No newline at end of file
diff --git a/app/src/main/java/ru/otus/basicarchitecture/viewmodels/Fragment1ViewModel.kt b/app/src/main/java/ru/otus/basicarchitecture/viewmodels/Fragment1ViewModel.kt
index 2874a71..d7c386d 100644
--- a/app/src/main/java/ru/otus/basicarchitecture/viewmodels/Fragment1ViewModel.kt
+++ b/app/src/main/java/ru/otus/basicarchitecture/viewmodels/Fragment1ViewModel.kt
@@ -3,11 +3,32 @@ package ru.otus.basicarchitecture.viewmodels
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
+import dagger.hilt.android.AndroidEntryPoint
+import dagger.hilt.android.lifecycle.HiltViewModel
 import ru.otus.basicarchitecture.model.Tag
 import ru.otus.basicarchitecture.repository.TagRepository
 import ru.otus.basicarchitecture.repository.WizardCache
 import javax.inject.Inject
-
+@HiltViewModel
 class Fragment1ViewModel @Inject constructor(private val wizardCache: WizardCache) : ViewModel() {
 
+    val firstName = MutableLiveData<String>()
+    val lastName = MutableLiveData<String>()
+    val birthDate = MutableLiveData<String>()
+
+    fun saveData() {
+        wizardCache.firstName = firstName.value
+        wizardCache.lastName = lastName.value
+        wizardCache.birthDate = birthDate.value
+    }
+
+    fun validateInput(): Boolean {
+        // Валидация имени, фамилии и возраста
+        return !firstName.value.isNullOrEmpty() && !lastName.value.isNullOrEmpty() && isAgeValid(birthDate.value)
+    }
+
+    private fun isAgeValid(birthDate: String?): Boolean {
+        // Логика проверки возраста (например, 18+)
+        return true // Замените на реальную логику
+    }
 }
\ No newline at end of file

From ef9dd02b775783ddeb2ad8e72711e46902a14af0 Mon Sep 17 00:00:00 2001
From: nikolay <nazarov.nikolay15@wb.ru>
Date: Wed, 14 Aug 2024 22:33:28 +0300
Subject: [PATCH 12/36] =?UTF-8?q?=D0=A1=D0=B4=D0=B5=D0=BB=D0=B0=D0=BB=20?=
 =?UTF-8?q?=D1=81=D0=BE=D1=85=D1=80=D0=B0=D0=BD=D0=B5=D0=BD=D0=B8=D0=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ui/fragments/Fragment1.kt                 | 26 +++++++++++--------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/app/src/main/java/ru/otus/basicarchitecture/ui/fragments/Fragment1.kt b/app/src/main/java/ru/otus/basicarchitecture/ui/fragments/Fragment1.kt
index 7f91570..9be363b 100644
--- a/app/src/main/java/ru/otus/basicarchitecture/ui/fragments/Fragment1.kt
+++ b/app/src/main/java/ru/otus/basicarchitecture/ui/fragments/Fragment1.kt
@@ -8,6 +8,7 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.Button
 import android.widget.EditText
+import android.widget.Toast
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import com.google.android.material.textfield.TextInputEditText
@@ -49,17 +50,17 @@ class Fragment1 : Fragment() {
         nextBtn = view.findViewById(R.id.fragment1Btn)
 
         // Устанавливаем наблюдателей для LiveData
-        viewModel.firstName.observe(viewLifecycleOwner) {
-            firstNameEditText.setText(it)
-        }
-
-        viewModel.lastName.observe(viewLifecycleOwner) {
-            lastNameEditText.setText(it)
-        }
-
-        viewModel.birthDate.observe(viewLifecycleOwner) {
-            birthDateEditText.setText(it)
-        }
+//        viewModel.firstName.observe(viewLifecycleOwner) {
+//            firstNameEditText.setText(it)
+//        }
+//
+//        viewModel.lastName.observe(viewLifecycleOwner) {
+//            lastNameEditText.setText(it)
+//        }
+//
+//        viewModel.birthDate.observe(viewLifecycleOwner) {
+//            birthDateEditText.setText(it)
+//        }
 
         nextBtn.setOnClickListener {
             // Сохраняем данные из EditText в LiveData
@@ -70,6 +71,9 @@ class Fragment1 : Fragment() {
             // Выполняем валидацию и сохраняем данные в кэш
             if (viewModel.validateInput()) {
                 viewModel.saveData()
+                Toast.makeText(context, viewModel.firstName.value +
+                        viewModel.lastName.value + viewModel.birthDate.value, Toast.LENGTH_SHORT).show()
+
                 // Можно добавить уведомление об успешном сохранении
             } else {
                 // Обработка ошибки валидации (например, показать сообщение пользователю)

From e8c0b3d3362faf4d6e97987401d0d4b081c0dd73 Mon Sep 17 00:00:00 2001
From: nikolay <nazarov.nikolay15@wb.ru>
Date: Wed, 14 Aug 2024 22:35:36 +0300
Subject: [PATCH 13/36] =?UTF-8?q?=D0=A1=D0=B4=D0=B5=D0=BB=D0=B0=D0=BB=20?=
 =?UTF-8?q?=D0=BF=D0=B5=D1=80=D0=B5=D1=85=D0=BE=D0=B4=20=D0=BD=D0=B0=20?=
 =?UTF-8?q?=D0=B2=D1=82=D0=BE=D1=80=D0=BE=D0=B9=20=D1=84=D1=80=D0=B0=D0=B3?=
 =?UTF-8?q?=D0=BC=D0=B5=D0=BD=D1=82,=20=D0=B4=D0=B5=D0=BB=D0=B0=D1=8E=20?=
 =?UTF-8?q?=D0=B2=D0=B0=D0=BB=D0=B8=D0=B4=D0=B0=D1=86=D0=B8=D1=8E=20=D0=B4?=
 =?UTF-8?q?=D0=B0=D1=82=D1=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ru/otus/basicarchitecture/ui/fragments/Fragment1.kt  | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/ru/otus/basicarchitecture/ui/fragments/Fragment1.kt b/app/src/main/java/ru/otus/basicarchitecture/ui/fragments/Fragment1.kt
index 9be363b..0cefaed 100644
--- a/app/src/main/java/ru/otus/basicarchitecture/ui/fragments/Fragment1.kt
+++ b/app/src/main/java/ru/otus/basicarchitecture/ui/fragments/Fragment1.kt
@@ -71,8 +71,13 @@ class Fragment1 : Fragment() {
             // Выполняем валидацию и сохраняем данные в кэш
             if (viewModel.validateInput()) {
                 viewModel.saveData()
-                Toast.makeText(context, viewModel.firstName.value +
-                        viewModel.lastName.value + viewModel.birthDate.value, Toast.LENGTH_SHORT).show()
+                parentFragmentManager.beginTransaction()
+                    .replace(R.id.fragment_container, Fragment2())
+                    .addToBackStack(null)
+                    .commit()
+                
+//                Toast.makeText(context, viewModel.firstName.value +
+//                        viewModel.lastName.value + viewModel.birthDate.value, Toast.LENGTH_SHORT).show()
 
                 // Можно добавить уведомление об успешном сохранении
             } else {

From 4ee48f3f2bd859178860f90aac08743fccc93069 Mon Sep 17 00:00:00 2001
From: nikolay <nazarov.nikolay15@wb.ru>
Date: Wed, 14 Aug 2024 22:36:42 +0300
Subject: [PATCH 14/36] =?UTF-8?q?=D0=A1=D0=B4=D0=B5=D0=BB=D0=B0=D0=BB=20?=
 =?UTF-8?q?=D0=BF=D0=B5=D1=80=D0=B5=D1=85=D0=BE=D0=B4=20=D0=BD=D0=B0=20?=
 =?UTF-8?q?=D0=B2=D1=82=D0=BE=D1=80=D0=BE=D0=B9=20=D1=84=D1=80=D0=B0=D0=B3?=
 =?UTF-8?q?=D0=BC=D0=B5=D0=BD=D1=82,=20=D0=B4=D0=B5=D0=BB=D0=B0=D1=8E=20?=
 =?UTF-8?q?=D0=B2=D0=B0=D0=BB=D0=B8=D0=B4=D0=B0=D1=86=D0=B8=D1=8E=20=D0=B4?=
 =?UTF-8?q?=D0=B0=D1=82=D1=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ui/fragments/Fragment1.kt                  | 18 ++----------------
 1 file changed, 2 insertions(+), 16 deletions(-)

diff --git a/app/src/main/java/ru/otus/basicarchitecture/ui/fragments/Fragment1.kt b/app/src/main/java/ru/otus/basicarchitecture/ui/fragments/Fragment1.kt
index 0cefaed..2a07118 100644
--- a/app/src/main/java/ru/otus/basicarchitecture/ui/fragments/Fragment1.kt
+++ b/app/src/main/java/ru/otus/basicarchitecture/ui/fragments/Fragment1.kt
@@ -37,8 +37,7 @@ class Fragment1 : Fragment() {
         inflater: LayoutInflater, container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View {
-        val view = inflater.inflate(R.layout.fragment_fragment1, container, false)
-        return view
+        return inflater.inflate(R.layout.fragment_fragment1, container, false)
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
@@ -49,19 +48,6 @@ class Fragment1 : Fragment() {
         birthDateEditText = view.findViewById(R.id.birthdate)
         nextBtn = view.findViewById(R.id.fragment1Btn)
 
-        // Устанавливаем наблюдателей для LiveData
-//        viewModel.firstName.observe(viewLifecycleOwner) {
-//            firstNameEditText.setText(it)
-//        }
-//
-//        viewModel.lastName.observe(viewLifecycleOwner) {
-//            lastNameEditText.setText(it)
-//        }
-//
-//        viewModel.birthDate.observe(viewLifecycleOwner) {
-//            birthDateEditText.setText(it)
-//        }
-
         nextBtn.setOnClickListener {
             // Сохраняем данные из EditText в LiveData
             viewModel.firstName.value = firstNameEditText.text.toString()
@@ -75,7 +61,7 @@ class Fragment1 : Fragment() {
                     .replace(R.id.fragment_container, Fragment2())
                     .addToBackStack(null)
                     .commit()
-                
+
 //                Toast.makeText(context, viewModel.firstName.value +
 //                        viewModel.lastName.value + viewModel.birthDate.value, Toast.LENGTH_SHORT).show()
 

From a7f81d0c0d9c128d2f627f912af883042fea6925 Mon Sep 17 00:00:00 2001
From: nikolay <nazarov.nikolay15@wb.ru>
Date: Wed, 14 Aug 2024 22:47:59 +0300
Subject: [PATCH 15/36] =?UTF-8?q?=D0=A1=D0=B4=D0=B5=D0=BB=D0=B0=D0=BB=20?=
 =?UTF-8?q?=D1=82=D0=BE=D1=81=D1=82=20=D0=BD=D0=B5=D0=B2=D0=B5=D1=80=D0=BD?=
 =?UTF-8?q?=D0=BE=D0=B9=20=D0=B2=D0=B0=D0=BB=D0=B8=D0=B4=D0=B0=D1=86=D0=B8?=
 =?UTF-8?q?=D0=B8=20=D0=BF=D0=BE=D0=BB=D0=B5=D0=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../basicarchitecture/ui/fragments/Fragment1.kt     |  9 ++++++++-
 app/src/main/res/layout/fragment_fragment1.xml      | 13 +++++++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/ru/otus/basicarchitecture/ui/fragments/Fragment1.kt b/app/src/main/java/ru/otus/basicarchitecture/ui/fragments/Fragment1.kt
index 2a07118..f6f559c 100644
--- a/app/src/main/java/ru/otus/basicarchitecture/ui/fragments/Fragment1.kt
+++ b/app/src/main/java/ru/otus/basicarchitecture/ui/fragments/Fragment1.kt
@@ -2,6 +2,7 @@ package ru.otus.basicarchitecture.ui.fragments
 
 import androidx.fragment.app.viewModels
 import android.os.Bundle
+import android.view.Gravity
 import androidx.fragment.app.Fragment
 import android.view.LayoutInflater
 import android.view.View
@@ -11,6 +12,7 @@ import android.widget.EditText
 import android.widget.Toast
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
+import com.google.android.material.snackbar.Snackbar
 import com.google.android.material.textfield.TextInputEditText
 import dagger.hilt.android.AndroidEntryPoint
 import ru.otus.basicarchitecture.R
@@ -33,6 +35,8 @@ class Fragment1 : Fragment() {
     private lateinit var birthDateEditText: EditText
     private lateinit var nextBtn: Button
 
+    private lateinit var toast: View
+
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?,
         savedInstanceState: Bundle?
@@ -47,6 +51,9 @@ class Fragment1 : Fragment() {
         lastNameEditText = view.findViewById(R.id.surname)
         birthDateEditText = view.findViewById(R.id.birthdate)
         nextBtn = view.findViewById(R.id.fragment1Btn)
+        toast = view.findViewById(R.id.toast)
+
+
 
         nextBtn.setOnClickListener {
             // Сохраняем данные из EditText в LiveData
@@ -67,7 +74,7 @@ class Fragment1 : Fragment() {
 
                 // Можно добавить уведомление об успешном сохранении
             } else {
-                // Обработка ошибки валидации (например, показать сообщение пользователю)
+                Snackbar.make(toast, "Валидация не пройдена", Snackbar.LENGTH_SHORT).show()
             }
         }
     }
diff --git a/app/src/main/res/layout/fragment_fragment1.xml b/app/src/main/res/layout/fragment_fragment1.xml
index 38ad8f8..5865068 100644
--- a/app/src/main/res/layout/fragment_fragment1.xml
+++ b/app/src/main/res/layout/fragment_fragment1.xml
@@ -86,4 +86,17 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent" />
 
+    <androidx.coordinatorlayout.widget.CoordinatorLayout
+        android:id="@+id/toast"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <!-- Другие элементы интерфейса -->
+
+    </androidx.coordinatorlayout.widget.CoordinatorLayout>
+
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

From 7d8362489d1873f3ad3c1d3942d757914742f3ac Mon Sep 17 00:00:00 2001
From: nikolay <nazarov.nikolay15@wb.ru>
Date: Wed, 14 Aug 2024 23:04:40 +0300
Subject: [PATCH 16/36] =?UTF-8?q?=D0=9C=D0=B5=D0=BD=D1=8F=D1=8E=20=D0=BC?=
 =?UTF-8?q?=D0=B0=D0=BA=D0=B5=D1=82=20=D0=B4=D0=BB=D1=8F=20=D0=B4=D0=B0?=
 =?UTF-8?q?=D1=82=D1=8B=20=D1=80=D0=BE=D0=B6=D0=B4=D0=B5=D0=BD=D0=B8=D1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle                                 |  2 ++
 .../basicarchitecture/ui/fragments/Fragment1.kt  |  2 ++
 .../viewmodels/Fragment1ViewModel.kt             | 16 ++++++++++++++--
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 9242091..a32306e 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -57,6 +57,8 @@ dependencies {
     implementation "androidx.lifecycle:lifecycle-runtime-ktx:$lifecycle_version"
     implementation "androidx.lifecycle:lifecycle-viewmodel-savedstate:$lifecycle_version"
     implementation 'androidx.activity:activity-ktx:1.7.2'
+
+    implementation 'com.github.redmadrobot:inputmask:6.0.0'
 }
 
 kapt {
diff --git a/app/src/main/java/ru/otus/basicarchitecture/ui/fragments/Fragment1.kt b/app/src/main/java/ru/otus/basicarchitecture/ui/fragments/Fragment1.kt
index f6f559c..f0d97d4 100644
--- a/app/src/main/java/ru/otus/basicarchitecture/ui/fragments/Fragment1.kt
+++ b/app/src/main/java/ru/otus/basicarchitecture/ui/fragments/Fragment1.kt
@@ -53,6 +53,8 @@ class Fragment1 : Fragment() {
         nextBtn = view.findViewById(R.id.fragment1Btn)
         toast = view.findViewById(R.id.toast)
 
+        birthDateEditText.setMask("99.99.9999")
+
 
 
         nextBtn.setOnClickListener {
diff --git a/app/src/main/java/ru/otus/basicarchitecture/viewmodels/Fragment1ViewModel.kt b/app/src/main/java/ru/otus/basicarchitecture/viewmodels/Fragment1ViewModel.kt
index d7c386d..1f232c0 100644
--- a/app/src/main/java/ru/otus/basicarchitecture/viewmodels/Fragment1ViewModel.kt
+++ b/app/src/main/java/ru/otus/basicarchitecture/viewmodels/Fragment1ViewModel.kt
@@ -8,6 +8,9 @@ import dagger.hilt.android.lifecycle.HiltViewModel
 import ru.otus.basicarchitecture.model.Tag
 import ru.otus.basicarchitecture.repository.TagRepository
 import ru.otus.basicarchitecture.repository.WizardCache
+import java.text.SimpleDateFormat
+import java.util.Calendar
+import java.util.Locale
 import javax.inject.Inject
 @HiltViewModel
 class Fragment1ViewModel @Inject constructor(private val wizardCache: WizardCache) : ViewModel() {
@@ -28,7 +31,16 @@ class Fragment1ViewModel @Inject constructor(private val wizardCache: WizardCach
     }
 
     private fun isAgeValid(birthDate: String?): Boolean {
-        // Логика проверки возраста (например, 18+)
-        return true // Замените на реальную логику
+        if (birthDate.isNullOrEmpty()) return false
+
+        val sdf = SimpleDateFormat("dd.MM.yyyy", Locale.getDefault())
+        return try {
+            val date = sdf.parse(birthDate)
+            val calendar = Calendar.getInstance()
+            calendar.add(Calendar.YEAR, -18)
+            date <= calendar.time
+        } catch (e: Exception) {
+            false
+        }
     }
 }
\ No newline at end of file

From 2cd8ebc656c182380c7f01901e46a7d2cf75bd2f Mon Sep 17 00:00:00 2001
From: nikolay <nazarov.nikolay15@wb.ru>
Date: Wed, 14 Aug 2024 23:29:21 +0300
Subject: [PATCH 17/36] =?UTF-8?q?=D0=A1=D0=94=D0=B5=D0=BB=D0=B0=D0=BB=20?=
 =?UTF-8?q?=D0=B2=D0=B0=D0=BB=D0=B8=D0=B4=D0=B0=D1=86=D0=B8=D1=8E=20=D0=B4?=
 =?UTF-8?q?=D0=B0=D1=82=D1=8B=20=D1=80=D0=BE=D0=B6=D0=B4=D0=B5=D0=BD=D0=B8?=
 =?UTF-8?q?=D1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle                              |  2 --
 .../ui/fragments/Fragment1.kt                 | 29 ++++++++++++++++++-
 .../viewmodels/Fragment1ViewModel.kt          | 16 ++++++----
 3 files changed, 38 insertions(+), 9 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index a32306e..9242091 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -57,8 +57,6 @@ dependencies {
     implementation "androidx.lifecycle:lifecycle-runtime-ktx:$lifecycle_version"
     implementation "androidx.lifecycle:lifecycle-viewmodel-savedstate:$lifecycle_version"
     implementation 'androidx.activity:activity-ktx:1.7.2'
-
-    implementation 'com.github.redmadrobot:inputmask:6.0.0'
 }
 
 kapt {
diff --git a/app/src/main/java/ru/otus/basicarchitecture/ui/fragments/Fragment1.kt b/app/src/main/java/ru/otus/basicarchitecture/ui/fragments/Fragment1.kt
index f0d97d4..a17a8ac 100644
--- a/app/src/main/java/ru/otus/basicarchitecture/ui/fragments/Fragment1.kt
+++ b/app/src/main/java/ru/otus/basicarchitecture/ui/fragments/Fragment1.kt
@@ -2,6 +2,8 @@ package ru.otus.basicarchitecture.ui.fragments
 
 import androidx.fragment.app.viewModels
 import android.os.Bundle
+import android.text.Editable
+import android.text.TextWatcher
 import android.view.Gravity
 import androidx.fragment.app.Fragment
 import android.view.LayoutInflater
@@ -53,7 +55,32 @@ class Fragment1 : Fragment() {
         nextBtn = view.findViewById(R.id.fragment1Btn)
         toast = view.findViewById(R.id.toast)
 
-        birthDateEditText.setMask("99.99.9999")
+        birthDateEditText.addTextChangedListener(object : TextWatcher {
+            private var isEditing = false
+
+            override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {}
+
+            override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {}
+
+            override fun afterTextChanged(s: Editable?) {
+                if (isEditing) return
+
+                isEditing = true
+                val input = s.toString().replace("/", "")
+                val formatted = StringBuilder()
+
+                for (i in input.indices) {
+                    if (i == 2 || i == 4) {
+                        formatted.append("/")
+                    }
+                    formatted.append(input[i])
+                }
+
+                birthDateEditText.setText(formatted.toString())
+                birthDateEditText.setSelection(formatted.length)
+                isEditing = false
+            }
+        })
 
 
 
diff --git a/app/src/main/java/ru/otus/basicarchitecture/viewmodels/Fragment1ViewModel.kt b/app/src/main/java/ru/otus/basicarchitecture/viewmodels/Fragment1ViewModel.kt
index 1f232c0..59cdc6e 100644
--- a/app/src/main/java/ru/otus/basicarchitecture/viewmodels/Fragment1ViewModel.kt
+++ b/app/src/main/java/ru/otus/basicarchitecture/viewmodels/Fragment1ViewModel.kt
@@ -8,6 +8,7 @@ import dagger.hilt.android.lifecycle.HiltViewModel
 import ru.otus.basicarchitecture.model.Tag
 import ru.otus.basicarchitecture.repository.TagRepository
 import ru.otus.basicarchitecture.repository.WizardCache
+import java.text.ParseException
 import java.text.SimpleDateFormat
 import java.util.Calendar
 import java.util.Locale
@@ -33,14 +34,17 @@ class Fragment1ViewModel @Inject constructor(private val wizardCache: WizardCach
     private fun isAgeValid(birthDate: String?): Boolean {
         if (birthDate.isNullOrEmpty()) return false
 
-        val sdf = SimpleDateFormat("dd.MM.yyyy", Locale.getDefault())
+        val dateFormat = SimpleDateFormat("dd/MM/yyyy", Locale.getDefault())
         return try {
-            val date = sdf.parse(birthDate)
-            val calendar = Calendar.getInstance()
-            calendar.add(Calendar.YEAR, -18)
-            date <= calendar.time
-        } catch (e: Exception) {
+            val birthDateParsed = dateFormat.parse(birthDate)
+            val age = Calendar.getInstance().get(Calendar.YEAR) - Calendar.getInstance().apply {
+                time = birthDateParsed
+            }.get(Calendar.YEAR)
+
+            age >= 18
+        } catch (e: ParseException) {
             false
         }
     }
+
 }
\ No newline at end of file

From bf0e8d7e5fdb6c75682ba697cc9330b7915e1f35 Mon Sep 17 00:00:00 2001
From: nikolay <nazarov.nikolay15@wb.ru>
Date: Wed, 14 Aug 2024 23:57:48 +0300
Subject: [PATCH 18/36] =?UTF-8?q?=D0=A1=D0=94=D0=B5=D0=BB=D0=B0=D0=BB=20?=
 =?UTF-8?q?=D0=B2=D0=B0=D0=BB=D0=B8=D0=B4=D0=B0=D1=86=D0=B8=D1=8E=20=D0=B4?=
 =?UTF-8?q?=D0=B0=D1=82=D1=8B=20=D1=80=D0=BE=D0=B6=D0=B4=D0=B5=D0=BD=D0=B8?=
 =?UTF-8?q?=D1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/ru/otus/basicarchitecture/ui/fragments/Fragment1.kt    | 2 --
 1 file changed, 2 deletions(-)

diff --git a/app/src/main/java/ru/otus/basicarchitecture/ui/fragments/Fragment1.kt b/app/src/main/java/ru/otus/basicarchitecture/ui/fragments/Fragment1.kt
index a17a8ac..f3ae96d 100644
--- a/app/src/main/java/ru/otus/basicarchitecture/ui/fragments/Fragment1.kt
+++ b/app/src/main/java/ru/otus/basicarchitecture/ui/fragments/Fragment1.kt
@@ -82,8 +82,6 @@ class Fragment1 : Fragment() {
             }
         })
 
-
-
         nextBtn.setOnClickListener {
             // Сохраняем данные из EditText в LiveData
             viewModel.firstName.value = firstNameEditText.text.toString()

From b8d115a99661495d486a3113975906886d40891a Mon Sep 17 00:00:00 2001
From: nikolay <nazarov.nikolay15@wb.ru>
Date: Thu, 15 Aug 2024 00:18:27 +0300
Subject: [PATCH 19/36] =?UTF-8?q?=D0=A1=D0=94=D0=B5=D0=BB=D0=B0=D0=BB=20?=
 =?UTF-8?q?=D0=B2=D0=B0=D0=BB=D0=B8=D0=B4=D0=B0=D1=86=D0=B8=D1=8E=20=D0=B4?=
 =?UTF-8?q?=D0=B0=D1=82=D1=8B=20=D1=80=D0=BE=D0=B6=D0=B4=D0=B5=D0=BD=D0=B8?=
 =?UTF-8?q?=D1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ui/fragments/Fragment1.kt                 | 79 ++++++++++---------
 .../viewmodels/Fragment1ViewModel.kt          | 40 +++++++++-
 2 files changed, 81 insertions(+), 38 deletions(-)

diff --git a/app/src/main/java/ru/otus/basicarchitecture/ui/fragments/Fragment1.kt b/app/src/main/java/ru/otus/basicarchitecture/ui/fragments/Fragment1.kt
index f3ae96d..d9c8730 100644
--- a/app/src/main/java/ru/otus/basicarchitecture/ui/fragments/Fragment1.kt
+++ b/app/src/main/java/ru/otus/basicarchitecture/ui/fragments/Fragment1.kt
@@ -1,28 +1,26 @@
 package ru.otus.basicarchitecture.ui.fragments
 
+import android.os.Build
 import androidx.fragment.app.viewModels
 import android.os.Bundle
-import android.text.Editable
-import android.text.TextWatcher
-import android.view.Gravity
 import androidx.fragment.app.Fragment
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.Button
 import android.widget.EditText
-import android.widget.Toast
+import androidx.annotation.RequiresApi
+import androidx.core.widget.addTextChangedListener
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import com.google.android.material.snackbar.Snackbar
-import com.google.android.material.textfield.TextInputEditText
 import dagger.hilt.android.AndroidEntryPoint
 import ru.otus.basicarchitecture.R
-import ru.otus.basicarchitecture.model.InputData
-import ru.otus.basicarchitecture.ui.MainActivity
 import ru.otus.basicarchitecture.viewmodels.Fragment1ViewModel
-import ru.otus.basicarchitecture.viewmodels.MainViewModel
 import ru.otus.basicarchitecture.viewmodels.ViewState
+import java.time.LocalDate
+import java.time.format.DateTimeFormatter
+import java.time.temporal.ChronoUnit
 
 @AndroidEntryPoint
 class Fragment1 : Fragment() {
@@ -46,6 +44,8 @@ class Fragment1 : Fragment() {
         return inflater.inflate(R.layout.fragment_fragment1, container, false)
     }
 
+
+    @RequiresApi(Build.VERSION_CODES.O)
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
@@ -55,32 +55,44 @@ class Fragment1 : Fragment() {
         nextBtn = view.findViewById(R.id.fragment1Btn)
         toast = view.findViewById(R.id.toast)
 
-        birthDateEditText.addTextChangedListener(object : TextWatcher {
-            private var isEditing = false
-
-            override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {}
-
-            override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {}
-
-            override fun afterTextChanged(s: Editable?) {
-                if (isEditing) return
+        viewModel.firstName.observe(viewLifecycleOwner) {
+            if (it == null || it.isBlank()) {
+                firstNameEditText.error = "Поле не должно быть пустым"
+            } else {
+                firstNameEditText.error = null
+            }
+        }
 
-                isEditing = true
-                val input = s.toString().replace("/", "")
-                val formatted = StringBuilder()
+        viewModel.lastName.observe(viewLifecycleOwner) {
+            if (it == null || it.isBlank()) {
+                lastNameEditText.error = "Поле не должно быть пустым"
+            } else {
+                lastNameEditText.error = null
+            }
+        }
 
-                for (i in input.indices) {
-                    if (i == 2 || i == 4) {
-                        formatted.append("/")
-                    }
-                    formatted.append(input[i])
+        viewModel.birthDate.observe(viewLifecycleOwner) {
+            try {
+                val formatter = DateTimeFormatter.ofPattern("dd.MM.yyyy")
+                val dob = LocalDate.parse(it, formatter)
+                val years = ChronoUnit.YEARS.between(dob, LocalDate.now())
+                if (years < 18) {
+                    birthDateEditText.error = "Вам не исполнилось 18"
+                } else {
+                    birthDateEditText.error = null
                 }
-
-                birthDateEditText.setText(formatted.toString())
-                birthDateEditText.setSelection(formatted.length)
-                isEditing = false
+            } catch (e: Exception) {
+                birthDateEditText.error = "Неверный формат даты"
             }
-        })
+        }
+
+        viewModel.isFormValid.observe(viewLifecycleOwner) { isValid ->
+            nextBtn.isEnabled = isValid
+        }
+
+        firstNameEditText.addTextChangedListener { viewModel.firstName.value = it.toString() }
+        lastNameEditText.addTextChangedListener { viewModel.lastName.value = it.toString() }
+        birthDateEditText.addTextChangedListener { viewModel.birthDate.value = it.toString() }
 
         nextBtn.setOnClickListener {
             // Сохраняем данные из EditText в LiveData
@@ -89,17 +101,12 @@ class Fragment1 : Fragment() {
             viewModel.birthDate.value = birthDateEditText.text.toString()
 
             // Выполняем валидацию и сохраняем данные в кэш
-            if (viewModel.validateInput()) {
+            if (nextBtn.isEnabled) {
                 viewModel.saveData()
                 parentFragmentManager.beginTransaction()
                     .replace(R.id.fragment_container, Fragment2())
                     .addToBackStack(null)
                     .commit()
-
-//                Toast.makeText(context, viewModel.firstName.value +
-//                        viewModel.lastName.value + viewModel.birthDate.value, Toast.LENGTH_SHORT).show()
-
-                // Можно добавить уведомление об успешном сохранении
             } else {
                 Snackbar.make(toast, "Валидация не пройдена", Snackbar.LENGTH_SHORT).show()
             }
diff --git a/app/src/main/java/ru/otus/basicarchitecture/viewmodels/Fragment1ViewModel.kt b/app/src/main/java/ru/otus/basicarchitecture/viewmodels/Fragment1ViewModel.kt
index 59cdc6e..9007725 100644
--- a/app/src/main/java/ru/otus/basicarchitecture/viewmodels/Fragment1ViewModel.kt
+++ b/app/src/main/java/ru/otus/basicarchitecture/viewmodels/Fragment1ViewModel.kt
@@ -1,5 +1,7 @@
 package ru.otus.basicarchitecture.viewmodels
 
+import android.os.Build
+import androidx.annotation.RequiresApi
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
@@ -10,9 +12,13 @@ import ru.otus.basicarchitecture.repository.TagRepository
 import ru.otus.basicarchitecture.repository.WizardCache
 import java.text.ParseException
 import java.text.SimpleDateFormat
+import java.time.LocalDate
+import java.time.format.DateTimeFormatter
+import java.time.temporal.ChronoUnit
 import java.util.Calendar
 import java.util.Locale
 import javax.inject.Inject
+@RequiresApi(Build.VERSION_CODES.O)
 @HiltViewModel
 class Fragment1ViewModel @Inject constructor(private val wizardCache: WizardCache) : ViewModel() {
 
@@ -20,6 +26,34 @@ class Fragment1ViewModel @Inject constructor(private val wizardCache: WizardCach
     val lastName = MutableLiveData<String>()
     val birthDate = MutableLiveData<String>()
 
+    private val _isFormValid = MutableLiveData<Boolean>()
+    val isFormValid: LiveData<Boolean> get() = _isFormValid
+
+    init {
+        val formatter = DateTimeFormatter.ofPattern("dd.MM.yyyy")
+        val today = LocalDate.now()
+
+        firstName.observeForever { validateForm() }
+        lastName.observeForever { validateForm() }
+        birthDate.observeForever { validateForm() }
+    }
+
+    private fun validateForm() {
+        val isNameValid = !firstName.value.isNullOrBlank()
+        val isSurnameValid = !lastName.value.isNullOrBlank()
+        val isDateOfBirthValid = birthDate.value?.let {
+            try {
+                val dob = LocalDate.parse(it, DateTimeFormatter.ofPattern("dd.MM.yyyy"))
+                val years = ChronoUnit.YEARS.between(dob, LocalDate.now())
+                years >= 18
+            } catch (e: Exception) {
+                false
+            }
+        } ?: false
+
+        _isFormValid.value = isNameValid && isSurnameValid && isDateOfBirthValid
+    }
+
     fun saveData() {
         wizardCache.firstName = firstName.value
         wizardCache.lastName = lastName.value
@@ -34,11 +68,13 @@ class Fragment1ViewModel @Inject constructor(private val wizardCache: WizardCach
     private fun isAgeValid(birthDate: String?): Boolean {
         if (birthDate.isNullOrEmpty()) return false
 
-        val dateFormat = SimpleDateFormat("dd/MM/yyyy", Locale.getDefault())
+        val dateFormat = SimpleDateFormat("dd.MM.yyyy", Locale.getDefault())
         return try {
             val birthDateParsed = dateFormat.parse(birthDate)
             val age = Calendar.getInstance().get(Calendar.YEAR) - Calendar.getInstance().apply {
-                time = birthDateParsed
+                if (birthDateParsed != null) {
+                    time = birthDateParsed
+                }
             }.get(Calendar.YEAR)
 
             age >= 18

From 13311b2eb56e9b753cee138845e016c6648048bb Mon Sep 17 00:00:00 2001
From: nikolay <nazarov.nikolay15@wb.ru>
Date: Thu, 15 Aug 2024 21:43:53 +0300
Subject: [PATCH 20/36] =?UTF-8?q?=D0=A1=D0=94=D0=B5=D0=BB=D0=B0=D0=BB=20?=
 =?UTF-8?q?=D0=B2=D0=B0=D0=BB=D0=B8=D0=B4=D0=B0=D1=86=D0=B8=D1=8E=20=D0=B4?=
 =?UTF-8?q?=D0=B0=D1=82=D1=8B=20=D1=80=D0=BE=D0=B6=D0=B4=D0=B5=D0=BD=D0=B8?=
 =?UTF-8?q?=D1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/ru/otus/basicarchitecture/ui/fragments/Fragment1.kt  | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/app/src/main/java/ru/otus/basicarchitecture/ui/fragments/Fragment1.kt b/app/src/main/java/ru/otus/basicarchitecture/ui/fragments/Fragment1.kt
index d9c8730..d39c29d 100644
--- a/app/src/main/java/ru/otus/basicarchitecture/ui/fragments/Fragment1.kt
+++ b/app/src/main/java/ru/otus/basicarchitecture/ui/fragments/Fragment1.kt
@@ -24,10 +24,6 @@ import java.time.temporal.ChronoUnit
 
 @AndroidEntryPoint
 class Fragment1 : Fragment() {
-
-    private val _state = MutableLiveData<ViewState>()
-    val viewState: LiveData<ViewState> = _state
-
     private val viewModel: Fragment1ViewModel by viewModels()
 
     private lateinit var firstNameEditText: EditText

From 5edd533dfbe4e9eee664f0ce5694e74c9a427f52 Mon Sep 17 00:00:00 2001
From: nikolay <nazarov.nikolay15@wb.ru>
Date: Thu, 15 Aug 2024 21:57:51 +0300
Subject: [PATCH 21/36] =?UTF-8?q?=D0=A1=D0=B4=D0=B5=D0=BB=D0=B0=D0=BB=202?=
 =?UTF-8?q?=20=D0=BF=D1=83=D0=BD=D0=BA=D1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ui/fragments/Fragment2.kt                 | 83 +++++++++++++++++--
 .../viewmodels/Fragment2ViewModel.kt          | 49 +++++++++++
 .../main/res/layout/fragment_fragment1.xml    |  2 -
 .../main/res/layout/fragment_fragment2.xml    | 14 +++-
 4 files changed, 140 insertions(+), 8 deletions(-)
 create mode 100644 app/src/main/java/ru/otus/basicarchitecture/viewmodels/Fragment2ViewModel.kt

diff --git a/app/src/main/java/ru/otus/basicarchitecture/ui/fragments/Fragment2.kt b/app/src/main/java/ru/otus/basicarchitecture/ui/fragments/Fragment2.kt
index d9d6355..d4a7d0f 100644
--- a/app/src/main/java/ru/otus/basicarchitecture/ui/fragments/Fragment2.kt
+++ b/app/src/main/java/ru/otus/basicarchitecture/ui/fragments/Fragment2.kt
@@ -1,22 +1,33 @@
 package ru.otus.basicarchitecture.ui.fragments
 
+import android.os.Build
 import androidx.fragment.app.viewModels
 import android.os.Bundle
 import androidx.fragment.app.Fragment
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.Button
+import android.widget.EditText
+import androidx.annotation.RequiresApi
+import androidx.core.widget.addTextChangedListener
+import androidx.lifecycle.Observer
+import com.google.android.material.snackbar.Snackbar
+import dagger.hilt.android.AndroidEntryPoint
 import ru.otus.basicarchitecture.R
+import ru.otus.basicarchitecture.viewmodels.Fragment2ViewModel
 import ru.otus.basicarchitecture.viewmodels.MainViewModel
 
+@AndroidEntryPoint
 class Fragment2 : Fragment() {
+    private val viewModel: Fragment2ViewModel by viewModels()
 
-    private val viewModel: MainViewModel by viewModels()
+    private lateinit var countryEditText: EditText
+    private lateinit var cityEditText: EditText
+    private lateinit var addressEditText: EditText
+    private lateinit var nextBtn: Button
 
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-
-    }
+    private lateinit var toast: View
 
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?,
@@ -24,4 +35,66 @@ class Fragment2 : Fragment() {
     ): View {
         return inflater.inflate(R.layout.fragment_fragment2, container, false)
     }
+
+    @RequiresApi(Build.VERSION_CODES.O)
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        countryEditText = view.findViewById(R.id.country)
+        cityEditText = view.findViewById(R.id.city)
+        addressEditText = view.findViewById(R.id.address)
+        nextBtn = view.findViewById(R.id.fragment2Btn)
+        toast = view.findViewById(R.id.toast)
+
+        viewModel.country.observe(viewLifecycleOwner) {
+            if (it == null || it.isBlank()) {
+                countryEditText.error = "Поле не должно быть пустым"
+            } else {
+                countryEditText.error = null
+            }
+        }
+
+        viewModel.city.observe(viewLifecycleOwner) {
+            if (it == null || it.isBlank()) {
+                cityEditText.error = "Поле не должно быть пустым"
+            } else {
+                cityEditText.error = null
+            }
+        }
+
+        viewModel.address.observe(viewLifecycleOwner) {
+            if (it == null || it.isBlank()) {
+                addressEditText.error = "Поле не должно быть пустым"
+            } else {
+                addressEditText.error = null
+            }
+        }
+
+        viewModel.isFormValid.observe(viewLifecycleOwner) { isValid ->
+            nextBtn.isEnabled = isValid
+        }
+
+        countryEditText.addTextChangedListener { viewModel.country.value = it.toString() }
+        cityEditText.addTextChangedListener { viewModel.city.value = it.toString() }
+        addressEditText.addTextChangedListener { viewModel.address.value = it.toString() }
+
+        nextBtn.setOnClickListener {
+            // Сохраняем данные из EditText в LiveData
+            viewModel.country.value = countryEditText.text.toString()
+            viewModel.city.value = cityEditText.text.toString()
+            viewModel.address.value = addressEditText.text.toString()
+
+            // Выполняем валидацию и сохраняем данные в кэш
+            if (nextBtn.isEnabled) {
+                viewModel.saveData()
+                parentFragmentManager.beginTransaction()
+                    .replace(R.id.fragment_container, Fragment3())
+                    .addToBackStack(null)
+                    .commit()
+                // Здесь можно перейти на следующий фрагмент или завершить процесс анкеты
+            } else {
+                Snackbar.make(toast, "Валидация не пройдена", Snackbar.LENGTH_SHORT).show()
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/ru/otus/basicarchitecture/viewmodels/Fragment2ViewModel.kt b/app/src/main/java/ru/otus/basicarchitecture/viewmodels/Fragment2ViewModel.kt
new file mode 100644
index 0000000..3a72d84
--- /dev/null
+++ b/app/src/main/java/ru/otus/basicarchitecture/viewmodels/Fragment2ViewModel.kt
@@ -0,0 +1,49 @@
+package ru.otus.basicarchitecture.viewmodels
+
+import android.os.Build
+import androidx.annotation.RequiresApi
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.ViewModel
+import dagger.hilt.android.AndroidEntryPoint
+import dagger.hilt.android.lifecycle.HiltViewModel
+import ru.otus.basicarchitecture.model.Tag
+import ru.otus.basicarchitecture.repository.TagRepository
+import ru.otus.basicarchitecture.repository.WizardCache
+import java.text.ParseException
+import java.text.SimpleDateFormat
+import java.time.LocalDate
+import java.time.format.DateTimeFormatter
+import java.time.temporal.ChronoUnit
+import java.util.Calendar
+import java.util.Locale
+import javax.inject.Inject
+@RequiresApi(Build.VERSION_CODES.O)
+@HiltViewModel
+class Fragment2ViewModel @Inject constructor(private val wizardCache: WizardCache) : ViewModel() {
+    val country = MutableLiveData<String>()
+    val city = MutableLiveData<String>()
+    val address = MutableLiveData<String>()
+
+    private val _isFormValid = MutableLiveData<Boolean>()
+    val isFormValid: LiveData<Boolean> get() = _isFormValid
+
+    init {
+        country.observeForever { validateForm() }
+        city.observeForever { validateForm() }
+        address.observeForever { validateForm() }
+    }
+
+    private fun validateForm() {
+        val isCountryValid = !country.value.isNullOrBlank()
+        val isCityValid = !city.value.isNullOrBlank()
+        val isAddressValid = !address.value.isNullOrBlank()
+        _isFormValid.value = isCountryValid && isCityValid && isAddressValid
+    }
+
+    fun saveData() {
+        wizardCache.country = country.value
+        wizardCache.city = city.value
+        wizardCache.address = address.value
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_fragment1.xml b/app/src/main/res/layout/fragment_fragment1.xml
index 5865068..ca0fb18 100644
--- a/app/src/main/res/layout/fragment_fragment1.xml
+++ b/app/src/main/res/layout/fragment_fragment1.xml
@@ -95,8 +95,6 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent">
 
-        <!-- Другие элементы интерфейса -->
-
     </androidx.coordinatorlayout.widget.CoordinatorLayout>
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_fragment2.xml b/app/src/main/res/layout/fragment_fragment2.xml
index 44c4cfe..f0683b9 100644
--- a/app/src/main/res/layout/fragment_fragment2.xml
+++ b/app/src/main/res/layout/fragment_fragment2.xml
@@ -65,7 +65,8 @@
             android:id="@+id/address"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:inputType="date" />
+            android:inputType="text"
+            android:maxLines="1"/>
     </com.google.android.material.textfield.TextInputLayout>
 
     <Button
@@ -86,4 +87,15 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent" />
 
+    <androidx.coordinatorlayout.widget.CoordinatorLayout
+        android:id="@+id/toast"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+    </androidx.coordinatorlayout.widget.CoordinatorLayout>
+
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

From 1bfbb82bd5a4c7cb1a134b24bedfd22674fe5ba2 Mon Sep 17 00:00:00 2001
From: nikolay <nazarov.nikolay15@wb.ru>
Date: Thu, 15 Aug 2024 22:28:26 +0300
Subject: [PATCH 22/36] =?UTF-8?q?=D0=A1=D0=B4=D0=B5=D0=BB=D0=B0=D0=BB=203?=
 =?UTF-8?q?=20=D0=BF=D1=83=D0=BD=D0=BA=D1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../repository/WizardCache.kt                 |  4 +
 .../ui/fragments/Fragment3.kt                 | 57 ++++++++------
 .../ui/fragments/Fragment4.kt                 | 74 +++++++++++++++++++
 .../viewmodels/Fragment3ViewModel.kt          | 41 ++++++----
 .../res/drawable/selector_tag_background.xml  |  5 ++
 .../res/drawable/tag_default_background.xml   |  4 +
 .../res/drawable/tag_selected_background.xml  |  4 +
 .../main/res/layout/fragment_fragment3.xml    | 25 ++++++-
 app/src/main/res/layout/tag_item.xml          | 12 +++
 app/src/main/res/values/colors.xml            |  2 +
 10 files changed, 186 insertions(+), 42 deletions(-)
 create mode 100644 app/src/main/java/ru/otus/basicarchitecture/ui/fragments/Fragment4.kt
 create mode 100644 app/src/main/res/drawable/selector_tag_background.xml
 create mode 100644 app/src/main/res/drawable/tag_default_background.xml
 create mode 100644 app/src/main/res/drawable/tag_selected_background.xml
 create mode 100644 app/src/main/res/layout/tag_item.xml

diff --git a/app/src/main/java/ru/otus/basicarchitecture/repository/WizardCache.kt b/app/src/main/java/ru/otus/basicarchitecture/repository/WizardCache.kt
index a10093e..60b166e 100644
--- a/app/src/main/java/ru/otus/basicarchitecture/repository/WizardCache.kt
+++ b/app/src/main/java/ru/otus/basicarchitecture/repository/WizardCache.kt
@@ -11,4 +11,8 @@ class WizardCache @Inject constructor() {
     var address: String? = null
     var interests: List<String> = emptyList()
 
+    fun setInterests(interests: Set<String>) {
+        this.interests = interests.toList()
+    }
+
 }
\ No newline at end of file
diff --git a/app/src/main/java/ru/otus/basicarchitecture/ui/fragments/Fragment3.kt b/app/src/main/java/ru/otus/basicarchitecture/ui/fragments/Fragment3.kt
index 943e3f6..4c37d53 100644
--- a/app/src/main/java/ru/otus/basicarchitecture/ui/fragments/Fragment3.kt
+++ b/app/src/main/java/ru/otus/basicarchitecture/ui/fragments/Fragment3.kt
@@ -6,20 +6,22 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.Button
+import android.widget.TextView
+import androidx.fragment.app.viewModels
+import androidx.lifecycle.Observer
 import androidx.lifecycle.ViewModelProvider
 import com.google.android.flexbox.FlexboxLayout
+import dagger.hilt.android.AndroidEntryPoint
 import ru.otus.basicarchitecture.R
 import ru.otus.basicarchitecture.model.Tag
 import ru.otus.basicarchitecture.viewmodels.Fragment3ViewModel
 
+@AndroidEntryPoint
 class Fragment3 : Fragment() {
-    private lateinit var viewModel: Fragment3ViewModel
-    private lateinit var tagFlexboxLayout: FlexboxLayout
-
+    private val viewModel: Fragment3ViewModel by viewModels()
 
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-    }
+    private lateinit var tagFlexboxLayout: FlexboxLayout
+    private lateinit var nextBtn: Button
 
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?,
@@ -31,35 +33,42 @@ class Fragment3 : Fragment() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
-        viewModel = ViewModelProvider(this).get(Fragment3ViewModel::class.java)
         tagFlexboxLayout = view.findViewById(R.id.tagFlexboxLayout)
+        nextBtn = view.findViewById(R.id.fragment3Btn)
 
-        viewModel.tags.observe(viewLifecycleOwner) { tags ->
-            setupTagCloud(tags)
+        viewModel.selectedInterests.observe(viewLifecycleOwner) { selectedInterests ->
+            updateTags(selectedInterests)
         }
 
-        viewModel.selectedTags.observe(viewLifecycleOwner) { selectedTags ->
-            updateSelectedTags(selectedTags)
+        nextBtn.setOnClickListener {
+            viewModel.saveSelectedInterests()
+            parentFragmentManager.beginTransaction()
+                .replace(R.id.fragment_container, Fragment4())
+                .addToBackStack(null)
+                .commit()
         }
-    }
 
-    private fun setupTagCloud(tags: List<Tag>) {
-        tagFlexboxLayout.removeAllViews()
-        for (tag in tags) {
-            val tagButton = Button(context).apply {
-                text = tag.name
-                setOnClickListener {
-                    viewModel.toggleTagSelection(tag)
-                }
+        // Добавить теги в FlexboxLayout
+        viewModel.interests.forEach { interest ->
+            val tagView = createTagView(interest)
+            tagView.setOnClickListener {
+                viewModel.toggleInterest(interest)
             }
-            tagFlexboxLayout.addView(tagButton)
+            tagFlexboxLayout.addView(tagView)
         }
     }
 
-    private fun updateSelectedTags(selectedTags: Set<Tag>) {
+    private fun createTagView(interest: String): TextView {
+        val tagView = LayoutInflater.from(context).inflate(R.layout.tag_item, tagFlexboxLayout, false) as TextView
+        tagView.text = interest
+        return tagView
+    }
+
+    private fun updateTags(selectedInterests: Set<String>) {
         for (i in 0 until tagFlexboxLayout.childCount) {
-            val button = tagFlexboxLayout.getChildAt(i) as Button
-            button.isSelected = selectedTags.any { it.name == button.text }
+            val tagView = tagFlexboxLayout.getChildAt(i) as TextView
+            val interest = tagView.text.toString()
+            tagView.isSelected = selectedInterests.contains(interest)
         }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/ru/otus/basicarchitecture/ui/fragments/Fragment4.kt b/app/src/main/java/ru/otus/basicarchitecture/ui/fragments/Fragment4.kt
new file mode 100644
index 0000000..5a5f1ff
--- /dev/null
+++ b/app/src/main/java/ru/otus/basicarchitecture/ui/fragments/Fragment4.kt
@@ -0,0 +1,74 @@
+package ru.otus.basicarchitecture.ui.fragments
+
+import android.os.Bundle
+import androidx.fragment.app.Fragment
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.Button
+import android.widget.TextView
+import androidx.fragment.app.viewModels
+import androidx.lifecycle.Observer
+import androidx.lifecycle.ViewModelProvider
+import com.google.android.flexbox.FlexboxLayout
+import dagger.hilt.android.AndroidEntryPoint
+import ru.otus.basicarchitecture.R
+import ru.otus.basicarchitecture.model.Tag
+import ru.otus.basicarchitecture.viewmodels.Fragment3ViewModel
+
+@AndroidEntryPoint
+class Fragment4 : Fragment() {
+    private val viewModel: Fragment3ViewModel by viewModels()
+
+    private lateinit var tagFlexboxLayout: FlexboxLayout
+    private lateinit var nextBtn: Button
+
+    override fun onCreateView(
+        inflater: LayoutInflater, container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View {
+        return inflater.inflate(R.layout.fragment_fragment1, container, false)
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        tagFlexboxLayout = view.findViewById(R.id.tagFlexboxLayout)
+        nextBtn = view.findViewById(R.id.fragment3Btn)
+
+        viewModel.selectedInterests.observe(viewLifecycleOwner) { selectedInterests ->
+            updateTags(selectedInterests)
+        }
+
+        nextBtn.setOnClickListener {
+            viewModel.saveSelectedInterests()
+            parentFragmentManager.beginTransaction()
+                .replace(R.id.fragment_container, Fragment4())
+                .addToBackStack(null)
+                .commit()
+        }
+
+        // Добавить теги в FlexboxLayout
+        viewModel.interests.forEach { interest ->
+            val tagView = createTagView(interest)
+            tagView.setOnClickListener {
+                viewModel.toggleInterest(interest)
+            }
+            tagFlexboxLayout.addView(tagView)
+        }
+    }
+
+    private fun createTagView(interest: String): TextView {
+        val tagView = LayoutInflater.from(context).inflate(R.layout.tag_item, tagFlexboxLayout, false) as TextView
+        tagView.text = interest
+        return tagView
+    }
+
+    private fun updateTags(selectedInterests: Set<String>) {
+        for (i in 0 until tagFlexboxLayout.childCount) {
+            val tagView = tagFlexboxLayout.getChildAt(i) as TextView
+            val interest = tagView.text.toString()
+            tagView.isSelected = selectedInterests.contains(interest)
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/ru/otus/basicarchitecture/viewmodels/Fragment3ViewModel.kt b/app/src/main/java/ru/otus/basicarchitecture/viewmodels/Fragment3ViewModel.kt
index 50eb6c9..12bf66c 100644
--- a/app/src/main/java/ru/otus/basicarchitecture/viewmodels/Fragment3ViewModel.kt
+++ b/app/src/main/java/ru/otus/basicarchitecture/viewmodels/Fragment3ViewModel.kt
@@ -3,32 +3,43 @@ package ru.otus.basicarchitecture.viewmodels
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
+import dagger.hilt.android.lifecycle.HiltViewModel
 import ru.otus.basicarchitecture.model.Tag
 import ru.otus.basicarchitecture.repository.TagRepository
+import ru.otus.basicarchitecture.repository.WizardCache
+import javax.inject.Inject
 
-class Fragment3ViewModel : ViewModel() {
-    private val repository = TagRepository()
+@HiltViewModel
+class Fragment3ViewModel @Inject constructor(
+    private val wizardCache: WizardCache
+) : ViewModel() {
 
-    private val _tags = MutableLiveData<List<Tag>>()
-    val tags: LiveData<List<Tag>> get() = _tags
+    private val _interests = listOf(
+        "Sport", "Music", "Travel", "Reading", "Movies", "Games", "Cooking", "Art"
+    )
 
-    private val _selectedTags = MutableLiveData<Set<Tag>>(setOf())
-    val selectedTags: LiveData<Set<Tag>> get() = _selectedTags
+    private val _selectedInterests = MutableLiveData<Set<String>>()
+    val selectedInterests: LiveData<Set<String>> get() = _selectedInterests
+
+    val interests: List<String> get() = _interests
 
     init {
-        loadTags()
+        _selectedInterests.value = emptySet()
     }
 
-    private fun loadTags() {
-        _tags.value = repository.getTags()
+    fun toggleInterest(interest: String) {
+        _selectedInterests.value = _selectedInterests.value?.let {
+            if (it.contains(interest)) {
+                it - interest
+            } else {
+                it + interest
+            }
+        }
     }
 
-    fun toggleTagSelection(tag: Tag) {
-        val currentSelection = _selectedTags.value ?: setOf()
-        if (currentSelection.contains(tag)) {
-            _selectedTags.value = currentSelection - tag
-        } else {
-            _selectedTags.value = currentSelection + tag
+    fun saveSelectedInterests() {
+        _selectedInterests.value?.let {
+            wizardCache.setInterests(it)
         }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/res/drawable/selector_tag_background.xml b/app/src/main/res/drawable/selector_tag_background.xml
new file mode 100644
index 0000000..0a7bff2
--- /dev/null
+++ b/app/src/main/res/drawable/selector_tag_background.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_selected="true" android:drawable="@color/selected_background_color" />
+    <item android:drawable="@color/default_background_color" />
+</selector>
diff --git a/app/src/main/res/drawable/tag_default_background.xml b/app/src/main/res/drawable/tag_default_background.xml
new file mode 100644
index 0000000..dcc4d67
--- /dev/null
+++ b/app/src/main/res/drawable/tag_default_background.xml
@@ -0,0 +1,4 @@
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="@android:color/darker_gray"/>
+    <corners android:radius="14dp"/>
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/tag_selected_background.xml b/app/src/main/res/drawable/tag_selected_background.xml
new file mode 100644
index 0000000..dec9a18
--- /dev/null
+++ b/app/src/main/res/drawable/tag_selected_background.xml
@@ -0,0 +1,4 @@
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="@android:color/holo_blue_light"/>
+    <corners android:radius="8dp"/>
+</shape>
diff --git a/app/src/main/res/layout/fragment_fragment3.xml b/app/src/main/res/layout/fragment_fragment3.xml
index 071f038..603456c 100644
--- a/app/src/main/res/layout/fragment_fragment3.xml
+++ b/app/src/main/res/layout/fragment_fragment3.xml
@@ -4,8 +4,8 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".ui.fragments.Fragment1">
-    
+    tools:context=".ui.fragments.Fragment3">
+
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
@@ -18,4 +18,23 @@
             app:flexWrap="wrap"
             app:justifyContent="flex_start" />
     </LinearLayout>
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+
+    <Button
+        android:id="@+id/fragment3Btn"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginHorizontal="16dp"
+        android:layout_marginStart="16dp"
+        android:layout_marginEnd="16dp"
+        android:layout_marginBottom="28dp"
+        android:insetTop="0dp"
+        android:insetBottom="0dp"
+        android:text="Next"
+        android:textAllCaps="true"
+        android:textSize="14sp"
+        android:textStyle="bold"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/tag_item.xml b/app/src/main/res/layout/tag_item.xml
new file mode 100644
index 0000000..0ff94aa
--- /dev/null
+++ b/app/src/main/res/layout/tag_item.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:padding="8dp"
+    android:drawablePadding="4dp"
+    android:textColor="?android:attr/textColorSecondary"
+    android:textSize="24sp"
+    android:layout_margin="4dp"
+    android:background="@drawable/selector_tag_background"
+    android:clickable="true"
+    android:focusable="true" />
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index f8c6127..4765913 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -7,4 +7,6 @@
     <color name="teal_700">#FF018786</color>
     <color name="black">#FF000000</color>
     <color name="white">#FFFFFFFF</color>
+    <color name="selected_background_color">#FF800080</color>
+    <color name="default_background_color">#DDDDDD</color>
 </resources>
\ No newline at end of file

From 604a96c954982936116ed40bdbcf502f0c200189 Mon Sep 17 00:00:00 2001
From: nikolay <nazarov.nikolay15@wb.ru>
Date: Thu, 15 Aug 2024 22:32:50 +0300
Subject: [PATCH 23/36] =?UTF-8?q?=D0=A1=D0=B4=D0=B5=D0=BB=D0=B0=D0=BB=203?=
 =?UTF-8?q?=20=D0=BF=D1=83=D0=BD=D0=BA=D1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../basicarchitecture/repository/TagRepository.kt | 15 ---------------
 .../viewmodels/Fragment1ViewModel.kt              |  3 ---
 .../viewmodels/Fragment2ViewModel.kt              | 10 ----------
 .../viewmodels/Fragment3ViewModel.kt              |  2 --
 .../main/res/drawable/tag_default_background.xml  |  2 +-
 .../main/res/drawable/tag_selected_background.xml |  4 ----
 app/src/main/res/values/colors.xml                |  2 +-
 7 files changed, 2 insertions(+), 36 deletions(-)
 delete mode 100644 app/src/main/java/ru/otus/basicarchitecture/repository/TagRepository.kt
 delete mode 100644 app/src/main/res/drawable/tag_selected_background.xml

diff --git a/app/src/main/java/ru/otus/basicarchitecture/repository/TagRepository.kt b/app/src/main/java/ru/otus/basicarchitecture/repository/TagRepository.kt
deleted file mode 100644
index e48b286..0000000
--- a/app/src/main/java/ru/otus/basicarchitecture/repository/TagRepository.kt
+++ /dev/null
@@ -1,15 +0,0 @@
-package ru.otus.basicarchitecture.repository
-
-import ru.otus.basicarchitecture.model.Tag
-
-class TagRepository {
-    fun getTags(): List<Tag> {
-        return listOf(
-            Tag(1, "Музыка"),
-            Tag(2, "Кошки"),
-            Tag(3, "Кино"),
-            Tag(4, "Фотография"),
-            Tag(5, "Театр")
-        )
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/ru/otus/basicarchitecture/viewmodels/Fragment1ViewModel.kt b/app/src/main/java/ru/otus/basicarchitecture/viewmodels/Fragment1ViewModel.kt
index 9007725..5c3e2e9 100644
--- a/app/src/main/java/ru/otus/basicarchitecture/viewmodels/Fragment1ViewModel.kt
+++ b/app/src/main/java/ru/otus/basicarchitecture/viewmodels/Fragment1ViewModel.kt
@@ -5,10 +5,7 @@ import androidx.annotation.RequiresApi
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
-import dagger.hilt.android.AndroidEntryPoint
 import dagger.hilt.android.lifecycle.HiltViewModel
-import ru.otus.basicarchitecture.model.Tag
-import ru.otus.basicarchitecture.repository.TagRepository
 import ru.otus.basicarchitecture.repository.WizardCache
 import java.text.ParseException
 import java.text.SimpleDateFormat
diff --git a/app/src/main/java/ru/otus/basicarchitecture/viewmodels/Fragment2ViewModel.kt b/app/src/main/java/ru/otus/basicarchitecture/viewmodels/Fragment2ViewModel.kt
index 3a72d84..1b2cabd 100644
--- a/app/src/main/java/ru/otus/basicarchitecture/viewmodels/Fragment2ViewModel.kt
+++ b/app/src/main/java/ru/otus/basicarchitecture/viewmodels/Fragment2ViewModel.kt
@@ -5,18 +5,8 @@ import androidx.annotation.RequiresApi
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
-import dagger.hilt.android.AndroidEntryPoint
 import dagger.hilt.android.lifecycle.HiltViewModel
-import ru.otus.basicarchitecture.model.Tag
-import ru.otus.basicarchitecture.repository.TagRepository
 import ru.otus.basicarchitecture.repository.WizardCache
-import java.text.ParseException
-import java.text.SimpleDateFormat
-import java.time.LocalDate
-import java.time.format.DateTimeFormatter
-import java.time.temporal.ChronoUnit
-import java.util.Calendar
-import java.util.Locale
 import javax.inject.Inject
 @RequiresApi(Build.VERSION_CODES.O)
 @HiltViewModel
diff --git a/app/src/main/java/ru/otus/basicarchitecture/viewmodels/Fragment3ViewModel.kt b/app/src/main/java/ru/otus/basicarchitecture/viewmodels/Fragment3ViewModel.kt
index 12bf66c..a61f023 100644
--- a/app/src/main/java/ru/otus/basicarchitecture/viewmodels/Fragment3ViewModel.kt
+++ b/app/src/main/java/ru/otus/basicarchitecture/viewmodels/Fragment3ViewModel.kt
@@ -4,8 +4,6 @@ import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import dagger.hilt.android.lifecycle.HiltViewModel
-import ru.otus.basicarchitecture.model.Tag
-import ru.otus.basicarchitecture.repository.TagRepository
 import ru.otus.basicarchitecture.repository.WizardCache
 import javax.inject.Inject
 
diff --git a/app/src/main/res/drawable/tag_default_background.xml b/app/src/main/res/drawable/tag_default_background.xml
index dcc4d67..2598f24 100644
--- a/app/src/main/res/drawable/tag_default_background.xml
+++ b/app/src/main/res/drawable/tag_default_background.xml
@@ -1,4 +1,4 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <solid android:color="@android:color/darker_gray"/>
-    <corners android:radius="14dp"/>
+    <corners android:radius="40dp"/>
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/tag_selected_background.xml b/app/src/main/res/drawable/tag_selected_background.xml
deleted file mode 100644
index dec9a18..0000000
--- a/app/src/main/res/drawable/tag_selected_background.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@android:color/holo_blue_light"/>
-    <corners android:radius="8dp"/>
-</shape>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 4765913..f2e6ebe 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -7,6 +7,6 @@
     <color name="teal_700">#FF018786</color>
     <color name="black">#FF000000</color>
     <color name="white">#FFFFFFFF</color>
-    <color name="selected_background_color">#FF800080</color>
+    <color name="selected_background_color">#FF6200EE</color>
     <color name="default_background_color">#DDDDDD</color>
 </resources>
\ No newline at end of file

From 7bb52f23046a93dc7f520d22be3799a8a7e0f14f Mon Sep 17 00:00:00 2001
From: nikolay <nazarov.nikolay15@wb.ru>
Date: Thu, 15 Aug 2024 22:45:10 +0300
Subject: [PATCH 24/36] =?UTF-8?q?=D0=A1=D0=B4=D0=B5=D0=BB=D0=B0=D0=BB=203?=
 =?UTF-8?q?=20=D0=BF=D1=83=D0=BD=D0=BA=D1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/ru/otus/basicarchitecture/ui/fragments/Fragment1.kt | 4 ----
 .../java/ru/otus/basicarchitecture/viewmodels/ViewState.kt   | 5 -----
 2 files changed, 9 deletions(-)
 delete mode 100644 app/src/main/java/ru/otus/basicarchitecture/viewmodels/ViewState.kt

diff --git a/app/src/main/java/ru/otus/basicarchitecture/ui/fragments/Fragment1.kt b/app/src/main/java/ru/otus/basicarchitecture/ui/fragments/Fragment1.kt
index d39c29d..272beea 100644
--- a/app/src/main/java/ru/otus/basicarchitecture/ui/fragments/Fragment1.kt
+++ b/app/src/main/java/ru/otus/basicarchitecture/ui/fragments/Fragment1.kt
@@ -11,13 +11,10 @@ import android.widget.Button
 import android.widget.EditText
 import androidx.annotation.RequiresApi
 import androidx.core.widget.addTextChangedListener
-import androidx.lifecycle.LiveData
-import androidx.lifecycle.MutableLiveData
 import com.google.android.material.snackbar.Snackbar
 import dagger.hilt.android.AndroidEntryPoint
 import ru.otus.basicarchitecture.R
 import ru.otus.basicarchitecture.viewmodels.Fragment1ViewModel
-import ru.otus.basicarchitecture.viewmodels.ViewState
 import java.time.LocalDate
 import java.time.format.DateTimeFormatter
 import java.time.temporal.ChronoUnit
@@ -91,7 +88,6 @@ class Fragment1 : Fragment() {
         birthDateEditText.addTextChangedListener { viewModel.birthDate.value = it.toString() }
 
         nextBtn.setOnClickListener {
-            // Сохраняем данные из EditText в LiveData
             viewModel.firstName.value = firstNameEditText.text.toString()
             viewModel.lastName.value = lastNameEditText.text.toString()
             viewModel.birthDate.value = birthDateEditText.text.toString()
diff --git a/app/src/main/java/ru/otus/basicarchitecture/viewmodels/ViewState.kt b/app/src/main/java/ru/otus/basicarchitecture/viewmodels/ViewState.kt
deleted file mode 100644
index 50b30a9..0000000
--- a/app/src/main/java/ru/otus/basicarchitecture/viewmodels/ViewState.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package ru.otus.basicarchitecture.viewmodels
-data class ViewState(
-    val isProgress: Boolean = false,
-    val currentWater: String = ""
-)
\ No newline at end of file

From 767cfbbd8682dcc23e054df7d29a4baa6d33696b Mon Sep 17 00:00:00 2001
From: nikolay <nazarov.nikolay15@wb.ru>
Date: Thu, 15 Aug 2024 22:47:05 +0300
Subject: [PATCH 25/36] =?UTF-8?q?=D0=A1=D0=B4=D0=B5=D0=BB=D0=B0=D0=BB=203?=
 =?UTF-8?q?=20=D0=BF=D1=83=D0=BD=D0=BA=D1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/java/ru/otus/basicarchitecture/model/Tag.kt       | 3 ---
 .../java/ru/otus/basicarchitecture/ui/fragments/Fragment3.kt   | 3 ---
 .../java/ru/otus/basicarchitecture/ui/fragments/Fragment4.kt   | 3 ---
 3 files changed, 9 deletions(-)
 delete mode 100644 app/src/main/java/ru/otus/basicarchitecture/model/Tag.kt

diff --git a/app/src/main/java/ru/otus/basicarchitecture/model/Tag.kt b/app/src/main/java/ru/otus/basicarchitecture/model/Tag.kt
deleted file mode 100644
index 7117864..0000000
--- a/app/src/main/java/ru/otus/basicarchitecture/model/Tag.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package ru.otus.basicarchitecture.model
-
-data class Tag(val id: Int, val name: String)
\ No newline at end of file
diff --git a/app/src/main/java/ru/otus/basicarchitecture/ui/fragments/Fragment3.kt b/app/src/main/java/ru/otus/basicarchitecture/ui/fragments/Fragment3.kt
index 4c37d53..8ae5435 100644
--- a/app/src/main/java/ru/otus/basicarchitecture/ui/fragments/Fragment3.kt
+++ b/app/src/main/java/ru/otus/basicarchitecture/ui/fragments/Fragment3.kt
@@ -8,12 +8,9 @@ import android.view.ViewGroup
 import android.widget.Button
 import android.widget.TextView
 import androidx.fragment.app.viewModels
-import androidx.lifecycle.Observer
-import androidx.lifecycle.ViewModelProvider
 import com.google.android.flexbox.FlexboxLayout
 import dagger.hilt.android.AndroidEntryPoint
 import ru.otus.basicarchitecture.R
-import ru.otus.basicarchitecture.model.Tag
 import ru.otus.basicarchitecture.viewmodels.Fragment3ViewModel
 
 @AndroidEntryPoint
diff --git a/app/src/main/java/ru/otus/basicarchitecture/ui/fragments/Fragment4.kt b/app/src/main/java/ru/otus/basicarchitecture/ui/fragments/Fragment4.kt
index 5a5f1ff..29ef02c 100644
--- a/app/src/main/java/ru/otus/basicarchitecture/ui/fragments/Fragment4.kt
+++ b/app/src/main/java/ru/otus/basicarchitecture/ui/fragments/Fragment4.kt
@@ -8,12 +8,9 @@ import android.view.ViewGroup
 import android.widget.Button
 import android.widget.TextView
 import androidx.fragment.app.viewModels
-import androidx.lifecycle.Observer
-import androidx.lifecycle.ViewModelProvider
 import com.google.android.flexbox.FlexboxLayout
 import dagger.hilt.android.AndroidEntryPoint
 import ru.otus.basicarchitecture.R
-import ru.otus.basicarchitecture.model.Tag
 import ru.otus.basicarchitecture.viewmodels.Fragment3ViewModel
 
 @AndroidEntryPoint

From 62339707afb1c7c9a9a03ce36b620cb84158613b Mon Sep 17 00:00:00 2001
From: nikolay <nazarov.nikolay15@wb.ru>
Date: Thu, 15 Aug 2024 23:01:29 +0300
Subject: [PATCH 26/36] =?UTF-8?q?=D0=A1=D0=B4=D0=B5=D0=BB=D0=B0=D0=BB=204?=
 =?UTF-8?q?=20=D0=BF=D1=83=D0=BD=D0=BA=D1=82=3F=20=D0=BF=D1=80=D0=B0=D0=B2?=
 =?UTF-8?q?=D0=BB=D1=8E=20=D0=B2=D0=B5=D1=80=D1=81=D1=82=D0=BA=D1=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ui/fragments/Fragment4.kt                 | 47 +++++++----------
 .../viewmodels/Fragment4ViewModel.kt          | 23 +++++++++
 .../main/res/layout/fragment_fragment4.xml    | 50 +++++++++++++++++++
 3 files changed, 90 insertions(+), 30 deletions(-)
 create mode 100644 app/src/main/java/ru/otus/basicarchitecture/viewmodels/Fragment4ViewModel.kt
 create mode 100644 app/src/main/res/layout/fragment_fragment4.xml

diff --git a/app/src/main/java/ru/otus/basicarchitecture/ui/fragments/Fragment4.kt b/app/src/main/java/ru/otus/basicarchitecture/ui/fragments/Fragment4.kt
index 29ef02c..6bcf3dc 100644
--- a/app/src/main/java/ru/otus/basicarchitecture/ui/fragments/Fragment4.kt
+++ b/app/src/main/java/ru/otus/basicarchitecture/ui/fragments/Fragment4.kt
@@ -5,52 +5,47 @@ import androidx.fragment.app.Fragment
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.widget.Button
 import android.widget.TextView
 import androidx.fragment.app.viewModels
 import com.google.android.flexbox.FlexboxLayout
 import dagger.hilt.android.AndroidEntryPoint
 import ru.otus.basicarchitecture.R
-import ru.otus.basicarchitecture.viewmodels.Fragment3ViewModel
+import ru.otus.basicarchitecture.viewmodels.Fragment4ViewModel
 
 @AndroidEntryPoint
 class Fragment4 : Fragment() {
-    private val viewModel: Fragment3ViewModel by viewModels()
+    private val viewModel: Fragment4ViewModel by viewModels()
 
+    private lateinit var firstNameTextView: TextView
+    private lateinit var lastNameTextView: TextView
+    private lateinit var birthDateTextView: TextView
+    private lateinit var addressTextView: TextView
     private lateinit var tagFlexboxLayout: FlexboxLayout
-    private lateinit var nextBtn: Button
 
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View {
-        return inflater.inflate(R.layout.fragment_fragment1, container, false)
+        return inflater.inflate(R.layout.fragment_fragment4, container, false)
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
+        firstNameTextView = view.findViewById(R.id.tvFirstName)
+        lastNameTextView = view.findViewById(R.id.tvLastName)
+        birthDateTextView = view.findViewById(R.id.tvBirthDate)
+        addressTextView = view.findViewById(R.id.tvAddress)
         tagFlexboxLayout = view.findViewById(R.id.tagFlexboxLayout)
-        nextBtn = view.findViewById(R.id.fragment3Btn)
 
-        viewModel.selectedInterests.observe(viewLifecycleOwner) { selectedInterests ->
-            updateTags(selectedInterests)
-        }
-
-        nextBtn.setOnClickListener {
-            viewModel.saveSelectedInterests()
-            parentFragmentManager.beginTransaction()
-                .replace(R.id.fragment_container, Fragment4())
-                .addToBackStack(null)
-                .commit()
-        }
+        firstNameTextView.text = viewModel.firstName ?: "N/A"
+        lastNameTextView.text = viewModel.lastName ?: "N/A"
+        birthDateTextView.text = viewModel.birthDate ?: "N/A"
+        addressTextView.text = viewModel.fullAddress
 
-        // Добавить теги в FlexboxLayout
+        // Отобразить интересы
         viewModel.interests.forEach { interest ->
             val tagView = createTagView(interest)
-            tagView.setOnClickListener {
-                viewModel.toggleInterest(interest)
-            }
             tagFlexboxLayout.addView(tagView)
         }
     }
@@ -60,12 +55,4 @@ class Fragment4 : Fragment() {
         tagView.text = interest
         return tagView
     }
-
-    private fun updateTags(selectedInterests: Set<String>) {
-        for (i in 0 until tagFlexboxLayout.childCount) {
-            val tagView = tagFlexboxLayout.getChildAt(i) as TextView
-            val interest = tagView.text.toString()
-            tagView.isSelected = selectedInterests.contains(interest)
-        }
-    }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/ru/otus/basicarchitecture/viewmodels/Fragment4ViewModel.kt b/app/src/main/java/ru/otus/basicarchitecture/viewmodels/Fragment4ViewModel.kt
new file mode 100644
index 0000000..73946a8
--- /dev/null
+++ b/app/src/main/java/ru/otus/basicarchitecture/viewmodels/Fragment4ViewModel.kt
@@ -0,0 +1,23 @@
+package ru.otus.basicarchitecture.viewmodels
+
+import androidx.lifecycle.ViewModel
+import dagger.hilt.android.lifecycle.HiltViewModel
+import ru.otus.basicarchitecture.repository.WizardCache
+import javax.inject.Inject
+
+@HiltViewModel
+class Fragment4ViewModel @Inject constructor(
+    private val wizardCache: WizardCache
+) : ViewModel() {
+
+    val firstName: String? get() = wizardCache.firstName
+    val lastName: String? get() = wizardCache.lastName
+    val birthDate: String? get() = wizardCache.birthDate
+    val country: String? get() = wizardCache.country
+    val city: String? get() = wizardCache.city
+    val address: String? get() = wizardCache.address
+    val interests: List<String> get() = wizardCache.interests
+
+    val fullAddress: String
+        get() = listOfNotNull(country, city, address).joinToString(" ")
+}
diff --git a/app/src/main/res/layout/fragment_fragment4.xml b/app/src/main/res/layout/fragment_fragment4.xml
new file mode 100644
index 0000000..5a7ed2c
--- /dev/null
+++ b/app/src/main/res/layout/fragment_fragment4.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".ui.fragments.Fragment4">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:padding="16dp"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent">
+
+        <TextView
+            android:id="@+id/tvFirstName"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="First Name" />
+
+        <TextView
+            android:id="@+id/tvLastName"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="Last Name" />
+
+        <TextView
+            android:id="@+id/tvBirthDate"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="Birth Date" />
+
+        <TextView
+            android:id="@+id/tvAddress"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="Address" />
+
+        <com.google.android.flexbox.FlexboxLayout
+            android:id="@+id/tagFlexboxLayout"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:flexWrap="wrap"
+            app:justifyContent="flex_start"
+            android:layout_marginTop="16dp" />
+    </LinearLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

From 375cfec1f0e581382deaa749b72e2f6820d570dc Mon Sep 17 00:00:00 2001
From: nikolay <nazarov.nikolay15@wb.ru>
Date: Thu, 15 Aug 2024 23:14:56 +0300
Subject: [PATCH 27/36] =?UTF-8?q?=D0=93=D0=BE=D1=82=D0=BE=D0=B2=D0=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/res/layout/fragment_fragment4.xml    | 135 +++++++++++++-----
 1 file changed, 96 insertions(+), 39 deletions(-)

diff --git a/app/src/main/res/layout/fragment_fragment4.xml b/app/src/main/res/layout/fragment_fragment4.xml
index 5a7ed2c..91eb7ec 100644
--- a/app/src/main/res/layout/fragment_fragment4.xml
+++ b/app/src/main/res/layout/fragment_fragment4.xml
@@ -6,45 +6,102 @@
     android:layout_height="match_parent"
     tools:context=".ui.fragments.Fragment4">
 
-    <LinearLayout
+    <TextView
+        android:id="@+id/tvFirstNameTitle"
+        android:textSize="24sp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="10dp"
+        android:text="Name"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <TextView
+        android:id="@+id/tvFirstName"
+        android:textSize="24sp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="8dp"
+        android:text="First Name value"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/tvFirstNameTitle" />
+
+    <TextView
+        android:id="@+id/tvLastNameTitle"
+        android:textSize="24sp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="30dp"
+        android:text="Surname"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/tvFirstName" />
+
+    <TextView
+        android:id="@+id/tvLastName"
+        android:textSize="24sp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="8dp"
+        android:text="Last Name value"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/tvLastNameTitle" />
+
+    <TextView
+        android:id="@+id/tvBirthDateTitle"
+        android:textSize="24sp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="30dp"
+        android:text="Date of Birth"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/tvLastName" />
+
+    <TextView
+        android:id="@+id/tvBirthDate"
+        android:textSize="24sp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="8dp"
+        android:text="Birth Date value"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/tvBirthDateTitle" />
+
+    <TextView
+        android:id="@+id/tvAddressTitle"
+        android:textSize="24sp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="30dp"
+        android:text="Address"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/tvBirthDate" />
+
+    <TextView
+        android:id="@+id/tvAddress"
+        android:textSize="24sp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="8dp"
+        android:text="Address value"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/tvAddressTitle" />
+
+    <TextView
+        android:id="@+id/tagFlexboxLayoutTitle"
+        android:textSize="24sp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="30dp"
+        android:text="Interests"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/tvAddress" />
+
+    <com.google.android.flexbox.FlexboxLayout
+        android:id="@+id/tagFlexboxLayout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:padding="16dp"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent">
-
-        <TextView
-            android:id="@+id/tvFirstName"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="First Name" />
-
-        <TextView
-            android:id="@+id/tvLastName"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="Last Name" />
-
-        <TextView
-            android:id="@+id/tvBirthDate"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="Birth Date" />
-
-        <TextView
-            android:id="@+id/tvAddress"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="Address" />
-
-        <com.google.android.flexbox.FlexboxLayout
-            android:id="@+id/tagFlexboxLayout"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            app:flexWrap="wrap"
-            app:justifyContent="flex_start"
-            android:layout_marginTop="16dp" />
-    </LinearLayout>
+        android:layout_marginTop="8dp"
+        app:flexWrap="wrap"
+        app:justifyContent="flex_start"
+        app:layout_constraintTop_toBottomOf="@+id/tagFlexboxLayoutTitle" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

From e4144639b9052bff94f67e00527b6c37b559ab67 Mon Sep 17 00:00:00 2001
From: nikolay <nazarov.nikolay15@wb.ru>
Date: Fri, 16 Aug 2024 00:46:16 +0300
Subject: [PATCH 28/36] =?UTF-8?q?=D0=93=D0=BE=D1=82=D0=BE=D0=B2=D0=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle                              |  7 +++
 app/src/main/AndroidManifest.xml              |  1 +
 .../basicarchitecture/network/DadataApi.kt    | 16 +++++
 .../network/DadataApiService.kt               | 44 ++++++++++++++
 .../ui/fragments/Fragment2.kt                 | 57 ++++++------------
 .../viewmodels/Fragment2ViewModel.kt          | 47 ++++++++++-----
 .../main/res/layout/fragment_fragment2.xml    | 58 +++----------------
 7 files changed, 126 insertions(+), 104 deletions(-)
 create mode 100644 app/src/main/java/ru/otus/basicarchitecture/network/DadataApi.kt
 create mode 100644 app/src/main/java/ru/otus/basicarchitecture/network/DadataApiService.kt

diff --git a/app/build.gradle b/app/build.gradle
index 9242091..7918184 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -57,6 +57,13 @@ dependencies {
     implementation "androidx.lifecycle:lifecycle-runtime-ktx:$lifecycle_version"
     implementation "androidx.lifecycle:lifecycle-viewmodel-savedstate:$lifecycle_version"
     implementation 'androidx.activity:activity-ktx:1.7.2'
+
+    // Retrofit2
+    implementation 'com.squareup.okhttp3:logging-interceptor:4.9.3'
+    implementation "com.squareup.retrofit2:retrofit:2.9.0"
+    implementation "com.squareup.retrofit2:converter-gson:2.9.0"
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4'
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4'
 }
 
 kapt {
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 23b8553..19a3ac8 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools">
+    <uses-permission android:name="android.permission.INTERNET" />
 
     <application
         android:name=".di.MyApplication"
diff --git a/app/src/main/java/ru/otus/basicarchitecture/network/DadataApi.kt b/app/src/main/java/ru/otus/basicarchitecture/network/DadataApi.kt
new file mode 100644
index 0000000..24cc7cb
--- /dev/null
+++ b/app/src/main/java/ru/otus/basicarchitecture/network/DadataApi.kt
@@ -0,0 +1,16 @@
+package ru.otus.basicarchitecture.network
+
+import retrofit2.http.Body
+import retrofit2.http.Headers
+import retrofit2.http.POST
+
+interface DadataApi {
+    @Headers("Content-Type: application/json", "Accept: application/json")
+    @POST("suggestions/api/4_1/rs/suggest/address")
+    suspend fun getAddressSuggestions(@Body request: AddressSuggestionRequest): DadataResponse
+}
+
+data class AddressSuggestionRequest(val query: String)
+
+data class DadataResponse(val suggestions: List<AddressSuggestion>)
+data class AddressSuggestion(val value: String)
diff --git a/app/src/main/java/ru/otus/basicarchitecture/network/DadataApiService.kt b/app/src/main/java/ru/otus/basicarchitecture/network/DadataApiService.kt
new file mode 100644
index 0000000..2d0fc16
--- /dev/null
+++ b/app/src/main/java/ru/otus/basicarchitecture/network/DadataApiService.kt
@@ -0,0 +1,44 @@
+package ru.otus.basicarchitecture.network
+
+import okhttp3.Interceptor
+import okhttp3.OkHttpClient
+import okhttp3.logging.HttpLoggingInterceptor
+import retrofit2.Retrofit
+import retrofit2.converter.gson.GsonConverterFactory
+import java.util.concurrent.TimeUnit
+
+object DadataApiService {
+    private const val BASE_URL = "https://suggestions.dadata.ru/"
+    private const val API_KEY = "8fa10df494b20be347e86fb921643f852a13cc07" // Ваш API ключ Dadata
+
+    private val client: OkHttpClient by lazy {
+        // Создаем и настраиваем HttpLoggingInterceptor
+        val loggingInterceptor = HttpLoggingInterceptor().apply {
+            level = HttpLoggingInterceptor.Level.BODY
+        }
+
+        // Создаем Interceptor для добавления заголовка авторизации
+        val headerInterceptor = Interceptor { chain ->
+            val request = chain.request().newBuilder()
+                .addHeader("Authorization", "Token $API_KEY")
+                .build()
+            chain.proceed(request)
+        }
+
+        OkHttpClient.Builder()
+            .addInterceptor(loggingInterceptor)  // Интерсептор логов
+            .addInterceptor(headerInterceptor)   // Интерсептор заголовков
+            .connectTimeout(30, TimeUnit.SECONDS)
+            .readTimeout(30, TimeUnit.SECONDS)
+            .build()
+    }
+
+    val api: DadataApi by lazy {
+        Retrofit.Builder()
+            .baseUrl(BASE_URL)
+            .client(client)
+            .addConverterFactory(GsonConverterFactory.create())
+            .build()
+            .create(DadataApi::class.java)
+    }
+}
diff --git a/app/src/main/java/ru/otus/basicarchitecture/ui/fragments/Fragment2.kt b/app/src/main/java/ru/otus/basicarchitecture/ui/fragments/Fragment2.kt
index d4a7d0f..e82e5ae 100644
--- a/app/src/main/java/ru/otus/basicarchitecture/ui/fragments/Fragment2.kt
+++ b/app/src/main/java/ru/otus/basicarchitecture/ui/fragments/Fragment2.kt
@@ -1,30 +1,28 @@
 package ru.otus.basicarchitecture.ui.fragments
 
 import android.os.Build
-import androidx.fragment.app.viewModels
 import android.os.Bundle
-import androidx.fragment.app.Fragment
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.ArrayAdapter
+import android.widget.AutoCompleteTextView
 import android.widget.Button
-import android.widget.EditText
 import androidx.annotation.RequiresApi
 import androidx.core.widget.addTextChangedListener
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.viewModels
 import androidx.lifecycle.Observer
 import com.google.android.material.snackbar.Snackbar
 import dagger.hilt.android.AndroidEntryPoint
 import ru.otus.basicarchitecture.R
 import ru.otus.basicarchitecture.viewmodels.Fragment2ViewModel
-import ru.otus.basicarchitecture.viewmodels.MainViewModel
 
 @AndroidEntryPoint
 class Fragment2 : Fragment() {
     private val viewModel: Fragment2ViewModel by viewModels()
 
-    private lateinit var countryEditText: EditText
-    private lateinit var cityEditText: EditText
-    private lateinit var addressEditText: EditText
+    private lateinit var addressEditText: AutoCompleteTextView
     private lateinit var nextBtn: Button
 
     private lateinit var toast: View
@@ -40,48 +38,29 @@ class Fragment2 : Fragment() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
-        countryEditText = view.findViewById(R.id.country)
-        cityEditText = view.findViewById(R.id.city)
         addressEditText = view.findViewById(R.id.address)
         nextBtn = view.findViewById(R.id.fragment2Btn)
         toast = view.findViewById(R.id.toast)
 
-        viewModel.country.observe(viewLifecycleOwner) {
-            if (it == null || it.isBlank()) {
-                countryEditText.error = "Поле не должно быть пустым"
-            } else {
-                countryEditText.error = null
-            }
-        }
-
-        viewModel.city.observe(viewLifecycleOwner) {
-            if (it == null || it.isBlank()) {
-                cityEditText.error = "Поле не должно быть пустым"
-            } else {
-                cityEditText.error = null
-            }
-        }
+        viewModel.isFormValid.observe(viewLifecycleOwner, Observer { isValid ->
+            nextBtn.isEnabled = isValid
+        })
 
-        viewModel.address.observe(viewLifecycleOwner) {
-            if (it == null || it.isBlank()) {
-                addressEditText.error = "Поле не должно быть пустым"
-            } else {
-                addressEditText.error = null
+        viewModel.addressSuggestions.observe(viewLifecycleOwner, Observer { suggestions ->
+            val adapter = ArrayAdapter(requireContext(), android.R.layout.simple_dropdown_item_1line, suggestions)
+            addressEditText.setAdapter(adapter)
+            if(suggestions.isNotEmpty()) {
+                addressEditText.showDropDown()
             }
-        }
+        })
 
-        viewModel.isFormValid.observe(viewLifecycleOwner) { isValid ->
-            nextBtn.isEnabled = isValid
+        addressEditText.addTextChangedListener {
+            viewModel.address.value = it.toString()
+            viewModel.fetchAddressSuggestions(it.toString())
         }
 
-        countryEditText.addTextChangedListener { viewModel.country.value = it.toString() }
-        cityEditText.addTextChangedListener { viewModel.city.value = it.toString() }
-        addressEditText.addTextChangedListener { viewModel.address.value = it.toString() }
-
         nextBtn.setOnClickListener {
             // Сохраняем данные из EditText в LiveData
-            viewModel.country.value = countryEditText.text.toString()
-            viewModel.city.value = cityEditText.text.toString()
             viewModel.address.value = addressEditText.text.toString()
 
             // Выполняем валидацию и сохраняем данные в кэш
@@ -97,4 +76,4 @@ class Fragment2 : Fragment() {
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/ru/otus/basicarchitecture/viewmodels/Fragment2ViewModel.kt b/app/src/main/java/ru/otus/basicarchitecture/viewmodels/Fragment2ViewModel.kt
index 1b2cabd..7468d5c 100644
--- a/app/src/main/java/ru/otus/basicarchitecture/viewmodels/Fragment2ViewModel.kt
+++ b/app/src/main/java/ru/otus/basicarchitecture/viewmodels/Fragment2ViewModel.kt
@@ -1,39 +1,56 @@
 package ru.otus.basicarchitecture.viewmodels
 
-import android.os.Build
-import androidx.annotation.RequiresApi
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
 import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.launch
+import ru.otus.basicarchitecture.network.AddressSuggestionRequest
+import ru.otus.basicarchitecture.network.DadataApiService
 import ru.otus.basicarchitecture.repository.WizardCache
 import javax.inject.Inject
-@RequiresApi(Build.VERSION_CODES.O)
+
 @HiltViewModel
 class Fragment2ViewModel @Inject constructor(private val wizardCache: WizardCache) : ViewModel() {
-    val country = MutableLiveData<String>()
-    val city = MutableLiveData<String>()
-    val address = MutableLiveData<String>()
 
+    val address = MutableLiveData<String>()
     private val _isFormValid = MutableLiveData<Boolean>()
     val isFormValid: LiveData<Boolean> get() = _isFormValid
 
+    private val _addressSuggestions = MutableLiveData<List<String>>()
+    val addressSuggestions: LiveData<List<String>> get() = _addressSuggestions
+
     init {
-        country.observeForever { validateForm() }
-        city.observeForever { validateForm() }
         address.observeForever { validateForm() }
     }
 
     private fun validateForm() {
-        val isCountryValid = !country.value.isNullOrBlank()
-        val isCityValid = !city.value.isNullOrBlank()
         val isAddressValid = !address.value.isNullOrBlank()
-        _isFormValid.value = isCountryValid && isCityValid && isAddressValid
+        _isFormValid.value = isAddressValid
+    }
+
+    fun fetchAddressSuggestions(query: String) {
+        if (query.isBlank()) {
+            _addressSuggestions.value = emptyList()
+            return
+        }
+
+        viewModelScope.launch {
+            try {
+                val response = DadataApiService.api.getAddressSuggestions(AddressSuggestionRequest(query))
+                _addressSuggestions.value = response.suggestions.map { it.value }
+            } catch (e: Exception) {
+                // Обработка ошибок если необходимо
+                _addressSuggestions.value = emptyList()
+            }
+        }
     }
 
     fun saveData() {
-        wizardCache.country = country.value
-        wizardCache.city = city.value
-        wizardCache.address = address.value
+        val addressParts = address.value?.split(",")?.map { it.trim() }
+        wizardCache.country = addressParts?.getOrNull(0)
+        wizardCache.city = addressParts?.getOrNull(1)
+        wizardCache.address = addressParts?.getOrNull(2)
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/res/layout/fragment_fragment2.xml b/app/src/main/res/layout/fragment_fragment2.xml
index f0683b9..5a8aecf 100644
--- a/app/src/main/res/layout/fragment_fragment2.xml
+++ b/app/src/main/res/layout/fragment_fragment2.xml
@@ -1,67 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".ui.fragments.Fragment1">
-
-    <com.google.android.material.textfield.TextInputLayout
-        android:id="@+id/countryEditText"
-        android:layout_width="match_parent"
-        android:layout_height="54dp"
-        android:layout_marginStart="24dp"
-        android:layout_marginTop="24dp"
-        android:layout_marginEnd="24dp"
-        android:hint="Country"
-        android:inputType="text"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
-
-        <com.google.android.material.textfield.TextInputEditText
-            android:id="@+id/country"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:inputType="text"
-            android:maxLines="1"/>
-    </com.google.android.material.textfield.TextInputLayout>
-
-    <com.google.android.material.textfield.TextInputLayout
-        android:id="@+id/cityEditText"
-        android:layout_width="match_parent"
-        android:layout_height="54dp"
-        android:layout_marginStart="24dp"
-        android:layout_marginTop="32dp"
-        android:layout_marginEnd="24dp"
-        android:hint="City"
-        android:inputType="text"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/countryEditText">
-
-        <com.google.android.material.textfield.TextInputEditText
-            android:id="@+id/city"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:inputType="text"
-            android:maxLines="1" />
-    </com.google.android.material.textfield.TextInputLayout>
+    tools:context=".ui.fragments.Fragment2">
 
     <com.google.android.material.textfield.TextInputLayout
         android:id="@+id/addressEditText"
         android:layout_width="match_parent"
-        android:layout_height="54dp"
+        android:layout_height="wrap_content"
         android:layout_marginStart="24dp"
-        android:layout_marginTop="32dp"
+        android:layout_marginTop="24dp"
         android:layout_marginEnd="24dp"
         android:hint="Address"
         android:inputType="text"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/cityEditText">
+        app:layout_constraintTop_toTopOf="parent">
 
-        <com.google.android.material.textfield.TextInputEditText
+        <AutoCompleteTextView
             android:id="@+id/address"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -95,7 +54,6 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent">
-
     </androidx.coordinatorlayout.widget.CoordinatorLayout>
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>

From c393863147e07b12ad58c3e4a012165ed91c4a8b Mon Sep 17 00:00:00 2001
From: nikolay <nazarov.nikolay15@wb.ru>
Date: Fri, 16 Aug 2024 01:01:02 +0300
Subject: [PATCH 29/36] =?UTF-8?q?=D0=93=D0=BE=D1=82=D0=BE=D0=B2=D0=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/res/layout/fragment_fragment2.xml    |  7 ++---
 .../main/res/layout/fragment_fragment4.xml    | 31 +++++++++++++------
 app/src/main/res/layout/tag_item.xml          |  2 +-
 3 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/app/src/main/res/layout/fragment_fragment2.xml b/app/src/main/res/layout/fragment_fragment2.xml
index 5a8aecf..dc78764 100644
--- a/app/src/main/res/layout/fragment_fragment2.xml
+++ b/app/src/main/res/layout/fragment_fragment2.xml
@@ -10,7 +10,7 @@
     <com.google.android.material.textfield.TextInputLayout
         android:id="@+id/addressEditText"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="54dp"
         android:layout_marginStart="24dp"
         android:layout_marginTop="24dp"
         android:layout_marginEnd="24dp"
@@ -23,9 +23,8 @@
         <AutoCompleteTextView
             android:id="@+id/address"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:inputType="text"
-            android:maxLines="1"/>
+            android:layout_height="54dp"
+            android:inputType="text" />
     </com.google.android.material.textfield.TextInputLayout>
 
     <Button
diff --git a/app/src/main/res/layout/fragment_fragment4.xml b/app/src/main/res/layout/fragment_fragment4.xml
index 91eb7ec..9c3bfdf 100644
--- a/app/src/main/res/layout/fragment_fragment4.xml
+++ b/app/src/main/res/layout/fragment_fragment4.xml
@@ -8,91 +8,100 @@
 
     <TextView
         android:id="@+id/tvFirstNameTitle"
-        android:textSize="24sp"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_marginStart="24dp"
         android:layout_marginTop="10dp"
         android:text="Name"
+        android:textSize="20sp"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
     <TextView
         android:id="@+id/tvFirstName"
-        android:textSize="24sp"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_marginStart="24dp"
         android:layout_marginTop="8dp"
         android:text="First Name value"
+        android:textSize="20sp"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/tvFirstNameTitle" />
 
     <TextView
         android:id="@+id/tvLastNameTitle"
-        android:textSize="24sp"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_marginStart="24dp"
         android:layout_marginTop="30dp"
         android:text="Surname"
+        android:textSize="20sp"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/tvFirstName" />
 
     <TextView
         android:id="@+id/tvLastName"
-        android:textSize="24sp"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_marginStart="24dp"
         android:layout_marginTop="8dp"
         android:text="Last Name value"
+        android:textSize="20sp"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/tvLastNameTitle" />
 
     <TextView
         android:id="@+id/tvBirthDateTitle"
-        android:textSize="24sp"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_marginStart="24dp"
         android:layout_marginTop="30dp"
         android:text="Date of Birth"
+        android:textSize="20sp"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/tvLastName" />
 
     <TextView
         android:id="@+id/tvBirthDate"
-        android:textSize="24sp"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_marginStart="24dp"
         android:layout_marginTop="8dp"
         android:text="Birth Date value"
+        android:textSize="20sp"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/tvBirthDateTitle" />
 
     <TextView
         android:id="@+id/tvAddressTitle"
-        android:textSize="24sp"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_marginStart="24dp"
         android:layout_marginTop="30dp"
         android:text="Address"
+        android:textSize="20sp"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/tvBirthDate" />
 
     <TextView
         android:id="@+id/tvAddress"
-        android:textSize="24sp"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_marginStart="24dp"
         android:layout_marginTop="8dp"
         android:text="Address value"
+        android:textSize="20sp"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/tvAddressTitle" />
 
     <TextView
         android:id="@+id/tagFlexboxLayoutTitle"
-        android:textSize="24sp"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_marginStart="24dp"
         android:layout_marginTop="30dp"
         android:text="Interests"
+        android:textSize="20sp"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/tvAddress" />
 
@@ -100,8 +109,12 @@
         android:id="@+id/tagFlexboxLayout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_marginStart="24dp"
         android:layout_marginTop="8dp"
+        android:layout_marginEnd="24dp"
         app:flexWrap="wrap"
         app:justifyContent="flex_start"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/tagFlexboxLayoutTitle" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/tag_item.xml b/app/src/main/res/layout/tag_item.xml
index 0ff94aa..4282488 100644
--- a/app/src/main/res/layout/tag_item.xml
+++ b/app/src/main/res/layout/tag_item.xml
@@ -5,7 +5,7 @@
     android:padding="8dp"
     android:drawablePadding="4dp"
     android:textColor="?android:attr/textColorSecondary"
-    android:textSize="24sp"
+    android:textSize="20sp"
     android:layout_margin="4dp"
     android:background="@drawable/selector_tag_background"
     android:clickable="true"

From 7bb83afbe7205d616dd49e12f13a680fc12080e6 Mon Sep 17 00:00:00 2001
From: nikolay <nazarov.nikolay15@wb.ru>
Date: Fri, 16 Aug 2024 01:22:16 +0300
Subject: [PATCH 30/36] =?UTF-8?q?=D0=93=D0=BE=D1=82=D0=BE=D0=B2=D0=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../network/DadataApiService.kt               |  7 ++-----
 .../repository/WizardCache.kt                 |  2 +-
 .../ui/fragments/Fragment1.kt                 |  1 -
 .../ui/fragments/Fragment2.kt                 | 20 +++++++++----------
 .../ui/fragments/Fragment4.kt                 |  1 -
 .../viewmodels/Fragment1ViewModel.kt          |  4 ----
 .../viewmodels/Fragment2ViewModel.kt          |  1 -
 7 files changed, 13 insertions(+), 23 deletions(-)

diff --git a/app/src/main/java/ru/otus/basicarchitecture/network/DadataApiService.kt b/app/src/main/java/ru/otus/basicarchitecture/network/DadataApiService.kt
index 2d0fc16..e9e9b95 100644
--- a/app/src/main/java/ru/otus/basicarchitecture/network/DadataApiService.kt
+++ b/app/src/main/java/ru/otus/basicarchitecture/network/DadataApiService.kt
@@ -12,12 +12,9 @@ object DadataApiService {
     private const val API_KEY = "8fa10df494b20be347e86fb921643f852a13cc07" // Ваш API ключ Dadata
 
     private val client: OkHttpClient by lazy {
-        // Создаем и настраиваем HttpLoggingInterceptor
         val loggingInterceptor = HttpLoggingInterceptor().apply {
             level = HttpLoggingInterceptor.Level.BODY
         }
-
-        // Создаем Interceptor для добавления заголовка авторизации
         val headerInterceptor = Interceptor { chain ->
             val request = chain.request().newBuilder()
                 .addHeader("Authorization", "Token $API_KEY")
@@ -26,8 +23,8 @@ object DadataApiService {
         }
 
         OkHttpClient.Builder()
-            .addInterceptor(loggingInterceptor)  // Интерсептор логов
-            .addInterceptor(headerInterceptor)   // Интерсептор заголовков
+            .addInterceptor(loggingInterceptor)
+            .addInterceptor(headerInterceptor)
             .connectTimeout(30, TimeUnit.SECONDS)
             .readTimeout(30, TimeUnit.SECONDS)
             .build()
diff --git a/app/src/main/java/ru/otus/basicarchitecture/repository/WizardCache.kt b/app/src/main/java/ru/otus/basicarchitecture/repository/WizardCache.kt
index 60b166e..dbc988a 100644
--- a/app/src/main/java/ru/otus/basicarchitecture/repository/WizardCache.kt
+++ b/app/src/main/java/ru/otus/basicarchitecture/repository/WizardCache.kt
@@ -5,7 +5,7 @@ import javax.inject.Inject
 class WizardCache @Inject constructor() {
     var firstName: String? = null
     var lastName: String? = null
-    var birthDate: String? = null // Лучше использовать Date или LocalDate
+    var birthDate: String? = null
     var country: String? = null
     var city: String? = null
     var address: String? = null
diff --git a/app/src/main/java/ru/otus/basicarchitecture/ui/fragments/Fragment1.kt b/app/src/main/java/ru/otus/basicarchitecture/ui/fragments/Fragment1.kt
index 272beea..7692722 100644
--- a/app/src/main/java/ru/otus/basicarchitecture/ui/fragments/Fragment1.kt
+++ b/app/src/main/java/ru/otus/basicarchitecture/ui/fragments/Fragment1.kt
@@ -92,7 +92,6 @@ class Fragment1 : Fragment() {
             viewModel.lastName.value = lastNameEditText.text.toString()
             viewModel.birthDate.value = birthDateEditText.text.toString()
 
-            // Выполняем валидацию и сохраняем данные в кэш
             if (nextBtn.isEnabled) {
                 viewModel.saveData()
                 parentFragmentManager.beginTransaction()
diff --git a/app/src/main/java/ru/otus/basicarchitecture/ui/fragments/Fragment2.kt b/app/src/main/java/ru/otus/basicarchitecture/ui/fragments/Fragment2.kt
index e82e5ae..cb99c0e 100644
--- a/app/src/main/java/ru/otus/basicarchitecture/ui/fragments/Fragment2.kt
+++ b/app/src/main/java/ru/otus/basicarchitecture/ui/fragments/Fragment2.kt
@@ -42,17 +42,21 @@ class Fragment2 : Fragment() {
         nextBtn = view.findViewById(R.id.fragment2Btn)
         toast = view.findViewById(R.id.toast)
 
-        viewModel.isFormValid.observe(viewLifecycleOwner, Observer { isValid ->
+        viewModel.isFormValid.observe(viewLifecycleOwner) { isValid ->
             nextBtn.isEnabled = isValid
-        })
+        }
 
-        viewModel.addressSuggestions.observe(viewLifecycleOwner, Observer { suggestions ->
-            val adapter = ArrayAdapter(requireContext(), android.R.layout.simple_dropdown_item_1line, suggestions)
+        viewModel.addressSuggestions.observe(viewLifecycleOwner) { suggestions ->
+            val adapter = ArrayAdapter(
+                requireContext(),
+                android.R.layout.simple_dropdown_item_1line,
+                suggestions
+            )
             addressEditText.setAdapter(adapter)
-            if(suggestions.isNotEmpty()) {
+            if (suggestions.isNotEmpty()) {
                 addressEditText.showDropDown()
             }
-        })
+        }
 
         addressEditText.addTextChangedListener {
             viewModel.address.value = it.toString()
@@ -60,17 +64,13 @@ class Fragment2 : Fragment() {
         }
 
         nextBtn.setOnClickListener {
-            // Сохраняем данные из EditText в LiveData
             viewModel.address.value = addressEditText.text.toString()
-
-            // Выполняем валидацию и сохраняем данные в кэш
             if (nextBtn.isEnabled) {
                 viewModel.saveData()
                 parentFragmentManager.beginTransaction()
                     .replace(R.id.fragment_container, Fragment3())
                     .addToBackStack(null)
                     .commit()
-                // Здесь можно перейти на следующий фрагмент или завершить процесс анкеты
             } else {
                 Snackbar.make(toast, "Валидация не пройдена", Snackbar.LENGTH_SHORT).show()
             }
diff --git a/app/src/main/java/ru/otus/basicarchitecture/ui/fragments/Fragment4.kt b/app/src/main/java/ru/otus/basicarchitecture/ui/fragments/Fragment4.kt
index 6bcf3dc..e84f59b 100644
--- a/app/src/main/java/ru/otus/basicarchitecture/ui/fragments/Fragment4.kt
+++ b/app/src/main/java/ru/otus/basicarchitecture/ui/fragments/Fragment4.kt
@@ -43,7 +43,6 @@ class Fragment4 : Fragment() {
         birthDateTextView.text = viewModel.birthDate ?: "N/A"
         addressTextView.text = viewModel.fullAddress
 
-        // Отобразить интересы
         viewModel.interests.forEach { interest ->
             val tagView = createTagView(interest)
             tagFlexboxLayout.addView(tagView)
diff --git a/app/src/main/java/ru/otus/basicarchitecture/viewmodels/Fragment1ViewModel.kt b/app/src/main/java/ru/otus/basicarchitecture/viewmodels/Fragment1ViewModel.kt
index 5c3e2e9..6539fea 100644
--- a/app/src/main/java/ru/otus/basicarchitecture/viewmodels/Fragment1ViewModel.kt
+++ b/app/src/main/java/ru/otus/basicarchitecture/viewmodels/Fragment1ViewModel.kt
@@ -27,9 +27,6 @@ class Fragment1ViewModel @Inject constructor(private val wizardCache: WizardCach
     val isFormValid: LiveData<Boolean> get() = _isFormValid
 
     init {
-        val formatter = DateTimeFormatter.ofPattern("dd.MM.yyyy")
-        val today = LocalDate.now()
-
         firstName.observeForever { validateForm() }
         lastName.observeForever { validateForm() }
         birthDate.observeForever { validateForm() }
@@ -58,7 +55,6 @@ class Fragment1ViewModel @Inject constructor(private val wizardCache: WizardCach
     }
 
     fun validateInput(): Boolean {
-        // Валидация имени, фамилии и возраста
         return !firstName.value.isNullOrEmpty() && !lastName.value.isNullOrEmpty() && isAgeValid(birthDate.value)
     }
 
diff --git a/app/src/main/java/ru/otus/basicarchitecture/viewmodels/Fragment2ViewModel.kt b/app/src/main/java/ru/otus/basicarchitecture/viewmodels/Fragment2ViewModel.kt
index 7468d5c..7048e9f 100644
--- a/app/src/main/java/ru/otus/basicarchitecture/viewmodels/Fragment2ViewModel.kt
+++ b/app/src/main/java/ru/otus/basicarchitecture/viewmodels/Fragment2ViewModel.kt
@@ -41,7 +41,6 @@ class Fragment2ViewModel @Inject constructor(private val wizardCache: WizardCach
                 val response = DadataApiService.api.getAddressSuggestions(AddressSuggestionRequest(query))
                 _addressSuggestions.value = response.suggestions.map { it.value }
             } catch (e: Exception) {
-                // Обработка ошибок если необходимо
                 _addressSuggestions.value = emptyList()
             }
         }

From 443ea670cd9d97bee9fd95a900efe72c37c26aca Mon Sep 17 00:00:00 2001
From: nikolay <nazarov.nikolay15@wb.ru>
Date: Fri, 16 Aug 2024 01:25:07 +0300
Subject: [PATCH 31/36] =?UTF-8?q?=D0=93=D0=BE=D1=82=D0=BE=D0=B2=D0=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/ru/otus/basicarchitecture/model/InputData.kt    | 3 ---
 .../java/ru/otus/basicarchitecture/ui/MainActivity.kt    | 2 +-
 .../ru/otus/basicarchitecture/ui/fragments/Fragment3.kt  | 1 -
 .../otus/basicarchitecture/viewmodels/MainViewModel.kt   | 9 ---------
 4 files changed, 1 insertion(+), 14 deletions(-)
 delete mode 100644 app/src/main/java/ru/otus/basicarchitecture/model/InputData.kt

diff --git a/app/src/main/java/ru/otus/basicarchitecture/model/InputData.kt b/app/src/main/java/ru/otus/basicarchitecture/model/InputData.kt
deleted file mode 100644
index 803040e..0000000
--- a/app/src/main/java/ru/otus/basicarchitecture/model/InputData.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package ru.otus.basicarchitecture.model
-
-data class InputData(val textInput: String)
\ No newline at end of file
diff --git a/app/src/main/java/ru/otus/basicarchitecture/ui/MainActivity.kt b/app/src/main/java/ru/otus/basicarchitecture/ui/MainActivity.kt
index 69ea9ac..7f81a47 100644
--- a/app/src/main/java/ru/otus/basicarchitecture/ui/MainActivity.kt
+++ b/app/src/main/java/ru/otus/basicarchitecture/ui/MainActivity.kt
@@ -21,7 +21,7 @@ class MainActivity : AppCompatActivity() {
     private fun loadFragment(fragment: Fragment) {
         val transaction = supportFragmentManager.beginTransaction()
         transaction.replace(R.id.fragment_container, fragment)
-        transaction.addToBackStack("null") // Добавляем в стек для навигации
+        transaction.addToBackStack("null")
         transaction.commit()
     }
 
diff --git a/app/src/main/java/ru/otus/basicarchitecture/ui/fragments/Fragment3.kt b/app/src/main/java/ru/otus/basicarchitecture/ui/fragments/Fragment3.kt
index 8ae5435..ab0dabb 100644
--- a/app/src/main/java/ru/otus/basicarchitecture/ui/fragments/Fragment3.kt
+++ b/app/src/main/java/ru/otus/basicarchitecture/ui/fragments/Fragment3.kt
@@ -45,7 +45,6 @@ class Fragment3 : Fragment() {
                 .commit()
         }
 
-        // Добавить теги в FlexboxLayout
         viewModel.interests.forEach { interest ->
             val tagView = createTagView(interest)
             tagView.setOnClickListener {
diff --git a/app/src/main/java/ru/otus/basicarchitecture/viewmodels/MainViewModel.kt b/app/src/main/java/ru/otus/basicarchitecture/viewmodels/MainViewModel.kt
index 45babd5..55fab00 100644
--- a/app/src/main/java/ru/otus/basicarchitecture/viewmodels/MainViewModel.kt
+++ b/app/src/main/java/ru/otus/basicarchitecture/viewmodels/MainViewModel.kt
@@ -1,16 +1,7 @@
 package ru.otus.basicarchitecture.viewmodels
 
-import androidx.lifecycle.LiveData
-import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
-import ru.otus.basicarchitecture.model.InputData
 import javax.inject.Inject
 
 class MainViewModel @Inject constructor() : ViewModel() {
-    private val _inputData = MutableLiveData<InputData>()
-    val inputData: LiveData<InputData> get() = _inputData
-
-    fun setInputData(data: InputData) {
-        _inputData.value = data
-    }
 }
\ No newline at end of file

From e748ec7684a18b2dced4221645aa1c7de0c9f5f1 Mon Sep 17 00:00:00 2001
From: nikolay <nazarov.nikolay15@wb.ru>
Date: Fri, 16 Aug 2024 01:29:03 +0300
Subject: [PATCH 32/36] =?UTF-8?q?=D0=A1=D0=B4=D0=B5=D0=BB=D0=B0=D0=BB=20ne?=
 =?UTF-8?q?twork?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/ru/otus/basicarchitecture/viewmodels/MainViewModel.kt   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/java/ru/otus/basicarchitecture/viewmodels/MainViewModel.kt b/app/src/main/java/ru/otus/basicarchitecture/viewmodels/MainViewModel.kt
index 55fab00..0cbe513 100644
--- a/app/src/main/java/ru/otus/basicarchitecture/viewmodels/MainViewModel.kt
+++ b/app/src/main/java/ru/otus/basicarchitecture/viewmodels/MainViewModel.kt
@@ -4,4 +4,5 @@ import androidx.lifecycle.ViewModel
 import javax.inject.Inject
 
 class MainViewModel @Inject constructor() : ViewModel() {
+
 }
\ No newline at end of file

From baad60901237e404b8699a6395793844b2373198 Mon Sep 17 00:00:00 2001
From: nikolay <nazarov.nikolay15@wb.ru>
Date: Fri, 16 Aug 2024 01:35:35 +0300
Subject: [PATCH 33/36] =?UTF-8?q?=D0=9F=D0=BE=D0=BF=D1=80=D0=B0=D0=B2?=
 =?UTF-8?q?=D0=B8=D0=BB=20=D0=BC=D0=B0=D1=81=D1=82=D0=B5=D1=80=20=D0=B2?=
 =?UTF-8?q?=D0=B5=D1=82=D0=BA=D1=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../repository/WizardCache.kt                 |  2 +-
 .../otus/basicarchitecture/ui/MainActivity.kt |  4 +--
 .../ui/fragments/Fragment1.kt                 |  1 -
 .../ui/fragments/Fragment2.kt                 |  5 ----
 .../ui/fragments/Fragment3.kt                 |  1 -
 .../ui/fragments/Fragment4.kt                 |  1 -
 .../viewmodels/Fragment1ViewModel.kt          | 29 -------------------
 .../viewmodels/MainViewModel.kt               |  9 ------
 8 files changed, 2 insertions(+), 50 deletions(-)

diff --git a/app/src/main/java/ru/otus/basicarchitecture/repository/WizardCache.kt b/app/src/main/java/ru/otus/basicarchitecture/repository/WizardCache.kt
index 60b166e..dbc988a 100644
--- a/app/src/main/java/ru/otus/basicarchitecture/repository/WizardCache.kt
+++ b/app/src/main/java/ru/otus/basicarchitecture/repository/WizardCache.kt
@@ -5,7 +5,7 @@ import javax.inject.Inject
 class WizardCache @Inject constructor() {
     var firstName: String? = null
     var lastName: String? = null
-    var birthDate: String? = null // Лучше использовать Date или LocalDate
+    var birthDate: String? = null
     var country: String? = null
     var city: String? = null
     var address: String? = null
diff --git a/app/src/main/java/ru/otus/basicarchitecture/ui/MainActivity.kt b/app/src/main/java/ru/otus/basicarchitecture/ui/MainActivity.kt
index 69ea9ac..680f833 100644
--- a/app/src/main/java/ru/otus/basicarchitecture/ui/MainActivity.kt
+++ b/app/src/main/java/ru/otus/basicarchitecture/ui/MainActivity.kt
@@ -10,8 +10,6 @@ import ru.otus.basicarchitecture.R
 import ru.otus.basicarchitecture.viewmodels.MainViewModel
 @AndroidEntryPoint
 class MainActivity : AppCompatActivity() {
-
-    private val viewModel: MainViewModel by viewModels()
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main)
@@ -21,7 +19,7 @@ class MainActivity : AppCompatActivity() {
     private fun loadFragment(fragment: Fragment) {
         val transaction = supportFragmentManager.beginTransaction()
         transaction.replace(R.id.fragment_container, fragment)
-        transaction.addToBackStack("null") // Добавляем в стек для навигации
+        transaction.addToBackStack("null")
         transaction.commit()
     }
 
diff --git a/app/src/main/java/ru/otus/basicarchitecture/ui/fragments/Fragment1.kt b/app/src/main/java/ru/otus/basicarchitecture/ui/fragments/Fragment1.kt
index 272beea..7692722 100644
--- a/app/src/main/java/ru/otus/basicarchitecture/ui/fragments/Fragment1.kt
+++ b/app/src/main/java/ru/otus/basicarchitecture/ui/fragments/Fragment1.kt
@@ -92,7 +92,6 @@ class Fragment1 : Fragment() {
             viewModel.lastName.value = lastNameEditText.text.toString()
             viewModel.birthDate.value = birthDateEditText.text.toString()
 
-            // Выполняем валидацию и сохраняем данные в кэш
             if (nextBtn.isEnabled) {
                 viewModel.saveData()
                 parentFragmentManager.beginTransaction()
diff --git a/app/src/main/java/ru/otus/basicarchitecture/ui/fragments/Fragment2.kt b/app/src/main/java/ru/otus/basicarchitecture/ui/fragments/Fragment2.kt
index d4a7d0f..f37c777 100644
--- a/app/src/main/java/ru/otus/basicarchitecture/ui/fragments/Fragment2.kt
+++ b/app/src/main/java/ru/otus/basicarchitecture/ui/fragments/Fragment2.kt
@@ -11,12 +11,10 @@ import android.widget.Button
 import android.widget.EditText
 import androidx.annotation.RequiresApi
 import androidx.core.widget.addTextChangedListener
-import androidx.lifecycle.Observer
 import com.google.android.material.snackbar.Snackbar
 import dagger.hilt.android.AndroidEntryPoint
 import ru.otus.basicarchitecture.R
 import ru.otus.basicarchitecture.viewmodels.Fragment2ViewModel
-import ru.otus.basicarchitecture.viewmodels.MainViewModel
 
 @AndroidEntryPoint
 class Fragment2 : Fragment() {
@@ -79,19 +77,16 @@ class Fragment2 : Fragment() {
         addressEditText.addTextChangedListener { viewModel.address.value = it.toString() }
 
         nextBtn.setOnClickListener {
-            // Сохраняем данные из EditText в LiveData
             viewModel.country.value = countryEditText.text.toString()
             viewModel.city.value = cityEditText.text.toString()
             viewModel.address.value = addressEditText.text.toString()
 
-            // Выполняем валидацию и сохраняем данные в кэш
             if (nextBtn.isEnabled) {
                 viewModel.saveData()
                 parentFragmentManager.beginTransaction()
                     .replace(R.id.fragment_container, Fragment3())
                     .addToBackStack(null)
                     .commit()
-                // Здесь можно перейти на следующий фрагмент или завершить процесс анкеты
             } else {
                 Snackbar.make(toast, "Валидация не пройдена", Snackbar.LENGTH_SHORT).show()
             }
diff --git a/app/src/main/java/ru/otus/basicarchitecture/ui/fragments/Fragment3.kt b/app/src/main/java/ru/otus/basicarchitecture/ui/fragments/Fragment3.kt
index 8ae5435..ab0dabb 100644
--- a/app/src/main/java/ru/otus/basicarchitecture/ui/fragments/Fragment3.kt
+++ b/app/src/main/java/ru/otus/basicarchitecture/ui/fragments/Fragment3.kt
@@ -45,7 +45,6 @@ class Fragment3 : Fragment() {
                 .commit()
         }
 
-        // Добавить теги в FlexboxLayout
         viewModel.interests.forEach { interest ->
             val tagView = createTagView(interest)
             tagView.setOnClickListener {
diff --git a/app/src/main/java/ru/otus/basicarchitecture/ui/fragments/Fragment4.kt b/app/src/main/java/ru/otus/basicarchitecture/ui/fragments/Fragment4.kt
index 6bcf3dc..e84f59b 100644
--- a/app/src/main/java/ru/otus/basicarchitecture/ui/fragments/Fragment4.kt
+++ b/app/src/main/java/ru/otus/basicarchitecture/ui/fragments/Fragment4.kt
@@ -43,7 +43,6 @@ class Fragment4 : Fragment() {
         birthDateTextView.text = viewModel.birthDate ?: "N/A"
         addressTextView.text = viewModel.fullAddress
 
-        // Отобразить интересы
         viewModel.interests.forEach { interest ->
             val tagView = createTagView(interest)
             tagFlexboxLayout.addView(tagView)
diff --git a/app/src/main/java/ru/otus/basicarchitecture/viewmodels/Fragment1ViewModel.kt b/app/src/main/java/ru/otus/basicarchitecture/viewmodels/Fragment1ViewModel.kt
index 5c3e2e9..bdfc572 100644
--- a/app/src/main/java/ru/otus/basicarchitecture/viewmodels/Fragment1ViewModel.kt
+++ b/app/src/main/java/ru/otus/basicarchitecture/viewmodels/Fragment1ViewModel.kt
@@ -7,13 +7,9 @@ import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import dagger.hilt.android.lifecycle.HiltViewModel
 import ru.otus.basicarchitecture.repository.WizardCache
-import java.text.ParseException
-import java.text.SimpleDateFormat
 import java.time.LocalDate
 import java.time.format.DateTimeFormatter
 import java.time.temporal.ChronoUnit
-import java.util.Calendar
-import java.util.Locale
 import javax.inject.Inject
 @RequiresApi(Build.VERSION_CODES.O)
 @HiltViewModel
@@ -27,8 +23,6 @@ class Fragment1ViewModel @Inject constructor(private val wizardCache: WizardCach
     val isFormValid: LiveData<Boolean> get() = _isFormValid
 
     init {
-        val formatter = DateTimeFormatter.ofPattern("dd.MM.yyyy")
-        val today = LocalDate.now()
 
         firstName.observeForever { validateForm() }
         lastName.observeForever { validateForm() }
@@ -57,27 +51,4 @@ class Fragment1ViewModel @Inject constructor(private val wizardCache: WizardCach
         wizardCache.birthDate = birthDate.value
     }
 
-    fun validateInput(): Boolean {
-        // Валидация имени, фамилии и возраста
-        return !firstName.value.isNullOrEmpty() && !lastName.value.isNullOrEmpty() && isAgeValid(birthDate.value)
-    }
-
-    private fun isAgeValid(birthDate: String?): Boolean {
-        if (birthDate.isNullOrEmpty()) return false
-
-        val dateFormat = SimpleDateFormat("dd.MM.yyyy", Locale.getDefault())
-        return try {
-            val birthDateParsed = dateFormat.parse(birthDate)
-            val age = Calendar.getInstance().get(Calendar.YEAR) - Calendar.getInstance().apply {
-                if (birthDateParsed != null) {
-                    time = birthDateParsed
-                }
-            }.get(Calendar.YEAR)
-
-            age >= 18
-        } catch (e: ParseException) {
-            false
-        }
-    }
-
 }
\ No newline at end of file
diff --git a/app/src/main/java/ru/otus/basicarchitecture/viewmodels/MainViewModel.kt b/app/src/main/java/ru/otus/basicarchitecture/viewmodels/MainViewModel.kt
index 45babd5..55fab00 100644
--- a/app/src/main/java/ru/otus/basicarchitecture/viewmodels/MainViewModel.kt
+++ b/app/src/main/java/ru/otus/basicarchitecture/viewmodels/MainViewModel.kt
@@ -1,16 +1,7 @@
 package ru.otus.basicarchitecture.viewmodels
 
-import androidx.lifecycle.LiveData
-import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
-import ru.otus.basicarchitecture.model.InputData
 import javax.inject.Inject
 
 class MainViewModel @Inject constructor() : ViewModel() {
-    private val _inputData = MutableLiveData<InputData>()
-    val inputData: LiveData<InputData> get() = _inputData
-
-    fun setInputData(data: InputData) {
-        _inputData.value = data
-    }
 }
\ No newline at end of file

From 16a581d75bab72794857774d97ee87f00a246341 Mon Sep 17 00:00:00 2001
From: nikolay <nazarov.nikolay15@wb.ru>
Date: Fri, 16 Aug 2024 01:39:51 +0300
Subject: [PATCH 34/36] =?UTF-8?q?=D0=A3=D0=B1=D1=80=D0=B0=D0=BB=20=D0=BB?=
 =?UTF-8?q?=D0=B8=D1=88=D0=BD=D0=B5=D0=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../basicarchitecture/di/MyApplication.kt     |  3 +--
 .../network/DadataApiService.kt               |  2 +-
 .../otus/basicarchitecture/ui/MainActivity.kt |  4 ---
 .../ui/fragments/Fragment2.kt                 |  1 -
 .../viewmodels/Fragment1ViewModel.kt          | 26 -------------------
 .../viewmodels/MainViewModel.kt               |  4 +--
 6 files changed, 3 insertions(+), 37 deletions(-)

diff --git a/app/src/main/java/ru/otus/basicarchitecture/di/MyApplication.kt b/app/src/main/java/ru/otus/basicarchitecture/di/MyApplication.kt
index 9bba04d..f829e8e 100644
--- a/app/src/main/java/ru/otus/basicarchitecture/di/MyApplication.kt
+++ b/app/src/main/java/ru/otus/basicarchitecture/di/MyApplication.kt
@@ -10,8 +10,7 @@ import ru.otus.basicarchitecture.repository.WizardCache
 import javax.inject.Singleton
 
 @HiltAndroidApp
-class MyApplication : Application() {
-}
+class MyApplication : Application()
 
 @InstallIn(SingletonComponent::class)
 @Module
diff --git a/app/src/main/java/ru/otus/basicarchitecture/network/DadataApiService.kt b/app/src/main/java/ru/otus/basicarchitecture/network/DadataApiService.kt
index e9e9b95..6ee23e4 100644
--- a/app/src/main/java/ru/otus/basicarchitecture/network/DadataApiService.kt
+++ b/app/src/main/java/ru/otus/basicarchitecture/network/DadataApiService.kt
@@ -9,7 +9,7 @@ import java.util.concurrent.TimeUnit
 
 object DadataApiService {
     private const val BASE_URL = "https://suggestions.dadata.ru/"
-    private const val API_KEY = "8fa10df494b20be347e86fb921643f852a13cc07" // Ваш API ключ Dadata
+    private const val API_KEY = "8fa10df494b20be347e86fb921643f852a13cc07"
 
     private val client: OkHttpClient by lazy {
         val loggingInterceptor = HttpLoggingInterceptor().apply {
diff --git a/app/src/main/java/ru/otus/basicarchitecture/ui/MainActivity.kt b/app/src/main/java/ru/otus/basicarchitecture/ui/MainActivity.kt
index 7f81a47..a49d853 100644
--- a/app/src/main/java/ru/otus/basicarchitecture/ui/MainActivity.kt
+++ b/app/src/main/java/ru/otus/basicarchitecture/ui/MainActivity.kt
@@ -2,16 +2,12 @@ package ru.otus.basicarchitecture.ui
 
 import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
-import androidx.activity.viewModels
 import androidx.fragment.app.Fragment
 import dagger.hilt.android.AndroidEntryPoint
 import ru.otus.basicarchitecture.ui.fragments.Fragment1
 import ru.otus.basicarchitecture.R
-import ru.otus.basicarchitecture.viewmodels.MainViewModel
 @AndroidEntryPoint
 class MainActivity : AppCompatActivity() {
-
-    private val viewModel: MainViewModel by viewModels()
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main)
diff --git a/app/src/main/java/ru/otus/basicarchitecture/ui/fragments/Fragment2.kt b/app/src/main/java/ru/otus/basicarchitecture/ui/fragments/Fragment2.kt
index cb99c0e..878347b 100644
--- a/app/src/main/java/ru/otus/basicarchitecture/ui/fragments/Fragment2.kt
+++ b/app/src/main/java/ru/otus/basicarchitecture/ui/fragments/Fragment2.kt
@@ -12,7 +12,6 @@ import androidx.annotation.RequiresApi
 import androidx.core.widget.addTextChangedListener
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.viewModels
-import androidx.lifecycle.Observer
 import com.google.android.material.snackbar.Snackbar
 import dagger.hilt.android.AndroidEntryPoint
 import ru.otus.basicarchitecture.R
diff --git a/app/src/main/java/ru/otus/basicarchitecture/viewmodels/Fragment1ViewModel.kt b/app/src/main/java/ru/otus/basicarchitecture/viewmodels/Fragment1ViewModel.kt
index 6539fea..ad1b8aa 100644
--- a/app/src/main/java/ru/otus/basicarchitecture/viewmodels/Fragment1ViewModel.kt
+++ b/app/src/main/java/ru/otus/basicarchitecture/viewmodels/Fragment1ViewModel.kt
@@ -7,13 +7,9 @@ import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import dagger.hilt.android.lifecycle.HiltViewModel
 import ru.otus.basicarchitecture.repository.WizardCache
-import java.text.ParseException
-import java.text.SimpleDateFormat
 import java.time.LocalDate
 import java.time.format.DateTimeFormatter
 import java.time.temporal.ChronoUnit
-import java.util.Calendar
-import java.util.Locale
 import javax.inject.Inject
 @RequiresApi(Build.VERSION_CODES.O)
 @HiltViewModel
@@ -54,26 +50,4 @@ class Fragment1ViewModel @Inject constructor(private val wizardCache: WizardCach
         wizardCache.birthDate = birthDate.value
     }
 
-    fun validateInput(): Boolean {
-        return !firstName.value.isNullOrEmpty() && !lastName.value.isNullOrEmpty() && isAgeValid(birthDate.value)
-    }
-
-    private fun isAgeValid(birthDate: String?): Boolean {
-        if (birthDate.isNullOrEmpty()) return false
-
-        val dateFormat = SimpleDateFormat("dd.MM.yyyy", Locale.getDefault())
-        return try {
-            val birthDateParsed = dateFormat.parse(birthDate)
-            val age = Calendar.getInstance().get(Calendar.YEAR) - Calendar.getInstance().apply {
-                if (birthDateParsed != null) {
-                    time = birthDateParsed
-                }
-            }.get(Calendar.YEAR)
-
-            age >= 18
-        } catch (e: ParseException) {
-            false
-        }
-    }
-
 }
\ No newline at end of file
diff --git a/app/src/main/java/ru/otus/basicarchitecture/viewmodels/MainViewModel.kt b/app/src/main/java/ru/otus/basicarchitecture/viewmodels/MainViewModel.kt
index 0cbe513..1b62a0c 100644
--- a/app/src/main/java/ru/otus/basicarchitecture/viewmodels/MainViewModel.kt
+++ b/app/src/main/java/ru/otus/basicarchitecture/viewmodels/MainViewModel.kt
@@ -3,6 +3,4 @@ package ru.otus.basicarchitecture.viewmodels
 import androidx.lifecycle.ViewModel
 import javax.inject.Inject
 
-class MainViewModel @Inject constructor() : ViewModel() {
-
-}
\ No newline at end of file
+class MainViewModel @Inject constructor() : ViewModel()
\ No newline at end of file

From 9625b661593b0d84afac56324b0ce3b72d111a70 Mon Sep 17 00:00:00 2001
From: nikolay <nazarov.nikolay15@wb.ru>
Date: Fri, 16 Aug 2024 01:50:09 +0300
Subject: [PATCH 35/36] =?UTF-8?q?=D0=A1=D0=BC=D0=B5=D1=80=D0=B4=D0=B6?=
 =?UTF-8?q?=D0=B8=D0=BB=20=D0=B2=D1=81=D0=B5=20=D0=B2=20=D0=BE=D0=B4=D0=BD?=
 =?UTF-8?q?=D0=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/java/ru/otus/basicarchitecture/ui/MainActivity.kt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/java/ru/otus/basicarchitecture/ui/MainActivity.kt b/app/src/main/java/ru/otus/basicarchitecture/ui/MainActivity.kt
index a49d853..b1a5120 100644
--- a/app/src/main/java/ru/otus/basicarchitecture/ui/MainActivity.kt
+++ b/app/src/main/java/ru/otus/basicarchitecture/ui/MainActivity.kt
@@ -19,6 +19,7 @@ class MainActivity : AppCompatActivity() {
         transaction.replace(R.id.fragment_container, fragment)
         transaction.addToBackStack("null")
         transaction.commit()
+
     }
 
 }
\ No newline at end of file

From 7a80a1b5579ca14eb4beb2194c402b20eac99395 Mon Sep 17 00:00:00 2001
From: nikolay <nazarov.nikolay15@wb.ru>
Date: Fri, 16 Aug 2024 11:27:11 +0300
Subject: [PATCH 36/36] =?UTF-8?q?=D0=A1=D0=BF=D1=80=D1=8F=D1=82=D0=B0?=
 =?UTF-8?q?=D0=BB=20=D0=BA=D0=BB=D1=8E=D1=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle                                          | 8 +++++++-
 .../ru/otus/basicarchitecture/network/DadataApiService.kt | 3 ++-
 gradle.properties                                         | 3 ++-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 7918184..81479e5 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -7,7 +7,11 @@ plugins {
 
 android {
     namespace 'ru.otus.basicarchitecture'
-    compileSdk 34
+    compileSdk 33
+
+    buildFeatures {
+        buildConfig = true
+    }
 
     defaultConfig {
         applicationId "ru.otus.basicarchitecture"
@@ -17,6 +21,8 @@ android {
         versionName "1.0"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+
+        buildConfigField("String", "DADATA_API_KEY", "\"${project.DADATA_API_KEY}\"")
     }
 
     buildTypes {
diff --git a/app/src/main/java/ru/otus/basicarchitecture/network/DadataApiService.kt b/app/src/main/java/ru/otus/basicarchitecture/network/DadataApiService.kt
index 6ee23e4..596e587 100644
--- a/app/src/main/java/ru/otus/basicarchitecture/network/DadataApiService.kt
+++ b/app/src/main/java/ru/otus/basicarchitecture/network/DadataApiService.kt
@@ -5,11 +5,12 @@ import okhttp3.OkHttpClient
 import okhttp3.logging.HttpLoggingInterceptor
 import retrofit2.Retrofit
 import retrofit2.converter.gson.GsonConverterFactory
+import ru.otus.basicarchitecture.BuildConfig
 import java.util.concurrent.TimeUnit
 
 object DadataApiService {
     private const val BASE_URL = "https://suggestions.dadata.ru/"
-    private const val API_KEY = "8fa10df494b20be347e86fb921643f852a13cc07"
+    private const val API_KEY = BuildConfig.DADATA_API_KEY
 
     private val client: OkHttpClient by lazy {
         val loggingInterceptor = HttpLoggingInterceptor().apply {
diff --git a/gradle.properties b/gradle.properties
index 3c5031e..01c3b67 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -20,4 +20,5 @@ kotlin.code.style=official
 # Enables namespacing of each library's R class so that its R class includes only the
 # resources declared in the library itself and none from the library's dependencies,
 # thereby reducing the size of the R class for that library
-android.nonTransitiveRClass=true
\ No newline at end of file
+android.nonTransitiveRClass=true
+DADATA_API_KEY=8fa10df494b20be347e86fb921643f852a13cc07
\ No newline at end of file