support for articles; ui & ux & logic fixes for 2fa and captcha screens; fix mentions;

feature/auth/captcha/src/main/kotlin/com/meloda/app/fast/auth/captcha/CaptchaViewModel.kt

@@ -2,7 +2,6 @@ package com.meloda.app.fast.auth.captcha
 
 import androidx.lifecycle.SavedStateHandle
 import androidx.lifecycle.ViewModel
-import com.meloda.app.fast.auth.captcha.model.CaptchaArguments
 import com.meloda.app.fast.auth.captcha.model.CaptchaScreenState
 import com.meloda.app.fast.auth.captcha.navigation.Captcha
 import com.meloda.app.fast.auth.captcha.validation.CaptchaValidator
@@ -13,16 +12,14 @@ import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.update
 
 interface CaptchaViewModel {
-
     val screenState: StateFlow<CaptchaScreenState>
+    val isNeedToOpenLogin: StateFlow<Boolean>
 
     fun onCodeInputChanged(newCode: String)
 
     fun onTextFieldDoneClicked()
     fun onDoneButtonClicked()
 
-    fun setArguments(arguments: CaptchaArguments)
-
     fun onNavigatedToLogin()
 }
 
@@ -32,6 +29,7 @@ class CaptchaViewModelImpl(
 ) : CaptchaViewModel, ViewModel() {
 
     override val screenState = MutableStateFlow(CaptchaScreenState.EMPTY)
+    override val isNeedToOpenLogin = MutableStateFlow(false)
 
     init {
         val arguments = Captcha.from(savedStateHandle).arguments
@@ -57,20 +55,12 @@ class CaptchaViewModelImpl(
     override fun onDoneButtonClicked() {
         if (!processValidation()) return
 
-        screenState.updateValue(screenState.value.copy(isNeedToOpenLogin = true))
-    }
-
-    override fun setArguments(arguments: CaptchaArguments) {
-//        screenState.updateValue(
-//            screenState.value.copy(
-//                captchaSid = arguments.captchaSid,
-//                captchaImage = arguments.captchaImage
-//            )
-//        )
+        isNeedToOpenLogin.update { true }
     }
 
     override fun onNavigatedToLogin() {
         screenState.updateValue(CaptchaScreenState.EMPTY)
+        isNeedToOpenLogin.update { false }
     }
 
     private fun processValidation(): Boolean {

feature/auth/captcha/src/main/kotlin/com/meloda/app/fast/auth/captcha/model/CaptchaScreenState.kt

@@ -4,8 +4,7 @@ data class CaptchaScreenState(
     val captchaSid: String,
     val captchaImage: String,
     val captchaCode: String,
-    val codeError: Boolean,
-    val isNeedToOpenLogin: Boolean
+    val codeError: Boolean
 ) {
 
     companion object {
@@ -13,8 +12,7 @@ data class CaptchaScreenState(
             captchaSid = "",
             captchaImage = "",
             captchaCode = "",
-            codeError = false,
-            isNeedToOpenLogin = false
+            codeError = false
         )
     }
 }

feature/auth/captcha/src/main/kotlin/com/meloda/app/fast/auth/captcha/navigation/CaptchaRoute.kt

@@ -41,7 +41,7 @@ fun NavController.navigateToCaptcha(arguments: CaptchaArguments) {
     this.navigate(Captcha(arguments))
 }
 
-fun NavController.setCaptchaResult(code: String) {
+fun NavController.setCaptchaResult(code: String?) {
     this.currentBackStackEntry
         ?.savedStateHandle
         ?.set("captchacode", code)

feature/auth/captcha/src/main/kotlin/com/meloda/app/fast/auth/captcha/presentation/CaptchaScreen.kt

@@ -27,6 +27,7 @@ import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
 import androidx.compose.material3.TextField
 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
@@ -61,6 +62,7 @@ fun CaptchaScreen(
     viewModel: CaptchaViewModel = koinViewModel<CaptchaViewModelImpl>()
 ) {
     val screenState by viewModel.screenState.collectAsStateWithLifecycle()
+    val isNeedToOpenLogin by viewModel.isNeedToOpenLogin.collectAsStateWithLifecycle()
 
     var confirmedExit by rememberSaveable {
         mutableStateOf(false)
@@ -70,8 +72,10 @@ fun CaptchaScreen(
         mutableStateOf(false)
     }
 
-    if (confirmedExit) {
-        onBack()
+    LaunchedEffect(confirmedExit) {
+        if (confirmedExit) {
+            onBack()
+        }
     }
 
     BackHandler(enabled = !confirmedExit) {
@@ -93,9 +97,11 @@ fun CaptchaScreen(
         )
     }
 
-    if (screenState.isNeedToOpenLogin) {
-        viewModel.onNavigatedToLogin()
-        onResult(screenState.captchaCode)
+    LaunchedEffect(isNeedToOpenLogin) {
+        if (isNeedToOpenLogin) {
+            viewModel.onNavigatedToLogin()
+            onResult(screenState.captchaCode)
+        }
     }
 
     val focusManager = LocalFocusManager.current