From 4be7c6310735af70041f2d708ebcb74858bcd65c Mon Sep 17 00:00:00 2001
From: dominiquebissey <dominiquebissey04@gmail.com>
Date: Tue, 18 Mar 2025 11:29:12 -0400
Subject: [PATCH 1/5] Fixed the bug that caused die rolls to start at 0 and end
 at 5.

---
 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 3059fe01a226868f88adbfb337b91a4f00706119 Mon Sep 17 00:00:00 2001
From: dominiquebissey <dominiquebissey04@gmail.com>
Date: Tue, 18 Mar 2025 11:40:54 -0400
Subject: [PATCH 2/5] Fixed the bug that caused die rolls to start at 0 and end
 at 5. Fixed the roll button to change the die roll when clicked.

---
 app/src/main/java/edu/temple/dicethrow/MainActivity.kt | 7 +++++++
 1 file changed, 7 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..f4341d8 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,11 @@ 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 0e4f87aaeba80e9323f96a71ed5d1fbda1acf878 Mon Sep 17 00:00:00 2001
From: dominiquebissey <dominiquebissey04@gmail.com>
Date: Tue, 18 Mar 2025 12:19:59 -0400
Subject: [PATCH 3/5] Fixed the bug that caused die rolls to start at 0 and end
 at 5. Fixed the roll button to change the die roll when clicked. Added
 saveInstanceState to save the value of the die roll when the screen in
 rotated.

---
 .../java/edu/temple/dicethrow/DieFragment.kt  | 21 ++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/edu/temple/dicethrow/DieFragment.kt b/app/src/main/java/edu/temple/dicethrow/DieFragment.kt
index 5e83663..cfe5824 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 PREVOUS_ROLL = "previousroll"
+
+    var currentRoll = 0
+
     lateinit var dieTextView: TextView
 
     var dieSides: Int = 6
@@ -37,13 +41,24 @@ class DieFragment : Fragment() {
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        throwDie()
-        view.setOnClickListener{
+
+        if (savedInstanceState == null)
             throwDie()
+        else {
+            currentRoll = savedInstanceState.getInt(PREVOUS_ROLL)
+            dieTextView.text = currentRoll.toString()
+
         }
     }
 
+    override fun onSaveInstanceState(outState: Bundle) {
+        super.onSaveInstanceState(outState)
+
+        outState.putInt(PREVOUS_ROLL, currentRoll)
+    }
+
     fun throwDie() {
-        dieTextView.text = (Random.nextInt(dieSides) + 1).toString()
+        currentRoll = (Random.nextInt(dieSides) + 1)
+        dieTextView.text = currentRoll.toString()
     }
 }
\ No newline at end of file

From f730c109293a7b2960053a67742d2881a8ba8b77 Mon Sep 17 00:00:00 2001
From: dominiquebissey <dominiquebissey04@gmail.com>
Date: Thu, 20 Mar 2025 12:04:55 -0400
Subject: [PATCH 4/5] Fixed the bug that caused die rolls to start at 0 and end
 at 5. Fixed the roll button to change the die roll when clicked. Added
 saveInstanceState to save the value of the die roll when the screen in
 rotated. Added factory method to change number of die sides and set 6 as the
 default. Fixed the rollDieButton to use work with the newInstance of the die
 sides. Added second fragmentContainerView to add second die that can be
 rolled. Added DieViewModel and implemented its usage in the DieFragment.

---
 .../java/edu/temple/dicethrow/DieFragment.kt  | 25 +++++++++----------
 .../java/edu/temple/dicethrow/DieViewModel.kt | 19 ++++++++++++++
 2 files changed, 31 insertions(+), 13 deletions(-)
 create mode 100644 app/src/main/java/edu/temple/dicethrow/DieViewModel.kt

