anyproto/anytype-kotlin
1
0
Fork 0
mirror of https://github.com/anyproto/anytype-kotlin.git synced 2025-06-08 05:47:05 +09:00
Code Activity

DROID-1464 Onboarding | Enhancement | Back navigation in login-flow (#125)

Browse source
This commit is contained in:
Evgenii Kozlov 2023-07-04 18:25:25 +02:00 • committed by GitHub
parent a3efc4a1bc
commit 274a96fa36
Signed by: github
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 25 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

26
app/src/main/java/com/anytypeio/anytype/ui/onboarding/screens/signin/OnboardingRecoveryPhraseLoginScreen.kt
View file

@ -14,7 +14,6 @@ import androidx.compose.runtime.Composable
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.ui.Alignment
import androidx.compose.ui.ExperimentalComposeUiApi
import androidx.compose.ui.Modifier
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.platform.LocalFocusManager
@ -49,7 +48,6 @@ fun RecoveryScreenWrapper(
)
}
@OptIn(ExperimentalComposeUiApi::class)
@Composable
fun RecoveryScreen(
onBackClicked: () -> Unit,
@ -58,12 +56,13 @@ fun RecoveryScreen(
onScanQrClicked: () -> Unit
) {
Box(
modifier = Modifier
.fillMaxSize()
.padding(top = 24.dp)
modifier = Modifier.fillMaxSize()
) {
Text(
modifier = Modifier.align(Alignment.TopCenter),
modifier = Modifier
.align(Alignment.TopCenter)
.padding(top = 20.dp)
,
text = stringResource(id = R.string.login),
style = TitleLogin.copy(
color = OnBoardingTextPrimaryColor
@ -84,9 +83,14 @@ fun RecoveryScreen(
item {
OnboardingInput(
modifier = Modifier
.padding(
start = 18.dp,
end = 18.dp,
top = 71.dp,
bottom = 18.dp
)
.height(165.dp)
.fillMaxWidth()
.height(164.dp)
.padding(start = 18.dp, end = 18.dp, top = 48.dp, bottom = 18.dp)
,
text = text,
singleLine = false,
@ -151,12 +155,12 @@ fun RecoveryScreen(
Image(
modifier = Modifier
.align(Alignment.TopStart)
.padding(top = 8.dp, start = 24.dp)
.padding(top = 15.dp, start = 9.dp)
.noRippleClickable {
onBackClicked.invoke()
},
painter = painterResource(id = R.drawable.icon_back_onboarding),
contentDescription = "back"
painter = painterResource(id = R.drawable.ic_back_onboarding_32),
contentDescription = "Back button"
)
}
}

10
core-ui/src/main/res/drawable/ic_back_onboarding_32.xml Normal file
View file

@ -0,0 +1,10 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="32dp"
android:height="32dp"
android:viewportWidth="32"
android:viewportHeight="32">
<path
android:pathData="M20.091,10.211C20.384,10.492 20.384,10.948 20.091,11.229L15.121,16L20.091,20.771C20.384,21.052 20.384,21.508 20.091,21.789C19.798,22.07 19.323,22.07 19.03,21.789L13,16L19.03,10.211C19.323,9.93 19.798,9.93 20.091,10.211Z"
android:fillColor="#A7A7A7"
android:fillType="evenOdd"/>
</vector>