diff --git a/dice_app/.gitignore b/dice_app/.gitignore new file mode 100644 index 0000000..aa724b7 --- /dev/null +++ b/dice_app/.gitignore @@ -0,0 +1,15 @@ +*.iml +.gradle +/local.properties +/.idea/caches +/.idea/libraries +/.idea/modules.xml +/.idea/workspace.xml +/.idea/navEditor.xml +/.idea/assetWizardSettings.xml +.DS_Store +/build +/captures +.externalNativeBuild +.cxx +local.properties diff --git a/dice_app/.idea/.gitignore b/dice_app/.idea/.gitignore new file mode 100644 index 0000000..26d3352 --- /dev/null +++ b/dice_app/.idea/.gitignore @@ -0,0 +1,3 @@ +# Default ignored files +/shelf/ +/workspace.xml diff --git a/dice_app/.idea/.name b/dice_app/.idea/.name new file mode 100644 index 0000000..839230b --- /dev/null +++ b/dice_app/.idea/.name @@ -0,0 +1 @@ +diceApp \ No newline at end of file diff --git a/dice_app/.idea/AndroidProjectSystem.xml b/dice_app/.idea/AndroidProjectSystem.xml new file mode 100644 index 0000000..4a53bee --- /dev/null +++ b/dice_app/.idea/AndroidProjectSystem.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/dice_app/.idea/compiler.xml b/dice_app/.idea/compiler.xml new file mode 100644 index 0000000..b86273d --- /dev/null +++ b/dice_app/.idea/compiler.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/dice_app/.idea/deploymentTargetSelector.xml b/dice_app/.idea/deploymentTargetSelector.xml new file mode 100644 index 0000000..b268ef3 --- /dev/null +++ b/dice_app/.idea/deploymentTargetSelector.xml @@ -0,0 +1,10 @@ + + + + + + + + + \ No newline at end of file diff --git a/dice_app/.idea/gradle.xml b/dice_app/.idea/gradle.xml new file mode 100644 index 0000000..97f0a8e --- /dev/null +++ b/dice_app/.idea/gradle.xml @@ -0,0 +1,18 @@ + + + + + + \ No newline at end of file diff --git a/dice_app/.idea/inspectionProfiles/Project_Default.xml b/dice_app/.idea/inspectionProfiles/Project_Default.xml new file mode 100644 index 0000000..7061a0d --- /dev/null +++ b/dice_app/.idea/inspectionProfiles/Project_Default.xml @@ -0,0 +1,61 @@ + + + + \ No newline at end of file diff --git a/dice_app/.idea/migrations.xml b/dice_app/.idea/migrations.xml new file mode 100644 index 0000000..f8051a6 --- /dev/null +++ b/dice_app/.idea/migrations.xml @@ -0,0 +1,10 @@ + + + + + + \ No newline at end of file diff --git a/dice_app/.idea/misc.xml b/dice_app/.idea/misc.xml new file mode 100644 index 0000000..74dd639 --- /dev/null +++ b/dice_app/.idea/misc.xml @@ -0,0 +1,10 @@ + + + + + + + + + \ No newline at end of file diff --git a/dice_app/.idea/runConfigurations.xml b/dice_app/.idea/runConfigurations.xml new file mode 100644 index 0000000..16660f1 --- /dev/null +++ b/dice_app/.idea/runConfigurations.xml @@ -0,0 +1,17 @@ + + + + + + \ No newline at end of file diff --git a/dice_app/.idea/studiobot.xml b/dice_app/.idea/studiobot.xml new file mode 100644 index 0000000..539e3b8 --- /dev/null +++ b/dice_app/.idea/studiobot.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/dice_app/.idea/vcs.xml b/dice_app/.idea/vcs.xml new file mode 100644 index 0000000..6c0b863 --- /dev/null +++ b/dice_app/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/dice_app/app/.gitignore b/dice_app/app/.gitignore new file mode 100644 index 0000000..42afabf --- /dev/null +++ b/dice_app/app/.gitignore @@ -0,0 +1 @@ +/build \ No newline at end of file diff --git a/dice_app/app/build.gradle.kts b/dice_app/app/build.gradle.kts new file mode 100644 index 0000000..a962b8a --- /dev/null +++ b/dice_app/app/build.gradle.kts @@ -0,0 +1,56 @@ +plugins { + alias(libs.plugins.android.application) + alias(libs.plugins.kotlin.compose) +} + +android { + namespace = "com.example.diceapp" + compileSdk { + version = release(36) + } + + defaultConfig { + applicationId = "com.example.diceapp" + minSdk = 24 + targetSdk = 36 + versionCode = 1 + versionName = "1.0" + + testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" + } + + buildTypes { + release { + isMinifyEnabled = false + proguardFiles( + getDefaultProguardFile("proguard-android-optimize.txt"), + "proguard-rules.pro" + ) + } + } + compileOptions { + sourceCompatibility = JavaVersion.VERSION_11 + targetCompatibility = JavaVersion.VERSION_11 + } + buildFeatures { + compose = true + } +} + +dependencies { + implementation(libs.androidx.core.ktx) + implementation(libs.androidx.lifecycle.runtime.ktx) + implementation(libs.androidx.activity.compose) + implementation(platform(libs.androidx.compose.bom)) + implementation(libs.androidx.compose.ui) + implementation(libs.androidx.compose.ui.graphics) + implementation(libs.androidx.compose.ui.tooling.preview) + implementation(libs.androidx.compose.material3) + testImplementation(libs.junit) + androidTestImplementation(libs.androidx.junit) + androidTestImplementation(libs.androidx.espresso.core) + androidTestImplementation(platform(libs.androidx.compose.bom)) + androidTestImplementation(libs.androidx.compose.ui.test.junit4) + debugImplementation(libs.androidx.compose.ui.tooling) + debugImplementation(libs.androidx.compose.ui.test.manifest) +} \ No newline at end of file diff --git a/dice_app/app/proguard-rules.pro b/dice_app/app/proguard-rules.pro new file mode 100644 index 0000000..481bb43 --- /dev/null +++ b/dice_app/app/proguard-rules.pro @@ -0,0 +1,21 @@ +# Add project specific ProGuard rules here. +# You can control the set of applied configuration files using the +# proguardFiles setting in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} + +# Uncomment this to preserve the line number information for +# debugging stack traces. +#-keepattributes SourceFile,LineNumberTable + +# If you keep the line number information, uncomment this to +# hide the original source file name. +#-renamesourcefileattribute SourceFile \ No newline at end of file diff --git a/dice_app/app/src/androidTest/java/com/example/diceapp/ExampleInstrumentedTest.kt b/dice_app/app/src/androidTest/java/com/example/diceapp/ExampleInstrumentedTest.kt new file mode 100644 index 0000000..c1b72a3 --- /dev/null +++ b/dice_app/app/src/androidTest/java/com/example/diceapp/ExampleInstrumentedTest.kt @@ -0,0 +1,24 @@ +package com.example.diceapp + +import androidx.test.platform.app.InstrumentationRegistry +import androidx.test.ext.junit.runners.AndroidJUnit4 + +import org.junit.Test +import org.junit.runner.RunWith + +import org.junit.Assert.* + +/** + * Instrumented test, which will execute on an Android device. + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +@RunWith(AndroidJUnit4::class) +class ExampleInstrumentedTest { + @Test + fun useAppContext() { + // Context of the app under test. + val appContext = InstrumentationRegistry.getInstrumentation().targetContext + assertEquals("com.example.diceapp", appContext.packageName) + } +} \ No newline at end of file diff --git a/dice_app/app/src/main/AndroidManifest.xml b/dice_app/app/src/main/AndroidManifest.xml new file mode 100644 index 0000000..a5a13a3 --- /dev/null +++ b/dice_app/app/src/main/AndroidManifest.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/dice_app/app/src/main/java/com/example/diceapp/MainActivity.kt b/dice_app/app/src/main/java/com/example/diceapp/MainActivity.kt new file mode 100644 index 0000000..a8b79d8 --- /dev/null +++ b/dice_app/app/src/main/java/com/example/diceapp/MainActivity.kt @@ -0,0 +1,67 @@ +package com.example.diceapp + +import android.os.Bundle +import androidx.activity.ComponentActivity +import androidx.activity.compose.setContent +import androidx.compose.foundation.Image +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.wrapContentSize +import androidx.compose.material3.Button +import androidx.compose.material3.Surface +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.runtime.setValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.res.painterResource +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.tooling.preview.Preview +import androidx.compose.ui.unit.sp + +class MainActivity : ComponentActivity() { + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContent { + Surface( + modifier = Modifier.fillMaxSize(), + ) { + DiceRollerApp() + } + } + } + } + +@Preview +@Composable +fun DiceRollerApp() { + DiceWithButtonAndImage(modifier = Modifier + .fillMaxSize() + .wrapContentSize(Alignment.Center) + ) +} + +@Composable +fun DiceWithButtonAndImage(modifier: Modifier = Modifier) { + var result by remember { mutableStateOf( 1) } + val imageResource = when(result) { + 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 + else -> R.drawable.dice_6 + } + Column(modifier = modifier, horizontalAlignment = Alignment.CenterHorizontally) { + Image(painter = painterResource(imageResource), contentDescription = result.toString()) + + Button( + onClick = { result = (1..6).random() }, + ) { + Text(text = stringResource(R.string.roll), fontSize = 24.sp) + } + } +} \ No newline at end of file diff --git a/dice_app/app/src/main/java/com/example/diceapp/ui/theme/Color.kt b/dice_app/app/src/main/java/com/example/diceapp/ui/theme/Color.kt new file mode 100644 index 0000000..148f9d2 --- /dev/null +++ b/dice_app/app/src/main/java/com/example/diceapp/ui/theme/Color.kt @@ -0,0 +1,11 @@ +package com.example.diceapp.ui.theme + +import androidx.compose.ui.graphics.Color + +val Purple80 = Color(0xFFD0BCFF) +val PurpleGrey80 = Color(0xFFCCC2DC) +val Pink80 = Color(0xFFEFB8C8) + +val Purple40 = Color(0xFF6650a4) +val PurpleGrey40 = Color(0xFF625b71) +val Pink40 = Color(0xFF7D5260) \ No newline at end of file diff --git a/dice_app/app/src/main/java/com/example/diceapp/ui/theme/Theme.kt b/dice_app/app/src/main/java/com/example/diceapp/ui/theme/Theme.kt new file mode 100644 index 0000000..84aa4c8 --- /dev/null +++ b/dice_app/app/src/main/java/com/example/diceapp/ui/theme/Theme.kt @@ -0,0 +1,58 @@ +package com.example.diceapp.ui.theme + +import android.app.Activity +import android.os.Build +import androidx.compose.foundation.isSystemInDarkTheme +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.darkColorScheme +import androidx.compose.material3.dynamicDarkColorScheme +import androidx.compose.material3.dynamicLightColorScheme +import androidx.compose.material3.lightColorScheme +import androidx.compose.runtime.Composable +import androidx.compose.ui.platform.LocalContext + +private val DarkColorScheme = darkColorScheme( + primary = Purple80, + secondary = PurpleGrey80, + tertiary = Pink80 +) + +private val LightColorScheme = lightColorScheme( + primary = Purple40, + secondary = PurpleGrey40, + tertiary = Pink40 + + /* Other default colors to override + background = Color(0xFFFFFBFE), + surface = Color(0xFFFFFBFE), + onPrimary = Color.White, + onSecondary = Color.White, + onTertiary = Color.White, + onBackground = Color(0xFF1C1B1F), + onSurface = Color(0xFF1C1B1F), + */ +) + +@Composable +fun DiceAppTheme( + darkTheme: Boolean = isSystemInDarkTheme(), + // Dynamic color is available on Android 12+ + dynamicColor: Boolean = true, + content: @Composable () -> Unit +) { + val colorScheme = when { + dynamicColor && Build.VERSION.SDK_INT >= Build.VERSION_CODES.S -> { + val context = LocalContext.current + if (darkTheme) dynamicDarkColorScheme(context) else dynamicLightColorScheme(context) + } + + darkTheme -> DarkColorScheme + else -> LightColorScheme + } + + MaterialTheme( + colorScheme = colorScheme, + typography = Typography, + content = content + ) +} \ No newline at end of file diff --git a/dice_app/app/src/main/java/com/example/diceapp/ui/theme/Type.kt b/dice_app/app/src/main/java/com/example/diceapp/ui/theme/Type.kt new file mode 100644 index 0000000..03ea745 --- /dev/null +++ b/dice_app/app/src/main/java/com/example/diceapp/ui/theme/Type.kt @@ -0,0 +1,34 @@ +package com.example.diceapp.ui.theme + +import androidx.compose.material3.Typography +import androidx.compose.ui.text.TextStyle +import androidx.compose.ui.text.font.FontFamily +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.unit.sp + +// Set of Material typography styles to start with +val Typography = Typography( + bodyLarge = TextStyle( + fontFamily = FontFamily.Default, + fontWeight = FontWeight.Normal, + fontSize = 16.sp, + lineHeight = 24.sp, + letterSpacing = 0.5.sp + ) + /* Other default text styles to override + titleLarge = TextStyle( + fontFamily = FontFamily.Default, + fontWeight = FontWeight.Normal, + fontSize = 22.sp, + lineHeight = 28.sp, + letterSpacing = 0.sp + ), + labelSmall = TextStyle( + fontFamily = FontFamily.Default, + fontWeight = FontWeight.Medium, + fontSize = 11.sp, + lineHeight = 16.sp, + letterSpacing = 0.5.sp + ) + */ +) \ No newline at end of file diff --git a/dice_app/app/src/main/res/drawable/dice_1.xml b/dice_app/app/src/main/res/drawable/dice_1.xml new file mode 100644 index 0000000..2bd436b --- /dev/null +++ b/dice_app/app/src/main/res/drawable/dice_1.xml @@ -0,0 +1,66 @@ + + + + + + + + + + + + + + + + + + diff --git a/dice_app/app/src/main/res/drawable/dice_2.xml b/dice_app/app/src/main/res/drawable/dice_2.xml new file mode 100644 index 0000000..30fb235 --- /dev/null +++ b/dice_app/app/src/main/res/drawable/dice_2.xml @@ -0,0 +1,66 @@ + + + + + + + + + + + + + + + + + + diff --git a/dice_app/app/src/main/res/drawable/dice_3.xml b/dice_app/app/src/main/res/drawable/dice_3.xml new file mode 100644 index 0000000..20bf472 --- /dev/null +++ b/dice_app/app/src/main/res/drawable/dice_3.xml @@ -0,0 +1,66 @@ + + + + + + + + + + + + + + + + + + diff --git a/dice_app/app/src/main/res/drawable/dice_4.xml b/dice_app/app/src/main/res/drawable/dice_4.xml new file mode 100644 index 0000000..772737d --- /dev/null +++ b/dice_app/app/src/main/res/drawable/dice_4.xml @@ -0,0 +1,69 @@ + + + + + + + + + + + + + + + + + + + diff --git a/dice_app/app/src/main/res/drawable/dice_5.xml b/dice_app/app/src/main/res/drawable/dice_5.xml new file mode 100644 index 0000000..b1e6afe --- /dev/null +++ b/dice_app/app/src/main/res/drawable/dice_5.xml @@ -0,0 +1,75 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/dice_app/app/src/main/res/drawable/dice_6.xml b/dice_app/app/src/main/res/drawable/dice_6.xml new file mode 100644 index 0000000..484f92e --- /dev/null +++ b/dice_app/app/src/main/res/drawable/dice_6.xml @@ -0,0 +1,81 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/dice_app/app/src/main/res/drawable/ic_launcher_background.xml b/dice_app/app/src/main/res/drawable/ic_launcher_background.xml new file mode 100644 index 0000000..07d5da9 --- /dev/null +++ b/dice_app/app/src/main/res/drawable/ic_launcher_background.xml @@ -0,0 +1,170 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/dice_app/app/src/main/res/drawable/ic_launcher_foreground.xml b/dice_app/app/src/main/res/drawable/ic_launcher_foreground.xml new file mode 100644 index 0000000..2b068d1 --- /dev/null +++ b/dice_app/app/src/main/res/drawable/ic_launcher_foreground.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/dice_app/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/dice_app/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 0000000..6f3b755 --- /dev/null +++ b/dice_app/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/dice_app/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/dice_app/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml new file mode 100644 index 0000000..6f3b755 --- /dev/null +++ b/dice_app/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/dice_app/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/dice_app/app/src/main/res/mipmap-hdpi/ic_launcher.webp new file mode 100644 index 0000000..c209e78 Binary files /dev/null and b/dice_app/app/src/main/res/mipmap-hdpi/ic_launcher.webp differ diff --git a/dice_app/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/dice_app/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp new file mode 100644 index 0000000..b2dfe3d Binary files /dev/null and b/dice_app/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp differ diff --git a/dice_app/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/dice_app/app/src/main/res/mipmap-mdpi/ic_launcher.webp new file mode 100644 index 0000000..4f0f1d6 Binary files /dev/null and b/dice_app/app/src/main/res/mipmap-mdpi/ic_launcher.webp differ diff --git a/dice_app/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/dice_app/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp new file mode 100644 index 0000000..62b611d Binary files /dev/null and b/dice_app/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp differ diff --git a/dice_app/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/dice_app/app/src/main/res/mipmap-xhdpi/ic_launcher.webp new file mode 100644 index 0000000..948a307 Binary files /dev/null and b/dice_app/app/src/main/res/mipmap-xhdpi/ic_launcher.webp differ diff --git a/dice_app/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/dice_app/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp new file mode 100644 index 0000000..1b9a695 Binary files /dev/null and b/dice_app/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp differ diff --git a/dice_app/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/dice_app/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp new file mode 100644 index 0000000..28d4b77 Binary files /dev/null and b/dice_app/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp differ diff --git a/dice_app/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/dice_app/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp new file mode 100644 index 0000000..9287f50 Binary files /dev/null and b/dice_app/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp differ diff --git a/dice_app/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/dice_app/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp new file mode 100644 index 0000000..aa7d642 Binary files /dev/null and b/dice_app/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp differ diff --git a/dice_app/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/dice_app/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp new file mode 100644 index 0000000..9126ae3 Binary files /dev/null and b/dice_app/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp differ diff --git a/dice_app/app/src/main/res/values/colors.xml b/dice_app/app/src/main/res/values/colors.xml new file mode 100644 index 0000000..f8c6127 --- /dev/null +++ b/dice_app/app/src/main/res/values/colors.xml @@ -0,0 +1,10 @@ + + + #FFBB86FC + #FF6200EE + #FF3700B3 + #FF03DAC5 + #FF018786 + #FF000000 + #FFFFFFFF + \ No newline at end of file diff --git a/dice_app/app/src/main/res/values/strings.xml b/dice_app/app/src/main/res/values/strings.xml new file mode 100644 index 0000000..095c352 --- /dev/null +++ b/dice_app/app/src/main/res/values/strings.xml @@ -0,0 +1,4 @@ + + diceApp + Roll + \ No newline at end of file diff --git a/dice_app/app/src/main/res/values/themes.xml b/dice_app/app/src/main/res/values/themes.xml new file mode 100644 index 0000000..173c65e --- /dev/null +++ b/dice_app/app/src/main/res/values/themes.xml @@ -0,0 +1,5 @@ + + + +