From f0a0380cb158a632412bf20d9d9e775138c66727 Mon Sep 17 00:00:00 2001 From: SamDevelops971 Date: Wed, 18 Mar 2026 15:50:04 -0400 Subject: [PATCH] Multi dice! --- .idea/gradle.xml | 2 +- .idea/misc.xml | 7 ++++ .idea/vcs.xml | 4 +- app/build.gradle.kts | 1 + .../java/edu/temple/dicethrow/DieFragment.kt | 12 +++++- .../java/edu/temple/dicethrow/MainActivity.kt | 37 ++++++++++++++++++- app/src/main/res/layout/activity_main.xml | 16 ++++++++ gradle/libs.versions.toml | 2 + 8 files changed, 77 insertions(+), 4 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 @@ + diff --git a/.idea/misc.xml b/.idea/misc.xml index 74dd639..c170b36 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -7,4 +7,11 @@ + + + \ No newline at end of file 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 @@ - + + + \ No newline at end of file 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 90530d7..54fa49a 100644 --- a/app/src/main/java/edu/temple/dicethrow/DieFragment.kt +++ b/app/src/main/java/edu/temple/dicethrow/DieFragment.kt @@ -16,6 +16,16 @@ class DieFragment : Fragment() { var dieSides: Int = 6 + companion object { + fun newInstance(dice: Int = 6) : DieFragment{ + return DieFragment().apply { + arguments = Bundle().apply { + putInt(DIESIDE, dieSides) + } + } + } + } + override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) arguments?.let { @@ -44,6 +54,6 @@ class DieFragment : Fragment() { } fun throwDie() { - dieTextView.text = Random.nextInt(dieSides).toString() + dieTextView.text = Random.nextInt(1,dieSides).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..f631733 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,39 @@ class MainActivity : AppCompatActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) setContentView(R.layout.activity_main) + + if (savedInstanceState == null) { + supportFragmentManager.beginTransaction() + .replace( + R.id.fragmentContainerView, + DieFragment.newInstance(6) + ) + .replace( + R.id.fragmentContainerView2, + DieFragment.newInstance(10) + ).commit() + DieFragment().apply { + arguments = Bundle().apply { + putInt(DIESIDE, 6) + } + } + + + val rollButton = findViewById