jenkins-bot has submitted this change and it was merged.
Change subject: Remove article header menu bar
......................................................................
Remove article header menu bar
TODO in next patch: Update bookmark icon when page is saved
Note that this removes the Navigate action and the footer article action
toolbar doesn't replace it. Do we want to put it somewhere else?
Bug: T135295
Change-Id: I3516eb508d9f3a4844d49ed536fe3d3f1428d0ab
---
M app/src/main/java/org/wikipedia/page/JsonPageLoadStrategy.java
M app/src/main/java/org/wikipedia/page/PageFragment.java
M app/src/main/java/org/wikipedia/page/leadimages/ArticleHeaderView.java
D app/src/main/java/org/wikipedia/page/leadimages/ArticleMenuBarView.java
M app/src/main/java/org/wikipedia/page/leadimages/LeadImagesHandler.java
M app/src/main/res/layout/dialog_add_to_reading_list.xml
M app/src/main/res/layout/view_article_header.xml
D app/src/main/res/layout/view_article_menu_bar.xml
M app/src/main/res/values/dimens.xml
M app/src/main/res/values/styles.xml
10 files changed, 10 insertions(+), 241 deletions(-)
Approvals:
jenkins-bot: Verified
Niedzielski: Looks good to me, approved
diff --git a/app/src/main/java/org/wikipedia/page/JsonPageLoadStrategy.java
b/app/src/main/java/org/wikipedia/page/JsonPageLoadStrategy.java
index 49fe1ce..6b87df8 100644
--- a/app/src/main/java/org/wikipedia/page/JsonPageLoadStrategy.java
+++ b/app/src/main/java/org/wikipedia/page/JsonPageLoadStrategy.java
@@ -165,7 +165,6 @@
loadOnWebViewReady(cachePreference);
} else {
fragment.updatePageInfo(null);
- leadImagesHandler.updateNavigate(null);
// kick off an event to the WebView that will cause it to clear
its contents,
// and then report back to us when the clearing is complete, so
that we can synchronize
@@ -594,8 +593,6 @@
if (fragment.callback() != null) {
fragment.callback().onPageUpdateProgressBar(true, true, 0);
}
-
- leadImagesHandler.updateNavigate(page.getPageProperties().getGeo());
}
private void sendMarginPayload() {
diff --git a/app/src/main/java/org/wikipedia/page/PageFragment.java
b/app/src/main/java/org/wikipedia/page/PageFragment.java
index 7cb4512..c74b5fd 100755
--- a/app/src/main/java/org/wikipedia/page/PageFragment.java
+++ b/app/src/main/java/org/wikipedia/page/PageFragment.java
@@ -599,6 +599,7 @@
webView.getSettings().setDefaultFontSize((int)
app.getFontSize(getActivity().getWindow()));
}
+ // TODO: Update bookmark icon on the page action toolbar
public void updateBookmark() {
ReadingList.DAO.anyListContainsTitleAsync(ReadingListDaoProxy.key(getTitle()),
new CallbackTask.Callback<ReadingListPage>() {
@@ -607,7 +608,7 @@
return;
}
if (page != null) {
- articleHeaderView.updateBookmark(true);
+ //articleHeaderView.updateBookmark(true);
page.touch();
ReadingListPageDao.instance().upsert(page);
if (page.savedOrSaving()) {
@@ -616,7 +617,7 @@
ReadingListPageDao.instance().markOutdated(page);
}
} else {
- articleHeaderView.updateBookmark(false);
+ //articleHeaderView.updateBookmark(false);
}
}
});
diff --git
a/app/src/main/java/org/wikipedia/page/leadimages/ArticleHeaderView.java
b/app/src/main/java/org/wikipedia/page/leadimages/ArticleHeaderView.java
index d66d643..e963a3e 100644
--- a/app/src/main/java/org/wikipedia/page/leadimages/ArticleHeaderView.java
+++ b/app/src/main/java/org/wikipedia/page/leadimages/ArticleHeaderView.java
@@ -50,7 +50,6 @@
public class ArticleHeaderView extends LinearLayout implements
ObservableWebView.OnScrollChangeListener {
@BindView(R.id.view_article_header_image) ArticleHeaderImageView image;
@BindView(R.id.view_article_header_text) AppTextView text;
- @BindView(R.id.view_article_header_menu_bar) ArticleMenuBarView menuBar;
@BindView(R.id.view_article_header_container) LinearLayout container;
@BindView(R.id.view_article_header_status_bar_placeholder)
StatusBarBlankView statusBarPlaceholder;
@@ -121,9 +120,6 @@
image.load(url);
int height = url == null ? 0 : leadImageHeightForDevice();
setMinimumHeight(height);
- if (url == null) {
- resetMenuBarColor();
- }
}
public boolean hasImage() {
@@ -180,26 +176,6 @@
public boolean hasPronunciation() {
return pronunciationUrl != null;
- }
-
- public void updateBookmark(boolean bookmarkSaved) {
- menuBar.updateBookmark(bookmarkSaved);
- }
-
- public void updateNavigate(boolean geoLocated) {
- menuBar.updateNavigate(geoLocated);
- }
-
- public void resetMenuBarColor() {
- menuBar.resetMenuBarColor();
- }
-
- public void setMenuBarColor(@ColorInt int color) {
- menuBar.setMenuBarColor(color);
- }
-
- public void setMenuBarCallback(@Nullable ArticleMenuBarView.Callback
callback) {
- menuBar.setCallback(callback);
}
@Override
diff --git
a/app/src/main/java/org/wikipedia/page/leadimages/ArticleMenuBarView.java
b/app/src/main/java/org/wikipedia/page/leadimages/ArticleMenuBarView.java
deleted file mode 100644
index 3ddba1f..0000000
--- a/app/src/main/java/org/wikipedia/page/leadimages/ArticleMenuBarView.java
+++ /dev/null
@@ -1,123 +0,0 @@
-package org.wikipedia.page.leadimages;
-
-import android.animation.ArgbEvaluator;
-import android.animation.ObjectAnimator;
-import android.annotation.TargetApi;
-import android.content.Context;
-import android.os.Build;
-import android.support.annotation.ColorInt;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.util.AttributeSet;
-import android.view.View;
-import android.widget.ImageView;
-import android.widget.LinearLayout;
-
-import org.wikipedia.R;
-import org.wikipedia.util.FeedbackUtil;
-import org.wikipedia.util.StringUtil;
-import org.wikipedia.util.log.L;
-
-import butterknife.BindView;
-import butterknife.ButterKnife;
-import butterknife.OnClick;
-
-public class ArticleMenuBarView extends LinearLayout {
- public interface Callback {
- void onBookmarkClick();
- void onShareClick();
- void onNavigateClick();
- }
-
- public static class DefaultCallback implements Callback {
- @Override public void onBookmarkClick() { }
- @Override public void onShareClick() { }
- @Override public void onNavigateClick() { }
- }
-
- @BindView(R.id.view_article_menu_bar_bookmark) ImageView bookmark;
- @BindView(R.id.view_article_menu_bar_navigate) ImageView navigate;
- @BindView(R.id.view_article_menu_bar_share) ImageView share;
-
- @NonNull private Callback callback = new DefaultCallback();
-
- public ArticleMenuBarView(Context context) {
- super(context);
- init();
- }
-
- public ArticleMenuBarView(Context context, AttributeSet attrs) {
- super(context, attrs);
- init();
- }
-
- public ArticleMenuBarView(Context context, AttributeSet attrs, int
defStyleAttr) {
- super(context, attrs, defStyleAttr);
- init();
- }
-
- @TargetApi(Build.VERSION_CODES.LOLLIPOP)
- public ArticleMenuBarView(Context context, AttributeSet attrs, int
defStyleAttr, int defStyleRes) {
- super(context, attrs, defStyleAttr, defStyleRes);
- init();
- }
-
- public void setCallback(@Nullable Callback callback) {
- this.callback = callback == null ? new DefaultCallback() : callback;
- }
-
- public void updateBookmark(boolean bookmarkSaved) {
- bookmark.setImageResource(bookmarkSaved ?
R.drawable.ic_bookmark_black_24dp
- : R.drawable.ic_bookmark_border_black_24dp);
- }
-
- public void updateNavigate(boolean geolocated) {
- navigate.setVisibility(geolocated ? VISIBLE : GONE);
- }
-
- public void resetMenuBarColor() {
- setMenuBarColor(getResources().getColor(R.color.grey_700));
- }
-
- public void setMenuBarColor(@ColorInt int color) {
- final int animDuration = 500;
- final ObjectAnimator animator =
ObjectAnimator.ofObject(getBackground(), "color",
- new ArgbEvaluator(), color);
- animator.setDuration(animDuration);
- animator.start();
- }
-
- @OnClick({R.id.view_article_menu_bar_bookmark,
- R.id.view_article_menu_bar_share,
- R.id.view_article_menu_bar_navigate})
- public void onClick(View view) {
- switch(view.getId()) {
- case R.id.view_article_menu_bar_bookmark:
- callback.onBookmarkClick();
- break;
- case R.id.view_article_menu_bar_share:
- callback.onShareClick();
- break;
- case R.id.view_article_menu_bar_navigate:
- callback.onNavigateClick();
- break;
- default:
- L.w("Unknown id=" + StringUtil.intToHexStr(view.getId()));
- break;
- }
- }
-
- private void init() {
- inflate();
- bind();
- FeedbackUtil.setToolbarButtonLongPressToast(bookmark, navigate, share);
- }
-
- private void inflate() {
- inflate(getContext(), R.layout.view_article_menu_bar, this);
- }
-
- private void bind() {
- ButterKnife.bind(this);
- }
-}
diff --git
a/app/src/main/java/org/wikipedia/page/leadimages/LeadImagesHandler.java
b/app/src/main/java/org/wikipedia/page/leadimages/LeadImagesHandler.java
index 757cd31..42e2630 100755
--- a/app/src/main/java/org/wikipedia/page/leadimages/LeadImagesHandler.java
+++ b/app/src/main/java/org/wikipedia/page/leadimages/LeadImagesHandler.java
@@ -24,9 +24,7 @@
import org.wikipedia.page.PageFragment;
import org.wikipedia.page.PageTitle;
import org.wikipedia.page.gallery.GalleryActivity;
-import org.wikipedia.readinglist.AddToReadingListDialog;
import org.wikipedia.util.DimenUtil;
-import org.wikipedia.util.UriUtil;
import org.wikipedia.views.FaceAndColorDetectImageView;
import org.wikipedia.views.ObservableWebView;
@@ -58,7 +56,6 @@
@NonNull ObservableWebView webView,
@NonNull ArticleHeaderView articleHeaderView) {
this.articleHeaderView = articleHeaderView;
- this.articleHeaderView.setMenuBarCallback(new MenuBarCallback());
this.parentFragment = parentFragment;
this.bridge = bridge;
this.webView = webView;
@@ -91,10 +88,6 @@
return WikipediaApp.getInstance().isImageDownloadEnabled()
&& displayHeightDp >= MIN_SCREEN_HEIGHT_DP
&& !TextUtils.isEmpty(getLeadImageUrl());
- }
-
- public void updateNavigate(@Nullable Location geo) {
- articleHeaderView.updateNavigate(geo != null);
}
public void setAnimationPaused(boolean paused) {
@@ -310,32 +303,6 @@
return parentFragment.getActivity();
}
- private class MenuBarCallback extends ArticleMenuBarView.DefaultCallback {
- @Override
- public void onBookmarkClick() {
- if (getPage() == null) {
- return;
- }
-
parentFragment.addToReadingList(AddToReadingListDialog.InvokeSource.BOOKMARK_BUTTON);
- }
-
- @Override
- public void onShareClick() {
- parentFragment.sharePageLink();
- }
-
- @Override
- public void onNavigateClick() {
- openGeoIntent();
- }
-
- private void openGeoIntent() {
- if (getGeo() != null) {
- UriUtil.sendGeoIntent(getActivity(), getGeo(),
getTitle().getDisplayText());
- }
- }
- }
-
private class ImageLoadListener implements
FaceAndColorDetectImageView.OnImageLoadListener {
@Override
public void onImageLoaded(final int bmpHeight, @Nullable final PointF
faceLocation, @ColorInt final int mainColor) {
@@ -346,7 +313,6 @@
if (faceLocation != null) {
articleHeaderView.setImageFocus(faceLocation);
}
- articleHeaderView.setMenuBarColor(mainColor);
startKenBurnsAnimation();
}
}
@@ -355,7 +321,6 @@
@Override
public void onImageFailed() {
- articleHeaderView.resetMenuBarColor();
}
}
}
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 3af2c6c..afbc7c7 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
@@ -34,7 +34,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
- style="@style/ArticleMenuBarViewButton"
android:tint="?attr/link_preview_text_color"
app:srcCompat="@drawable/ic_close_white_24dp"
android:contentDescription="@string/dialog_close_description"/>
diff --git a/app/src/main/res/layout/view_article_header.xml
b/app/src/main/res/layout/view_article_header.xml
index 69a35c7..dbeb964 100644
--- a/app/src/main/res/layout/view_article_header.xml
+++ b/app/src/main/res/layout/view_article_header.xml
@@ -34,18 +34,13 @@
android:maxLines="5"
android:ellipsize="end"
tools:text="Title\nSubtitle" />
-
- <org.wikipedia.page.leadimages.ArticleMenuBarView
- android:id="@+id/view_article_header_menu_bar"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:paddingRight="@dimen/activity_horizontal_margin"
- android:paddingLeft="@dimen/activity_horizontal_margin"
- android:background="@color/grey_700"
- android:clickable="true"
- android:maxHeight="42dp"
- android:gravity="center_vertical" />
-
+
+ <View
+ android:layout_width="53.5dp"
+ android:layout_height="2dp"
+ android:layout_marginLeft="@dimen/activity_horizontal_margin"
+ android:layout_marginRight="@dimen/activity_horizontal_margin"
+ android:background="#9aa0a7"/>
</LinearLayout>
</merge>
\ No newline at end of file
diff --git a/app/src/main/res/layout/view_article_menu_bar.xml
b/app/src/main/res/layout/view_article_menu_bar.xml
deleted file mode 100644
index 67860d3..0000000
--- a/app/src/main/res/layout/view_article_menu_bar.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<merge
- xmlns:android="http://schemas.android.com/apk/res/android";
- xmlns:app="http://schemas.android.com/apk/res-auto";>
-
- <ImageButton
- style="@style/ArticleMenuBarViewButton"
- android:id="@+id/view_article_menu_bar_bookmark"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- app:srcCompat="@drawable/ic_bookmark_border_black_24dp"
- android:contentDescription="@string/article_menu_bar_bookmark" />
-
- <ImageButton
- style="@style/ArticleMenuBarViewButton"
- android:id="@+id/view_article_menu_bar_share"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- app:srcCompat="@drawable/ic_share_black_24dp"
- android:contentDescription="@string/article_menu_bar_share" />
-
- <ImageButton
- style="@style/ArticleMenuBarViewButton"
- android:id="@+id/view_article_menu_bar_navigate"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:visibility="gone"
- app:srcCompat="@drawable/ic_place_black_24dp"
- android:contentDescription="@string/article_menu_bar_navigate" />
-
-</merge>
\ No newline at end of file
diff --git a/app/src/main/res/values/dimens.xml
b/app/src/main/res/values/dimens.xml
index a1c1158..63e9030 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -88,9 +88,6 @@
<!-- Crash report -->
<item name="crash_report_icon_alpha" format="float" type="dimen">.5</item>
- <!-- Article menu bar -->
- <dimen name="view_article_menu_bar_button_padding">12dp</dimen>
-
<!-- The Feed -->
<dimen name="view_feed_header_height">240dp</dimen>
<dimen name="view_feed_overlap_top">84dp</dimen>
diff --git a/app/src/main/res/values/styles.xml
b/app/src/main/res/values/styles.xml
index 4ad8562..8db2a7d 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -214,14 +214,6 @@
<item name="android:textColor">@drawable/view_nav_tab_text_color</item>
</style>
- <style name="ArticleMenuBarViewButton"
parent="@style/Widget.AppCompat.Button.Borderless">
- <item name="android:minWidth">0dp</item>
- <item
name="android:paddingRight">@dimen/view_article_menu_bar_button_padding</item>
- <item
name="android:paddingLeft">@dimen/view_article_menu_bar_button_padding</item>
- <item name="android:tint">@android:color/white</item>
- <item
name="android:background">?attr/selectableItemBackgroundBorderless</item>
- </style>
-
<style name="SimpleDraweeViewPlaceholder">
<item name="actualImageScaleType">centerCrop</item>
<item name="placeholderImage">@drawable/checkerboard</item>
--
To view, visit https://gerrit.wikimedia.org/r/305637
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3516eb508d9f3a4844d49ed536fe3d3f1428d0ab
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Mholloway <mhollo...@wikimedia.org>
Gerrit-Reviewer: BearND <bsitzm...@wikimedia.org>
Gerrit-Reviewer: Brion VIBBER <br...@wikimedia.org>
Gerrit-Reviewer: Dbrant <dbr...@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
