diff --git a/CHANGELOG.md b/CHANGELOG.md index 0e5ebc2a1d..a095fe3151 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ All notable changes to this project will be documented in this file. ### Removed ### Fixed * ui: subject dialog for external billing now works in dark mode +* ui: external billing icon works with dark mode now ## [0.75.7] ### Added diff --git a/ui/src/main/java/io/snabble/sdk/ui/payment/PaymentCredentialsListView.java b/ui/src/main/java/io/snabble/sdk/ui/payment/PaymentCredentialsListView.java index 99a854920a..c6d530f16f 100644 --- a/ui/src/main/java/io/snabble/sdk/ui/payment/PaymentCredentialsListView.java +++ b/ui/src/main/java/io/snabble/sdk/ui/payment/PaymentCredentialsListView.java @@ -220,7 +220,7 @@ public void onChanged() { entries.add(new Entry(pm, R.drawable.snabble_ic_payment_select_tegut, pm.getObfuscatedId())); break; case EXTERNAL_BILLING: - entries.add(new Entry(pm, R.drawable.ic_snabble_external_billing, pm.getObfuscatedId())); + entries.add(new Entry(pm, R.drawable.snabble_ic_external_billing, pm.getObfuscatedId())); break; } } diff --git a/ui/src/main/java/io/snabble/sdk/ui/payment/PaymentMethodIcons.kt b/ui/src/main/java/io/snabble/sdk/ui/payment/PaymentMethodIcons.kt index 5425fdd64b..d378fb8d5e 100644 --- a/ui/src/main/java/io/snabble/sdk/ui/payment/PaymentMethodIcons.kt +++ b/ui/src/main/java/io/snabble/sdk/ui/payment/PaymentMethodIcons.kt @@ -21,7 +21,7 @@ val PaymentMethodDescriptor.icon: Int PaymentMethod.GOOGLE_PAY.id -> R.drawable.snabble_ic_payment_select_gpay "externalBilling" -> when (acceptedOriginTypes?.first()) { "tegutEmployeeID" -> R.drawable.snabble_ic_payment_select_tegut - "contactPersonCredentials" -> R.drawable.ic_snabble_external_billing + "contactPersonCredentials" -> R.drawable.snabble_ic_external_billing else -> 0 } diff --git a/ui/src/main/java/io/snabble/sdk/ui/payment/PaymentMethodMetaData.kt b/ui/src/main/java/io/snabble/sdk/ui/payment/PaymentMethodMetaData.kt index 5cf6fa4f6e..16fbc38666 100644 --- a/ui/src/main/java/io/snabble/sdk/ui/payment/PaymentMethodMetaData.kt +++ b/ui/src/main/java/io/snabble/sdk/ui/payment/PaymentMethodMetaData.kt @@ -18,7 +18,7 @@ import io.snabble.sdk.PaymentMethod.QRCODE_POS import io.snabble.sdk.PaymentMethod.TEGUT_EMPLOYEE_CARD import io.snabble.sdk.PaymentMethod.TWINT import io.snabble.sdk.PaymentMethod.VISA -import io.snabble.sdk.ui.R.drawable.ic_snabble_external_billing +import io.snabble.sdk.ui.R.drawable.snabble_ic_external_billing import io.snabble.sdk.ui.R.drawable.snabble_ic_payment_giropay import io.snabble.sdk.ui.R.drawable.snabble_ic_payment_select_amex import io.snabble.sdk.ui.R.drawable.snabble_ic_payment_select_gpay @@ -50,7 +50,7 @@ class PaymentMethodMetaDataHelper( GIROPAY withMeta (Snabble_Giropay_title.resolved to snabble_ic_payment_giropay), PAYONE_SEPA withMeta ("SEPA-Lastschrift" to snabble_ic_payment_select_sepa), GATEKEEPER_TERMINAL withMeta (Snabble_Payment_payAtSCO.resolved to snabble_ic_payment_select_sco), - EXTERNAL_BILLING withMeta (Snabble_Payment_ExternalBilling_title.resolved to ic_snabble_external_billing), + EXTERNAL_BILLING withMeta (Snabble_Payment_ExternalBilling_title.resolved to snabble_ic_external_billing), TEGUT_EMPLOYEE_CARD withMeta ("Tegut... Mitarbeiterkarte" to snabble_ic_payment_select_tegut), CUSTOMERCARD_POS withMeta (Snabble_Payment_payAtCashDesk.resolved to snabble_ic_payment_select_pos), QRCODE_POS withMeta (Snabble_Payment_payAtCashDesk.resolved to snabble_ic_payment_select_pos), diff --git a/ui/src/main/java/io/snabble/sdk/ui/payment/SelectPaymentMethodFragment.java b/ui/src/main/java/io/snabble/sdk/ui/payment/SelectPaymentMethodFragment.java index 3ce78d9c8e..b72376dc5a 100644 --- a/ui/src/main/java/io/snabble/sdk/ui/payment/SelectPaymentMethodFragment.java +++ b/ui/src/main/java/io/snabble/sdk/ui/payment/SelectPaymentMethodFragment.java @@ -102,7 +102,7 @@ public void click() { if (availablePaymentMethods.contains(PaymentMethod.EXTERNAL_BILLING)) { entries.add(new SelectPaymentMethodFragment.Entry( - R.drawable.ic_snabble_external_billing, + R.drawable.snabble_ic_external_billing, requireContext().getString(R.string.Snabble_Payment_ExternalBilling_title), getUsableAtText(PaymentMethod.EXTERNAL_BILLING), new OneShotClickListener() { diff --git a/ui/src/main/res/drawable-mdpi/ic_snabble_external_billing.png b/ui/src/main/res/drawable-mdpi/ic_snabble_external_billing.png deleted file mode 100644 index c314c21a7f..0000000000 Binary files a/ui/src/main/res/drawable-mdpi/ic_snabble_external_billing.png and /dev/null differ diff --git a/ui/src/main/res/drawable-night-hdpi/ic_snabble_external_billing.png b/ui/src/main/res/drawable-night-hdpi/ic_snabble_external_billing.png deleted file mode 100644 index 9ae4720b85..0000000000 Binary files a/ui/src/main/res/drawable-night-hdpi/ic_snabble_external_billing.png and /dev/null differ diff --git a/ui/src/main/res/drawable-night-xhdpi/ic_snabble_external_billing.png b/ui/src/main/res/drawable-night-xhdpi/ic_snabble_external_billing.png deleted file mode 100644 index 1bb3143a16..0000000000 Binary files a/ui/src/main/res/drawable-night-xhdpi/ic_snabble_external_billing.png and /dev/null differ diff --git a/ui/src/main/res/drawable-night-xxhdpi/ic_snabble_external_billing.png b/ui/src/main/res/drawable-night-xxhdpi/ic_snabble_external_billing.png deleted file mode 100644 index ab09925440..0000000000 Binary files a/ui/src/main/res/drawable-night-xxhdpi/ic_snabble_external_billing.png and /dev/null differ diff --git a/ui/src/main/res/drawable-night-xxxhdpi/ic_snabble_external_billing.png b/ui/src/main/res/drawable-night-xxxhdpi/ic_snabble_external_billing.png deleted file mode 100644 index 143f927ee4..0000000000 Binary files a/ui/src/main/res/drawable-night-xxxhdpi/ic_snabble_external_billing.png and /dev/null differ diff --git a/ui/src/main/res/drawable/snabble_ic_external_billing.xml b/ui/src/main/res/drawable/snabble_ic_external_billing.xml new file mode 100644 index 0000000000..5db8d0c16e --- /dev/null +++ b/ui/src/main/res/drawable/snabble_ic_external_billing.xml @@ -0,0 +1,12 @@ + + + + +