maj/MonsterCards
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Makes dashboard views use dimension and string resources.

Browse Source
This commit is contained in:
Tom Hicks
2021-07-05 14:09:09 -07:00
parent 7b09098833
commit bf6220b339
13 changed files with 146 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/src/main/res/layout/card_ability_score.xml
View File

@@ -10,9 +10,9 @@
android:id="@+id/name" android:id="@+id/name"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_margin="2dp" android:layout_margin="@dimen/text_icon_border_padding"
android:textColor="@android:color/primary_text_light" android:textColor="@android:color/primary_text_light"
android:textSize="8sp" android:textSize="@dimen/text_icon_tiny"
android:textStyle="bold" android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
@@ -23,9 +23,9 @@
android:id="@+id/advantage" android:id="@+id/advantage"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_margin="2dp" android:layout_margin="@dimen/text_icon_border_padding"
android:textColor="@android:color/primary_text_light" android:textColor="@android:color/primary_text_light"
android:textSize="8sp" android:textSize="@dimen/text_icon_tiny"
android:textStyle="bold" android:textStyle="bold"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
@@ -35,9 +35,9 @@
android:id="@+id/proficiency" android:id="@+id/proficiency"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_margin="2dp" android:layout_margin="@dimen/text_icon_border_padding"
android:textColor="@android:color/primary_text_light" android:textColor="@android:color/primary_text_light"
android:textSize="8sp" android:textSize="@dimen/text_icon_tiny"
android:textStyle="bold" android:textStyle="bold"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
@@ -48,7 +48,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textColor="@android:color/primary_text_light" android:textColor="@android:color/primary_text_light"
android:textSize="20sp" android:textSize="@dimen/text_icon_size"
android:textStyle="bold" android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"

14
app/src/main/res/layout/card_action.xml
View File

@@ -3,17 +3,17 @@
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="@dimen/action_card_height"
android:background="@drawable/rectangle_background"> android:background="@drawable/rectangle_background">
<TextView <TextView
android:id="@+id/name" android:id="@+id/name"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginHorizontal="8dp" android:layout_marginHorizontal="@dimen/padding_normal"
android:layout_marginTop="4dp" android:layout_marginTop="@dimen/padding_small"
android:textSize="14sp" android:textSize="@dimen/action_card_name_text_size"
android:textStyle="bold" android:textStyle="bold"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
@@ -25,11 +25,11 @@
android:id="@+id/description" android:id="@+id/description"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0dp" android:layout_height="0dp"
android:layout_marginHorizontal="8dp" android:layout_marginHorizontal="@dimen/padding_normal"
android:layout_marginBottom="8dp" android:layout_marginBottom="@dimen/padding_normal"
android:ellipsize="end" android:ellipsize="end"
android:singleLine="false" android:singleLine="false"
android:textSize="10sp" android:textSize="@dimen/action_card_description_text_size"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"

12
app/src/main/res/layout/card_armor_class.xml
View File

@@ -2,18 +2,18 @@
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="40dp" android:layout_width="@dimen/icon_size"
android:layout_height="40dp" android:layout_height="@dimen/icon_size"
android:background="@drawable/rectangle_background"> android:background="@drawable/rectangle_background">
<TextView <TextView
android:id="@+id/name" android:id="@+id/name"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_margin="2dp" android:layout_margin="@dimen/text_icon_border_padding"
android:text="AC" android:text="@string/label_armorClass_icon"
android:textColor="@android:color/primary_text_light" android:textColor="@android:color/primary_text_light"
android:textSize="8sp" android:textSize="@dimen/text_icon_tiny"
android:textStyle="bold" android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
@@ -24,7 +24,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textColor="@android:color/primary_text_light" android:textColor="@android:color/primary_text_light"
android:textSize="20sp" android:textSize="@dimen/text_icon_size"
android:textStyle="bold" android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"

14
app/src/main/res/layout/card_challenge_rating.xml
View File

