Dbrant has uploaded a new change for review.
https://gerrit.wikimedia.org/r/299188
Change subject: Use stylized text wordmark at top of feed.
......................................................................
Use stylized text wordmark at top of feed.
Bug: T140375
Change-Id: I4aede416cba4fde9fb2fcc9ddce8155c9ac7a59d
---
M app/src/main/java/org/wikipedia/feed/FeedFragment.java
D app/src/main/res/drawable/feed_header_wordmark.xml
M app/src/main/res/layout/fragment_feed.xml
3 files changed, 28 insertions(+), 238 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia
refs/changes/88/299188/1
diff --git a/app/src/main/java/org/wikipedia/feed/FeedFragment.java
b/app/src/main/java/org/wikipedia/feed/FeedFragment.java
index f159dfb..b64b3ae 100644
--- a/app/src/main/java/org/wikipedia/feed/FeedFragment.java
+++ b/app/src/main/java/org/wikipedia/feed/FeedFragment.java
@@ -9,12 +9,14 @@
import android.support.v4.app.Fragment;
import android.support.v4.widget.SwipeRefreshLayout;
import android.support.v7.widget.Toolbar;
+import android.text.Html;
import android.view.LayoutInflater;
import android.view.Menu;
import android.view.MenuInflater;
import android.view.MenuItem;
import android.view.View;
import android.view.ViewGroup;
+import android.widget.TextView;
import org.wikipedia.BackPressedHandler;
import org.wikipedia.MainActivityToolbarProvider;
@@ -47,6 +49,7 @@
@BindView(R.id.feed_swipe_refresh_layout) SwipeRefreshLayout
swipeRefreshLayout;
@BindView(R.id.fragment_feed_feed) FeedView feedView;
@BindView(R.id.feed_toolbar) Toolbar toolbar;
+ @BindView(R.id.feed_header_text) TextView headerText;
private Unbinder unbinder;
private WikipediaApp app;
private FeedCoordinator coordinator;
@@ -88,6 +91,7 @@
View view = inflater.inflate(R.layout.fragment_feed, container, false);
unbinder = ButterKnife.bind(this, view);
+ headerText.setText(Html.fromHtml(getString(R.string.wp_stylized)));
feedView.set(coordinator, feedCallback);
appBarLayout.addOnOffsetChangedListener(headerOffsetChangedListener);
searchIconShowThresholdPx = (int)
getResources().getDimension(R.dimen.view_feed_header_height) -
DimenUtil.getContentTopOffsetPx(getContext());
diff --git a/app/src/main/res/drawable/feed_header_wordmark.xml
b/app/src/main/res/drawable/feed_header_wordmark.xml
deleted file mode 100644
index 5bd52a2..0000000
--- a/app/src/main/res/drawable/feed_header_wordmark.xml
+++ /dev/null
@@ -1,232 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android";
- android:width="200dp"
- android:height="48dp"
- android:viewportWidth="200"
- android:viewportHeight="48">
-
- <path
- android:pathData="M0,0 L200,0 L200,48 L0,48 L0,0 Z" />
- <path
- android:fillColor="#fff"
- android:pathData="M178.31,27.93 A1.52,1.52,0,0,1,178.31,29.4
-C176.76,29.4,174.66,29.31,172.94,29.31 S170.76,29.31,169.21,29.4
-A1.53,1.53,0,0,1,169.21,27.93 C171.04,27.8,172.3,27.52,173.41,24.77
L182.74,1.59
-C183.2,0.4,183.52,0,184.14,0 S184.97,0.48,185.27,1.34 L193.87,25.48
-C194.65,27.77,196.02,27.77,197.65,27.93 A1.52,1.52,0,0,1,197.65,29.4
-C196.1,29.4,194.59,29.31,192.87,29.31 S188.93,29.31,187.37,29.4
-A1.53,1.53,0,0,1,187.37,27.93 C189.37,27.78,191.1,27.93,190.48,26.1
-L187.92,18.57 L179.19,18.57 C178.19,18.57,177.93,18.75,177.72,19.33
-L175.41,25.79 C174.76,27.62,176.73,27.79,178.31,27.93 Z M187.25,16.71
-L183.18,4.81 L183.1,4.81 L178.9,16.11 C178.72,16.59,179.03,16.7,179.96,16.7 Z"
/>
- <path
- android:fillColor="#fff"
- android:pathData="M163.75,23.94 C163.75,27.64,164.21,27.82,166.75,27.99
-A1.53,1.53,0,0,1,166.75,29.46 C164.94,29.46,163.9,29.37,162.09,29.37
-S159.15,29.37,157.39,29.46 A1.53,1.53,0,0,1,157.39,27.99
-C159.95,27.77,160.39,27.63,160.39,23.94 L160.39,14.32
-C160.39,10.62,159.93,10.45,157.39,10.27 A1.53,1.53,0,0,1,157.39,8.8
-C159.2,8.8,160.24,8.89,162.05,8.89 S164.99,8.89,166.75,8.8
-A1.53,1.53,0,0,1,166.75,10.27 C164.19,10.49,163.75,10.63,163.75,14.32
-L163.75,23.94 Z" />
- <path
- android:fillColor="#fff"
- android:pathData="M143.58,8.79 C150.58,8.79,154.03,13.42,154.03,19.35
-C154.03,27.15,148.83,29.46,144.17,29.46 C140.81,29.46,139.3,29.37,138.04,29.37
-C136.19,29.37,135.1,29.37,133.34,29.46 A1.52,1.52,0,0,1,133.34,27.99
-C135.9,27.77,136.34,27.63,136.34,23.94 L136.34,14.32
-C136.34,10.62,135.88,10.45,133.34,10.27 A1.52,1.52,0,0,1,133.34,8.8
-C135.14,8.8,136.19,8.89,138,8.89 C138.8,8.89,142.49,8.8,143.58,8.8 Z M143.16,28
-C147.78,28,150.38,26.35,150.38,20.12 C150.38,15.49,149.38,10.28,142.38,10.28
-C140.74,10.28,139.7,10.55,139.7,11.66 L139.7,26
C139.7,27.25,139.99,28,143.18,28
-Z" />
- <path
- android:fillColor="#fff"
- android:pathData="M119,19.44 L119,26.12
C119,26.97,119.59,28.12,120.34,28.12 L123.83,28.12
-C126.47,28.12,127.69,25.89,128.36,23.27 A1.36,1.36,0,0,1,129.53,23.45
-A61.42,61.42,0,0,1,128.27,29.6 S125.5,29.51,123.82,29.51 L117.36,29.51
-S114.42,29.51,112.66,29.6 A1.53,1.53,0,0,1,112.66,28.13
-C115.22,27.91,115.66,27.77,115.66,24.08 L115.66,14.4
-C115.66,10.7,115.2,10.53,112.66,10.35 A1.53,1.53,0,0,1,112.66,8.88
-C114.47,8.88,117.32,8.97,117.32,8.97 L126.01,8.97 A8.76,8.76,0,0,0,127.73,8.79
-C127.81,8.79,127.86,8.79,127.86,8.92 C127.94,9.23,128.45,12.71,128.62,14.22
-A2,2,0,0,1,127.49,14.44 C126.73,11.9,126.19,10.44,123.59,10.44 L120.36,10.44
-A1.23,1.23,0,0,0,119,11.69 L119,18 L121.39,18
-C124.33,18,124.2,17.51,124.28,15.51 A1.12,1.12,0,0,1,125.45,15.51
-C125.45,16.62,125.37,17.43,125.37,18.67 S125.37,20.67,125.45,21.92
-A1.12,1.12,0,0,1,124.28,21.92 C124.2,20.27,124.36,19.43,121.39,19.43 L119,19.43
-Z" />
- <path
- android:fillColor="#fff"
- android:pathData="M102.42,28 A1.53,1.53,0,0,1,102.42,29.47
C100.61,29.47,99.57,29.38,97.76,29.38
-S94.82,29.38,93.06,29.47 A1.52,1.52,0,0,1,93.06,28
-C95.62,27.78,96.06,27.64,96.06,23.95 L96.06,14.32
-C96.06,10.62,95.6,10.45,93.06,10.27 A1.52,1.52,0,0,1,93.06,8.8
-C94.86,8.8,95.91,8.89,97.72,8.89 C98.85,8.89,100.62,8.8,102.17,8.8
-C108.17,8.8,109.39,11.92,109.39,14.23 C109.39,16.9,107.67,21.18,102.04,21.18
-A6,6,0,0,1,99.4,20.65 L99.4,23.95 C99.4,27.65,99.86,27.82,102.4,28 Z
-M99.42,19.22 A7.35,7.35,0,0,0,102.15,19.71
-C104.67,19.71,105.76,17.98,105.76,14.77 S104.42,10.27,101.94,10.27
-C99.94,10.27,99.42,10.85,99.42,12.27 L99.42,19.22 Z" />
- <path
- android:fillColor="#fff"
- android:pathData="M86.13,23.94 C86.13,27.64,86.59,27.82,89.13,27.99
A1.52,1.52,0,0,1,89.13,29.46
-C87.33,29.46,86.28,29.37,84.47,29.37 S81.53,29.37,79.77,29.46
-A1.53,1.53,0,0,1,79.77,27.99 C82.33,27.77,82.77,27.63,82.77,23.94 L82.77,14.32
-C82.77,10.62,82.31,10.45,79.77,10.27 A1.53,1.53,0,0,1,79.77,8.8
-C81.57,8.8,82.62,8.89,84.43,8.89 S87.37,8.89,89.13,8.8
-A1.52,1.52,0,0,1,89.13,10.27 C86.57,10.49,86.13,10.63,86.13,14.32 L86.13,23.94
Z" />
- <path
- android:fillColor="#fff"
- android:pathData="M56.21,10.26 A1.53,1.53,0,0,1,56.21,8.79
C57.97,8.79,59.06,8.88,60.91,8.88
-C62.46,8.88,63.13,8.88,64.91,8.79 A1.53,1.53,0,0,1,64.91,10.26
-C62.91,10.48,62.52,10.62,62.52,14.31 L62.52,18.31
-C63.9,18.31,65.13,17.61,66.93,15.46 C70.16,11.59,70.58,10.46,68.48,10.29
-A1.52,1.52,0,0,1,68.48,8.82 C70.28,8.82,71.88,8.91,73.1,8.91
-S74.9,8.91,76.04,8.82 A1.53,1.53,0,0,1,76.04,10.29
-C74.36,10.38,72.82,10.61,71.55,12.16 L68,16.54 C67.29,17.34,67,17.83,67,18.19
-A1.29,1.29,0,0,0,67.38,18.95 L73.59,26.7 A4.11,4.11,0,0,0,76.27,28
-A1.45,1.45,0,0,1,76.27,29.43 S74.21,29.43,73.04,29.43 S70.9,29.43,70.44,29.52
-L70.44,28.9 A2.39,2.39,0,0,0,69.81,27.12 L65.15,20.97 A3,3,0,0,0,62.55,19.86
-L62.55,24 C62.55,27.7,62.93,27.83,64.94,28.05 A1.53,1.53,0,0,1,64.94,29.52
-C63.14,29.52,62.46,29.43,60.94,29.43 C59.09,29.43,58,29.43,56.24,29.52
-A1.53,1.53,0,0,1,56.24,28.05 C58.8,27.83,59.24,27.69,59.24,24 L59.24,14.32
-C59.24,10.62,58.78,10.49,56.24,10.27 Z" />
- <path
- android:fillColor="#fff"
- android:pathData="M49.28,23.94 C49.28,27.64,49.74,27.82,52.28,27.99
A1.52,1.52,0,0,1,52.28,29.46
-C50.48,29.46,49.43,29.37,47.62,29.37 S44.68,29.37,42.92,29.46
-A1.53,1.53,0,0,1,42.92,27.99 C45.48,27.77,45.92,27.63,45.92,23.94 L45.92,14.32
-C45.92,10.62,45.46,10.45,42.92,10.27 A1.53,1.53,0,0,1,42.92,8.8
-C44.72,8.8,45.77,8.89,47.58,8.89 S50.52,8.89,52.28,8.8
-A1.52,1.52,0,0,1,52.28,10.27 C49.72,10.49,49.28,10.63,49.28,14.32 L49.28,23.94
Z" />
- <path
- android:fillColor="#fff"
- android:pathData="M25.17,0.49 C26.72,0.49,27.52,0.58,28.48,0.58
S30.48,0.58,31.54,0.49
-A1.53,1.53,0,0,1,31.54,1.96 C29.37,2.32,28.46,4,27.42,6.1 L24.35,12.3
-L29.72,24.1 L29.91,24.1 L37.91,5.79 C38.91,3.38,38.83,2.18,36.11,1.96
-A1.52,1.52,0,0,1,36.11,0.49 C38.11,0.49,39.3,0.58,40.26,0.58
-S42.26,0.58,43.95,0.49 A1.52,1.52,0,0,1,43.95,1.96 C41.16,2.32,40.68,4,39.8,6.1
-L29.87,28.82 C29.58,29.49,29.32,29.82,28.87,29.82 S28.13,29.46,27.87,28.82
-L22.25,15.89 L16.07,28.82 C15.82,29.49,15.52,29.82,15.07,29.82
-S14.36,29.46,14.07,28.82 L5,6 C3.69,2.85,3.6,2.18,1.21,2
-A1.52,1.52,0,0,1,1.21,0.53 C3.21,0.53,3.9,0.62,5.57,0.62 S8.26,0.62,10.23,0.53
-A1.52,1.52,0,0,1,10.23,2 C7.59,2.31,7.47,3,8.53,5.56 L16.17,24.1 L16.36,24.1
-L21.05,14 L17.51,6 C16.11,2.85,15.77,2.23,14,2 A1.53,1.53,0,0,1,14,0.53
-C15.34,0.53,16.06,0.62,17.73,0.62 S20,0.53,21.48,0.49
-A1.52,1.52,0,0,1,21.48,1.96 C19.72,2.23,19.89,2.96,21.04,5.52 L23.1,10
-L23.28,10.2 L25.5,5.77 C26.8,3.21,27,2.23,25.17,2 A1.53,1.53,0,0,1,25.17,0.53
Z" />
- <path
- android:fillColor="#fff"
- android:pathData="M25.15,1 C26.7,1,27.5,1.09,28.46,1.09
S30.46,1.09,31.52,1
-A1.53,1.53,0,0,1,31.52,2.47 C29.34,2.83,28.43,4.52,27.39,6.61 L24.32,12.81
-L29.7,24.6 L29.89,24.6 L37.89,6.29 C38.89,3.88,38.81,2.68,36.09,2.46
-A1.52,1.52,0,0,1,36.09,0.99 C38.09,0.99,39.28,1.08,40.24,1.08
-S42.24,1.08,43.93,0.99 A1.52,1.52,0,0,1,43.93,2.46
-C41.16,2.82,40.68,4.52,39.81,6.6 L29.85,29.32
-C29.56,29.99,29.3,30.32,28.85,30.32 S28.11,29.96,27.85,29.32 L22.23,16.39
-L16,29.32 C15.75,29.99,15.45,30.32,15,30.32 S14.29,29.96,14,29.32 L4.95,6.51
-C3.67,3.35,3.58,2.68,1.19,2.46 A1.52,1.52,0,0,1,1.15,1
-C3.15,1,3.84,1.09,5.51,1.09 S8.2,1,10.17,1 A1.52,1.52,0,0,1,10.17,2.47
-C7.53,2.78,7.41,3.47,8.47,6.03 L16.15,24.6 L16.34,24.6 L21,14.48 L17.46,6.48
-C16.05,3.32,15.72,2.69,13.91,2.43 A1.53,1.53,0,0,1,13.9,1
-C15.24,1,15.96,1.09,17.63,1.09 S19.95,1,21.46,1 A1.52,1.52,0,0,1,21.46,2.47
-C19.7,2.74,19.87,3.47,21.02,6.03 L23.08,10.53 L23.26,10.73 L25.48,6.3
-C26.78,3.72,26.95,2.74,25.14,2.47 A1.53,1.53,0,0,1,25.14,1 Z" />
- <path
- android:fillColor="#fff"
- android:pathData="M49.16,24.44 C49.16,28.14,49.62,28.32,52.16,28.49
A1.52,1.52,0,0,1,52.16,29.96
-C50.36,29.96,49.31,29.87,47.5,29.87 S44.56,29.87,42.8,29.96
-A1.53,1.53,0,0,1,42.8,28.49 C45.36,28.27,45.8,28.13,45.8,24.44 L45.8,14.81
-C45.8,11.11,45.34,10.94,42.8,10.76 A1.53,1.53,0,0,1,42.8,9.29
-C44.6,9.29,45.65,9.38,47.46,9.38 S50.4,9.38,52.16,9.29
-A1.52,1.52,0,0,1,52.16,10.76 C49.6,10.98,49.16,11.12,49.16,14.81 L49.16,24.43
Z" />
- <path
- android:fillColor="#fff"
- android:pathData="M56.19,10.76 A1.53,1.53,0,0,1,56.19,9.29
C57.95,9.29,59.04,9.38,60.89,9.38
-C62.44,9.38,63.11,9.38,64.89,9.29 A1.53,1.53,0,0,1,64.89,10.76
-C62.89,10.98,62.5,11.12,62.5,14.81 L62.5,18.81
-C63.88,18.81,65.11,18.11,66.91,15.96 C70.14,12.09,70.56,10.96,68.46,10.79
-A1.52,1.52,0,0,1,68.46,9.32 C70.26,9.32,71.86,9.41,73.08,9.41
-S74.88,9.41,76.02,9.32 A1.53,1.53,0,0,1,76.02,10.79
-C74.34,10.88,72.8,11.11,71.53,12.66 L67.94,17
-C67.23,17.8,66.94,18.29,66.94,18.65 A1.29,1.29,0,0,0,67.32,19.41 L73.53,27.16
-A4.11,4.11,0,0,0,76.22,28.45 A1.45,1.45,0,0,1,76.22,29.88
-S74.16,29.88,72.99,29.88 S70.85,29.88,70.39,29.97 L70.39,29.35
-A2.39,2.39,0,0,0,69.76,27.57 L65.1,21.42 A3,3,0,0,0,62.5,20.31 L62.5,24.45
-C62.5,28.15,62.88,28.28,64.89,28.5 A1.53,1.53,0,0,1,64.89,29.97
-C63.09,29.97,62.41,29.88,60.89,29.88 C59.04,29.88,57.95,29.88,56.19,29.97
-A1.53,1.53,0,0,1,56.19,28.5 C58.75,28.28,59.19,28.14,59.19,24.45 L59.19,14.82
-C59.19,11.12,58.73,10.99,56.19,10.77 Z" />
- <path
- android:fillColor="#fff"
- android:pathData="M86.16,24.44 C86.16,28.14,86.62,28.32,89.16,28.49
A1.52,1.52,0,0,1,89.16,29.96
-C87.36,29.96,86.31,29.87,84.5,29.87 S81.56,29.87,79.8,29.96
-A1.53,1.53,0,0,1,79.8,28.49 C82.36,28.27,82.8,28.13,82.8,24.44 L82.8,14.81
-C82.8,11.11,82.34,10.94,79.8,10.76 A1.53,1.53,0,0,1,79.8,9.29
-C81.6,9.29,82.65,9.38,84.46,9.38 S87.4,9.38,89.16,9.29
-A1.52,1.52,0,0,1,89.16,10.76 C86.6,10.98,86.16,11.12,86.16,14.81 L86.16,24.43
Z" />
- <path
- android:fillColor="#fff"
- android:pathData="M102.39,28.49 A1.53,1.53,0,0,1,102.39,29.96
-C100.58,29.96,99.54,29.87,97.73,29.87 S94.79,29.87,93.03,29.96
-A1.52,1.52,0,0,1,93.03,28.49 C95.59,28.27,96.03,28.13,96.03,24.44 L96.03,14.82
-C96.03,11.12,95.57,10.95,93.03,10.77 A1.52,1.52,0,0,1,93.03,9.3
-C94.83,9.3,95.88,9.39,97.69,9.39 C98.82,9.39,100.59,9.3,102.14,9.3
-C108.14,9.3,109.36,12.42,109.36,14.73 C109.36,17.4,107.64,21.68,102.01,21.68
-A6,6,0,0,1,99.37,21.15 L99.37,24.45 C99.37,28.15,99.83,28.32,102.37,28.5 Z
-M99.39,19.71 A7.35,7.35,0,0,0,102.12,20.2
C104.64,20.2,105.73,18.47,105.73,15.26
-S104.39,10.76,101.91,10.76 C99.91,10.76,99.39,11.34,99.39,12.76 L99.39,19.71
Z" />
- <path
- android:fillColor="#fff"
- android:pathData="M119,19.94 L119,26.62
C119,27.47,119.59,28.62,120.34,28.62 L123.83,28.62
-C126.47,28.62,127.69,26.39,128.36,23.77 A1.36,1.36,0,0,1,129.53,23.95
-A61.42,61.42,0,0,1,128.3,30 S125.53,29.91,123.85,29.91 L117.39,29.91
-S114.45,29.91,112.69,30 A1.53,1.53,0,0,1,112.69,28.53
-C115.25,28.31,115.69,28.17,115.69,24.48 L115.69,14.9
-C115.69,11.2,115.23,11.03,112.69,10.85 A1.53,1.53,0,0,1,112.69,9.38
-C114.5,9.38,117.35,9.47,117.35,9.47 L126,9.47 A8.76,8.76,0,0,0,127.72,9.29
-C127.8,9.29,127.85,9.29,127.85,9.42 C127.93,9.73,128.44,13.21,128.61,14.72
-A2,2,0,0,1,127.48,14.94 C126.72,12.4,126.18,10.94,123.58,10.94 L120.35,10.94
-A1.23,1.23,0,0,0,119,12.19 L119,18.51 L121.39,18.51
-C124.33,18.51,124.2,18.02,124.28,16.02 A1.12,1.12,0,0,1,125.45,16.02
-C125.45,17.13,125.37,17.94,125.37,19.18 S125.37,21.18,125.45,22.43
-A1.12,1.12,0,0,1,124.28,22.43 C124.2,20.78,124.36,19.94,121.39,19.94 L119,19.94
-Z" />
- <path
- android:fillColor="#fff"
- android:pathData="M143.56,9.29 C150.56,9.29,154.01,13.92,154.01,19.85
-C154.01,27.65,148.81,29.96,144.15,29.96 C140.79,29.96,139.28,29.87,138.02,29.87
-C136.17,29.87,135.08,29.87,133.32,29.96 A1.52,1.52,0,0,1,133.32,28.49
-C135.88,28.27,136.32,28.13,136.32,24.44 L136.32,14.82
-C136.32,11.12,135.86,10.95,133.32,10.77 A1.52,1.52,0,0,1,133.32,9.3
-C135.12,9.3,136.17,9.39,137.98,9.39 C138.78,9.39,142.47,9.3,143.56,9.3 Z
-M143.14,28.49 C147.76,28.49,150.36,26.84,150.36,20.61
-C150.36,15.98,149.36,10.77,142.36,10.77 C140.72,10.77,139.68,11.04,139.68,12.15
-L139.68,26.49 C139.68,27.74,139.97,28.49,143.16,28.49 Z" />
- <path
- android:fillColor="#fff"
- android:pathData="M163.73,24.44 C163.73,28.14,164.19,28.32,166.73,28.49
-A1.53,1.53,0,0,1,166.73,29.96 C164.92,29.96,163.88,29.87,162.07,29.87
-S159.13,29.87,157.37,29.96 A1.53,1.53,0,0,1,157.37,28.49
-C159.93,28.27,160.37,28.13,160.37,24.44 L160.37,14.82
-C160.37,11.12,159.91,10.95,157.37,10.77 A1.53,1.53,0,0,1,157.37,9.3
-C159.18,9.3,160.22,9.39,162.03,9.39 S164.97,9.39,166.73,9.3
-A1.53,1.53,0,0,1,166.73,10.77 C164.17,10.99,163.73,11.13,163.73,14.82
-L163.73,24.44 Z" />
- <path
- android:fillColor="#fff"
- android:pathData="M178.29,28.43 A1.52,1.52,0,0,1,178.29,29.9
-C176.74,29.9,174.64,29.81,172.92,29.81 S170.74,29.81,169.19,29.9
-A1.53,1.53,0,0,1,169.19,28.43 C171.02,28.3,172.28,28.02,173.39,25.27
-L182.72,2.09 C183.18,0.9,183.5,0.5,184.12,0.5 S184.95,0.98,185.25,1.84
-L193.86,26 C194.64,28.29,196.01,28.29,197.64,28.45
A1.52,1.52,0,0,1,197.64,29.92
-C196.09,29.92,194.58,29.83,192.86,29.83 S188.92,29.83,187.36,29.92
-A1.53,1.53,0,0,1,187.36,28.45 C189.36,28.3,191.09,28.45,190.47,26.62
-L187.91,19.09 L179.18,19.09 C178.18,19.09,177.92,19.27,177.71,19.85
L175.4,26.31
-C174.75,28.14,176.72,28.31,178.3,28.45 Z M187.23,17.21 L183.16,5.31
L183.08,5.31
-L178.88,16.61 C178.7,17.09,179.01,17.2,179.94,17.2 Z" />
- <path
- android:fillColor="#fff"
- android:pathData="M78,47 L120,47 L120,48 L78,48 L78,47 Z" />
-</vector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_feed.xml
b/app/src/main/res/layout/fragment_feed.xml
index 8464586..5823dba 100644
--- a/app/src/main/res/layout/fragment_feed.xml
+++ b/app/src/main/res/layout/fragment_feed.xml
@@ -2,6 +2,7 @@
<android.support.v4.widget.SwipeRefreshLayout
xmlns:android="http://schemas.android.com/apk/res/android";
xmlns:app="http://schemas.android.com/apk/res-auto";
+ xmlns:tools="http://schemas.android.com/tools";
android:id="@+id/feed_swipe_refresh_layout"
android:layout_width="match_parent"
android:layout_height="match_parent">
@@ -29,16 +30,33 @@
app:statusBarScrim="@color/status_bar_background"
app:titleEnabled="false">
- <ImageView
+ <LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:scaleType="center"
android:fitsSystemWindows="true"
+ android:orientation="vertical"
+ android:paddingBottom="16dp"
android:background="@drawable/feed_header_background"
- android:contentDescription="@null"
- app:srcCompat="@drawable/feed_header_wordmark"
- app:layout_collapseMode="parallax"
- />
+ android:gravity="center"
+ app:layout_collapseMode="parallax">
+
+ <TextView
+ android:id="@+id/feed_header_text"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:fontFamily="serif"
+ android:textSize="32sp"
+ android:textColor="@android:color/white"
+ tools:text="WikipediA" />
+
+ <View
+ android:layout_width="48dp"
+ android:layout_height="1dp"
+ android:layout_marginTop="8dp"
+ android:layout_gravity="center_horizontal"
+ android:background="@android:color/white"/>
+
+ </LinearLayout>
<android.support.v7.widget.Toolbar
android:id="@+id/feed_toolbar"
--
To view, visit https://gerrit.wikimedia.org/r/299188
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4aede416cba4fde9fb2fcc9ddce8155c9ac7a59d
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Dbrant <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
