Merge branch 'feat/note' into 'master'

fmasa · fmasa · commit cd1a78afc668 · 2020-06-26T22:13:52.000Z
Přidána vlastní poznámka u postavy

See merge request fmasa/pv239-project!76
diff --git a/app/src/main/java/cz/muni/fi/rpg/model/domain/character/Character.kt b/app/src/main/java/cz/muni/fi/rpg/model/domain/character/Character.kt
@@ -16,7 +16,8 @@ data class Character(
     private var maxStats: Stats,
     private var points: Points,
     private var ambitions: Ambitions = Ambitions("", ""),
-    private var mutation: String = ""
+    private var mutation: String = "",
+    private var note: String = ""
 ) {
     companion object {
         const val NAME_MAX_LENGTH = 50
@@ -25,6 +26,7 @@ data class Character(
         const val PSYCHOLOGY_MAX_LENGTH = 200
         const val MOTIVATION_MAX_LENGTH = 200
         const val MUTATION_MAX_LENGTH = 200
+        const val NOTE_MAX_LENGTH = 400
     }
 
     private var money: Money = Money.zero()
@@ -37,6 +39,7 @@ data class Character(
         require(psychology.length <= PSYCHOLOGY_MAX_LENGTH) { "Psychology is too long" }
         require(motivation.length <= MOTIVATION_MAX_LENGTH) { "Motivation is too long" }
         require(mutation.length <= MUTATION_MAX_LENGTH) { "Mutation is too long" }
+        require(note.length <= NOTE_MAX_LENGTH) { "Note is too long" }
     }
 
     fun update(
@@ -48,7 +51,8 @@ data class Character(
         maxStats: Stats,
         points: Points,
         psychology: String,
-        motivation: String
+        motivation: String,
+        note: String
     ) {
         require(listOf(name, career).all { it.isNotBlank() })
         require(name.length <= NAME_MAX_LENGTH) { "Character name is too long" }
@@ -57,6 +61,7 @@ data class Character(
         require(stats.allLowerOrEqualTo(maxStats)) { "Stats cannot be larger than max stats" }
         require(psychology.length <= PSYCHOLOGY_MAX_LENGTH) { "Psychology is too long" }
         require(motivation.length <= MOTIVATION_MAX_LENGTH) { "Motivation is too long" }
+        require(note.length <= NOTE_MAX_LENGTH) { "Note is too long" }
 
         this.name = name
         this.career = career
@@ -67,6 +72,7 @@ data class Character(
         this.points = points
         this.psychology = psychology
         this.motivation = motivation
+        this.note = note
     }
 
     fun addMoney(amount: Money) {
@@ -113,5 +119,7 @@ data class Character(
 
     fun getMotivation() = motivation
 
+    fun getNote() = note
+
     fun getMutation() = mutation
 }
diff --git a/app/src/main/java/cz/muni/fi/rpg/ui/character/CharacterMiscFragment.kt b/app/src/main/java/cz/muni/fi/rpg/ui/character/CharacterMiscFragment.kt
@@ -66,6 +66,7 @@ internal class CharacterMiscFragment : Fragment(R.layout.fragment_character_misc
             socialClassValue.text = character.getSocialClass()
             psychologyValue.text = character.getPsychology()
             motivationValue.text = character.getMotivation()
+            noteValue.text = character.getNote()
 
             xpPoints.text = getString(R.string.xp_points, character.getPoints().experience)
             xpPoints.setOnClickListener {
diff --git a/app/src/main/java/cz/muni/fi/rpg/ui/character/edit/CharacterEditFragment.kt b/app/src/main/java/cz/muni/fi/rpg/ui/character/edit/CharacterEditFragment.kt
@@ -112,7 +112,8 @@ class CharacterEditFragment(
             statsData.maxStats,
             points.updateMaxWounds(maxWounds),
             info.psychology,
-            info.motivation
+            info.motivation,
+            info.note
         )
 
         characters.save(args.characterId.partyId, character)
diff --git a/app/src/main/java/cz/muni/fi/rpg/ui/characterCreation/CharacterCreationFragment.kt b/app/src/main/java/cz/muni/fi/rpg/ui/characterCreation/CharacterCreationFragment.kt
@@ -147,7 +147,8 @@ class CharacterCreationFragment(
                     maxStats = statsData.maxStats,
                     points = points,
                     psychology = info.psychology,
-                    motivation = info.motivation
+                    motivation = info.motivation,
+                    note = info.note
                 )
             )
             toast("Your character has been created")
diff --git a/app/src/main/java/cz/muni/fi/rpg/ui/characterCreation/CharacterInfoFormFragment.kt b/app/src/main/java/cz/muni/fi/rpg/ui/characterCreation/CharacterInfoFormFragment.kt
@@ -17,6 +17,7 @@ class CharacterInfoFormFragment :
         private const val STATE_SOCIAL_CLASS = "infoClass"
         private const val STATE_PSYCHOLOGY = "infoPsychology"
         private const val STATE_MOTIVATION = "infoMotivation"
+        private const val STATE_NOTE = "infoNote"
     }
 
     var character: Character? = null
@@ -27,7 +28,8 @@ class CharacterInfoFormFragment :
         val career: String,
         val socialClass: String,
         val psychology: String,
-        val motivation: String
+        val motivation: String,
+        val note: String
     )
 
     private lateinit var form: Form
@@ -39,6 +41,7 @@ class CharacterInfoFormFragment :
             outState.putString(STATE_SOCIAL_CLASS, socialClassInput.getValue())
             outState.putString(STATE_PSYCHOLOGY, psychologyInput.getValue())
             outState.putString(STATE_MOTIVATION, motivationInput.getValue())
+            outState.putString(STATE_NOTE, noteInput.getValue())
 
         super.onSaveInstanceState(outState)
     }
@@ -69,6 +72,10 @@ class CharacterInfoFormFragment :
             addTextInput(motivationInput).apply {
                 setMaxLength(Character.MOTIVATION_MAX_LENGTH, showCounter = false)
             }
+
+            addTextInput(noteInput).apply {
+                setMaxLength(Character.NOTE_MAX_LENGTH, showCounter = false)
+            }
         }
 
         setDefaultValues()
@@ -78,6 +85,7 @@ class CharacterInfoFormFragment :
             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)
         }
     }
 
