From 7c78ac3695b0f3fea3ba9bd7d097e4decf5059ac Mon Sep 17 00:00:00 2001
From: JackyC99 <chenjacky838@gmail.com>
Date: Tue, 18 Mar 2025 11:31:37 -0400
Subject: [PATCH 1/6] Fixe the bug

---
 .idea/gradle.xml | 1 +
 .idea/misc.xml   | 1 -
 .idea/vcs.xml    | 4 +++-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index ae733f1..7b3006b 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>
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

From 3c6b4c9561eca1b30af3f4961cff6664a4b3860e Mon Sep 17 00:00:00 2001
From: JackyC99 <chenjacky838@gmail.com>
Date: Tue, 18 Mar 2025 11:33:35 -0400
Subject: [PATCH 2/6] Fixe the bug

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

diff --git a/app/src/main/java/edu/temple/dicethrow/DieFragment.kt b/app/src/main/java/edu/temple/dicethrow/DieFragment.kt
index 90530d7..5e83663 100644
--- a/app/src/main/java/edu/temple/dicethrow/DieFragment.kt
+++ b/app/src/main/java/edu/temple/dicethrow/DieFragment.kt
@@ -44,6 +44,6 @@ class DieFragment : Fragment() {
     }
 
     fun throwDie() {
-        dieTextView.text = Random.nextInt(dieSides).toString()
+        dieTextView.text = (Random.nextInt(dieSides) + 1).toString()
     }
 }
\ No newline at end of file

From b26d3a726d9ba4a8e4e2bc9d47526c88793d5a00 Mon Sep 17 00:00:00 2001
From: JackyC99 <chenjacky838@gmail.com>
Date: Tue, 18 Mar 2025 11:41:25 -0400
Subject: [PATCH 3/6] Added a onClickListener for the diefragment

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

diff --git a/app/src/main/java/edu/temple/dicethrow/MainActivity.kt b/app/src/main/java/edu/temple/dicethrow/MainActivity.kt
index aa91cf6..b64f6bd 100644
--- a/app/src/main/java/edu/temple/dicethrow/MainActivity.kt
+++ b/app/src/main/java/edu/temple/dicethrow/MainActivity.kt
@@ -1,6 +1,7 @@
 package edu.temple.dicethrow
 
 import android.os.Bundle
+import android.widget.Button
 import androidx.activity.enableEdgeToEdge
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.view.ViewCompat
@@ -10,5 +11,12 @@ 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) as DieFragment).throwDie()
+        }
     }
 }
\ No newline at end of file

From f9c69704bf9eefa7b3266ef8f614f53937c4e9c3 Mon Sep 17 00:00:00 2001
From: JackyC99 <chenjacky838@gmail.com>
Date: Tue, 18 Mar 2025 11:53:21 -0400
Subject: [PATCH 4/6] Preventedc fragment overlay by adding an if statement to
 check for frangment

---
 app/src/main/java/edu/temple/dicethrow/MainActivity.kt | 5 ++++-
 1 file changed, 4 insertions(+), 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 b64f6bd..3912238 100644
--- a/app/src/main/java/edu/temple/dicethrow/MainActivity.kt
+++ b/app/src/main/java/edu/temple/dicethrow/MainActivity.kt
@@ -12,7 +12,10 @@ 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())
+                .commit()
 
         findViewById<Button>(R.id.rollDiceButton).setOnClickListener {
             (supportFragmentManager

From 5923c1b79a5945aabcbd52976ea1095a7ed1b49c Mon Sep 17 00:00:00 2001
From: JackyC99 <chenjacky838@gmail.com>
Date: Tue, 18 Mar 2025 12:13:19 -0400
Subject: [PATCH 5/6] Implemented an onSaveInstance to prevent the roll to
 change when flipping screen

---
 .../java/edu/temple/dicethrow/DieFragment.kt     | 16 +++++++++++++++-
 .../java/edu/temple/dicethrow/MainActivity.kt    |  1 +
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/edu/temple/dicethrow/DieFragment.kt b/app/src/main/java/edu/temple/dicethrow/DieFragment.kt
index 5e83663..8895fc6 100644
--- a/app/src/main/java/edu/temple/dicethrow/DieFragment.kt
+++ b/app/src/main/java/edu/temple/dicethrow/DieFragment.kt
@@ -12,6 +12,10 @@ class DieFragment : Fragment() {
 
     val DIESIDE = "sidenumber"
 
+    val PREV = "previousroll"
+
+    var Current = 0
+
     lateinit var dieTextView: TextView
 
     var dieSides: Int = 6
@@ -38,12 +42,22 @@ class DieFragment : Fragment() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         throwDie()
+        savedInstanceState?.getInt(PREV)?.run {
+            Current = this
+            dieTextView.text = Current.toString()
+        }
         view.setOnClickListener{
             throwDie()
         }
     }
 
+    override fun onSaveInstanceState(outState: Bundle) {
+        super.onSaveInstanceState(outState)
+        outState.putInt(PREV,Current )
+    }
+
     fun throwDie() {
-        dieTextView.text = (Random.nextInt(dieSides) + 1).toString()
+        Current = Random.nextInt(dieSides) + 1
+        dieTextView.text = Current.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 3912238..2a73c93 100644
--- a/app/src/main/java/edu/temple/dicethrow/MainActivity.kt
+++ b/app/src/main/java/edu/temple/dicethrow/MainActivity.kt
@@ -22,4 +22,5 @@ class MainActivity : AppCompatActivity() {
                 .findFragmentById(R.id.fragmentContainerView) as DieFragment).throwDie()
         }
     }
+
 }
