diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..aa724b7 --- /dev/null +++ b/.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/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000..26d3352 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,3 @@ +# Default ignored files +/shelf/ +/workspace.xml diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..b86273d --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml new file mode 100644 index 0000000..b268ef3 --- /dev/null +++ b/.idea/deploymentTargetSelector.xml @@ -0,0 +1,10 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml new file mode 100644 index 0000000..7b3006b --- /dev/null +++ b/.idea/gradle.xml @@ -0,0 +1,20 @@ + + + + + + + \ No newline at end of file diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml new file mode 100644 index 0000000..fdf8d99 --- /dev/null +++ b/.idea/kotlinc.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/.idea/migrations.xml b/.idea/migrations.xml new file mode 100644 index 0000000..f8051a6 --- /dev/null +++ b/.idea/migrations.xml @@ -0,0 +1,10 @@ + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..b2c751a --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,9 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml new file mode 100644 index 0000000..16660f1 --- /dev/null +++ b/.idea/runConfigurations.xml @@ -0,0 +1,17 @@ + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..c2365ab --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/app/.gitignore b/app/.gitignore new file mode 100644 index 0000000..42afabf --- /dev/null +++ b/app/.gitignore @@ -0,0 +1 @@ +/build \ No newline at end of file diff --git a/app/build.gradle.kts b/app/build.gradle.kts new file mode 100644 index 0000000..7056353 --- /dev/null +++ b/app/build.gradle.kts @@ -0,0 +1,72 @@ +plugins { + alias(libs.plugins.android.application) + alias(libs.plugins.kotlin.android) +} + +android { + namespace = "at.ac.htlleonding.calculator" + compileSdk = 34 + + defaultConfig { + applicationId = "at.ac.htlleonding.calculator" + minSdk = 31 + targetSdk = 34 + versionCode = 1 + versionName = "1.0" + + testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" + vectorDrawables { + useSupportLibrary = true + } + } + + buildTypes { + release { + isMinifyEnabled = false + proguardFiles( + getDefaultProguardFile("proguard-android-optimize.txt"), + "proguard-rules.pro" + ) + } + } + compileOptions { + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 + } + kotlinOptions { + jvmTarget = "1.8" + } + buildFeatures { + compose = true + } + composeOptions { + kotlinCompilerExtensionVersion = "1.5.1" + } + packaging { + resources { + excludes += "/META-INF/{AL2.0,LGPL2.1}" + } + } +} + +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.ui) + implementation(libs.androidx.ui.graphics) + implementation(libs.androidx.ui.tooling.preview) + implementation(libs.androidx.material3) + testImplementation(libs.junit) + androidTestImplementation(libs.androidx.junit) + androidTestImplementation(libs.androidx.espresso.core) + androidTestImplementation(platform(libs.androidx.compose.bom)) + androidTestImplementation(libs.androidx.ui.test.junit4) + debugImplementation(libs.androidx.ui.tooling) + debugImplementation(libs.androidx.ui.test.manifest) + + // Compose dependencies + implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.4.1") +} \ No newline at end of file diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro new file mode 100644 index 0000000..481bb43 --- /dev/null +++ b/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/app/src/androidTest/java/at/ac/htlleonding/calculator/ExampleInstrumentedTest.kt b/app/src/androidTest/java/at/ac/htlleonding/calculator/ExampleInstrumentedTest.kt new file mode 100644 index 0000000..f5c2a83 --- /dev/null +++ b/app/src/androidTest/java/at/ac/htlleonding/calculator/ExampleInstrumentedTest.kt @@ -0,0 +1,24 @@ +package at.ac.htlleonding.calculator + +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("at.ac.htlleonding.calculator", appContext.packageName) + } +} \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml new file mode 100644 index 0000000..8d7bca4 --- /dev/null +++ b/app/src/main/AndroidManifest.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/java/at/ac/htlleonding/calculator/Calculator.kt b/app/src/main/java/at/ac/htlleonding/calculator/Calculator.kt new file mode 100644 index 0000000..fc1c3c0 --- /dev/null +++ b/app/src/main/java/at/ac/htlleonding/calculator/Calculator.kt @@ -0,0 +1,138 @@ +package at.ac.htlleonding.calculator + +import androidx.compose.foundation.background +import androidx.compose.foundation.horizontalScroll +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.aspectRatio +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.rememberScrollState +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.text.style.TextAlign +import androidx.compose.ui.unit.Dp +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp +import at.ac.htlleonding.calculator.ui.theme.DarkGreen +import at.ac.htlleonding.calculator.ui.theme.LightGray +import at.ac.htlleonding.calculator.ui.theme.Orange + +data class CalculatorButton( + val symbol: String, + val backgroundColor: Color, + val width: Int = 1, + val action: CalculatorAction +) + +@Composable +fun Calculator( + state: CalculatorState, + modifier: Modifier = Modifier, + buttonSpacing: Dp = 8.dp, + onAction: (CalculatorAction) -> Unit +) { + // Define button layout + val buttons = listOf( + // Row 1 + listOf( + CalculatorButton("AC", LightGray, 2, CalculatorAction.Clear), + CalculatorButton("Del", Color.Red, 1, CalculatorAction.Delete), + CalculatorButton("/", Orange, 1, CalculatorAction.Operation(CalculatorOperation.Divide)) + ), + // Row 2 + listOf(7, 8, 9).map { num -> + CalculatorButton( + num.toString(), + Color.DarkGray, + 1, + CalculatorAction.Number(num) + ) + } + CalculatorButton( + "*", + Orange, + 1, + CalculatorAction.Operation(CalculatorOperation.Multiply) + ), + // Row 3 + listOf(4, 5, 6).map { num -> + CalculatorButton( + num.toString(), + Color.DarkGray, + 1, + CalculatorAction.Number(num) + ) + } + CalculatorButton( + "-", + Orange, + 1, + CalculatorAction.Operation(CalculatorOperation.Subtract) + ), + // Row 4 + listOf(1, 2, 3).map { num -> + CalculatorButton( + num.toString(), + Color.DarkGray, + 1, + CalculatorAction.Number(num) + ) + } + CalculatorButton("+", Orange, 1, CalculatorAction.Operation(CalculatorOperation.Add)), + // Row 5 + listOf( + CalculatorButton("0", Color.DarkGray, 2, CalculatorAction.Number(0)), + CalculatorButton(".", Color.DarkGray, 1, CalculatorAction.Decimal), + CalculatorButton("=", DarkGreen, 1, CalculatorAction.Calculate) + ) + ) + + Box(modifier = modifier) { + Column( + modifier = Modifier + .fillMaxWidth() + .align(Alignment.BottomCenter), + verticalArrangement = Arrangement.spacedBy(buttonSpacing) + ) { + // Display + Row( + modifier = Modifier + .fillMaxWidth() + .padding(vertical = 32.dp) + .horizontalScroll(rememberScrollState()), // Add horizontal scroll + horizontalArrangement = Arrangement.End // Align content to the end + ) { + Text( + text = state.number1 + (state.operation?.symbol ?: "") + state.number2, + textAlign = TextAlign.End, + fontWeight = FontWeight.Light, + fontSize = 80.sp, + color = Color.White, + ) + } + + // Button grid + buttons.forEach { rowButtons -> + Row( + modifier = Modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.spacedBy(buttonSpacing) + ) { + rowButtons.forEach { button -> + CalculatorButton( + symbol = button.symbol, + modifier = Modifier + .background(button.backgroundColor) + .aspectRatio(ratio = button.width.toFloat()) + .weight(button.width.toFloat()), + onClick = { onAction(button.action) } + ) + } + } + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/at/ac/htlleonding/calculator/CalculatorAction.kt b/app/src/main/java/at/ac/htlleonding/calculator/CalculatorAction.kt new file mode 100644 index 0000000..102b0f6 --- /dev/null +++ b/app/src/main/java/at/ac/htlleonding/calculator/CalculatorAction.kt @@ -0,0 +1,10 @@ +package at.ac.htlleonding.calculator + +sealed class CalculatorAction { + data class Number(val number: Int) : CalculatorAction() + data object Clear : CalculatorAction() + data object Delete : CalculatorAction() + data object Decimal : CalculatorAction() + data object Calculate : CalculatorAction() + data class Operation(val operation: CalculatorOperation) : CalculatorAction() +} \ No newline at end of file diff --git a/app/src/main/java/at/ac/htlleonding/calculator/CalculatorButton.kt b/app/src/main/java/at/ac/htlleonding/calculator/CalculatorButton.kt new file mode 100644 index 0000000..f2102ba --- /dev/null +++ b/app/src/main/java/at/ac/htlleonding/calculator/CalculatorButton.kt @@ -0,0 +1,33 @@ +package at.ac.htlleonding.calculator + +import androidx.compose.foundation.clickable +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.clip +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.unit.sp + +@Composable +fun CalculatorButton( + symbol: String, + modifier: Modifier = Modifier, + onClick: () -> Unit +) { + Box( + contentAlignment = Alignment.Center, + modifier = Modifier + .clip(RoundedCornerShape(25)) + .clickable { onClick() } + .then(modifier) + ) { + Text( + text = symbol, + fontSize = 36.sp, + color = Color.White + ) + } +} \ No newline at end of file diff --git a/app/src/main/java/at/ac/htlleonding/calculator/CalculatorOperation.kt b/app/src/main/java/at/ac/htlleonding/calculator/CalculatorOperation.kt new file mode 100644 index 0000000..6258608 --- /dev/null +++ b/app/src/main/java/at/ac/htlleonding/calculator/CalculatorOperation.kt @@ -0,0 +1,8 @@ +package at.ac.htlleonding.calculator + +sealed class CalculatorOperation(val symbol: String) { + data object Add : CalculatorOperation("+") + data object Subtract : CalculatorOperation("-") + data object Multiply : CalculatorOperation("*") + data object Divide : CalculatorOperation("/") +} \ No newline at end of file diff --git a/app/src/main/java/at/ac/htlleonding/calculator/CalculatorState.kt b/app/src/main/java/at/ac/htlleonding/calculator/CalculatorState.kt new file mode 100644 index 0000000..63d22a2 --- /dev/null +++ b/app/src/main/java/at/ac/htlleonding/calculator/CalculatorState.kt @@ -0,0 +1,7 @@ +package at.ac.htlleonding.calculator + +data class CalculatorState( + val number1: String = "", + val number2: String = "", + val operation: CalculatorOperation? = null +) diff --git a/app/src/main/java/at/ac/htlleonding/calculator/CalculatorViewModel.kt b/app/src/main/java/at/ac/htlleonding/calculator/CalculatorViewModel.kt new file mode 100644 index 0000000..dbd0fe3 --- /dev/null +++ b/app/src/main/java/at/ac/htlleonding/calculator/CalculatorViewModel.kt @@ -0,0 +1,112 @@ +package at.ac.htlleonding.calculator + +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.setValue +import androidx.lifecycle.ViewModel + +class CalculatorViewModel : ViewModel() { + var state by mutableStateOf(CalculatorState()) + private set + + fun onAction(action: CalculatorAction) { + when (action) { + is CalculatorAction.Number -> enterNumber(action.number) + is CalculatorAction.Decimal -> enterDecimal() + is CalculatorAction.Clear -> state = CalculatorState() + is CalculatorAction.Operation -> enterOperation(action.operation) + is CalculatorAction.Calculate -> performCalculation() + is CalculatorAction.Delete -> performDeletion() + } + } + + private fun performCalculation() { + val number1 = state.number1.toDoubleOrNull() + val number2 = state.number2.toDoubleOrNull() + if (number1 == null || number2 == null) { + return + } + + val result = when (state.operation) { + is CalculatorOperation.Add -> number1 + number2 + is CalculatorOperation.Subtract -> number1 - number2 + is CalculatorOperation.Multiply -> number1 * number2 + is CalculatorOperation.Divide -> if (number2 != 0.0) number1 / number2 else Double.POSITIVE_INFINITY + null -> return + } + + // Format the result to handle scientific notation and trailing zeros + val formattedResult = when { + result.isInfinite() -> "Error" + result.isNaN() -> "Error" + result == result.toLong().toDouble() -> result.toLong().toString() + else -> "%.8f".format(result).trimEnd('0').trimEnd('.') + } + + state = state.copy( + number1 = formattedResult.take(MAX_NUM_LENGTH), + number2 = "", + operation = null + ) + } + + private fun enterDecimal() { + if (state.operation == null && !state.number1.contains(".")) { + state = state.copy( + number1 = if (state.number1.isBlank()) "0." else state.number1 + "." + ) + } else if (state.operation != null && !state.number2.contains(".")) { + state = state.copy( + number2 = if (state.number2.isBlank()) "0." else state.number2 + "." + ) + } + } + + private fun performDeletion() { + when { + state.number2.isNotBlank() -> state = state.copy( + number2 = state.number2.dropLast(1) + ) + + state.operation != null -> state = state.copy( + operation = null + ) + + state.number1.isNotBlank() -> state = state.copy( + number1 = state.number1.dropLast(1) + ) + } + } + + private fun enterNumber(number: Int) { + if (state.operation == null) { + if (state.number1.length >= MAX_NUM_LENGTH) { + return + } + state = state.copy( + number1 = state.number1 + number + ) + return + } + if (state.number2.length >= MAX_NUM_LENGTH) { + return + } + state = state.copy( + number2 = state.number2 + number + ) + } + + private fun enterOperation(operation: CalculatorOperation) { + if (state.number1.isNotBlank()) { + // If there's a pending calculation, perform it first + if (state.number2.isNotBlank()) { + performCalculation() + } + state = state.copy(operation = operation) + } + } + + companion object { + private const val MAX_NUM_LENGTH = 8 + } +} \ No newline at end of file diff --git a/app/src/main/java/at/ac/htlleonding/calculator/MainActivity.kt b/app/src/main/java/at/ac/htlleonding/calculator/MainActivity.kt new file mode 100644 index 0000000..491e753 --- /dev/null +++ b/app/src/main/java/at/ac/htlleonding/calculator/MainActivity.kt @@ -0,0 +1,37 @@ +package at.ac.htlleonding.calculator + +import android.os.Bundle +import androidx.activity.ComponentActivity +import androidx.activity.compose.setContent +import androidx.activity.enableEdgeToEdge +import androidx.compose.foundation.background +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.padding +import androidx.compose.ui.Modifier +import androidx.compose.ui.unit.dp +import androidx.lifecycle.viewmodel.compose.viewModel +import at.ac.htlleonding.calculator.ui.theme.CalculatorTheme +import at.ac.htlleonding.calculator.ui.theme.MediumGray + +class MainActivity : ComponentActivity() { + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + enableEdgeToEdge() + setContent { + CalculatorTheme { + val viewModel = viewModel() + val state = viewModel.state + val buttonSpacing = 8.dp + Calculator( + state = state, + onAction = viewModel::onAction, + buttonSpacing = buttonSpacing, + modifier = Modifier + .fillMaxSize() + .background(MediumGray) + .padding(16.dp) + ) + } + } + } +} diff --git a/app/src/main/java/at/ac/htlleonding/calculator/ui/theme/Color.kt b/app/src/main/java/at/ac/htlleonding/calculator/ui/theme/Color.kt new file mode 100644 index 0000000..4ea0404 --- /dev/null +++ b/app/src/main/java/at/ac/htlleonding/calculator/ui/theme/Color.kt @@ -0,0 +1,17 @@ +package at.ac.htlleonding.calculator.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) + +val MediumGray = Color(0xFF222222) +val LightGray = Color(0xFF818181) +val Orange = Color(0xFFFF9800) + +val DarkGreen = Color(0xFF006400) diff --git a/app/src/main/java/at/ac/htlleonding/calculator/ui/theme/Theme.kt b/app/src/main/java/at/ac/htlleonding/calculator/ui/theme/Theme.kt new file mode 100644 index 0000000..7d4baec --- /dev/null +++ b/app/src/main/java/at/ac/htlleonding/calculator/ui/theme/Theme.kt @@ -0,0 +1,47 @@ +package at.ac.htlleonding.calculator.ui.theme + +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 +) + +@Composable +fun CalculatorTheme( + 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/app/src/main/java/at/ac/htlleonding/calculator/ui/theme/Type.kt b/app/src/main/java/at/ac/htlleonding/calculator/ui/theme/Type.kt new file mode 100644 index 0000000..d98aa02 --- /dev/null +++ b/app/src/main/java/at/ac/htlleonding/calculator/ui/theme/Type.kt @@ -0,0 +1,18 @@ +package at.ac.htlleonding.calculator.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 + ) +) \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml new file mode 100644 index 0000000..07d5da9 --- /dev/null +++ b/app/src/main/res/drawable/ic_launcher_background.xml @@ -0,0 +1,170 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/drawable/ic_launcher_foreground.xml b/app/src/main/res/drawable/ic_launcher_foreground.xml new file mode 100644 index 0000000..2b068d1 --- /dev/null +++ b/app/src/main/res/drawable/ic_launcher_foreground.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi/ic_launcher.xml b/app/src/main/res/mipmap-anydpi/ic_launcher.xml new file mode 100644 index 0000000..6f3b755 --- /dev/null +++ b/app/src/main/res/mipmap-anydpi/ic_launcher.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi/ic_launcher_round.xml new file mode 100644 index 0000000..6f3b755 --- /dev/null +++ b/app/src/main/res/mipmap-anydpi/ic_launcher_round.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/app/src/main/res/mipmap-hdpi/ic_launcher.webp new file mode 100644 index 0000000..c209e78 Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher.webp differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp new file mode 100644 index 0000000..b2dfe3d Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/app/src/main/res/mipmap-mdpi/ic_launcher.webp new file mode 100644 index 0000000..4f0f1d6 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher.webp differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp new file mode 100644 index 0000000..62b611d Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp new file mode 100644 index 0000000..948a307 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp new file mode 100644 index 0000000..1b9a695 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp new file mode 100644 index 0000000..28d4b77 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp new file mode 100644 index 0000000..9287f50 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp new file mode 100644 index 0000000..aa7d642 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp new file mode 100644 index 0000000..9126ae3 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp differ diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml new file mode 100644 index 0000000..f8c6127 --- /dev/null +++ b/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/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml new file mode 100644 index 0000000..665ca8d --- /dev/null +++ b/app/src/main/res/values/strings.xml @@ -0,0 +1,3 @@ + + Calculator + \ No newline at end of file diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml new file mode 100644 index 0000000..f244678 --- /dev/null +++ b/app/src/main/res/values/themes.xml @@ -0,0 +1,5 @@ + + + +