@@ -2,29 +2,29 @@
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="40dp" android:layout_width="@dimen/icon_size"
android:layout_height="40dp" android:layout_height="@dimen/icon_size"
android:background="@drawable/rectangle_background"> android:background="@drawable/rectangle_background">
<TextView <TextView
android:id="@+id/name" android:id="@+id/name"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_margin="2dp" android:layout_margin="@dimen/text_icon_border_padding"
android:text="@string/label_challengeRating_icon"
android:textColor="@android:color/primary_text_light" android:textColor="@android:color/primary_text_light"
android:textSize="8sp" android:textSize="@dimen/text_icon_tiny"
android:textStyle="bold" android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent" />
android:text="CR" />
<TextView <TextView
android:id="@+id/value" android:id="@+id/value"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textColor="@android:color/primary_text_light" android:textColor="@android:color/primary_text_light"
android:textSize="20sp" android:textSize="@dimen/text_icon_size"
android:textStyle="bold" android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"

12
app/src/main/res/layout/card_hit_points.xml
View File

@@ -2,18 +2,18 @@
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="40dp" android:layout_width="@dimen/icon_size"
android:layout_height="40dp" android:layout_height="@dimen/icon_size"
android:background="@drawable/rectangle_background"> android:background="@drawable/rectangle_background">
<TextView <TextView
android:id="@+id/name" android:id="@+id/name"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_margin="2dp" android:layout_margin="@dimen/text_icon_border_padding"
android:text="HP" android:text="@string/label_hitPoints_icon"
android:textColor="@android:color/primary_text_light" android:textColor="@android:color/primary_text_light"
android:textSize="8sp" android:textSize="@dimen/text_icon_tiny"
android:textStyle="bold" android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
@@ -24,7 +24,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textColor="@android:color/primary_text_light" android:textColor="@android:color/primary_text_light"
android:textSize="20sp" android:textSize="@dimen/text_icon_size"
android:textStyle="bold" android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"

12
app/src/main/res/layout/card_initiative.xml
View File

@@ -2,18 +2,18 @@
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="40dp" android:layout_width="@dimen/icon_size"
android:layout_height="40dp" android:layout_height="@dimen/icon_size"
android:background="@drawable/rectangle_background"> android:background="@drawable/rectangle_background">
<TextView <TextView
android:id="@+id/name" android:id="@+id/name"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_margin="2dp" android:layout_margin="@dimen/text_icon_border_padding"
android:text="INIT" android:text="@string/label_initiative_icon"
android:textColor="@android:color/primary_text_light" android:textColor="@android:color/primary_text_light"
android:textSize="8sp" android:textSize="@dimen/text_icon_tiny"
android:textStyle="bold" android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
@@ -24,7 +24,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textColor="@android:color/primary_text_light" android:textColor="@android:color/primary_text_light"
android:textSize="20sp" android:textSize="@dimen/text_icon_size"
android:textStyle="bold" android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"

64
app/src/main/res/layout/card_monster.xml
View File

