wip

meikpiep · Jan 12, 2025 · 1703139 · 1703139
1 parent 8c5ec0d
commit 1703139
Show file tree

Hide file tree

Showing 47 changed files with 114 additions and 39 deletions.
diff --git a/gauguin-app/build.gradle.kts b/gauguin-app/build.gradle.kts
@@ -28,6 +28,7 @@ android {
         applicationId = "org.piepmeyer.gauguin"
         minSdk = 24
         targetSdk = 34
+        testInstrumentationRunner = "org.piepmeyer.gauguin.InstrumentationTestRunner"
     }
 
     if (keystoreExists) {

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,36 @@
+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.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 =
+        org.koin.dsl.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,11 @@ 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.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,42 +23,32 @@ class MainApplication : Application() {
 
         val applicationPreferences = ApplicationPreferencesImpl(this)
 
+        val koinApplication =
+            startKoin {
+                androidLogger()
+                androidContext(this@MainApplication)
+
+                val statisticsPreferences = getSharedPreferences("stats", Context.MODE_PRIVATE)
+
+                applicationPreferences.migrateGridSizeFromTwoToThree()
+
+                modules(
+                    CoreModule(filesDir).module(),
+                    ApplicationModule(filesDir, statisticsPreferences, applicationPreferences).module(),
+                )
+            }
+
         val options =
-            DynamicColorsOptions.Builder()
+            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() }
-                }
-
-            applicationPreferences.migrateGridSizeFromTwoToThree()
-
-            modules(
-                CoreModule(filesDir).module(),
-                appModule,
-            )
-        }
+        val activityUtils = get<ActivityUtils>()
+        activityUtils.configureNightMode()
 
         logger.info {
             "Gauguin application started successfully, " +

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
@@ -33,10 +33,25 @@ class ActivityUtils : KoinComponent {
         when (applicationPreferences.theme) {
             Theme.LIGHT -> {
                 activity.setTheme(R.style.AppTheme)
-                AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO)
+                // 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 -> {
+                activity.setTheme(R.style.AppTheme)
+                // AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM)
+            }
+        }
+    }
+
+    fun configureNightMode() {
+        when (applicationPreferences.theme) {
+            Theme.LIGHT -> {
+                AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO)
+            }
+            Theme.DARK -> {
                 AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES)
             }
             Theme.SYSTEM_DEFAULT, Theme.DYNAMIC_COLORS -> {

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/test/kotlin/org/piepmeyer/gauguin/InstrumentationTestRunner.kt b/gauguin-app/src/test/kotlin/org/piepmeyer/gauguin/InstrumentationTestRunner.kt
@@ -0,0 +1,13 @@
+package org.piepmeyer.gauguin
+
+import android.app.Application
+import android.content.Context
+import androidx.test.runner.AndroidJUnitRunner
+
+class InstrumentationTestRunner : AndroidJUnitRunner() {
+    override fun newApplication(
+        classLoader: ClassLoader?,
+        className: String?,
+        context: Context?,
+    ): Application = super.newApplication(classLoader, TestApplication::class.java.name, context)
+}
diff --git a/gauguin-app/src/test/kotlin/org/piepmeyer/gauguin/TestApplication.kt b/gauguin-app/src/test/kotlin/org/piepmeyer/gauguin/TestApplication.kt
@@ -0,0 +1,26 @@
+package org.piepmeyer.gauguin
+
+import android.app.Application
+import io.mockk.every
+import io.mockk.mockk
+import org.koin.core.context.startKoin
+import org.piepmeyer.gauguin.preferences.ApplicationPreferencesImpl
+import kotlin.io.path.createTempDirectory
+
+class TestApplication : Application() {
+    override fun onCreate() {
+        super.onCreate()
+
+        val mockedPreferences =
+            mockk<ApplicationPreferencesImpl> {
+                every { theme } returns Theme.LIGHT
+            }
+
+        startKoin {
+            modules(
+                CoreModule(createTempDirectory().toFile()).module(),
+                ApplicationModule(createTempDirectory().toFile(), mockk(), mockedPreferences).module(),
+            )
+        }
+    }
+}
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