Injects ColorContrastSection classes
Bug: 331594637
Flag: NA
Test: manually verified contrast flow still works
Change-Id: I5b7d7202b43e78d1888dee5dadc534af4002941e
diff --git a/src/com/android/customization/module/ThemePickerInjector.kt b/src/com/android/customization/module/ThemePickerInjector.kt
index 1491fcc..0bf6270 100644
--- a/src/com/android/customization/module/ThemePickerInjector.kt
+++ b/src/com/android/customization/module/ThemePickerInjector.kt
@@ -61,8 +61,6 @@
import com.android.customization.picker.quickaffordance.domain.interactor.KeyguardQuickAffordancePickerInteractor
import com.android.customization.picker.quickaffordance.domain.interactor.KeyguardQuickAffordanceSnapshotRestorer
import com.android.customization.picker.quickaffordance.ui.viewmodel.KeyguardQuickAffordancePickerViewModel
-import com.android.customization.picker.settings.data.repository.ColorContrastSectionRepository
-import com.android.customization.picker.settings.domain.interactor.ColorContrastSectionInteractor
import com.android.customization.picker.settings.ui.viewmodel.ColorContrastSectionViewModel
import com.android.systemui.shared.clocks.ClockRegistry
import com.android.systemui.shared.customization.data.content.CustomizationProviderClient
@@ -127,10 +125,10 @@
private var gridSnapshotRestorer: GridSnapshotRestorer? = null
private var gridScreenViewModelFactory: GridScreenViewModel.Factory? = null
private var clockRegistryProvider: ClockRegistryProvider? = null
- private var colorContrastSectionViewModelFactory: ColorContrastSectionViewModel.Factory? = null
- private var colorContrastSectionInteractor: ColorContrastSectionInteractor? = null
@Inject lateinit var themesUserEventLogger: Lazy<ThemesUserEventLogger>
+ @Inject
+ lateinit var colorContrastSectionViewModelFactory: Lazy<ColorContrastSectionViewModel.Factory>
override fun getCustomizationSections(activity: ComponentActivity): CustomizationSections {
val appContext = activity.applicationContext
@@ -143,7 +141,7 @@
wallpaperColorsRepository = getWallpaperColorsRepository(),
),
getKeyguardQuickAffordancePickerViewModelFactory(appContext),
- getColorContrastSectionViewModelFactory(),
+ colorContrastSectionViewModelFactory.get(),
getNotificationSectionViewModelFactory(appContext),
getFlags(),
getClockCarouselViewModelFactory(
@@ -235,24 +233,6 @@
.also { wallpaperInteractor = it }
}
- private fun getColorContrastSectionInteractorImpl(): ColorContrastSectionInteractor {
- return ColorContrastSectionInteractor(
- ColorContrastSectionRepository(uiModeManager, bgDispatcher),
- )
- }
-
- fun getColorContrastSectionInteractor(): ColorContrastSectionInteractor {
- return colorContrastSectionInteractor
- ?: getColorContrastSectionInteractorImpl().also { colorContrastSectionInteractor = it }
- }
-
- fun getColorContrastSectionViewModelFactory(): ColorContrastSectionViewModel.Factory {
- return colorContrastSectionViewModelFactory
- ?: ColorContrastSectionViewModel.Factory(getColorContrastSectionInteractor()).also {
- colorContrastSectionViewModelFactory = it
- }
- }
-
override fun getKeyguardQuickAffordancePickerInteractor(
context: Context
): KeyguardQuickAffordancePickerInteractor {
diff --git a/src/com/android/customization/picker/settings/data/repository/ColorContrastSectionRepository.kt b/src/com/android/customization/picker/settings/data/repository/ColorContrastSectionRepository.kt
index 1615486..85cf307 100644
--- a/src/com/android/customization/picker/settings/data/repository/ColorContrastSectionRepository.kt
+++ b/src/com/android/customization/picker/settings/data/repository/ColorContrastSectionRepository.kt
@@ -17,17 +17,23 @@
package com.android.customization.picker.settings.data.repository
import android.app.UiModeManager
+import com.android.wallpaper.picker.di.modules.BackgroundDispatcher
import com.android.wallpaper.system.UiModeManagerWrapper
import java.util.concurrent.Executor
+import javax.inject.Inject
+import javax.inject.Singleton
import kotlinx.coroutines.CoroutineDispatcher
import kotlinx.coroutines.asExecutor
import kotlinx.coroutines.channels.awaitClose
import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.callbackFlow
-class ColorContrastSectionRepository(
+@Singleton
+class ColorContrastSectionRepository
+@Inject
+constructor(
uiModeManager: UiModeManagerWrapper,
- private val bgDispatcher: CoroutineDispatcher
+ @BackgroundDispatcher bgDispatcher: CoroutineDispatcher,
) {
var contrast: Flow<Float> = callbackFlow {
val executor: Executor = bgDispatcher.asExecutor()
diff --git a/src/com/android/customization/picker/settings/domain/interactor/ColorContrastSectionInteractor.kt b/src/com/android/customization/picker/settings/domain/interactor/ColorContrastSectionInteractor.kt
index ff5cd20..003d4d0 100644
--- a/src/com/android/customization/picker/settings/domain/interactor/ColorContrastSectionInteractor.kt
+++ b/src/com/android/customization/picker/settings/domain/interactor/ColorContrastSectionInteractor.kt
@@ -17,10 +17,13 @@
package com.android.customization.picker.settings.domain.interactor
import com.android.customization.picker.settings.data.repository.ColorContrastSectionRepository
+import javax.inject.Inject
+import javax.inject.Singleton
import kotlinx.coroutines.flow.Flow
-class ColorContrastSectionInteractor(
- colorContrastSectionRepository: ColorContrastSectionRepository
-) {
+@Singleton
+class ColorContrastSectionInteractor
+@Inject
+constructor(colorContrastSectionRepository: ColorContrastSectionRepository) {
val contrast: Flow<Float> = colorContrastSectionRepository.contrast
}
diff --git a/src/com/android/customization/picker/settings/ui/viewmodel/ColorContrastSectionViewModel.kt b/src/com/android/customization/picker/settings/ui/viewmodel/ColorContrastSectionViewModel.kt
index 9b804a3..ecbe9d1 100644
--- a/src/com/android/customization/picker/settings/ui/viewmodel/ColorContrastSectionViewModel.kt
+++ b/src/com/android/customization/picker/settings/ui/viewmodel/ColorContrastSectionViewModel.kt
@@ -22,6 +22,8 @@
import com.android.themepicker.R
import com.android.wallpaper.picker.common.icon.ui.viewmodel.Icon
import com.android.wallpaper.picker.common.text.ui.viewmodel.Text
+import javax.inject.Inject
+import javax.inject.Singleton
import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.map
@@ -70,7 +72,10 @@
HIGH(1f)
}
- class Factory(
+ @Singleton
+ class Factory
+ @Inject
+ constructor(
private val colorContrastSectionInteractor: ColorContrastSectionInteractor,
) : ViewModelProvider.Factory {
override fun <T : ViewModel> create(modelClass: Class<T>): T {
diff --git a/tests/common/Android.bp b/tests/common/Android.bp
index 06c3834..40b0a27 100644
--- a/tests/common/Android.bp
+++ b/tests/common/Android.bp
@@ -23,6 +23,7 @@
android_library {
name: "ThemePickerTestLib",
+ defaults: ["ThemePicker_defaults"],
srcs: [
"src/**/*.java",
"src/**/*.kt",
diff --git a/tests/module/Android.bp b/tests/module/Android.bp
new file mode 100644
index 0000000..c174699
--- /dev/null
+++ b/tests/module/Android.bp
@@ -0,0 +1,30 @@
+// Copyright (C) 2024 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 {
+ default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+android_library {
+ name: "ThemePickerTestModule",
+ srcs: ["src/com/android/customization/TestModule.kt"],
+ static_libs: [
+ "ThemePickerTestLib",
+ "hilt_android",
+ "hilt_android_testing",
+ ],
+
+ platform_apis: true,
+}
diff --git a/tests/module/AndroidManifest.xml b/tests/module/AndroidManifest.xml
new file mode 100644
index 0000000..67ae9de
--- /dev/null
+++ b/tests/module/AndroidManifest.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2024 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.
+-->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+ package="com.android.wallpaper">
+
+ <application />
+</manifest>
diff --git a/tests/robotests/Android.bp b/tests/robotests/Android.bp
index 1377e22..5c0f388 100644
--- a/tests/robotests/Android.bp
+++ b/tests/robotests/Android.bp
@@ -7,7 +7,10 @@
name: "ThemePickerShell",
defaults: ["ThemePicker_defaults"],
platform_apis: true,
- static_libs: ["ThemePickerTestLib"],
+ static_libs: [
+ "ThemePickerTestLib",
+ "ThemePickerTestModule",
+ ],
}
android_robolectric_test {
@@ -29,6 +32,8 @@
"ThemePickerApplicationLib",
"mockito-robolectric-prebuilt",
"mockito-kotlin2",
+ "hilt_android",
+ "hilt_android_testing",
],
libs: [
diff --git a/tests/robotests/config/robolectric.properties b/tests/robotests/config/robolectric.properties
index fab7251..62f25a7 100644
--- a/tests/robotests/config/robolectric.properties
+++ b/tests/robotests/config/robolectric.properties
@@ -1 +1,2 @@
sdk=NEWEST_SDK
+application = dagger.hilt.android.testing.HiltTestApplication
diff --git a/tests/robotests/src/com/android/customization/model/picker/settings/data/repository/ColorContrastSectionRepositoryTest.kt b/tests/robotests/src/com/android/customization/model/picker/settings/data/repository/ColorContrastSectionRepositoryTest.kt
index f6a3a22..54b7c6e 100644
--- a/tests/robotests/src/com/android/customization/model/picker/settings/data/repository/ColorContrastSectionRepositoryTest.kt
+++ b/tests/robotests/src/com/android/customization/model/picker/settings/data/repository/ColorContrastSectionRepositoryTest.kt
@@ -20,28 +20,30 @@
import com.android.customization.picker.settings.data.repository.ColorContrastSectionRepository
import com.android.wallpaper.testing.FakeUiModeManager
import com.google.common.truth.Truth.assertThat
+import dagger.hilt.android.testing.HiltAndroidRule
+import dagger.hilt.android.testing.HiltAndroidTest
+import javax.inject.Inject
import kotlinx.coroutines.ExperimentalCoroutinesApi
import kotlinx.coroutines.launch
-import kotlinx.coroutines.test.TestCoroutineDispatcher
import kotlinx.coroutines.test.runBlockingTest
-import org.junit.After
import org.junit.Before
+import org.junit.Rule
import org.junit.Test
import org.junit.runner.RunWith
import org.robolectric.RobolectricTestRunner
+@HiltAndroidTest
@SmallTest
@RunWith(RobolectricTestRunner::class)
class ColorContrastSectionRepositoryTest {
- private val uiModeManager = FakeUiModeManager()
- private lateinit var underTest: ColorContrastSectionRepository
+ @get:Rule var hiltRule = HiltAndroidRule(this)
- private lateinit var bgDispatcher: TestCoroutineDispatcher
+ @Inject lateinit var uiModeManager: FakeUiModeManager
+ @Inject lateinit var underTest: ColorContrastSectionRepository
@Before
fun setUp() {
- bgDispatcher = TestCoroutineDispatcher()
- underTest = ColorContrastSectionRepository(uiModeManager, bgDispatcher)
+ hiltRule.inject()
}
@Test
@@ -65,10 +67,4 @@
assertThat(collectedValues).containsExactlyElementsIn(nextContrastValues)
job.cancel()
}
-
- @OptIn(ExperimentalCoroutinesApi::class)
- @After
- fun tearDown() {
- bgDispatcher.cleanupTestCoroutines()
- }
}
diff --git a/tests/robotests/src/com/android/customization/model/picker/settings/domain/interactor/ColorContrastSectionInteractorTest.kt b/tests/robotests/src/com/android/customization/model/picker/settings/domain/interactor/ColorContrastSectionInteractorTest.kt
index 9936928..2319eed 100644
--- a/tests/robotests/src/com/android/customization/model/picker/settings/domain/interactor/ColorContrastSectionInteractorTest.kt
+++ b/tests/robotests/src/com/android/customization/model/picker/settings/domain/interactor/ColorContrastSectionInteractorTest.kt
@@ -17,27 +17,37 @@
package com.android.customization.model.picker.settings.domain.interactor
import androidx.test.filters.SmallTest
-import com.android.customization.picker.settings.data.repository.ColorContrastSectionRepository
import com.android.customization.picker.settings.domain.interactor.ColorContrastSectionInteractor
import com.android.wallpaper.testing.FakeUiModeManager
+import dagger.hilt.android.testing.HiltAndroidRule
+import dagger.hilt.android.testing.HiltAndroidTest
+import javax.inject.Inject
import kotlinx.coroutines.flow.first
-import kotlinx.coroutines.test.TestCoroutineDispatcher
import kotlinx.coroutines.test.runBlockingTest
import org.junit.Assert.assertEquals
+import org.junit.Before
+import org.junit.Rule
import org.junit.Test
import org.junit.runner.RunWith
import org.robolectric.RobolectricTestRunner
@SmallTest
+@HiltAndroidTest
@RunWith(RobolectricTestRunner::class)
class ColorContrastSectionInteractorTest {
+ @get:Rule var hiltRule = HiltAndroidRule(this)
+
+ @Inject lateinit var uiModeManager: FakeUiModeManager
+ @Inject lateinit var interactor: ColorContrastSectionInteractor
+
+ @Before
+ fun setUp() {
+ hiltRule.inject()
+ }
+
@Test
fun contrastEmitCorrectValuesFromRepository() = runBlockingTest {
- val bgDispatcher = TestCoroutineDispatcher()
- val uiModeManager = FakeUiModeManager()
- val repository = ColorContrastSectionRepository(uiModeManager, bgDispatcher)
val expectedContrast = 1.5f
- val interactor = ColorContrastSectionInteractor(repository)
uiModeManager.setContrast(expectedContrast)
val result = interactor.contrast.first()
diff --git a/tests/robotests/src/com/android/customization/model/picker/settings/ui/viewmodel/ColorContrastSectionViewModelTest.kt b/tests/robotests/src/com/android/customization/model/picker/settings/ui/viewmodel/ColorContrastSectionViewModelTest.kt
index 0910697..c06f8a3 100644
--- a/tests/robotests/src/com/android/customization/model/picker/settings/ui/viewmodel/ColorContrastSectionViewModelTest.kt
+++ b/tests/robotests/src/com/android/customization/model/picker/settings/ui/viewmodel/ColorContrastSectionViewModelTest.kt
@@ -16,37 +16,39 @@
package com.android.customization.model.picker.settings.ui.viewmodel
-import com.android.customization.picker.settings.data.repository.ColorContrastSectionRepository
-import com.android.customization.picker.settings.domain.interactor.ColorContrastSectionInteractor
import com.android.customization.picker.settings.ui.viewmodel.ColorContrastSectionDataViewModel
import com.android.customization.picker.settings.ui.viewmodel.ColorContrastSectionViewModel
import com.android.themepicker.R
import com.android.wallpaper.picker.common.icon.ui.viewmodel.Icon
import com.android.wallpaper.picker.common.text.ui.viewmodel.Text
import com.android.wallpaper.testing.FakeUiModeManager
+import dagger.hilt.android.testing.HiltAndroidRule
+import dagger.hilt.android.testing.HiltAndroidTest
+import javax.inject.Inject
import kotlinx.coroutines.flow.collect
import kotlinx.coroutines.flow.first
-import kotlinx.coroutines.test.TestCoroutineDispatcher
import kotlinx.coroutines.test.runBlockingTest
import org.junit.Assert.assertEquals
import org.junit.Before
+import org.junit.Rule
import org.junit.Test
import org.junit.runner.RunWith
import org.robolectric.RobolectricTestRunner
+@HiltAndroidTest
@RunWith(RobolectricTestRunner::class)
class ColorContrastSectionViewModelTest {
- private val uiModeManager = FakeUiModeManager()
- private val bgDispatcher = TestCoroutineDispatcher()
+ @get:Rule var hiltRule = HiltAndroidRule(this)
private lateinit var viewModel: ColorContrastSectionViewModel
+ @Inject lateinit var uiModeManager: FakeUiModeManager
+ @Inject lateinit var viewModelFactory: ColorContrastSectionViewModel.Factory
+
@Before
fun setUp() {
- val repository = ColorContrastSectionRepository(uiModeManager, bgDispatcher)
- val factory =
- ColorContrastSectionViewModel.Factory(ColorContrastSectionInteractor(repository))
- viewModel = factory.create(ColorContrastSectionViewModel::class.java)
+ hiltRule.inject()
+ viewModel = viewModelFactory.create(ColorContrastSectionViewModel::class.java)
}
@Test