Skip to content

Commit befb385

Browse files
fmasafmasa
committed
Merge branch 'fix/inventory' into 'master'
Fix various UI bugs See merge request fmasa/pv239-project!78
2 parents 6cd0769 + 1bde792 commit befb385

File tree

10 files changed

+29
-21
lines changed

10 files changed

+29
-21
lines changed

‎app/src/main/java/cz/muni/fi/rpg/ui/character/InventoryFragment.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ import androidx.fragment.app.Fragment
88
import cz.muni.fi.rpg.R
99
import kotlinx.android.synthetic.main.fragment_inventory.view.*
1010
import androidx.lifecycle.observe
11-
import androidx.recyclerview.widget.LinearLayoutManager
1211
import cz.muni.fi.rpg.model.domain.character.CharacterId
1312
import cz.muni.fi.rpg.model.domain.inventory.InventoryItem
1413
import cz.muni.fi.rpg.ui.character.adapter.InventoryAdapter
1514
import cz.muni.fi.rpg.ui.character.inventory.ChangeArmorDialog
1615
import cz.muni.fi.rpg.ui.character.inventory.InventoryItemDialog
1716
import cz.muni.fi.rpg.ui.character.inventory.TransactionDialog
17+
import cz.muni.fi.rpg.ui.common.NonScrollableLayoutManager
1818
import cz.muni.fi.rpg.ui.common.parcelableArgument
1919
import cz.muni.fi.rpg.viewModels.InventoryViewModel
2020
import kotlinx.android.synthetic.main.fragment_inventory.*
@@ -67,7 +67,7 @@ class InventoryFragment : Fragment(R.layout.fragment_inventory),
6767
onClickListener = this::showDialog,
6868
onRemoveListener = { launch { viewModel.removeInventoryItem(it) } }
6969
)
70-
inventoryRecycler.layoutManager = LinearLayoutManager(context)
70+
inventoryRecycler.layoutManager = NonScrollableLayoutManager(requireContext())
7171
inventoryRecycler.adapter = adapter
7272

7373
viewModel.inventory.observe(viewLifecycleOwner) { items ->

‎app/src/main/java/cz/muni/fi/rpg/ui/character/skills/CharacterSkillsFragment.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@ import androidx.core.os.bundleOf
66
import androidx.fragment.app.Fragment
77
import androidx.fragment.app.commit
88
import androidx.lifecycle.observe
9-
import androidx.recyclerview.widget.LinearLayoutManager
109
import cz.muni.fi.rpg.R
1110
import cz.muni.fi.rpg.model.domain.character.CharacterId
1211
import cz.muni.fi.rpg.model.domain.skills.Skill
1312
import cz.muni.fi.rpg.model.right
1413
import cz.muni.fi.rpg.ui.character.skills.adapter.SkillAdapter
1514
import cz.muni.fi.rpg.ui.character.skills.talents.TalentsFragment
1615
import cz.muni.fi.rpg.ui.common.CombinedLiveData
16+
import cz.muni.fi.rpg.ui.common.NonScrollableLayoutManager
1717
import cz.muni.fi.rpg.ui.common.parcelableArgument
1818
import cz.muni.fi.rpg.viewModels.CharacterViewModel
1919
import cz.muni.fi.rpg.viewModels.SkillsViewModel
@@ -42,7 +42,7 @@ class CharacterSkillsFragment : Fragment(R.layout.fragment_character_skills),
4242
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
4343
super.onViewCreated(view, savedInstanceState)
4444

45-
skillList.layoutManager = LinearLayoutManager(context)
45+
skillList.layoutManager = NonScrollableLayoutManager(requireContext())
4646
val adapter = SkillAdapter(
4747
layoutInflater,
4848
{ openSkillDialog(it) },

‎app/src/main/java/cz/muni/fi/rpg/ui/character/skills/talents/TalentsFragment.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ import android.view.View
55
import androidx.core.os.bundleOf
66
import androidx.fragment.app.Fragment
77
import androidx.lifecycle.observe
8-
import androidx.recyclerview.widget.LinearLayoutManager
98
import cz.muni.fi.rpg.R
109
import cz.muni.fi.rpg.model.domain.character.CharacterId
1110
import cz.muni.fi.rpg.model.domain.talents.Talent
11+
import cz.muni.fi.rpg.ui.common.NonScrollableLayoutManager
1212
import cz.muni.fi.rpg.ui.common.parcelableArgument
1313
import cz.muni.fi.rpg.viewModels.TalentsViewModel
1414
import kotlinx.android.synthetic.main.fragment_talents.*
@@ -36,7 +36,7 @@ class TalentsFragment : Fragment(R.layout.fragment_talents),
3636
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
3737
super.onViewCreated(view, savedInstanceState)
3838

39-
talentList.layoutManager = LinearLayoutManager(context)
39+
talentList.layoutManager = NonScrollableLayoutManager(requireContext())
4040
val adapter = TalentAdapter(
4141
layoutInflater,
4242
{ openTalentDialog(it) },

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -81,11 +81,11 @@ class CharacterInfoFormFragment :
8181
setDefaultValues()
8282

8383
savedInstanceState?.let {
84-
it.getString(STATE_NAME)?.let(nameInput::setDefaultValue)
84+
it.getString(STATE_NAME)?.let { value -> nameInput.setDefaultValue(value) }
8585
it.getInt(STATE_RACE).let(radioGroup::check)
86-
it.getString(STATE_CAREER)?.let(careerInput::setDefaultValue)
87-
it.getString(STATE_SOCIAL_CLASS)?.let(socialClassInput::setDefaultValue)
88-
it.getString(STATE_NOTE)?.let(noteInput::setDefaultValue)
86+
it.getString(STATE_CAREER)?.let { value -> careerInput.setDefaultValue(value)}
87+
it.getString(STATE_SOCIAL_CLASS)?.let { value -> socialClassInput.setDefaultValue(value) }
88+
it.getString(STATE_NOTE)?.let { value -> noteInput.setDefaultValue(value) }
8989
}
9090
}
9191

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,9 @@ class CharacterPointsFormFragment :
5656
}
5757

5858
savedInstanceState?.let {
59-
it.getString(STATE_MAX_WOUNDS)?.let(maxWoundsInput::setDefaultValue)
60-
it.getString(STATE_FATE_POINTS)?.let(fatePointsInput::setDefaultValue)
61-
it.getString(STATE_RESILIENCE_POINTS)?.let(resiliencePointsInput::setDefaultValue)
59+
it.getString(STATE_MAX_WOUNDS)?.let { value -> maxWoundsInput.setDefaultValue(value) }
60+
it.getString(STATE_FATE_POINTS)?.let { value -> fatePointsInput.setDefaultValue(value) }
61+
it.getString(STATE_RESILIENCE_POINTS)?.let { value -> resiliencePointsInput.setDefaultValue(value) }
6262
}
6363
}
6464

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,8 +122,8 @@ class CharacterStatsFormFragment :
122122
val currentInput = entry.key.first
123123
val maxInput = entry.key.second
124124

