diff options
author | Iván Ávalos <avalos@disroot.org> | 2023-01-11 21:08:11 -0600 |
---|---|---|
committer | Iván Ávalos <avalos@disroot.org> | 2023-01-26 12:18:54 -0600 |
commit | c1684e6c3f6f131136efebcb2724e681b79aef6c (patch) | |
tree | e19785eb69929b8c594e06c24197f8fdde865f4d /wallet/src/main/res/layout | |
parent | c2a9681cd415e6d5b0a100b14624326a51d5a293 (diff) | |
download | taler-android-c1684e6c3f6f131136efebcb2724e681b79aef6c.tar.gz taler-android-c1684e6c3f6f131136efebcb2724e681b79aef6c.tar.bz2 taler-android-c1684e6c3f6f131136efebcb2724e681b79aef6c.zip |
[wallet] Experimental port to Material 3
Diffstat (limited to 'wallet/src/main/res/layout')
7 files changed, 9 insertions, 9 deletions
diff --git a/wallet/src/main/res/layout/app_content_main.xml b/wallet/src/main/res/layout/app_content_main.xml index 6937e59..b53717f 100644 --- a/wallet/src/main/res/layout/app_content_main.xml +++ b/wallet/src/main/res/layout/app_content_main.xml @@ -36,14 +36,14 @@ style="@style/AppTheme.Toolbar" android:layout_width="0dp" android:layout_height="wrap_content" - android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" + android:theme="@style/Widget.Material3.ActionBar.Solid" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> <me.zhanghai.android.materialprogressbar.MaterialProgressBar android:id="@+id/progress_bar" - style="@style/Widget.MaterialProgressBar.ProgressBar.Horizontal" + style="@style/Widget.MaterialProgressBar.ProgressBar" android:layout_width="0dp" android:layout_height="4dp" android:elevation="4dp" diff --git a/wallet/src/main/res/layout/dialog_exchange_add.xml b/wallet/src/main/res/layout/dialog_exchange_add.xml index dfa0f70..bf90177 100644 --- a/wallet/src/main/res/layout/dialog_exchange_add.xml +++ b/wallet/src/main/res/layout/dialog_exchange_add.xml @@ -22,7 +22,7 @@ <com.google.android.material.textfield.TextInputLayout android:id="@+id/urlLayout" - style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense" + style="@style/Widget.Material3.TextInputLayout.OutlinedBox.Dense" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_margin="16dp" diff --git a/wallet/src/main/res/layout/fragment_error.xml b/wallet/src/main/res/layout/fragment_error.xml index b9f585f..c8c4913 100644 --- a/wallet/src/main/res/layout/fragment_error.xml +++ b/wallet/src/main/res/layout/fragment_error.xml @@ -60,7 +60,7 @@ android:layout_height="wrap_content" android:layout_margin="16dp" android:gravity="center" - android:textAppearance="@style/TextAppearance.AppCompat.Medium" + android:textAppearance="@style/TextAppearance.Material3.TitleMedium" app:layout_constraintBottom_toTopOf="@+id/errorDevMessage" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" diff --git a/wallet/src/main/res/layout/fragment_manual_withdraw.xml b/wallet/src/main/res/layout/fragment_manual_withdraw.xml index ec176ff..56ff077 100644 --- a/wallet/src/main/res/layout/fragment_manual_withdraw.xml +++ b/wallet/src/main/res/layout/fragment_manual_withdraw.xml @@ -57,7 +57,7 @@ <com.google.android.material.textfield.TextInputLayout android:id="@+id/amountLayout" - style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense" + style="@style/Widget.Material3.TextInputLayout.OutlinedBox.Dense" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="16dp" diff --git a/wallet/src/main/res/layout/fragment_transactions.xml b/wallet/src/main/res/layout/fragment_transactions.xml index bad79ea..00bde32 100644 --- a/wallet/src/main/res/layout/fragment_transactions.xml +++ b/wallet/src/main/res/layout/fragment_transactions.xml @@ -22,9 +22,9 @@ <com.google.android.material.button.MaterialButton android:id="@+id/sendButton" - style="@style/Widget.MaterialComponents.Button.TextButton" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_marginStart="10dp" android:text="@string/transactions_send_funds" app:layout_constraintBottom_toTopOf="@+id/divider" app:layout_constraintStart_toStartOf="parent" @@ -32,9 +32,9 @@ <com.google.android.material.button.MaterialButton android:id="@+id/receiveButton" - style="@style/Widget.MaterialComponents.Button.TextButton" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_marginHorizontal="10dp" android:text="@string/transactions_receive_funds" app:layout_constraintBottom_toTopOf="@+id/divider" app:layout_constraintEnd_toStartOf="@+id/amount" diff --git a/wallet/src/main/res/layout/fragment_uri_input.xml b/wallet/src/main/res/layout/fragment_uri_input.xml index 1e9934f..6ea1a13 100644 --- a/wallet/src/main/res/layout/fragment_uri_input.xml +++ b/wallet/src/main/res/layout/fragment_uri_input.xml @@ -22,7 +22,7 @@ <com.google.android.material.textfield.TextInputLayout android:id="@+id/uriLayout" - style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense" + style="@style/Widget.Material3.TextInputLayout.OutlinedBox.Dense" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_margin="16dp" diff --git a/wallet/src/main/res/layout/nav_header_main.xml b/wallet/src/main/res/layout/nav_header_main.xml index e70e80f..6837814 100644 --- a/wallet/src/main/res/layout/nav_header_main.xml +++ b/wallet/src/main/res/layout/nav_header_main.xml @@ -39,7 +39,7 @@ android:layout_marginTop="8dp" android:layout_marginEnd="16dp" android:text="@string/nav_header_title" - android:textAppearance="@style/TextAppearance.AppCompat.Body1" + android:textAppearance="@style/TextAppearance.Material3.BodyLarge" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/talerLogoView" /> |