forked from melod1n/fast-messenger
vk.com -> vk.ru
This commit is contained in:
+2
@@ -50,6 +50,7 @@ import androidx.compose.ui.text.input.TextFieldValue
|
||||
import androidx.compose.ui.tooling.preview.Preview
|
||||
import androidx.compose.ui.unit.dp
|
||||
import androidx.lifecycle.compose.collectAsStateWithLifecycle
|
||||
import androidx.lifecycle.viewmodel.compose.LocalViewModelStoreOwner
|
||||
import coil.compose.AsyncImage
|
||||
import dev.meloda.fast.auth.captcha.CaptchaViewModel
|
||||
import dev.meloda.fast.auth.captcha.CaptchaViewModelImpl
|
||||
@@ -66,6 +67,7 @@ fun CaptchaRoute(
|
||||
onResult: (String) -> Unit,
|
||||
viewModel: CaptchaViewModel = koinViewModel<CaptchaViewModelImpl>()
|
||||
) {
|
||||
LocalViewModelStoreOwner.current
|
||||
val screenState by viewModel.screenState.collectAsStateWithLifecycle()
|
||||
val isNeedToOpenLogin by viewModel.isNeedToOpenLogin.collectAsStateWithLifecycle()
|
||||
|
||||
|
||||
@@ -3,6 +3,7 @@ package dev.meloda.fast.auth.login.navigation
|
||||
import androidx.compose.runtime.LaunchedEffect
|
||||
import androidx.compose.runtime.getValue
|
||||
import androidx.lifecycle.compose.collectAsStateWithLifecycle
|
||||
import androidx.lifecycle.viewmodel.compose.LocalViewModelStoreOwner
|
||||
import androidx.navigation.NavBackStackEntry
|
||||
import androidx.navigation.NavController
|
||||
import androidx.navigation.NavGraphBuilder
|
||||
|
||||
@@ -393,7 +393,7 @@ fun LoginScreen(
|
||||
TextButton(
|
||||
onClick = {
|
||||
context.startActivity(
|
||||
Intent(Intent.ACTION_VIEW, "https://vk.com/join".toUri())
|
||||
Intent(Intent.ACTION_VIEW, "https://vk.ru/join".toUri())
|
||||
)
|
||||
}
|
||||
) {
|
||||
@@ -408,7 +408,7 @@ fun LoginScreen(
|
||||
TextButton(
|
||||
onClick = {
|
||||
context.startActivity(
|
||||
Intent(Intent.ACTION_VIEW, "https://vk.com/restore".toUri())
|
||||
Intent(Intent.ACTION_VIEW, "https://vk.ru/restore".toUri())
|
||||
)
|
||||
}
|
||||
) {
|
||||
|
||||
+3
-5
@@ -168,10 +168,8 @@ fun ConversationsScreen(
|
||||
|
||||
val toolbarContainerColor by animateColorAsState(
|
||||
targetValue =
|
||||
if (currentTheme.enableBlur || !listState.canScrollBackward)
|
||||
MaterialTheme.colorScheme.surface
|
||||
else
|
||||
MaterialTheme.colorScheme.surfaceColorAtElevation(3.dp),
|
||||
if (!listState.canScrollBackward) MaterialTheme.colorScheme.surface
|
||||
else MaterialTheme.colorScheme.surfaceColorAtElevation(3.dp),
|
||||
label = "toolbarColorAlpha",
|
||||
animationSpec = tween(durationMillis = 50)
|
||||
)
|
||||
@@ -266,7 +264,7 @@ fun ConversationsScreen(
|
||||
if (currentTheme.enableBlur) {
|
||||
Modifier.hazeEffect(
|
||||
state = hazeState,
|
||||
style = HazeMaterials.thick()
|
||||
style = HazeMaterials.regular(toolbarContainerColor)
|
||||
)
|
||||
} else Modifier
|
||||
)
|
||||
|
||||
+1
-1
@@ -107,7 +107,7 @@ fun SettingsScreen(
|
||||
if (themeConfig.enableBlur) {
|
||||
Modifier.hazeEffect(
|
||||
state = hazeState,
|
||||
style = HazeMaterials.thick()
|
||||
style = HazeMaterials.regular()
|
||||
)
|
||||
} else {
|
||||
Modifier
|
||||
|
||||
Reference in New Issue
Block a user