Skip to content

Commit b65cf7a

Browse files
fmasafmasa
committed
Merge branch 'fix/dialog-scroll' into 'master'
Make all dialogs scrollable See merge request fmasa/wfrp-master!117
2 parents 4e3ceb3 + 5f0927f commit b65cf7a

File tree

7 files changed

+2564
-199
lines changed

7 files changed

+2564
-199
lines changed

‎.gitlab-ci.yml‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
image: circleci/android:api-29-node
1+
image: circleci/android@sha256:03f7f2463126fb0cd7055b1c87b94307fd11c3cf8c60b5d8d18d59ad32bbb3d7
22

33
stages:
44
- check
@@ -29,7 +29,6 @@ Test Firestore rules:
2929
paths:
3030
- node_modules
3131
script:
32-
- curl -sL firebase.tools | bash
3332
- yarn install
3433
- yarn test
3534

@@ -50,8 +49,8 @@ Deploy Firebase changes:
5049
only:
5150
- master
5251
script:
53-
- curl -sL firebase.tools | bash
54-
- firebase deploy
52+
- yarn install
53+
- yarn firebase deploy
5554

5655
Run Firestore migrations:
5756
stage: build

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

Lines changed: 33 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,44 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
3-
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
4-
android:layout_width="match_parent"
5-
android:layout_height="match_parent"
2+
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
63
xmlns:app="http://schemas.android.com/apk/res-auto"
7-
android:padding="@dimen/dialogPadding">
8-
9-
<ProgressBar
10-
android:layout_width="match_parent"
11-
android:layout_gravity="center"
12-
android:visibility="gone"
13-
android:layout_height="match_parent"
14-
android:id="@+id/progress" />
4+
android:layout_width="match_parent"
5+
android:layout_height="match_parent">
156

16-
<LinearLayout
17-
android:id="@+id/mainView"
7+
<FrameLayout
188
android:layout_width="match_parent"
199
android:layout_height="wrap_content"
20-
android:orientation="vertical">
10+
android:padding="@dimen/dialogPadding">
2111

22-
<cz.muni.fi.rpg.ui.views.TextInput
23-
app:inputLabel="@string/label_ambition_short_term"
24-
android:id="@+id/shortTermAmbitionInput"
12+
<ProgressBar
13+
android:id="@+id/progress"
2514
android:layout_width="match_parent"
26-
android:layout_height="wrap_content"
27-
android:minLines="2"
28-
android:inputType="textMultiLine"/>
15+
android:layout_height="match_parent"
16+
android:layout_gravity="center"
17+
android:visibility="gone" />
2918

30-
<cz.muni.fi.rpg.ui.views.TextInput
31-
app:inputLabel="@string/label_ambition_long_term"
32-
android:id="@+id/longTermAmbitionInput"
19+
<LinearLayout
20+
android:id="@+id/mainView"
3321
android:layout_width="match_parent"
3422
android:layout_height="wrap_content"
35-
android:minLines="2"
36-
android:inputType="textMultiLine"/>
23+
android:orientation="vertical">
24+
25+
<cz.muni.fi.rpg.ui.views.TextInput
26+
android:id="@+id/shortTermAmbitionInput"
27+
android:layout_width="match_parent"
28+
android:layout_height="wrap_content"
29+
android:inputType="textMultiLine"
30+
android:minLines="2"
31+
app:inputLabel="@string/label_ambition_short_term" />
32+
33+
<cz.muni.fi.rpg.ui.views.TextInput
34+
android:id="@+id/longTermAmbitionInput"
35+
android:layout_width="match_parent"
36+
android:layout_height="wrap_content"
37+
android:inputType="textMultiLine"
38+
android:minLines="2"
39+
app:inputLabel="@string/label_ambition_long_term" />
40+
41+
</LinearLayout>
42+
</FrameLayout>
3743

38-
</LinearLayout>
39-
</FrameLayout>
44+
</ScrollView>

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

Lines changed: 54 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -1,58 +1,60 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
2+
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
33
xmlns:app="http://schemas.android.com/apk/res-auto"
4-
xmlns:tools="http://schemas.android.com/tools"
54
android:layout_width="match_parent"
6-
android:layout_height="match_parent"
7-
android:orientation="vertical"
8-
android:padding="@dimen/dialogPadding">
5+
android:layout_height="match_parent">
96

