|
@@ -19,6 +19,8 @@ import androidx.compose.ui.Modifier
|
|
import androidx.compose.ui.unit.dp
|
|
import androidx.compose.ui.unit.dp
|
|
import androidx.hilt.navigation.compose.hiltViewModel
|
|
import androidx.hilt.navigation.compose.hiltViewModel
|
|
import androidx.navigation.NavHostController
|
|
import androidx.navigation.NavHostController
|
|
|
|
+import com.example.wabi.domain.navigation.Routes
|
|
|
|
+import com.example.wabi.domain.repository.UserData
|
|
import com.example.wabi.ui.theme.WabiTheme
|
|
import com.example.wabi.ui.theme.WabiTheme
|
|
import com.example.wabi.view.common_elements.button.ButtonLink
|
|
import com.example.wabi.view.common_elements.button.ButtonLink
|
|
import com.example.wabi.view.common_elements.button.MainButton
|
|
import com.example.wabi.view.common_elements.button.MainButton
|
|
@@ -32,6 +34,8 @@ fun SignIn(navController: NavHostController, vm: SignInViewModel = hiltViewModel
|
|
val data = vm.data
|
|
val data = vm.data
|
|
val printError = remember { mutableStateOf(false) }
|
|
val printError = remember { mutableStateOf(false) }
|
|
|
|
|
|
|
|
+ UserData.currentScreen = Routes.SIGNIN
|
|
|
|
+
|
|
Column(
|
|
Column(
|
|
modifier = Modifier
|
|
modifier = Modifier
|
|
.fillMaxSize()
|
|
.fillMaxSize()
|
|
@@ -84,7 +88,7 @@ fun SignIn(navController: NavHostController, vm: SignInViewModel = hiltViewModel
|
|
vm.goToRegistration(navController = navController)
|
|
vm.goToRegistration(navController = navController)
|
|
},
|
|
},
|
|
textContent = "Зарегистирируйтесь!",
|
|
textContent = "Зарегистирируйтесь!",
|
|
- modifierButton = Modifier.offset(y = -15.dp),
|
|
|
|
|
|
+ modifierButton = Modifier.offset(y = (-15).dp),
|
|
colorContent = WabiTheme.colors.mainColor
|
|
colorContent = WabiTheme.colors.mainColor
|
|
)
|
|
)
|
|
MainButton(
|
|
MainButton(
|