From 58b9efb24c7bdd41d9aaa044674c4b3da9a9f73d Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Mon, 10 Apr 2017 13:53:40 -0300
Subject: [PATCH] Open feed's blog when clicking it in 'manage activity'
---
.../briar/android/blog/RssFeedAdapter.java | 17 ++++++++++++++---
.../android/blog/RssFeedManageActivity.java | 9 +++++++++
.../src/main/res/layout/list_item_rss_feed.xml | 2 +-
3 files changed, 24 insertions(+), 4 deletions(-)
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 3052e3694f..e55dcef305 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 56f948f4b7..8525f1f653 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 76e0978a77..183dfc3b0c 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"
--
GitLab