Dbrant has uploaded a new change for review.
https://gerrit.wikimedia.org/r/256251
Change subject: Add thumbnail to link preview.
......................................................................
Add thumbnail to link preview.
This adds a thumbnail to the default link preview layout, to make it
consistent with other instances where we have a page title and a
thumbnail. Also a few minor design tweaks:
- Added a subtle gray divider between the title and extract text.
- Sightly reduced the font size of the title text, now that there's less
horizontal space because of the thumbnail.
- Increased the maximum lines for the title text to 3.
Bug: T119214
Change-Id: Ifbc38fe20328e7b3237e03d8f8923183783c0e32
---
M app/src/main/java/org/wikipedia/page/linkpreview/LinkPreviewDialog.java
M app/src/main/res/layout/dialog_link_preview.xml
2 files changed, 36 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia
refs/changes/51/256251/1
diff --git
a/app/src/main/java/org/wikipedia/page/linkpreview/LinkPreviewDialog.java
b/app/src/main/java/org/wikipedia/page/linkpreview/LinkPreviewDialog.java
index d507244..c2bebf1 100755
--- a/app/src/main/java/org/wikipedia/page/linkpreview/LinkPreviewDialog.java
+++ b/app/src/main/java/org/wikipedia/page/linkpreview/LinkPreviewDialog.java
@@ -25,14 +25,18 @@
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.v7.widget.PopupMenu;
+import android.text.TextUtils;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.MenuItem;
import android.view.View;
import android.view.ViewGroup;
import android.widget.Button;
+import android.widget.ImageView;
import android.widget.ProgressBar;
import android.widget.TextView;
+
+import com.squareup.picasso.Picasso;
import retrofit.RetrofitError;
import retrofit.client.Response;
@@ -47,6 +51,7 @@
private ProgressBar progressBar;
private TextView extractText;
+ private ImageView thumbnailView;
private GalleryThumbnailScrollView thumbnailGallery;
private PageTitle pageTitle;
@@ -121,6 +126,7 @@
onNavigateListener = new DefaultOnNavigateListener();
extractText = (TextView)
rootView.findViewById(R.id.link_preview_extract);
+ thumbnailView = (ImageView)
rootView.findViewById(R.id.link_preview_thumbnail);
thumbnailGallery = (GalleryThumbnailScrollView)
rootView.findViewById(R.id.link_preview_thumbnail_gallery);
if (shouldLoadImages) {
@@ -313,6 +319,18 @@
if (contents.getExtract().length() > 0) {
extractText.setText(contents.getExtract());
}
+ if (!TextUtils.isEmpty(contents.getTitle().getThumbUrl())
+ && WikipediaApp.getInstance().isImageDownloadEnabled()) {
+ Picasso.with(getActivity())
+ .load(contents.getTitle().getThumbUrl())
+ .placeholder(R.drawable.ic_pageimage_placeholder)
+ .error(R.drawable.ic_pageimage_placeholder)
+ .into(thumbnailView);
+ } else {
+ Picasso.with(getActivity())
+ .load(R.drawable.ic_pageimage_placeholder)
+ .into(thumbnailView);
+ }
}
private class GalleryThumbnailFetchTask extends GalleryCollectionFetchTask
{
diff --git a/app/src/main/res/layout/dialog_link_preview.xml
b/app/src/main/res/layout/dialog_link_preview.xml
index cfd6a78..5668f8f 100755
--- a/app/src/main/res/layout/dialog_link_preview.xml
+++ b/app/src/main/res/layout/dialog_link_preview.xml
@@ -31,18 +31,23 @@
android:clickable="true"
android:background="?attr/selectableItemBackground"
android:minHeight="64dp">
+ <ImageView
+ android:id="@+id/link_preview_thumbnail"
+ android:layout_width="48dp"
+ android:layout_height="48dp"
+ android:layout_margin="16dp"
+ android:layout_gravity="center_vertical"
+ android:contentDescription="@null"
+ android:scaleType="centerCrop"
+ android:src="@drawable/ic_pageimage_placeholder"/>
<TextView
android:id="@+id/link_preview_title"
android:layout_width="0dp"
android:layout_height="wrap_content"
- android:layout_marginTop="16dp"
- android:layout_marginBottom="10dp"
android:layout_weight="1"
android:layout_gravity="center_vertical"
style="@style/RtlAwareTextView"
android:textColor="?attr/link_preview_text_color"
- android:paddingLeft="16dp"
- android:paddingRight="16dp"
android:paddingBottom="4dp"
android:textSize="22sp"
android:fontFamily="serif"
@@ -54,7 +59,7 @@
android:id="@+id/link_preview_overflow_button"
android:layout_width="48dp"
android:layout_height="48dp"
- android:layout_marginTop="12dp"
+ android:layout_gravity="center_vertical"
android:clickable="true"
android:padding="12dp"
android:background="?attr/actionBarItemBackground"
@@ -63,12 +68,19 @@
android:tint="?attr/link_preview_text_color"/>
</LinearLayout>
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="0.5dp"
+ android:layout_marginLeft="16dp"
+ android:layout_marginRight="16dp"
+ android:background="@color/list_separator_light"/>
+
<TextView
android:id="@+id/link_preview_extract"
android:layout_width="match_parent"
android:layout_height="wrap_content"
style="@style/RtlAwareTextView"
- android:paddingTop="4dp"
+ android:paddingTop="8dp"
android:paddingLeft="16dp"
android:paddingRight="16dp"
android:textSize="16sp"
--
To view, visit https://gerrit.wikimedia.org/r/256251
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifbc38fe20328e7b3237e03d8f8923183783c0e32
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Dbrant <dbr...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
