diff --git a/E04SumCalculator/.gitignore b/E04SumCalculator/.gitignore new file mode 100644 index 0000000000000000000000000000000000000000..aa724b77071afcbd9bb398053e05adaf7ac9405a --- /dev/null +++ b/E04SumCalculator/.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/E04SumCalculator/.idea/.gitignore b/E04SumCalculator/.idea/.gitignore new file mode 100644 index 0000000000000000000000000000000000000000..26d33521af10bcc7fd8cea344038eaaeb78d0ef5 --- /dev/null +++ b/E04SumCalculator/.idea/.gitignore @@ -0,0 +1,3 @@ +# Default ignored files +/shelf/ +/workspace.xml diff --git a/E04SumCalculator/.idea/.name b/E04SumCalculator/.idea/.name new file mode 100644 index 0000000000000000000000000000000000000000..3491d4b5c165a83d57d70c6095cc2c7b092f745e --- /dev/null +++ b/E04SumCalculator/.idea/.name @@ -0,0 +1 @@ +E04 Sum Calculator \ No newline at end of file diff --git a/E04SumCalculator/.idea/compiler.xml b/E04SumCalculator/.idea/compiler.xml new file mode 100644 index 0000000000000000000000000000000000000000..b589d56e9f285d8cfdc6c270853a5d439021a278 --- /dev/null +++ b/E04SumCalculator/.idea/compiler.xml @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project version="4"> + <component name="CompilerConfiguration"> + <bytecodeTargetLevel target="17" /> + </component> +</project> \ No newline at end of file diff --git a/E04SumCalculator/.idea/deploymentTargetDropDown.xml b/E04SumCalculator/.idea/deploymentTargetDropDown.xml new file mode 100644 index 0000000000000000000000000000000000000000..0c0c3383890637b4721df1f49d0b229e55c0f361 --- /dev/null +++ b/E04SumCalculator/.idea/deploymentTargetDropDown.xml @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project version="4"> + <component name="deploymentTargetDropDown"> + <value> + <entry key="app"> + <State /> + </entry> + </value> + </component> +</project> \ No newline at end of file diff --git a/E04SumCalculator/.idea/gradle.xml b/E04SumCalculator/.idea/gradle.xml new file mode 100644 index 0000000000000000000000000000000000000000..0897082f7512e48e89310db81b5455d997417505 --- /dev/null +++ b/E04SumCalculator/.idea/gradle.xml @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project version="4"> + <component name="GradleMigrationSettings" migrationVersion="1" /> + <component name="GradleSettings"> + <option name="linkedExternalProjectsSettings"> + <GradleProjectSettings> + <option name="externalProjectPath" value="$PROJECT_DIR$" /> + <option name="gradleJvm" value="#GRADLE_LOCAL_JAVA_HOME" /> + <option name="modules"> + <set> + <option value="$PROJECT_DIR$" /> + <option value="$PROJECT_DIR$/app" /> + </set> + </option> + <option name="resolveExternalAnnotations" value="false" /> + </GradleProjectSettings> + </option> + </component> +</project> \ No newline at end of file diff --git a/E04SumCalculator/.idea/kotlinc.xml b/E04SumCalculator/.idea/kotlinc.xml new file mode 100644 index 0000000000000000000000000000000000000000..fdf8d994a6599dd8b64a341af14c598069a10022 --- /dev/null +++ b/E04SumCalculator/.idea/kotlinc.xml @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project version="4"> + <component name="KotlinJpsPluginSettings"> + <option name="version" value="1.9.0" /> + </component> +</project> \ No newline at end of file diff --git a/E04SumCalculator/.idea/migrations.xml b/E04SumCalculator/.idea/migrations.xml new file mode 100644 index 0000000000000000000000000000000000000000..f8051a6f973e69a86e6f07f1a1c87f17a31c7235 --- /dev/null +++ b/E04SumCalculator/.idea/migrations.xml @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project version="4"> + <component name="ProjectMigrations"> + <option name="MigrateToGradleLocalJavaHome"> + <set> + <option value="$PROJECT_DIR$" /> + </set> + </option> + </component> +</project> \ No newline at end of file diff --git a/E04SumCalculator/.idea/misc.xml b/E04SumCalculator/.idea/misc.xml new file mode 100644 index 0000000000000000000000000000000000000000..8978d23db569daa721cb26dde7923f4c673d1fc9 --- /dev/null +++ b/E04SumCalculator/.idea/misc.xml @@ -0,0 +1,9 @@ +<project version="4"> + <component name="ExternalStorageConfigurationManager" enabled="true" /> + <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="jbr-17" project-jdk-type="JavaSDK"> + <output url="file://$PROJECT_DIR$/build/classes" /> + </component> + <component name="ProjectType"> + <option name="id" value="Android" /> + </component> +</project> \ No newline at end of file diff --git a/E04SumCalculator/.idea/vcs.xml b/E04SumCalculator/.idea/vcs.xml new file mode 100644 index 0000000000000000000000000000000000000000..6c0b8635858dc7ad44b93df54b762707ce49eefc --- /dev/null +++ b/E04SumCalculator/.idea/vcs.xml @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project version="4"> + <component name="VcsDirectoryMappings"> + <mapping directory="$PROJECT_DIR$/.." vcs="Git" /> + </component> +</project> \ No newline at end of file diff --git a/E04SumCalculator/app/.gitignore b/E04SumCalculator/app/.gitignore new file mode 100644 index 0000000000000000000000000000000000000000..42afabfd2abebf31384ca7797186a27a4b7dbee8 --- /dev/null +++ b/E04SumCalculator/app/.gitignore @@ -0,0 +1 @@ +/build \ No newline at end of file diff --git a/E04SumCalculator/app/build.gradle.kts b/E04SumCalculator/app/build.gradle.kts new file mode 100644 index 0000000000000000000000000000000000000000..bdb453ff0ca4056ea68d65f2fbe7f371a5e46982 --- /dev/null +++ b/E04SumCalculator/app/build.gradle.kts @@ -0,0 +1,75 @@ +plugins { + id("com.android.application") + id("org.jetbrains.kotlin.android") +} + +android { + namespace = "com.example.e04sumcalculator" + compileSdk = 34 + + defaultConfig { + applicationId = "com.example.e04sumcalculator" + minSdk = 30 + 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("androidx.core:core-ktx:1.12.0") + implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.6.2") + implementation("androidx.activity:activity-compose:1.8.1") + implementation(platform("androidx.compose:compose-bom:2023.08.00")) + implementation("androidx.compose.ui:ui") + implementation("androidx.compose.ui:ui-graphics") + implementation("androidx.compose.ui:ui-tooling-preview") + implementation("androidx.compose.material3:material3") + implementation("androidx.compose.material3:material3-window-size-class") + testImplementation("junit:junit:4.13.2") + androidTestImplementation("androidx.test.ext:junit:1.1.5") + androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1") + androidTestImplementation(platform("androidx.compose:compose-bom:2023.08.00")) + androidTestImplementation("androidx.compose.ui:ui-test-junit4") + debugImplementation("androidx.compose.ui:ui-tooling") + debugImplementation("androidx.compose.ui:ui-test-manifest") + + // extra dependencies + implementation("androidx.lifecycle:lifecycle-viewmodel-compose:{latest_version}") + + // Third party libraries + implementation("com.notkamui.libs:keval:0.9.0") +} \ No newline at end of file diff --git a/E04SumCalculator/app/proguard-rules.pro b/E04SumCalculator/app/proguard-rules.pro new file mode 100644 index 0000000000000000000000000000000000000000..481bb434814107eb79d7a30b676d344b0df2f8ce --- /dev/null +++ b/E04SumCalculator/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/E04SumCalculator/app/src/androidTest/java/com/example/e04sumcalculator/ExampleInstrumentedTest.kt b/E04SumCalculator/app/src/androidTest/java/com/example/e04sumcalculator/ExampleInstrumentedTest.kt new file mode 100644 index 0000000000000000000000000000000000000000..8164265c8fed085700612b5ec6171bbd42a59090 --- /dev/null +++ b/E04SumCalculator/app/src/androidTest/java/com/example/e04sumcalculator/ExampleInstrumentedTest.kt @@ -0,0 +1,24 @@ +package com.example.e04sumcalculator + +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.e04sumcalculator", appContext.packageName) + } +} \ No newline at end of file diff --git a/E04SumCalculator/app/src/main/AndroidManifest.xml b/E04SumCalculator/app/src/main/AndroidManifest.xml new file mode 100644 index 0000000000000000000000000000000000000000..835294c2f9217949960621a3e70a6971f46ae8ab --- /dev/null +++ b/E04SumCalculator/app/src/main/AndroidManifest.xml @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="utf-8"?> +<manifest xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:tools="http://schemas.android.com/tools"> + + <application + android:allowBackup="true" + android:dataExtractionRules="@xml/data_extraction_rules" + android:fullBackupContent="@xml/backup_rules" + android:icon="@mipmap/ic_launcher" + android:label="@string/app_name" + android:roundIcon="@mipmap/ic_launcher_round" + android:supportsRtl="true" + android:theme="@style/Theme.E04SumCalculator" + tools:targetApi="31"> + <activity + android:name=".MainActivity" + android:exported="true" + android:label="@string/app_name" + android:theme="@style/Theme.E04SumCalculator"> + <intent-filter> + <action android:name="android.intent.action.MAIN" /> + + <category android:name="android.intent.category.LAUNCHER" /> + </intent-filter> + </activity> + </application> + +</manifest> \ No newline at end of file diff --git a/E04SumCalculator/app/src/main/java/com/example/e04sumcalculator/CalculatorViewModel.kt b/E04SumCalculator/app/src/main/java/com/example/e04sumcalculator/CalculatorViewModel.kt new file mode 100644 index 0000000000000000000000000000000000000000..19a026eaa388fc585d96f1135ccd70e3f1020cad --- /dev/null +++ b/E04SumCalculator/app/src/main/java/com/example/e04sumcalculator/CalculatorViewModel.kt @@ -0,0 +1,113 @@ +package com.example.e04sumcalculator + + +import androidx.lifecycle.ViewModel +import com.notkamui.keval.keval +import kotlinx.coroutines.flow.MutableStateFlow +import kotlinx.coroutines.flow.StateFlow +import kotlinx.coroutines.flow.asStateFlow +import kotlinx.coroutines.flow.update +import java.math.RoundingMode + + +data class MathExpression( + val expression: String, + val result: String +) + +const val EXAMPLE_EXPRESSION = "(e*PI)^2 * ((10-2.5+3)/2)^2" + +data class CalculatorState( + val previousExpressions: MutableList<MathExpression> = mutableListOf( + MathExpression( + EXAMPLE_EXPRESSION, + EXAMPLE_EXPRESSION.keval().toBigDecimal().setScale(2, RoundingMode.HALF_EVEN).toString() + ) + ), + val currentExpression: MathExpression = MathExpression("", "") +) + +class CalculatorViewModel : ViewModel() { + private val _state = MutableStateFlow(CalculatorState()) + val state: StateFlow<CalculatorState> = _state.asStateFlow() + private val validDigits = setOf("0", "1", "2", "3", "4", "5", "6", "7", "8", "9", ".") + private val validKevalOperators = setOf("+", "-", "*", "/", "%", "^", "neg", "PI", "e", "(", ")") + private val validActions = setOf("C", "<=", "=") + + fun onKeyPressed(data: String) { + val expr = _state.value.currentExpression.expression + if (isValidDigit(data) || isValidOperator(data)) { + concatCurrentExpression(data) + } else if (isValidAction(data)) { + when (data) { + "C" -> clearCurrentExpression() + "=" -> evaluateCurrentExpression() + "<=" -> eraseLastCharacter() + } + } else { + println("Have no idea what you are doing.") + } + } + + private fun evaluateCurrentExpression() { + val expr = _state.value.currentExpression.expression + if (expr.isEmpty()) return + var exprRes = "Error" + try { + exprRes = expr + .keval() + .toBigDecimal() + .setScale(2, RoundingMode.HALF_EVEN) + .toString() + } catch (error: Exception) { + println("Error curred") + } + _state.update { + var prevExpressions = it.previousExpressions + prevExpressions.add(MathExpression(expr, exprRes)) + CalculatorState( + previousExpressions = prevExpressions, + currentExpression = MathExpression("", "") + ) + } + } + + private fun eraseLastCharacter() { + val expr = state.value.currentExpression.expression + if (expr.isNotEmpty()) { + _state.update { + it.copy(currentExpression = MathExpression(expr.dropLast(1), "")) + } + } else if (_state.value.previousExpressions.size > 0) { + _state.update { + var prevExpressions = it.previousExpressions + var lastExpr = prevExpressions.removeLast() + it.copy(previousExpressions = prevExpressions, currentExpression = lastExpr) + } + } + } + + private fun clearCurrentExpression() { + _state.update { + it.copy(currentExpression = MathExpression("", "")) + } + } + + private fun concatCurrentExpression(str: String) { + _state.update { + it.copy(currentExpression = MathExpression(it.currentExpression.expression + str, "")) + } + } + + private fun isValidDigit(str: String): Boolean { + return validDigits.contains(str) + } + + private fun isValidOperator(str: String): Boolean { + return validKevalOperators.contains(str) + } + + private fun isValidAction(str: String): Boolean { + return validActions.contains(str) + } +} diff --git a/E04SumCalculator/app/src/main/java/com/example/e04sumcalculator/MainActivity.kt b/E04SumCalculator/app/src/main/java/com/example/e04sumcalculator/MainActivity.kt new file mode 100644 index 0000000000000000000000000000000000000000..2105bbaf5b0a61278e59cf45e3edadc45462f56e --- /dev/null +++ b/E04SumCalculator/app/src/main/java/com/example/e04sumcalculator/MainActivity.kt @@ -0,0 +1,571 @@ +package com.example.e04sumcalculator + +import android.os.Bundle +import androidx.activity.ComponentActivity +import androidx.activity.compose.setContent +import androidx.activity.viewModels +import androidx.annotation.DrawableRes +import androidx.compose.foundation.Image +import androidx.compose.foundation.background +import androidx.compose.foundation.border +import androidx.compose.foundation.gestures.rememberScrollableState +import androidx.compose.foundation.gestures.scrollBy +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.IntrinsicSize +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.aspectRatio +import androidx.compose.foundation.layout.fillMaxHeight +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.wrapContentHeight +import androidx.compose.foundation.rememberScrollState +import androidx.compose.foundation.verticalScroll +import androidx.compose.material3.Button +import androidx.compose.material3.Divider +import androidx.compose.material3.Surface +import androidx.compose.material3.Text +import androidx.compose.material3.windowsizeclass.ExperimentalMaterial3WindowSizeClassApi +import androidx.compose.material3.windowsizeclass.WindowSizeClass +import androidx.compose.material3.windowsizeclass.WindowWidthSizeClass +import androidx.compose.material3.windowsizeclass.calculateWindowSizeClass +import androidx.compose.runtime.Composable +import androidx.compose.runtime.collectAsState +import androidx.compose.runtime.derivedStateOf +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.rememberCoroutineScope +import androidx.compose.runtime.saveable.rememberSaveable +import androidx.compose.runtime.setValue +import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.layout.ContentScale +import androidx.compose.ui.res.painterResource +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.text.style.TextAlign +import androidx.compose.ui.tooling.preview.Preview +import androidx.compose.ui.unit.dp +import androidx.lifecycle.viewmodel.compose.viewModel +import com.example.e04sumcalculator.ui.theme.E04SumCalculatorTheme +import com.notkamui.keval.keval +import kotlinx.coroutines.coroutineScope +import kotlinx.coroutines.currentCoroutineContext +import kotlinx.coroutines.launch +import java.math.RoundingMode +import kotlin.coroutines.CoroutineContext + + +class MainActivity : ComponentActivity() { + @OptIn(ExperimentalMaterial3WindowSizeClassApi::class) + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + + setContent { + E04SumCalculatorTheme { + val windowSize = calculateWindowSizeClass(this) + val calcModel: CalculatorViewModel = viewModel() + CalculatorApp(windowSize, calcModel) + } + } + } + + override fun onDestroy() { + super.onDestroy() + println("App is closing") + } +} + + +@Composable +fun CalculatorApp(windowSize: WindowSizeClass, calcViewModel: CalculatorViewModel = viewModel()) { + when (windowSize.widthSizeClass) { + WindowWidthSizeClass.Compact -> { + CalculatorPortrait(calcViewModel) + } +// WindowWidthSizeClass.Medium -> {} +// WindowWidthSizeClass.Expanded -> {} + else -> { + CalculatorLandscape(calcViewModel) + } + } +} + +@Composable +fun CalculatorPortrait( + calcViewModel: CalculatorViewModel = viewModel(), + modifier: Modifier = Modifier +) { + val state by calcViewModel.state.collectAsState() + val scrollState = rememberScrollState() + val scope = rememberCoroutineScope() + + Column( + modifier = Modifier + .fillMaxHeight() + .then(modifier) + ) { + Banner(imageSrc = R.drawable.math, modifier = Modifier.fillMaxHeight(1f)) + + Column( + Modifier.weight(1f), + verticalArrangement = Arrangement.Bottom + ) { + // Expressions + Column( + modifier = Modifier + .weight(1f) + .verticalScroll(scrollState), + verticalArrangement = Arrangement.Bottom + ) { + // Show previous expressions + for (expression in state.previousExpressions) { + Column(modifier = Modifier.fillMaxWidth()) { + Text( + text = "${expression.expression} = ${expression.result}", + textAlign = TextAlign.End, + modifier = Modifier + .fillMaxWidth() + .padding(16.dp, 8.dp) + ) + Divider(thickness = 1.dp, color = Color.LightGray) + } + } + } + + // Show current expression + Column(modifier = Modifier.fillMaxWidth()) { + Text( + // text = "${expression.expression} = ${expression.result}", + text = state.currentExpression.expression, + textAlign = TextAlign.End, + modifier = Modifier + .fillMaxWidth() + .padding(16.dp, 8.dp) + ) + Divider(thickness = 1.dp, color = Color.Gray) + } + + // Keys + Column( + verticalArrangement = Arrangement.Bottom, + modifier = Modifier + .wrapContentHeight() + .padding(16.dp, 8.dp) + ) { + Row( + modifier = Modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.spacedBy(8.dp) + ) { + Button( + onClick = { calcViewModel.onKeyPressed("7") }, + modifier = Modifier.weight(1f) + ) { + Text("7") + } + Button( + onClick = { calcViewModel.onKeyPressed("8") }, + modifier = Modifier.weight(1f) + ) { + Text("8") + } + Button( + onClick = { calcViewModel.onKeyPressed("9") }, + modifier = Modifier.weight(1f) + ) { + Text("9") + } + Button( + onClick = { calcViewModel.onKeyPressed("*") }, + modifier = Modifier.weight(1f) + ) { + Text("*") + } + } + Row( + modifier = Modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.spacedBy(8.dp) + ) { + Button( + onClick = { calcViewModel.onKeyPressed("4") }, + modifier = Modifier.weight(1f) + ) { + Text("4") + } + Button( + onClick = { calcViewModel.onKeyPressed("5") }, + modifier = Modifier.weight(1f) + ) { + Text("5") + } + Button( + onClick = { calcViewModel.onKeyPressed("6") }, + modifier = Modifier.weight(1f) + ) { + Text("6") + } + Button( + onClick = { calcViewModel.onKeyPressed("-") }, + modifier = Modifier.weight(1f) + ) { + Text("-") + } + } + Row( + modifier = Modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.spacedBy(8.dp) + ) { + Button( + onClick = { calcViewModel.onKeyPressed("1") }, + modifier = Modifier.weight(1f) + ) { + Text("1") + } + Button( + onClick = { calcViewModel.onKeyPressed("2") }, + modifier = Modifier.weight(1f) + ) { + Text("2") + } + Button( + onClick = { calcViewModel.onKeyPressed("3") }, + modifier = Modifier.weight(1f) + ) { + Text("3") + } + Button( + onClick = { calcViewModel.onKeyPressed("+") }, + modifier = Modifier.weight(1f) + ) { + Text("+") + } + } + Row( + modifier = Modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.spacedBy(8.dp) + ) { + Row(modifier = Modifier.weight(1f)) { + Button( + modifier = Modifier.weight(1f), + onClick = { calcViewModel.onKeyPressed("0") }) { + Text("0") + } + } + Row( + modifier = Modifier.weight(1f), + horizontalArrangement = Arrangement.spacedBy(8.dp) + ) { + Button( + onClick = { calcViewModel.onKeyPressed("C") }, + modifier = Modifier.weight(1f) + ) { + Text("C") + } + Button( + onClick = { + calcViewModel.onKeyPressed("=") + scope.launch { + while (scrollState.canScrollForward) { + scrollState.scrollBy(20f) + } + } + }, + modifier = Modifier.weight(1f) + ) { + Text("=") + } + } + } + } + } + + } +} + +@Composable +fun CalculatorLandscape( + calcViewModel: CalculatorViewModel = viewModel(), + modifier: Modifier = Modifier +) { + val state by calcViewModel.state.collectAsState() + val scrollState = rememberScrollState() + val scope = rememberCoroutineScope() + + Column( + modifier = Modifier + .fillMaxHeight() + .then(modifier) + ) { + Column( + Modifier.weight(1f), + verticalArrangement = Arrangement.Bottom + ) { + // Expressions + Column( + modifier = Modifier + .weight(1f) + .verticalScroll(scrollState), + verticalArrangement = Arrangement.Bottom + ) { + // Show previous expressions + for (expression in state.previousExpressions) { + Column(modifier = Modifier.fillMaxWidth()) { + Text( + text = "${expression.expression} = ${expression.result}", + textAlign = TextAlign.End, + modifier = Modifier + .fillMaxWidth() + .padding(16.dp, 8.dp) + ) + Divider(thickness = 1.dp, color = Color.LightGray) + } + } + } + + // Show current expression + Column(modifier = Modifier.fillMaxWidth()) { + Text( + text = state.currentExpression.expression, + textAlign = TextAlign.End, + modifier = Modifier + .fillMaxWidth() + .padding(16.dp, 8.dp) + ) + Divider(thickness = 1.dp, color = Color.Gray) + } + + // Keys + Column( + verticalArrangement = Arrangement.Bottom, + modifier = Modifier + .wrapContentHeight() + .padding(16.dp, 8.dp) + ) { + Row( + modifier = Modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.spacedBy(8.dp) + ) { + Button( + onClick = { calcViewModel.onKeyPressed("(") }, + modifier = Modifier.weight(1f) + ) { + Text("(") + } + Button( + onClick = { calcViewModel.onKeyPressed(")") }, + modifier = Modifier.weight(1f) + ) { + Text(")") + } + Button( + onClick = { calcViewModel.onKeyPressed("<=") }, + modifier = Modifier.weight(1f) + ) { + Text("<=") + } + Button( + onClick = { calcViewModel.onKeyPressed("7") }, + modifier = Modifier.weight(1f) + ) { + Text("7") + } + Button( + onClick = { calcViewModel.onKeyPressed("8") }, + modifier = Modifier.weight(1f) + ) { + Text("8") + } + Button( + onClick = { calcViewModel.onKeyPressed("9") }, + modifier = Modifier.weight(1f) + ) { + Text("9") + } + Button( + onClick = { calcViewModel.onKeyPressed("*") }, + modifier = Modifier.weight(1f) + ) { + Text("*") + } + } + Row( + modifier = Modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.spacedBy(8.dp) + ) { + + Button( + onClick = { calcViewModel.onKeyPressed("SIN") }, + modifier = Modifier.weight(1f) + ) { + Text("SIN") + } + Button( + onClick = { calcViewModel.onKeyPressed("COS") }, + modifier = Modifier.weight(1f) + ) { + Text("COS") + } + Button( + onClick = { calcViewModel.onKeyPressed("e") }, + modifier = Modifier.weight(1f) + ) { + Text("e") + } + Button( + onClick = { calcViewModel.onKeyPressed("4") }, + modifier = Modifier.weight(1f) + ) { + Text("4") + } + Button( + onClick = { calcViewModel.onKeyPressed("5") }, + modifier = Modifier.weight(1f) + ) { + Text("5") + } + Button( + onClick = { calcViewModel.onKeyPressed("6") }, + modifier = Modifier.weight(1f) + ) { + Text("6") + } + Button( + onClick = { calcViewModel.onKeyPressed("-") }, + modifier = Modifier.weight(1f) + ) { + Text("-") + } + } + Row( + modifier = Modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.spacedBy(8.dp) + ) { + Button( + onClick = { calcViewModel.onKeyPressed("SINH") }, + modifier = Modifier.weight(1f) + ) { + Text("SINH") + } + Button( + onClick = { calcViewModel.onKeyPressed("COSH") }, + modifier = Modifier.weight(1f) + ) { + Text("COSH") + } + Button( + onClick = { calcViewModel.onKeyPressed("^") }, + modifier = Modifier.weight(1f) + ) { + Text("^") + } + Button( + onClick = { calcViewModel.onKeyPressed("1") }, + modifier = Modifier.weight(1f) + ) { + Text("1") + } + Button( + onClick = { calcViewModel.onKeyPressed("2") }, + modifier = Modifier.weight(1f) + ) { + Text("2") + } + Button( + onClick = { calcViewModel.onKeyPressed("3") }, + modifier = Modifier.weight(1f) + ) { + Text("3") + } + Button( + onClick = { calcViewModel.onKeyPressed("+") }, + modifier = Modifier.weight(1f) + ) { + Text("+") + } + } + Row( + modifier = Modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.spacedBy(8.dp) + ) { + Button( + onClick = { calcViewModel.onKeyPressed("C") }, + modifier = Modifier.weight(2f) + ) { + Text("C") + } + Button( + modifier = Modifier.weight(1f), + onClick = { calcViewModel.onKeyPressed("PI") }) { + Text("PI") + } + Button( + modifier = Modifier.weight(1f), + onClick = { calcViewModel.onKeyPressed("0") }) { + Text("0") + } + Button( + modifier = Modifier.weight(1f), + onClick = { calcViewModel.onKeyPressed(".") }) { + Text(".") + } + Button( + onClick = { calcViewModel.onKeyPressed("/") }, + modifier = Modifier.weight(1f) + ) { + Text("/") + } + Button( + onClick = { + calcViewModel.onKeyPressed("=") + scope.launch { + while (scrollState.canScrollForward) { + scrollState.scrollBy(20f) + } + } + }, + modifier = Modifier.weight(1f) + ) { + Text("=") + } + } + } + } + } +} + +@Preview(showBackground = true) +@Composable +fun CalculatorPortraitPreview() { + E04SumCalculatorTheme { + CalculatorPortrait() + } +} + +@Preview(showBackground = true, device = "spec:parent=pixel_5,orientation=landscape") +@Composable +fun CalculatorLandscapePreview() { + E04SumCalculatorTheme { + CalculatorLandscape() + } +} + +@Composable +fun Banner(@DrawableRes imageSrc: Int, modifier: Modifier = Modifier) { + Image( + painter = painterResource(id = imageSrc), + contentDescription = stringResource(R.string.banner_content_description), + contentScale = ContentScale.Crop, + modifier = Modifier + .aspectRatio(16f / 9f) + .fillMaxWidth() + .then(modifier) + ) +} + +@Preview +@Composable +fun BannerPreview() { + Banner(R.drawable.math) +} \ No newline at end of file diff --git a/E04SumCalculator/app/src/main/java/com/example/e04sumcalculator/ui/theme/Color.kt b/E04SumCalculator/app/src/main/java/com/example/e04sumcalculator/ui/theme/Color.kt new file mode 100644 index 0000000000000000000000000000000000000000..b04b5d8fbc4b4b693d8cf8227d4660785095d87e --- /dev/null +++ b/E04SumCalculator/app/src/main/java/com/example/e04sumcalculator/ui/theme/Color.kt @@ -0,0 +1,11 @@ +package com.example.e04sumcalculator.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/E04SumCalculator/app/src/main/java/com/example/e04sumcalculator/ui/theme/Theme.kt b/E04SumCalculator/app/src/main/java/com/example/e04sumcalculator/ui/theme/Theme.kt new file mode 100644 index 0000000000000000000000000000000000000000..adbf84b871962b8d5adb7374f2943fb00db7bd22 --- /dev/null +++ b/E04SumCalculator/app/src/main/java/com/example/e04sumcalculator/ui/theme/Theme.kt @@ -0,0 +1,70 @@ +package com.example.e04sumcalculator.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.runtime.SideEffect +import androidx.compose.ui.graphics.toArgb +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.platform.LocalView +import androidx.core.view.WindowCompat + +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 E04SumCalculatorTheme( + 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 + } + val view = LocalView.current + if (!view.isInEditMode) { + SideEffect { + val window = (view.context as Activity).window + window.statusBarColor = colorScheme.primary.toArgb() + WindowCompat.getInsetsController(window, view).isAppearanceLightStatusBars = darkTheme + } + } + + MaterialTheme( + colorScheme = colorScheme, + typography = Typography, + content = content + ) +} \ No newline at end of file diff --git a/E04SumCalculator/app/src/main/java/com/example/e04sumcalculator/ui/theme/Type.kt b/E04SumCalculator/app/src/main/java/com/example/e04sumcalculator/ui/theme/Type.kt new file mode 100644 index 0000000000000000000000000000000000000000..33e07f9329acb88f318c3d52f9d5d7e042d2215f --- /dev/null +++ b/E04SumCalculator/app/src/main/java/com/example/e04sumcalculator/ui/theme/Type.kt @@ -0,0 +1,34 @@ +package com.example.e04sumcalculator.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/E04SumCalculator/app/src/main/res/drawable/ic_launcher_background.xml b/E04SumCalculator/app/src/main/res/drawable/ic_launcher_background.xml new file mode 100644 index 0000000000000000000000000000000000000000..07d5da9cbf141911847041df5d7b87f0dd5ef9d4 --- /dev/null +++ b/E04SumCalculator/app/src/main/res/drawable/ic_launcher_background.xml @@ -0,0 +1,170 @@ +<?xml version="1.0" encoding="utf-8"?> +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="108dp" + android:height="108dp" + android:viewportWidth="108" + android:viewportHeight="108"> + <path + android:fillColor="#3DDC84" + android:pathData="M0,0h108v108h-108z" /> + <path + android:fillColor="#00000000" + android:pathData="M9,0L9,108" + android:strokeWidth="0.8" + android:strokeColor="#33FFFFFF" /> + <path + android:fillColor="#00000000" + android:pathData="M19,0L19,108" + android:strokeWidth="0.8" + android:strokeColor="#33FFFFFF" /> + <path + android:fillColor="#00000000" + android:pathData="M29,0L29,108" + android:strokeWidth="0.8" + android:strokeColor="#33FFFFFF" /> + <path + android:fillColor="#00000000" + android:pathData="M39,0L39,108" + android:strokeWidth="0.8" + android:strokeColor="#33FFFFFF" /> + <path + android:fillColor="#00000000" + android:pathData="M49,0L49,108" + android:strokeWidth="0.8" + android:strokeColor="#33FFFFFF" /> + <path + android:fillColor="#00000000" + android:pathData="M59,0L59,108" + android:strokeWidth="0.8" + android:strokeColor="#33FFFFFF" /> + <path + android:fillColor="#00000000" + android:pathData="M69,0L69,108" + android:strokeWidth="0.8" + android:strokeColor="#33FFFFFF" /> + <path + android:fillColor="#00000000" + android:pathData="M79,0L79,108" + android:strokeWidth="0.8" + android:strokeColor="#33FFFFFF" /> + <path + android:fillColor="#00000000" + android:pathData="M89,0L89,108" + android:strokeWidth="0.8" + android:strokeColor="#33FFFFFF" /> + <path + android:fillColor="#00000000" + android:pathData="M99,0L99,108" + android:strokeWidth="0.8" + android:strokeColor="#33FFFFFF" /> + <path + android:fillColor="#00000000" + android:pathData="M0,9L108,9" + android:strokeWidth="0.8" + android:strokeColor="#33FFFFFF" /> + <path + android:fillColor="#00000000" + android:pathData="M0,19L108,19" + android:strokeWidth="0.8" + android:strokeColor="#33FFFFFF" /> + <path + android:fillColor="#00000000" + android:pathData="M0,29L108,29" + android:strokeWidth="0.8" + android:strokeColor="#33FFFFFF" /> + <path + android:fillColor="#00000000" + android:pathData="M0,39L108,39" + android:strokeWidth="0.8" + android:strokeColor="#33FFFFFF" /> + <path + android:fillColor="#00000000" + android:pathData="M0,49L108,49" + android:strokeWidth="0.8" + android:strokeColor="#33FFFFFF" /> + <path + android:fillColor="#00000000" + android:pathData="M0,59L108,59" + android:strokeWidth="0.8" + android:strokeColor="#33FFFFFF" /> + <path + android:fillColor="#00000000" + android:pathData="M0,69L108,69" + android:strokeWidth="0.8" + android:strokeColor="#33FFFFFF" /> + <path + android:fillColor="#00000000" + android:pathData="M0,79L108,79" + android:strokeWidth="0.8" + android:strokeColor="#33FFFFFF" /> + <path + android:fillColor="#00000000" + android:pathData="M0,89L108,89" + android:strokeWidth="0.8" + android:strokeColor="#33FFFFFF" /> + <path + android:fillColor="#00000000" + android:pathData="M0,99L108,99" + android:strokeWidth="0.8" + android:strokeColor="#33FFFFFF" /> + <path + android:fillColor="#00000000" + android:pathData="M19,29L89,29" + android:strokeWidth="0.8" + android:strokeColor="#33FFFFFF" /> + <path + android:fillColor="#00000000" + android:pathData="M19,39L89,39" + android:strokeWidth="0.8" + android:strokeColor="#33FFFFFF" /> + <path + android:fillColor="#00000000" + android:pathData="M19,49L89,49" + android:strokeWidth="0.8" + android:strokeColor="#33FFFFFF" /> + <path + android:fillColor="#00000000" + android:pathData="M19,59L89,59" + android:strokeWidth="0.8" + android:strokeColor="#33FFFFFF" /> + <path + android:fillColor="#00000000" + android:pathData="M19,69L89,69" + android:strokeWidth="0.8" + android:strokeColor="#33FFFFFF" /> + <path + android:fillColor="#00000000" + android:pathData="M19,79L89,79" + android:strokeWidth="0.8" + android:strokeColor="#33FFFFFF" /> + <path + android:fillColor="#00000000" + android:pathData="M29,19L29,89" + android:strokeWidth="0.8" + android:strokeColor="#33FFFFFF" /> + <path + android:fillColor="#00000000" + android:pathData="M39,19L39,89" + android:strokeWidth="0.8" + android:strokeColor="#33FFFFFF" /> + <path + android:fillColor="#00000000" + android:pathData="M49,19L49,89" + android:strokeWidth="0.8" + android:strokeColor="#33FFFFFF" /> + <path + android:fillColor="#00000000" + android:pathData="M59,19L59,89" + android:strokeWidth="0.8" + android:strokeColor="#33FFFFFF" /> + <path + android:fillColor="#00000000" + android:pathData="M69,19L69,89" + android:strokeWidth="0.8" + android:strokeColor="#33FFFFFF" /> + <path + android:fillColor="#00000000" + android:pathData="M79,19L79,89" + android:strokeWidth="0.8" + android:strokeColor="#33FFFFFF" /> +</vector> diff --git a/E04SumCalculator/app/src/main/res/drawable/ic_launcher_foreground.xml b/E04SumCalculator/app/src/main/res/drawable/ic_launcher_foreground.xml new file mode 100644 index 0000000000000000000000000000000000000000..2b068d11462a4b96669193de13a711a3a36220a0 --- /dev/null +++ b/E04SumCalculator/app/src/main/res/drawable/ic_launcher_foreground.xml @@ -0,0 +1,30 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:aapt="http://schemas.android.com/aapt" + android:width="108dp" + android:height="108dp" + android:viewportWidth="108" + android:viewportHeight="108"> + <path android:pathData="M31,63.928c0,0 6.4,-11 12.1,-13.1c7.2,-2.6 26,-1.4 26,-1.4l38.1,38.1L107,108.928l-32,-1L31,63.928z"> + <aapt:attr name="android:fillColor"> + <gradient + android:endX="85.84757" + android:endY="92.4963" + android:startX="42.9492" + android:startY="49.59793" + android:type="linear"> + <item + android:color="#44000000" + android:offset="0.0" /> + <item + android:color="#00000000" + android:offset="1.0" /> + </gradient> + </aapt:attr> + </path> + <path + android:fillColor="#FFFFFF" + android:fillType="nonZero" + android:pathData="M65.3,45.828l3.8,-6.6c0.2,-0.4 0.1,-0.9 -0.3,-1.1c-0.4,-0.2 -0.9,-0.1 -1.1,0.3l-3.9,6.7c-6.3,-2.8 -13.4,-2.8 -19.7,0l-3.9,-6.7c-0.2,-0.4 -0.7,-0.5 -1.1,-0.3C38.8,38.328 38.7,38.828 38.9,39.228l3.8,6.6C36.2,49.428 31.7,56.028 31,63.928h46C76.3,56.028 71.8,49.428 65.3,45.828zM43.4,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2c-0.3,-0.7 -0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C45.3,56.528 44.5,57.328 43.4,57.328L43.4,57.328zM64.6,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2s-0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C66.5,56.528 65.6,57.328 64.6,57.328L64.6,57.328z" + android:strokeWidth="1" + android:strokeColor="#00000000" /> +</vector> \ No newline at end of file diff --git a/E04SumCalculator/app/src/main/res/drawable/math.jpg b/E04SumCalculator/app/src/main/res/drawable/math.jpg new file mode 100644 index 0000000000000000000000000000000000000000..6f670bf7cccac1c11a644478535a676047fb2e8a Binary files /dev/null and b/E04SumCalculator/app/src/main/res/drawable/math.jpg differ diff --git a/E04SumCalculator/app/src/main/res/mipmap-anydpi/ic_launcher.xml b/E04SumCalculator/app/src/main/res/mipmap-anydpi/ic_launcher.xml new file mode 100644 index 0000000000000000000000000000000000000000..6f3b755bf50c6b03d8714a9c6184705e6a08389f --- /dev/null +++ b/E04SumCalculator/app/src/main/res/mipmap-anydpi/ic_launcher.xml @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="utf-8"?> +<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android"> + <background android:drawable="@drawable/ic_launcher_background" /> + <foreground android:drawable="@drawable/ic_launcher_foreground" /> + <monochrome android:drawable="@drawable/ic_launcher_foreground" /> +</adaptive-icon> \ No newline at end of file diff --git a/E04SumCalculator/app/src/main/res/mipmap-anydpi/ic_launcher_round.xml b/E04SumCalculator/app/src/main/res/mipmap-anydpi/ic_launcher_round.xml new file mode 100644 index 0000000000000000000000000000000000000000..6f3b755bf50c6b03d8714a9c6184705e6a08389f --- /dev/null +++ b/E04SumCalculator/app/src/main/res/mipmap-anydpi/ic_launcher_round.xml @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="utf-8"?> +<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android"> + <background android:drawable="@drawable/ic_launcher_background" /> + <foreground android:drawable="@drawable/ic_launcher_foreground" /> + <monochrome android:drawable="@drawable/ic_launcher_foreground" /> +</adaptive-icon> \ No newline at end of file diff --git a/E04SumCalculator/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/E04SumCalculator/app/src/main/res/mipmap-hdpi/ic_launcher.webp new file mode 100644 index 0000000000000000000000000000000000000000..c209e78ecd372343283f4157dcfd918ec5165bb3 Binary files /dev/null and b/E04SumCalculator/app/src/main/res/mipmap-hdpi/ic_launcher.webp differ diff --git a/E04SumCalculator/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/E04SumCalculator/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp new file mode 100644 index 0000000000000000000000000000000000000000..b2dfe3d1ba5cf3ee31b3ecc1ced89044a1f3b7a9 Binary files /dev/null and b/E04SumCalculator/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp differ diff --git a/E04SumCalculator/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/E04SumCalculator/app/src/main/res/mipmap-mdpi/ic_launcher.webp new file mode 100644 index 0000000000000000000000000000000000000000..4f0f1d64e58ba64d180ce43ee13bf9a17835fbca Binary files /dev/null and b/E04SumCalculator/app/src/main/res/mipmap-mdpi/ic_launcher.webp differ diff --git a/E04SumCalculator/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/E04SumCalculator/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp new file mode 100644 index 0000000000000000000000000000000000000000..62b611da081676d42f6c3f78a2c91e7bcedddedb Binary files /dev/null and b/E04SumCalculator/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp differ diff --git a/E04SumCalculator/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/E04SumCalculator/app/src/main/res/mipmap-xhdpi/ic_launcher.webp new file mode 100644 index 0000000000000000000000000000000000000000..948a3070fe34c611c42c0d3ad3013a0dce358be0 Binary files /dev/null and b/E04SumCalculator/app/src/main/res/mipmap-xhdpi/ic_launcher.webp differ diff --git a/E04SumCalculator/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/E04SumCalculator/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp new file mode 100644 index 0000000000000000000000000000000000000000..1b9a6956b3acdc11f40ce2bb3f6efbd845cc243f Binary files /dev/null and b/E04SumCalculator/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp differ diff --git a/E04SumCalculator/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/E04SumCalculator/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp new file mode 100644 index 0000000000000000000000000000000000000000..28d4b77f9f036a47549d47db79c16788749dca10 Binary files /dev/null and b/E04SumCalculator/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp differ diff --git a/E04SumCalculator/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/E04SumCalculator/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp new file mode 100644 index 0000000000000000000000000000000000000000..9287f5083623b375139afb391af71cc533a7dd37 Binary files /dev/null and b/E04SumCalculator/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp differ diff --git a/E04SumCalculator/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/E04SumCalculator/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp new file mode 100644 index 0000000000000000000000000000000000000000..aa7d6427e6fa1074b79ccd52ef67ac15c5637e85 Binary files /dev/null and b/E04SumCalculator/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp differ diff --git a/E04SumCalculator/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/E04SumCalculator/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp new file mode 100644 index 0000000000000000000000000000000000000000..9126ae37cbc3587421d6889eadd1d91fbf1994d4 Binary files /dev/null and b/E04SumCalculator/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp differ diff --git a/E04SumCalculator/app/src/main/res/values/colors.xml b/E04SumCalculator/app/src/main/res/values/colors.xml new file mode 100644 index 0000000000000000000000000000000000000000..f8c6127d327620c93d2b2d00342a68e97b98a48d --- /dev/null +++ b/E04SumCalculator/app/src/main/res/values/colors.xml @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <color name="purple_200">#FFBB86FC</color> + <color name="purple_500">#FF6200EE</color> + <color name="purple_700">#FF3700B3</color> + <color name="teal_200">#FF03DAC5</color> + <color name="teal_700">#FF018786</color> + <color name="black">#FF000000</color> + <color name="white">#FFFFFFFF</color> +</resources> \ No newline at end of file diff --git a/E04SumCalculator/app/src/main/res/values/strings.xml b/E04SumCalculator/app/src/main/res/values/strings.xml new file mode 100644 index 0000000000000000000000000000000000000000..1aa6446a5a797ab9afac4c10d01eef2923370db3 --- /dev/null +++ b/E04SumCalculator/app/src/main/res/values/strings.xml @@ -0,0 +1,4 @@ +<resources> + <string name="app_name">E04 Sum Calculator</string> + <string name="banner_content_description">Banner Image</string> +</resources> \ No newline at end of file diff --git a/E04SumCalculator/app/src/main/res/values/themes.xml b/E04SumCalculator/app/src/main/res/values/themes.xml new file mode 100644 index 0000000000000000000000000000000000000000..3f44e512ab4a09bf8c4da16b8bf2aa6256902360 --- /dev/null +++ b/E04SumCalculator/app/src/main/res/values/themes.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + + <style name="Theme.E04SumCalculator" parent="android:Theme.Material.Light.NoActionBar" /> +</resources> \ No newline at end of file diff --git a/E04SumCalculator/app/src/main/res/xml/backup_rules.xml b/E04SumCalculator/app/src/main/res/xml/backup_rules.xml new file mode 100644 index 0000000000000000000000000000000000000000..fa0f996d2c2a6bdd11f5371de4268c8389d6c720 --- /dev/null +++ b/E04SumCalculator/app/src/main/res/xml/backup_rules.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="utf-8"?><!-- + Sample backup rules file; uncomment and customize as necessary. + See https://developer.android.com/guide/topics/data/autobackup + for details. + Note: This file is ignored for devices older that API 31 + See https://developer.android.com/about/versions/12/backup-restore +--> +<full-backup-content> + <!-- + <include domain="sharedpref" path="."/> + <exclude domain="sharedpref" path="device.xml"/> +--> +</full-backup-content> \ No newline at end of file diff --git a/E04SumCalculator/app/src/main/res/xml/data_extraction_rules.xml b/E04SumCalculator/app/src/main/res/xml/data_extraction_rules.xml new file mode 100644 index 0000000000000000000000000000000000000000..9ee9997b0b4726e57c27b2f7b21462b604ff8a88 --- /dev/null +++ b/E04SumCalculator/app/src/main/res/xml/data_extraction_rules.xml @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="utf-8"?><!-- + Sample data extraction rules file; uncomment and customize as necessary. + See https://developer.android.com/about/versions/12/backup-restore#xml-changes + for details. +--> +<data-extraction-rules> + <cloud-backup> + <!-- TODO: Use <include> and <exclude> to control what is backed up. + <include .../> + <exclude .../> + --> + </cloud-backup> + <!-- + <device-transfer> + <include .../> + <exclude .../> + </device-transfer> + --> +</data-extraction-rules> \ No newline at end of file diff --git a/E04SumCalculator/app/src/test/java/com/example/e04sumcalculator/ExampleUnitTest.kt b/E04SumCalculator/app/src/test/java/com/example/e04sumcalculator/ExampleUnitTest.kt new file mode 100644 index 0000000000000000000000000000000000000000..8daab846d1b398a44669cd6ef3250bd468b6e9b2 --- /dev/null +++ b/E04SumCalculator/app/src/test/java/com/example/e04sumcalculator/ExampleUnitTest.kt @@ -0,0 +1,17 @@ +package com.example.e04sumcalculator + +import org.junit.Test + +import org.junit.Assert.* + +/** + * Example local unit test, which will execute on the development machine (host). + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +class ExampleUnitTest { + @Test + fun addition_isCorrect() { + assertEquals(4, 2 + 2) + } +} \ No newline at end of file diff --git a/E04SumCalculator/build.gradle.kts b/E04SumCalculator/build.gradle.kts new file mode 100644 index 0000000000000000000000000000000000000000..bea45c98fc9880ef6b88f435745493d67dbfeac4 --- /dev/null +++ b/E04SumCalculator/build.gradle.kts @@ -0,0 +1,5 @@ +// Top-level build file where you can add configuration options common to all sub-projects/modules. +plugins { + id("com.android.application") version "8.2.0-rc03" apply false + id("org.jetbrains.kotlin.android") version "1.9.0" apply false +} diff --git a/E04SumCalculator/gradle.properties b/E04SumCalculator/gradle.properties new file mode 100644 index 0000000000000000000000000000000000000000..3c5031eb7d63f785752b1914cc8692a453d1cc63 --- /dev/null +++ b/E04SumCalculator/gradle.properties @@ -0,0 +1,23 @@ +# Project-wide Gradle settings. +# IDE (e.g. Android Studio) users: +# Gradle settings configured through the IDE *will override* +# any settings specified in this file. +# For more details on how to configure your build environment visit +# http://www.gradle.org/docs/current/userguide/build_environment.html +# Specifies the JVM arguments used for the daemon process. +# The setting is particularly useful for tweaking memory settings. +org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8 +# When configured, Gradle will run in incubating parallel mode. +# This option should only be used with decoupled projects. More details, visit +# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects +# org.gradle.parallel=true +# AndroidX package structure to make it clearer which packages are bundled with the +# Android operating system, and which are packaged with your app's APK +# https://developer.android.com/topic/libraries/support-library/androidx-rn +android.useAndroidX=true +# Kotlin code style for this project: "official" or "obsolete": +kotlin.code.style=official +# Enables namespacing of each library's R class so that its R class includes only the +# resources declared in the library itself and none from the library's dependencies, +# thereby reducing the size of the R class for that library +android.nonTransitiveRClass=true \ No newline at end of file diff --git a/E04SumCalculator/gradle/wrapper/gradle-wrapper.jar b/E04SumCalculator/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..e708b1c023ec8b20f512888fe07c5bd3ff77bb8f Binary files /dev/null and b/E04SumCalculator/gradle/wrapper/gradle-wrapper.jar differ diff --git a/E04SumCalculator/gradle/wrapper/gradle-wrapper.properties b/E04SumCalculator/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000000000000000000000000000000000000..b9e5d242604f8c5d1893efc626d9afc432581107 --- /dev/null +++ b/E04SumCalculator/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Sat Nov 25 15:08:38 GMT 2023 +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/E04SumCalculator/gradlew b/E04SumCalculator/gradlew new file mode 100755 index 0000000000000000000000000000000000000000..4f906e0c811fc9e230eb44819f509cd0627f2600 --- /dev/null +++ b/E04SumCalculator/gradlew @@ -0,0 +1,185 @@ +#!/usr/bin/env sh + +# +# Copyright 2015 the original author or authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn () { + echo "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin or MSYS, switch paths to Windows format before running java +if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=`expr $i + 1` + done + case $i in + 0) set -- ;; + 1) set -- "$args0" ;; + 2) set -- "$args0" "$args1" ;; + 3) set -- "$args0" "$args1" "$args2" ;; + 4) set -- "$args0" "$args1" "$args2" "$args3" ;; + 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=`save "$@"` + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +exec "$JAVACMD" "$@" diff --git a/E04SumCalculator/gradlew.bat b/E04SumCalculator/gradlew.bat new file mode 100644 index 0000000000000000000000000000000000000000..ac1b06f93825db68fb0c0b5150917f340eaa5d02 --- /dev/null +++ b/E04SumCalculator/gradlew.bat @@ -0,0 +1,89 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/E04SumCalculator/settings.gradle.kts b/E04SumCalculator/settings.gradle.kts new file mode 100644 index 0000000000000000000000000000000000000000..f76f97bd9d693f7aa265934eab352e6242666dbd --- /dev/null +++ b/E04SumCalculator/settings.gradle.kts @@ -0,0 +1,17 @@ +pluginManagement { + repositories { + google() + mavenCentral() + gradlePluginPortal() + } +} +dependencyResolutionManagement { + repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) + repositories { + google() + mavenCentral() + } +} + +rootProject.name = "E04 Sum Calculator" +include(":app")