10-
<cz.muni.fi.rpg.ui.views.TextInput
11-
android:id="@+id/nameInput"
12-
android:layout_marginBottom="16dp"
13-
android:maxLines="1"
7+
<LinearLayout
148
android:layout_width="match_parent"
159
android:layout_height="wrap_content"
16-
app:inputLabel="@string/label_skill_name" />
17-
18-
19-
<cz.muni.fi.rpg.ui.views.TextInput
20-
android:id="@+id/descriptionInput"
21-
android:layout_marginBottom="16dp"
22-
android:minLines="3"
23-
android:inputType="textMultiLine"
24-
android:layout_width="match_parent"
25-
android:layout_height="wrap_content"
26-
app:inputLabel="@string/label_skill_description" />
27-
28-
29-
<TextView
30-
android:hint="@string/label_skill_characteristic"
31-
android:textSize="14sp"
32-
android:layout_width="match_parent"
33-
android:layout_height="wrap_content" />
34-
35-
<com.google.android.material.chip.ChipGroup
36-
android:id="@+id/skillCharacteristic"
37-
app:selectionRequired="true"
38-
app:singleSelection="true"
39-
android:layout_width="match_parent"
40-
android:layout_height="wrap_content"/>
41-
42-
<com.google.android.material.checkbox.MaterialCheckBox
43-
android:id="@+id/skillAdvanced"
44-
android:layout_width="wrap_content"
45-
android:layout_height="wrap_content"
46-
android:checked="true"
47-
android:text="@string/label_skill_advanced"
48-
app:switchPadding="4dp" />
49-
50-
<cz.muni.fi.rpg.ui.views.TextInput
51-
android:id="@+id/advancesInput"
52-
android:layout_width="wrap_content"
53-
android:layout_height="wrap_content"
54-
android:layout_marginTop="16dp"
55-
android:inputType="number"
56-
android:maxLength="3"
57-
app:inputLabel="@string/label_skill_advances" />
58-
</LinearLayout>
10+
android:orientation="vertical"
11+
android:padding="@dimen/dialogPadding">
12+
13+
<cz.muni.fi.rpg.ui.views.TextInput
14+
android:id="@+id/nameInput"
15+
android:layout_width="match_parent"
16+
android:layout_height="wrap_content"
17+
android:layout_marginBottom="16dp"
18+
android:maxLines="1"
19+
app:inputLabel="@string/label_skill_name" />
20+
21+
<cz.muni.fi.rpg.ui.views.TextInput
22+
android:id="@+id/descriptionInput"
23+
android:layout_width="match_parent"
24+
android:layout_height="wrap_content"
25+
android:layout_marginBottom="16dp"
26+
android:inputType="textMultiLine"
27+
android:minLines="3"
28+
app:inputLabel="@string/label_skill_description" />
29+
30+
<TextView
31+
android:layout_width="match_parent"
32+
android:layout_height="wrap_content"
33+
android:hint="@string/label_skill_characteristic"
34+
android:textSize="14sp" />
35+
36+
<com.google.android.material.chip.ChipGroup
37+
android:id="@+id/skillCharacteristic"
38+
android:layout_width="match_parent"
39+
android:layout_height="wrap_content"
40+
app:selectionRequired="true"
41+
app:singleSelection="true" />
42+
43+
<com.google.android.material.checkbox.MaterialCheckBox
44+
android:id="@+id/skillAdvanced"
45+
android:layout_width="wrap_content"
46+
android:layout_height="wrap_content"
47+
android:checked="true"
48+
android:text="@string/label_skill_advanced"
49+
app:switchPadding="4dp" />
50+
51+
<cz.muni.fi.rpg.ui.views.TextInput
52+
android:id="@+id/advancesInput"
53+
android:layout_width="wrap_content"
54+
android:layout_height="wrap_content"
55+
android:layout_marginTop="16dp"
56+
android:inputType="number"
57+
android:maxLength="3"
58+
app:inputLabel="@string/label_skill_advances" />
59+
</LinearLayout>
60+
</ScrollView>

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

Lines changed: 31 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,39 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
2+
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
33
xmlns:app="http://schemas.android.com/apk/res-auto"
44
android:layout_width="match_parent"
5-
android:layout_height="match_parent"
6-
android:orientation="vertical"
7-
android:padding="@dimen/dialogPadding">
5+
android:layout_height="match_parent">
86

9-
<cz.muni.fi.rpg.ui.views.TextInput
10-
android:id="@+id/talentNameInput"
11-
android:maxLines="1"
7+
<LinearLayout
128
android:layout_width="match_parent"
139
android:layout_height="wrap_content"
14-
app:inputLabel="@string/label_name" />
10+
android:orientation="vertical"
11+
android:padding="@dimen/dialogPadding">
1512

16-
<cz.muni.fi.rpg.ui.views.TextInput
17-
android:layout_marginTop="16dp"
18-
android:id="@+id/talentDescriptionInput"
19-
android:minLines="3"
20-
android:inputType="textMultiLine"
21-
android:layout_width="match_parent"
22-
android:layout_height="wrap_content"
23-
app:inputLabel="@string/label_description" />
13+
<cz.muni.fi.rpg.ui.views.TextInput
14+
android:id="@+id/talentNameInput"
15+
android:layout_width="match_parent"
16+
android:layout_height="wrap_content"
17+
android:maxLines="1"
18+
app:inputLabel="@string/label_name" />
2419

