wip

meikpiep · Jan 13, 2025 · 0f8bc76 · 0f8bc76
1 parent 8c5ec0d
commit 0f8bc76
Show file tree

Hide file tree

Showing 50 changed files with 143 additions and 66 deletions.
diff --git a/gauguin-app/src/main/kotlin/org/piepmeyer/gauguin/ApplicationModule.kt b/gauguin-app/src/main/kotlin/org/piepmeyer/gauguin/ApplicationModule.kt
@@ -0,0 +1,37 @@
+package org.piepmeyer.gauguin
+
+import android.content.SharedPreferences
+import org.koin.core.module.Module
+import org.koin.core.module.dsl.binds
+import org.koin.core.module.dsl.createdAtStart
+import org.koin.core.module.dsl.withOptions
+import org.koin.dsl.module
+import org.piepmeyer.gauguin.preferences.ApplicationPreferences
+import org.piepmeyer.gauguin.preferences.ApplicationPreferencesImpl
+import org.piepmeyer.gauguin.preferences.StatisticsManager
+import org.piepmeyer.gauguin.preferences.StatisticsManagerImpl
+import org.piepmeyer.gauguin.ui.ActivityUtils
+import java.io.File
+
+class ApplicationModule(
+    private val filesDir: File,
+    private val statisticsPreferences: SharedPreferences,
+    private val applicationPreferences: ApplicationPreferencesImpl,
+) {
+    fun module(): Module =
+        module {
+            single {
+                applicationPreferences
+            } withOptions { binds(listOf(ApplicationPreferences::class)) }
+            single {
+                StatisticsManagerImpl(
+                    filesDir,
+                    statisticsPreferences,
+                )
+            } withOptions {
+                binds(listOf(StatisticsManager::class))
+                createdAtStart()
+            }
+            single { ActivityUtils() }
+        }
+}
diff --git a/gauguin-app/src/main/kotlin/org/piepmeyer/gauguin/MainApplication.kt b/gauguin-app/src/main/kotlin/org/piepmeyer/gauguin/MainApplication.kt
@@ -5,17 +5,12 @@ import android.content.Context
 import com.google.android.material.color.DynamicColors
 import com.google.android.material.color.DynamicColorsOptions
 import io.github.oshai.kotlinlogging.KotlinLogging
+import org.koin.android.ext.android.get
 import org.koin.android.ext.koin.androidContext
 import org.koin.android.ext.koin.androidLogger
 import org.koin.core.context.startKoin
-import org.koin.core.module.dsl.binds
-import org.koin.core.module.dsl.createdAtStart
-import org.koin.core.module.dsl.withOptions
-import org.koin.dsl.module
-import org.piepmeyer.gauguin.preferences.ApplicationPreferences
+import org.koin.core.module.Module
 import org.piepmeyer.gauguin.preferences.ApplicationPreferencesImpl
-import org.piepmeyer.gauguin.preferences.StatisticsManager
-import org.piepmeyer.gauguin.preferences.StatisticsManagerImpl
 import org.piepmeyer.gauguin.ui.ActivityUtils
 import org.piepmeyer.gauguin.ui.DynamicColorsPrecondition
 
