Use presenter factory
This commit is contained in:
parent
9c6bc8d872
commit
08fa22069b
9 changed files with 67 additions and 38 deletions
|
|
@ -19,5 +19,8 @@ package io.element.android.libraries.permissions.api
|
|||
import io.element.android.libraries.architecture.Presenter
|
||||
|
||||
interface PermissionsPresenter : Presenter<PermissionsState> {
|
||||
fun setParameter(permission: String)
|
||||
|
||||
interface Factory {
|
||||
fun create(permission: String): PermissionsPresenter
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -30,25 +30,26 @@ import com.google.accompanist.permissions.PermissionStatus
|
|||
import com.google.accompanist.permissions.isGranted
|
||||
import com.google.accompanist.permissions.shouldShowRationale
|
||||
import com.squareup.anvil.annotations.ContributesBinding
|
||||
import dagger.assisted.Assisted
|
||||
import dagger.assisted.AssistedFactory
|
||||
import dagger.assisted.AssistedInject
|
||||
import io.element.android.libraries.di.AppScope
|
||||
import io.element.android.libraries.permissions.api.PermissionsEvents
|
||||
import io.element.android.libraries.permissions.api.PermissionsPresenter
|
||||
import io.element.android.libraries.permissions.api.PermissionsState
|
||||
import kotlinx.coroutines.launch
|
||||
import timber.log.Timber
|
||||
import javax.inject.Inject
|
||||
|
||||
@ContributesBinding(AppScope::class)
|
||||
class DefaultPermissionsPresenter @Inject constructor(
|
||||
class DefaultPermissionsPresenter @AssistedInject constructor(
|
||||
@Assisted val permission: String,
|
||||
private val permissionsStore: PermissionsStore,
|
||||
private val permissionStateProvider: PermissionStateProvider,
|
||||
) : PermissionsPresenter {
|
||||
|
||||
private lateinit var permission: String
|
||||
|
||||
// TODO Move to the constructor.
|
||||
override fun setParameter(permission: String) {
|
||||
this.permission = permission
|
||||
@AssistedFactory
|
||||
@ContributesBinding(AppScope::class)
|
||||
interface Factory : PermissionsPresenter.Factory {
|
||||
override fun create(permission: String): DefaultPermissionsPresenter
|
||||
}
|
||||
|
||||
@OptIn(ExperimentalPermissionsApi::class)
|
||||
|
|
|
|||
|
|
@ -38,11 +38,11 @@ class DefaultPermissionsPresenterTest {
|
|||
val permissionState = FakePermissionState(A_PERMISSION, PermissionStatus.Granted)
|
||||
val permissionStateProvider = FakePermissionStateProvider(permissionState)
|
||||
val presenter = DefaultPermissionsPresenter(
|
||||
A_PERMISSION,
|
||||
permissionsStore,
|
||||
permissionStateProvider
|
||||
)
|
||||
moleculeFlow(RecompositionClock.Immediate) {
|
||||
presenter.setParameter(A_PERMISSION)
|
||||
presenter.present()
|
||||
}.test {
|
||||
val initialState = awaitItem()
|
||||
|
|
@ -61,11 +61,11 @@ class DefaultPermissionsPresenterTest {
|
|||
val permissionState = FakePermissionState(A_PERMISSION, PermissionStatus.Denied(shouldShowRationale = false))
|
||||
val permissionStateProvider = FakePermissionStateProvider(permissionState)
|
||||
val presenter = DefaultPermissionsPresenter(
|
||||
A_PERMISSION,
|
||||
permissionsStore,
|
||||
permissionStateProvider
|
||||
)
|
||||
moleculeFlow(RecompositionClock.Immediate) {
|
||||
presenter.setParameter(A_PERMISSION)
|
||||
presenter.present()
|
||||
}.test {
|
||||
val initialState = awaitItem()
|
||||
|
|
@ -81,11 +81,11 @@ class DefaultPermissionsPresenterTest {
|
|||
val permissionState = FakePermissionState(A_PERMISSION, PermissionStatus.Denied(shouldShowRationale = false))
|
||||
val permissionStateProvider = FakePermissionStateProvider(permissionState)
|
||||
val presenter = DefaultPermissionsPresenter(
|
||||
A_PERMISSION,
|
||||
permissionsStore,
|
||||
permissionStateProvider
|
||||
)
|
||||
moleculeFlow(RecompositionClock.Immediate) {
|
||||
presenter.setParameter(A_PERMISSION)
|
||||
presenter.present()
|
||||
}.test {
|
||||
val initialState = awaitItem()
|
||||
|
|
@ -110,11 +110,11 @@ class DefaultPermissionsPresenterTest {
|
|||
val permissionState = FakePermissionState(A_PERMISSION, PermissionStatus.Denied(shouldShowRationale = true))
|
||||
val permissionStateProvider = FakePermissionStateProvider(permissionState)
|
||||
val presenter = DefaultPermissionsPresenter(
|
||||
A_PERMISSION,
|
||||
permissionsStore,
|
||||
permissionStateProvider
|
||||
)
|
||||
moleculeFlow(RecompositionClock.Immediate) {
|
||||
presenter.setParameter(A_PERMISSION)
|
||||
presenter.present()
|
||||
}.test {
|
||||
val initialState = awaitItem()
|
||||
|
|
@ -139,11 +139,11 @@ class DefaultPermissionsPresenterTest {
|
|||
val permissionState = FakePermissionState(A_PERMISSION, PermissionStatus.Denied(shouldShowRationale = false))
|
||||
val permissionStateProvider = FakePermissionStateProvider(permissionState)
|
||||
val presenter = DefaultPermissionsPresenter(
|
||||
A_PERMISSION,
|
||||
permissionsStore,
|
||||
permissionStateProvider
|
||||
)
|
||||
moleculeFlow(RecompositionClock.Immediate) {
|
||||
presenter.setParameter(A_PERMISSION)
|
||||
presenter.present()
|
||||
}.test {
|
||||
skipItems(1)
|
||||
|
|
@ -161,11 +161,11 @@ class DefaultPermissionsPresenterTest {
|
|||
val permissionState = FakePermissionState(A_PERMISSION, PermissionStatus.Denied(shouldShowRationale = false))
|
||||
val permissionStateProvider = FakePermissionStateProvider(permissionState)
|
||||
val presenter = DefaultPermissionsPresenter(
|
||||
A_PERMISSION,
|
||||
permissionsStore,
|
||||
permissionStateProvider
|
||||
)
|
||||
moleculeFlow(RecompositionClock.Immediate) {
|
||||
presenter.setParameter(A_PERMISSION)
|
||||
presenter.present()
|
||||
}.test {
|
||||
val initialState = awaitItem()
|
||||
|
|
|
|||
|
|
@ -20,9 +20,7 @@ import androidx.compose.runtime.Composable
|
|||
import io.element.android.libraries.permissions.api.PermissionsPresenter
|
||||
import io.element.android.libraries.permissions.api.PermissionsState
|
||||
|
||||
class NoopPermissionsPresenter: PermissionsPresenter {
|
||||
|
||||
override fun setParameter(permission: String) = Unit
|
||||
class NoopPermissionsPresenter : PermissionsPresenter {
|
||||
|
||||
@Composable
|
||||
override fun present(): PermissionsState {
|
||||
|
|
|
|||
|
|
@ -0,0 +1,23 @@
|
|||
/*
|
||||
* 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.libraries.permissions.noop
|
||||
|
||||
import io.element.android.libraries.permissions.api.PermissionsPresenter
|
||||
|
||||
class NoopPermissionsPresenterFactory : PermissionsPresenter.Factory {
|
||||
override fun create(permission: String) = NoopPermissionsPresenter()
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue