From 1b764739c79173d42dc54f1eff84c4134a800b3a Mon Sep 17 00:00:00 2001
From: Antialexclub <tuq33077@temple.edu>
Date: Tue, 17 Mar 2026 11:40:26 -0400
Subject: [PATCH 1/4] Added setonclicklistener

---
 .idea/gradle.xml                                       | 2 +-
 .idea/misc.xml                                         | 1 -
 .idea/vcs.xml                                          | 4 +++-
 app/src/main/java/edu/temple/dicethrow/DieFragment.kt  | 6 ++----
 app/src/main/java/edu/temple/dicethrow/MainActivity.kt | 9 +++++++++
 5 files changed, 15 insertions(+), 7 deletions(-)

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/DieFragment.kt b/app/src/main/java/edu/temple/dicethrow/DieFragment.kt
index 90530d7..6bb408e 100644
--- a/app/src/main/java/edu/temple/dicethrow/DieFragment.kt
+++ b/app/src/main/java/edu/temple/dicethrow/DieFragment.kt
@@ -38,12 +38,10 @@ class DieFragment : Fragment() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         throwDie()
-        view.setOnClickListener{
-            throwDie()
-        }
+
     }
 
     fun throwDie() {
-        dieTextView.text = Random.nextInt(dieSides).toString()
+        dieTextView.text = Random.nextInt(dieSides + 1).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..0496c28 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,13 @@ 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 516c4106f128a2b6c1ebdc2cdc28ed4be4de267e Mon Sep 17 00:00:00 2001
From: Antialexclub <tuq33077@temple.edu>
Date: Tue, 17 Mar 2026 12:09:33 -0400
Subject: [PATCH 2/4] 2nd commit

---
 .../java/edu/temple/dicethrow/DieFragment.kt    | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/app/src/main/java/edu/temple/dicethrow/DieFragment.kt b/app/src/main/java/edu/temple/dicethrow/DieFragment.kt
index 6bb408e..03f7b69 100644
--- a/app/src/main/java/edu/temple/dicethrow/DieFragment.kt
+++ b/app/src/main/java/edu/temple/dicethrow/DieFragment.kt
@@ -12,8 +12,11 @@ class DieFragment : Fragment() {
 
     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,9 @@ class DieFragment : Fragment() {
                 dieSides = this
             }
         }
+       savedInstanceState?.run{
+           currentRoll = getInt(ROLL_KEY)
+       }
     }
 
     override fun onCreateView(
@@ -37,11 +43,22 @@ class DieFragment : Fragment() {
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
+        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 + 1).toString()
+        currentRoll = Random.nextInt()
     }
 }
\ No newline at end of file

From fee6f25ba188c35a7168270688b6053a7266a0f9 Mon Sep 17 00:00:00 2001
From: Antialexclub <tuq33077@temple.edu>
Date: Tue, 17 Mar 2026 12:24:35 -0400
Subject: [PATCH 3/4] 3rd commit

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

diff --git a/app/src/main/java/edu/temple/dicethrow/DieFragment.kt b/app/src/main/java/edu/temple/dicethrow/DieFragment.kt
index 03f7b69..05fb135 100644
--- a/app/src/main/java/edu/temple/dicethrow/DieFragment.kt
+++ b/app/src/main/java/edu/temple/dicethrow/DieFragment.kt
@@ -58,7 +58,17 @@ class DieFragment : Fragment() {
     }
 
     fun throwDie() {
-        dieTextView.text = Random.nextInt(dieSides + 1).toString()
-        currentRoll = Random.nextInt()
+        dieTextView.text = currentRoll.toString()
+        currentRoll = Random.nextInt(dieSides)
     }
+
+    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 0496c28..f33352d 100644
--- a/app/src/main/java/edu/temple/dicethrow/MainActivity.kt
+++ b/app/src/main/java/edu/temple/dicethrow/MainActivity.kt
@@ -12,6 +12,11 @@ class MainActivity : AppCompatActivity() {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main)
 