@@ -102,6 +110,7 @@ class CharacterInfoFormFragment :
         socialClassInput.setDefaultValue(character.getSocialClass())
         psychologyInput.setDefaultValue(character.getPsychology())
         motivationInput.setDefaultValue(character.getMotivation())
+        noteInput.setDefaultValue(character.getNote())
 
         when (character.getRace()) {
             Race.HUMAN -> radioButtonRaceHuman.isChecked = true
@@ -132,7 +141,8 @@ class CharacterInfoFormFragment :
             career = career,
             socialClass = socialClass,
             psychology = psychologyInput.getValue(),
-            motivation = motivationInput.getValue()
+            motivation = motivationInput.getValue(),
+            note = noteInput.getValue()
         )
     }
 }
diff --git a/app/src/main/res/layout/fragment_character_info_form.xml b/app/src/main/res/layout/fragment_character_info_form.xml
@@ -96,4 +96,11 @@
         app:inputLabel="@string/label_motivation_input"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"/>
+
+    <cz.muni.fi.rpg.ui.views.TextInput
+        android:id="@+id/noteInput"
+        android:layout_marginTop="12dp"
+        app:inputLabel="@string/label_character_note_input"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"/>
 </LinearLayout>
diff --git a/app/src/main/res/layout/fragment_character_misc.xml b/app/src/main/res/layout/fragment_character_misc.xml
@@ -43,7 +43,9 @@
                     psychologyLabel,
                     psychologyValue,
                     motivationLabel,
-                    motivationValue"
+                    motivationValue,
+                    noteLabel,
+                    noteValue"
                     app:flow_horizontalBias="0"
                     app:flow_horizontalGap="14dp"
                     app:flow_horizontalStyle="spread"
@@ -159,13 +161,26 @@
                     android:paddingBottom="6dp"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content" />
+
+                <TextView
+                    android:id="@+id/noteLabel"
+                    android:text="@string/label_character_note"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content" />
+
+                <TextView
+                    android:id="@+id/noteValue"
+                    style="@style/TextAppearance.AppCompat.Medium"
+                    android:textColor="@color/colorText"
+                    android:paddingBottom="6dp"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content" />
             </androidx.constraintlayout.widget.ConstraintLayout>
         </androidx.cardview.widget.CardView>
 
         <cz.muni.fi.rpg.ui.views.AmbitionsCard
             android:id="@+id/characterAmbitionsCard"
             style="@style/CardContainer"
-            android:layout_marginTop="20dp"
             android:clickable="true"
             android:focusable="true"
             android:foreground="?attr/selectableItemBackground"
@@ -176,7 +191,6 @@
         <cz.muni.fi.rpg.ui.views.AmbitionsCard
             android:id="@+id/partyAmbitionsCard"
             style="@style/CardContainer"
