jenkins-bot has submitted this change and it was merged.
Change subject: Hygiene: break layout into separate XML files
......................................................................
Hygiene: break layout into separate XML files
The Reading List onboarding is a static billboard experience and quite
independent. Break the onboarding out into a separate file and include
it instead. No functional changes intended.
Change-Id: Ia934894a91d4a7618b9c0efdb0144cd0667973ba
---
M app/src/main/res/layout/dialog_add_to_reading_list.xml
A app/src/main/res/layout/include_add_to_reading_list_onboarding.xml
2 files changed, 115 insertions(+), 109 deletions(-)
Approvals:
BearND: Looks good to me, but someone else must approve
Mholloway: Looks good to me, approved
jenkins-bot: Verified
diff --git a/app/src/main/res/layout/dialog_add_to_reading_list.xml
b/app/src/main/res/layout/dialog_add_to_reading_list.xml
index 5850611..2fd0ea8 100644
--- a/app/src/main/res/layout/dialog_add_to_reading_list.xml
+++ b/app/src/main/res/layout/dialog_add_to_reading_list.xml
@@ -98,115 +98,8 @@
</LinearLayout>
- <LinearLayout
+ <include
android:id="@+id/onboarding_container"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="vertical"
- android:paddingLeft="16dp"
- android:paddingRight="16dp"
- android:paddingTop="16dp"
- android:paddingBottom="16dp"
- android:background="?attr/link_preview_background_color">
+ layout="@layout/include_add_to_reading_list_onboarding" />
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:textSize="20sp"
- android:textColor="?attr/link_preview_text_color"
- android:text="@string/reading_lists_onboarding_intro"/>
-
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginTop="16dp"
- android:textAllCaps="true"
- android:textColor="?attr/link_preview_text_color"
- android:text="@string/reading_lists_onboarding_for_example"/>
-
- <!--
- Not yet able to use vector drawables with compound TextView...
- https://code.google.com/p/android/issues/detail?id=204183. Here's what
it might look like
- (currently doesn't work on at least API 16 and 19):
-
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginTop="16dp"
- android:gravity="center_vertical"
- android:textSize="16sp"
- android:textColor="?attr/link_preview_text_color"
- android:text="@string/reading_lists_onboarding_example1"
- android:drawablePadding="24dp"
- android:drawableLeft="@drawable/ic_grid_gray_24dp"
- android:drawableStart="@drawable/ic_grid_gray_24dp" />
- -->
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginTop="16dp">
- <ImageView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginEnd="24dp"
- app:srcCompat="@drawable/ic_grid_gray_24dp"
- android:contentDescription="@null"/>
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:gravity="center_vertical"
- android:textSize="16sp"
- android:textColor="?attr/link_preview_text_color"
- android:text="@string/reading_lists_onboarding_example1"/>
- </LinearLayout>
-
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginTop="16dp">
- <ImageView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginEnd="24dp"
- app:srcCompat="@drawable/ic_grid_gray_24dp"
- android:contentDescription="@null"/>
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:gravity="center_vertical"
- android:textSize="16sp"
- android:textColor="?attr/link_preview_text_color"
- android:text="@string/reading_lists_onboarding_example2"/>
- </LinearLayout>
-
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginTop="16dp"
- android:layout_marginBottom="16dp">
- <ImageView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginEnd="24dp"
- app:srcCompat="@drawable/ic_grid_gray_24dp"
- android:contentDescription="@null"/>
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:gravity="center_vertical"
- android:textSize="16sp"
- android:textColor="?attr/link_preview_text_color"
- android:text="@string/reading_lists_onboarding_example3"/>
- </LinearLayout>
-
- <Button
- android:id="@+id/onboarding_button"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_margin="0dp"
- style="@style/Widget.AppCompat.Button.Colored"
- android:textSize="16sp"
- android:textAllCaps="true"
- android:text="@string/reading_lists_onboarding_got_it"/>
- </LinearLayout>
</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/include_add_to_reading_list_onboarding.xml
b/app/src/main/res/layout/include_add_to_reading_list_onboarding.xml
new file mode 100644
index 0000000..3a211a0
--- /dev/null
+++ b/app/src/main/res/layout/include_add_to_reading_list_onboarding.xml
@@ -0,0 +1,113 @@
+<LinearLayout
+ xmlns:android="http://schemas.android.com/apk/res/android";
+ xmlns:app="http://schemas.android.com/apk/res-auto";
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical"
+ android:paddingLeft="16dp"
+ android:paddingRight="16dp"
+ android:paddingTop="16dp"
+ android:paddingBottom="16dp"
+ android:background="?attr/link_preview_background_color">
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:textSize="20sp"
+ android:textColor="?attr/link_preview_text_color"
+ android:text="@string/reading_lists_onboarding_intro"/>
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="16dp"
+ android:textAllCaps="true"
+ android:textColor="?attr/link_preview_text_color"
+ android:text="@string/reading_lists_onboarding_for_example"/>
+
+
+ <!--
+ Not yet able to use vector drawables with compound TextView...
+ https://code.google.com/p/android/issues/detail?id=204183. Here's what it
might look like
+ (currently works on API 23 but not on API 16 and 19):
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="16dp"
+ android:gravity="center_vertical"
+ android:textSize="16sp"
+ android:textColor="?attr/link_preview_text_color"
+ android:text="@string/reading_lists_onboarding_example1"
+ android:drawablePadding="24dp"
+ android:drawableLeft="@drawable/ic_grid_gray_24dp"
+ android:drawableStart="@drawable/ic_grid_gray_24dp" />
+ -->
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="16dp">
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginEnd="24dp"
+ app:srcCompat="@drawable/ic_grid_gray_24dp"
+ android:contentDescription="@null"/>
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:gravity="center_vertical"
+ android:textSize="16sp"
+ android:textColor="?attr/link_preview_text_color"
+ android:text="@string/reading_lists_onboarding_example1"/>
+ </LinearLayout>
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="16dp">
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginEnd="24dp"
+ app:srcCompat="@drawable/ic_grid_gray_24dp"
+ android:contentDescription="@null"/>
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:gravity="center_vertical"
+ android:textSize="16sp"
+ android:textColor="?attr/link_preview_text_color"
+ android:text="@string/reading_lists_onboarding_example2"/>
+ </LinearLayout>
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="16dp"
+ android:layout_marginBottom="16dp">
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginEnd="24dp"
+ app:srcCompat="@drawable/ic_grid_gray_24dp"
+ android:contentDescription="@null"/>
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:gravity="center_vertical"
+ android:textSize="16sp"
+ android:textColor="?attr/link_preview_text_color"
+ android:text="@string/reading_lists_onboarding_example3"/>
+ </LinearLayout>
+
+ <Button
+ android:id="@+id/onboarding_button"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_margin="0dp"
+ style="@style/Widget.AppCompat.Button.Colored"
+ android:textSize="16sp"
+ android:textAllCaps="true"
+ android:text="@string/reading_lists_onboarding_got_it"/>
+</LinearLayout>
\ No newline at end of file
--
To view, visit https://gerrit.wikimedia.org/r/288699
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia934894a91d4a7618b9c0efdb0144cd0667973ba
Gerrit-PatchSet: 2
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Niedzielski <sniedziel...@wikimedia.org>
Gerrit-Reviewer: BearND <bsitzm...@wikimedia.org>
Gerrit-Reviewer: Brion VIBBER <br...@wikimedia.org>
Gerrit-Reviewer: Dbrant <dbr...@wikimedia.org>
Gerrit-Reviewer: Mholloway <mhollo...@wikimedia.org>
Gerrit-Reviewer: Niedzielski <sniedziel...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
