diff options
author | Torsten Grote <t@grobox.de> | 2020-09-08 15:14:43 -0300 |
---|---|---|
committer | Torsten Grote <t@grobox.de> | 2020-09-08 15:39:53 -0300 |
commit | 0030ad13496571616501500dfd9df18652869004 (patch) | |
tree | a8e75101edee511f2a1ba62e7a30c1dfe41aaa04 /taler-kotlin-android/src/main/res | |
parent | 7260531f37b5832b3a0f8059bf931919a6e0b059 (diff) | |
download | taler-android-0030ad13496571616501500dfd9df18652869004.tar.gz taler-android-0030ad13496571616501500dfd9df18652869004.tar.bz2 taler-android-0030ad13496571616501500dfd9df18652869004.zip |
[pos] use bottom sheet for showing errors instead of snackbar
Diffstat (limited to 'taler-kotlin-android/src/main/res')
6 files changed, 154 insertions, 0 deletions
diff --git a/taler-kotlin-android/src/main/res/drawable/ic_close.xml b/taler-kotlin-android/src/main/res/drawable/ic_close.xml new file mode 100644 index 0000000..d5d2297 --- /dev/null +++ b/taler-kotlin-android/src/main/res/drawable/ic_close.xml @@ -0,0 +1,10 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:tint="?attr/colorControlNormal" + android:viewportWidth="24" + android:viewportHeight="24"> + <path + android:fillColor="@android:color/white" + android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z" /> +</vector> diff --git a/taler-kotlin-android/src/main/res/drawable/ic_share.xml b/taler-kotlin-android/src/main/res/drawable/ic_share.xml new file mode 100644 index 0000000..59b0e84 --- /dev/null +++ b/taler-kotlin-android/src/main/res/drawable/ic_share.xml @@ -0,0 +1,10 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:tint="?attr/colorControlNormal" + android:viewportWidth="24" + android:viewportHeight="24"> + <path + android:fillColor="@android:color/white" + android:pathData="M18,16.08c-0.76,0 -1.44,0.3 -1.96,0.77L8.91,12.7c0.05,-0.23 0.09,-0.46 0.09,-0.7s-0.04,-0.47 -0.09,-0.7l7.05,-4.11c0.54,0.5 1.25,0.81 2.04,0.81 1.66,0 3,-1.34 3,-3s-1.34,-3 -3,-3 -3,1.34 -3,3c0,0.24 0.04,0.47 0.09,0.7L8.04,9.81C7.5,9.31 6.79,9 6,9c-1.66,0 -3,1.34 -3,3s1.34,3 3,3c0.79,0 1.5,-0.31 2.04,-0.81l7.12,4.16c-0.05,0.21 -0.08,0.43 -0.08,0.65 0,1.61 1.31,2.92 2.92,2.92 1.61,0 2.92,-1.31 2.92,-2.92s-1.31,-2.92 -2.92,-2.92z" /> +</vector> diff --git a/taler-kotlin-android/src/main/res/layout/bottomsheet_error.xml b/taler-kotlin-android/src/main/res/layout/bottomsheet_error.xml new file mode 100644 index 0000000..8d8e540 --- /dev/null +++ b/taler-kotlin-android/src/main/res/layout/bottomsheet_error.xml @@ -0,0 +1,84 @@ +<?xml version="1.0" encoding="utf-8"?><!-- + ~ This file is part of GNU Taler + ~ (C) 2020 Taler Systems S.A. + ~ + ~ GNU Taler is free software; you can redistribute it and/or modify it under the + ~ terms of the GNU General Public License as published by the Free Software + ~ Foundation; either version 3, or (at your option) any later version. + ~ + ~ GNU Taler is distributed in the hope that it will be useful, but WITHOUT ANY + ~ WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR + ~ A PARTICULAR PURPOSE. See the GNU General Public License for more details. + ~ + ~ You should have received a copy of the GNU General Public License along with + ~ GNU Taler; see the file COPYING. If not, see <http://www.gnu.org/licenses/> + --> + +<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto" + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="match_parent" + android:layout_height="match_parent" + tools:layout_height="500dp"> + + <TextView + android:id="@+id/mainText" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_margin="16dp" + android:textColor="?android:attr/textColorPrimary" + app:layout_constrainedHeight="true" + app:layout_constraintBottom_toTopOf="@+id/guideline" + app:layout_constraintEnd_toStartOf="@+id/closeButton" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" + tools:text="@tools:sample/lorem" /> + + <ImageButton + android:id="@+id/closeButton" + android:layout_width="48dp" + android:layout_height="48dp" + android:background="?attr/selectableItemBackgroundBorderless" + android:contentDescription="@string/close" + android:src="@drawable/ic_close" + app:layout_constraintBottom_toTopOf="@+id/guideline" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintVertical_bias="0.0" /> + + <androidx.constraintlayout.widget.Guideline + android:id="@+id/guideline" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:orientation="horizontal" + app:layout_constraintGuide_begin="@dimen/bottom_sheet_peek_height" /> + + <TextView + android:id="@+id/detailText" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_margin="16dp" + android:fontFamily="monospace" + android:minHeight="48dp" + android:textColor="@color/red" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toStartOf="@+id/shareButton" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="@+id/guideline" + app:layout_constraintVertical_bias="0.0" + tools:text="@tools:sample/lorem/random" /> + + <ImageButton + android:id="@+id/shareButton" + android:layout_width="48dp" + android:layout_height="48dp" + android:layout_margin="16dp" + android:background="?attr/selectableItemBackgroundBorderless" + android:contentDescription="@string/share" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintTop_toTopOf="@+id/guideline" + app:layout_constraintVertical_bias="1.0" + app:srcCompat="@drawable/ic_share" /> + +</androidx.constraintlayout.widget.ConstraintLayout> diff --git a/taler-kotlin-android/src/main/res/values/dimens.xml b/taler-kotlin-android/src/main/res/values/dimens.xml new file mode 100644 index 0000000..03c413d --- /dev/null +++ b/taler-kotlin-android/src/main/res/values/dimens.xml @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + ~ This file is part of GNU Taler + ~ (C) 2020 Taler Systems S.A. + ~ + ~ GNU Taler is free software; you can redistribute it and/or modify it under the + ~ terms of the GNU General Public License as published by the Free Software + ~ Foundation; either version 3, or (at your option) any later version. + ~ + ~ GNU Taler is distributed in the hope that it will be useful, but WITHOUT ANY + ~ WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR + ~ A PARTICULAR PURPOSE. See the GNU General Public License for more details. + ~ + ~ You should have received a copy of the GNU General Public License along with + ~ GNU Taler; see the file COPYING. If not, see <http://www.gnu.org/licenses/> + --> + +<resources> + <item name="bottom_sheet_peek_height" type="dimen">80dp</item> +</resources> diff --git a/taler-kotlin-android/src/main/res/values/strings.xml b/taler-kotlin-android/src/main/res/values/strings.xml index a5b1df1..9903ada 100644 --- a/taler-kotlin-android/src/main/res/values/strings.xml +++ b/taler-kotlin-android/src/main/res/values/strings.xml @@ -18,4 +18,7 @@ <string name="version_invalid">Invalid version. Please try again later!</string> <string name="version_too_old">App too old. Please upgrade!</string> <string name="version_too_new">Service outdated. Please wait until it gets upgraded.</string> + + <string name="close">Close</string> + <string name="share">Share</string> </resources> diff --git a/taler-kotlin-android/src/main/res/values/styles.xml b/taler-kotlin-android/src/main/res/values/styles.xml new file mode 100644 index 0000000..af11cbd --- /dev/null +++ b/taler-kotlin-android/src/main/res/values/styles.xml @@ -0,0 +1,27 @@ +<?xml version="1.0" encoding="utf-8"?><!-- + ~ This file is part of GNU Taler + ~ (C) 2020 Taler Systems S.A. + ~ + ~ GNU Taler is free software; you can redistribute it and/or modify it under the + ~ terms of the GNU General Public License as published by the Free Software + ~ Foundation; either version 3, or (at your option) any later version. + ~ + ~ GNU Taler is distributed in the hope that it will be useful, but WITHOUT ANY + ~ WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR + ~ A PARTICULAR PURPOSE. See the GNU General Public License for more details. + ~ + ~ You should have received a copy of the GNU General Public License along with + ~ GNU Taler; see the file COPYING. If not, see <http://www.gnu.org/licenses/> + --> + +<resources> + + <style name="ErrorBottomSheet" parent="Widget.MaterialComponents.BottomSheet.Modal"> + <item name="behavior_peekHeight">@dimen/bottom_sheet_peek_height</item> + </style> + + <style name="ErrorBottomSheetTheme" parent="Theme.MaterialComponents.BottomSheetDialog"> + <item name="bottomSheetStyle">@style/ErrorBottomSheet</item> + </style> + +</resources>
\ No newline at end of file |