Editor's Choice. Reposts. Some ontent page tweaks.

app/src/main/java/io/lbry/browser/MainActivity.java

@@ -99,6 +99,7 @@ import io.lbry.browser.tasks.wallet.SyncSetTask;
 import io.lbry.browser.tasks.wallet.WalletBalanceTask;
 import io.lbry.browser.ui.BaseFragment;
 import io.lbry.browser.ui.channel.ChannelFragment;
+import io.lbry.browser.ui.editorschoice.EditorsChoiceFragment;
 import io.lbry.browser.ui.following.FollowingFragment;
 import io.lbry.browser.ui.search.SearchFragment;
 import io.lbry.browser.ui.settings.SettingsFragment;
@@ -202,7 +203,11 @@ public class MainActivity extends AppCompatActivity implements SdkStatusListener
     private boolean pendingFollowingReload;
 
     private final List<Integer> supportedMenuItemIds = Arrays.asList(
-            NavMenuItem.ID_ITEM_FOLLOWING, NavMenuItem.ID_ITEM_ALL_CONTENT, NavMenuItem.ID_ITEM_WALLET, NavMenuItem.ID_ITEM_SETTINGS
+            NavMenuItem.ID_ITEM_FOLLOWING,
+            NavMenuItem.ID_ITEM_EDITORS_CHOICE,
+            NavMenuItem.ID_ITEM_ALL_CONTENT,
+            NavMenuItem.ID_ITEM_WALLET,
+            NavMenuItem.ID_ITEM_SETTINGS
     );
 
     @Override
@@ -350,6 +355,9 @@ public class MainActivity extends AppCompatActivity implements SdkStatusListener
             case NavMenuItem.ID_ITEM_FOLLOWING:
                 openFragment(FollowingFragment.class, true, NavMenuItem.ID_ITEM_FOLLOWING);
                 break;
+            case NavMenuItem.ID_ITEM_EDITORS_CHOICE:
+                openFragment(EditorsChoiceFragment.class, true, NavMenuItem.ID_ITEM_EDITORS_CHOICE);
+                break;
             case NavMenuItem.ID_ITEM_ALL_CONTENT:
                 openFragment(AllContentFragment.class, true, NavMenuItem.ID_ITEM_ALL_CONTENT);
                 break;
@@ -553,9 +561,7 @@ public class MainActivity extends AppCompatActivity implements SdkStatusListener
         findViewById(R.id.wunderbar_close).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                findViewById(R.id.wunderbar).clearFocus();
+                clearWunderbarFocus(view);
-                InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
-                imm.hideSoftInputFromWindow(view.getWindowToken(), 0);
             }
         });
         findViewById(R.id.wunderbar).setOnFocusChangeListener(new View.OnFocusChangeListener() {
@@ -612,8 +618,7 @@ public class MainActivity extends AppCompatActivity implements SdkStatusListener
                         openAllContentFragmentWithTag(urlSuggestion.getText());
                         break;
                 }
-                findViewById(R.id.wunderbar).clearFocus();
+                clearWunderbarFocus(findViewById(R.id.wunderbar));
-                //findViewById(R.id.url_suggestions_container).setVisibility(View.GONE);
             }
         });
 
@@ -623,6 +628,12 @@ public class MainActivity extends AppCompatActivity implements SdkStatusListener
         urlSuggestionList.setAdapter(urlSuggestionListAdapter);
     }
 
+    private void clearWunderbarFocus(View view) {
+        findViewById(R.id.wunderbar).clearFocus();
+        InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
+        imm.hideSoftInputFromWindow(view.getWindowToken(), 0);
+    }
+
     private void launchSearch(String text) {
         Fragment currentFragment = getCurrentFragment();
         if (currentFragment instanceof SearchFragment) {

app/src/main/java/io/lbry/browser/adapter/ClaimListAdapter.java

@@ -87,6 +87,8 @@ public class ClaimListAdapter extends RecyclerView.Adapter<ClaimListAdapter.View
         protected TextView titleView;
         protected TextView publisherView;
         protected TextView publishTimeView;
+        protected View repostInfoView;
+        protected TextView repostChannelView;
         public ViewHolder(View v) {
             super(v);
             alphaView = v.findViewById(R.id.claim_thumbnail_alpha);
@@ -97,6 +99,8 @@ public class ClaimListAdapter extends RecyclerView.Adapter<ClaimListAdapter.View
             titleView = v.findViewById(R.id.claim_title);
             publisherView = v.findViewById(R.id.claim_publisher);
             publishTimeView = v.findViewById(R.id.claim_publish_time);
+            repostInfoView = v.findViewById(R.id.claim_repost_info);
+            repostChannelView = v.findViewById(R.id.claim_repost_channel);
         }
     }
 
@@ -111,7 +115,11 @@ public class ClaimListAdapter extends RecyclerView.Adapter<ClaimListAdapter.View
             return VIEW_TYPE_FEATURED;
         }
 
-        return Claim.TYPE_CHANNEL.equalsIgnoreCase(items.get(position).getValueType()) ? VIEW_TYPE_CHANNEL : VIEW_TYPE_STREAM;
+        Claim claim = items.get(position);
+        String valueType = items.get(position).getValueType();
+        Claim actualClaim = Claim.TYPE_REPOST.equalsIgnoreCase(valueType) ? claim.getRepostedClaim() : claim;
+
+        return Claim.TYPE_CHANNEL.equalsIgnoreCase(actualClaim.getValueType()) ? VIEW_TYPE_CHANNEL : VIEW_TYPE_STREAM;
     }
 
     @Override
