From f3601f4694f8282c1d9a10164ddcfac10dfb8a24 Mon Sep 17 00:00:00 2001 From: Andrew Kemp Date: Thu, 5 Mar 2020 19:24:38 -0500 Subject: [PATCH] Added some neat die images --- .../dev/andrewkemp/diceroller/MainActivity.kt | 15 +++- app/src/main/res/drawable/dice_1.xml | 66 +++++++++++++++ app/src/main/res/drawable/dice_2.xml | 66 +++++++++++++++ app/src/main/res/drawable/dice_3.xml | 66 +++++++++++++++ app/src/main/res/drawable/dice_4.xml | 69 ++++++++++++++++ app/src/main/res/drawable/dice_5.xml | 75 +++++++++++++++++ app/src/main/res/drawable/dice_6.xml | 81 +++++++++++++++++++ app/src/main/res/drawable/empty_dice.xml | 48 +++++++++++ app/src/main/res/layout/activity_main.xml | 7 +- 9 files changed, 485 insertions(+), 8 deletions(-) create mode 100644 app/src/main/res/drawable/dice_1.xml create mode 100644 app/src/main/res/drawable/dice_2.xml create mode 100644 app/src/main/res/drawable/dice_3.xml create mode 100644 app/src/main/res/drawable/dice_4.xml create mode 100644 app/src/main/res/drawable/dice_5.xml create mode 100644 app/src/main/res/drawable/dice_6.xml create mode 100644 app/src/main/res/drawable/empty_dice.xml diff --git a/app/src/main/java/dev/andrewkemp/diceroller/MainActivity.kt b/app/src/main/java/dev/andrewkemp/diceroller/MainActivity.kt index b58f99c..11d4729 100644 --- a/app/src/main/java/dev/andrewkemp/diceroller/MainActivity.kt +++ b/app/src/main/java/dev/andrewkemp/diceroller/MainActivity.kt @@ -16,8 +16,7 @@ class MainActivity : AppCompatActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) binding = ActivityMainBinding.inflate(layoutInflater) - val view = binding.root - setContentView(view) + setContentView(R.layout.activity_main) roll_button.setOnClickListener() { rollDice() @@ -25,8 +24,16 @@ class MainActivity : AppCompatActivity() { } private fun rollDice() { - val rollResult = Random().nextInt(DICE_SIDES + 1) - dice_result.text = rollResult.toString() + val rollResult = Random().nextInt(DICE_SIDES) + 1 + dice_image.setImageResource(when(rollResult) { + 1 -> R.drawable.dice_1 + 2 -> R.drawable.dice_2 + 3 -> R.drawable.dice_3 + 4 -> R.drawable.dice_4 + 5 -> R.drawable.dice_5 + 6 -> R.drawable.dice_6 + else -> R.drawable.empty_dice + }) } } diff --git a/app/src/main/res/drawable/dice_1.xml b/app/src/main/res/drawable/dice_1.xml new file mode 100644 index 0000000..379fad8 --- /dev/null +++ b/app/src/main/res/drawable/dice_1.xml @@ -0,0 +1,66 @@ + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/drawable/dice_2.xml b/app/src/main/res/drawable/dice_2.xml new file mode 100644 index 0000000..d8251f1 --- /dev/null +++ b/app/src/main/res/drawable/dice_2.xml @@ -0,0 +1,66 @@ + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/drawable/dice_3.xml b/app/src/main/res/drawable/dice_3.xml new file mode 100644 index 0000000..c47ebc0 --- /dev/null +++ b/app/src/main/res/drawable/dice_3.xml @@ -0,0 +1,66 @@ + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/drawable/dice_4.xml b/app/src/main/res/drawable/dice_4.xml new file mode 100644 index 0000000..cd62a71 --- /dev/null +++ b/app/src/main/res/drawable/dice_4.xml @@ -0,0 +1,69 @@ + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/drawable/dice_5.xml b/app/src/main/res/drawable/dice_5.xml new file mode 100644 index 0000000..d819fa6 --- /dev/null +++ b/app/src/main/res/drawable/dice_5.xml @@ -0,0 +1,75 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/drawable/dice_6.xml b/app/src/main/res/drawable/dice_6.xml new file mode 100644 index 0000000..06efb34 --- /dev/null +++ b/app/src/main/res/drawable/dice_6.xml @@ -0,0 +1,81 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/drawable/empty_dice.xml b/app/src/main/res/drawable/empty_dice.xml new file mode 100644 index 0000000..ad65c24 --- /dev/null +++ b/app/src/main/res/drawable/empty_dice.xml @@ -0,0 +1,48 @@ + + + + + + + + + + + + diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index ba49aaf..20dd447 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -7,13 +7,12 @@ android:layout_gravity="center_vertical" tools:context=".MainActivity"> - + android:src="@drawable/empty_dice" />