@@ -4,15 +4,15 @@
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_margin="@dimen/text_margin" android:layout_margin="@dimen/padding_normal"
android:background="@drawable/rectangle_background"> android:background="@drawable/rectangle_background">
<TextView <TextView
android:id="@+id/name" android:id="@+id/name"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_margin="8dp" android:layout_margin="@dimen/padding_normal"
android:textSize="20sp" android:textSize="@dimen/monster_card_name_text_size"
android:textStyle="bold" android:textStyle="bold"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
@@ -23,8 +23,8 @@
android:id="@+id/meta" android:id="@+id/meta"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_margin="8dp" android:layout_margin="@dimen/padding_normal"
android:textSize="12sp" android:textSize="@dimen/monster_card_meta_text_size"
android:textStyle="italic" android:textStyle="italic"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
@@ -35,8 +35,8 @@
android:id="@+id/challengeRating" android:id="@+id/challengeRating"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_margin="8dp" android:layout_margin="@dimen/padding_normal"
android:textSize="20sp" android:textSize="@dimen/monster_card_name_text_size"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
tools:text="CR 1/8" /> tools:text="CR 1/8" />
@@ -45,7 +45,7 @@
android:id="@+id/boxesRow" android:id="@+id/boxesRow"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_margin="8dp" android:layout_margin="@dimen/padding_normal"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/meta"> app:layout_constraintTop_toBottomOf="@id/meta">
@@ -53,8 +53,8 @@
<include <include
android:id="@+id/strength" android:id="@+id/strength"
layout="@layout/card_ability_score" layout="@layout/card_ability_score"
android:layout_width="40dp" android:layout_width="@dimen/icon_size"
android:layout_height="40dp" /> android:layout_height="@dimen/icon_size" />
<Space <Space
android:layout_width="0dp" android:layout_width="0dp"
@@ -64,8 +64,8 @@
<include <include
android:id="@+id/dexterity" android:id="@+id/dexterity"
layout="@layout/card_ability_score" layout="@layout/card_ability_score"
android:layout_width="40dp" android:layout_width="@dimen/icon_size"
android:layout_height="40dp" /> android:layout_height="@dimen/icon_size" />
<Space <Space
android:layout_width="0dp" android:layout_width="0dp"
@@ -75,8 +75,8 @@
<include <include
android:id="@+id/constitution" android:id="@+id/constitution"
layout="@layout/card_ability_score" layout="@layout/card_ability_score"
android:layout_width="40dp" android:layout_width="@dimen/icon_size"
android:layout_height="40dp" /> android:layout_height="@dimen/icon_size" />
<Space <Space
android:layout_width="0dp" android:layout_width="0dp"
@@ -86,8 +86,8 @@
<include <include
android:id="@+id/intelligence" android:id="@+id/intelligence"
layout="@layout/card_ability_score" layout="@layout/card_ability_score"
android:layout_width="40dp" android:layout_width="@dimen/icon_size"
android:layout_height="40dp" /> android:layout_height="@dimen/icon_size" />
<Space <Space
android:layout_width="0dp" android:layout_width="0dp"
@@ -97,8 +97,8 @@
<include <include
android:id="@+id/wisdom" android:id="@+id/wisdom"
layout="@layout/card_ability_score" layout="@layout/card_ability_score"
android:layout_width="40dp" android:layout_width="@dimen/icon_size"
android:layout_height="40dp" /> android:layout_height="@dimen/icon_size" />
<Space <Space
android:layout_width="0dp" android:layout_width="0dp"
@@ -108,8 +108,8 @@
<include <include
android:id="@+id/charisma" android:id="@+id/charisma"
layout="@layout/card_ability_score" layout="@layout/card_ability_score"
android:layout_width="40dp" android:layout_width="@dimen/icon_size"
android:layout_height="40dp" /> android:layout_height="@dimen/icon_size" />
<Space <Space
android:layout_width="0dp" android:layout_width="0dp"
@@ -119,8 +119,8 @@
<include <include
android:id="@+id/armorClass" android:id="@+id/armorClass"
layout="@layout/card_armor_class" layout="@layout/card_armor_class"
android:layout_width="40dp" android:layout_width="@dimen/icon_size"
android:layout_height="40dp" /> android:layout_height="@dimen/icon_size" />
<Space <Space
android:layout_width="0dp" android:layout_width="0dp"
@@ -130,15 +130,15 @@
<include <include
android:id="@+id/hitPoints" android:id="@+id/hitPoints"
layout="@layout/card_hit_points" layout="@layout/card_hit_points"
android:layout_width="40dp" android:layout_width="@dimen/icon_size"
android:layout_height="40dp" /> android:layout_height="@dimen/icon_size" />
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginHorizontal="4dp" android:layout_marginHorizontal="@dimen/padding_small"
android:layout_marginVertical="8dp" android:layout_marginVertical="@dimen/padding_normal"
android:baselineAligned="false" android:baselineAligned="false"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
@@ -149,24 +149,24 @@
android:id="@+id/action1" android:id="@+id/action1"
layout="@layout/card_action" layout="@layout/card_action"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="80dp" android:layout_height="@dimen/action_card_height"
android:layout_marginHorizontal="4dp" android:layout_marginHorizontal="@dimen/padding_small"
android:layout_weight="1" /> android:layout_weight="1" />
<include <include
android:id="@+id/action2" android:id="@+id/action2"
layout="@layout/card_action" layout="@layout/card_action"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="80dp" android:layout_height="@dimen/action_card_height"
android:layout_marginHorizontal="4dp" android:layout_marginHorizontal="@dimen/padding_small"
android:layout_weight="1" /> android:layout_weight="1" />
<include <include
android:id="@+id/action3" android:id="@+id/action3"
layout="@layout/card_action" layout="@layout/card_action"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="80dp" android:layout_height="@dimen/action_card_height"
android:layout_marginHorizontal="4dp" android:layout_marginHorizontal="@dimen/padding_small"
android:layout_weight="1" /> android:layout_weight="1" />
</LinearLayout> </LinearLayout>