\ No newline at end of file

From 7a284207c6e5ce63c4cd582da9751b8fcfd42632 Mon Sep 17 00:00:00 2001
From: JackyC99 <chenjacky838@gmail.com>
Date: Wed, 19 Mar 2025 16:04:32 -0400
Subject: [PATCH 6/6] Update the dice to throw two and factory set

---
 .../java/edu/temple/dicethrow/DieFragment.kt  | 44 ++++++++++---------
 .../java/edu/temple/dicethrow/MainActivity.kt | 32 +++++++++-----
 app/src/main/res/layout/activity_main.xml     | 34 +++++++++-----
 app/src/main/res/layout/fragment_die.xml      | 18 ++++----
 app/src/main/res/values/ids.xml               |  6 +++
 5 files changed, 82 insertions(+), 52 deletions(-)
 create mode 100644 app/src/main/res/values/ids.xml

diff --git a/app/src/main/java/edu/temple/dicethrow/DieFragment.kt b/app/src/main/java/edu/temple/dicethrow/DieFragment.kt
index 8895fc6..ec3f3e6 100644
--- a/app/src/main/java/edu/temple/dicethrow/DieFragment.kt
+++ b/app/src/main/java/edu/temple/dicethrow/DieFragment.kt
@@ -11,21 +11,26 @@ import kotlin.random.Random
 class DieFragment : Fragment() {
 
     val DIESIDE = "sidenumber"
-
     val PREV = "previousroll"
-
-    var Current = 0
-
+    var current = 0
     lateinit var dieTextView: TextView
-
     var dieSides: Int = 6
 
+    // Factory method to create an instance of DieFragment with a specific number of sides
+    companion object {
+        fun newInstance(dieSides: Int): DieFragment {
+            val fragment = DieFragment()
+            val args = Bundle()
+            args.putInt(fragment.DIESIDE, dieSides)  // Use the constant DIESIDE correctly
+            fragment.arguments = args
+            return fragment
+        }
+    }
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         arguments?.let {
-            it.getInt(DIESIDE).run {
-                dieSides = this
-            }
+            dieSides = it.getInt(DIESIDE, 6)  // Default to 6 if not provided
         }
     }
 