@@ -130,7 +138,10 @@ public class ClaimListAdapter extends RecyclerView.Adapter<ClaimListAdapter.View
     @Override
     public void onBindViewHolder(ClaimListAdapter.ViewHolder vh, int position) {
         int type = getItemViewType(position);
-        Claim item = items.get(position);
+
+        Claim original = items.get(position);
+        boolean isRepost = Claim.TYPE_REPOST.equalsIgnoreCase(original.getValueType());
+        final Claim item = Claim.TYPE_REPOST.equalsIgnoreCase(original.getValueType()) ? original.getRepostedClaim() : original;
         Claim.GenericMetadata metadata = item.getValue();
         Claim signingChannel = item.getSigningChannel();
         Claim.StreamMetadata streamMetadata = null;
@@ -162,6 +173,16 @@ public class ClaimListAdapter extends RecyclerView.Adapter<ClaimListAdapter.View
             }
         });
 
+        vh.repostInfoView.setVisibility(isRepost ? View.VISIBLE : View.GONE);
+        vh.repostChannelView.setText(isRepost ? original.getSigningChannel().getName() : null);
+        vh.repostChannelView.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                if (listener != null) {
+                    listener.onClaimClicked(original.getSigningChannel());
+                }
+            }
+        });
 
         vh.titleView.setText(Helper.isNullOrEmpty(item.getTitle()) ? item.getName() : item.getTitle());
         if (type == VIEW_TYPE_FEATURED) {

app/src/main/java/io/lbry/browser/adapter/EditorsChoiceItemAdapter.java

@@ -0,0 +1,117 @@
+package io.lbry.browser.adapter;
+
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.bumptech.glide.Glide;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import io.lbry.browser.R;
+import io.lbry.browser.model.EditorsChoiceItem;
+import io.lbry.browser.utils.Helper;
+import lombok.Setter;
+
+public class EditorsChoiceItemAdapter extends RecyclerView.Adapter<EditorsChoiceItemAdapter.ViewHolder> {
+    private static final int VIEW_TYPE_HEADER = 1;
+    private static final int VIEW_TYPE_CONTENT = 2;
+
+    private Context context;
+    private List<EditorsChoiceItem> items;
+    @Setter
+    private EditorsChoiceItemListener listener;
+
+    public EditorsChoiceItemAdapter(List<EditorsChoiceItem> items, Context context) {
+        this.context = context;
+        this.items = new ArrayList<>(items);
+    }
+
+    public void addFeaturedItem(EditorsChoiceItem item) {
+        items.add(0, item);
+        notifyDataSetChanged();
+    }
+
+    public void addItems(List<EditorsChoiceItem> items) {
+        for (EditorsChoiceItem item : items) {
+            if (!this.items.contains(item)) {
+                this.items.add(item);
+            }
+        }
+        notifyDataSetChanged();
+    }
+
+    public static class ViewHolder extends RecyclerView.ViewHolder {
+        protected ImageView thumbnailView;
+        protected TextView descriptionView;
+        protected TextView headerView;
+        protected TextView titleView;
+        protected View cardView;
+
+        public ViewHolder(View v) {
+            super(v);
+
+            cardView = v.findViewById(R.id.editors_choice_content_card);
+            descriptionView = v.findViewById(R.id.editors_choice_content_description);
+            titleView = v.findViewById(R.id.editors_choice_content_title);
+
+            thumbnailView = v.findViewById(R.id.editors_choice_content_thumbnail);
+            headerView = v.findViewById(R.id.editors_choice_header_title);
+        }
+    }
+
+    @Override
+    public int getItemCount() {
+        return items != null ? items.size() : 0;
+    }
+
+    @Override
+    public int getItemViewType(int position) {
+        return items.get(position).isHeader() ? VIEW_TYPE_HEADER : VIEW_TYPE_CONTENT;
+    }
+
+    @Override
+    public EditorsChoiceItemAdapter.ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+        View v = LayoutInflater.from(context).inflate(R.layout.list_item_editors_choice, parent, false);
+        return new EditorsChoiceItemAdapter.ViewHolder(v);
+    }
+
+    @Override
+    public void onBindViewHolder(EditorsChoiceItemAdapter.ViewHolder vh, int position) {
+        int type = getItemViewType(position);
+        EditorsChoiceItem item = items.get(position);
+
+        vh.headerView.setVisibility(type == VIEW_TYPE_HEADER ? View.VISIBLE : View.GONE);
+        vh.cardView.setVisibility(type == VIEW_TYPE_CONTENT ? View.VISIBLE : View.GONE);
+
+        vh.headerView.setText(item.getTitle());
+        vh.titleView.setText(item.getTitle());
+        vh.descriptionView.setText(item.getDescription());
+        if (!Helper.isNullOrEmpty(item.getThumbnailUrl())) {
+            Glide.with(context.getApplicationContext()).
+                    load(item.getThumbnailUrl()).
+                    centerCrop().
+                    placeholder(R.drawable.bg_thumbnail_placeholder).
+                    into(vh.thumbnailView);
+        }
+
+        vh.cardView.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                if (listener != null) {
+                    listener.onEditorsChoiceItemClicked(item);
+                }
+            }
+        });
+    }
+
+    public interface EditorsChoiceItemListener {
+        void onEditorsChoiceItemClicked(EditorsChoiceItem item);
+    }
+}

