Merge branch 'feat/gnome' into 'master'

Přidán gnóm jako hratelná rasa

See merge request fmasa/pv239-project!90

Author: fmasa

app/src/main/java/cz/muni/fi/rpg/model/domain/character/Race.kt

@@ -7,7 +7,8 @@ enum class Race {
     HIGH_ELF,
     DWARF,
     WOOD_ELF,
-    HALFLING;
+    HALFLING,
+    GNOME;
 
     fun getReadableNameId(): Int {
         return when (this) {
@@ -16,6 +17,7 @@ enum class Race {
             DWARF -> R.string.race_dwarf
             HALFLING -> R.string.race_halfling
             WOOD_ELF -> R.string.race_wood_elf
+            GNOME -> R.string.race_gnome
         }
     }
 }

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

@@ -115,9 +115,10 @@ class CharacterInfoFormFragment :
         when (character.getRace()) {
             Race.HUMAN -> radioButtonRaceHuman.isChecked = true
             Race.DWARF -> radioButtonRaceDwarf.isChecked = true
-            Race.HIGH_ELF -> radioButtonRaceElf.isChecked = true
-            Race.WOOD_ELF -> radioButtonRaceGnome.isChecked = true
+            Race.HIGH_ELF -> radioButtonRaceHighElf.isChecked = true
+            Race.WOOD_ELF -> radioButtonRaceWoodElf.isChecked = true
             Race.HALFLING -> radioButtonRaceHalfling.isChecked = true
+            Race.GNOME -> radioButtonRaceGnome.isChecked = true
         }
     }
 
@@ -129,9 +130,10 @@ class CharacterInfoFormFragment :
         val race: Race = when (radioGroup.checkedRadioButtonId) {
             R.id.radioButtonRaceHuman -> Race.HUMAN
             R.id.radioButtonRaceDwarf -> Race.DWARF
-            R.id.radioButtonRaceElf -> Race.HIGH_ELF
-            R.id.radioButtonRaceGnome -> Race.WOOD_ELF
+            R.id.radioButtonRaceHighElf -> Race.HIGH_ELF
+            R.id.radioButtonRaceWoodElf -> Race.WOOD_ELF
             R.id.radioButtonRaceHalfling -> Race.HALFLING
+            R.id.radioButtonRaceGnome -> Race.GNOME
             else -> error("No race selected")
         }
 

app/src/main/res/layout/fragment_character_info_form.xml

@@ -64,7 +64,7 @@
             android:text="@string/race_halfling" />
 
         <RadioButton
-            android:id="@+id/radioButtonRaceElf"
+            android:id="@+id/radioButtonRaceHighElf"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="@string/race_high_elf" />
@@ -76,10 +76,16 @@
             android:text="@string/race_dwarf" />
 
         <RadioButton
-            android:id="@+id/radioButtonRaceGnome"
+            android:id="@+id/radioButtonRaceWoodElf"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="@string/race_wood_elf" />
+
+        <RadioButton
+            android:id="@+id/radioButtonRaceGnome"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/race_gnome" />
     </RadioGroup>
 
     <cz.muni.fi.rpg.ui.views.TextInput

app/src/main/res/values/strings.xml

@@ -94,6 +94,7 @@
     <string name="race_wood_elf">Wood Elf</string>
     <string name="race_halfling">Halfling</string>
     <string name="race_human">Human</string>
+    <string name="race_gnome">Gnome</string>
     <string name="button_edit">Edit</string>
     <string name="subtitle_edit_character">Edit character</string>
     <string name="no_parties_prompt">Assemble your first party\n or join the existing one.</string>

firebase/firestore.rules

@@ -190,7 +190,7 @@ service cloud.firestore {
                         && character.motivation is string && character.motivation.size() <= 200
                         && character.mutation is string && character.mutation.size() <= 200
                         && character.socialClass is string && isNotBlank(character.socialClass) && character.socialClass.size() <= 50
-                        && character.race is string && character.race in ["HUMAN", "HIGH_ELF", "DWARF", "HALFLING", "WOOD_ELF"]
+                        && character.race is string && character.race in ["HUMAN", "HIGH_ELF", "DWARF", "HALFLING", "WOOD_ELF", "GNOME"]
                         && arePointsValid(character.points)
                         && areStatsValid(character.stats)
                         && areStatsValid(character.maxStats)