Fix stat defaults in character edit

Author: fmasa

app/src/main/java/cz/muni/fi/rpg/ui/characterCreation/CharacterInfoFormFragment.kt

@@ -81,11 +81,11 @@ class CharacterInfoFormFragment :
         setDefaultValues()
 
         savedInstanceState?.let {
-            it.getString(STATE_NAME)?.let(nameInput::setDefaultValue)
+            it.getString(STATE_NAME)?.let { value -> nameInput.setDefaultValue(value) }
             it.getInt(STATE_RACE).let(radioGroup::check)
-            it.getString(STATE_CAREER)?.let(careerInput::setDefaultValue)
-            it.getString(STATE_SOCIAL_CLASS)?.let(socialClassInput::setDefaultValue)
-            it.getString(STATE_NOTE)?.let(noteInput::setDefaultValue)
+            it.getString(STATE_CAREER)?.let { value -> careerInput.setDefaultValue(value)}
+            it.getString(STATE_SOCIAL_CLASS)?.let { value -> socialClassInput.setDefaultValue(value) }
+            it.getString(STATE_NOTE)?.let { value -> noteInput.setDefaultValue(value) }
         }
     }
 

app/src/main/java/cz/muni/fi/rpg/ui/characterCreation/CharacterPointsFormFragment.kt

@@ -56,9 +56,9 @@ class CharacterPointsFormFragment :
         }
 
         savedInstanceState?.let {
-            it.getString(STATE_MAX_WOUNDS)?.let(maxWoundsInput::setDefaultValue)
-            it.getString(STATE_FATE_POINTS)?.let(fatePointsInput::setDefaultValue)
-            it.getString(STATE_RESILIENCE_POINTS)?.let(resiliencePointsInput::setDefaultValue)
+            it.getString(STATE_MAX_WOUNDS)?.let { value -> maxWoundsInput.setDefaultValue(value) }
+            it.getString(STATE_FATE_POINTS)?.let { value -> fatePointsInput.setDefaultValue(value) }
+            it.getString(STATE_RESILIENCE_POINTS)?.let { value -> resiliencePointsInput.setDefaultValue(value) }
         }
     }
 

app/src/main/java/cz/muni/fi/rpg/ui/characterCreation/CharacterStatsFormFragment.kt

@@ -122,8 +122,8 @@ class CharacterStatsFormFragment :
             val currentInput = entry.key.first
             val maxInput = entry.key.second
 
-            currentInput.setDefaultValue(entry.value(character.getStats()).toString())
-            maxInput.setDefaultValue(entry.value(character.getMaxStats()).toString())
+            currentInput.setDefaultValue(entry.value(character.getStats()).toString(), force = true)
+            maxInput.setDefaultValue(entry.value(character.getMaxStats()).toString(), force = true)
         }
     }
 }

app/src/main/java/cz/muni/fi/rpg/ui/views/TextInput.kt

@@ -65,8 +65,8 @@ class TextInput(context: Context, attrs: AttributeSet) : LinearLayout(context, a
 
     fun getTextInputLayout(): TextInputLayout = textInputLayout
 
-    fun setDefaultValue(value: String) {
-        if (textInputLayout.editText?.text.toString() == "") {
+    fun setDefaultValue(value: String, force: Boolean = false) {
+        if (force || textInputLayout.editText?.text.toString() == "") {
             textInputLayout.editText?.setText(value)
         }
     }