Niedzielski has uploaded a new change for review.
https://gerrit.wikimedia.org/r/312296
Change subject: Hygiene: move article toolbar to custom View
......................................................................
Hygiene: move article toolbar to custom View
Change-Id: I5baf2a6dc4c491ce8e13a7aa218f727c295bb684
---
A app/src/main/java/org/wikipedia/page/ArticleTabLayout.java
M app/src/main/res/layout/fragment_page.xml
A app/src/main/res/layout/view_article_tab_layout.xml
3 files changed, 49 insertions(+), 24 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia
refs/changes/96/312296/1
diff --git a/app/src/main/java/org/wikipedia/page/ArticleTabLayout.java
b/app/src/main/java/org/wikipedia/page/ArticleTabLayout.java
new file mode 100644
index 0000000..7134c92
--- /dev/null
+++ b/app/src/main/java/org/wikipedia/page/ArticleTabLayout.java
@@ -0,0 +1,25 @@
+package org.wikipedia.page;
+
+import android.content.Context;
+import android.support.design.widget.TabLayout;
+import android.util.AttributeSet;
+
+import org.wikipedia.R;
+
+import butterknife.ButterKnife;
+
+public class ArticleTabLayout extends TabLayout {
+ public ArticleTabLayout(Context context) {
+ this(context, null);
+ }
+
+ public ArticleTabLayout(Context context, AttributeSet attrs) {
+ this(context, attrs, 0);
+ }
+
+ public ArticleTabLayout(Context context, AttributeSet attrs, int
defStyleAttr) {
+ super(context, attrs, defStyleAttr);
+ inflate(getContext(), R.layout.view_article_tab_layout, this);
+ ButterKnife.bind(this);
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_page.xml
b/app/src/main/res/layout/fragment_page.xml
index f52a029..f699832 100644
--- a/app/src/main/res/layout/fragment_page.xml
+++ b/app/src/main/res/layout/fragment_page.xml
@@ -117,8 +117,7 @@
</LinearLayout>
</LinearLayout>
- <!-- Page action tabs -->
- <android.support.design.widget.TabLayout
+ <org.wikipedia.page.ArticleTabLayout
android:id="@+id/page_actions_tab_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -126,28 +125,7 @@
app:tabGravity="fill"
android:background="@color/darkest_gray"
app:tabSelectedTextColor="@color/darkest_gray"
- app:tabIndicatorColor="@color/darkest_gray">
- <android.support.design.widget.TabItem
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
-
android:icon="@drawable/ic_bookmark_border_white_24dp"/>
- <android.support.design.widget.TabItem
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:icon="@drawable/ic_share_white_24dp"/>
- <android.support.design.widget.TabItem
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:icon="@drawable/ic_translate_white_24dp"/>
- <android.support.design.widget.TabItem
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:icon="@drawable/ic_find_in_page" />
- <android.support.design.widget.TabItem
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:icon="@drawable/ic_list_white_24dp" />
- </android.support.design.widget.TabLayout>
+ app:tabIndicatorColor="@color/darkest_gray" />
</android.support.design.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/view_article_tab_layout.xml
b/app/src/main/res/layout/view_article_tab_layout.xml
new file mode 100644
index 0000000..d9b46bc
--- /dev/null
+++ b/app/src/main/res/layout/view_article_tab_layout.xml
@@ -0,0 +1,22 @@
+<merge xmlns:android="http://schemas.android.com/apk/res/android";>
+ <android.support.design.widget.TabItem
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:icon="@drawable/ic_bookmark_border_white_24dp"/>
+ <android.support.design.widget.TabItem
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:icon="@drawable/ic_share_white_24dp"/>
+ <android.support.design.widget.TabItem
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:icon="@drawable/ic_translate_white_24dp"/>
+ <android.support.design.widget.TabItem
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:icon="@drawable/ic_find_in_page" />
+ <android.support.design.widget.TabItem
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:icon="@drawable/ic_list_white_24dp" />
+</merge>
\ No newline at end of file
--
To view, visit https://gerrit.wikimedia.org/r/312296
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5baf2a6dc4c491ce8e13a7aa218f727c295bb684
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Niedzielski <sniedziel...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