25-
<cz.muni.fi.rpg.ui.views.TextInput
26-
android:id="@+id/talentTakenInput"
27-
android:layout_width="wrap_content"
28-
android:layout_height="wrap_content"
29-
android:layout_marginTop="16dp"
30-
android:inputType="number"
31-
android:maxLines="1"
32-
android:maxLength="3"
33-
app:inputLabel="@string/label_talent_taken" />
34-
</LinearLayout>
20+
<cz.muni.fi.rpg.ui.views.TextInput
21+
android:id="@+id/talentDescriptionInput"
22+
android:layout_width="match_parent"
23+
android:layout_height="wrap_content"
24+
android:layout_marginTop="16dp"
25+
android:inputType="textMultiLine"
26+
android:minLines="3"
27+
app:inputLabel="@string/label_description" />
28+
29+
<cz.muni.fi.rpg.ui.views.TextInput
30+
android:id="@+id/talentTakenInput"
31+
android:layout_width="wrap_content"
32+
android:layout_height="wrap_content"
33+
android:layout_marginTop="16dp"
34+
android:inputType="number"
35+
android:maxLength="3"
36+
android:maxLines="1"
37+
app:inputLabel="@string/label_talent_taken" />
38+
</LinearLayout>
39+
</ScrollView>

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

Lines changed: 31 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,37 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
3-
xmlns:tools="http://schemas.android.com/tools"
2+
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
43
android:layout_width="match_parent"
54
android:layout_height="wrap_content"
6-
xmlns:app="http://schemas.android.com/apk/res-auto"
7-
android:orientation="vertical"
8-
android:padding="@dimen/dialogPadding">
9-
10-
<cz.muni.fi.rpg.ui.views.TextInput
11-
app:inputLabel="@string/label_name"
12-
android:id="@+id/nameInput"
13-
android:maxLines="1"
14-
android:layout_marginBottom="16dp"
5+
xmlns:app="http://schemas.android.com/apk/res-auto">
6+
<LinearLayout
7+
android:padding="@dimen/dialogPadding"
158
android:layout_width="match_parent"
16-
android:layout_height="wrap_content"/>
17-
18-
<cz.muni.fi.rpg.ui.views.TextInput
19-
android:id="@+id/quantityInput"
20-
app:inputLabel="@string/inventory_item_quantity"
21-
android:maxLines="1"
22-
android:layout_marginBottom="16dp"
23-
android:inputType="number"
24-
android:layout_width="100dp"
25-
android:layout_height="wrap_content"/>
9+
android:orientation="vertical"
10+
android:layout_height="wrap_content">
11+
<cz.muni.fi.rpg.ui.views.TextInput
12+
app:inputLabel="@string/label_name"
13+
android:id="@+id/nameInput"
14+
android:maxLines="1"
15+
android:layout_marginBottom="16dp"
16+
android:layout_width="match_parent"
17+
android:layout_height="wrap_content"/>
2618

27-
<cz.muni.fi.rpg.ui.views.TextInput
28-
android:id="@+id/descriptionInput"
29-
app:inputLabel="@string/label_description"
30-
android:minLines="3"
31-
android:layout_marginBottom="16dp"
32-
android:inputType="textMultiLine"
33-
android:layout_width="match_parent"
34-
android:layout_height="wrap_content"/>
19+
<cz.muni.fi.rpg.ui.views.TextInput
20+
android:id="@+id/quantityInput"
21+
app:inputLabel="@string/inventory_item_quantity"
22+
android:maxLines="1"
23+
android:layout_marginBottom="16dp"
24+
android:inputType="number"
25+
android:layout_width="100dp"
26+
android:layout_height="wrap_content"/>
3527

36-
</LinearLayout>
28+
<cz.muni.fi.rpg.ui.views.TextInput
29+
android:id="@+id/descriptionInput"
30+
app:inputLabel="@string/label_description"
31+
android:minLines="3"
32+
android:layout_marginBottom="16dp"
33+
android:inputType="textMultiLine"
34+
android:layout_width="match_parent"
35+
android:layout_height="wrap_content"/>
36+
</LinearLayout>
37+
</ScrollView>

‎package.json‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "@fmasa/dnd",
33
"version": "1.0.0",
44
"scripts": {
5-
"test": "firebase emulators:exec --only firestore 'mocha --timeout=10000 firebase/tests/**/*.ts'"
5+
"test": "yarn firebase emulators:exec --only firestore 'mocha --timeout=10000 firebase/tests/**/*.ts'"
66
},
77
"devDependencies": {
88
"@firebase/testing": "^0.15.1",
@@ -20,5 +20,7 @@
2020
"ui": "mocha-typescript",
2121
"require": "ts-node/register"
2222
},
23-
"dependencies": {}
23+
"dependencies": {
24+
"firebase-tools": "8.10.0"
25+
}
2426
}

0 commit comments

Comments
 (0)