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

Pin setup : clean up

Browse source
This commit is contained in:
ganfra 2023-10-12 12:29:53 +02:00
parent cb6a07b90d
commit 227d7c7ac4
4 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

1
appnav/src/main/kotlin/io/element/android/appnav/RootFlowNode.kt
View file

@ -44,7 +44,6 @@ import io.element.android.appnav.root.RootPresenter
import io.element.android.appnav.root.RootView import io.element.android.appnav.root.RootView
import io.element.android.features.login.api.oidc.OidcAction import io.element.android.features.login.api.oidc.OidcAction
import io.element.android.features.login.api.oidc.OidcActionFlow import io.element.android.features.login.api.oidc.OidcActionFlow
import io.element.android.features.pin.api.PinEntryPoint
import io.element.android.features.rageshake.api.bugreport.BugReportEntryPoint import io.element.android.features.rageshake.api.bugreport.BugReportEntryPoint
import io.element.android.libraries.architecture.BackstackNode import io.element.android.libraries.architecture.BackstackNode
import io.element.android.libraries.architecture.animation.rememberDefaultTransitionHandler import io.element.android.libraries.architecture.animation.rememberDefaultTransitionHandler

5
features/pin/impl/src/main/kotlin/io/element/android/features/pin/impl/auth/PinAuthenticationView.kt
View file

@ -26,14 +26,12 @@ import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.tooling.preview.PreviewParameter import androidx.compose.ui.tooling.preview.PreviewParameter
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import androidx.lifecycle.Lifecycle
import io.element.android.libraries.designsystem.atomic.molecules.IconTitleSubtitleMolecule import io.element.android.libraries.designsystem.atomic.molecules.IconTitleSubtitleMolecule
import io.element.android.libraries.designsystem.atomic.pages.HeaderFooterPage import io.element.android.libraries.designsystem.atomic.pages.HeaderFooterPage
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.Surface import io.element.android.libraries.designsystem.theme.components.Surface
import io.element.android.libraries.designsystem.utils.OnLifecycleEvent
@Composable @Composable
fun PinAuthenticationView( fun PinAuthenticationView(
@ -76,10 +74,11 @@ private fun PinAuthenticationFooter(state: PinAuthenticationState) {
@Composable @Composable
@PreviewsDayNight @PreviewsDayNight
fun PinAuthenticationViewLightPreview(@PreviewParameter(PinAuthenticationStateProvider::class) state: PinAuthenticationState) = internal fun PinAuthenticationViewPreview(@PreviewParameter(PinAuthenticationStateProvider::class) state: PinAuthenticationState) {
ElementPreview { ElementPreview {
PinAuthenticationView( PinAuthenticationView(
state = state, state = state,
) )
} }
}

5
features/pin/impl/src/main/kotlin/io/element/android/features/pin/impl/create/CreatePinView.kt
View file

@ -25,12 +25,14 @@ import androidx.compose.ui.tooling.preview.PreviewParameter
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.Text import io.element.android.libraries.designsystem.theme.components.Text
import timber.log.Timber
@Composable @Composable
fun CreatePinView( fun CreatePinView(
state: CreatePinState, state: CreatePinState,
modifier: Modifier = Modifier, modifier: Modifier = Modifier,
) { ) {
Timber.d("CreatePinView: $state")
Box(modifier, contentAlignment = Alignment.Center) { Box(modifier, contentAlignment = Alignment.Center) {
Text( Text(
"CreatePin feature view", "CreatePin feature view",
@ -41,9 +43,10 @@ fun CreatePinView(
@Composable @Composable
@PreviewsDayNight @PreviewsDayNight
fun CreatePinViewLightPreview(@PreviewParameter(CreatePinStateProvider::class) state: CreatePinState) = internal fun CreatePinViewLightPreview(@PreviewParameter(CreatePinStateProvider::class) state: CreatePinState) {
ElementPreview { ElementPreview {
CreatePinView( CreatePinView(
state = state, state = state,
) )
} }
}

2
features/pin/impl/src/main/kotlin/io/element/android/features/pin/impl/state/DefaultPinStateService.kt
View file

@ -54,7 +54,7 @@ class DefaultPinStateService @Inject constructor(
lockJob?.cancel() lockJob?.cancel()
} }
override suspend fun entersBackground(): Unit = coroutineScope { override suspend fun entersBackground() = coroutineScope {
lockJob = launch { lockJob = launch {
if (featureFlagService.isFeatureEnabled(FeatureFlags.PinUnlock)) { if (featureFlagService.isFeatureEnabled(FeatureFlags.PinUnlock)) {
delay(GRACE_PERIOD_IN_MILLIS) delay(GRACE_PERIOD_IN_MILLIS)