Dbrant has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/381127 )
Change subject: Consolidation: Use styles for commonly-used text instances.
......................................................................
Consolidation: Use styles for commonly-used text instances.
Change-Id: Idcb0cadd413c02bf57147642ce002948d1c1e98c
---
M app/src/main/res/layout/activity_login.xml
M app/src/main/res/layout/fragment_history.xml
M app/src/main/res/layout/fragment_local_compilations.xml
M app/src/main/res/layout/fragment_reading_list.xml
M app/src/main/res/layout/fragment_reading_lists.xml
M app/src/main/res/layout/fragment_search_recent.xml
M app/src/main/res/layout/inflate_create_account_onboarding.xml
M app/src/main/res/layout/item_language_list_entry.xml
M app/src/main/res/layout/item_page_list_entry.xml
M app/src/main/res/layout/item_reading_list.xml
M app/src/main/res/layout/item_search_result.xml
M app/src/main/res/layout/view_card_offline.xml
M app/src/main/res/layout/view_link_preview_error.xml
M app/src/main/res/layout/view_list_card_item.xml
M app/src/main/res/layout/view_search_empty.xml
M app/src/main/res/layout/view_static_card.xml
M app/src/main/res/values/styles.xml
17 files changed, 67 insertions(+), 74 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia
refs/changes/27/381127/1
diff --git a/app/src/main/res/layout/activity_login.xml
b/app/src/main/res/layout/activity_login.xml
index c20221d..2a6e414 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -26,7 +26,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:textColor="?attr/primary_text_color"
+ android:textColor="?attr/material_theme_primary_color"
android:text="@string/login_dont_have_account" />
<TextView
diff --git a/app/src/main/res/layout/fragment_history.xml
b/app/src/main/res/layout/fragment_history.xml
index 8145f0f..ea19e18 100644
--- a/app/src/main/res/layout/fragment_history.xml
+++ b/app/src/main/res/layout/fragment_history.xml
@@ -20,8 +20,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:gravity="center"
- android:textSize="20sp"
- android:fontFamily="sans-serif-medium"
+ style="@style/MaterialLargePrimaryTitle"
android:layout_marginBottom="20dp"
android:text="@string/history_empty_title" />
<ImageView
@@ -38,7 +37,7 @@
android:layout_gravity="center_horizontal"
android:layout_marginTop="32dp"
android:gravity="center"
- android:textSize="16sp"
+ style="@style/MaterialMediumSecondaryCaption"
android:text="@string/history_empty_message" />
</LinearLayout>
diff --git a/app/src/main/res/layout/fragment_local_compilations.xml
b/app/src/main/res/layout/fragment_local_compilations.xml
index b65548a..ad9be8b 100644
--- a/app/src/main/res/layout/fragment_local_compilations.xml
+++ b/app/src/main/res/layout/fragment_local_compilations.xml
@@ -93,9 +93,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
- android:textSize="20sp"
- android:fontFamily="sans-serif-medium"
- android:textColor="?attr/primary_text_color"
+ style="@style/MaterialLargePrimaryTitle"
android:text="@string/offline_library_empty_title"/>
<ImageView
@@ -113,10 +111,7 @@
android:layout_marginLeft="@dimen/activity_horizontal_margin"
android:layout_marginRight="@dimen/activity_horizontal_margin"
android:gravity="center"
- android:textSize="16sp"
- android:fontFamily="sans-serif-medium"
- android:lineSpacingMultiplier="1.2"
- android:textColor="?attr/material_theme_secondary_color"
+ style="@style/MaterialMediumSecondaryCaption"
android:text="@string/offline_library_empty_description"/>
<TextView
diff --git a/app/src/main/res/layout/fragment_reading_list.xml
b/app/src/main/res/layout/fragment_reading_list.xml
index 411d26d..135de5d 100644
--- a/app/src/main/res/layout/fragment_reading_list.xml
+++ b/app/src/main/res/layout/fragment_reading_list.xml
@@ -59,7 +59,7 @@
android:layout_marginTop="96dp"
android:gravity="center"
android:padding="16dp"
- android:textSize="16sp"
+ style="@style/MaterialMediumSecondaryCaption"
android:text="@string/reading_list_empty"
android:visibility="gone"
tools:visibility="visible"/>
diff --git a/app/src/main/res/layout/fragment_reading_lists.xml
b/app/src/main/res/layout/fragment_reading_lists.xml
index c64dcb7..dc1ffd3 100644
--- a/app/src/main/res/layout/fragment_reading_lists.xml
+++ b/app/src/main/res/layout/fragment_reading_lists.xml
@@ -21,8 +21,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:gravity="center"
- android:textSize="20sp"
- android:fontFamily="sans-serif-medium"
+ style="@style/MaterialLargePrimaryTitle"
android:layout_marginBottom="20dp"
android:text="@string/reading_lists_empty" />
<ImageView
@@ -39,7 +38,7 @@
android:layout_gravity="center_horizontal"
android:layout_marginTop="32dp"
android:gravity="center"
- android:textSize="16sp"
+ style="@style/MaterialMediumSecondaryCaption"
android:text="@string/reading_lists_empty_message" />
</LinearLayout>
diff --git a/app/src/main/res/layout/fragment_search_recent.xml
b/app/src/main/res/layout/fragment_search_recent.xml
index 481a141..263d39b 100644
--- a/app/src/main/res/layout/fragment_search_recent.xml
+++ b/app/src/main/res/layout/fragment_search_recent.xml
@@ -33,8 +33,7 @@
android:layout_marginRight="30dp"
android:gravity="center"
android:text="@string/search_empty_message"
- android:textSize="16sp"
- android:lineSpacingMultiplier="1.25"/>
+ style="@style/MaterialMediumSecondaryCaption"/>
</LinearLayout>
<LinearLayout
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 4eeae18..f1a92ba 100644
--- a/app/src/main/res/layout/inflate_create_account_onboarding.xml
+++ b/app/src/main/res/layout/inflate_create_account_onboarding.xml
@@ -95,7 +95,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:textColor="?attr/primary_text_color"
+ android:textColor="?attr/material_theme_primary_color"
android:text="@string/create_account_already_have" />
<TextView
diff --git a/app/src/main/res/layout/item_language_list_entry.xml
b/app/src/main/res/layout/item_language_list_entry.xml
index 1cfec6d..a662b73 100644
--- a/app/src/main/res/layout/item_language_list_entry.xml
+++ b/app/src/main/res/layout/item_language_list_entry.xml
@@ -15,8 +15,8 @@
android:id="@+id/localized_language_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- style="@style/RtlAwareTextView"
- android:textAppearance="?android:attr/textAppearanceMedium"
+ style="@style/MaterialListTitle"
+ android:textAppearance="@style/RtlAwareTextView"
android:gravity="center_vertical"
tools:text="Sample language local name"
/>
@@ -24,8 +24,8 @@
android:id="@+id/language_subtitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- style="@style/RtlAwareTextView"
- android:textAppearance="?android:attr/textAppearanceSmall"
+ style="@style/MaterialListSubtitle"
+ android:textAppearance="@style/RtlAwareTextView"
android:gravity="center_vertical"
tools:text="Sample article local name"
/>
diff --git a/app/src/main/res/layout/item_page_list_entry.xml
b/app/src/main/res/layout/item_page_list_entry.xml
index 3d4e05d..f8edbc2 100644
--- a/app/src/main/res/layout/item_page_list_entry.xml
+++ b/app/src/main/res/layout/item_page_list_entry.xml
@@ -24,10 +24,10 @@
android:layout_marginLeft="@dimen/list_item_horizontal_padding"
android:layout_marginRight="@dimen/list_item_horizontal_padding"
android:gravity="center_vertical"
+ android:textColor="?attr/section_title_color"
android:visibility="gone"
tools:visibility="visible"
- tools:text="Header text"
- />
+ tools:text="Header text" />
<LinearLayout
android:layout_width="match_parent"
@@ -78,9 +78,8 @@
android:layout_height="wrap_content"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
- android:textSize="16sp"
- android:textColor="?attr/primary_text_color"
- style="@style/RtlAwareTextView"
+ style="@style/MaterialListTitle"
+ android:textAppearance="@style/RtlAwareTextView"
tools:text="Lorem ipsum"/>
<org.wikipedia.views.GoneIfEmptyTextView
@@ -89,10 +88,8 @@
android:layout_height="wrap_content"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
- android:textSize="14sp"
- android:textColor="@color/base30"
- android:lineSpacingMultiplier="1.2"
- style="@style/RtlAwareTextView"
+ style="@style/MaterialListSubtitle"
+ android:textAppearance="@style/RtlAwareTextView"
tools:text="Lorem ipsum"/>
</LinearLayout>
diff --git a/app/src/main/res/layout/item_reading_list.xml
b/app/src/main/res/layout/item_reading_list.xml
index 4da4f0b..62c63cf 100644
--- a/app/src/main/res/layout/item_reading_list.xml
+++ b/app/src/main/res/layout/item_reading_list.xml
@@ -67,22 +67,21 @@
android:id="@+id/item_title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- style="@style/RtlAwareTextView"
- android:textSize="16sp"
+ android:textAppearance="@style/RtlAwareTextView"
+ style="@style/MaterialListTitle"
android:ellipsize="end"
android:maxLines="2"
- android:textColor="?attr/material_theme_primary_color"
tools:text="Lorem ipsum" />
<TextView
android:id="@+id/item_reading_list_statistical_description"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- style="@style/RtlAwareTextView"
+ android:textAppearance="@style/RtlAwareTextView"
+ style="@style/MaterialListSubtitle"
android:textSize="12sp"
android:ellipsize="end"
android:maxLines="1"
- android:textColor="?attr/secondary_text_color"
tools:text="x items" />
<TextView
@@ -90,11 +89,10 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
- style="@style/RtlAwareTextView"
- android:textAppearance="?android:attr/textAppearanceSmall"
+ android:textAppearance="@style/RtlAwareTextView"
+ style="@style/MaterialListSubtitle"
android:ellipsize="end"
android:maxLines="@integer/reading_list_description_summary_view_max_lines"
- android:textColor="?attr/secondary_text_color"
tools:text="Sample description" />
</LinearLayout>
diff --git a/app/src/main/res/layout/item_search_result.xml
b/app/src/main/res/layout/item_search_result.xml
index fff1b3b..a1fad40 100644
--- a/app/src/main/res/layout/item_search_result.xml
+++ b/app/src/main/res/layout/item_search_result.xml
@@ -37,9 +37,8 @@
android:layout_height="wrap_content"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
- android:textSize="16sp"
- android:textColor="?attr/primary_text_color"
- style="@style/RtlAwareTextView"
+ style="@style/MaterialListTitle"
+ android:textAppearance="@style/RtlAwareTextView"
tools:text="Lorem ipsum"/>
<LinearLayout
@@ -60,13 +59,11 @@
android:id="@+id/page_list_item_redirect"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- style="@style/RtlAwareTextView"
- android:textAppearance="?android:attr/textAppearanceSmall"
+ style="@style/MaterialListSubtitle"
+ android:textAppearance="@style/RtlAwareTextView"
android:ellipsize="end"
android:maxLines="2"
- android:textColor="?attr/secondary_text_color"
- tools:text="Redirected from..."
- />
+ tools:text="Redirected from..." />
</LinearLayout>
<org.wikipedia.views.GoneIfEmptyTextView
@@ -76,10 +73,8 @@
android:layout_marginTop="2dp"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
- android:textSize="14sp"
- android:textColor="?attr/secondary_text_color"
- android:lineSpacingMultiplier="1.2"
- style="@style/RtlAwareTextView"
+ style="@style/MaterialListSubtitle"
+ android:textAppearance="@style/RtlAwareTextView"
tools:text="Lorem ipsum"/>
</LinearLayout>
diff --git a/app/src/main/res/layout/view_card_offline.xml
b/app/src/main/res/layout/view_card_offline.xml
index 1d70421..59fa5ed 100644
--- a/app/src/main/res/layout/view_card_offline.xml
+++ b/app/src/main/res/layout/view_card_offline.xml
@@ -18,9 +18,7 @@
android:layout_height="wrap_content"
android:gravity="center"
android:text="@string/view_offline_card_text"
- android:textColor="@color/base30"
- android:textAlignment="center"
- android:textSize="16sp" />
+ style="@style/MaterialMediumSecondaryCaption" />
<TextView
android:id="@+id/view_card_offline_button_retry"
diff --git a/app/src/main/res/layout/view_link_preview_error.xml
b/app/src/main/res/layout/view_link_preview_error.xml
index 9deb7fa..31ba77b 100644
--- a/app/src/main/res/layout/view_link_preview_error.xml
+++ b/app/src/main/res/layout/view_link_preview_error.xml
@@ -17,10 +17,8 @@
android:layout_height="wrap_content"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
- android:textSize="16sp"
- android:textColor="?attr/material_theme_secondary_color"
+ style="@style/MaterialMediumSecondaryCaption"
android:gravity="center"
android:textAlignment="center"
- android:lineSpacingMultiplier="1.1"
android:text="@string/error_message_generic"/>
</merge>
\ No newline at end of file
diff --git a/app/src/main/res/layout/view_list_card_item.xml
b/app/src/main/res/layout/view_list_card_item.xml
index 9642997..1810583 100644
--- a/app/src/main/res/layout/view_list_card_item.xml
+++ b/app/src/main/res/layout/view_list_card_item.xml
@@ -34,9 +34,8 @@
android:layout_height="wrap_content"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
- android:textSize="16sp"
- android:textColor="?attr/primary_text_color"
- style="@style/RtlAwareTextView"
+ style="@style/MaterialListTitle"
+ android:textAppearance="@style/RtlAwareTextView"
tools:text="Lorem ipsum"/>
<org.wikipedia.views.GoneIfEmptyTextView
@@ -46,10 +45,8 @@
android:layout_marginTop="2dp"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
- android:textSize="14sp"
- android:textColor="?attr/secondary_text_color"
- android:lineSpacingMultiplier="1.2"
- style="@style/RtlAwareTextView"
+ style="@style/MaterialListSubtitle"
+ android:textAppearance="@style/RtlAwareTextView"
tools:text="Lorem ipsum"/>
</LinearLayout>
diff --git a/app/src/main/res/layout/view_search_empty.xml
b/app/src/main/res/layout/view_search_empty.xml
index d1969c3..e35cab6 100644
--- a/app/src/main/res/layout/view_search_empty.xml
+++ b/app/src/main/res/layout/view_search_empty.xml
@@ -22,8 +22,7 @@
android:layout_gravity="center_horizontal"
android:layout_marginTop="24dp"
android:gravity="center"
- android:textSize="16sp"
- android:textColor="@color/base30"
+ style="@style/MaterialMediumSecondaryCaption"
android:text="@string/search_no_results_found" />
</merge>
diff --git a/app/src/main/res/layout/view_static_card.xml
b/app/src/main/res/layout/view_static_card.xml
index 2bba23a..0517736 100644
--- a/app/src/main/res/layout/view_static_card.xml
+++ b/app/src/main/res/layout/view_static_card.xml
@@ -22,7 +22,7 @@
android:layout_marginBottom="2dp"
android:fontFamily="sans-serif-medium"
android:textSize="14sp"
- android:textColor="?attr/material_theme_primary_color"
+ android:textColor="?attr/section_title_color"
tools:text="Title of card"/>
<TextView
diff --git a/app/src/main/res/values/styles.xml
b/app/src/main/res/values/styles.xml
index 1f6361d..03767a8 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -107,15 +107,9 @@
<item name="android:dividerHeight">0dp</item>
</style>
- <style name="RtlAwareTextView" parent="@android:style/Widget.TextView"
tools:targetApi="17">
+ <style name="RtlAwareTextView" tools:targetApi="17">
<item name="android:textDirection">anyRtl</item>
<item name="android:textAlignment">viewStart</item>
- </style>
-
- <style name="ToolTipTextView" parent="@style/RtlAwareTextView"
tools:targetApi="17">
- <item name="android:layoutDirection">locale</item>
- <item name="android:maxWidth">@dimen/tool_tip_max_width</item>
- <item name="android:textColor">@android:color/white</item>
</style>
<style name="OverflowMenuItem" parent="@android:style/TextAppearance">
@@ -269,6 +263,31 @@
<item name="android:textColor">@color/red50</item>
</style>
+ <style name="MaterialLargePrimaryTitle">
+ <item name="android:textSize">20sp</item>
+ <item name="android:lineSpacingExtra">8sp</item>
+ <item name="android:fontFamily">sans-serif-medium</item>
+ <item
name="android:textColor">?attr/material_theme_secondary_color</item>
+ </style>
+
+ <style name="MaterialMediumSecondaryCaption">
+ <item name="android:textSize">16sp</item>
+ <item name="android:lineSpacingExtra">8sp</item>
+ <item
name="android:textColor">?attr/material_theme_secondary_color</item>
+ </style>
+
+ <style name="MaterialListTitle">
+ <item name="android:textSize">16sp</item>
+ <item name="android:lineSpacingExtra">8sp</item>
+ <item
name="android:textColor">?attr/material_theme_primary_color</item>
+ </style>
+
+ <style name="MaterialListSubtitle">
+ <item name="android:textSize">14sp</item>
+ <item name="android:lineSpacingExtra">6sp</item>
+ <item
name="android:textColor">?attr/material_theme_secondary_color</item>
+ </style>
+
<style name="ReadingListTitleTextAppearance">
<item name="android:textSize">20sp</item>
<item name="android:fontFamily">sans-serif-medium</item>
--
To view, visit https://gerrit.wikimedia.org/r/381127
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Idcb0cadd413c02bf57147642ce002948d1c1e98c
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Dbrant <dbr...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
