summaryrefslogtreecommitdiff
path: root/wallet/src/main/res
diff options
context:
space:
mode:
Diffstat (limited to 'wallet/src/main/res')
-rw-r--r--wallet/src/main/res/layout/activity_main.xml3
-rw-r--r--wallet/src/main/res/layout/app_content_main.xml (renamed from wallet/src/main/res/layout/app_bar_main.xml)0
-rw-r--r--wallet/src/main/res/layout/fragment_prompt_payment.xml8
-rw-r--r--wallet/src/main/res/layout/payment_bottom_bar.xml1
-rw-r--r--wallet/src/main/res/navigation/nav_graph.xml38
5 files changed, 41 insertions, 9 deletions
diff --git a/wallet/src/main/res/layout/activity_main.xml b/wallet/src/main/res/layout/activity_main.xml
index 3879490..15e11fe 100644
--- a/wallet/src/main/res/layout/activity_main.xml
+++ b/wallet/src/main/res/layout/activity_main.xml
@@ -24,7 +24,8 @@
tools:openDrawer="start">
<include
- layout="@layout/app_bar_main"
+ android:id="@+id/content"
+ layout="@layout/app_content_main"
android:layout_width="match_parent"
android:layout_height="match_parent" />
diff --git a/wallet/src/main/res/layout/app_bar_main.xml b/wallet/src/main/res/layout/app_content_main.xml
index 6937e59..6937e59 100644
--- a/wallet/src/main/res/layout/app_bar_main.xml
+++ b/wallet/src/main/res/layout/app_content_main.xml
diff --git a/wallet/src/main/res/layout/fragment_prompt_payment.xml b/wallet/src/main/res/layout/fragment_prompt_payment.xml
index 8d8954d..8cfa3dd 100644
--- a/wallet/src/main/res/layout/fragment_prompt_payment.xml
+++ b/wallet/src/main/res/layout/fragment_prompt_payment.xml
@@ -22,23 +22,23 @@
tools:context=".payment.PromptPaymentFragment">
<include
- android:id="@+id/scrollView"
+ android:id="@+id/details"
layout="@layout/payment_details"
android:layout_width="0dp"
android:layout_height="0dp"
- app:layout_constraintBottom_toTopOf="@+id/bottomView"
+ app:layout_constraintBottom_toTopOf="@+id/bottom"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<include
- android:id="@+id/bottomView"
+ android:id="@+id/bottom"
layout="@layout/payment_bottom_bar"
android:layout_width="0dp"
android:layout_height="wrap_content"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/scrollView" />
+ app:layout_constraintTop_toBottomOf="@+id/details" />
</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/wallet/src/main/res/layout/payment_bottom_bar.xml b/wallet/src/main/res/layout/payment_bottom_bar.xml
index dbc60ae..496f2f3 100644
--- a/wallet/src/main/res/layout/payment_bottom_bar.xml
+++ b/wallet/src/main/res/layout/payment_bottom_bar.xml
@@ -17,6 +17,7 @@
<com.google.android.material.card.MaterialCardView 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:id="@+id/bottomView"
style="@style/BottomCard"
android:layout_width="0dp"
android:layout_height="wrap_content"
diff --git a/wallet/src/main/res/navigation/nav_graph.xml b/wallet/src/main/res/navigation/nav_graph.xml
index 285fac9..d8ce5b2 100644
--- a/wallet/src/main/res/navigation/nav_graph.xml
+++ b/wallet/src/main/res/navigation/nav_graph.xml
@@ -89,8 +89,26 @@
tools:layout="@layout/fragment_transactions" />
<fragment
- android:id="@+id/nav_transactions_detail"
- android:name="net.taler.wallet.transactions.TransactionDetailFragment"
+ android:id="@+id/nav_transactions_detail_withdrawal"
+ android:name="net.taler.wallet.transactions.TransactionWithdrawalFragment"
+ android:label="@string/transactions_detail_title"
+ tools:layout="@layout/fragment_transaction_withdrawal" />
+
+ <fragment
+ android:id="@+id/nav_transactions_detail_payment"
+ android:name="net.taler.wallet.transactions.TransactionPaymentFragment"
+ android:label="@string/transactions_detail_title"
+ tools:layout="@layout/fragment_transaction_payment" />
+
+ <fragment
+ android:id="@+id/nav_transactions_detail_refund"
+ android:name="net.taler.wallet.transactions.TransactionRefundFragment"
+ android:label="@string/transactions_detail_title"
+ tools:layout="@layout/fragment_transaction_payment" />
+
+ <fragment
+ android:id="@+id/nav_transactions_detail_refresh"
+ android:name="net.taler.wallet.transactions.TransactionRefreshFragment"
android:label="@string/transactions_detail_title"
tools:layout="@layout/fragment_transaction_withdrawal" />
@@ -168,7 +186,19 @@
app:destination="@id/nav_pending_operations" />
<action
- android:id="@+id/action_nav_transaction_detail"
- app:destination="@id/nav_transactions_detail" />
+ android:id="@+id/action_nav_transactions_detail_withdrawal"
+ app:destination="@id/nav_transactions_detail_withdrawal" />
+
+ <action
+ android:id="@+id/action_nav_transactions_detail_payment"
+ app:destination="@id/nav_transactions_detail_payment" />
+
+ <action
+ android:id="@+id/action_nav_transactions_detail_refund"
+ app:destination="@id/nav_transactions_detail_refund" />
+
+ <action
+ android:id="@+id/action_nav_transactions_detail_refresh"
+ app:destination="@id/nav_transactions_detail_refresh" />
</navigation>