@@ -29,47 +24,47 @@ class MainApplication : Application() {
 
         val applicationPreferences = ApplicationPreferencesImpl(this)
 
-        val options =
-            DynamicColorsOptions.Builder()
-                .setThemeOverlay(R.style.AppTheme_Overlay)
-                .setPrecondition(DynamicColorsPrecondition())
-                .build()
-
-        DynamicColors.applyToActivitiesIfAvailable(this, options)
-
         startKoin {
             androidLogger()
             androidContext(this@MainApplication)
 
-            val appModule =
-                module {
-                    single {
-                        applicationPreferences
-                    } withOptions { binds(listOf(ApplicationPreferences::class)) }
-                    single {
-                        StatisticsManagerImpl(
-                            filesDir,
-                            this@MainApplication.getSharedPreferences("stats", Context.MODE_PRIVATE),
-                        )
-                    } withOptions {
-                        binds(listOf(StatisticsManager::class))
-                        createdAtStart()
-                    }
-                    single { ActivityUtils() }
-                }
+            val statisticsPreferences = getSharedPreferences("stats", Context.MODE_PRIVATE)
 
             applicationPreferences.migrateGridSizeFromTwoToThree()
 
-            modules(
-                CoreModule(filesDir).module(),
-                appModule,
-            )
+            var modules =
+                listOf(
+                    CoreModule(filesDir).module(),
+                    ApplicationModule(filesDir, statisticsPreferences, applicationPreferences).module(),
+                )
+
+            testOverideModule?.let {
+                modules += it
+            }
+
+            modules(modules)
         }
 
+        val options =
+            DynamicColorsOptions
+                .Builder()
+                .setThemeOverlay(R.style.AppTheme_Overlay)
+                .setPrecondition(DynamicColorsPrecondition())
+                .build()
+
+        DynamicColors.applyToActivitiesIfAvailable(this, options)
+
+        val activityUtils = get<ActivityUtils>()
+        activityUtils.configureNightMode()
+
         logger.info {
             "Gauguin application started successfully, " +
                 "version ${resources.getString(R.string.versionName)}, " +
                 "debug flag ${resources.getBoolean(R.bool.debuggable)}."
         }
     }
+
+    companion object {
+        var testOverideModule: Module? = null
+    }
 }
diff --git a/gauguin-app/src/main/kotlin/org/piepmeyer/gauguin/ui/AboutActivity.kt b/gauguin-app/src/main/kotlin/org/piepmeyer/gauguin/ui/AboutActivity.kt
@@ -4,7 +4,6 @@ import android.content.Intent
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
 import org.koin.android.ext.android.inject