diff --git a/app/src/main/java/edu/temple/dicethrow/DieFragment.kt b/app/src/main/java/edu/temple/dicethrow/DieFragment.kt
index cfe5824..380b0e5 100644
--- a/app/src/main/java/edu/temple/dicethrow/DieFragment.kt
+++ b/app/src/main/java/edu/temple/dicethrow/DieFragment.kt
@@ -6,6 +6,7 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.TextView
+import androidx.lifecycle.ViewModelProvider
 import kotlin.random.Random
 
 class DieFragment : Fragment() {
@@ -20,6 +21,8 @@ class DieFragment : Fragment() {
 
     var dieSides: Int = 6
 
+    lateinit var dieViewModel: DieViewModel
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         arguments?.let {
@@ -27,6 +30,8 @@ class DieFragment : Fragment() {
                 dieSides = this
             }
         }
+
+        dieViewModel = ViewModelProvider(this).get(DieViewModel::class.java)
     }
 
     override fun onCreateView(
@@ -42,23 +47,17 @@ class DieFragment : Fragment() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
-        if (savedInstanceState == null)
-            throwDie()
-        else {
-            currentRoll = savedInstanceState.getInt(PREVOUS_ROLL)
-            dieTextView.text = currentRoll.toString()
-
+        dieViewModel.getCurrentRoll().observe(viewLifecycleOwner){
+            dieTextView.text = it.toString()
         }
-    }
 
-    override fun onSaveInstanceState(outState: Bundle) {
-        super.onSaveInstanceState(outState)
-
-        outState.putInt(PREVOUS_ROLL, currentRoll)
+        if (dieViewModel.getCurrentRoll().value)
+            throwDie()
     }
 
+
     fun throwDie() {
-        currentRoll = (Random.nextInt(dieSides) + 1)
-        dieTextView.text = currentRoll.toString()
+        dieViewModel.setCurrentRoll(Random.nextInt(dieSides) + 1)
+
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/edu/temple/dicethrow/DieViewModel.kt b/app/src/main/java/edu/temple/dicethrow/DieViewModel.kt
new file mode 100644
index 0000000..2a5fe37
--- /dev/null
+++ b/app/src/main/java/edu/temple/dicethrow/DieViewModel.kt
@@ -0,0 +1,19 @@
+package edu.temple.dicethrow
+
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.LiveData
+
+class DieViewModel : ViewModel() {
+    private val currentRoll : MutableLiveData<Int> by lazy {
+        MutableLiveData()
+    }
+
+    fun getCurrentRoll() : LiveData<Int> {
+        return currentRoll
+    }
+
+    fun setCurrentRoll(roll : Int) {
+        currentRoll.value = roll
+    }
+}
\ No newline at end of file

From d136b36b9235f127745d75b7c760933fe71b3838 Mon Sep 17 00:00:00 2001
From: dominiquebissey <dominiquebissey04@gmail.com>
Date: Thu, 20 Mar 2025 12:08:51 -0400
Subject: [PATCH 5/5] Fixed the bug that caused die rolls to start at 0 and end
 at 5. Fixed the roll button to change the die roll when clicked. Added
 saveInstanceState to save the value of the die roll when the screen in
 rotated. Added factory method to change number of die sides and set 6 as the
 default. Fixed the rollDieButton to use work with the newInstance of the die
 sides. Added second fragmentContainerView to add second die that can be
 rolled. Added DieViewModel and implemented its usage in the DieFragment.
 Added rollDie function to ViewModel with fixed die sides.

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

diff --git a/app/src/main/java/edu/temple/dicethrow/DieViewModel.kt b/app/src/main/java/edu/temple/dicethrow/DieViewModel.kt
index 2a5fe37..fda40d8 100644
--- a/app/src/main/java/edu/temple/dicethrow/DieViewModel.kt
+++ b/app/src/main/java/edu/temple/dicethrow/DieViewModel.kt
@@ -3,8 +3,12 @@ package edu.temple.dicethrow
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.LiveData
+import kotlin.random.Random
 
 class DieViewModel : ViewModel() {
+
+    private var dieSides: Int = 6
+
     private val currentRoll : MutableLiveData<Int> by lazy {
         MutableLiveData()
     }
@@ -16,4 +20,8 @@ class DieViewModel : ViewModel() {
     fun setCurrentRoll(roll : Int) {
         currentRoll.value = roll
     }
+
+    fun rollDie() {
+        setCurrentRoll(Random.nextInt(dieSides) + 1)
+    }
 }
\ No newline at end of file