From 3634ac9da4d015dc7cbf4397fe3a5805e28fde36 Mon Sep 17 00:00:00 2001
From: "Wyatt J. Miller" <wjmiller2016@gmail.com>
Date: Thu, 24 Sep 2020 22:46:10 -0400
Subject: [PATCH] added layout and resources

---
 app/src/main/res/layout/activity_dice.xml | 89 +++++++++++++++++++----
 app/src/main/res/values/strings.xml       |  2 +-
 2 files changed, 75 insertions(+), 16 deletions(-)

diff --git a/app/src/main/res/layout/activity_dice.xml b/app/src/main/res/layout/activity_dice.xml
index dae0ca1..485f045 100644
--- a/app/src/main/res/layout/activity_dice.xml
+++ b/app/src/main/res/layout/activity_dice.xml
@@ -7,48 +7,107 @@
     android:layout_height="match_parent"
     tools:context=".DiceActivity">
 
+    <TextView
+        android:id="@+id/diceTextView"
+        android:layout_width="157dp"
+        android:layout_height="76dp"
+        android:layout_marginTop="40dp"
+        android:gravity="center"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/metaStatusTextView" />
+
     <Button
         android:id="@+id/rollButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="32dp"
         android:onClick="onClickDieRoll"
         android:text="@string/btn_roll"
+        app:layout_constraintBaseline_toBaselineOf="@+id/rollFourButton"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.498"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/diceTextView" />
+        app:layout_constraintHorizontal_bias="0.699"
+        app:layout_constraintStart_toStartOf="parent" />
 
     <Button
         android:id="@+id/rollTenButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="16dp"
         android:onClick="onClickDieTenRoll"
         android:text="Roll D10"
+        app:layout_constraintBaseline_toBaselineOf="@+id/rollEightButton"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/rollButton" />
+        app:layout_constraintHorizontal_bias="0.699"
+        app:layout_constraintStart_toStartOf="parent" />
 
     <Button
         android:id="@+id/rollTwentyButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="16dp"
         android:onClick="onClickDieTwentyRoll"
         android:text="Roll D20"
+        app:layout_constraintBaseline_toBaselineOf="@+id/rollTwelveButton"
         app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.699"
+        app:layout_constraintStart_toStartOf="parent" />
+
+    <Button
+        android:id="@+id/rollFourButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="32dp"
+        android:onClick="onClickDieFourRoll"
+        android:text="Roll D4"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.321"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/rollTenButton" />
+        app:layout_constraintTop_toBottomOf="@+id/diceTextView" />
+
+    <Button
+        android:id="@+id/rollEightButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="16dp"
+        android:onClick="onClickDieEightRoll"
+        android:text="Roll D8"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.321"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/rollFourButton" />
+
+    <Button
+        android:id="@+id/rollTwelveButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="16dp"
+        android:onClick="onClickDieTwelveRoll"
+        android:text="Roll D12"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.321"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/rollEightButton" />
+
+    <Button
+        android:id="@+id/roll100Button"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="16dp"
+        android:width="50dp"
+        android:onClick="onClickDie100Roll"
+        android:text="Roll D100"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.498"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/rollTwelveButton" />
 
     <TextView
-        android:id="@+id/diceTextView"
-        android:layout_width="157dp"
-        android:layout_height="76dp"
-        android:layout_marginTop="144dp"
-        android:gravity="center"
-        android:text="1"
+        android:id="@+id/metaStatusTextView"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="64dp"
+        android:gravity="center_horizontal"
+        android:text="Roll a die!"
         app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 8691625..e8e4adb 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -5,5 +5,5 @@
     <string name="btn_coin">Flip the Coin</string>
     <string name="btn_die">Roll Dice</string>
     <string name="btn_flip">Flip</string>
-    <string name="btn_roll">Roll</string>
+    <string name="btn_roll">Roll D6</string>
 </resources>
\ No newline at end of file