Sulkta-OSS/element-x-ada
3
0
Fork 0
Code Issues 1 Pull requests 10 Projects Releases Packages Wiki Activity Actions

Fix vertical position for the primary button in VerifySelfSessionView

Browse source
This commit is contained in:
Jorge Martín 2024-08-12 13:59:33 +02:00
parent b022652b0d
commit 4f1adb1609
1 changed files with 6 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

6
features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/VerifySelfSessionView.kt
View file

@ -54,6 +54,7 @@ import io.element.android.libraries.designsystem.components.PageTitle
import io.element.android.libraries.designsystem.preview.ElementPreview import io.element.android.libraries.designsystem.preview.ElementPreview
import io.element.android.libraries.designsystem.preview.PreviewsDayNight import io.element.android.libraries.designsystem.preview.PreviewsDayNight
import io.element.android.libraries.designsystem.theme.components.Button import io.element.android.libraries.designsystem.theme.components.Button
import io.element.android.libraries.designsystem.theme.components.ButtonSize
import io.element.android.libraries.designsystem.theme.components.OutlinedButton import io.element.android.libraries.designsystem.theme.components.OutlinedButton
import io.element.android.libraries.designsystem.theme.components.Text import io.element.android.libraries.designsystem.theme.components.Text
import io.element.android.libraries.designsystem.theme.components.TextButton import io.element.android.libraries.designsystem.theme.components.TextButton
@ -260,6 +261,7 @@ private fun BottomMenu(
onClick = onEnterRecoveryKey, onClick = onEnterRecoveryKey,
) )
} }
// This option should always be displayed
TextButton( TextButton(
modifier = Modifier.fillMaxWidth(), modifier = Modifier.fillMaxWidth(),
text = stringResource(R.string.screen_identity_confirmation_cannot_confirm), text = stringResource(R.string.screen_identity_confirmation_cannot_confirm),
@ -303,6 +305,8 @@ private fun BottomMenu(
onClick = {}, onClick = {},
showProgress = true, showProgress = true,
) )
// Placeholder so the 1st button keeps its vertical position
Spacer(modifier = Modifier.height(40.dp))
} }
} }
is FlowStep.Verifying -> { is FlowStep.Verifying -> {
@ -336,6 +340,8 @@ private fun BottomMenu(
text = stringResource(CommonStrings.action_continue), text = stringResource(CommonStrings.action_continue),
onClick = onFinish, onClick = onFinish,
) )
// Placeholder so the 1st button keeps its vertical position
Spacer(modifier = Modifier.height(48.dp))
} }
} }
is FlowStep.Skipped -> return is FlowStep.Skipped -> return