diff --git a/E13RoomShoppingList/.gitignore b/E13RoomShoppingList/.gitignore new file mode 100644 index 0000000000000000000000000000000000000000..aa724b77071afcbd9bb398053e05adaf7ac9405a --- /dev/null +++ b/E13RoomShoppingList/.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/E13RoomShoppingList/.idea/.name b/E13RoomShoppingList/.idea/.name new file mode 100644 index 0000000000000000000000000000000000000000..b9bae38d0c405d771079441bf53cbc43d9ffd40c --- /dev/null +++ b/E13RoomShoppingList/.idea/.name @@ -0,0 +1 @@ +E13 Room Shopping List \ No newline at end of file diff --git a/E13RoomShoppingList/.idea/compiler.xml b/E13RoomShoppingList/.idea/compiler.xml new file mode 100644 index 0000000000000000000000000000000000000000..b589d56e9f285d8cfdc6c270853a5d439021a278 --- /dev/null +++ b/E13RoomShoppingList/.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/E13RoomShoppingList/.idea/deploymentTargetDropDown.xml b/E13RoomShoppingList/.idea/deploymentTargetDropDown.xml new file mode 100644 index 0000000000000000000000000000000000000000..0c0c3383890637b4721df1f49d0b229e55c0f361 --- /dev/null +++ b/E13RoomShoppingList/.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/E13RoomShoppingList/.idea/gradle.xml b/E13RoomShoppingList/.idea/gradle.xml new file mode 100644 index 0000000000000000000000000000000000000000..32522c1e7054e664d0b44bf5c384d6e06213b9a5 --- /dev/null +++ b/E13RoomShoppingList/.idea/gradle.xml @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project version="4"> + <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/E13RoomShoppingList/.idea/kotlinc.xml b/E13RoomShoppingList/.idea/kotlinc.xml new file mode 100644 index 0000000000000000000000000000000000000000..fdf8d994a6599dd8b64a341af14c598069a10022 --- /dev/null +++ b/E13RoomShoppingList/.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/E13RoomShoppingList/.idea/migrations.xml b/E13RoomShoppingList/.idea/migrations.xml new file mode 100644 index 0000000000000000000000000000000000000000..f8051a6f973e69a86e6f07f1a1c87f17a31c7235 --- /dev/null +++ b/E13RoomShoppingList/.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/E13RoomShoppingList/.idea/misc.xml b/E13RoomShoppingList/.idea/misc.xml new file mode 100644 index 0000000000000000000000000000000000000000..0ad17cbd33a2f389d524bc4bfef9c52e1f7ab490 --- /dev/null +++ b/E13RoomShoppingList/.idea/misc.xml @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="UTF-8"?> +<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/E13RoomShoppingList/.idea/vcs.xml b/E13RoomShoppingList/.idea/vcs.xml new file mode 100644 index 0000000000000000000000000000000000000000..6c0b8635858dc7ad44b93df54b762707ce49eefc --- /dev/null +++ b/E13RoomShoppingList/.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/E13RoomShoppingList/app/.gitignore b/E13RoomShoppingList/app/.gitignore new file mode 100644 index 0000000000000000000000000000000000000000..42afabfd2abebf31384ca7797186a27a4b7dbee8 --- /dev/null +++ b/E13RoomShoppingList/app/.gitignore @@ -0,0 +1 @@ +/build \ No newline at end of file diff --git a/E13RoomShoppingList/app/build.gradle.kts b/E13RoomShoppingList/app/build.gradle.kts new file mode 100644 index 0000000000000000000000000000000000000000..357888dc2309795b7493b68c4c1471b4423a5042 --- /dev/null +++ b/E13RoomShoppingList/app/build.gradle.kts @@ -0,0 +1,79 @@ +plugins { + id("com.android.application") + id("org.jetbrains.kotlin.android") + id("com.google.devtools.ksp") version "1.9.22-1.0.16" +} + +android { + namespace = "com.example.e13roomshoppinglist" + compileSdk = 34 + + defaultConfig { + applicationId = "com.example.e13roomshoppinglist" + 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("androidx.core:core-ktx:1.12.0") + implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.6.2") + implementation("androidx.activity:activity-compose:1.8.2") + 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") + 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") + + // Room + val roomVersion = "2.6.1" + implementation("androidx.room:room-ktx:$roomVersion") + ksp("androidx.room:room-compiler:$roomVersion") + + // Material compose 3 + implementation("androidx.compose.material3:material3:1.1.2") + implementation("androidx.compose.material3:material3-window-size-class:1.1.2") +} \ No newline at end of file diff --git a/E13RoomShoppingList/app/proguard-rules.pro b/E13RoomShoppingList/app/proguard-rules.pro new file mode 100644 index 0000000000000000000000000000000000000000..481bb434814107eb79d7a30b676d344b0df2f8ce --- /dev/null +++ b/E13RoomShoppingList/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/E13RoomShoppingList/app/src/androidTest/java/com/example/e13roomshoppinglist/ExampleInstrumentedTest.kt b/E13RoomShoppingList/app/src/androidTest/java/com/example/e13roomshoppinglist/ExampleInstrumentedTest.kt new file mode 100644 index 0000000000000000000000000000000000000000..f83253bcbc4ed866352feef0df54378a411467d2 --- /dev/null +++ b/E13RoomShoppingList/app/src/androidTest/java/com/example/e13roomshoppinglist/ExampleInstrumentedTest.kt @@ -0,0 +1,24 @@ +package com.example.e13roomshoppinglist + +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.e13roomshoppinglist", appContext.packageName) + } +} \ No newline at end of file diff --git a/E13RoomShoppingList/app/src/main/AndroidManifest.xml b/E13RoomShoppingList/app/src/main/AndroidManifest.xml new file mode 100644 index 0000000000000000000000000000000000000000..46ed83d0551248cc5bd0708533a271c3d1552972 --- /dev/null +++ b/E13RoomShoppingList/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.E13RoomShoppingList" + tools:targetApi="31"> + <activity + android:name=".MainActivity" + android:exported="true" + android:label="@string/app_name" + android:theme="@style/Theme.E13RoomShoppingList"> + <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/E13RoomShoppingList/app/src/main/java/com/example/e13roomshoppinglist/MainActivity.kt b/E13RoomShoppingList/app/src/main/java/com/example/e13roomshoppinglist/MainActivity.kt new file mode 100644 index 0000000000000000000000000000000000000000..d6c3897edf03ce37e324992523c904242adc82c2 --- /dev/null +++ b/E13RoomShoppingList/app/src/main/java/com/example/e13roomshoppinglist/MainActivity.kt @@ -0,0 +1,63 @@ +package com.example.e13roomshoppinglist + +import android.os.Bundle +import android.widget.Toast +import androidx.activity.ComponentActivity +import androidx.activity.compose.setContent +import androidx.activity.viewModels +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Surface +import androidx.compose.runtime.collectAsState +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.ui.Modifier +import androidx.compose.ui.platform.LocalContext +import androidx.lifecycle.ViewModel +import androidx.lifecycle.ViewModelProvider +import androidx.room.Room +import com.example.e13roomshoppinglist.ui.theme.E13RoomShoppingListTheme + +class MainActivity : ComponentActivity() { + private val db by lazy { + Room.databaseBuilder( + applicationContext, + ShoppingListDatabase::class.java, + "shoppingListDB.db" + ).build() + } + private val viewModel by viewModels<ShoppingListViewModel> { + object : ViewModelProvider.Factory { + override fun <T : ViewModel> create(modelClass: Class<T>): T { + return ShoppingListViewModel(db.dao) as T + } + } + } + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContent { + E13RoomShoppingListTheme { + val state by viewModel.state.collectAsState() + val ctx = LocalContext.current + var toast by remember { + mutableStateOf<Toast?>(Toast.makeText(ctx, "Loaded data from room db!", Toast.LENGTH_SHORT)) + } + + val showToast = { msg: String -> + toast = Toast.makeText(ctx, msg, Toast.LENGTH_SHORT) + toast?.show() + } + + Surface( + modifier = Modifier.fillMaxSize(), + color = MaterialTheme.colorScheme.background + ) { + ShoppingListScreen(state = state, onEvent = viewModel::onEvent, onShowToast = showToast) + } + } + } + } +} diff --git a/E13RoomShoppingList/app/src/main/java/com/example/e13roomshoppinglist/ShoppingListDatabase.kt b/E13RoomShoppingList/app/src/main/java/com/example/e13roomshoppinglist/ShoppingListDatabase.kt new file mode 100644 index 0000000000000000000000000000000000000000..266a4208ee52deb290d5bdd4dbbede74b346b438 --- /dev/null +++ b/E13RoomShoppingList/app/src/main/java/com/example/e13roomshoppinglist/ShoppingListDatabase.kt @@ -0,0 +1,63 @@ +package com.example.e13roomshoppinglist + +import androidx.room.ColumnInfo +import androidx.room.Dao +import androidx.room.Database +import androidx.room.Delete +import androidx.room.Entity +import androidx.room.PrimaryKey +import androidx.room.Query +import androidx.room.RoomDatabase +import androidx.room.Upsert +import kotlinx.coroutines.flow.Flow + + +@Database( + entities = [ShoppingListItem::class], + version = 1 +) +abstract class ShoppingListDatabase:RoomDatabase() { + abstract val dao: ShoppingListDao +} + + +@Entity +data class ShoppingListItem( + @PrimaryKey(autoGenerate = true) + val id: Int? = null, + + @ColumnInfo(defaultValue = "") + val name: String, + @ColumnInfo(defaultValue = 0.toString()) + val price: Float, + @ColumnInfo(defaultValue = 0.toString()) + val count: Int, +) + + +@Dao +interface ShoppingListDao{ + @Upsert + fun upsertShoppingListItem(shoppingListItem: ShoppingListItem) + + @Delete + suspend fun deleteShoppingListItem(shoppingListItem: ShoppingListItem) + + @Query("SELECT * FROM ShoppingListItem") + fun getAllShoppingListItems(): Flow<List<ShoppingListItem>> + + @Query("SELECT * FROM ShoppingListItem ORDER BY name ASC") + fun getShoppingListItemsOrderedByNameASC(): Flow<List<ShoppingListItem>> + @Query("SELECT * FROM ShoppingListItem ORDER BY name DESC") + fun getShoppingListItemsOrderedByNameDESC(): Flow<List<ShoppingListItem>> + + @Query("SELECT * FROM ShoppingListItem ORDER BY price ASC") + fun getShoppingListItemsOrderedByPriceASC(): Flow<List<ShoppingListItem>> + @Query("SELECT * FROM ShoppingListItem ORDER BY price DESC") + fun getShoppingListItemsOrderedByPriceDESC(): Flow<List<ShoppingListItem>> + + @Query("SELECT * FROM ShoppingListItem ORDER BY count ASC") + fun getShoppingListItemsOrderedByCountASC(): Flow<List<ShoppingListItem>> + @Query("SELECT * FROM ShoppingListItem ORDER BY count DESC") + fun getShoppingListItemsOrderedByCountDESC(): Flow<List<ShoppingListItem>> +} diff --git a/E13RoomShoppingList/app/src/main/java/com/example/e13roomshoppinglist/ShoppingListScreen.kt b/E13RoomShoppingList/app/src/main/java/com/example/e13roomshoppinglist/ShoppingListScreen.kt new file mode 100644 index 0000000000000000000000000000000000000000..5b6f379dba3202f12fa5be87e31c3fe223373994 --- /dev/null +++ b/E13RoomShoppingList/app/src/main/java/com/example/e13roomshoppinglist/ShoppingListScreen.kt @@ -0,0 +1,238 @@ +package com.example.e13roomshoppinglist + + +import androidx.compose.foundation.background +import androidx.compose.foundation.clickable +import androidx.compose.foundation.horizontalScroll +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.heightIn +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.width +import androidx.compose.foundation.lazy.LazyColumn +import androidx.compose.foundation.lazy.items +import androidx.compose.foundation.rememberScrollState +import androidx.compose.foundation.text.KeyboardOptions +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.Add +import androidx.compose.material.icons.filled.Delete +import androidx.compose.material.icons.filled.Edit +import androidx.compose.material3.AlertDialog +import androidx.compose.material3.Button +import androidx.compose.material3.Divider +import androidx.compose.material3.FloatingActionButton +import androidx.compose.material3.Icon +import androidx.compose.material3.IconButton +import androidx.compose.material3.RadioButton +import androidx.compose.material3.Scaffold +import androidx.compose.material3.Text +import androidx.compose.material3.TextField +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.input.KeyboardType +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp + + +@Composable +fun ShoppingListScreen( + state: ShoppingListState, + onEvent: (ShoppingListEvent) -> Unit, + onShowToast: (String) -> Unit? +) { + Scaffold( + floatingActionButton = { + FloatingActionButton(onClick = { + onEvent(ShoppingListEvent.OpenAddingNewShoppingListItemDialog) + }) { + Icon(imageVector = Icons.Default.Add, contentDescription = "Add new shopping list item") + } + }, + modifier = Modifier.padding(16.dp) + ) { padding -> + if (state.isAddingNewShoppingListItem || state.isEditingShoppingListItem) { + AddShoppingListItemDialog(state = state, onEvent = onEvent, onShowToast = onShowToast) + } + Column { + + + Row( + modifier = Modifier + .fillMaxWidth(), + verticalAlignment = Alignment.CenterVertically + ) { + Row(Modifier.padding(end = 8.dp)) { + Text(text = "Sort by:", fontSize = 20.sp, fontWeight = FontWeight.Bold) + } + Row(Modifier.horizontalScroll(rememberScrollState())) { + SortType.entries.forEach { sortType -> + Row( + modifier = Modifier + .clickable { onEvent(ShoppingListEvent.SetSortType(sortType)) }, + verticalAlignment = Alignment.CenterVertically + ) { + RadioButton( + selected = state.sortType == sortType, + onClick = { onEvent(ShoppingListEvent.SetSortType(sortType)) }) + Text(text = sortType.name, fontSize = 16.sp) + } + } + } + } + Divider(thickness = 2.dp, color = Color.LightGray, modifier = Modifier.padding(bottom = 8.dp)) + + LazyColumn( + contentPadding = padding, + modifier = Modifier.fillMaxSize(), + verticalArrangement = Arrangement.spacedBy(16.dp) + ) { + items(state.shoppingListItems) { shoppingItem -> + Row(modifier = Modifier.fillMaxWidth()) { + Column(modifier = Modifier.weight(1f)) { + Text( + text = "${shoppingItem.name} - 🧮 ${shoppingItem.count}", + fontSize = 18.sp + ) + Text(text = "💶 ${shoppingItem.price}", fontSize = 16.sp) + } + + IconButton(onClick = { + onEvent(ShoppingListEvent.DeleteShoppingListItem(shoppingItem)) + .also { + onShowToast("Deleted shopping list item ${shoppingItem.name}") + } + }) { + Icon( + imageVector = Icons.Default.Delete, + contentDescription = "Delete Shopping List Item" + ) + } + + IconButton(onClick = { + onEvent(ShoppingListEvent.OpenEditingShoppingListItem(shoppingItem)) + }) { + Icon( + imageVector = Icons.Default.Edit, + contentDescription = "Edit Shopping List Item" + ) + } + } + } + item { + Row( + modifier = Modifier + .width(280.dp) + .height(70.dp), + verticalAlignment = Alignment.CenterVertically + ) { + Text(text = "Empty item to fill up room so that the last item does not go under FAB.", fontSize = 12.sp, color = Color.Gray) + } + } + } + } + } +} + +@Composable +fun AddShoppingListItemDialog( + state: ShoppingListState, + onEvent: (ShoppingListEvent) -> Unit, + onShowToast: (String) -> Unit?, + modifier: Modifier = Modifier, +) { + AlertDialog( + modifier = modifier, + onDismissRequest = { + if (state.isAddingNewShoppingListItem) { + onEvent(ShoppingListEvent.CloseAddingNewShoppingListItemDialog) + } else if (state.isEditingShoppingListItem) { + onEvent(ShoppingListEvent.CloseEditingShoppingListItem) + } + }, + title = { Text(text = "Add new shopping list item") }, + text = { + Column(verticalArrangement = Arrangement.spacedBy(8.dp)) { + val shoppingListItem = state.newShoppingListItem + + TextField( + value = shoppingListItem.name, + onValueChange = { onEvent(ShoppingListEvent.SetName(it)) }, + label = { Text(text = "Item Name") }, + placeholder = { Text(text = "Item Name") }, + ) + TextField( + value = if(shoppingListItem.count>0) shoppingListItem.count.toString() else "", + label = { Text(text = "Count") }, + placeholder = { Text(text = "Count") }, + onValueChange = { + var count = it.toIntOrNull() + if (count===null) { + onShowToast("Invalid value for Count!") + count = 0 + } + onEvent(ShoppingListEvent.SetCount(count = count)) + }, + keyboardOptions = KeyboardOptions().copy( + autoCorrect = false, + keyboardType = KeyboardType.Number + ), + leadingIcon = { + Text(text = "🧮", fontSize = 24.sp) + } + ) + TextField( + value = if(shoppingListItem.price>0) shoppingListItem.price.toString() else "", + label = { Text(text = "Price") }, + placeholder = { Text(text = "Price") }, + onValueChange = { + var price = it.toFloatOrNull() + if (price===null) { + price = 0f + } + onEvent(ShoppingListEvent.SetPrice(price = price)) + }, + keyboardOptions = KeyboardOptions().copy( + autoCorrect = false, + keyboardType = KeyboardType.Decimal + ), + leadingIcon = { + Text(text = "💶", fontSize = 24.sp) + } + ) + } + }, + confirmButton = { + Button(onClick = { + if (state.newShoppingListItem.name.length<3){ + onShowToast("Item name should not be too short!") + return@Button + } + if (state.isAddingNewShoppingListItem) { + onEvent(ShoppingListEvent.InsertNewShoppingListItemToDb).also { onShowToast("Added new item to shopping list!") } + } else if (state.isEditingShoppingListItem) { + onEvent(ShoppingListEvent.UpdateCurrentlyEditingShoppingListItem).also { onShowToast("Updated shopping list item!") } + } + }) { + Text(text = if (state.isEditingShoppingListItem) "Update" else "Insert") + } + }, + dismissButton = { + Button(onClick = { + if (state.isAddingNewShoppingListItem) { + onEvent(ShoppingListEvent.CloseAddingNewShoppingListItemDialog) + } else if (state.isEditingShoppingListItem) { + onEvent(ShoppingListEvent.CloseEditingShoppingListItem) + } + }) { + Text(text = "Close") + } + } + ) +} \ No newline at end of file diff --git a/E13RoomShoppingList/app/src/main/java/com/example/e13roomshoppinglist/ShoppingListViewModel.kt b/E13RoomShoppingList/app/src/main/java/com/example/e13roomshoppinglist/ShoppingListViewModel.kt new file mode 100644 index 0000000000000000000000000000000000000000..f172270b6e9e9db2cd36985e3f0a3f8b7099d848 --- /dev/null +++ b/E13RoomShoppingList/app/src/main/java/com/example/e13roomshoppinglist/ShoppingListViewModel.kt @@ -0,0 +1,168 @@ +package com.example.e13roomshoppinglist + +import androidx.lifecycle.ViewModel +import androidx.lifecycle.viewModelScope +import kotlinx.coroutines.DelicateCoroutinesApi +import kotlinx.coroutines.ExperimentalCoroutinesApi +import kotlinx.coroutines.GlobalScope +import kotlinx.coroutines.flow.MutableStateFlow +import kotlinx.coroutines.flow.SharingStarted +import kotlinx.coroutines.flow.combine +import kotlinx.coroutines.flow.flatMapLatest +import kotlinx.coroutines.flow.stateIn +import kotlinx.coroutines.flow.update +import kotlinx.coroutines.launch + + +enum class SortType{ + None, + NameASC, + NameDESC, + PriceASC, + PriceDESC, + CountASC, + CountDESC, +} + +sealed interface ShoppingListEvent{ + data object OpenAddingNewShoppingListItemDialog: ShoppingListEvent + data object CloseAddingNewShoppingListItemDialog: ShoppingListEvent + data class SetName(val name: String): ShoppingListEvent + data class SetPrice(val price: Float): ShoppingListEvent + data class SetCount(val count: Int): ShoppingListEvent + data object InsertNewShoppingListItemToDb: ShoppingListEvent + + data class OpenEditingShoppingListItem(val shoppingListItem: ShoppingListItem): ShoppingListEvent + data object CloseEditingShoppingListItem: ShoppingListEvent + data object UpdateCurrentlyEditingShoppingListItem: ShoppingListEvent + data class DeleteShoppingListItem(val shoppingListItem: ShoppingListItem): ShoppingListEvent + + data class SetSortType(val sortType: SortType): ShoppingListEvent +} + +data class NewShoppingListItem( + val name: String = "", + val price: Float = 0f, + val count: Int = 0 +) + +data class ShoppingListState( + val shoppingListItems: List<ShoppingListItem> = emptyList(), + + val isAddingNewShoppingListItem: Boolean = false, + val newShoppingListItem: NewShoppingListItem = NewShoppingListItem(), + + val isEditingShoppingListItem: Boolean = false, + val currentlyEditingShoppingListItem: ShoppingListItem? = null, + + val sortType: SortType = SortType.None +) + + +class ShoppingListViewModel(private val dao: ShoppingListDao): ViewModel() { + private val _state = MutableStateFlow(ShoppingListState()) + private val _sortType = MutableStateFlow(SortType.None) + @OptIn(ExperimentalCoroutinesApi::class) + private val _shoppingListItems = _sortType.flatMapLatest { sortType -> + when(sortType) { + SortType.None -> dao.getAllShoppingListItems() + SortType.NameASC -> dao.getShoppingListItemsOrderedByNameASC() + SortType.NameDESC -> dao.getShoppingListItemsOrderedByNameDESC() + SortType.PriceASC -> dao.getShoppingListItemsOrderedByPriceASC() + SortType.PriceDESC -> dao.getShoppingListItemsOrderedByPriceDESC() + SortType.CountASC -> dao.getShoppingListItemsOrderedByCountASC() + SortType.CountDESC -> dao.getShoppingListItemsOrderedByCountDESC() + } + }.stateIn(viewModelScope, SharingStarted.WhileSubscribed(), emptyList()) + + val state = combine(_state, _sortType, _shoppingListItems){ + state, sortType, shoppingListItems -> state.copy(shoppingListItems = shoppingListItems, sortType=sortType) + }.stateIn(viewModelScope, SharingStarted.WhileSubscribed(5000), ShoppingListState()) + + + + @OptIn(DelicateCoroutinesApi::class) + fun onEvent(event: ShoppingListEvent){ + when(event) { + is ShoppingListEvent.SetName -> { + val newShoppingListItem = _state.value.newShoppingListItem + _state.update { it.copy(newShoppingListItem = newShoppingListItem.copy(name = event.name)) } + } + is ShoppingListEvent.SetCount -> { + val newShoppingListItem = _state.value.newShoppingListItem + _state.update { it.copy(newShoppingListItem = newShoppingListItem.copy(count = event.count)) } + } + is ShoppingListEvent.SetPrice -> { + val newShoppingListItem = _state.value.newShoppingListItem + _state.update { it.copy(newShoppingListItem = newShoppingListItem.copy(price = event.price)) } + } + + ShoppingListEvent.OpenAddingNewShoppingListItemDialog -> { + _state.update { it.copy(isAddingNewShoppingListItem = true) } + } + ShoppingListEvent.InsertNewShoppingListItemToDb -> { + val newShoppingListItem = _state.value.newShoppingListItem + GlobalScope.launch { + dao.upsertShoppingListItem(ShoppingListItem( + name = newShoppingListItem.name, + price = newShoppingListItem.price, + count = newShoppingListItem.count)) + } + _state.update { it.copy(newShoppingListItem=NewShoppingListItem()) } + } + ShoppingListEvent.CloseAddingNewShoppingListItemDialog -> { + _state.update { it.copy(isAddingNewShoppingListItem = false) } + } + + is ShoppingListEvent.OpenEditingShoppingListItem -> { + _state.update { + val shoppingListItem = event.shoppingListItem + it.copy( + isEditingShoppingListItem = true, + currentlyEditingShoppingListItem = shoppingListItem, + newShoppingListItem = NewShoppingListItem( + name = shoppingListItem.name, + price = shoppingListItem.price, + count = shoppingListItem.count + )) + } + } + ShoppingListEvent.UpdateCurrentlyEditingShoppingListItem -> { + val currentlyEditingShoppingListItem = _state.value.currentlyEditingShoppingListItem + if (currentlyEditingShoppingListItem===null) return + val modifiedShoppingListItemAttrs = _state.value.newShoppingListItem + val updatedShoppingListItem = currentlyEditingShoppingListItem.copy( + name = modifiedShoppingListItemAttrs.name, + price = modifiedShoppingListItemAttrs.price, + count = modifiedShoppingListItemAttrs.count + ) + + GlobalScope.launch { dao.upsertShoppingListItem(updatedShoppingListItem) } + + _state.update { + it.copy( + currentlyEditingShoppingListItem = null, + newShoppingListItem = NewShoppingListItem(), + isEditingShoppingListItem = false) + } + } + ShoppingListEvent.CloseEditingShoppingListItem -> { + _state.update { + it.copy( + isEditingShoppingListItem = false, + currentlyEditingShoppingListItem = null, + newShoppingListItem = NewShoppingListItem()) + } + } + is ShoppingListEvent.DeleteShoppingListItem -> { + GlobalScope.launch { + dao.deleteShoppingListItem(event.shoppingListItem) + } + } + + is ShoppingListEvent.SetSortType -> { + _sortType.update { event.sortType } + } + } + } +} diff --git a/E13RoomShoppingList/app/src/main/java/com/example/e13roomshoppinglist/ui/theme/Color.kt b/E13RoomShoppingList/app/src/main/java/com/example/e13roomshoppinglist/ui/theme/Color.kt new file mode 100644 index 0000000000000000000000000000000000000000..2230e399047db7b9ef29e4511040be350610d0db --- /dev/null +++ b/E13RoomShoppingList/app/src/main/java/com/example/e13roomshoppinglist/ui/theme/Color.kt @@ -0,0 +1,11 @@ +package com.example.e13roomshoppinglist.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/E13RoomShoppingList/app/src/main/java/com/example/e13roomshoppinglist/ui/theme/Theme.kt b/E13RoomShoppingList/app/src/main/java/com/example/e13roomshoppinglist/ui/theme/Theme.kt new file mode 100644 index 0000000000000000000000000000000000000000..0ecea9148a98294cbcb6fca3ee7ccf4f676f7697 --- /dev/null +++ b/E13RoomShoppingList/app/src/main/java/com/example/e13roomshoppinglist/ui/theme/Theme.kt @@ -0,0 +1,70 @@ +package com.example.e13roomshoppinglist.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 E13RoomShoppingListTheme( + 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/E13RoomShoppingList/app/src/main/java/com/example/e13roomshoppinglist/ui/theme/Type.kt b/E13RoomShoppingList/app/src/main/java/com/example/e13roomshoppinglist/ui/theme/Type.kt new file mode 100644 index 0000000000000000000000000000000000000000..151de6a5be36b81ab30f16bb7f1aa114b28c4c73 --- /dev/null +++ b/E13RoomShoppingList/app/src/main/java/com/example/e13roomshoppinglist/ui/theme/Type.kt @@ -0,0 +1,34 @@ +package com.example.e13roomshoppinglist.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/E13RoomShoppingList/app/src/main/res/drawable/ic_launcher_background.xml b/E13RoomShoppingList/app/src/main/res/drawable/ic_launcher_background.xml new file mode 100644 index 0000000000000000000000000000000000000000..07d5da9cbf141911847041df5d7b87f0dd5ef9d4 --- /dev/null +++ b/E13RoomShoppingList/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/E13RoomShoppingList/app/src/main/res/drawable/ic_launcher_foreground.xml b/E13RoomShoppingList/app/src/main/res/drawable/ic_launcher_foreground.xml new file mode 100644 index 0000000000000000000000000000000000000000..2b068d11462a4b96669193de13a711a3a36220a0 --- /dev/null +++ b/E13RoomShoppingList/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/E13RoomShoppingList/app/src/main/res/mipmap-anydpi/ic_launcher.xml b/E13RoomShoppingList/app/src/main/res/mipmap-anydpi/ic_launcher.xml new file mode 100644 index 0000000000000000000000000000000000000000..6f3b755bf50c6b03d8714a9c6184705e6a08389f --- /dev/null +++ b/E13RoomShoppingList/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/E13RoomShoppingList/app/src/main/res/mipmap-anydpi/ic_launcher_round.xml b/E13RoomShoppingList/app/src/main/res/mipmap-anydpi/ic_launcher_round.xml new file mode 100644 index 0000000000000000000000000000000000000000..6f3b755bf50c6b03d8714a9c6184705e6a08389f --- /dev/null +++ b/E13RoomShoppingList/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/E13RoomShoppingList/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/E13RoomShoppingList/app/src/main/res/mipmap-hdpi/ic_launcher.webp new file mode 100644 index 0000000000000000000000000000000000000000..c209e78ecd372343283f4157dcfd918ec5165bb3 Binary files /dev/null and b/E13RoomShoppingList/app/src/main/res/mipmap-hdpi/ic_launcher.webp differ diff --git a/E13RoomShoppingList/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/E13RoomShoppingList/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp new file mode 100644 index 0000000000000000000000000000000000000000..b2dfe3d1ba5cf3ee31b3ecc1ced89044a1f3b7a9 Binary files /dev/null and b/E13RoomShoppingList/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp differ diff --git a/E13RoomShoppingList/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/E13RoomShoppingList/app/src/main/res/mipmap-mdpi/ic_launcher.webp new file mode 100644 index 0000000000000000000000000000000000000000..4f0f1d64e58ba64d180ce43ee13bf9a17835fbca Binary files /dev/null and b/E13RoomShoppingList/app/src/main/res/mipmap-mdpi/ic_launcher.webp differ diff --git a/E13RoomShoppingList/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/E13RoomShoppingList/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp new file mode 100644 index 0000000000000000000000000000000000000000..62b611da081676d42f6c3f78a2c91e7bcedddedb Binary files /dev/null and b/E13RoomShoppingList/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp differ diff --git a/E13RoomShoppingList/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/E13RoomShoppingList/app/src/main/res/mipmap-xhdpi/ic_launcher.webp new file mode 100644 index 0000000000000000000000000000000000000000..948a3070fe34c611c42c0d3ad3013a0dce358be0 Binary files /dev/null and b/E13RoomShoppingList/app/src/main/res/mipmap-xhdpi/ic_launcher.webp differ diff --git a/E13RoomShoppingList/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/E13RoomShoppingList/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp new file mode 100644 index 0000000000000000000000000000000000000000..1b9a6956b3acdc11f40ce2bb3f6efbd845cc243f Binary files /dev/null and b/E13RoomShoppingList/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp differ diff --git a/E13RoomShoppingList/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/E13RoomShoppingList/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp new file mode 100644 index 0000000000000000000000000000000000000000..28d4b77f9f036a47549d47db79c16788749dca10 Binary files /dev/null and b/E13RoomShoppingList/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp differ diff --git a/E13RoomShoppingList/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/E13RoomShoppingList/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp new file mode 100644 index 0000000000000000000000000000000000000000..9287f5083623b375139afb391af71cc533a7dd37 Binary files /dev/null and b/E13RoomShoppingList/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp differ diff --git a/E13RoomShoppingList/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/E13RoomShoppingList/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp new file mode 100644 index 0000000000000000000000000000000000000000..aa7d6427e6fa1074b79ccd52ef67ac15c5637e85 Binary files /dev/null and b/E13RoomShoppingList/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp differ diff --git a/E13RoomShoppingList/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/E13RoomShoppingList/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp new file mode 100644 index 0000000000000000000000000000000000000000..9126ae37cbc3587421d6889eadd1d91fbf1994d4 Binary files /dev/null and b/E13RoomShoppingList/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp differ diff --git a/E13RoomShoppingList/app/src/main/res/values/colors.xml b/E13RoomShoppingList/app/src/main/res/values/colors.xml new file mode 100644 index 0000000000000000000000000000000000000000..f8c6127d327620c93d2b2d00342a68e97b98a48d --- /dev/null +++ b/E13RoomShoppingList/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/E13RoomShoppingList/app/src/main/res/values/strings.xml b/E13RoomShoppingList/app/src/main/res/values/strings.xml new file mode 100644 index 0000000000000000000000000000000000000000..8efcf75a070097782ccea08df5f66f2dcb1f0a0d --- /dev/null +++ b/E13RoomShoppingList/app/src/main/res/values/strings.xml @@ -0,0 +1,3 @@ +<resources> + <string name="app_name">E13 Room Shopping List</string> +</resources> \ No newline at end of file diff --git a/E13RoomShoppingList/app/src/main/res/values/themes.xml b/E13RoomShoppingList/app/src/main/res/values/themes.xml new file mode 100644 index 0000000000000000000000000000000000000000..1cf1cb5681cfc7cab70d59d23a7b0fc1babe3cc6 --- /dev/null +++ b/E13RoomShoppingList/app/src/main/res/values/themes.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + + <style name="Theme.E13RoomShoppingList" parent="android:Theme.Material.Light.NoActionBar" /> +</resources> \ No newline at end of file diff --git a/E13RoomShoppingList/app/src/main/res/xml/backup_rules.xml b/E13RoomShoppingList/app/src/main/res/xml/backup_rules.xml new file mode 100644 index 0000000000000000000000000000000000000000..fa0f996d2c2a6bdd11f5371de4268c8389d6c720 --- /dev/null +++ b/E13RoomShoppingList/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/E13RoomShoppingList/app/src/main/res/xml/data_extraction_rules.xml b/E13RoomShoppingList/app/src/main/res/xml/data_extraction_rules.xml new file mode 100644 index 0000000000000000000000000000000000000000..9ee9997b0b4726e57c27b2f7b21462b604ff8a88 --- /dev/null +++ b/E13RoomShoppingList/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/E13RoomShoppingList/app/src/test/java/com/example/e13roomshoppinglist/ExampleUnitTest.kt b/E13RoomShoppingList/app/src/test/java/com/example/e13roomshoppinglist/ExampleUnitTest.kt new file mode 100644 index 0000000000000000000000000000000000000000..a9f37ba758a04ed24e65d15d0e3f05249c31263d --- /dev/null +++ b/E13RoomShoppingList/app/src/test/java/com/example/e13roomshoppinglist/ExampleUnitTest.kt @@ -0,0 +1,17 @@ +package com.example.e13roomshoppinglist + +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/E13RoomShoppingList/build.gradle.kts b/E13RoomShoppingList/build.gradle.kts new file mode 100644 index 0000000000000000000000000000000000000000..55ea678759ceab648edafd15b7a8e9b186fbe57d --- /dev/null +++ b/E13RoomShoppingList/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.1" apply false + id("org.jetbrains.kotlin.android") version "1.9.0" apply false +} \ No newline at end of file diff --git a/E13RoomShoppingList/gradle.properties b/E13RoomShoppingList/gradle.properties new file mode 100644 index 0000000000000000000000000000000000000000..3c5031eb7d63f785752b1914cc8692a453d1cc63 --- /dev/null +++ b/E13RoomShoppingList/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/E13RoomShoppingList/gradle/wrapper/gradle-wrapper.jar b/E13RoomShoppingList/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..e708b1c023ec8b20f512888fe07c5bd3ff77bb8f Binary files /dev/null and b/E13RoomShoppingList/gradle/wrapper/gradle-wrapper.jar differ diff --git a/E13RoomShoppingList/gradle/wrapper/gradle-wrapper.properties b/E13RoomShoppingList/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000000000000000000000000000000000000..9d785bb70634f88f1cbc65e4ae13c2b87d491a05 --- /dev/null +++ b/E13RoomShoppingList/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Fri Jan 05 12:58:53 EET 2024 +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/E13RoomShoppingList/gradlew b/E13RoomShoppingList/gradlew new file mode 100644 index 0000000000000000000000000000000000000000..4f906e0c811fc9e230eb44819f509cd0627f2600 --- /dev/null +++ b/E13RoomShoppingList/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/E13RoomShoppingList/gradlew.bat b/E13RoomShoppingList/gradlew.bat new file mode 100644 index 0000000000000000000000000000000000000000..107acd32c4e687021ef32db511e8a206129b88ec --- /dev/null +++ b/E13RoomShoppingList/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/E13RoomShoppingList/settings.gradle.kts b/E13RoomShoppingList/settings.gradle.kts new file mode 100644 index 0000000000000000000000000000000000000000..de72db9fab8c9f421530732402301d6e2614a7f4 --- /dev/null +++ b/E13RoomShoppingList/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 = "E13 Room Shopping List" +include(":app") diff --git a/README.md b/README.md index a190d42e295855bb989cebe70d511a159396d139..63826ef7d5ed92dbfb432674f844c30c80762e3e 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ Iftakhar Husan - [Exercise 9's][ex9] requirements are satisfied by [Exercise 8][ex8] - [Exercise 10][ex10] - [Exercise 11's][ex11] requirements are satisfied by [Exercise 10][ex10] -- [Exercise 12][ex12] +- [Exercise 12's][ex12] requirements are satisfied by [Exercise 11][ex10] - [Exercise 13][ex13] - [Exercise 14][ex14] - [Exercise 15][ex15] @@ -34,7 +34,7 @@ Iftakhar Husan [ex9]: ./E08Employeesapp/ [ex10]: ./E10FavouriteCities/ [ex11]: ./E10FavouriteCities/ -[ex12]: ./ +[ex12]: ./E10FavouriteCities/ [ex13]: ./ [ex14]: ./ [ex15]: ./