diff options
author | Torsten Grote <t@grobox.de> | 2020-03-04 16:14:29 -0300 |
---|---|---|
committer | Torsten Grote <t@grobox.de> | 2020-03-04 16:14:29 -0300 |
commit | 1bbc48f7f9a893c13b07a5436a0b2b5f923de398 (patch) | |
tree | a84ba1a7fcc59c5a07dba7083e532726a9eea11a /app/src/main/res/layout | |
parent | 30980bc83be99ea85205f44c815b78164b11f7b9 (diff) | |
download | wallet-android-1bbc48f7f9a893c13b07a5436a0b2b5f923de398.tar.gz wallet-android-1bbc48f7f9a893c13b07a5436a0b2b5f923de398.tar.bz2 wallet-android-1bbc48f7f9a893c13b07a5436a0b2b5f923de398.zip |
Move pending operations into their own fragment
They will be visible only in developer mode
and otherwise rendered nicely for the user where appropriate.
Diffstat (limited to 'app/src/main/res/layout')
-rw-r--r-- | app/src/main/res/layout/fragment_pending_operations.xml | 34 | ||||
-rw-r--r-- | app/src/main/res/layout/fragment_show_balance.xml | 16 |
2 files changed, 37 insertions, 13 deletions
diff --git a/app/src/main/res/layout/fragment_pending_operations.xml b/app/src/main/res/layout/fragment_pending_operations.xml new file mode 100644 index 0000000..26c1be1 --- /dev/null +++ b/app/src/main/res/layout/fragment_pending_operations.xml @@ -0,0 +1,34 @@ +<?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"> + + <androidx.recyclerview.widget.RecyclerView + android:id="@+id/list_pending" + android:layout_width="0dp" + android:layout_height="0dp" + android:scrollbars="vertical" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" + tools:listitem="@layout/pending_row" /> + +</androidx.constraintlayout.widget.ConstraintLayout> diff --git a/app/src/main/res/layout/fragment_show_balance.xml b/app/src/main/res/layout/fragment_show_balance.xml index af003eb..db50754 100644 --- a/app/src/main/res/layout/fragment_show_balance.xml +++ b/app/src/main/res/layout/fragment_show_balance.xml @@ -34,7 +34,8 @@ android:id="@+id/list_balances" android:layout_width="match_parent" android:layout_height="wrap_content" - android:scrollbars="vertical" /> + android:scrollbars="vertical" + tools:listitem="@layout/balance_row" /> <TextView android:id="@+id/list_balances_placeholder" @@ -60,17 +61,6 @@ android:layout_height="wrap_content" android:text="@string/button_scan_qr_code" /> - <TextView - android:id="@+id/pending_operations_label" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="@string/pending_operations_label" /> - - <androidx.recyclerview.widget.RecyclerView - android:id="@+id/list_pending" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:scrollbars="vertical" /> - </LinearLayout> + </androidx.core.widget.NestedScrollView> |