punix/noteshop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: Commit remaining changes

Browse Source
This commit is contained in:
Désiré Werner Menrath
2025-11-06 19:18:15 +01:00
parent a5bed3031a
commit 62ff3594d4
6 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/de/lxtools/noteshop/ui/GuidedTourScreen.kt
View File

@@ -67,7 +67,7 @@ fun GuidedTourScreen(onTourFinished: () -> Unit) {
.fillMaxWidth()
.padding(16.dp)
) {
Text(text = if (pagerState.currentPage == 2) "Fertig" else "Überspringen")
Text(text = if (pagerState.currentPage == 2) stringResource(id = R.string.tour_finish) else stringResource(id = R.string.tour_skip))
}
}
}

3
app/src/main/java/de/lxtools/noteshop/ui/appshell/AppTopBar.kt
View File

@@ -296,7 +296,6 @@ fun AppTopBar(
shoppingListWithItems?.let { listWithItems ->
DropdownMenuItem(
text = { Text(stringResource(R.string.lock)) },
enabled = hasEncryptionPassword,
onClick = {
showMenu = false
onShowChooseLockMethodDialog(LockableItemType.SHOPPING_LIST, listWithItems.shoppingList.id)
@@ -381,7 +380,6 @@ fun AppTopBar(
noteDetails.let {
DropdownMenuItem(
text = { Text(stringResource(R.string.lock)) },
enabled = hasEncryptionPassword,
onClick = {
showMenu = false
onShowChooseLockMethodDialog(LockableItemType.NOTE, it.id)
@@ -468,7 +466,6 @@ fun AppTopBar(
recipeDetails.let {
DropdownMenuItem(
text = { Text(stringResource(R.string.lock)) },
enabled = hasEncryptionPassword,
onClick = {
showMenu = false
onShowChooseLockMethodDialog(LockableItemType.RECIPE, it.id)

1
app/src/main/java/de/lxtools/noteshop/ui/recipes/RecipeInputDialog.kt
View File

@@ -1,6 +1,5 @@
package de.lxtools.noteshop.ui.recipes
import android.util.Log
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxWidth

3
app/src/main/java/de/lxtools/noteshop/ui/webapp/WebAppIntegrationViewModel.kt
View File

@@ -13,7 +13,6 @@ import de.lxtools.noteshop.data.NoteshopRepository
import de.lxtools.noteshop.security.FileEncryptor
import de.lxtools.noteshop.security.KeyManager
import kotlinx.coroutines.launch
import kotlinx.coroutines.delay
class WebAppIntegrationViewModel(private val repository: NoteshopRepository, application: Application) : AndroidViewModel(application) {
@@ -99,7 +98,7 @@ class WebAppIntegrationViewModel(private val repository: NoteshopRepository, app
val decrypted = fileEncryptor.decrypt(Base64.decode(it, Base64.DEFAULT), secretKey)
password = String(decrypted)
}
} catch (e: Exception) {
} catch (_: Exception) {
Toast.makeText(getApplication(), getApplication<Application>().getString(de.lxtools.noteshop.R.string.failed_to_decrypt_credentials), Toast.LENGTH_SHORT).show()
}
}

2
app/src/main/res/values-de/strings.xml
View File

@@ -339,4 +339,6 @@
<string name="set_pin">PIN festlegen</string>
<string name="enter_pin">PIN eingeben</string>
<string name="set_pattern">Muster festlegen</string>
<string name="tour_finish">Fertig</string>
<string name="tour_skip">Überspringen</string>
</resources>

2
app/src/main/res/values/strings.xml
View File

@@ -339,4 +339,6 @@
<string name="set_pin">Set PIN</string>
<string name="enter_pin">Enter PIN</string>
<string name="set_pattern">Set Pattern</string>
<string name="tour_finish">Finish</string>
<string name="tour_skip">Skip</string>
</resources>