mirror of
https://github.com/Novaloop-AG/element-x-android.git
synced 2026-11-02 21:32:34 +00:00
Move open system setting to the PermissionsPresenter
This commit is contained in:
committed by
Benoit Marty
parent
9f0b5dbc64
commit
dd5d67d186
-4
@@ -18,7 +18,6 @@ package io.element.android.features.createroom.impl.configureroom
|
||||
|
||||
import androidx.compose.runtime.Composable
|
||||
import androidx.compose.ui.Modifier
|
||||
import androidx.compose.ui.platform.LocalContext
|
||||
import com.bumble.appyx.core.lifecycle.subscribe
|
||||
import com.bumble.appyx.core.modality.BuildContext
|
||||
import com.bumble.appyx.core.node.Node
|
||||
@@ -29,7 +28,6 @@ import dagger.assisted.AssistedInject
|
||||
import im.vector.app.features.analytics.plan.MobileScreen
|
||||
import io.element.android.anvilannotations.ContributesNode
|
||||
import io.element.android.features.createroom.impl.di.CreateRoomScope
|
||||
import io.element.android.libraries.androidutils.system.openAppSettingsPage
|
||||
import io.element.android.libraries.matrix.api.core.RoomId
|
||||
import io.element.android.services.analytics.api.AnalyticsService
|
||||
|
||||
@@ -60,13 +58,11 @@ class ConfigureRoomNode @AssistedInject constructor(
|
||||
@Composable
|
||||
override fun View(modifier: Modifier) {
|
||||
val state = presenter.present()
|
||||
val context = LocalContext.current
|
||||
ConfigureRoomView(
|
||||
state = state,
|
||||
modifier = modifier,
|
||||
onBackPressed = this::navigateUp,
|
||||
onRoomCreated = this::onRoomCreated,
|
||||
onOpenSystemSettings = { context.openAppSettingsPage() }
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
-3
@@ -76,7 +76,6 @@ fun ConfigureRoomView(
|
||||
state: ConfigureRoomState,
|
||||
onBackPressed: () -> Unit,
|
||||
onRoomCreated: (RoomId) -> Unit,
|
||||
onOpenSystemSettings: () -> Unit,
|
||||
modifier: Modifier = Modifier,
|
||||
) {
|
||||
val coroutineScope = rememberCoroutineScope()
|
||||
@@ -177,7 +176,6 @@ fun ConfigureRoomView(
|
||||
|
||||
PermissionsView(
|
||||
state = state.cameraPermissionState,
|
||||
onOpenSystemSettings = onOpenSystemSettings,
|
||||
)
|
||||
}
|
||||
|
||||
@@ -287,6 +285,5 @@ internal fun ConfigureRoomViewPreview(@PreviewParameter(ConfigureRoomStateProvid
|
||||
state = state,
|
||||
onBackPressed = {},
|
||||
onRoomCreated = {},
|
||||
onOpenSystemSettings = {},
|
||||
)
|
||||
}
|
||||
|
||||
-4
@@ -18,14 +18,12 @@ package io.element.android.features.preferences.impl.user.editprofile
|
||||
|
||||
import androidx.compose.runtime.Composable
|
||||
import androidx.compose.ui.Modifier
|
||||
import androidx.compose.ui.platform.LocalContext
|
||||
import com.bumble.appyx.core.modality.BuildContext
|
||||
import com.bumble.appyx.core.node.Node
|
||||
import com.bumble.appyx.core.plugin.Plugin
|
||||
import dagger.assisted.Assisted
|
||||
import dagger.assisted.AssistedInject
|
||||
import io.element.android.anvilannotations.ContributesNode
|
||||
import io.element.android.libraries.androidutils.system.openAppSettingsPage
|
||||
import io.element.android.libraries.architecture.NodeInputs
|
||||
import io.element.android.libraries.architecture.inputs
|
||||
import io.element.android.libraries.di.SessionScope
|
||||
@@ -48,12 +46,10 @@ class EditUserProfileNode @AssistedInject constructor(
|
||||
@Composable
|
||||
override fun View(modifier: Modifier) {
|
||||
val state = presenter.present()
|
||||
val context = LocalContext.current
|
||||
EditUserProfileView(
|
||||
state = state,
|
||||
onBackPressed = ::navigateUp,
|
||||
onProfileEdited = ::navigateUp,
|
||||
onOpenSystemSettings = { context.openAppSettingsPage() },
|
||||
modifier = modifier
|
||||
)
|
||||
}
|
||||
|
||||
-3
@@ -69,7 +69,6 @@ fun EditUserProfileView(
|
||||
state: EditUserProfileState,
|
||||
onBackPressed: () -> Unit,
|
||||
onProfileEdited: () -> Unit,
|
||||
onOpenSystemSettings: () -> Unit,
|
||||
modifier: Modifier = Modifier,
|
||||
) {
|
||||
val coroutineScope = rememberCoroutineScope()
|
||||
@@ -172,7 +171,6 @@ fun EditUserProfileView(
|
||||
}
|
||||
PermissionsView(
|
||||
state = state.cameraPermissionState,
|
||||
onOpenSystemSettings = onOpenSystemSettings,
|
||||
)
|
||||
}
|
||||
|
||||
@@ -190,7 +188,6 @@ internal fun EditUserProfileViewPreview(@PreviewParameter(EditUserProfileStatePr
|
||||
EditUserProfileView(
|
||||
onBackPressed = {},
|
||||
onProfileEdited = {},
|
||||
onOpenSystemSettings = {},
|
||||
state = state,
|
||||
)
|
||||
}
|
||||
|
||||
-4
@@ -18,7 +18,6 @@ package io.element.android.features.roomdetails.impl.edit
|
||||
|
||||
import androidx.compose.runtime.Composable
|
||||
import androidx.compose.ui.Modifier
|
||||
import androidx.compose.ui.platform.LocalContext
|
||||
import com.bumble.appyx.core.lifecycle.subscribe
|
||||
import com.bumble.appyx.core.modality.BuildContext
|
||||
import com.bumble.appyx.core.node.Node
|
||||
@@ -27,7 +26,6 @@ import dagger.assisted.Assisted
|
||||
import dagger.assisted.AssistedInject
|
||||
import im.vector.app.features.analytics.plan.MobileScreen
|
||||
import io.element.android.anvilannotations.ContributesNode
|
||||
import io.element.android.libraries.androidutils.system.openAppSettingsPage
|
||||
import io.element.android.libraries.di.RoomScope
|
||||
import io.element.android.services.analytics.api.AnalyticsService
|
||||
|
||||
@@ -50,12 +48,10 @@ class RoomDetailsEditNode @AssistedInject constructor(
|
||||
@Composable
|
||||
override fun View(modifier: Modifier) {
|
||||
val state = presenter.present()
|
||||
val context = LocalContext.current
|
||||
RoomDetailsEditView(
|
||||
state = state,
|
||||
onBackPressed = ::navigateUp,
|
||||
onRoomEdited = ::navigateUp,
|
||||
onOpenSystemSettings = { context.openAppSettingsPage() },
|
||||
modifier = modifier,
|
||||
)
|
||||
}
|
||||
|
||||
-3
@@ -73,7 +73,6 @@ fun RoomDetailsEditView(
|
||||
state: RoomDetailsEditState,
|
||||
onBackPressed: () -> Unit,
|
||||
onRoomEdited: () -> Unit,
|
||||
onOpenSystemSettings: () -> Unit,
|
||||
modifier: Modifier = Modifier,
|
||||
) {
|
||||
val coroutineScope = rememberCoroutineScope()
|
||||
@@ -198,7 +197,6 @@ fun RoomDetailsEditView(
|
||||
|
||||
PermissionsView(
|
||||
state = state.cameraPermissionState,
|
||||
onOpenSystemSettings = onOpenSystemSettings,
|
||||
)
|
||||
}
|
||||
|
||||
@@ -242,6 +240,5 @@ internal fun RoomDetailsEditViewPreview(@PreviewParameter(RoomDetailsEditStatePr
|
||||
state = state,
|
||||
onBackPressed = {},
|
||||
onRoomEdited = {},
|
||||
onOpenSystemSettings = {},
|
||||
)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user