+        val disFragment = DieFragment.newInstance(20)
+        supportFragmentManager.beginTransaction()
+            .add(R.id.fragmentContainerView, DieFragment)
+            .commit()
+
         findViewById<Button>(R.id.rollDiceButton).setOnClickListener{
             supportFragmentManager
                 .findFragmentById(R.id.fragmentContainerView)?.run{

From f4606969e78b1069f96131da08aa04fb1733f08c Mon Sep 17 00:00:00 2001
From: Antialexclub <tuq33077@temple.edu>
Date: Wed, 18 Mar 2026 15:48:47 -0400
Subject: [PATCH 4/4] lab

---
 app/build.gradle.kts                          |  1 +
 .../java/edu/temple/dicethrow/DieFragment.kt  | 52 ++++++++-----------
 .../java/edu/temple/dicethrow/MainActivity.kt | 25 +++++----
 app/src/main/res/layout/activity_main.xml     | 13 +++++
 gradle/libs.versions.toml                     |  2 +
 5 files changed, 54 insertions(+), 39 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 41d6979..ca5d9a8 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -42,6 +42,7 @@ dependencies {
     implementation(libs.material)
     implementation(libs.androidx.activity)
     implementation(libs.androidx.constraintlayout)
+    implementation(libs.androidx.fragment)
     testImplementation(libs.junit)
     androidTestImplementation(libs.androidx.junit)
     androidTestImplementation(libs.androidx.espresso.core)
diff --git a/app/src/main/java/edu/temple/dicethrow/DieFragment.kt b/app/src/main/java/edu/temple/dicethrow/DieFragment.kt
index 05fb135..ce1d6b2 100644
--- a/app/src/main/java/edu/temple/dicethrow/DieFragment.kt
+++ b/app/src/main/java/edu/temple/dicethrow/DieFragment.kt
@@ -10,32 +10,40 @@ import kotlin.random.Random
 
 class DieFragment : Fragment() {
 
-    val DIESIDE = "sidenumber"
+    private val ROLL_KEY = "current_roll"
+    private lateinit var dieTextView: TextView
 
-    private val ROLL_KEY = "current_role"
-    lateinit var dieTextView: TextView
+    private var currentRoll = 1
+    private var dieSides: Int = 6
 
-    var currentRoll = 1
+    companion object {
+        const val DIESIDE = "sidenumber"
 
-    var dieSides: Int = 6
+        fun newInstance(sides: Int = 6): DieFragment {
+            return DieFragment().apply {
+                arguments = Bundle().apply {
+                    putInt(DIESIDE, sides)
+                }
+            }
+        }
+    }
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+
         arguments?.let {
-            it.getInt(DIESIDE).run {
-                dieSides = this
-            }
+            dieSides = it.getInt(DIESIDE)
+        }
+
+        savedInstanceState?.let {
+            currentRoll = it.getInt(ROLL_KEY, 1)
         }
-       savedInstanceState?.run{
-           currentRoll = getInt(ROLL_KEY)
-       }
     }
 
     override fun onCreateView(
         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)
         }
@@ -43,32 +51,16 @@ 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)
     }
 
     fun throwDie() {
+        currentRoll = Random.nextInt(1, dieSides + 1)
         dieTextView.text = currentRoll.toString()
-        currentRoll = Random.nextInt(dieSides)
     }
-
-    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 f33352d..5464aef 100644
--- a/app/src/main/java/edu/temple/dicethrow/MainActivity.kt
+++ b/app/src/main/java/edu/temple/dicethrow/MainActivity.kt
@@ -12,17 +12,24 @@ class MainActivity : AppCompatActivity() {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main)
 
-        val disFragment = DieFragment.newInstance(20)
-        supportFragmentManager.beginTransaction()
-            .add(R.id.fragmentContainerView, DieFragment)
-            .commit()
+        if (savedInstanceState == null){
+            supportFragmentManager.beginTransaction()
+                .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)?.run{
-                    (this as DieFragment).throwDie()
-                }
 
         }
+
+        val rollbutton = findViewById<Button>(R.id.rollDiceButton)
+        rollbutton.setOnClickListener {
+            val dieFragment = supportFragmentManager.findFragmentById(R.id.fragmentContainerView)
+            as? DieFragment
+            dieFragment?.throwDie()
+
+            val dieFragment2 = supportFragmentManager.findFragmentById(R.id.fragmentContainerView2)
+                    as? DieFragment
+            dieFragment2?.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..fcff07c 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -26,4 +26,17 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
+
+    <androidx.fragment.app.FragmentContainerView
+        android:id="@+id/fragmentContainerView2"
+        android:name="edu.temple.dicethrow.DieFragment"
+        android:layout_width="411dp"
+        android:layout_height="303dp"
+        android:layout_marginTop="35dp"
+        android:layout_marginBottom="3dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.0"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/rollDiceButton" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 06e32ad..edf6cab 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -9,6 +9,7 @@ appcompat = "1.6.1"
 material = "1.10.0"
 activity = "1.9.2"
 constraintlayout = "2.1.4"
+fragment = "1.8.9"
 
 [libraries]
 androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" }
@@ -19,6 +20,7 @@ androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version
 material = { group = "com.google.android.material", name = "material", version.ref = "material" }
 androidx-activity = { group = "androidx.activity", name = "activity", version.ref = "activity" }
 androidx-constraintlayout = { group = "androidx.constraintlayout", name = "constraintlayout", version.ref = "constraintlayout" }
+androidx-fragment = { group = "androidx.fragment", name = "fragment", version.ref = "fragment" }
 
 [plugins]
 android-application = { id = "com.android.application", version.ref = "agp" }