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

Adds views for dashboard.

Browse Source
This commit is contained in:
Tom Hicks
2021-07-03 22:13:29 -07:00
parent 129d910126
commit 8e2372085d
12 changed files with 304 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Android/app/src/main/java/com/majinnaibu/monstercards/ui/dashboard/DashboardFragment.java
View File

@@ -4,7 +4,6 @@ import android.os.Bundle;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.lifecycle.ViewModelProvider;
@@ -13,15 +12,21 @@ import com.majinnaibu.monstercards.R;
import com.majinnaibu.monstercards.ui.shared.MCFragment;
public class DashboardFragment extends MCFragment {
private ViewHolder mHolder;
private DashboardViewModel dashboardViewModel;
public View onCreateView(@NonNull LayoutInflater inflater,
ViewGroup container, Bundle savedInstanceState) {
dashboardViewModel = new ViewModelProvider(this).get(DashboardViewModel.class);
View root = inflater.inflate(R.layout.fragment_dashboard, container, false);
final TextView textView = root.findViewById(R.id.text_dashboard);
dashboardViewModel.getText().observe(getViewLifecycleOwner(), textView::setText);
mHolder = new ViewHolder(root);
return root;
}
private static class ViewHolder {
ViewHolder(View root) {
}
}
}

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

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

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

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

16
Android/app/src/main/res/layout/card_armor_class.xml
View File

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

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

16
Android/app/src/main/res/layout/card_hit_points.xml
View File

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

16
Android/app/src/main/res/layout/card_initiative.xml
View File

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

63
Android/app/src/main/res/layout/card_monster.xml
View File

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

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

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

181
Android/app/src/main/res/layout/fragment_dashboard.xml
View File

@@ -1,22 +1,175 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".ui.dashboard.DashboardFragment">
<TextView
android:id="@+id/text_dashboard"
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="8dp"
android:textAlignment="center"
android:textSize="20sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
android:layout_margin="8dp"
android:orientation="vertical">
<!-- <include-->
<!-- layout="@layout/card_monster"-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_marginVertical="8dp" />-->
<!-- <include-->
<!-- layout="@layout/card_monster"-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_marginVertical="8dp" />-->
<!-- <include-->
<!-- layout="@layout/card_monster_short"-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_marginVertical="8dp" />-->
<!-- <include-->
<!-- layout="@layout/card_monster_short"-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_marginVertical="8dp" />-->
<GridLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:columnCount="2">
<include
layout="@layout/tile_monster"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_columnWeight="1"
android:layout_marginVertical="8dp"/>
<include
layout="@layout/tile_monster"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_columnWeight="1"
android:layout_marginVertical="8dp" />
<include
layout="@layout/tile_monster_short"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_columnWeight="1"
android:layout_marginVertical="8dp" />
<include
layout="@layout/tile_monster_short"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_columnWeight="1"
android:layout_marginVertical="8dp" />
<include
layout="@layout/card_monster"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_columnWeight="1"
android:layout_marginVertical="8dp"/>
<include
layout="@layout/card_monster"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_columnWeight="1"
android:layout_marginVertical="8dp"/>
<!-- <include-->
<!-- layout="@layout/tile_monster"-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_columnWeight="1"-->
<!-- android:layout_marginVertical="8dp" />-->
<!-- <include-->
<!-- layout="@layout/tile_monster"-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_columnWeight="1"-->
<!-- android:layout_marginVertical="8dp" />-->
<!-- <include-->
<!-- layout="@layout/tile_monster"-->
<!-- android:layout_width="0dp"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_columnWeight="1"-->
<!-- android:layout_marginVertical="8dp" />-->
<!-- <include-->
<!-- layout="@layout/tile_monster"-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_columnWeight="1"-->
<!-- android:layout_marginVertical="8dp" />-->
</GridLayout>
<GridLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:columnCount="2">
<include
layout="@layout/tile_monster_short"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_columnWeight="1"
android:layout_marginVertical="8dp" />
<include
layout="@layout/tile_monster_short"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_columnWeight="1"
android:layout_marginVertical="8dp" />
<include
layout="@layout/tile_monster_short"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_columnWeight="1"
android:layout_marginVertical="8dp" />
<include
layout="@layout/tile_monster_short"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_columnWeight="1"
android:layout_marginVertical="8dp" />
<include
layout="@layout/tile_monster_short"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_columnWeight="1"
android:layout_marginVertical="8dp" />
<include
layout="@layout/tile_monster_short"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_columnWeight="1"
android:layout_marginVertical="8dp" />
<include
layout="@layout/tile_monster_short"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_columnWeight="1"
android:layout_marginVertical="8dp" />
<include
layout="@layout/tile_monster_short"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_columnWeight="1"
android:layout_marginVertical="8dp" />
</GridLayout>
</LinearLayout>
</ScrollView>

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

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

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

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