@@ -33,31 +38,30 @@ class DieFragment : Fragment() {
         inflater: LayoutInflater, container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View? {
-        // Inflate the layout for this fragment
-        return inflater.inflate(R.layout.fragment_die, container, false).apply {
-            dieTextView = findViewById(R.id.dieTextView)
-        }
+        val view = inflater.inflate(R.layout.fragment_die, container, false)
+        dieTextView = view.findViewById(R.id.dieTextView)
+        return view
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         throwDie()
-        savedInstanceState?.getInt(PREV)?.run {
-            Current = this
-            dieTextView.text = Current.toString()
+        savedInstanceState?.getInt(PREV)?.let {
+            current = it
+            dieTextView.text = current.toString()
         }
-        view.setOnClickListener{
+        view.setOnClickListener {
             throwDie()
         }
     }
 
     override fun onSaveInstanceState(outState: Bundle) {
         super.onSaveInstanceState(outState)
-        outState.putInt(PREV,Current )
+        outState.putInt(PREV, current)
     }
 
     fun throwDie() {
-        Current = Random.nextInt(dieSides) + 1
-        dieTextView.text = Current.toString()
+        current = Random.nextInt(dieSides) + 1
+        dieTextView.text = current.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 2a73c93..7fcc6b6 100644
--- a/app/src/main/java/edu/temple/dicethrow/MainActivity.kt
+++ b/app/src/main/java/edu/temple/dicethrow/MainActivity.kt
@@ -1,26 +1,34 @@
 package edu.temple.dicethrow
 
 import android.os.Bundle
-import android.widget.Button
-import androidx.activity.enableEdgeToEdge
 import androidx.appcompat.app.AppCompatActivity
-import androidx.core.view.ViewCompat
-import androidx.core.view.WindowInsetsCompat
+import androidx.fragment.app.FragmentTransaction
+import android.widget.Button
 
 class MainActivity : AppCompatActivity() {
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main)
 
-        if (supportFragmentManager.findFragmentById(R.id.fragmentContainerView) == null)
-            supportFragmentManager.beginTransaction()
-                .add(R.id.fragmentContainerView, DieFragment())
-                .commit()
+        // Create the first die with 6 sides
+        val dieFragment1 = DieFragment.newInstance(20)
+        val fragmentTransaction1: FragmentTransaction = supportFragmentManager.beginTransaction()
+        fragmentTransaction1.replace(R.id.dieFragmentContainer1, dieFragment1)
+        fragmentTransaction1.commit()
+
+        // Create the second die with 6 sides
+        val dieFragment2 = DieFragment.newInstance(20)
+        val fragmentTransaction2: FragmentTransaction = supportFragmentManager.beginTransaction()
+        fragmentTransaction2.replace(R.id.dieFragmentContainer2, dieFragment2)
+        fragmentTransaction2.commit()
 
-        findViewById<Button>(R.id.rollDiceButton).setOnClickListener {
-            (supportFragmentManager
-                .findFragmentById(R.id.fragmentContainerView) as DieFragment).throwDie()
+        // Set up the roll button to roll both dice
+        val rollButton = findViewById<Button>(R.id.rollButton)
+        rollButton.setOnClickListener {
+            dieFragment1.throwDie()  // Roll the first die
+            dieFragment2.throwDie()  // Roll the second die
         }
     }
+}
 
-}
\ 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..bb211c7 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -2,28 +2,40 @@
 <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:id="@+id/main"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context=".MainActivity">
 
+    <!-- First Die FragmentContainerView -->
     <androidx.fragment.app.FragmentContainerView
-        android:id="@+id/fragmentContainerView"
+        android:id="@+id/dieFragmentContainer1"
         android:name="edu.temple.dicethrow.DieFragment"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="50dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"/>
+
+    <!-- Second Die FragmentContainerView -->
+    <androidx.fragment.app.FragmentContainerView
+        android:id="@+id/dieFragmentContainer2"
+        android:name="edu.temple.dicethrow.DieFragment"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="150dp"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHeight_percent=".4"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toTopOf="parent"/>
 
+    <!-- Roll Button -->
     <Button
-        android:id="@+id/rollDiceButton"
+        android:id="@+id/rollButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="ROLL"
-        app:layout_constraintBottom_toBottomOf="parent"
+        android:text="Roll"
+        app:layout_constraintTop_toBottomOf="@id/dieFragmentContainer2"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+        android:layout_marginTop="32dp" />
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/fragment_die.xml b/app/src/main/res/layout/fragment_die.xml
index b2b9d98..7e9e40b 100644
--- a/app/src/main/res/layout/fragment_die.xml
+++ b/app/src/main/res/layout/fragment_die.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".DieFragment">
+    android:orientation="vertical"
+    android:gravity="center">
 
-    <!-- TODO: Update blank fragment layout -->
     <TextView
         android:id="@+id/dieTextView"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:gravity="center_horizontal|center_vertical"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
         android:text="0"
-        android:textSize="96sp" />
+        android:textSize="48sp"
+        android:textAlignment="center"
+        android:layout_marginTop="32dp"/>
 
-</FrameLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/app/src/main/res/values/ids.xml b/app/src/main/res/values/ids.xml
new file mode 100644
index 0000000..85bdfd6
--- /dev/null
+++ b/app/src/main/res/values/ids.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <item name="dieFragmentContainer1" type="id" />
+    <item name="rollButton" type="id" />
+    <item name="dieFragmentContainer2" type="id" />
+</resources>
\ No newline at end of file