46
app/src/main/res/layout/card_monster_short.xml
View File

@@ -10,8 +10,8 @@
android:id="@+id/name" android:id="@+id/name"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_margin="8dp" android:layout_margin="@dimen/padding_normal"
android:textSize="20sp" android:textSize="@dimen/monster_card_name_text_size"
android:textStyle="bold" android:textStyle="bold"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
@@ -22,8 +22,8 @@
android:id="@+id/meta" android:id="@+id/meta"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_margin="8dp" android:layout_margin="@dimen/padding_normal"
android:textSize="12sp" android:textSize="@dimen/monster_card_meta_text_size"
android:textStyle="italic" android:textStyle="italic"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
@@ -34,8 +34,8 @@
android:id="@+id/challengeRating" android:id="@+id/challengeRating"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_margin="8dp" android:layout_margin="@dimen/padding_normal"
android:textSize="20sp" android:textSize="@dimen/monster_card_name_text_size"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
tools:text="CR 1/8" /> tools:text="CR 1/8" />
@@ -44,7 +44,7 @@
android:id="@+id/boxesRow" android:id="@+id/boxesRow"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_margin="8dp" android:layout_margin="@dimen/padding_normal"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
@@ -53,8 +53,8 @@
<include <include
android:id="@+id/strength" android:id="@+id/strength"
layout="@layout/card_ability_score" layout="@layout/card_ability_score"
android:layout_width="40dp" android:layout_width="@dimen/icon_size"
android:layout_height="40dp" /> android:layout_height="@dimen/icon_size" />
<Space <Space
android:layout_width="0dp" android:layout_width="0dp"
@@ -64,8 +64,8 @@
<include <include
android:id="@+id/dexterity" android:id="@+id/dexterity"
layout="@layout/card_ability_score" layout="@layout/card_ability_score"
android:layout_width="40dp" android:layout_width="@dimen/icon_size"
android:layout_height="40dp" /> android:layout_height="@dimen/icon_size" />
<Space <Space
android:layout_width="0dp" android:layout_width="0dp"
@@ -75,8 +75,8 @@
<include <include
android:id="@+id/constitution" android:id="@+id/constitution"
layout="@layout/card_ability_score" layout="@layout/card_ability_score"
android:layout_width="40dp" android:layout_width="@dimen/icon_size"
android:layout_height="40dp" /> android:layout_height="@dimen/icon_size" />
<Space <Space
android:layout_width="0dp" android:layout_width="0dp"
@@ -86,8 +86,8 @@
<include <include
android:id="@+id/intelligence" android:id="@+id/intelligence"
layout="@layout/card_ability_score" layout="@layout/card_ability_score"
android:layout_width="40dp" android:layout_width="@dimen/icon_size"
android:layout_height="40dp" /> android:layout_height="@dimen/icon_size" />
<Space <Space
android:layout_width="0dp" android:layout_width="0dp"
@@ -97,8 +97,8 @@
<include <include
android:id="@+id/wisdom" android:id="@+id/wisdom"
layout="@layout/card_ability_score" layout="@layout/card_ability_score"
android:layout_width="40dp" android:layout_width="@dimen/icon_size"
android:layout_height="40dp" /> android:layout_height="@dimen/icon_size" />
<Space <Space
android:layout_width="0dp" android:layout_width="0dp"
@@ -108,8 +108,8 @@
<include <include
android:id="@+id/charisma" android:id="@+id/charisma"
layout="@layout/card_ability_score" layout="@layout/card_ability_score"
android:layout_width="40dp" android:layout_width="@dimen/icon_size"
android:layout_height="40dp" /> android:layout_height="@dimen/icon_size" />
<Space <Space
android:layout_width="0dp" android:layout_width="0dp"
@@ -119,8 +119,8 @@
<include <include
android:id="@+id/armorClass" android:id="@+id/armorClass"
layout="@layout/card_armor_class" layout="@layout/card_armor_class"
android:layout_width="40dp" android:layout_width="@dimen/icon_size"
android:layout_height="40dp" /> android:layout_height="@dimen/icon_size" />
<Space <Space
android:layout_width="0dp" android:layout_width="0dp"
@@ -130,7 +130,7 @@
<include <include
android:id="@+id/hitPoints" android:id="@+id/hitPoints"
layout="@layout/card_hit_points" layout="@layout/card_hit_points"
android:layout_width="40dp" android:layout_width="@dimen/icon_size"
android:layout_height="40dp" /> android:layout_height="@dimen/icon_size" />
</LinearLayout> </LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>

