From ebe766796c9a0994ab7d822917070f41bef07a17 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9A=D0=BE=D0=B7=D1=8B=D1=80=D0=B5=D0=B2=20=D0=90=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= <amk2921@yandex.ru>
Date: Fri, 12 Jan 2024 12:01:25 +0300
Subject: [PATCH 1/9] create domain layer

---
 app/src/main/AndroidManifest.xml              |  2 +-
 .../basicarchitecture/data/WizardCache.kt     |  8 ++
 .../basicarchitecture/domain/Model/Address.kt |  7 ++
 .../domain/Model/Interests.kt                 |  5 ++
 .../basicarchitecture/domain/Model/Person.kt  |  7 ++
 .../basicarchitecture/domain/Repository.kt    |  4 +
 .../domain/getData/GetAddressPerson.kt        |  4 +
 .../domain/getData/GetAllInterestsUseCase.kt  |  4 +
 .../domain/getData/GetInfoPersonUseCase.kt    |  4 +
 .../getData/GetInterestsPersonUseCase.kt      |  4 +
 .../domain/getData/GetPersonsUseCase.kt       |  4 +
 .../domain/setData/SetAddressUseCase.kt       |  9 ++
 .../setData/SetInterestsPersonUseCase.kt      | 10 +++
 .../domain/setData/SetPersonUseCase.kt        | 11 +++
 .../{ => presentation}/MainActivity.kt        |  3 +-
 app/src/main/res/drawable/calendar.xml        |  5 ++
 app/src/main/res/layout/activity_main.xml     |  5 +-
 .../res/layout/first_and_second_screen.xml    | 83 +++++++++++++++++++
 app/src/main/res/values/colors.xml            |  2 +
 app/src/main/res/values/strings.xml           |  4 +
 20 files changed, 181 insertions(+), 4 deletions(-)
 create mode 100644 app/src/main/java/ru/otus/basicarchitecture/data/WizardCache.kt
 create mode 100644 app/src/main/java/ru/otus/basicarchitecture/domain/Model/Address.kt
 create mode 100644 app/src/main/java/ru/otus/basicarchitecture/domain/Model/Interests.kt
 create mode 100644 app/src/main/java/ru/otus/basicarchitecture/domain/Model/Person.kt
 create mode 100644 app/src/main/java/ru/otus/basicarchitecture/domain/Repository.kt
 create mode 100644 app/src/main/java/ru/otus/basicarchitecture/domain/getData/GetAddressPerson.kt
 create mode 100644 app/src/main/java/ru/otus/basicarchitecture/domain/getData/GetAllInterestsUseCase.kt
 create mode 100644 app/src/main/java/ru/otus/basicarchitecture/domain/getData/GetInfoPersonUseCase.kt
 create mode 100644 app/src/main/java/ru/otus/basicarchitecture/domain/getData/GetInterestsPersonUseCase.kt
 create mode 100644 app/src/main/java/ru/otus/basicarchitecture/domain/getData/GetPersonsUseCase.kt
 create mode 100644 app/src/main/java/ru/otus/basicarchitecture/domain/setData/SetAddressUseCase.kt
 create mode 100644 app/src/main/java/ru/otus/basicarchitecture/domain/setData/SetInterestsPersonUseCase.kt
 create mode 100644 app/src/main/java/ru/otus/basicarchitecture/domain/setData/SetPersonUseCase.kt
 rename app/src/main/java/ru/otus/basicarchitecture/{ => presentation}/MainActivity.kt (76%)
 create mode 100644 app/src/main/res/drawable/calendar.xml
 create mode 100644 app/src/main/res/layout/first_and_second_screen.xml

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 1e81fea..80369e1 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=".MainActivity"
+            android:name=".presentation.MainActivity"
             android:exported="false" />
     </application>
 