-import org.piepmeyer.gauguin.R
 import org.piepmeyer.gauguin.databinding.ActivityAboutBinding
 
 class AboutActivity : AppCompatActivity() {
@@ -13,8 +12,10 @@ class AboutActivity : AppCompatActivity() {
     private lateinit var binding: ActivityAboutBinding
 
     public override fun onCreate(savedInstanceState: Bundle?) {
-        setTheme(R.style.AppTheme)
+        activityUtils.configureTheme(this)
+
         super.onCreate(savedInstanceState)
+
         binding = ActivityAboutBinding.inflate(layoutInflater)
         setContentView(binding.root)
 
@@ -26,7 +27,9 @@ class AboutActivity : AppCompatActivity() {
 
         binding.aboutShareApplicationLog.setOnClickListener {
             val reversedLines =
-                Runtime.getRuntime().exec("logcat -d")
+                Runtime
+                    .getRuntime()
+                    .exec("logcat -d")
                     .inputStream
                     .bufferedReader()
                     .readLines()

diff --git a/gauguin-app/src/main/kotlin/org/piepmeyer/gauguin/ui/ActivityUtils.kt b/gauguin-app/src/main/kotlin/org/piepmeyer/gauguin/ui/ActivityUtils.kt
@@ -30,13 +30,17 @@ class ActivityUtils : KoinComponent {
     }
 
     fun configureTheme(activity: Activity) {
+        if (applicationPreferences.theme != Theme.DYNAMIC_COLORS) {
+            activity.setTheme(R.style.AppTheme)
+        }
+    }
+
+    fun configureNightMode() {
         when (applicationPreferences.theme) {
             Theme.LIGHT -> {
-                activity.setTheme(R.style.AppTheme)
                 AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO)
             }
             Theme.DARK -> {
-                activity.setTheme(R.style.AppTheme)
                 AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES)
             }
             Theme.SYSTEM_DEFAULT, Theme.DYNAMIC_COLORS -> {

diff --git a/gauguin-app/src/main/kotlin/org/piepmeyer/gauguin/ui/LoadGameListActivity.kt b/gauguin-app/src/main/kotlin/org/piepmeyer/gauguin/ui/LoadGameListActivity.kt
@@ -23,14 +23,14 @@ class LoadGameListActivity : AppCompatActivity() {
     private lateinit var empty: View
 
     public override fun onCreate(savedInstanceState: Bundle?) {
-        setTheme(R.style.AppTheme)
+        activityUtils.configureTheme(this)
+
         super.onCreate(savedInstanceState)
 
         setContentView(R.layout.activity_savegame)
 
         val recyclerView = findViewById<RecyclerView>(android.R.id.list)
 
-        activityUtils.configureTheme(this)
         activityUtils.configureFullscreen(this)
 
         empty = findViewById(android.R.id.empty)

diff --git a/gauguin-app/src/main/kotlin/org/piepmeyer/gauguin/ui/SettingsActivity.kt b/gauguin-app/src/main/kotlin/org/piepmeyer/gauguin/ui/SettingsActivity.kt
@@ -13,7 +13,8 @@ class SettingsActivity : AppCompatActivity() {
     private val activityUtils: ActivityUtils by inject()
 
     override fun onCreate(savedInstanceState: Bundle?) {
-        setTheme(R.style.AppTheme)
+        activityUtils.configureTheme(this)
+
         super.onCreate(savedInstanceState)
 
         setContentView(R.layout.activity_settings)

diff --git a/gauguin-app/src/main/kotlin/org/piepmeyer/gauguin/ui/main/ThemeChooserFragment.kt b/gauguin-app/src/main/kotlin/org/piepmeyer/gauguin/ui/main/ThemeChooserFragment.kt
@@ -35,37 +35,40 @@ class ThemeChooserFragment(
 
         binding.navigationDrawerThemeLight.isChecked = preferences.theme == Theme.LIGHT
         binding.navigationDrawerThemeLight.setOnClickListener {
-            preferences.theme = Theme.LIGHT
-            activityUtils.configureTheme(mainActivity)
+            switchToTheme(Theme.LIGHT)
         }
 
         binding.navigationDrawerThemeDark.isChecked = preferences.theme == Theme.DARK
         binding.navigationDrawerThemeDark.setOnClickListener {
-            preferences.theme = Theme.DARK
-            activityUtils.configureTheme(mainActivity)
+            switchToTheme(Theme.DARK)
         }
 
         binding.navigationDrawerThemeAuto.isChecked = preferences.theme == Theme.SYSTEM_DEFAULT
         binding.navigationDrawerThemeAuto.setOnClickListener {
-            preferences.theme = Theme.SYSTEM_DEFAULT
-            activityUtils.configureTheme(mainActivity)
+            switchToTheme(Theme.SYSTEM_DEFAULT)
         }
 
         binding.navigationDrawerThemeDynamicColors.isChecked = preferences.theme == Theme.DYNAMIC_COLORS
         binding.navigationDrawerThemeDynamicColors.setOnClickListener {
-            preferences.theme = Theme.DYNAMIC_COLORS
-            activityUtils.configureTheme(mainActivity)
-
-            val options =
-                DynamicColorsOptions
-                    .Builder()
-                    .setThemeOverlay(R.style.AppTheme_Overlay)
-                    .setPrecondition(DynamicColorsPrecondition())
-                    .build()
-
-            DynamicColors.applyToActivitiesIfAvailable(this.mainActivity.application, options)
+            switchToTheme(Theme.DYNAMIC_COLORS)
         }
 
         return binding.root
     }
+
+    private fun switchToTheme(theme: Theme) {
+        preferences.theme = theme
+
+        activityUtils.configureTheme(mainActivity)
+        activityUtils.configureNightMode()
+
+        val options =
+            DynamicColorsOptions
+                .Builder()
+                .setThemeOverlay(R.style.AppTheme_Overlay)
+                .setPrecondition(DynamicColorsPrecondition())
+                .build()
+
+        DynamicColors.applyToActivitiesIfAvailable(this.mainActivity.application, options)
+    }
 }
diff --git a/gauguin-app/src/main/kotlin/org/piepmeyer/gauguin/ui/newgame/NewGameActivity.kt b/gauguin-app/src/main/kotlin/org/piepmeyer/gauguin/ui/newgame/NewGameActivity.kt
@@ -15,13 +15,13 @@ class NewGameActivity : AppCompatActivity() {
     private lateinit var viewModel: NewGameViewModel
 
     public override fun onCreate(savedInstanceState: Bundle?) {
-        setTheme(R.style.AppTheme)
+        activityUtils.configureTheme(this)
+
         super.onCreate(savedInstanceState)
 
         val binding = ActivityNewgameBinding.inflate(layoutInflater)
         setContentView(binding.root)
 
-        activityUtils.configureTheme(this)
         activityUtils.configureFullscreen(this)
 
         val startNewGameButton = binding.startnewgame

diff --git a/gauguin-app/src/main/kotlin/org/piepmeyer/gauguin/ui/statistics/StatisticsActivity.kt b/gauguin-app/src/main/kotlin/org/piepmeyer/gauguin/ui/statistics/StatisticsActivity.kt
@@ -34,16 +34,17 @@ class StatisticsActivity : AppCompatActivity() {
     private var multiDiagramFragment: StatisticsMultiDiagramFragment? = null
 
     public override fun onCreate(savedInstanceState: Bundle?) {
-        setTheme(R.style.AppTheme)
+        activityUtils.configureTheme(this)
+
         super.onCreate(savedInstanceState)
+
         binding = ActivityStatisticsBinding.inflate(layoutInflater)
         setContentView(binding.root)
 
         binding.clearstats.setOnClickListener { _: View? ->
             resetStatisticsDialog()
         }
 
-        activityUtils.configureTheme(this)
         activityUtils.configureFullscreen(this)
 
         scatterPlotDiagramFragment = StatisticsScatterPlotDiagramFragment()

diff --git a/...uin-app/src/test/kotlin/org/piepmeyer/gauguin/ui/newgame/NewGameActivityScreenshotTest.kt b/...uin-app/src/test/kotlin/org/piepmeyer/gauguin/ui/newgame/NewGameActivityScreenshotTest.kt
@@ -2,23 +2,36 @@ package org.piepmeyer.gauguin.ui.newgame
 
 import com.github.takahirom.roborazzi.captureRoboImage
 import com.google.android.material.tabs.TabLayout
+import io.mockk.every
+import io.mockk.mockk
 import org.junit.After
+import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
 import org.junit.experimental.categories.Category
 import org.junit.runner.RunWith
 import org.koin.core.context.stopKoin
-import org.koin.test.KoinTest
+import org.koin.core.module.dsl.binds
+import org.koin.core.module.dsl.withOptions
+import org.koin.dsl.module
+import org.piepmeyer.gauguin.MainApplication
 import org.piepmeyer.gauguin.R
 import org.piepmeyer.gauguin.ScreenshotTest
 import org.piepmeyer.gauguin.ScreenshotTestUtils
+import org.piepmeyer.gauguin.Theme
 import org.piepmeyer.gauguin.creation.GridCreator
 import org.piepmeyer.gauguin.creation.RandomPossibleDigitsShuffler
 import org.piepmeyer.gauguin.creation.SeedRandomizerMock
 import org.piepmeyer.gauguin.grid.Grid
 import org.piepmeyer.gauguin.grid.GridSize
+import org.piepmeyer.gauguin.options.DifficultySetting
+import org.piepmeyer.gauguin.options.DigitSetting
 import org.piepmeyer.gauguin.options.GameOptionsVariant
 import org.piepmeyer.gauguin.options.GameVariant
+import org.piepmeyer.gauguin.options.GridCageOperation
+import org.piepmeyer.gauguin.options.NumeralSystem
+import org.piepmeyer.gauguin.options.SingleCageUsage
+import org.piepmeyer.gauguin.preferences.ApplicationPreferences
 import org.piepmeyer.gauguin.ui.grid.GridUI
 import org.robolectric.ParameterizedRobolectricTestRunner
 import org.robolectric.annotation.Config
@@ -37,7 +50,7 @@ import sergio.sastre.uitesting.utils.common.UiMode
 @GraphicsMode(GraphicsMode.Mode.NATIVE)
 class NewGameActivityScreenshotTest(
     private val testItem: TestDataForActivity<UiStateEnum>,
-) : KoinTest {
+) {
     enum class UiStateEnum {
         TabBasic,
         TabNumbers,
@@ -76,6 +89,26 @@ class NewGameActivityScreenshotTest(
             deviceScreen = testItem.device,
         )
 
+    @Before
+    fun before() {
+        MainApplication.testOverideModule =
+            module {
+                single {
+                    mockk<ApplicationPreferences>(relaxed = true) {
+                        every { theme } returns Theme.LIGHT
+                        every { difficultySetting } returns DifficultySetting.ANY
+                        every { digitSetting } returns DigitSetting.FIRST_DIGIT_ONE
+                        every { numeralSystem } returns NumeralSystem.Decimal
+                        every { operations } returns GridCageOperation.OPERATIONS_ALL
+                        every { singleCageUsage } returns SingleCageUsage.FIXED_NUMBER
+                        every { gridWidth } returns 9
+                        every { gridHeigth } returns 9
+                        every { gameVariant } returns GameOptionsVariant.createClassic()
+                    }
+                } withOptions { binds(listOf(ApplicationPreferences::class)) }
+            }
+    }
+
     @After
     fun after() {
         stopKoin()

diff --git a/...eActivityScreenshotTest_LARGE_DESKTOP_DAY_FONT_NORMAL_LANDSCAPE_TabAdvanced.png b/...eActivityScreenshotTest_LARGE_DESKTOP_DAY_FONT_NORMAL_LANDSCAPE_TabAdvanced.png
diff --git a/...GameActivityScreenshotTest_LARGE_DESKTOP_DAY_FONT_NORMAL_LANDSCAPE_TabBasic.png b/...GameActivityScreenshotTest_LARGE_DESKTOP_DAY_FONT_NORMAL_LANDSCAPE_TabBasic.png
diff --git a/...meActivityScreenshotTest_LARGE_DESKTOP_DAY_FONT_NORMAL_LANDSCAPE_TabNumbers.png b/...meActivityScreenshotTest_LARGE_DESKTOP_DAY_FONT_NORMAL_LANDSCAPE_TabNumbers.png
diff --git a/...meActivityScreenshotTest_LARGE_DESKTOP_DAY_FONT_NORMAL_PORTRAIT_TabAdvanced.png b/...meActivityScreenshotTest_LARGE_DESKTOP_DAY_FONT_NORMAL_PORTRAIT_TabAdvanced.png
diff --git a/...wGameActivityScreenshotTest_LARGE_DESKTOP_DAY_FONT_NORMAL_PORTRAIT_TabBasic.png b/...wGameActivityScreenshotTest_LARGE_DESKTOP_DAY_FONT_NORMAL_PORTRAIT_TabBasic.png
diff --git a/...ameActivityScreenshotTest_LARGE_DESKTOP_DAY_FONT_NORMAL_PORTRAIT_TabNumbers.png b/...ameActivityScreenshotTest_LARGE_DESKTOP_DAY_FONT_NORMAL_PORTRAIT_TabNumbers.png
diff --git a/...eActivityScreenshotTest_MEDIUM_TABLET_DAY_FONT_NORMAL_LANDSCAPE_TabAdvanced.png b/...eActivityScreenshotTest_MEDIUM_TABLET_DAY_FONT_NORMAL_LANDSCAPE_TabAdvanced.png
diff --git a/...GameActivityScreenshotTest_MEDIUM_TABLET_DAY_FONT_NORMAL_LANDSCAPE_TabBasic.png b/...GameActivityScreenshotTest_MEDIUM_TABLET_DAY_FONT_NORMAL_LANDSCAPE_TabBasic.png
diff --git a/...meActivityScreenshotTest_MEDIUM_TABLET_DAY_FONT_NORMAL_LANDSCAPE_TabNumbers.png b/...meActivityScreenshotTest_MEDIUM_TABLET_DAY_FONT_NORMAL_LANDSCAPE_TabNumbers.png
diff --git a/...meActivityScreenshotTest_MEDIUM_TABLET_DAY_FONT_NORMAL_PORTRAIT_TabAdvanced.png b/...meActivityScreenshotTest_MEDIUM_TABLET_DAY_FONT_NORMAL_PORTRAIT_TabAdvanced.png
diff --git a/...wGameActivityScreenshotTest_MEDIUM_TABLET_DAY_FONT_NORMAL_PORTRAIT_TabBasic.png b/...wGameActivityScreenshotTest_MEDIUM_TABLET_DAY_FONT_NORMAL_PORTRAIT_TabBasic.png
diff --git a/...ameActivityScreenshotTest_MEDIUM_TABLET_DAY_FONT_NORMAL_PORTRAIT_TabNumbers.png b/...ameActivityScreenshotTest_MEDIUM_TABLET_DAY_FONT_NORMAL_PORTRAIT_TabNumbers.png
diff --git a/...wGameActivityScreenshotTest_NEXUS_ONE_DAY_FONT_NORMAL_LANDSCAPE_TabAdvanced.png b/...wGameActivityScreenshotTest_NEXUS_ONE_DAY_FONT_NORMAL_LANDSCAPE_TabAdvanced.png
diff --git a/.../NewGameActivityScreenshotTest_NEXUS_ONE_DAY_FONT_NORMAL_LANDSCAPE_TabBasic.png b/.../NewGameActivityScreenshotTest_NEXUS_ONE_DAY_FONT_NORMAL_LANDSCAPE_TabBasic.png
diff --git a/...ewGameActivityScreenshotTest_NEXUS_ONE_DAY_FONT_NORMAL_LANDSCAPE_TabNumbers.png b/...ewGameActivityScreenshotTest_NEXUS_ONE_DAY_FONT_NORMAL_LANDSCAPE_TabNumbers.png
diff --git a/...ewGameActivityScreenshotTest_NEXUS_ONE_DAY_FONT_NORMAL_PORTRAIT_TabAdvanced.png b/...ewGameActivityScreenshotTest_NEXUS_ONE_DAY_FONT_NORMAL_PORTRAIT_TabAdvanced.png
diff --git a/...e/NewGameActivityScreenshotTest_NEXUS_ONE_DAY_FONT_NORMAL_PORTRAIT_TabBasic.png b/...e/NewGameActivityScreenshotTest_NEXUS_ONE_DAY_FONT_NORMAL_PORTRAIT_TabBasic.png
diff --git a/...NewGameActivityScreenshotTest_NEXUS_ONE_DAY_FONT_NORMAL_PORTRAIT_TabNumbers.png b/...NewGameActivityScreenshotTest_NEXUS_ONE_DAY_FONT_NORMAL_PORTRAIT_TabNumbers.png
diff --git a/...ewGameActivityScreenshotTest_PIXEL_4A_DAY_FONT_NORMAL_LANDSCAPE_TabAdvanced.png b/...ewGameActivityScreenshotTest_PIXEL_4A_DAY_FONT_NORMAL_LANDSCAPE_TabAdvanced.png
diff --git a/...e/NewGameActivityScreenshotTest_PIXEL_4A_DAY_FONT_NORMAL_LANDSCAPE_TabBasic.png b/...e/NewGameActivityScreenshotTest_PIXEL_4A_DAY_FONT_NORMAL_LANDSCAPE_TabBasic.png
diff --git a/...NewGameActivityScreenshotTest_PIXEL_4A_DAY_FONT_NORMAL_LANDSCAPE_TabNumbers.png b/...NewGameActivityScreenshotTest_PIXEL_4A_DAY_FONT_NORMAL_LANDSCAPE_TabNumbers.png
diff --git a/...NewGameActivityScreenshotTest_PIXEL_4A_DAY_FONT_NORMAL_PORTRAIT_TabAdvanced.png b/...NewGameActivityScreenshotTest_PIXEL_4A_DAY_FONT_NORMAL_PORTRAIT_TabAdvanced.png
diff --git a/...me/NewGameActivityScreenshotTest_PIXEL_4A_DAY_FONT_NORMAL_PORTRAIT_TabBasic.png b/...me/NewGameActivityScreenshotTest_PIXEL_4A_DAY_FONT_NORMAL_PORTRAIT_TabBasic.png
diff --git a/.../NewGameActivityScreenshotTest_PIXEL_4A_DAY_FONT_NORMAL_PORTRAIT_TabNumbers.png b/.../NewGameActivityScreenshotTest_PIXEL_4A_DAY_FONT_NORMAL_PORTRAIT_TabNumbers.png
diff --git a/...ameActivityScreenshotTest_SMALL_PHONE_DAY_FONT_NORMAL_LANDSCAPE_TabAdvanced.png b/...ameActivityScreenshotTest_SMALL_PHONE_DAY_FONT_NORMAL_LANDSCAPE_TabAdvanced.png
diff --git a/...ewGameActivityScreenshotTest_SMALL_PHONE_DAY_FONT_NORMAL_LANDSCAPE_TabBasic.png b/...ewGameActivityScreenshotTest_SMALL_PHONE_DAY_FONT_NORMAL_LANDSCAPE_TabBasic.png
diff --git a/...GameActivityScreenshotTest_SMALL_PHONE_DAY_FONT_NORMAL_LANDSCAPE_TabNumbers.png b/...GameActivityScreenshotTest_SMALL_PHONE_DAY_FONT_NORMAL_LANDSCAPE_TabNumbers.png
diff --git a/...GameActivityScreenshotTest_SMALL_PHONE_DAY_FONT_NORMAL_PORTRAIT_TabAdvanced.png b/...GameActivityScreenshotTest_SMALL_PHONE_DAY_FONT_NORMAL_PORTRAIT_TabAdvanced.png
diff --git a/...NewGameActivityScreenshotTest_SMALL_PHONE_DAY_FONT_NORMAL_PORTRAIT_TabBasic.png b/...NewGameActivityScreenshotTest_SMALL_PHONE_DAY_FONT_NORMAL_PORTRAIT_TabBasic.png
diff --git a/...wGameActivityScreenshotTest_SMALL_PHONE_DAY_FONT_NORMAL_PORTRAIT_TabNumbers.png b/...wGameActivityScreenshotTest_SMALL_PHONE_DAY_FONT_NORMAL_PORTRAIT_TabNumbers.png
diff --git a/...tatisticsActivityScreenshotTest_LARGE_DESKTOP_DAY_PORTRAIT_FilledStatistics.png b/...tatisticsActivityScreenshotTest_LARGE_DESKTOP_DAY_PORTRAIT_FilledStatistics.png
diff --git a/...cs/StatisticsActivityScreenshotTest_LARGE_DESKTOP_DAY_PORTRAIT_NoStatistics.png b/...cs/StatisticsActivityScreenshotTest_LARGE_DESKTOP_DAY_PORTRAIT_NoStatistics.png
diff --git a/...tatisticsActivityScreenshotTest_MEDIUM_TABLET_DAY_PORTRAIT_FilledStatistics.png b/...tatisticsActivityScreenshotTest_MEDIUM_TABLET_DAY_PORTRAIT_FilledStatistics.png
diff --git a/...cs/StatisticsActivityScreenshotTest_MEDIUM_TABLET_DAY_PORTRAIT_NoStatistics.png b/...cs/StatisticsActivityScreenshotTest_MEDIUM_TABLET_DAY_PORTRAIT_NoStatistics.png
diff --git a/...cs/StatisticsActivityScreenshotTest_NEXUS_ONE_DAY_PORTRAIT_FilledStatistics.png b/...cs/StatisticsActivityScreenshotTest_NEXUS_ONE_DAY_PORTRAIT_FilledStatistics.png
diff --git a/...istics/StatisticsActivityScreenshotTest_NEXUS_ONE_DAY_PORTRAIT_NoStatistics.png b/...istics/StatisticsActivityScreenshotTest_NEXUS_ONE_DAY_PORTRAIT_NoStatistics.png
diff --git a/...ics/StatisticsActivityScreenshotTest_PIXEL_4A_DAY_PORTRAIT_FilledStatistics.png b/...ics/StatisticsActivityScreenshotTest_PIXEL_4A_DAY_PORTRAIT_FilledStatistics.png
diff --git a/...tistics/StatisticsActivityScreenshotTest_PIXEL_4A_DAY_PORTRAIT_NoStatistics.png b/...tistics/StatisticsActivityScreenshotTest_PIXEL_4A_DAY_PORTRAIT_NoStatistics.png
diff --git a/.../StatisticsActivityScreenshotTest_SMALL_PHONE_DAY_PORTRAIT_FilledStatistics.png b/.../StatisticsActivityScreenshotTest_SMALL_PHONE_DAY_PORTRAIT_FilledStatistics.png
diff --git a/...tics/StatisticsActivityScreenshotTest_SMALL_PHONE_DAY_PORTRAIT_NoStatistics.png b/...tics/StatisticsActivityScreenshotTest_SMALL_PHONE_DAY_PORTRAIT_NoStatistics.png