2
app/src/main/res/layout/fragment_dashboard.xml
View File

@@ -10,8 +10,10 @@
android:id="@+id/list" android:id="@+id/list"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:clipToPadding="false"
android:divider="?android:attr/dividerVertical" android:divider="?android:attr/dividerVertical"
android:dividerPadding="@dimen/text_margin" android:dividerPadding="@dimen/text_margin"
android:padding="@dimen/padding_normal"
app:layoutManager="LinearLayoutManager" app:layoutManager="LinearLayoutManager"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"

32
app/src/main/res/layout/tile_monster.xml
View File

@@ -10,10 +10,10 @@
android:id="@+id/name" android:id="@+id/name"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_margin="8dp" android:layout_margin="@dimen/padding_normal"
android:ellipsize="end" android:ellipsize="end"
android:lines="1" android:lines="1"
android:textSize="16sp" android:textSize="@dimen/monster_tile_name_text_size"
android:textStyle="bold" android:textStyle="bold"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
@@ -24,10 +24,10 @@
android:id="@+id/meta" android:id="@+id/meta"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_margin="8dp" android:layout_margin="@dimen/padding_normal"
android:ellipsize="end" android:ellipsize="end"
android:lines="1" android:lines="1"
android:textSize="10sp" android:textSize="@dimen/monster_tile_meta_text_size"
android:textStyle="italic" android:textStyle="italic"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
@@ -38,7 +38,7 @@
android:id="@+id/boxesRow" android:id="@+id/boxesRow"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_margin="8dp" android:layout_margin="@dimen/padding_normal"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/meta"> app:layout_constraintTop_toBottomOf="@id/meta">
@@ -46,8 +46,8 @@
<include <include
android:id="@+id/armorClass" android:id="@+id/armorClass"
layout="@layout/card_armor_class" layout="@layout/card_armor_class"
android:layout_width="40dp" android:layout_width="@dimen/icon_size"
android:layout_height="40dp" /> android:layout_height="@dimen/icon_size" />
<Space <Space
@@ -58,8 +58,8 @@
<include <include
android:id="@+id/hitPoints" android:id="@+id/hitPoints"
layout="@layout/card_hit_points" layout="@layout/card_hit_points"
android:layout_width="40dp" android:layout_width="@dimen/icon_size"
android:layout_height="40dp" /> android:layout_height="@dimen/icon_size" />
<Space <Space
android:layout_width="0dp" android:layout_width="0dp"
@@ -69,8 +69,8 @@
<include <include
android:id="@+id/initiative" android:id="@+id/initiative"
layout="@layout/card_initiative" layout="@layout/card_initiative"
android:layout_width="40dp" android:layout_width="@dimen/icon_size"
android:layout_height="40dp" /> android:layout_height="@dimen/icon_size" />
<Space <Space
android:layout_width="0dp" android:layout_width="0dp"
@@ -80,8 +80,8 @@
<include <include
android:id="@+id/challengeRating" android:id="@+id/challengeRating"
layout="@layout/card_challenge_rating" layout="@layout/card_challenge_rating"
android:layout_width="40dp" android:layout_width="@dimen/icon_size"
android:layout_height="40dp" /> android:layout_height="@dimen/icon_size" />
</LinearLayout> </LinearLayout>
@@ -89,9 +89,9 @@
android:id="@+id/action" android:id="@+id/action"
layout="@layout/card_action" layout="@layout/card_action"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="@dimen/action_card_height"
android:layout_marginHorizontal="4dp" android:layout_marginHorizontal="@dimen/padding_small"
android:layout_marginVertical="8dp" android:layout_marginVertical="@dimen/padding_normal"
android:baselineAligned="false" android:baselineAligned="false"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"

