From 37b5a82d6702f868485eda43cf99a5706de9a910 Mon Sep 17 00:00:00 2001
From: annaksenova <aksenovasmail@gmail.com>
Date: Sat, 10 Jan 2026 17:03:05 +0300
Subject: [PATCH 1/2] =?UTF-8?q?=D0=97=D0=B0=D0=B4=D0=B0=D0=BD=D0=B8=D0=B5?=
 =?UTF-8?q?=201.=20=D0=90=D1=80=D1=85=D0=B8=D1=82=D0=B5=D0=BA=D1=82=D1=83?=
 =?UTF-8?q?=D1=80=D0=B0=20MVVM=20=D0=B4=D0=BB=D1=8F=20=D1=81=D0=BE=D0=B7?=
 =?UTF-8?q?=D0=B4=D0=B0=D0=BD=D0=B8=D1=8F=20=D0=B2=D0=B8=D0=B7=D0=B0=D1=80?=
 =?UTF-8?q?=D0=B4=D0=B0=20=D1=80=D0=B5=D0=B3=D0=B8=D1=81=D1=82=D1=80=D0=B0?=
 =?UTF-8?q?=D1=86=D0=B8=D0=B8=20=D0=BF=D0=BE=D0=BB=D1=8C=D0=B7=D0=BE=D0=B2?=
 =?UTF-8?q?=D0=B0=D1=82=D0=B5=D0=BB=D1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/ru/otus/basicarchitecture/App.kt     |   7 +
 .../ru/otus/basicarchitecture/MainActivity.kt |   2 +
 .../basicarchitecture/data/WizardCache.kt     |  45 ++++++
 .../basicarchitecture/ui/StepFourFragment.kt  |  41 +++++
 .../basicarchitecture/ui/StepOneFragment.kt   | 103 ++++++++++++
 .../basicarchitecture/ui/StepThreeFragment.kt |  53 +++++++
 .../basicarchitecture/ui/StepTwoFragment.kt   |  64 ++++++++
 .../ru/otus/basicarchitecture/ui/ViewModel.kt | 148 ++++++++++++++++++
 app/src/main/res/layout/activity_main.xml     |   8 +
 .../main/res/layout/fragment_step_four.xml    | 116 ++++++++++++++
 app/src/main/res/layout/fragment_step_one.xml |  49 ++++++
 .../main/res/layout/fragment_step_three.xml   |  44 ++++++
 app/src/main/res/layout/fragment_step_two.xml |  49 ++++++
 app/src/main/res/navigation/nav_graph.xml     |  44 ++++++
 app/src/main/res/values/dimens.xml            |   4 +
 15 files changed, 777 insertions(+)
 create mode 100644 app/src/main/java/ru/otus/basicarchitecture/App.kt
 create mode 100644 app/src/main/java/ru/otus/basicarchitecture/data/WizardCache.kt
 create mode 100644 app/src/main/java/ru/otus/basicarchitecture/ui/StepFourFragment.kt
 create mode 100644 app/src/main/java/ru/otus/basicarchitecture/ui/StepOneFragment.kt
 create mode 100644 app/src/main/java/ru/otus/basicarchitecture/ui/StepThreeFragment.kt
 create mode 100644 app/src/main/java/ru/otus/basicarchitecture/ui/StepTwoFragment.kt
 create mode 100644 app/src/main/java/ru/otus/basicarchitecture/ui/ViewModel.kt
 create mode 100644 app/src/main/res/layout/fragment_step_four.xml
 create mode 100644 app/src/main/res/layout/fragment_step_one.xml
 create mode 100644 app/src/main/res/layout/fragment_step_three.xml
 create mode 100644 app/src/main/res/layout/fragment_step_two.xml
 create mode 100644 app/src/main/res/navigation/nav_graph.xml
 create mode 100644 app/src/main/res/values/dimens.xml

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..41902a3
--- /dev/null
+++ b/app/src/main/java/ru/otus/basicarchitecture/App.kt
@@ -0,0 +1,7 @@
+package ru.otus.basicarchitecture
+
+import android.app.Application
+import dagger.hilt.android.HiltAndroidApp
+
+@HiltAndroidApp
+class App : Application()
\ No newline at end of file
diff --git a/app/src/main/java/ru/otus/basicarchitecture/MainActivity.kt b/app/src/main/java/ru/otus/basicarchitecture/MainActivity.kt
index 623aba9..080ecdb 100644
--- a/app/src/main/java/ru/otus/basicarchitecture/MainActivity.kt
+++ b/app/src/main/java/ru/otus/basicarchitecture/MainActivity.kt
@@ -2,7 +2,9 @@ package ru.otus.basicarchitecture
 
 import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
+import dagger.hilt.android.AndroidEntryPoint
 