-            android:layout_marginTop="20dp"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             app:title="@string/title_party_ambitions"
diff --git a/app/src/main/res/layout/fragment_character_stats.xml b/app/src/main/res/layout/fragment_character_stats.xml
@@ -28,7 +28,7 @@
                 app:constraint_referenced_ids="woundsCard,pointsContainer,statsCard"
                 app:flow_maxElementsWrap="1"
                 app:flow_verticalBias="0"
-                app:flow_verticalGap="48dp"
+                app:flow_verticalGap="40dp"
                 app:flow_wrapMode="aligned"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
@@ -81,7 +81,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 app:constraint_referenced_ids="fateCard,pointsCard"
-                app:flow_horizontalGap="16dp" />
+                app:flow_horizontalGap="10dp" />
 
             <androidx.cardview.widget.CardView
                 android:id="@+id/fateCard"
diff --git a/app/src/main/res/layout/fragment_game_master.xml b/app/src/main/res/layout/fragment_game_master.xml
@@ -11,6 +11,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical"
+        android:clipToPadding="false"
         android:paddingBottom="@dimen/long_ui_bottom_padding">
 
         <androidx.cardview.widget.CardView
@@ -74,7 +75,6 @@
             android:clickable="true"
             android:focusable="true"
             android:foreground="?attr/selectableItemBackground"
-            android:layout_marginTop="20dp"
             app:title="@string/title_party_ambitions" />
     </LinearLayout>
 </ScrollView>
diff --git a/app/src/main/res/layout/fragment_inventory.xml b/app/src/main/res/layout/fragment_inventory.xml
@@ -8,6 +8,7 @@
     tools:context=".ui.character.InventoryFragment">
 
     <LinearLayout
+        android:clipToPadding="false"
         android:orientation="vertical"
         android:paddingBottom="@dimen/long_ui_bottom_padding"
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/fragment_talents.xml b/app/src/main/res/layout/fragment_talents.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_marginBottom="@dimen/long_ui_bottom_padding"
     style="@style/CardContainer">
 
     <LinearLayout
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -207,4 +207,6 @@
     <string name="title_character_armor">Armor</string>
     <string name="title_inventory_add_item">Add Item</string>
     <string name="title_change_armor">Change Armor</string>
+    <string name="label_character_note">Additional notes</string>
+    <string name="label_character_note_input">Additional notes (Optional)</string>
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
@@ -71,7 +71,7 @@
     <style name="CardContainer" parent="CardView">
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_marginTop">12dp</item>
-        <item name="android:layout_marginBottom">8dp</item>
+        <item name="android:layout_marginBottom">0dp</item>
         <item name="android:layout_marginStart">8dp</item>
         <item name="android:layout_marginEnd">8dp</item>
         <item name="android:layout_height">wrap_content</item>
diff --git a/firebase/firestore.rules b/firebase/firestore.rules
@@ -109,7 +109,7 @@ service cloud.firestore {
                 }
 
                 function isValidCharacter(character) {
-                    return character.keys().toSet() == [
+                    return [
                             "name",
                             "career",
                             "socialClass",
@@ -122,8 +122,9 @@ service cloud.firestore {
                             "motivation",
                             "psychology",
                             "mutation",
-                            "ambitions"
-                        ].toSet()
+                            "ambitions",
+                            "note"
+                        ].hasAll(character.keys())
                         && character.userId == userId
                         && character.name is string && isNotBlank(character.name) && character.name.size() <= 50
                         && character.career is string && isNotBlank(character.career) && character.career.size() <= 50
@@ -136,7 +137,8 @@ service cloud.firestore {
                         && areStatsValid(character.stats)
                         && areStatsValid(character.maxStats)
                         && areMoneyValid(character.money)
-                        && areAmbitionsValid(character.ambitions);
+                        && areAmbitionsValid(character.ambitions)
+                        && (! ("note" in character) || (character.note is string && character.note.size() <= 400));
                 }
             }
 
diff --git a/firebase/tests/rulesTest.ts b/firebase/tests/rulesTest.ts
@@ -562,6 +562,9 @@ class Parties extends Suite {
         // Invalid ambition object type
         await firebase.assertFails(character.set({...data, ambitions: "foo"}));
 
+        // Additional notes too long
+        await firebase.assertFails(character.set({...data, note: "a".repeat(401)}));
+
         // Invalid ambition field type
         await firebase.assertFails(character.set({...data, ambitions: {shortTerm: "foo", longTerm: 1}}));
     }

Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,8 @@ class CharacterEditFragment(`
`112`	`112`	`statsData.maxStats,`
`113`	`113`	`points.updateMaxWounds(maxWounds),`
`114`	`114`	`info.psychology,`
`115`		`- info.motivation`
	`115`	`+ info.motivation,`
	`116`	`+ info.note`
`116`	`117`	`)`
`117`	`118`
`118`	`119`	`characters.save(args.characterId.partyId, character)`
Original file line number	Diff line number	Diff line change
`@@ -147,7 +147,8 @@ class CharacterCreationFragment(`
`147`	`147`	`maxStats = statsData.maxStats,`
`148`	`148`	`points = points,`
`149`	`149`	`psychology = info.psychology,`
`150`		`- motivation = info.motivation`
	`150`	`+ motivation = info.motivation,`
	`151`	`+ note = info.note`
`151`	`152`	`)`
`152`	`153`	`)`
`153`	`154`	`toast("Your character has been created")`
Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,7 @@ class CharacterInfoFormFragment :`
`17`	`17`	`private const val STATE_SOCIAL_CLASS = "infoClass"`
`18`	`18`	`private const val STATE_PSYCHOLOGY = "infoPsychology"`
`19`	`19`	`private const val STATE_MOTIVATION = "infoMotivation"`
	`20`	`+ private const val STATE_NOTE = "infoNote"`
