From 1804a22e70e2f47beffe1eb1a83405d3397d1460 Mon Sep 17 00:00:00 2001
From: 2olka <brayanevoni@gmail.com>
Date: Thu, 29 Jan 2026 19:33:28 +0500
Subject: [PATCH 01/31] =?UTF-8?q?ANDR-75:=20=D0=A1=D0=BE=D0=B7=D0=B4=D0=B0?=
 =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D0=BC=D0=BE=D0=B4=D1=83=D0=BB=D1=8F=20for?=
 =?UTF-8?q?got=20password?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/gradle.xml                              |  3 ++
 feature/forgot-password/.gitignore            |  1 +
 feature/forgot-password/api/.gitignore        |  1 +
 feature/forgot-password/api/build.gradle.kts  | 44 +++++++++++++++++++
 .../forgot-password/api/consumer-rules.pro    |  0
 .../forgot-password/api/proguard-rules.pro    | 21 +++++++++
 .../ru/yeahub/api/ExampleInstrumentedTest.kt  | 24 ++++++++++
 .../api/src/main/AndroidManifest.xml          |  4 ++
 .../java/ru/yeahub/api/ExampleUnitTest.kt     | 17 +++++++
 feature/forgot-password/build.gradle.kts      | 44 +++++++++++++++++++
 feature/forgot-password/consumer-rules.pro    |  0
 feature/forgot-password/impl/.gitignore       |  1 +
 feature/forgot-password/impl/build.gradle.kts | 44 +++++++++++++++++++
 .../forgot-password/impl/consumer-rules.pro   |  0
 .../forgot-password/impl/proguard-rules.pro   | 21 +++++++++
 .../ru/yeahub/impl/ExampleInstrumentedTest.kt | 24 ++++++++++
 .../impl/src/main/AndroidManifest.xml         |  4 ++
 .../java/ru/yeahub/impl/ExampleUnitTest.kt    | 17 +++++++
 feature/forgot-password/proguard-rules.pro    | 21 +++++++++
 .../ExampleInstrumentedTest.kt                | 24 ++++++++++
 .../src/main/AndroidManifest.xml              |  4 ++
 .../yeahub/forgot_password/ExampleUnitTest.kt | 17 +++++++
 settings.gradle.kts                           |  3 ++
 23 files changed, 339 insertions(+)
 create mode 100644 feature/forgot-password/.gitignore
 create mode 100644 feature/forgot-password/api/.gitignore
 create mode 100644 feature/forgot-password/api/build.gradle.kts
 create mode 100644 feature/forgot-password/api/consumer-rules.pro
 create mode 100644 feature/forgot-password/api/proguard-rules.pro
 create mode 100644 feature/forgot-password/api/src/androidTest/java/ru/yeahub/api/ExampleInstrumentedTest.kt
 create mode 100644 feature/forgot-password/api/src/main/AndroidManifest.xml
 create mode 100644 feature/forgot-password/api/src/test/java/ru/yeahub/api/ExampleUnitTest.kt
 create mode 100644 feature/forgot-password/build.gradle.kts
 create mode 100644 feature/forgot-password/consumer-rules.pro
 create mode 100644 feature/forgot-password/impl/.gitignore
 create mode 100644 feature/forgot-password/impl/build.gradle.kts
 create mode 100644 feature/forgot-password/impl/consumer-rules.pro
 create mode 100644 feature/forgot-password/impl/proguard-rules.pro
 create mode 100644 feature/forgot-password/impl/src/androidTest/java/ru/yeahub/impl/ExampleInstrumentedTest.kt
 create mode 100644 feature/forgot-password/impl/src/main/AndroidManifest.xml
 create mode 100644 feature/forgot-password/impl/src/test/java/ru/yeahub/impl/ExampleUnitTest.kt
 create mode 100644 feature/forgot-password/proguard-rules.pro
 create mode 100644 feature/forgot-password/src/androidTest/java/ru/yeahub/forgot_password/ExampleInstrumentedTest.kt
 create mode 100644 feature/forgot-password/src/main/AndroidManifest.xml
 create mode 100644 feature/forgot-password/src/test/java/ru/yeahub/forgot_password/ExampleUnitTest.kt

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 8bf84ad7..0a34d9b8 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -39,6 +39,9 @@
             <option value="$PROJECT_DIR$/feature/example-questions" />
             <option value="$PROJECT_DIR$/feature/example-questions/api" />
             <option value="$PROJECT_DIR$/feature/example-questions/impl" />
+            <option value="$PROJECT_DIR$/feature/forgot-password" />
+            <option value="$PROJECT_DIR$/feature/forgot-password/api" />
+            <option value="$PROJECT_DIR$/feature/forgot-password/impl" />
             <option value="$PROJECT_DIR$/feature/public-collections" />
             <option value="$PROJECT_DIR$/feature/public-collections/api" />
             <option value="$PROJECT_DIR$/feature/public-collections/impl" />
diff --git a/feature/forgot-password/.gitignore b/feature/forgot-password/.gitignore
new file mode 100644
index 00000000..42afabfd
--- /dev/null
+++ b/feature/forgot-password/.gitignore
@@ -0,0 +1 @@
+/build
\ No newline at end of file
diff --git a/feature/forgot-password/api/.gitignore b/feature/forgot-password/api/.gitignore
new file mode 100644
index 00000000..42afabfd
--- /dev/null
+++ b/feature/forgot-password/api/.gitignore
@@ -0,0 +1 @@
+/build
\ No newline at end of file
diff --git a/feature/forgot-password/api/build.gradle.kts b/feature/forgot-password/api/build.gradle.kts
new file mode 100644
index 00000000..b4a39edf
--- /dev/null
+++ b/feature/forgot-password/api/build.gradle.kts
@@ -0,0 +1,44 @@
+plugins {
+    alias(libs.plugins.android.library)
+    alias(libs.plugins.kotlin.android)
+}
+
+android {
+    namespace = "ru.yeahub.api"
+    compileSdk {
+        version = release(35)
+    }
+
+    defaultConfig {
+        minSdk = 24
+
+        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+        consumerProguardFiles("consumer-rules.pro")
+    }
+
+    buildTypes {
+        release {
+            isMinifyEnabled = false
+            proguardFiles(
+                getDefaultProguardFile("proguard-android-optimize.txt"),
+                "proguard-rules.pro"
+            )
+        }
+    }
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
+    }
+    kotlinOptions {
+        jvmTarget = "11"
+    }
+}
+
+dependencies {
+    implementation(libs.androidx.core.ktx)
+    implementation(libs.androidx.appcompat)
+    implementation(libs.material)
+    testImplementation(libs.junit)
+    androidTestImplementation(libs.androidx.junit)
+    androidTestImplementation(libs.androidx.espresso.core)
+}
\ No newline at end of file
diff --git a/feature/forgot-password/api/consumer-rules.pro b/feature/forgot-password/api/consumer-rules.pro
new file mode 100644
index 00000000..e69de29b
diff --git a/feature/forgot-password/api/proguard-rules.pro b/feature/forgot-password/api/proguard-rules.pro
new file mode 100644
index 00000000..481bb434
--- /dev/null
+++ b/feature/forgot-password/api/proguard-rules.pro
@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
\ No newline at end of file
diff --git a/feature/forgot-password/api/src/androidTest/java/ru/yeahub/api/ExampleInstrumentedTest.kt b/feature/forgot-password/api/src/androidTest/java/ru/yeahub/api/ExampleInstrumentedTest.kt
new file mode 100644
index 00000000..77e7bf26
--- /dev/null
+++ b/feature/forgot-password/api/src/androidTest/java/ru/yeahub/api/ExampleInstrumentedTest.kt
@@ -0,0 +1,24 @@
+package ru.yeahub.api
+
+import androidx.test.platform.app.InstrumentationRegistry
+import androidx.test.ext.junit.runners.AndroidJUnit4
+
+import org.junit.Test
+import org.junit.runner.RunWith
+
+import org.junit.Assert.*
+
+/**
+ * Instrumented test, which will execute on an Android device.
+ *
+ * See [testing documentation](http://d.android.com/tools/testing).
+ */
+@RunWith(AndroidJUnit4::class)
+class ExampleInstrumentedTest {
+    @Test
+    fun useAppContext() {
+        // Context of the app under test.
+        val appContext = InstrumentationRegistry.getInstrumentation().targetContext
+        assertEquals("ru.yeahub.api.test", appContext.packageName)
+    }
+}
\ No newline at end of file
diff --git a/feature/forgot-password/api/src/main/AndroidManifest.xml b/feature/forgot-password/api/src/main/AndroidManifest.xml
new file mode 100644
index 00000000..a5918e68
--- /dev/null
+++ b/feature/forgot-password/api/src/main/AndroidManifest.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+
+</manifest>
\ No newline at end of file
diff --git a/feature/forgot-password/api/src/test/java/ru/yeahub/api/ExampleUnitTest.kt b/feature/forgot-password/api/src/test/java/ru/yeahub/api/ExampleUnitTest.kt
new file mode 100644
index 00000000..20a5ef57
--- /dev/null
+++ b/feature/forgot-password/api/src/test/java/ru/yeahub/api/ExampleUnitTest.kt
@@ -0,0 +1,17 @@
+package ru.yeahub.api
+
+import org.junit.Test
+
+import org.junit.Assert.*
+
+/**
+ * Example local unit test, which will execute on the development machine (host).
+ *
+ * See [testing documentation](http://d.android.com/tools/testing).
+ */
+class ExampleUnitTest {
+    @Test
+    fun addition_isCorrect() {
+        assertEquals(4, 2 + 2)
+    }
+}
\ No newline at end of file
diff --git a/feature/forgot-password/build.gradle.kts b/feature/forgot-password/build.gradle.kts
new file mode 100644
index 00000000..c6d924a4
--- /dev/null
+++ b/feature/forgot-password/build.gradle.kts
@@ -0,0 +1,44 @@
+plugins {
+    alias(libs.plugins.android.library)
+    alias(libs.plugins.kotlin.android)
+}
+
+android {
+    namespace = "ru.yeahub.forgot_password"
+    compileSdk {
+        version = release(35)
+    }
+
+    defaultConfig {
+        minSdk = 24
+
+        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+        consumerProguardFiles("consumer-rules.pro")
+    }
+
+    buildTypes {
+        release {
+            isMinifyEnabled = false
+            proguardFiles(
+                getDefaultProguardFile("proguard-android-optimize.txt"),
+                "proguard-rules.pro"
+            )
+        }
+    }
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
+    }
+    kotlinOptions {
+        jvmTarget = "11"
+    }
+}
+
+dependencies {
+    implementation(libs.androidx.core.ktx)
+    implementation(libs.androidx.appcompat)
+    implementation(libs.material)
+    testImplementation(libs.junit)
+    androidTestImplementation(libs.androidx.junit)
+    androidTestImplementation(libs.androidx.espresso.core)
+}
\ No newline at end of file
diff --git a/feature/forgot-password/consumer-rules.pro b/feature/forgot-password/consumer-rules.pro
new file mode 100644
index 00000000..e69de29b
diff --git a/feature/forgot-password/impl/.gitignore b/feature/forgot-password/impl/.gitignore
new file mode 100644
index 00000000..42afabfd
--- /dev/null
+++ b/feature/forgot-password/impl/.gitignore
@@ -0,0 +1 @@
+/build
\ No newline at end of file
diff --git a/feature/forgot-password/impl/build.gradle.kts b/feature/forgot-password/impl/build.gradle.kts
new file mode 100644
index 00000000..abd04c49
--- /dev/null
+++ b/feature/forgot-password/impl/build.gradle.kts
@@ -0,0 +1,44 @@
+plugins {
+    alias(libs.plugins.android.library)
+    alias(libs.plugins.kotlin.android)
+}
+
+android {
+    namespace = "ru.yeahub.impl"
+    compileSdk {
+        version = release(35)
+    }
+
+    defaultConfig {
+        minSdk = 24
+
+        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+        consumerProguardFiles("consumer-rules.pro")
+    }
+
+    buildTypes {
+        release {
+            isMinifyEnabled = false
+            proguardFiles(
+                getDefaultProguardFile("proguard-android-optimize.txt"),
+                "proguard-rules.pro"
+            )
+        }
+    }
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
+    }
+    kotlinOptions {
+        jvmTarget = "11"
+    }
+}
+
+dependencies {
+    implementation(libs.androidx.core.ktx)
+    implementation(libs.androidx.appcompat)
+    implementation(libs.material)
+    testImplementation(libs.junit)
+    androidTestImplementation(libs.androidx.junit)
+    androidTestImplementation(libs.androidx.espresso.core)
+}
\ No newline at end of file
diff --git a/feature/forgot-password/impl/consumer-rules.pro b/feature/forgot-password/impl/consumer-rules.pro
new file mode 100644
index 00000000..e69de29b
diff --git a/feature/forgot-password/impl/proguard-rules.pro b/feature/forgot-password/impl/proguard-rules.pro
new file mode 100644
index 00000000..481bb434
--- /dev/null
+++ b/feature/forgot-password/impl/proguard-rules.pro
@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
\ No newline at end of file
diff --git a/feature/forgot-password/impl/src/androidTest/java/ru/yeahub/impl/ExampleInstrumentedTest.kt b/feature/forgot-password/impl/src/androidTest/java/ru/yeahub/impl/ExampleInstrumentedTest.kt
new file mode 100644
index 00000000..432cb481
--- /dev/null
+++ b/feature/forgot-password/impl/src/androidTest/java/ru/yeahub/impl/ExampleInstrumentedTest.kt
@@ -0,0 +1,24 @@
+package ru.yeahub.impl
+
+import androidx.test.platform.app.InstrumentationRegistry
+import androidx.test.ext.junit.runners.AndroidJUnit4
+
+import org.junit.Test
+import org.junit.runner.RunWith
+
+import org.junit.Assert.*
+
+/**
+ * Instrumented test, which will execute on an Android device.
+ *
+ * See [testing documentation](http://d.android.com/tools/testing).
+ */
+@RunWith(AndroidJUnit4::class)
+class ExampleInstrumentedTest {
+    @Test
+    fun useAppContext() {
+        // Context of the app under test.
+        val appContext = InstrumentationRegistry.getInstrumentation().targetContext
+        assertEquals("ru.yeahub.impl.test", appContext.packageName)
+    }
+}
\ No newline at end of file
diff --git a/feature/forgot-password/impl/src/main/AndroidManifest.xml b/feature/forgot-password/impl/src/main/AndroidManifest.xml
new file mode 100644
index 00000000..a5918e68
--- /dev/null
+++ b/feature/forgot-password/impl/src/main/AndroidManifest.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+
+</manifest>
\ No newline at end of file
diff --git a/feature/forgot-password/impl/src/test/java/ru/yeahub/impl/ExampleUnitTest.kt b/feature/forgot-password/impl/src/test/java/ru/yeahub/impl/ExampleUnitTest.kt
new file mode 100644
index 00000000..072360cd
--- /dev/null
+++ b/feature/forgot-password/impl/src/test/java/ru/yeahub/impl/ExampleUnitTest.kt
@@ -0,0 +1,17 @@
+package ru.yeahub.impl
+
+import org.junit.Test
+
+import org.junit.Assert.*
+
+/**
+ * Example local unit test, which will execute on the development machine (host).
+ *
+ * See [testing documentation](http://d.android.com/tools/testing).
+ */
+class ExampleUnitTest {
+    @Test
+    fun addition_isCorrect() {
+        assertEquals(4, 2 + 2)
+    }
+}
\ No newline at end of file
diff --git a/feature/forgot-password/proguard-rules.pro b/feature/forgot-password/proguard-rules.pro
new file mode 100644
index 00000000..481bb434
--- /dev/null
+++ b/feature/forgot-password/proguard-rules.pro
@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
\ No newline at end of file
diff --git a/feature/forgot-password/src/androidTest/java/ru/yeahub/forgot_password/ExampleInstrumentedTest.kt b/feature/forgot-password/src/androidTest/java/ru/yeahub/forgot_password/ExampleInstrumentedTest.kt
new file mode 100644
index 00000000..7cbb2a1a
--- /dev/null
+++ b/feature/forgot-password/src/androidTest/java/ru/yeahub/forgot_password/ExampleInstrumentedTest.kt
@@ -0,0 +1,24 @@
+package ru.yeahub.forgot_password
+
+import androidx.test.platform.app.InstrumentationRegistry
+import androidx.test.ext.junit.runners.AndroidJUnit4
+
+import org.junit.Test
+import org.junit.runner.RunWith
+
+import org.junit.Assert.*
+
+/**
+ * Instrumented test, which will execute on an Android device.
+ *
+ * See [testing documentation](http://d.android.com/tools/testing).
+ */
+@RunWith(AndroidJUnit4::class)
+class ExampleInstrumentedTest {
+    @Test
+    fun useAppContext() {
+        // Context of the app under test.
+        val appContext = InstrumentationRegistry.getInstrumentation().targetContext
+        assertEquals("ru.yeahub.forgot_password.test", appContext.packageName)
+    }
+}
\ No newline at end of file
diff --git a/feature/forgot-password/src/main/AndroidManifest.xml b/feature/forgot-password/src/main/AndroidManifest.xml
new file mode 100644
index 00000000..a5918e68
--- /dev/null
+++ b/feature/forgot-password/src/main/AndroidManifest.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+
+</manifest>
\ No newline at end of file
diff --git a/feature/forgot-password/src/test/java/ru/yeahub/forgot_password/ExampleUnitTest.kt b/feature/forgot-password/src/test/java/ru/yeahub/forgot_password/ExampleUnitTest.kt
new file mode 100644
index 00000000..81a714c3
--- /dev/null
+++ b/feature/forgot-password/src/test/java/ru/yeahub/forgot_password/ExampleUnitTest.kt
@@ -0,0 +1,17 @@
+package ru.yeahub.forgot_password
+
+import org.junit.Test
+
+import org.junit.Assert.*
+
+/**
+ * Example local unit test, which will execute on the development machine (host).
+ *
+ * See [testing documentation](http://d.android.com/tools/testing).
+ */
+class ExampleUnitTest {
+    @Test
+    fun addition_isCorrect() {
+        assertEquals(4, 2 + 2)
+    }
+}
\ No newline at end of file
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 590a963a..970f1e86 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -61,3 +61,6 @@ include(":feature:questions-or-collections:impl")
 include(":feature:enter-and-registration")
 include(":feature:enter-and-registration:api")
 include(":feature:enter-and-registration:impl")
+include(":feature:forgot-password")
+include(":feature:forgot-password:api")
+include(":feature:forgot-password:impl")

