From 2839dd636aa2b8dc80e8860118286a26363be2a1 Mon Sep 17 00:00:00 2001
From: beige <markoguaman45@gmail.com>
Date: Tue, 17 Mar 2026 12:08:51 -0400
Subject: [PATCH 1/4] fixed issue where orientation change would call RollDie()
 function

---
 .idea/AndroidProjectSystem.xml                |  6 +++++
 .idea/deviceManager.xml                       | 13 ++++++++++
 .idea/gradle.xml                              |  2 +-
 .idea/misc.xml                                |  1 -
 .idea/vcs.xml                                 |  4 ++-
 .../java/edu/temple/dicethrow/BaseBundle.java |  4 +++
 .../java/edu/temple/dicethrow/DieFragment.kt  | 25 +++++++++++++++----
 .../java/edu/temple/dicethrow/MainActivity.kt | 12 ++++++---
 8 files changed, 56 insertions(+), 11 deletions(-)
 create mode 100644 .idea/AndroidProjectSystem.xml
 create mode 100644 .idea/deviceManager.xml
 create mode 100644 app/src/main/java/edu/temple/dicethrow/BaseBundle.java

diff --git a/.idea/AndroidProjectSystem.xml b/.idea/AndroidProjectSystem.xml
new file mode 100644
index 0000000..4a53bee
--- /dev/null
+++ b/.idea/AndroidProjectSystem.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="AndroidProjectSystem">
+    <option name="providerId" value="com.android.tools.idea.GradleProjectSystem" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/deviceManager.xml b/.idea/deviceManager.xml
new file mode 100644
index 0000000..91f9558
--- /dev/null
+++ b/.idea/deviceManager.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="DeviceTable">
+    <option name="columnSorters">
+      <list>
+        <ColumnSorterState>
+          <option name="column" value="Name" />
+          <option name="order" value="ASCENDING" />
+        </ColumnSorterState>
+      </list>
+    </option>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index ae733f1..639c779 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="GradleMigrationSettings" migrationVersion="1" />
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
@@ -12,7 +13,6 @@
             <option value="$PROJECT_DIR$/app" />
           </set>
         </option>
-        <option name="resolveExternalAnnotations" value="false" />
       </GradleProjectSettings>
     </option>
   </component>
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 74dd639..b2c751a 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ExternalStorageConfigurationManager" enabled="true" />
   <component name="ProjectRootManager" version="2" languageLevel="JDK_21" default="true" project-jdk-name="jbr-21" project-jdk-type="JavaSDK">
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index d843f34..35eb1dd 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="VcsDirectoryMappings" defaultProject="true" />
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
 </project>
\ No newline at end of file
diff --git a/app/src/main/java/edu/temple/dicethrow/BaseBundle.java b/app/src/main/java/edu/temple/dicethrow/BaseBundle.java
new file mode 100644
index 0000000..15c310f
--- /dev/null
+++ b/app/src/main/java/edu/temple/dicethrow/BaseBundle.java
@@ -0,0 +1,4 @@
+package edu.temple.dicethrow;
+
+public class BaseBundle {
+}
diff --git a/app/src/main/java/edu/temple/dicethrow/DieFragment.kt b/app/src/main/java/edu/temple/dicethrow/DieFragment.kt
index 90530d7..d1c4a50 100644
--- a/app/src/main/java/edu/temple/dicethrow/DieFragment.kt
+++ b/app/src/main/java/edu/temple/dicethrow/DieFragment.kt
@@ -10,10 +10,13 @@ import kotlin.random.Random
 
 class DieFragment : Fragment() {
 
-    val DIESIDE = "sidenumber"
+   private val DIESIDE = "sidenumber"
+   private val ROLL_KEY = "current_role"
 
     lateinit var dieTextView: TextView
 
+    var currentRoll = 1
+
     var dieSides: Int = 6
 
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -23,6 +26,10 @@ class DieFragment : Fragment() {
                 dieSides = this
             }
         }