+@AndroidEntryPoint
 class MainActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
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..a3a1baf
--- /dev/null
+++ b/app/src/main/java/ru/otus/basicarchitecture/data/WizardCache.kt
@@ -0,0 +1,45 @@
+package ru.otus.basicarchitecture.data
+
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class WizardCache @Inject constructor() {
+
+    private var _name: String = ""
+    val name: String get() = _name
+
+    private var _surname: String = ""
+    val surname: String get() = _surname
+
+    private var _birthDate: String = ""
+    val birthDate: String get() = _birthDate
+
+    private var _country: String = ""
+    val country: String get() = _country
+
+    private var _city: String = ""
+    val city: String get() = _city
+
+    private var _address: String = ""
+    val address: String get() = _address
+
+    private var _interests: List<String> = emptyList()
+    val interests: List<String> get() = _interests
+
+    fun updatePersonalInfo(name: String, surname: String, birthDate: String) {
+        _name = name
+        _surname = surname
+        _birthDate = birthDate
+    }
+
+    fun updateAddress(country: String, city: String, address: String) {
+        _country = country
+        _city = city
+        _address = address
+    }
+
+    fun updateInterests(interests: List<String>) {
+        _interests = interests
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/ru/otus/basicarchitecture/ui/StepFourFragment.kt b/app/src/main/java/ru/otus/basicarchitecture/ui/StepFourFragment.kt
new file mode 100644
index 0000000..e72e2df
--- /dev/null
+++ b/app/src/main/java/ru/otus/basicarchitecture/ui/StepFourFragment.kt
@@ -0,0 +1,41 @@
+package ru.otus.basicarchitecture.ui
+
+import android.os.Bundle
+import android.util.TypedValue
+import android.view.View
+import android.widget.TextView
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.viewModels
+import com.google.android.material.chip.Chip
+import com.google.android.material.chip.ChipGroup
+import dagger.hilt.android.AndroidEntryPoint
+import ru.otus.basicarchitecture.R
+
+@AndroidEntryPoint
+class StepFourFragment : Fragment(R.layout.fragment_step_four) {
+
+    private val viewModel: StepFourViewModel by viewModels()
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        view.findViewById<TextView>(R.id.tvName).text = viewModel.name
+        view.findViewById<TextView>(R.id.tvSurname).text = viewModel.surname
+        view.findViewById<TextView>(R.id.tvBirthDate).text = viewModel.birthDate
+        view.findViewById<TextView>(R.id.tvAddress).text = viewModel.fullAddress
+
+        val chipGroup = view.findViewById<ChipGroup>(R.id.cgInterests)
+        viewModel.interests.forEach { interest ->
+            val chip = Chip(requireContext()).apply {
+                text = interest
+                isCheckable = false
+                setChipBackgroundColorResource(android.R.color.transparent)
+                setChipStrokeColorResource(android.R.color.darker_gray)
+                chipStrokeWidth = TypedValue.applyDimension(
+                    TypedValue.COMPLEX_UNIT_DIP, 2f, resources.displayMetrics
+                )
+            }
+            chipGroup.addView(chip)
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/ru/otus/basicarchitecture/ui/StepOneFragment.kt b/app/src/main/java/ru/otus/basicarchitecture/ui/StepOneFragment.kt
new file mode 100644
index 0000000..186930d
--- /dev/null
+++ b/app/src/main/java/ru/otus/basicarchitecture/ui/StepOneFragment.kt
@@ -0,0 +1,103 @@
+package ru.otus.basicarchitecture.ui
+
+import android.os.Bundle
+import android.text.Editable
+import android.text.TextWatcher
+import android.view.View
+import android.widget.Button
+import android.widget.EditText
+import android.widget.Toast
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.viewModels
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.lifecycleScope
+import androidx.lifecycle.repeatOnLifecycle
+import androidx.navigation.fragment.findNavController
+import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.launch
+import ru.otus.basicarchitecture.R
+
+@AndroidEntryPoint
+class StepOneFragment : Fragment(R.layout.fragment_step_one) {
+    private val viewModel: StepOneViewModel by viewModels()
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        val etName = view.findViewById<EditText>(R.id.etName)
+        val etSurname = view.findViewById<EditText>(R.id.etSurname)
+        val etBirthDate = view.findViewById<EditText>(R.id.etBirthDate)
+        val btnNext = view.findViewById<Button>(R.id.btnNext)
+
+        val inputWatcher = object : TextWatcher {
+            override fun afterTextChanged(s: Editable?) {
+                if (etBirthDate.hasFocus() || etName.hasFocus() || etSurname.hasFocus()) {
+                    viewModel.onInputChanged(
+                        etName.text.toString(),
+                        etSurname.text.toString(),
+                        etBirthDate.text.toString()
+                    )
+                }
+            }
+
+            override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {}
+            override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {}
+        }
+
+        etName.addTextChangedListener(inputWatcher)
+        etSurname.addTextChangedListener(inputWatcher)
+
+        etBirthDate.addTextChangedListener(object : TextWatcher {
+            private var isFormatting = false
+            override fun afterTextChanged(s: Editable?) {
+                if (isFormatting) return
+                isFormatting = true
+
+                val str = s.toString().replace(".", "")
+                val formatted = StringBuilder()
+                for (i in str.indices) {
+                    formatted.append(str[i])
+                    if ((i == 1 || i == 3) && i < str.length - 1) formatted.append(".")
+                }
+
+                val finalStr =
+                    if (formatted.length > 10) formatted.substring(0, 10) else formatted.toString()
+
+                if (s.toString() != finalStr) {
+                    etBirthDate.setText(finalStr)
+                    etBirthDate.setSelection(finalStr.length)
+                }
+
+                viewModel.onInputChanged(
+                    etName.text.toString(), etSurname.text.toString(), finalStr
+                )
+
+                isFormatting = false
+            }
+
+            override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {}
+            override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {}
+        })
+
+        viewLifecycleOwner.lifecycleScope.launch {
+            viewLifecycleOwner.repeatOnLifecycle(Lifecycle.State.STARTED) {
+                launch {
+                    viewModel.isNextButtonEnabled.collect { isEnabled ->
+                        btnNext.isEnabled = isEnabled
+                    }
+                }
+                launch {
+                    viewModel.errorEvents.collect { message ->
+                        etBirthDate.error = message
+                        Toast.makeText(requireContext(), message, Toast.LENGTH_SHORT).show()
+                    }
+                }
+            }
+        }
+
+        btnNext.setOnClickListener {
+            viewModel.onNextClicked()
+            findNavController().navigate(R.id.action_stepOne_to_stepTwo)
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/ru/otus/basicarchitecture/ui/StepThreeFragment.kt b/app/src/main/java/ru/otus/basicarchitecture/ui/StepThreeFragment.kt
new file mode 100644
index 0000000..69e03da
--- /dev/null
+++ b/app/src/main/java/ru/otus/basicarchitecture/ui/StepThreeFragment.kt
@@ -0,0 +1,53 @@
+package ru.otus.basicarchitecture.ui
+
+import android.os.Bundle
+import android.view.View
+import android.widget.Button
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.viewModels
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.lifecycleScope
+import androidx.lifecycle.repeatOnLifecycle
+import androidx.navigation.fragment.findNavController
+import com.google.android.material.chip.Chip
+import com.google.android.material.chip.ChipGroup
+import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.launch
+import ru.otus.basicarchitecture.R
+
+@AndroidEntryPoint
+class StepThreeFragment : Fragment(R.layout.fragment_step_three) {
+    private val viewModel: StepThreeViewModel by viewModels()
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        val chipGroup = view.findViewById<ChipGroup>(R.id.chipGroupInterests)
+        val btnNext = view.findViewById<Button>(R.id.btnNext)
+
+        viewModel.allInterests.forEach { interest ->
+            val chip = Chip(requireContext()).apply {
+                text = interest
+                isCheckable = true
+
+                setOnCheckedChangeListener { _, isChecked ->
+                    viewModel.onInterestChanged(interest, isChecked)
+                }
+            }
+            chipGroup.addView(chip)
+        }
+
+        viewLifecycleOwner.lifecycleScope.launch {
+            viewLifecycleOwner.repeatOnLifecycle(Lifecycle.State.STARTED) {
+                viewModel.isNextButtonEnabled.collect { isEnabled ->
+                    btnNext.isEnabled = isEnabled
+                }
+            }
+        }
+
+        btnNext.setOnClickListener {
+            viewModel.onNextClicked()
+            findNavController().navigate(R.id.action_stepThree_to_stepFour)
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/ru/otus/basicarchitecture/ui/StepTwoFragment.kt b/app/src/main/java/ru/otus/basicarchitecture/ui/StepTwoFragment.kt
new file mode 100644
index 0000000..69c3908
--- /dev/null
+++ b/app/src/main/java/ru/otus/basicarchitecture/ui/StepTwoFragment.kt
@@ -0,0 +1,64 @@
+package ru.otus.basicarchitecture.ui
+
+import android.os.Bundle
+import android.text.Editable
+import android.text.TextWatcher
+import android.view.View
+import android.widget.Button
+import android.widget.EditText
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.viewModels
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.lifecycleScope
+import androidx.lifecycle.repeatOnLifecycle
+import androidx.navigation.fragment.findNavController
+import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.launch
+import ru.otus.basicarchitecture.R
+
+@AndroidEntryPoint
+class StepTwoFragment : Fragment(R.layout.fragment_step_two) {
+    private val viewModel: StepTwoViewModel by viewModels()
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        val etCountry = view.findViewById<EditText>(R.id.etCountry)
+        val etCity = view.findViewById<EditText>(R.id.etCity)
+        val etStreetHouse = view.findViewById<EditText>(R.id.etAddress)
+        val btnNext = view.findViewById<Button>(R.id.btnNext)
+
+        val watcher = object : TextWatcher {
+            override fun afterTextChanged(s: Editable?) {
+                viewModel.validate(
+                    etCountry.text.toString(),
+                    etCity.text.toString(),
+                    etStreetHouse.text.toString()
+                )
+            }
+            override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {}
+            override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {}
+        }
+
+        etCountry.addTextChangedListener(watcher)
+        etCity.addTextChangedListener(watcher)
+        etStreetHouse.addTextChangedListener(watcher)
+
+        viewLifecycleOwner.lifecycleScope.launch {
+            viewLifecycleOwner.repeatOnLifecycle(Lifecycle.State.STARTED) {
+                viewModel.isNextButtonEnabled.collect { isEnabled ->
+                    btnNext.isEnabled = isEnabled
+                }
+            }
+        }
+
+        btnNext.setOnClickListener {
+            viewModel.onNextClicked(
+                etCountry.text.toString(),
+                etCity.text.toString(),
+                etStreetHouse.text.toString()
+            )
+            findNavController().navigate(R.id.action_stepTwo_to_stepThree)
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/ru/otus/basicarchitecture/ui/ViewModel.kt b/app/src/main/java/ru/otus/basicarchitecture/ui/ViewModel.kt
new file mode 100644
index 0000000..d753b82
--- /dev/null
+++ b/app/src/main/java/ru/otus/basicarchitecture/ui/ViewModel.kt
@@ -0,0 +1,148 @@
+package ru.otus.basicarchitecture.ui
+
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.flow.MutableSharedFlow
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asSharedFlow
+import kotlinx.coroutines.launch
+import ru.otus.basicarchitecture.data.WizardCache
+import java.time.LocalDate
+import java.time.Period
+import java.time.format.DateTimeFormatter
+import javax.inject.Inject
+
+// StepOneViewModel
+// region
+@HiltViewModel
+class StepOneViewModel @Inject constructor(
+    private val wizardCache: WizardCache
+) : ViewModel() {
+
+    val name = MutableStateFlow("")
+    val surname = MutableStateFlow("")
+    val birthDate = MutableStateFlow("")
+
+    private val _isNextButtonEnabled = MutableStateFlow(false)
+    val isNextButtonEnabled: StateFlow<Boolean> = _isNextButtonEnabled
+
+    private val _errorEvents = MutableSharedFlow<String>()
+    val errorEvents = _errorEvents.asSharedFlow()
+
+    fun onInputChanged(newName: String, newSurname: String, newBirthDate: String) {
+        name.value = newName
+        surname.value = newSurname
+        birthDate.value = newBirthDate
+        validate()
+    }
+
+    private fun validate() {
+        val currentName = name.value
+        val currentSurname = surname.value
+        val currentDate = birthDate.value
+
+        val isDateValidLength = currentDate.length == 10
+        val isAdult = if (isDateValidLength) checkIsAdult(currentDate) else false
+
+        val isValid = currentName.isNotBlank() && currentSurname.isNotBlank() && isAdult
+        _isNextButtonEnabled.value = isValid
+
+        if (isDateValidLength && !isAdult) {
+            viewModelScope.launch { _errorEvents.emit("Вам должно быть больше 18 лет") }
+        }
+    }
+
+    fun onNextClicked() {
+        if (_isNextButtonEnabled.value) {
+            wizardCache.updatePersonalInfo(name.value, surname.value, birthDate.value)
+        } else {
+            viewModelScope.launch { _errorEvents.emit("Заполните все поля корректно") }
+        }
+    }
+
+    private fun checkIsAdult(birthDateStr: String): Boolean {
+        return try {
+            val formatter = DateTimeFormatter.ofPattern("dd.MM.yyyy")
+            val date = LocalDate.parse(birthDateStr, formatter)
+            Period.between(date, LocalDate.now()).years >= 18
+        } catch (_: Exception) {
+            false
+        }
+    }
+}
+// endregion
+
+// StepTwoViewModel
+// region
+@HiltViewModel
+class StepTwoViewModel @Inject constructor(
+    private val wizardCache: WizardCache
+) : ViewModel() {
+
+    private val _isNextButtonEnabled = MutableStateFlow(false)
+    val isNextButtonEnabled: StateFlow<Boolean> = _isNextButtonEnabled
+
+    fun validate(country: String, city: String, address: String) {
+        _isNextButtonEnabled.value =
+            country.isNotBlank() && city.isNotBlank() && address.isNotBlank()
+    }
+
+    fun onNextClicked(country: String, city: String, address: String) {
+        wizardCache.updateAddress(country, city, address)
+    }
+}
+// endregion
+
+// StepThreeViewModel
+// region
+@HiltViewModel
+class StepThreeViewModel @Inject constructor(
+    private val wizardCache: WizardCache
+) : ViewModel() {
+
+    val allInterests = listOf("Музыка", "Спорт", "Кино", "IT", "Путешествия", "Наука", "Книги")
+    private val selectedInterests = mutableSetOf<String>()
+
+    private val _isNextButtonEnabled = MutableStateFlow(false)
+    val isNextButtonEnabled: StateFlow<Boolean> = _isNextButtonEnabled
+
+    fun toggleInterest(interest: String) {
+        if (selectedInterests.contains(interest)) {
+            selectedInterests.remove(interest)
+        } else {
+            selectedInterests.add(interest)
+        }
+        _isNextButtonEnabled.value = selectedInterests.isNotEmpty()
+    }
+
+    fun onInterestChanged(interest: String, isSelected: Boolean) {
+        if (isSelected) {
+            selectedInterests.add(interest)
+        } else {
+            selectedInterests.remove(interest)
+        }
+        _isNextButtonEnabled.value = selectedInterests.isNotEmpty()
+    }
+
+    fun onNextClicked() {
+        wizardCache.updateInterests(selectedInterests.toList())
+    }
+
+}
+// endregion
+
+// StepFourViewModel
+// region
+@HiltViewModel
+class StepFourViewModel @Inject constructor(
+    wizardCache: WizardCache
+) : ViewModel() {
+    val birthDate = wizardCache.birthDate
+    val fullAddress = "${wizardCache.country}, ${wizardCache.city}, ${wizardCache.address}"
+    val interests = wizardCache.interests
+    val name = wizardCache.name
+    val surname = wizardCache.surname
+}
+// endregion
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 0b15a20..39c9655 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -6,4 +6,12 @@
     android:layout_height="match_parent"
     tools:context=".MainActivity">
 
+    <androidx.fragment.app.FragmentContainerView
+        android:id="@+id/nav_host_fragment"
+        android:name="androidx.navigation.fragment.NavHostFragment"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        app:defaultNavHost="true"
+        app:navGraph="@navigation/nav_graph" />
+
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_step_four.xml b/app/src/main/res/layout/fragment_step_four.xml
new file mode 100644
index 0000000..2651545
--- /dev/null
+++ b/app/src/main/res/layout/fragment_step_four.xml
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:padding="20dp">
+
+    <TextView
+        android:id="@+id/labelName"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Name"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <TextView
+        android:id="@+id/tvName"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="4dp"
+        android:textColor="@color/black"
+        android:textSize="14sp"
+        android:textStyle="bold"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/labelName"
+        tools:text="Ivan" />
+
+    <TextView
+        android:id="@+id/labelSurname"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="16dp"
+        android:text="Surname"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/tvName" />
+
+    <TextView
+        android:id="@+id/tvSurname"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="4dp"
+        android:textColor="@color/black"
+        android:textSize="14sp"
+        android:textStyle="bold"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/labelSurname"
+        tools:text="Ivanov" />
+
+    <TextView
+        android:id="@+id/labelBirthDate"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="16dp"
+        android:text="Date of Birth"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/tvSurname" />
+
+    <TextView
+        android:id="@+id/tvBirthDate"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="4dp"
+        android:textColor="@color/black"
+        android:textSize="14sp"
+        android:textStyle="bold"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/labelBirthDate"
+        tools:text="12.12.1992" />
+
+    <TextView
+        android:id="@+id/labelAddress"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="16dp"
+        android:text="Address"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/tvBirthDate" />
+
+    <TextView
+        android:id="@+id/tvAddress"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="4dp"
+        android:textColor="@color/black"
+        android:textSize="14sp"
+        android:textStyle="bold"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/labelAddress"
+        tools:text="Moscow, Shabolovskaya, 1" />
+
+    <TextView
+        android:id="@+id/labelInterests"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="16dp"
+        android:text="Interests"
+        android:textSize="14sp"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/tvAddress" />
+
+    <com.google.android.material.chip.ChipGroup
+        android:id="@+id/cgInterests"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="8dp"
+        app:chipSpacingHorizontal="8dp"
+        app:chipSpacingVertical="4dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/labelInterests">
+
+    </com.google.android.material.chip.ChipGroup>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_step_one.xml b/app/src/main/res/layout/fragment_step_one.xml
new file mode 100644
index 0000000..57d4195
--- /dev/null
+++ b/app/src/main/res/layout/fragment_step_one.xml
@@ -0,0 +1,49 @@
+<?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"
+    android:padding="16dp">
+
+    <EditText
+        android:id="@+id/etName"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:hint="Name"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <EditText
+        android:id="@+id/etSurname"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="16dp"
+        android:hint="Surname"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/etName" />
+
+    <EditText
+        android:id="@+id/etBirthDate"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="16dp"
+        android:hint="DD.MM.YYYY"
+        android:inputType="date"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/etSurname" />
+
+    <Button
+        android:id="@+id/btnNext"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="24dp"
+        android:enabled="false"
+        android:text="Next"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_step_three.xml b/app/src/main/res/layout/fragment_step_three.xml
new file mode 100644
index 0000000..fb91809
--- /dev/null
+++ b/app/src/main/res/layout/fragment_step_three.xml
@@ -0,0 +1,44 @@
+<?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"
+    android:padding="16dp">
+
+    <TextView
+        android:id="@+id/tvTitle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Choose your interests"
+        android:textSize="20sp"
+        android:textStyle="bold"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <ScrollView
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:layout_marginTop="16dp"
+        android:layout_marginBottom="16dp"
+        app:layout_constraintBottom_toTopOf="@id/btnNext"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/tvTitle">
+
+        <com.google.android.material.chip.ChipGroup
+            android:id="@+id/chipGroupInterests"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:chipSpacing="8dp"
+            app:itemSpacing="8dp" />
+    </ScrollView>
+
+    <Button
+        android:id="@+id/btnNext"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:enabled="false"
+        android:text="Next"
+        app:layout_constraintBottom_toBottomOf="parent" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_step_two.xml b/app/src/main/res/layout/fragment_step_two.xml
new file mode 100644
index 0000000..e6ee0bb
--- /dev/null
+++ b/app/src/main/res/layout/fragment_step_two.xml
@@ -0,0 +1,49 @@
+<?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"
+    android:padding="16dp">
+
+    <EditText
+        android:id="@+id/etCountry"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:hint="Country"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <EditText
+        android:id="@+id/etCity"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="16dp"
+        android:hint="City"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/etCountry" />
+
+    <EditText
+        android:id="@+id/etAddress"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="16dp"
+        android:hint="Street, House"
+        android:inputType="textPostalAddress"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/etCity" />
+
+    <Button
+        android:id="@+id/btnNext"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="24dp"
+        android:enabled="false"
+        android:text="Next"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/navigation/nav_graph.xml b/app/src/main/res/navigation/nav_graph.xml
new file mode 100644
index 0000000..bddcd10
--- /dev/null
+++ b/app/src/main/res/navigation/nav_graph.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<navigation 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:id="@+id/nav_graph"
+    app:startDestination="@id/stepOneFragment">
+
+    <fragment
+        android:id="@+id/stepOneFragment"
+        android:name="ru.otus.basicarchitecture.ui.StepOneFragment"
+        android:label="Step 1"
+        tools:layout="@layout/fragment_step_one">
+        <action
+            android:id="@+id/action_stepOne_to_stepTwo"
+            app:destination="@id/stepTwoFragment" />
+    </fragment>
+
+    <fragment
+        android:id="@+id/stepTwoFragment"
+        android:name="ru.otus.basicarchitecture.ui.StepTwoFragment"
+        android:label="Step 2"
+        tools:layout="@layout/fragment_step_two">
+        <action
+            android:id="@+id/action_stepTwo_to_stepThree"
+            app:destination="@id/stepThreeFragment" />
+    </fragment>
+
+    <fragment
+        android:id="@+id/stepThreeFragment"
+        android:name="ru.otus.basicarchitecture.ui.StepThreeFragment"
+        android:label="Step 3"
+        tools:layout="@layout/fragment_step_three">
+        <action
+            android:id="@+id/action_stepThree_to_stepFour"
+            app:destination="@id/stepFourFragment" />
+    </fragment>
+
+    <fragment
+        android:id="@+id/stepFourFragment"
+        android:name="ru.otus.basicarchitecture.ui.StepFourFragment"
+        android:label="Summary"
+        tools:layout="@layout/fragment_step_four" />
+
+</navigation>
\ No newline at end of file
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
new file mode 100644
index 0000000..28a8b73
--- /dev/null
+++ b/app/src/main/res/values/dimens.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="m3_chip_pressed_stroke_width" />
+</resources>
\ No newline at end of file

From 3dfd81bda04d002dc0f80bf56ec09a8e4e8f7ded Mon Sep 17 00:00:00 2001
From: annaksenova <aksenovasmail@gmail.com>
Date: Sat, 10 Jan 2026 18:32:37 +0300
Subject: [PATCH 2/2] =?UTF-8?q?=D0=97=D0=B0=D0=B4=D0=B0=D0=BD=D0=B8=D0=B5?=
 =?UTF-8?q?=202.=20=D0=A0=D0=B0=D0=B1=D0=BE=D1=82=D0=B0=20=D1=81=20=D1=81?=
 =?UTF-8?q?=D0=B5=D1=82=D1=8C=D1=8E=20-=20=D0=B2=D0=B0=D0=BB=D0=B8=D0=B4?=
 =?UTF-8?q?=D0=B0=D1=86=D0=B8=D1=8F=20=D0=B0=D0=B4=D1=80=D0=B5=D1=81=D0=B0?=
 =?UTF-8?q?=20=D0=BF=D0=BE=D0=BB=D1=8C=D0=B7=D0=BE=D0=B2=D0=B0=D1=82=D0=B5?=
 =?UTF-8?q?=D0=BB=D1=8F=20+=20=D0=97=D0=B0=D0=B4=D0=B0=D0=BD=D0=B8=D0=B5?=
 =?UTF-8?q?=203.=20Unit-=D1=82=D0=B5=D1=81=D1=82=D0=B8=D1=80=D0=BE=D0=B2?=
 =?UTF-8?q?=D0=B0=D0=BD=D0=B8=D0=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../data/AddressRepository.kt                 | 22 +++++
 .../data/network/DadataApi.kt                 | 12 +++
 .../data/network/DadataModels.kt              | 16 ++++
 .../basicarchitecture/di/NetworkModule.kt     | 52 +++++++++++
 .../basicarchitecture/ui/NoFilterAdapter.kt   | 23 +++++
 .../basicarchitecture/ui/StepTwoFragment.kt   | 64 --------------
 .../ru/otus/basicarchitecture/ui/ViewModel.kt | 33 +++----
 .../ui/{ => steps}/StepFourFragment.kt        |  3 +-
 .../ui/{ => steps}/StepOneFragment.kt         |  4 +-
 .../ui/{ => steps}/StepThreeFragment.kt       |  3 +-
 .../ui/steps/StepTwoFragment.kt               | 86 +++++++++++++++++++
 app/src/main/res/layout/fragment_step_two.xml | 35 +++-----
 app/src/main/res/navigation/nav_graph.xml     |  8 +-
 .../otus/basicarchitecture/ExampleUnitTest.kt | 75 +++++++++++++++-
 14 files changed, 324 insertions(+), 112 deletions(-)
 create mode 100644 app/src/main/java/ru/otus/basicarchitecture/data/AddressRepository.kt
 create mode 100644 app/src/main/java/ru/otus/basicarchitecture/data/network/DadataApi.kt
 create mode 100644 app/src/main/java/ru/otus/basicarchitecture/data/network/DadataModels.kt
 create mode 100644 app/src/main/java/ru/otus/basicarchitecture/di/NetworkModule.kt
 create mode 100644 app/src/main/java/ru/otus/basicarchitecture/ui/NoFilterAdapter.kt
 delete mode 100644 app/src/main/java/ru/otus/basicarchitecture/ui/StepTwoFragment.kt
 rename app/src/main/java/ru/otus/basicarchitecture/ui/{ => steps}/StepFourFragment.kt (94%)
 rename app/src/main/java/ru/otus/basicarchitecture/ui/{ => steps}/StepOneFragment.kt (96%)
 rename app/src/main/java/ru/otus/basicarchitecture/ui/{ => steps}/StepThreeFragment.kt (94%)
 create mode 100644 app/src/main/java/ru/otus/basicarchitecture/ui/steps/StepTwoFragment.kt

diff --git a/app/src/main/java/ru/otus/basicarchitecture/data/AddressRepository.kt b/app/src/main/java/ru/otus/basicarchitecture/data/AddressRepository.kt
new file mode 100644
index 0000000..dbaf470
--- /dev/null
+++ b/app/src/main/java/ru/otus/basicarchitecture/data/AddressRepository.kt
@@ -0,0 +1,22 @@
+package ru.otus.basicarchitecture.data
+
+import ru.otus.basicarchitecture.data.network.DadataApi
+import ru.otus.basicarchitecture.data.network.DadataRequest
+import javax.inject.Inject
+
+class AddressRepository @Inject constructor(
+    private val api: DadataApi
+) {
+    suspend fun getSuggestions(query: String): List<String> {
+        return try {
+            val response = api.getAddressSuggestions(DadataRequest(query))
+            if (response.isSuccessful) {
+                response.body()?.suggestions?.map { it.value } ?: emptyList()
+            } else {
+                emptyList()
+            }
+        } catch (_: Exception) {
+            emptyList()
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/ru/otus/basicarchitecture/data/network/DadataApi.kt b/app/src/main/java/ru/otus/basicarchitecture/data/network/DadataApi.kt
new file mode 100644
index 0000000..b372468
--- /dev/null
+++ b/app/src/main/java/ru/otus/basicarchitecture/data/network/DadataApi.kt
@@ -0,0 +1,12 @@
+package ru.otus.basicarchitecture.data.network
+
+import retrofit2.Response
+import retrofit2.http.Body
+import retrofit2.http.POST
+
+interface DadataApi {
+    @POST("suggestions/api/4_1/rs/suggest/address")
+    suspend fun getAddressSuggestions(
+        @Body request: DadataRequest
+    ): Response<DadataResponse>
+}
\ No newline at end of file
diff --git a/app/src/main/java/ru/otus/basicarchitecture/data/network/DadataModels.kt b/app/src/main/java/ru/otus/basicarchitecture/data/network/DadataModels.kt
new file mode 100644
index 0000000..0c4598d
--- /dev/null
+++ b/app/src/main/java/ru/otus/basicarchitecture/data/network/DadataModels.kt
@@ -0,0 +1,16 @@
+package ru.otus.basicarchitecture.data.network
+
+import com.google.gson.annotations.SerializedName
+
+data class DadataRequest(
+    @SerializedName("query") val query: String, @SerializedName("count") val count: Int = 10
+)
+
+data class DadataResponse(
+    @SerializedName("suggestions") val suggestions: List<DadataSuggestion>
+)
+
+data class DadataSuggestion(
+    @SerializedName("value") val value: String,
+    @SerializedName("unrestricted_value") val unrestrictedValue: String
+)
\ No newline at end of file
diff --git a/app/src/main/java/ru/otus/basicarchitecture/di/NetworkModule.kt b/app/src/main/java/ru/otus/basicarchitecture/di/NetworkModule.kt
new file mode 100644
index 0000000..562268f
--- /dev/null
+++ b/app/src/main/java/ru/otus/basicarchitecture/di/NetworkModule.kt
@@ -0,0 +1,52 @@
+package ru.otus.basicarchitecture.di
+
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+import okhttp3.Interceptor
+import okhttp3.OkHttpClient
+import okhttp3.logging.HttpLoggingInterceptor
+import retrofit2.Retrofit
+import retrofit2.converter.gson.GsonConverterFactory
+import ru.otus.basicarchitecture.BuildConfig
+import ru.otus.basicarchitecture.data.network.DadataApi
+import javax.inject.Singleton
+
+@Module
+@InstallIn(SingletonComponent::class)
+object NetworkModule {
+
+    @Provides
+    @Singleton
+    fun provideOkHttpClient(): OkHttpClient {
+        val logging = HttpLoggingInterceptor().apply {
+            level = HttpLoggingInterceptor.Level.BODY
+        }
+
+        val authInterceptor = Interceptor { chain ->
+            val original = chain.request()
+            val request = original.newBuilder().header(
+                "Authorization", "Token ${BuildConfig.DADATA_API_KEY}"
+            ).header("Content-Type", "application/json").header("Accept", "application/json")
+                .method(original.method, original.body).build()
+            chain.proceed(request)
+        }
+
+        return OkHttpClient.Builder().addInterceptor(authInterceptor).addInterceptor(logging)
+            .build()
+    }
+
+    @Provides
+    @Singleton
+    fun provideRetrofit(okHttpClient: OkHttpClient): Retrofit {
+        return Retrofit.Builder().baseUrl("https://suggestions.dadata.ru/")
+            .addConverterFactory(GsonConverterFactory.create()).client(okHttpClient).build()
+    }
+
+    @Provides
+    @Singleton
+    fun provideDadataApi(retrofit: Retrofit): DadataApi {
+        return retrofit.create(DadataApi::class.java)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/ru/otus/basicarchitecture/ui/NoFilterAdapter.kt b/app/src/main/java/ru/otus/basicarchitecture/ui/NoFilterAdapter.kt
new file mode 100644
index 0000000..05011ba
--- /dev/null
+++ b/app/src/main/java/ru/otus/basicarchitecture/ui/NoFilterAdapter.kt
@@ -0,0 +1,23 @@
+package ru.otus.basicarchitecture.ui
+
+import android.content.Context
+import android.widget.ArrayAdapter
+
+class NoFilterAdapter(context: Context, resource: Int, objects: List<String>) :
+    ArrayAdapter<String>(context, resource, objects) {
+
+    private val noFilter = object : android.widget.Filter() {
+        override fun performFiltering(constraint: CharSequence?): FilterResults {
+            val results = FilterResults()
+            results.values = objects
+            results.count = objects.size
+            return results
+        }
+
+        override fun publishResults(constraint: CharSequence?, results: FilterResults?) {
+            notifyDataSetChanged()
+        }
+    }
+
+    override fun getFilter(): android.widget.Filter = noFilter
+}
\ No newline at end of file
diff --git a/app/src/main/java/ru/otus/basicarchitecture/ui/StepTwoFragment.kt b/app/src/main/java/ru/otus/basicarchitecture/ui/StepTwoFragment.kt
deleted file mode 100644
index 69c3908..0000000
--- a/app/src/main/java/ru/otus/basicarchitecture/ui/StepTwoFragment.kt
+++ /dev/null
@@ -1,64 +0,0 @@
-package ru.otus.basicarchitecture.ui
-
-import android.os.Bundle
-import android.text.Editable
-import android.text.TextWatcher
-import android.view.View
-import android.widget.Button
-import android.widget.EditText
-import androidx.fragment.app.Fragment
-import androidx.fragment.app.viewModels
-import androidx.lifecycle.Lifecycle
-import androidx.lifecycle.lifecycleScope
-import androidx.lifecycle.repeatOnLifecycle
-import androidx.navigation.fragment.findNavController
-import dagger.hilt.android.AndroidEntryPoint
-import kotlinx.coroutines.launch
-import ru.otus.basicarchitecture.R
-
-@AndroidEntryPoint
-class StepTwoFragment : Fragment(R.layout.fragment_step_two) {
-    private val viewModel: StepTwoViewModel by viewModels()
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        val etCountry = view.findViewById<EditText>(R.id.etCountry)
-        val etCity = view.findViewById<EditText>(R.id.etCity)
-        val etStreetHouse = view.findViewById<EditText>(R.id.etAddress)
-        val btnNext = view.findViewById<Button>(R.id.btnNext)
-
-        val watcher = object : TextWatcher {
-            override fun afterTextChanged(s: Editable?) {
-                viewModel.validate(
-                    etCountry.text.toString(),
-                    etCity.text.toString(),
-                    etStreetHouse.text.toString()
-                )
-            }
-            override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {}
-            override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {}
-        }
-
-        etCountry.addTextChangedListener(watcher)
-        etCity.addTextChangedListener(watcher)
-        etStreetHouse.addTextChangedListener(watcher)
-
-        viewLifecycleOwner.lifecycleScope.launch {
-            viewLifecycleOwner.repeatOnLifecycle(Lifecycle.State.STARTED) {
-                viewModel.isNextButtonEnabled.collect { isEnabled ->
-                    btnNext.isEnabled = isEnabled
-                }
-            }
-        }
-
-        btnNext.setOnClickListener {
-            viewModel.onNextClicked(
-                etCountry.text.toString(),
-                etCity.text.toString(),
-                etStreetHouse.text.toString()
-            )
-            findNavController().navigate(R.id.action_stepTwo_to_stepThree)
-        }
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/ru/otus/basicarchitecture/ui/ViewModel.kt b/app/src/main/java/ru/otus/basicarchitecture/ui/ViewModel.kt
index d753b82..32db295 100644
--- a/app/src/main/java/ru/otus/basicarchitecture/ui/ViewModel.kt
+++ b/app/src/main/java/ru/otus/basicarchitecture/ui/ViewModel.kt
@@ -13,6 +13,7 @@ import java.time.LocalDate
 import java.time.Period
 import java.time.format.DateTimeFormatter
 import javax.inject.Inject
+import ru.otus.basicarchitecture.data.AddressRepository
 
 // StepOneViewModel
 // region
@@ -78,19 +79,28 @@ class StepOneViewModel @Inject constructor(
 // region
 @HiltViewModel
 class StepTwoViewModel @Inject constructor(
-    private val wizardCache: WizardCache
+    private val repository: AddressRepository, private val wizardCache: WizardCache
 ) : ViewModel() {
 
+    private val _suggestions = MutableStateFlow<List<String>>(emptyList())
+    val suggestions: StateFlow<List<String>> = _suggestions
+
     private val _isNextButtonEnabled = MutableStateFlow(false)
     val isNextButtonEnabled: StateFlow<Boolean> = _isNextButtonEnabled
 
-    fun validate(country: String, city: String, address: String) {
-        _isNextButtonEnabled.value =
-            country.isNotBlank() && city.isNotBlank() && address.isNotBlank()
+    fun onAddressInputChanged(query: String) {
+        _isNextButtonEnabled.value = query.isNotBlank() && query.length > 5
+    }
+
+    fun getSuggestions(query: String) {
+        viewModelScope.launch {
+            val list = repository.getSuggestions(query)
+            _suggestions.value = list
+        }
     }
 
-    fun onNextClicked(country: String, city: String, address: String) {
-        wizardCache.updateAddress(country, city, address)
+    fun onNextClicked(fullAddress: String) {
+        wizardCache.updateAddress("", "", fullAddress)
     }
 }
 // endregion
@@ -108,15 +118,6 @@ class StepThreeViewModel @Inject constructor(
     private val _isNextButtonEnabled = MutableStateFlow(false)
     val isNextButtonEnabled: StateFlow<Boolean> = _isNextButtonEnabled
 
-    fun toggleInterest(interest: String) {
-        if (selectedInterests.contains(interest)) {
-            selectedInterests.remove(interest)
-        } else {
-            selectedInterests.add(interest)
-        }
-        _isNextButtonEnabled.value = selectedInterests.isNotEmpty()
-    }
-
     fun onInterestChanged(interest: String, isSelected: Boolean) {
         if (isSelected) {
             selectedInterests.add(interest)
@@ -140,7 +141,7 @@ class StepFourViewModel @Inject constructor(
     wizardCache: WizardCache
 ) : ViewModel() {
     val birthDate = wizardCache.birthDate
-    val fullAddress = "${wizardCache.country}, ${wizardCache.city}, ${wizardCache.address}"
+    val fullAddress = "${wizardCache.country} ${wizardCache.city} ${wizardCache.address}".trim()
     val interests = wizardCache.interests
     val name = wizardCache.name
     val surname = wizardCache.surname
diff --git a/app/src/main/java/ru/otus/basicarchitecture/ui/StepFourFragment.kt b/app/src/main/java/ru/otus/basicarchitecture/ui/steps/StepFourFragment.kt
similarity index 94%
rename from app/src/main/java/ru/otus/basicarchitecture/ui/StepFourFragment.kt
rename to app/src/main/java/ru/otus/basicarchitecture/ui/steps/StepFourFragment.kt
index e72e2df..6ec6e16 100644
--- a/app/src/main/java/ru/otus/basicarchitecture/ui/StepFourFragment.kt
+++ b/app/src/main/java/ru/otus/basicarchitecture/ui/steps/StepFourFragment.kt
@@ -1,4 +1,4 @@
-package ru.otus.basicarchitecture.ui
+package ru.otus.basicarchitecture.ui.steps
 
 import android.os.Bundle
 import android.util.TypedValue
@@ -10,6 +10,7 @@ import com.google.android.material.chip.Chip
 import com.google.android.material.chip.ChipGroup
 import dagger.hilt.android.AndroidEntryPoint
 import ru.otus.basicarchitecture.R
+import ru.otus.basicarchitecture.ui.StepFourViewModel
 
 @AndroidEntryPoint
 class StepFourFragment : Fragment(R.layout.fragment_step_four) {
diff --git a/app/src/main/java/ru/otus/basicarchitecture/ui/StepOneFragment.kt b/app/src/main/java/ru/otus/basicarchitecture/ui/steps/StepOneFragment.kt
similarity index 96%
rename from app/src/main/java/ru/otus/basicarchitecture/ui/StepOneFragment.kt
rename to app/src/main/java/ru/otus/basicarchitecture/ui/steps/StepOneFragment.kt
index 186930d..aa7426e 100644
--- a/app/src/main/java/ru/otus/basicarchitecture/ui/StepOneFragment.kt
+++ b/app/src/main/java/ru/otus/basicarchitecture/ui/steps/StepOneFragment.kt
@@ -1,4 +1,4 @@
-package ru.otus.basicarchitecture.ui
+package ru.otus.basicarchitecture.ui.steps
 
 import android.os.Bundle
 import android.text.Editable
@@ -16,6 +16,7 @@ import androidx.navigation.fragment.findNavController
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.launch
 import ru.otus.basicarchitecture.R
+import ru.otus.basicarchitecture.ui.StepOneViewModel
 
 @AndroidEntryPoint
 class StepOneFragment : Fragment(R.layout.fragment_step_one) {
@@ -89,7 +90,6 @@ class StepOneFragment : Fragment(R.layout.fragment_step_one) {
                 launch {
                     viewModel.errorEvents.collect { message ->
                         etBirthDate.error = message
-                        Toast.makeText(requireContext(), message, Toast.LENGTH_SHORT).show()
                     }
                 }
             }
diff --git a/app/src/main/java/ru/otus/basicarchitecture/ui/StepThreeFragment.kt b/app/src/main/java/ru/otus/basicarchitecture/ui/steps/StepThreeFragment.kt
similarity index 94%
rename from app/src/main/java/ru/otus/basicarchitecture/ui/StepThreeFragment.kt
rename to app/src/main/java/ru/otus/basicarchitecture/ui/steps/StepThreeFragment.kt
index 69e03da..ab2c817 100644
--- a/app/src/main/java/ru/otus/basicarchitecture/ui/StepThreeFragment.kt
+++ b/app/src/main/java/ru/otus/basicarchitecture/ui/steps/StepThreeFragment.kt
@@ -1,4 +1,4 @@
-package ru.otus.basicarchitecture.ui
+package ru.otus.basicarchitecture.ui.steps
 
 import android.os.Bundle
 import android.view.View
@@ -14,6 +14,7 @@ import com.google.android.material.chip.ChipGroup
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.launch
 import ru.otus.basicarchitecture.R
+import ru.otus.basicarchitecture.ui.StepThreeViewModel
 
 @AndroidEntryPoint
 class StepThreeFragment : Fragment(R.layout.fragment_step_three) {
diff --git a/app/src/main/java/ru/otus/basicarchitecture/ui/steps/StepTwoFragment.kt b/app/src/main/java/ru/otus/basicarchitecture/ui/steps/StepTwoFragment.kt
new file mode 100644
index 0000000..8eae09a
--- /dev/null
+++ b/app/src/main/java/ru/otus/basicarchitecture/ui/steps/StepTwoFragment.kt
@@ -0,0 +1,86 @@
+package ru.otus.basicarchitecture.ui.steps
+
+import android.os.Bundle
+import android.view.View
+import android.widget.AutoCompleteTextView
+import android.widget.Button
+import androidx.core.widget.addTextChangedListener
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.viewModels
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.lifecycleScope
+import androidx.lifecycle.repeatOnLifecycle
+import androidx.navigation.fragment.findNavController
+import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
+import ru.otus.basicarchitecture.R
+import ru.otus.basicarchitecture.ui.NoFilterAdapter
+import ru.otus.basicarchitecture.ui.StepTwoViewModel
+
+@AndroidEntryPoint
+class StepTwoFragment : Fragment(R.layout.fragment_step_two) {
+
+    private val viewModel: StepTwoViewModel by viewModels()
+    private var searchJob: Job? = null
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        val actvAddress = view.findViewById<AutoCompleteTextView>(R.id.actvAddress)
+        val btnNext = view.findViewById<Button>(R.id.btnNext)
+
+        val suggestionsList = mutableListOf<String>()
+        val adapter = NoFilterAdapter(
+            requireContext(), android.R.layout.simple_dropdown_item_1line, suggestionsList
+        )
+        actvAddress.setAdapter(adapter)
+
+        actvAddress.addTextChangedListener { text ->
+            val query = text.toString()
+
+            viewModel.onAddressInputChanged(query)
+
+            searchJob?.cancel()
+            searchJob = viewLifecycleOwner.lifecycleScope.launch {
+                delay(500)
+                if (query.length >= 3) {
+                    viewModel.getSuggestions(query)
+                }
+            }
+        }
+
+        actvAddress.setOnItemClickListener { parent, _, position, _ ->
+            val selectedAddress = parent.getItemAtPosition(position) as String
+            viewModel.onAddressInputChanged(selectedAddress)
+        }
+
+        viewLifecycleOwner.lifecycleScope.launch {
+            viewLifecycleOwner.repeatOnLifecycle(Lifecycle.State.STARTED) {
+                launch {
+                    viewModel.suggestions.collect { list ->
+                        adapter.clear()
+                        adapter.addAll(list)
+                        adapter.notifyDataSetChanged()
+
+                        if (list.isNotEmpty()) {
+                            actvAddress.showDropDown()
+                        }
+                    }
+                }
+
+                launch {
+                    viewModel.isNextButtonEnabled.collect { isEnabled ->
+                        btnNext.isEnabled = isEnabled
+                    }
+                }
+            }
+        }
+
+        btnNext.setOnClickListener {
+            viewModel.onNextClicked(actvAddress.text.toString())
+            findNavController().navigate(R.id.action_stepTwo_to_stepThree)
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_step_two.xml b/app/src/main/res/layout/fragment_step_two.xml
index e6ee0bb..5628ed6 100644
--- a/app/src/main/res/layout/fragment_step_two.xml
+++ b/app/src/main/res/layout/fragment_step_two.xml
@@ -5,35 +5,24 @@
     android:layout_height="match_parent"
     android:padding="16dp">
 
-    <EditText
-        android:id="@+id/etCountry"
+    <com.google.android.material.textfield.TextInputLayout
+        android:id="@+id/tilAddress"
+        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:hint="Country"
+        android:hint="Enter address"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toTopOf="parent">
 
-    <EditText
-        android:id="@+id/etCity"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="16dp"
-        android:hint="City"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/etCountry" />
+        <AutoCompleteTextView
+            android:id="@+id/actvAddress"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:completionThreshold="3"
+            android:inputType="textPostalAddress" />
 
-    <EditText
-        android:id="@+id/etAddress"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="16dp"
-        android:hint="Street, House"
-        android:inputType="textPostalAddress"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/etCity" />
+    </com.google.android.material.textfield.TextInputLayout>
 
     <Button
         android:id="@+id/btnNext"
diff --git a/app/src/main/res/navigation/nav_graph.xml b/app/src/main/res/navigation/nav_graph.xml
index bddcd10..e0b5cd0 100644
--- a/app/src/main/res/navigation/nav_graph.xml
+++ b/app/src/main/res/navigation/nav_graph.xml
@@ -7,7 +7,7 @@
 
     <fragment
         android:id="@+id/stepOneFragment"
-        android:name="ru.otus.basicarchitecture.ui.StepOneFragment"
+        android:name="ru.otus.basicarchitecture.ui.steps.StepOneFragment"
         android:label="Step 1"
         tools:layout="@layout/fragment_step_one">
         <action
@@ -17,7 +17,7 @@
 
     <fragment
         android:id="@+id/stepTwoFragment"
-        android:name="ru.otus.basicarchitecture.ui.StepTwoFragment"
+        android:name="ru.otus.basicarchitecture.ui.steps.StepTwoFragment"
         android:label="Step 2"
         tools:layout="@layout/fragment_step_two">
         <action
@@ -27,7 +27,7 @@
 
     <fragment
         android:id="@+id/stepThreeFragment"
-        android:name="ru.otus.basicarchitecture.ui.StepThreeFragment"
+        android:name="ru.otus.basicarchitecture.ui.steps.StepThreeFragment"
         android:label="Step 3"
         tools:layout="@layout/fragment_step_three">
         <action
@@ -37,7 +37,7 @@
 
     <fragment
         android:id="@+id/stepFourFragment"
-        android:name="ru.otus.basicarchitecture.ui.StepFourFragment"
+        android:name="ru.otus.basicarchitecture.ui.steps.StepFourFragment"
         android:label="Summary"
         tools:layout="@layout/fragment_step_four" />
 
diff --git a/app/src/test/java/ru/otus/basicarchitecture/ExampleUnitTest.kt b/app/src/test/java/ru/otus/basicarchitecture/ExampleUnitTest.kt
index 5a5b4c1..5b7eff6 100644
--- a/app/src/test/java/ru/otus/basicarchitecture/ExampleUnitTest.kt
+++ b/app/src/test/java/ru/otus/basicarchitecture/ExampleUnitTest.kt
@@ -2,7 +2,25 @@ package ru.otus.basicarchitecture
 
 import org.junit.Test
 
-import org.junit.Assert.*
+import io.mockk.mockk
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.test.UnconfinedTestDispatcher
+import kotlinx.coroutines.test.setMain
+import org.junit.Assert.assertFalse
+import org.junit.Assert.assertTrue
+import org.junit.Before
+import ru.otus.basicarchitecture.data.WizardCache
+import ru.otus.basicarchitecture.ui.StepOneViewModel
+import java.time.LocalDate
+import java.time.format.DateTimeFormatter
+import io.mockk.coEvery
+import kotlinx.coroutines.test.StandardTestDispatcher
+import kotlinx.coroutines.test.advanceUntilIdle
+import kotlinx.coroutines.test.runTest
+import org.junit.Assert.assertEquals
+import ru.otus.basicarchitecture.data.AddressRepository
+import ru.otus.basicarchitecture.ui.StepTwoViewModel
 
 /**
  * Example local unit test, which will execute on the development machine (host).
@@ -14,4 +32,59 @@ class ExampleUnitTest {
     fun addition_isCorrect() {
         assertEquals(4, 2 + 2)
     }
+}
+
+@OptIn(ExperimentalCoroutinesApi::class)
+class StepOneViewModelTest {
+
+    private lateinit var viewModel: StepOneViewModel
+    private val wizardCache: WizardCache = mockk(relaxed = true)
+
+    @Before
+    fun setUp() {
+        Dispatchers.setMain(UnconfinedTestDispatcher())
+        viewModel = StepOneViewModel(wizardCache)
+    }
+
+    @Test
+    fun `when input is valid and age is 18 plus then button is enabled`() {
+        val adultDate =
+            LocalDate.now().minusYears(20).format(DateTimeFormatter.ofPattern("dd.MM.yyyy"))
+        viewModel.onInputChanged("Ivan", "Ivanov", adultDate)
+        assertTrue(viewModel.isNextButtonEnabled.value)
+    }
+
+    @Test
+    fun `when age is less than 18 then button is disabled`() {
+        val youngDate =
+            LocalDate.now().minusYears(10).format(DateTimeFormatter.ofPattern("dd.MM.yyyy"))
+        viewModel.onInputChanged("Ivan", "Ivanov", youngDate)
+        assertFalse(viewModel.isNextButtonEnabled.value)
+    }
+}
+
+@OptIn(ExperimentalCoroutinesApi::class)
+class StepTwoViewModelTest {
+
+    private lateinit var viewModel: StepTwoViewModel
+    private val repository: AddressRepository = mockk()
+    private val wizardCache: WizardCache = mockk(relaxed = true)
+    private val testDispatcher = StandardTestDispatcher()
+
+    @Before
+    fun setUp() {
+        Dispatchers.setMain(testDispatcher)
+        viewModel = StepTwoViewModel(repository, wizardCache)
+    }
+
+    @Test
+    fun `getSuggestions should update state flow with data from repository`() = runTest {
+        val mockSuggestions = listOf("Москва, ул. Ленина", "Московская обл.")
+        coEvery { repository.getSuggestions("Мос") } returns mockSuggestions
+
+        viewModel.getSuggestions("Мос")
+        advanceUntilIdle()
+
+        assertEquals(mockSuggestions, viewModel.suggestions.value)
+    }
 }
\ No newline at end of file