Merge branch 'develop' into julioromano/sqldelight2
This commit is contained in:
commit
d38f47b22c
6 changed files with 43 additions and 23 deletions
|
|
@ -16,12 +16,6 @@
|
||||||
|
|
||||||
package io.element.android.appnav
|
package io.element.android.appnav
|
||||||
|
|
||||||
import android.content.Context
|
|
||||||
import android.content.ContextWrapper
|
|
||||||
import androidx.activity.ComponentActivity
|
|
||||||
import androidx.activity.compose.BackHandler
|
|
||||||
import androidx.compose.runtime.Composable
|
|
||||||
import androidx.compose.ui.platform.LocalContext
|
|
||||||
import com.bumble.appyx.navmodel.backstack.BackStack
|
import com.bumble.appyx.navmodel.backstack.BackStack
|
||||||
import com.bumble.appyx.navmodel.backstack.operation.NewRoot
|
import com.bumble.appyx.navmodel.backstack.operation.NewRoot
|
||||||
import com.bumble.appyx.navmodel.backstack.operation.Remove
|
import com.bumble.appyx.navmodel.backstack.operation.Remove
|
||||||
|
|
@ -47,18 +41,3 @@ fun <T : Any> BackStack<T>.removeLast(element: T) {
|
||||||
accept(Remove(lastExpectedNavElement.key))
|
accept(Remove(lastExpectedNavElement.key))
|
||||||
}
|
}
|
||||||
|
|
||||||
@Composable
|
|
||||||
fun MoveActivityToBackgroundBackHandler(enabled: Boolean = true) {
|
|
||||||
|
|
||||||
fun Context.findActivity(): ComponentActivity? = when (this) {
|
|
||||||
is ComponentActivity -> this
|
|
||||||
is ContextWrapper -> baseContext.findActivity()
|
|
||||||
else -> null
|
|
||||||
}
|
|
||||||
|
|
||||||
val context = LocalContext.current
|
|
||||||
BackHandler(enabled = enabled) {
|
|
||||||
context.findActivity()?.moveTaskToBack(false)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,39 @@
|
||||||
|
/*
|
||||||
|
* Copyright (c) 2023 New Vector Ltd
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package io.element.android.appnav
|
||||||
|
|
||||||
|
import android.content.Context
|
||||||
|
import android.content.ContextWrapper
|
||||||
|
import androidx.activity.ComponentActivity
|
||||||
|
import androidx.activity.compose.BackHandler
|
||||||
|
import androidx.compose.runtime.Composable
|
||||||
|
import androidx.compose.ui.platform.LocalContext
|
||||||
|
|
||||||
|
@Composable
|
||||||
|
fun MoveActivityToBackgroundBackHandler(enabled: Boolean = true) {
|
||||||
|
|
||||||
|
fun Context.findActivity(): ComponentActivity? = when (this) {
|
||||||
|
is ComponentActivity -> this
|
||||||
|
is ContextWrapper -> baseContext.findActivity()
|
||||||
|
else -> null
|
||||||
|
}
|
||||||
|
|
||||||
|
val context = LocalContext.current
|
||||||
|
BackHandler(enabled = enabled) {
|
||||||
|
context.findActivity()?.moveTaskToBack(false)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -251,7 +251,9 @@ koverMerged {
|
||||||
// Some options can't be tested at the moment
|
// Some options can't be tested at the moment
|
||||||
excludes += "io.element.android.features.preferences.impl.developer.DeveloperSettingsPresenter$*"
|
excludes += "io.element.android.features.preferences.impl.developer.DeveloperSettingsPresenter$*"
|
||||||
// Temporary until we have actually something to test.
|
// Temporary until we have actually something to test.
|
||||||
excludes += "io.element.android.features.pin.impl.*Presenter"
|
excludes += "io.element.android.features.pin.impl.auth.PinAuthenticationPresenter"
|
||||||
|
excludes += "io.element.android.features.pin.impl.auth.PinAuthenticationPresenter$*"
|
||||||
|
excludes += "io.element.android.features.pin.impl.create.CreatePinPresenter"
|
||||||
}
|
}
|
||||||
bound {
|
bound {
|
||||||
minValue = 85
|
minValue = 85
|
||||||
|
|
|
||||||
|
|
@ -43,7 +43,7 @@ fun CreatePinView(
|
||||||
|
|
||||||
@Composable
|
@Composable
|
||||||
@PreviewsDayNight
|
@PreviewsDayNight
|
||||||
internal fun CreatePinViewLightPreview(@PreviewParameter(CreatePinStateProvider::class) state: CreatePinState) {
|
internal fun CreatePinViewPreview(@PreviewParameter(CreatePinStateProvider::class) state: CreatePinState) {
|
||||||
ElementPreview {
|
ElementPreview {
|
||||||
CreatePinView(
|
CreatePinView(
|
||||||
state = state,
|
state = state,
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue