summaryrefslogtreecommitdiff
path: root/cashier
diff options
context:
space:
mode:
Diffstat (limited to 'cashier')
-rw-r--r--cashier/build.gradle4
-rw-r--r--cashier/proguard-rules.pro1
-rw-r--r--cashier/src/main/java/net/taler/cashier/BalanceFragment.kt1
-rw-r--r--cashier/src/main/res/layout-w550dp/fragment_balance.xml2
-rw-r--r--cashier/src/main/res/layout/fragment_balance.xml2
-rw-r--r--cashier/src/main/res/values/strings.xml2
6 files changed, 6 insertions, 6 deletions
diff --git a/cashier/build.gradle b/cashier/build.gradle
index a749353..337a427 100644
--- a/cashier/build.gradle
+++ b/cashier/build.gradle
@@ -28,7 +28,7 @@ android {
defaultConfig {
applicationId "net.taler.cashier"
- minSdkVersion 24
+ minSdkVersion 23
targetSdkVersion 29
versionCode 1
versionName "0.1"
@@ -70,7 +70,7 @@ android {
dependencies {
implementation project(":taler-kotlin-android")
implementation "androidx.constraintlayout:constraintlayout:$constraintlayout_version"
- implementation 'androidx.security:security-crypto:1.0.0-rc03'
+ implementation 'androidx.security:security-crypto:1.0.0-rc03' // requires minSdk 23
implementation "com.google.android.material:material:$material_version"
implementation "androidx.navigation:navigation-fragment-ktx:$nav_version"
diff --git a/cashier/proguard-rules.pro b/cashier/proguard-rules.pro
index a1cc1f6..ced7b5c 100644
--- a/cashier/proguard-rules.pro
+++ b/cashier/proguard-rules.pro
@@ -20,6 +20,7 @@
# hide the original source file name.
#-renamesourcefileattribute SourceFile
+#noinspection ShrinkerUnresolvedReference
-keep class net.taler.cashier.** {*;}
# androidx.security:security-crypto
diff --git a/cashier/src/main/java/net/taler/cashier/BalanceFragment.kt b/cashier/src/main/java/net/taler/cashier/BalanceFragment.kt
index 541bca2..86ace20 100644
--- a/cashier/src/main/java/net/taler/cashier/BalanceFragment.kt
+++ b/cashier/src/main/java/net/taler/cashier/BalanceFragment.kt
@@ -27,7 +27,6 @@ import android.view.ViewGroup
import android.view.inputmethod.EditorInfo
import androidx.fragment.app.Fragment
import androidx.fragment.app.activityViewModels
-import androidx.lifecycle.Observer
import androidx.navigation.fragment.findNavController
import net.taler.cashier.BalanceFragmentDirections.Companion.actionBalanceFragmentToTransactionFragment
import net.taler.cashier.databinding.FragmentBalanceBinding
diff --git a/cashier/src/main/res/layout-w550dp/fragment_balance.xml b/cashier/src/main/res/layout-w550dp/fragment_balance.xml
index bcfffc7..5023aba 100644
--- a/cashier/src/main/res/layout-w550dp/fragment_balance.xml
+++ b/cashier/src/main/res/layout-w550dp/fragment_balance.xml
@@ -208,9 +208,9 @@
android:layout_margin="@dimen/default_margin"
android:backgroundTint="@color/green"
android:drawableLeft="@drawable/ic_withdraw"
- android:drawableTint="?attr/colorOnPrimarySurface"
android:text="@string/withdraw_button_confirm"
android:visibility="invisible"
+ app:drawableTint="?attr/colorOnPrimarySurface"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="@+id/guideline"
diff --git a/cashier/src/main/res/layout/fragment_balance.xml b/cashier/src/main/res/layout/fragment_balance.xml
index 5a11b2a..b8a8012 100644
--- a/cashier/src/main/res/layout/fragment_balance.xml
+++ b/cashier/src/main/res/layout/fragment_balance.xml
@@ -211,9 +211,9 @@
android:layout_margin="@dimen/default_margin"
android:backgroundTint="@color/green"
android:drawableLeft="@drawable/ic_withdraw"
- android:drawableTint="?attr/colorOnPrimarySurface"
android:text="@string/withdraw_button_confirm"
android:visibility="invisible"
+ app:drawableTint="?attr/colorOnPrimarySurface"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.5"
diff --git a/cashier/src/main/res/values/strings.xml b/cashier/src/main/res/values/strings.xml
index 0400f82..4a8064f 100644
--- a/cashier/src/main/res/values/strings.xml
+++ b/cashier/src/main/res/values/strings.xml
@@ -1,4 +1,4 @@
-<resources xmlns:tools="http://schemas.android.com/tools">
+<resources>
<string name="app_name">Taler Cashier</string>
<string name="config_bank_url">Bank API address</string>