diff --git a/README.md b/README.md index 039e8be..16ded80 100644 --- a/README.md +++ b/README.md @@ -35,7 +35,7 @@ Whether you're casually curious or a seasoned enthusiast, ViNotes helps you reme - 📊 **Statistics** — visualise your ratings by year and region with interactive charts - 📍 **One-tap location** — autofill the venue field using your GPS position with reverse geocoding via OpenStreetMap - 🔄 **Catalog sync** — download a curated wine database and keep it up to date with delta syncing -- 📁 **Local JSON import** — import your own wine catalog from a file, no internet required +- 📁 **Local JSON import** — import your own wine catalogue from a file, no internet required - 🌙 **Dark & light theme** — fully themed UI with a warm, elegant wine-inspired palette - 🔒 **Privacy-first** — works completely offline, no account needed, no tracking @@ -44,9 +44,9 @@ Whether you're casually curious or a seasoned enthusiast, ViNotes helps you reme -| Dashboard | Tasting Form | Wine Detail | Statistics | -|:-:|:-:|:-:|:-:| -| *coming soon* | *coming soon* | *coming soon* | *coming soon* | +| Dashboard | Tasting Form | Wine Detail | Statistics | +|:-----------------------:|:----------------------------:|:-------------------------:|:--------------------------:| +| ![](imgs/dashboard.png) | ![](imgs/tasting-screen.png) | ![](imgs/wine-screen.png) | ![](imgs/stats-screen.png) | ## Tech Stack @@ -81,17 +81,17 @@ Repositories Abstract data sources behind interfaces Room Retrofit ``` -## Wine Catalog +## Wine Catalogue -ViNotes ships with a community-maintained wine catalog hosted on GitHub Pages. The sync system is designed to be lightweight and bandwidth-friendly: +ViNotes ships with a community-maintained wine catalogue hosted on GitHub Pages. The sync system is designed to be lightweight and bandwidth-friendly: - **`manifest.json`** — fetched first; lists all available files with checksums -- **`full.json`** — the complete catalog, used on first install or manual reset +- **`full.json`** — the complete catalogue, used on first install or manual reset - **`delta-YYYY-MM-DD.json`** — incremental updates with only added, changed, or removed wines -The app tracks the last applied delta date in Room and only downloads what it hasn't seen yet. A GitHub Action automatically regenerates the delta files and updates the manifest whenever the source catalog changes. +The app tracks the last applied delta date in Room and only downloads what it hasn't seen yet. A GitHub Action automatically regenerates the delta files and updates the manifest whenever the source catalogue changes. -> Want to add wines to the catalog? Contributions are welcome in the [catalog branch]()! Add your own issue/pull request! +> Want to add wines to the catalogue? Contributions are welcome in the [catalog branch](https://github.com/T0liver/ViNotes/tree/catalogue)! Add your own issue/pull request! ## Getting Started @@ -115,10 +115,10 @@ adb install app/build/outputs/apk/debug/app-debug.apk ### Download -| Source | Link | -|------------|----------------------------| -| F-Droid | *coming soon* | -| Direct APK | [Releases](../../releases) | +| Source | Link | +|------------|----------------------------------------------------------------| +| F-Droid | *coming soon* | +| Direct APK | [Releases](https://github.com/T0liver/ViNotes/releases/latest) | --- @@ -126,9 +126,9 @@ adb install app/build/outputs/apk/debug/app-debug.apk Contributions of all kinds are welcome! -- 🐛 **Found a bug?** Open an [issue](../../issues) with steps to reproduce +- 🐛 **Found a bug?** Open an [issue](https://github.com/T0liver/ViNotes/issues) with steps to reproduce - 💡 **Have an idea?** Open an issue with the `enhancement` label -- đŸ· **Know your wines?** Add entries to the [wine catalog]() +- đŸ· **Know your wines?** Add entries to the [wine catalog](https://github.com/T0liver/ViNotes/tree/catalogue/source)! - 🔧 **Want to code?** Fork the repo and open a pull request — please discuss larger changes in an issue first ### A few guidelines diff --git a/app/build.gradle.kts b/app/build.gradle.kts index a5a4be6..f22ea08 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -21,7 +21,7 @@ android { //noinspection OldTargetApi ... like why. the andorid 17 (sdk level 37) is still not out, why do you want to target it? also, the compile sdk is 36, so you can't target 37. just stop. targetSdk = 36 versionCode = 1 - versionName = "1.0-alpha" + versionName = "1.0.0" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" } @@ -36,8 +36,15 @@ android { } buildTypes { + getByName("debug") { + isDebuggable = true + } getByName("release") { - signingConfig = signingConfigs.getByName("release") + signingConfig = if (file("release.keystore").exists()) { + signingConfigs.getByName("release") + } else { + signingConfigs.getByName("debug") + } isMinifyEnabled = true proguardFiles( getDefaultProguardFile("proguard-android-optimize.txt"), diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index b67b30f..466720a 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -11,6 +11,7 @@ android:allowBackup="true" android:dataExtractionRules="@xml/data_extraction_rules" android:fullBackupContent="@xml/backup_rules" + android:localeConfig="@xml/locales_config" android:icon="@drawable/vinotes" android:label="@string/app_name" android:roundIcon="@drawable/vinotes" diff --git a/app/src/main/java/hu/toliver/vinotes/MainActivity.kt b/app/src/main/java/hu/toliver/vinotes/MainActivity.kt index c541eeb..a378ada 100644 --- a/app/src/main/java/hu/toliver/vinotes/MainActivity.kt +++ b/app/src/main/java/hu/toliver/vinotes/MainActivity.kt @@ -5,19 +5,19 @@ import androidx.activity.ComponentActivity import androidx.activity.compose.setContent import androidx.activity.enableEdgeToEdge import androidx.appcompat.app.AppCompatDelegate -import androidx.core.os.LocaleListCompat import androidx.compose.foundation.isSystemInDarkTheme import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect -import androidx.compose.ui.tooling.preview.Preview -import androidx.compose.runtime.collectAsState +import androidx.lifecycle.compose.collectAsStateWithLifecycle import androidx.compose.runtime.getValue +import androidx.compose.ui.tooling.preview.Preview +import androidx.core.os.LocaleListCompat import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel -import hu.toliver.vinotes.ui.screen.settings.ThemeViewModel +import dagger.hilt.android.AndroidEntryPoint import hu.toliver.vinotes.domain.model.enums.AppLanguage import hu.toliver.vinotes.domain.model.enums.ThemeMode -import dagger.hilt.android.AndroidEntryPoint import hu.toliver.vinotes.ui.navigation.VinNoteNavGraph +import hu.toliver.vinotes.ui.screen.settings.ThemeViewModel import hu.toliver.vinotes.ui.theme.ViNotesTheme @AndroidEntryPoint @@ -35,8 +35,8 @@ class MainActivity : ComponentActivity() { @Composable private fun MainActivityContent() { val vm: ThemeViewModel = hiltViewModel() - val theme by vm.themeMode.collectAsState() - val language by vm.appLanguage.collectAsState() + val theme by vm.themeMode.collectAsStateWithLifecycle() + val language by vm.appLanguage.collectAsStateWithLifecycle() LaunchedEffect(language) { AppCompatDelegate.setApplicationLocales(language.toLocaleListCompat()) diff --git a/app/src/main/java/hu/toliver/vinotes/ViNotesApplication.kt b/app/src/main/java/hu/toliver/vinotes/ViNotesApplication.kt index e57f6b2..ebde71e 100644 --- a/app/src/main/java/hu/toliver/vinotes/ViNotesApplication.kt +++ b/app/src/main/java/hu/toliver/vinotes/ViNotesApplication.kt @@ -1,6 +1,5 @@ package hu.toliver.vinotes -import android.app.Activity import android.app.Application import dagger.hilt.android.HiltAndroidApp diff --git a/app/src/main/java/hu/toliver/vinotes/data/repository/TasteRepositoryImpl.kt b/app/src/main/java/hu/toliver/vinotes/data/repository/TasteRepositoryImpl.kt index e917638..adddd64 100644 --- a/app/src/main/java/hu/toliver/vinotes/data/repository/TasteRepositoryImpl.kt +++ b/app/src/main/java/hu/toliver/vinotes/data/repository/TasteRepositoryImpl.kt @@ -1,15 +1,14 @@ package hu.toliver.vinotes.data.repository -import hu.toliver.vinotes.R import hu.toliver.vinotes.data.dao.TasteDao import hu.toliver.vinotes.data.local.entity.toDomain import hu.toliver.vinotes.data.local.entity.toEntity import hu.toliver.vinotes.domain.model.Taste import hu.toliver.vinotes.domain.repository.TasteRepository +import java.util.UUID import javax.inject.Inject import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.map -import java.util.UUID class TasteRepositoryImpl @Inject constructor( private val dao: TasteDao @@ -22,12 +21,12 @@ class TasteRepositoryImpl @Inject constructor( dao.getByWineId(wineId).map { entities -> entities.map { it.toDomain() } } override suspend fun getById(id: String): Result = runCatching { - dao.getById(id)?.toDomain() ?: error(R.string.tasting_not_found_id.toString() + id) + dao.getById(id)?.toDomain() ?: error("Tasting not found: $id") } override suspend fun save(taste: Taste): Result = runCatching { - val id = UUID.randomUUID().toString() - dao.insert(taste.toEntity(id = id)) + val idToUse = taste.id.ifBlank { UUID.randomUUID().toString() } + dao.insert(taste.toEntity(id = idToUse)) } override suspend fun update(taste: Taste): Result = runCatching { diff --git a/app/src/main/java/hu/toliver/vinotes/data/repository/WineRepositoryImpl.kt b/app/src/main/java/hu/toliver/vinotes/data/repository/WineRepositoryImpl.kt index 89ac983..96aa3d7 100644 --- a/app/src/main/java/hu/toliver/vinotes/data/repository/WineRepositoryImpl.kt +++ b/app/src/main/java/hu/toliver/vinotes/data/repository/WineRepositoryImpl.kt @@ -1,6 +1,5 @@ package hu.toliver.vinotes.data.repository -import hu.toliver.vinotes.R import hu.toliver.vinotes.data.dao.WineDao import hu.toliver.vinotes.data.local.entity.toDomain import hu.toliver.vinotes.data.local.entity.toEntity @@ -22,7 +21,7 @@ class WineRepositoryImpl @Inject constructor( dao.searchWines(query).map { entities -> entities.map { it.toDomain() } } override suspend fun getById(id: String): Result = runCatching { - dao.getById(id)?.toDomain() ?: error(R.string.not_found_id.toString() + id) + dao.getById(id)?.toDomain() ?: error("Wine not found: $id") } override fun getFiltered( diff --git a/app/src/main/java/hu/toliver/vinotes/domain/usecases/taste/DeleteTastingUseCase.kt b/app/src/main/java/hu/toliver/vinotes/domain/usecases/taste/DeleteTastingUseCase.kt deleted file mode 100644 index 5e7b5b9..0000000 --- a/app/src/main/java/hu/toliver/vinotes/domain/usecases/taste/DeleteTastingUseCase.kt +++ /dev/null @@ -1,10 +0,0 @@ -package hu.toliver.vinotes.domain.usecases.taste - -import hu.toliver.vinotes.domain.repository.TasteRepository -import javax.inject.Inject - -class DeleteTastingUseCase @Inject constructor ( - private val repository: TasteRepository -) { - suspend operator fun invoke(id: String): Result = repository.delete(id) -} \ No newline at end of file diff --git a/app/src/main/java/hu/toliver/vinotes/domain/usecases/taste/GetTasteByIDUseCase.kt b/app/src/main/java/hu/toliver/vinotes/domain/usecases/taste/GetTasteByIDUseCase.kt deleted file mode 100644 index 8526942..0000000 --- a/app/src/main/java/hu/toliver/vinotes/domain/usecases/taste/GetTasteByIDUseCase.kt +++ /dev/null @@ -1,10 +0,0 @@ -package hu.toliver.vinotes.domain.usecases.taste - -import hu.toliver.vinotes.domain.repository.TasteRepository -import javax.inject.Inject - -class GetTasteByIDUseCase @Inject constructor( - private val repository: TasteRepository -) { - suspend operator fun invoke(id: String) = repository.getById(id) -} \ No newline at end of file diff --git a/app/src/main/java/hu/toliver/vinotes/domain/usecases/taste/GetTastingByWineUseCase.kt b/app/src/main/java/hu/toliver/vinotes/domain/usecases/taste/GetTastingByWineUseCase.kt index ccd073d..d39ed89 100644 --- a/app/src/main/java/hu/toliver/vinotes/domain/usecases/taste/GetTastingByWineUseCase.kt +++ b/app/src/main/java/hu/toliver/vinotes/domain/usecases/taste/GetTastingByWineUseCase.kt @@ -6,5 +6,5 @@ import javax.inject.Inject class GetTastingByWineUseCase @Inject constructor( private val repository: TasteRepository ) { - suspend operator fun invoke(wineId: String) = repository.getByWineId(wineId) + operator fun invoke(wineId: String) = repository.getByWineId(wineId) } \ No newline at end of file diff --git a/app/src/main/java/hu/toliver/vinotes/domain/usecases/taste/SaveTastingUseCase.kt b/app/src/main/java/hu/toliver/vinotes/domain/usecases/taste/SaveTastingUseCase.kt deleted file mode 100644 index 50e9266..0000000 --- a/app/src/main/java/hu/toliver/vinotes/domain/usecases/taste/SaveTastingUseCase.kt +++ /dev/null @@ -1,17 +0,0 @@ -package hu.toliver.vinotes.domain.usecases.taste - -import hu.toliver.vinotes.domain.model.Taste -import hu.toliver.vinotes.domain.model.Wine -import hu.toliver.vinotes.domain.repository.TasteRepository -import hu.toliver.vinotes.domain.repository.WineRepository -import javax.inject.Inject - -class SaveTastingUseCase @Inject constructor( - private val tasteRepository: TasteRepository, - private val wineRepository: WineRepository -) { - suspend operator fun invoke(taste: Taste, wine: Wine): Result { - wineRepository.insertIfNotExists(wine) - return tasteRepository.save(taste) - } -} \ No newline at end of file diff --git a/app/src/main/java/hu/toliver/vinotes/domain/usecases/taste/UpdateTasingUseCase.kt b/app/src/main/java/hu/toliver/vinotes/domain/usecases/taste/UpdateTasingUseCase.kt deleted file mode 100644 index f715ae5..0000000 --- a/app/src/main/java/hu/toliver/vinotes/domain/usecases/taste/UpdateTasingUseCase.kt +++ /dev/null @@ -1,13 +0,0 @@ -package hu.toliver.vinotes.domain.usecases.taste - -import hu.toliver.vinotes.domain.model.Taste -import hu.toliver.vinotes.domain.repository.TasteRepository -import javax.inject.Inject - -class UpdateTasingUseCase @Inject constructor( - private val repository: TasteRepository -) { - suspend operator fun invoke(taste: Taste): Result { - return repository.update(taste) - } -} \ No newline at end of file diff --git a/app/src/main/java/hu/toliver/vinotes/ui/screen/UIConverter.kt b/app/src/main/java/hu/toliver/vinotes/ui/screen/UIConverter.kt index 5f97e7c..79c3ca0 100644 --- a/app/src/main/java/hu/toliver/vinotes/ui/screen/UIConverter.kt +++ b/app/src/main/java/hu/toliver/vinotes/ui/screen/UIConverter.kt @@ -174,4 +174,25 @@ object UIConverter { TasteWineColour.TAWNY -> Color(0xFF8B4513) TasteWineColour.REDBROWN -> Color(0xFF8B3A3A) } + + fun TasteWineColour.toDisplayName(context: Context): String = when (this) { + TasteWineColour.WHITE -> context.getString(R.string.white) + TasteWineColour.LEMONGREEN -> context.getString(R.string.lemongreen) + TasteWineColour.LEMON -> context.getString(R.string.lemon) + TasteWineColour.GOLD -> context.getString(R.string.gold) + TasteWineColour.AMBER -> context.getString(R.string.amber) + TasteWineColour.WHITEBROWN -> context.getString(R.string.whitebrown) + + TasteWineColour.ROSE -> context.getString(R.string.rose) + TasteWineColour.PINK -> context.getString(R.string.pink) + TasteWineColour.SALMON -> context.getString(R.string.salmon) + TasteWineColour.ORANGE -> context.getString(R.string.orange) + + TasteWineColour.RED -> context.getString(R.string.red) + TasteWineColour.PURPLE -> context.getString(R.string.purple) + TasteWineColour.RUBY -> context.getString(R.string.ruby) + TasteWineColour.GARNET -> context.getString(R.string.garnet) + TasteWineColour.TAWNY -> context.getString(R.string.tawny) + TasteWineColour.REDBROWN -> context.getString(R.string.redbrown) + } } \ No newline at end of file diff --git a/app/src/main/java/hu/toliver/vinotes/ui/screen/addtasting/AddTastingViewModel.kt b/app/src/main/java/hu/toliver/vinotes/ui/screen/addtasting/AddTastingViewModel.kt index fc980f1..5736d08 100644 --- a/app/src/main/java/hu/toliver/vinotes/ui/screen/addtasting/AddTastingViewModel.kt +++ b/app/src/main/java/hu/toliver/vinotes/ui/screen/addtasting/AddTastingViewModel.kt @@ -1,8 +1,10 @@ package hu.toliver.vinotes.ui.screen.addtasting +import android.content.Context import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import dagger.hilt.android.lifecycle.HiltViewModel +import dagger.hilt.android.qualifiers.ApplicationContext import hu.toliver.vinotes.R import hu.toliver.vinotes.domain.model.Taste import hu.toliver.vinotes.domain.usecases.location.GetCurrentLocationUseCase @@ -19,11 +21,11 @@ import kotlinx.coroutines.flow.receiveAsFlow import kotlinx.coroutines.flow.update import kotlinx.coroutines.launch import kotlinx.coroutines.withTimeout -import java.util.UUID import javax.inject.Inject @HiltViewModel class AddTastingViewModel @Inject constructor( + @param:ApplicationContext private val context: Context, private val addTaste: AddTasteUseCase, private val updateTaste: UpdateTasteUseCase, private val getTasteById: GetTasteByIdUseCase, @@ -93,7 +95,7 @@ class AddTastingViewModel @Inject constructor( AddTastingEvent.OnLocationPermissionGranted -> fetchLocation() AddTastingEvent.OnLocationPermissionDenied -> { viewModelScope.launch { - emitLocationError(R.string.location_permission_missing.toString()) + emitLocationError(context.getString(R.string.location_permission_missing)) } } @@ -129,17 +131,17 @@ class AddTastingViewModel @Inject constructor( longitude = longitude, ) } - emitLocationError(error.message ?: R.string.reverse_geocoding_failed.toString()) + emitLocationError(error.message ?: context.getString(R.string.reverse_geocoding_failed)) } } .onFailure { error -> _state.update { it.copy(isLoadingLocation = false) } - emitLocationError(error.message ?: R.string.failed_to_fetch_location.toString()) + emitLocationError(error.message ?: context.getString(R.string.failed_to_fetch_location)) } } } catch (_: TimeoutCancellationException) { _state.update { it.copy(isLoadingLocation = false) } - emitLocationError(R.string.location_fetch_timed_out.toString()) + emitLocationError(context.getString(R.string.location_fetch_timed_out)) } } } @@ -197,11 +199,11 @@ class AddTastingViewModel @Inject constructor( val s = _state.value if (s.wineId.isBlank()) { _state.value = _state.value.copy(isSaving = false) - _effect.send(AddTastingEffect.ShowSnackbar(R.string.please_select_a_wine_first.toString())) + _effect.send(AddTastingEffect.ShowSnackbar(context.getString(R.string.please_select_a_wine_first))) return@launch } val taste = Taste( - id = s.editingTasteId ?: UUID.randomUUID().toString(), + id = s.editingTasteId ?: "", clarity = s.clarity, colourIntensity = s.colourIntensity, colour = s.colour, @@ -237,8 +239,13 @@ class AddTastingViewModel @Inject constructor( } .onFailure { e -> _state.value = _state.value.copy(isSaving = false) - viewModelScope.launch { _effect.send(AddTastingEffect.ShowSnackbar(e.message ?: - R.string.error_on_save.toString())) } + viewModelScope.launch { + _effect.send( + AddTastingEffect.ShowSnackbar( + e.message ?: context.getString(R.string.error_on_save) + ) + ) + } } } } diff --git a/app/src/main/java/hu/toliver/vinotes/ui/screen/addtasting/components/TastingSlider.kt b/app/src/main/java/hu/toliver/vinotes/ui/screen/addtasting/components/TastingSlider.kt index eb47b1f..bd61b64 100644 --- a/app/src/main/java/hu/toliver/vinotes/ui/screen/addtasting/components/TastingSlider.kt +++ b/app/src/main/java/hu/toliver/vinotes/ui/screen/addtasting/components/TastingSlider.kt @@ -20,6 +20,11 @@ import androidx.compose.runtime.getValue import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp +import hu.toliver.vinotes.domain.model.enums.Intensity +import hu.toliver.vinotes.domain.model.enums.Level +import hu.toliver.vinotes.domain.model.enums.WineColourIntensity +import hu.toliver.vinotes.domain.model.enums.WineSweetness +import hu.toliver.vinotes.ui.screen.UIConverter.toDisplayName import kotlin.math.roundToInt /** @@ -48,6 +53,15 @@ fun TastingSlider( label = "slider_$label", ) + val currentText = when (current) { + is WineColourIntensity -> current.toDisplayName() + is Intensity -> current.toDisplayName() + is WineSweetness -> current.toDisplayName() + is Level -> current.toDisplayName() + else -> current.toString().replace("_", " ").lowercase() + .replaceFirstChar { it.uppercase() } + } + Column(modifier = modifier) { Row( modifier = Modifier @@ -61,8 +75,7 @@ fun TastingSlider( color = MaterialTheme.colorScheme.primaryContainer, ) { Text( - text = current.toString().replace("_", " ").lowercase() - .replaceFirstChar { it.uppercase() }, + text = currentText, style = MaterialTheme.typography.labelSmall, color = MaterialTheme.colorScheme.onPrimaryContainer, modifier = Modifier.padding(horizontal = 8.dp, vertical = 3.dp), diff --git a/app/src/main/java/hu/toliver/vinotes/ui/screen/addtasting/components/WineColourPicker.kt b/app/src/main/java/hu/toliver/vinotes/ui/screen/addtasting/components/WineColourPicker.kt index a9138cf..5410dd9 100644 --- a/app/src/main/java/hu/toliver/vinotes/ui/screen/addtasting/components/WineColourPicker.kt +++ b/app/src/main/java/hu/toliver/vinotes/ui/screen/addtasting/components/WineColourPicker.kt @@ -21,7 +21,9 @@ import androidx.compose.runtime.getValue import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip import androidx.compose.ui.draw.scale +import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp +import hu.toliver.vinotes.R import hu.toliver.vinotes.ui.screen.UIConverter.toHexColour import hu.toliver.vinotes.domain.model.enums.TasteWineColour @@ -32,7 +34,7 @@ fun WineColourPicker( modifier: Modifier = Modifier, ) { Column(modifier = modifier) { - Text("Colour", style = MaterialTheme.typography.titleMedium) + Text(stringResource(R.string.colour), style = MaterialTheme.typography.titleMedium) Spacer(Modifier.height(12.dp)) FlowRow( horizontalArrangement = Arrangement.spacedBy(10.dp), diff --git a/app/src/main/java/hu/toliver/vinotes/ui/screen/addtasting/steps/SummaryStepContent.kt b/app/src/main/java/hu/toliver/vinotes/ui/screen/addtasting/steps/SummaryStepContent.kt index ba6b60d..75178e9 100644 --- a/app/src/main/java/hu/toliver/vinotes/ui/screen/addtasting/steps/SummaryStepContent.kt +++ b/app/src/main/java/hu/toliver/vinotes/ui/screen/addtasting/steps/SummaryStepContent.kt @@ -7,22 +7,22 @@ import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.width import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.material.icons.Icons import androidx.compose.material.icons.outlined.CalendarToday import androidx.compose.material.icons.outlined.MyLocation -import androidx.compose.foundation.layout.padding import androidx.compose.material3.CircularProgressIndicator +import androidx.compose.material3.DatePicker +import androidx.compose.material3.DatePickerDialog import androidx.compose.material3.Icon import androidx.compose.material3.IconButton +import androidx.compose.material3.MaterialTheme.typography import androidx.compose.material3.OutlinedButton import androidx.compose.material3.OutlinedTextField import androidx.compose.material3.Text -import androidx.compose.material3.DatePicker -import androidx.compose.material3.DatePickerDialog -import androidx.compose.material3.MaterialTheme.typography import androidx.compose.material3.TextButton import androidx.compose.material3.rememberDatePickerState import androidx.compose.runtime.Composable @@ -31,6 +31,7 @@ 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.LocalLocale import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import hu.toliver.vinotes.R @@ -40,8 +41,6 @@ import hu.toliver.vinotes.ui.screen.addtasting.components.RatingArcSlider import hu.toliver.vinotes.ui.screen.addtasting.components.WouldDrinkAgainToggle import java.text.SimpleDateFormat import java.util.Date -import java.util.Locale -import androidx.compose.ui.platform.LocalLocale @Composable fun SummaryStepContent( diff --git a/app/src/main/java/hu/toliver/vinotes/ui/screen/dashboard/DashboardScreen.kt b/app/src/main/java/hu/toliver/vinotes/ui/screen/dashboard/DashboardScreen.kt index 37fea72..52ea2ef 100644 --- a/app/src/main/java/hu/toliver/vinotes/ui/screen/dashboard/DashboardScreen.kt +++ b/app/src/main/java/hu/toliver/vinotes/ui/screen/dashboard/DashboardScreen.kt @@ -28,7 +28,6 @@ import androidx.compose.material3.pulltorefresh.PullToRefreshBox import androidx.compose.material3.pulltorefresh.rememberPullToRefreshState import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect -import androidx.compose.runtime.collectAsState import androidx.compose.runtime.getValue import androidx.compose.runtime.remember import androidx.compose.ui.Alignment @@ -37,6 +36,7 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel +import androidx.lifecycle.compose.collectAsStateWithLifecycle import hu.toliver.vinotes.R import hu.toliver.vinotes.ui.screen.dashboard.components.DashboardHeader import hu.toliver.vinotes.ui.screen.dashboard.components.EmptyTastingsPlaceholder @@ -54,7 +54,7 @@ fun DashboardScreen( onNavigateToTastingDetail: (tasteId: String) -> Unit, onNavigateToWineSelection: () -> Unit, ) { - val state by viewModel.state.collectAsState() + val state by viewModel.state.collectAsStateWithLifecycle() val snackbarHostState = remember { SnackbarHostState() } LaunchedEffect(Unit) { diff --git a/app/src/main/java/hu/toliver/vinotes/ui/screen/dashboard/DashboardViewModel.kt b/app/src/main/java/hu/toliver/vinotes/ui/screen/dashboard/DashboardViewModel.kt index 0e45047..ab0ca83 100644 --- a/app/src/main/java/hu/toliver/vinotes/ui/screen/dashboard/DashboardViewModel.kt +++ b/app/src/main/java/hu/toliver/vinotes/ui/screen/dashboard/DashboardViewModel.kt @@ -127,10 +127,11 @@ class DashboardViewModel @Inject constructor( } catch (e: CancellationException) { throw e } catch (e: Exception) { + val message = e.message ?: context.getString(R.string.unknown_error) _state.update { - it.copy(isLoading = false, errorMessage = e.message ?: R.string.unknown_error.toString()) + it.copy(isLoading = false, errorMessage = message) } - _effect.send(DashboardEffect.ShowError(e.message ?: R.string.unknown_error.toString())) + _effect.send(DashboardEffect.ShowError(message)) } } } diff --git a/app/src/main/java/hu/toliver/vinotes/ui/screen/settings/SettingsScreen.kt b/app/src/main/java/hu/toliver/vinotes/ui/screen/settings/SettingsScreen.kt index cbdcd21..09fb508 100644 --- a/app/src/main/java/hu/toliver/vinotes/ui/screen/settings/SettingsScreen.kt +++ b/app/src/main/java/hu/toliver/vinotes/ui/screen/settings/SettingsScreen.kt @@ -1,41 +1,39 @@ package hu.toliver.vinotes.ui.screen.settings +import androidx.activity.compose.rememberLauncherForActivityResult +import androidx.activity.result.contract.ActivityResultContracts import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.PaddingValues +import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.padding -import androidx.compose.foundation.layout.Column -import androidx.compose.foundation.layout.Row -import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.lazy.LazyColumn -import androidx.activity.compose.rememberLauncherForActivityResult -import androidx.activity.result.contract.ActivityResultContracts import androidx.compose.material.icons.Icons import androidx.compose.material.icons.automirrored.filled.ArrowBack import androidx.compose.material.icons.outlined.CloudSync import androidx.compose.material.icons.outlined.DeleteForever import androidx.compose.material.icons.outlined.Edit import androidx.compose.material.icons.outlined.FileUpload -import androidx.compose.material.icons.outlined.Language import androidx.compose.material.icons.outlined.ModeNight +import androidx.compose.material3.AlertDialog import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.Icon import androidx.compose.material3.IconButton import androidx.compose.material3.MaterialTheme.colorScheme import androidx.compose.material3.MaterialTheme.typography +import androidx.compose.material3.RadioButton import androidx.compose.material3.Scaffold import androidx.compose.material3.SnackbarHost import androidx.compose.material3.SnackbarHostState import androidx.compose.material3.Text -import androidx.compose.material3.AlertDialog -import androidx.compose.material3.RadioButton import androidx.compose.material3.TextButton import androidx.compose.material3.TopAppBar import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect -import androidx.compose.runtime.collectAsState import androidx.compose.runtime.getValue import androidx.compose.runtime.remember import androidx.compose.ui.Alignment @@ -44,7 +42,10 @@ import androidx.compose.ui.platform.LocalUriHandler import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel +import androidx.lifecycle.compose.collectAsStateWithLifecycle import hu.toliver.vinotes.R +import hu.toliver.vinotes.domain.model.enums.AppLanguage +import hu.toliver.vinotes.domain.model.enums.ThemeMode import hu.toliver.vinotes.ui.screen.settings.components.AboutInfoDialog import hu.toliver.vinotes.ui.screen.settings.components.AboutSection import hu.toliver.vinotes.ui.screen.settings.components.ClearDataConfirmDialog @@ -52,8 +53,6 @@ import hu.toliver.vinotes.ui.screen.settings.components.SettingsActionItem import hu.toliver.vinotes.ui.screen.settings.components.SettingsSectionHeader import hu.toliver.vinotes.ui.screen.settings.components.UrlEditDialog import hu.toliver.vinotes.ui.screen.settings.components.UsernameEditDialog -import hu.toliver.vinotes.domain.model.enums.AppLanguage -import hu.toliver.vinotes.domain.model.enums.ThemeMode import kotlinx.coroutines.flow.collectLatest @OptIn(ExperimentalMaterial3Api::class) @@ -62,7 +61,7 @@ fun SettingsScreen( viewModel: SettingsViewModel = hiltViewModel(), onNavigateUp: () -> Unit, ) { - val state by viewModel.state.collectAsState() + val state by viewModel.state.collectAsStateWithLifecycle() val snackbarHostState = remember { SnackbarHostState() } val uriHandler = LocalUriHandler.current val importFileLauncher = rememberLauncherForActivityResult( @@ -245,7 +244,14 @@ fun SettingsScreen( onClick = { viewModel.onEvent(SettingsEvent.ThemeClicked) }, ) } - +/* +This will be removed for release 1.0, I can't manage to work the change work, + Google should fix the damn AppCompatDelegate.setApplicationLocales already, + it's been months, and it still does not work, even though it returns the correct + locale list and logs show that the app language is changed, + the locale just does not change at all. + So for now, I'm hiding the option to change app language in the settings, + it will be only changeable through system settings, which works just fine. item { SettingsActionItem( icon = Icons.Outlined.Language, @@ -258,7 +264,7 @@ fun SettingsScreen( onClick = { viewModel.onEvent(SettingsEvent.LanguageClicked) }, ) } - +*/ item { SettingsSectionHeader(stringResource(R.string.synchronization)) } item { SettingsActionItem( diff --git a/app/src/main/java/hu/toliver/vinotes/ui/screen/settings/SettingsViewModel.kt b/app/src/main/java/hu/toliver/vinotes/ui/screen/settings/SettingsViewModel.kt index ea8085f..6c684f9 100644 --- a/app/src/main/java/hu/toliver/vinotes/ui/screen/settings/SettingsViewModel.kt +++ b/app/src/main/java/hu/toliver/vinotes/ui/screen/settings/SettingsViewModel.kt @@ -1,11 +1,15 @@ package hu.toliver.vinotes.ui.screen.settings import android.content.Context +import android.util.Log +import androidx.appcompat.app.AppCompatDelegate +import androidx.core.os.LocaleListCompat import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import dagger.hilt.android.lifecycle.HiltViewModel import dagger.hilt.android.qualifiers.ApplicationContext import hu.toliver.vinotes.R +import hu.toliver.vinotes.domain.model.enums.AppLanguage import hu.toliver.vinotes.domain.usecases.catalog.ImportFromFileUseCase import hu.toliver.vinotes.domain.usecases.catalog.PerformDeltaSyncUseCase import hu.toliver.vinotes.domain.usecases.catalog.PerformFullImportUseCase @@ -236,6 +240,17 @@ class SettingsViewModel @Inject constructor( is SettingsEvent.LanguageSelected -> viewModelScope.launch { saveAppLanguage(event.language) _state.update { it.copy(showLanguageDialog = false, appLanguage = event.language) } + val appLocale = LocaleListCompat.forLanguageTags( + when (event.language) { + AppLanguage.SYSTEM -> "" + AppLanguage.ENGLISH -> "en" + AppLanguage.HUNGARIAN -> "hu" + } + ) + Log.d("LOCALE", "App language changed to ${event.language}, setting app locales to $appLocale") + AppCompatDelegate.setApplicationLocales(appLocale) + // this here does not set the locale at all. + Log.d("LOCALE", "Current application locales: ${AppCompatDelegate.getApplicationLocales()}") } SettingsEvent.LanguageDialogDismissed -> _state.update { diff --git a/app/src/main/java/hu/toliver/vinotes/ui/screen/stats/StatsScreen.kt b/app/src/main/java/hu/toliver/vinotes/ui/screen/stats/StatsScreen.kt index 2f4a98c..2718617 100644 --- a/app/src/main/java/hu/toliver/vinotes/ui/screen/stats/StatsScreen.kt +++ b/app/src/main/java/hu/toliver/vinotes/ui/screen/stats/StatsScreen.kt @@ -12,6 +12,7 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color.Companion.Transparent import androidx.compose.ui.unit.dp import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel +import androidx.lifecycle.compose.collectAsStateWithLifecycle import hu.toliver.vinotes.domain.model.FullStatsData import hu.toliver.vinotes.ui.screen.stats.charts.* import hu.toliver.vinotes.ui.screen.stats.components.* @@ -24,7 +25,7 @@ import hu.toliver.vinotes.R fun StatsScreen( viewModel: StatsViewModel = hiltViewModel(), ) { - val state by viewModel.state.collectAsState() + val state by viewModel.state.collectAsStateWithLifecycle() val playedSections = remember { mutableStateMapOf() } fun shouldPlay(id: String) = playedSections[id] != true fun markPlayed(id: String) { playedSections[id] = true } @@ -51,14 +52,16 @@ fun StatsScreen( ) } - else -> StatsContent( - state = state, - data = state.data!!, - onEvent = viewModel::onEvent, - modifier = Modifier.padding(innerPadding), - shouldPlay = ::shouldPlay, - markPlayed = ::markPlayed, - ) + else -> state.data?.let { data -> + StatsContent( + state = state, + data = data, + onEvent = viewModel::onEvent, + modifier = Modifier.padding(innerPadding), + shouldPlay = ::shouldPlay, + markPlayed = ::markPlayed, + ) + } } } } diff --git a/app/src/main/java/hu/toliver/vinotes/ui/screen/tastingdetail/TastingDetailScreen.kt b/app/src/main/java/hu/toliver/vinotes/ui/screen/tastingdetail/TastingDetailScreen.kt index 9294461..65a0d75 100644 --- a/app/src/main/java/hu/toliver/vinotes/ui/screen/tastingdetail/TastingDetailScreen.kt +++ b/app/src/main/java/hu/toliver/vinotes/ui/screen/tastingdetail/TastingDetailScreen.kt @@ -179,11 +179,11 @@ fun TastingDetailContent( item { SensoryProfileChart( entries = listOf( - R.string.acidity.toString() to uiData.acidity.second, - R.string.tannin.toString() to uiData.tannin.second, - R.string.body.toString() to uiData.body.second, - R.string.alcohol.toString() to uiData.alcohol.second, - R.string.finish.toString() to uiData.finish.second, + stringResource(R.string.acidity) to uiData.acidity.second, + stringResource(R.string.tannin) to uiData.tannin.second, + stringResource(R.string.body) to uiData.body.second, + stringResource(R.string.alcohol) to uiData.alcohol.second, + stringResource(R.string.finish) to uiData.finish.second, ), ) } diff --git a/app/src/main/java/hu/toliver/vinotes/ui/screen/tastingdetail/TastingDetailViewModel.kt b/app/src/main/java/hu/toliver/vinotes/ui/screen/tastingdetail/TastingDetailViewModel.kt index c86cbb4..a3f3d99 100644 --- a/app/src/main/java/hu/toliver/vinotes/ui/screen/tastingdetail/TastingDetailViewModel.kt +++ b/app/src/main/java/hu/toliver/vinotes/ui/screen/tastingdetail/TastingDetailViewModel.kt @@ -1,9 +1,11 @@ package hu.toliver.vinotes.ui.screen.tastingdetail +import android.content.Context import androidx.lifecycle.SavedStateHandle import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import dagger.hilt.android.lifecycle.HiltViewModel +import dagger.hilt.android.qualifiers.ApplicationContext import hu.toliver.vinotes.R import hu.toliver.vinotes.domain.usecases.taste.DeleteTasteUseCase import hu.toliver.vinotes.domain.usecases.taste.GetTasteWithWineUseCase @@ -17,6 +19,7 @@ import javax.inject.Inject @HiltViewModel class TastingDetailViewModel @Inject constructor( + @param:ApplicationContext private val context: Context, private val savedStateHandle: SavedStateHandle, private val getTasteWithWine: GetTasteWithWineUseCase, private val deleteTaste: DeleteTasteUseCase, @@ -52,7 +55,7 @@ class TastingDetailViewModel @Inject constructor( _state.value = _state.value.copy(showDeleteDialog = false) _effect.send(TastingDetailEffect.NavigateUp) } - .onFailure { e -> _effect.send(TastingDetailEffect.ShowSnackbar(e.message ?: R.string.error_on_delete.toString())) } + .onFailure { e -> _effect.send(TastingDetailEffect.ShowSnackbar(e.message ?: context.getString(R.string.error_on_delete))) } } TastingDetailEvent.DeleteTastingDismissed -> @@ -63,7 +66,7 @@ class TastingDetailViewModel @Inject constructor( private fun loadData() { val currentTasteId = savedStateHandle.get("tasteId") ?: "" if (currentTasteId.isEmpty()) { - _state.value = _state.value.copy(isLoading = false, errorMessage = R.string.tasting_id_is_missing.toString()) + _state.value = _state.value.copy(isLoading = false, errorMessage = context.getString(R.string.tasting_id_is_missing)) return } @@ -80,7 +83,7 @@ class TastingDetailViewModel @Inject constructor( .onFailure { e -> _state.value = _state.value.copy( isLoading = false, - errorMessage = e.message ?: R.string.the_tasting_could_not_be_found.toString() + errorMessage = e.message ?: context.getString(R.string.the_tasting_could_not_be_found) ) } } diff --git a/app/src/main/java/hu/toliver/vinotes/ui/screen/tastingdetail/components/TastingDetailUiMapper.kt b/app/src/main/java/hu/toliver/vinotes/ui/screen/tastingdetail/components/TastingDetailUiMapper.kt index bc864fd..9782441 100644 --- a/app/src/main/java/hu/toliver/vinotes/ui/screen/tastingdetail/components/TastingDetailUiMapper.kt +++ b/app/src/main/java/hu/toliver/vinotes/ui/screen/tastingdetail/components/TastingDetailUiMapper.kt @@ -61,7 +61,7 @@ fun Taste.toUiData(wine: Wine, context: Context): TastingDetailUiData { clarity = this.clarity.toDisplayName(context.resources), colourIntensity = this.colourIntensity.toDisplayName(context.resources), - colour = this.colour.name, + colour = this.colour.toDisplayName(context), otherVisual = this.otherVisual, noseIntensity = this.noseIntensity.toDisplayName(context.resources), diff --git a/app/src/main/java/hu/toliver/vinotes/ui/screen/tastingdetail/components/TastingParametersCard.kt b/app/src/main/java/hu/toliver/vinotes/ui/screen/tastingdetail/components/TastingParametersCard.kt index e87d886..98bad58 100644 --- a/app/src/main/java/hu/toliver/vinotes/ui/screen/tastingdetail/components/TastingParametersCard.kt +++ b/app/src/main/java/hu/toliver/vinotes/ui/screen/tastingdetail/components/TastingParametersCard.kt @@ -12,6 +12,7 @@ import androidx.compose.material3.MaterialTheme.typography import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier +import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.dp @Composable @@ -41,7 +42,7 @@ fun TastingParametersCard( text = value, style = typography.bodyMedium, color = colorScheme.onSurface, - fontWeight = androidx.compose.ui.text.font.FontWeight.SemiBold, + fontWeight = FontWeight.SemiBold, ) } } diff --git a/app/src/main/java/hu/toliver/vinotes/ui/screen/winedetail/WineDetailViewModel.kt b/app/src/main/java/hu/toliver/vinotes/ui/screen/winedetail/WineDetailViewModel.kt index b1dea6a..31d2273 100644 --- a/app/src/main/java/hu/toliver/vinotes/ui/screen/winedetail/WineDetailViewModel.kt +++ b/app/src/main/java/hu/toliver/vinotes/ui/screen/winedetail/WineDetailViewModel.kt @@ -1,9 +1,11 @@ package hu.toliver.vinotes.ui.screen.winedetail +import android.content.Context import androidx.lifecycle.SavedStateHandle import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import dagger.hilt.android.lifecycle.HiltViewModel +import dagger.hilt.android.qualifiers.ApplicationContext import hu.toliver.vinotes.R import hu.toliver.vinotes.ui.screen.UIConverter.toFloat import hu.toliver.vinotes.domain.model.Taste @@ -21,14 +23,13 @@ import javax.inject.Inject @HiltViewModel class WineDetailViewModel @Inject constructor( + @param:ApplicationContext private val context: Context, private val savedStateHandle: SavedStateHandle, private val getWineWithTastings: GetWineWithTastingsUseCase, private val updateWine: UpdateWineUseCase, private val deleteWine: DeleteWineUseCase, ) : ViewModel() { - private val wineId: String = savedStateHandle.get("wineId") ?: "" - private var initialized = false private val _state = MutableStateFlow(WineDetailState()) @@ -56,10 +57,10 @@ class WineDetailViewModel @Inject constructor( runCatching { updateWine(event.wine) } .onSuccess { _state.value = _state.value.copy(isEditSheetOpen = false) - _effect.send(WineDetailEffect.ShowSnackbar(R.string.wine_updated.toString())) + _effect.send(WineDetailEffect.ShowSnackbar(context.getString(R.string.wine_updated))) } .onFailure { e -> - _effect.send(WineDetailEffect.ShowSnackbar(e.message ?: R.string.error_on_save.toString())) + _effect.send(WineDetailEffect.ShowSnackbar(e.message ?: context.getString(R.string.error_on_save))) } } @@ -73,7 +74,7 @@ class WineDetailViewModel @Inject constructor( val wine = _state.value.wine ?: return@launch runCatching { deleteWine(wine) } .onSuccess { _effect.send(WineDetailEffect.NavigateUp) } - .onFailure { e -> _effect.send(WineDetailEffect.ShowSnackbar(e.message ?: R.string.error_on_delete.toString())) } + .onFailure { e -> _effect.send(WineDetailEffect.ShowSnackbar(e.message ?: context.getString(R.string.error_on_delete))) } } WineDetailEvent.AddTastingClicked -> viewModelScope.launch { @@ -90,7 +91,7 @@ class WineDetailViewModel @Inject constructor( private fun loadData() { val currentWineId = savedStateHandle.get("wineId") ?: "" if (currentWineId.isEmpty()) { - _state.value = _state.value.copy(isLoading = false, errorMessage = R.string.wine_id_is_missing.toString()) + _state.value = _state.value.copy(isLoading = false, errorMessage = context.getString(R.string.wine_id_is_missing)) return } @@ -102,7 +103,7 @@ class WineDetailViewModel @Inject constructor( } .collect { result -> if (result == null) { - _state.value = _state.value.copy(isLoading = false, errorMessage = R.string.the_wine_could_not_be_found.toString()) + _state.value = _state.value.copy(isLoading = false, errorMessage = context.getString(R.string.the_wine_could_not_be_found)) return@collect } _state.value = _state.value.copy( diff --git a/app/src/main/java/hu/toliver/vinotes/ui/screen/winedetail/components/WineDetailContent.kt b/app/src/main/java/hu/toliver/vinotes/ui/screen/winedetail/components/WineDetailContent.kt index 27b8139..4c50c4f 100644 --- a/app/src/main/java/hu/toliver/vinotes/ui/screen/winedetail/components/WineDetailContent.kt +++ b/app/src/main/java/hu/toliver/vinotes/ui/screen/winedetail/components/WineDetailContent.kt @@ -34,7 +34,7 @@ fun WineDetailContent( onEvent: (WineDetailEvent) -> Unit, modifier: Modifier = Modifier, ) { - val wine = state.wine!! + val wine = state.wine ?: return LazyColumn( modifier = modifier.fillMaxSize(), diff --git a/app/src/main/java/hu/toliver/vinotes/ui/screen/winelist/WineListScreen.kt b/app/src/main/java/hu/toliver/vinotes/ui/screen/winelist/WineListScreen.kt index 9419dbf..b582d9f 100644 --- a/app/src/main/java/hu/toliver/vinotes/ui/screen/winelist/WineListScreen.kt +++ b/app/src/main/java/hu/toliver/vinotes/ui/screen/winelist/WineListScreen.kt @@ -12,7 +12,6 @@ import androidx.compose.material3.SnackbarHost import androidx.compose.material3.SnackbarHostState import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect -import androidx.compose.runtime.collectAsState import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.remember @@ -21,6 +20,7 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel +import androidx.lifecycle.compose.collectAsStateWithLifecycle import hu.toliver.vinotes.R import hu.toliver.vinotes.domain.model.Wine import hu.toliver.vinotes.domain.model.enums.WineColour @@ -40,7 +40,7 @@ fun WineListScreen( onNavigateToDetail: (wineId: String) -> Unit, onWineSelected: ((wineId: String) -> Unit)? = null, ) { - val state by viewModel.state.collectAsState() + val state by viewModel.state.collectAsStateWithLifecycle() val snackbarHostState = remember { SnackbarHostState() } var showDeleteDialog by remember { mutableStateOf(null) } val selectionMode = onWineSelected != null diff --git a/app/src/main/java/hu/toliver/vinotes/ui/screen/winelist/WineListViewModel.kt b/app/src/main/java/hu/toliver/vinotes/ui/screen/winelist/WineListViewModel.kt index cd2e6d2..9c26203 100644 --- a/app/src/main/java/hu/toliver/vinotes/ui/screen/winelist/WineListViewModel.kt +++ b/app/src/main/java/hu/toliver/vinotes/ui/screen/winelist/WineListViewModel.kt @@ -1,8 +1,10 @@ package hu.toliver.vinotes.ui.screen.winelist +import android.content.Context import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import dagger.hilt.android.lifecycle.HiltViewModel +import dagger.hilt.android.qualifiers.ApplicationContext import hu.toliver.vinotes.R import hu.toliver.vinotes.domain.model.WineWithStats import hu.toliver.vinotes.domain.usecases.wine.DeleteWineUseCase @@ -22,6 +24,7 @@ import javax.inject.Inject @HiltViewModel class WineListViewModel @Inject constructor( + @param:ApplicationContext private val context: Context, private val getWinesWithStats: GetWinesWithStatsUseCase, private val addWine: InsertWineUseCase, private val updateWine: UpdateWineUseCase, @@ -83,26 +86,28 @@ class WineListViewModel @Inject constructor( if (event.isNew) addWine(event.wine) else updateWine(event.wine) }.onSuccess { _state.update { it.copy(isAddSheetOpen = false, editingWine = null) } - _effect.send(WineListEffect.ShowSnackbar( - if (event.isNew) R.string.wine_added.toString() else R.string.wine_updated.toString() - )) + _effect.send( + WineListEffect.ShowSnackbar( + if (event.isNew) context.getString(R.string.wine_added) else context.getString(R.string.wine_updated) + ) + ) }.onFailure { e -> - _effect.send(WineListEffect.ShowSnackbar(e.message ?: R.string.an_error_occurred.toString())) + _effect.send(WineListEffect.ShowSnackbar(e.message ?: context.getString(R.string.an_error_occurred))) } } is WineListEvent.WineDeleteRequested -> { - // The UI will show a confirmation dialog, then send WineDeleteConfirmed + // The UI will show a confirmation dialogue, then send WineDeleteConfirmed } is WineListEvent.WineDeleteConfirmed -> viewModelScope.launch { runCatching { deleteWine(event.wine) } .onSuccess { _state.update { it.copy(editingWine = null) } - _effect.send(WineListEffect.ShowSnackbar(R.string.wine_deleted.toString())) + _effect.send(WineListEffect.ShowSnackbar(context.getString(R.string.wine_deleted))) } .onFailure { e -> - _effect.send(WineListEffect.ShowSnackbar(e.message ?: R.string.error_on_delete.toString())) + _effect.send(WineListEffect.ShowSnackbar(e.message ?: context.getString(R.string.error_on_delete))) } } } diff --git a/app/src/main/java/hu/toliver/vinotes/ui/screen/winelist/components/WineSearchBar.kt b/app/src/main/java/hu/toliver/vinotes/ui/screen/winelist/components/WineSearchBar.kt index 5675195..288655b 100644 --- a/app/src/main/java/hu/toliver/vinotes/ui/screen/winelist/components/WineSearchBar.kt +++ b/app/src/main/java/hu/toliver/vinotes/ui/screen/winelist/components/WineSearchBar.kt @@ -9,6 +9,7 @@ import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.size import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.Check import androidx.compose.material.icons.outlined.FilterList import androidx.compose.material.icons.outlined.SwapVert import androidx.compose.material.icons.outlined.WineBar @@ -80,7 +81,12 @@ fun WineSearchBar( ) { WineSortOrder.entries.forEach { order -> DropdownMenuItem( - text = { Text(order.displayLabel()) }, + text = { Text(stringResource(order.displayLabelRes())) }, + trailingIcon = { + if (order == sortOrder) { + Icon(Icons.Filled.Check, contentDescription = null) + } + }, onClick = { onSortChange(order) sortMenuExpanded = false @@ -111,9 +117,9 @@ fun WineSearchBar( } } -private fun WineSortOrder.displayLabel(): String = when (this) { - WineSortOrder.NAME_ASC -> R.string.sort_name_a_z.toString() - WineSortOrder.RATING_DESC -> R.string.best_rating.toString() - WineSortOrder.YEAR_DESC -> R.string.newest_vintage.toString() - WineSortOrder.TASTING_DATE_DESC -> R.string.most_recently_tasted.toString() +private fun WineSortOrder.displayLabelRes(): Int = when (this) { + WineSortOrder.NAME_ASC -> R.string.sort_name_a_z + WineSortOrder.RATING_DESC -> R.string.best_rating + WineSortOrder.YEAR_DESC -> R.string.newest_vintage + WineSortOrder.TASTING_DATE_DESC -> R.string.most_recently_tasted } diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml deleted file mode 100644 index 07d5da9..0000000 --- a/app/src/main/res/drawable/ic_launcher_background.xml +++ /dev/null @@ -1,170 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_launcher_foreground.xml b/app/src/main/res/drawable/ic_launcher_foreground.xml deleted file mode 100644 index 2b068d1..0000000 --- a/app/src/main/res/drawable/ic_launcher_foreground.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml deleted file mode 100644 index 6f3b755..0000000 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml deleted file mode 100644 index 6f3b755..0000000 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/app/src/main/res/mipmap-hdpi/ic_launcher.webp deleted file mode 100644 index c209e78..0000000 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher.webp and /dev/null differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp deleted file mode 100644 index b2dfe3d..0000000 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp and /dev/null differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/app/src/main/res/mipmap-mdpi/ic_launcher.webp deleted file mode 100644 index 4f0f1d6..0000000 Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher.webp and /dev/null differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp deleted file mode 100644 index 62b611d..0000000 Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp deleted file mode 100644 index 948a307..0000000 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp deleted file mode 100644 index 1b9a695..0000000 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp deleted file mode 100644 index 28d4b77..0000000 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp deleted file mode 100644 index 9287f50..0000000 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp and /dev/null differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp deleted file mode 100644 index aa7d642..0000000 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp and /dev/null differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp deleted file mode 100644 index 9126ae3..0000000 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp and /dev/null differ diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 5fe2bfe..84f356c 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -15,13 +15,13 @@ Összes Minden adat törölve Minden bor Ă©s kĂłstolĂĄs törlĂ©sre kerĂŒl. + BorostyĂĄn %1$d nap %1$d napos sorozat %1$d kĂłstolĂĄs %1$d kĂłstolĂĄs %1$d bor Hiba törtĂ©nt - ViNotes Nyelv Alkalmaz Biztosan törölni szeretnĂ©d ezt a kĂłstolĂĄst? Ez a mƱvelet nem vonhatĂł vissza. @@ -116,6 +116,7 @@ Nagy LegutĂłbbi kĂłstolĂĄsok Kevesebb + ZöldessĂĄrga KönnyƱ VilĂĄgos RendszerbeĂĄllĂ­tĂĄsok @@ -163,16 +164,21 @@ ÖsszbenyomĂĄs SzĂĄjĂ©rzet HalvĂĄny + Pink Hely KĂ©rlek elƑször vĂĄlassz egy bort TermelƑ * Kifejezett + BĂ­bor ÉrtĂ©kelĂ©sek eloszlĂĄsa Vörös + Vörösesbarna RĂ©giĂł A hely lekĂ©rve, de a fordĂ­tott geokĂłdolĂĄs sikertelen volt RozĂ© + Rubin MentĂ©s + Lazac KeresĂ©s
 FĂ©lszĂĄraz ÉrzĂ©kszervi profil @@ -202,7 +208,7 @@ KĂłstolĂĄs nem talĂĄlhatĂł: KĂłstolĂĄsok KĂłstolĂĄsok az idƑszakban - BorostyĂĄn + BarnĂĄsvörös TĂ©ma A helyszolgĂĄltatĂł le lett tiltva. A kĂłstolĂĄs nem talĂĄlhatĂł. @@ -238,6 +244,7 @@ Szia %1$s! Üdvözlet a borospincĂ©dben! A katalĂłgust letöltheted a webrƑl, hogy feltöltsd a pincĂ©det borokkal.\nNyomj OK-t a teljes katalĂłgus letöltĂ©sĂ©hez most. FehĂ©r + BarnĂĄsfehĂ©r Bor hozzĂĄadva Bor törölve HiĂĄnyzik a bor azonosĂ­tĂłja @@ -255,4 +262,7 @@ SĂĄrga Igen, mindenkĂ©pp! Fiatal + Citrom + GrĂĄnĂĄtalma + Arany \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 868bb87..f20d16d 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -15,6 +15,7 @@ All All data cleared All wine and tastings get deleted. + Amber %1$d day %1$d day streak %1$d tasting @@ -40,7 +41,7 @@ Brut Brut Nature Cancel - Cannot resolve catalog host. Check your device network/DNS or try opening the catalog URL in a browser. + Cannot resolve catalogue host. Check your device network/DNS or try opening the catalogue URL in a browser. Catalog URL Clarity Classic @@ -74,7 +75,7 @@ Development DNS resolution failed DNS resolution failed for host when downloading delta: %1$s - DNS resolution failed for host when downloading full catalog: %1$s + DNS resolution failed for host when downloading full catalogue: %1$s DNS resolution failed for host when fetching manifest: %1$s Download catalog: %1$s Dry @@ -87,7 +88,7 @@ Error on delete Error on save Error syncing catalog - Error importing catalog from file + Error importing catalogue from file Extra Brut Extra Dry Failed to fetch location @@ -100,6 +101,8 @@ From Full Full catalog imported + Gold + Gold Good Gray Hungarian @@ -114,11 +117,13 @@ Large Latest Tastings Less + Lemon + Lemongreen Light Light System settings Load JSON file from device - Selected file is not a valid wine catalog: %1$s + Selected file is not a valid wine catalogue: %1$s Location fetch timed out. Please try again. Needs location permission to fetch current location @@ -161,16 +166,21 @@ Overall impression Palate Pale + Pink Place Please select a wine first Producer * Pronounced + Purple Ratings distribution Red + Red brown Region Location fetched but reverse geocoding failed RosĂ© + Ruby Save + Salmon Search
 Semi Dry Sensory Profile @@ -216,7 +226,7 @@ Unacceptable Unknown Unknown error - Update catalog from web + Update catalogue from web URL Update catalog Sync only new changes to catalog @@ -236,8 +246,9 @@ Weak Welcome to your wine vault! Hi %1$s! Welcome to your wine vault! - You can download the catalog from the web to populate wines in your collection. Tap OK to download the full catalog now. + You can download the catalogue from the web to populate wines in your collection. Tap OK to download the full catalogue now. White + White brown Wine added Wine deleted Wine ID is missing diff --git a/app/src/main/res/xml/backup_rules.xml b/app/src/main/res/xml/backup_rules.xml index 4df9255..c2f3ee1 100644 --- a/app/src/main/res/xml/backup_rules.xml +++ b/app/src/main/res/xml/backup_rules.xml @@ -1,5 +1,5 @@ diff --git a/app/src/main/res/xml/locales_config.xml b/app/src/main/res/xml/locales_config.xml new file mode 100644 index 0000000..e0dd233 --- /dev/null +++ b/app/src/main/res/xml/locales_config.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/build.gradle.kts b/build.gradle.kts index c1b4d51..66b2351 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,4 +1,4 @@ -// Top-level build file where you can add configuration options common to all sub-projects/modules. +// Top-level build file where you can add configuration options common to all subprojects/modules. plugins { alias(libs.plugins.android.application) apply false alias(libs.plugins.kotlin.compose) apply false diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 8967ea3..45a8657 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -8,7 +8,7 @@ espressoCore = "3.7.0" lifecycleRuntimeKtx = "2.10.0" activityCompose = "1.13.0" kotlin = "2.3.21" -composeBom = "2026.05.00" +composeBom = "2026.05.01" coil = "2.7.0" room = "2.8.4" @@ -16,11 +16,11 @@ datastore = "1.2.1" kotlinxDatetime = "0.8.0" viewModel = "2.10.0" -nav3Core = "1.1.1" +nav3Core = "1.1.2" lifecycleViewmodelNav3 = "2.11.0-beta01" kotlinSerialization = "2.3.21" kotlinxSerializationCore = "1.11.0" -material3AdaptiveNav3 = "1.3.0-beta01" +material3AdaptiveNav3 = "1.3.0-beta02" ksp = "2.3.6" hilt = "2.59.2" diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 8128c19..5523a3a 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,8 +1,8 @@ #Mon May 11 14:29:32 CEST 2026 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionSha256Sum=b266d5ff6b90eada6dc3b20cb090e3731302e553a27c5d3e4df1f0d76beaff06 -distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip +distributionSha256Sum=bafc141b619ad6350fd975fc903156dd5c151998cc8b058e8c1044ab5f7b031f +distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/imgs/dashboard.png b/imgs/dashboard.png new file mode 100644 index 0000000..7cdeece Binary files /dev/null and b/imgs/dashboard.png differ diff --git a/imgs/stats-screen.png b/imgs/stats-screen.png new file mode 100644 index 0000000..a09bacf Binary files /dev/null and b/imgs/stats-screen.png differ diff --git a/imgs/tasting-screen.png b/imgs/tasting-screen.png new file mode 100644 index 0000000..9566159 Binary files /dev/null and b/imgs/tasting-screen.png differ diff --git a/imgs/wine-screen.png b/imgs/wine-screen.png new file mode 100644 index 0000000..4b78819 Binary files /dev/null and b/imgs/wine-screen.png differ