summaryrefslogtreecommitdiff
path: root/wallet/src/main/res/layout
diff options
context:
space:
mode:
authorTorsten Grote <t@grobox.de>2020-09-03 11:50:13 -0300
committerTorsten Grote <t@grobox.de>2020-09-03 11:50:13 -0300
commit85c344b358e13d5b78647d191d6129dd11f8bdaf (patch)
tree0aa870edbd76e43075d3c701626a2b41ce78682d /wallet/src/main/res/layout
parent126b0710dda4546dc3337df1bee886f5f4657674 (diff)
downloadtaler-android-85c344b358e13d5b78647d191d6129dd11f8bdaf.tar.gz
taler-android-85c344b358e13d5b78647d191d6129dd11f8bdaf.tar.bz2
taler-android-85c344b358e13d5b78647d191d6129dd11f8bdaf.zip
[wallet] migrate away from kotlin view extensions
Diffstat (limited to 'wallet/src/main/res/layout')
-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
4 files changed, 7 insertions, 5 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"