From f58bd14730073ef3b2fca87284cc0afddd64fdec Mon Sep 17 00:00:00 2001
From: 2olka <brayanevoni@gmail.com>
Date: Thu, 5 Feb 2026 19:09:13 +0500
Subject: [PATCH 02/31] =?UTF-8?q?ANDR-75:=20=D0=92=D0=B5=D1=80=D1=81=D1=82?=
 =?UTF-8?q?=D0=BA=D0=B0=20=D0=BC=D0=BE=D0=B4=D0=B0=D0=BB=D1=8C=D0=BD=D0=BE?=
 =?UTF-8?q?=D0=B3=D0=BE=20=D0=BE=D0=BA=D0=BD=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle.kts                          |   2 ++
 feature/forgot-password/impl/build.gradle.kts |  22 +++++++++++++++---
 .../impl/src/main/res/drawable/close.jpg      | Bin 0 -> 7063 bytes
 .../impl/src/main/res/drawable/letter.jpg     | Bin 0 -> 13437 bytes
 gradle/libs.versions.toml                     |   8 +++++++
 5 files changed, 29 insertions(+), 3 deletions(-)
 create mode 100644 feature/forgot-password/impl/src/main/res/drawable/close.jpg
 create mode 100644 feature/forgot-password/impl/src/main/res/drawable/letter.jpg

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 0d19b5df..e7cf1e64 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -98,6 +98,8 @@ dependencies {
     implementation(project(":feature:questions-or-collections:api"))
     implementation(project(":feature:public-collections:api"))
     implementation(project(":feature:selection-specializations:api"))
+    implementation(project(":feature:forgot-password:api"))
+    implementation(project(":feature:forgot-password:impl"))
     implementation(project(":feature:example-home:impl"))
     implementation(project(":feature:example-profile:impl"))
     implementation(project(":feature:example-questions:impl"))
diff --git a/feature/forgot-password/impl/build.gradle.kts b/feature/forgot-password/impl/build.gradle.kts
index abd04c49..2c3d5a27 100644
--- a/feature/forgot-password/impl/build.gradle.kts
+++ b/feature/forgot-password/impl/build.gradle.kts
@@ -1,13 +1,12 @@
 plugins {
     alias(libs.plugins.android.library)
     alias(libs.plugins.kotlin.android)
+    alias(libs.plugins.kotlin.compose)
 }
 
 android {
     namespace = "ru.yeahub.impl"
-    compileSdk {
-        version = release(35)
-    }
+    compileSdk = 35
 
     defaultConfig {
         minSdk = 24
@@ -32,12 +31,29 @@ android {
     kotlinOptions {
         jvmTarget = "11"
     }
+    buildFeatures {
+        compose = true
+    }
+    composeOptions {
+        kotlinCompilerExtensionVersion = "1.5.8"
+    }
 }
 
 dependencies {
     implementation(libs.androidx.core.ktx)
     implementation(libs.androidx.appcompat)
     implementation(libs.material)
+    implementation(libs.androidx.compose.runtime)
+    implementation(libs.androidx.compose.ui)
+    implementation(libs.androidx.compose.foundation)
+    implementation(libs.androidx.compose.material3)
+    implementation(project(":core:ui"))
+
+    // Compose Preview dependencies
+    implementation(libs.androidx.ui.tooling.preview)
+    debugImplementation(libs.androidx.ui.tooling)
+    debugImplementation(libs.androidx.ui.test.manifest)
+
     testImplementation(libs.junit)
     androidTestImplementation(libs.androidx.junit)
     androidTestImplementation(libs.androidx.espresso.core)
diff --git a/feature/forgot-password/impl/src/main/res/drawable/close.jpg b/feature/forgot-password/impl/src/main/res/drawable/close.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..4de6c0819bb288f701c9ad81b8a31a84f4a91db9
GIT binary patch
literal 7063
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

literal 0
HcmV?d00001

diff --git a/feature/forgot-password/impl/src/main/res/drawable/letter.jpg b/feature/forgot-password/impl/src/main/res/drawable/letter.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..4b3363638424d8ae415b7d2cf14e70e63ed44d44
GIT binary patch
literal 13437
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
DANVS#

literal 0
HcmV?d00001

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 2a9f91cd..e716b5a4 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -30,6 +30,10 @@ jsoup = "1.17.2"
 shimmer = "1.3.3"
 uiToolingPreviewAndroid = "1.8.3"
 runtime = "1.9.0"
+runtimeVersion = "1.10.2"
+ui = "1.10.2"
+foundation = "1.10.2"
+material3 = "1.4.0"
 
 [libraries]
 androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" }
@@ -84,6 +88,10 @@ androidx-runtime-android = { group = "androidx.compose.runtime", name = "runtime
 compose-shimmer = { group = "com.valentinilk.shimmer", name = "compose-shimmer", version.ref = "shimmer" }
 androidx-ui-tooling-preview-android = { group = "androidx.compose.ui", name = "ui-tooling-preview-android", version.ref = "uiToolingPreviewAndroid" }
 androidx-runtime = { group = "androidx.compose.runtime", name = "runtime", version.ref = "runtime" }
+androidx-compose-runtime = { group = "androidx.compose.runtime", name = "runtime", version.ref = "runtimeVersion" }
+androidx-compose-ui = { group = "androidx.compose.ui", name = "ui", version.ref = "ui" }
+androidx-compose-foundation = { group = "androidx.compose.foundation", name = "foundation", version.ref = "foundation" }
+androidx-compose-material3 = { group = "androidx.compose.material3", name = "material3", version.ref = "material3" }
 
 [plugins]
 kotlin-parcelize = { id = "org.jetbrains.kotlin.plugin.parcelize", version.ref = "kotlin" }

From e1c82b2d6319cf5bdb4d6a728db6f469f1d51e9a Mon Sep 17 00:00:00 2001
From: 2olka <brayanevoni@gmail.com>
Date: Thu, 5 Feb 2026 19:25:45 +0500
Subject: [PATCH 03/31] =?UTF-8?q?ANDR-75:=20=D0=94=D0=BE=D0=B1=D0=B0=D0=B2?=
 =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=20=D1=82=D0=B0=D0=B9=D0=BC=D0=B5?=
 =?UTF-8?q?=D1=80=D0=B0=20=D0=BD=D0=B0=20=D0=BC=D0=BE=D0=B4=D0=B0=D0=BB?=
 =?UTF-8?q?=D1=8C=D0=BD=D0=BE=D0=B5=20=D0=BE=D0=BA=D0=BD=D0=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../yeahub/impl/ForgotPasswordModalWindow.kt  | 182 ++++++++++++++++++
 1 file changed, 182 insertions(+)
 create mode 100644 feature/forgot-password/impl/src/main/java/ru/yeahub/impl/ForgotPasswordModalWindow.kt

diff --git a/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/ForgotPasswordModalWindow.kt b/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/ForgotPasswordModalWindow.kt
new file mode 100644
index 00000000..b62fc81d
--- /dev/null
+++ b/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/ForgotPasswordModalWindow.kt
@@ -0,0 +1,182 @@
+@file:OptIn(ExperimentalMaterial3Api::class)
+
+package ru.yeahub.impl
+
+import androidx.compose.foundation.BorderStroke
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.window.Dialog
+import kotlinx.coroutines.delay
+import ru.yeahub.core_ui.example.staticPreview.StaticPreview
+import ru.yeahub.core_ui.theme.Theme
+
+
+@Composable
+fun InstructionsSentDialog(
+    onDismiss: () -> Unit,
+    onResend: () -> Unit,
+    modifier: Modifier = Modifier,
+) {
+    Dialog(onDismissRequest = onDismiss) {
+        InstructionsSentDialogContent(
+            onDismiss = onDismiss,
+            onResend = onResend,
+            modifier = modifier
+        )
+    }
+}
+
+@Composable
+private fun InstructionsSentDialogContent(
+    onDismiss: () -> Unit,
+    onResend: () -> Unit,
+    modifier: Modifier = Modifier,
+) {
+    val color = Theme.colors.purple700
+    val shape = RoundedCornerShape(16.dp)
+
+    var secondsLeft by remember { mutableStateOf(60) }
+
+    LaunchedEffect(Unit) {
+        while (secondsLeft > 0) {
+            delay(1_000)
+            secondsLeft--
+        }
+    }
+    Surface(
+        modifier = modifier
+            .fillMaxWidth()
+            .padding(horizontal = 24.dp),
+        shape = shape,
+        color = Color.White,
+        tonalElevation = 0.dp,
+        shadowElevation = 0.dp,
+        border = BorderStroke(1.dp, color),
+    ) {
+        Box(
+            modifier = Modifier
+                .clip(shape)
+                .padding(14.dp),
+            contentAlignment = Alignment.TopEnd
+        ) {
+            // Close button
+            IconButton(
+                onClick = onDismiss,
+                modifier = Modifier
+                    .size(32.dp)
+            ) {
+                Image(
+                    painter = painterResource(id = ru.yeahub.impl.R.drawable.close),
+                    contentDescription = "Close",
+                    modifier = Modifier.size(24.dp)
+                )
+            }
+
+            Column(
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .padding(top = 4.dp),
+                horizontalAlignment = Alignment.CenterHorizontally
+            ) {
+                Spacer(Modifier.height(8.dp))
+
+                Box(
+                    contentAlignment = Alignment.Center
+                ) {
+                    Image(
+                        painter = painterResource(id = ru.yeahub.impl.R.drawable.letter),
+                        contentDescription = "Letter",
+                        modifier = Modifier.size(112.dp)
+                    )
+                }
+
+                Spacer(Modifier.height(4.dp))
+
+                Text(
+                    text = "Мы отправили письмо\nс инструкциями",
+                    style = MaterialTheme.typography.titleLarge,
+                    color = Color(0xFF2B2B2B),
+                    textAlign = TextAlign.Center
+                )
+
+                Spacer(Modifier.height(10.dp))
+
+                Text(
+                    text = "Если вы не получили письмо\nс инструкциями, проверьте, пожалуйста," +
+                            "\nпапку «Спам» или попробуйте отправить\nзапрос еще раз",
+                    style = MaterialTheme.typography.bodyMedium,
+                    color = Color(0xFF2B2B2B),
+                    textAlign = TextAlign.Center,
+                    lineHeight = MaterialTheme.typography.bodyMedium.lineHeight
+                )
+
+                Spacer(Modifier.height(14.dp))
+
+                if (secondsLeft > 0) {
+                    Text(
+                        text = "Отправить повторно через $secondsLeft c",
+                        color = Color(0xFF9CA3AF),
+                        style = MaterialTheme.typography.bodyMedium
+                    )
+                } else {
+                    Text(
+                        text = "Отправить повторно",
+                        color = color,
+                        style = MaterialTheme.typography.titleSmall,
+                        modifier = Modifier
+                            .clip(RoundedCornerShape(10.dp))
+                            .clickable(onClick = onResend)
+                            .padding(horizontal = 12.dp, vertical = 10.dp)
+                    )
+                }
+
+                Spacer(Modifier.height(8.dp))
+
+                Text(
+                    text = "Хорошо",
+                    color = color,
+                    style = MaterialTheme.typography.titleSmall,
+                    modifier = Modifier
+                        .clip(RoundedCornerShape(10.dp))
+                        .clickable(onClick = onDismiss)
+                        .padding(horizontal = 12.dp, vertical = 8.dp)
+                )
+            }
+        }
+    }
+}
+
+@StaticPreview
+@Composable
+fun InstructionsSentDialogPreview() {
+    InstructionsSentDialogContent(
+        onDismiss = {},
+        onResend = {}
+    )
+}

From 2993e685d55ac605e7290d87f152f2738aab360e Mon Sep 17 00:00:00 2001
From: 2olka <brayanevoni@gmail.com>
Date: Fri, 6 Feb 2026 17:49:15 +0500
Subject: [PATCH 04/31] =?UTF-8?q?ANDR-75:=20=D0=92=D0=B5=D1=80=D1=81=D1=82?=
 =?UTF-8?q?=D0=BA=D0=B0=20=D1=8D=D0=BA=D1=80=D0=B0=D0=BD=D0=B0=20=D0=B7?=
 =?UTF-8?q?=D0=B0=D0=B1=D1=8B=D0=BB=D0=B8=20=D0=BF=D0=B0=D1=80=D0=BE=D0=BB?=
 =?UTF-8?q?=D1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ForgotPasswordModalWindow.kt              |   7 +-
 .../impl/presentation/ForgotPasswordScreen.kt | 108 ++++++++++++++++++
 2 files changed, 112 insertions(+), 3 deletions(-)
 rename feature/forgot-password/impl/src/main/java/ru/yeahub/impl/{ => presentation}/ForgotPasswordModalWindow.kt (96%)
 create mode 100644 feature/forgot-password/impl/src/main/java/ru/yeahub/impl/presentation/ForgotPasswordScreen.kt

diff --git a/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/ForgotPasswordModalWindow.kt b/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/presentation/ForgotPasswordModalWindow.kt
similarity index 96%
rename from feature/forgot-password/impl/src/main/java/ru/yeahub/impl/ForgotPasswordModalWindow.kt
rename to feature/forgot-password/impl/src/main/java/ru/yeahub/impl/presentation/ForgotPasswordModalWindow.kt
index b62fc81d..ccf2ce08 100644
--- a/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/ForgotPasswordModalWindow.kt
+++ b/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/presentation/ForgotPasswordModalWindow.kt
@@ -1,6 +1,6 @@
 @file:OptIn(ExperimentalMaterial3Api::class)
 
-package ru.yeahub.impl
+package ru.yeahub.impl.presentation
 
 import androidx.compose.foundation.BorderStroke
 import androidx.compose.foundation.Image
@@ -35,6 +35,7 @@ import androidx.compose.ui.window.Dialog
 import kotlinx.coroutines.delay
 import ru.yeahub.core_ui.example.staticPreview.StaticPreview
 import ru.yeahub.core_ui.theme.Theme
+import ru.yeahub.impl.R
 
 
 @Composable
@@ -92,7 +93,7 @@ private fun InstructionsSentDialogContent(
                     .size(32.dp)
             ) {
                 Image(
-                    painter = painterResource(id = ru.yeahub.impl.R.drawable.close),
+                    painter = painterResource(id = R.drawable.close),
                     contentDescription = "Close",
                     modifier = Modifier.size(24.dp)
                 )
@@ -110,7 +111,7 @@ private fun InstructionsSentDialogContent(
                     contentAlignment = Alignment.Center
                 ) {
                     Image(
-                        painter = painterResource(id = ru.yeahub.impl.R.drawable.letter),
+                        painter = painterResource(id = R.drawable.letter),
                         contentDescription = "Letter",
                         modifier = Modifier.size(112.dp)
                     )
diff --git a/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/presentation/ForgotPasswordScreen.kt b/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/presentation/ForgotPasswordScreen.kt
new file mode 100644
index 00000000..09674525
--- /dev/null
+++ b/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/presentation/ForgotPasswordScreen.kt
@@ -0,0 +1,108 @@
+@file:OptIn(ExperimentalMaterial3Api::class)
+
+package ru.yeahub.impl.presentation
+
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.text.KeyboardOptions
+import androidx.compose.material3.Button
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.material3.TextField
+import androidx.compose.material3.TextFieldDefaults
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.text.input.KeyboardType
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+
+@Composable
+fun ForgotPasswordScreen(
+    modifier: Modifier = Modifier,
+    onSendClick: (String) -> Unit = {}
+) {
+    var email by remember { mutableStateOf("") }
+
+    // Можно заменить на свою валидацию
+    val isEmailValid = email.contains("@") && email.contains(".")
+
+    Column(
+        modifier = modifier
+            .fillMaxSize()
+            .padding(horizontal = 24.dp)
+            .padding(top = 32.dp)
+    ) {
+        Text(
+            text = "Забыли пароль?",
+            style = MaterialTheme.typography.headlineSmall
+        )
+
+        Spacer(Modifier.height(10.dp))
+
+        Text(
+            text = "Для восстановления пароля введите адрес\nэл.почты, на который вы" +
+                    " регистрировались.\nМы отправим письмо для восстановления пароля",
+            style = MaterialTheme.typography.bodyMedium,
+            color = MaterialTheme.colorScheme.onSurfaceVariant
+        )
+
+        Spacer(Modifier.height(48.dp))
+
+        Text(
+            text = "Электронная почта",
+            style = MaterialTheme.typography.bodyMedium
+        )
+
+        Spacer(Modifier.height(10.dp))
+
+        TextField(
+            value = email,
+            onValueChange = { email = it },
+            placeholder = { Text(text = "Введите электронную почту")},
+            singleLine = true,
+            keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Email),
+            modifier = Modifier
+                .fillMaxWidth()
+                .height(58.dp),
+            shape = MaterialTheme.shapes.medium,
+            colors = TextFieldDefaults.colors(
+                focusedContainerColor = MaterialTheme.colorScheme.surfaceVariant,
+                unfocusedContainerColor = MaterialTheme.colorScheme.surfaceVariant,
+                disabledContainerColor = MaterialTheme.colorScheme.surfaceVariant,
+                focusedIndicatorColor = MaterialTheme.colorScheme.surfaceVariant,
+                unfocusedIndicatorColor = MaterialTheme.colorScheme.surfaceVariant,
+                disabledIndicatorColor = MaterialTheme.colorScheme.surfaceVariant
+            )
+        )
+
+        Spacer(Modifier.height(20.dp))
+
+        Button(
+            onClick = { onSendClick(email) },
+            enabled = isEmailValid,
+            modifier = Modifier
+                .fillMaxWidth()
+                .height(48.dp),
+            shape = MaterialTheme.shapes.medium
+        ) {
+            Text("Отправить")
+        }
+    }
+}
+
+@Preview(showBackground = true)
+@Composable
+private fun ForgotPasswordScreenPreview() {
+    MaterialTheme {
+        ForgotPasswordScreen()
+    }
+}

From 9f2a6b5e55d5df96e1c2636f7426909776db35e7 Mon Sep 17 00:00:00 2001
From: 2olka <brayanevoni@gmail.com>
Date: Thu, 12 Feb 2026 11:32:50 +0500
Subject: [PATCH 05/31] =?UTF-8?q?ANDR-75:=20=D0=92=D1=8B=D0=BD=D0=BE=D1=81?=
 =?UTF-8?q?=20=D1=82=D0=B5=D0=BA=D1=81=D1=82=D0=B0=20=D0=B2=20=D1=81=D1=82?=
 =?UTF-8?q?=D0=BE=D1=80=D0=BE=D0=BA=D0=BE=D0=B2=D1=8B=D0=B5=20=D1=80=D0=B5?=
 =?UTF-8?q?=D1=81=D1=83=D1=80=D1=81=D1=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/compiler.xml                            |  5 ++++-
 .../impl/presentation/ForgotPasswordScreen.kt | 19 +++++++++----------
 .../ForgotPasswordModalWindow.kt              | 18 +++++++++---------
 .../impl/src/main/res/values/strings.xml      | 15 +++++++++++++++
 4 files changed, 37 insertions(+), 20 deletions(-)
 rename feature/forgot-password/impl/src/main/java/ru/yeahub/impl/{presentation => ui}/ForgotPasswordModalWindow.kt (88%)
 create mode 100644 feature/forgot-password/impl/src/main/res/values/strings.xml

diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 48a4d6d7..49e77a04 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -2,7 +2,10 @@
 <project version="4">
   <component name="CompilerConfiguration">
     <bytecodeTargetLevel target="11">
-      <module name="YeaHub.feature.enter-and-registration.mylibrary" target="21" />
+      <module name="YeaHub.feature.authentication.api" target="21" />
+      <module name="YeaHub.feature.authentication.impl" target="21" />
+      <module name="YeaHub.feature.profile-edit.api" target="21" />
+      <module name="YeaHub.feature.profile-edit.impl" target="21" />
     </bytecodeTargetLevel>
   </component>
 </project>
\ No newline at end of file
diff --git a/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/presentation/ForgotPasswordScreen.kt b/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/presentation/ForgotPasswordScreen.kt
index 09674525..38054ed2 100644
--- a/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/presentation/ForgotPasswordScreen.kt
+++ b/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/presentation/ForgotPasswordScreen.kt
@@ -9,7 +9,6 @@ import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.text.KeyboardOptions
-import androidx.compose.material3.Button
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
@@ -21,9 +20,12 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.input.KeyboardType
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
+import ru.yeahub.core_ui.component.PrimaryButton
+import ru.yeahub.impl.R
 
 @Composable
 fun ForgotPasswordScreen(
@@ -32,7 +34,6 @@ fun ForgotPasswordScreen(
 ) {
     var email by remember { mutableStateOf("") }
 
-    // Можно заменить на свою валидацию
     val isEmailValid = email.contains("@") && email.contains(".")
 
     Column(
@@ -42,15 +43,14 @@ fun ForgotPasswordScreen(
             .padding(top = 32.dp)
     ) {
         Text(
-            text = "Забыли пароль?",
+            text = stringResource(R.string.title_forgot_password),
             style = MaterialTheme.typography.headlineSmall
         )
 
         Spacer(Modifier.height(10.dp))
 
         Text(
-            text = "Для восстановления пароля введите адрес\nэл.почты, на который вы" +
-                    " регистрировались.\nМы отправим письмо для восстановления пароля",
+            text = stringResource(R.string.enter_email_instruction),
             style = MaterialTheme.typography.bodyMedium,
             color = MaterialTheme.colorScheme.onSurfaceVariant
         )
@@ -58,7 +58,7 @@ fun ForgotPasswordScreen(
         Spacer(Modifier.height(48.dp))
 
         Text(
-            text = "Электронная почта",
+            text = stringResource(R.string.email),
             style = MaterialTheme.typography.bodyMedium
         )
 
@@ -67,7 +67,7 @@ fun ForgotPasswordScreen(
         TextField(
             value = email,
             onValueChange = { email = it },
-            placeholder = { Text(text = "Введите электронную почту")},
+            placeholder = { Text(text = stringResource(R.string.enter_email))},
             singleLine = true,
             keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Email),
             modifier = Modifier
@@ -86,15 +86,14 @@ fun ForgotPasswordScreen(
 
         Spacer(Modifier.height(20.dp))
 
-        Button(
+        PrimaryButton(
             onClick = { onSendClick(email) },
             enabled = isEmailValid,
             modifier = Modifier
                 .fillMaxWidth()
                 .height(48.dp),
-            shape = MaterialTheme.shapes.medium
         ) {
-            Text("Отправить")
+            Text(stringResource(R.string.send_button))
         }
     }
 }
diff --git a/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/presentation/ForgotPasswordModalWindow.kt b/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/ui/ForgotPasswordModalWindow.kt
similarity index 88%
rename from feature/forgot-password/impl/src/main/java/ru/yeahub/impl/presentation/ForgotPasswordModalWindow.kt
rename to feature/forgot-password/impl/src/main/java/ru/yeahub/impl/ui/ForgotPasswordModalWindow.kt
index ccf2ce08..246ed813 100644
--- a/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/presentation/ForgotPasswordModalWindow.kt
+++ b/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/ui/ForgotPasswordModalWindow.kt
@@ -1,6 +1,6 @@
 @file:OptIn(ExperimentalMaterial3Api::class)
 
-package ru.yeahub.impl.presentation
+package ru.yeahub.impl.ui
 
 import androidx.compose.foundation.BorderStroke
 import androidx.compose.foundation.Image
@@ -29,6 +29,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.window.Dialog
@@ -94,7 +95,7 @@ private fun InstructionsSentDialogContent(
             ) {
                 Image(
                     painter = painterResource(id = R.drawable.close),
-                    contentDescription = "Close",
+                    contentDescription = stringResource(R.string.close),
                     modifier = Modifier.size(24.dp)
                 )
             }
@@ -112,7 +113,7 @@ private fun InstructionsSentDialogContent(
                 ) {
                     Image(
                         painter = painterResource(id = R.drawable.letter),
-                        contentDescription = "Letter",
+                        contentDescription = stringResource(R.string.letter),
                         modifier = Modifier.size(112.dp)
                     )
                 }
@@ -120,7 +121,7 @@ private fun InstructionsSentDialogContent(
                 Spacer(Modifier.height(4.dp))
 
                 Text(
-                    text = "Мы отправили письмо\nс инструкциями",
+                    text = stringResource(R.string.instructions_letter),
                     style = MaterialTheme.typography.titleLarge,
                     color = Color(0xFF2B2B2B),
                     textAlign = TextAlign.Center
@@ -129,8 +130,7 @@ private fun InstructionsSentDialogContent(
                 Spacer(Modifier.height(10.dp))
 
                 Text(
-                    text = "Если вы не получили письмо\nс инструкциями, проверьте, пожалуйста," +
-                            "\nпапку «Спам» или попробуйте отправить\nзапрос еще раз",
+                    text = stringResource(R.string.instruction),
                     style = MaterialTheme.typography.bodyMedium,
                     color = Color(0xFF2B2B2B),
                     textAlign = TextAlign.Center,
@@ -141,13 +141,13 @@ private fun InstructionsSentDialogContent(
 
                 if (secondsLeft > 0) {
                     Text(
-                        text = "Отправить повторно через $secondsLeft c",
+                        text = stringResource(R.string.resend, secondsLeft),
                         color = Color(0xFF9CA3AF),
                         style = MaterialTheme.typography.bodyMedium
                     )
                 } else {
                     Text(
-                        text = "Отправить повторно",
+                        text = stringResource(R.string.resend_button),
                         color = color,
                         style = MaterialTheme.typography.titleSmall,
                         modifier = Modifier
@@ -160,7 +160,7 @@ private fun InstructionsSentDialogContent(
                 Spacer(Modifier.height(8.dp))
 
                 Text(
-                    text = "Хорошо",
+                    text = stringResource(R.string.ok),
                     color = color,
                     style = MaterialTheme.typography.titleSmall,
                     modifier = Modifier
diff --git a/feature/forgot-password/impl/src/main/res/values/strings.xml b/feature/forgot-password/impl/src/main/res/values/strings.xml
new file mode 100644
index 00000000..202a190e
--- /dev/null
+++ b/feature/forgot-password/impl/src/main/res/values/strings.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="close">Close</string>
+    <string name="letter">Letter</string>
+    <string name="instructions_letter">Мы отправили письмо\nс инструкциями</string>
+    <string name="instruction">Если вы не получили письмо\nс инструкциями, проверьте, пожалуйста,\nпапку «Спам» или попробуйте отправить\nзапрос еще раз</string>
+    <string name="resend">Отправить повторно через %1$d c</string>
+    <string name="resend_button">Отправить повторно</string>
+    <string name="ok">Хорошо</string>
+    <string name="title_forgot_password">Забыли пароль?</string>
+    <string name="enter_email_instruction">Для восстановления пароля введите адрес\nэл.почты, на который вы регистрировались.\nМы отправим письмо для восстановления пароля</string>
+    <string name="email">Электронная почта</string>
+    <string name="enter_email">Введите электронную почту</string>
+    <string name="send_button">Отправить</string>
+</resources>
\ No newline at end of file

From 0eaaa8f850e4553292866a806fb10e3bc23fc626 Mon Sep 17 00:00:00 2001
From: 2olka <brayanevoni@gmail.com>
Date: Thu, 12 Feb 2026 13:54:58 +0500
Subject: [PATCH 06/31] ANDR-75: presentation and finished ui

---
 .../impl/domain/SendResetLinkUseCase.kt       | 11 +++
 .../impl/presentation/ForgotPasswordEffect.kt |  7 ++
 .../impl/presentation/ForgotPasswordIntent.kt |  7 ++
 .../impl/presentation/ForgotPasswordState.kt  |  9 +++
 .../presentation/ForgotPasswordViewModel.kt   | 71 +++++++++++++++++++
 .../ForgotPasswordScreen.kt                   | 21 ++++--
 6 files changed, 119 insertions(+), 7 deletions(-)
 create mode 100644 feature/forgot-password/impl/src/main/java/ru/yeahub/impl/domain/SendResetLinkUseCase.kt
 create mode 100644 feature/forgot-password/impl/src/main/java/ru/yeahub/impl/presentation/ForgotPasswordEffect.kt
 create mode 100644 feature/forgot-password/impl/src/main/java/ru/yeahub/impl/presentation/ForgotPasswordIntent.kt
 create mode 100644 feature/forgot-password/impl/src/main/java/ru/yeahub/impl/presentation/ForgotPasswordState.kt
 create mode 100644 feature/forgot-password/impl/src/main/java/ru/yeahub/impl/presentation/ForgotPasswordViewModel.kt
 rename feature/forgot-password/impl/src/main/java/ru/yeahub/impl/{presentation => ui}/ForgotPasswordScreen.kt (86%)

diff --git a/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/domain/SendResetLinkUseCase.kt b/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/domain/SendResetLinkUseCase.kt
new file mode 100644
index 00000000..b97cfa57
--- /dev/null
+++ b/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/domain/SendResetLinkUseCase.kt
@@ -0,0 +1,11 @@
+package ru.yeahub.impl.domain
+
+class SendResetLinkUseCase (
+    private val repository: ForgotPasswordRepository
+    ) {
+        suspend operator fun invoke(email: String): ForgotPasswordResult {
+            if (email.isBlank()) return ForgotPasswordResult.Error("Введите email")
+            if (!email.contains("@")) return ForgotPasswordResult.Error("Некорректный email")
+            return repository.sendResetLink(email.trim())
+        }
+}
\ No newline at end of file
diff --git a/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/presentation/ForgotPasswordEffect.kt b/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/presentation/ForgotPasswordEffect.kt
new file mode 100644
index 00000000..d7003d57
--- /dev/null
+++ b/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/presentation/ForgotPasswordEffect.kt
@@ -0,0 +1,7 @@
+package ru.yeahub.impl.presentation
+
+sealed interface ForgotPasswordEffect {
+    data class ShowSnackbar(val message: String) : ForgotPasswordEffect
+    data object NavigateBack : ForgotPasswordEffect
+    data object NavigateToCheckEmail : ForgotPasswordEffect
+}
\ No newline at end of file
diff --git a/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/presentation/ForgotPasswordIntent.kt b/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/presentation/ForgotPasswordIntent.kt
new file mode 100644
index 00000000..92303708
--- /dev/null
+++ b/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/presentation/ForgotPasswordIntent.kt
@@ -0,0 +1,7 @@
+package ru.yeahub.impl.presentation
+
+    sealed interface ForgotPasswordIntent {
+        data class EmailChanged(val value: String) : ForgotPasswordIntent
+        data object SubmitClicked : ForgotPasswordIntent
+        data object BackClicked : ForgotPasswordIntent
+    }
diff --git a/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/presentation/ForgotPasswordState.kt b/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/presentation/ForgotPasswordState.kt
new file mode 100644
index 00000000..34835851
--- /dev/null
+++ b/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/presentation/ForgotPasswordState.kt
@@ -0,0 +1,9 @@
+package ru.yeahub.impl.presentation
+
+data class ForgotPasswordState(
+    val email: String = "",
+    val isLoading: Boolean = false,
+    val isEmailError: Boolean = false,
+    val emailErrorText: String? = null,
+    val isSent: Boolean = false
+)
\ No newline at end of file
diff --git a/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/presentation/ForgotPasswordViewModel.kt b/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/presentation/ForgotPasswordViewModel.kt
new file mode 100644
index 00000000..7d96932e
--- /dev/null
+++ b/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/presentation/ForgotPasswordViewModel.kt
@@ -0,0 +1,71 @@
+package ru.yeahub.impl.presentation
+
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import kotlinx.coroutines.channels.Channel
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.receiveAsFlow
+import kotlinx.coroutines.flow.update
+import kotlinx.coroutines.launch
+import ru.yeahub.impl.domain.ForgotPasswordResult
+import ru.yeahub.impl.domain.SendResetLinkUseCase
+
+class ForgotPasswordViewModel (
+    private val sendResetLink: SendResetLinkUseCase
+    ) : ViewModel() {
+
+        private val _state = MutableStateFlow(ForgotPasswordState())
+        val state: StateFlow<ForgotPasswordState> = _state.asStateFlow()
+
+        private val _effect = Channel<ForgotPasswordEffect>(Channel.BUFFERED)
+        val effect = _effect.receiveAsFlow()
+
+        fun onIntent(intent: ForgotPasswordIntent) {
+            when (intent) {
+                is ForgotPasswordIntent.EmailChanged -> onEmailChanged(intent.value)
+                is ForgotPasswordIntent.SubmitClicked -> onSubmit()
+                is ForgotPasswordIntent.BackClicked -> emitEffect(ForgotPasswordEffect.NavigateBack)
+            }
+        }
+
+        private fun onEmailChanged(value: String) {
+            _state.update {
+                it.copy(
+                    email = value,
+                    isEmailError = false,
+                    emailErrorText = null,
+                    isSent = false
+                )
+            }
+        }
+
+        private fun onSubmit() {
+            val email = state.value.email
+            _state.update { it.copy(isLoading = true) }
+
+            viewModelScope.launch {
+                when (val result = sendResetLink(email)) {
+                    is ForgotPasswordResult.Success -> {
+                        _state.update { it.copy(isLoading = false, isSent = true) }
+                        emitEffect(ForgotPasswordEffect.NavigateToCheckEmail)
+                    }
+                    is ForgotPasswordResult.Error -> {
+                        _state.update {
+                            it.copy(
+                                isLoading = false,
+                                isEmailError = true,
+                                emailErrorText = result.message
+                            )
+                        }
+                        emitEffect(ForgotPasswordEffect.ShowSnackbar(result.message))
+                    }
+                }
+            }
+        }
+
+        private fun emitEffect(effect: ForgotPasswordEffect) {
+            viewModelScope.launch { _effect.send(effect) }
+        }
+}
\ No newline at end of file
diff --git a/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/presentation/ForgotPasswordScreen.kt b/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/ui/ForgotPasswordScreen.kt
similarity index 86%
rename from feature/forgot-password/impl/src/main/java/ru/yeahub/impl/presentation/ForgotPasswordScreen.kt
rename to feature/forgot-password/impl/src/main/java/ru/yeahub/impl/ui/ForgotPasswordScreen.kt
index 38054ed2..4ef1bbd4 100644
--- a/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/presentation/ForgotPasswordScreen.kt
+++ b/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/ui/ForgotPasswordScreen.kt
@@ -1,6 +1,6 @@
 @file:OptIn(ExperimentalMaterial3Api::class)
 
-package ru.yeahub.impl.presentation
+package ru.yeahub.impl.ui
 
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Spacer
@@ -26,11 +26,14 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import ru.yeahub.core_ui.component.PrimaryButton
 import ru.yeahub.impl.R
+import ru.yeahub.impl.presentation.ForgotPasswordIntent
+import ru.yeahub.impl.presentation.ForgotPasswordState
 
 @Composable
 fun ForgotPasswordScreen(
     modifier: Modifier = Modifier,
-    onSendClick: (String) -> Unit = {}
+    state: ForgotPasswordState,
+    onIntent: (ForgotPasswordIntent) -> Unit
 ) {
     var email by remember { mutableStateOf("") }
 
@@ -63,7 +66,7 @@ fun ForgotPasswordScreen(
         )
 
         Spacer(Modifier.height(10.dp))
-
+        //DefaultTextField TextInput
         TextField(
             value = email,
             onValueChange = { email = it },
@@ -86,8 +89,10 @@ fun ForgotPasswordScreen(
 
         Spacer(Modifier.height(20.dp))
 
+        // DisabledSecondaryButton
+        // EnabledPrimaryButton
         PrimaryButton(
-            onClick = { onSendClick(email) },
+            onClick = { onIntent(ForgotPasswordIntent.SubmitClicked) },
             enabled = isEmailValid,
             modifier = Modifier
                 .fillMaxWidth()
@@ -101,7 +106,9 @@ fun ForgotPasswordScreen(
 @Preview(showBackground = true)
 @Composable
 private fun ForgotPasswordScreenPreview() {
-    MaterialTheme {
-        ForgotPasswordScreen()
-    }
+        ForgotPasswordScreen(
+            state = ForgotPasswordState(),
+            modifier = TODO(),
+            onIntent = TODO(),
+        )
 }

From 0dfef8567bd5b37618e912b395f1f50ffe18c103 Mon Sep 17 00:00:00 2001
From: 2olka <brayanevoni@gmail.com>
Date: Thu, 12 Feb 2026 13:56:11 +0500
Subject: [PATCH 07/31] ANDR-75: domain

---
 .../java/ru/yeahub/impl/domain/ForgotPasswordRepository.kt  | 5 +++++
 .../main/java/ru/yeahub/impl/domain/ForgotPasswordResult.kt | 6 ++++++
 2 files changed, 11 insertions(+)
 create mode 100644 feature/forgot-password/impl/src/main/java/ru/yeahub/impl/domain/ForgotPasswordRepository.kt
 create mode 100644 feature/forgot-password/impl/src/main/java/ru/yeahub/impl/domain/ForgotPasswordResult.kt

diff --git a/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/domain/ForgotPasswordRepository.kt b/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/domain/ForgotPasswordRepository.kt
new file mode 100644
index 00000000..d46b17ae
--- /dev/null
+++ b/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/domain/ForgotPasswordRepository.kt
@@ -0,0 +1,5 @@
+package ru.yeahub.impl.domain
+
+interface ForgotPasswordRepository {
+    suspend fun sendResetLink(email: String): ForgotPasswordResult
+}
\ No newline at end of file
diff --git a/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/domain/ForgotPasswordResult.kt b/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/domain/ForgotPasswordResult.kt
new file mode 100644
index 00000000..4220d03e
--- /dev/null
+++ b/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/domain/ForgotPasswordResult.kt
@@ -0,0 +1,6 @@
+package ru.yeahub.impl.domain
+
+sealed interface ForgotPasswordResult {
+    data object Success : ForgotPasswordResult
+    data class Error(val message: String) : ForgotPasswordResult
+}
\ No newline at end of file

From 31e64a06128e316693e80734571fe3a50c3d4862 Mon Sep 17 00:00:00 2001
From: 2olka <brayanevoni@gmail.com>
Date: Thu, 12 Feb 2026 13:56:42 +0500
Subject: [PATCH 08/31] ANDR-75: data

---
 .../impl/data/dto/ForgotPasswordRequestDto.kt |  5 +++++
 .../data/dto/ForgotPasswordResponseDto.kt     |  6 ++++++
 .../impl/data/mapper/ForgotPasswordMapper.kt  | 11 ++++++++++
 .../ru/yeahub/impl/data/remote/AuthApi.kt     |  8 ++++++++
 .../ForgotPasswordRepositoryImpl.kt           | 20 +++++++++++++++++++
 5 files changed, 50 insertions(+)
 create mode 100644 feature/forgot-password/impl/src/main/java/ru/yeahub/impl/data/dto/ForgotPasswordRequestDto.kt
 create mode 100644 feature/forgot-password/impl/src/main/java/ru/yeahub/impl/data/dto/ForgotPasswordResponseDto.kt
 create mode 100644 feature/forgot-password/impl/src/main/java/ru/yeahub/impl/data/mapper/ForgotPasswordMapper.kt
 create mode 100644 feature/forgot-password/impl/src/main/java/ru/yeahub/impl/data/remote/AuthApi.kt
 create mode 100644 feature/forgot-password/impl/src/main/java/ru/yeahub/impl/data/repository/ForgotPasswordRepositoryImpl.kt

diff --git a/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/data/dto/ForgotPasswordRequestDto.kt b/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/data/dto/ForgotPasswordRequestDto.kt
new file mode 100644
index 00000000..0517819a
--- /dev/null
+++ b/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/data/dto/ForgotPasswordRequestDto.kt
@@ -0,0 +1,5 @@
+package ru.yeahub.impl.data.dto
+
+data class ForgotPasswordRequestDto(
+    val email: String
+)
\ No newline at end of file
diff --git a/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/data/dto/ForgotPasswordResponseDto.kt b/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/data/dto/ForgotPasswordResponseDto.kt
new file mode 100644
index 00000000..a8dfb1c7
--- /dev/null
+++ b/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/data/dto/ForgotPasswordResponseDto.kt
@@ -0,0 +1,6 @@
+package ru.yeahub.impl.data.dto
+
+data class ForgotPasswordResponseDto(
+    val ok: Boolean,
+    val message: String? = null
+)
\ No newline at end of file
diff --git a/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/data/mapper/ForgotPasswordMapper.kt b/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/data/mapper/ForgotPasswordMapper.kt
new file mode 100644
index 00000000..1f535007
--- /dev/null
+++ b/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/data/mapper/ForgotPasswordMapper.kt
@@ -0,0 +1,11 @@
+package ru.yeahub.impl.data.mapper
+
+import ru.yeahub.impl.data.dto.ForgotPasswordResponseDto
+import ru.yeahub.impl.domain.ForgotPasswordResult
+
+class ForgotPasswordMapper {
+    fun ForgotPasswordResponseDto.toDomain(): ForgotPasswordResult {
+        return if (ok) ForgotPasswordResult.Success
+        else ForgotPasswordResult.Error(message ?: "Не удалось отправить письмо")
+    }
+}
\ No newline at end of file
diff --git a/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/data/remote/AuthApi.kt b/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/data/remote/AuthApi.kt
new file mode 100644
index 00000000..b673889e
--- /dev/null
+++ b/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/data/remote/AuthApi.kt
@@ -0,0 +1,8 @@
+package ru.yeahub.impl.data.remote
+
+import ru.yeahub.impl.data.dto.ForgotPasswordRequestDto
+import ru.yeahub.impl.data.dto.ForgotPasswordResponseDto
+
+interface AuthApi {
+    suspend fun forgotPassword(request: ForgotPasswordRequestDto): ForgotPasswordResponseDto
+}
\ No newline at end of file
diff --git a/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/data/repository/ForgotPasswordRepositoryImpl.kt b/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/data/repository/ForgotPasswordRepositoryImpl.kt
new file mode 100644
index 00000000..2ed00f30
--- /dev/null
+++ b/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/data/repository/ForgotPasswordRepositoryImpl.kt
@@ -0,0 +1,20 @@
+package ru.yeahub.impl.data.repository
+
+import ru.yeahub.impl.data.dto.ForgotPasswordRequestDto
+import ru.yeahub.impl.data.remote.AuthApi
+import ru.yeahub.impl.domain.ForgotPasswordRepository
+import ru.yeahub.impl.domain.ForgotPasswordResult
+
+class ForgotPasswordRepositoryImpl(
+    private val api: AuthApi
+) : ForgotPasswordRepository {
+    override suspend fun sendResetLink(email: String): ForgotPasswordResult {
+        return try {
+            val dto = api.forgotPassword(ForgotPasswordRequestDto(email))
+            dto.toDomain()
+        } catch (t: Throwable) {
+            // Здесь можно разрулить HttpException, IOException и т.п.
+            ForgotPasswordResult.Error("Ошибка сети. Попробуйте ещё раз.")
+        }
+    }
+}
\ No newline at end of file

From 1fd0faba032cb1cf0280812e232d412fdb431580 Mon Sep 17 00:00:00 2001
From: 2olka <brayanevoni@gmail.com>
Date: Thu, 12 Feb 2026 13:57:08 +0500
Subject: [PATCH 09/31] ANDR-75: di

---
 .../ru/yeahub/impl/di/ForgotPasswordFactory.kt     | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 feature/forgot-password/impl/src/main/java/ru/yeahub/impl/di/ForgotPasswordFactory.kt

diff --git a/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/di/ForgotPasswordFactory.kt b/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/di/ForgotPasswordFactory.kt
new file mode 100644
index 00000000..81d806ae
--- /dev/null
+++ b/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/di/ForgotPasswordFactory.kt
@@ -0,0 +1,14 @@
+package ru.yeahub.impl.di
+
+import ru.yeahub.impl.data.remote.AuthApi
+import ru.yeahub.impl.data.repository.ForgotPasswordRepositoryImpl
+import ru.yeahub.impl.domain.SendResetLinkUseCase
+import ru.yeahub.impl.presentation.ForgotPasswordViewModel
+
+object ForgotPasswordFactory {
+    fun createViewModel(api: AuthApi): ForgotPasswordViewModel {
+        val repo = ForgotPasswordRepositoryImpl(api)
+        val useCase = SendResetLinkUseCase(repo)
+        return ForgotPasswordViewModel(useCase)
+    }
+}
\ No newline at end of file

From e669e467113e04e1f083c59e68e280db28bd62dd Mon Sep 17 00:00:00 2001
From: 2olka <brayanevoni@gmail.com>
Date: Thu, 12 Feb 2026 13:57:22 +0500
Subject: [PATCH 10/31] ANDR-75: ui

---
 .../ru/yeahub/impl/ui/ForgotPasswordRoute.kt  | 33 +++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 feature/forgot-password/impl/src/main/java/ru/yeahub/impl/ui/ForgotPasswordRoute.kt

diff --git a/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/ui/ForgotPasswordRoute.kt b/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/ui/ForgotPasswordRoute.kt
new file mode 100644
index 00000000..b86d6723
--- /dev/null
+++ b/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/ui/ForgotPasswordRoute.kt
@@ -0,0 +1,33 @@
+package ru.yeahub.impl.ui
+
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.getValue
+import ru.yeahub.impl.presentation.ForgotPasswordEffect
+import ru.yeahub.impl.presentation.ForgotPasswordViewModel
+
+@Composable
+fun ForgotPasswordRoute(
+    viewModel: ForgotPasswordViewModel,
+    onBack: () -> Unit,
+    onCheckEmail: () -> Unit,
+    showSnackbar: suspend (String) -> Unit
+) {
+    val state by viewModel.state.collectAsState()
+
+    LaunchedEffect(Unit) {
+        viewModel.effect.collect { effect ->
+            when (effect) {
+                is ForgotPasswordEffect.NavigateBack -> onBack()
+                is ForgotPasswordEffect.NavigateToCheckEmail -> onCheckEmail()
+                is ForgotPasswordEffect.ShowSnackbar -> showSnackbar(effect.message)
+            }
+        }
+    }
+
+    ForgotPasswordScreen(
+        state = state,
+        onIntent = viewModel::onIntent
+    )
+}
\ No newline at end of file

From 6b21161dc6872ef83255264cd6cfe4dd9408049a Mon Sep 17 00:00:00 2001
From: 2olka <brayanevoni@gmail.com>
Date: Mon, 16 Feb 2026 14:09:42 +0500
Subject: [PATCH 11/31] =?UTF-8?q?ANDR-75:=20=D0=9D=D0=B0=D1=81=D1=82=D1=80?=
 =?UTF-8?q?=D0=BE=D0=B9=D0=BA=D0=B0=20=D0=BE=D1=82=D1=81=D1=82=D1=83=D0=BF?=
 =?UTF-8?q?=D0=BE=D0=B2=20=D0=B8=20=D1=86=D0=B2=D0=B5=D1=82=D0=BE=D0=B2=20?=
 =?UTF-8?q?=D0=B4=D0=BB=D1=8F=20PixelPerfect?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ru/yeahub/core_ui/component/Button.kt     |  2 +
 .../core_ui/component/textInput/TextInput.kt  | 15 +++-
 .../data/dto/ForgotPasswordResponseDto.kt     |  2 +-
 .../impl/data/mapper/ForgotPasswordMapper.kt  |  7 +-
 .../ForgotPasswordRepositoryImpl.kt           |  6 +-
 .../yeahub/impl/di/ForgotPasswordFactory.kt   |  5 +-
 .../ru/yeahub/impl/ui/ForgotPasswordScreen.kt | 84 +++++++++----------
 .../impl/src/main/res/values/strings.xml      |  1 +
 8 files changed, 65 insertions(+), 57 deletions(-)

diff --git a/core/ui/src/main/java/ru/yeahub/core_ui/component/Button.kt b/core/ui/src/main/java/ru/yeahub/core_ui/component/Button.kt
index e3ca6cc4..402ac5a7 100644
--- a/core/ui/src/main/java/ru/yeahub/core_ui/component/Button.kt
+++ b/core/ui/src/main/java/ru/yeahub/core_ui/component/Button.kt
@@ -23,6 +23,7 @@ import androidx.compose.runtime.State
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberUpdatedState
+import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.Shape
@@ -138,6 +139,7 @@ private fun DefaultButton(
                 modifier = Modifier
                     .padding(contentPadding),
                 horizontalArrangement = Arrangement.Center,
+                verticalAlignment = Alignment.CenterVertically,
                 content = content
             )
         }
diff --git a/core/ui/src/main/java/ru/yeahub/core_ui/component/textInput/TextInput.kt b/core/ui/src/main/java/ru/yeahub/core_ui/component/textInput/TextInput.kt
index 410680b9..2c8334e7 100644
--- a/core/ui/src/main/java/ru/yeahub/core_ui/component/textInput/TextInput.kt
+++ b/core/ui/src/main/java/ru/yeahub/core_ui/component/textInput/TextInput.kt
@@ -46,9 +46,11 @@ import androidx.compose.ui.platform.LocalFocusManager
 import androidx.compose.ui.platform.LocalSoftwareKeyboardController
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.text.input.ImeAction
+import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.tooling.preview.PreviewParameterProvider
 import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
 import kotlinx.coroutines.delay
 import ru.yeahub.core_ui.example.dynamicPreview.StandardScreenSizePreview
 import ru.yeahub.core_ui.example.staticPreview.StaticPreview
@@ -174,6 +176,7 @@ fun DefaultTextField(
     isEnabled: Boolean = true,
     isError: Boolean = false,
     singleLine: Boolean = true,
+    showLeadingIcon: Boolean = true,
     shape: Shape = RoundedCornerShape(12.dp),
     interactionSource: MutableInteractionSource = remember { MutableInteractionSource() }
 ) {
@@ -203,7 +206,7 @@ fun DefaultTextField(
     OutlinedTextField(
         value = value,
         onValueChange = onValueChange,
-        label = {
+        placeholder = {
             Text(
                 text = label,
                 color = Theme.colors.black300,
@@ -215,7 +218,7 @@ fun DefaultTextField(
             .height(58.dp),
         enabled = isEnabled,
         singleLine = singleLine,
-        leadingIcon =
+        leadingIcon = if (showLeadingIcon) {
             {
                 Icon(
                     painter = painterResource(id = R.drawable.icon_search),
@@ -225,10 +228,14 @@ fun DefaultTextField(
                         .width(20.dp)
                         .height(20.dp)
                 )
-            },
+            }
+        } else null,
         isError = isError,
         shape = shape,
-        textStyle = Theme.typography.body3,
+        textStyle = Theme.typography.body3.copy(
+            textAlign = TextAlign.Center,
+            fontSize = 14.sp
+        ),
         colors = OutlinedTextFieldDefaults.colors(
             cursorColor = if (state == TextInputState.Focused) contentColor else Color.Transparent,
             unfocusedTextColor = contentColor,
diff --git a/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/data/dto/ForgotPasswordResponseDto.kt b/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/data/dto/ForgotPasswordResponseDto.kt
index a8dfb1c7..cfc5132c 100644
--- a/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/data/dto/ForgotPasswordResponseDto.kt
+++ b/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/data/dto/ForgotPasswordResponseDto.kt
@@ -2,5 +2,5 @@ package ru.yeahub.impl.data.dto
 
 data class ForgotPasswordResponseDto(
     val ok: Boolean,
-    val message: String? = null
+    val message: String
 )
\ No newline at end of file
diff --git a/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/data/mapper/ForgotPasswordMapper.kt b/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/data/mapper/ForgotPasswordMapper.kt
index 1f535007..0c9a80bb 100644
--- a/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/data/mapper/ForgotPasswordMapper.kt
+++ b/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/data/mapper/ForgotPasswordMapper.kt
@@ -3,9 +3,10 @@ package ru.yeahub.impl.data.mapper
 import ru.yeahub.impl.data.dto.ForgotPasswordResponseDto
 import ru.yeahub.impl.domain.ForgotPasswordResult
 
+
 class ForgotPasswordMapper {
-    fun ForgotPasswordResponseDto.toDomain(): ForgotPasswordResult {
-        return if (ok) ForgotPasswordResult.Success
-        else ForgotPasswordResult.Error(message ?: "Не удалось отправить письмо")
+    fun toDomain(responseDto: ForgotPasswordResponseDto): ForgotPasswordResult {
+        return if (responseDto.ok) ForgotPasswordResult.Success
+        else ForgotPasswordResult.Error(responseDto.message)
     }
 }
\ No newline at end of file
diff --git a/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/data/repository/ForgotPasswordRepositoryImpl.kt b/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/data/repository/ForgotPasswordRepositoryImpl.kt
index 2ed00f30..4016aa8a 100644
--- a/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/data/repository/ForgotPasswordRepositoryImpl.kt
+++ b/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/data/repository/ForgotPasswordRepositoryImpl.kt
@@ -1,17 +1,19 @@
 package ru.yeahub.impl.data.repository
 
 import ru.yeahub.impl.data.dto.ForgotPasswordRequestDto
+import ru.yeahub.impl.data.mapper.ForgotPasswordMapper
 import ru.yeahub.impl.data.remote.AuthApi
 import ru.yeahub.impl.domain.ForgotPasswordRepository
 import ru.yeahub.impl.domain.ForgotPasswordResult
 
 class ForgotPasswordRepositoryImpl(
-    private val api: AuthApi
+    private val api: AuthApi,
+    private val mapper: ForgotPasswordMapper
 ) : ForgotPasswordRepository {
     override suspend fun sendResetLink(email: String): ForgotPasswordResult {
         return try {
             val dto = api.forgotPassword(ForgotPasswordRequestDto(email))
-            dto.toDomain()
+            mapper.toDomain(dto)
         } catch (t: Throwable) {
             // Здесь можно разрулить HttpException, IOException и т.п.
             ForgotPasswordResult.Error("Ошибка сети. Попробуйте ещё раз.")
diff --git a/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/di/ForgotPasswordFactory.kt b/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/di/ForgotPasswordFactory.kt
index 81d806ae..992fb18d 100644
--- a/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/di/ForgotPasswordFactory.kt
+++ b/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/di/ForgotPasswordFactory.kt
@@ -1,13 +1,14 @@
 package ru.yeahub.impl.di
 
+import ru.yeahub.impl.data.mapper.ForgotPasswordMapper
 import ru.yeahub.impl.data.remote.AuthApi
 import ru.yeahub.impl.data.repository.ForgotPasswordRepositoryImpl
 import ru.yeahub.impl.domain.SendResetLinkUseCase
 import ru.yeahub.impl.presentation.ForgotPasswordViewModel
 
 object ForgotPasswordFactory {
-    fun createViewModel(api: AuthApi): ForgotPasswordViewModel {
-        val repo = ForgotPasswordRepositoryImpl(api)
+    fun createViewModel(api: AuthApi, mapper: ForgotPasswordMapper): ForgotPasswordViewModel {
+        val repo = ForgotPasswordRepositoryImpl(api, mapper)
         val useCase = SendResetLinkUseCase(repo)
         return ForgotPasswordViewModel(useCase)
     }
diff --git a/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/ui/ForgotPasswordScreen.kt b/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/ui/ForgotPasswordScreen.kt
index 4ef1bbd4..913c1e0b 100644
--- a/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/ui/ForgotPasswordScreen.kt
+++ b/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/ui/ForgotPasswordScreen.kt
@@ -8,23 +8,19 @@ import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
-import androidx.compose.material3.TextField
-import androidx.compose.material3.TextFieldDefaults
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.text.input.KeyboardType
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import ru.yeahub.core_ui.component.PrimaryButton
+import ru.yeahub.core_ui.component.YeahubButtonColors
+import ru.yeahub.core_ui.component.textInput.DefaultTextField
+import ru.yeahub.core_ui.component.textInput.TextInputColorsDefaults
+import ru.yeahub.core_ui.theme.Theme
 import ru.yeahub.impl.R
 import ru.yeahub.impl.presentation.ForgotPasswordIntent
 import ru.yeahub.impl.presentation.ForgotPasswordState
@@ -35,70 +31,69 @@ fun ForgotPasswordScreen(
     state: ForgotPasswordState,
     onIntent: (ForgotPasswordIntent) -> Unit
 ) {
-    var email by remember { mutableStateOf("") }
-
-    val isEmailValid = email.contains("@") && email.contains(".")
+    val isEmailValid = state.email.contains("@") && state.email.contains(".")
 
     Column(
         modifier = modifier
             .fillMaxSize()
-            .padding(horizontal = 24.dp)
+            .padding(horizontal = 16.dp)
             .padding(top = 32.dp)
     ) {
         Text(
             text = stringResource(R.string.title_forgot_password),
-            style = MaterialTheme.typography.headlineSmall
+            style = Theme.typography.head5
         )
 
-        Spacer(Modifier.height(10.dp))
+        Spacer(Modifier.height(6.dp))
 
         Text(
             text = stringResource(R.string.enter_email_instruction),
-            style = MaterialTheme.typography.bodyMedium,
-            color = MaterialTheme.colorScheme.onSurfaceVariant
+            style = Theme.typography.body2Accent,
+            color = Theme.colors.black500
         )
 
-        Spacer(Modifier.height(48.dp))
+        Spacer(Modifier.height(96.dp))
 
         Text(
             text = stringResource(R.string.email),
-            style = MaterialTheme.typography.bodyMedium
+            style = Theme.typography.body3Accent
         )
 
-        Spacer(Modifier.height(10.dp))
-        //DefaultTextField TextInput
-        TextField(
-            value = email,
-            onValueChange = { email = it },
-            placeholder = { Text(text = stringResource(R.string.enter_email))},
-            singleLine = true,
-            keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Email),
+        Spacer(Modifier.height(6.dp))
+        
+        DefaultTextField(
+            value = state.email,
+            onValueChange = { onIntent(ForgotPasswordIntent.EmailChanged(it)) },
+            label = stringResource(R.string.enter_email),
+            isEnabled = !state.isLoading,
+            isError = state.isEmailError,
+            showLeadingIcon = false,
+            onExpandedChange = { },
             modifier = Modifier
                 .fillMaxWidth()
-                .height(58.dp),
-            shape = MaterialTheme.shapes.medium,
-            colors = TextFieldDefaults.colors(
-                focusedContainerColor = MaterialTheme.colorScheme.surfaceVariant,
-                unfocusedContainerColor = MaterialTheme.colorScheme.surfaceVariant,
-                disabledContainerColor = MaterialTheme.colorScheme.surfaceVariant,
-                focusedIndicatorColor = MaterialTheme.colorScheme.surfaceVariant,
-                unfocusedIndicatorColor = MaterialTheme.colorScheme.surfaceVariant,
-                disabledIndicatorColor = MaterialTheme.colorScheme.surfaceVariant
-            )
+                .height(52.dp),
+            colors = TextInputColorsDefaults.defaultColors()
         )
 
         Spacer(Modifier.height(20.dp))
 
-        // DisabledSecondaryButton
-        // EnabledPrimaryButton
         PrimaryButton(
             onClick = { onIntent(ForgotPasswordIntent.SubmitClicked) },
-            enabled = isEmailValid,
+            enabled = isEmailValid && !state.isLoading,
             modifier = Modifier
                 .fillMaxWidth()
                 .height(48.dp),
+            colors = YeahubButtonColors(
+                contentColor = Theme.colors.white900,
+                containerColor = Theme.colors.purple700,
+                disabledContentColor = Theme.colors.black200,
+                disabledContainerColor = Theme.colors.black50
+            )
         ) {
-            Text(stringResource(R.string.send_button))
+            Text(
+                text = stringResource(R.string.send_button),
+                style = Theme.typography.body4
+            )
         }
     }
 }
@@ -106,9 +101,8 @@ fun ForgotPasswordScreen(
 @Preview(showBackground = true)
 @Composable
 private fun ForgotPasswordScreenPreview() {
-        ForgotPasswordScreen(
-            state = ForgotPasswordState(),
-            modifier = TODO(),
-            onIntent = TODO(),
-        )
+    ForgotPasswordScreen(
+        state = ForgotPasswordState(),
+        onIntent = {}
+    )
 }
diff --git a/feature/forgot-password/impl/src/main/res/values/strings.xml b/feature/forgot-password/impl/src/main/res/values/strings.xml
index 202a190e..6dfa844e 100644
--- a/feature/forgot-password/impl/src/main/res/values/strings.xml
+++ b/feature/forgot-password/impl/src/main/res/values/strings.xml
@@ -12,4 +12,5 @@
     <string name="email">Электронная почта</string>
     <string name="enter_email">Введите электронную почту</string>
     <string name="send_button">Отправить</string>
+    <string name="cant_send_a_letter">Не удалось отправить письмо</string>
 </resources>
\ No newline at end of file

From 28d142fdc91d3e426850ea66dbc71adafe91df2a Mon Sep 17 00:00:00 2001
From: 2olka <brayanevoni@gmail.com>
Date: Mon, 16 Feb 2026 15:44:34 +0500
Subject: [PATCH 12/31] =?UTF-8?q?ANDR-75:=20=D0=9D=D0=B0=D1=81=D1=82=D1=80?=
 =?UTF-8?q?=D0=BE=D0=B9=D0=BA=D0=B0=20=D0=BE=D1=82=D1=81=D1=82=D1=83=D0=BF?=
 =?UTF-8?q?=D0=BE=D0=B2=20=D0=B8=20=D1=86=D0=B2=D0=B5=D1=82=D0=BE=D0=B2=20?=
 =?UTF-8?q?=D0=B2=20ModalWindow=20=D0=B4=D0=BB=D1=8F=20PixelPerfect?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/ui/ForgotPasswordModalWindow.kt      | 45 ++++++++-----------
 1 file changed, 18 insertions(+), 27 deletions(-)

diff --git a/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/ui/ForgotPasswordModalWindow.kt b/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/ui/ForgotPasswordModalWindow.kt
index 246ed813..5b5bbf40 100644
--- a/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/ui/ForgotPasswordModalWindow.kt
+++ b/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/ui/ForgotPasswordModalWindow.kt
@@ -84,10 +84,9 @@ private fun InstructionsSentDialogContent(
         Box(
             modifier = Modifier
                 .clip(shape)
-                .padding(14.dp),
+                .padding(16.dp),
             contentAlignment = Alignment.TopEnd
         ) {
-            // Close button
             IconButton(
                 onClick = onDismiss,
                 modifier = Modifier
@@ -102,37 +101,29 @@ private fun InstructionsSentDialogContent(
 
             Column(
                 modifier = Modifier
-                    .fillMaxWidth()
-                    .padding(top = 4.dp),
+                    .fillMaxWidth(),
                 horizontalAlignment = Alignment.CenterHorizontally
             ) {
-                Spacer(Modifier.height(8.dp))
-
-                Box(
-                    contentAlignment = Alignment.Center
-                ) {
-                    Image(
-                        painter = painterResource(id = R.drawable.letter),
-                        contentDescription = stringResource(R.string.letter),
-                        modifier = Modifier.size(112.dp)
-                    )
-                }
-
-                Spacer(Modifier.height(4.dp))
+                Image(
+                    painter = painterResource(id = R.drawable.letter),
+                    contentDescription = stringResource(R.string.letter),
+                    modifier = Modifier
+                        .size(116.dp)
+                        .padding(vertical = 2.dp)
+                )
 
                 Text(
                     text = stringResource(R.string.instructions_letter),
-                    style = MaterialTheme.typography.titleLarge,
-                    color = Color(0xFF2B2B2B),
+                    style = Theme.typography.body5Accent,
                     textAlign = TextAlign.Center
                 )
 
-                Spacer(Modifier.height(10.dp))
+                Spacer(Modifier.height(6.dp))
 
                 Text(
                     text = stringResource(R.string.instruction),
-                    style = MaterialTheme.typography.bodyMedium,
-                    color = Color(0xFF2B2B2B),
+                    style = Theme.typography.body2,
+                    color = Theme.colors.black900,
                     textAlign = TextAlign.Center,
                     lineHeight = MaterialTheme.typography.bodyMedium.lineHeight
                 )
@@ -142,14 +133,14 @@ private fun InstructionsSentDialogContent(
                 if (secondsLeft > 0) {
                     Text(
                         text = stringResource(R.string.resend, secondsLeft),
-                        color = Color(0xFF9CA3AF),
-                        style = MaterialTheme.typography.bodyMedium
+                        color = Theme.colors.black300,
+                        style = Theme.typography.body2
                     )
                 } else {
                     Text(
                         text = stringResource(R.string.resend_button),
                         color = color,
-                        style = MaterialTheme.typography.titleSmall,
+                        style = Theme.typography.body2,
                         modifier = Modifier
                             .clip(RoundedCornerShape(10.dp))
                             .clickable(onClick = onResend)
@@ -162,11 +153,11 @@ private fun InstructionsSentDialogContent(
                 Text(
                     text = stringResource(R.string.ok),
                     color = color,
-                    style = MaterialTheme.typography.titleSmall,
+                    style = Theme.typography.body2,
                     modifier = Modifier
                         .clip(RoundedCornerShape(10.dp))
                         .clickable(onClick = onDismiss)
-                        .padding(horizontal = 12.dp, vertical = 8.dp)
+                        .padding(horizontal = 12.dp, vertical = 4.dp)
                 )
             }
         }

From ea3533b781387d9434768230a7c55ed29f4e0d6f Mon Sep 17 00:00:00 2001
From: 2olka <brayanevoni@gmail.com>
Date: Mon, 16 Feb 2026 16:24:08 +0500
Subject: [PATCH 13/31] =?UTF-8?q?ANDR-75:=20=D0=B8=D1=81=D0=BF=D1=80=D0=B0?=
 =?UTF-8?q?=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BE=D1=88=D0=B8=D0=B1?=
 =?UTF-8?q?=D0=BE=D0=BA=20KtLint?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/ru/yeahub/core_ui/component/Button.kt    | 10 +++++-----
 .../ru/yeahub/core_ui/component/textInput/TextInput.kt |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/core/ui/src/main/java/ru/yeahub/core_ui/component/Button.kt b/core/ui/src/main/java/ru/yeahub/core_ui/component/Button.kt
index 402ac5a7..93c39781 100644
--- a/core/ui/src/main/java/ru/yeahub/core_ui/component/Button.kt
+++ b/core/ui/src/main/java/ru/yeahub/core_ui/component/Button.kt
@@ -42,7 +42,7 @@ fun PrimaryButton(
     interactionSource: MutableInteractionSource = remember { MutableInteractionSource() },
     shape: Shape = RoundedCornerShape(12.dp),
     contentPadding: PaddingValues = ButtonDefaults.ContentPadding,
-    content: @Composable RowScope.() -> Unit,
+    content: @Composable RowScope.() -> Unit
 ) {
     DefaultButton(
         onClick = onClick,
@@ -67,7 +67,7 @@ fun SecondaryButton(
     interactionSource: MutableInteractionSource = remember { MutableInteractionSource() },
     shape: Shape = RoundedCornerShape(12.dp),
     contentPadding: PaddingValues = ButtonDefaults.ContentPadding,
-    content: @Composable RowScope.() -> Unit,
+    content: @Composable RowScope.() -> Unit
 ) {
     DefaultButton(
         onClick = onClick,
@@ -78,7 +78,7 @@ fun SecondaryButton(
         interactionSource = interactionSource,
         shape = shape,
         contentPadding = contentPadding,
-        content = content,
+        content = content
     )
 }
 
@@ -212,7 +212,7 @@ object YeahubButtonDefaults {
         contentColor: Color = Theme.colors.red600,
         containerColor: Color = Color.Transparent,
         disabledContentColor: Color = Theme.colors.red200,
-        disabledContainerColor: Color = Color.Transparent,
+        disabledContainerColor: Color = Color.Transparent
     ): YeahubButtonColors {
         return YeahubButtonColors(
             contentColor = contentColor,
@@ -239,7 +239,7 @@ data class YeahubButtonColors(
     private val contentColor: Color,
     private val containerColor: Color,
     private val disabledContentColor: Color,
-    private val disabledContainerColor: Color,
+    private val disabledContainerColor: Color
 ) : ButtonColors {
     @Composable
     override fun containerColor(enabled: Boolean): State<Color> {
diff --git a/core/ui/src/main/java/ru/yeahub/core_ui/component/textInput/TextInput.kt b/core/ui/src/main/java/ru/yeahub/core_ui/component/textInput/TextInput.kt
index 2c8334e7..476c72aa 100644
--- a/core/ui/src/main/java/ru/yeahub/core_ui/component/textInput/TextInput.kt
+++ b/core/ui/src/main/java/ru/yeahub/core_ui/component/textInput/TextInput.kt
@@ -249,7 +249,7 @@ fun DefaultTextField(
             unfocusedBorderColor = defaultBorder,
             focusedBorderColor = TextInputColorsDefaults.focusBorder(),
             disabledBorderColor = TextInputColorsDefaults.defaultsBorder(),
-            errorBorderColor = TextInputColorsDefaults.errorBorder(),
+            errorBorderColor = TextInputColorsDefaults.errorBorder()
         ),
         keyboardActions = KeyboardActions(
             onSearch = {
@@ -259,7 +259,7 @@ fun DefaultTextField(
             }
         ),
         keyboardOptions = KeyboardOptions(imeAction = ImeAction.Search),
-        interactionSource = interactionSource,
+        interactionSource = interactionSource
     )
 }
 

From 774c1017d2a3b788524f9263f842d25ff07fae01 Mon Sep 17 00:00:00 2001
From: 2olka <brayanevoni@gmail.com>
Date: Mon, 16 Feb 2026 17:10:18 +0500
Subject: [PATCH 14/31] =?UTF-8?q?ANDR-75:=20=D0=B8=D1=81=D0=BF=D1=80=D0=B0?=
 =?UTF-8?q?=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BE=D1=88=D0=B8=D0=B1?=
 =?UTF-8?q?=D0=BE=D0=BA=20KtLint?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/data/mapper/ForgotPasswordMapper.kt  |  8 +-
 .../impl/domain/SendResetLinkUseCase.kt       | 14 +--
 .../presentation/ForgotPasswordViewModel.kt   | 85 ++++++++++---------
 .../impl/ui/ForgotPasswordModalWindow.kt      |  1 -
 .../ru/yeahub/impl/ui/ForgotPasswordScreen.kt |  1 -
 .../test/PublicCollectionsScreenMapperTest.kt |  3 +-
 .../test/SpecializationSelectionMapperTest.kt | 12 +--
 7 files changed, 63 insertions(+), 61 deletions(-)

diff --git a/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/data/mapper/ForgotPasswordMapper.kt b/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/data/mapper/ForgotPasswordMapper.kt
index 0c9a80bb..ce20fabe 100644
--- a/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/data/mapper/ForgotPasswordMapper.kt
+++ b/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/data/mapper/ForgotPasswordMapper.kt
@@ -3,10 +3,12 @@ package ru.yeahub.impl.data.mapper
 import ru.yeahub.impl.data.dto.ForgotPasswordResponseDto
 import ru.yeahub.impl.domain.ForgotPasswordResult
 
-
 class ForgotPasswordMapper {
     fun toDomain(responseDto: ForgotPasswordResponseDto): ForgotPasswordResult {
-        return if (responseDto.ok) ForgotPasswordResult.Success
-        else ForgotPasswordResult.Error(responseDto.message)
+        return if (responseDto.ok) {
+            ForgotPasswordResult.Success
+        } else {
+            ForgotPasswordResult.Error(responseDto.message)
+        }
     }
 }
\ No newline at end of file
diff --git a/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/domain/SendResetLinkUseCase.kt b/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/domain/SendResetLinkUseCase.kt
index b97cfa57..f28752e5 100644
--- a/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/domain/SendResetLinkUseCase.kt
+++ b/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/domain/SendResetLinkUseCase.kt
@@ -1,11 +1,11 @@
 package ru.yeahub.impl.domain
 
-class SendResetLinkUseCase (
+class SendResetLinkUseCase(
     private val repository: ForgotPasswordRepository
-    ) {
-        suspend operator fun invoke(email: String): ForgotPasswordResult {
-            if (email.isBlank()) return ForgotPasswordResult.Error("Введите email")
-            if (!email.contains("@")) return ForgotPasswordResult.Error("Некорректный email")
-            return repository.sendResetLink(email.trim())
-        }
+) {
+    suspend operator fun invoke(email: String): ForgotPasswordResult {
+        if (email.isBlank()) return ForgotPasswordResult.Error("Введите email")
+        if (!email.contains("@")) return ForgotPasswordResult.Error("Некорректный email")
+        return repository.sendResetLink(email.trim())
+    }
 }
\ No newline at end of file
diff --git a/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/presentation/ForgotPasswordViewModel.kt b/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/presentation/ForgotPasswordViewModel.kt
index 7d96932e..af81914a 100644
--- a/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/presentation/ForgotPasswordViewModel.kt
+++ b/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/presentation/ForgotPasswordViewModel.kt
@@ -12,60 +12,61 @@ import kotlinx.coroutines.launch
 import ru.yeahub.impl.domain.ForgotPasswordResult
 import ru.yeahub.impl.domain.SendResetLinkUseCase
 
-class ForgotPasswordViewModel (
+class ForgotPasswordViewModel(
     private val sendResetLink: SendResetLinkUseCase
-    ) : ViewModel() {
+) : ViewModel() {
 
-        private val _state = MutableStateFlow(ForgotPasswordState())
-        val state: StateFlow<ForgotPasswordState> = _state.asStateFlow()
+    private val _state = MutableStateFlow(ForgotPasswordState())
+    val state: StateFlow<ForgotPasswordState> = _state.asStateFlow()
 
-        private val _effect = Channel<ForgotPasswordEffect>(Channel.BUFFERED)
-        val effect = _effect.receiveAsFlow()
+    private val _effect = Channel<ForgotPasswordEffect>(Channel.BUFFERED)
+    val effect = _effect.receiveAsFlow()
 
-        fun onIntent(intent: ForgotPasswordIntent) {
-            when (intent) {
-                is ForgotPasswordIntent.EmailChanged -> onEmailChanged(intent.value)
-                is ForgotPasswordIntent.SubmitClicked -> onSubmit()
-                is ForgotPasswordIntent.BackClicked -> emitEffect(ForgotPasswordEffect.NavigateBack)
-            }
+    fun onIntent(intent: ForgotPasswordIntent) {
+        when (intent) {
+            is ForgotPasswordIntent.EmailChanged -> onEmailChanged(intent.value)
+            is ForgotPasswordIntent.SubmitClicked -> onSubmit()
+            is ForgotPasswordIntent.BackClicked -> emitEffect(ForgotPasswordEffect.NavigateBack)
         }
+    }
 
-        private fun onEmailChanged(value: String) {
-            _state.update {
-                it.copy(
-                    email = value,
-                    isEmailError = false,
-                    emailErrorText = null,
-                    isSent = false
-                )
-            }
+    private fun onEmailChanged(value: String) {
+        _state.update {
+            it.copy(
+                email = value,
+                isEmailError = false,
+                emailErrorText = null,
+                isSent = false
+            )
         }
+    }
 
-        private fun onSubmit() {
-            val email = state.value.email
-            _state.update { it.copy(isLoading = true) }
+    private fun onSubmit() {
+        val email = state.value.email
+        _state.update { it.copy(isLoading = true) }
 
-            viewModelScope.launch {
-                when (val result = sendResetLink(email)) {
-                    is ForgotPasswordResult.Success -> {
-                        _state.update { it.copy(isLoading = false, isSent = true) }
-                        emitEffect(ForgotPasswordEffect.NavigateToCheckEmail)
-                    }
-                    is ForgotPasswordResult.Error -> {
-                        _state.update {
-                            it.copy(
-                                isLoading = false,
-                                isEmailError = true,
-                                emailErrorText = result.message
-                            )
-                        }
-                        emitEffect(ForgotPasswordEffect.ShowSnackbar(result.message))
+        viewModelScope.launch {
+            when (val result = sendResetLink(email)) {
+                is ForgotPasswordResult.Success -> {
+                    _state.update { it.copy(isLoading = false, isSent = true) }
+                    emitEffect(ForgotPasswordEffect.NavigateToCheckEmail)
+                }
+
+                is ForgotPasswordResult.Error -> {
+                    _state.update {
+                        it.copy(
+                            isLoading = false,
+                            isEmailError = true,
+                            emailErrorText = result.message
+                        )
                     }
+                    emitEffect(ForgotPasswordEffect.ShowSnackbar(result.message))
                 }
             }
         }
+    }
 
-        private fun emitEffect(effect: ForgotPasswordEffect) {
-            viewModelScope.launch { _effect.send(effect) }
-        }
+    private fun emitEffect(effect: ForgotPasswordEffect) {
+        viewModelScope.launch { _effect.send(effect) }
+    }
 }
\ No newline at end of file
diff --git a/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/ui/ForgotPasswordModalWindow.kt b/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/ui/ForgotPasswordModalWindow.kt
index 5b5bbf40..4fbefe02 100644
--- a/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/ui/ForgotPasswordModalWindow.kt
+++ b/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/ui/ForgotPasswordModalWindow.kt
@@ -38,7 +38,6 @@ import ru.yeahub.core_ui.example.staticPreview.StaticPreview
 import ru.yeahub.core_ui.theme.Theme
 import ru.yeahub.impl.R
 
-
 @Composable
 fun InstructionsSentDialog(
     onDismiss: () -> Unit,
diff --git a/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/ui/ForgotPasswordScreen.kt b/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/ui/ForgotPasswordScreen.kt
index 913c1e0b..122f906c 100644
--- a/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/ui/ForgotPasswordScreen.kt
+++ b/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/ui/ForgotPasswordScreen.kt
@@ -9,7 +9,6 @@ import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
diff --git a/feature/public-collections/impl/src/test/java/ru/yeahub/public_collections/impl/test/PublicCollectionsScreenMapperTest.kt b/feature/public-collections/impl/src/test/java/ru/yeahub/public_collections/impl/test/PublicCollectionsScreenMapperTest.kt
index 8e58ac05..8f9ace3f 100644
--- a/feature/public-collections/impl/src/test/java/ru/yeahub/public_collections/impl/test/PublicCollectionsScreenMapperTest.kt
+++ b/feature/public-collections/impl/src/test/java/ru/yeahub/public_collections/impl/test/PublicCollectionsScreenMapperTest.kt
@@ -20,7 +20,8 @@ class PublicCollectionsScreenMapperTest {
     @ParameterizedTest
     @ArgumentsSource(PublicCollectionsScreenMapperArgumentsProvider::class)
     fun `should map GetCollectionResponseEntity to PublicCollectionsScreenState`(
-        testCase: PublicCollectionsScreenMapperTestCase) {
+        testCase: PublicCollectionsScreenMapperTestCase
+    ) {
         val result = mapper.getScreenState(
             testCase.dataToTest,
             header = testCase.header
diff --git a/feature/selection-specializations/impl/src/test/java/test/SpecializationSelectionMapperTest.kt b/feature/selection-specializations/impl/src/test/java/test/SpecializationSelectionMapperTest.kt
index f09a805b..812b51e3 100644
--- a/feature/selection-specializations/impl/src/test/java/test/SpecializationSelectionMapperTest.kt
+++ b/feature/selection-specializations/impl/src/test/java/test/SpecializationSelectionMapperTest.kt
@@ -24,7 +24,7 @@ class SpecializationSelectionMapperTest(
     private val toDomainMapper: SpecializationSelectionDataToDomainMapper
 ) {
 
-    class ArgumentsProvider1 : TestArgumentsProvider<SpecializationSelectionDataToDomainMapperTestCase1>(){
+    class ArgumentsProvider1 : TestArgumentsProvider<SpecializationSelectionDataToDomainMapperTestCase1>() {
         override fun testCases(): List<SpecializationSelectionDataToDomainMapperTestCase1> = listOf(
             SpecializationSelectionDataToDomainMapperTestCase1(
                 dataToTest = defaultSpecialResponse,
@@ -37,7 +37,7 @@ class SpecializationSelectionMapperTest(
         )
     }
 
-    class ArgumentsProvider2 : TestArgumentsProvider<SpecializationSelectionDataToDomainMapperTestCase2>(){
+    class ArgumentsProvider2 : TestArgumentsProvider<SpecializationSelectionDataToDomainMapperTestCase2>() {
         override fun testCases(): List<SpecializationSelectionDataToDomainMapperTestCase2> = listOf(
             SpecializationSelectionDataToDomainMapperTestCase2(
                 dataToTest = defaultSpecialListResponse,
@@ -46,7 +46,7 @@ class SpecializationSelectionMapperTest(
         )
     }
 
-    class ArgumentsProvider3 : TestArgumentsProvider<SpecializationSelectionDomainToVoMapperTestCase>(){
+    class ArgumentsProvider3 : TestArgumentsProvider<SpecializationSelectionDomainToVoMapperTestCase>() {
         override fun testCases(): List<SpecializationSelectionDomainToVoMapperTestCase> = listOf(
             SpecializationSelectionDomainToVoMapperTestCase(
                 dataToTest = listOf(defaultDomainSpecial, defaultDomainSpecialWithImage),
@@ -59,7 +59,7 @@ class SpecializationSelectionMapperTest(
     @ArgumentsSource(ArgumentsProvider1::class)
     fun specializationSelectionDataToDomainMapperTestCase1(
         testCase1: SpecializationSelectionDataToDomainMapperTestCase1
-    ){
+    ) {
         val result = toDomainMapper.dataToDomain(testCase1.dataToTest)
         assertEquals(testCase1.expectedResult, result)
     }
@@ -68,7 +68,7 @@ class SpecializationSelectionMapperTest(
     @ArgumentsSource(ArgumentsProvider2::class)
     fun specializationSelectionDataToDomainMapperTestCase2(
         testCase2: SpecializationSelectionDataToDomainMapperTestCase2
-    ){
+    ) {
         val result = toDomainMapper.dataListToDomainList(testCase2.dataToTest)
         assertEquals(testCase2.expectedResult, result)
     }
@@ -77,7 +77,7 @@ class SpecializationSelectionMapperTest(
     @ArgumentsSource(ArgumentsProvider3::class)
     fun specializationSelectionDomainToVoMapperTestCase(
         testCase: SpecializationSelectionDomainToVoMapperTestCase
-    ){
+    ) {
         val result = getScreenState(testCase.dataToTest)
         assertEquals(testCase.expectedResult, result)
     }

From c5f71df1c88b5f8d425676792ab6b22352367394 Mon Sep 17 00:00:00 2001
From: 2olka <brayanevoni@gmail.com>
Date: Mon, 16 Feb 2026 17:31:06 +0500
Subject: [PATCH 15/31] =?UTF-8?q?ANDR-75:=20=D0=B8=D1=81=D0=BF=D1=80=D0=B0?=
 =?UTF-8?q?=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BE=D1=88=D0=B8=D0=B1?=
 =?UTF-8?q?=D0=BE=D0=BA=20KtLint?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/ru/yeahub/core_ui/component/textInput/TextInput.kt | 4 +++-
 .../java/com/example/impl/ExampleInstrumentedTest.kt        | 4 +---
 .../impl/src/test/java/com/example/impl/ExampleUnitTest.kt  | 3 +--
 .../ru/yeahub/forgot_password/ExampleInstrumentedTest.kt    | 6 ++----
 .../test/java/ru/yeahub/forgot_password/ExampleUnitTest.kt  | 3 +--
 .../impl/test/PublicQuestionsDataToDomainMapperTest.kt      | 1 -
 .../src/test/java/test/SpecializationExampleDataClasses.kt  | 1 -
 .../src/test/java/test/SpecializationSelectionMapperTest.kt | 1 -
 8 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/core/ui/src/main/java/ru/yeahub/core_ui/component/textInput/TextInput.kt b/core/ui/src/main/java/ru/yeahub/core_ui/component/textInput/TextInput.kt
index 476c72aa..97136d36 100644
--- a/core/ui/src/main/java/ru/yeahub/core_ui/component/textInput/TextInput.kt
+++ b/core/ui/src/main/java/ru/yeahub/core_ui/component/textInput/TextInput.kt
@@ -229,7 +229,9 @@ fun DefaultTextField(
                         .height(20.dp)
                 )
             }
-        } else null,
+        } else {
+            null
+        },
         isError = isError,
         shape = shape,
         textStyle = Theme.typography.body3.copy(
diff --git a/feature/enter-and-registration/impl/src/androidTest/java/com/example/impl/ExampleInstrumentedTest.kt b/feature/enter-and-registration/impl/src/androidTest/java/com/example/impl/ExampleInstrumentedTest.kt
index 47870fe4..e6b3b8d4 100644
--- a/feature/enter-and-registration/impl/src/androidTest/java/com/example/impl/ExampleInstrumentedTest.kt
+++ b/feature/enter-and-registration/impl/src/androidTest/java/com/example/impl/ExampleInstrumentedTest.kt
@@ -1,11 +1,9 @@
 package com.example.impl
 
-import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.ext.junit.runners.AndroidJUnit4
-
+import androidx.test.platform.app.InstrumentationRegistry
 import org.junit.Test
 import org.junit.runner.RunWith
-
 import org.junit.Assert.*
 
 /**
diff --git a/feature/enter-and-registration/impl/src/test/java/com/example/impl/ExampleUnitTest.kt b/feature/enter-and-registration/impl/src/test/java/com/example/impl/ExampleUnitTest.kt
index 48dccab5..ea1f4939 100644
--- a/feature/enter-and-registration/impl/src/test/java/com/example/impl/ExampleUnitTest.kt
+++ b/feature/enter-and-registration/impl/src/test/java/com/example/impl/ExampleUnitTest.kt
@@ -1,8 +1,7 @@
 package com.example.impl
 
-import org.junit.Test
-
 import org.junit.Assert.*
+import org.junit.Test
 
 /**
  * Example local unit test, which will execute on the development machine (host).
diff --git a/feature/forgot-password/src/androidTest/java/ru/yeahub/forgot_password/ExampleInstrumentedTest.kt b/feature/forgot-password/src/androidTest/java/ru/yeahub/forgot_password/ExampleInstrumentedTest.kt
index 7cbb2a1a..52fe4afc 100644
--- a/feature/forgot-password/src/androidTest/java/ru/yeahub/forgot_password/ExampleInstrumentedTest.kt
+++ b/feature/forgot-password/src/androidTest/java/ru/yeahub/forgot_password/ExampleInstrumentedTest.kt
@@ -1,13 +1,11 @@
 package ru.yeahub.forgot_password
 
-import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.ext.junit.runners.AndroidJUnit4
-
+import androidx.test.platform.app.InstrumentationRegistry
+import org.junit.Assert.*
 import org.junit.Test
 import org.junit.runner.RunWith
 
-import org.junit.Assert.*
-
 /**
  * Instrumented test, which will execute on an Android device.
  *
diff --git a/feature/forgot-password/src/test/java/ru/yeahub/forgot_password/ExampleUnitTest.kt b/feature/forgot-password/src/test/java/ru/yeahub/forgot_password/ExampleUnitTest.kt
index 81a714c3..18a93b90 100644
--- a/feature/forgot-password/src/test/java/ru/yeahub/forgot_password/ExampleUnitTest.kt
+++ b/feature/forgot-password/src/test/java/ru/yeahub/forgot_password/ExampleUnitTest.kt
@@ -1,8 +1,7 @@
 package ru.yeahub.forgot_password
 
-import org.junit.Test
-
 import org.junit.Assert.*
+import org.junit.Test
 
 /**
  * Example local unit test, which will execute on the development machine (host).
diff --git a/feature/public-questions/impl/src/test/java/ru/yeahub/public_questions/impl/test/PublicQuestionsDataToDomainMapperTest.kt b/feature/public-questions/impl/src/test/java/ru/yeahub/public_questions/impl/test/PublicQuestionsDataToDomainMapperTest.kt
index 0ca1e37f..a75a267d 100644
--- a/feature/public-questions/impl/src/test/java/ru/yeahub/public_questions/impl/test/PublicQuestionsDataToDomainMapperTest.kt
+++ b/feature/public-questions/impl/src/test/java/ru/yeahub/public_questions/impl/test/PublicQuestionsDataToDomainMapperTest.kt
@@ -1,7 +1,6 @@
 package ru.yeahub.public_questions.impl.test
 
 import org.junit.jupiter.api.Assertions
-
 import ru.yeahub.public_questions.impl.data.mapper.PublicQuestionsDataToDomainMapper
 import ru.yeahub.public_questions.impl.domain.entity.PublicQuestionModel
 import ru.yeahub.public_questions.impl.domain.entity.PublicQuestionsModel
diff --git a/feature/selection-specializations/impl/src/test/java/test/SpecializationExampleDataClasses.kt b/feature/selection-specializations/impl/src/test/java/test/SpecializationExampleDataClasses.kt
index 38b8d9a8..d584eb14 100644
--- a/feature/selection-specializations/impl/src/test/java/test/SpecializationExampleDataClasses.kt
+++ b/feature/selection-specializations/impl/src/test/java/test/SpecializationExampleDataClasses.kt
@@ -59,4 +59,3 @@ object SpecializationExampleDataClasses {
         title = "default title num 1"
     )
 }
-
diff --git a/feature/selection-specializations/impl/src/test/java/test/SpecializationSelectionMapperTest.kt b/feature/selection-specializations/impl/src/test/java/test/SpecializationSelectionMapperTest.kt
index 812b51e3..b565c286 100644
--- a/feature/selection-specializations/impl/src/test/java/test/SpecializationSelectionMapperTest.kt
+++ b/feature/selection-specializations/impl/src/test/java/test/SpecializationSelectionMapperTest.kt
@@ -97,4 +97,3 @@ data class SpecializationSelectionDomainToVoMapperTestCase(
     val dataToTest: List<DomainSpecilialization>,
     val expectedResult: List<VoSpecilialization>
 )
-

From c07500c7bc9ee1891d63e804ccf6f0139ccbab9e Mon Sep 17 00:00:00 2001
From: 2olka <brayanevoni@gmail.com>
Date: Mon, 16 Feb 2026 18:15:41 +0500
Subject: [PATCH 16/31] =?UTF-8?q?ANDR-75:=20=D0=B8=D1=81=D0=BF=D1=80=D0=B0?=
 =?UTF-8?q?=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BE=D1=88=D0=B8=D0=B1?=
 =?UTF-8?q?=D0=BE=D0=BA=20Detect?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/example/api/ExampleInstrumentedTest.kt   |  2 +-
 .../test/java/com/example/api/ExampleUnitTest.kt |  2 +-
 .../com/example/impl/ExampleInstrumentedTest.kt  |  2 +-
 .../java/com/example/impl/ExampleUnitTest.kt     |  2 +-
 .../ru/yeahub/api/ExampleInstrumentedTest.kt     |  2 +-
 .../test/java/ru/yeahub/api/ExampleUnitTest.kt   |  2 +-
 feature/forgot-password/impl/build.gradle.kts    |  1 +
 .../ru/yeahub/impl/ExampleInstrumentedTest.kt    |  2 +-
 .../repository/ForgotPasswordRepositoryImpl.kt   | 16 +++++++++++++---
 .../yeahub/impl/domain/SendResetLinkUseCase.kt   | 10 +++++++---
 .../test/java/ru/yeahub/impl/ExampleUnitTest.kt  |  2 +-
 .../forgot_password/ExampleInstrumentedTest.kt   |  2 +-
 .../ru/yeahub/forgot_password/ExampleUnitTest.kt |  2 +-
 13 files changed, 31 insertions(+), 16 deletions(-)

diff --git a/feature/enter-and-registration/api/src/androidTest/java/com/example/api/ExampleInstrumentedTest.kt b/feature/enter-and-registration/api/src/androidTest/java/com/example/api/ExampleInstrumentedTest.kt
index ff4ec4b4..59e3b112 100644
--- a/feature/enter-and-registration/api/src/androidTest/java/com/example/api/ExampleInstrumentedTest.kt
+++ b/feature/enter-and-registration/api/src/androidTest/java/com/example/api/ExampleInstrumentedTest.kt
@@ -6,7 +6,7 @@ import androidx.test.ext.junit.runners.AndroidJUnit4
 import org.junit.Test
 import org.junit.runner.RunWith
 
-import org.junit.Assert.*
+import org.junit.Assert.assertEquals
 
 /**
  * Instrumented test, which will execute on an Android device.
diff --git a/feature/enter-and-registration/api/src/test/java/com/example/api/ExampleUnitTest.kt b/feature/enter-and-registration/api/src/test/java/com/example/api/ExampleUnitTest.kt
index 186556f3..72a7cd63 100644
--- a/feature/enter-and-registration/api/src/test/java/com/example/api/ExampleUnitTest.kt
+++ b/feature/enter-and-registration/api/src/test/java/com/example/api/ExampleUnitTest.kt
@@ -2,7 +2,7 @@ package com.example.api
 
 import org.junit.Test
 
-import org.junit.Assert.*
+import org.junit.Assert.assertEquals
 
 /**
  * Example local unit test, which will execute on the development machine (host).
diff --git a/feature/enter-and-registration/impl/src/androidTest/java/com/example/impl/ExampleInstrumentedTest.kt b/feature/enter-and-registration/impl/src/androidTest/java/com/example/impl/ExampleInstrumentedTest.kt
index e6b3b8d4..8e64f09b 100644
--- a/feature/enter-and-registration/impl/src/androidTest/java/com/example/impl/ExampleInstrumentedTest.kt
+++ b/feature/enter-and-registration/impl/src/androidTest/java/com/example/impl/ExampleInstrumentedTest.kt
@@ -4,7 +4,7 @@ import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.platform.app.InstrumentationRegistry
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.junit.Assert.*
+import org.junit.Assert.assertEquals
 
 /**
  * Instrumented test, which will execute on an Android device.
diff --git a/feature/enter-and-registration/impl/src/test/java/com/example/impl/ExampleUnitTest.kt b/feature/enter-and-registration/impl/src/test/java/com/example/impl/ExampleUnitTest.kt
index ea1f4939..0e93e650 100644
--- a/feature/enter-and-registration/impl/src/test/java/com/example/impl/ExampleUnitTest.kt
+++ b/feature/enter-and-registration/impl/src/test/java/com/example/impl/ExampleUnitTest.kt
@@ -1,6 +1,6 @@
 package com.example.impl
 
-import org.junit.Assert.*
+import org.junit.Assert.assertEquals
 import org.junit.Test
 
 /**
diff --git a/feature/forgot-password/api/src/androidTest/java/ru/yeahub/api/ExampleInstrumentedTest.kt b/feature/forgot-password/api/src/androidTest/java/ru/yeahub/api/ExampleInstrumentedTest.kt
index 77e7bf26..e61ed36d 100644
--- a/feature/forgot-password/api/src/androidTest/java/ru/yeahub/api/ExampleInstrumentedTest.kt
+++ b/feature/forgot-password/api/src/androidTest/java/ru/yeahub/api/ExampleInstrumentedTest.kt
@@ -6,7 +6,7 @@ import androidx.test.ext.junit.runners.AndroidJUnit4
 import org.junit.Test
 import org.junit.runner.RunWith
 
-import org.junit.Assert.*
+import org.junit.Assert.assertEquals
 
 /**
  * Instrumented test, which will execute on an Android device.
diff --git a/feature/forgot-password/api/src/test/java/ru/yeahub/api/ExampleUnitTest.kt b/feature/forgot-password/api/src/test/java/ru/yeahub/api/ExampleUnitTest.kt
index 20a5ef57..20fa19d9 100644
--- a/feature/forgot-password/api/src/test/java/ru/yeahub/api/ExampleUnitTest.kt
+++ b/feature/forgot-password/api/src/test/java/ru/yeahub/api/ExampleUnitTest.kt
@@ -2,7 +2,7 @@ package ru.yeahub.api
 
 import org.junit.Test
 
-import org.junit.Assert.*
+import org.junit.Assert.assertEquals
 
 /**
  * Example local unit test, which will execute on the development machine (host).
diff --git a/feature/forgot-password/impl/build.gradle.kts b/feature/forgot-password/impl/build.gradle.kts
index 2c3d5a27..290ccdc7 100644
--- a/feature/forgot-password/impl/build.gradle.kts
+++ b/feature/forgot-password/impl/build.gradle.kts
@@ -47,6 +47,7 @@ dependencies {
     implementation(libs.androidx.compose.ui)
     implementation(libs.androidx.compose.foundation)
     implementation(libs.androidx.compose.material3)
+    implementation(libs.timber)
     implementation(project(":core:ui"))
 
     // Compose Preview dependencies
diff --git a/feature/forgot-password/impl/src/androidTest/java/ru/yeahub/impl/ExampleInstrumentedTest.kt b/feature/forgot-password/impl/src/androidTest/java/ru/yeahub/impl/ExampleInstrumentedTest.kt
index 432cb481..3dcfa5af 100644
--- a/feature/forgot-password/impl/src/androidTest/java/ru/yeahub/impl/ExampleInstrumentedTest.kt
+++ b/feature/forgot-password/impl/src/androidTest/java/ru/yeahub/impl/ExampleInstrumentedTest.kt
@@ -6,7 +6,7 @@ import androidx.test.ext.junit.runners.AndroidJUnit4
 import org.junit.Test
 import org.junit.runner.RunWith
 
-import org.junit.Assert.*
+import org.junit.Assert.assertEquals
 
 /**
  * Instrumented test, which will execute on an Android device.
diff --git a/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/data/repository/ForgotPasswordRepositoryImpl.kt b/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/data/repository/ForgotPasswordRepositoryImpl.kt
index 4016aa8a..118700cb 100644
--- a/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/data/repository/ForgotPasswordRepositoryImpl.kt
+++ b/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/data/repository/ForgotPasswordRepositoryImpl.kt
@@ -1,5 +1,7 @@
 package ru.yeahub.impl.data.repository
 
+import java.io.IOException
+import timber.log.Timber
 import ru.yeahub.impl.data.dto.ForgotPasswordRequestDto
 import ru.yeahub.impl.data.mapper.ForgotPasswordMapper
 import ru.yeahub.impl.data.remote.AuthApi
@@ -10,13 +12,21 @@ class ForgotPasswordRepositoryImpl(
     private val api: AuthApi,
     private val mapper: ForgotPasswordMapper
 ) : ForgotPasswordRepository {
+
+    @Suppress("TooGenericExceptionCaught")
     override suspend fun sendResetLink(email: String): ForgotPasswordResult {
         return try {
             val dto = api.forgotPassword(ForgotPasswordRequestDto(email))
             mapper.toDomain(dto)
-        } catch (t: Throwable) {
-            // Здесь можно разрулить HttpException, IOException и т.п.
-            ForgotPasswordResult.Error("Ошибка сети. Попробуйте ещё раз.")
+        } catch (e: IOException) {
+            Timber.e("Network error sending reset link for email: $email, error: ${e.message}")
+            ForgotPasswordResult.Error("Ошибка сети. Проверьте подключение к интернету.")
+        } catch (e: IllegalArgumentException) {
+            Timber.e("Invalid data error sending reset link for email: $email, error: ${e.message}")
+            ForgotPasswordResult.Error("Некорректные данные. Проверьте введенный email.")
+        } catch (e: Exception) {
+            Timber.e("Unexpected error sending reset link for email: $email, error: ${e.message}")
+            ForgotPasswordResult.Error("Неизвестная ошибка. Попробуйте позже.")
         }
     }
 }
\ No newline at end of file
diff --git a/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/domain/SendResetLinkUseCase.kt b/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/domain/SendResetLinkUseCase.kt
index f28752e5..bf0d2084 100644
--- a/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/domain/SendResetLinkUseCase.kt
+++ b/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/domain/SendResetLinkUseCase.kt
@@ -4,8 +4,12 @@ class SendResetLinkUseCase(
     private val repository: ForgotPasswordRepository
 ) {
     suspend operator fun invoke(email: String): ForgotPasswordResult {
-        if (email.isBlank()) return ForgotPasswordResult.Error("Введите email")
-        if (!email.contains("@")) return ForgotPasswordResult.Error("Некорректный email")
-        return repository.sendResetLink(email.trim())
+        if (email.isBlank()) {
+            return ForgotPasswordResult.Error("Введите email")
+        } else if (!email.contains("@")) {
+            return ForgotPasswordResult.Error("Некорректный email")
+        } else {
+            return repository.sendResetLink(email.trim())
+        }
     }
 }
\ No newline at end of file
diff --git a/feature/forgot-password/impl/src/test/java/ru/yeahub/impl/ExampleUnitTest.kt b/feature/forgot-password/impl/src/test/java/ru/yeahub/impl/ExampleUnitTest.kt
index 072360cd..35f0eeee 100644
--- a/feature/forgot-password/impl/src/test/java/ru/yeahub/impl/ExampleUnitTest.kt
+++ b/feature/forgot-password/impl/src/test/java/ru/yeahub/impl/ExampleUnitTest.kt
@@ -2,7 +2,7 @@ package ru.yeahub.impl
 
 import org.junit.Test
 
-import org.junit.Assert.*
+import org.junit.Assert.assertEquals
 
 /**
  * Example local unit test, which will execute on the development machine (host).
diff --git a/feature/forgot-password/src/androidTest/java/ru/yeahub/forgot_password/ExampleInstrumentedTest.kt b/feature/forgot-password/src/androidTest/java/ru/yeahub/forgot_password/ExampleInstrumentedTest.kt
index 52fe4afc..02c0b56e 100644
--- a/feature/forgot-password/src/androidTest/java/ru/yeahub/forgot_password/ExampleInstrumentedTest.kt
+++ b/feature/forgot-password/src/androidTest/java/ru/yeahub/forgot_password/ExampleInstrumentedTest.kt
@@ -2,7 +2,7 @@ package ru.yeahub.forgot_password
 
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.platform.app.InstrumentationRegistry
-import org.junit.Assert.*
+import org.junit.Assert.assertEquals
 import org.junit.Test
 import org.junit.runner.RunWith
 
diff --git a/feature/forgot-password/src/test/java/ru/yeahub/forgot_password/ExampleUnitTest.kt b/feature/forgot-password/src/test/java/ru/yeahub/forgot_password/ExampleUnitTest.kt
index 18a93b90..f3ab03aa 100644
--- a/feature/forgot-password/src/test/java/ru/yeahub/forgot_password/ExampleUnitTest.kt
+++ b/feature/forgot-password/src/test/java/ru/yeahub/forgot_password/ExampleUnitTest.kt
@@ -1,6 +1,6 @@
 package ru.yeahub.forgot_password
 
-import org.junit.Assert.*
+import org.junit.Assert.assertEquals
 import org.junit.Test
 
 /**

From 9f36d369c1bfa974f05f8f59ae95f4507d1ddbc8 Mon Sep 17 00:00:00 2001
From: 2olka <brayanevoni@gmail.com>
Date: Mon, 16 Feb 2026 18:33:16 +0500
Subject: [PATCH 17/31] =?UTF-8?q?ANDR-75:=20=D0=B8=D1=81=D0=BF=D1=80=D0=B0?=
 =?UTF-8?q?=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BE=D1=88=D0=B8=D0=B1?=
 =?UTF-8?q?=D0=BE=D0=BA=20KtLint?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/example/api/ExampleInstrumentedTest.kt    |  8 +++-----
 .../src/test/java/com/example/api/ExampleUnitTest.kt   |  3 +--
 .../java/com/example/impl/ExampleInstrumentedTest.kt   |  4 ++--
 .../java/ru/yeahub/api/ExampleInstrumentedTest.kt      |  8 +++-----
 .../api/src/test/java/ru/yeahub/api/ExampleUnitTest.kt |  3 +--
 .../java/ru/yeahub/impl/ExampleInstrumentedTest.kt     |  8 +++-----
 .../data/repository/ForgotPasswordRepositoryImpl.kt    |  6 +++---
 .../src/test/java/ru/yeahub/impl/ExampleUnitTest.kt    |  3 +--
 .../impl/test/PublicQuestionsDataToDomainMapperTest.kt | 10 +++++-----
 9 files changed, 22 insertions(+), 31 deletions(-)

diff --git a/feature/enter-and-registration/api/src/androidTest/java/com/example/api/ExampleInstrumentedTest.kt b/feature/enter-and-registration/api/src/androidTest/java/com/example/api/ExampleInstrumentedTest.kt
index 59e3b112..384bef8d 100644
--- a/feature/enter-and-registration/api/src/androidTest/java/com/example/api/ExampleInstrumentedTest.kt
+++ b/feature/enter-and-registration/api/src/androidTest/java/com/example/api/ExampleInstrumentedTest.kt
@@ -1,12 +1,10 @@
 package com.example.api
 
-import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.ext.junit.runners.AndroidJUnit4
-
-import org.junit.Test
-import org.junit.runner.RunWith
-
+import androidx.test.platform.app.InstrumentationRegistry
 import org.junit.Assert.assertEquals
+import org.junit.runner.RunWith
+import org.junit.Test
 
 /**
  * Instrumented test, which will execute on an Android device.
diff --git a/feature/enter-and-registration/api/src/test/java/com/example/api/ExampleUnitTest.kt b/feature/enter-and-registration/api/src/test/java/com/example/api/ExampleUnitTest.kt
index 72a7cd63..d546ddd6 100644
--- a/feature/enter-and-registration/api/src/test/java/com/example/api/ExampleUnitTest.kt
+++ b/feature/enter-and-registration/api/src/test/java/com/example/api/ExampleUnitTest.kt
@@ -1,8 +1,7 @@
 package com.example.api
 
-import org.junit.Test
-
 import org.junit.Assert.assertEquals
+import org.junit.Test
 
 /**
  * Example local unit test, which will execute on the development machine (host).
diff --git a/feature/enter-and-registration/impl/src/androidTest/java/com/example/impl/ExampleInstrumentedTest.kt b/feature/enter-and-registration/impl/src/androidTest/java/com/example/impl/ExampleInstrumentedTest.kt
index 8e64f09b..7ab14ba1 100644
--- a/feature/enter-and-registration/impl/src/androidTest/java/com/example/impl/ExampleInstrumentedTest.kt
+++ b/feature/enter-and-registration/impl/src/androidTest/java/com/example/impl/ExampleInstrumentedTest.kt
@@ -2,9 +2,9 @@ package com.example.impl
 
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.platform.app.InstrumentationRegistry
-import org.junit.Test
-import org.junit.runner.RunWith
 import org.junit.Assert.assertEquals
+import org.junit.runner.RunWith
+import org.junit.Test
 
 /**
  * Instrumented test, which will execute on an Android device.
diff --git a/feature/forgot-password/api/src/androidTest/java/ru/yeahub/api/ExampleInstrumentedTest.kt b/feature/forgot-password/api/src/androidTest/java/ru/yeahub/api/ExampleInstrumentedTest.kt
index e61ed36d..6d2ea7ae 100644
--- a/feature/forgot-password/api/src/androidTest/java/ru/yeahub/api/ExampleInstrumentedTest.kt
+++ b/feature/forgot-password/api/src/androidTest/java/ru/yeahub/api/ExampleInstrumentedTest.kt
@@ -1,12 +1,10 @@
 package ru.yeahub.api
 
-import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.ext.junit.runners.AndroidJUnit4
-
-import org.junit.Test
-import org.junit.runner.RunWith
-
+import androidx.test.platform.app.InstrumentationRegistry
 import org.junit.Assert.assertEquals
+import org.junit.runner.RunWith
+import org.junit.Test
 
 /**
  * Instrumented test, which will execute on an Android device.
diff --git a/feature/forgot-password/api/src/test/java/ru/yeahub/api/ExampleUnitTest.kt b/feature/forgot-password/api/src/test/java/ru/yeahub/api/ExampleUnitTest.kt
index 20fa19d9..59dc864e 100644
--- a/feature/forgot-password/api/src/test/java/ru/yeahub/api/ExampleUnitTest.kt
+++ b/feature/forgot-password/api/src/test/java/ru/yeahub/api/ExampleUnitTest.kt
@@ -1,8 +1,7 @@
 package ru.yeahub.api
 
-import org.junit.Test
-
 import org.junit.Assert.assertEquals
+import org.junit.Test
 
 /**
  * Example local unit test, which will execute on the development machine (host).
diff --git a/feature/forgot-password/impl/src/androidTest/java/ru/yeahub/impl/ExampleInstrumentedTest.kt b/feature/forgot-password/impl/src/androidTest/java/ru/yeahub/impl/ExampleInstrumentedTest.kt
index 3dcfa5af..14ddf7ea 100644
--- a/feature/forgot-password/impl/src/androidTest/java/ru/yeahub/impl/ExampleInstrumentedTest.kt
+++ b/feature/forgot-password/impl/src/androidTest/java/ru/yeahub/impl/ExampleInstrumentedTest.kt
@@ -1,12 +1,10 @@
 package ru.yeahub.impl
 
-import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.ext.junit.runners.AndroidJUnit4
-
-import org.junit.Test
-import org.junit.runner.RunWith
-
+import androidx.test.platform.app.InstrumentationRegistry
 import org.junit.Assert.assertEquals
+import org.junit.runner.RunWith
+import org.junit.Test
 
 /**
  * Instrumented test, which will execute on an Android device.
diff --git a/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/data/repository/ForgotPasswordRepositoryImpl.kt b/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/data/repository/ForgotPasswordRepositoryImpl.kt
index 118700cb..1f10bc5a 100644
--- a/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/data/repository/ForgotPasswordRepositoryImpl.kt
+++ b/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/data/repository/ForgotPasswordRepositoryImpl.kt
@@ -1,12 +1,12 @@
 package ru.yeahub.impl.data.repository
 
 import java.io.IOException
-import timber.log.Timber
-import ru.yeahub.impl.data.dto.ForgotPasswordRequestDto
-import ru.yeahub.impl.data.mapper.ForgotPasswordMapper
 import ru.yeahub.impl.data.remote.AuthApi
+import ru.yeahub.impl.data.mapper.ForgotPasswordMapper
+import ru.yeahub.impl.data.dto.ForgotPasswordRequestDto
 import ru.yeahub.impl.domain.ForgotPasswordRepository
 import ru.yeahub.impl.domain.ForgotPasswordResult
+import timber.log.Timber
 
 class ForgotPasswordRepositoryImpl(
     private val api: AuthApi,
diff --git a/feature/forgot-password/impl/src/test/java/ru/yeahub/impl/ExampleUnitTest.kt b/feature/forgot-password/impl/src/test/java/ru/yeahub/impl/ExampleUnitTest.kt
index 35f0eeee..d86c56b0 100644
--- a/feature/forgot-password/impl/src/test/java/ru/yeahub/impl/ExampleUnitTest.kt
+++ b/feature/forgot-password/impl/src/test/java/ru/yeahub/impl/ExampleUnitTest.kt
@@ -1,8 +1,7 @@
 package ru.yeahub.impl
 
-import org.junit.Test
-
 import org.junit.Assert.assertEquals
+import org.junit.Test
 
 /**
  * Example local unit test, which will execute on the development machine (host).
diff --git a/feature/public-questions/impl/src/test/java/ru/yeahub/public_questions/impl/test/PublicQuestionsDataToDomainMapperTest.kt b/feature/public-questions/impl/src/test/java/ru/yeahub/public_questions/impl/test/PublicQuestionsDataToDomainMapperTest.kt
index a75a267d..ddee044e 100644
--- a/feature/public-questions/impl/src/test/java/ru/yeahub/public_questions/impl/test/PublicQuestionsDataToDomainMapperTest.kt
+++ b/feature/public-questions/impl/src/test/java/ru/yeahub/public_questions/impl/test/PublicQuestionsDataToDomainMapperTest.kt
@@ -1,20 +1,20 @@
 package ru.yeahub.public_questions.impl.test
 
+import java.util.stream.Stream
 import org.junit.jupiter.api.Assertions
-import ru.yeahub.public_questions.impl.data.mapper.PublicQuestionsDataToDomainMapper
-import ru.yeahub.public_questions.impl.domain.entity.PublicQuestionModel
-import ru.yeahub.public_questions.impl.domain.entity.PublicQuestionsModel
 import org.junit.jupiter.api.extension.ExtensionContext
-import org.junit.jupiter.params.ParameterizedTest
 import org.junit.jupiter.params.provider.Arguments
 import org.junit.jupiter.params.provider.ArgumentsProvider
 import org.junit.jupiter.params.provider.ArgumentsSource
+import org.junit.jupiter.params.ParameterizedTest
+import ru.yeahub.public_questions.impl.data.mapper.PublicQuestionsDataToDomainMapper
+import ru.yeahub.public_questions.impl.domain.entity.PublicQuestionModel
+import ru.yeahub.public_questions.impl.domain.entity.PublicQuestionsModel
 import ru.yeahub.network_api.models.GetPublicQuestionsResponse
 import ru.yeahub.network_api.models.GetQuestionResponse
 import ru.yeahub.network_api.models.NestedSkillResponse
 import ru.yeahub.network_api.models.NestedSpecializationResponse
 import ru.yeahub.network_api.models.NestedUserReferenceDto
-import java.util.stream.Stream
 
 class PublicQuestionsDataToDomainMapperTest {
     private val mapper = PublicQuestionsDataToDomainMapper()

From ccb606bfb1c685dd77605be300c2af68d6016ae3 Mon Sep 17 00:00:00 2001
From: 2olka <brayanevoni@gmail.com>
Date: Mon, 16 Feb 2026 18:42:15 +0500
Subject: [PATCH 18/31] =?UTF-8?q?ANDR-75:=20=D0=B8=D1=81=D0=BF=D1=80=D0=B0?=
 =?UTF-8?q?=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BE=D1=88=D0=B8=D0=B1?=
 =?UTF-8?q?=D0=BE=D0=BA=20KtLint?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/example/api/ExampleInstrumentedTest.kt       | 2 +-
 .../java/com/example/impl/ExampleInstrumentedTest.kt      | 2 +-
 .../java/ru/yeahub/api/ExampleInstrumentedTest.kt         | 2 +-
 .../java/ru/yeahub/impl/ExampleInstrumentedTest.kt        | 2 +-
 .../impl/data/repository/ForgotPasswordRepositoryImpl.kt  | 4 ++--
 .../impl/test/PublicQuestionsDataToDomainMapperTest.kt    | 8 ++++----
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/feature/enter-and-registration/api/src/androidTest/java/com/example/api/ExampleInstrumentedTest.kt b/feature/enter-and-registration/api/src/androidTest/java/com/example/api/ExampleInstrumentedTest.kt
index 384bef8d..baad68ac 100644
--- a/feature/enter-and-registration/api/src/androidTest/java/com/example/api/ExampleInstrumentedTest.kt
+++ b/feature/enter-and-registration/api/src/androidTest/java/com/example/api/ExampleInstrumentedTest.kt
@@ -3,8 +3,8 @@ package com.example.api
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.platform.app.InstrumentationRegistry
 import org.junit.Assert.assertEquals
-import org.junit.runner.RunWith
 import org.junit.Test
+import org.junit.runner.RunWith
 
 /**
  * Instrumented test, which will execute on an Android device.
diff --git a/feature/enter-and-registration/impl/src/androidTest/java/com/example/impl/ExampleInstrumentedTest.kt b/feature/enter-and-registration/impl/src/androidTest/java/com/example/impl/ExampleInstrumentedTest.kt
index 7ab14ba1..2df91a90 100644
--- a/feature/enter-and-registration/impl/src/androidTest/java/com/example/impl/ExampleInstrumentedTest.kt
+++ b/feature/enter-and-registration/impl/src/androidTest/java/com/example/impl/ExampleInstrumentedTest.kt
@@ -3,8 +3,8 @@ package com.example.impl
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.platform.app.InstrumentationRegistry
 import org.junit.Assert.assertEquals
-import org.junit.runner.RunWith
 import org.junit.Test
+import org.junit.runner.RunWith
 
 /**
  * Instrumented test, which will execute on an Android device.
diff --git a/feature/forgot-password/api/src/androidTest/java/ru/yeahub/api/ExampleInstrumentedTest.kt b/feature/forgot-password/api/src/androidTest/java/ru/yeahub/api/ExampleInstrumentedTest.kt
index 6d2ea7ae..c5731cb3 100644
--- a/feature/forgot-password/api/src/androidTest/java/ru/yeahub/api/ExampleInstrumentedTest.kt
+++ b/feature/forgot-password/api/src/androidTest/java/ru/yeahub/api/ExampleInstrumentedTest.kt
@@ -3,8 +3,8 @@ package ru.yeahub.api
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.platform.app.InstrumentationRegistry
 import org.junit.Assert.assertEquals
-import org.junit.runner.RunWith
 import org.junit.Test
+import org.junit.runner.RunWith
 
 /**
  * Instrumented test, which will execute on an Android device.
diff --git a/feature/forgot-password/impl/src/androidTest/java/ru/yeahub/impl/ExampleInstrumentedTest.kt b/feature/forgot-password/impl/src/androidTest/java/ru/yeahub/impl/ExampleInstrumentedTest.kt
index 14ddf7ea..669e7bdf 100644
--- a/feature/forgot-password/impl/src/androidTest/java/ru/yeahub/impl/ExampleInstrumentedTest.kt
+++ b/feature/forgot-password/impl/src/androidTest/java/ru/yeahub/impl/ExampleInstrumentedTest.kt
@@ -3,8 +3,8 @@ package ru.yeahub.impl
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.platform.app.InstrumentationRegistry
 import org.junit.Assert.assertEquals
-import org.junit.runner.RunWith
 import org.junit.Test
+import org.junit.runner.RunWith
 
 /**
  * Instrumented test, which will execute on an Android device.
diff --git a/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/data/repository/ForgotPasswordRepositoryImpl.kt b/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/data/repository/ForgotPasswordRepositoryImpl.kt
index 1f10bc5a..c0de3467 100644
--- a/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/data/repository/ForgotPasswordRepositoryImpl.kt
+++ b/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/data/repository/ForgotPasswordRepositoryImpl.kt
@@ -1,9 +1,9 @@
 package ru.yeahub.impl.data.repository
 
 import java.io.IOException
-import ru.yeahub.impl.data.remote.AuthApi
-import ru.yeahub.impl.data.mapper.ForgotPasswordMapper
 import ru.yeahub.impl.data.dto.ForgotPasswordRequestDto
+import ru.yeahub.impl.data.mapper.ForgotPasswordMapper
+import ru.yeahub.impl.data.remote.AuthApi
 import ru.yeahub.impl.domain.ForgotPasswordRepository
 import ru.yeahub.impl.domain.ForgotPasswordResult
 import timber.log.Timber
diff --git a/feature/public-questions/impl/src/test/java/ru/yeahub/public_questions/impl/test/PublicQuestionsDataToDomainMapperTest.kt b/feature/public-questions/impl/src/test/java/ru/yeahub/public_questions/impl/test/PublicQuestionsDataToDomainMapperTest.kt
index ddee044e..82ac5023 100644
--- a/feature/public-questions/impl/src/test/java/ru/yeahub/public_questions/impl/test/PublicQuestionsDataToDomainMapperTest.kt
+++ b/feature/public-questions/impl/src/test/java/ru/yeahub/public_questions/impl/test/PublicQuestionsDataToDomainMapperTest.kt
@@ -3,18 +3,18 @@ package ru.yeahub.public_questions.impl.test
 import java.util.stream.Stream
 import org.junit.jupiter.api.Assertions
 import org.junit.jupiter.api.extension.ExtensionContext
+import org.junit.jupiter.params.ParameterizedTest
 import org.junit.jupiter.params.provider.Arguments
 import org.junit.jupiter.params.provider.ArgumentsProvider
 import org.junit.jupiter.params.provider.ArgumentsSource
-import org.junit.jupiter.params.ParameterizedTest
-import ru.yeahub.public_questions.impl.data.mapper.PublicQuestionsDataToDomainMapper
-import ru.yeahub.public_questions.impl.domain.entity.PublicQuestionModel
-import ru.yeahub.public_questions.impl.domain.entity.PublicQuestionsModel
 import ru.yeahub.network_api.models.GetPublicQuestionsResponse
 import ru.yeahub.network_api.models.GetQuestionResponse
 import ru.yeahub.network_api.models.NestedSkillResponse
 import ru.yeahub.network_api.models.NestedSpecializationResponse
 import ru.yeahub.network_api.models.NestedUserReferenceDto
+import ru.yeahub.public_questions.impl.data.mapper.PublicQuestionsDataToDomainMapper
+import ru.yeahub.public_questions.impl.domain.entity.PublicQuestionModel
+import ru.yeahub.public_questions.impl.domain.entity.PublicQuestionsModel
 
 class PublicQuestionsDataToDomainMapperTest {
     private val mapper = PublicQuestionsDataToDomainMapper()

From b6d273614041ba10524a7a8903c5d3d87ebc3627 Mon Sep 17 00:00:00 2001
From: 2olka <brayanevoni@gmail.com>
Date: Mon, 16 Feb 2026 19:03:19 +0500
Subject: [PATCH 19/31] =?UTF-8?q?ANDR-75:=20=D0=B8=D1=81=D0=BF=D1=80=D0=B0?=
 =?UTF-8?q?=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BE=D1=88=D0=B8=D0=B1?=
 =?UTF-8?q?=D0=BE=D0=BA=20KtLint?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/test/PublicQuestionsDataToDomainMapperTest.kt          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/feature/public-questions/impl/src/test/java/ru/yeahub/public_questions/impl/test/PublicQuestionsDataToDomainMapperTest.kt b/feature/public-questions/impl/src/test/java/ru/yeahub/public_questions/impl/test/PublicQuestionsDataToDomainMapperTest.kt
index 82ac5023..0269ccec 100644
--- a/feature/public-questions/impl/src/test/java/ru/yeahub/public_questions/impl/test/PublicQuestionsDataToDomainMapperTest.kt
+++ b/feature/public-questions/impl/src/test/java/ru/yeahub/public_questions/impl/test/PublicQuestionsDataToDomainMapperTest.kt
@@ -424,4 +424,4 @@ class PublicQuestionsDataToDomainMapperTest {
             )
         }
     }
-}
+}
\ No newline at end of file

From 2735cad29e41c990d379b9d887823f718dd429cf Mon Sep 17 00:00:00 2001
From: 2olka <brayanevoni@gmail.com>
Date: Mon, 16 Feb 2026 19:15:25 +0500
Subject: [PATCH 20/31] =?UTF-8?q?ANDR-75:=20=D0=B8=D1=81=D0=BF=D1=80=D0=B0?=
 =?UTF-8?q?=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BE=D1=88=D0=B8=D0=B1?=
 =?UTF-8?q?=D0=BE=D0=BA=20KtLint?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .editorconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.editorconfig b/.editorconfig
index f3939f6a..8d34f8ff 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -24,4 +24,5 @@ ktlint_standard_multiline-expression-wrapping = disabled
 ktlint_standard_no-trailing-spaces = disabled
 ktlint_standard_no-multi-spaces = disabled
 ktlint_standard_blank-line-before-declaration = disabled
+ktlint_standard_import-ordering = disabled
 #immune for no-wildcard in detekt config (detekt-setting/detekt.yml)

From d26ec9aa24f27f7564edd11fd3b73903bc6707fd Mon Sep 17 00:00:00 2001
From: 2olka <brayanevoni@gmail.com>
Date: Mon, 16 Feb 2026 19:23:17 +0500
Subject: [PATCH 21/31] =?UTF-8?q?ANDR-75:=20=D0=B8=D1=81=D0=BF=D1=80=D0=B0?=
 =?UTF-8?q?=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BE=D1=88=D0=B8=D0=B1?=
 =?UTF-8?q?=D0=BE=D0=BA=20Detect?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ru/yeahub/impl/domain/SendResetLinkUseCase.kt    | 12 ++++++------
 .../java/ru/yeahub/impl/ui/ForgotPasswordScreen.kt   |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/domain/SendResetLinkUseCase.kt b/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/domain/SendResetLinkUseCase.kt
index bf0d2084..c141eb30 100644
--- a/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/domain/SendResetLinkUseCase.kt
+++ b/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/domain/SendResetLinkUseCase.kt
@@ -4,12 +4,12 @@ class SendResetLinkUseCase(
     private val repository: ForgotPasswordRepository
 ) {
     suspend operator fun invoke(email: String): ForgotPasswordResult {
-        if (email.isBlank()) {
-            return ForgotPasswordResult.Error("Введите email")
-        } else if (!email.contains("@")) {
-            return ForgotPasswordResult.Error("Некорректный email")
-        } else {
-            return repository.sendResetLink(email.trim())
+        val errorMessage = when {
+            email.isBlank() -> "Введите email"
+            !email.contains("@") -> "Некорректный email"
+            else -> null
         }
+        return errorMessage?.let { ForgotPasswordResult.Error(it) }
+            ?: repository.sendResetLink(email.trim())
     }
 }
\ No newline at end of file
diff --git a/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/ui/ForgotPasswordScreen.kt b/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/ui/ForgotPasswordScreen.kt
index 122f906c..1139f366 100644
--- a/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/ui/ForgotPasswordScreen.kt
+++ b/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/ui/ForgotPasswordScreen.kt
@@ -99,7 +99,7 @@ fun ForgotPasswordScreen(
 
 @Preview(showBackground = true)
 @Composable
-private fun ForgotPasswordScreenPreview() {
+fun ForgotPasswordScreenPreview() {
     ForgotPasswordScreen(
         state = ForgotPasswordState(),
         onIntent = {}

From 8ef05128f6fde5613b218c399e589766087ace19 Mon Sep 17 00:00:00 2001
From: 2olka <brayanevoni@gmail.com>
Date: Tue, 10 Mar 2026 17:03:38 +0500
Subject: [PATCH 22/31] =?UTF-8?q?ANDR-75:=20=D0=B8=D1=81=D0=BF=D1=80=D0=B0?=
 =?UTF-8?q?=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=B7=D0=B0=D0=BC=D0=B5?=
 =?UTF-8?q?=D1=87=D0=B0=D0=BD=D0=B8=D0=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/.gitignore                              |   2 +
 .../ru/yeahub/core_ui/component/Button.kt     |  22 ++--
 .../core_ui/component/textInput/TextInput.kt  |   6 +-
 .../forgot-password/api/proguard-rules.pro    |  21 ----
 .../ru/yeahub/api/ExampleInstrumentedTest.kt  |  22 ----
 .../java/ru/yeahub/api/ExampleUnitTest.kt     |  16 ---
 .../forgot-password/impl/proguard-rules.pro   |  21 ----
 .../ru/yeahub/impl/ExampleInstrumentedTest.kt |  22 ----
 .../ForgotPasswordRepositoryImpl.kt           |  39 +++++--
 .../yeahub/impl/di/ForgotPasswordFactory.kt   |  16 ++-
 .../impl/domain/ForgotPasswordRepository.kt   |   1 +
 .../impl/presentation/ForgotPasswordEffect.kt |   7 --
 .../impl/presentation/ForgotPasswordIntent.kt |   7 --
 .../impl/presentation/ForgotPasswordState.kt  |   9 --
 .../presentation/ForgotPasswordViewModel.kt   | 105 +++++++++++++-----
 .../intents/ForgotPasswordCommand.kt          |   7 ++
 .../intents/ForgotPasswordEvent.kt            |   7 ++
 .../presentation/mapper/EmailValidator.kt     |  28 +++++
 .../mapper/ForgotPasswordScreenMapper.kt      |  41 +++++++
 .../state/ForgotPasswordScreenState.kt        |  14 +++
 .../presentation/state/ForgotPasswordState.kt |   9 ++
 .../ru/yeahub/impl/ui/ForgotPasswordRoute.kt  |  16 +--
 .../ru/yeahub/impl/ui/ForgotPasswordScreen.kt | 100 ++++++++++++++---
 .../java/ru/yeahub/impl/ExampleUnitTest.kt    |  16 ---
 feature/forgot-password/proguard-rules.pro    |  21 ----
 .../ExampleInstrumentedTest.kt                |  22 ----
 .../yeahub/forgot_password/ExampleUnitTest.kt |  16 ---
 27 files changed, 334 insertions(+), 279 deletions(-)
 delete mode 100644 feature/forgot-password/api/proguard-rules.pro
 delete mode 100644 feature/forgot-password/api/src/androidTest/java/ru/yeahub/api/ExampleInstrumentedTest.kt
 delete mode 100644 feature/forgot-password/api/src/test/java/ru/yeahub/api/ExampleUnitTest.kt
 delete mode 100644 feature/forgot-password/impl/proguard-rules.pro
 delete mode 100644 feature/forgot-password/impl/src/androidTest/java/ru/yeahub/impl/ExampleInstrumentedTest.kt
 delete mode 100644 feature/forgot-password/impl/src/main/java/ru/yeahub/impl/presentation/ForgotPasswordEffect.kt
 delete mode 100644 feature/forgot-password/impl/src/main/java/ru/yeahub/impl/presentation/ForgotPasswordIntent.kt
 delete mode 100644 feature/forgot-password/impl/src/main/java/ru/yeahub/impl/presentation/ForgotPasswordState.kt
 create mode 100644 feature/forgot-password/impl/src/main/java/ru/yeahub/impl/presentation/intents/ForgotPasswordCommand.kt
 create mode 100644 feature/forgot-password/impl/src/main/java/ru/yeahub/impl/presentation/intents/ForgotPasswordEvent.kt
 create mode 100644 feature/forgot-password/impl/src/main/java/ru/yeahub/impl/presentation/mapper/EmailValidator.kt
 create mode 100644 feature/forgot-password/impl/src/main/java/ru/yeahub/impl/presentation/mapper/ForgotPasswordScreenMapper.kt
 create mode 100644 feature/forgot-password/impl/src/main/java/ru/yeahub/impl/presentation/state/ForgotPasswordScreenState.kt
 create mode 100644 feature/forgot-password/impl/src/main/java/ru/yeahub/impl/presentation/state/ForgotPasswordState.kt
 delete mode 100644 feature/forgot-password/impl/src/test/java/ru/yeahub/impl/ExampleUnitTest.kt
 delete mode 100644 feature/forgot-password/proguard-rules.pro
 delete mode 100644 feature/forgot-password/src/androidTest/java/ru/yeahub/forgot_password/ExampleInstrumentedTest.kt
 delete mode 100644 feature/forgot-password/src/test/java/ru/yeahub/forgot_password/ExampleUnitTest.kt

diff --git a/.idea/.gitignore b/.idea/.gitignore
index 1ed342ca..945b9558 100644
--- a/.idea/.gitignore
+++ b/.idea/.gitignore
@@ -18,6 +18,8 @@ output-metadata.json
 # IntelliJ
 *.iml
 .idea/
+gradle.xml
+compiler.xml
 !.idea/runConfigurations/
 misc.xml
 deploymentTargetDropDown.xml
diff --git a/core/ui/src/main/java/ru/yeahub/core_ui/component/Button.kt b/core/ui/src/main/java/ru/yeahub/core_ui/component/Button.kt
index 93c39781..d2beaa04 100644
--- a/core/ui/src/main/java/ru/yeahub/core_ui/component/Button.kt
+++ b/core/ui/src/main/java/ru/yeahub/core_ui/component/Button.kt
@@ -53,7 +53,7 @@ fun PrimaryButton(
         interactionSource = interactionSource,
         shape = shape,
         contentPadding = contentPadding,
-        content = content
+        content = content,
     )
 }
 
@@ -78,7 +78,7 @@ fun SecondaryButton(
         interactionSource = interactionSource,
         shape = shape,
         contentPadding = contentPadding,
-        content = content
+        content = content,
     )
 }
 
@@ -103,7 +103,7 @@ fun OutlineButton(
         interactionSource = interactionSource,
         shape = shape,
         contentPadding = contentPadding,
-        content = content
+        content = content,
     )
 }
 
@@ -130,7 +130,7 @@ private fun DefaultButton(
         color = containerColor,
         contentColor = contentColor,
         border = border,
-        interactionSource = interactionSource
+        interactionSource = interactionSource,
     ) {
         CompositionLocalProvider(
             value = LocalContentColor provides contentColor
@@ -140,7 +140,7 @@ private fun DefaultButton(
                     .padding(contentPadding),
                 horizontalArrangement = Arrangement.Center,
                 verticalAlignment = Alignment.CenterVertically,
-                content = content
+                content = content,
             )
         }
     }
@@ -158,7 +158,7 @@ object YeahubButtonDefaults {
             contentColor = contentColor,
             containerColor = containerColor,
             disabledContentColor = disabledContentColor,
-            disabledContainerColor = disabledContainerColor
+            disabledContainerColor = disabledContainerColor,
         )
     }
 
@@ -173,7 +173,7 @@ object YeahubButtonDefaults {
             contentColor = contentColor,
             containerColor = containerColor,
             disabledContentColor = disabledContentColor,
-            disabledContainerColor = disabledContainerColor
+            disabledContainerColor = disabledContainerColor,
         )
     }
 
@@ -188,7 +188,7 @@ object YeahubButtonDefaults {
             contentColor = contentColor,
             containerColor = containerColor,
             disabledContentColor = disabledContentColor,
-            disabledContainerColor = disabledContainerColor
+            disabledContainerColor = disabledContainerColor,
         )
     }
 
@@ -203,7 +203,7 @@ object YeahubButtonDefaults {
             contentColor = contentColor,
             containerColor = containerColor,
             disabledContentColor = disabledContentColor,
-            disabledContainerColor = disabledContainerColor
+            disabledContainerColor = disabledContainerColor,
         )
     }
 
@@ -218,7 +218,7 @@ object YeahubButtonDefaults {
             contentColor = contentColor,
             containerColor = containerColor,
             disabledContentColor = disabledContentColor,
-            disabledContainerColor = disabledContainerColor
+            disabledContainerColor = disabledContainerColor,
         )
     }
 
@@ -229,7 +229,7 @@ object YeahubButtonDefaults {
     ): BorderStroke {
         return BorderStroke(
             width = width,
-            color = borderColor
+            color = borderColor,
         )
     }
 }
diff --git a/core/ui/src/main/java/ru/yeahub/core_ui/component/textInput/TextInput.kt b/core/ui/src/main/java/ru/yeahub/core_ui/component/textInput/TextInput.kt
index 97136d36..e67d01b5 100644
--- a/core/ui/src/main/java/ru/yeahub/core_ui/component/textInput/TextInput.kt
+++ b/core/ui/src/main/java/ru/yeahub/core_ui/component/textInput/TextInput.kt
@@ -176,7 +176,7 @@ fun DefaultTextField(
     isEnabled: Boolean = true,
     isError: Boolean = false,
     singleLine: Boolean = true,
-    showLeadingIcon: Boolean = true,
+    showLeadingIcon: Boolean = false,
     shape: Shape = RoundedCornerShape(12.dp),
     interactionSource: MutableInteractionSource = remember { MutableInteractionSource() }
 ) {
@@ -251,7 +251,7 @@ fun DefaultTextField(
             unfocusedBorderColor = defaultBorder,
             focusedBorderColor = TextInputColorsDefaults.focusBorder(),
             disabledBorderColor = TextInputColorsDefaults.defaultsBorder(),
-            errorBorderColor = TextInputColorsDefaults.errorBorder()
+            errorBorderColor = TextInputColorsDefaults.errorBorder(),
         ),
         keyboardActions = KeyboardActions(
             onSearch = {
@@ -261,7 +261,7 @@ fun DefaultTextField(
             }
         ),
         keyboardOptions = KeyboardOptions(imeAction = ImeAction.Search),
-        interactionSource = interactionSource
+        interactionSource = interactionSource,
     )
 }
 
diff --git a/feature/forgot-password/api/proguard-rules.pro b/feature/forgot-password/api/proguard-rules.pro
deleted file mode 100644
index 481bb434..00000000
--- a/feature/forgot-password/api/proguard-rules.pro
+++ /dev/null
@@ -1,21 +0,0 @@
-# Add project specific ProGuard rules here.
-# You can control the set of applied configuration files using the
-# proguardFiles setting in build.gradle.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
-
-# Uncomment this to preserve the line number information for
-# debugging stack traces.
-#-keepattributes SourceFile,LineNumberTable
-
-# If you keep the line number information, uncomment this to
-# hide the original source file name.
-#-renamesourcefileattribute SourceFile
\ No newline at end of file
diff --git a/feature/forgot-password/api/src/androidTest/java/ru/yeahub/api/ExampleInstrumentedTest.kt b/feature/forgot-password/api/src/androidTest/java/ru/yeahub/api/ExampleInstrumentedTest.kt
deleted file mode 100644
index c5731cb3..00000000
--- a/feature/forgot-password/api/src/androidTest/java/ru/yeahub/api/ExampleInstrumentedTest.kt
+++ /dev/null
@@ -1,22 +0,0 @@
-package ru.yeahub.api
-
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import androidx.test.platform.app.InstrumentationRegistry
-import org.junit.Assert.assertEquals
-import org.junit.Test
-import org.junit.runner.RunWith
-
-/**
- * Instrumented test, which will execute on an Android device.
- *
- * See [testing documentation](http://d.android.com/tools/testing).
- */
-@RunWith(AndroidJUnit4::class)
-class ExampleInstrumentedTest {
-    @Test
-    fun useAppContext() {
-        // Context of the app under test.
-        val appContext = InstrumentationRegistry.getInstrumentation().targetContext
-        assertEquals("ru.yeahub.api.test", appContext.packageName)
-    }
-}
\ No newline at end of file
diff --git a/feature/forgot-password/api/src/test/java/ru/yeahub/api/ExampleUnitTest.kt b/feature/forgot-password/api/src/test/java/ru/yeahub/api/ExampleUnitTest.kt
deleted file mode 100644
index 59dc864e..00000000
--- a/feature/forgot-password/api/src/test/java/ru/yeahub/api/ExampleUnitTest.kt
+++ /dev/null
@@ -1,16 +0,0 @@
-package ru.yeahub.api
-
-import org.junit.Assert.assertEquals
-import org.junit.Test
-
-/**
- * Example local unit test, which will execute on the development machine (host).
- *
- * See [testing documentation](http://d.android.com/tools/testing).
- */
-class ExampleUnitTest {
-    @Test
-    fun addition_isCorrect() {
-        assertEquals(4, 2 + 2)
-    }
-}
\ No newline at end of file
diff --git a/feature/forgot-password/impl/proguard-rules.pro b/feature/forgot-password/impl/proguard-rules.pro
deleted file mode 100644
index 481bb434..00000000
--- a/feature/forgot-password/impl/proguard-rules.pro
+++ /dev/null
@@ -1,21 +0,0 @@
-# Add project specific ProGuard rules here.
-# You can control the set of applied configuration files using the
-# proguardFiles setting in build.gradle.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
-
-# Uncomment this to preserve the line number information for
-# debugging stack traces.
-#-keepattributes SourceFile,LineNumberTable
-
-# If you keep the line number information, uncomment this to
-# hide the original source file name.
-#-renamesourcefileattribute SourceFile
\ No newline at end of file
diff --git a/feature/forgot-password/impl/src/androidTest/java/ru/yeahub/impl/ExampleInstrumentedTest.kt b/feature/forgot-password/impl/src/androidTest/java/ru/yeahub/impl/ExampleInstrumentedTest.kt
deleted file mode 100644
index 669e7bdf..00000000
--- a/feature/forgot-password/impl/src/androidTest/java/ru/yeahub/impl/ExampleInstrumentedTest.kt
+++ /dev/null
@@ -1,22 +0,0 @@
-package ru.yeahub.impl
-
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import androidx.test.platform.app.InstrumentationRegistry
-import org.junit.Assert.assertEquals
-import org.junit.Test
-import org.junit.runner.RunWith
-
-/**
- * Instrumented test, which will execute on an Android device.
- *
- * See [testing documentation](http://d.android.com/tools/testing).
- */
-@RunWith(AndroidJUnit4::class)
-class ExampleInstrumentedTest {
-    @Test
-    fun useAppContext() {
-        // Context of the app under test.
-        val appContext = InstrumentationRegistry.getInstrumentation().targetContext
-        assertEquals("ru.yeahub.impl.test", appContext.packageName)
-    }
-}
\ No newline at end of file
diff --git a/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/data/repository/ForgotPasswordRepositoryImpl.kt b/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/data/repository/ForgotPasswordRepositoryImpl.kt
index c0de3467..2185a3c6 100644
--- a/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/data/repository/ForgotPasswordRepositoryImpl.kt
+++ b/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/data/repository/ForgotPasswordRepositoryImpl.kt
@@ -1,5 +1,6 @@
 package ru.yeahub.impl.data.repository
 
+import kotlinx.coroutines.CancellationException
 import java.io.IOException
 import ru.yeahub.impl.data.dto.ForgotPasswordRequestDto
 import ru.yeahub.impl.data.mapper.ForgotPasswordMapper
@@ -18,15 +19,35 @@ class ForgotPasswordRepositoryImpl(
         return try {
             val dto = api.forgotPassword(ForgotPasswordRequestDto(email))
             mapper.toDomain(dto)
-        } catch (e: IOException) {
-            Timber.e("Network error sending reset link for email: $email, error: ${e.message}")
-            ForgotPasswordResult.Error("Ошибка сети. Проверьте подключение к интернету.")
-        } catch (e: IllegalArgumentException) {
-            Timber.e("Invalid data error sending reset link for email: $email, error: ${e.message}")
-            ForgotPasswordResult.Error("Некорректные данные. Проверьте введенный email.")
-        } catch (e: Exception) {
-            Timber.e("Unexpected error sending reset link for email: $email, error: ${e.message}")
-            ForgotPasswordResult.Error("Неизвестная ошибка. Попробуйте позже.")
+        } catch (e: Throwable) {
+            if (e is CancellationException) throw e
+            when (e) {
+                is IOException -> {
+                    Timber.e(
+                        "Network error sending reset link for email: $email," +
+                                "error: ${e.message}"
+                    )
+                    ForgotPasswordResult.Error(
+                        "Ошибка сети. Проверьте подключение к интернету."
+                    )
+                }
+                is IllegalArgumentException -> {
+                    Timber.e(
+                        "Invalid data error sending reset link for email: $email, " +
+                                "error: ${e.message}"
+                    )
+                    ForgotPasswordResult.Error(
+                        "Некорректные данные. Проверьте введенный email."
+                    )
+                }
+                else -> {
+                    Timber.e(
+                        "Unexpected error sending reset link for email: $email," +
+                                "error: ${e.message}"
+                    )
+                    ForgotPasswordResult.Error("Неизвестная ошибка. Попробуйте позже.")
+                }
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/di/ForgotPasswordFactory.kt b/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/di/ForgotPasswordFactory.kt
index 992fb18d..f7202c10 100644
--- a/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/di/ForgotPasswordFactory.kt
+++ b/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/di/ForgotPasswordFactory.kt
@@ -5,11 +5,19 @@ import ru.yeahub.impl.data.remote.AuthApi
 import ru.yeahub.impl.data.repository.ForgotPasswordRepositoryImpl
 import ru.yeahub.impl.domain.SendResetLinkUseCase
 import ru.yeahub.impl.presentation.ForgotPasswordViewModel
+import ru.yeahub.impl.presentation.mapper.EmailValidator
+import ru.yeahub.impl.presentation.mapper.ForgotPasswordScreenMapper
 
 object ForgotPasswordFactory {
-    fun createViewModel(api: AuthApi, mapper: ForgotPasswordMapper): ForgotPasswordViewModel {
-        val repo = ForgotPasswordRepositoryImpl(api, mapper)
-        val useCase = SendResetLinkUseCase(repo)
-        return ForgotPasswordViewModel(useCase)
+
+    fun createViewModel(
+        api: AuthApi,
+        mapper: ForgotPasswordMapper,
+        emailValidator: EmailValidator,
+    ): ForgotPasswordViewModel {
+        val forgotPasswordRepository = ForgotPasswordRepositoryImpl(api, mapper)
+        val sendResetLinkUseCase = SendResetLinkUseCase(forgotPasswordRepository)
+        val forgotPasswordScreenMapper = ForgotPasswordScreenMapper(emailValidator)
+        return ForgotPasswordViewModel(forgotPasswordScreenMapper, sendResetLinkUseCase)
     }
 }
\ No newline at end of file
diff --git a/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/domain/ForgotPasswordRepository.kt b/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/domain/ForgotPasswordRepository.kt
index d46b17ae..07aef5e8 100644
--- a/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/domain/ForgotPasswordRepository.kt
+++ b/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/domain/ForgotPasswordRepository.kt
@@ -1,5 +1,6 @@
 package ru.yeahub.impl.domain
 
 interface ForgotPasswordRepository {
+
     suspend fun sendResetLink(email: String): ForgotPasswordResult
 }
\ No newline at end of file
diff --git a/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/presentation/ForgotPasswordEffect.kt b/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/presentation/ForgotPasswordEffect.kt
deleted file mode 100644
index d7003d57..00000000
--- a/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/presentation/ForgotPasswordEffect.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package ru.yeahub.impl.presentation
-
-sealed interface ForgotPasswordEffect {
-    data class ShowSnackbar(val message: String) : ForgotPasswordEffect
-    data object NavigateBack : ForgotPasswordEffect
-    data object NavigateToCheckEmail : ForgotPasswordEffect
-}
\ No newline at end of file
diff --git a/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/presentation/ForgotPasswordIntent.kt b/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/presentation/ForgotPasswordIntent.kt
deleted file mode 100644
index 92303708..00000000
--- a/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/presentation/ForgotPasswordIntent.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package ru.yeahub.impl.presentation
-
-    sealed interface ForgotPasswordIntent {
-        data class EmailChanged(val value: String) : ForgotPasswordIntent
-        data object SubmitClicked : ForgotPasswordIntent
-        data object BackClicked : ForgotPasswordIntent
-    }
diff --git a/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/presentation/ForgotPasswordState.kt b/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/presentation/ForgotPasswordState.kt
deleted file mode 100644
index 34835851..00000000
--- a/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/presentation/ForgotPasswordState.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-package ru.yeahub.impl.presentation
-
-data class ForgotPasswordState(
-    val email: String = "",
-    val isLoading: Boolean = false,
-    val isEmailError: Boolean = false,
-    val emailErrorText: String? = null,
-    val isSent: Boolean = false
-)
\ No newline at end of file
diff --git a/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/presentation/ForgotPasswordViewModel.kt b/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/presentation/ForgotPasswordViewModel.kt
index af81914a..487eedea 100644
--- a/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/presentation/ForgotPasswordViewModel.kt
+++ b/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/presentation/ForgotPasswordViewModel.kt
@@ -2,71 +2,122 @@ package ru.yeahub.impl.presentation
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import kotlinx.coroutines.channels.Channel
+import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.SharedFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asStateFlow
-import kotlinx.coroutines.flow.receiveAsFlow
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
 import ru.yeahub.impl.domain.ForgotPasswordResult
 import ru.yeahub.impl.domain.SendResetLinkUseCase
+import ru.yeahub.impl.presentation.intents.ForgotPasswordCommand
+import ru.yeahub.impl.presentation.intents.ForgotPasswordEvent
+import ru.yeahub.impl.presentation.mapper.ForgotPasswordScreenMapper
+import ru.yeahub.impl.presentation.state.ForgotPasswordScreenState
+import ru.yeahub.impl.presentation.state.ForgotPasswordState
 
 class ForgotPasswordViewModel(
-    private val sendResetLink: SendResetLinkUseCase
+    private val forgotPasswordScreenMapper: ForgotPasswordScreenMapper,
+    private val sendResetLinkUseCase: SendResetLinkUseCase
 ) : ViewModel() {
 
-    private val _state = MutableStateFlow(ForgotPasswordState())
-    val state: StateFlow<ForgotPasswordState> = _state.asStateFlow()
+    private val _state = MutableStateFlow(
+        ForgotPasswordState(
+            email = "",
+            isLoading = false,
+            error = null,
+            emailValidationError = "",
+            isSuccessDialogVisible = false,
+        )
+    )
 
-    private val _effect = Channel<ForgotPasswordEffect>(Channel.BUFFERED)
-    val effect = _effect.receiveAsFlow()
+    private val _uiState =
+        MutableStateFlow<ForgotPasswordScreenState>(ForgotPasswordScreenState.Initial)
+    val uiState: StateFlow<ForgotPasswordScreenState> = _uiState.asStateFlow()
 
-    fun onIntent(intent: ForgotPasswordIntent) {
-        when (intent) {
-            is ForgotPasswordIntent.EmailChanged -> onEmailChanged(intent.value)
-            is ForgotPasswordIntent.SubmitClicked -> onSubmit()
-            is ForgotPasswordIntent.BackClicked -> emitEffect(ForgotPasswordEffect.NavigateBack)
+    private val _commands =
+        MutableSharedFlow<ForgotPasswordCommand>()
+    val commands: SharedFlow<ForgotPasswordCommand> = _commands
+
+    init {
+        viewModelScope.launch {
+            _state.collect { state ->
+                _uiState.value = forgotPasswordScreenMapper.getScreenState(state)
+            }
+        }
+    }
+
+    fun handleEvents(event: ForgotPasswordEvent) {
+        when (event) {
+            is ForgotPasswordEvent.EmailChanged -> onEmailChanged(event.value)
+            is ForgotPasswordEvent.SubmitClicked -> onSubmit()
+            is ForgotPasswordEvent.BackClicked -> handleBackClick()
         }
     }
 
     private fun onEmailChanged(value: String) {
-        _state.update {
-            it.copy(
+        _state.update { currentState ->
+            val validationError = if (value.isNotBlank()) {
+                forgotPasswordScreenMapper.validateEmail(value)
+            } else {
+                null
+            }
+            currentState.copy(
                 email = value,
-                isEmailError = false,
-                emailErrorText = null,
-                isSent = false
+                emailValidationError = validationError,
+                error = null
             )
         }
     }
 
     private fun onSubmit() {
-        val email = state.value.email
-        _state.update { it.copy(isLoading = true) }
+        val currentState = _state.value
+        val email = currentState.email.trim()
+
+        if (!forgotPasswordScreenMapper.canSubmit(email)) {
+            _state.update {
+                it.copy(emailValidationError = forgotPasswordScreenMapper.validateEmail(email))
+            }
+            return
+        }
+
+        _state.update { it.copy(isLoading = true, error = null) }
 
         viewModelScope.launch {
-            when (val result = sendResetLink(email)) {
+            when (val result = sendResetLinkUseCase(email)) {
                 is ForgotPasswordResult.Success -> {
-                    _state.update { it.copy(isLoading = false, isSent = true) }
-                    emitEffect(ForgotPasswordEffect.NavigateToCheckEmail)
+                    _state.update {
+                        it.copy(
+                            isLoading = false,
+                            isSuccessDialogVisible = true
+                        )
+                    }
+                    emitCommand(ForgotPasswordCommand.NavigateToCheckEmail)
                 }
 
                 is ForgotPasswordResult.Error -> {
                     _state.update {
                         it.copy(
                             isLoading = false,
-                            isEmailError = true,
-                            emailErrorText = result.message
+                            error = result.message
                         )
                     }
-                    emitEffect(ForgotPasswordEffect.ShowSnackbar(result.message))
+                    emitCommand(ForgotPasswordCommand.ShowSnackbar(result.message))
                 }
             }
         }
     }
 
-    private fun emitEffect(effect: ForgotPasswordEffect) {
-        viewModelScope.launch { _effect.send(effect) }
+    private fun handleBackClick() {
+        viewModelScope.launch {
+            _commands.emit(ForgotPasswordCommand.NavigateBack)
+        }
+    }
+
+    private fun emitCommand(command: ForgotPasswordCommand) {
+        viewModelScope.launch {
+            _commands.emit(command)
+        }
     }
 }
\ No newline at end of file
diff --git a/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/presentation/intents/ForgotPasswordCommand.kt b/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/presentation/intents/ForgotPasswordCommand.kt
new file mode 100644
index 00000000..091724ec
--- /dev/null
+++ b/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/presentation/intents/ForgotPasswordCommand.kt
@@ -0,0 +1,7 @@
+package ru.yeahub.impl.presentation.intents
+
+sealed interface ForgotPasswordCommand {
+    data class ShowSnackbar(val message: String) : ForgotPasswordCommand
+    data object NavigateBack : ForgotPasswordCommand
+    data object NavigateToCheckEmail : ForgotPasswordCommand
+}
\ No newline at end of file
diff --git a/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/presentation/intents/ForgotPasswordEvent.kt b/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/presentation/intents/ForgotPasswordEvent.kt
new file mode 100644
index 00000000..72324f87
--- /dev/null
+++ b/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/presentation/intents/ForgotPasswordEvent.kt
@@ -0,0 +1,7 @@
+package ru.yeahub.impl.presentation.intents
+
+sealed interface ForgotPasswordEvent {
+    data class EmailChanged(val value: String) : ForgotPasswordEvent
+    data object SubmitClicked : ForgotPasswordEvent
+    data object BackClicked : ForgotPasswordEvent
+}
\ No newline at end of file
diff --git a/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/presentation/mapper/EmailValidator.kt b/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/presentation/mapper/EmailValidator.kt
new file mode 100644
index 00000000..19d9b3e7
--- /dev/null
+++ b/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/presentation/mapper/EmailValidator.kt
@@ -0,0 +1,28 @@
+package ru.yeahub.impl.presentation.mapper
+
+import android.util.Patterns
+
+sealed interface EmailValidationResult {
+    data object Valid : EmailValidationResult
+    data object Empty : EmailValidationResult
+    data class Invalid(val errorMessage: String) : EmailValidationResult
+}
+
+class EmailValidator {
+
+    fun validate(email: String): EmailValidationResult {
+        val trimmedEmail = email.trim()
+
+        return when {
+            trimmedEmail.isBlank() -> EmailValidationResult.Empty
+            !Patterns.EMAIL_ADDRESS.matcher(trimmedEmail).matches() -> {
+                EmailValidationResult.Invalid("Введите корректный email")
+            }
+            else -> EmailValidationResult.Valid
+        }
+    }
+
+    fun isValid(email: String): Boolean {
+        return validate(email) is EmailValidationResult.Valid
+    }
+}
\ No newline at end of file
diff --git a/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/presentation/mapper/ForgotPasswordScreenMapper.kt b/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/presentation/mapper/ForgotPasswordScreenMapper.kt
new file mode 100644
index 00000000..8dd1cbac
--- /dev/null
+++ b/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/presentation/mapper/ForgotPasswordScreenMapper.kt
@@ -0,0 +1,41 @@
+package ru.yeahub.impl.presentation.mapper
+
+import ru.yeahub.impl.presentation.state.ForgotPasswordScreenState
+import ru.yeahub.impl.presentation.state.ForgotPasswordState
+
+class ForgotPasswordScreenMapper(
+    private val emailValidator: EmailValidator,
+) {
+    fun getScreenState(state: ForgotPasswordState): ForgotPasswordScreenState {
+        return when {
+            state.error != null -> {
+                ForgotPasswordScreenState.Error(message = state.error)
+            }
+
+            state.email.isBlank() && state.emailValidationError == null -> {
+                ForgotPasswordScreenState.Initial
+            }
+
+            else -> {
+                ForgotPasswordScreenState.Content(
+                    email = state.email,
+                    isLoading = state.isLoading,
+                    emailError = state.emailValidationError,
+                    isSent = state.isSuccessDialogVisible,
+                )
+            }
+        }
+    }
+
+    fun validateEmail(email: String): String? {
+        return when (val result = emailValidator.validate(email)) {
+            is EmailValidationResult.Valid -> null
+            is EmailValidationResult.Empty -> null
+            is EmailValidationResult.Invalid -> result.errorMessage
+        }
+    }
+
+    fun canSubmit(email: String): Boolean {
+        return emailValidator.isValid(email)
+    }
+}
diff --git a/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/presentation/state/ForgotPasswordScreenState.kt b/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/presentation/state/ForgotPasswordScreenState.kt
new file mode 100644
index 00000000..11735ce2
--- /dev/null
+++ b/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/presentation/state/ForgotPasswordScreenState.kt
@@ -0,0 +1,14 @@
+package ru.yeahub.impl.presentation.state
+
+sealed class ForgotPasswordScreenState {
+    data object Initial : ForgotPasswordScreenState()
+    data class Content(
+        val email: String,
+        val isLoading: Boolean,
+        val emailError: String?,
+        val isSent: Boolean,
+    ) : ForgotPasswordScreenState() {
+        val isEmailValid: Boolean = emailError == null && email.isNotBlank()
+    }
+    data class Error(val message: String?) : ForgotPasswordScreenState()
+}
\ No newline at end of file
diff --git a/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/presentation/state/ForgotPasswordState.kt b/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/presentation/state/ForgotPasswordState.kt
new file mode 100644
index 00000000..78486f01
--- /dev/null
+++ b/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/presentation/state/ForgotPasswordState.kt
@@ -0,0 +1,9 @@
+package ru.yeahub.impl.presentation.state
+
+data class ForgotPasswordState(
+    val email: String,
+    val isLoading: Boolean,
+    val error: String?,
+    val emailValidationError: String?,
+    val isSuccessDialogVisible: Boolean,
+)
\ No newline at end of file
diff --git a/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/ui/ForgotPasswordRoute.kt b/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/ui/ForgotPasswordRoute.kt
index b86d6723..7264ad8e 100644
--- a/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/ui/ForgotPasswordRoute.kt
+++ b/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/ui/ForgotPasswordRoute.kt
@@ -4,8 +4,8 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
-import ru.yeahub.impl.presentation.ForgotPasswordEffect
 import ru.yeahub.impl.presentation.ForgotPasswordViewModel
+import ru.yeahub.impl.presentation.intents.ForgotPasswordCommand
 
 @Composable
 fun ForgotPasswordRoute(
@@ -14,20 +14,20 @@ fun ForgotPasswordRoute(
     onCheckEmail: () -> Unit,
     showSnackbar: suspend (String) -> Unit
 ) {
-    val state by viewModel.state.collectAsState()
+    val state by viewModel.uiState.collectAsState()
 
     LaunchedEffect(Unit) {
-        viewModel.effect.collect { effect ->
-            when (effect) {
-                is ForgotPasswordEffect.NavigateBack -> onBack()
-                is ForgotPasswordEffect.NavigateToCheckEmail -> onCheckEmail()
-                is ForgotPasswordEffect.ShowSnackbar -> showSnackbar(effect.message)
+        viewModel.commands.collect { command ->
+            when (command) {
+                is ForgotPasswordCommand.NavigateBack -> onBack()
+                is ForgotPasswordCommand.NavigateToCheckEmail -> onCheckEmail()
+                is ForgotPasswordCommand.ShowSnackbar -> showSnackbar(command.message)
             }
         }
     }
 
     ForgotPasswordScreen(
         state = state,
-        onIntent = viewModel::onIntent
+        onEvent = viewModel::handleEvents
     )
 }
\ No newline at end of file
diff --git a/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/ui/ForgotPasswordScreen.kt b/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/ui/ForgotPasswordScreen.kt
index 1139f366..e8e55718 100644
--- a/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/ui/ForgotPasswordScreen.kt
+++ b/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/ui/ForgotPasswordScreen.kt
@@ -21,17 +21,15 @@ import ru.yeahub.core_ui.component.textInput.DefaultTextField
 import ru.yeahub.core_ui.component.textInput.TextInputColorsDefaults
 import ru.yeahub.core_ui.theme.Theme
 import ru.yeahub.impl.R
-import ru.yeahub.impl.presentation.ForgotPasswordIntent
-import ru.yeahub.impl.presentation.ForgotPasswordState
+import ru.yeahub.impl.presentation.intents.ForgotPasswordEvent
+import ru.yeahub.impl.presentation.state.ForgotPasswordScreenState
 
 @Composable
 fun ForgotPasswordScreen(
     modifier: Modifier = Modifier,
-    state: ForgotPasswordState,
-    onIntent: (ForgotPasswordIntent) -> Unit
+    state: ForgotPasswordScreenState,
+    onEvent: (ForgotPasswordEvent) -> Unit
 ) {
-    val isEmailValid = state.email.contains("@") && state.email.contains(".")
-
     Column(
         modifier = modifier
             .fillMaxSize()
@@ -59,13 +57,30 @@ fun ForgotPasswordScreen(
         )
 
         Spacer(Modifier.height(6.dp))
-        
+
+        val email = when (state) {
+            is ForgotPasswordScreenState.Content -> state.email
+            else -> ""
+        }
+        val isLoading = when (state) {
+            is ForgotPasswordScreenState.Content -> state.isLoading
+            else -> false
+        }
+        val emailError = when (state) {
+            is ForgotPasswordScreenState.Content -> state.emailError
+            else -> null
+        }
+        val isEmailValid = when (state) {
+            is ForgotPasswordScreenState.Content -> state.isEmailValid
+            else -> false
+        }
+
         DefaultTextField(
-            value = state.email,
-            onValueChange = { onIntent(ForgotPasswordIntent.EmailChanged(it)) },
+            value = email,
+            onValueChange = { onEvent(ForgotPasswordEvent.EmailChanged(it)) },
             label = stringResource(R.string.enter_email),
-            isEnabled = !state.isLoading,
-            isError = state.isEmailError,
+            isEnabled = !isLoading,
+            isError = emailError != null,
             showLeadingIcon = false,
             onExpandedChange = { },
             modifier = Modifier
@@ -74,11 +89,20 @@ fun ForgotPasswordScreen(
             colors = TextInputColorsDefaults.defaultColors()
         )
 
+        if (emailError != null) {
+            Spacer(Modifier.height(4.dp))
+            Text(
+                text = emailError,
+                style = Theme.typography.body3,
+                color = Theme.colors.red500
+            )
+        }
+
         Spacer(Modifier.height(20.dp))
 
         PrimaryButton(
-            onClick = { onIntent(ForgotPasswordIntent.SubmitClicked) },
-            enabled = isEmailValid && !state.isLoading,
+            onClick = { onEvent(ForgotPasswordEvent.SubmitClicked) },
+            enabled = isEmailValid && !isLoading,
             modifier = Modifier
                 .fillMaxWidth()
                 .height(48.dp),
@@ -97,11 +121,53 @@ fun ForgotPasswordScreen(
     }
 }
 
-@Preview(showBackground = true)
+@Preview(showBackground = true, name = "Initial State")
+@Composable
+fun ForgotPasswordScreenPreview_Initial() {
+    ForgotPasswordScreen(
+        state = ForgotPasswordScreenState.Initial,
+        onEvent = {}
+    )
+}
+
+@Preview(showBackground = true, name = "Valid Email")
+@Composable
+fun ForgotPasswordScreenPreview_Valid() {
+    ForgotPasswordScreen(
+        state = ForgotPasswordScreenState.Content(
+            email = "user@example.com",
+            isLoading = false,
+            emailError = null,
+            isSent = false
+        ),
+        onEvent = {}
+    )
+}
+
+@Preview(showBackground = true, name = "Invalid Email")
+@Composable
+fun ForgotPasswordScreenPreview_Invalid() {
+    ForgotPasswordScreen(
+        state = ForgotPasswordScreenState.Content(
+            email = "invalid-email",
+            isLoading = false,
+            emailError = "Введите корректный email",
+            isSent = false
+        ),
+        onEvent = {}
+    )
+}
+
+@Preview(showBackground = true, name = "Loading")
 @Composable
-fun ForgotPasswordScreenPreview() {
+fun ForgotPasswordScreenPreview_Loading() {
     ForgotPasswordScreen(
-        state = ForgotPasswordState(),
-        onIntent = {}
+        state = ForgotPasswordScreenState.Content(
+            email = "user@example.com",
+            isLoading = true,
+            emailError = null,
+            isSent = false
+        ),
+        onEvent = {}
     )
 }
diff --git a/feature/forgot-password/impl/src/test/java/ru/yeahub/impl/ExampleUnitTest.kt b/feature/forgot-password/impl/src/test/java/ru/yeahub/impl/ExampleUnitTest.kt
deleted file mode 100644
index d86c56b0..00000000
--- a/feature/forgot-password/impl/src/test/java/ru/yeahub/impl/ExampleUnitTest.kt
+++ /dev/null
@@ -1,16 +0,0 @@
-package ru.yeahub.impl
-
-import org.junit.Assert.assertEquals
-import org.junit.Test
-
-/**
- * Example local unit test, which will execute on the development machine (host).
- *
- * See [testing documentation](http://d.android.com/tools/testing).
- */
-class ExampleUnitTest {
-    @Test
-    fun addition_isCorrect() {
-        assertEquals(4, 2 + 2)
-    }
-}
\ No newline at end of file
diff --git a/feature/forgot-password/proguard-rules.pro b/feature/forgot-password/proguard-rules.pro
deleted file mode 100644
index 481bb434..00000000
--- a/feature/forgot-password/proguard-rules.pro
+++ /dev/null
@@ -1,21 +0,0 @@
-# Add project specific ProGuard rules here.
-# You can control the set of applied configuration files using the
-# proguardFiles setting in build.gradle.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
-
-# Uncomment this to preserve the line number information for
-# debugging stack traces.
-#-keepattributes SourceFile,LineNumberTable
-
-# If you keep the line number information, uncomment this to
-# hide the original source file name.
-#-renamesourcefileattribute SourceFile
\ No newline at end of file
diff --git a/feature/forgot-password/src/androidTest/java/ru/yeahub/forgot_password/ExampleInstrumentedTest.kt b/feature/forgot-password/src/androidTest/java/ru/yeahub/forgot_password/ExampleInstrumentedTest.kt
deleted file mode 100644
index 02c0b56e..00000000
--- a/feature/forgot-password/src/androidTest/java/ru/yeahub/forgot_password/ExampleInstrumentedTest.kt
+++ /dev/null
@@ -1,22 +0,0 @@
-package ru.yeahub.forgot_password
-
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import androidx.test.platform.app.InstrumentationRegistry
-import org.junit.Assert.assertEquals
-import org.junit.Test
-import org.junit.runner.RunWith
-
-/**
- * Instrumented test, which will execute on an Android device.
- *
- * See [testing documentation](http://d.android.com/tools/testing).
- */
-@RunWith(AndroidJUnit4::class)
-class ExampleInstrumentedTest {
-    @Test
-    fun useAppContext() {
-        // Context of the app under test.
-        val appContext = InstrumentationRegistry.getInstrumentation().targetContext
-        assertEquals("ru.yeahub.forgot_password.test", appContext.packageName)
-    }
-}
\ No newline at end of file
diff --git a/feature/forgot-password/src/test/java/ru/yeahub/forgot_password/ExampleUnitTest.kt b/feature/forgot-password/src/test/java/ru/yeahub/forgot_password/ExampleUnitTest.kt
deleted file mode 100644
index f3ab03aa..00000000
--- a/feature/forgot-password/src/test/java/ru/yeahub/forgot_password/ExampleUnitTest.kt
+++ /dev/null
@@ -1,16 +0,0 @@
-package ru.yeahub.forgot_password
-
-import org.junit.Assert.assertEquals
-import org.junit.Test
-
-/**
- * Example local unit test, which will execute on the development machine (host).
- *
- * See [testing documentation](http://d.android.com/tools/testing).
- */
-class ExampleUnitTest {
-    @Test
-    fun addition_isCorrect() {
-        assertEquals(4, 2 + 2)
-    }
-}
\ No newline at end of file

From 23a2ec43ac834880485a1431bf080eaabcaf3b9e Mon Sep 17 00:00:00 2001
From: 2olka <brayanevoni@gmail.com>
Date: Thu, 12 Mar 2026 15:55:43 +0500
Subject: [PATCH 23/31] =?UTF-8?q?ANDR-75:=20=D0=B8=D1=81=D0=BF=D1=80=D0=B0?=
 =?UTF-8?q?=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=B7=D0=B0=D0=BC=D0=B5?=
 =?UTF-8?q?=D1=87=D0=B0=D0=BD=D0=B8=D0=B9=20Ktlint?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/compiler.xml                            |  2 --
 .idea/gradle.xml                              |  1 -
 .../presentation/ForgotPasswordViewModel.kt   | 30 +++++++++----------
 3 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 49e77a04..76b52f20 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -2,8 +2,6 @@
 <project version="4">
   <component name="CompilerConfiguration">
     <bytecodeTargetLevel target="11">
-      <module name="YeaHub.feature.authentication.api" target="21" />
-      <module name="YeaHub.feature.authentication.impl" target="21" />
       <module name="YeaHub.feature.profile-edit.api" target="21" />
       <module name="YeaHub.feature.profile-edit.impl" target="21" />
     </bytecodeTargetLevel>
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index a01a51bd..eed5d4c7 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -6,7 +6,6 @@
       <GradleProjectSettings>
         <option name="testRunner" value="CHOOSE_PER_TEST" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="#GRADLE_LOCAL_JAVA_HOME" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/presentation/ForgotPasswordViewModel.kt b/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/presentation/ForgotPasswordViewModel.kt
index 487eedea..346a31fc 100644
--- a/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/presentation/ForgotPasswordViewModel.kt
+++ b/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/presentation/ForgotPasswordViewModel.kt
@@ -22,7 +22,7 @@ class ForgotPasswordViewModel(
     private val sendResetLinkUseCase: SendResetLinkUseCase
 ) : ViewModel() {
 
-    private val _state = MutableStateFlow(
+    private val mutableState = MutableStateFlow(
         ForgotPasswordState(
             email = "",
             isLoading = false,
@@ -32,18 +32,18 @@ class ForgotPasswordViewModel(
         )
     )
 
-    private val _uiState =
+    private val mutableUiState =
         MutableStateFlow<ForgotPasswordScreenState>(ForgotPasswordScreenState.Initial)
-    val uiState: StateFlow<ForgotPasswordScreenState> = _uiState.asStateFlow()
+    val uiState: StateFlow<ForgotPasswordScreenState> = mutableUiState.asStateFlow()
 
-    private val _commands =
+    private val mutableCommands =
         MutableSharedFlow<ForgotPasswordCommand>()
-    val commands: SharedFlow<ForgotPasswordCommand> = _commands
+    val commands: SharedFlow<ForgotPasswordCommand> = mutableCommands
 
     init {
         viewModelScope.launch {
-            _state.collect { state ->
-                _uiState.value = forgotPasswordScreenMapper.getScreenState(state)
+            mutableState.collect { state ->
+                mutableUiState.value = forgotPasswordScreenMapper.getScreenState(state)
             }
         }
     }
@@ -57,7 +57,7 @@ class ForgotPasswordViewModel(
     }
 
     private fun onEmailChanged(value: String) {
-        _state.update { currentState ->
+        mutableState.update { currentState ->
             val validationError = if (value.isNotBlank()) {
                 forgotPasswordScreenMapper.validateEmail(value)
             } else {
@@ -72,22 +72,22 @@ class ForgotPasswordViewModel(
     }
 
     private fun onSubmit() {
-        val currentState = _state.value
+        val currentState = mutableState.value
         val email = currentState.email.trim()
 
         if (!forgotPasswordScreenMapper.canSubmit(email)) {
-            _state.update {
+            mutableState.update {
                 it.copy(emailValidationError = forgotPasswordScreenMapper.validateEmail(email))
             }
             return
         }
 
-        _state.update { it.copy(isLoading = true, error = null) }
+        mutableState.update { it.copy(isLoading = true, error = null) }
 
         viewModelScope.launch {
             when (val result = sendResetLinkUseCase(email)) {
                 is ForgotPasswordResult.Success -> {
-                    _state.update {
+                    mutableState.update {
                         it.copy(
                             isLoading = false,
                             isSuccessDialogVisible = true
@@ -97,7 +97,7 @@ class ForgotPasswordViewModel(
                 }
 
                 is ForgotPasswordResult.Error -> {
-                    _state.update {
+                    mutableState.update {
                         it.copy(
                             isLoading = false,
                             error = result.message
@@ -111,13 +111,13 @@ class ForgotPasswordViewModel(
 
     private fun handleBackClick() {
         viewModelScope.launch {
-            _commands.emit(ForgotPasswordCommand.NavigateBack)
+            mutableCommands.emit(ForgotPasswordCommand.NavigateBack)
         }
     }
 
     private fun emitCommand(command: ForgotPasswordCommand) {
         viewModelScope.launch {
-            _commands.emit(command)
+            mutableCommands.emit(command)
         }
     }
 }
\ No newline at end of file

From c8db0f162c82ebc0b6cb6d1f8abc05082cc4ecd7 Mon Sep 17 00:00:00 2001
From: 2olka <brayanevoni@gmail.com>
Date: Thu, 12 Mar 2026 16:11:18 +0500
Subject: [PATCH 24/31] =?UTF-8?q?ANDR-75:=20=D0=B8=D1=81=D0=BF=D1=80=D0=B0?=
 =?UTF-8?q?=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=B7=D0=B0=D0=BC=D0=B5?=
 =?UTF-8?q?=D1=87=D0=B0=D0=BD=D0=B8=D0=B9=20Detect?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ForgotPasswordRepositoryImpl.kt           | 52 ++++++++-----------
 1 file changed, 23 insertions(+), 29 deletions(-)

diff --git a/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/data/repository/ForgotPasswordRepositoryImpl.kt b/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/data/repository/ForgotPasswordRepositoryImpl.kt
index 2185a3c6..24722564 100644
--- a/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/data/repository/ForgotPasswordRepositoryImpl.kt
+++ b/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/data/repository/ForgotPasswordRepositoryImpl.kt
@@ -14,40 +14,34 @@ class ForgotPasswordRepositoryImpl(
     private val mapper: ForgotPasswordMapper
 ) : ForgotPasswordRepository {
 
-    @Suppress("TooGenericExceptionCaught")
     override suspend fun sendResetLink(email: String): ForgotPasswordResult {
         return try {
             val dto = api.forgotPassword(ForgotPasswordRequestDto(email))
             mapper.toDomain(dto)
+        } catch (e: CancellationException) {
+            throw e
+        } catch (e: IOException) {
+            Timber.e(
+                "Network error sending reset link for email: $email," +
+                        "error: ${e.message}"
+            )
+            ForgotPasswordResult.Error(
+                "Ошибка сети. Проверьте подключение к интернету."
+            )
+        } catch (e: IllegalArgumentException) {
+            Timber.e(
+                "Invalid data error sending reset link for email: $email, " +
+                        "error: ${e.message}"
+            )
+            ForgotPasswordResult.Error(
+                "Некорректные данные. Проверьте введенный email."
+            )
         } catch (e: Throwable) {
-            if (e is CancellationException) throw e
-            when (e) {
-                is IOException -> {
-                    Timber.e(
-                        "Network error sending reset link for email: $email," +
-                                "error: ${e.message}"
-                    )
-                    ForgotPasswordResult.Error(
-                        "Ошибка сети. Проверьте подключение к интернету."
-                    )
-                }
-                is IllegalArgumentException -> {
-                    Timber.e(
-                        "Invalid data error sending reset link for email: $email, " +
-                                "error: ${e.message}"
-                    )
-                    ForgotPasswordResult.Error(
-                        "Некорректные данные. Проверьте введенный email."
-                    )
-                }
-                else -> {
-                    Timber.e(
-                        "Unexpected error sending reset link for email: $email," +
-                                "error: ${e.message}"
-                    )
-                    ForgotPasswordResult.Error("Неизвестная ошибка. Попробуйте позже.")
-                }
-            }
+            Timber.e(
+                "Unexpected error sending reset link for email: $email," +
+                        "error: ${e.message}"
+            )
+            ForgotPasswordResult.Error("Неизвестная ошибка. Попробуйте позже.")
         }
     }
 }
\ No newline at end of file

From 3287b331450fb459d355c3732308e1b88c8f56c4 Mon Sep 17 00:00:00 2001
From: 2olka <brayanevoni@gmail.com>
Date: Thu, 12 Mar 2026 16:50:17 +0500
Subject: [PATCH 25/31] =?UTF-8?q?ANDR-75:=20=D0=B8=D1=81=D0=BF=D1=80=D0=B0?=
 =?UTF-8?q?=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=B7=D0=B0=D0=BC=D0=B5?=
 =?UTF-8?q?=D1=87=D0=B0=D0=BD=D0=B8=D0=B9=20Detect?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../yeahub/impl/data/repository/ForgotPasswordRepositoryImpl.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/data/repository/ForgotPasswordRepositoryImpl.kt b/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/data/repository/ForgotPasswordRepositoryImpl.kt
index 24722564..bc05581c 100644
--- a/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/data/repository/ForgotPasswordRepositoryImpl.kt
+++ b/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/data/repository/ForgotPasswordRepositoryImpl.kt
@@ -36,7 +36,7 @@ class ForgotPasswordRepositoryImpl(
             ForgotPasswordResult.Error(
                 "Некорректные данные. Проверьте введенный email."
             )
-        } catch (e: Throwable) {
+        } catch (e: Exception) {
             Timber.e(
                 "Unexpected error sending reset link for email: $email," +
                         "error: ${e.message}"

From d23dec9133cd21540b274ef5c384f112ce35e16b Mon Sep 17 00:00:00 2001
From: 2olka <brayanevoni@gmail.com>
Date: Thu, 12 Mar 2026 17:02:17 +0500
Subject: [PATCH 26/31] =?UTF-8?q?ANDR-75:=20=D0=B8=D1=81=D0=BF=D1=80=D0=B0?=
 =?UTF-8?q?=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=B7=D0=B0=D0=BC=D0=B5?=
 =?UTF-8?q?=D1=87=D0=B0=D0=BD=D0=B8=D0=B9=20Detect?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../yeahub/impl/data/repository/ForgotPasswordRepositoryImpl.kt  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/data/repository/ForgotPasswordRepositoryImpl.kt b/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/data/repository/ForgotPasswordRepositoryImpl.kt
index bc05581c..118a9cae 100644
--- a/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/data/repository/ForgotPasswordRepositoryImpl.kt
+++ b/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/data/repository/ForgotPasswordRepositoryImpl.kt
@@ -14,6 +14,7 @@ class ForgotPasswordRepositoryImpl(
     private val mapper: ForgotPasswordMapper
 ) : ForgotPasswordRepository {
 
+    @Suppress("TooGenericExceptionCaught")
     override suspend fun sendResetLink(email: String): ForgotPasswordResult {
         return try {
             val dto = api.forgotPassword(ForgotPasswordRequestDto(email))

From a17515c44404b1d0b654f100205e5b6c80dc75fb Mon Sep 17 00:00:00 2001
From: 2olka <brayanevoni@gmail.com>
Date: Mon, 16 Mar 2026 20:04:46 +0500
Subject: [PATCH 27/31] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2?=
 =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=B7=D0=B0=D0=BC=D0=B5=D1=87?=
 =?UTF-8?q?=D0=B0=D0=BD=D0=B8=D0=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/compiler.xml                            |  1 +
 feature/forgot-password/impl/build.gradle.kts |  3 ++
 .../yeahub/impl/di/ForgotPasswordFactory.kt   | 23 ---------------
 .../impl/di/ForgotPasswordViewModelModule.kt  | 20 +++++++++++++
 .../presentation/ForgotPasswordViewModel.kt   | 28 ++++++++++---------
 .../mapper/ForgotPasswordScreenMapper.kt      |  2 ++
 .../presentation/state/ForgotPasswordState.kt |  2 +-
 .../validator/EmailValidationResult.kt        |  7 +++++
 .../presentation/validator/EmailValidator.kt  |  6 ++++
 .../EmailValidatorImpl.kt}                    | 15 ++++------
 .../ru/yeahub/impl/ui/ForgotPasswordRoute.kt  |  5 ++--
 .../ru/yeahub/impl/ui/ForgotPasswordScreen.kt | 23 ++++++---------
 12 files changed, 71 insertions(+), 64 deletions(-)
 delete mode 100644 feature/forgot-password/impl/src/main/java/ru/yeahub/impl/di/ForgotPasswordFactory.kt
 create mode 100644 feature/forgot-password/impl/src/main/java/ru/yeahub/impl/di/ForgotPasswordViewModelModule.kt
 create mode 100644 feature/forgot-password/impl/src/main/java/ru/yeahub/impl/presentation/validator/EmailValidationResult.kt
 create mode 100644 feature/forgot-password/impl/src/main/java/ru/yeahub/impl/presentation/validator/EmailValidator.kt
 rename feature/forgot-password/impl/src/main/java/ru/yeahub/impl/presentation/{mapper/EmailValidator.kt => validator/EmailValidatorImpl.kt} (55%)

diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 76b52f20..dd57af9e 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -2,6 +2,7 @@
 <project version="4">
   <component name="CompilerConfiguration">
     <bytecodeTargetLevel target="11">
+      <module name="YeaHub.feature.enter-and-registration.mylibrary" target="21" />
       <module name="YeaHub.feature.profile-edit.api" target="21" />
       <module name="YeaHub.feature.profile-edit.impl" target="21" />
     </bytecodeTargetLevel>
diff --git a/feature/forgot-password/impl/build.gradle.kts b/feature/forgot-password/impl/build.gradle.kts
index 290ccdc7..aa9c142d 100644
--- a/feature/forgot-password/impl/build.gradle.kts
+++ b/feature/forgot-password/impl/build.gradle.kts
@@ -49,6 +49,9 @@ dependencies {
     implementation(libs.androidx.compose.material3)
     implementation(libs.timber)
     implementation(project(":core:ui"))
+    implementation(libs.koin.core)
+    implementation(libs.koin.android)
+    implementation(libs.koin.compose)
 
     // Compose Preview dependencies
     implementation(libs.androidx.ui.tooling.preview)
diff --git a/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/di/ForgotPasswordFactory.kt b/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/di/ForgotPasswordFactory.kt
deleted file mode 100644
index f7202c10..00000000
--- a/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/di/ForgotPasswordFactory.kt
+++ /dev/null
@@ -1,23 +0,0 @@
-package ru.yeahub.impl.di
-
-import ru.yeahub.impl.data.mapper.ForgotPasswordMapper
-import ru.yeahub.impl.data.remote.AuthApi
-import ru.yeahub.impl.data.repository.ForgotPasswordRepositoryImpl
-import ru.yeahub.impl.domain.SendResetLinkUseCase
-import ru.yeahub.impl.presentation.ForgotPasswordViewModel
-import ru.yeahub.impl.presentation.mapper.EmailValidator
-import ru.yeahub.impl.presentation.mapper.ForgotPasswordScreenMapper
-
-object ForgotPasswordFactory {
-
-    fun createViewModel(
-        api: AuthApi,
-        mapper: ForgotPasswordMapper,
-        emailValidator: EmailValidator,
-    ): ForgotPasswordViewModel {
-        val forgotPasswordRepository = ForgotPasswordRepositoryImpl(api, mapper)
-        val sendResetLinkUseCase = SendResetLinkUseCase(forgotPasswordRepository)
-        val forgotPasswordScreenMapper = ForgotPasswordScreenMapper(emailValidator)
-        return ForgotPasswordViewModel(forgotPasswordScreenMapper, sendResetLinkUseCase)
-    }
-}
\ No newline at end of file
diff --git a/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/di/ForgotPasswordViewModelModule.kt b/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/di/ForgotPasswordViewModelModule.kt
new file mode 100644
index 00000000..b28ab660
--- /dev/null
+++ b/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/di/ForgotPasswordViewModelModule.kt
@@ -0,0 +1,20 @@
+package ru.yeahub.impl.di
+
+import org.koin.androidx.viewmodel.dsl.viewModel
+import org.koin.dsl.module
+import ru.yeahub.impl.presentation.ForgotPasswordViewModel
+import ru.yeahub.impl.presentation.validator.EmailValidator
+import ru.yeahub.impl.presentation.validator.EmailValidatorImpl
+import ru.yeahub.impl.presentation.mapper.ForgotPasswordScreenMapper
+
+internal val forgotPasswordViewModelModule = module {
+    factory<EmailValidator> { EmailValidatorImpl() }
+    factory { ForgotPasswordScreenMapper(emailValidator = get()) }
+
+    viewModel {
+        ForgotPasswordViewModel(
+            forgotPasswordScreenMapper = get(),
+            sendResetLinkUseCase = get()
+        )
+    }
+}
\ No newline at end of file
diff --git a/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/presentation/ForgotPasswordViewModel.kt b/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/presentation/ForgotPasswordViewModel.kt
index 346a31fc..f8f6c961 100644
--- a/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/presentation/ForgotPasswordViewModel.kt
+++ b/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/presentation/ForgotPasswordViewModel.kt
@@ -2,11 +2,14 @@ package ru.yeahub.impl.presentation
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
+import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.SharedFlow
+import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.StateFlow
-import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.mapLatest
+import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
 import ru.yeahub.impl.domain.ForgotPasswordResult
@@ -17,6 +20,7 @@ import ru.yeahub.impl.presentation.mapper.ForgotPasswordScreenMapper
 import ru.yeahub.impl.presentation.state.ForgotPasswordScreenState
 import ru.yeahub.impl.presentation.state.ForgotPasswordState
 
+@OptIn(ExperimentalCoroutinesApi::class)
 class ForgotPasswordViewModel(
     private val forgotPasswordScreenMapper: ForgotPasswordScreenMapper,
     private val sendResetLinkUseCase: SendResetLinkUseCase
@@ -32,23 +36,21 @@ class ForgotPasswordViewModel(
         )
     )
 
-    private val mutableUiState =
-        MutableStateFlow<ForgotPasswordScreenState>(ForgotPasswordScreenState.Initial)
-    val uiState: StateFlow<ForgotPasswordScreenState> = mutableUiState.asStateFlow()
+    val uiState: StateFlow<ForgotPasswordScreenState> = mutableState
+        .mapLatest { state -> forgotPasswordScreenMapper
+            .getScreenState(state)
+        }
+        .stateIn(
+            scope = viewModelScope,
+            started = SharingStarted.WhileSubscribed(5_000),
+            initialValue = ForgotPasswordScreenState.Initial
+        )
 
     private val mutableCommands =
         MutableSharedFlow<ForgotPasswordCommand>()
     val commands: SharedFlow<ForgotPasswordCommand> = mutableCommands
 
-    init {
-        viewModelScope.launch {
-            mutableState.collect { state ->
-                mutableUiState.value = forgotPasswordScreenMapper.getScreenState(state)
-            }
-        }
-    }
-
-    fun handleEvents(event: ForgotPasswordEvent) {
+    fun onEvent(event: ForgotPasswordEvent) {
         when (event) {
             is ForgotPasswordEvent.EmailChanged -> onEmailChanged(event.value)
             is ForgotPasswordEvent.SubmitClicked -> onSubmit()
diff --git a/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/presentation/mapper/ForgotPasswordScreenMapper.kt b/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/presentation/mapper/ForgotPasswordScreenMapper.kt
index 8dd1cbac..faa32348 100644
--- a/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/presentation/mapper/ForgotPasswordScreenMapper.kt
+++ b/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/presentation/mapper/ForgotPasswordScreenMapper.kt
@@ -2,6 +2,8 @@ package ru.yeahub.impl.presentation.mapper
 
 import ru.yeahub.impl.presentation.state.ForgotPasswordScreenState
 import ru.yeahub.impl.presentation.state.ForgotPasswordState
+import ru.yeahub.impl.presentation.validator.EmailValidationResult
+import ru.yeahub.impl.presentation.validator.EmailValidator
 
 class ForgotPasswordScreenMapper(
     private val emailValidator: EmailValidator,
diff --git a/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/presentation/state/ForgotPasswordState.kt b/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/presentation/state/ForgotPasswordState.kt
index 78486f01..fc1ec152 100644
--- a/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/presentation/state/ForgotPasswordState.kt
+++ b/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/presentation/state/ForgotPasswordState.kt
@@ -1,6 +1,6 @@
 package ru.yeahub.impl.presentation.state
 
-data class ForgotPasswordState(
+data class ForgotPasswordState (
     val email: String,
     val isLoading: Boolean,
     val error: String?,
diff --git a/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/presentation/validator/EmailValidationResult.kt b/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/presentation/validator/EmailValidationResult.kt
new file mode 100644
index 00000000..f87b3977
--- /dev/null
+++ b/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/presentation/validator/EmailValidationResult.kt
@@ -0,0 +1,7 @@
+package ru.yeahub.impl.presentation.validator
+
+sealed interface EmailValidationResult {
+    data object Valid : EmailValidationResult
+    data object Empty : EmailValidationResult
+    data class Invalid(val errorMessage: String) : EmailValidationResult
+}
\ No newline at end of file
diff --git a/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/presentation/validator/EmailValidator.kt b/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/presentation/validator/EmailValidator.kt
new file mode 100644
index 00000000..f7bfeee6
--- /dev/null
+++ b/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/presentation/validator/EmailValidator.kt
@@ -0,0 +1,6 @@
+package ru.yeahub.impl.presentation.validator
+
+interface EmailValidator {
+    fun validate(email: String): EmailValidationResult
+    fun isValid(email: String): Boolean
+}
\ No newline at end of file
diff --git a/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/presentation/mapper/EmailValidator.kt b/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/presentation/validator/EmailValidatorImpl.kt
similarity index 55%
rename from feature/forgot-password/impl/src/main/java/ru/yeahub/impl/presentation/mapper/EmailValidator.kt
rename to feature/forgot-password/impl/src/main/java/ru/yeahub/impl/presentation/validator/EmailValidatorImpl.kt
index 19d9b3e7..95882947 100644
--- a/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/presentation/mapper/EmailValidator.kt
+++ b/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/presentation/validator/EmailValidatorImpl.kt
@@ -1,16 +1,10 @@
-package ru.yeahub.impl.presentation.mapper
+package ru.yeahub.impl.presentation.validator
 
 import android.util.Patterns
 
-sealed interface EmailValidationResult {
-    data object Valid : EmailValidationResult
-    data object Empty : EmailValidationResult
-    data class Invalid(val errorMessage: String) : EmailValidationResult
-}
+class EmailValidatorImpl: EmailValidator {
 
-class EmailValidator {
-
-    fun validate(email: String): EmailValidationResult {
+    override fun validate(email: String): EmailValidationResult {
         val trimmedEmail = email.trim()
 
         return when {
@@ -18,11 +12,12 @@ class EmailValidator {
             !Patterns.EMAIL_ADDRESS.matcher(trimmedEmail).matches() -> {
                 EmailValidationResult.Invalid("Введите корректный email")
             }
+
             else -> EmailValidationResult.Valid
         }
     }
 
-    fun isValid(email: String): Boolean {
+    override fun isValid(email: String): Boolean {
         return validate(email) is EmailValidationResult.Valid
     }
 }
\ No newline at end of file
diff --git a/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/ui/ForgotPasswordRoute.kt b/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/ui/ForgotPasswordRoute.kt
index 7264ad8e..6feb3e8a 100644
--- a/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/ui/ForgotPasswordRoute.kt
+++ b/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/ui/ForgotPasswordRoute.kt
@@ -4,6 +4,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import ru.yeahub.impl.presentation.ForgotPasswordViewModel
 import ru.yeahub.impl.presentation.intents.ForgotPasswordCommand
 
@@ -14,7 +15,7 @@ fun ForgotPasswordRoute(
     onCheckEmail: () -> Unit,
     showSnackbar: suspend (String) -> Unit
 ) {
-    val state by viewModel.uiState.collectAsState()
+    val state by viewModel.uiState.collectAsStateWithLifecycle()
 
     LaunchedEffect(Unit) {
         viewModel.commands.collect { command ->
@@ -28,6 +29,6 @@ fun ForgotPasswordRoute(
 
     ForgotPasswordScreen(
         state = state,
-        onEvent = viewModel::handleEvents
+        onEvent = viewModel::onEvent
     )
 }
\ No newline at end of file
diff --git a/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/ui/ForgotPasswordScreen.kt b/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/ui/ForgotPasswordScreen.kt
index e8e55718..42d4acf0 100644
--- a/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/ui/ForgotPasswordScreen.kt
+++ b/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/ui/ForgotPasswordScreen.kt
@@ -58,22 +58,15 @@ fun ForgotPasswordScreen(
 
         Spacer(Modifier.height(6.dp))
 
-        val email = when (state) {
-            is ForgotPasswordScreenState.Content -> state.email
-            else -> ""
-        }
-        val isLoading = when (state) {
-            is ForgotPasswordScreenState.Content -> state.isLoading
-            else -> false
-        }
-        val emailError = when (state) {
-            is ForgotPasswordScreenState.Content -> state.emailError
+        val contentState = when (state) {
+            is ForgotPasswordScreenState.Content -> state
             else -> null
         }
-        val isEmailValid = when (state) {
-            is ForgotPasswordScreenState.Content -> state.isEmailValid
-            else -> false
-        }
+
+        val email = contentState?.email.orEmpty()
+        val isLoading = contentState?.isLoading ?: false
+        val emailError = contentState?.emailError
+        val isEmailValid = contentState?.isEmailValid ?: false
 
         DefaultTextField(
             value = email,
@@ -149,7 +142,7 @@ fun ForgotPasswordScreenPreview_Valid() {
 fun ForgotPasswordScreenPreview_Invalid() {
     ForgotPasswordScreen(
         state = ForgotPasswordScreenState.Content(
-            email = "invalid-email",
+            email = "invalid email",
             isLoading = false,
             emailError = "Введите корректный email",
             isSent = false

From 0af4f77090dfaa9e5b05762e1aeafc6ae6d00ef9 Mon Sep 17 00:00:00 2001
From: 2olka <brayanevoni@gmail.com>
Date: Mon, 16 Mar 2026 20:39:05 +0500
Subject: [PATCH 28/31] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2?=
 =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=B7=D0=B0=D0=BC=D0=B5=D1=87?=
 =?UTF-8?q?=D0=B0=D0=BD=D0=B8=D0=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../presentation/ForgotPasswordViewModel.kt   | 65 ++++++++++++-------
 .../mapper/ForgotPasswordScreenMapper.kt      | 23 +++++--
 .../presentation/state/ForgotPasswordState.kt | 26 ++++++--
 3 files changed, 76 insertions(+), 38 deletions(-)

diff --git a/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/presentation/ForgotPasswordViewModel.kt b/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/presentation/ForgotPasswordViewModel.kt
index f8f6c961..4b23a82c 100644
--- a/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/presentation/ForgotPasswordViewModel.kt
+++ b/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/presentation/ForgotPasswordViewModel.kt
@@ -26,19 +26,17 @@ class ForgotPasswordViewModel(
     private val sendResetLinkUseCase: SendResetLinkUseCase
 ) : ViewModel() {
 
-    private val mutableState = MutableStateFlow(
-        ForgotPasswordState(
+    private val mutableState = MutableStateFlow<ForgotPasswordState>(
+        ForgotPasswordState.Content(
             email = "",
-            isLoading = false,
-            error = null,
-            emailValidationError = "",
+            emailValidationError = null,
             isSuccessDialogVisible = false,
         )
     )
 
     val uiState: StateFlow<ForgotPasswordScreenState> = mutableState
-        .mapLatest { state -> forgotPasswordScreenMapper
-            .getScreenState(state)
+        .mapLatest { state ->
+            forgotPasswordScreenMapper.getScreenState(state)
         }
         .stateIn(
             scope = viewModelScope,
@@ -59,16 +57,17 @@ class ForgotPasswordViewModel(
     }
 
     private fun onEmailChanged(value: String) {
-        mutableState.update { currentState ->
-            val validationError = if (value.isNotBlank()) {
-                forgotPasswordScreenMapper.validateEmail(value)
-            } else {
-                null
-            }
-            currentState.copy(
+        val validationError = if (value.isNotBlank()) {
+            forgotPasswordScreenMapper.validateEmail(value)
+        } else {
+            null
+        }
+
+        mutableState.update {
+            ForgotPasswordState.Content(
                 email = value,
                 emailValidationError = validationError,
-                error = null
+                isSuccessDialogVisible = false,
             )
         }
     }
@@ -79,20 +78,30 @@ class ForgotPasswordViewModel(
 
         if (!forgotPasswordScreenMapper.canSubmit(email)) {
             mutableState.update {
-                it.copy(emailValidationError = forgotPasswordScreenMapper.validateEmail(email))
+                ForgotPasswordState.Content(
+                    email = email,
+                    emailValidationError = forgotPasswordScreenMapper.validateEmail(email),
+                    isSuccessDialogVisible = false,
+                )
             }
             return
         }
 
-        mutableState.update { it.copy(isLoading = true, error = null) }
+        mutableState.update {
+            ForgotPasswordState.Loading(
+                email = email,
+                emailValidationError = null,
+            )
+        }
 
         viewModelScope.launch {
             when (val result = sendResetLinkUseCase(email)) {
                 is ForgotPasswordResult.Success -> {
                     mutableState.update {
-                        it.copy(
-                            isLoading = false,
-                            isSuccessDialogVisible = true
+                        ForgotPasswordState.Content(
+                            email = email,
+                            emailValidationError = null,
+                            isSuccessDialogVisible = true,
                         )
                     }
                     emitCommand(ForgotPasswordCommand.NavigateToCheckEmail)
@@ -100,9 +109,10 @@ class ForgotPasswordViewModel(
 
                 is ForgotPasswordResult.Error -> {
                     mutableState.update {
-                        it.copy(
-                            isLoading = false,
-                            error = result.message
+                        ForgotPasswordState.Error(
+                            email = email,
+                            error = result.message,
+                            emailValidationError = null,
                         )
                     }
                     emitCommand(ForgotPasswordCommand.ShowSnackbar(result.message))
@@ -122,4 +132,11 @@ class ForgotPasswordViewModel(
             mutableCommands.emit(command)
         }
     }
-}
\ No newline at end of file
+
+    private val ForgotPasswordState.email: String
+        get() = when (this) {
+            is ForgotPasswordState.Content -> email
+            is ForgotPasswordState.Loading -> email
+            is ForgotPasswordState.Error -> email
+        }
+}
diff --git a/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/presentation/mapper/ForgotPasswordScreenMapper.kt b/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/presentation/mapper/ForgotPasswordScreenMapper.kt
index faa32348..b628e7c6 100644
--- a/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/presentation/mapper/ForgotPasswordScreenMapper.kt
+++ b/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/presentation/mapper/ForgotPasswordScreenMapper.kt
@@ -9,21 +9,30 @@ class ForgotPasswordScreenMapper(
     private val emailValidator: EmailValidator,
 ) {
     fun getScreenState(state: ForgotPasswordState): ForgotPasswordScreenState {
-        return when {
-            state.error != null -> {
+        return when (state) {
+            is ForgotPasswordState.Error -> {
                 ForgotPasswordScreenState.Error(message = state.error)
             }
 
-            state.email.isBlank() && state.emailValidationError == null -> {
-                ForgotPasswordScreenState.Initial
+            is ForgotPasswordState.Content -> {
+                if (state.email.isBlank() && state.emailValidationError == null) {
+                    ForgotPasswordScreenState.Initial
+                } else {
+                    ForgotPasswordScreenState.Content(
+                        email = state.email,
+                        isLoading = false,
+                        emailError = state.emailValidationError,
+                        isSent = state.isSuccessDialogVisible,
+                    )
+                }
             }
 
-            else -> {
+            is ForgotPasswordState.Loading -> {
                 ForgotPasswordScreenState.Content(
                     email = state.email,
-                    isLoading = state.isLoading,
+                    isLoading = true,
                     emailError = state.emailValidationError,
-                    isSent = state.isSuccessDialogVisible,
+                    isSent = false,
                 )
             }
         }
diff --git a/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/presentation/state/ForgotPasswordState.kt b/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/presentation/state/ForgotPasswordState.kt
index fc1ec152..32106af1 100644
--- a/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/presentation/state/ForgotPasswordState.kt
+++ b/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/presentation/state/ForgotPasswordState.kt
@@ -1,9 +1,21 @@
 package ru.yeahub.impl.presentation.state
 
-data class ForgotPasswordState (
-    val email: String,
-    val isLoading: Boolean,
-    val error: String?,
-    val emailValidationError: String?,
-    val isSuccessDialogVisible: Boolean,
-)
\ No newline at end of file
+sealed interface ForgotPasswordState {
+
+    data class Content(
+        val email: String,
+        val emailValidationError: String?,
+        val isSuccessDialogVisible: Boolean,
+    ) : ForgotPasswordState
+
+    data class Loading(
+        val email: String,
+        val emailValidationError: String?,
+    ) : ForgotPasswordState
+
+    data class Error(
+        val email: String,
+        val error: String,
+        val emailValidationError: String?,
+    ) : ForgotPasswordState
+}
\ No newline at end of file

From 84295412f87da96d939b1524c6dc35d669041ebf Mon Sep 17 00:00:00 2001
From: 2olka <brayanevoni@gmail.com>
Date: Mon, 16 Mar 2026 21:17:40 +0500
Subject: [PATCH 29/31] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2?=
 =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=B7=D0=B0=D0=BC=D0=B5=D1=87?=
 =?UTF-8?q?=D0=B0=D0=BD=D0=B8=D0=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ru/yeahub/impl/presentation/ForgotPasswordViewModel.kt | 7 +++----
 .../yeahub/impl/presentation/state/ForgotPasswordState.kt  | 1 -
 .../impl/presentation/validator/EmailValidatorImpl.kt      | 2 +-
 .../src/main/java/ru/yeahub/impl/ui/ForgotPasswordRoute.kt | 1 -
 4 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/presentation/ForgotPasswordViewModel.kt b/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/presentation/ForgotPasswordViewModel.kt
index 4b23a82c..86a8a86f 100644
--- a/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/presentation/ForgotPasswordViewModel.kt
+++ b/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/presentation/ForgotPasswordViewModel.kt
@@ -26,7 +26,8 @@ class ForgotPasswordViewModel(
     private val sendResetLinkUseCase: SendResetLinkUseCase
 ) : ViewModel() {
 
-    private val mutableState = MutableStateFlow<ForgotPasswordState>(
+    private val mutableState =
+        MutableStateFlow<ForgotPasswordState>(
         ForgotPasswordState.Content(
             email = "",
             emailValidationError = null,
@@ -35,9 +36,7 @@ class ForgotPasswordViewModel(
     )
 
     val uiState: StateFlow<ForgotPasswordScreenState> = mutableState
-        .mapLatest { state ->
-            forgotPasswordScreenMapper.getScreenState(state)
-        }
+        .mapLatest { state -> forgotPasswordScreenMapper.getScreenState(state) }
         .stateIn(
             scope = viewModelScope,
             started = SharingStarted.WhileSubscribed(5_000),
diff --git a/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/presentation/state/ForgotPasswordState.kt b/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/presentation/state/ForgotPasswordState.kt
index 32106af1..9e3906fd 100644
--- a/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/presentation/state/ForgotPasswordState.kt
+++ b/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/presentation/state/ForgotPasswordState.kt
@@ -1,7 +1,6 @@
 package ru.yeahub.impl.presentation.state
 
 sealed interface ForgotPasswordState {
-
     data class Content(
         val email: String,
         val emailValidationError: String?,
diff --git a/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/presentation/validator/EmailValidatorImpl.kt b/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/presentation/validator/EmailValidatorImpl.kt
index 95882947..b78b7c86 100644
--- a/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/presentation/validator/EmailValidatorImpl.kt
+++ b/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/presentation/validator/EmailValidatorImpl.kt
@@ -2,7 +2,7 @@ package ru.yeahub.impl.presentation.validator
 
 import android.util.Patterns
 
-class EmailValidatorImpl: EmailValidator {
+class EmailValidatorImpl : EmailValidator {
 
     override fun validate(email: String): EmailValidationResult {
         val trimmedEmail = email.trim()
diff --git a/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/ui/ForgotPasswordRoute.kt b/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/ui/ForgotPasswordRoute.kt
index 6feb3e8a..c07c1acc 100644
--- a/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/ui/ForgotPasswordRoute.kt
+++ b/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/ui/ForgotPasswordRoute.kt
@@ -2,7 +2,6 @@ package ru.yeahub.impl.ui
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import ru.yeahub.impl.presentation.ForgotPasswordViewModel

From b017692a3d157cea61b19a9de87451a6e1b12364 Mon Sep 17 00:00:00 2001
From: 2olka <brayanevoni@gmail.com>
Date: Mon, 16 Mar 2026 21:35:40 +0500
Subject: [PATCH 30/31] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2?=
 =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=B7=D0=B0=D0=BC=D0=B5=D1=87?=
 =?UTF-8?q?=D0=B0=D0=BD=D0=B8=D0=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ru/yeahub/impl/presentation/ForgotPasswordViewModel.kt  | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/presentation/ForgotPasswordViewModel.kt b/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/presentation/ForgotPasswordViewModel.kt
index 86a8a86f..909178d3 100644
--- a/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/presentation/ForgotPasswordViewModel.kt
+++ b/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/presentation/ForgotPasswordViewModel.kt
@@ -26,6 +26,10 @@ class ForgotPasswordViewModel(
     private val sendResetLinkUseCase: SendResetLinkUseCase
 ) : ViewModel() {
 
+    private companion object {
+        const val STOP_TIMEOUT_MILLIS = 5_000L
+    }
+
     private val mutableState =
         MutableStateFlow<ForgotPasswordState>(
         ForgotPasswordState.Content(
@@ -39,7 +43,7 @@ class ForgotPasswordViewModel(
         .mapLatest { state -> forgotPasswordScreenMapper.getScreenState(state) }
         .stateIn(
             scope = viewModelScope,
-            started = SharingStarted.WhileSubscribed(5_000),
+            started = SharingStarted.WhileSubscribed(STOP_TIMEOUT_MILLIS),
             initialValue = ForgotPasswordScreenState.Initial
         )
 

From c632b36f0317b3dc6c21096fbac6ea991c1afa37 Mon Sep 17 00:00:00 2001
From: 2olka <brayanevoni@gmail.com>
Date: Mon, 16 Mar 2026 21:47:39 +0500
Subject: [PATCH 31/31] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2?=
 =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=B7=D0=B0=D0=BC=D0=B5=D1=87?=
 =?UTF-8?q?=D0=B0=D0=BD=D0=B8=D0=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../yeahub/impl/di/ForgotPasswordFactory.kt   | 23 -------------------
 1 file changed, 23 deletions(-)
 delete mode 100644 feature/forgot-password/impl/src/main/java/ru/yeahub/impl/di/ForgotPasswordFactory.kt

diff --git a/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/di/ForgotPasswordFactory.kt b/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/di/ForgotPasswordFactory.kt
deleted file mode 100644
index f7202c10..00000000
--- a/feature/forgot-password/impl/src/main/java/ru/yeahub/impl/di/ForgotPasswordFactory.kt
+++ /dev/null
@@ -1,23 +0,0 @@
-package ru.yeahub.impl.di
-
-import ru.yeahub.impl.data.mapper.ForgotPasswordMapper
-import ru.yeahub.impl.data.remote.AuthApi
-import ru.yeahub.impl.data.repository.ForgotPasswordRepositoryImpl
-import ru.yeahub.impl.domain.SendResetLinkUseCase
-import ru.yeahub.impl.presentation.ForgotPasswordViewModel
-import ru.yeahub.impl.presentation.mapper.EmailValidator
-import ru.yeahub.impl.presentation.mapper.ForgotPasswordScreenMapper
-
-object ForgotPasswordFactory {
-
-    fun createViewModel(
-        api: AuthApi,
-        mapper: ForgotPasswordMapper,
-        emailValidator: EmailValidator,
-    ): ForgotPasswordViewModel {
-        val forgotPasswordRepository = ForgotPasswordRepositoryImpl(api, mapper)
-        val sendResetLinkUseCase = SendResetLinkUseCase(forgotPasswordRepository)
-        val forgotPasswordScreenMapper = ForgotPasswordScreenMapper(emailValidator)
-        return ForgotPasswordViewModel(forgotPasswordScreenMapper, sendResetLinkUseCase)
-    }
-}
\ No newline at end of file