diff --git a/README.md b/README.md index 16ded80..039e8be 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 catalogue from a file, no internet required +- 📁 **Local JSON import** — import your own wine catalog 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 | -|:-----------------------:|:----------------------------:|:-------------------------:|:--------------------------:| -| ![](imgs/dashboard.png) | ![](imgs/tasting-screen.png) | ![](imgs/wine-screen.png) | ![](imgs/stats-screen.png) | +| Dashboard | Tasting Form | Wine Detail | Statistics | +|:-:|:-:|:-:|:-:| +| *coming soon* | *coming soon* | *coming soon* | *coming soon* | ## Tech Stack @@ -81,17 +81,17 @@ Repositories Abstract data sources behind interfaces Room Retrofit ``` -## Wine Catalogue +## Wine Catalog -ViNotes ships with a community-maintained wine catalogue hosted on GitHub Pages. The sync system is designed to be lightweight and bandwidth-friendly: +ViNotes ships with a community-maintained wine catalog 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 catalogue, used on first install or manual reset +- **`full.json`** — the complete catalog, 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 catalogue 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 catalog changes. -> 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! +> Want to add wines to the catalog? Contributions are welcome in the [catalog branch]()! 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](https://github.com/T0liver/ViNotes/releases/latest) | +| Source | Link | +|------------|----------------------------| +| F-Droid | *coming soon* | +| Direct APK | [Releases](../../releases) | --- @@ -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](https://github.com/T0liver/ViNotes/issues) with steps to reproduce +- 🐛 **Found a bug?** Open an [issue](../../issues) with steps to reproduce - 💡 **Have an idea?** Open an issue with the `enhancement` label -- đŸ· **Know your wines?** Add entries to the [wine catalog](https://github.com/T0liver/ViNotes/tree/catalogue/source)! +- đŸ· **Know your wines?** Add entries to the [wine catalog]() - 🔧 **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 f22ea08..a5a4be6 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.0" + versionName = "1.0-alpha" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" } @@ -36,15 +36,8 @@ android { } buildTypes { - getByName("debug") { - isDebuggable = true - } getByName("release") { - signingConfig = if (file("release.keystore").exists()) { - signingConfigs.getByName("release") - } else { - signingConfigs.getByName("debug") - } + signingConfig = signingConfigs.getByName("release") isMinifyEnabled = true proguardFiles( getDefaultProguardFile("proguard-android-optimize.txt"), diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 466720a..b67b30f 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -11,7 +11,6 @@ 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 a378ada..c541eeb 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.lifecycle.compose.collectAsStateWithLifecycle -import androidx.compose.runtime.getValue import androidx.compose.ui.tooling.preview.Preview -import androidx.core.os.LocaleListCompat +import androidx.compose.runtime.collectAsState +import androidx.compose.runtime.getValue import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel -import dagger.hilt.android.AndroidEntryPoint +import hu.toliver.vinotes.ui.screen.settings.ThemeViewModel 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.collectAsStateWithLifecycle() - val language by vm.appLanguage.collectAsStateWithLifecycle() + val theme by vm.themeMode.collectAsState() + val language by vm.appLanguage.collectAsState() 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 ebde71e..e57f6b2 100644 --- a/app/src/main/java/hu/toliver/vinotes/ViNotesApplication.kt +++ b/app/src/main/java/hu/toliver/vinotes/ViNotesApplication.kt @@ -1,5 +1,6 @@ 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 adddd64..e917638 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,14 +1,15 @@ 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 @@ -21,12 +22,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("Tasting not found: $id") + dao.getById(id)?.toDomain() ?: error(R.string.tasting_not_found_id.toString() + id) } override suspend fun save(taste: Taste): Result = runCatching { - val idToUse = taste.id.ifBlank { UUID.randomUUID().toString() } - dao.insert(taste.toEntity(id = idToUse)) + val id = UUID.randomUUID().toString() + dao.insert(taste.toEntity(id = id)) } 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 96aa3d7..89ac983 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,5 +1,6 @@ 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 @@ -21,7 +22,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("Wine not found: $id") + dao.getById(id)?.toDomain() ?: error(R.string.not_found_id.toString() + 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 new file mode 100644 index 0000000..5e7b5b9 --- /dev/null +++ b/app/src/main/java/hu/toliver/vinotes/domain/usecases/taste/DeleteTastingUseCase.kt @@ -0,0 +1,10 @@ +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 new file mode 100644 index 0000000..8526942 --- /dev/null +++ b/app/src/main/java/hu/toliver/vinotes/domain/usecases/taste/GetTasteByIDUseCase.kt @@ -0,0 +1,10 @@ +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 d39ed89..ccd073d 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 ) { - operator fun invoke(wineId: String) = repository.getByWineId(wineId) + suspend 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 new file mode 100644 index 0000000..50e9266 --- /dev/null +++ b/app/src/main/java/hu/toliver/vinotes/domain/usecases/taste/SaveTastingUseCase.kt @@ -0,0 +1,17 @@ +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 new file mode 100644 index 0000000..f715ae5 --- /dev/null +++ b/app/src/main/java/hu/toliver/vinotes/domain/usecases/taste/UpdateTasingUseCase.kt @@ -0,0 +1,13 @@ +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 79c3ca0..5f97e7c 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,25 +174,4 @@ 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 5736d08..fc980f1 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,10 +1,8 @@ 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 @@ -21,11 +19,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, @@ -95,7 +93,7 @@ class AddTastingViewModel @Inject constructor( AddTastingEvent.OnLocationPermissionGranted -> fetchLocation() AddTastingEvent.OnLocationPermissionDenied -> { viewModelScope.launch { - emitLocationError(context.getString(R.string.location_permission_missing)) + emitLocationError(R.string.location_permission_missing.toString()) } } @@ -131,17 +129,17 @@ class AddTastingViewModel @Inject constructor( longitude = longitude, ) } - emitLocationError(error.message ?: context.getString(R.string.reverse_geocoding_failed)) + emitLocationError(error.message ?: R.string.reverse_geocoding_failed.toString()) } } .onFailure { error -> _state.update { it.copy(isLoadingLocation = false) } - emitLocationError(error.message ?: context.getString(R.string.failed_to_fetch_location)) + emitLocationError(error.message ?: R.string.failed_to_fetch_location.toString()) } } } catch (_: TimeoutCancellationException) { _state.update { it.copy(isLoadingLocation = false) } - emitLocationError(context.getString(R.string.location_fetch_timed_out)) + emitLocationError(R.string.location_fetch_timed_out.toString()) } } } @@ -199,11 +197,11 @@ class AddTastingViewModel @Inject constructor( val s = _state.value if (s.wineId.isBlank()) { _state.value = _state.value.copy(isSaving = false) - _effect.send(AddTastingEffect.ShowSnackbar(context.getString(R.string.please_select_a_wine_first))) + _effect.send(AddTastingEffect.ShowSnackbar(R.string.please_select_a_wine_first.toString())) return@launch } val taste = Taste( - id = s.editingTasteId ?: "", + id = s.editingTasteId ?: UUID.randomUUID().toString(), clarity = s.clarity, colourIntensity = s.colourIntensity, colour = s.colour, @@ -239,13 +237,8 @@ class AddTastingViewModel @Inject constructor( } .onFailure { e -> _state.value = _state.value.copy(isSaving = false) - viewModelScope.launch { - _effect.send( - AddTastingEffect.ShowSnackbar( - e.message ?: context.getString(R.string.error_on_save) - ) - ) - } + viewModelScope.launch { _effect.send(AddTastingEffect.ShowSnackbar(e.message ?: + R.string.error_on_save.toString())) } } } } 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 bd61b64..eb47b1f 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,11 +20,6 @@ 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 /** @@ -53,15 +48,6 @@ 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 @@ -75,7 +61,8 @@ fun TastingSlider( color = MaterialTheme.colorScheme.primaryContainer, ) { Text( - text = currentText, + text = current.toString().replace("_", " ").lowercase() + .replaceFirstChar { it.uppercase() }, 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 5410dd9..a9138cf 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,9 +21,7 @@ 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 @@ -34,7 +32,7 @@ fun WineColourPicker( modifier: Modifier = Modifier, ) { Column(modifier = modifier) { - Text(stringResource(R.string.colour), style = MaterialTheme.typography.titleMedium) + Text("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 75178e9..ba6b60d 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,7 +31,6 @@ 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 @@ -41,6 +40,8 @@ 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 52ea2ef..37fea72 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,6 +28,7 @@ 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 @@ -36,7 +37,6 @@ 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.collectAsStateWithLifecycle() + val state by viewModel.state.collectAsState() 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 ab0ca83..0e45047 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,11 +127,10 @@ 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 = message) + it.copy(isLoading = false, errorMessage = e.message ?: R.string.unknown_error.toString()) } - _effect.send(DashboardEffect.ShowError(message)) + _effect.send(DashboardEffect.ShowError(e.message ?: R.string.unknown_error.toString())) } } } 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 09fb508..cbdcd21 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,39 +1,41 @@ 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 @@ -42,10 +44,7 @@ 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 @@ -53,6 +52,8 @@ 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) @@ -61,7 +62,7 @@ fun SettingsScreen( viewModel: SettingsViewModel = hiltViewModel(), onNavigateUp: () -> Unit, ) { - val state by viewModel.state.collectAsStateWithLifecycle() + val state by viewModel.state.collectAsState() val snackbarHostState = remember { SnackbarHostState() } val uriHandler = LocalUriHandler.current val importFileLauncher = rememberLauncherForActivityResult( @@ -244,14 +245,7 @@ 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, @@ -264,7 +258,7 @@ This will be removed for release 1.0, I can't manage to work the change work, 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 6c684f9..ea8085f 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,15 +1,11 @@ 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 @@ -240,17 +236,6 @@ 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 2718617..2f4a98c 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,7 +12,6 @@ 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.* @@ -25,7 +24,7 @@ import hu.toliver.vinotes.R fun StatsScreen( viewModel: StatsViewModel = hiltViewModel(), ) { - val state by viewModel.state.collectAsStateWithLifecycle() + val state by viewModel.state.collectAsState() val playedSections = remember { mutableStateMapOf() } fun shouldPlay(id: String) = playedSections[id] != true fun markPlayed(id: String) { playedSections[id] = true } @@ -52,16 +51,14 @@ fun StatsScreen( ) } - else -> state.data?.let { data -> - StatsContent( - state = state, - data = data, - onEvent = viewModel::onEvent, - modifier = Modifier.padding(innerPadding), - shouldPlay = ::shouldPlay, - markPlayed = ::markPlayed, - ) - } + else -> StatsContent( + state = state, + data = state.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 65a0d75..9294461 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( - 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, + 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, ), ) } 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 a3f3d99..c86cbb4 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,11 +1,9 @@ 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 @@ -19,7 +17,6 @@ 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, @@ -55,7 +52,7 @@ class TastingDetailViewModel @Inject constructor( _state.value = _state.value.copy(showDeleteDialog = false) _effect.send(TastingDetailEffect.NavigateUp) } - .onFailure { e -> _effect.send(TastingDetailEffect.ShowSnackbar(e.message ?: context.getString(R.string.error_on_delete))) } + .onFailure { e -> _effect.send(TastingDetailEffect.ShowSnackbar(e.message ?: R.string.error_on_delete.toString())) } } TastingDetailEvent.DeleteTastingDismissed -> @@ -66,7 +63,7 @@ class TastingDetailViewModel @Inject constructor( private fun loadData() { val currentTasteId = savedStateHandle.get("tasteId") ?: "" if (currentTasteId.isEmpty()) { - _state.value = _state.value.copy(isLoading = false, errorMessage = context.getString(R.string.tasting_id_is_missing)) + _state.value = _state.value.copy(isLoading = false, errorMessage = R.string.tasting_id_is_missing.toString()) return } @@ -83,7 +80,7 @@ class TastingDetailViewModel @Inject constructor( .onFailure { e -> _state.value = _state.value.copy( isLoading = false, - errorMessage = e.message ?: context.getString(R.string.the_tasting_could_not_be_found) + errorMessage = e.message ?: R.string.the_tasting_could_not_be_found.toString() ) } } 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 9782441..bc864fd 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.toDisplayName(context), + colour = this.colour.name, 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 98bad58..e87d886 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,7 +12,6 @@ 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 @@ -42,7 +41,7 @@ fun TastingParametersCard( text = value, style = typography.bodyMedium, color = colorScheme.onSurface, - fontWeight = FontWeight.SemiBold, + fontWeight = androidx.compose.ui.text.font.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 31d2273..b1dea6a 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,11 +1,9 @@ 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 @@ -23,13 +21,14 @@ 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()) @@ -57,10 +56,10 @@ class WineDetailViewModel @Inject constructor( runCatching { updateWine(event.wine) } .onSuccess { _state.value = _state.value.copy(isEditSheetOpen = false) - _effect.send(WineDetailEffect.ShowSnackbar(context.getString(R.string.wine_updated))) + _effect.send(WineDetailEffect.ShowSnackbar(R.string.wine_updated.toString())) } .onFailure { e -> - _effect.send(WineDetailEffect.ShowSnackbar(e.message ?: context.getString(R.string.error_on_save))) + _effect.send(WineDetailEffect.ShowSnackbar(e.message ?: R.string.error_on_save.toString())) } } @@ -74,7 +73,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 ?: context.getString(R.string.error_on_delete))) } + .onFailure { e -> _effect.send(WineDetailEffect.ShowSnackbar(e.message ?: R.string.error_on_delete.toString())) } } WineDetailEvent.AddTastingClicked -> viewModelScope.launch { @@ -91,7 +90,7 @@ class WineDetailViewModel @Inject constructor( private fun loadData() { val currentWineId = savedStateHandle.get("wineId") ?: "" if (currentWineId.isEmpty()) { - _state.value = _state.value.copy(isLoading = false, errorMessage = context.getString(R.string.wine_id_is_missing)) + _state.value = _state.value.copy(isLoading = false, errorMessage = R.string.wine_id_is_missing.toString()) return } @@ -103,7 +102,7 @@ class WineDetailViewModel @Inject constructor( } .collect { result -> if (result == null) { - _state.value = _state.value.copy(isLoading = false, errorMessage = context.getString(R.string.the_wine_could_not_be_found)) + _state.value = _state.value.copy(isLoading = false, errorMessage = R.string.the_wine_could_not_be_found.toString()) 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 4c50c4f..27b8139 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 ?: return + val wine = state.wine!! 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 b582d9f..9419dbf 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,6 +12,7 @@ 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 @@ -20,7 +21,6 @@ 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.collectAsStateWithLifecycle() + val state by viewModel.state.collectAsState() 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 9c26203..cd2e6d2 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,10 +1,8 @@ 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 @@ -24,7 +22,6 @@ 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, @@ -86,28 +83,26 @@ 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) context.getString(R.string.wine_added) else context.getString(R.string.wine_updated) - ) - ) + _effect.send(WineListEffect.ShowSnackbar( + if (event.isNew) R.string.wine_added.toString() else R.string.wine_updated.toString() + )) }.onFailure { e -> - _effect.send(WineListEffect.ShowSnackbar(e.message ?: context.getString(R.string.an_error_occurred))) + _effect.send(WineListEffect.ShowSnackbar(e.message ?: R.string.an_error_occurred.toString())) } } is WineListEvent.WineDeleteRequested -> { - // The UI will show a confirmation dialogue, then send WineDeleteConfirmed + // The UI will show a confirmation dialog, then send WineDeleteConfirmed } is WineListEvent.WineDeleteConfirmed -> viewModelScope.launch { runCatching { deleteWine(event.wine) } .onSuccess { _state.update { it.copy(editingWine = null) } - _effect.send(WineListEffect.ShowSnackbar(context.getString(R.string.wine_deleted))) + _effect.send(WineListEffect.ShowSnackbar(R.string.wine_deleted.toString())) } .onFailure { e -> - _effect.send(WineListEffect.ShowSnackbar(e.message ?: context.getString(R.string.error_on_delete))) + _effect.send(WineListEffect.ShowSnackbar(e.message ?: R.string.error_on_delete.toString())) } } } 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 288655b..5675195 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,7 +9,6 @@ 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 @@ -81,12 +80,7 @@ fun WineSearchBar( ) { WineSortOrder.entries.forEach { order -> DropdownMenuItem( - text = { Text(stringResource(order.displayLabelRes())) }, - trailingIcon = { - if (order == sortOrder) { - Icon(Icons.Filled.Check, contentDescription = null) - } - }, + text = { Text(order.displayLabel()) }, onClick = { onSortChange(order) sortMenuExpanded = false @@ -117,9 +111,9 @@ fun WineSearchBar( } } -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 +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() } diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml new file mode 100644 index 0000000..07d5da9 --- /dev/null +++ b/app/src/main/res/drawable/ic_launcher_background.xml @@ -0,0 +1,170 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/drawable/ic_launcher_foreground.xml b/app/src/main/res/drawable/ic_launcher_foreground.xml new file mode 100644 index 0000000..2b068d1 --- /dev/null +++ b/app/src/main/res/drawable/ic_launcher_foreground.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 0000000..6f3b755 --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,6 @@ + + + + + + \ 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 new file mode 100644 index 0000000..6f3b755 --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/app/src/main/res/mipmap-hdpi/ic_launcher.webp new file mode 100644 index 0000000..c209e78 Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher.webp differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp new file mode 100644 index 0000000..b2dfe3d Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/app/src/main/res/mipmap-mdpi/ic_launcher.webp new file mode 100644 index 0000000..4f0f1d6 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher.webp differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp new file mode 100644 index 0000000..62b611d Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp new file mode 100644 index 0000000..948a307 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp new file mode 100644 index 0000000..1b9a695 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp new file mode 100644 index 0000000..28d4b77 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp new file mode 100644 index 0000000..9287f50 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp new file mode 100644 index 0000000..aa7d642 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp new file mode 100644 index 0000000..9126ae3 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp differ diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 84f356c..5fe2bfe 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,7 +116,6 @@ Nagy LegutĂłbbi kĂłstolĂĄsok Kevesebb - ZöldessĂĄrga KönnyƱ VilĂĄgos RendszerbeĂĄllĂ­tĂĄsok @@ -164,21 +163,16 @@ Ö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 @@ -208,7 +202,7 @@ KĂłstolĂĄs nem talĂĄlhatĂł: KĂłstolĂĄsok KĂłstolĂĄsok az idƑszakban - BarnĂĄsvörös + BorostyĂĄn TĂ©ma A helyszolgĂĄltatĂł le lett tiltva. A kĂłstolĂĄs nem talĂĄlhatĂł. @@ -244,7 +238,6 @@ 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 @@ -262,7 +255,4 @@ 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 f20d16d..868bb87 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -15,7 +15,6 @@ All All data cleared All wine and tastings get deleted. - Amber %1$d day %1$d day streak %1$d tasting @@ -41,7 +40,7 @@ Brut Brut Nature Cancel - Cannot resolve catalogue host. Check your device network/DNS or try opening the catalogue URL in a browser. + Cannot resolve catalog host. Check your device network/DNS or try opening the catalog URL in a browser. Catalog URL Clarity Classic @@ -75,7 +74,7 @@ Development DNS resolution failed DNS resolution failed for host when downloading delta: %1$s - DNS resolution failed for host when downloading full catalogue: %1$s + DNS resolution failed for host when downloading full catalog: %1$s DNS resolution failed for host when fetching manifest: %1$s Download catalog: %1$s Dry @@ -88,7 +87,7 @@ Error on delete Error on save Error syncing catalog - Error importing catalogue from file + Error importing catalog from file Extra Brut Extra Dry Failed to fetch location @@ -101,8 +100,6 @@ From Full Full catalog imported - Gold - Gold Good Gray Hungarian @@ -117,13 +114,11 @@ Large Latest Tastings Less - Lemon - Lemongreen Light Light System settings Load JSON file from device - Selected file is not a valid wine catalogue: %1$s + Selected file is not a valid wine catalog: %1$s Location fetch timed out. Please try again. Needs location permission to fetch current location @@ -166,21 +161,16 @@ 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 @@ -226,7 +216,7 @@ Unacceptable Unknown Unknown error - Update catalogue from web + Update catalog from web URL Update catalog Sync only new changes to catalog @@ -246,9 +236,8 @@ Weak Welcome to your wine vault! Hi %1$s! Welcome to your wine vault! - You can download the catalogue from the web to populate wines in your collection. Tap OK to download the full catalogue now. + You can download the catalog from the web to populate wines in your collection. Tap OK to download the full catalog 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 c2f3ee1..4df9255 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 deleted file mode 100644 index e0dd233..0000000 --- a/app/src/main/res/xml/locales_config.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/build.gradle.kts b/build.gradle.kts index 66b2351..c1b4d51 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 subprojects/modules. +// Top-level build file where you can add configuration options common to all sub-projects/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 45a8657..8967ea3 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.01" +composeBom = "2026.05.00" 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.2" +nav3Core = "1.1.1" lifecycleViewmodelNav3 = "2.11.0-beta01" kotlinSerialization = "2.3.21" kotlinxSerializationCore = "1.11.0" -material3AdaptiveNav3 = "1.3.0-beta02" +material3AdaptiveNav3 = "1.3.0-beta01" ksp = "2.3.6" hilt = "2.59.2" diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 5523a3a..8128c19 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=bafc141b619ad6350fd975fc903156dd5c151998cc8b058e8c1044ab5f7b031f -distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.1-bin.zip +distributionSha256Sum=b266d5ff6b90eada6dc3b20cb090e3731302e553a27c5d3e4df1f0d76beaff06 +distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/imgs/dashboard.png b/imgs/dashboard.png deleted file mode 100644 index 7cdeece..0000000 Binary files a/imgs/dashboard.png and /dev/null differ diff --git a/imgs/stats-screen.png b/imgs/stats-screen.png deleted file mode 100644 index a09bacf..0000000 Binary files a/imgs/stats-screen.png and /dev/null differ diff --git a/imgs/tasting-screen.png b/imgs/tasting-screen.png deleted file mode 100644 index 9566159..0000000 Binary files a/imgs/tasting-screen.png and /dev/null differ diff --git a/imgs/wine-screen.png b/imgs/wine-screen.png deleted file mode 100644 index 4b78819..0000000 Binary files a/imgs/wine-screen.png and /dev/null differ