125-
currentInput.setDefaultValue(entry.value(character.getStats()).toString())
126-
maxInput.setDefaultValue(entry.value(character.getMaxStats()).toString())
125+
currentInput.setDefaultValue(entry.value(character.getStats()).toString(), force = true)
126+
maxInput.setDefaultValue(entry.value(character.getMaxStats()).toString(), force = true)
127127
}
128128
}
129129
}

‎app/src/main/java/cz/muni/fi/rpg/ui/common/NonScrollableLayoutManager.kt‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
package cz.muni.fi.rpg.ui.common
2+
3+
import android.content.Context
4+
import androidx.recyclerview.widget.LinearLayoutManager
5+
6+
class NonScrollableLayoutManager(context: Context) : LinearLayoutManager(context) {
7+
override fun canScrollVertically(): Boolean = false
8+
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,8 @@ class TextInput(context: Context, attrs: AttributeSet) : LinearLayout(context, a
6565

6666
fun getTextInputLayout(): TextInputLayout = textInputLayout
6767

68-
fun setDefaultValue(value: String) {
69-
if (textInputLayout.editText?.text.toString() == "") {
68+
fun setDefaultValue(value: String, force: Boolean = false) {
69+
if (force || textInputLayout.editText?.text.toString() == "") {
7070
textInputLayout.editText?.setText(value)
7171
}
7272
}

‎app/src/main/res/layout/fragment_character_skills.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
2+
<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
33
xmlns:tools="http://schemas.android.com/tools"
44
android:layout_width="match_parent"
55
android:layout_height="match_parent"
@@ -68,4 +68,4 @@
6868
android:layout_width="match_parent"
6969
android:layout_height="wrap_content"/>
7070
</LinearLayout>
71-
</ScrollView>
71+
</androidx.core.widget.NestedScrollView>

‎app/src/main/res/layout/fragment_inventory.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
2+
<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
33
xmlns:app="http://schemas.android.com/apk/res-auto"
44
xmlns:tools="http://schemas.android.com/tools"
55
android:layout_width="match_parent"
@@ -373,5 +373,5 @@
373373
</LinearLayout>
374374
</androidx.cardview.widget.CardView>
375375
</LinearLayout>
376-
</ScrollView>
376+
</androidx.core.widget.NestedScrollView>
377377

0 commit comments

Comments
 (0)