jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/400087 )
Change subject: Update empty state of reading lists
......................................................................
Update empty state of reading lists
- Updated logic for showing empty container for : Saved list is empty
- Updated image and text for : Saved list has >0 articles, but there are no
other user created lists
Bug: T183434
Change-Id: Ic9ceab68c25cdb17e04e3c0f1cc929ecf8079bec
---
M app/src/main/java/org/wikipedia/readinglist/ReadingListsFragment.java
A app/src/main/res/drawable/ic_no_user_lists.xml
M app/src/main/res/layout/fragment_reading_lists.xml
M app/src/main/res/values-qq/strings.xml
M app/src/main/res/values/strings.xml
5 files changed, 379 insertions(+), 57 deletions(-)
Approvals:
Dbrant: Looks good to me, approved
jenkins-bot: Verified
diff --git
a/app/src/main/java/org/wikipedia/readinglist/ReadingListsFragment.java
b/app/src/main/java/org/wikipedia/readinglist/ReadingListsFragment.java
index fa251fc..33c073f 100644
--- a/app/src/main/java/org/wikipedia/readinglist/ReadingListsFragment.java
+++ b/app/src/main/java/org/wikipedia/readinglist/ReadingListsFragment.java
@@ -18,6 +18,8 @@
import android.view.MenuItem;
import android.view.View;
import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.TextView;
import com.squareup.otto.Subscribe;
@@ -54,6 +56,9 @@
@BindView(R.id.reading_list_content_container) ViewGroup contentContainer;
@BindView(R.id.reading_list_list) RecyclerView readingListView;
@BindView(R.id.empty_container) View emptyContainer;
+ @BindView(R.id.empty_title) TextView emptyTitle;
+ @BindView(R.id.empty_image) ImageView emptyImage;
+ @BindView(R.id.empty_message) TextView emptyMessage;
@BindView(R.id.search_empty_view) SearchEmptyView searchEmptyView;
@BindView(R.id.reading_list_onboarding_container) ViewGroup
onboardingContainer;
@@ -190,7 +195,11 @@
private void updateEmptyState(@Nullable String searchQuery) {
if (TextUtils.isEmpty(searchQuery)) {
searchEmptyView.setVisibility(View.GONE);
- emptyContainer.setVisibility(readingLists.isEmpty() ? View.VISIBLE
: View.GONE);
+ if (readingLists.size() == 1) {
+ emptyContainer.setVisibility(View.VISIBLE);
+ setUpEmptyContainer();
+ }
+ emptyContainer.setVisibility(readingLists.size() == 1 ?
View.VISIBLE : View.GONE);
} else {
searchEmptyView.setVisibility(readingLists.isEmpty() ?
View.VISIBLE : View.GONE);
emptyContainer.setVisibility(View.GONE);
@@ -198,6 +207,18 @@
contentContainer.setVisibility(readingLists.isEmpty() ? View.GONE :
View.VISIBLE);
}
+ private void setUpEmptyContainer() {
+ if (!readingLists.get(0).pages().isEmpty()) {
+ emptyTitle.setText(getString(R.string.no_user_lists_title));
+ emptyMessage.setText(getString(R.string.no_user_lists_msg));
+
emptyImage.setImageDrawable(ContextCompat.getDrawable(emptyImage.getContext(),
R.drawable.ic_no_user_lists));
+ } else {
+ emptyTitle.setText(getString(R.string.reading_lists_empty));
+
emptyMessage.setText(getString(R.string.reading_lists_empty_message));
+
emptyImage.setImageDrawable(ContextCompat.getDrawable(emptyImage.getContext(),
R.drawable.no_lists));
+ }
+ }
+
private class ReadingListItemHolder extends RecyclerView.ViewHolder {
private ReadingListItemView itemView;
diff --git a/app/src/main/res/drawable/ic_no_user_lists.xml
b/app/src/main/res/drawable/ic_no_user_lists.xml
new file mode 100644
index 0000000..f2245ac
--- /dev/null
+++ b/app/src/main/res/drawable/ic_no_user_lists.xml
@@ -0,0 +1,286 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android";
+ android:width="168dp"
+ android:height="168dp"
+ android:viewportWidth="168.0"
+ android:viewportHeight="168.0">
+ <path
+ android:pathData="M3.8,16a2,2 0,0 1,1.82
-2.17L117.19,4.11l15.94,-1.39a2,2 0,0 1,2.17 1.82l13,148.43c0.1,1.1 -0.42,1.33
-1.21,0.56a5.64,5.64 0,0 0,-4.72 -2.21c-2.95,0.26 -2.48,2.55
-5,3.51s-2.88,-2.82 -5.67,-2.57 -2.68,3.3 -5.33,3.53 -2.75,-2.83 -5.65,-2.57
-2.92,3.32 -5.47,3.55 -2.74,-2.83 -5.72,-2.57 -2.71,3.3 -5.35,3.54 -2.72,-2.83
-5.51,-2.59 -2.48,2.56 -5.12,3.52 -3.44,-2.77 -6.14,-2.53 -2.63,3.3 -5.23,3.53
-2.45,-2.85 -5.33,-2.6 -2.94,3.32 -5.63,3.56 -3.19,-2.79 -6,-2.54 -2.23,3.26
-5,3.51 -3.13,-2.79 -5.88,-2.55 -2.44,3.28 -5.15,3.52 -2.85,-2.82 -5.75,-2.56
-2.75,3.31 -5.47,3.55 -2.75,-2.83 -5.13,-2.62 -3,4.15 -5.7,3.57 -2.56,-2.84
-5.46,-2.59a4.37,4.37 0,0 0,-3.73 2.83c-0.52,1 -1,0.87 -1.12,-0.22Z"
+ android:fillColor="#f6f6f6"/>
+ <path
+ android:pathData="M16.22,66.15l116.55,-10.2l3.57,40.84l-116.55,10.2z"
+ android:fillColor="#fff"/>
+ <path
+ android:pathData="M132.32,56.49l3.49,39.85L20.24,106.45 16.76,66.6
132.32,56.49m0.91,-1.08 l-1,0.09L16.67,65.6l-1,0.09 0.09,1 3.49,39.85 0.09,1
1,-0.09L135.89,97.33l1,-0.09 -0.09,-1L133.31,56.4l-0.09,-1Z"
+ android:fillColor="#c8ccd1"/>
+ <path
+ android:pathData="M15.77,66.69l39.85,-3.49l3.49,39.85l-39.85,3.49z"
+ android:fillColor="#c8ccd1"/>
+ <path
+ android:pathData="M25.23,77.4m-4.48,0.39a4.5,4.5 87.91,1 1,8.97
-0.78a4.5,4.5 87.91,1 1,-8.97 0.78"
+ android:fillColor="#a2a9b1"/>
+ <path
+ android:pathData="M17.94,91.59S34,96.74 41.69,96.07s2.36,5.28
2.36,5.28l-25,2.19Z"
+ android:fillType="evenOdd"
+ android:fillColor="#a2a9b1"/>
+ <path
+ android:pathData="M39.38,84.19s13.51,5.91 15,2.93 0.36,4.11
0.36,4.11L40.1,92.51Z"
+ android:fillType="evenOdd"
+ android:fillColor="#a2a9b1"/>
+ <path
+ android:pathData="M18.81,101.52S39.76,75 40.85,87.43s16.42,-5.3
16.42,-5.3L58.83,100l0.26,3 -39.84,3.53Z"
+ android:fillType="evenOdd"
+ android:fillColor="#eaecf0"/>
+ <path
+ android:pathData="M66.1,68.3L107.94,64.64A3,3 132.1,0 1,111.19
67.37L111.19,67.37A3,3 132.1,0 1,108.46 70.62L66.62,74.28A3,3 131.38,0 1,63.37
71.55L63.37,71.55A3,3 131.38,0 1,66.1 68.3z"
+ android:fillColor="#c8ccd1"/>
+ <path
+ android:pathData="M65.32,82.43L105.17,78.94A1,1 67.5,0 1,106.25
79.85L106.25,79.85A1,1 67.5,0 1,105.35 80.94L65.5,84.42A1,1 67.5,0 1,64.41
83.51L64.41,83.51A1,1 67.5,0 1,65.32 82.43z"
+ android:fillColor="#c8ccd1"/>
+ <path
+ android:pathData="M65.83,88.26L85.76,86.51A1,1 130.51,0 1,86.84
87.42L86.84,87.42A1,1 130.51,0 1,85.93 88.5L66.01,90.25A1,1 78.88,0 1,64.93
89.34L64.93,89.34A1,1 78.88,0 1,65.83 88.26z"
+ android:fillColor="#c8ccd1"/>
+ <path
+ android:pathData="M91.73,85.99L105.68,84.76A1,1 128.03,0 1,106.76
85.67L106.76,85.67A1,1 128.03,0 1,105.85 86.76L91.91,87.98A1,1 60.46,0 1,90.82
87.07L90.82,87.07A1,1 60.46,0 1,91.73 85.99z"
+ android:fillColor="#c8ccd1"/>
+ <path
+ android:pathData="M12.65,25.29l116.55,-10.2l3.57,40.84l-116.55,10.2z"
+ android:fillColor="#fff"/>
+ <path
+ android:pathData="M128.74,15.64l3.49,39.85L16.67,65.6 13.18,25.75
128.74,15.64m0.91,-1.08 l-1,0.09L13.1,24.76l-1,0.09 0.09,1 3.49,39.85 0.09,1
1,-0.09L132.32,56.49l1,-0.09 -0.09,-1 -3.49,-39.85 -0.09,-1Z"
+ android:fillColor="#c8ccd1"/>
+ <path
+ android:pathData="M12.18,25.84l39.85,-3.49l3.49,39.85l-39.85,3.49z"
+ android:fillColor="#c8ccd1"/>
+ <path
+ android:pathData="M21.66,36.56m-4.48,0.39a4.5,4.5 129.27,1 1,8.97
-0.78a4.5,4.5 129.27,1 1,-8.97 0.78"
+ android:fillColor="#a2a9b1"/>
+ <path
+ android:pathData="M14.37,50.75s16.05,5.15 23.75,4.48 2.36,5.28
2.36,5.28l-25,2.19Z"
+ android:fillType="evenOdd"
+ android:fillColor="#a2a9b1"/>
+ <path
+ android:pathData="M35.8,43.35s13.51,5.91 15,2.93 0.36,4.11
0.36,4.11L36.53,51.67Z"
+ android:fillType="evenOdd"
+ android:fillColor="#a2a9b1"/>
+ <path
+ android:pathData="M15.23,60.67s20.95,-26.55 22,-14.09 16.42,-5.3
16.42,-5.3l1.57,17.89 0.26,3L15.67,65.69Z"
+ android:fillType="evenOdd"
+ android:fillColor="#eaecf0"/>
+ <path
+ android:pathData="M62.51,27.46L104.35,23.8A3,3 59.95,0 1,107.6
26.52L107.6,26.52A3,3 59.95,0 1,104.88 29.77L63.04,33.44A3,3 119.5,0 1,59.79
30.71L59.79,30.71A3,3 119.5,0 1,62.51 27.46z"
+ android:fillColor="#c8ccd1"/>
+ <path
+ android:pathData="M61.75,41.59L101.6,38.1A1,1 52.68,0 1,102.68
39.01L102.68,39.01A1,1 52.68,0 1,101.77 40.09L61.92,43.58A1,1 130.18,0 1,60.84
42.67L60.84,42.67A1,1 130.18,0 1,61.75 41.59z"
+ android:fillColor="#c8ccd1"/>
+ <path
+ android:pathData="M62.26,47.4L82.18,45.66A1,1 58.98,0 1,83.27
46.57L83.27,46.57A1,1 58.98,0 1,82.36 47.65L62.43,49.39A1,1 56.9,0 1,61.35
48.49L61.35,48.49A1,1 56.9,0 1,62.26 47.4z"
+ android:fillColor="#c8ccd1"/>
+ <path
+ android:pathData="M88.16,45.14L102.1,43.92A1,1 83.19,0 1,103.19
44.83L103.19,44.83A1,1 83.19,0 1,102.28 45.91L88.33,47.13A1,1 77.35,0 1,87.25
46.23L87.25,46.23A1,1 77.35,0 1,88.16 45.14z"
+ android:fillColor="#c8ccd1"/>
+ <path
+ android:pathData="M117.22,46.1l-2.38,-2 0.85,-1 1.37,1.15 3.21,-3.83
1,0.85ZM121.9,48.37 L115.26,48.95 115.14,47.62
121.78,47.04ZM117.65,38a6.67,6.67 0,1 0,7.22 6.06A6.69,6.69 0,0 0,117.65 38Z"
+ android:fillType="evenOdd"
+ android:fillColor="#a2a9b1"/>
+ <path
+ android:pathData="M109.57,37.39l15.94,-1.39l1.39,15.94l-15.94,1.39z"
+ android:fillColor="#a2a9b1"/>
+ <path
+ android:pathData="M19.78,106.99l116.55,-10.2l3.57,40.84l-116.55,10.2z"
+ android:fillColor="#fff"/>
+ <path
+
android:pathData="M135.89,97.33l3.49,39.85L23.82,147.29l-3.49,-39.85L135.89,97.33m0.91,-1.08
l-1,0.09L20.24,106.45l-1,0.09 0.09,1 3.49,39.85 0.09,1 1,-0.09 115.56,-10.11
1,-0.09 -0.09,-1 -3.49,-39.85 -0.09,-1Z"
+ android:fillColor="#c8ccd1"/>
+ <path
+ android:pathData="M19.33,107.53l39.85,-3.49l3.49,39.85l-39.85,3.49z"
+ android:fillColor="#c8ccd1"/>
+ <path
+ android:pathData="M28.8,118.25m-4.48,0.39a4.5,4.5 118.23,1 1,8.97
-0.78a4.5,4.5 118.23,1 1,-8.97 0.78"
+ android:fillColor="#a2a9b1"/>
+ <path
+ android:pathData="M21.51,132.43s16.05,5.15 23.75,4.48 2.36,5.28
2.36,5.28l-25,2.19Z"
+ android:fillType="evenOdd"
+ android:fillColor="#a2a9b1"/>
+ <path
+ android:pathData="M43,125s13.51,5.91 15,2.93 0.36,4.11
0.36,4.11l-14.63,1.28Z"
+ android:fillType="evenOdd"
+ android:fillColor="#a2a9b1"/>
+ <path
+ android:pathData="M22.38,142.36s20.95,-26.55 22,-14.09S60.84,123
60.84,123l1.57,17.89 0.26,3 -39.84,3.53Z"
+ android:fillType="evenOdd"
+ android:fillColor="#eaecf0"/>
+ <path
+ android:pathData="M69.67,109.15L111.51,105.49A3,3 132.1,0 1,114.76
108.22L114.76,108.22A3,3 132.1,0 1,112.03 111.47L70.19,115.13A3,3 130.37,0
1,66.94 112.4L66.94,112.4A3,3 130.37,0 1,69.67 109.15z"
+ android:fillColor="#c8ccd1"/>
+ <path
+ android:pathData="M68.9,123.27L108.75,119.79A1,1 128.03,0 1,109.83
120.69L109.83,120.69A1,1 128.03,0 1,108.92 121.78L69.07,125.26A1,1 89.11,0
1,67.99 124.36L67.99,124.36A1,1 89.11,0 1,68.9 123.27z"
+ android:fillColor="#c8ccd1"/>
+ <path
+ android:pathData="M69.4,129.1L89.32,127.36A1,1 117,0 1,90.41
128.27L90.41,128.27A1,1 117,0 1,89.5 129.35L69.58,131.09A1,1 73.21,0 1,68.49
130.18L68.49,130.18A1,1 73.21,0 1,69.4 129.1z"
+ android:fillColor="#c8ccd1"/>
+ <path
+ android:pathData="M95.31,126.84L109.25,125.62A1,1 67.5,0 1,110.34
126.53L110.34,126.53A1,1 67.5,0 1,109.43 127.61L95.48,128.83A1,1 129.97,0
1,94.4 127.92L94.4,127.92A1,1 129.97,0 1,95.31 126.84z"
+ android:fillColor="#c8ccd1"/>
+ <path
+ android:pathData="M133.31,2.71a2,2 0,0 1,2 1.83l13,148.43c0.06,0.66
-0.11,1 -0.42,1a1.3,1.3 0,0 1,-0.79 -0.45,5.73 5.73,0 0,0
-4.29,-2.23l-0.43,0c-2.95,0.26 -2.48,2.55 -5,3.51a2.22,2.22 0,0 1,-0.78
0.15c-1.8,0 -2.37,-2.74 -4.63,-2.74h-0.26c-2.79,0.24 -2.68,3.3
-5.33,3.53h-0.28c-2.29,0 -2.55,-2.6 -5,-2.6l-0.33,0c-2.9,0.25 -2.92,3.32
-5.47,3.55H115c-2.21,0 -2.55,-2.59 -5.11,-2.59l-0.35,0c-3,0.26 -2.71,3.3
-5.35,3.54h-0.28c-2.28,0 -2.53,-2.61 -4.92,-2.61h-0.31c-2.79,0.24 -2.48,2.56
-5.12,3.52a2.44,2.44 0,0 1,-0.84 0.16c-1.94,0 -2.85,-2.7
-5.06,-2.7h-0.24c-2.7,0.24 -2.63,3.3 -5.23,3.53h-0.27c-2.23,0 -2.28,-2.63
-4.74,-2.63h-0.33c-2.88,0.25 -2.94,3.32 -5.63,3.56H70.9c-2.34,0 -3,-2.57
-5.39,-2.57h-0.32c-2.81,0.25 -2.23,3.26 -5,3.51h-0.31c-2.39,0 -2.89,-2.58
-5.27,-2.58h-0.31c-2.75,0.24 -2.44,3.28 -5.15,3.52h-0.29c-2.33,0 -2.64,-2.59
-5.13,-2.59l-0.34,0c-2.9,0.25 -2.75,3.31 -5.47,3.55h-0.29c-2.35,0 -2.53,-2.64
-4.61,-2.64h-0.23c-2.22,0.19 -2.94,3.63 -5.18,3.63a2.44,2.44 0,0 1,-0.52
-0.06c-2.53,-0.55 -2.57,-2.61 -5,-2.61l-0.44,0a4.37,4.37 0,0 0,-3.73
2.83c-0.24,0.45 -0.48,0.67 -0.67,0.67s-0.4,-0.3 -0.45,-0.89L3.8,16a2,2 0,0
1,1.82 -2.17L133.13,2.71h0.18m0,-2 l-0.35,0L5.45,11.88a4,4 0,0 0,-3.64
4.34l13,148.44c0.18,2 1.43,2.71 2.44,2.71a2.75,2.75 0,0 0,2.43 -1.72l0.09,-0.16
0.06,-0.18a2.31,2.31 0,0 1,2 -1.45h0.26c0.51,0 0.64,0.11 1.25,0.67a6.73,6.73
0,0 0,3.35 1.89,4.45 4.45,0 0,0 1,0.11c2.08,0 3.3,-1.45 4.18,-2.52 0.36,-0.44
0.91,-1.1 1.17,-1.12H33a2.63,2.63 0,0 1,0.66 0.6,5.11 5.11,0 0,0
3.95,2l0.47,0a5.56,5.56 0,0 0,4 -2.47c0.67,-0.83 0.88,-1 1.45,-1.08h0.16c0.42,0
0.62,0.15 1.27,0.78a5.34,5.34 0,0 0,3.85 1.82l0.47,0a5.28,5.28 0,0 0,4
-2.55c0.6,-0.81 0.74,-0.93 1.16,-1h0.13c0.37,0 0.6,0.16 1.3,0.78a5.74,5.74 0,0
0,4 1.8l0.48,0a5.08,5.08 0,0 0,4 -2.61c0.53,-0.77 0.62,-0.86
1,-0.89h0.14c0.45,0 0.74,0.21 1.45,0.82a5.79,5.79 0,0 0,3.94
1.75l0.47,0a5.76,5.76 0,0 0,4.05 -2.42c0.7,-0.82 1,-1.08 1.58,-1.14h0.15c0.32,0
0.42,0.05 1,0.71a4.84,4.84 0,0 0,3.72 1.92l0.44,0a5.46,5.46 0,0 0,4
-2.5c0.62,-0.79 0.82,-1 1.27,-1h0.07c0.34,0 0.74,0.34 1.36,0.9a5.46,5.46 0,0
0,3.7 1.8,4.45 4.45,0 0,0 1.52,-0.28 7,7 0,0 0,3.21 -2.46c0.6,-0.73 0.74,-0.89
1.39,-0.94h0.13c0.33,0 0.48,0.1 1.11,0.74a5.13,5.13 0,0 0,3.81
1.87l0.45,0a5.28,5.28 0,0 0,3.9 -2.45c0.6,-0.78 0.82,-1 1.45,-1.08h0.18c0.47,0
0.69,0.17 1.38,0.82a5.21,5.21 0,0 0,3.73 1.78l0.44,0a5.55,5.55 0,0 0,3.9
-2.4c0.68,-0.82 1,-1.09 1.57,-1.15H121c0.41,0 0.6,0.15 1.23,0.77a5.19,5.19 0,0
0,3.8 1.83l0.46,0a5.5,5.5 0,0 0,4 -2.48c0.64,-0.81 0.84,-1
1.35,-1.05h0.08c0.29,0 0.52,0.2 1.14,0.86a4.77,4.77 0,0 0,3.49 1.88,4.22 4.22,0
0,0 1.48,-0.28 6.53,6.53 0,0 0,3.06 -2.44c0.55,-0.71 0.67,-0.88
1.42,-0.95h0.25a3.76,3.76 0,0 1,2.68 1.42l0.09,0.12 0.12,0.13a3.14,3.14 0,0
0,2.19 1,2.33 2.33,0 0,0 1.74,-0.76 3,3 0,0 0,0.68 -2.42l-13,-148.43a4,4 0,0
0,-4 -3.65Z"
+ android:fillColor="#a2a9b1"/>
+ <path
+ android:pathData="M117.65,38a6.67,6.67 0,1 0,7.22 6.06A6.67,6.67 0,0
0,117.65 38ZM121.9,48.34 L115.26,48.92 115.14,47.59 121.78,47.01ZM117.22,46.07
L114.84,44.07 115.69,43.07 117.06,44.22 120.27,40.39 121.27,41.24Z"
+ android:fillType="evenOdd"
+ android:fillColor="#a2a9b1"/>
+ <path
+ android:pathData="M121.22,78.87a6.67,6.67 0,1 0,7.22 6.06A6.67,6.67
0,0 0,121.22 78.87ZM125.47,89.21 L118.83,89.79 118.71,88.46
125.35,87.88ZM120.79,86.94 L118.41,84.94 119.26,83.94 120.63,85.09 123.84,81.26
124.84,82.11Z"
+ android:fillType="evenOdd"
+ android:fillColor="#a2a9b1"/>
+ <path
+ android:pathData="M124.8,119.72a6.67,6.67 0,1 0,7.22 6.06A6.67,6.67
0,0 0,124.8 119.72ZM129,130.05l-6.64,0.58 -0.12,-1.33 6.64,-0.58ZM124.32,127.78
L121.94,125.78 122.79,124.78 124.16,125.93 127.37,122.1 128.37,122.95Z"
+ android:fillType="evenOdd"
+ android:fillColor="#a2a9b1"/>
+ <path
+ android:pathData="M30.12,4.88a2,2 0,0 1,2.17 -1.82l111.57,9.76
15.94,1.39a2,2 0,0 1,1.82 2.17l-13,148.43c-0.1,1.1 -0.65,1.23
-1.29,0.34a5.64,5.64 0,0 0,-4.27 -3c-2.95,-0.26 -2.88,2.09
-5.55,2.58s-2.34,-3.27 -5.13,-3.52 -3.21,2.79 -5.86,2.55 -2.21,-3.26
-5.12,-3.52 -3.45,2.77 -6,2.54 -2.2,-3.26 -5.19,-3.52 -3.24,2.78 -5.88,2.55
-2.19,-3.26 -5,-3.5 -2.89,2.09 -5.65,2.57 -2.91,-3.32 -5.61,-3.56 -3.16,2.79
-5.76,2.56 -1.91,-3.24 -4.8,-3.49 -3.47,2.76 -6.16,2.53 -2.66,-3.3 -5.47,-3.55
-2.77,2.83 -5.53,2.58 -2.6,-3.3 -5.35,-3.54 -3,2.81 -5.68,2.57 -2.32,-3.27
-5.22,-3.52 -3.28,2.78 -6,2.54 -2.22,-3.26 -4.6,-3.47 -3.71,3.56 -6.24,2.52
-2,-3.25 -4.93,-3.5a4.37,4.37 0,0 0,-4.16 2.14c-0.69,0.87 -1.16,0.67
-1.07,-0.41Z"
+ android:fillColor="#f6f6f6"/>
+ <path
+ android:pathData="M137.06,165.28c-1.32,0 -2,-1 -2.54,-1.84s-1.07,-1.63
-2.18,-1.72h-0.27a3.42,3.42 0,0 0,-2.37 1.19,4.21 4.21,0 0,1
-2.9,1.4h-0.33a3.64,3.64 0,0 1,-2.79 -1.9,3 3,0 0,0 -2.33,-1.61h-0.3a3.8,3.8
0,0 0,-2.55 1.22,4.24 4.24,0 0,1 -2.85,1.35h-0.31a3.63,3.63 0,0 1,-2.72
-1.85,3.16 3.16,0 0,0 -2.47,-1.67h-0.31a3.39,3.39 0,0 0,-2.44 1.21,4 4,0 0,1
-2.8,1.37h-0.32a3.58,3.58 0,0 1,-2.78 -1.93,2.81 2.81,0 0,0
-2.2,-1.58l-0.35,0a3.19,3.19 0,0 0,-2.29 1.06,5.55 5.55,0 0,1 -2.87,1.52
3.14,3.14 0,0 1,-0.56 0.05c-1.4,0 -2.18,-1 -2.87,-1.9s-1.25,-1.61
-2.31,-1.71h-0.25A3.36,3.36 0,0 0,85.5 159a4.19,4.19 0,0 1,-2.88
1.41H82.3a3.26,3.26 0,0 1,-2.63 -1.9,2.62 2.62,0 0,0
-2.17,-1.58h-0.29a3.88,3.88 0,0 0,-2.54 1.19,4.57 4.57,0 0,1
-3,1.36l-0.34,0a4.23,4.23 0,0 1,-3 -1.92,3.41 3.41,0 0,0
-2.45,-1.62h-0.27a2.19,2.19 0,0 0,-0.81 0.14l-0.75,0.29 1.3,-14.86 77.7,6.8
-1.27,14.46 -0.27,0.12a4.4,4.4 0,0 0,-1.2 0.88,5.09 5.09,0 0,1 -2.7,1.5 3,3 0,0
1,-0.55 0.05ZM75,149.35a2.51,2.51 0,0 0,-2.49 2.28,2.5 2.5,0 0,0
2.27,2.71L116.6,158h0.22a2.52,2.52 0,0 0,2.49 -2.28A2.5,2.5 0,0 0,117
153L75.2,149.36Z"
+ android:fillColor="#fff"/>
+ <path
+ android:pathData="M65.81,142l76.71,6.71 -1.2,13.67c-1.33,0.58 -1.8,2
-3.79,2.35a2.52,2.52 0,0 1,-0.46 0c-2.18,0 -2.05,-3.33
-4.67,-3.56h-0.31c-2.42,0 -3,2.58 -5.26,2.58h-0.29c-2.66,-0.23 -2.21,-3.26
-5.12,-3.52l-0.34,0c-2.51,0 -3.17,2.57 -5.39,2.57h-0.27c-2.55,-0.22 -2.2,-3.26
-5.19,-3.52l-0.36,0c-2.55,0 -3,2.58 -5.24,2.58h-0.28c-2.64,-0.23 -2.19,-3.26
-5,-3.5l-0.4,0c-2.41,0 -2.63,2.13 -5.25,2.59a2.7,2.7 0,0 1,-0.47 0c-2.32,0
-2.6,-3.38 -5.14,-3.6h-0.29c-2.35,0 -2.92,2.59 -5.19,2.59h-0.27c-2.6,-0.23
-1.91,-3.24 -4.8,-3.49l-0.34,0c-2.49,0 -3.19,2.56 -5.53,2.56h-0.3c-2.69,-0.24
-2.66,-3.3 -5.47,-3.55h-0.31a2.7,2.7 0,0 0,-1 0.18L65.81,142m51,16.5a3,3 0,0
0,0.26 -6l-41.84,-3.66L75,148.84a3,3 0,0 0,-0.26
6l41.84,3.66h0.26M64.9,140.93l-0.09,1 -1.19,13.56 -0.14,1.6 1.5,-0.58a1.71,1.71
0,0 1,0.63 -0.11h0.22c1,0.08 1.4,0.58 2.11,1.44a4.7,4.7 0,0 0,3.36
2.11l0.38,0A5.05,5.05 0,0 0,75 158.49a3.41,3.41 0,0 1,2.22 -1.08h0.25c1,0.09
1.29,0.56 1.79,1.35a3.77,3.77 0,0 0,3 2.13l0.36,0a4.66,4.66 0,0 0,3.22
-1.53,2.91 2.91,0 0,1 2,-1.06L88,158.3c0.8,0.07 1.26,0.62 2,1.51s1.62,2.09
3.27,2.09a3.71,3.71 0,0 0,0.64 -0.06A6,6 0,0 0,97 160.26a2.72,2.72 0,0 1,2
-0.94h0.31c0.91,0.08 1.25,0.52 1.84,1.36a4.09,4.09 0,0 0,3.14
2.14l0.37,0a4.46,4.46 0,0 0,3.13 -1.5,3 3,0 0,1 2.11,-1.08h0.27c1.1,0.1
1.52,0.67 2.11,1.47a4.1,4.1 0,0 0,3.08 2.05l0.35,0a4.71,4.71 0,0 0,3.17
-1.47,3.32 3.32,0 0,1 2.22,-1.1h0.25c1,0.09 1.4,0.61 2,1.41a4.1,4.1 0,0 0,3.15
2.11l0.37,0a4.69,4.69 0,0 0,3.23 -1.52,3 3,0 0,1 2,-1.06h0.23c0.83,0.07
1.21,0.59 1.81,1.5s1.36,2.06 3,2.06a3.53,3.53 0,0 0,0.64 -0.06,5.59 5.59,0 0,0
2.95,-1.62 4,4 0,0 1,1.06 -0.79l0.54,-0.24 0.05,-0.59 1.2,-13.67 0.09,-1
-1,-0.09L65.89,141l-1,-0.09ZM116.83,157.51h-0.18l-41.84,-3.66a2,2 0,0 1,0.17
-4h0.18L117,153.52a2,2 0,0 1,1.82 2.17,2 2,0 0,1 -2,1.83Z"
+ android:fillColor="#c8ccd1"/>
+ <path
+ android:pathData="M25.62,153.87 L27,138.61l-1,-0.09
-1.24,14.21C25,153.09 25.29,153.49 25.62,153.87Z"
+ android:fillColor="#c8ccd1"/>
+ <path
+ android:pathData="M27.3,155.09c1.27,0.52 2.24,-0.17 3.2,-1a4.51,4.51
0,1 1,5.34 0.38A2.84,2.84 0,0 0,38.13 156c2.72,0.24 3.1,-2.8 6,-2.54s2.51,3.29
5.22,3.52 2.93,-2.81 5.68,-2.57 2.59,3.29 5.35,3.54c2.25,0.2 2.65,-1.8
4.23,-2.42L65.81,142 27,138.61l-1.34,15.26A4.27,4.27 0,0 0,27.3 155.09Z"
+ android:fillColor="#c8ccd1"/>
+ <path
+ android:pathData="M33.53,152.57c-1.18,-0.1 -2.1,0.77 -3,1.55a4.43,4.43
0,0 0,5.34 0.38C35.27,153.63 34.82,152.68 33.53,152.57Z"
+ android:fillColor="#a2a9b1"/>
+ <path
+ android:pathData="M37.91,151.12a4.5,4.5 0,1 0,-7.41 3c0.94,-0.78
1.86,-1.66 3,-1.55s1.73,1.05 2.3,1.93A4.48,4.48 0,0 0,37.91 151.12Z"
+ android:fillColor="#a2a9b1"/>
+ <path
+ android:pathData="M117.08,152.52l-41.84,-3.66a3,3 0,1 0,-0.52
6l41.84,3.66a3,3 0,1 0,0.52 -6Z"
+ android:fillColor="#c8ccd1"/>
+ <path
+ android:pathData="M30.08,97.23l3.57,-40.84l116.55,10.2l-3.57,40.84z"
+ android:fillColor="#fff"/>
+ <path
+ android:pathData="M34.1,56.93 L149.66,67l-3.49,39.85L30.61,96.77
34.1,56.93m-0.91,-1.08 l-0.09,1L29.62,96.69l-0.09,1 1,0.09 115.56,10.11 1,0.09
0.09,-1 3.49,-39.85 0.09,-1 -1,-0.09L34.19,55.93l-1,-0.09Z"
+ android:fillColor="#c8ccd1"/>
+ <path
+ android:pathData="M33.1,56.84l39.85,3.49l-3.49,39.85l-39.85,-3.49z"
+ android:fillColor="#c8ccd1"/>
+ <path
+ android:pathData="M40.57,69.03m-0.39,4.48a4.5,4.5 109.24,1 1,0.78
-8.97a4.5,4.5 109.24,1 1,-0.78 8.97"
+ android:fillColor="#a2a9b1"/>
+ <path
+ android:pathData="M30.93,81.74s14.92,7.86 22.61,8.53 1.41,5.61
1.41,5.61l-25,-2.19Z"
+ android:fillType="evenOdd"
+ android:fillColor="#a2a9b1"/>
+ <path
+ android:pathData="M53.32,78.18s12.28,8.17 14.26,5.49 -0.36,4.11
-0.36,4.11L52.59,86.5Z"
+ android:fillType="evenOdd"
+ android:fillColor="#a2a9b1"/>
+ <path
+ android:pathData="M30.06,91.67s25.24,-22.51 24.15,-10S71.3,79.25
71.3,79.25L69.73,97.15l-0.26,3L29.62,96.69Z"
+ android:fillType="evenOdd"
+ android:fillColor="#eaecf0"/>
+ <path
+ android:pathData="M82.39,67.17L124.24,70.83A3,3 121.05,0 1,126.96
74.08L126.96,74.08A3,3 121.05,0 1,123.71 76.81L81.87,73.15A3,3 66.6,0 1,79.14
69.9L79.14,69.9A3,3 66.6,0 1,82.39 67.17z"
+ android:fillColor="#c8ccd1"/>
+ <path
+ android:pathData="M79.25,81.49L119.25,85.09A1,1 47.8,0 1,120.16
86.18L120.16,86.18A1,1 47.8,0 1,119.07 87.09L79.07,83.49A1,1 49.95,0 1,78.16
82.4L78.16,82.4A1,1 49.95,0 1,79.25 81.49z"
+ android:fillColor="#c8ccd1"/>
+ <path
+ android:pathData="M78.66,86.77L98.59,88.51A1,1 50.15,0 1,99.5
89.6L99.5,89.6A1,1 50.15,0 1,98.41 90.51L78.49,88.76A1,1 46.77,0 1,77.58
87.68L77.58,87.68A1,1 46.77,0 1,78.66 86.77z"
+ android:fillColor="#c8ccd1"/>
+ <path
+ android:pathData="M104.57,89.04L118.52,90.26A1,1 101.01,0 1,119.42
91.35L119.42,91.35A1,1 101.01,0 1,118.34 92.26L104.39,91.04A1,1 88.08,0
1,103.49 89.95L103.49,89.95A1,1 88.08,0 1,104.57 89.04z"
+ android:fillColor="#c8ccd1"/>
+ <path
+ android:pathData="M26.5,138.07l3.57,-40.84l116.55,10.2l-3.57,40.84z"
+ android:fillColor="#fff"/>
+ <path
+ android:pathData="M30.53,97.77l115.56,10.11
-3.49,39.85L27,137.62l3.49,-39.85m-0.91,-1.08 l-0.09,1L26,137.53l-0.09,1 1,0.09
115.56,10.11 1,0.09 0.09,-1L147.08,108l0.09,-1 -1,-0.09L30.61,96.77l-1,-0.09Z"
+ android:fillColor="#c8ccd1"/>
+ <path
+ android:pathData="M29.53,97.69l39.85,3.49l-3.49,39.85l-39.85,-3.49z"
+ android:fillColor="#c8ccd1"/>
+ <path
+ android:pathData="M37,109.88m-0.39,4.48a4.5,4.5 94.55,1 1,0.78
-8.97a4.5,4.5 94.55,1 1,-0.78 8.97"
+ android:fillColor="#a2a9b1"/>
+ <path
+ android:pathData="M27.35,122.59s14.92,7.86 22.61,8.53 1.41,5.61
1.41,5.61l-25,-2.19Z"
+ android:fillType="evenOdd"
+ android:fillColor="#a2a9b1"/>
+ <path
+ android:pathData="M49.75,119S62,127.2 64,124.52s-0.36,4.11
-0.36,4.11L49,127.34Z"
+ android:fillType="evenOdd"
+ android:fillColor="#a2a9b1"/>
+ <path
+ android:pathData="M26.48,132.51s25.24,-22.51 24.15,-10 17.09,-2.37
17.09,-2.37L66.16,138l-0.26,3L26,137.53Z"
+ android:fillType="evenOdd"
+ android:fillColor="#eaecf0"/>
+ <path
+ android:pathData="M78.82,108.02L120.66,111.68A3,3 66.6,0 1,123.39
114.93L123.39,114.93A3,3 66.6,0 1,120.14 117.66L78.3,114A3,3 50.75,0 1,75.57
110.75L75.57,110.75A3,3 50.75,0 1,78.82 108.02z"
+ android:fillColor="#c8ccd1"/>
+ <path
+ android:pathData="M75.61,121.79L115.45,125.28A1,1 101.01,0 1,116.36
126.36L116.36,126.36A1,1 101.01,0 1,115.28 127.27L75.43,123.79A1,1 47.93,0
1,74.52 122.7L74.52,122.7A1,1 47.93,0 1,75.61 121.79z"
+ android:fillColor="#c8ccd1"/>
+ <path
+ android:pathData="M75.1,127.63L95.02,129.37A1,1 77.72,0 1,95.93
130.45L95.93,130.45A1,1 77.72,0 1,94.85 131.36L74.92,129.62A1,1 65.38,0 1,74.01
128.53L74.01,128.53A1,1 65.38,0 1,75.1 127.63z"
+ android:fillColor="#c8ccd1"/>
+ <path
+ android:pathData="M100.99,129.89L114.94,131.11A1,1 84.51,0 1,115.85
132.19L115.85,132.19A1,1 84.51,0 1,114.77 133.1L100.82,131.88A1,1 46.77,0
1,99.91 130.79L99.91,130.79A1,1 46.77,0 1,100.99 129.89z"
+ android:fillColor="#c8ccd1"/>
+ <path
+ android:pathData="M32.12,3.06h0.17L159.8,14.22a2,2 0,0 1,1.82
2.17l-13,148.43c-0.05,0.61 -0.25,0.93 -0.52,0.93s-0.48,-0.2
-0.77,-0.59a5.64,5.64 0,0 0,-4.27 -3l-0.44,0c-2.51,0 -2.59,2.13
-5.11,2.6a2.52,2.52 0,0 1,-0.46 0c-2.18,0 -2.05,-3.33 -4.67,-3.56h-0.31c-2.42,0
-3,2.58 -5.26,2.58h-0.29c-2.66,-0.23 -2.21,-3.26 -5.12,-3.52l-0.34,0c-2.51,0
-3.17,2.57 -5.39,2.57h-0.27c-2.55,-0.22 -2.2,-3.26 -5.19,-3.52l-0.36,0c-2.55,0
-3,2.58 -5.24,2.58h-0.28c-2.64,-0.23 -2.19,-3.26 -5,-3.5l-0.4,0c-2.41,0
-2.63,2.13 -5.25,2.59a2.7,2.7 0,0 1,-0.47 0c-2.32,0 -2.6,-3.38
-5.14,-3.6h-0.29c-2.35,0 -2.92,2.59 -5.19,2.59h-0.27c-2.6,-0.23 -1.91,-3.24
-4.8,-3.49l-0.34,0c-2.49,0 -3.19,2.56 -5.53,2.56h-0.3c-2.69,-0.24 -2.66,-3.3
-5.47,-3.55h-0.31c-2.4,0 -2.55,2.61 -4.92,2.61h-0.3c-2.77,-0.24 -2.6,-3.3
-5.35,-3.54h-0.3c-2.37,0 -2.75,2.6 -5.09,2.6h-0.29c-2.71,-0.24 -2.32,-3.27
-5.22,-3.52l-0.34,0c-2.5,0 -3,2.57 -5.36,2.57h-0.3c-2.72,-0.24 -2.22,-3.26
-4.6,-3.47h-0.19c-2,0 -3.24,2.71 -5.17,2.71a2.27,2.27 0,0 1,-0.87
-0.18c-2.53,-1 -2,-3.25 -4.93,-3.5l-0.43,0a4.37,4.37 0,0 0,-3.74
2.16c-0.29,0.37 -0.54,0.54 -0.73,0.54s-0.39,-0.33 -0.34,-1l13,-148.44a2,2 0,0
1,2 -1.83m0,-2a4,4 0,0 0,-4 3.65l-13,148.44a3,3 0,0 0,0.66 2.4,2.24 2.24,0 0,0
1.67,0.74 2.94,2.94 0,0 0,2.3 -1.3l0.11,-0.14 0.09,-0.16a2.34,2.34 0,0 1,2
-1.09h0.25c0.73,0.06 0.84,0.21 1.37,0.91a6.73,6.73 0,0 0,3 2.45,4.28 4.28,0 0,0
1.63,0.33A6,6 0,0 0,32 155.46c0.42,-0.36 1.07,-0.9 1.33,-0.9l0.11,0a3.47,3.47
0,0 1,0.51 0.7A5,5 0,0 0,38 158l0.47,0a5.65,5.65 0,0 0,3.91 -1.75c0.71,-0.62
1,-0.82 1.45,-0.82H44c0.53,0 0.69,0.21 1.28,1A5.21,5.21 0,0 0,49.18
159l0.47,0a5.42,5.42 0,0 0,3.9 -1.84c0.63,-0.6 0.83,-0.75
1.18,-0.75h0.13c0.46,0 0.66,0.23 1.27,1A5.58,5.58 0,0 0,60.21
160l0.48,0a5.12,5.12 0,0 0,3.88 -1.91c0.6,-0.61 0.73,-0.71 1,-0.71h0.14c0.52,0
0.75,0.26 1.42,1.08a5.68,5.68 0,0 0,4 2.47l0.47,0a6,6 0,0 0,3.94
-1.7c0.75,-0.62 1.09,-0.85 1.59,-0.85h0.16c0.46,0 0.53,0.11 1,0.89a4.74,4.74
0,0 0,3.77 2.59l0.45,0a5.57,5.57 0,0 0,3.88 -1.79c0.7,-0.63 0.94,-0.8
1.31,-0.8h0.12c0.37,0 0.66,0.37 1.25,1.13a5.09,5.09 0,0 0,4.06 2.48,4.72 4.72,0
0,0 0.82,-0.07A7,7 0,0 0,97.66 161c0.68,-0.58 0.85,-0.7 1.31,-0.7h0.22c0.43,0
0.54,0.13 1.1,0.94a5.07,5.07 0,0 0,3.88 2.57l0.45,0a5.43,5.43 0,0 0,3.81
-1.76c0.68,-0.62 0.94,-0.82 1.43,-0.82H110c0.59,0.05 0.78,0.23
1.39,1.07a5.06,5.06 0,0 0,3.8 2.46l0.44,0a5.67,5.67 0,0 0,3.82 -1.7c0.74,-0.63
1.07,-0.87 1.58,-0.87h0.17c0.52,0 0.67,0.19 1.24,1a5.07,5.07 0,0 0,3.88
2.53l0.46,0a5.6,5.6 0,0 0,3.9 -1.77c0.67,-0.6 0.95,-0.81 1.37,-0.81h0.14c0.32,0
0.49,0.2 1.06,1.05a4.14,4.14 0,0 0,4.62 2.44,6.53 6.53,0 0,0
3.44,-1.87c0.61,-0.56 0.78,-0.7 1.31,-0.7h0.26a3.6,3.6 0,0 1,2.64
1.87l0.08,0.16 0.1,0.14a2.93,2.93 0,0 0,2.39 1.42c1,0 2.34,-0.72
2.52,-2.75l13,-148.43A4,4 0,0 0,160 12.23L32.46,1.07l-0.35,0Z"
+ android:fillColor="#a2a9b1"/>
+ <path
+ android:pathData="M134.85,87.16a6.67,6.67 0,1 0,6.06 7.22A6.67,6.67
0,0 0,134.85 87.16ZM137.24,98.08 L130.6,97.5 130.72,96.17
137.36,96.75ZM133,95l-2,-2.38 1,-0.85 1.15,1.37L137,90l0.85,1Z"
+ android:fillType="evenOdd"
+ android:fillColor="#a2a9b1"/>
+ <path
+ android:pathData="M131.28,128a6.67,6.67 0,1 0,6.06 7.22A6.67,6.67 0,0
0,131.28 128ZM133.67,138.92 L127.03,138.34 127.15,137.01
133.79,137.59ZM129.45,135.92 L127.45,133.54 128.45,132.69 129.6,134.06
133.43,130.85 134.28,131.85Z"
+ android:fillType="evenOdd"
+ android:fillColor="#a2a9b1"/>
+ <path
+ android:pathData="M33.67,56.23l3.57,-40.84l116.55,10.2l-3.57,40.84z"
+ android:fillColor="#fff"/>
+ <path
+ android:pathData="M37.69,15.93
L153.25,26l-3.49,39.85L34.21,55.77l3.49,-39.85m-0.91,-1.08
l-0.09,1L33.21,55.69l-0.09,1 1,0.09L149.68,66.88l1,0.09 0.09,-1 3.49,-39.85
0.09,-1 -1,-0.09L37.78,14.93l-1,-0.09Z"
+ android:fillColor="#c8ccd1"/>
+ <path
+ android:pathData="M36.7,15.84l39.85,3.49l-3.49,39.85l-39.85,-3.49z"
+ android:fillColor="#c8ccd1"/>
+ <path
+ android:pathData="M44.16,28.04m-0.39,4.48a4.5,4.5 48.51,1 1,0.78
-8.97a4.5,4.5 48.51,1 1,-0.78 8.97"
+ android:fillColor="#a2a9b1"/>
+ <path
+ android:pathData="M34.52,40.74s14.92,7.86 22.61,8.53 1.41,5.61
1.41,5.61l-25,-2.19Z"
+ android:fillType="evenOdd"
+ android:fillColor="#a2a9b1"/>
+ <path
+ android:pathData="M56.91,37.18s12.28,8.17 14.26,5.49 -0.36,4.11
-0.36,4.11L56.18,45.5Z"
+ android:fillType="evenOdd"
+ android:fillColor="#a2a9b1"/>
+ <path
+ android:pathData="M33.65,50.67s25.24,-22.51 24.15,-10 17.09,-2.37
17.09,-2.37L73.32,56.15l-0.26,3L33.21,55.69Z"
+ android:fillType="evenOdd"
+ android:fillColor="#eaecf0"/>
+ <path
+ android:pathData="M85.98,26.17L127.82,29.83A3,3 91.44,0 1,130.55
33.08L130.55,33.08A3,3 78.99,0 1,127.3 35.81L85.46,32.14A3,3 87.94,0 1,82.73
28.89L82.73,28.89A3,3 59.26,0 1,85.98 26.17z"
+ android:fillColor="#c8ccd1"/>
+ <path
+ android:pathData="M82.77,39.95L122.62,43.44A1,1 69.48,0 1,123.53
44.52L123.53,44.52A1,1 69.48,0 1,122.45 45.43L82.6,41.94A1,1 129.35,0 1,81.69
40.86L81.69,40.86A1,1 129.35,0 1,82.77 39.95z"
+ android:fillColor="#c8ccd1"/>
+ <path
+ android:pathData="M82.25,45.77L102.18,47.51A1,1 121.11,0 1,103.09
48.6L103.09,48.6A1,1 121.11,0 1,102 49.51L82.08,47.76A1,1 68.88,0 1,81.17
46.68L81.17,46.68A1,1 68.88,0 1,82.25 45.77z"
+ android:fillColor="#c8ccd1"/>
+ <path
+ android:pathData="M108.16,48.04L122.11,49.26A1,1 102.49,0 1,123.01
50.35L123.01,50.35A1,1 102.49,0 1,121.93 51.25L107.98,50.03A1,1 65.57,0
1,107.08 48.95L107.08,48.95A1,1 65.57,0 1,108.16 48.04z"
+ android:fillColor="#c8ccd1"/>
+ <path
+ android:pathData="M138.44,46.16a6.67,6.67 0,1 0,6.06 7.22A6.67,6.67
0,0 0,138.44 46.16ZM140.83,57.08 L134.19,56.5 134.31,55.17
140.95,55.75ZM136.61,54.08 L134.61,51.7 135.61,50.85
136.76,52.22L140.6,49l0.85,1Z"
+ android:fillType="evenOdd"
+ android:fillColor="#a2a9b1"/>
+</vector>
diff --git a/app/src/main/res/layout/fragment_reading_lists.xml
b/app/src/main/res/layout/fragment_reading_lists.xml
index dc1ffd3..0a525e5 100644
--- a/app/src/main/res/layout/fragment_reading_lists.xml
+++ b/app/src/main/res/layout/fragment_reading_lists.xml
@@ -1,71 +1,82 @@
<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout
- xmlns:android="http://schemas.android.com/apk/res/android";
+<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="match_parent">
+ android:layout_height="match_parent"
+ android:orientation="vertical">
<LinearLayout
- android:id="@+id/empty_container"
- android:orientation="vertical"
- android:layout_gravity="center_vertical|center_horizontal"
- android:layout_marginLeft="30dp"
- android:layout_marginRight="30dp"
- android:layout_width="wrap_content"
+ android:id="@+id/reading_list_content_container"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:visibility="gone">
- <TextView
- android:id="@+id/empty_title"
- android:layout_width="wrap_content"
+ android:animateLayoutChanges="true"
+ android:orientation="vertical">
+
+ <FrameLayout
+ android:id="@+id/reading_list_onboarding_container"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content" />
+
+ <android.support.v7.widget.RecyclerView
+ android:id="@+id/reading_list_list"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_gravity="center_horizontal"
- android:gravity="center"
- style="@style/MaterialLargePrimaryTitle"
- android:layout_marginBottom="20dp"
- android:text="@string/reading_lists_empty" />
- <ImageView
- android:id="@+id/empty_image"
- android:layout_width="168dp"
- android:layout_height="168dp"
- android:layout_gravity="center_horizontal"
- app:srcCompat="@drawable/no_lists"
- android:contentDescription="@null" />
- <TextView
- android:id="@+id/empty_message"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center_horizontal"
- android:layout_marginTop="32dp"
- android:gravity="center"
- style="@style/MaterialMediumSecondaryCaption"
- android:text="@string/reading_lists_empty_message" />
+ android:scrollbars="vertical" />
+
</LinearLayout>
+
+ <ScrollView
+ android:layout_width="match_parent"
+ android:layout_height="0dp"
+ android:fillViewport="true"
+ android:layout_weight="1">
+
+ <LinearLayout
+ android:id="@+id/empty_container"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:layout_marginLeft="30dp"
+ android:layout_marginRight="30dp"
+ android:gravity="center"
+ android:layout_gravity="center_horizontal"
+ android:orientation="vertical"
+ android:visibility="gone">
+
+ <TextView
+ android:id="@+id/empty_title"
+ style="@style/MaterialLargePrimaryTitle"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center_horizontal"
+ android:layout_marginBottom="20dp"
+ android:gravity="center"
+ android:text="@string/reading_lists_empty" />
+
+ <ImageView
+ android:id="@+id/empty_image"
+ android:layout_width="168dp"
+ android:layout_height="168dp"
+ android:layout_gravity="center_horizontal"
+ android:contentDescription="@null"
+ app:srcCompat="@drawable/no_lists" />
+
+ <TextView
+ android:id="@+id/empty_message"
+ style="@style/MaterialMediumSecondaryCaption"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="32dp"
+ android:layout_gravity="center_horizontal"
+ android:gravity="center"
+ android:text="@string/reading_lists_empty_message" />
+ </LinearLayout>
+ </ScrollView>
<org.wikipedia.views.SearchEmptyView
android:id="@+id/search_empty_view"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_gravity="center"/>
+ android:layout_gravity="center" />
- <LinearLayout
- android:id="@+id/reading_list_content_container"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:orientation="vertical"
- android:animateLayoutChanges="true">
-
- <FrameLayout
- android:id="@+id/reading_list_onboarding_container"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"/>
-
- <android.support.v7.widget.RecyclerView
- android:id="@+id/reading_list_list"
- android:scrollbars="vertical"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"/>
-
- </LinearLayout>
-
-</FrameLayout>
+</LinearLayout>
diff --git a/app/src/main/res/values-qq/strings.xml
b/app/src/main/res/values-qq/strings.xml
index 5341704..ee3f3ca 100644
--- a/app/src/main/res/values-qq/strings.xml
+++ b/app/src/main/res/values-qq/strings.xml
@@ -364,6 +364,8 @@
<string name="reading_list_added_articles_list_titled">Message shown when
the user adds articles to a named reading list. The %1$d symbol is replaced
with the number of articles added, and the %2$s symbol is replaced with the
list name.</string>
<string name="default_reading_list_name">Title for default list</string>
<string name="default_reading_list_description">Short description of the
default reading list where articles are saved.</string>
+ <string name="no_user_lists_title">Suggestion string for users to Organize
articles into lists</string>
+ <string name="no_user_lists_msg">Text explaining the advantages of creating
reading lists, to users</string>
<plurals name="reading_list_article_offline_message">
<item quantity="one">Message shown when a single reading list article is
made available for offline use.</item>
<item quantity="other">Message shown when more than one reading list
article is made available for offline use.</item>
diff --git a/app/src/main/res/values/strings.xml
b/app/src/main/res/values/strings.xml
index ebce5d9..c35bd58 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -389,6 +389,8 @@
<string name="reading_list_added_articles_list_titled">Added %1$d articles
to %2$s</string>
<string name="default_reading_list_name">Saved</string>
<string name="default_reading_list_description">Default list for your
saved articles</string>
+ <string name="no_user_lists_title">Organize articles into lists</string>
+ <string name="no_user_lists_msg">Create lists for places to travel to,
favorite topics, and much more</string>
<plurals name="reading_list_article_offline_message">
<item quantity="one">This article will now be available offline.</item>
<item quantity="other">These articles will now be available
offline.</item>
--
To view, visit https://gerrit.wikimedia.org/r/400087
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic9ceab68c25cdb17e04e3c0f1cc929ecf8079bec
Gerrit-PatchSet: 6
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Sharvaniharan <[email protected]>
Gerrit-Reviewer: Brion VIBBER <[email protected]>
Gerrit-Reviewer: Cooltey <[email protected]>
Gerrit-Reviewer: Dbrant <[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