26
app/src/main/res/layout/tile_monster_short.xml
View File

@@ -10,10 +10,10 @@
android:id="@+id/name" android:id="@+id/name"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_margin="8dp" android:layout_margin="@dimen/padding_normal"
android:ellipsize="end" android:ellipsize="end"
android:lines="1" android:lines="1"
android:textSize="16sp" android:textSize="@dimen/monster_tile_name_text_size"
android:textStyle="bold" android:textStyle="bold"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
@@ -24,10 +24,10 @@
android:id="@+id/meta" android:id="@+id/meta"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_margin="8dp" android:layout_margin="@dimen/padding_normal"
android:ellipsize="end" android:ellipsize="end"
android:lines="1" android:lines="1"
android:textSize="10sp" android:textSize="@dimen/monster_tile_meta_text_size"
android:textStyle="italic" android:textStyle="italic"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
@@ -38,7 +38,7 @@
android:id="@+id/boxesRow" android:id="@+id/boxesRow"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_margin="8dp" android:layout_margin="@dimen/padding_normal"
android:baselineAligned="false" android:baselineAligned="false"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
@@ -48,8 +48,8 @@
<include <include
android:id="@+id/armorClass" android:id="@+id/armorClass"
layout="@layout/card_armor_class" layout="@layout/card_armor_class"
android:layout_width="40dp" android:layout_width="@dimen/icon_size"
android:layout_height="40dp" /> android:layout_height="@dimen/icon_size" />
<Space <Space
@@ -60,8 +60,8 @@
<include <include
android:id="@+id/hitPoints" android:id="@+id/hitPoints"
layout="@layout/card_hit_points" layout="@layout/card_hit_points"
android:layout_width="40dp" android:layout_width="@dimen/icon_size"
android:layout_height="40dp" /> android:layout_height="@dimen/icon_size" />
<Space <Space
android:layout_width="0dp" android:layout_width="0dp"
@@ -71,8 +71,8 @@
<include <include
android:id="@+id/initiative" android:id="@+id/initiative"
layout="@layout/card_initiative" layout="@layout/card_initiative"
android:layout_width="40dp" android:layout_width="@dimen/icon_size"
android:layout_height="40dp" /> android:layout_height="@dimen/icon_size" />
<Space <Space
android:layout_width="0dp" android:layout_width="0dp"
@@ -82,8 +82,8 @@
<include <include
android:id="@+id/challengeRating" android:id="@+id/challengeRating"
layout="@layout/card_challenge_rating" layout="@layout/card_challenge_rating"
android:layout_width="40dp" android:layout_width="@dimen/icon_size"
android:layout_height="40dp" /> android:layout_height="@dimen/icon_size" />
</LinearLayout> </LinearLayout>

