jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/403414 )
Change subject: Fix a couple more button text center-alignments.
......................................................................
Fix a couple more button text center-alignments.
Change-Id: I7df05cf8d592767ad1eca4f662e3bc0df8804327
---
M app/src/main/res/layout/activity_login.xml
M app/src/main/res/layout/fragment_local_compilations.xml
M app/src/main/res/layout/fragment_onboarding_pager.xml
M app/src/main/res/layout/inflate_create_account_onboarding.xml
M app/src/main/res/layout/view_card_announcement.xml
M app/src/main/res/layout/view_card_offline_compilation.xml
M app/src/main/res/layout/view_link_preview_overlay.xml
M app/src/main/res/layout/view_onboarding.xml
M app/src/main/res/values/styles.xml
9 files changed, 14 insertions(+), 14 deletions(-)
Approvals:
jenkins-bot: Verified
Cooltey: Looks good to me, approved
diff --git a/app/src/main/res/layout/activity_login.xml
b/app/src/main/res/layout/activity_login.xml
index e28ae52..6b7408c 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -31,7 +31,7 @@
<TextView
android:id="@+id/login_create_ccount_button"
- style="@style/Widget.AppCompat.Button.Borderless"
+ style="@style/TransparentButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="0dp"
diff --git a/app/src/main/res/layout/fragment_local_compilations.xml
b/app/src/main/res/layout/fragment_local_compilations.xml
index d032a8c..bddd3b3 100644
--- a/app/src/main/res/layout/fragment_local_compilations.xml
+++ b/app/src/main/res/layout/fragment_local_compilations.xml
@@ -67,7 +67,7 @@
<!-- Unhide when ready to allow downloading of packs.
-->
<TextView
android:id="@+id/compilations_add_button"
- style="@style/Widget.AppCompat.Button.Borderless"
+ style="@style/TransparentButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="4dp"
diff --git a/app/src/main/res/layout/fragment_onboarding_pager.xml
b/app/src/main/res/layout/fragment_onboarding_pager.xml
index 2733a87..c0af0b6 100644
--- a/app/src/main/res/layout/fragment_onboarding_pager.xml
+++ b/app/src/main/res/layout/fragment_onboarding_pager.xml
@@ -30,8 +30,7 @@
<TextView
android:id="@+id/fragment_onboarding_skip_button"
- style="@style/Widget.AppCompat.Button.Borderless"
- android:textAlignment="center"
+ style="@style/TransparentButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="0dp"
@@ -66,8 +65,7 @@
<TextView
android:id="@+id/fragment_onboarding_done_button"
- style="@style/Widget.AppCompat.Button.Borderless"
- android:textAlignment="center"
+ style="@style/TransparentButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="0dp"
diff --git a/app/src/main/res/layout/inflate_create_account_onboarding.xml
b/app/src/main/res/layout/inflate_create_account_onboarding.xml
index f1a92ba..7301946 100644
--- a/app/src/main/res/layout/inflate_create_account_onboarding.xml
+++ b/app/src/main/res/layout/inflate_create_account_onboarding.xml
@@ -100,7 +100,7 @@
<TextView
android:id="@+id/create_account_login_button"
- style="@style/Widget.AppCompat.Button.Borderless"
+ style="@style/TransparentButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="0dp"
diff --git a/app/src/main/res/layout/view_card_announcement.xml
b/app/src/main/res/layout/view_card_announcement.xml
index 7b46192..06412bd 100644
--- a/app/src/main/res/layout/view_card_announcement.xml
+++ b/app/src/main/res/layout/view_card_announcement.xml
@@ -35,7 +35,7 @@
<TextView
android:id="@+id/view_announcement_action_negative"
- style="@style/Widget.AppCompat.Button.Borderless"
+ style="@style/TransparentButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="4dp"
diff --git a/app/src/main/res/layout/view_card_offline_compilation.xml
b/app/src/main/res/layout/view_card_offline_compilation.xml
index 50eeb82..afa41a6 100644
--- a/app/src/main/res/layout/view_card_offline_compilation.xml
+++ b/app/src/main/res/layout/view_card_offline_compilation.xml
@@ -36,7 +36,7 @@
android:layout_height="wrap_content"
android:layout_marginLeft="4dp"
android:layout_marginRight="4dp"
- style="@style/Widget.AppCompat.Button.Borderless"
+ style="@style/TransparentButton"
android:textColor="@android:color/white"
android:text="@string/offline_my_compilations"/>
diff --git a/app/src/main/res/layout/view_link_preview_overlay.xml
b/app/src/main/res/layout/view_link_preview_overlay.xml
index 9fbbd6d..394b662 100644
--- a/app/src/main/res/layout/view_link_preview_overlay.xml
+++ b/app/src/main/res/layout/view_link_preview_overlay.xml
@@ -23,9 +23,8 @@
android:paddingTop="16dp"
android:paddingBottom="16dp"
android:textColor="@color/base30"
- android:textAlignment="center"
android:background="?attr/selectableItemBackground"
- style="@style/Widget.AppCompat.Button.Borderless"
+ style="@style/TransparentButton"
android:text="@string/button_get_directions"/>
<TextView
android:id="@+id/link_preview_primary_button"
@@ -35,9 +34,8 @@
android:paddingTop="16dp"
android:paddingBottom="16dp"
android:textColor="?attr/colorAccent"
- android:textAlignment="center"
android:background="?attr/selectableItemBackground"
- style="@style/Widget.AppCompat.Button.Borderless"
+ style="@style/TransparentButton"
android:fontFamily="sans-serif-medium"
android:text="@string/button_continue_to_article"/>
diff --git a/app/src/main/res/layout/view_onboarding.xml
b/app/src/main/res/layout/view_onboarding.xml
index feca0c2..170950e 100644
--- a/app/src/main/res/layout/view_onboarding.xml
+++ b/app/src/main/res/layout/view_onboarding.xml
@@ -43,7 +43,7 @@
<TextView
android:id="@+id/view_onboarding_action_negative"
- style="@style/Widget.AppCompat.Button.Borderless"
+ style="@style/TransparentButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="4dp"
diff --git a/app/src/main/res/values/styles.xml
b/app/src/main/res/values/styles.xml
index c9aed9a..a85cdc9 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -227,6 +227,10 @@
<item name="android:minHeight">36dp</item>
</style>
+ <style name="TransparentButton"
parent="@style/Widget.AppCompat.Button.Borderless">
+ <item name="android:textAlignment">center</item>
+ </style>
+
<style name="OnboardingSwitch">
<item name="colorControlActivated">@color/accent75</item>
<item name="colorSwitchThumbNormal">@color/base50</item>
--
To view, visit https://gerrit.wikimedia.org/r/403414
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7df05cf8d592767ad1eca4f662e3bc0df8804327
Gerrit-PatchSet: 2
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Dbrant <[email protected]>
Gerrit-Reviewer: Brion VIBBER <[email protected]>
Gerrit-Reviewer: Cooltey <[email protected]>
Gerrit-Reviewer: Sharvaniharan <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
