created SettingsMiddleware and LocalSettingsRepository

Author: patjackson52

app/build.gradle

@@ -1,3 +1,6 @@
+repositories {
+    maven{ url "https://dl.bintray.com/russhwolf/multiplatform-settings" }
+}
 apply plugin: 'com.android.application'
 
 apply plugin: 'kotlin-android'
@@ -23,6 +26,10 @@ android {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
+        debug {
+            // MPP libraries don't currently get this resolution automatically
+            matchingFallbacks = ['release']
+        }
     }
     packagingOptions {
         exclude 'META-INF/*.kotlin_module'
@@ -55,6 +62,7 @@ dependencies {
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutinesVersion"
     implementation project(':common')
     implementation 'nl.dionsegijn:konfetti:1.1.2'
+    implementation "com.russhwolf:multiplatform-settings:0.2"
 
     kapt 'com.github.bumptech.glide:compiler:4.8.0'
     testImplementation 'junit:junit:4.12'

app/src/test/java/com/willowtreeapps/namegame/ReducersTest.kt

@@ -125,6 +125,16 @@ class ReducersTest {
         assertEquals(10, final.questionClock)
     }
 
+    @Test
+    fun `ChangeNumQuestionsAction should update AppState`() {
+        val initial = generateInitialTestState()
+
+        val final = reducer(initial, Actions.ChangeNumQuestionsSettingsAction(10))
+
+        assertEquals(10, final.settings.numQuestions)
+
+    }
+
     private fun generateInitialTestState(): AppState {
         val initialState = reducer(AppState(), Actions.FetchingProfilesSuccessAction(MockRepositoryFactory.getValidResponse()))
         return initialState

build.gradle

@@ -10,6 +10,7 @@ buildscript {
         maven { url 'https://dl.bintray.com/jetbrains/kotlin-native-dependencies' }
     }
     dependencies {
+//        classpath 'com.android.tools.build:gradle:3.3.2'
         classpath 'com.android.tools.build:gradle:3.5.0-alpha10'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
         classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlinVersion"
@@ -25,6 +26,7 @@ allprojects {
         mavenCentral()
         maven { url "https://jitpack.io" }
         maven { url 'https://dl.bintray.com/kotlin/kotlin-eap' }
+        maven { url "https://dl.bintray.com/russhwolf/multiplatform-settings" }
         maven { url "https://kotlin.bintray.com/kotlinx" }
         maven { url "https://dl.bintray.com/kotlin/ktor" }
         maven { url "https://dl.bintray.com/soywiz/soywiz" }

common/build.gradle

@@ -1,30 +1,24 @@
-//plugins {
-//      id("org.jetbrains.kotlin.native.cocoapods")
-//}
 repositories {
     maven { url "https://dl.bintray.com/soywiz/soywiz" }
 }
 
-apply plugin: 'kotlin-multiplatform'
 apply plugin: 'com.android.library'
+apply plugin: 'kotlin-multiplatform'
 apply plugin: 'kotlinx-serialization'
 
-
-
-
-
 kotlin {
 
-    android {
-        compilations.all {
-            tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile) { task ->
-                kotlinOptions {
-                    freeCompilerArgs = ['-Xuse-experimental=kotlin.Experimental']
-                }
-            }
-        }
-        publishLibraryVariants("release")
-    }
+
+//    android {
+//        compilations.all {
+//            tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile) { task ->
+//                kotlinOptions {
+//                    freeCompilerArgs = ['-Xuse-experimental=kotlin.Experimental']
+//                }
+//            }
+//        }
+//        publishLibraryVariants("release")
+//    }
 
 //    iosArm64("ios")
 //    iosX64("iosSim")
@@ -39,24 +33,34 @@ kotlin {
 //    }
 //
     targets {
-        fromPreset(presets.jvm, 'jvm')
+//        fromPreset(presets.jvm, 'jvm')
 
 //        fromPreset(presets.android, 'androidMain')
+        fromPreset(presets.android, 'android')
+        final def iOSTarget = System.getenv('SDK_NAME')?.startsWith("iphoneos") \
+                              ? presets.iosArm64 : presets.iosX64
+
+        fromPreset(iOSTarget, 'ios') {
+            binaries {
+                framework('shared')
+            }
+        }
 
 //         Change to `presets.iosArm64` to deploy the app to iPhone
 //         Change to `presets.iosX64` to deploy the app to iPhone
-            fromPreset(presets.iosX64, 'ios') {
+//            fromPreset(presets.iosX64, 'ios') {
 //            fromPreset(presets.iosArm64, 'ios') {
-            compilations.main.outputKinds('FRAMEWORK')
-        }
+//            compilations.main.outputKinds('FRAMEWORK')
+//        }
     }
     sourceSets {
         commonMain {
             dependencies {
-                implementation 'org.jetbrains.kotlin:kotlin-stdlib'
+                api 'org.jetbrains.kotlin:kotlin-stdlib'
                 implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core-common:$coroutinesVersion"
                 implementation "org.jetbrains.kotlinx:kotlinx-serialization-runtime-common:$serializationVersion"
                 implementation "io.ktor:ktor-client-logging:$ktorVersion"
+                implementation "com.russhwolf:multiplatform-settings:0.2"
 
 
                 implementation "io.ktor:ktor-client-core:$ktorVersion"
@@ -72,7 +76,7 @@ kotlin {
         }
         androidMain {
             dependencies {
-                implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
+                api "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
                 implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutinesVersion"
 
                 implementation "org.jetbrains.kotlinx:kotlinx-serialization-runtime:$serializationVersion"
@@ -113,17 +117,22 @@ kotlin {
             }
         }
 
-        iosSimMain.dependsOn iosMain
-        iosSimTest.dependsOn iosTest
+//        iosSimMain.dependsOn iosMain
+//        iosSimTest.dependsOn iosTest
     }
 }
 
 android {
-    compileSdkVersion 27
+    compileSdkVersion 28
     defaultConfig {
         minSdkVersion 15
     }
     buildTypes {
+        //This is for MultiplatformSettings
+        debug {
+            // MPP libraries don't currently get this resolution automatically
+            matchingFallbacks = ['release']
+        }
         release {
             minifyEnabled true
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
@@ -136,7 +145,6 @@ android {
 // Xcode runs this task itself during its build process when we configure it.
 // make sure all Gradle infrastructure exists (gradle.wrapper, gradlew)
 //and gradlw is in executable mode (chmod +x gradlew)
-
 task packForXCode(type: Sync) {
     final File frameworkDir = new File(buildDir, "xcode-frameworks")
     final String mode = project.findProperty("XCODE_CONFIGURATION")?.toUpperCase() ?: 'DEBUG'

common/src/androidMain/kotlin/com/willowtreeapps/common/repo/UserSettings.kt

@@ -0,0 +1,9 @@
+package com.willowtreeapps.common.repo
+
+import android.app.Application
+import android.content.Context
+import com.russhwolf.settings.PlatformSettings
+
+
+
+actual fun userSettings(context: Any?) = PlatformSettings.Factory(context as Context).create()

common/src/commonMain/kotlin/com/willowtreeapps/common/Actions.kt

@@ -22,5 +22,8 @@ sealed class Actions : Action {
     class DecrementCountDownAction
     class TimesUpAction
 
+    class LoadAllSettingsAction
+    class ChangeNumQuestionsSettingsAction(val num: Int)
+
 }
 

common/src/commonMain/kotlin/com/willowtreeapps/common/AppState.kt

@@ -7,11 +7,11 @@ data class AppState(val isLoadingProfiles: Boolean = false,
                     val errorLoadingProfiles: Boolean = false,
                     val errorMsg: String = "",
                     val currentQuestionIndex: Int = 0,
-                    val numQuestions: Int = 3,
                     val waitingForNextQuestion: Boolean = false,
                     val waitingForResultsTap: Boolean = false,
                     val questionClock: Int = 0,
-                    val questions: List<Question> = listOf()) {
+                    val questions: List<Question> = listOf(),
+                    val settings: UserSettings = UserSettings.defaults()) {
     companion object {
         val INITIAL_STATE = AppState()
     }
@@ -51,3 +51,9 @@ data class Question(val profileId: ProfileId,
     }
 }
 
+data class UserSettings(val numQuestions: Int) {
+    companion object {
+        fun defaults() = UserSettings(3)
+    }
+}
+

common/src/commonMain/kotlin/com/willowtreeapps/common/GameEngine.kt

@@ -5,25 +5,34 @@ import com.beyondeye.reduks.middlewares.applyMiddleware
 import com.beyondeye.reduks.middlewares.thunkMiddleware
 import com.willowtreeapps.common.middleware.NavigationMiddleware
 import com.willowtreeapps.common.middleware.Navigator
+import com.willowtreeapps.common.middleware.SettingsMiddleware
 import com.willowtreeapps.common.middleware.ViewEffectsMiddleware
+import com.willowtreeapps.common.repo.LocalStorageSettingsRepository
+import com.willowtreeapps.common.repo.userSettings
 import com.willowtreeapps.common.util.VibrateUtil
 import kotlin.coroutines.CoroutineContext
 
-class GameEngine(navigator: Navigator, application: Any = Any(),
+class GameEngine(navigator: Navigator,
+                 application: Any = Any(),
                  networkContext: CoroutineContext,
                  uiContext: CoroutineContext) {
     private val navigationMiddleware = NavigationMiddleware(navigator)
     private val viewEffectsMiddleware = ViewEffectsMiddleware()
     private val presenterFactory by lazy { PresenterFactory(this, networkContext) }
     val vibrateUtil = VibrateUtil(application)
+    private val settingsMiddleware by lazy {  SettingsMiddleware(LocalStorageSettingsRepository(userSettings(application))) }
 
     val appStore by lazy {
         SimpleStore(AppState.INITIAL_STATE, ::reducer)
                 .applyMiddleware(::thunkMiddleware,
                         viewEffectsMiddleware::dispatch,
-                        navigationMiddleware::dispatch)
+                        navigationMiddleware::dispatch,
+                        settingsMiddleware::dispatch)
     }
 
+    init {
+        appStore.dispatch(Actions.LoadAllSettingsAction())
+    }
     fun attachView(view: View): Presenter<out View?> = presenterFactory.attachView(view)
 
     fun detachView(view: View) = presenterFactory.detachView(view)

common/src/commonMain/kotlin/com/willowtreeapps/common/Reducers.kt

@@ -14,7 +14,7 @@ fun reducer(state: AppState, action: Any): AppState =
         when (action) {
             is FetchingProfilesStartedAction -> state.copy(isLoadingProfiles = true)
             is FetchingProfilesSuccessAction -> {
-                val rounds = generateRounds(action.profiles, state.numQuestions)
+                val rounds = generateRounds(action.profiles, state.settings.numQuestions)
                 state.copy(isLoadingProfiles = false, profiles = action.profiles, questions = rounds)
             }
             is FetchingProfilesFailedAction -> state.copy(isLoadingProfiles = false, errorLoadingProfiles = true, errorMsg = action.message)
@@ -40,6 +40,8 @@ fun reducer(state: AppState, action: Any): AppState =
                 state.copy(questions = newQuestions, waitingForNextQuestion = true, questionClock = -1)
             }
 
+            is ChangeNumQuestionsSettingsAction -> state.copy(settings = state.settings.copy(numQuestions = action.num))
+
             else -> throw AssertionError("Action ${action::class.simpleName} not handled")
         }