diff options
| author | George Zacharia <george.zcharia@gmail.com> | 2023-07-02 14:33:47 +0530 |
|---|---|---|
| committer | George Zacharia <george.zcharia@gmail.com> | 2023-07-02 14:33:47 +0530 |
| commit | 913b11dfd2b52e445c773838c766f0d4f8ba0d05 (patch) | |
| tree | adb07f584833593bad6fca5495927c276ceef531 /src/com/android/customization/picker/notifications | |
| parent | b2d9a4961b3804f79c151630421d480846fd0176 (diff) | |
| parent | cc6f666d7c0bc3b6927f6e9e3c7e46123be6263d (diff) | |
Merge tag 'android-13.0.0_r52' of https://android.googlesource.com/platform/packages/apps/ThemePicker into HEADHEADt13.0
Android 13.0.0 Release 52 (TQ3A.230605.012)
Change-Id: I2cea11fa2f1f02fbd3c9d21cfc1697a79d42a5b7
Diffstat (limited to 'src/com/android/customization/picker/notifications')
8 files changed, 431 insertions, 0 deletions
diff --git a/src/com/android/customization/picker/notifications/data/repository/NotificationsRepository.kt b/src/com/android/customization/picker/notifications/data/repository/NotificationsRepository.kt new file mode 100644 index 00000000..c75ddce0 --- /dev/null +++ b/src/com/android/customization/picker/notifications/data/repository/NotificationsRepository.kt @@ -0,0 +1,74 @@ +/* + * Copyright (C) 2023 The Android Open Source Project + * + * 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 com.android.customization.picker.notifications.data.repository + +import android.provider.Settings +import com.android.customization.picker.notifications.shared.model.NotificationSettingsModel +import com.android.wallpaper.settings.data.repository.SecureSettingsRepository +import kotlinx.coroutines.CoroutineDispatcher +import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.flow.SharedFlow +import kotlinx.coroutines.flow.SharingStarted +import kotlinx.coroutines.flow.map +import kotlinx.coroutines.flow.shareIn +import kotlinx.coroutines.withContext + +/** Provides access to state related to notifications. */ +class NotificationsRepository( + scope: CoroutineScope, + private val backgroundDispatcher: CoroutineDispatcher, + private val secureSettingsRepository: SecureSettingsRepository, +) { + /** The current state of the notification setting. */ + val settings: SharedFlow<NotificationSettingsModel> = + secureSettingsRepository + .intSetting( + name = Settings.Secure.LOCK_SCREEN_SHOW_NOTIFICATIONS, + ) + .map { lockScreenShowNotificationsInt -> + NotificationSettingsModel( + isShowNotificationsOnLockScreenEnabled = lockScreenShowNotificationsInt == 1, + ) + } + .shareIn( + scope = scope, + started = SharingStarted.WhileSubscribed(), + replay = 1, + ) + + suspend fun getSettings(): NotificationSettingsModel { + return withContext(backgroundDispatcher) { + NotificationSettingsModel( + isShowNotificationsOnLockScreenEnabled = + secureSettingsRepository.get( + name = Settings.Secure.LOCK_SCREEN_SHOW_NOTIFICATIONS, + defaultValue = 0, + ) == 1 + ) + } + } + + suspend fun setSettings(model: NotificationSettingsModel) { + withContext(backgroundDispatcher) { + secureSettingsRepository.set( + name = Settings.Secure.LOCK_SCREEN_SHOW_NOTIFICATIONS, + value = if (model.isShowNotificationsOnLockScreenEnabled) 1 else 0, + ) + } + } +} diff --git a/src/com/android/customization/picker/notifications/domain/interactor/NotificationsInteractor.kt b/src/com/android/customization/picker/notifications/domain/interactor/NotificationsInteractor.kt new file mode 100644 index 00000000..1f892f0a --- /dev/null +++ b/src/com/android/customization/picker/notifications/domain/interactor/NotificationsInteractor.kt @@ -0,0 +1,52 @@ +/* + * Copyright (C) 2023 The Android Open Source Project + * + * 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 com.android.customization.picker.notifications.domain.interactor + +import com.android.customization.picker.notifications.data.repository.NotificationsRepository +import com.android.customization.picker.notifications.shared.model.NotificationSettingsModel +import javax.inject.Provider +import kotlinx.coroutines.flow.Flow + +/** Encapsulates business logic for interacting with notifications. */ +class NotificationsInteractor( + private val repository: NotificationsRepository, + private val snapshotRestorer: Provider<NotificationsSnapshotRestorer>, +) { + /** The current state of the notification setting. */ + val settings: Flow<NotificationSettingsModel> = repository.settings + + /** Toggles the setting to show or hide notifications on the lock screen. */ + suspend fun toggleShowNotificationsOnLockScreenEnabled() { + val currentModel = repository.getSettings() + setSettings( + currentModel.copy( + isShowNotificationsOnLockScreenEnabled = + !currentModel.isShowNotificationsOnLockScreenEnabled, + ) + ) + } + + suspend fun setSettings(model: NotificationSettingsModel) { + repository.setSettings(model) + snapshotRestorer.get().storeSnapshot(model) + } + + suspend fun getSettings(): NotificationSettingsModel { + return repository.getSettings() + } +} diff --git a/src/com/android/customization/picker/notifications/domain/interactor/NotificationsSnapshotRestorer.kt b/src/com/android/customization/picker/notifications/domain/interactor/NotificationsSnapshotRestorer.kt new file mode 100644 index 00000000..c782b74c --- /dev/null +++ b/src/com/android/customization/picker/notifications/domain/interactor/NotificationsSnapshotRestorer.kt @@ -0,0 +1,66 @@ +/* + * Copyright (C) 2023 The Android Open Source Project + * + * 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 com.android.customization.picker.notifications.domain.interactor + +import com.android.customization.picker.notifications.shared.model.NotificationSettingsModel +import com.android.wallpaper.picker.undo.domain.interactor.SnapshotRestorer +import com.android.wallpaper.picker.undo.domain.interactor.SnapshotStore +import com.android.wallpaper.picker.undo.shared.model.RestorableSnapshot + +/** Handles state restoration for notification settings. */ +class NotificationsSnapshotRestorer( + private val interactor: NotificationsInteractor, +) : SnapshotRestorer { + + private var snapshotStore: SnapshotStore = SnapshotStore.NOOP + + fun storeSnapshot(model: NotificationSettingsModel) { + snapshotStore.store(snapshot(model)) + } + + override suspend fun setUpSnapshotRestorer( + store: SnapshotStore, + ): RestorableSnapshot { + snapshotStore = store + return snapshot(interactor.getSettings()) + } + + override suspend fun restoreToSnapshot(snapshot: RestorableSnapshot) { + val isShowNotificationsOnLockScreenEnabled = + snapshot.args[KEY_IS_SHOW_NOTIFICATIONS_ON_LOCK_SCREEN_ENABLED]?.toBoolean() ?: false + interactor.setSettings( + NotificationSettingsModel( + isShowNotificationsOnLockScreenEnabled = isShowNotificationsOnLockScreenEnabled, + ) + ) + } + + private fun snapshot(model: NotificationSettingsModel): RestorableSnapshot { + return RestorableSnapshot( + mapOf( + KEY_IS_SHOW_NOTIFICATIONS_ON_LOCK_SCREEN_ENABLED to + model.isShowNotificationsOnLockScreenEnabled.toString(), + ) + ) + } + + companion object { + private const val KEY_IS_SHOW_NOTIFICATIONS_ON_LOCK_SCREEN_ENABLED = + "is_show_notifications_on_lock_screen_enabled" + } +} diff --git a/src/com/android/customization/picker/notifications/shared/model/NotificationSettingsModel.kt b/src/com/android/customization/picker/notifications/shared/model/NotificationSettingsModel.kt new file mode 100644 index 00000000..7ce388b8 --- /dev/null +++ b/src/com/android/customization/picker/notifications/shared/model/NotificationSettingsModel.kt @@ -0,0 +1,24 @@ +/* + * Copyright (C) 2023 The Android Open Source Project + * + * 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 com.android.customization.picker.notifications.shared.model + +/** Models notification settings. */ +data class NotificationSettingsModel( + /** Whether notifications are shown on the lock screen. */ + val isShowNotificationsOnLockScreenEnabled: Boolean = false, +) diff --git a/src/com/android/customization/picker/notifications/ui/binder/NotificationSectionBinder.kt b/src/com/android/customization/picker/notifications/ui/binder/NotificationSectionBinder.kt new file mode 100644 index 00000000..54f9bf61 --- /dev/null +++ b/src/com/android/customization/picker/notifications/ui/binder/NotificationSectionBinder.kt @@ -0,0 +1,59 @@ +/* + * Copyright (C) 2023 The Android Open Source Project + * + * 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 com.android.customization.picker.notifications.ui.binder + +import android.annotation.SuppressLint +import android.view.View +import android.widget.Switch +import android.widget.TextView +import androidx.lifecycle.Lifecycle +import androidx.lifecycle.LifecycleOwner +import androidx.lifecycle.lifecycleScope +import androidx.lifecycle.repeatOnLifecycle +import com.android.customization.picker.notifications.ui.viewmodel.NotificationSectionViewModel +import com.android.wallpaper.R +import kotlinx.coroutines.launch + +/** + * Binds between view and view-model for a section that lets the user control notification settings. + */ +object NotificationSectionBinder { + @SuppressLint("UseSwitchCompatOrMaterialCode") // We're using Switch and that's okay for SysUI. + fun bind( + view: View, + viewModel: NotificationSectionViewModel, + lifecycleOwner: LifecycleOwner, + ) { + val subtitle: TextView = view.requireViewById(R.id.subtitle) + val switch: Switch = view.requireViewById(R.id.switcher) + + view.setOnClickListener { viewModel.onClicked() } + + lifecycleOwner.lifecycleScope.launch { + lifecycleOwner.repeatOnLifecycle(Lifecycle.State.STARTED) { + launch { + viewModel.subtitleStringResourceId.collect { + subtitle.text = view.context.getString(it) + } + } + + launch { viewModel.isSwitchOn.collect { switch.isChecked = it } } + } + } + } +} diff --git a/src/com/android/customization/picker/notifications/ui/section/NotificationSectionController.kt b/src/com/android/customization/picker/notifications/ui/section/NotificationSectionController.kt new file mode 100644 index 00000000..d35c3820 --- /dev/null +++ b/src/com/android/customization/picker/notifications/ui/section/NotificationSectionController.kt @@ -0,0 +1,57 @@ +/* + * Copyright (C) 2023 The Android Open Source Project + * + * 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 com.android.customization.picker.notifications.ui.section + +import android.annotation.SuppressLint +import android.content.Context +import android.view.LayoutInflater +import androidx.lifecycle.LifecycleOwner +import com.android.customization.picker.notifications.ui.binder.NotificationSectionBinder +import com.android.customization.picker.notifications.ui.view.NotificationSectionView +import com.android.customization.picker.notifications.ui.viewmodel.NotificationSectionViewModel +import com.android.wallpaper.R +import com.android.wallpaper.model.CustomizationSectionController + +/** Controls a section with UI that lets the user toggle notification settings. */ +class NotificationSectionController( + private val viewModel: NotificationSectionViewModel, + private val lifecycleOwner: LifecycleOwner, +) : CustomizationSectionController<NotificationSectionView> { + + override fun isAvailable(context: Context): Boolean { + return true + } + + @SuppressLint("InflateParams") // We don't care that the parent is null. + override fun createView(context: Context): NotificationSectionView { + val view = + LayoutInflater.from(context) + .inflate( + R.layout.notification_section, + /* parent= */ null, + ) as NotificationSectionView + + NotificationSectionBinder.bind( + view = view, + viewModel = viewModel, + lifecycleOwner = lifecycleOwner, + ) + + return view + } +} diff --git a/src/com/android/customization/picker/notifications/ui/view/NotificationSectionView.kt b/src/com/android/customization/picker/notifications/ui/view/NotificationSectionView.kt new file mode 100644 index 00000000..29cce0ae --- /dev/null +++ b/src/com/android/customization/picker/notifications/ui/view/NotificationSectionView.kt @@ -0,0 +1,31 @@ +/* + * Copyright (C) 2023 The Android Open Source Project + * + * 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 com.android.customization.picker.notifications.ui.view + +import android.content.Context +import android.util.AttributeSet +import com.android.wallpaper.picker.SectionView + +class NotificationSectionView( + context: Context?, + attrs: AttributeSet?, +) : + SectionView( + context, + attrs, + ) diff --git a/src/com/android/customization/picker/notifications/ui/viewmodel/NotificationSectionViewModel.kt b/src/com/android/customization/picker/notifications/ui/viewmodel/NotificationSectionViewModel.kt new file mode 100644 index 00000000..97b04487 --- /dev/null +++ b/src/com/android/customization/picker/notifications/ui/viewmodel/NotificationSectionViewModel.kt @@ -0,0 +1,68 @@ +/* + * Copyright (C) 2023 The Android Open Source Project + * + * 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 com.android.customization.picker.notifications.ui.viewmodel + +import androidx.annotation.StringRes +import androidx.annotation.VisibleForTesting +import androidx.lifecycle.ViewModel +import androidx.lifecycle.ViewModelProvider +import androidx.lifecycle.viewModelScope +import com.android.customization.picker.notifications.domain.interactor.NotificationsInteractor +import com.android.wallpaper.R +import kotlinx.coroutines.flow.Flow +import kotlinx.coroutines.flow.map +import kotlinx.coroutines.launch + +/** Models UI state for a section that lets the user control the notification settings. */ +class NotificationSectionViewModel +@VisibleForTesting +constructor( + private val interactor: NotificationsInteractor, +) : ViewModel() { + + /** A string resource ID for the subtitle. */ + @StringRes + val subtitleStringResourceId: Flow<Int> = + interactor.settings.map { model -> + when (model.isShowNotificationsOnLockScreenEnabled) { + true -> R.string.show_notifications_on_lock_screen + false -> R.string.hide_notifications_on_lock_screen + } + } + + /** Whether the switch should be on. */ + val isSwitchOn: Flow<Boolean> = + interactor.settings.map { model -> model.isShowNotificationsOnLockScreenEnabled } + + /** Notifies that the section has been clicked. */ + fun onClicked() { + viewModelScope.launch { interactor.toggleShowNotificationsOnLockScreenEnabled() } + } + + class Factory( + private val interactor: NotificationsInteractor, + ) : ViewModelProvider.Factory { + @Suppress("UNCHECKED_CAST") + override fun <T : ViewModel> create(modelClass: Class<T>): T { + return NotificationSectionViewModel( + interactor = interactor, + ) + as T + } + } +} |
