jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/393632 )
Change subject: Design updates for Randomizer.
......................................................................
Design updates for Randomizer.
- The bookmark icon is now correctly filled-in when the page is added to a
list, and allows the user to remove and/or add to another list.
- Fixed background color.
- Card height is now fixed.
Bug: T158788
Change-Id: I7015f580713346b227b7a3a8d755e11d21bc6621
---
M app/src/main/java/org/wikipedia/random/RandomFragment.java
M app/src/main/java/org/wikipedia/random/RandomItemFragment.java
M app/src/main/res/layout-land/fragment_random.xml
M app/src/main/res/layout/fragment_random.xml
M app/src/main/res/layout/fragment_random_item.xml
5 files changed, 36 insertions(+), 14 deletions(-)
Approvals:
jenkins-bot: Verified
Cooltey: Looks good to me, approved
diff --git a/app/src/main/java/org/wikipedia/random/RandomFragment.java
b/app/src/main/java/org/wikipedia/random/RandomFragment.java
index d822a1f..cca8bc6 100644
--- a/app/src/main/java/org/wikipedia/random/RandomFragment.java
+++ b/app/src/main/java/org/wikipedia/random/RandomFragment.java
@@ -22,11 +22,11 @@
import org.wikipedia.page.PageTitle;
import org.wikipedia.readinglist.AddToReadingListDialog;
import org.wikipedia.readinglist.ReadingList;
+import org.wikipedia.readinglist.ReadingListBookmarkMenu;
import org.wikipedia.readinglist.page.ReadingListPage;
import org.wikipedia.readinglist.page.database.ReadingListDaoProxy;
import org.wikipedia.util.DimenUtil;
import org.wikipedia.util.FeedbackUtil;
-import org.wikipedia.util.ShareUtil;
import butterknife.BindView;
import butterknife.ButterKnife;
@@ -36,11 +36,11 @@
public class RandomFragment extends Fragment {
@BindView(R.id.random_item_pager) ViewPager randomPager;
@BindView(R.id.random_next_button) View nextButton;
- @BindView(R.id.random_save_button) ImageView saveShareButton;
+ @BindView(R.id.random_save_button) ImageView saveButton;
@BindView(R.id.random_back_button) View backButton;
private Unbinder unbinder;
private ExclusiveBottomSheetPresenter bottomSheetPresenter = new
ExclusiveBottomSheetPresenter();
- private boolean saveShareButtonState;
+ private boolean saveButtonState;
private ViewPagerListener viewPagerListener = new ViewPagerListener();
@NonNull
@@ -54,7 +54,7 @@
super.onCreateView(inflater, container, savedInstanceState);
View view = inflater.inflate(R.layout.fragment_random, container,
false);
unbinder = ButterKnife.bind(this, view);
- FeedbackUtil.setToolbarButtonLongPressToast(nextButton,
saveShareButton);
+ FeedbackUtil.setToolbarButtonLongPressToast(nextButton, saveButton);
randomPager.setOffscreenPageLimit(2);
randomPager.setAdapter(new RandomItemAdapter((AppCompatActivity)
getActivity()));
@@ -88,8 +88,20 @@
if (title == null) {
return;
}
- if (saveShareButtonState) {
- ShareUtil.shareText(getActivity(), title);
+ if (saveButtonState) {
+ new ReadingListBookmarkMenu(saveButton, new
ReadingListBookmarkMenu.Callback() {
+ @Override
+ public void onAddRequest(@Nullable ReadingListPage page) {
+ onAddPageToList(title);
+ }
+
+ @Override
+ public void onDeleted(@Nullable ReadingListPage page) {
+ FeedbackUtil.showMessage(getActivity(),
+ getString(R.string.reading_list_item_deleted,
title.getDisplayText()));
+ updateSaveShareButton(title);
+ }
+ }).show(title);
} else {
onAddPageToList(title);
}
@@ -117,9 +129,9 @@
ReadingList.DAO.anyListContainsTitleAsync(ReadingListDaoProxy.key(title),
new CallbackTask.DefaultCallback<ReadingListPage>() {
@Override public void success(@Nullable ReadingListPage
page) {
- saveShareButtonState = page != null;
- saveShareButton.setImageResource(saveShareButtonState
- ? R.drawable.ic_share_white_24dp :
R.drawable.ic_bookmark_border_white_24dp);
+ saveButtonState = page != null;
+ saveButton.setImageResource(saveButtonState
+ ? R.drawable.ic_bookmark_white_24dp :
R.drawable.ic_bookmark_border_white_24dp);
}
});
}
diff --git a/app/src/main/java/org/wikipedia/random/RandomItemFragment.java
b/app/src/main/java/org/wikipedia/random/RandomItemFragment.java
index ed69650..2a6aec5 100644
--- a/app/src/main/java/org/wikipedia/random/RandomItemFragment.java
+++ b/app/src/main/java/org/wikipedia/random/RandomItemFragment.java
@@ -9,6 +9,7 @@
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
+import android.view.ViewTreeObserver;
import android.widget.TextView;
import org.wikipedia.R;
@@ -101,6 +102,14 @@
articleTitleView.setText(summary.getNormalizedTitle());
articleSubtitleView.setText(null); //summary.getDescription());
extractView.setText(summary.getExtract());
+ ViewTreeObserver observer = extractView.getViewTreeObserver();
+ observer.addOnGlobalLayoutListener(new
ViewTreeObserver.OnGlobalLayoutListener() {
+ @Override
+ public void onGlobalLayout() {
+ extractView.setMaxLines(extractView.getHeight() /
extractView.getLineHeight());
+
extractView.getViewTreeObserver().removeOnGlobalLayoutListener(this);
+ }
+ });
imageView.loadImage(TextUtils.isEmpty(summary.getThumbnailUrl()) ? null
: Uri.parse(summary.getThumbnailUrl()));
}
diff --git a/app/src/main/res/layout-land/fragment_random.xml
b/app/src/main/res/layout-land/fragment_random.xml
index fef3443..9c1bcf3 100644
--- a/app/src/main/res/layout-land/fragment_random.xml
+++ b/app/src/main/res/layout-land/fragment_random.xml
@@ -5,7 +5,7 @@
android:id="@+id/random_coordinator_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="?attr/colorAccent"
+ android:background="?attr/main_toolbar_color"
android:transitionName="@string/transition_random_activity"
android:orientation="vertical">
diff --git a/app/src/main/res/layout/fragment_random.xml
b/app/src/main/res/layout/fragment_random.xml
index 8141d27..fcac116 100644
--- a/app/src/main/res/layout/fragment_random.xml
+++ b/app/src/main/res/layout/fragment_random.xml
@@ -5,7 +5,7 @@
android:id="@+id/random_coordinator_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="?attr/colorAccent"
+ android:background="?attr/main_toolbar_color"
android:transitionName="@string/transition_random_activity"
android:orientation="vertical">
diff --git a/app/src/main/res/layout/fragment_random_item.xml
b/app/src/main/res/layout/fragment_random_item.xml
index 4c00db7..bc3a668 100644
--- a/app/src/main/res/layout/fragment_random_item.xml
+++ b/app/src/main/res/layout/fragment_random_item.xml
@@ -44,7 +44,7 @@
<LinearLayout
android:id="@+id/view_featured_article_card_text_container"
android:layout_width="match_parent"
- android:layout_height="wrap_content"
+ android:layout_height="164dp"
android:orientation="vertical"
android:paddingLeft="16dp"
android:paddingRight="16dp"
@@ -62,7 +62,7 @@
android:fontFamily="serif"
android:textColor="?attr/primary_text_color"
android:lineSpacingMultiplier="0.9"
- android:maxLines="3"
+ android:maxLines="2"
android:ellipsize="end"
tools:text="Lorem ipsum"/>
@@ -83,7 +83,8 @@
style="@style/RtlAwareTextView"
android:id="@+id/view_featured_article_card_extract"
android:layout_width="match_parent"
- android:layout_height="wrap_content"
+ android:layout_height="0dp"
+ android:layout_weight="1"
android:paddingTop="8dp"
android:paddingBottom="16dp"
android:maxLines="4"
--
To view, visit https://gerrit.wikimedia.org/r/393632
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7015f580713346b227b7a3a8d755e11d21bc6621
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Dbrant <dbr...@wikimedia.org>
Gerrit-Reviewer: Brion VIBBER <br...@wikimedia.org>
Gerrit-Reviewer: Cooltey <cf...@wikimedia.org>
Gerrit-Reviewer: Sharvaniharan <sha...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