app/src/main/java/io/lbry/browser/model/Claim.java

@@ -32,6 +32,7 @@ public class Claim {
 
     public static final String TYPE_STREAM = "stream";
     public static final String TYPE_CHANNEL = "channel";
+    public static final String TYPE_REPOST = "repost";
 
     public static final String STREAM_TYPE_AUDIO = "audio";
     public static final String STREAM_TYPE_IMAGE = "image";
@@ -73,7 +74,8 @@ public class Claim {
     private String shortUrl;
     private String txid;
     private String type; // claim | update | support
-    private String valueType; // stream | channel
+    private String valueType; // stream | channel | repost
+    private Claim repostedClaim;
     private Claim signingChannel;
     private String repostChannelUrl;
     private boolean isChannelSignatureValid;
@@ -158,24 +160,30 @@ public class Claim {
     }
 
     public static Claim fromJSONObject(JSONObject claimObject) {
+        Claim claim = null;
         String claimJson = claimObject.toString();
         Type type = new TypeToken<Claim>(){}.getType();
         Type streamMetadataType = new TypeToken<StreamMetadata>(){}.getType();
         Type channelMetadataType = new TypeToken<ChannelMetadata>(){}.getType();
 
         Gson gson = new GsonBuilder().setFieldNamingPolicy(FieldNamingPolicy.LOWER_CASE_WITH_UNDERSCORES).create();
-        Claim claim = gson.fromJson(claimJson, type);
+        claim = gson.fromJson(claimJson, type);
 
-        // Specific value parsing
         try {
-            JSONObject value = claimObject.getJSONObject("value");
             String valueType = claim.getValueType();
-            if (value != null) {
+            // Specific value type parsing
-                String valueJson = value.toString();
+            if (TYPE_REPOST.equalsIgnoreCase(valueType)) {
-                if (TYPE_STREAM.equalsIgnoreCase(valueType)) {
+                JSONObject repostedClaimObject = claimObject.getJSONObject("reposted_claim");
-                    claim.setValue(gson.fromJson(valueJson, streamMetadataType));
+                claim.setRepostedClaim(Claim.fromJSONObject(repostedClaimObject));
-                } else if (TYPE_CHANNEL.equalsIgnoreCase(valueType)) {
+            } else {
-                    claim.setValue(gson.fromJson(valueJson, channelMetadataType));
+                JSONObject value = claimObject.getJSONObject("value");
+                if (value != null) {
+                    String valueJson = value.toString();
+                    if (TYPE_STREAM.equalsIgnoreCase(valueType)) {
+                        claim.setValue(gson.fromJson(valueJson, streamMetadataType));
+                    } else if (TYPE_CHANNEL.equalsIgnoreCase(valueType)) {
+                        claim.setValue(gson.fromJson(valueJson, channelMetadataType));
+                    }
                 }
             }
         } catch (JSONException ex) {

app/src/main/java/io/lbry/browser/ui/allcontent/AllContentFragment.java

@@ -376,7 +376,7 @@ public class AllContentFragment extends BaseFragment implements SharedPreference
         boolean canShowMatureContent = sp.getBoolean(MainActivity.PREFERENCE_KEY_SHOW_MATURE_CONTENT, false);
 
         return Lbry.buildClaimSearchOptions(
-                Claim.TYPE_STREAM,
+                null,
                 (currentContentScope == ContentScopeDialogFragment.ITEM_EVERYONE) ? null : tags,
                 canShowMatureContent ? null : new ArrayList<>(Predefined.MATURE_TAGS),
                 null,

app/src/main/java/io/lbry/browser/ui/channel/ChannelContentFragment.java

@@ -203,7 +203,7 @@ public class ChannelContentFragment extends Fragment implements SharedPreference
         boolean canShowMatureContent = sp.getBoolean(MainActivity.PREFERENCE_KEY_SHOW_MATURE_CONTENT, false);
 
         return Lbry.buildClaimSearchOptions(
-                Claim.TYPE_STREAM,
+                null,
                 null,
                 canShowMatureContent ? null : new ArrayList<>(Predefined.MATURE_TAGS),
                 Arrays.asList(channelId),

app/src/main/java/io/lbry/browser/ui/editorschoice/EditorsChoiceFragment.java

@@ -1,6 +1,154 @@
 package io.lbry.browser.ui.editorschoice;
 
+import android.content.Context;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.os.AsyncTask;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ProgressBar;
+
+import androidx.annotation.NonNull;
+import androidx.preference.PreferenceManager;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+import io.lbry.browser.FileViewActivity;
+import io.lbry.browser.MainActivity;
+import io.lbry.browser.R;
+import io.lbry.browser.adapter.ClaimListAdapter;
+import io.lbry.browser.adapter.EditorsChoiceItemAdapter;
+import io.lbry.browser.dialog.ContentScopeDialogFragment;
+import io.lbry.browser.model.Claim;
+import io.lbry.browser.model.EditorsChoiceItem;
+import io.lbry.browser.tasks.ClaimSearchTask;
 import io.lbry.browser.ui.BaseFragment;
+import io.lbry.browser.utils.Helper;
+import io.lbry.browser.utils.Lbry;
+import io.lbry.browser.utils.Predefined;
 
 public class EditorsChoiceFragment extends BaseFragment {
+
+    private static final HashMap<String, String> titleChannelIdsMap = new LinkedHashMap<>();
+    static {
+        titleChannelIdsMap.put("Short Films", "7056f8267188fc49cd3f7162b4115d9e3c8216f6");
+        titleChannelIdsMap.put("Feature-Length Films", "7aad6f36f61da95cb02471fae55f736b28e3bca7");
+        titleChannelIdsMap.put("Documentaries", "d57c606e11462e821d5596430c336b58716193bb");
+        titleChannelIdsMap.put("Episodic Content", "ea5fc1bd3e1335776fe2641a539a47850606d7db");
+    }
+
+    private boolean contentLoading;
+    private ProgressBar loading;
+    private RecyclerView contentList;
+    private EditorsChoiceItemAdapter contentListAdapter;
+
+    public View onCreateView(@NonNull LayoutInflater inflater,
+                             ViewGroup container, Bundle savedInstanceState) {
+        View root = inflater.inflate(R.layout.fragment_editors_choice, container, false);
+
+        loading = root.findViewById(R.id.editors_choice_loading);
+        contentList = root.findViewById(R.id.editors_choice_content_list);
+
+        LinearLayoutManager llm = new LinearLayoutManager(getContext());
+        contentList.setLayoutManager(llm);
+
+        return root;
+    }
+
+    private Map<String, Object> buildContentOptions() {
+        SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(getContext());
+        boolean canShowMatureContent = sp.getBoolean(MainActivity.PREFERENCE_KEY_SHOW_MATURE_CONTENT, false);
+        return Lbry.buildClaimSearchOptions(
+                Claim.TYPE_REPOST,
+                null,
+                null, /*canShowMatureContent ? null : new ArrayList<>(Predefined.MATURE_TAGS),*/
+                new ArrayList<>(titleChannelIdsMap.values()),
+                null,
+                Arrays.asList(Claim.ORDER_BY_RELEASE_TIME),
+                null,
+                1,
+                99);
+    }
+
+    public void onResume() {
+        super.onResume();
+        if (contentListAdapter == null || contentListAdapter.getItemCount() == 0) {
+            fetchClaimSearchContent();
+        } else {
+            if (contentList != null) {
+                contentList.setAdapter(contentListAdapter);
+            }
+        }
+    }
+
+    public void fetchClaimSearchContent() {
+        if (contentLoading) {
+            return;
+        }
+
+        contentLoading = true;
+        ClaimSearchTask task = new ClaimSearchTask(buildContentOptions(), Lbry.LBRY_TV_CONNECTION_STRING, loading, new ClaimSearchTask.ClaimSearchResultHandler() {
+            @Override
+            public void onSuccess(List<Claim> items, boolean hasReachedEnd) {
+                List<EditorsChoiceItem> data = buildDataFromClaims(items);
+                if (contentListAdapter == null) {
+                    contentListAdapter = new EditorsChoiceItemAdapter(data, getContext());
+                    contentListAdapter.setListener(new EditorsChoiceItemAdapter.EditorsChoiceItemListener() {
+                        @Override
+                        public void onEditorsChoiceItemClicked(EditorsChoiceItem item) {
+                            String url = item.getPermanentUrl();
+
+                            Intent intent = new Intent(getContext(), FileViewActivity.class);
+                            intent.putExtra("url", url);
+                            MainActivity.startingFileViewActivity = true;
+                            startActivity(intent);
+                        }
+                    });
+                } else {
+                    contentListAdapter.addItems(data);
+                }
+
+                if (contentList != null && contentList.getAdapter() == null) {
+                    contentList.setAdapter(contentListAdapter);
+                }
+                contentLoading = false;
+            }
+
+            @Override
+            public void onError(Exception error) {
+                contentLoading = false;
+            }
+        });
+        task.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
+    }
+
+    private List<EditorsChoiceItem> buildDataFromClaims(List<Claim> claims) {
+        List<EditorsChoiceItem> data = new ArrayList<>();
+        for (String title : titleChannelIdsMap.keySet()) {
+            EditorsChoiceItem titleItem = new EditorsChoiceItem();
+            titleItem.setTitle(title);
+            titleItem.setHeader(true);
+            data.add(titleItem);
+
+            String channelClaimId = titleChannelIdsMap.get(title);
+            for (Claim c : claims) {
+                if (c.getSigningChannel() != null && channelClaimId.equalsIgnoreCase(c.getSigningChannel().getClaimId())) {
+                    EditorsChoiceItem item = EditorsChoiceItem.fromClaim(
+                            Claim.TYPE_REPOST.equalsIgnoreCase(c.getValueType()) ? c.getRepostedClaim() : c);
+                    data.add(item);
+                }
+            }
+        }
+
+        return data;
+    }
 }

app/src/main/java/io/lbry/browser/ui/following/FollowingFragment.java

@@ -330,6 +330,9 @@ public class FollowingFragment extends BaseFragment implements
         // check if subscriptions exist
         if (suggestedChannelAdapter != null) {
             showSuggestedChannels();
+            if (suggestedChannelGrid != null) {
+                suggestedChannelGrid.setAdapter(suggestedChannelAdapter);
+            }
         }
 
         if (Lbryio.subscriptions != null && Lbryio.subscriptions.size() > 0) {

app/src/main/res/layout/fragment_editors_choice.xml

@@ -1,11 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
+<RelativeLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical">
+    <ProgressBar
+        android:id="@+id/editors_choice_loading"
+        android:layout_width="36dp"
+        android:layout_height="36dp"
+        android:layout_centerInParent="true"
+        android:visibility="gone" />
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/editors_choice_content_list"
+        android:clipToPadding="false"
         android:layout_width="match_parent"
-        android:layout_height="match_parent" />
+        android:layout_height="match_parent"
-</LinearLayout>
+        android:paddingTop="16dp"
+        android:paddingBottom="16dp" />
+</RelativeLayout>

app/src/main/res/layout/list_item_channel.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:paddingLeft="16dp"
@@ -8,71 +8,112 @@
     android:paddingBottom="8dp"
     android:clickable="true"
     android:focusable="true"
+    android:orientation="vertical"
     android:background="?attr/selectableItemBackground">
+    <LinearLayout
+        android:id="@+id/claim_repost_info"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="4dp"
+        android:orientation="horizontal"
+        android:visibility="gone">
+        <io.lbry.browser.ui.controls.SolidIconView
+            android:layout_width="16dp"
+            android:layout_height="12dp"
+            android:layout_gravity="center_vertical"
+            android:textColor="@color/lightForeground"
+            android:textSize="12dp"
+            android:text="@string/fa_repost" />
+        <TextView
+            android:id="@+id/claim_repost_channel"
+            android:background="?attr/selectableItemBackground"
+            android:clickable="true"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:layout_marginLeft="4dp"
+            android:fontFamily="@font/inter"
+            android:textColor="@color/lightForeground"
+            android:textFontWeight="300"
+            android:textSize="12sp" />
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:layout_marginLeft="4dp"
+            android:fontFamily="@font/inter"
+            android:text="@string/reposted"
+            android:textColor="@color/lightForeground"
+            android:textFontWeight="300"
+            android:textSize="12sp" />
+    </LinearLayout>w
     <RelativeLayout
-        android:id="@+id/claim_media_container"
+        android:layout_width="match_parent"
-        android:layout_width="160dp"
+        android:layout_height="wrap_content">
-        android:layout_height="90dp">
-        <ImageView
-            android:layout_centerHorizontal="true"
-            android:id="@+id/claim_thumbnail"
-            android:layout_width="90dp"
-            android:layout_height="90dp" />
         <RelativeLayout
-            android:layout_centerHorizontal="true"
+            android:id="@+id/claim_media_container"
-            android:background="@drawable/bg_channel_icon"
+            android:layout_width="160dp"
-            android:id="@+id/claim_no_thumbnail"
-            android:layout_width="90dp"
             android:layout_height="90dp">
+            <ImageView
+                android:layout_centerHorizontal="true"
+                android:id="@+id/claim_thumbnail"
+                android:layout_width="90dp"
+                android:layout_height="90dp" />
+            <RelativeLayout
+                android:layout_centerHorizontal="true"
+                android:background="@drawable/bg_channel_icon"
+                android:id="@+id/claim_no_thumbnail"
+                android:layout_width="90dp"
+                android:layout_height="90dp">
+                <TextView
+                    android:id="@+id/claim_thumbnail_alpha"
+                    android:layout_centerInParent="true"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:fontFamily="@font/inter"
+                    android:textAllCaps="true"
+                    android:textSize="48sp"
+                    android:textColor="@color/white"
+                    android:textFontWeight="300" />
+            </RelativeLayout>
+        </RelativeLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:layout_centerVertical="true"
+            android:layout_marginLeft="16dp"
+            android:layout_toRightOf="@id/claim_media_container">
             <TextView
-                android:id="@+id/claim_thumbnail_alpha"
+                android:id="@+id/claim_vanity_url"
-                android:layout_centerInParent="true"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:visibility="gone"/>
+            <TextView
+                android:id="@+id/claim_title"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:maxLines="2"
+                android:ellipsize="end"
+                android:fontFamily="@font/inter"
+                android:textSize="14sp"
+                android:textFontWeight="600" />
+            <TextView
+                android:id="@+id/claim_publisher"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textColor="@color/lbryGreen"
+                android:fontFamily="@font/inter"
+                android:textSize="12sp" />
+            <TextView
+                android:id="@+id/claim_publish_time"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:fontFamily="@font/inter"
-                android:textAllCaps="true"
+                android:textSize="11sp"
-                android:textSize="48sp"
-                android:textColor="@color/white"
                 android:textFontWeight="300" />
-        </RelativeLayout>
+            <!-- download progress bar -->
+        </LinearLayout>
     </RelativeLayout>
-
+</LinearLayout>
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:layout_centerVertical="true"
-        android:layout_marginLeft="16dp"
-        android:layout_toRightOf="@id/claim_media_container">
-        <TextView
-            android:id="@+id/claim_vanity_url"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:visibility="gone"/>
-        <TextView
-            android:id="@+id/claim_title"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:maxLines="2"
-            android:ellipsize="end"
-            android:fontFamily="@font/inter"
-            android:textSize="14sp"
-            android:textFontWeight="600" />
-        <TextView
-            android:id="@+id/claim_publisher"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textColor="@color/lbryGreen"
-            android:fontFamily="@font/inter"
-            android:textSize="12sp" />
-        <TextView
-            android:id="@+id/claim_publish_time"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:fontFamily="@font/inter"
-            android:textSize="11sp"
-            android:textFontWeight="300" />
-        <!-- download progress bar -->
-    </LinearLayout>
-
-</RelativeLayout>

app/src/main/res/layout/list_item_editors_choice.xml

@@ -2,26 +2,29 @@
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
+    android:layout_height="wrap_content"
     android:orientation="vertical">
 
     <TextView
         android:id="@+id/editors_choice_header_title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:fontFamily="@font/inter"
-        android:textSize="28sp"
         android:layout_marginLeft="16dp"
         android:layout_marginRight="16dp"
-        android:layout_marginBottom="16dp" />
+        android:layout_marginBottom="16dp"
+        android:fontFamily="@font/inter"
+        android:textSize="24sp"
+        android:textColor="@color/lbryGreen" />
 
     <androidx.cardview.widget.CardView
+        android:id="@+id/editors_choice_content_card"
         android:clickable="true"
         android:foreground="?attr/selectableItemBackground"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginLeft="16dp"
-        android:layout_marginRight="16dp">
+        android:layout_marginRight="16dp"
+        android:layout_marginBottom="16dp">
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
@@ -32,7 +35,8 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:fontFamily="@font/inter"
-                android:textSize="20sp" />
+                android:textSize="18sp"
+                android:singleLine="true" />
 
             <RelativeLayout
                 android:layout_marginTop="8dp"
@@ -41,19 +45,20 @@
                 <ImageView
                     android:id="@+id/editors_choice_content_thumbnail"
                     android:layout_width="160dp"
-                    android:layout_height="90dp"
+                    android:layout_height="120dp"
                     android:layout_centerVertical="true"/>
                 <TextView
                     android:id="@+id/editors_choice_content_description"
                     android:layout_toRightOf="@id/editors_choice_content_thumbnail"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginLeft="8dp"
+                    android:layout_marginLeft="16dp"
+                    android:layout_centerVertical="true"
                     android:fontFamily="@font/inter"
                     android:ellipsize="end"
                     android:maxLines="6"
                     android:textFontWeight="300"
-                    android:textSize="14sp" />
+                    android:textSize="12sp" />
             </RelativeLayout>
         </LinearLayout>
     </androidx.cardview.widget.CardView>

app/src/main/res/layout/list_item_featured_search_result.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:paddingLeft="16dp"
@@ -8,93 +8,130 @@
     android:paddingBottom="8dp"
     android:clickable="true"
     android:focusable="true"
+    android:orientation="vertical"
     android:background="@android:color/black">
+    <LinearLayout
+        android:id="@+id/claim_repost_info"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:visibility="gone">
+        <io.lbry.browser.ui.controls.SolidIconView
+            android:layout_width="20dp"
+            android:layout_height="20dp"
+            android:textSize="18dp"
+            android:layout_gravity="center_vertical"
+            android:text="@string/fa_repost" />
+        <TextView
+            android:id="@+id/claim_repost_channel"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:layout_marginLeft="4dp"
+            android:clickable="true"
+            android:fontFamily="@font/inter"
+            android:textFontWeight="300"
+            android:textSize="12sp" />
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:layout_marginLeft="4dp"
+            android:fontFamily="@font/inter"
+            android:text="@string/reposted"
+            android:textSize="12sp"
+            android:textFontWeight="300"
+            />
+    </LinearLayout>
     <RelativeLayout
-        android:id="@+id/claim_media_container"
+        android:layout_width="match_parent"
-        android:layout_width="160dp"
+        android:layout_height="wrap_content">
-        android:layout_height="90dp">
         <RelativeLayout
-            android:layout_centerHorizontal="true"
+            android:id="@+id/claim_media_container"
-            android:background="@drawable/bg_thumbnail_icon"
+            android:layout_width="160dp"
-            android:id="@+id/claim_no_thumbnail"
+            android:layout_height="90dp">
-            android:layout_width="match_parent"
+            <RelativeLayout
-            android:layout_height="match_parent">
+                android:layout_centerHorizontal="true"
+                android:background="@drawable/bg_thumbnail_icon"
+                android:id="@+id/claim_no_thumbnail"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent">
+                <TextView
+                    android:id="@+id/claim_thumbnail_alpha"
+                    android:layout_centerInParent="true"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:fontFamily="@font/inter"
+                    android:textAllCaps="true"
+                    android:textSize="24sp"
+                    android:singleLine="true"
+                    android:textColor="@color/white"
+                    android:textFontWeight="300" />
+            </RelativeLayout>
+            <ImageView
+                android:id="@+id/claim_thumbnail"
+                android:layout_width="160dp"
+                android:layout_height="90dp" />
             <TextView
-                android:id="@+id/claim_thumbnail_alpha"
+                android:background="@android:color/black"
-                android:layout_centerInParent="true"
+                android:id="@+id/claim_duration"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentBottom="true"
+                android:layout_alignParentRight="true"
+                android:layout_marginRight="4dp"
+                android:layout_marginBottom="4dp"
+                android:fontFamily="@font/inter"
+                android:textColor="@android:color/white"
+                android:textSize="10sp"
+                android:textFontWeight="300"
+                android:padding="2dp"
+                android:visibility="gone" />
+        </RelativeLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:layout_marginLeft="16dp"
+            android:layout_toRightOf="@id/claim_media_container">
+            <TextView
+                android:id="@+id/claim_vanity_url"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:fontFamily="@font/inter"
-                android:textAllCaps="true"
-                android:textSize="24sp"
                 android:singleLine="true"
-                android:textColor="@color/white"
+                android:ellipsize="end"
+                android:textColor="@android:color/white"
+                android:textSize="18sp"
+                android:textFontWeight="600" />
+            <TextView
+                android:id="@+id/claim_title"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:maxLines="2"
+                android:ellipsize="end"
+                android:fontFamily="@font/inter"
+                android:textColor="@android:color/white"
+                android:textSize="14sp"
+                android:textFontWeight="600" />
+            <TextView
+                android:id="@+id/claim_publisher"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textColor="@color/lbryGreen"
+                android:fontFamily="@font/inter"
+                android:textSize="12sp" />
+            <TextView
+                android:id="@+id/claim_publish_time"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:fontFamily="@font/inter"
+                android:textColor="@android:color/white"
+                android:textSize="11sp"
                 android:textFontWeight="300" />
-        </RelativeLayout>
+
-        <ImageView
+            <!-- download progress bar -->
-            android:id="@+id/claim_thumbnail"
+        </LinearLayout>
-            android:layout_width="160dp"
-            android:layout_height="90dp" />
-        <TextView
-            android:background="@android:color/black"
-            android:id="@+id/claim_duration"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentBottom="true"
-            android:layout_alignParentRight="true"
-            android:layout_marginRight="4dp"
-            android:layout_marginBottom="4dp"
-            android:fontFamily="@font/inter"
-            android:textColor="@android:color/white"
-            android:textSize="10sp"
-            android:textFontWeight="300"
-            android:padding="2dp"
-            android:visibility="gone" />
     </RelativeLayout>
-
+</LinearLayout>
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:layout_marginLeft="16dp"
-        android:layout_toRightOf="@id/claim_media_container">
-        <TextView
-            android:id="@+id/claim_vanity_url"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:fontFamily="@font/inter"
-            android:singleLine="true"
-            android:ellipsize="end"
-            android:textColor="@android:color/white"
-            android:textSize="18sp"
-            android:textFontWeight="600" />
-        <TextView
-            android:id="@+id/claim_title"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:maxLines="2"
-            android:ellipsize="end"
-            android:fontFamily="@font/inter"
-            android:textColor="@android:color/white"
-            android:textSize="14sp"
-            android:textFontWeight="600" />
-        <TextView
-            android:id="@+id/claim_publisher"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textColor="@color/lbryGreen"
-            android:fontFamily="@font/inter"
-            android:textSize="12sp" />
-        <TextView
-            android:id="@+id/claim_publish_time"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:fontFamily="@font/inter"
-            android:textColor="@android:color/white"
-            android:textSize="11sp"
-            android:textFontWeight="300" />
-
-        <!-- download progress bar -->
-    </LinearLayout>
-
-</RelativeLayout>

app/src/main/res/layout/list_item_stream.xml

@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:orientation="vertical"
     android:paddingLeft="16dp"
     android:paddingRight="16dp"
     android:paddingTop="8dp"
@@ -9,87 +10,127 @@
     android:clickable="true"
     android:focusable="true"
     android:background="?attr/selectableItemBackground">
-    <RelativeLayout
-        android:id="@+id/claim_media_container"
-        android:layout_width="160dp"
-        android:layout_height="90dp">
-        <RelativeLayout
-            android:layout_centerHorizontal="true"
-            android:background="@drawable/bg_thumbnail_icon"
-            android:id="@+id/claim_no_thumbnail"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent">
-            <TextView
-                android:id="@+id/claim_thumbnail_alpha"
-                android:layout_centerInParent="true"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:fontFamily="@font/inter"
-                android:textAllCaps="true"
-                android:textSize="24sp"
-                android:singleLine="true"
-                android:textColor="@color/white"
-                android:textFontWeight="300" />
-        </RelativeLayout>
-        <ImageView
-            android:id="@+id/claim_thumbnail"
-            android:layout_width="160dp"
-            android:layout_height="90dp" />
-        <TextView
-            android:background="@android:color/black"
-            android:id="@+id/claim_duration"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentBottom="true"
-            android:layout_alignParentRight="true"
-            android:layout_marginRight="4dp"
-            android:layout_marginBottom="4dp"
-            android:fontFamily="@font/inter"
-            android:textColor="@android:color/white"
-            android:textSize="10sp"
-            android:textFontWeight="300"
-            android:padding="2dp"
-            android:visibility="gone" />
-    </RelativeLayout>
-
     <LinearLayout
+        android:id="@+id/claim_repost_info"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="vertical"
+        android:layout_marginBottom="4dp"
-        android:layout_marginLeft="16dp"
+        android:orientation="horizontal"
-        android:layout_toRightOf="@id/claim_media_container">
+        android:visibility="gone">
+        <io.lbry.browser.ui.controls.SolidIconView
+            android:layout_width="16dp"
+            android:layout_height="12dp"
+            android:layout_gravity="center_vertical"
+            android:textColor="@color/lightForeground"
+            android:textSize="12dp"
+            android:text="@string/fa_repost" />
         <TextView
-            android:id="@+id/claim_vanity_url"
+            android:id="@+id/claim_repost_channel"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:visibility="gone" />
-        <TextView
-            android:id="@+id/claim_title"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:maxLines="2"
-            android:ellipsize="end"
-            android:fontFamily="@font/inter"
-            android:textSize="14sp"
-            android:textFontWeight="600" />
-        <TextView
-            android:id="@+id/claim_publisher"
             android:background="?attr/selectableItemBackground"
             android:clickable="true"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:textColor="@color/lbryGreen"
+            android:layout_gravity="center_vertical"
+            android:layout_marginLeft="4dp"
             android:fontFamily="@font/inter"
+            android:textColor="@color/lightForeground"
+            android:textFontWeight="300"
             android:textSize="12sp" />
         <TextView
-            android:id="@+id/claim_publish_time"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:layout_marginLeft="4dp"
             android:fontFamily="@font/inter"
-            android:textSize="11sp"
+            android:text="@string/reposted"
-            android:textFontWeight="300" />
+            android:textColor="@color/lightForeground"
-
+            android:textFontWeight="300"
-        <!-- download progress bar -->
+            android:textSize="12sp" />
     </LinearLayout>
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+        <RelativeLayout
+            android:id="@+id/claim_media_container"
+            android:layout_width="160dp"
+            android:layout_height="90dp">
+            <RelativeLayout
+                android:layout_centerHorizontal="true"
+                android:background="@drawable/bg_thumbnail_icon"
+                android:id="@+id/claim_no_thumbnail"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent">
+                <TextView
+                    android:id="@+id/claim_thumbnail_alpha"
+                    android:layout_centerInParent="true"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:fontFamily="@font/inter"
+                    android:textAllCaps="true"
+                    android:textSize="24sp"
+                    android:singleLine="true"
+                    android:textColor="@color/white"
+                    android:textFontWeight="300" />
+            </RelativeLayout>
+            <ImageView
+                android:id="@+id/claim_thumbnail"
+                android:layout_width="160dp"
+                android:layout_height="90dp" />
+            <TextView
+                android:background="@android:color/black"
+                android:id="@+id/claim_duration"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentBottom="true"
+                android:layout_alignParentRight="true"
+                android:layout_marginRight="4dp"
+                android:layout_marginBottom="4dp"
+                android:fontFamily="@font/inter"
+                android:textColor="@android:color/white"
+                android:textSize="10sp"
+                android:textFontWeight="300"
+                android:padding="2dp"
+                android:visibility="gone" />
+        </RelativeLayout>
 
-</RelativeLayout>
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:layout_marginLeft="16dp"
+            android:layout_toRightOf="@id/claim_media_container">
+            <TextView
+                android:id="@+id/claim_vanity_url"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:visibility="gone" />
+            <TextView
+                android:id="@+id/claim_title"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:maxLines="2"
+                android:ellipsize="end"
+                android:fontFamily="@font/inter"
+                android:textSize="14sp"
+                android:textFontWeight="600" />
+            <TextView
+                android:id="@+id/claim_publisher"
+                android:background="?attr/selectableItemBackground"
+                android:clickable="true"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textColor="@color/lbryGreen"
+                android:fontFamily="@font/inter"
+                android:textSize="12sp" />
+            <TextView
+                android:id="@+id/claim_publish_time"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:fontFamily="@font/inter"
+                android:textSize="11sp"
+                android:textFontWeight="300" />
+
+            <!-- download progress bar -->
+        </LinearLayout>
+    </RelativeLayout>
+</LinearLayout>

app/src/main/res/values-night/colors.xml

@@ -13,7 +13,9 @@
     <color name="selectedNavItem">#0E0E0E</color>
     <color name="channelCoverBackground">#CC000000</color>
 
+    <!-- At some point, these colours have to be renamed -->
     <color name="darkForeground">#EEEEEE</color>
+    <color name="lightForeground">#555555</color>
     <color name="foreground">#999999</color>
     <color name="mediaContainerBackground">#333333</color>
     <color name="borderTextArea">#5F5F5F</color>

app/src/main/res/values/colors.xml

@@ -14,6 +14,7 @@
     <color name="channelCoverBackground">#CC000000</color>
 
     <color name="darkForeground">#222222</color>
+    <color name="lightForeground">#AAAAAA</color>
     <color name="foreground">#333333</color>
     <color name="mediaContainerBackground">#333333</color>
     <color name="borderTextArea">#777777</color>

app/src/main/res/values/strings.xml

@@ -66,6 +66,7 @@
     <string name="no_channel_info">There\'s nothing here yet.\nPlease check back later.</string>
     <string name="content">Content</string>
     <string name="website">Website</string>
+    <string name="reposted">reposted</string>
 
     <!-- Settings -->
     <string name="user_interface">Content &amp; User interface</string>
@@ -228,4 +229,5 @@
     <string name="fa_user_friends">&#xf500;</string>
     <string name="fa_cog">&#xf013;</string>
     <string name="fa_mobile_alt">&#xf3cd;</string>
+    <string name="fa_repost">&#xf079;</string>
 </resources>