diff --git a/briar-android/src/main/java/org/briarproject/briar/android/blog/RssFeedAdapter.java b/briar-android/src/main/java/org/briarproject/briar/android/blog/RssFeedAdapter.java index 3052e3694f22d42ac3001d3c3e7208b93b0fc9b8..e55dcef305010fad609953d47d0b15d36b6c2639 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/blog/RssFeedAdapter.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/blog/RssFeedAdapter.java @@ -6,7 +6,7 @@ import android.view.LayoutInflater; import android.view.View; import android.view.View.OnClickListener; import android.view.ViewGroup; -import android.widget.ImageView; +import android.widget.ImageButton; import android.widget.TextView; import org.briarproject.briar.R; @@ -75,6 +75,14 @@ class RssFeedAdapter extends BriarAdapter<Feed, RssFeedAdapter.FeedViewHolder> { } else { ui.description.setVisibility(GONE); } + + // Open feed's blog when clicked + ui.layout.setOnClickListener(new OnClickListener() { + @Override + public void onClick(View v) { + listener.onFeedClick(item); + } + }); } @Override @@ -99,8 +107,9 @@ class RssFeedAdapter extends BriarAdapter<Feed, RssFeedAdapter.FeedViewHolder> { } static class FeedViewHolder extends RecyclerView.ViewHolder { + private final View layout; private final TextView title; - private final ImageView delete; + private final ImageButton delete; private final TextView imported; private final TextView updated; private final TextView author; @@ -110,8 +119,9 @@ class RssFeedAdapter extends BriarAdapter<Feed, RssFeedAdapter.FeedViewHolder> { private FeedViewHolder(View v) { super(v); + layout = v; title = (TextView) v.findViewById(R.id.titleView); - delete = (ImageView) v.findViewById(R.id.deleteButton); + delete = (ImageButton) v.findViewById(R.id.deleteButton); imported = (TextView) v.findViewById(R.id.importedView); updated = (TextView) v.findViewById(R.id.updatedView); author = (TextView) v.findViewById(R.id.authorView); @@ -121,6 +131,7 @@ class RssFeedAdapter extends BriarAdapter<Feed, RssFeedAdapter.FeedViewHolder> { } interface RssFeedListener { + void onFeedClick(Feed feed); void onDeleteClick(Feed feed); } diff --git a/briar-android/src/main/java/org/briarproject/briar/android/blog/RssFeedManageActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/blog/RssFeedManageActivity.java index 56f948f4b7d51297ba531bf9f05fe2ab8cc05a4b..8525f1f653f5e1547612504624567664b1cea465 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/blog/RssFeedManageActivity.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/blog/RssFeedManageActivity.java @@ -24,6 +24,7 @@ import java.util.logging.Logger; import javax.inject.Inject; +import static android.content.Intent.FLAG_ACTIVITY_CLEAR_TOP; import static android.support.design.widget.Snackbar.LENGTH_LONG; import static java.util.logging.Level.WARNING; @@ -93,6 +94,14 @@ public class RssFeedManageActivity extends BriarActivity component.inject(this); } + @Override + public void onFeedClick(Feed feed) { + Intent i = new Intent(this, BlogActivity.class); + i.putExtra(GROUP_ID, feed.getBlogId().getBytes()); + i.setFlags(FLAG_ACTIVITY_CLEAR_TOP); + startActivity(i); + } + @Override public void onDeleteClick(final Feed feed) { DialogInterface.OnClickListener okListener = diff --git a/briar-android/src/main/res/layout/list_item_rss_feed.xml b/briar-android/src/main/res/layout/list_item_rss_feed.xml index 76e0978a7719b623ca4b55d248eea69d87da8b14..183dfc3b0c4faea28ba30dc4e0ca7203c0052db9 100644 --- a/briar-android/src/main/res/layout/list_item_rss_feed.xml +++ b/briar-android/src/main/res/layout/list_item_rss_feed.xml @@ -19,7 +19,7 @@ android:textSize="@dimen/text_size_medium" tools:text="This is a name of a RSS Feed"/> - <ImageView + <ImageButton android:id="@+id/deleteButton" android:layout_width="wrap_content" android:layout_height="wrap_content"