diff options
| author | Torsten Grote <t@grobox.de> | 2020-09-16 10:21:33 -0300 |
|---|---|---|
| committer | Torsten Grote <t@grobox.de> | 2020-09-16 10:37:37 -0300 |
| commit | c0a8673e9f97fbeb565000fe85d2f1ce55f6e8c2 (patch) | |
| tree | afeef27bf7da0683560fb61f887c87e0be410dbc /cashier/src/main | |
| parent | 85c2be5713eac244ffbe7a024ed2aa08b9816388 (diff) | |
| download | taler-android-c0a8673e9f97fbeb565000fe85d2f1ce55f6e8c2.tar.gz taler-android-c0a8673e9f97fbeb565000fe85d2f1ce55f6e8c2.tar.bz2 taler-android-c0a8673e9f97fbeb565000fe85d2f1ce55f6e8c2.zip | |
Make apps work on API 21+ (except cashier that needs 23+)
Diffstat (limited to 'cashier/src/main')
4 files changed, 3 insertions, 4 deletions
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> |