+
+        savedInstanceState?.getInt(ROLL_KEY)?.run {
+            currentRoll = this
+        }
     }
 
     override fun onCreateView(
@@ -37,13 +44,21 @@ class DieFragment : Fragment() {
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        throwDie()
-        view.setOnClickListener{
+
+        if (currentRoll == 0)
             throwDie()
-        }
+        else
+            dieTextView.text = currentRoll.toString()
+    }
+
+    override fun onSaveInstanceState(outState: Bundle) {
+        super.onSaveInstanceState(outState)
+
+        outState.putInt(ROLL_KEY, currentRoll)
     }
 
     fun throwDie() {
-        dieTextView.text = Random.nextInt(dieSides).toString()
+        currentRoll = Random.nextInt(dieSides) + 1
+        dieTextView.text = currentRoll.toString()
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/edu/temple/dicethrow/MainActivity.kt b/app/src/main/java/edu/temple/dicethrow/MainActivity.kt
index aa91cf6..f0fd0a4 100644
--- a/app/src/main/java/edu/temple/dicethrow/MainActivity.kt
+++ b/app/src/main/java/edu/temple/dicethrow/MainActivity.kt
@@ -1,14 +1,20 @@
 package edu.temple.dicethrow
 
 import android.os.Bundle
-import androidx.activity.enableEdgeToEdge
+import android.widget.Button
 import androidx.appcompat.app.AppCompatActivity
-import androidx.core.view.ViewCompat
-import androidx.core.view.WindowInsetsCompat
 
 class MainActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main)
+
+        findViewById<Button>(R.id.rollDiceButton).setOnClickListener {
+                supportFragmentManager
+                    .findFragmentById(R.id.fragmentContainerView)?.run {
+                        (this as DieFragment).throwDie()
+            }
+        }
+            
     }
 }
\ No newline at end of file

From 081de7944e497e9bb19f0b3d7bebfdb668cfef83 Mon Sep 17 00:00:00 2001
From: beige <markoguaman45@gmail.com>
Date: Tue, 17 Mar 2026 12:21:15 -0400
Subject: [PATCH 2/4] final commit

---
 .../main/java/edu/temple/dicethrow/DieFragment.kt  |  8 ++++++++
 .../main/java/edu/temple/dicethrow/MainActivity.kt | 14 +++++++++-----
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/edu/temple/dicethrow/DieFragment.kt b/app/src/main/java/edu/temple/dicethrow/DieFragment.kt
index d1c4a50..011b666 100644
--- a/app/src/main/java/edu/temple/dicethrow/DieFragment.kt
+++ b/app/src/main/java/edu/temple/dicethrow/DieFragment.kt
@@ -61,4 +61,12 @@ class DieFragment : Fragment() {
         currentRoll = Random.nextInt(dieSides) + 1
         dieTextView.text = currentRoll.toString()
     }
