[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Consolidation: Use styles for commonly-used text instances.
jenkins-bot has submitted this change and it was merged. ( 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(-) Approvals: jenkins-bot: Verified Mholloway: 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 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 @@ 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"/> 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" /> 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"/> @@ -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" /> diff --git a/app/src/main/res/layout/item_reading_list.xml
[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Consolidation: Use styles for commonly-used text instances.
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 @@ 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"/> 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" /> 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"/> @@ -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" /> diff --git a/app/src/main/res/layout/item_reading_list.xml
