Merge pull request #1077 from wordpress-mobile/issue/1076-reader-featured-image

Issue/1076 reader featured image

Author: daniloercoli

res/layout/reader_listitem_post_detail.xml

@@ -5,7 +5,7 @@
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
+    android:layout_height="match_parent"
     android:orientation="vertical"
     android:padding="@dimen/margin_large">
 
@@ -81,7 +81,10 @@
 
     <org.wordpress.android.widgets.WPNetworkImageView
         android:id="@+id/image_featured"
-        style="@style/ReaderImageView.Featured"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:minHeight="@dimen/reader_featured_image_height"
+        android:adjustViewBounds="true"
         android:layout_marginLeft="@dimen/reader_list_margin"
         android:layout_marginRight="@dimen/reader_list_margin"
         android:layout_marginTop="@dimen/margin_large"

src/org/wordpress/android/models/ReaderPost.java

@@ -34,7 +34,7 @@ public class ReaderPost {
     private String tags;          // comma-separated list of tags
 
     public long timestamp;        // used for sorting
-    public String published;
+    private String published;
 
     private String url;
     private String featuredImage;
@@ -166,21 +166,23 @@ public static ReaderPost fromJson(JSONObject json) {
         // it as a video
         if (!post.hasFeaturedImage()) {
             JSONObject jsonMedia = json.optJSONObject("featured_media");
-            if (jsonMedia!=null) {
+            if (jsonMedia != null) {
                 String mediaUrl = JSONUtil.getString(jsonMedia, "uri");
-                String type = JSONUtil.getString(jsonMedia, "type");
-                boolean isVideo = (type!=null && type.equals("video"));
-                if (isVideo) {
-                    post.featuredVideo = mediaUrl;
-                } else {
-                    post.featuredImage = mediaUrl;
+                if (!TextUtils.isEmpty(mediaUrl)) {
+                    String type = JSONUtil.getString(jsonMedia, "type");
+                    boolean isVideo = (type != null && type.equals("video"));
+                    if (isVideo) {
+                        post.featuredVideo = mediaUrl;
+                    } else {
+                        post.featuredImage = mediaUrl;
+                    }
                 }
             }
 
             // if we still don't have a featured image, parse the content for an image that's
             // suitable as a featured image - this is done since featured_media seems to miss
             // some images that would work well as featured images on mobile
-            if (!post.hasFeaturedImage() && post.isWP())
+            if (!post.hasFeaturedImage())
                 post.featuredImage = findFeaturedImage(post.text);
         }
 
@@ -257,7 +259,7 @@ private static String extractTitle(final String excerpt, int maxLen) {
     /*
      * called when a post doesn't have a featured image, searches post's content for an image that
      * may still be suitable as a featured image - only works with WP posts due to the search for
-     * specific WP image classes
+     * specific WP image classes (but will also work with RSS posts that come from WP blogs)
      */
     private static String findFeaturedImage(final String text) {
         if (text==null || !text.contains("<img "))
@@ -478,7 +480,7 @@ public boolean hasTags() {
         return !TextUtils.isEmpty(tags);
     }
 
-    public List<String> getTagList() {
+    List<String> getTagList() {
         return Arrays.asList(getTags().split(","));
     }
 

src/org/wordpress/android/ui/reader/ReaderPostDetailFragment.java

@@ -1277,10 +1277,12 @@ protected Boolean doInBackground(Void... params) {
             // it will be shown between the post's title and its content (but skip mshots)
             if (mPost.hasFeaturedImage() && !PhotonUtils.isMshotsUrl(mPost.getFeaturedImage())) {
                 Uri uri = Uri.parse(mPost.getFeaturedImage());
-                if (!mPost.getText().contains(StringUtils.notNullStr(uri.getLastPathSegment()))) {
+                String path = StringUtils.notNullStr(uri.getLastPathSegment());
+                if (!mPost.getText().contains(path)) {
                     showFeaturedImage = true;
-                    int imgHeight = getResources().getDimensionPixelSize(R.dimen.reader_featured_image_height);
-                    featuredImageUrl = mPost.getFeaturedImageForDisplay(0, imgHeight);
+                    // note that only the width is used here - the imageView will adjust
+                    // the height to match that of the image once loaded
+                    featuredImageUrl = mPost.getFeaturedImageForDisplay(getFullSizeImageWidth(), 0);
                 }
             }
 

src/org/wordpress/android/ui/reader/actions/ReaderPostActions.java

@@ -234,13 +234,19 @@ public void run() {
 
                 if (hasChanges) {
                     AppLog.d(T.READER, "post updated");
-                    // the endpoint for requesting a single post doesn't always support featured images,
-                    // so if the original post had a featured image and the updated post doesn't, set
-                    // the featured image for the updated post to that of the original post
-                    if (post.hasFeaturedImage() && !updatedPost.hasFeaturedImage()) {
-                        AppLog.i(T.READER, "restored featured image after updating post");
+                    // the endpoint for requesting a single post doesn't support featured images,
+                    // so if the original post had a featured image, set the featured image for
+                    // the updated post to that of the original post - this should be done even
+                    // if the updated post has a featured image since that was most likely
+                    // assigned by ReaderPost.findFeaturedImage()
+                    if (post.hasFeaturedImage()) {
                         updatedPost.setFeaturedImage(post.getFeaturedImage());
                     }
+                    // likewise for featured video
+                    if (post.hasFeaturedVideo()) {
+                        updatedPost.setFeaturedVideo(post.getFeaturedVideo());
+                        updatedPost.isVideoPress = post.isVideoPress;
+                    }
                     ReaderPostTable.addOrUpdatePost(updatedPost);
                 }