[Android] Set the correct style for dialogs buttons
Geoffrey Métais
git at videolan.org
Tue Nov 13 18:03:52 CET 2018
vlc-android | branch: master | Geoffrey Métais <geoffrey.metais at gmail.com> | Tue Nov 13 18:03:32 2018 +0100| [8c06d0c23c0f540ecfc98dbd558fe40c5376e740] | committer: Geoffrey Métais
Set the correct style for dialogs buttons
> https://code.videolan.org/videolan/vlc-android/commit/8c06d0c23c0f540ecfc98dbd558fe40c5376e740
---
vlc-android/res/layout/dialog_playlist.xml | 4 ++--
vlc-android/res/layout/dialog_renderers.xml | 2 +-
vlc-android/res/layout/ml_wizard_activity.xml | 2 +-
vlc-android/res/layout/network_server_dialog.xml | 4 ++--
vlc-android/res/layout/subtitle_download_fragment.xml | 2 +-
vlc-android/res/layout/subtitle_downloader_dialog.xml | 2 +-
vlc-android/res/layout/vlc_login_dialog.xml | 4 ++--
vlc-android/res/layout/vlc_progress_dialog.xml | 2 +-
vlc-android/res/layout/vlc_question_dialog.xml | 6 +++---
9 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/vlc-android/res/layout/dialog_playlist.xml b/vlc-android/res/layout/dialog_playlist.xml
index 9a637cced..a4547d67b 100644
--- a/vlc-android/res/layout/dialog_playlist.xml
+++ b/vlc-android/res/layout/dialog_playlist.xml
@@ -28,7 +28,7 @@
android:layout_below="@+id/dialog_playlist_name"
android:layout_toStartOf="@+id/dialog_playlist_save"
android:layout_marginEnd="8dp"
- style="@style/Widget.MaterialComponents.Button.OutlinedButton" />
+ style="@style/Widget.MaterialComponents.Button.TextButton.Dialog" />
<Button
android:id="@+id/dialog_playlist_save"
android:layout_width="wrap_content"
@@ -36,7 +36,7 @@
android:layout_alignParentEnd="true"
android:text="@android:string/ok"
android:layout_below="@+id/dialog_playlist_name"
- style="@style/Widget.MaterialComponents.Button.OutlinedButton" />
+ style="@style/Widget.MaterialComponents.Button.TextButton.Dialog" />
<FrameLayout
android:id="@+id/dialog_list_container"
android:layout_width="match_parent"
diff --git a/vlc-android/res/layout/dialog_renderers.xml b/vlc-android/res/layout/dialog_renderers.xml
index 1d8632c3c..ba13bdcd1 100644
--- a/vlc-android/res/layout/dialog_renderers.xml
+++ b/vlc-android/res/layout/dialog_renderers.xml
@@ -39,7 +39,7 @@
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
- style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+ style="@style/Widget.MaterialComponents.Button.TextButton.Dialog"
android:text="@string/renderers_disconnect"
android:textAppearance="@style/TextAppearance.AppCompat.Medium"
android:onClick="@{() -> holder.connect((RendererItem)null)}" />
diff --git a/vlc-android/res/layout/ml_wizard_activity.xml b/vlc-android/res/layout/ml_wizard_activity.xml
index 03fc22089..ee0c64405 100644
--- a/vlc-android/res/layout/ml_wizard_activity.xml
+++ b/vlc-android/res/layout/ml_wizard_activity.xml
@@ -28,7 +28,7 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@+id/wizard_check_scan"
- style="@style/Widget.MaterialComponents.Button.OutlinedButton" />
+ style="@style/Widget.MaterialComponents.Button.TextButton.Dialog" />
<TextView
android:id="@+id/wizard_description"
diff --git a/vlc-android/res/layout/network_server_dialog.xml b/vlc-android/res/layout/network_server_dialog.xml
index e4de460ec..5ab93f8ac 100644
--- a/vlc-android/res/layout/network_server_dialog.xml
+++ b/vlc-android/res/layout/network_server_dialog.xml
@@ -115,7 +115,7 @@
android:text="@android:string/cancel"
android:layout_below="@id/server_name"
android:layout_toStartOf="@+id/server_save"
- style="@style/Widget.MaterialComponents.Button.OutlinedButton" />
+ style="@style/Widget.MaterialComponents.Button.TextButton.Dialog" />
<Button
android:id="@+id/server_save"
android:layout_width="wrap_content"
@@ -124,5 +124,5 @@
android:layout_marginStart="8dp"
android:text="@android:string/ok"
android:layout_below="@id/server_name"
- style="@style/Widget.MaterialComponents.Button.OutlinedButton" />
+ style="@style/Widget.MaterialComponents.Button.TextButton.Dialog" />
</RelativeLayout>
\ No newline at end of file
diff --git a/vlc-android/res/layout/subtitle_download_fragment.xml b/vlc-android/res/layout/subtitle_download_fragment.xml
index 4ea4d9133..5a0d971bc 100644
--- a/vlc-android/res/layout/subtitle_download_fragment.xml
+++ b/vlc-android/res/layout/subtitle_download_fragment.xml
@@ -153,7 +153,7 @@
app:layout_constraintEnd_toStartOf="@+id/right_vertical_guideline"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toEndOf="@+id/episode"
- style="@style/Widget.MaterialComponents.Button.OutlinedButton" />
+ style="@style/Widget.MaterialComponents.Button.TextButton.Dialog" />
<androidx.constraintlayout.widget.Guideline
android:id="@+id/top_horizontal_guideline"
diff --git a/vlc-android/res/layout/subtitle_downloader_dialog.xml b/vlc-android/res/layout/subtitle_downloader_dialog.xml
index 867499a25..2621fc483 100644
--- a/vlc-android/res/layout/subtitle_downloader_dialog.xml
+++ b/vlc-android/res/layout/subtitle_downloader_dialog.xml
@@ -50,7 +50,7 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/pager"
app:layout_constraintBottom_toBottomOf="parent"
- style="@style/Widget.MaterialComponents.Button.OutlinedButton" />
+ style="@style/Widget.MaterialComponents.Button.TextButton.Dialog" />
</androidx.constraintlayout.widget.ConstraintLayout>
</layout>
\ No newline at end of file
diff --git a/vlc-android/res/layout/vlc_login_dialog.xml b/vlc-android/res/layout/vlc_login_dialog.xml
index 7a84c6a26..e63351936 100644
--- a/vlc-android/res/layout/vlc_login_dialog.xml
+++ b/vlc-android/res/layout/vlc_login_dialog.xml
@@ -80,7 +80,7 @@
android:focusable="true"
android:text="@android:string/cancel"
android:onClick="@{handler::onCancel}"
- style="@style/Widget.MaterialComponents.Button.OutlinedButton" />
+ style="@style/Widget.MaterialComponents.Button.TextButton.Dialog" />
<Button
android:id="@+id/action"
android:layout_width="wrap_content"
@@ -92,7 +92,7 @@
android:layout_below="@+id/warning"
android:text="@android:string/ok"
android:onClick="@{handler::onLogin}"
- style="@style/Widget.MaterialComponents.Button.OutlinedButton" />
+ style="@style/Widget.MaterialComponents.Button.TextButton.Dialog" />
</RelativeLayout>
</ScrollView>
</layout>
diff --git a/vlc-android/res/layout/vlc_progress_dialog.xml b/vlc-android/res/layout/vlc_progress_dialog.xml
index 8965525f0..649ebd64c 100644
--- a/vlc-android/res/layout/vlc_progress_dialog.xml
+++ b/vlc-android/res/layout/vlc_progress_dialog.xml
@@ -38,7 +38,7 @@
android:layout_alignParentEnd="true"
android:layout_marginEnd="8dp"
android:onClick="@{handler::onCancel}"
- style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+ style="@style/Widget.MaterialComponents.Button.TextButton.Dialog"
android:visibility="@{TextUtils.isEmpty(dialog.cancelText) ? View.GONE : View.VISIBLE}"/>
tools:visibility="visible"/>
</RelativeLayout>
diff --git a/vlc-android/res/layout/vlc_question_dialog.xml b/vlc-android/res/layout/vlc_question_dialog.xml
index 6108cfa48..623145011 100644
--- a/vlc-android/res/layout/vlc_question_dialog.xml
+++ b/vlc-android/res/layout/vlc_question_dialog.xml
@@ -30,7 +30,7 @@
android:layout_toStartOf="@+id/action2"
android:layout_marginStart="@dimen/default_margin"
android:onClick="@{handler::onCancel}"
- style="@style/Widget.MaterialComponents.Button.OutlinedButton" />
+ style="@style/Widget.MaterialComponents.Button.TextButton.Dialog" />
<Button
android:id="@+id/action2"
android:layout_width="wrap_content"
@@ -41,7 +41,7 @@
android:text="@{dialog.action2Text}"
android:visibility="@{TextUtils.isEmpty(dialog.action2Text) ? View.GONE : View.VISIBLE}"
android:onClick="@{handler::onAction2}"
- style="@style/Widget.MaterialComponents.Button.OutlinedButton" />
+ style="@style/Widget.MaterialComponents.Button.TextButton.Dialog" />
<Button
android:id="@+id/action1"
android:layout_width="wrap_content"
@@ -53,7 +53,7 @@
android:text="@{dialog.action1Text}"
android:visibility="@{TextUtils.isEmpty(dialog.action1Text) ? View.GONE : View.VISIBLE}"
android:onClick="@{handler::onAction1}"
- style="@style/Widget.MaterialComponents.Button.OutlinedButton" />
+ style="@style/Widget.MaterialComponents.Button.TextButton.Dialog" />
</RelativeLayout>
</ScrollView>
</layout>
More information about the Android
mailing list