+
+    companion object {
+        fun newInstance (sides: Int) = DieFragment().apply {
+            arguments = Bundle().apply {
+                putInt(DIESIDE, sides)
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/edu/temple/dicethrow/MainActivity.kt b/app/src/main/java/edu/temple/dicethrow/MainActivity.kt
index f0fd0a4..5171405 100644
--- a/app/src/main/java/edu/temple/dicethrow/MainActivity.kt
+++ b/app/src/main/java/edu/temple/dicethrow/MainActivity.kt
@@ -9,12 +9,16 @@ class MainActivity : AppCompatActivity() {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main)
 
+        if (supportFragmentManager.findFragmentById(R.id.fragmentContainerView) == null) {
+            supportFragmentManager
+                .beginTransaction()
+                .add(R.id.fragmentContainerView, DieFragment.newInstance(20))
+                .commit()
+        }
+
         findViewById<Button>(R.id.rollDiceButton).setOnClickListener {
-                supportFragmentManager
-                    .findFragmentById(R.id.fragmentContainerView)?.run {
-                        (this as DieFragment).throwDie()
-            }
+            (supportFragmentManager
+                .findFragmentById(R.id.fragmentContainerView) as? DieFragment)?.throwDie()
         }
-            
     }
 }
\ No newline at end of file

From 3bb4dbd73ff4a20cd7b48609eca097419bdbbbee Mon Sep 17 00:00:00 2001
From: beige <markoguaman45@gmail.com>
Date: Wed, 18 Mar 2026 16:14:39 -0400
Subject: [PATCH 3/4] added a second die

---
 .../java/edu/temple/dicethrow/DieFragment.kt  | 20 +++++-----------
 .../java/edu/temple/dicethrow/MainActivity.kt | 14 +++++++----
 app/src/main/res/layout/activity_main.xml     | 24 +++++++++++++++++++
 3 files changed, 39 insertions(+), 19 deletions(-)

diff --git a/app/src/main/java/edu/temple/dicethrow/DieFragment.kt b/app/src/main/java/edu/temple/dicethrow/DieFragment.kt
index 011b666..22fed5d 100644
--- a/app/src/main/java/edu/temple/dicethrow/DieFragment.kt
+++ b/app/src/main/java/edu/temple/dicethrow/DieFragment.kt
@@ -10,21 +10,15 @@ import kotlin.random.Random
 
 class DieFragment : Fragment() {
 
-   private val DIESIDE = "sidenumber"
-   private val ROLL_KEY = "current_role"
-
     lateinit var dieTextView: TextView
 
     var currentRoll = 1
-
     var dieSides: Int = 6
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         arguments?.let {
-            it.getInt(DIESIDE).run {
-                dieSides = this
-            }
+            dieSides = it.getInt(DIESIDE, 6)
         }
 
         savedInstanceState?.getInt(ROLL_KEY)?.run {
@@ -44,16 +38,11 @@ class DieFragment : Fragment() {
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-
-        if (currentRoll == 0)
-            throwDie()
-        else
-            dieTextView.text = currentRoll.toString()
+        dieTextView.text = currentRoll.toString()
     }
 
     override fun onSaveInstanceState(outState: Bundle) {
         super.onSaveInstanceState(outState)
-
         outState.putInt(ROLL_KEY, currentRoll)
     }
 
@@ -63,7 +52,10 @@ class DieFragment : Fragment() {
     }
 
     companion object {
-        fun newInstance (sides: Int) = DieFragment().apply {
+        private const val DIESIDE = "sidenumber"
+        private const val ROLL_KEY = "current_role"
+
+        fun newInstance(sides: Int) = DieFragment().apply {
             arguments = Bundle().apply {
                 putInt(DIESIDE, sides)
             }
diff --git a/app/src/main/java/edu/temple/dicethrow/MainActivity.kt b/app/src/main/java/edu/temple/dicethrow/MainActivity.kt
index 5171405..f69dd13 100644
--- a/app/src/main/java/edu/temple/dicethrow/MainActivity.kt
+++ b/app/src/main/java/edu/temple/dicethrow/MainActivity.kt
@@ -9,16 +9,20 @@ class MainActivity : AppCompatActivity() {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main)
 
-        if (supportFragmentManager.findFragmentById(R.id.fragmentContainerView) == null) {
+        // Add fragments only the first time the activity is created
+        if (savedInstanceState == null) {
             supportFragmentManager
                 .beginTransaction()
-                .add(R.id.fragmentContainerView, DieFragment.newInstance(20))
+                .replace(R.id.fragmentContainerView, DieFragment.newInstance(6))
+                .replace(R.id.fragmentContainerView2, DieFragment.newInstance(10))
                 .commit()
         }
 
-        findViewById<Button>(R.id.rollDiceButton).setOnClickListener {
-            (supportFragmentManager
-                .findFragmentById(R.id.fragmentContainerView) as? DieFragment)?.throwDie()
+        val rollButton = findViewById<Button>(R.id.rollDiceButton)
+
+        rollButton.setOnClickListener {
+            (supportFragmentManager.findFragmentById(R.id.fragmentContainerView) as? DieFragment)?.throwDie()
+            (supportFragmentManager.findFragmentById(R.id.fragmentContainerView2) as? DieFragment)?.throwDie()
         }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 0f49c59..f1d4c09 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -26,4 +26,28 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical"
+        android:gravity="center">
+
+        <FrameLayout
+            android:id="@+id/fragmentContainerView1"
+            android:layout_width="200dp"
+            android:layout_height="200dp" />
+
+        <FrameLayout
+            android:id="@+id/fragmentContainerView2"
+            android:layout_width="200dp"
+            android:layout_height="200dp" />
+
+        <Button
+            android:id="@+id/rollDiceButton"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Roll Dice" />
+
+    </LinearLayout>
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

From fdec52bb32381e96eb362ed946dc20401d408d29 Mon Sep 17 00:00:00 2001
From: beige <markoguaman45@gmail.com>
Date: Wed, 18 Mar 2026 16:15:06 -0400
Subject: [PATCH 4/4] final

---
 app/src/main/java/edu/temple/dicethrow/MainActivity.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/edu/temple/dicethrow/MainActivity.kt b/app/src/main/java/edu/temple/dicethrow/MainActivity.kt
index f69dd13..64079ee 100644
--- a/app/src/main/java/edu/temple/dicethrow/MainActivity.kt
+++ b/app/src/main/java/edu/temple/dicethrow/MainActivity.kt
@@ -19,7 +19,7 @@ class MainActivity : AppCompatActivity() {
         }
 
         val rollButton = findViewById<Button>(R.id.rollDiceButton)
-
+        // Set a click listener for the button
         rollButton.setOnClickListener {
             (supportFragmentManager.findFragmentById(R.id.fragmentContainerView) as? DieFragment)?.throwDie()
             (supportFragmentManager.findFragmentById(R.id.fragmentContainerView2) as? DieFragment)?.throwDie()