23
app/src/main/res/values/dimens.xml
View File

@@ -1,11 +1,22 @@
<resources> <resources>
<!-- Default screen margins, per the Android Design guidelines. --> <!-- Default screen margins, per the Android Design guidelines. -->
<dimen name="text_margin">16dp</dimen> <dimen name="action_card_description_text_size">10sp</dimen>
<dimen name="fab_margin">16dp</dimen> <dimen name="action_card_height">80dp</dimen>
<dimen name="text_h4_size">20sp</dimen> <dimen name="action_card_name_text_size">14sp</dimen>
<dimen name="corner_radius">4dp</dimen> <dimen name="corner_radius">4dp</dimen>
<dimen name="padding_small">4dp</dimen> <dimen name="fab_margin">16dp</dimen>
<dimen name="padding_normal">8dp</dimen> <dimen name="icon_size">40dp</dimen>
<dimen name="padding_large">16dp</dimen> <dimen name="monster_card_meta_text_size">12sp</dimen>
<dimen name="monster_card_name_text_size">20sp</dimen>
<dimen name="monster_tile_meta_text_size">10sp</dimen>
<dimen name="monster_tile_name_text_size">16sp</dimen>
<dimen name="padding_huge">32dp</dimen> <dimen name="padding_huge">32dp</dimen>
<dimen name="padding_large">16dp</dimen>
<dimen name="padding_normal">8dp</dimen>
<dimen name="padding_small">4dp</dimen>
<dimen name="text_h4_size">20sp</dimen>
<dimen name="text_icon_border_padding">2dp</dimen>
<dimen name="text_icon_size">16sp</dimen>
<dimen name="text_icon_tiny">8sp</dimen>
<dimen name="text_margin">16dp</dimen>
</resources> </resources>

4
app/src/main/res/values/strings.xml
View File

@@ -27,12 +27,14 @@
<string name="label_alignment">Alignment</string> <string name="label_alignment">Alignment</string>
<string name="label_armor">Armor</string> <string name="label_armor">Armor</string>
<string name="label_armor_class">Armor Class</string> <string name="label_armor_class">Armor Class</string>
<string name="label_armorClass_icon">AC</string>
<string name="label_base_speed">Base Speed</string> <string name="label_base_speed">Base Speed</string>
<string name="label_basic_info">Basic Info</string> <string name="label_basic_info">Basic Info</string>
<string name="label_burrow_speed">Burrow Speed</string> <string name="label_burrow_speed">Burrow Speed</string>
<string name="label_can_hover">Can Hover</string> <string name="label_can_hover">Can Hover</string>
<string name="label_can_speak_language">Can Speak</string> <string name="label_can_speak_language">Can Speak</string>
<string name="label_challenge_rating">Challenge Rating</string> <string name="label_challenge_rating">Challenge Rating</string>
<string name="label_challengeRating_icon">CR</string>
<string name="label_charisma">Charisma</string> <string name="label_charisma">Charisma</string>
<string name="label_climb_speed">Climb Speed</string> <string name="label_climb_speed">Climb Speed</string>
<string name="label_condition_immunities">Condition Immunities</string> <string name="label_condition_immunities">Condition Immunities</string>
@@ -55,7 +57,9 @@
<string name="label_has_a_shield">Has a Shield</string> <string name="label_has_a_shield">Has a Shield</string>
<string name="label_hit_dice">Hit Dice</string> <string name="label_hit_dice">Hit Dice</string>
<string name="label_hit_points">Hit Points</string> <string name="label_hit_points">Hit Points</string>
<string name="label_hitPoints_icon">HP</string>
<string name="label_increment_field">+</string> <string name="label_increment_field">+</string>
<string name="label_initiative_icon">INIT</string>
<string name="label_intelligence">Intelligence</string> <string name="label_intelligence">Intelligence</string>
<string name="label_lair_actions">Lair Actions</string> <string name="label_lair_actions">Lair Actions</string>
<string name="label_languages">Languages</string> <string name="label_languages">Languages</string>