-
Notifications
You must be signed in to change notification settings - Fork 149
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Replace notification permission dialog with a screen (#1223)
* Replace notification permission dialog with a screen --------- Co-authored-by: ElementBot <benoitm+elementbot@element.io>
- Loading branch information
1 parent
d4b527f
commit cfdccc9
Showing
43 changed files
with
1,027 additions
and
69 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| Add a notification permission screen to the initial flow. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
22 changes: 22 additions & 0 deletions
22
...in/kotlin/io/element/android/features/ftue/impl/notifications/NotificationsOptInEvents.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| /* | ||
| * 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.features.ftue.impl.notifications | ||
|
|
||
| sealed interface NotificationsOptInEvents { | ||
| data object ContinueClicked : NotificationsOptInEvents | ||
| data object NotNowClicked : NotificationsOptInEvents | ||
| } |
57 changes: 57 additions & 0 deletions
57
...main/kotlin/io/element/android/features/ftue/impl/notifications/NotificationsOptInNode.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,57 @@ | ||
| /* | ||
| * 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.features.ftue.impl.notifications | ||
|
|
||
| import androidx.compose.runtime.Composable | ||
| import androidx.compose.ui.Modifier | ||
| 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.architecture.NodeInputs | ||
| import io.element.android.libraries.architecture.inputs | ||
| import io.element.android.libraries.di.AppScope | ||
|
|
||
| @ContributesNode(AppScope::class) | ||
| class NotificationsOptInNode @AssistedInject constructor( | ||
| @Assisted buildContext: BuildContext, | ||
| @Assisted plugins: List<Plugin>, | ||
| private val presenterFactory: NotificationsOptInPresenter.Factory, | ||
| ) : Node(buildContext, plugins = plugins) { | ||
|
|
||
| interface Callback: NodeInputs { | ||
| fun onNotificationsOptInFinished() | ||
| } | ||
|
|
||
| private val callback = inputs<Callback>() | ||
|
|
||
| private val presenter: NotificationsOptInPresenter by lazy { | ||
| presenterFactory.create(callback) | ||
| } | ||
|
|
||
| @Composable | ||
| override fun View(modifier: Modifier) { | ||
| val state = presenter.present() | ||
| NotificationsOptInView( | ||
| state = state, | ||
| onBack = { callback.onNotificationsOptInFinished() }, | ||
| modifier = modifier | ||
| ) | ||
| } | ||
| } |
89 changes: 89 additions & 0 deletions
89
...kotlin/io/element/android/features/ftue/impl/notifications/NotificationsOptInPresenter.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,89 @@ | ||
| /* | ||
| * 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.features.ftue.impl.notifications | ||
|
|
||
| import android.Manifest | ||
| import android.os.Build | ||
| import androidx.annotation.RequiresApi | ||
| import androidx.compose.runtime.Composable | ||
| import dagger.assisted.Assisted | ||
| import dagger.assisted.AssistedFactory | ||
| import dagger.assisted.AssistedInject | ||
| import io.element.android.libraries.architecture.Presenter | ||
| import io.element.android.libraries.permissions.api.PermissionStateProvider | ||
| import io.element.android.libraries.permissions.api.PermissionsEvents | ||
| import io.element.android.libraries.permissions.api.PermissionsPresenter | ||
| import io.element.android.libraries.permissions.noop.NoopPermissionsPresenter | ||
| import io.element.android.services.toolbox.api.sdk.BuildVersionSdkIntProvider | ||
| import kotlinx.coroutines.CoroutineScope | ||
| import kotlinx.coroutines.launch | ||
|
|
||
| class NotificationsOptInPresenter @AssistedInject constructor( | ||
| private val permissionsPresenterFactory: PermissionsPresenter.Factory, | ||
| @Assisted private val callback: NotificationsOptInNode.Callback, | ||
| private val appCoroutineScope: CoroutineScope, | ||
| private val permissionStateProvider: PermissionStateProvider, | ||
| private val buildVersionSdkIntProvider: BuildVersionSdkIntProvider, | ||
| ) : Presenter<NotificationsOptInState> { | ||
|
|
||
| @AssistedFactory | ||
| interface Factory { | ||
| fun create(callback: NotificationsOptInNode.Callback): NotificationsOptInPresenter | ||
| } | ||
|
|
||
| private val postNotificationPermissionsPresenter by lazy { | ||
| // Ask for POST_NOTIFICATION PERMISSION on Android 13+ | ||
| if (buildVersionSdkIntProvider.isAtLeast(Build.VERSION_CODES.TIRAMISU)) { | ||
| permissionsPresenterFactory.create(Manifest.permission.POST_NOTIFICATIONS) | ||
| } else { | ||
| NoopPermissionsPresenter() | ||
| } | ||
| } | ||
|
|
||
| @Composable | ||
| override fun present(): NotificationsOptInState { | ||
| val notificationPremissionsState = postNotificationPermissionsPresenter.present() | ||
|
|
||
| fun handleEvents(event: NotificationsOptInEvents) { | ||
| when (event) { | ||
| NotificationsOptInEvents.ContinueClicked -> { | ||
| if (notificationPremissionsState.permissionGranted) { | ||
| callback.onNotificationsOptInFinished() | ||
| } else { | ||
| notificationPremissionsState.eventSink(PermissionsEvents.OpenSystemDialog) | ||
| } | ||
| } | ||
| NotificationsOptInEvents.NotNowClicked -> { | ||
| if (buildVersionSdkIntProvider.isAtLeast(Build.VERSION_CODES.TIRAMISU)) { | ||
| appCoroutineScope.setPermissionDenied() | ||
| } | ||
| callback.onNotificationsOptInFinished() | ||
| } | ||
| } | ||
| } | ||
|
|
||
| return NotificationsOptInState( | ||
| notificationsPermissionState = notificationPremissionsState, | ||
| eventSink = ::handleEvents | ||
| ) | ||
| } | ||
|
|
||
| @RequiresApi(Build.VERSION_CODES.TIRAMISU) | ||
| private fun CoroutineScope.setPermissionDenied() = launch { | ||
| permissionStateProvider.setPermissionDenied(Manifest.permission.POST_NOTIFICATIONS, true) | ||
| } | ||
| } |
Oops, something went wrong.