diff --git a/composeApp/src/commonMain/composeResources/drawable/visibility.png b/composeApp/src/commonMain/composeResources/drawable/visibility.png deleted file mode 100644 index 1fb3666..0000000 Binary files a/composeApp/src/commonMain/composeResources/drawable/visibility.png and /dev/null differ diff --git a/composeApp/src/commonMain/composeResources/drawable/visibility_off.png b/composeApp/src/commonMain/composeResources/drawable/visibility_off.png deleted file mode 100644 index 5be7f70..0000000 Binary files a/composeApp/src/commonMain/composeResources/drawable/visibility_off.png and /dev/null differ diff --git a/composeApp/src/commonMain/composeResources/drawable/zoom_in.png b/composeApp/src/commonMain/composeResources/drawable/zoom_in.png deleted file mode 100644 index c04269d..0000000 Binary files a/composeApp/src/commonMain/composeResources/drawable/zoom_in.png and /dev/null differ diff --git a/composeApp/src/commonMain/composeResources/drawable/zoom_out.png b/composeApp/src/commonMain/composeResources/drawable/zoom_out.png deleted file mode 100644 index fc17946..0000000 Binary files a/composeApp/src/commonMain/composeResources/drawable/zoom_out.png and /dev/null differ diff --git a/composeApp/src/commonMain/kotlin/net/codinux/banking/ui/appskeleton/BottomBar.kt b/composeApp/src/commonMain/kotlin/net/codinux/banking/ui/appskeleton/BottomBar.kt index 99264d4..109b2eb 100644 --- a/composeApp/src/commonMain/kotlin/net/codinux/banking/ui/appskeleton/BottomBar.kt +++ b/composeApp/src/commonMain/kotlin/net/codinux/banking/ui/appskeleton/BottomBar.kt @@ -7,6 +7,7 @@ import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material.* import androidx.compose.material.icons.Icons import androidx.compose.material.icons.filled.* +import androidx.compose.material.icons.outlined.FilterAlt import androidx.compose.runtime.* import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier @@ -17,13 +18,10 @@ import androidx.compose.ui.input.key.* import androidx.compose.ui.text.TextStyle import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp -import bankmeister.composeapp.generated.resources.Res -import bankmeister.composeapp.generated.resources.filter_alt import kotlinx.coroutines.launch import net.codinux.banking.ui.config.Colors import net.codinux.banking.ui.config.DI import net.codinux.banking.ui.extensions.toggle -import org.jetbrains.compose.resources.imageResource private val uiState = DI.uiState @@ -135,7 +133,7 @@ fun BottomBar(showMenuDrawer: Boolean = true) { Row(Modifier.fillMaxHeight().widthIn(IconWidth.times(2), IconWidth.times(2)), verticalAlignment = Alignment.CenterVertically) { IconButton({ uiState.showFilterBar.value = !!!uiState.showFilterBar.value }, Modifier.width(IconWidth)) { - Icon(imageResource(Res.drawable.filter_alt), "Kontoumsätze nach Konto, Zeitraum oder Betrag filtern", Modifier.size(24.dp)) + Icon(Icons.Outlined.FilterAlt, "Kontoumsätze nach Konto, Zeitraum oder Betrag filtern", Modifier.size(24.dp)) } IconButton({ coroutineScope.launch { DI.bankingService.updateAccountTransactions() } }, Modifier.width(IconWidth)) { diff --git a/composeApp/src/commonMain/kotlin/net/codinux/banking/ui/dialogs/EnterTanDialog.kt b/composeApp/src/commonMain/kotlin/net/codinux/banking/ui/dialogs/EnterTanDialog.kt index 984ce74..1b2dad9 100644 --- a/composeApp/src/commonMain/kotlin/net/codinux/banking/ui/dialogs/EnterTanDialog.kt +++ b/composeApp/src/commonMain/kotlin/net/codinux/banking/ui/dialogs/EnterTanDialog.kt @@ -4,6 +4,9 @@ import androidx.compose.foundation.Image import androidx.compose.foundation.layout.* import androidx.compose.foundation.text.KeyboardOptions import androidx.compose.material.* +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.ZoomIn +import androidx.compose.material.icons.filled.ZoomOut import androidx.compose.runtime.* import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier @@ -13,9 +16,6 @@ import androidx.compose.ui.graphics.Color import androidx.compose.ui.layout.ContentScale import androidx.compose.ui.text.input.KeyboardType import androidx.compose.ui.unit.dp -import bankmeister.composeapp.generated.resources.Res -import bankmeister.composeapp.generated.resources.zoom_in -import bankmeister.composeapp.generated.resources.zoom_out import kotlinx.datetime.TimeZone import kotlinx.datetime.toLocalDateTime import net.codinux.banking.client.model.tan.ActionRequiringTan @@ -146,11 +146,11 @@ fun EnterTanDialog(tanChallengeReceived: TanChallengeReceived, onDismiss: () -> Text("Größe") Spacer(Modifier.width(6.dp)) TextButton({ tanImageHeight -= 25}, enabled = tanImageHeight > minTanImageHeight, modifier = Modifier.width(48.dp), colors = ButtonDefaults.buttonColors(backgroundColor = Color.Transparent)) { - Icon(imageResource(Res.drawable.zoom_out), contentDescription = "Bild mit enkodierter TAN verkleiner", Modifier.size(28.dp)) + Icon(Icons.Filled.ZoomOut, contentDescription = "Bild mit enkodierter TAN verkleiner", Modifier.size(28.dp)) } Spacer(Modifier.width(6.dp)) TextButton({ tanImageHeight += 25}, enabled = tanImageHeight < maxTanImageHeight, modifier = Modifier.width(48.dp), colors = ButtonDefaults.buttonColors(backgroundColor = Color.Transparent)) { - Icon(imageResource(Res.drawable.zoom_in), contentDescription = "Bild mit enkodierter TAN vergrößern", Modifier.size(28.dp)) + Icon(Icons.Filled.ZoomIn, contentDescription = "Bild mit enkodierter TAN vergrößern", Modifier.size(28.dp)) } } diff --git a/composeApp/src/commonMain/kotlin/net/codinux/banking/ui/forms/PasswordTextField.kt b/composeApp/src/commonMain/kotlin/net/codinux/banking/ui/forms/PasswordTextField.kt index c0b980e..2833564 100644 --- a/composeApp/src/commonMain/kotlin/net/codinux/banking/ui/forms/PasswordTextField.kt +++ b/composeApp/src/commonMain/kotlin/net/codinux/banking/ui/forms/PasswordTextField.kt @@ -6,16 +6,15 @@ import androidx.compose.foundation.layout.size import androidx.compose.foundation.text.KeyboardOptions import androidx.compose.material.Icon import androidx.compose.material.Text +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.Visibility +import androidx.compose.material.icons.filled.VisibilityOff import androidx.compose.runtime.* import androidx.compose.ui.Modifier import androidx.compose.ui.text.input.KeyboardType import androidx.compose.ui.text.input.PasswordVisualTransformation import androidx.compose.ui.text.input.VisualTransformation import androidx.compose.ui.unit.dp -import bankmeister.composeapp.generated.resources.Res -import bankmeister.composeapp.generated.resources.visibility -import bankmeister.composeapp.generated.resources.visibility_off -import org.jetbrains.compose.resources.imageResource @Composable // try BasicSecureTextField fun PasswordTextField(password: String = "", label: String = "Passwort", forceHidePassword: Boolean? = null, onEnterPressed: (() -> Unit)? = null, onChange: (String) -> Unit) { @@ -34,12 +33,12 @@ fun PasswordTextField(password: String = "", label: String = "Passwort", forceHi visualTransformation = if (passwordVisible) VisualTransformation.None else PasswordVisualTransformation(), trailingIcon = { val visibilityIcon = if (passwordVisible) { - Res.drawable.visibility_off + Icons.Filled.VisibilityOff } else { - Res.drawable.visibility + Icons.Filled.Visibility } Icon( - bitmap = imageResource(visibilityIcon), + visibilityIcon, contentDescription = if (passwordVisible) "Hide password" else "Show password", modifier = Modifier.size(24.dp).clickable { passwordVisible = !passwordVisible } )