diff --git a/app/src/main/java/ru/otus/basicarchitecture/data/WizardCache.kt b/app/src/main/java/ru/otus/basicarchitecture/data/WizardCache.kt
new file mode 100644
index 0000000..cf80929
--- /dev/null
+++ b/app/src/main/java/ru/otus/basicarchitecture/data/WizardCache.kt
@@ -0,0 +1,8 @@
+package ru.otus.basicarchitecture.data
+
+class WizardCache {
+
+    private val _listInterests: List<String> = emptyList()
+
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/ru/otus/basicarchitecture/domain/Model/Address.kt b/app/src/main/java/ru/otus/basicarchitecture/domain/Model/Address.kt
new file mode 100644
index 0000000..6e2ec6e
--- /dev/null
+++ b/app/src/main/java/ru/otus/basicarchitecture/domain/Model/Address.kt
@@ -0,0 +1,7 @@
+package ru.otus.basicarchitecture.domain.Model
+
+data class Address(
+    val country: String,
+    val city: String,
+    val address: String
+)
\ No newline at end of file
diff --git a/app/src/main/java/ru/otus/basicarchitecture/domain/Model/Interests.kt b/app/src/main/java/ru/otus/basicarchitecture/domain/Model/Interests.kt
new file mode 100644
index 0000000..c8f6b7b
--- /dev/null
+++ b/app/src/main/java/ru/otus/basicarchitecture/domain/Model/Interests.kt
@@ -0,0 +1,5 @@
+package ru.otus.basicarchitecture.domain.Model
+
+data class Interests (
+    val interests:  String
+)
\ No newline at end of file
diff --git a/app/src/main/java/ru/otus/basicarchitecture/domain/Model/Person.kt b/app/src/main/java/ru/otus/basicarchitecture/domain/Model/Person.kt
new file mode 100644
index 0000000..69e5f7f
--- /dev/null
+++ b/app/src/main/java/ru/otus/basicarchitecture/domain/Model/Person.kt
@@ -0,0 +1,7 @@
+package ru.otus.basicarchitecture.domain.Model
+
+data class Person(
+    val firstName: String,
+    val surName: String,
+    val dateOfBirth: String
+)
\ No newline at end of file
diff --git a/app/src/main/java/ru/otus/basicarchitecture/domain/Repository.kt b/app/src/main/java/ru/otus/basicarchitecture/domain/Repository.kt
new file mode 100644
index 0000000..455b0e3
--- /dev/null
+++ b/app/src/main/java/ru/otus/basicarchitecture/domain/Repository.kt
@@ -0,0 +1,4 @@
+package ru.otus.basicarchitecture.domain
+
+interface Repository {
+}
\ No newline at end of file
diff --git a/app/src/main/java/ru/otus/basicarchitecture/domain/getData/GetAddressPerson.kt b/app/src/main/java/ru/otus/basicarchitecture/domain/getData/GetAddressPerson.kt
new file mode 100644
index 0000000..5f7b9ae
--- /dev/null
+++ b/app/src/main/java/ru/otus/basicarchitecture/domain/getData/GetAddressPerson.kt
@@ -0,0 +1,4 @@
+package ru.otus.basicarchitecture.domain.getData
+
+class GetAddressPerson {
+}
\ No newline at end of file
diff --git a/app/src/main/java/ru/otus/basicarchitecture/domain/getData/GetAllInterestsUseCase.kt b/app/src/main/java/ru/otus/basicarchitecture/domain/getData/GetAllInterestsUseCase.kt
new file mode 100644
index 0000000..b6b3dfd
--- /dev/null
+++ b/app/src/main/java/ru/otus/basicarchitecture/domain/getData/GetAllInterestsUseCase.kt
@@ -0,0 +1,4 @@
+package ru.otus.basicarchitecture.domain.getData
+
+class GetAllInterestsUseCase {
+}
\ No newline at end of file
diff --git a/app/src/main/java/ru/otus/basicarchitecture/domain/getData/GetInfoPersonUseCase.kt b/app/src/main/java/ru/otus/basicarchitecture/domain/getData/GetInfoPersonUseCase.kt
new file mode 100644
index 0000000..e957c98
--- /dev/null
+++ b/app/src/main/java/ru/otus/basicarchitecture/domain/getData/GetInfoPersonUseCase.kt
@@ -0,0 +1,4 @@
+package ru.otus.basicarchitecture.domain.getData
+
+class GetInfoPersonUseCase {
+}
\ No newline at end of file
diff --git a/app/src/main/java/ru/otus/basicarchitecture/domain/getData/GetInterestsPersonUseCase.kt b/app/src/main/java/ru/otus/basicarchitecture/domain/getData/GetInterestsPersonUseCase.kt
new file mode 100644
index 0000000..c934031
--- /dev/null
+++ b/app/src/main/java/ru/otus/basicarchitecture/domain/getData/GetInterestsPersonUseCase.kt
@@ -0,0 +1,4 @@
+package ru.otus.basicarchitecture.domain.getData
+
+class GetInterestsPersonUseCase {
+}
\ No newline at end of file
diff --git a/app/src/main/java/ru/otus/basicarchitecture/domain/getData/GetPersonsUseCase.kt b/app/src/main/java/ru/otus/basicarchitecture/domain/getData/GetPersonsUseCase.kt
new file mode 100644
index 0000000..55f99d6
--- /dev/null
+++ b/app/src/main/java/ru/otus/basicarchitecture/domain/getData/GetPersonsUseCase.kt
@@ -0,0 +1,4 @@
+package ru.otus.basicarchitecture.domain.getData
+
+class GetPersonsUseCase {
+}
\ No newline at end of file
diff --git a/app/src/main/java/ru/otus/basicarchitecture/domain/setData/SetAddressUseCase.kt b/app/src/main/java/ru/otus/basicarchitecture/domain/setData/SetAddressUseCase.kt
new file mode 100644
index 0000000..1dc4a96
--- /dev/null
+++ b/app/src/main/java/ru/otus/basicarchitecture/domain/setData/SetAddressUseCase.kt
@@ -0,0 +1,9 @@
+package ru.otus.basicarchitecture.domain.setData
+
+import ru.otus.basicarchitecture.domain.Model.Address
+
+class SetAddressUseCase {
+    fun setAddress(address: Address, idPerson: Int){
+        TODO()
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/ru/otus/basicarchitecture/domain/setData/SetInterestsPersonUseCase.kt b/app/src/main/java/ru/otus/basicarchitecture/domain/setData/SetInterestsPersonUseCase.kt
new file mode 100644
index 0000000..6d4d7e2
--- /dev/null
+++ b/app/src/main/java/ru/otus/basicarchitecture/domain/setData/SetInterestsPersonUseCase.kt
@@ -0,0 +1,10 @@
+package ru.otus.basicarchitecture.domain.setData
+
+import ru.otus.basicarchitecture.domain.Model.Interests
+import ru.otus.basicarchitecture.domain.Model.Person
+
+class SetInterestsPersonUseCase {
+    fun setInterests(interests: Interests, idPerson: Person){
+        TODO()
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/ru/otus/basicarchitecture/domain/setData/SetPersonUseCase.kt b/app/src/main/java/ru/otus/basicarchitecture/domain/setData/SetPersonUseCase.kt
new file mode 100644
index 0000000..c0a241d
--- /dev/null
+++ b/app/src/main/java/ru/otus/basicarchitecture/domain/setData/SetPersonUseCase.kt
@@ -0,0 +1,11 @@
+package ru.otus.basicarchitecture.domain.setData
+
+import ru.otus.basicarchitecture.domain.Model.Person
+
+class SetPersonUseCase {
+    fun setPerson(person: Person) : Int {
+        TODO()
+        val personId = 0
+        return personId
+    }
+}
\ 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/presentation/MainActivity.kt
similarity index 76%
rename from app/src/main/java/ru/otus/basicarchitecture/MainActivity.kt
rename to app/src/main/java/ru/otus/basicarchitecture/presentation/MainActivity.kt
index 623aba9..c03e893 100644
--- a/app/src/main/java/ru/otus/basicarchitecture/MainActivity.kt
+++ b/app/src/main/java/ru/otus/basicarchitecture/presentation/MainActivity.kt
@@ -1,7 +1,8 @@
-package ru.otus.basicarchitecture
+package ru.otus.basicarchitecture.presentation
 
 import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
+import ru.otus.basicarchitecture.R
 
 class MainActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
diff --git a/app/src/main/res/drawable/calendar.xml b/app/src/main/res/drawable/calendar.xml
new file mode 100644
index 0000000..9580bfa
--- /dev/null
+++ b/app/src/main/res/drawable/calendar.xml
@@ -0,0 +1,5 @@
+<vector android:alpha="0.84" android:height="24dp"
+    android:tint="#000000" android:viewportHeight="24"
+    android:viewportWidth="24" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M20,3h-1L19,1h-2v2L7,3L7,1L5,1v2L4,3c-1.1,0 -2,0.9 -2,2v16c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,5c0,-1.1 -0.9,-2 -2,-2zM20,21L4,21L4,8h16v13z"/>
+</vector>
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 0b15a20..5d2615d 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -1,9 +1,10 @@
 <?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=".MainActivity">
+    tools:context=".presentation.MainActivity">
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/first_and_second_screen.xml b/app/src/main/res/layout/first_and_second_screen.xml
new file mode 100644
index 0000000..8980180
--- /dev/null
+++ b/app/src/main/res/layout/first_and_second_screen.xml
@@ -0,0 +1,83 @@
+<?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"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <com.google.android.material.textfield.TextInputLayout
+        android:id="@+id/nameTextField"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:layout_constraintBottom_toTopOf="@id/surnameTextField"
+        android:layout_marginBottom="30dp"
+        android:layout_marginLeft="10dp"
+        android:layout_marginRight="10dp"
+        android:hint="@string/hintName">
+
+        <com.google.android.material.textfield.TextInputEditText
+            android:id="@+id/nameEditText"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:endIconMode="clear_text"/>
+
+    </com.google.android.material.textfield.TextInputLayout>
+
+
+    <com.google.android.material.textfield.TextInputLayout
+        android:id="@+id/surnameTextField"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        android:layout_marginLeft="10dp"
+        android:layout_marginRight="10dp"
+        android:hint="@string/surnameHint">
+
+        <com.google.android.material.textfield.TextInputEditText
+            android:id="@+id/surnameEditText"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:endIconMode="clear_text" />
+
+    </com.google.android.material.textfield.TextInputLayout>
+
+    <com.google.android.material.textfield.TextInputLayout
+        android:id="@+id/ageTextField"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:layout_constraintTop_toBottomOf="@id/surnameTextField"
+        android:layout_marginTop="30dp"
+        android:layout_marginLeft="10dp"
+        android:layout_marginRight="10dp"
+        android:hint="@string/DateOfBirthHint"
+        app:startIconDrawable="@drawable/calendar"
+        app:startIconContentDescription="@string/DateOfBirthHint"
+        app:startIconScaleType = "centerInside">
+
+        <com.google.android.material.textfield.TextInputEditText
+            android:id="@+id/ageEditText"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:endIconMode="clear_text"
+            android:inputType="date"/>
+
+    </com.google.android.material.textfield.TextInputLayout>
+
+    <Button
+        android:id="@+id/filledButton"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="20dp"
+        android:layout_marginLeft="30dp"
+        android:layout_marginRight="30dp"
+        android:text="@string/textButton"
+        android:textSize="14sp"
+        android:backgroundTint="@color/button"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"/>
+
+
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index f8c6127..c465f18 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="button">#008DED</color>
+
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index f26b6d3..5d54ec5 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,3 +1,7 @@
 <resources>
     <string name="app_name">BasicArchitecture</string>
+    <string name="hintName">Name</string>
+    <string name="surnameHint">Surname</string>
+    <string name="DateOfBirthHint">Date of Birth</string>
+    <string name="textButton">Next</string>
 </resources>
\ No newline at end of file

From e866bd268a0035b203e39a5cbd7cae6e60bbe2ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9A=D0=BE=D0=B7=D1=8B=D1=80=D0=B5=D0=B2=20=D0=90=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= <amk2921@yandex.ru>
Date: Mon, 15 Jan 2024 16:38:23 +0300
Subject: [PATCH 2/9] =?UTF-8?q?=D0=A1=D0=BE=D0=B7=D0=B4=D0=B0=D0=BB=20?=
 =?UTF-8?q?=D1=80=D0=B5=D0=BF=D0=BE=D0=B7=D0=B8=D1=82=D0=BE=D1=80=D0=B8?=
 =?UTF-8?q?=D0=B9=20=D0=B8=20=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB=20?=
 =?UTF-8?q?=D0=B7=D0=B0=D0=B2=D0=B8=D1=81=D0=B8=D0=BC=D0=BE=D1=81=D1=82?=
 =?UTF-8?q?=D0=B8=20=D0=B4=D0=BB=D1=8F=20=D0=B4=D0=B0=D0=B3=D0=B3=D0=B5?=
 =?UTF-8?q?=D1=80=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle                              |  5 ++++
 .../basicarchitecture/data/RepositoryImpl.kt  | 20 +++++++++++++
 .../basicarchitecture/data/WizardCache.kt     | 14 ++++++++--
 .../basicarchitecture/domain/Repository.kt    | 16 +++++++++++
 .../domain/getData/GetAddressPerson.kt        |  4 ---
 .../domain/getData/GetAllInterestsUseCase.kt  |  4 ---
 .../domain/getData/GetInfoPersonUseCase.kt    |  2 ++
 .../getData/GetInterestsPersonUseCase.kt      |  4 ---
 .../domain/getData/GetPersonsUseCase.kt       |  4 ---
 .../domain/setData/SetAddressUseCase.kt       |  7 +++--
 .../setData/SetInterestsPersonUseCase.kt      |  8 +++---
 .../domain/setData/SetPersonUseCase.kt        |  9 +++---
 .../presentation/FirstScreenFragment.kt       | 28 +++++++++++++++++++
 app/src/main/res/layout/activity_main.xml     |  5 ++++
 14 files changed, 100 insertions(+), 30 deletions(-)
 create mode 100644 app/src/main/java/ru/otus/basicarchitecture/data/RepositoryImpl.kt
 delete mode 100644 app/src/main/java/ru/otus/basicarchitecture/domain/getData/GetAddressPerson.kt
 delete mode 100644 app/src/main/java/ru/otus/basicarchitecture/domain/getData/GetAllInterestsUseCase.kt
 delete mode 100644 app/src/main/java/ru/otus/basicarchitecture/domain/getData/GetInterestsPersonUseCase.kt
 delete mode 100644 app/src/main/java/ru/otus/basicarchitecture/domain/getData/GetPersonsUseCase.kt
 create mode 100644 app/src/main/java/ru/otus/basicarchitecture/presentation/FirstScreenFragment.kt

diff --git a/app/build.gradle b/app/build.gradle
index 9c99d98..8cec1a8 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,6 +1,7 @@
 plugins {
     id 'com.android.application'
     id 'org.jetbrains.kotlin.android'
+    id("org.jetbrains.kotlin.kapt")
 }
 
 android {
@@ -34,6 +35,10 @@ android {
 
 dependencies {
 
+    //dagger2
+    implementation("com.google.dagger:dagger:2.48.1")
+    kapt("com.google.dagger:dagger-compiler:2.48.1")
+
     implementation 'androidx.core:core-ktx:1.8.0'
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'com.google.android.material:material:1.9.0'
diff --git a/app/src/main/java/ru/otus/basicarchitecture/data/RepositoryImpl.kt b/app/src/main/java/ru/otus/basicarchitecture/data/RepositoryImpl.kt
new file mode 100644
index 0000000..02893d0
--- /dev/null
+++ b/app/src/main/java/ru/otus/basicarchitecture/data/RepositoryImpl.kt
@@ -0,0 +1,20 @@
+package ru.otus.basicarchitecture.data
+
+import ru.otus.basicarchitecture.domain.Model.Address
+import ru.otus.basicarchitecture.domain.Model.Interests
+import ru.otus.basicarchitecture.domain.Model.Person
+import ru.otus.basicarchitecture.domain.Repository
+
+class RepositoryImpl : Repository  {
+    override fun setPerson(person: Person) {
+        TODO("Not yet implemented")
+    }
+
+    override fun setInterests(interests: Interests) {
+        TODO("Not yet implemented")
+    }
+
+    override fun setAddress(address: Address) {
+        TODO("Not yet implemented")
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/ru/otus/basicarchitecture/data/WizardCache.kt b/app/src/main/java/ru/otus/basicarchitecture/data/WizardCache.kt
index cf80929..ae4cbda 100644
--- a/app/src/main/java/ru/otus/basicarchitecture/data/WizardCache.kt
+++ b/app/src/main/java/ru/otus/basicarchitecture/data/WizardCache.kt
@@ -1,8 +1,18 @@
 package ru.otus.basicarchitecture.data
 
+import ru.otus.basicarchitecture.domain.Model.Address
+import ru.otus.basicarchitecture.domain.Model.Interests
+import ru.otus.basicarchitecture.domain.Model.Person
+
+
 class WizardCache {
+    private var resultDataModel: ResultDataModel? = null
+}
 
-    private val _listInterests: List<String> = emptyList()
 
 
-}
\ No newline at end of file
+private data class ResultDataModel(
+    val person: Person,
+    val address: Address,
+    val interests: Interests
+)
\ No newline at end of file
diff --git a/app/src/main/java/ru/otus/basicarchitecture/domain/Repository.kt b/app/src/main/java/ru/otus/basicarchitecture/domain/Repository.kt
index 455b0e3..7666395 100644
--- a/app/src/main/java/ru/otus/basicarchitecture/domain/Repository.kt
+++ b/app/src/main/java/ru/otus/basicarchitecture/domain/Repository.kt
@@ -1,4 +1,20 @@
 package ru.otus.basicarchitecture.domain
 
+import ru.otus.basicarchitecture.domain.Model.Address
+import ru.otus.basicarchitecture.domain.Model.Interests
+import ru.otus.basicarchitecture.domain.Model.Person
+
 interface Repository {
+
+    fun setPerson(person: Person)
+
+    fun setInterests(interests: Interests)
+
+
+    fun setAddress(address: Address)
+
+
+
+
+    //fun getInfoPersonUseCase()
 }
\ No newline at end of file
diff --git a/app/src/main/java/ru/otus/basicarchitecture/domain/getData/GetAddressPerson.kt b/app/src/main/java/ru/otus/basicarchitecture/domain/getData/GetAddressPerson.kt
deleted file mode 100644
index 5f7b9ae..0000000
--- a/app/src/main/java/ru/otus/basicarchitecture/domain/getData/GetAddressPerson.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-package ru.otus.basicarchitecture.domain.getData
-
-class GetAddressPerson {
-}
\ No newline at end of file
diff --git a/app/src/main/java/ru/otus/basicarchitecture/domain/getData/GetAllInterestsUseCase.kt b/app/src/main/java/ru/otus/basicarchitecture/domain/getData/GetAllInterestsUseCase.kt
deleted file mode 100644
index b6b3dfd..0000000
--- a/app/src/main/java/ru/otus/basicarchitecture/domain/getData/GetAllInterestsUseCase.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-package ru.otus.basicarchitecture.domain.getData
-
-class GetAllInterestsUseCase {
-}
\ No newline at end of file
diff --git a/app/src/main/java/ru/otus/basicarchitecture/domain/getData/GetInfoPersonUseCase.kt b/app/src/main/java/ru/otus/basicarchitecture/domain/getData/GetInfoPersonUseCase.kt
index e957c98..b13bfb3 100644
--- a/app/src/main/java/ru/otus/basicarchitecture/domain/getData/GetInfoPersonUseCase.kt
+++ b/app/src/main/java/ru/otus/basicarchitecture/domain/getData/GetInfoPersonUseCase.kt
@@ -1,4 +1,6 @@
 package ru.otus.basicarchitecture.domain.getData
 
 class GetInfoPersonUseCase {
+
+
 }
\ No newline at end of file
diff --git a/app/src/main/java/ru/otus/basicarchitecture/domain/getData/GetInterestsPersonUseCase.kt b/app/src/main/java/ru/otus/basicarchitecture/domain/getData/GetInterestsPersonUseCase.kt
deleted file mode 100644
index c934031..0000000
--- a/app/src/main/java/ru/otus/basicarchitecture/domain/getData/GetInterestsPersonUseCase.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-package ru.otus.basicarchitecture.domain.getData
-
-class GetInterestsPersonUseCase {
-}
\ No newline at end of file
diff --git a/app/src/main/java/ru/otus/basicarchitecture/domain/getData/GetPersonsUseCase.kt b/app/src/main/java/ru/otus/basicarchitecture/domain/getData/GetPersonsUseCase.kt
deleted file mode 100644
index 55f99d6..0000000
--- a/app/src/main/java/ru/otus/basicarchitecture/domain/getData/GetPersonsUseCase.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-package ru.otus.basicarchitecture.domain.getData
-
-class GetPersonsUseCase {
-}
\ No newline at end of file
diff --git a/app/src/main/java/ru/otus/basicarchitecture/domain/setData/SetAddressUseCase.kt b/app/src/main/java/ru/otus/basicarchitecture/domain/setData/SetAddressUseCase.kt
index 1dc4a96..120d14b 100644
--- a/app/src/main/java/ru/otus/basicarchitecture/domain/setData/SetAddressUseCase.kt
+++ b/app/src/main/java/ru/otus/basicarchitecture/domain/setData/SetAddressUseCase.kt
@@ -1,9 +1,10 @@
 package ru.otus.basicarchitecture.domain.setData
 
 import ru.otus.basicarchitecture.domain.Model.Address
+import ru.otus.basicarchitecture.domain.Repository
 
-class SetAddressUseCase {
-    fun setAddress(address: Address, idPerson: Int){
-        TODO()
+class SetAddressUseCase(val repository: Repository) {
+    fun setAddress(address: Address){
+        repository.setAddress(address)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/ru/otus/basicarchitecture/domain/setData/SetInterestsPersonUseCase.kt b/app/src/main/java/ru/otus/basicarchitecture/domain/setData/SetInterestsPersonUseCase.kt
index 6d4d7e2..b010672 100644
--- a/app/src/main/java/ru/otus/basicarchitecture/domain/setData/SetInterestsPersonUseCase.kt
+++ b/app/src/main/java/ru/otus/basicarchitecture/domain/setData/SetInterestsPersonUseCase.kt
@@ -1,10 +1,10 @@
 package ru.otus.basicarchitecture.domain.setData
 
 import ru.otus.basicarchitecture.domain.Model.Interests
-import ru.otus.basicarchitecture.domain.Model.Person
+import ru.otus.basicarchitecture.domain.Repository
 
-class SetInterestsPersonUseCase {
-    fun setInterests(interests: Interests, idPerson: Person){
-        TODO()
+class SetInterestsPersonUseCase(val repository: Repository) {
+    fun setInterests(interests: Interests){
+        repository.setInterests(interests)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/ru/otus/basicarchitecture/domain/setData/SetPersonUseCase.kt b/app/src/main/java/ru/otus/basicarchitecture/domain/setData/SetPersonUseCase.kt
index c0a241d..bc835d9 100644
--- a/app/src/main/java/ru/otus/basicarchitecture/domain/setData/SetPersonUseCase.kt
+++ b/app/src/main/java/ru/otus/basicarchitecture/domain/setData/SetPersonUseCase.kt
@@ -1,11 +1,10 @@
 package ru.otus.basicarchitecture.domain.setData
 
 import ru.otus.basicarchitecture.domain.Model.Person
+import ru.otus.basicarchitecture.domain.Repository
 
-class SetPersonUseCase {
-    fun setPerson(person: Person) : Int {
-        TODO()
-        val personId = 0
-        return personId
+class SetPersonUseCase(val repository: Repository) {
+    fun setPerson(person: Person) {
+        repository.setPerson(person)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/ru/otus/basicarchitecture/presentation/FirstScreenFragment.kt b/app/src/main/java/ru/otus/basicarchitecture/presentation/FirstScreenFragment.kt
new file mode 100644
index 0000000..c98b9d7
--- /dev/null
+++ b/app/src/main/java/ru/otus/basicarchitecture/presentation/FirstScreenFragment.kt
@@ -0,0 +1,28 @@
+package ru.otus.basicarchitecture.presentation
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.fragment.app.Fragment
+
+class FirstScreenFragment : Fragment() {
+
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
+        return super.onCreateView(inflater, container, savedInstanceState)
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+    }
+
+
+    companion object{
+         private val FIRST_SCREEN_MODE = "FIRST_SCREEN_MODE"
+    }
+}
\ 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 5d2615d..16c0c81 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -7,4 +7,9 @@
     android:layout_height="match_parent"
     tools:context=".presentation.MainActivity">
 
+    <androidx.fragment.app.FragmentContainerView
+        android:id="@+id/fragmentContainer"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"/>
+
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

From 228c805114c2f528cb21e22b8acb749090e7df82 Mon Sep 17 00:00:00 2001
From: Alexey Kozyrev <tcsid4@gmail.com>
Date: Thu, 18 Jan 2024 09:13:42 +0300
Subject: [PATCH 3/9] =?UTF-8?q?=D1=81=D0=BE=D0=B7=D0=B4=D0=B0=D0=BB=20?=
 =?UTF-8?q?=D0=BF=D0=B5=D1=80=D0=B2=D1=8B=D0=B5=20=D0=B4=D0=B2=D0=B0=20?=
 =?UTF-8?q?=D1=8D=D0=BA=D1=80=D0=B0=D0=BD=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../basicarchitecture/data/WizardCache.kt     |  4 ++-
 .../presentation/FirstScreenFragment.kt       | 32 +++++++++++++++++--
 .../presentation/SecondScreenFragment.kt      |  6 ++++
 .../res/layout/first_and_second_screen.xml    | 30 ++++++++---------
 4 files changed, 54 insertions(+), 18 deletions(-)
 create mode 100644 app/src/main/java/ru/otus/basicarchitecture/presentation/SecondScreenFragment.kt

diff --git a/app/src/main/java/ru/otus/basicarchitecture/data/WizardCache.kt b/app/src/main/java/ru/otus/basicarchitecture/data/WizardCache.kt
index ae4cbda..3aa8888 100644
--- a/app/src/main/java/ru/otus/basicarchitecture/data/WizardCache.kt
+++ b/app/src/main/java/ru/otus/basicarchitecture/data/WizardCache.kt
@@ -7,10 +7,12 @@ import ru.otus.basicarchitecture.domain.Model.Person
 
 class WizardCache {
     private var resultDataModel: ResultDataModel? = null
-}
 
+}
 
 
+//комментарии на уточнить - не уверен что модель из домаина должна находится в дата слое
+//не знаю в каком слое делать парсер
 private data class ResultDataModel(
     val person: Person,
     val address: Address,
diff --git a/app/src/main/java/ru/otus/basicarchitecture/presentation/FirstScreenFragment.kt b/app/src/main/java/ru/otus/basicarchitecture/presentation/FirstScreenFragment.kt
index c98b9d7..9064390 100644
--- a/app/src/main/java/ru/otus/basicarchitecture/presentation/FirstScreenFragment.kt
+++ b/app/src/main/java/ru/otus/basicarchitecture/presentation/FirstScreenFragment.kt
@@ -5,24 +5,52 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.Fragment
+import ru.otus.basicarchitecture.R
 
 class FirstScreenFragment : Fragment() {
 
 
+
+    private var screen = UNKNOWN_SCREEN
+
+    private val
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        parseParam()
+    }
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View? {
-        return super.onCreateView(inflater, container, savedInstanceState)
+        return inflater.inflate(R.layout.first_and_second_screen, container, false)
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
     }
 
+    private fun parseParam(){
+        val args = requireArguments()
+        if(!args.containsKey(KEY_SCREEN_MODE)){
+            throw Exception(Exception_message)
+        }
+        screen = requireArguments().getString(SCREEN_MODE) ?: throw Exception(Exception_message)
+    }
+
 
     companion object{
-         private val FIRST_SCREEN_MODE = "FIRST_SCREEN_MODE"
+        private val Exception_message = "First fragment: unknown screen mode"
+        private val UNKNOWN_SCREEN = "unknown_screen"
+        private val KEY_SCREEN_MODE = "key_screen_mode"
+        private val SCREEN_MODE = "first_screen"
+        fun instance() : FirstScreenFragment{
+            return FirstScreenFragment().apply {
+                arguments = Bundle().apply {
+                    putString(KEY_SCREEN_MODE, SCREEN_MODE)
+                }
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/ru/otus/basicarchitecture/presentation/SecondScreenFragment.kt b/app/src/main/java/ru/otus/basicarchitecture/presentation/SecondScreenFragment.kt
new file mode 100644
index 0000000..e3de11e
--- /dev/null
+++ b/app/src/main/java/ru/otus/basicarchitecture/presentation/SecondScreenFragment.kt
@@ -0,0 +1,6 @@
+package ru.otus.basicarchitecture.presentation
+
+import androidx.fragment.app.Fragment
+
+class SecondScreenFragment : Fragment() {
+}
\ No newline at end of file
diff --git a/app/src/main/res/layout/first_and_second_screen.xml b/app/src/main/res/layout/first_and_second_screen.xml
index 8980180..4d07e77 100644
--- a/app/src/main/res/layout/first_and_second_screen.xml
+++ b/app/src/main/res/layout/first_and_second_screen.xml
@@ -6,17 +6,17 @@
     android:layout_height="match_parent">
 
     <com.google.android.material.textfield.TextInputLayout
-        android:id="@+id/nameTextField"
+        android:id="@+id/firstTextField"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        app:layout_constraintBottom_toTopOf="@id/surnameTextField"
+        app:layout_constraintBottom_toTopOf="@id/secondTextField"
         android:layout_marginBottom="30dp"
         android:layout_marginLeft="10dp"
-        android:layout_marginRight="10dp"
-        android:hint="@string/hintName">
+        android:layout_marginRight="10dp">
+    <!--    android:hint="@string/hintName">-->
 
         <com.google.android.material.textfield.TextInputEditText
-            android:id="@+id/nameEditText"
+            android:id="@+id/firstEditText"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             app:endIconMode="clear_text"/>
@@ -25,17 +25,17 @@
 
 
     <com.google.android.material.textfield.TextInputLayout
-        android:id="@+id/surnameTextField"
+        android:id="@+id/secondTextField"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintBottom_toBottomOf="parent"
         android:layout_marginLeft="10dp"
-        android:layout_marginRight="10dp"
-        android:hint="@string/surnameHint">
+        android:layout_marginRight="10dp">
+    <!--    android:hint="@string/surnameHint">-->
 
         <com.google.android.material.textfield.TextInputEditText
-            android:id="@+id/surnameEditText"
+            android:id="@+id/secondEditText"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             app:endIconMode="clear_text" />
@@ -43,20 +43,20 @@
     </com.google.android.material.textfield.TextInputLayout>
 
     <com.google.android.material.textfield.TextInputLayout
-        android:id="@+id/ageTextField"
+        android:id="@+id/thirdInputText"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        app:layout_constraintTop_toBottomOf="@id/surnameTextField"
+        app:layout_constraintTop_toBottomOf="@id/secondTextField"
         android:layout_marginTop="30dp"
         android:layout_marginLeft="10dp"
-        android:layout_marginRight="10dp"
-        android:hint="@string/DateOfBirthHint"
+        android:layout_marginRight="10dp">
+        <!--android:hint="@string/DateOfBirthHint"
         app:startIconDrawable="@drawable/calendar"
         app:startIconContentDescription="@string/DateOfBirthHint"
-        app:startIconScaleType = "centerInside">
+        app:startIconScaleType = "centerInside">-->
 
         <com.google.android.material.textfield.TextInputEditText
-            android:id="@+id/ageEditText"
+            android:id="@+id/thirdEditText"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             app:endIconMode="clear_text"

From 7245d71974b45f79217ac2acf095104476988296 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9A=D0=BE=D0=B7=D1=8B=D1=80=D0=B5=D0=B2=20=D0=90=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= <amk2921@yandex.ru>
Date: Thu, 18 Jan 2024 11:39:49 +0300
Subject: [PATCH 4/9] =?UTF-8?q?=D0=A0=D0=B0=D0=B1=D0=BE=D1=82=D0=B0=20?=
 =?UTF-8?q?=D0=BD=D0=B0=D0=B4=20ViewModel=20=D0=BF=D0=B5=D1=80=D0=B2=D0=BE?=
 =?UTF-8?q?=D0=B3=D0=BE=20=D1=8D=D0=BA=D1=80=D0=B0=D0=BD=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../basicarchitecture/data/WizardCache.kt     |   1 +
 .../FirstScreen/FirstScreenFragment.kt        | 111 ++++++++++++++++++
 .../FirstScreen/FirstScreenViewModel.kt       |  39 ++++++
 .../presentation/FirstScreenFragment.kt       |  56 ---------
 .../presentation/MainActivity.kt              |  15 ++-
 .../res/layout/first_and_second_screen.xml    |  14 +--
 app/src/main/res/values/strings.xml           |   2 +-
 7 files changed, 173 insertions(+), 65 deletions(-)
 create mode 100644 app/src/main/java/ru/otus/basicarchitecture/presentation/FirstScreen/FirstScreenFragment.kt
 create mode 100644 app/src/main/java/ru/otus/basicarchitecture/presentation/FirstScreen/FirstScreenViewModel.kt
 delete mode 100644 app/src/main/java/ru/otus/basicarchitecture/presentation/FirstScreenFragment.kt

diff --git a/app/src/main/java/ru/otus/basicarchitecture/data/WizardCache.kt b/app/src/main/java/ru/otus/basicarchitecture/data/WizardCache.kt
index 3aa8888..19098cc 100644
--- a/app/src/main/java/ru/otus/basicarchitecture/data/WizardCache.kt
+++ b/app/src/main/java/ru/otus/basicarchitecture/data/WizardCache.kt
@@ -6,6 +6,7 @@ import ru.otus.basicarchitecture.domain.Model.Person
 
 
 class WizardCache {
+
     private var resultDataModel: ResultDataModel? = null
 
 }
diff --git a/app/src/main/java/ru/otus/basicarchitecture/presentation/FirstScreen/FirstScreenFragment.kt b/app/src/main/java/ru/otus/basicarchitecture/presentation/FirstScreen/FirstScreenFragment.kt
new file mode 100644
index 0000000..d8fa266
--- /dev/null
+++ b/app/src/main/java/ru/otus/basicarchitecture/presentation/FirstScreen/FirstScreenFragment.kt
@@ -0,0 +1,111 @@
+package ru.otus.basicarchitecture.presentation.FirstScreen
+
+import android.os.Bundle
+import android.text.InputType
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.Button
+import android.widget.EditText
+import androidx.core.content.ContextCompat
+import androidx.core.widget.addTextChangedListener
+import androidx.fragment.app.Fragment
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.ViewModelProvider
+import com.google.android.material.textfield.TextInputLayout
+import ru.otus.basicarchitecture.R
+
+class FirstScreenFragment : Fragment() {
+
+
+    private var screen = UNKNOWN_SCREEN
+
+    private var nextButton: Button? = null
+
+    private var nameEditText: EditText? = null
+    private var surNameEditText: EditText? = null
+    private var birthDateEditText: EditText? = null
+
+
+    private var nameInputLayout: TextInputLayout? = null
+    private var surNameInputLayout: TextInputLayout? = null
+    private var birthDateInputLayout: TextInputLayout? = null
+
+    private lateinit var viewModel: FirstScreenViewModel
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        parseParam()
+    }
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
+        return inflater.inflate(R.layout.first_and_second_screen, container, false)
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        viewModel = ViewModelProvider(this)[FirstScreenViewModel::class.java]
+        setupView(view)
+        nameEditText.apply {
+        }
+
+
+    }
+
+    private fun setupView(view: View) {
+        with(view) {
+            nextButton = findViewById(R.id.nextButton)
+
+            nameInputLayout = findViewById(R.id.firstInputLayout)
+            nameEditText = findViewById(R.id.firstEditText)
+
+            surNameInputLayout = findViewById(R.id.secondInputLayout)
+            surNameEditText = findViewById(R.id.secondEditText)
+
+            birthDateInputLayout = findViewById(R.id.thirdInputLayout)
+            birthDateEditText = findViewById(R.id.thirdEditText)
+
+
+        }
+        nameInputLayout?.apply {
+            hint = R.string.hintName.toString()
+        }
+        surNameInputLayout?.apply {
+            hint = R.string.surNameHint.toString()
+        }
+        birthDateInputLayout?.apply {
+            hint = R.string.DateOfBirthHint.toString()
+            startIconDrawable = ContextCompat.getDrawable(context, R.drawable.calendar)
+            startIconContentDescription = R.string.DateOfBirthHint.toString()
+        }
+        birthDateEditText?.apply {
+            inputType = InputType.TYPE_DATETIME_VARIATION_DATE
+        }
+    }
+
+    private fun parseParam(){
+        val args = requireArguments()
+        if(!args.containsKey(KEY_SCREEN_MODE)){
+            throw Exception(Exception_message)
+        }
+        screen = requireArguments().getString(SCREEN_MODE) ?: throw Exception(Exception_message)
+    }
+
+
+    companion object{
+        private const val Exception_message = "First fragment: unknown screen mode"
+        private const val UNKNOWN_SCREEN = "unknown_screen"
+        private const val KEY_SCREEN_MODE = "key_screen_mode"
+        private const val SCREEN_MODE = "first_screen"
+        fun instance() : FirstScreenFragment {
+            return FirstScreenFragment().apply {
+                arguments = Bundle().apply {
+                    putString(KEY_SCREEN_MODE, SCREEN_MODE)
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/ru/otus/basicarchitecture/presentation/FirstScreen/FirstScreenViewModel.kt b/app/src/main/java/ru/otus/basicarchitecture/presentation/FirstScreen/FirstScreenViewModel.kt
new file mode 100644
index 0000000..6c46605
--- /dev/null
+++ b/app/src/main/java/ru/otus/basicarchitecture/presentation/FirstScreen/FirstScreenViewModel.kt
@@ -0,0 +1,39 @@
+package ru.otus.basicarchitecture.presentation.FirstScreen
+
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.ViewModel
+import ru.otus.basicarchitecture.data.RepositoryImpl
+import ru.otus.basicarchitecture.domain.Model.Person
+import ru.otus.basicarchitecture.domain.Repository
+import ru.otus.basicarchitecture.domain.setData.SetPersonUseCase
+
+class FirstScreenViewModel : ViewModel(){
+
+
+//    private val personMutableLiveData = MutableLiveData<Person>()
+//
+//
+//    val personLiveData = personMutableLiveData
+//
+    var repository = RepositoryImpl()
+    private val setPersonUseCase = SetPersonUseCase(repository)
+
+
+    private val enabledButtonMutableLiveData = MutableLiveData<Boolean>()
+    val enabledButtonLiveData = enabledButtonMutableLiveData
+
+    private var name = UNKNOWN_VALUE
+    private var surName = UNKNOWN_VALUE
+    private var birthDate  = UNKNOWN_VALUE
+
+    fun validate(){
+
+    }
+
+
+    companion object{
+        private val UNKNOWN_VALUE = ""
+    }
+
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/ru/otus/basicarchitecture/presentation/FirstScreenFragment.kt b/app/src/main/java/ru/otus/basicarchitecture/presentation/FirstScreenFragment.kt
deleted file mode 100644
index 9064390..0000000
--- a/app/src/main/java/ru/otus/basicarchitecture/presentation/FirstScreenFragment.kt
+++ /dev/null
@@ -1,56 +0,0 @@
-package ru.otus.basicarchitecture.presentation
-
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.fragment.app.Fragment
-import ru.otus.basicarchitecture.R
-
-class FirstScreenFragment : Fragment() {
-
-
-
-    private var screen = UNKNOWN_SCREEN
-
-    private val
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        parseParam()
-    }
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View? {
-        return inflater.inflate(R.layout.first_and_second_screen, container, false)
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-    }
-
-    private fun parseParam(){
-        val args = requireArguments()
-        if(!args.containsKey(KEY_SCREEN_MODE)){
-            throw Exception(Exception_message)
-        }
-        screen = requireArguments().getString(SCREEN_MODE) ?: throw Exception(Exception_message)
-    }
-
-
-    companion object{
-        private val Exception_message = "First fragment: unknown screen mode"
-        private val UNKNOWN_SCREEN = "unknown_screen"
-        private val KEY_SCREEN_MODE = "key_screen_mode"
-        private val SCREEN_MODE = "first_screen"
-        fun instance() : FirstScreenFragment{
-            return FirstScreenFragment().apply {
-                arguments = Bundle().apply {
-                    putString(KEY_SCREEN_MODE, SCREEN_MODE)
-                }
-            }
-        }
-    }
-}
\ 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
index c03e893..5435259 100644
--- a/app/src/main/java/ru/otus/basicarchitecture/presentation/MainActivity.kt
+++ b/app/src/main/java/ru/otus/basicarchitecture/presentation/MainActivity.kt
@@ -1,12 +1,25 @@
 package ru.otus.basicarchitecture.presentation
 
-import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
 import ru.otus.basicarchitecture.R
+import ru.otus.basicarchitecture.presentation.FirstScreen.FirstScreenFragment
 
 class MainActivity : AppCompatActivity() {
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main)
+
+        if(savedInstanceState == null ){
+            val fragment = FirstScreenFragment.instance()
+            supportFragmentManager
+                .beginTransaction()
+                .replace(R.id.fragmentContainer, fragment)
+                .addToBackStack(null)
+                .commit()
+        }
+
+
     }
 }
\ No newline at end of file
diff --git a/app/src/main/res/layout/first_and_second_screen.xml b/app/src/main/res/layout/first_and_second_screen.xml
index 4d07e77..f5ff3c4 100644
--- a/app/src/main/res/layout/first_and_second_screen.xml
+++ b/app/src/main/res/layout/first_and_second_screen.xml
@@ -6,10 +6,10 @@
     android:layout_height="match_parent">
 
     <com.google.android.material.textfield.TextInputLayout
-        android:id="@+id/firstTextField"
+        android:id="@+id/firstInputLayout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        app:layout_constraintBottom_toTopOf="@id/secondTextField"
+        app:layout_constraintBottom_toTopOf="@id/secondInputLayout"
         android:layout_marginBottom="30dp"
         android:layout_marginLeft="10dp"
         android:layout_marginRight="10dp">
@@ -25,7 +25,7 @@
 
 
     <com.google.android.material.textfield.TextInputLayout
-        android:id="@+id/secondTextField"
+        android:id="@+id/secondInputLayout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:layout_constraintTop_toTopOf="parent"
@@ -43,14 +43,14 @@
     </com.google.android.material.textfield.TextInputLayout>
 
     <com.google.android.material.textfield.TextInputLayout
-        android:id="@+id/thirdInputText"
+        android:id="@+id/thirdInputLayout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        app:layout_constraintTop_toBottomOf="@id/secondTextField"
+        app:layout_constraintTop_toBottomOf="@id/secondInputLayout"
         android:layout_marginTop="30dp"
         android:layout_marginLeft="10dp"
         android:layout_marginRight="10dp">
-        <!--android:hint="@string/DateOfBirthHint"
+<!--        android:hint="@string/DateOfBirthHint"
         app:startIconDrawable="@drawable/calendar"
         app:startIconContentDescription="@string/DateOfBirthHint"
         app:startIconScaleType = "centerInside">-->
@@ -65,7 +65,7 @@
     </com.google.android.material.textfield.TextInputLayout>
 
     <Button
-        android:id="@+id/filledButton"
+        android:id="@+id/nextButton"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="20dp"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 5d54ec5..3a681c3 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,7 +1,7 @@
 <resources>
     <string name="app_name">BasicArchitecture</string>
     <string name="hintName">Name</string>
-    <string name="surnameHint">Surname</string>
+    <string name="surNameHint">Surname</string>
     <string name="DateOfBirthHint">Date of Birth</string>
     <string name="textButton">Next</string>
 </resources>
\ No newline at end of file

From 052b5d67ad01d5f512e85794824c1a7769ab0f19 Mon Sep 17 00:00:00 2001
From: Alexey Kozyrev <tcsid4@gmail.com>
Date: Tue, 23 Jan 2024 21:21:00 +0300
Subject: [PATCH 5/9] =?UTF-8?q?=D0=B3=D0=BE=D1=82=D0=BE=D0=B2=20=D0=BF?=
 =?UTF-8?q?=D0=B5=D1=80=D0=B2=D1=8B=D0=B9=20=D1=8D=D0=BA=D1=80=D0=B0=D0=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle                              |  18 +--
 app/src/main/AndroidManifest.xml              |  12 +-
 .../java/ru/otus/basicarchitecture/App.kt     |  10 ++
 .../FirstScreen/FirstScreenSubComponent.kt    |  21 ++++
 .../FirstScreen/PersonModule.kt               |  15 +++
 .../FirstScreen/ViewModelModule.kt            |  18 +++
 .../DI/FragmentComponents/FragmentScope.kt    |   8 ++
 .../DI/MainComponent/MainComponent.kt         |  17 +++
 .../DI/MainComponent/RepositoryModule.kt      |  14 +++
 .../DI/MainComponent/WizardCacheModule.kt     |  23 ++++
 .../basicarchitecture/data/RepositoryImpl.kt  |  31 ++++-
 .../basicarchitecture/data/WizardCache.kt     |  26 ++--
 .../domain/Model/Interests.kt                 |   2 +-
 .../basicarchitecture/domain/Model/Person.kt  |  24 +++-
 .../domain/getData/GetInfoPersonUseCase.kt    |   3 +-
 .../domain/setData/SetAddressUseCase.kt       |   5 +-
 .../setData/SetInterestsPersonUseCase.kt      |   5 +-
 .../domain/setData/SetPersonUseCase.kt        |   5 +-
 .../FirstScreen/FirstScreenFragment.kt        | 118 +++++++++++++++---
 .../FirstScreen/FirstScreenViewModel.kt       |  58 ++++++---
 .../SecondScreenFragment.kt                   |   3 +-
 .../presentation/ViewModelFactory.kt          |  13 ++
 .../res/drawable/background_state_button.xml  |   7 ++
 .../res/layout/first_and_second_screen.xml    |  30 +++--
 build.gradle                                  |   4 +-
 gradle/wrapper/gradle-wrapper.properties      |   2 +-
 26 files changed, 411 insertions(+), 81 deletions(-)
 create mode 100644 app/src/main/java/ru/otus/basicarchitecture/App.kt
 create mode 100644 app/src/main/java/ru/otus/basicarchitecture/DI/FragmentComponents/FirstScreen/FirstScreenSubComponent.kt
 create mode 100644 app/src/main/java/ru/otus/basicarchitecture/DI/FragmentComponents/FirstScreen/PersonModule.kt
 create mode 100644 app/src/main/java/ru/otus/basicarchitecture/DI/FragmentComponents/FirstScreen/ViewModelModule.kt
 create mode 100644 app/src/main/java/ru/otus/basicarchitecture/DI/FragmentComponents/FragmentScope.kt
 create mode 100644 app/src/main/java/ru/otus/basicarchitecture/DI/MainComponent/MainComponent.kt
 create mode 100644 app/src/main/java/ru/otus/basicarchitecture/DI/MainComponent/RepositoryModule.kt
 create mode 100644 app/src/main/java/ru/otus/basicarchitecture/DI/MainComponent/WizardCacheModule.kt
 rename app/src/main/java/ru/otus/basicarchitecture/presentation/{ => SecondScreen}/SecondScreenFragment.kt (53%)
 create mode 100644 app/src/main/java/ru/otus/basicarchitecture/presentation/ViewModelFactory.kt
 create mode 100644 app/src/main/res/drawable/background_state_button.xml

diff --git a/app/build.gradle b/app/build.gradle
index 8cec1a8..a86020c 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -6,12 +6,12 @@ plugins {
 
 android {
     namespace 'ru.otus.basicarchitecture'
-    compileSdk 33
+    compileSdk 34
 
     defaultConfig {
         applicationId "ru.otus.basicarchitecture"
-        minSdk 24
-        targetSdk 33
+        minSdk = 26
+        targetSdk = 34
         versionCode 1
         versionName "1.0"
 
@@ -25,12 +25,14 @@ 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'
     }
+
+
 }
 
 dependencies {
@@ -39,9 +41,9 @@ dependencies {
     implementation("com.google.dagger:dagger:2.48.1")
     kapt("com.google.dagger:dagger-compiler:2.48.1")
 
-    implementation 'androidx.core:core-ktx:1.8.0'
+    implementation 'androidx.core:core-ktx:1.12.0'
     implementation 'androidx.appcompat:appcompat:1.6.1'
-    implementation 'com.google.android.material:material:1.9.0'
+    implementation 'com.google.android.material:material:1.11.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.5'
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 80369e1..15ecd82 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=".App"
         android:allowBackup="true"
         android:dataExtractionRules="@xml/data_extraction_rules"
         android:fullBackupContent="@xml/backup_rules"
@@ -14,7 +15,16 @@
         tools:targetApi="31">
         <activity
             android:name=".presentation.MainActivity"
-            android:exported="false" />
+            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/App.kt b/app/src/main/java/ru/otus/basicarchitecture/App.kt
new file mode 100644
index 0000000..b7f3b2b
--- /dev/null
+++ b/app/src/main/java/ru/otus/basicarchitecture/App.kt
@@ -0,0 +1,10 @@
+package ru.otus.basicarchitecture
+
+import android.app.Application
+import ru.otus.basicarchitecture.DI.MainComponent.DaggerMainComponent
+
+class App : Application() {
+    val component by lazy {
+        DaggerMainComponent.builder().build()
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/ru/otus/basicarchitecture/DI/FragmentComponents/FirstScreen/FirstScreenSubComponent.kt b/app/src/main/java/ru/otus/basicarchitecture/DI/FragmentComponents/FirstScreen/FirstScreenSubComponent.kt
new file mode 100644
index 0000000..b303867
--- /dev/null
+++ b/app/src/main/java/ru/otus/basicarchitecture/DI/FragmentComponents/FirstScreen/FirstScreenSubComponent.kt
@@ -0,0 +1,21 @@
+package ru.otus.basicarchitecture.DI.FragmentComponents.FirstScreen
+
+import dagger.Subcomponent
+import ru.otus.basicarchitecture.DI.FragmentComponents.FragmentScope
+import ru.otus.basicarchitecture.presentation.FirstScreen.FirstScreenFragment
+
+
+/**
+ * Подкомпонент для первого фрагмента
+ */
+@FragmentScope
+@Subcomponent(modules = [PersonModule::class, ViewModelModule::class])
+interface FirstScreenSubComponent {
+
+    @Subcomponent.Builder
+    interface Builder {
+        fun build() : FirstScreenSubComponent
+    }
+
+    fun inject(fragmentFirst: FirstScreenFragment)
+}
\ No newline at end of file
diff --git a/app/src/main/java/ru/otus/basicarchitecture/DI/FragmentComponents/FirstScreen/PersonModule.kt b/app/src/main/java/ru/otus/basicarchitecture/DI/FragmentComponents/FirstScreen/PersonModule.kt
new file mode 100644
index 0000000..5ff3a71
--- /dev/null
+++ b/app/src/main/java/ru/otus/basicarchitecture/DI/FragmentComponents/FirstScreen/PersonModule.kt
@@ -0,0 +1,15 @@
+package ru.otus.basicarchitecture.DI.FragmentComponents.FirstScreen
+
+import dagger.Module
+import dagger.Provides
+import ru.otus.basicarchitecture.DI.FragmentComponents.FragmentScope
+import ru.otus.basicarchitecture.domain.Model.Person
+
+@Module
+class PersonModule {
+    @FragmentScope
+    @Provides
+    fun providePerson(): Person{
+        return Person.defaultPerson()
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/ru/otus/basicarchitecture/DI/FragmentComponents/FirstScreen/ViewModelModule.kt b/app/src/main/java/ru/otus/basicarchitecture/DI/FragmentComponents/FirstScreen/ViewModelModule.kt
new file mode 100644
index 0000000..19838f8
--- /dev/null
+++ b/app/src/main/java/ru/otus/basicarchitecture/DI/FragmentComponents/FirstScreen/ViewModelModule.kt
@@ -0,0 +1,18 @@
+package ru.otus.basicarchitecture.DI.FragmentComponents.FirstScreen
+
+import androidx.lifecycle.ViewModel
+import dagger.Binds
+import dagger.Module
+import dagger.multibindings.IntoMap
+import dagger.multibindings.StringKey
+import ru.otus.basicarchitecture.presentation.FirstScreen.FirstScreenViewModel
+
+@Module
+interface ViewModelModule {
+
+    @IntoMap
+    @StringKey("FirstScreenViewModel")
+    @Binds
+    fun bindFirstScreenViewModel(impl: FirstScreenViewModel): ViewModel
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/ru/otus/basicarchitecture/DI/FragmentComponents/FragmentScope.kt b/app/src/main/java/ru/otus/basicarchitecture/DI/FragmentComponents/FragmentScope.kt
new file mode 100644
index 0000000..4b5c132
--- /dev/null
+++ b/app/src/main/java/ru/otus/basicarchitecture/DI/FragmentComponents/FragmentScope.kt
@@ -0,0 +1,8 @@
+package ru.otus.basicarchitecture.DI.FragmentComponents
+
+import javax.inject.Scope
+
+//Синглтон внутри сабкомпонентов для фрагментов
+@Scope
+@Retention(value = AnnotationRetention.RUNTIME)
+annotation class FragmentScope()
diff --git a/app/src/main/java/ru/otus/basicarchitecture/DI/MainComponent/MainComponent.kt b/app/src/main/java/ru/otus/basicarchitecture/DI/MainComponent/MainComponent.kt
new file mode 100644
index 0000000..64a6d54
--- /dev/null
+++ b/app/src/main/java/ru/otus/basicarchitecture/DI/MainComponent/MainComponent.kt
@@ -0,0 +1,17 @@
+package ru.otus.basicarchitecture.DI.MainComponent
+
+import dagger.Component
+import ru.otus.basicarchitecture.DI.FragmentComponents.FirstScreen.FirstScreenSubComponent
+import ru.otus.basicarchitecture.data.WizardCache
+import ru.otus.basicarchitecture.domain.Repository
+import javax.inject.Singleton
+
+@Singleton
+@Component(modules = [WizardCacheModule::class, RepositoryModule::class])
+interface MainComponent {
+    fun firstScreenSubComponent() : FirstScreenSubComponent.Builder
+
+    fun wizardCache(): WizardCache
+
+    fun repository(): Repository
+}
\ No newline at end of file
diff --git a/app/src/main/java/ru/otus/basicarchitecture/DI/MainComponent/RepositoryModule.kt b/app/src/main/java/ru/otus/basicarchitecture/DI/MainComponent/RepositoryModule.kt
new file mode 100644
index 0000000..7208a0e
--- /dev/null
+++ b/app/src/main/java/ru/otus/basicarchitecture/DI/MainComponent/RepositoryModule.kt
@@ -0,0 +1,14 @@
+package ru.otus.basicarchitecture.DI.MainComponent
+
+import dagger.Binds
+import dagger.Module
+import ru.otus.basicarchitecture.data.RepositoryImpl
+import ru.otus.basicarchitecture.domain.Repository
+import javax.inject.Singleton
+
+@Module
+interface RepositoryModule {
+    @Singleton
+    @Binds
+    fun getRepository(impl: RepositoryImpl) : Repository
+}
\ No newline at end of file
diff --git a/app/src/main/java/ru/otus/basicarchitecture/DI/MainComponent/WizardCacheModule.kt b/app/src/main/java/ru/otus/basicarchitecture/DI/MainComponent/WizardCacheModule.kt
new file mode 100644
index 0000000..93d74ee
--- /dev/null
+++ b/app/src/main/java/ru/otus/basicarchitecture/DI/MainComponent/WizardCacheModule.kt
@@ -0,0 +1,23 @@
+package ru.otus.basicarchitecture.DI.MainComponent
+
+import dagger.Module
+import dagger.Provides
+import ru.otus.basicarchitecture.data.WizardCache
+import javax.inject.Singleton
+
+@Module
+class WizardCacheModule {
+    @Singleton
+    @Provides
+    fun provideWizardCache() : WizardCache{
+        return WizardCache(
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            ""
+        )
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/ru/otus/basicarchitecture/data/RepositoryImpl.kt b/app/src/main/java/ru/otus/basicarchitecture/data/RepositoryImpl.kt
index 02893d0..a33cdfd 100644
--- a/app/src/main/java/ru/otus/basicarchitecture/data/RepositoryImpl.kt
+++ b/app/src/main/java/ru/otus/basicarchitecture/data/RepositoryImpl.kt
@@ -1,20 +1,43 @@
 package ru.otus.basicarchitecture.data
 
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
 import ru.otus.basicarchitecture.domain.Model.Address
 import ru.otus.basicarchitecture.domain.Model.Interests
 import ru.otus.basicarchitecture.domain.Model.Person
 import ru.otus.basicarchitecture.domain.Repository
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class RepositoryImpl @Inject constructor(
+    private val wizardCache: WizardCache
+) : Repository {
+
+    private val mutableLiveDataWizardCache = MutableLiveData<WizardCache>()
+
+    val liveDataWizardCache: LiveData<WizardCache> = mutableLiveDataWizardCache
 
-class RepositoryImpl : Repository  {
     override fun setPerson(person: Person) {
-        TODO("Not yet implemented")
+        wizardCache.firstName = person.firstName
+        wizardCache.surName = person.surName
+        wizardCache.dateOfBirth = person.firstName
+        updateWizardCache()
     }
 
     override fun setInterests(interests: Interests) {
-        TODO("Not yet implemented")
+        wizardCache.interests = interests.interests
+        updateWizardCache()
     }
 
     override fun setAddress(address: Address) {
-        TODO("Not yet implemented")
+        wizardCache.city = address.city
+        wizardCache.country = address.country
+        wizardCache.address = address.address
+        updateWizardCache()
+    }
+
+    private fun updateWizardCache() {
+        mutableLiveDataWizardCache.postValue(wizardCache)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/ru/otus/basicarchitecture/data/WizardCache.kt b/app/src/main/java/ru/otus/basicarchitecture/data/WizardCache.kt
index 19098cc..557a344 100644
--- a/app/src/main/java/ru/otus/basicarchitecture/data/WizardCache.kt
+++ b/app/src/main/java/ru/otus/basicarchitecture/data/WizardCache.kt
@@ -3,19 +3,21 @@ package ru.otus.basicarchitecture.data
 import ru.otus.basicarchitecture.domain.Model.Address
 import ru.otus.basicarchitecture.domain.Model.Interests
 import ru.otus.basicarchitecture.domain.Model.Person
+import javax.inject.Inject
+import javax.inject.Singleton
 
+@Singleton
+data class WizardCache(
+    //person
+    var firstName: String,
+    var surName: String,
+    var dateOfBirth: String,
 
-class WizardCache {
+    //address
+    var country: String,
+    var city: String,
+    var address: String,
 
-    private var resultDataModel: ResultDataModel? = null
-
-}
-
-
-//комментарии на уточнить - не уверен что модель из домаина должна находится в дата слое
-//не знаю в каком слое делать парсер
-private data class ResultDataModel(
-    val person: Person,
-    val address: Address,
-    val interests: Interests
+    //interests
+    var interests:  String
 )
\ No newline at end of file
diff --git a/app/src/main/java/ru/otus/basicarchitecture/domain/Model/Interests.kt b/app/src/main/java/ru/otus/basicarchitecture/domain/Model/Interests.kt
index c8f6b7b..3a803bb 100644
--- a/app/src/main/java/ru/otus/basicarchitecture/domain/Model/Interests.kt
+++ b/app/src/main/java/ru/otus/basicarchitecture/domain/Model/Interests.kt
@@ -1,5 +1,5 @@
 package ru.otus.basicarchitecture.domain.Model
 
 data class Interests (
-    val interests:  String
+    var interests:  String
 )
\ No newline at end of file
diff --git a/app/src/main/java/ru/otus/basicarchitecture/domain/Model/Person.kt b/app/src/main/java/ru/otus/basicarchitecture/domain/Model/Person.kt
index 69e5f7f..58e56b6 100644
--- a/app/src/main/java/ru/otus/basicarchitecture/domain/Model/Person.kt
+++ b/app/src/main/java/ru/otus/basicarchitecture/domain/Model/Person.kt
@@ -1,7 +1,23 @@
 package ru.otus.basicarchitecture.domain.Model
 
+import ru.otus.basicarchitecture.DI.FragmentComponents.FragmentScope
+
+
+@FragmentScope
 data class Person(
-    val firstName: String,
-    val surName: String,
-    val dateOfBirth: String
-)
\ No newline at end of file
+    var firstName: String,
+    var surName: String,
+    var dateOfBirth: String
+) {
+    companion object {
+        const val defaultValueProperty = ""
+
+        fun defaultPerson(): Person {
+            return Person(
+                defaultValueProperty,
+                defaultValueProperty,
+                defaultValueProperty
+            )
+        }
+    }
+}
diff --git a/app/src/main/java/ru/otus/basicarchitecture/domain/getData/GetInfoPersonUseCase.kt b/app/src/main/java/ru/otus/basicarchitecture/domain/getData/GetInfoPersonUseCase.kt
index b13bfb3..f9d8f18 100644
--- a/app/src/main/java/ru/otus/basicarchitecture/domain/getData/GetInfoPersonUseCase.kt
+++ b/app/src/main/java/ru/otus/basicarchitecture/domain/getData/GetInfoPersonUseCase.kt
@@ -1,6 +1,7 @@
 package ru.otus.basicarchitecture.domain.getData
 
-class GetInfoPersonUseCase {
+import ru.otus.basicarchitecture.domain.Repository
 
+class GetInfoPersonUseCase(val repository: Repository) {
 
 }
\ No newline at end of file
diff --git a/app/src/main/java/ru/otus/basicarchitecture/domain/setData/SetAddressUseCase.kt b/app/src/main/java/ru/otus/basicarchitecture/domain/setData/SetAddressUseCase.kt
index 120d14b..0b0413c 100644
--- a/app/src/main/java/ru/otus/basicarchitecture/domain/setData/SetAddressUseCase.kt
+++ b/app/src/main/java/ru/otus/basicarchitecture/domain/setData/SetAddressUseCase.kt
@@ -2,8 +2,11 @@ package ru.otus.basicarchitecture.domain.setData
 
 import ru.otus.basicarchitecture.domain.Model.Address
 import ru.otus.basicarchitecture.domain.Repository
+import javax.inject.Inject
 
-class SetAddressUseCase(val repository: Repository) {
+class SetAddressUseCase @Inject constructor(
+    private val repository: Repository
+) {
     fun setAddress(address: Address){
         repository.setAddress(address)
     }
diff --git a/app/src/main/java/ru/otus/basicarchitecture/domain/setData/SetInterestsPersonUseCase.kt b/app/src/main/java/ru/otus/basicarchitecture/domain/setData/SetInterestsPersonUseCase.kt
index b010672..220ccd6 100644
--- a/app/src/main/java/ru/otus/basicarchitecture/domain/setData/SetInterestsPersonUseCase.kt
+++ b/app/src/main/java/ru/otus/basicarchitecture/domain/setData/SetInterestsPersonUseCase.kt
@@ -2,8 +2,11 @@ package ru.otus.basicarchitecture.domain.setData
 
 import ru.otus.basicarchitecture.domain.Model.Interests
 import ru.otus.basicarchitecture.domain.Repository
+import javax.inject.Inject
 
-class SetInterestsPersonUseCase(val repository: Repository) {
+class SetInterestsPersonUseCase @Inject constructor(
+    private val repository: Repository
+) {
     fun setInterests(interests: Interests){
         repository.setInterests(interests)
     }
diff --git a/app/src/main/java/ru/otus/basicarchitecture/domain/setData/SetPersonUseCase.kt b/app/src/main/java/ru/otus/basicarchitecture/domain/setData/SetPersonUseCase.kt
index bc835d9..0025568 100644
--- a/app/src/main/java/ru/otus/basicarchitecture/domain/setData/SetPersonUseCase.kt
+++ b/app/src/main/java/ru/otus/basicarchitecture/domain/setData/SetPersonUseCase.kt
@@ -2,8 +2,11 @@ package ru.otus.basicarchitecture.domain.setData
 
 import ru.otus.basicarchitecture.domain.Model.Person
 import ru.otus.basicarchitecture.domain.Repository
+import javax.inject.Inject
 
-class SetPersonUseCase(val repository: Repository) {
+class SetPersonUseCase @Inject constructor(
+    private val repository: Repository
+) {
     fun setPerson(person: Person) {
         repository.setPerson(person)
     }
diff --git a/app/src/main/java/ru/otus/basicarchitecture/presentation/FirstScreen/FirstScreenFragment.kt b/app/src/main/java/ru/otus/basicarchitecture/presentation/FirstScreen/FirstScreenFragment.kt
index d8fa266..b7b763b 100644
--- a/app/src/main/java/ru/otus/basicarchitecture/presentation/FirstScreen/FirstScreenFragment.kt
+++ b/app/src/main/java/ru/otus/basicarchitecture/presentation/FirstScreen/FirstScreenFragment.kt
@@ -1,5 +1,7 @@
 package ru.otus.basicarchitecture.presentation.FirstScreen
 
+import android.app.DatePickerDialog
+import android.content.Context
 import android.os.Bundle
 import android.text.InputType
 import android.view.LayoutInflater
@@ -7,16 +9,29 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.Button
 import android.widget.EditText
+import android.widget.TextView
+import android.widget.Toast
 import androidx.core.content.ContextCompat
-import androidx.core.widget.addTextChangedListener
 import androidx.fragment.app.Fragment
-import androidx.lifecycle.ViewModel
 import androidx.lifecycle.ViewModelProvider
 import com.google.android.material.textfield.TextInputLayout
+import ru.otus.basicarchitecture.App
 import ru.otus.basicarchitecture.R
+import ru.otus.basicarchitecture.presentation.ViewModelFactory
+import java.util.Calendar
+import java.util.Locale
+import javax.inject.Inject
 
 class FirstScreenFragment : Fragment() {
 
+    @Inject
+    lateinit var viewModelFactory: ViewModelFactory
+
+
+    private val viewModel by lazy {
+        ViewModelProvider(this, viewModelFactory)[FirstScreenViewModel::class.java]
+    }
+
 
     private var screen = UNKNOWN_SCREEN
 
@@ -31,12 +46,12 @@ class FirstScreenFragment : Fragment() {
     private var surNameInputLayout: TextInputLayout? = null
     private var birthDateInputLayout: TextInputLayout? = null
 
-    private lateinit var viewModel: FirstScreenViewModel
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         parseParam()
     }
+
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
@@ -47,14 +62,17 @@ class FirstScreenFragment : Fragment() {
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        viewModel = ViewModelProvider(this)[FirstScreenViewModel::class.java]
-        setupView(view)
-        nameEditText.apply {
-        }
 
+        (requireActivity().application as App).component
+            .firstScreenSubComponent()
+            .build()
+            .inject(this)
+
+        setupView(view)
 
     }
 
+
     private fun setupView(view: View) {
         with(view) {
             nextButton = findViewById(R.id.nextButton)
@@ -70,37 +88,103 @@ class FirstScreenFragment : Fragment() {
 
 
         }
+
+        nextButton?.let{ button ->
+            setListeners(button.context)
+            viewModel.enabledButtonLiveData.observe(viewLifecycleOwner){
+                button.isEnabled = it
+            }
+        }
         nameInputLayout?.apply {
-            hint = R.string.hintName.toString()
+            hint = context.getString(R.string.hintName)
         }
         surNameInputLayout?.apply {
-            hint = R.string.surNameHint.toString()
+            hint = context.getString(R.string.surNameHint)
         }
+
         birthDateInputLayout?.apply {
-            hint = R.string.DateOfBirthHint.toString()
+            hint = context.getString(R.string.DateOfBirthHint)
             startIconDrawable = ContextCompat.getDrawable(context, R.drawable.calendar)
-            startIconContentDescription = R.string.DateOfBirthHint.toString()
+            startIconContentDescription = context.getString(R.string.DateOfBirthHint)
         }
         birthDateEditText?.apply {
-            inputType = InputType.TYPE_DATETIME_VARIATION_DATE
+            inputType = InputType.TYPE_NULL
+        //    isEnabled = false
+            isCursorVisible = false
+            keyListener = null
+
+            onFocusChangeListener = View.OnFocusChangeListener { view, hasFocus ->
+                if(hasFocus){
+                    showDatePicker(view.context)
+                }
+                this.clearFocus()
+            }
+
+         /*   setOnClickListener{
+                showDatePicker(it.context)
+            }*/
+
+        }
+
+
+
+    }
+
+
+
+    private fun setListeners(context: Context) {
+
+        nextButton?.setOnClickListener{
+            viewModel.setData(
+                nameEditText?.text.toString(),
+                surNameEditText?.text.toString(),
+                birthDateEditText?.text.toString()
+            ) { showToast(MESSAGE_TOAST_INVALIDATE_TEXT, it.context) }
         }
     }
 
-    private fun parseParam(){
+    // возможно надо перенести внутрь ViewModel
+    private fun showDatePicker(context: Context) {
+        val currentDate = Calendar.getInstance()
+        val datePicker = DatePickerDialog(
+            context,
+            { _, year, month, day ->
+                val selectedData =
+                    String.format(Locale.getDefault(), "%04d-%02d-%02d", year, month + 1, day)
+                viewModel.validData(day, month, year,
+                    { showToast(MESSAGE_TOAST_INCORRECT_AGE, context) }
+                )
+                birthDateEditText?.setText(selectedData)
+            },
+            currentDate.get(Calendar.YEAR),
+            currentDate.get(Calendar.MONTH),
+            currentDate.get(Calendar.DAY_OF_MONTH)
+        )
+        datePicker.show()
+    }
+
+
+    private fun parseParam() {
         val args = requireArguments()
-        if(!args.containsKey(KEY_SCREEN_MODE)){
+        if (!args.containsKey(KEY_SCREEN_MODE)) {
             throw Exception(Exception_message)
         }
-        screen = requireArguments().getString(SCREEN_MODE) ?: throw Exception(Exception_message)
+        screen = requireArguments().getString(KEY_SCREEN_MODE) ?: throw Exception(Exception_message)
+    }
+
+    private fun showToast(message: String, context: Context) {
+        Toast.makeText(context, message, Toast.LENGTH_LONG).show()
     }
 
 
-    companion object{
+    companion object {
+        private val MESSAGE_TOAST_INVALIDATE_TEXT = "Есть незаполненные поля"
+        private val MESSAGE_TOAST_INCORRECT_AGE = "Возраст пользователя не может быть меньше 18"
         private const val Exception_message = "First fragment: unknown screen mode"
         private const val UNKNOWN_SCREEN = "unknown_screen"
         private const val KEY_SCREEN_MODE = "key_screen_mode"
         private const val SCREEN_MODE = "first_screen"
-        fun instance() : FirstScreenFragment {
+        fun instance(): FirstScreenFragment {
             return FirstScreenFragment().apply {
                 arguments = Bundle().apply {
                     putString(KEY_SCREEN_MODE, SCREEN_MODE)
diff --git a/app/src/main/java/ru/otus/basicarchitecture/presentation/FirstScreen/FirstScreenViewModel.kt b/app/src/main/java/ru/otus/basicarchitecture/presentation/FirstScreen/FirstScreenViewModel.kt
index 6c46605..2e005d4 100644
--- a/app/src/main/java/ru/otus/basicarchitecture/presentation/FirstScreen/FirstScreenViewModel.kt
+++ b/app/src/main/java/ru/otus/basicarchitecture/presentation/FirstScreen/FirstScreenViewModel.kt
@@ -2,22 +2,16 @@ package ru.otus.basicarchitecture.presentation.FirstScreen
 
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
-import ru.otus.basicarchitecture.data.RepositoryImpl
 import ru.otus.basicarchitecture.domain.Model.Person
-import ru.otus.basicarchitecture.domain.Repository
 import ru.otus.basicarchitecture.domain.setData.SetPersonUseCase
+import java.time.LocalDate
+import java.time.format.DateTimeFormatter
+import java.time.temporal.ChronoUnit
+import javax.inject.Inject
 
-class FirstScreenViewModel : ViewModel(){
-
-
-//    private val personMutableLiveData = MutableLiveData<Person>()
-//
-//
-//    val personLiveData = personMutableLiveData
-//
-    var repository = RepositoryImpl()
-    private val setPersonUseCase = SetPersonUseCase(repository)
-
+class FirstScreenViewModel @Inject constructor(
+    val setPersonUseCase: SetPersonUseCase
+) : ViewModel(){
 
     private val enabledButtonMutableLiveData = MutableLiveData<Boolean>()
     val enabledButtonLiveData = enabledButtonMutableLiveData
@@ -26,8 +20,44 @@ class FirstScreenViewModel : ViewModel(){
     private var surName = UNKNOWN_VALUE
     private var birthDate  = UNKNOWN_VALUE
 
-    fun validate(){
 
+    init {
+        enabledButtonMutableLiveData.postValue(true)
+    }
+
+    fun setData(name: String?, surName: String?, birthDate: String?, showToast: () -> Unit){
+        this.name = name ?: UNKNOWN_VALUE
+        this.surName = surName ?: UNKNOWN_VALUE
+        this.birthDate = birthDate ?: UNKNOWN_VALUE
+        validateEmptyValue(showToast)
+        val person = Person(this.name, this.surName, this.birthDate)
+        setPersonUseCase.setPerson(person)
+    }
+
+    fun validateEmptyValue(showToast: () -> Unit){
+        if(name == UNKNOWN_VALUE || surName == UNKNOWN_VALUE || birthDate == UNKNOWN_VALUE){
+            setupFalseButton(showToast)
+        }else {
+            enabledButtonMutableLiveData.postValue(true)
+        }
+    }
+
+    fun validData(day: Int, month: Int, year: Int, showToast: () -> Unit){
+        val correctAge = 18
+        val currentDate = LocalDate.now()
+        val monthText = if (month < 10) "0${month+1}" else "1${month+1}"
+        val selectedDateValue = LocalDate.parse("$year-$monthText-$day", DateTimeFormatter.ISO_DATE)
+        val diff = ChronoUnit.YEARS.between(selectedDateValue, currentDate)
+        if(diff < correctAge){
+            setupFalseButton(showToast)
+        }else{
+            enabledButtonLiveData.postValue(true)
+        }
+    }
+
+    private fun setupFalseButton(showToast: () -> Unit) {
+        enabledButtonMutableLiveData.postValue(false)
+        showToast.invoke()
     }
 
 
diff --git a/app/src/main/java/ru/otus/basicarchitecture/presentation/SecondScreenFragment.kt b/app/src/main/java/ru/otus/basicarchitecture/presentation/SecondScreen/SecondScreenFragment.kt
similarity index 53%
rename from app/src/main/java/ru/otus/basicarchitecture/presentation/SecondScreenFragment.kt
rename to app/src/main/java/ru/otus/basicarchitecture/presentation/SecondScreen/SecondScreenFragment.kt
index e3de11e..df6e464 100644
--- a/app/src/main/java/ru/otus/basicarchitecture/presentation/SecondScreenFragment.kt
+++ b/app/src/main/java/ru/otus/basicarchitecture/presentation/SecondScreen/SecondScreenFragment.kt
@@ -1,6 +1,7 @@
-package ru.otus.basicarchitecture.presentation
+package ru.otus.basicarchitecture.presentation.SecondScreen
 
 import androidx.fragment.app.Fragment
 
 class SecondScreenFragment : Fragment() {
+    // TODO:
 }
\ No newline at end of file
diff --git a/app/src/main/java/ru/otus/basicarchitecture/presentation/ViewModelFactory.kt b/app/src/main/java/ru/otus/basicarchitecture/presentation/ViewModelFactory.kt
new file mode 100644
index 0000000..4b4c7e6
--- /dev/null
+++ b/app/src/main/java/ru/otus/basicarchitecture/presentation/ViewModelFactory.kt
@@ -0,0 +1,13 @@
+package ru.otus.basicarchitecture.presentation
+
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.ViewModelProvider
+import javax.inject.Inject
+
+class ViewModelFactory @Inject constructor(
+    private val viewModels: @JvmSuppressWildcards Map<String, ViewModel>
+) : ViewModelProvider.Factory {
+    override fun <T : ViewModel> create(modelClass: Class<T>): T {
+        return viewModels[modelClass.simpleName] as T
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/res/drawable/background_state_button.xml b/app/src/main/res/drawable/background_state_button.xml
new file mode 100644
index 0000000..132c26d
--- /dev/null
+++ b/app/src/main/res/drawable/background_state_button.xml
@@ -0,0 +1,7 @@
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- Состояние для активной кнопки (включенной) -->
+    <item android:state_enabled="true" android:drawable="@color/button" />
+
+    <!-- Состояние для неактивной кнопки (выключенной) -->
+    <item android:state_enabled="false" android:drawable="@android:color/darker_gray" />
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/first_and_second_screen.xml b/app/src/main/res/layout/first_and_second_screen.xml
index f5ff3c4..6036b56 100644
--- a/app/src/main/res/layout/first_and_second_screen.xml
+++ b/app/src/main/res/layout/first_and_second_screen.xml
@@ -4,7 +4,16 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
-
+<ScrollView
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    app:layout_constraintTop_toTopOf="parent"
+    app:layout_constraintStart_toStartOf="parent"
+    app:layout_constraintEnd_toEndOf="parent"
+    app:layout_constraintBottom_toTopOf="@id/nextButton">
+   <androidx.constraintlayout.widget.ConstraintLayout
+       android:layout_width="match_parent"
+       android:layout_height="wrap_content">
     <com.google.android.material.textfield.TextInputLayout
         android:id="@+id/firstInputLayout"
         android:layout_width="match_parent"
@@ -19,7 +28,8 @@
             android:id="@+id/firstEditText"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            app:endIconMode="clear_text"/>
+            app:endIconMode="clear_text"
+            android:inputType="none"/>
 
     </com.google.android.material.textfield.TextInputLayout>
 
@@ -50,19 +60,16 @@
         android:layout_marginTop="30dp"
         android:layout_marginLeft="10dp"
         android:layout_marginRight="10dp">
-<!--        android:hint="@string/DateOfBirthHint"
-        app:startIconDrawable="@drawable/calendar"
-        app:startIconContentDescription="@string/DateOfBirthHint"
-        app:startIconScaleType = "centerInside">-->
 
         <com.google.android.material.textfield.TextInputEditText
             android:id="@+id/thirdEditText"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            app:endIconMode="clear_text"
-            android:inputType="date"/>
+            app:endIconMode="clear_text" />
 
     </com.google.android.material.textfield.TextInputLayout>
+   </androidx.constraintlayout.widget.ConstraintLayout>
+</ScrollView>
 
     <Button
         android:id="@+id/nextButton"
@@ -72,12 +79,11 @@
         android:layout_marginLeft="30dp"
         android:layout_marginRight="30dp"
         android:text="@string/textButton"
-        android:textSize="14sp"
-        android:backgroundTint="@color/button"
+        android:textSize="18sp"
+        android:textColor="@android:color/white"
+        android:background="@drawable/background_state_button"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"/>
 
-
-
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index c84cccf..a7ea160 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,6 +1,6 @@
 // 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 'com.android.application' version '8.2.0' apply false
+    id 'com.android.library' version '8.2.0' apply false
     id 'org.jetbrains.kotlin.android' version '1.8.0' apply false
 }
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index bfac0f0..8d2efbf 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Sun May 14 22:33:44 GST 2023
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

From e141346326c61b2c0b04d00da76d7aefbbeb027a Mon Sep 17 00:00:00 2001
From: Alexey Kozyrev <tcsid4@gmail.com>
Date: Sun, 28 Jan 2024 15:18:23 +0300
Subject: [PATCH 6/9] =?UTF-8?q?=D0=93=D0=BE=D1=82=D0=BE=D0=B2=D1=8B=D0=B9?=
 =?UTF-8?q?=20=D0=B2=D1=82=D0=BE=D1=80=D0=BE=D0=B9=20=D1=8D=D0=BA=D1=80?=
 =?UTF-8?q?=D0=B0=D0=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../FirstScreen/FirstScreenSubComponent.kt    |   2 +-
 ...ModelModule.kt => FirstViewModelModule.kt} |   2 +-
 .../FirstScreen/PersonModule.kt               |   6 +-
 .../SecondScreen/AddressModule.kt             |  17 +++
 .../SecondScreen/SecondScreenSubComponent.kt  |  19 +++
 .../SecondScreen/SecondViewModelModule.kt     |  17 +++
 .../DI/MainComponent/MainComponent.kt         |   3 +
 .../basicarchitecture/data/RepositoryImpl.kt  |   4 +
 .../basicarchitecture/domain/Repository.kt    |   4 +-
 .../FirstScreen/FirstScreenFragment.kt        |  72 +++++-----
 .../FirstScreen/FirstScreenViewModel.kt       |  32 +++--
 .../SecondScreen/SecondScreenFragment.kt      | 124 +++++++++++++++++-
 .../SecondScreen/SecondScreenViewModel.kt     |  56 ++++++++
 .../ThirdScreen/ThirdScreenFragment.kt        |  28 ++++
 app/src/main/res/layout/third_screen.xml      |  18 +++
 app/src/main/res/values/strings.xml           |   3 +
 16 files changed, 345 insertions(+), 62 deletions(-)
 rename app/src/main/java/ru/otus/basicarchitecture/DI/FragmentComponents/FirstScreen/{ViewModelModule.kt => FirstViewModelModule.kt} (93%)
 create mode 100644 app/src/main/java/ru/otus/basicarchitecture/DI/FragmentComponents/SecondScreen/AddressModule.kt
 create mode 100644 app/src/main/java/ru/otus/basicarchitecture/DI/FragmentComponents/SecondScreen/SecondScreenSubComponent.kt
 create mode 100644 app/src/main/java/ru/otus/basicarchitecture/DI/FragmentComponents/SecondScreen/SecondViewModelModule.kt
 create mode 100644 app/src/main/java/ru/otus/basicarchitecture/presentation/SecondScreen/SecondScreenViewModel.kt
 create mode 100644 app/src/main/java/ru/otus/basicarchitecture/presentation/ThirdScreen/ThirdScreenFragment.kt
 create mode 100644 app/src/main/res/layout/third_screen.xml

diff --git a/app/src/main/java/ru/otus/basicarchitecture/DI/FragmentComponents/FirstScreen/FirstScreenSubComponent.kt b/app/src/main/java/ru/otus/basicarchitecture/DI/FragmentComponents/FirstScreen/FirstScreenSubComponent.kt
index b303867..621e9c5 100644
--- a/app/src/main/java/ru/otus/basicarchitecture/DI/FragmentComponents/FirstScreen/FirstScreenSubComponent.kt
+++ b/app/src/main/java/ru/otus/basicarchitecture/DI/FragmentComponents/FirstScreen/FirstScreenSubComponent.kt
@@ -9,7 +9,7 @@ import ru.otus.basicarchitecture.presentation.FirstScreen.FirstScreenFragment
  * Подкомпонент для первого фрагмента
  */
 @FragmentScope
-@Subcomponent(modules = [PersonModule::class, ViewModelModule::class])
+@Subcomponent(modules = [PersonModule::class, FirstViewModelModule::class])
 interface FirstScreenSubComponent {
 
     @Subcomponent.Builder
diff --git a/app/src/main/java/ru/otus/basicarchitecture/DI/FragmentComponents/FirstScreen/ViewModelModule.kt b/app/src/main/java/ru/otus/basicarchitecture/DI/FragmentComponents/FirstScreen/FirstViewModelModule.kt
similarity index 93%
rename from app/src/main/java/ru/otus/basicarchitecture/DI/FragmentComponents/FirstScreen/ViewModelModule.kt
rename to app/src/main/java/ru/otus/basicarchitecture/DI/FragmentComponents/FirstScreen/FirstViewModelModule.kt
index 19838f8..1aae91c 100644
--- a/app/src/main/java/ru/otus/basicarchitecture/DI/FragmentComponents/FirstScreen/ViewModelModule.kt
+++ b/app/src/main/java/ru/otus/basicarchitecture/DI/FragmentComponents/FirstScreen/FirstViewModelModule.kt
@@ -8,7 +8,7 @@ import dagger.multibindings.StringKey
 import ru.otus.basicarchitecture.presentation.FirstScreen.FirstScreenViewModel
 
 @Module
-interface ViewModelModule {
+interface FirstViewModelModule {
 
     @IntoMap
     @StringKey("FirstScreenViewModel")
diff --git a/app/src/main/java/ru/otus/basicarchitecture/DI/FragmentComponents/FirstScreen/PersonModule.kt b/app/src/main/java/ru/otus/basicarchitecture/DI/FragmentComponents/FirstScreen/PersonModule.kt
index 5ff3a71..b4116b9 100644
--- a/app/src/main/java/ru/otus/basicarchitecture/DI/FragmentComponents/FirstScreen/PersonModule.kt
+++ b/app/src/main/java/ru/otus/basicarchitecture/DI/FragmentComponents/FirstScreen/PersonModule.kt
@@ -3,6 +3,7 @@ package ru.otus.basicarchitecture.DI.FragmentComponents.FirstScreen
 import dagger.Module
 import dagger.Provides
 import ru.otus.basicarchitecture.DI.FragmentComponents.FragmentScope
+import ru.otus.basicarchitecture.domain.Model.Address
 import ru.otus.basicarchitecture.domain.Model.Person
 
 @Module
@@ -12,4 +13,7 @@ class PersonModule {
     fun providePerson(): Person{
         return Person.defaultPerson()
     }
-}
\ No newline at end of file
+
+
+}
+
diff --git a/app/src/main/java/ru/otus/basicarchitecture/DI/FragmentComponents/SecondScreen/AddressModule.kt b/app/src/main/java/ru/otus/basicarchitecture/DI/FragmentComponents/SecondScreen/AddressModule.kt
new file mode 100644
index 0000000..94db3f4
--- /dev/null
+++ b/app/src/main/java/ru/otus/basicarchitecture/DI/FragmentComponents/SecondScreen/AddressModule.kt
@@ -0,0 +1,17 @@
+package ru.otus.basicarchitecture.DI.FragmentComponents.SecondScreen
+
+import dagger.Module
+import dagger.Provides
+import ru.otus.basicarchitecture.DI.FragmentComponents.FragmentScope
+import ru.otus.basicarchitecture.domain.Model.Address
+
+@Module
+class AddressModule {
+    @FragmentScope
+    @Provides
+    fun providesAddress(): Address{
+        return Address("","","")
+    }
+
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/ru/otus/basicarchitecture/DI/FragmentComponents/SecondScreen/SecondScreenSubComponent.kt b/app/src/main/java/ru/otus/basicarchitecture/DI/FragmentComponents/SecondScreen/SecondScreenSubComponent.kt
new file mode 100644
index 0000000..8f55adf
--- /dev/null
+++ b/app/src/main/java/ru/otus/basicarchitecture/DI/FragmentComponents/SecondScreen/SecondScreenSubComponent.kt
@@ -0,0 +1,19 @@
+package ru.otus.basicarchitecture.DI.FragmentComponents.SecondScreen
+
+import dagger.Subcomponent
+import ru.otus.basicarchitecture.DI.FragmentComponents.FragmentScope
+import ru.otus.basicarchitecture.presentation.SecondScreen.SecondScreenFragment
+import ru.otus.basicarchitecture.presentation.SecondScreen.SecondScreenViewModel
+
+
+@FragmentScope
+@Subcomponent(modules = [AddressModule::class, SecondViewModelModule::class])
+interface SecondScreenSubComponent {
+
+    @Subcomponent.Builder
+    interface Builder {
+        fun build() : SecondScreenSubComponent
+    }
+
+    fun inject(fragmentSecond: SecondScreenFragment)
+}
\ No newline at end of file
diff --git a/app/src/main/java/ru/otus/basicarchitecture/DI/FragmentComponents/SecondScreen/SecondViewModelModule.kt b/app/src/main/java/ru/otus/basicarchitecture/DI/FragmentComponents/SecondScreen/SecondViewModelModule.kt
new file mode 100644
index 0000000..d98bfeb
--- /dev/null
+++ b/app/src/main/java/ru/otus/basicarchitecture/DI/FragmentComponents/SecondScreen/SecondViewModelModule.kt
@@ -0,0 +1,17 @@
+package ru.otus.basicarchitecture.DI.FragmentComponents.SecondScreen
+
+import androidx.lifecycle.ViewModel
+import dagger.Binds
+import dagger.Module
+import dagger.multibindings.IntoMap
+import dagger.multibindings.StringKey
+import ru.otus.basicarchitecture.presentation.SecondScreen.SecondScreenViewModel
+@Module
+interface SecondViewModelModule {
+
+    @IntoMap
+    @StringKey("SecondScreenViewModel")
+    @Binds
+    fun bindFirstScreenViewModel(impl: SecondScreenViewModel): ViewModel
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/ru/otus/basicarchitecture/DI/MainComponent/MainComponent.kt b/app/src/main/java/ru/otus/basicarchitecture/DI/MainComponent/MainComponent.kt
index 64a6d54..4c275e6 100644
--- a/app/src/main/java/ru/otus/basicarchitecture/DI/MainComponent/MainComponent.kt
+++ b/app/src/main/java/ru/otus/basicarchitecture/DI/MainComponent/MainComponent.kt
@@ -2,6 +2,7 @@ package ru.otus.basicarchitecture.DI.MainComponent
 
 import dagger.Component
 import ru.otus.basicarchitecture.DI.FragmentComponents.FirstScreen.FirstScreenSubComponent
+import ru.otus.basicarchitecture.DI.FragmentComponents.SecondScreen.SecondScreenSubComponent
 import ru.otus.basicarchitecture.data.WizardCache
 import ru.otus.basicarchitecture.domain.Repository
 import javax.inject.Singleton
@@ -11,6 +12,8 @@ import javax.inject.Singleton
 interface MainComponent {
     fun firstScreenSubComponent() : FirstScreenSubComponent.Builder
 
+    fun secondScreenSubComponent() : SecondScreenSubComponent.Builder
+
     fun wizardCache(): WizardCache
 
     fun repository(): Repository
diff --git a/app/src/main/java/ru/otus/basicarchitecture/data/RepositoryImpl.kt b/app/src/main/java/ru/otus/basicarchitecture/data/RepositoryImpl.kt
index a33cdfd..ca02a66 100644
--- a/app/src/main/java/ru/otus/basicarchitecture/data/RepositoryImpl.kt
+++ b/app/src/main/java/ru/otus/basicarchitecture/data/RepositoryImpl.kt
@@ -37,6 +37,10 @@ class RepositoryImpl @Inject constructor(
         updateWizardCache()
     }
 
+    override fun getInfoPersonUseCase() {
+
+    }
+
     private fun updateWizardCache() {
         mutableLiveDataWizardCache.postValue(wizardCache)
     }
diff --git a/app/src/main/java/ru/otus/basicarchitecture/domain/Repository.kt b/app/src/main/java/ru/otus/basicarchitecture/domain/Repository.kt
index 7666395..ea01356 100644
--- a/app/src/main/java/ru/otus/basicarchitecture/domain/Repository.kt
+++ b/app/src/main/java/ru/otus/basicarchitecture/domain/Repository.kt
@@ -14,7 +14,5 @@ interface Repository {
     fun setAddress(address: Address)
 
 
-
-
-    //fun getInfoPersonUseCase()
+    fun getInfoPersonUseCase()
 }
\ No newline at end of file
diff --git a/app/src/main/java/ru/otus/basicarchitecture/presentation/FirstScreen/FirstScreenFragment.kt b/app/src/main/java/ru/otus/basicarchitecture/presentation/FirstScreen/FirstScreenFragment.kt
index b7b763b..f397a56 100644
--- a/app/src/main/java/ru/otus/basicarchitecture/presentation/FirstScreen/FirstScreenFragment.kt
+++ b/app/src/main/java/ru/otus/basicarchitecture/presentation/FirstScreen/FirstScreenFragment.kt
@@ -9,7 +9,6 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.Button
 import android.widget.EditText
-import android.widget.TextView
 import android.widget.Toast
 import androidx.core.content.ContextCompat
 import androidx.fragment.app.Fragment
@@ -17,6 +16,7 @@ import androidx.lifecycle.ViewModelProvider
 import com.google.android.material.textfield.TextInputLayout
 import ru.otus.basicarchitecture.App
 import ru.otus.basicarchitecture.R
+import ru.otus.basicarchitecture.presentation.SecondScreen.SecondScreenFragment
 import ru.otus.basicarchitecture.presentation.ViewModelFactory
 import java.util.Calendar
 import java.util.Locale
@@ -33,8 +33,6 @@ class FirstScreenFragment : Fragment() {
     }
 
 
-    private var screen = UNKNOWN_SCREEN
-
     private var nextButton: Button? = null
 
     private var nameEditText: EditText? = null
@@ -47,10 +45,10 @@ class FirstScreenFragment : Fragment() {
     private var birthDateInputLayout: TextInputLayout? = null
 
 
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        parseParam()
-    }
+    /*    override fun onCreate(savedInstanceState: Bundle?) {
+            super.onCreate(savedInstanceState)
+            parseParam()
+        }*/
 
     override fun onCreateView(
         inflater: LayoutInflater,
@@ -89,9 +87,9 @@ class FirstScreenFragment : Fragment() {
 
         }
 
-        nextButton?.let{ button ->
-            setListeners(button.context)
-            viewModel.enabledButtonLiveData.observe(viewLifecycleOwner){
+        nextButton?.let { button ->
+            setListeners()
+            viewModel.enabledButtonLiveData.observe(viewLifecycleOwner) {
                 button.isEnabled = it
             }
         }
@@ -109,40 +107,44 @@ class FirstScreenFragment : Fragment() {
         }
         birthDateEditText?.apply {
             inputType = InputType.TYPE_NULL
-        //    isEnabled = false
+            //    isEnabled = false
             isCursorVisible = false
             keyListener = null
 
             onFocusChangeListener = View.OnFocusChangeListener { view, hasFocus ->
-                if(hasFocus){
+                if (hasFocus) {
                     showDatePicker(view.context)
                 }
                 this.clearFocus()
             }
 
-         /*   setOnClickListener{
-                showDatePicker(it.context)
-            }*/
-
         }
 
 
-
     }
 
 
-
-    private fun setListeners(context: Context) {
-
-        nextButton?.setOnClickListener{
+    private fun setListeners() {
+        nextButton?.setOnClickListener {
             viewModel.setData(
                 nameEditText?.text.toString(),
                 surNameEditText?.text.toString(),
-                birthDateEditText?.text.toString()
-            ) { showToast(MESSAGE_TOAST_INVALIDATE_TEXT, it.context) }
+                birthDateEditText?.text.toString(),
+                { showToast(MESSAGE_TOAST_INVALIDATE_TEXT, it.context) },
+                { openSecondFragment() }
+            )
         }
     }
 
+    private fun openSecondFragment() {
+        val fragment = SecondScreenFragment.instance()
+        parentFragmentManager
+            .beginTransaction()
+            .replace(R.id.fragmentContainer, fragment)
+            .addToBackStack(null)
+            .commit()
+    }
+
     // возможно надо перенести внутрь ViewModel
     private fun showDatePicker(context: Context) {
         val currentDate = Calendar.getInstance()
@@ -164,13 +166,7 @@ class FirstScreenFragment : Fragment() {
     }
 
 
-    private fun parseParam() {
-        val args = requireArguments()
-        if (!args.containsKey(KEY_SCREEN_MODE)) {
-            throw Exception(Exception_message)
-        }
-        screen = requireArguments().getString(KEY_SCREEN_MODE) ?: throw Exception(Exception_message)
-    }
+
 
     private fun showToast(message: String, context: Context) {
         Toast.makeText(context, message, Toast.LENGTH_LONG).show()
@@ -178,18 +174,12 @@ class FirstScreenFragment : Fragment() {
 
 
     companion object {
-        private val MESSAGE_TOAST_INVALIDATE_TEXT = "Есть незаполненные поля"
-        private val MESSAGE_TOAST_INCORRECT_AGE = "Возраст пользователя не может быть меньше 18"
-        private const val Exception_message = "First fragment: unknown screen mode"
-        private const val UNKNOWN_SCREEN = "unknown_screen"
-        private const val KEY_SCREEN_MODE = "key_screen_mode"
-        private const val SCREEN_MODE = "first_screen"
+        private const val MESSAGE_TOAST_INVALIDATE_TEXT = "Есть незаполненные поля"
+        private const val MESSAGE_TOAST_INCORRECT_AGE ="Возраст пользователя не может быть меньше 18"
+
+
         fun instance(): FirstScreenFragment {
-            return FirstScreenFragment().apply {
-                arguments = Bundle().apply {
-                    putString(KEY_SCREEN_MODE, SCREEN_MODE)
-                }
-            }
+            return FirstScreenFragment()
         }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/ru/otus/basicarchitecture/presentation/FirstScreen/FirstScreenViewModel.kt b/app/src/main/java/ru/otus/basicarchitecture/presentation/FirstScreen/FirstScreenViewModel.kt
index 2e005d4..1627b96 100644
--- a/app/src/main/java/ru/otus/basicarchitecture/presentation/FirstScreen/FirstScreenViewModel.kt
+++ b/app/src/main/java/ru/otus/basicarchitecture/presentation/FirstScreen/FirstScreenViewModel.kt
@@ -11,46 +11,50 @@ import javax.inject.Inject
 
 class FirstScreenViewModel @Inject constructor(
     val setPersonUseCase: SetPersonUseCase
-) : ViewModel(){
+) : ViewModel() {
 
     private val enabledButtonMutableLiveData = MutableLiveData<Boolean>()
     val enabledButtonLiveData = enabledButtonMutableLiveData
 
     private var name = UNKNOWN_VALUE
     private var surName = UNKNOWN_VALUE
-    private var birthDate  = UNKNOWN_VALUE
+    private var birthDate = UNKNOWN_VALUE
 
 
     init {
         enabledButtonMutableLiveData.postValue(true)
     }
 
-    fun setData(name: String?, surName: String?, birthDate: String?, showToast: () -> Unit){
+    fun setData(name: String?, surName: String?, birthDate: String?, showToast: () -> Unit, openFragment: () -> Unit) {
         this.name = name ?: UNKNOWN_VALUE
         this.surName = surName ?: UNKNOWN_VALUE
         this.birthDate = birthDate ?: UNKNOWN_VALUE
-        validateEmptyValue(showToast)
-        val person = Person(this.name, this.surName, this.birthDate)
-        setPersonUseCase.setPerson(person)
+        if(validateEmptyValue(showToast)){
+            val person = Person(this.name, this.surName, this.birthDate)
+            setPersonUseCase.setPerson(person)
+            openFragment.invoke()
+        }
     }
 
-    fun validateEmptyValue(showToast: () -> Unit){
-        if(name == UNKNOWN_VALUE || surName == UNKNOWN_VALUE || birthDate == UNKNOWN_VALUE){
+    fun validateEmptyValue(showToast: () -> Unit): Boolean {
+        return if (name == UNKNOWN_VALUE || surName == UNKNOWN_VALUE || birthDate == UNKNOWN_VALUE) {
             setupFalseButton(showToast)
-        }else {
+            false
+        } else {
             enabledButtonMutableLiveData.postValue(true)
+            true
         }
     }
 
-    fun validData(day: Int, month: Int, year: Int, showToast: () -> Unit){
+    fun validData(day: Int, month: Int, year: Int, showToast: () -> Unit) {
         val correctAge = 18
         val currentDate = LocalDate.now()
-        val monthText = if (month < 10) "0${month+1}" else "1${month+1}"
+        val monthText = if (month < 10) "0${month + 1}" else "1${month + 1}"
         val selectedDateValue = LocalDate.parse("$year-$monthText-$day", DateTimeFormatter.ISO_DATE)
         val diff = ChronoUnit.YEARS.between(selectedDateValue, currentDate)
-        if(diff < correctAge){
+        if (diff < correctAge) {
             setupFalseButton(showToast)
-        }else{
+        } else {
             enabledButtonLiveData.postValue(true)
         }
     }
@@ -61,7 +65,7 @@ class FirstScreenViewModel @Inject constructor(
     }
 
 
-    companion object{
+    companion object {
         private val UNKNOWN_VALUE = ""
     }
 
diff --git a/app/src/main/java/ru/otus/basicarchitecture/presentation/SecondScreen/SecondScreenFragment.kt b/app/src/main/java/ru/otus/basicarchitecture/presentation/SecondScreen/SecondScreenFragment.kt
index df6e464..532ed21 100644
--- a/app/src/main/java/ru/otus/basicarchitecture/presentation/SecondScreen/SecondScreenFragment.kt
+++ b/app/src/main/java/ru/otus/basicarchitecture/presentation/SecondScreen/SecondScreenFragment.kt
@@ -1,7 +1,129 @@
 package ru.otus.basicarchitecture.presentation.SecondScreen
 
+import android.content.Context
+import android.os.Bundle
+import android.os.Message
+import android.text.InputType
+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.core.content.ContextCompat
 import androidx.fragment.app.Fragment
+import androidx.lifecycle.ViewModelProvider
+import com.google.android.material.textfield.TextInputLayout
+import ru.otus.basicarchitecture.App
+import ru.otus.basicarchitecture.R
+import ru.otus.basicarchitecture.presentation.FirstScreen.FirstScreenFragment
+import ru.otus.basicarchitecture.presentation.FirstScreen.FirstScreenViewModel
+import ru.otus.basicarchitecture.presentation.ThirdScreen.ThirdScreenFragment
+import ru.otus.basicarchitecture.presentation.ViewModelFactory
+import javax.inject.Inject
 
 class SecondScreenFragment : Fragment() {
-    // TODO:
+    @Inject
+    lateinit var viewModelFactory: ViewModelFactory
+
+    private val viewModel by lazy {
+        ViewModelProvider(this, viewModelFactory)[SecondScreenViewModel::class.java]
+    }
+
+
+
+    private var countryEditText: EditText? = null
+    private var cityEditText: EditText? = null
+    private var addressEditText: EditText? = null
+
+
+    private var countryInputLayout: TextInputLayout? = null
+    private var cityInputLayout: TextInputLayout? = null
+    private var addressInputLayout: TextInputLayout? = null
+
+    private var nextButton: Button? = null
+
+
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
+        return inflater.inflate(R.layout.first_and_second_screen, container, false)
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        (requireActivity().application as App).component
+            .secondScreenSubComponent()
+            .build()
+            .inject(this)
+        setupView(view)
+    }
+
+    private fun setupView(view: View){
+        with(view) {
+            nextButton = findViewById(R.id.nextButton)
+
+            countryInputLayout = findViewById(R.id.firstInputLayout)
+            countryEditText = findViewById(R.id.firstEditText)
+
+            cityInputLayout = findViewById(R.id.secondInputLayout)
+            cityEditText = findViewById(R.id.secondEditText)
+
+            addressInputLayout = findViewById(R.id.thirdInputLayout)
+            addressEditText = findViewById(R.id.thirdEditText)
+
+
+        }
+
+        nextButton?.let{ button ->
+            setListeners()
+            viewModel.enabledButtonLiveData.observe(viewLifecycleOwner){
+                button.isEnabled = it
+            }
+        }
+        countryInputLayout?.apply {
+            hint = context.getString(R.string.country)
+        }
+        cityInputLayout?.apply {
+            hint = context.getString(R.string.city)
+        }
+        addressEditText?.apply {
+            hint = context.getString(R.string.address)
+        }
+    }
+
+    private fun setListeners() {
+        nextButton?.setOnClickListener {
+            viewModel.setData(
+                countryEditText?.text.toString(),
+                cityEditText?.text.toString(),
+                addressEditText?.text.toString(),
+                {showToast(MESSAGE_TOAST_INVALIDATE_TEXT, it.context)},
+                {openFragment()}
+            )
+        }
+    }
+
+    private fun showToast(message: String, context: Context){
+        Toast.makeText(context, message, Toast.LENGTH_LONG).show()
+    }
+
+    private fun openFragment(){
+        val fragment = ThirdScreenFragment.instance()
+        parentFragmentManager
+            .beginTransaction()
+            .replace(R.id.fragmentContainer, fragment)
+            .addToBackStack(null)
+            .commit()
+    }
+
+    companion object{
+        private val MESSAGE_TOAST_INVALIDATE_TEXT = "есть незаполненные поля"
+        fun instance():SecondScreenFragment{
+            return SecondScreenFragment()
+        }
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/ru/otus/basicarchitecture/presentation/SecondScreen/SecondScreenViewModel.kt b/app/src/main/java/ru/otus/basicarchitecture/presentation/SecondScreen/SecondScreenViewModel.kt
new file mode 100644
index 0000000..a19e61a
--- /dev/null
+++ b/app/src/main/java/ru/otus/basicarchitecture/presentation/SecondScreen/SecondScreenViewModel.kt
@@ -0,0 +1,56 @@
+package ru.otus.basicarchitecture.presentation.SecondScreen
+
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.ViewModel
+import ru.otus.basicarchitecture.domain.Model.Address
+import ru.otus.basicarchitecture.domain.setData.SetAddressUseCase
+import javax.inject.Inject
+
+class SecondScreenViewModel @Inject constructor (
+    private val setAddressUseCase: SetAddressUseCase
+) : ViewModel() {
+
+
+    private val enabledButtonMutableLiveData = MutableLiveData<Boolean>()
+    val enabledButtonLiveData = enabledButtonMutableLiveData
+
+    private var country: String = UNKNOWN_VALUE
+    private var city: String = UNKNOWN_VALUE
+    private var address: String = UNKNOWN_VALUE
+
+    init {
+        enabledButtonMutableLiveData.postValue(true)
+    }
+
+    fun setData(country: String?, city: String?, address: String?, showToast: () -> Unit, openFragment: () -> Unit){
+        this.country = country ?: UNKNOWN_VALUE
+        this.city = city ?: UNKNOWN_VALUE
+        this.address = address ?: UNKNOWN_VALUE
+        if(validateEmptyValue(showToast)) {
+            val addres = Address(this.country, this.city, this.address)
+            setAddressUseCase.setAddress(addres)
+            openFragment.invoke()
+        }
+    }
+
+
+    fun validateEmptyValue(showToast: () -> Unit): Boolean {
+        return if (country == UNKNOWN_VALUE || city == UNKNOWN_VALUE || address == UNKNOWN_VALUE) {
+            setupFalseButton(showToast)
+            false
+        } else {
+            enabledButtonMutableLiveData.postValue(true)
+            true
+        }
+    }
+
+    private fun setupFalseButton(showToast: () -> Unit) {
+        enabledButtonMutableLiveData.postValue(false)
+        showToast.invoke()
+    }
+
+
+    companion object{
+        private val UNKNOWN_VALUE = ""
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/ru/otus/basicarchitecture/presentation/ThirdScreen/ThirdScreenFragment.kt b/app/src/main/java/ru/otus/basicarchitecture/presentation/ThirdScreen/ThirdScreenFragment.kt
new file mode 100644
index 0000000..f79b018
--- /dev/null
+++ b/app/src/main/java/ru/otus/basicarchitecture/presentation/ThirdScreen/ThirdScreenFragment.kt
@@ -0,0 +1,28 @@
+package ru.otus.basicarchitecture.presentation.ThirdScreen
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.fragment.app.Fragment
+import ru.otus.basicarchitecture.R
+
+class ThirdScreenFragment : Fragment() {
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
+        return inflater.inflate(R.layout.third_screen, container,false)
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+    }
+
+    companion object{
+        fun instance() : ThirdScreenFragment{
+            return ThirdScreenFragment()
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/res/layout/third_screen.xml b/app/src/main/res/layout/third_screen.xml
new file mode 100644
index 0000000..5b30a99
--- /dev/null
+++ b/app/src/main/res/layout/third_screen.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        android:text="Hello world"
+        android:textSize="30sp"
+        android:textStyle="bold"/>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 3a681c3..ae42908 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -4,4 +4,7 @@
     <string name="surNameHint">Surname</string>
     <string name="DateOfBirthHint">Date of Birth</string>
     <string name="textButton">Next</string>
+    <string name="country">Country</string>
+    <string name="city">City</string>
+    <string name="address">Address</string>
 </resources>
\ No newline at end of file

From bb1e6ec8a3bce52ff08cd9da40ef1155629aaf0b Mon Sep 17 00:00:00 2001
From: Alexey Kozyrev <tcsid4@gmail.com>
Date: Sat, 10 Feb 2024 14:42:08 +0300
Subject: [PATCH 7/9] =?UTF-8?q?=D0=BD=D0=B0=20=D1=8D=D0=BA=D1=80=D0=B0?=
 =?UTF-8?q?=D0=BD=D0=B5=203=20=D0=BF=D1=80=D0=B8=20=D0=BA=D0=BB=D0=B8?=
 =?UTF-8?q?=D0=BA=D0=B5=20=D0=BD=D0=B5=20=D0=BF=D0=B5=D1=80=D0=B5=D1=80?=
 =?UTF-8?q?=D0=B8=D1=81=D0=BE=D0=B2=D1=8B=D0=B2=D0=B0=D0=B5=D1=82=D1=81?=
 =?UTF-8?q?=D1=8F=20=D0=B2=D1=8C=D1=8E=D1=85=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SecondScreen/SecondViewModelModule.kt     |  2 +-
 .../ThirdScreen/ThirdScreenSubComponent.kt    | 19 ++++++
 .../ThirdScreen/ThirdViewModelModule.kt       | 18 ++++++
 .../DI/MainComponent/MainComponent.kt         |  3 +
 .../basicarchitecture/data/RepositoryImpl.kt  | 43 ++++++++++++-
 .../basicarchitecture/domain/Repository.kt    |  2 +
 .../domain/getData/GetListInterests.kt        | 10 +++
 .../FirstScreen/FirstScreenViewModel.kt       |  5 +-
 .../presentation/MainActivity.kt              |  4 +-
 .../ThirdScreen/InterestsDiffUtil.kt          | 25 ++++++++
 .../ThirdScreen/InterestsViewHolder.kt        | 10 +++
 .../ThirdScreen/ListInterestsAdapter.kt       | 56 +++++++++++++++++
 .../ThirdScreen/ModelInterestsForView.kt      | 20 ++++++
 .../ThirdScreen/ThirdScreenFragment.kt        | 63 ++++++++++++++++++-
 .../ThirdScreen/ThirdScreenViewModel.kt       | 59 +++++++++++++++++
 .../res/drawable/form_text_view_for_rv.xml    | 10 +++
 .../main/res/layout/interests_disabled.xml    | 25 ++++++++
 app/src/main/res/layout/interests_enabled.xml | 26 ++++++++
 app/src/main/res/layout/third_screen.xml      | 34 +++++++---
 19 files changed, 418 insertions(+), 16 deletions(-)
 create mode 100644 app/src/main/java/ru/otus/basicarchitecture/DI/FragmentComponents/ThirdScreen/ThirdScreenSubComponent.kt
 create mode 100644 app/src/main/java/ru/otus/basicarchitecture/DI/FragmentComponents/ThirdScreen/ThirdViewModelModule.kt
 create mode 100644 app/src/main/java/ru/otus/basicarchitecture/domain/getData/GetListInterests.kt
 create mode 100644 app/src/main/java/ru/otus/basicarchitecture/presentation/ThirdScreen/InterestsDiffUtil.kt
 create mode 100644 app/src/main/java/ru/otus/basicarchitecture/presentation/ThirdScreen/InterestsViewHolder.kt
 create mode 100644 app/src/main/java/ru/otus/basicarchitecture/presentation/ThirdScreen/ListInterestsAdapter.kt
 create mode 100644 app/src/main/java/ru/otus/basicarchitecture/presentation/ThirdScreen/ModelInterestsForView.kt
 create mode 100644 app/src/main/java/ru/otus/basicarchitecture/presentation/ThirdScreen/ThirdScreenViewModel.kt
 create mode 100644 app/src/main/res/drawable/form_text_view_for_rv.xml
 create mode 100644 app/src/main/res/layout/interests_disabled.xml
 create mode 100644 app/src/main/res/layout/interests_enabled.xml

diff --git a/app/src/main/java/ru/otus/basicarchitecture/DI/FragmentComponents/SecondScreen/SecondViewModelModule.kt b/app/src/main/java/ru/otus/basicarchitecture/DI/FragmentComponents/SecondScreen/SecondViewModelModule.kt
index d98bfeb..e330969 100644
--- a/app/src/main/java/ru/otus/basicarchitecture/DI/FragmentComponents/SecondScreen/SecondViewModelModule.kt
+++ b/app/src/main/java/ru/otus/basicarchitecture/DI/FragmentComponents/SecondScreen/SecondViewModelModule.kt
@@ -12,6 +12,6 @@ interface SecondViewModelModule {
     @IntoMap
     @StringKey("SecondScreenViewModel")
     @Binds
-    fun bindFirstScreenViewModel(impl: SecondScreenViewModel): ViewModel
+    fun bindSecondScreenViewModel(impl: SecondScreenViewModel): ViewModel
 
 }
\ No newline at end of file
diff --git a/app/src/main/java/ru/otus/basicarchitecture/DI/FragmentComponents/ThirdScreen/ThirdScreenSubComponent.kt b/app/src/main/java/ru/otus/basicarchitecture/DI/FragmentComponents/ThirdScreen/ThirdScreenSubComponent.kt
new file mode 100644
index 0000000..0c8d53c
--- /dev/null
+++ b/app/src/main/java/ru/otus/basicarchitecture/DI/FragmentComponents/ThirdScreen/ThirdScreenSubComponent.kt
@@ -0,0 +1,19 @@
+package ru.otus.basicarchitecture.DI.FragmentComponents.ThirdScreen
+
+import dagger.Subcomponent
+import ru.otus.basicarchitecture.DI.FragmentComponents.FragmentScope
+import ru.otus.basicarchitecture.presentation.ThirdScreen.ThirdScreenFragment
+
+@FragmentScope
+@Subcomponent(modules = [ThirdViewModelModule::class])
+interface ThirdScreenSubComponent {
+
+    @Subcomponent.Builder
+    interface Builder {
+        fun build() : ThirdScreenSubComponent
+    }
+
+    fun inject(fragmentThird: ThirdScreenFragment)
+
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/ru/otus/basicarchitecture/DI/FragmentComponents/ThirdScreen/ThirdViewModelModule.kt b/app/src/main/java/ru/otus/basicarchitecture/DI/FragmentComponents/ThirdScreen/ThirdViewModelModule.kt
new file mode 100644
index 0000000..9eb584f
--- /dev/null
+++ b/app/src/main/java/ru/otus/basicarchitecture/DI/FragmentComponents/ThirdScreen/ThirdViewModelModule.kt
@@ -0,0 +1,18 @@
+package ru.otus.basicarchitecture.DI.FragmentComponents.ThirdScreen
+
+import androidx.lifecycle.ViewModel
+import dagger.Binds
+import dagger.Module
+import dagger.multibindings.IntoMap
+import dagger.multibindings.StringKey
+import ru.otus.basicarchitecture.presentation.ThirdScreen.ThirdScreenViewModel
+
+@Module
+interface ThirdViewModelModule {
+
+    @IntoMap
+    @StringKey("ThirdScreenViewModel")
+    @Binds
+    fun bindThirdScreenViewModel(impl: ThirdScreenViewModel): ViewModel
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/ru/otus/basicarchitecture/DI/MainComponent/MainComponent.kt b/app/src/main/java/ru/otus/basicarchitecture/DI/MainComponent/MainComponent.kt
index 4c275e6..b91f198 100644
--- a/app/src/main/java/ru/otus/basicarchitecture/DI/MainComponent/MainComponent.kt
+++ b/app/src/main/java/ru/otus/basicarchitecture/DI/MainComponent/MainComponent.kt
@@ -3,6 +3,7 @@ package ru.otus.basicarchitecture.DI.MainComponent
 import dagger.Component
 import ru.otus.basicarchitecture.DI.FragmentComponents.FirstScreen.FirstScreenSubComponent
 import ru.otus.basicarchitecture.DI.FragmentComponents.SecondScreen.SecondScreenSubComponent
+import ru.otus.basicarchitecture.DI.FragmentComponents.ThirdScreen.ThirdScreenSubComponent
 import ru.otus.basicarchitecture.data.WizardCache
 import ru.otus.basicarchitecture.domain.Repository
 import javax.inject.Singleton
@@ -14,6 +15,8 @@ interface MainComponent {
 
     fun secondScreenSubComponent() : SecondScreenSubComponent.Builder
 
+    fun thirdScreenSubComponent() : ThirdScreenSubComponent.Builder
+
     fun wizardCache(): WizardCache
 
     fun repository(): Repository
diff --git a/app/src/main/java/ru/otus/basicarchitecture/data/RepositoryImpl.kt b/app/src/main/java/ru/otus/basicarchitecture/data/RepositoryImpl.kt
index ca02a66..d2ac736 100644
--- a/app/src/main/java/ru/otus/basicarchitecture/data/RepositoryImpl.kt
+++ b/app/src/main/java/ru/otus/basicarchitecture/data/RepositoryImpl.kt
@@ -14,10 +14,49 @@ class RepositoryImpl @Inject constructor(
     private val wizardCache: WizardCache
 ) : Repository {
 
+
+    private val listInterests =  listOf(
+        "Путешествия на велосипеде",
+        "Готовка экзотических блюд",
+        "Фотография природы",
+        "Чтение фантастической литературы",
+        "Участие в квестах и головоломках",
+        "Скалолазание",
+        "Изучение иностранных языков",
+        "Фильмы ужасов",
+        "Коллекционирование винтажных книг",
+        "Графический дизайн",
+        "Велоспорт",
+        "Рисование мандал и зентанглов",
+        "Плавание с аквалангом",
+        "Изучение астрономии",
+        "Фотография уличного искусства",
+        "Участие в косплей-событиях",
+        "Йога и медитация",
+        "Игры настольные",
+        "Пение в караоке",
+        "Реставрация старинной мебели",
+        "Занятия танцами",
+        "Развитие навыков программирования",
+        "Садоводство и уход за растениями",
+        "Фотография архитектурных сооружений",
+        "Шитье и создание одежды",
+        "Философия и обсуждение философских вопросов",
+        "Развитие навыков игры на музыкальных инструментах",
+        "Прослушивание подкастов о науке",
+        "Рукоделие и создание поделок",
+        "Экстримальные виды спорта: парашютный спорт, сноубординг, скейтбординг"
+    )
+
+
+
+
     private val mutableLiveDataWizardCache = MutableLiveData<WizardCache>()
 
     val liveDataWizardCache: LiveData<WizardCache> = mutableLiveDataWizardCache
 
+
+
     override fun setPerson(person: Person) {
         wizardCache.firstName = person.firstName
         wizardCache.surName = person.surName
@@ -38,9 +77,11 @@ class RepositoryImpl @Inject constructor(
     }
 
     override fun getInfoPersonUseCase() {
-
+        TODO()
     }
 
+    override fun getListInterests(): List<String>  = listInterests
+
     private fun updateWizardCache() {
         mutableLiveDataWizardCache.postValue(wizardCache)
     }
diff --git a/app/src/main/java/ru/otus/basicarchitecture/domain/Repository.kt b/app/src/main/java/ru/otus/basicarchitecture/domain/Repository.kt
index ea01356..eef3315 100644
--- a/app/src/main/java/ru/otus/basicarchitecture/domain/Repository.kt
+++ b/app/src/main/java/ru/otus/basicarchitecture/domain/Repository.kt
@@ -15,4 +15,6 @@ interface Repository {
 
 
     fun getInfoPersonUseCase()
+
+    fun getListInterests(): List<String>
 }
\ No newline at end of file
diff --git a/app/src/main/java/ru/otus/basicarchitecture/domain/getData/GetListInterests.kt b/app/src/main/java/ru/otus/basicarchitecture/domain/getData/GetListInterests.kt
new file mode 100644
index 0000000..4646f65
--- /dev/null
+++ b/app/src/main/java/ru/otus/basicarchitecture/domain/getData/GetListInterests.kt
@@ -0,0 +1,10 @@
+package ru.otus.basicarchitecture.domain.getData
+
+import ru.otus.basicarchitecture.domain.Repository
+import javax.inject.Inject
+
+class GetListInterests @Inject constructor(val repository: Repository) {
+    fun getList(): List<String>{
+        return repository.getListInterests()
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/ru/otus/basicarchitecture/presentation/FirstScreen/FirstScreenViewModel.kt b/app/src/main/java/ru/otus/basicarchitecture/presentation/FirstScreen/FirstScreenViewModel.kt
index 1627b96..012d05f 100644
--- a/app/src/main/java/ru/otus/basicarchitecture/presentation/FirstScreen/FirstScreenViewModel.kt
+++ b/app/src/main/java/ru/otus/basicarchitecture/presentation/FirstScreen/FirstScreenViewModel.kt
@@ -49,8 +49,9 @@ class FirstScreenViewModel @Inject constructor(
     fun validData(day: Int, month: Int, year: Int, showToast: () -> Unit) {
         val correctAge = 18
         val currentDate = LocalDate.now()
-        val monthText = if (month < 10) "0${month + 1}" else "1${month + 1}"
-        val selectedDateValue = LocalDate.parse("$year-$monthText-$day", DateTimeFormatter.ISO_DATE)
+        val monthText = if (month < 9) "0${month + 1}" else "${month + 1}"
+        val dayText = if (day<10) "0${day+1}" else "$day"
+        val selectedDateValue = LocalDate.parse("$year-$monthText-$dayText", DateTimeFormatter.ISO_DATE)
         val diff = ChronoUnit.YEARS.between(selectedDateValue, currentDate)
         if (diff < correctAge) {
             setupFalseButton(showToast)
diff --git a/app/src/main/java/ru/otus/basicarchitecture/presentation/MainActivity.kt b/app/src/main/java/ru/otus/basicarchitecture/presentation/MainActivity.kt
index 5435259..dd3974e 100644
--- a/app/src/main/java/ru/otus/basicarchitecture/presentation/MainActivity.kt
+++ b/app/src/main/java/ru/otus/basicarchitecture/presentation/MainActivity.kt
@@ -4,6 +4,7 @@ import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
 import ru.otus.basicarchitecture.R
 import ru.otus.basicarchitecture.presentation.FirstScreen.FirstScreenFragment
+import ru.otus.basicarchitecture.presentation.ThirdScreen.ThirdScreenFragment
 
 class MainActivity : AppCompatActivity() {
 
@@ -12,7 +13,8 @@ class MainActivity : AppCompatActivity() {
         setContentView(R.layout.activity_main)
 
         if(savedInstanceState == null ){
-            val fragment = FirstScreenFragment.instance()
+           // val fragment = FirstScreenFragment.instance()
+            val fragment = ThirdScreenFragment.instance()
             supportFragmentManager
                 .beginTransaction()
                 .replace(R.id.fragmentContainer, fragment)
diff --git a/app/src/main/java/ru/otus/basicarchitecture/presentation/ThirdScreen/InterestsDiffUtil.kt b/app/src/main/java/ru/otus/basicarchitecture/presentation/ThirdScreen/InterestsDiffUtil.kt
new file mode 100644
index 0000000..e36a4af
--- /dev/null
+++ b/app/src/main/java/ru/otus/basicarchitecture/presentation/ThirdScreen/InterestsDiffUtil.kt
@@ -0,0 +1,25 @@
+package ru.otus.basicarchitecture.presentation.ThirdScreen
+
+import androidx.recyclerview.widget.DiffUtil
+
+class InterestsDiffUtil(
+    private val oldList: List<ModelInterestsForView>,
+    private val newList: List<ModelInterestsForView>,
+) : DiffUtil.Callback() {
+    override fun getOldListSize(): Int {
+        return oldList.size
+    }
+
+    override fun getNewListSize(): Int {
+        return newList.size
+    }
+
+    override fun areItemsTheSame(oldItemPosition: Int, newItemPosition: Int): Boolean {
+        return oldList[oldItemPosition].id == newList[newItemPosition].id
+    }
+
+    override fun areContentsTheSame(oldItemPosition: Int, newItemPosition: Int): Boolean {
+        return oldList[oldItemPosition] == newList[newItemPosition]
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/ru/otus/basicarchitecture/presentation/ThirdScreen/InterestsViewHolder.kt b/app/src/main/java/ru/otus/basicarchitecture/presentation/ThirdScreen/InterestsViewHolder.kt
new file mode 100644
index 0000000..a0457ca
--- /dev/null
+++ b/app/src/main/java/ru/otus/basicarchitecture/presentation/ThirdScreen/InterestsViewHolder.kt
@@ -0,0 +1,10 @@
+package ru.otus.basicarchitecture.presentation.ThirdScreen
+
+import android.view.View
+import android.widget.TextView
+import androidx.recyclerview.widget.RecyclerView
+import ru.otus.basicarchitecture.R
+
+class InterestsViewHolder(val view: View) : RecyclerView.ViewHolder(view) {
+    val textView = view.findViewById<TextView>(R.id.textInterests)
+}
\ No newline at end of file
diff --git a/app/src/main/java/ru/otus/basicarchitecture/presentation/ThirdScreen/ListInterestsAdapter.kt b/app/src/main/java/ru/otus/basicarchitecture/presentation/ThirdScreen/ListInterestsAdapter.kt
new file mode 100644
index 0000000..9876d2d
--- /dev/null
+++ b/app/src/main/java/ru/otus/basicarchitecture/presentation/ThirdScreen/ListInterestsAdapter.kt
@@ -0,0 +1,56 @@
+package ru.otus.basicarchitecture.presentation.ThirdScreen
+
+import android.util.Log
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.recyclerview.widget.DiffUtil
+import androidx.recyclerview.widget.ListAdapter
+import androidx.recyclerview.widget.RecyclerView
+import ru.otus.basicarchitecture.R
+
+
+class ListInterestsAdapter
+    : RecyclerView.Adapter<InterestsViewHolder>() {
+
+    var onClickListener: ((ModelInterestsForView) -> Unit)? = null
+
+    var interestsList = listOf<ModelInterestsForView>()
+        set(value){
+            val callback = InterestsDiffUtil(interestsList, value)
+            val diffResult = DiffUtil.calculateDiff(callback)
+            diffResult.dispatchUpdatesTo(this)
+            field = value
+        }
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): InterestsViewHolder {
+
+        val layout = when (viewType) {
+            DISABLED_VIEW -> R.layout.interests_disabled
+            ENABLED_VIEW -> R.layout.interests_enabled
+            else -> throw RuntimeException("Unknown view type: $viewType")
+        }
+        val view = LayoutInflater.from(parent.context).inflate(layout, parent, false)
+        return InterestsViewHolder(view)
+    }
+
+    override fun onBindViewHolder(holder: InterestsViewHolder, position: Int) {
+        val item = interestsList[position]
+        holder.view.setOnClickListener {
+            onClickListener?.invoke(item)
+        }
+        holder.textView.text = item.interests
+    }
+    override fun getItemViewType(position: Int): Int {
+        val item = interestsList[position]
+        return if (item.enabled) ENABLED_VIEW else DISABLED_VIEW
+    }
+
+    override fun getItemCount(): Int {
+        return interestsList.size
+    }
+
+    companion object {
+        val ENABLED_VIEW = 100
+        val DISABLED_VIEW = 101
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/ru/otus/basicarchitecture/presentation/ThirdScreen/ModelInterestsForView.kt b/app/src/main/java/ru/otus/basicarchitecture/presentation/ThirdScreen/ModelInterestsForView.kt
new file mode 100644
index 0000000..81cf329
--- /dev/null
+++ b/app/src/main/java/ru/otus/basicarchitecture/presentation/ThirdScreen/ModelInterestsForView.kt
@@ -0,0 +1,20 @@
+package ru.otus.basicarchitecture.presentation.ThirdScreen
+
+import ru.otus.basicarchitecture.domain.Model.Interests
+
+data class ModelInterestsForView(
+    var id: Int,
+    val interests: String,
+    var enabled: Boolean
+){
+
+    companion object {
+        fun toDomain(modelView: ModelInterestsForView): Interests {
+            return Interests(modelView.interests)
+        }
+
+        fun toModel(id: Int, interests: Interests): ModelInterestsForView {
+            return ModelInterestsForView(id, interests.interests, false)
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/ru/otus/basicarchitecture/presentation/ThirdScreen/ThirdScreenFragment.kt b/app/src/main/java/ru/otus/basicarchitecture/presentation/ThirdScreen/ThirdScreenFragment.kt
index f79b018..995552f 100644
--- a/app/src/main/java/ru/otus/basicarchitecture/presentation/ThirdScreen/ThirdScreenFragment.kt
+++ b/app/src/main/java/ru/otus/basicarchitecture/presentation/ThirdScreen/ThirdScreenFragment.kt
@@ -1,27 +1,84 @@
 package ru.otus.basicarchitecture.presentation.ThirdScreen
 
 import android.os.Bundle
+import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.Fragment
+import androidx.lifecycle.ViewModelProvider
+import androidx.recyclerview.widget.GridLayoutManager
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import androidx.recyclerview.widget.RecyclerView.LayoutManager
+import androidx.recyclerview.widget.StaggeredGridLayoutManager
+import ru.otus.basicarchitecture.App
 import ru.otus.basicarchitecture.R
+import ru.otus.basicarchitecture.presentation.ViewModelFactory
+import javax.inject.Inject
 
 class ThirdScreenFragment : Fragment() {
+
+    @Inject
+    lateinit var viewModelFactory: ViewModelFactory
+
+    private lateinit var adapterCastom: ListInterestsAdapter
+
+    private val viewModel by lazy {
+        ViewModelProvider(this, viewModelFactory)[ThirdScreenViewModel::class.java]
+    }
+
+    private var recyclerView: RecyclerView? = null
+
+
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View? {
-        return inflater.inflate(R.layout.third_screen, container,false)
+        return inflater.inflate(R.layout.third_screen, container, false)
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
+
+        (requireActivity().application as App).component
+            .thirdScreenSubComponent()
+            .build()
+            .inject(this)
+
+        setupRV(view)
+
+        viewModel.listInterestsLD.observe(viewLifecycleOwner) {
+            adapterCastom.interestsList = it
+        }
+        setupClickListener()
+    }
+
+    private fun setupRV(view: View) {
+        adapterCastom = ListInterestsAdapter()
+        recyclerView = view.findViewById(R.id.recyclerView)
+
+        recyclerView?.let {
+            with(it) {
+                val layoutManager = LinearLayoutManager(view.context)
+                this.layoutManager = layoutManager
+                adapter = adapterCastom
+                recycledViewPool.setMaxRecycledViews(ListInterestsAdapter.ENABLED_VIEW, 15)
+                recycledViewPool.setMaxRecycledViews(ListInterestsAdapter.DISABLED_VIEW, 15)
+            }
+        }
+
+    }
+
+    private fun setupClickListener() {
+        adapterCastom.onClickListener = {
+            viewModel.changeEnabledState(it)
+        }
     }
 
-    companion object{
-        fun instance() : ThirdScreenFragment{
+    companion object {
+        fun instance(): ThirdScreenFragment {
             return ThirdScreenFragment()
         }
     }
diff --git a/app/src/main/java/ru/otus/basicarchitecture/presentation/ThirdScreen/ThirdScreenViewModel.kt b/app/src/main/java/ru/otus/basicarchitecture/presentation/ThirdScreen/ThirdScreenViewModel.kt
new file mode 100644
index 0000000..f4269b9
--- /dev/null
+++ b/app/src/main/java/ru/otus/basicarchitecture/presentation/ThirdScreen/ThirdScreenViewModel.kt
@@ -0,0 +1,59 @@
+package ru.otus.basicarchitecture.presentation.ThirdScreen
+
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.ViewModel
+import ru.otus.basicarchitecture.domain.Model.Interests
+import ru.otus.basicarchitecture.domain.getData.GetListInterests
+import ru.otus.basicarchitecture.domain.setData.SetInterestsPersonUseCase
+import javax.inject.Inject
+
+class ThirdScreenViewModel @Inject constructor(
+    private val setInterestsPersonUseCase: SetInterestsPersonUseCase,
+    getListInterests: GetListInterests
+) : ViewModel() {
+
+    private val saveInterests = mutableListOf<ModelInterestsForView>()
+
+    private val mutableListAllInterests: MutableList<ModelInterestsForView>
+    private val _listInterestsLD = MutableLiveData<List<ModelInterestsForView>>()
+
+    val listInterestsLD: LiveData<List<ModelInterestsForView>> = _listInterestsLD
+
+    //todo: разберем наверное чтение с визарда, что бы при переходе экрана туда - сюда , значения не пропадали
+    init {
+        val aa = getListInterests.getList()
+        mutableListAllInterests =
+            aa.mapIndexed{
+                    index, s -> ModelInterestsForView(index,s,false)
+            }.toMutableList()
+        _listInterestsLD.postValue(mutableListAllInterests)
+    }
+
+    private fun updateListSaveInterests(model: ModelInterestsForView){
+        if(model.enabled) saveInterests.add(model) else saveInterests.remove(model)
+    }
+
+
+/*    private fun setupState(){
+        saveInterests.forEach{
+            mutableListAllInterests[it.id].enabled = it.enabled
+        }
+    }*/
+
+    fun setData( openFragment: () -> Unit){
+        setInterestsPersonUseCase.setInterests(Interests(saveInterests.toString()))
+    }
+
+    fun changeEnabledState(model: ModelInterestsForView){
+        val newEnabledState = !model.enabled
+        mutableListAllInterests[model.id].enabled = newEnabledState
+        updateListSaveInterests(mutableListAllInterests[model.id])
+        updateList()
+    }
+
+    private fun updateList(){
+        _listInterestsLD.postValue(mutableListAllInterests)
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/res/drawable/form_text_view_for_rv.xml b/app/src/main/res/drawable/form_text_view_for_rv.xml
new file mode 100644
index 0000000..c01d672
--- /dev/null
+++ b/app/src/main/res/drawable/form_text_view_for_rv.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape>
+            <corners android:radius="30dp" />
+            <stroke android:width= "2dp"/>
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/interests_disabled.xml b/app/src/main/res/layout/interests_disabled.xml
new file mode 100644
index 0000000..27d6b98
--- /dev/null
+++ b/app/src/main/res/layout/interests_disabled.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_margin="10dp">
+
+    <TextView
+        android:id="@+id/textInterests"
+        android:layout_width="120dp"
+        android:layout_height="90dp"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        android:padding="10dp"
+        android:layout_margin="10dp"
+        android:gravity="center"
+        android:text="EXAMPLE"
+        android:textStyle="bold"
+        android:textSize="15sp"
+        android:background="@drawable/form_text_view_for_rv"/>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/interests_enabled.xml b/app/src/main/res/layout/interests_enabled.xml
new file mode 100644
index 0000000..2b2c9cd
--- /dev/null
+++ b/app/src/main/res/layout/interests_enabled.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_margin="10dp">
+
+    <TextView
+        android:id="@+id/textInterests"
+        android:layout_width="120dp"
+        android:layout_height="80dp"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        android:padding="10dp"
+        android:layout_margin="10dp"
+        android:gravity="center"
+        android:text="EXAMPLE"
+        android:textStyle="bold"
+        android:textSize="15sp"
+        android:background="@drawable/form_text_view_for_rv"
+        android:backgroundTint="@color/teal_200" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/third_screen.xml b/app/src/main/res/layout/third_screen.xml
index 5b30a99..867dcf5 100644
--- a/app/src/main/res/layout/third_screen.xml
+++ b/app/src/main/res/layout/third_screen.xml
@@ -3,16 +3,34 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/recyclerView"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
         app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        android:text="Hello world"
-        android:textSize="30sp"
-        android:textStyle="bold"/>
+        app:layout_constraintBottom_toTopOf="@id/nextButton"
+        tools:listitem="@layout/interests_disabled"
+        android:layout_marginBottom="6dp"/>
+
+
+    <Button
+        android:id="@+id/nextButton"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="20dp"
+        android:layout_marginLeft="30dp"
+        android:layout_marginRight="30dp"
+        android:text="@string/textButton"
+        android:textSize="18sp"
+        android:textColor="@android:color/white"
+        android:background="@drawable/background_state_button"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"/>
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

From 87cf1d67b21928194a3203b4b23b6db54e3792ae Mon Sep 17 00:00:00 2001
From: Alexey Kozyrev <tcsid4@gmail.com>
Date: Sat, 10 Feb 2024 20:39:06 +0300
Subject: [PATCH 8/9] =?UTF-8?q?=D0=B3=D0=BE=D1=82=D0=BE=D0=B2=D1=8B=D0=B9?=
 =?UTF-8?q?=20=D1=82=D1=80=D0=B5=D1=82=D0=B8=D0=B9=20=D1=8D=D0=BA=D1=80?=
 =?UTF-8?q?=D0=B0=D0=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../FourthScreen/FourthScreenFragment.kt      | 28 ++++++++++
 .../ThirdScreen/ThirdScreenFragment.kt        | 26 +++++++++-
 .../ThirdScreen/ThirdScreenViewModel.kt       | 52 ++++++++++---------
 .../main/res/layout/interests_disabled.xml    |  4 +-
 app/src/main/res/layout/interests_enabled.xml |  6 +--
 5 files changed, 85 insertions(+), 31 deletions(-)
 create mode 100644 app/src/main/java/ru/otus/basicarchitecture/presentation/FourthScreen/FourthScreenFragment.kt

diff --git a/app/src/main/java/ru/otus/basicarchitecture/presentation/FourthScreen/FourthScreenFragment.kt b/app/src/main/java/ru/otus/basicarchitecture/presentation/FourthScreen/FourthScreenFragment.kt
new file mode 100644
index 0000000..e652c5e
--- /dev/null
+++ b/app/src/main/java/ru/otus/basicarchitecture/presentation/FourthScreen/FourthScreenFragment.kt
@@ -0,0 +1,28 @@
+package ru.otus.basicarchitecture.presentation.FourthScreen
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.fragment.app.Fragment
+
+class FourthScreenFragment: Fragment() {
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
+        return super.onCreateView(inflater, container, savedInstanceState)
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+    }
+
+    companion object{
+        fun instance() : FourthScreenFragment{
+            return FourthScreenFragment()
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/ru/otus/basicarchitecture/presentation/ThirdScreen/ThirdScreenFragment.kt b/app/src/main/java/ru/otus/basicarchitecture/presentation/ThirdScreen/ThirdScreenFragment.kt
index 995552f..b836586 100644
--- a/app/src/main/java/ru/otus/basicarchitecture/presentation/ThirdScreen/ThirdScreenFragment.kt
+++ b/app/src/main/java/ru/otus/basicarchitecture/presentation/ThirdScreen/ThirdScreenFragment.kt
@@ -5,6 +5,7 @@ import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.Button
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.ViewModelProvider
 import androidx.recyclerview.widget.GridLayoutManager
@@ -14,6 +15,8 @@ import androidx.recyclerview.widget.RecyclerView.LayoutManager
 import androidx.recyclerview.widget.StaggeredGridLayoutManager
 import ru.otus.basicarchitecture.App
 import ru.otus.basicarchitecture.R
+import ru.otus.basicarchitecture.presentation.FourthScreen.FourthScreenFragment
+import ru.otus.basicarchitecture.presentation.SecondScreen.SecondScreenFragment
 import ru.otus.basicarchitecture.presentation.ViewModelFactory
 import javax.inject.Inject
 
@@ -30,6 +33,8 @@ class ThirdScreenFragment : Fragment() {
 
     private var recyclerView: RecyclerView? = null
 
+    private var button: Button? = null
+
 
     override fun onCreateView(
         inflater: LayoutInflater,
@@ -53,6 +58,22 @@ class ThirdScreenFragment : Fragment() {
             adapterCastom.interestsList = it
         }
         setupClickListener()
+
+        button = view.findViewById(R.id.nextButton)
+
+        button?.setOnClickListener {
+            viewModel.setData {
+                openFourthFragment()
+            }
+        }
+    }
+    private fun openFourthFragment() {
+        val fragment = FourthScreenFragment.instance()
+        parentFragmentManager
+            .beginTransaction()
+            .replace(R.id.fragmentContainer, fragment)
+            .addToBackStack(null)
+            .commit()
     }
 
     private fun setupRV(view: View) {
@@ -61,14 +82,13 @@ class ThirdScreenFragment : Fragment() {
 
         recyclerView?.let {
             with(it) {
-                val layoutManager = LinearLayoutManager(view.context)
+                val layoutManager = GridLayoutManager(view.context,3)
                 this.layoutManager = layoutManager
                 adapter = adapterCastom
                 recycledViewPool.setMaxRecycledViews(ListInterestsAdapter.ENABLED_VIEW, 15)
                 recycledViewPool.setMaxRecycledViews(ListInterestsAdapter.DISABLED_VIEW, 15)
             }
         }
-
     }
 
     private fun setupClickListener() {
@@ -82,4 +102,6 @@ class ThirdScreenFragment : Fragment() {
             return ThirdScreenFragment()
         }
     }
+
+
 }
\ No newline at end of file
diff --git a/app/src/main/java/ru/otus/basicarchitecture/presentation/ThirdScreen/ThirdScreenViewModel.kt b/app/src/main/java/ru/otus/basicarchitecture/presentation/ThirdScreen/ThirdScreenViewModel.kt
index f4269b9..7a444ac 100644
--- a/app/src/main/java/ru/otus/basicarchitecture/presentation/ThirdScreen/ThirdScreenViewModel.kt
+++ b/app/src/main/java/ru/otus/basicarchitecture/presentation/ThirdScreen/ThirdScreenViewModel.kt
@@ -6,6 +6,7 @@ import androidx.lifecycle.ViewModel
 import ru.otus.basicarchitecture.domain.Model.Interests
 import ru.otus.basicarchitecture.domain.getData.GetListInterests
 import ru.otus.basicarchitecture.domain.setData.SetInterestsPersonUseCase
+import java.util.TreeSet
 import javax.inject.Inject
 
 class ThirdScreenViewModel @Inject constructor(
@@ -15,7 +16,9 @@ class ThirdScreenViewModel @Inject constructor(
 
     private val saveInterests = mutableListOf<ModelInterestsForView>()
 
-    private val mutableListAllInterests: MutableList<ModelInterestsForView>
+    private val mutableListAllInterests = sortedSetOf<ModelInterestsForView>(
+        { o1, o2 -> o1.id.compareTo(o2.id) }
+    )
     private val _listInterestsLD = MutableLiveData<List<ModelInterestsForView>>()
 
     val listInterestsLD: LiveData<List<ModelInterestsForView>> = _listInterestsLD
@@ -23,37 +26,38 @@ class ThirdScreenViewModel @Inject constructor(
     //todo: разберем наверное чтение с визарда, что бы при переходе экрана туда - сюда , значения не пропадали
     init {
         val aa = getListInterests.getList()
-        mutableListAllInterests =
-            aa.mapIndexed{
-                    index, s -> ModelInterestsForView(index,s,false)
-            }.toMutableList()
-        _listInterestsLD.postValue(mutableListAllInterests)
-    }
-
-    private fun updateListSaveInterests(model: ModelInterestsForView){
-        if(model.enabled) saveInterests.add(model) else saveInterests.remove(model)
+        for (a in aa.indices) {
+            val model = ModelInterestsForView(a, aa[a], false)
+            mutableListAllInterests.add(model)
+        }
+        _listInterestsLD.postValue(mutableListAllInterests.toList())
     }
 
+//    private fun updateListSaveInterests(model: ModelInterestsForView){
+//        if(model.enabled) saveInterests.add(model) else saveInterests.remove(model)
+//    }
 
-/*    private fun setupState(){
-        saveInterests.forEach{
-            mutableListAllInterests[it.id].enabled = it.enabled
-        }
-    }*/
-
-    fun setData( openFragment: () -> Unit){
-        setInterestsPersonUseCase.setInterests(Interests(saveInterests.toString()))
+    fun setData(openFragment: () -> Unit){
+        setInterestsPersonUseCase.setInterests(
+            Interests(saveInterests.joinToString())
+        )
+        openFragment.invoke()
     }
 
-    fun changeEnabledState(model: ModelInterestsForView){
-        val newEnabledState = !model.enabled
-        mutableListAllInterests[model.id].enabled = newEnabledState
-        updateListSaveInterests(mutableListAllInterests[model.id])
+    fun changeEnabledState(model: ModelInterestsForView) {
+        val newModel = model.copy(enabled = !model.enabled)
+        mutableListAllInterests.remove(model)
+        mutableListAllInterests.add(newModel)
+        if(newModel.enabled){
+            saveInterests.add(newModel)
+        }else{
+            saveInterests.remove(newModel)
+        }
         updateList()
     }
 
-    private fun updateList(){
-        _listInterestsLD.postValue(mutableListAllInterests)
+    private fun updateList() {
+        _listInterestsLD.postValue(mutableListAllInterests.toList())
     }
 
 }
\ No newline at end of file
diff --git a/app/src/main/res/layout/interests_disabled.xml b/app/src/main/res/layout/interests_disabled.xml
index 27d6b98..9295816 100644
--- a/app/src/main/res/layout/interests_disabled.xml
+++ b/app/src/main/res/layout/interests_disabled.xml
@@ -8,14 +8,14 @@
 
     <TextView
         android:id="@+id/textInterests"
-        android:layout_width="120dp"
+        android:layout_width="100dp"
         android:layout_height="90dp"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         android:padding="10dp"
-        android:layout_margin="10dp"
+        android:layout_margin="5dp"
         android:gravity="center"
         android:text="EXAMPLE"
         android:textStyle="bold"
diff --git a/app/src/main/res/layout/interests_enabled.xml b/app/src/main/res/layout/interests_enabled.xml
index 2b2c9cd..171e2ab 100644
--- a/app/src/main/res/layout/interests_enabled.xml
+++ b/app/src/main/res/layout/interests_enabled.xml
@@ -8,14 +8,14 @@
 
     <TextView
         android:id="@+id/textInterests"
-        android:layout_width="120dp"
-        android:layout_height="80dp"
+        android:layout_width="100dp"
+        android:layout_height="90dp"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         android:padding="10dp"
-        android:layout_margin="10dp"
+        android:layout_margin="5dp"
         android:gravity="center"
         android:text="EXAMPLE"
         android:textStyle="bold"

From 9cc69892987ed1c2f7003ba2fd96ee5af329e42b Mon Sep 17 00:00:00 2001
From: Alexey Kozyrev <tcsid4@gmail.com>
Date: Thu, 15 Feb 2024 23:17:43 +0300
Subject: [PATCH 9/9] =?UTF-8?q?=D0=93=D0=BE=D1=82=D0=BE=D0=B2=D0=BE=D0=B5?=
 =?UTF-8?q?=20=D0=B4=D0=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../FourthScreen/FourthScreenSubComponent.kt  |  19 +++
 .../FourthScreen/FourthViewModelModule.kt     |  18 +++
 .../DI/MainComponent/MainComponent.kt         |   3 +
 .../basicarchitecture/data/RepositoryImpl.kt  |  26 +++-
 .../basicarchitecture/domain/Model/Address.kt |   2 +-
 .../domain/Model/DomainModel.kt               |   3 +
 .../domain/Model/Interests.kt                 |   2 +-
 .../basicarchitecture/domain/Model/Person.kt  |   2 +-
 .../basicarchitecture/domain/Repository.kt    |   3 +-
 .../domain/getData/GetInfoPersonUseCase.kt    |   8 +-
 .../FirstScreen/FirstScreenFragment.kt        |  22 ++-
 .../FirstScreen/FirstScreenViewModel.kt       |  14 +-
 .../FourthScreen/AdapterFourthScreen.kt       |  31 +++++
 .../FourthScreen/FourthScreenFragment.kt      |  65 ++++++++-
 .../FourthScreen/FourthScreenViewModel.kt     |  29 ++++
 .../FourthScreen/ModelFourthScreen.kt         |   9 ++
 .../presentation/MainActivity.kt              |   3 +-
 .../SecondScreen/SecondScreenFragment.kt      |  43 +++---
 .../SecondScreen/SecondScreenViewModel.kt     |  18 +--
 .../ThirdScreen/ThirdScreenViewModel.kt       |   7 +-
 app/src/main/res/layout/fourth_screen.xml     | 130 ++++++++++++++++++
 .../res/layout/interests_forth_screen.xml     |  25 ++++
 22 files changed, 429 insertions(+), 53 deletions(-)
 create mode 100644 app/src/main/java/ru/otus/basicarchitecture/DI/FragmentComponents/FourthScreen/FourthScreenSubComponent.kt
 create mode 100644 app/src/main/java/ru/otus/basicarchitecture/DI/FragmentComponents/FourthScreen/FourthViewModelModule.kt
 create mode 100644 app/src/main/java/ru/otus/basicarchitecture/domain/Model/DomainModel.kt
 create mode 100644 app/src/main/java/ru/otus/basicarchitecture/presentation/FourthScreen/AdapterFourthScreen.kt
 create mode 100644 app/src/main/java/ru/otus/basicarchitecture/presentation/FourthScreen/FourthScreenViewModel.kt
 create mode 100644 app/src/main/java/ru/otus/basicarchitecture/presentation/FourthScreen/ModelFourthScreen.kt
 create mode 100644 app/src/main/res/layout/fourth_screen.xml
 create mode 100644 app/src/main/res/layout/interests_forth_screen.xml

diff --git a/app/src/main/java/ru/otus/basicarchitecture/DI/FragmentComponents/FourthScreen/FourthScreenSubComponent.kt b/app/src/main/java/ru/otus/basicarchitecture/DI/FragmentComponents/FourthScreen/FourthScreenSubComponent.kt
new file mode 100644
index 0000000..672287b
--- /dev/null
+++ b/app/src/main/java/ru/otus/basicarchitecture/DI/FragmentComponents/FourthScreen/FourthScreenSubComponent.kt
@@ -0,0 +1,19 @@
+package ru.otus.basicarchitecture.DI.FragmentComponents.FourthScreen
+
+import dagger.Subcomponent
+import ru.otus.basicarchitecture.DI.FragmentComponents.FragmentScope
+import ru.otus.basicarchitecture.presentation.FourthScreen.FourthScreenFragment
+
+@FragmentScope
+@Subcomponent(modules = [FourthViewModelModule::class])
+interface FourthScreenSubComponent {
+
+
+    @Subcomponent.Builder
+    interface Builder {
+        fun build() : FourthScreenSubComponent
+    }
+
+    fun inject(fragment: FourthScreenFragment)
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/ru/otus/basicarchitecture/DI/FragmentComponents/FourthScreen/FourthViewModelModule.kt b/app/src/main/java/ru/otus/basicarchitecture/DI/FragmentComponents/FourthScreen/FourthViewModelModule.kt
new file mode 100644
index 0000000..4b42fd2
--- /dev/null
+++ b/app/src/main/java/ru/otus/basicarchitecture/DI/FragmentComponents/FourthScreen/FourthViewModelModule.kt
@@ -0,0 +1,18 @@
+package ru.otus.basicarchitecture.DI.FragmentComponents.FourthScreen
+
+import androidx.lifecycle.ViewModel
+import dagger.Binds
+import dagger.Module
+import dagger.multibindings.IntoMap
+import dagger.multibindings.StringKey
+import ru.otus.basicarchitecture.presentation.FourthScreen.FourthScreenViewModel
+
+
+@Module
+interface FourthViewModelModule {
+
+    @IntoMap
+    @StringKey("FourthScreenViewModel")
+    @Binds
+    fun bindFourthScreenViewModel(impl: FourthScreenViewModel): ViewModel
+}
\ No newline at end of file
diff --git a/app/src/main/java/ru/otus/basicarchitecture/DI/MainComponent/MainComponent.kt b/app/src/main/java/ru/otus/basicarchitecture/DI/MainComponent/MainComponent.kt
index b91f198..bf275c2 100644
--- a/app/src/main/java/ru/otus/basicarchitecture/DI/MainComponent/MainComponent.kt
+++ b/app/src/main/java/ru/otus/basicarchitecture/DI/MainComponent/MainComponent.kt
@@ -2,6 +2,7 @@ package ru.otus.basicarchitecture.DI.MainComponent
 
 import dagger.Component
 import ru.otus.basicarchitecture.DI.FragmentComponents.FirstScreen.FirstScreenSubComponent
+import ru.otus.basicarchitecture.DI.FragmentComponents.FourthScreen.FourthScreenSubComponent
 import ru.otus.basicarchitecture.DI.FragmentComponents.SecondScreen.SecondScreenSubComponent
 import ru.otus.basicarchitecture.DI.FragmentComponents.ThirdScreen.ThirdScreenSubComponent
 import ru.otus.basicarchitecture.data.WizardCache
@@ -17,6 +18,8 @@ interface MainComponent {
 
     fun thirdScreenSubComponent() : ThirdScreenSubComponent.Builder
 
+    fun fourthScreenSubComponent(): FourthScreenSubComponent.Builder
+
     fun wizardCache(): WizardCache
 
     fun repository(): Repository
diff --git a/app/src/main/java/ru/otus/basicarchitecture/data/RepositoryImpl.kt b/app/src/main/java/ru/otus/basicarchitecture/data/RepositoryImpl.kt
index d2ac736..cae43a8 100644
--- a/app/src/main/java/ru/otus/basicarchitecture/data/RepositoryImpl.kt
+++ b/app/src/main/java/ru/otus/basicarchitecture/data/RepositoryImpl.kt
@@ -3,6 +3,7 @@ package ru.otus.basicarchitecture.data
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import ru.otus.basicarchitecture.domain.Model.Address
+import ru.otus.basicarchitecture.domain.Model.DomainModel
 import ru.otus.basicarchitecture.domain.Model.Interests
 import ru.otus.basicarchitecture.domain.Model.Person
 import ru.otus.basicarchitecture.domain.Repository
@@ -76,8 +77,29 @@ class RepositoryImpl @Inject constructor(
         updateWizardCache()
     }
 
-    override fun getInfoPersonUseCase() {
-        TODO()
+    override fun getInfoPersonUseCase(): Map<String, DomainModel> {
+        val person = Person(
+            wizardCache.firstName,
+            wizardCache.surName,
+            wizardCache.dateOfBirth
+        )
+
+        val address = Address(
+            wizardCache.country,
+            wizardCache.city,
+            wizardCache.address
+        )
+
+        val interests = Interests(
+            wizardCache.interests
+        )
+
+
+        return mapOf(
+            "person" to person,
+            "address" to address,
+            "interests" to interests
+        )
     }
 
     override fun getListInterests(): List<String>  = listInterests
diff --git a/app/src/main/java/ru/otus/basicarchitecture/domain/Model/Address.kt b/app/src/main/java/ru/otus/basicarchitecture/domain/Model/Address.kt
index 6e2ec6e..37d2cbb 100644
--- a/app/src/main/java/ru/otus/basicarchitecture/domain/Model/Address.kt
+++ b/app/src/main/java/ru/otus/basicarchitecture/domain/Model/Address.kt
@@ -4,4 +4,4 @@ data class Address(
     val country: String,
     val city: String,
     val address: String
-)
\ No newline at end of file
+) : DomainModel
\ No newline at end of file
diff --git a/app/src/main/java/ru/otus/basicarchitecture/domain/Model/DomainModel.kt b/app/src/main/java/ru/otus/basicarchitecture/domain/Model/DomainModel.kt
new file mode 100644
index 0000000..6749984
--- /dev/null
+++ b/app/src/main/java/ru/otus/basicarchitecture/domain/Model/DomainModel.kt
@@ -0,0 +1,3 @@
+package ru.otus.basicarchitecture.domain.Model
+
+sealed interface DomainModel
\ No newline at end of file
diff --git a/app/src/main/java/ru/otus/basicarchitecture/domain/Model/Interests.kt b/app/src/main/java/ru/otus/basicarchitecture/domain/Model/Interests.kt
index 3a803bb..771917f 100644
--- a/app/src/main/java/ru/otus/basicarchitecture/domain/Model/Interests.kt
+++ b/app/src/main/java/ru/otus/basicarchitecture/domain/Model/Interests.kt
@@ -2,4 +2,4 @@ package ru.otus.basicarchitecture.domain.Model
 
 data class Interests (
     var interests:  String
-)
\ No newline at end of file
+) : DomainModel
\ No newline at end of file
diff --git a/app/src/main/java/ru/otus/basicarchitecture/domain/Model/Person.kt b/app/src/main/java/ru/otus/basicarchitecture/domain/Model/Person.kt
index 58e56b6..54dd295 100644
--- a/app/src/main/java/ru/otus/basicarchitecture/domain/Model/Person.kt
+++ b/app/src/main/java/ru/otus/basicarchitecture/domain/Model/Person.kt
@@ -8,7 +8,7 @@ data class Person(
     var firstName: String,
     var surName: String,
     var dateOfBirth: String
-) {
+) : DomainModel {
     companion object {
         const val defaultValueProperty = ""
 
diff --git a/app/src/main/java/ru/otus/basicarchitecture/domain/Repository.kt b/app/src/main/java/ru/otus/basicarchitecture/domain/Repository.kt
index eef3315..060f4af 100644
--- a/app/src/main/java/ru/otus/basicarchitecture/domain/Repository.kt
+++ b/app/src/main/java/ru/otus/basicarchitecture/domain/Repository.kt
@@ -1,6 +1,7 @@
 package ru.otus.basicarchitecture.domain
 
 import ru.otus.basicarchitecture.domain.Model.Address
+import ru.otus.basicarchitecture.domain.Model.DomainModel
 import ru.otus.basicarchitecture.domain.Model.Interests
 import ru.otus.basicarchitecture.domain.Model.Person
 
@@ -14,7 +15,7 @@ interface Repository {
     fun setAddress(address: Address)
 
 
-    fun getInfoPersonUseCase()
+    fun getInfoPersonUseCase() : Map<String, DomainModel>
 
     fun getListInterests(): List<String>
 }
\ No newline at end of file
diff --git a/app/src/main/java/ru/otus/basicarchitecture/domain/getData/GetInfoPersonUseCase.kt b/app/src/main/java/ru/otus/basicarchitecture/domain/getData/GetInfoPersonUseCase.kt
index f9d8f18..157c310 100644
--- a/app/src/main/java/ru/otus/basicarchitecture/domain/getData/GetInfoPersonUseCase.kt
+++ b/app/src/main/java/ru/otus/basicarchitecture/domain/getData/GetInfoPersonUseCase.kt
@@ -1,7 +1,11 @@
 package ru.otus.basicarchitecture.domain.getData
 
+import ru.otus.basicarchitecture.domain.Model.DomainModel
 import ru.otus.basicarchitecture.domain.Repository
+import javax.inject.Inject
 
-class GetInfoPersonUseCase(val repository: Repository) {
-
+class GetInfoPersonUseCase @Inject constructor(val repository: Repository) {
+    fun getInfo() : Map<String, DomainModel>{
+        return repository.getInfoPersonUseCase()
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/ru/otus/basicarchitecture/presentation/FirstScreen/FirstScreenFragment.kt b/app/src/main/java/ru/otus/basicarchitecture/presentation/FirstScreen/FirstScreenFragment.kt
index f397a56..cdb6ca6 100644
--- a/app/src/main/java/ru/otus/basicarchitecture/presentation/FirstScreen/FirstScreenFragment.kt
+++ b/app/src/main/java/ru/otus/basicarchitecture/presentation/FirstScreen/FirstScreenFragment.kt
@@ -68,6 +68,7 @@ class FirstScreenFragment : Fragment() {
 
         setupView(view)
 
+
     }
 
 
@@ -114,11 +115,14 @@ class FirstScreenFragment : Fragment() {
             onFocusChangeListener = View.OnFocusChangeListener { view, hasFocus ->
                 if (hasFocus) {
                     showDatePicker(view.context)
+                }else{
+                    viewModel.validateEmptyValue()
                 }
                 this.clearFocus()
             }
 
         }
+        setFocusListener()
 
 
     }
@@ -129,11 +133,20 @@ class FirstScreenFragment : Fragment() {
             viewModel.setData(
                 nameEditText?.text.toString(),
                 surNameEditText?.text.toString(),
-                birthDateEditText?.text.toString(),
-                { showToast(MESSAGE_TOAST_INVALIDATE_TEXT, it.context) },
-                { openSecondFragment() }
-            )
+                birthDateEditText?.text.toString()
+            ) { openSecondFragment() }
+        }
+    }
+
+    private fun setFocusListener(){
+        val lossFocus = View.OnFocusChangeListener{_,hasFocus ->
+            if(!hasFocus){
+                viewModel.validateEmptyValue()
+            }
         }
+        nameEditText?.onFocusChangeListener =  lossFocus
+        surNameEditText?.onFocusChangeListener = lossFocus
+
     }
 
     private fun openSecondFragment() {
@@ -174,7 +187,6 @@ class FirstScreenFragment : Fragment() {
 
 
     companion object {
-        private const val MESSAGE_TOAST_INVALIDATE_TEXT = "Есть незаполненные поля"
         private const val MESSAGE_TOAST_INCORRECT_AGE ="Возраст пользователя не может быть меньше 18"
 
 
diff --git a/app/src/main/java/ru/otus/basicarchitecture/presentation/FirstScreen/FirstScreenViewModel.kt b/app/src/main/java/ru/otus/basicarchitecture/presentation/FirstScreen/FirstScreenViewModel.kt
index 012d05f..44836b7 100644
--- a/app/src/main/java/ru/otus/basicarchitecture/presentation/FirstScreen/FirstScreenViewModel.kt
+++ b/app/src/main/java/ru/otus/basicarchitecture/presentation/FirstScreen/FirstScreenViewModel.kt
@@ -22,23 +22,23 @@ class FirstScreenViewModel @Inject constructor(
 
 
     init {
-        enabledButtonMutableLiveData.postValue(true)
+        enabledButtonMutableLiveData.postValue(false)
     }
 
-    fun setData(name: String?, surName: String?, birthDate: String?, showToast: () -> Unit, openFragment: () -> Unit) {
+    fun setData(name: String?, surName: String?, birthDate: String?, openFragment: () -> Unit) {
         this.name = name ?: UNKNOWN_VALUE
         this.surName = surName ?: UNKNOWN_VALUE
         this.birthDate = birthDate ?: UNKNOWN_VALUE
-        if(validateEmptyValue(showToast)){
+        if(validateEmptyValue()){
             val person = Person(this.name, this.surName, this.birthDate)
             setPersonUseCase.setPerson(person)
             openFragment.invoke()
         }
     }
 
-    fun validateEmptyValue(showToast: () -> Unit): Boolean {
+    fun validateEmptyValue(): Boolean {
         return if (name == UNKNOWN_VALUE || surName == UNKNOWN_VALUE || birthDate == UNKNOWN_VALUE) {
-            setupFalseButton(showToast)
+            enabledButtonMutableLiveData.postValue(false)
             false
         } else {
             enabledButtonMutableLiveData.postValue(true)
@@ -65,6 +65,10 @@ class FirstScreenViewModel @Inject constructor(
         showToast.invoke()
     }
 
+    fun enabledButton(){
+        enabledButtonMutableLiveData.postValue(true)
+    }
+
 
     companion object {
         private val UNKNOWN_VALUE = ""
diff --git a/app/src/main/java/ru/otus/basicarchitecture/presentation/FourthScreen/AdapterFourthScreen.kt b/app/src/main/java/ru/otus/basicarchitecture/presentation/FourthScreen/AdapterFourthScreen.kt
new file mode 100644
index 0000000..9abd1c3
--- /dev/null
+++ b/app/src/main/java/ru/otus/basicarchitecture/presentation/FourthScreen/AdapterFourthScreen.kt
@@ -0,0 +1,31 @@
+package ru.otus.basicarchitecture.presentation.FourthScreen
+
+
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.recyclerview.widget.RecyclerView
+import ru.otus.basicarchitecture.R
+import ru.otus.basicarchitecture.presentation.ThirdScreen.InterestsViewHolder
+
+class AdapterFourthScreen : RecyclerView.Adapter<InterestsViewHolder>() {
+
+    var listInterestsInfo: List<String> = listOf()
+        set(value)  {
+            field = value
+            notifyDataSetChanged()
+        }
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): InterestsViewHolder {
+        val layout = R.layout.interests_forth_screen
+        val view  = LayoutInflater.from(parent.context).inflate(layout, parent,false)
+        return InterestsViewHolder(view)
+    }
+
+    override fun getItemCount(): Int {
+        return listInterestsInfo.size
+    }
+
+    override fun onBindViewHolder(holder: InterestsViewHolder, position: Int) {
+        val item = listInterestsInfo[position]
+        holder.textView.text = item
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/ru/otus/basicarchitecture/presentation/FourthScreen/FourthScreenFragment.kt b/app/src/main/java/ru/otus/basicarchitecture/presentation/FourthScreen/FourthScreenFragment.kt
index e652c5e..148cafc 100644
--- a/app/src/main/java/ru/otus/basicarchitecture/presentation/FourthScreen/FourthScreenFragment.kt
+++ b/app/src/main/java/ru/otus/basicarchitecture/presentation/FourthScreen/FourthScreenFragment.kt
@@ -4,20 +4,83 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.TextView
 import androidx.fragment.app.Fragment
+import androidx.lifecycle.ViewModelProvider
+import androidx.recyclerview.widget.RecyclerView
+import androidx.recyclerview.widget.StaggeredGridLayoutManager
+import ru.otus.basicarchitecture.App
+import ru.otus.basicarchitecture.R
+import ru.otus.basicarchitecture.presentation.FirstScreen.FirstScreenViewModel
+import ru.otus.basicarchitecture.presentation.ViewModelFactory
+import javax.inject.Inject
 
 class FourthScreenFragment: Fragment() {
 
+    @Inject
+    lateinit var viewModelFactory: ViewModelFactory
+
+
+    private val viewModel by lazy{
+        ViewModelProvider(this, viewModelFactory)[FourthScreenViewModel::class.java]
+    }
+
+    private var recyclerView: RecyclerView? = null
+
+    private var name: TextView? = null
+    private var surname: TextView? = null
+    private var dateOfBirth: TextView? = null
+    private var address: TextView? = null
+
+    private var adapter = AdapterFourthScreen()
+
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View? {
-        return super.onCreateView(inflater, container, savedInstanceState)
+        return inflater.inflate(R.layout.fourth_screen,container,false)
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
+
+        (requireActivity().application as App).component
+            .fourthScreenSubComponent()
+            .build()
+            .inject(this)
+
+        setupView(view)
+
+    }
+
+    private fun setupView(view: View){
+
+        with(view){
+
+            recyclerView = findViewById(R.id.recyclerView4)
+            name = findViewById(R.id.Name)
+            surname = findViewById(R.id.Surname)
+            dateOfBirth = findViewById(R.id.DateOfBirth)
+            address =  findViewById(R.id.Address)
+
+        }
+
+
+        name?.text = viewModel.modelFourthScreen.name
+        surname?.text = viewModel.modelFourthScreen.surName
+        dateOfBirth?.text = viewModel.modelFourthScreen.birthDate
+        address?.text = viewModel.modelFourthScreen.fullAddress
+        adapter.listInterestsInfo = viewModel.modelFourthScreen.interests
+
+        val spanCount = 2
+        val orientation = StaggeredGridLayoutManager.VERTICAL
+        val layoutManager = StaggeredGridLayoutManager(spanCount, orientation)
+
+        recyclerView?.layoutManager = layoutManager
+
+        recyclerView?.adapter = adapter
+
     }
 
     companion object{
diff --git a/app/src/main/java/ru/otus/basicarchitecture/presentation/FourthScreen/FourthScreenViewModel.kt b/app/src/main/java/ru/otus/basicarchitecture/presentation/FourthScreen/FourthScreenViewModel.kt
new file mode 100644
index 0000000..90ab958
--- /dev/null
+++ b/app/src/main/java/ru/otus/basicarchitecture/presentation/FourthScreen/FourthScreenViewModel.kt
@@ -0,0 +1,29 @@
+package ru.otus.basicarchitecture.presentation.FourthScreen
+
+import androidx.lifecycle.ViewModel
+import ru.otus.basicarchitecture.domain.Model.Address
+import ru.otus.basicarchitecture.domain.Model.Interests
+import ru.otus.basicarchitecture.domain.Model.Person
+import ru.otus.basicarchitecture.domain.getData.GetInfoPersonUseCase
+import javax.inject.Inject
+
+class FourthScreenViewModel @Inject constructor(
+    info: GetInfoPersonUseCase
+) : ViewModel() {
+
+    val modelFourthScreen: ModelFourthScreen
+
+    init {
+        val information = info.getInfo()
+        val person = information["person"] as Person
+        val address = information["address"] as Address
+        val interest = information["interests"] as Interests
+        modelFourthScreen = ModelFourthScreen(
+            person.firstName,
+            person.surName,
+            person.dateOfBirth,
+            "${address.country}, ${address.city}, ${address.city}",
+            interest.interests.split(",")
+        )
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/ru/otus/basicarchitecture/presentation/FourthScreen/ModelFourthScreen.kt b/app/src/main/java/ru/otus/basicarchitecture/presentation/FourthScreen/ModelFourthScreen.kt
new file mode 100644
index 0000000..0949881
--- /dev/null
+++ b/app/src/main/java/ru/otus/basicarchitecture/presentation/FourthScreen/ModelFourthScreen.kt
@@ -0,0 +1,9 @@
+package ru.otus.basicarchitecture.presentation.FourthScreen
+
+data class ModelFourthScreen(
+    val name: String,
+    val surName: String,
+    val birthDate: String,
+    val fullAddress: String,
+    val interests: List<String>
+)
\ 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
index dd3974e..84bb07d 100644
--- a/app/src/main/java/ru/otus/basicarchitecture/presentation/MainActivity.kt
+++ b/app/src/main/java/ru/otus/basicarchitecture/presentation/MainActivity.kt
@@ -13,8 +13,7 @@ class MainActivity : AppCompatActivity() {
         setContentView(R.layout.activity_main)
 
         if(savedInstanceState == null ){
-           // val fragment = FirstScreenFragment.instance()
-            val fragment = ThirdScreenFragment.instance()
+            val fragment = FirstScreenFragment.instance()
             supportFragmentManager
                 .beginTransaction()
                 .replace(R.id.fragmentContainer, fragment)
diff --git a/app/src/main/java/ru/otus/basicarchitecture/presentation/SecondScreen/SecondScreenFragment.kt b/app/src/main/java/ru/otus/basicarchitecture/presentation/SecondScreen/SecondScreenFragment.kt
index 532ed21..0c3df98 100644
--- a/app/src/main/java/ru/otus/basicarchitecture/presentation/SecondScreen/SecondScreenFragment.kt
+++ b/app/src/main/java/ru/otus/basicarchitecture/presentation/SecondScreen/SecondScreenFragment.kt
@@ -1,23 +1,16 @@
 package ru.otus.basicarchitecture.presentation.SecondScreen
 
-import android.content.Context
 import android.os.Bundle
-import android.os.Message
-import android.text.InputType
 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.core.content.ContextCompat
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.ViewModelProvider
 import com.google.android.material.textfield.TextInputLayout
 import ru.otus.basicarchitecture.App
 import ru.otus.basicarchitecture.R
-import ru.otus.basicarchitecture.presentation.FirstScreen.FirstScreenFragment
-import ru.otus.basicarchitecture.presentation.FirstScreen.FirstScreenViewModel
 import ru.otus.basicarchitecture.presentation.ThirdScreen.ThirdScreenFragment
 import ru.otus.basicarchitecture.presentation.ViewModelFactory
 import javax.inject.Inject
@@ -31,7 +24,6 @@ class SecondScreenFragment : Fragment() {
     }
 
 
-
     private var countryEditText: EditText? = null
     private var cityEditText: EditText? = null
     private var addressEditText: EditText? = null
@@ -44,7 +36,6 @@ class SecondScreenFragment : Fragment() {
     private var nextButton: Button? = null
 
 
-
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
@@ -62,7 +53,7 @@ class SecondScreenFragment : Fragment() {
         setupView(view)
     }
 
-    private fun setupView(view: View){
+    private fun setupView(view: View) {
         with(view) {
             nextButton = findViewById(R.id.nextButton)
 
@@ -78,9 +69,9 @@ class SecondScreenFragment : Fragment() {
 
         }
 
-        nextButton?.let{ button ->
+        nextButton?.let { button ->
             setListeners()
-            viewModel.enabledButtonLiveData.observe(viewLifecycleOwner){
+            viewModel.enabledButtonLiveData.observe(viewLifecycleOwner) {
                 button.isEnabled = it
             }
         }
@@ -93,6 +84,8 @@ class SecondScreenFragment : Fragment() {
         addressEditText?.apply {
             hint = context.getString(R.string.address)
         }
+
+        setFocusListener()
     }
 
     private fun setListeners() {
@@ -100,18 +93,13 @@ class SecondScreenFragment : Fragment() {
             viewModel.setData(
                 countryEditText?.text.toString(),
                 cityEditText?.text.toString(),
-                addressEditText?.text.toString(),
-                {showToast(MESSAGE_TOAST_INVALIDATE_TEXT, it.context)},
-                {openFragment()}
-            )
+                addressEditText?.text.toString()
+            ) { openFragment() }
         }
     }
 
-    private fun showToast(message: String, context: Context){
-        Toast.makeText(context, message, Toast.LENGTH_LONG).show()
-    }
 
-    private fun openFragment(){
+    private fun openFragment() {
         val fragment = ThirdScreenFragment.instance()
         parentFragmentManager
             .beginTransaction()
@@ -120,9 +108,18 @@ class SecondScreenFragment : Fragment() {
             .commit()
     }
 
-    companion object{
-        private val MESSAGE_TOAST_INVALIDATE_TEXT = "есть незаполненные поля"
-        fun instance():SecondScreenFragment{
+    private fun setFocusListener() {
+        val lossFocus = View.OnFocusChangeListener { _, hasFocus ->
+            if (hasFocus) viewModel.buttonEnabled()
+        }
+        countryEditText?.onFocusChangeListener = lossFocus
+        cityEditText?.onFocusChangeListener = lossFocus
+        addressEditText?.onFocusChangeListener = lossFocus
+    }
+
+    companion object {
+
+        fun instance(): SecondScreenFragment {
             return SecondScreenFragment()
         }
     }
diff --git a/app/src/main/java/ru/otus/basicarchitecture/presentation/SecondScreen/SecondScreenViewModel.kt b/app/src/main/java/ru/otus/basicarchitecture/presentation/SecondScreen/SecondScreenViewModel.kt
index a19e61a..0047955 100644
--- a/app/src/main/java/ru/otus/basicarchitecture/presentation/SecondScreen/SecondScreenViewModel.kt
+++ b/app/src/main/java/ru/otus/basicarchitecture/presentation/SecondScreen/SecondScreenViewModel.kt
@@ -18,25 +18,26 @@ class SecondScreenViewModel @Inject constructor (
     private var city: String = UNKNOWN_VALUE
     private var address: String = UNKNOWN_VALUE
 
+    //по хорошему подтягивать бы данные из визард кэша
     init {
         enabledButtonMutableLiveData.postValue(true)
     }
 
-    fun setData(country: String?, city: String?, address: String?, showToast: () -> Unit, openFragment: () -> Unit){
+    fun setData(country: String?, city: String?, address: String?,  openFragment: () -> Unit){
         this.country = country ?: UNKNOWN_VALUE
         this.city = city ?: UNKNOWN_VALUE
         this.address = address ?: UNKNOWN_VALUE
-        if(validateEmptyValue(showToast)) {
+        if(validateEmptyValue(this.country, this.city , this.address)) {
             val addres = Address(this.country, this.city, this.address)
             setAddressUseCase.setAddress(addres)
             openFragment.invoke()
         }
     }
 
-
-    fun validateEmptyValue(showToast: () -> Unit): Boolean {
+    //убрать костыль с параметрами
+    fun validateEmptyValue(country: String, city: String, address: String): Boolean {
         return if (country == UNKNOWN_VALUE || city == UNKNOWN_VALUE || address == UNKNOWN_VALUE) {
-            setupFalseButton(showToast)
+            enabledButtonMutableLiveData.postValue(false)
             false
         } else {
             enabledButtonMutableLiveData.postValue(true)
@@ -44,12 +45,13 @@ class SecondScreenViewModel @Inject constructor (
         }
     }
 
-    private fun setupFalseButton(showToast: () -> Unit) {
-        enabledButtonMutableLiveData.postValue(false)
-        showToast.invoke()
+    fun buttonEnabled(){
+        enabledButtonMutableLiveData.postValue(true)
     }
 
 
+
+
     companion object{
         private val UNKNOWN_VALUE = ""
     }
diff --git a/app/src/main/java/ru/otus/basicarchitecture/presentation/ThirdScreen/ThirdScreenViewModel.kt b/app/src/main/java/ru/otus/basicarchitecture/presentation/ThirdScreen/ThirdScreenViewModel.kt
index 7a444ac..45cd83c 100644
--- a/app/src/main/java/ru/otus/basicarchitecture/presentation/ThirdScreen/ThirdScreenViewModel.kt
+++ b/app/src/main/java/ru/otus/basicarchitecture/presentation/ThirdScreen/ThirdScreenViewModel.kt
@@ -38,8 +38,13 @@ class ThirdScreenViewModel @Inject constructor(
 //    }
 
     fun setData(openFragment: () -> Unit){
+
+        val list = mutableListOf<String>()
+        saveInterests.forEach {
+            list.add(it.interests)
+        }
         setInterestsPersonUseCase.setInterests(
-            Interests(saveInterests.joinToString())
+            Interests(list.joinToString())
         )
         openFragment.invoke()
     }
diff --git a/app/src/main/res/layout/fourth_screen.xml b/app/src/main/res/layout/fourth_screen.xml
new file mode 100644
index 0000000..9d9a7ab
--- /dev/null
+++ b/app/src/main/res/layout/fourth_screen.xml
@@ -0,0 +1,130 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
+
+
+    <TextView
+        android:id="@+id/labelName"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        android:text="Name"
+        android:textSize="20sp"
+        android:layout_marginTop="10dp"
+        android:layout_marginStart="10dp"
+        android:textStyle="italic"/>
+
+
+    <TextView
+        android:id="@+id/Name"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintTop_toBottomOf="@id/labelName"
+        app:layout_constraintStart_toStartOf="parent"
+        android:text="Ivan"
+        android:textSize="25sp"
+        android:layout_marginStart="10dp"
+        android:textStyle="bold"
+        android:textColor="@color/black"/>
+
+
+
+    <TextView
+        android:id="@+id/labelSurname"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintTop_toBottomOf="@id/Name"
+        app:layout_constraintStart_toStartOf="parent"
+        android:text="Surname"
+        android:textSize="20sp"
+        android:layout_marginTop="10dp"
+        android:layout_marginStart="10dp"
+        android:textStyle="italic"/>
+
+
+    <TextView
+        android:id="@+id/Surname"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintTop_toBottomOf="@id/labelSurname"
+        app:layout_constraintStart_toStartOf="parent"
+        android:text="Ivanov"
+        android:textSize="25sp"
+        android:layout_marginStart="10dp"
+        android:textStyle="bold"
+        android:textColor="@color/black"/>
+
+
+
+    <TextView
+        android:id="@+id/labelDateOfBirth"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintTop_toBottomOf="@id/Surname"
+        app:layout_constraintStart_toStartOf="parent"
+        android:text="DateOfBirth"
+        android:textSize="20sp"
+        android:layout_marginTop="10dp"
+        android:layout_marginStart="10dp"
+        android:textStyle="italic"/>
+
+    <TextView
+        android:id="@+id/DateOfBirth"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintTop_toBottomOf="@id/labelDateOfBirth"
+        app:layout_constraintStart_toStartOf="parent"
+        android:text="16.05.1997"
+        android:textSize="25sp"
+        android:layout_marginStart="10dp"
+        android:textStyle="bold"
+        android:textColor="@color/black"/>
+
+
+
+
+    <TextView
+        android:id="@+id/labelAddress"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintTop_toBottomOf="@id/DateOfBirth"
+        app:layout_constraintStart_toStartOf="parent"
+        android:text="Address"
+        android:textSize="20sp"
+        android:layout_marginTop="10dp"
+        android:layout_marginStart="10dp"
+        android:textStyle="italic"/>
+
+    <TextView
+        android:id="@+id/Address"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintTop_toBottomOf="@id/labelAddress"
+        app:layout_constraintStart_toStartOf="parent"
+        android:text="Tomsk, Usova,15"
+        android:textSize="25sp"
+        android:layout_marginStart="10dp"
+        android:textStyle="bold"
+        android:textColor="@color/black"/>
+
+
+
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/recyclerView4"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        app:layout_constraintTop_toBottomOf="@+id/Address"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        tools:listitem="@layout/interests_forth_screen"
+        app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"/>
+
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/interests_forth_screen.xml b/app/src/main/res/layout/interests_forth_screen.xml
new file mode 100644
index 0000000..e8ae8b9
--- /dev/null
+++ b/app/src/main/res/layout/interests_forth_screen.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_margin="10dp">
+
+    <TextView
+        android:id="@+id/textInterests"
+        android:layout_width="wrap_content"
+        android:layout_height="70dp"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        android:padding="10dp"
+        android:layout_margin="5dp"
+        android:gravity="center"
+        android:text="EXAMPLE"
+        android:textStyle="bold"
+        android:textSize="15sp"
+        android:background="@drawable/form_text_view_for_rv"/>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file