`20`	`21`	`}`
`21`	`22`
`22`	`23`	`var character: Character? = null`
`@@ -27,7 +28,8 @@ class CharacterInfoFormFragment :`
`27`	`28`	`val career: String,`
`28`	`29`	`val socialClass: String,`
`29`	`30`	`val psychology: String,`
`30`		`- val motivation: String`
	`31`	`+ val motivation: String,`
	`32`	`+ val note: String`
`31`	`33`	`)`
`32`	`34`
`33`	`35`	`private lateinit var form: Form`
`@@ -39,6 +41,7 @@ class CharacterInfoFormFragment :`
`39`	`41`	`outState.putString(STATE_SOCIAL_CLASS, socialClassInput.getValue())`
`40`	`42`	`outState.putString(STATE_PSYCHOLOGY, psychologyInput.getValue())`
`41`	`43`	`outState.putString(STATE_MOTIVATION, motivationInput.getValue())`
	`44`	`+ outState.putString(STATE_NOTE, noteInput.getValue())`
`42`	`45`
`43`	`46`	`super.onSaveInstanceState(outState)`
`44`	`47`	`}`
`@@ -69,6 +72,10 @@ class CharacterInfoFormFragment :`
`69`	`72`	`addTextInput(motivationInput).apply {`
`70`	`73`	`setMaxLength(Character.MOTIVATION_MAX_LENGTH, showCounter = false)`
`71`	`74`	`}`
	`75`	`+`
	`76`	`+ addTextInput(noteInput).apply {`
	`77`	`+ setMaxLength(Character.NOTE_MAX_LENGTH, showCounter = false)`
	`78`	`+ }`
`72`	`79`	`}`
`73`	`80`
`74`	`81`	`setDefaultValues()`
`@@ -78,6 +85,7 @@ class CharacterInfoFormFragment :`
`78`	`85`	`it.getInt(STATE_RACE).let(radioGroup::check)`
`79`	`86`	`it.getString(STATE_CAREER)?.let(careerInput::setDefaultValue)`
`80`	`87`	`it.getString(STATE_SOCIAL_CLASS)?.let(socialClassInput::setDefaultValue)`
	`88`	`+ it.getString(STATE_NOTE)?.let(noteInput::setDefaultValue)`
`81`	`89`	`}`
`82`	`90`	`}`
`83`	`91`
`@@ -102,6 +110,7 @@ class CharacterInfoFormFragment :`
`102`	`110`	`socialClassInput.setDefaultValue(character.getSocialClass())`
`103`	`111`	`psychologyInput.setDefaultValue(character.getPsychology())`
`104`	`112`	`motivationInput.setDefaultValue(character.getMotivation())`
	`113`	`+ noteInput.setDefaultValue(character.getNote())`
`105`	`114`
`106`	`115`	`when (character.getRace()) {`
`107`	`116`	`Race.HUMAN -> radioButtonRaceHuman.isChecked = true`
`@@ -132,7 +141,8 @@ class CharacterInfoFormFragment :`
`132`	`141`	`career = career,`
`133`	`142`	`socialClass = socialClass,`
`134`	`143`	`psychology = psychologyInput.getValue(),`
`135`		`- motivation = motivationInput.getValue()`
	`144`	`+ motivation = motivationInput.getValue(),`
	`145`	`+ note = noteInput.getValue()`
`136`	`146`	`)`
`137`	`147`	`}`
`138`	`148`	`}`