Merge branch 'master' into 'main'

.gitignore

.idea/.gitignore

.idea/.name

.idea/codeStyles/Project.xml

.idea/codeStyles/codeStyleConfig.xml

.idea/compiler.xml

.idea/gradle.xml

.idea/kotlinc.xml

.idea/misc.xml

app/.gitignore

app/build.gradle.kts

app/proguard-rules.pro

...st/java/com/example/diceroller/ExampleInstrumentedTest.kt

app/src/main/AndroidManifest.xml

app/src/main/java/com/example/diceroller/MainActivity.kt

app/src/main/java/com/example/diceroller/ui/theme/Color.kt

app/src/main/java/com/example/diceroller/ui/theme/Theme.kt

app/src/main/java/com/example/diceroller/ui/theme/Type.kt

app/src/main/res/drawable/dice_1.xml

app/src/main/res/drawable/dice_2.xml