mirror of
https://code.briarproject.org/briar/briar.git
synced 2026-02-21 07:09:56 +01:00
Merge branch '517-simple-ui-for-managing-rss-feeds' into 'master'
Simple UI for Managing and Importing RSS Feeds Please note that this does not yet include the reblogging style for displaying imported RSS entries.    Closes #517 See merge request !251
This commit is contained in:
@@ -182,6 +182,27 @@
|
|||||||
/>
|
/>
|
||||||
</activity>
|
</activity>
|
||||||
|
|
||||||
|
<activity
|
||||||
|
android:name=".android.blogs.RssFeedImportActivity"
|
||||||
|
android:label="@string/blogs_rss_feeds_import"
|
||||||
|
android:parentActivityName=".android.NavDrawerActivity"
|
||||||
|
android:windowSoftInputMode="stateVisible|adjustResize">
|
||||||
|
<meta-data
|
||||||
|
android:name="android.support.PARENT_ACTIVITY"
|
||||||
|
android:value=".android.NavDrawerActivity"
|
||||||
|
/>
|
||||||
|
</activity>
|
||||||
|
|
||||||
|
<activity
|
||||||
|
android:name=".android.blogs.RssFeedManageActivity"
|
||||||
|
android:label="@string/blogs_rss_feeds_manage"
|
||||||
|
android:parentActivityName=".android.NavDrawerActivity">
|
||||||
|
<meta-data
|
||||||
|
android:name="android.support.PARENT_ACTIVITY"
|
||||||
|
android:value=".android.NavDrawerActivity"
|
||||||
|
/>
|
||||||
|
</activity>
|
||||||
|
|
||||||
<activity
|
<activity
|
||||||
android:name=".android.identity.CreateIdentityActivity"
|
android:name=".android.identity.CreateIdentityActivity"
|
||||||
android:label="@string/new_identity_title"
|
android:label="@string/new_identity_title"
|
||||||
|
|||||||
10
briar-android/res/drawable/action_delete_black.xml
Normal file
10
briar-android/res/drawable/action_delete_black.xml
Normal file
@@ -0,0 +1,10 @@
|
|||||||
|
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
android:width="24dp"
|
||||||
|
android:height="24dp"
|
||||||
|
android:alpha="0.56"
|
||||||
|
android:viewportHeight="24.0"
|
||||||
|
android:viewportWidth="24.0">
|
||||||
|
<path
|
||||||
|
android:fillColor="#000000"
|
||||||
|
android:pathData="M6,19c0,1.1 0.9,2 2,2h8c1.1,0 2,-0.9 2,-2V7H6v12zM19,4h-3.5l-1,-1h-5l-1,1H5v2h14V4z"/>
|
||||||
|
</vector>
|
||||||
34
briar-android/res/layout/activity_rss_feed_import.xml
Normal file
34
briar-android/res/layout/activity_rss_feed_import.xml
Normal file
@@ -0,0 +1,34 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<LinearLayout
|
||||||
|
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
xmlns:tools="http://schemas.android.com/tools"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent"
|
||||||
|
android:orientation="vertical"
|
||||||
|
android:padding="@dimen/margin_small"
|
||||||
|
tools:context=".android.blogs.RssFeedImportActivity">
|
||||||
|
|
||||||
|
<EditText
|
||||||
|
android:id="@+id/urlInput"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="0dp"
|
||||||
|
android:layout_weight="1"
|
||||||
|
android:gravity="top"
|
||||||
|
android:hint="@string/blogs_rss_feeds_import_hint"
|
||||||
|
android:inputType="textMultiLine|textUri"/>
|
||||||
|
|
||||||
|
<Button
|
||||||
|
android:id="@+id/importButton"
|
||||||
|
style="@style/BriarButton"
|
||||||
|
android:enabled="false"
|
||||||
|
android:text="@string/blogs_rss_feeds_import_button"/>
|
||||||
|
|
||||||
|
<ProgressBar
|
||||||
|
android:id="@+id/progressBar"
|
||||||
|
style="?android:attr/progressBarStyle"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_gravity="center"
|
||||||
|
android:visibility="gone"/>
|
||||||
|
|
||||||
|
</LinearLayout>
|
||||||
11
briar-android/res/layout/activity_rss_feed_manage.xml
Normal file
11
briar-android/res/layout/activity_rss_feed_manage.xml
Normal file
@@ -0,0 +1,11 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<org.briarproject.android.util.BriarRecyclerView
|
||||||
|
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
xmlns:tools="http://schemas.android.com/tools"
|
||||||
|
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||||
|
android:id="@+id/feedList"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent"
|
||||||
|
app:scrollToEnd="false"
|
||||||
|
app:emptyText="@string/blogs_rss_feeds_manage_empty_state"
|
||||||
|
tools:listitem="@layout/list_item_rss_feed"/>
|
||||||
123
briar-android/res/layout/list_item_rss_feed.xml
Normal file
123
briar-android/res/layout/list_item_rss_feed.xml
Normal file
@@ -0,0 +1,123 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<RelativeLayout
|
||||||
|
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
xmlns:tools="http://schemas.android.com/tools"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginLeft="@dimen/listitem_horizontal_margin"
|
||||||
|
android:layout_marginStart="@dimen/listitem_horizontal_margin"
|
||||||
|
android:layout_marginTop="@dimen/listitem_horizontal_margin"
|
||||||
|
android:background="?attr/selectableItemBackground">
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/titleView"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_alignParentTop="true"
|
||||||
|
android:maxLines="2"
|
||||||
|
android:textColor="@color/briar_text_primary"
|
||||||
|
android:textSize="@dimen/text_size_medium"
|
||||||
|
tools:text="This is a name of a RSS Feed"/>
|
||||||
|
|
||||||
|
<ImageView
|
||||||
|
android:id="@+id/deleteButton"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_alignParentRight="true"
|
||||||
|
android:layout_alignParentTop="true"
|
||||||
|
android:layout_marginEnd="@dimen/listitem_horizontal_margin"
|
||||||
|
android:layout_marginRight="@dimen/listitem_horizontal_margin"
|
||||||
|
android:contentDescription="@string/delete_button"
|
||||||
|
android:src="@drawable/action_delete_black"/>
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/author"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_below="@+id/titleView"
|
||||||
|
android:layout_marginRight="@dimen/margin_small"
|
||||||
|
android:paddingTop="@dimen/margin_tiny"
|
||||||
|
android:text="@string/blogs_rss_feeds_manage_author"
|
||||||
|
android:textColor="@color/briar_text_secondary"
|
||||||
|
android:textSize="@dimen/text_size_small"/>
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/authorView"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_alignBottom="@+id/author"
|
||||||
|
android:layout_marginEnd="@dimen/listitem_horizontal_margin"
|
||||||
|
android:layout_marginRight="@dimen/listitem_horizontal_margin"
|
||||||
|
android:layout_toRightOf="@+id/author"
|
||||||
|
android:textColor="@color/briar_text_secondary"
|
||||||
|
android:textSize="@dimen/text_size_small"
|
||||||
|
tools:text="Bruce Schneier"/>
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/imported"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_below="@+id/author"
|
||||||
|
android:layout_marginRight="@dimen/margin_small"
|
||||||
|
android:paddingTop="@dimen/margin_tiny"
|
||||||
|
android:text="@string/blogs_rss_feeds_manage_imported"
|
||||||
|
android:textColor="@color/briar_text_secondary"
|
||||||
|
android:textSize="@dimen/text_size_small"/>
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/importedView"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_alignBottom="@+id/imported"
|
||||||
|
android:layout_marginEnd="@dimen/listitem_horizontal_margin"
|
||||||
|
android:layout_marginRight="@dimen/listitem_horizontal_margin"
|
||||||
|
android:layout_toRightOf="@+id/imported"
|
||||||
|
android:textColor="@color/briar_text_secondary"
|
||||||
|
android:textSize="@dimen/text_size_small"
|
||||||
|
tools:text="July 4"/>
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/updated"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_below="@+id/imported"
|
||||||
|
android:layout_marginEnd="@dimen/listitem_horizontal_margin"
|
||||||
|
android:layout_marginRight="@dimen/margin_small"
|
||||||
|
android:paddingTop="@dimen/margin_tiny"
|
||||||
|
android:text="@string/blogs_rss_feeds_manage_updated"
|
||||||
|
android:textColor="@color/briar_text_secondary"
|
||||||
|
android:textSize="@dimen/text_size_small"/>
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/updatedView"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_alignBottom="@+id/updated"
|
||||||
|
android:layout_marginEnd="@dimen/listitem_horizontal_margin"
|
||||||
|
android:layout_marginRight="@dimen/listitem_horizontal_margin"
|
||||||
|
android:layout_toRightOf="@+id/updated"
|
||||||
|
android:textColor="@color/briar_text_secondary"
|
||||||
|
android:textSize="@dimen/text_size_small"
|
||||||
|
tools:text="5 min. ago"/>
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/descriptionView"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_below="@+id/updated"
|
||||||
|
android:layout_marginEnd="@dimen/listitem_horizontal_margin"
|
||||||
|
android:layout_marginRight="@dimen/listitem_horizontal_margin"
|
||||||
|
android:paddingTop="@dimen/margin_medium"
|
||||||
|
android:textColor="@color/briar_text_secondary"
|
||||||
|
android:textSize="@dimen/text_size_small"
|
||||||
|
tools:text="This is a description of the RSS feed. It can be several lines long, but it can also not exist at all if it is not present in the feed itself."/>
|
||||||
|
|
||||||
|
<View
|
||||||
|
style="@style/Divider.ForumList"
|
||||||
|
android:layout_alignParentLeft="true"
|
||||||
|
android:layout_alignParentStart="true"
|
||||||
|
android:layout_below="@+id/descriptionView"
|
||||||
|
android:layout_marginTop="@dimen/listitem_horizontal_margin"/>
|
||||||
|
|
||||||
|
</RelativeLayout>
|
||||||
|
|
||||||
@@ -9,4 +9,14 @@
|
|||||||
android:title="@string/blogs_write_blog_post"
|
android:title="@string/blogs_write_blog_post"
|
||||||
app:showAsAction="always"/>
|
app:showAsAction="always"/>
|
||||||
|
|
||||||
|
<item
|
||||||
|
android:id="@+id/action_rss_feeds_import"
|
||||||
|
android:title="@string/blogs_rss_feeds_import"
|
||||||
|
app:showAsAction="never"/>
|
||||||
|
|
||||||
|
<item
|
||||||
|
android:id="@+id/action_rss_feeds_manage"
|
||||||
|
android:title="@string/blogs_rss_feeds_manage"
|
||||||
|
app:showAsAction="never"/>
|
||||||
|
|
||||||
</menu>
|
</menu>
|
||||||
12
briar-android/res/menu/rss_feed_manage_actions.xml
Normal file
12
briar-android/res/menu/rss_feed_manage_actions.xml
Normal file
@@ -0,0 +1,12 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<menu
|
||||||
|
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||||
|
|
||||||
|
<item
|
||||||
|
android:id="@+id/action_rss_feeds_import"
|
||||||
|
android:icon="@drawable/ic_add_white"
|
||||||
|
android:title="@string/blogs_rss_feeds_import"
|
||||||
|
app:showAsAction="always"/>
|
||||||
|
|
||||||
|
</menu>
|
||||||
@@ -2,6 +2,7 @@
|
|||||||
<resources>
|
<resources>
|
||||||
<declare-styleable name="BriarRecyclerView">
|
<declare-styleable name="BriarRecyclerView">
|
||||||
<attr name="scrollToEnd" format="boolean" />
|
<attr name="scrollToEnd" format="boolean" />
|
||||||
|
<attr name="emptyText" format="string" />
|
||||||
</declare-styleable>
|
</declare-styleable>
|
||||||
|
|
||||||
</resources>
|
</resources>
|
||||||
@@ -309,4 +309,17 @@
|
|||||||
<string name="blogs_available_blogs">Available Blogs</string>
|
<string name="blogs_available_blogs">Available Blogs</string>
|
||||||
<string name="blogs_drafts">Drafts</string>
|
<string name="blogs_drafts">Drafts</string>
|
||||||
|
|
||||||
|
<!-- RSS Feeds -->
|
||||||
|
<string name="blogs_rss_feeds_import">Import RSS Feed</string>
|
||||||
|
<string name="blogs_rss_feeds_import_button">Import</string>
|
||||||
|
<string name="blogs_rss_feeds_import_hint">Enter the URL of the RSS feed</string>
|
||||||
|
<string name="blogs_rss_feeds_import_error">We are sorry! There was an error importing your feed.</string>
|
||||||
|
<string name="blogs_rss_feeds_manage">Manage RSS Feeds</string>
|
||||||
|
<string name="blogs_rss_feeds_manage_imported">Imported:</string>
|
||||||
|
<string name="blogs_rss_feeds_manage_author">Author:</string>
|
||||||
|
<string name="blogs_rss_feeds_manage_updated">Last Updated:</string>
|
||||||
|
<string name="blogs_rss_feeds_manage_delete_error">The feed could not be deleted!</string>
|
||||||
|
<string name="blogs_rss_feeds_manage_empty_state">You haven\'t imported any RSS feeds.\n\nWhy don\'t you click the plus in the top right screen corner to add your first?</string>
|
||||||
|
<string name="blogs_rss_feeds_manage_error">There was a problem loading your feeds. Please try again later.</string>
|
||||||
|
|
||||||
</resources>
|
</resources>
|
||||||
|
|||||||
@@ -10,6 +10,8 @@ import org.briarproject.android.blogs.BlogsFragment;
|
|||||||
import org.briarproject.android.blogs.CreateBlogActivity;
|
import org.briarproject.android.blogs.CreateBlogActivity;
|
||||||
import org.briarproject.android.blogs.FeedFragment;
|
import org.briarproject.android.blogs.FeedFragment;
|
||||||
import org.briarproject.android.blogs.MyBlogsFragment;
|
import org.briarproject.android.blogs.MyBlogsFragment;
|
||||||
|
import org.briarproject.android.blogs.RssFeedImportActivity;
|
||||||
|
import org.briarproject.android.blogs.RssFeedManageActivity;
|
||||||
import org.briarproject.android.blogs.WriteBlogPostActivity;
|
import org.briarproject.android.blogs.WriteBlogPostActivity;
|
||||||
import org.briarproject.android.contact.ContactListFragment;
|
import org.briarproject.android.contact.ContactListFragment;
|
||||||
import org.briarproject.android.contact.ConversationActivity;
|
import org.briarproject.android.contact.ConversationActivity;
|
||||||
@@ -87,6 +89,10 @@ public interface ActivityComponent {
|
|||||||
|
|
||||||
void inject(IntroductionActivity activity);
|
void inject(IntroductionActivity activity);
|
||||||
|
|
||||||
|
void inject(RssFeedImportActivity activity);
|
||||||
|
|
||||||
|
void inject(RssFeedManageActivity activity);
|
||||||
|
|
||||||
// Fragments
|
// Fragments
|
||||||
void inject(ContactListFragment fragment);
|
void inject(ContactListFragment fragment);
|
||||||
void inject(ForumListFragment fragment);
|
void inject(ForumListFragment fragment);
|
||||||
|
|||||||
@@ -16,6 +16,7 @@ import org.briarproject.api.crypto.PasswordStrengthEstimator;
|
|||||||
import org.briarproject.api.db.DatabaseConfig;
|
import org.briarproject.api.db.DatabaseConfig;
|
||||||
import org.briarproject.api.db.DatabaseExecutor;
|
import org.briarproject.api.db.DatabaseExecutor;
|
||||||
import org.briarproject.api.event.EventBus;
|
import org.briarproject.api.event.EventBus;
|
||||||
|
import org.briarproject.api.feed.FeedManager;
|
||||||
import org.briarproject.api.forum.ForumManager;
|
import org.briarproject.api.forum.ForumManager;
|
||||||
import org.briarproject.api.forum.ForumPostFactory;
|
import org.briarproject.api.forum.ForumPostFactory;
|
||||||
import org.briarproject.api.forum.ForumSharingManager;
|
import org.briarproject.api.forum.ForumSharingManager;
|
||||||
@@ -112,6 +113,8 @@ public interface AndroidComponent extends CoreEagerSingletons {
|
|||||||
|
|
||||||
AndroidExecutor androidExecutor();
|
AndroidExecutor androidExecutor();
|
||||||
|
|
||||||
|
FeedManager feedManager();
|
||||||
|
|
||||||
@IoExecutor
|
@IoExecutor
|
||||||
Executor ioExecutor();
|
Executor ioExecutor();
|
||||||
|
|
||||||
|
|||||||
@@ -140,20 +140,31 @@ public class FeedFragment extends BaseFragment implements
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean onOptionsItemSelected(final MenuItem item) {
|
public boolean onOptionsItemSelected(final MenuItem item) {
|
||||||
|
if (personalBlog == null) return false;
|
||||||
|
ActivityOptionsCompat options =
|
||||||
|
makeCustomAnimation(getActivity(), android.R.anim.slide_in_left,
|
||||||
|
android.R.anim.slide_out_right);
|
||||||
switch (item.getItemId()) {
|
switch (item.getItemId()) {
|
||||||
case R.id.action_write_blog_post:
|
case R.id.action_write_blog_post:
|
||||||
if (personalBlog == null) return false;
|
Intent i1 =
|
||||||
Intent i =
|
|
||||||
new Intent(getActivity(), WriteBlogPostActivity.class);
|
new Intent(getActivity(), WriteBlogPostActivity.class);
|
||||||
i.putExtra(GROUP_ID, personalBlog.getId().getBytes());
|
i1.putExtra(GROUP_ID, personalBlog.getId().getBytes());
|
||||||
i.putExtra(BLOG_NAME, personalBlog.getName());
|
i1.putExtra(BLOG_NAME, personalBlog.getName());
|
||||||
ActivityOptionsCompat options =
|
startActivityForResult(i1, REQUEST_WRITE_POST,
|
||||||
makeCustomAnimation(getActivity(),
|
|
||||||
android.R.anim.slide_in_left,
|
|
||||||
android.R.anim.slide_out_right);
|
|
||||||
startActivityForResult(i, REQUEST_WRITE_POST,
|
|
||||||
options.toBundle());
|
options.toBundle());
|
||||||
return true;
|
return true;
|
||||||
|
case R.id.action_rss_feeds_import:
|
||||||
|
Intent i2 =
|
||||||
|
new Intent(getActivity(), RssFeedImportActivity.class);
|
||||||
|
i2.putExtra(GROUP_ID, personalBlog.getId().getBytes());
|
||||||
|
startActivity(i2, options.toBundle());
|
||||||
|
return true;
|
||||||
|
case R.id.action_rss_feeds_manage:
|
||||||
|
Intent i3 =
|
||||||
|
new Intent(getActivity(), RssFeedManageActivity.class);
|
||||||
|
i3.putExtra(GROUP_ID, personalBlog.getId().getBytes());
|
||||||
|
startActivity(i3, options.toBundle());
|
||||||
|
return true;
|
||||||
default:
|
default:
|
||||||
return super.onOptionsItemSelected(item);
|
return super.onOptionsItemSelected(item);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,192 @@
|
|||||||
|
package org.briarproject.android.blogs;
|
||||||
|
|
||||||
|
import android.app.Activity;
|
||||||
|
import android.support.annotation.Nullable;
|
||||||
|
import android.support.v7.util.SortedList;
|
||||||
|
import android.support.v7.widget.RecyclerView;
|
||||||
|
import android.view.LayoutInflater;
|
||||||
|
import android.view.View;
|
||||||
|
import android.view.View.OnClickListener;
|
||||||
|
import android.view.ViewGroup;
|
||||||
|
import android.widget.ImageView;
|
||||||
|
import android.widget.TextView;
|
||||||
|
|
||||||
|
import org.briarproject.R;
|
||||||
|
import org.briarproject.android.util.AndroidUtils;
|
||||||
|
import org.briarproject.api.feed.Feed;
|
||||||
|
import org.briarproject.api.sync.GroupId;
|
||||||
|
|
||||||
|
import java.util.Collection;
|
||||||
|
|
||||||
|
import static android.view.View.GONE;
|
||||||
|
import static android.view.View.VISIBLE;
|
||||||
|
|
||||||
|
class RssFeedAdapter extends
|
||||||
|
RecyclerView.Adapter<RssFeedAdapter.FeedViewHolder> {
|
||||||
|
|
||||||
|
private SortedList<Feed> feeds = new SortedList<>(
|
||||||
|
Feed.class, new SortedList.Callback<Feed>() {
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int compare(Feed a, Feed b) {
|
||||||
|
if (a == b) return 0;
|
||||||
|
long aTime = a.getAdded(), bTime = b.getAdded();
|
||||||
|
if (aTime > bTime) return -1;
|
||||||
|
if (aTime < bTime) return 1;
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onInserted(int position, int count) {
|
||||||
|
notifyItemRangeInserted(position, count);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onRemoved(int position, int count) {
|
||||||
|
notifyItemRangeRemoved(position, count);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onMoved(int fromPosition, int toPosition) {
|
||||||
|
notifyItemMoved(fromPosition, toPosition);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onChanged(int position, int count) {
|
||||||
|
notifyItemRangeChanged(position, count);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean areContentsTheSame(Feed a, Feed b) {
|
||||||
|
return a.getUpdated() == b.getUpdated();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean areItemsTheSame(Feed a, Feed b) {
|
||||||
|
return a.getUrl().equals(b.getUrl()) &&
|
||||||
|
a.getBlogId().equals(b.getBlogId()) &&
|
||||||
|
a.getAdded() == b.getAdded();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
private final Activity ctx;
|
||||||
|
private final RssFeedListener listener;
|
||||||
|
|
||||||
|
RssFeedAdapter(Activity ctx, RssFeedListener listener) {
|
||||||
|
this.ctx = ctx;
|
||||||
|
this.listener = listener;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public FeedViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
|
||||||
|
View v = LayoutInflater.from(ctx).inflate(
|
||||||
|
R.layout.list_item_rss_feed, parent, false);
|
||||||
|
return new FeedViewHolder(v);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onBindViewHolder(FeedViewHolder ui, int position) {
|
||||||
|
final Feed item = getItem(position);
|
||||||
|
|
||||||
|
// Feed Title
|
||||||
|
if (item.getTitle() != null) {
|
||||||
|
ui.title.setText(item.getTitle());
|
||||||
|
ui.title.setVisibility(VISIBLE);
|
||||||
|
} else {
|
||||||
|
ui.title.setVisibility(GONE);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Delete Button
|
||||||
|
ui.delete.setOnClickListener(new OnClickListener() {
|
||||||
|
@Override
|
||||||
|
public void onClick(View v) {
|
||||||
|
listener.onDeleteClick(item);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
// Author
|
||||||
|
if (item.getAuthor() != null) {
|
||||||
|
ui.author.setText(item.getAuthor());
|
||||||
|
ui.author.setVisibility(VISIBLE);
|
||||||
|
ui.authorLabel.setVisibility(VISIBLE);
|
||||||
|
} else {
|
||||||
|
ui.author.setVisibility(GONE);
|
||||||
|
ui.authorLabel.setVisibility(GONE);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Imported and Last Updated
|
||||||
|
ui.imported.setText(AndroidUtils.formatDate(ctx, item.getAdded()));
|
||||||
|
ui.updated.setText(AndroidUtils.formatDate(ctx, item.getUpdated()));
|
||||||
|
|
||||||
|
// Description
|
||||||
|
if (item.getDescription() != null) {
|
||||||
|
ui.description.setText(item.getDescription());
|
||||||
|
ui.description.setVisibility(VISIBLE);
|
||||||
|
} else {
|
||||||
|
ui.description.setVisibility(GONE);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int getItemCount() {
|
||||||
|
return feeds.size();
|
||||||
|
}
|
||||||
|
|
||||||
|
public Feed getItem(int position) {
|
||||||
|
return feeds.get(position);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Nullable
|
||||||
|
public Feed getItem(GroupId g) {
|
||||||
|
for (int i = 0; i < feeds.size(); i++) {
|
||||||
|
Feed item = feeds.get(i);
|
||||||
|
if (item.getBlogId().equals(g)) {
|
||||||
|
return item;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void addAll(Collection<Feed> items) {
|
||||||
|
feeds.addAll(items);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void remove(Feed item) {
|
||||||
|
feeds.remove(item);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void clear() {
|
||||||
|
feeds.clear();
|
||||||
|
}
|
||||||
|
|
||||||
|
public boolean isEmpty() {
|
||||||
|
return feeds.size() == 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
static class FeedViewHolder extends RecyclerView.ViewHolder {
|
||||||
|
private final TextView title;
|
||||||
|
private final ImageView delete;
|
||||||
|
private final TextView imported;
|
||||||
|
private final TextView updated;
|
||||||
|
private final TextView author;
|
||||||
|
private final TextView authorLabel;
|
||||||
|
private final TextView description;
|
||||||
|
|
||||||
|
FeedViewHolder(View v) {
|
||||||
|
super(v);
|
||||||
|
|
||||||
|
title = (TextView) v.findViewById(R.id.titleView);
|
||||||
|
delete = (ImageView) 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);
|
||||||
|
authorLabel = (TextView) v.findViewById(R.id.author);
|
||||||
|
description = (TextView) v.findViewById(R.id.descriptionView);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
interface RssFeedListener {
|
||||||
|
void onDeleteClick(Feed feed);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@@ -0,0 +1,178 @@
|
|||||||
|
package org.briarproject.android.blogs;
|
||||||
|
|
||||||
|
import android.content.DialogInterface;
|
||||||
|
import android.content.Intent;
|
||||||
|
import android.os.Bundle;
|
||||||
|
import android.support.v7.app.AlertDialog;
|
||||||
|
import android.text.Editable;
|
||||||
|
import android.text.TextWatcher;
|
||||||
|
import android.view.Menu;
|
||||||
|
import android.view.MenuItem;
|
||||||
|
import android.view.View;
|
||||||
|
import android.widget.Button;
|
||||||
|
import android.widget.EditText;
|
||||||
|
import android.widget.ProgressBar;
|
||||||
|
|
||||||
|
import org.briarproject.R;
|
||||||
|
import org.briarproject.android.ActivityComponent;
|
||||||
|
import org.briarproject.android.BriarActivity;
|
||||||
|
import org.briarproject.api.db.DbException;
|
||||||
|
import org.briarproject.api.feed.FeedManager;
|
||||||
|
import org.briarproject.api.lifecycle.IoExecutor;
|
||||||
|
import org.briarproject.api.sync.GroupId;
|
||||||
|
|
||||||
|
import java.io.IOException;
|
||||||
|
import java.util.concurrent.Executor;
|
||||||
|
import java.util.logging.Logger;
|
||||||
|
|
||||||
|
import javax.inject.Inject;
|
||||||
|
|
||||||
|
import static android.view.View.GONE;
|
||||||
|
import static android.view.View.VISIBLE;
|
||||||
|
import static java.util.logging.Level.WARNING;
|
||||||
|
|
||||||
|
public class RssFeedImportActivity extends BriarActivity {
|
||||||
|
|
||||||
|
private static final Logger LOG =
|
||||||
|
Logger.getLogger(RssFeedImportActivity.class.getName());
|
||||||
|
|
||||||
|
private EditText urlInput;
|
||||||
|
private Button importButton;
|
||||||
|
private ProgressBar progressBar;
|
||||||
|
|
||||||
|
@Inject
|
||||||
|
@IoExecutor
|
||||||
|
protected Executor ioExecutor;
|
||||||
|
|
||||||
|
// Fields that are accessed from background threads must be volatile
|
||||||
|
private volatile GroupId groupId = null;
|
||||||
|
@Inject
|
||||||
|
@SuppressWarnings("WeakerAccess")
|
||||||
|
volatile FeedManager feedManager;
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onCreate(Bundle savedInstanceState) {
|
||||||
|
super.onCreate(savedInstanceState);
|
||||||
|
|
||||||
|
// GroupId from Intent
|
||||||
|
Intent i = getIntent();
|
||||||
|
byte[] b = i.getByteArrayExtra(GROUP_ID);
|
||||||
|
if (b == null) throw new IllegalStateException("No Group in intent.");
|
||||||
|
groupId = new GroupId(b);
|
||||||
|
|
||||||
|
setContentView(R.layout.activity_rss_feed_import);
|
||||||
|
|
||||||
|
urlInput = (EditText) findViewById(R.id.urlInput);
|
||||||
|
urlInput.addTextChangedListener(new TextWatcher() {
|
||||||
|
@Override
|
||||||
|
public void beforeTextChanged(CharSequence s, int start, int count,
|
||||||
|
int after) {
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onTextChanged(CharSequence s, int start, int before,
|
||||||
|
int count) {
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void afterTextChanged(Editable s) {
|
||||||
|
enableOrDisableImportButton();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
importButton = (Button) findViewById(R.id.importButton);
|
||||||
|
importButton.setOnClickListener(new View.OnClickListener() {
|
||||||
|
@Override
|
||||||
|
public void onClick(View v) {
|
||||||
|
publish();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
progressBar = (ProgressBar) findViewById(R.id.progressBar);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean onCreateOptionsMenu(Menu menu) {
|
||||||
|
return super.onCreateOptionsMenu(menu);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean onOptionsItemSelected(MenuItem item) {
|
||||||
|
return super.onOptionsItemSelected(item);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void injectActivity(ActivityComponent component) {
|
||||||
|
component.inject(this);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void enableOrDisableImportButton() {
|
||||||
|
String url = urlInput.getText().toString();
|
||||||
|
if (url.startsWith("http://") || url.startsWith("https://"))
|
||||||
|
importButton.setEnabled(true);
|
||||||
|
else
|
||||||
|
importButton.setEnabled(false);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void publish() {
|
||||||
|
// hide import button, show progress bar
|
||||||
|
importButton.setVisibility(GONE);
|
||||||
|
progressBar.setVisibility(VISIBLE);
|
||||||
|
|
||||||
|
importFeed(urlInput.getText().toString());
|
||||||
|
}
|
||||||
|
|
||||||
|
private void importFeed(final String url) {
|
||||||
|
ioExecutor.execute(new Runnable() {
|
||||||
|
@Override
|
||||||
|
public void run() {
|
||||||
|
try {
|
||||||
|
feedManager.addFeed(url, groupId);
|
||||||
|
feedImported();
|
||||||
|
} catch (DbException | IOException e) {
|
||||||
|
if (LOG.isLoggable(WARNING))
|
||||||
|
LOG.log(WARNING, e.toString(), e);
|
||||||
|
importFailed();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
private void feedImported() {
|
||||||
|
runOnUiThread(new Runnable() {
|
||||||
|
@Override
|
||||||
|
public void run() {
|
||||||
|
supportFinishAfterTransition();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
private void importFailed() {
|
||||||
|
runOnUiThread(new Runnable() {
|
||||||
|
@Override
|
||||||
|
public void run() {
|
||||||
|
// hide progress bar, show publish button
|
||||||
|
progressBar.setVisibility(GONE);
|
||||||
|
importButton.setVisibility(VISIBLE);
|
||||||
|
|
||||||
|
// show error dialog
|
||||||
|
AlertDialog.Builder builder =
|
||||||
|
new AlertDialog.Builder(RssFeedImportActivity.this,
|
||||||
|
R.style.BriarDialogTheme);
|
||||||
|
builder.setMessage(R.string.blogs_rss_feeds_import_error);
|
||||||
|
builder.setNegativeButton(R.string.cancel_button, null);
|
||||||
|
builder.setPositiveButton(R.string.try_again_button,
|
||||||
|
new DialogInterface.OnClickListener() {
|
||||||
|
@Override
|
||||||
|
public void onClick(DialogInterface dialog, int which) {
|
||||||
|
publish();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
AlertDialog dialog = builder.create();
|
||||||
|
dialog.show();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
@@ -0,0 +1,167 @@
|
|||||||
|
package org.briarproject.android.blogs;
|
||||||
|
|
||||||
|
import android.content.Intent;
|
||||||
|
import android.os.Bundle;
|
||||||
|
import android.support.design.widget.Snackbar;
|
||||||
|
import android.support.v4.app.ActivityCompat;
|
||||||
|
import android.support.v4.app.ActivityOptionsCompat;
|
||||||
|
import android.support.v7.widget.LinearLayoutManager;
|
||||||
|
import android.view.Menu;
|
||||||
|
import android.view.MenuInflater;
|
||||||
|
import android.view.MenuItem;
|
||||||
|
|
||||||
|
import org.briarproject.R;
|
||||||
|
import org.briarproject.android.ActivityComponent;
|
||||||
|
import org.briarproject.android.BriarActivity;
|
||||||
|
import org.briarproject.android.blogs.RssFeedAdapter.RssFeedListener;
|
||||||
|
import org.briarproject.android.util.BriarRecyclerView;
|
||||||
|
import org.briarproject.api.db.DbException;
|
||||||
|
import org.briarproject.api.feed.Feed;
|
||||||
|
import org.briarproject.api.feed.FeedManager;
|
||||||
|
import org.briarproject.api.sync.GroupId;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.logging.Logger;
|
||||||
|
|
||||||
|
import javax.inject.Inject;
|
||||||
|
|
||||||
|
import static android.support.design.widget.Snackbar.LENGTH_LONG;
|
||||||
|
import static android.support.v4.app.ActivityOptionsCompat.makeCustomAnimation;
|
||||||
|
import static java.util.logging.Level.WARNING;
|
||||||
|
|
||||||
|
public class RssFeedManageActivity extends BriarActivity
|
||||||
|
implements RssFeedListener {
|
||||||
|
|
||||||
|
private static final Logger LOG =
|
||||||
|
Logger.getLogger(RssFeedManageActivity.class.getName());
|
||||||
|
|
||||||
|
private BriarRecyclerView list;
|
||||||
|
private RssFeedAdapter adapter;
|
||||||
|
|
||||||
|
// Fields that are accessed from background threads must be volatile
|
||||||
|
private volatile GroupId groupId = null;
|
||||||
|
@Inject
|
||||||
|
@SuppressWarnings("WeakerAccess")
|
||||||
|
volatile FeedManager feedManager;
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onCreate(Bundle savedInstanceState) {
|
||||||
|
super.onCreate(savedInstanceState);
|
||||||
|
|
||||||
|
// GroupId from Intent
|
||||||
|
Intent i = getIntent();
|
||||||
|
byte[] b = i.getByteArrayExtra(GROUP_ID);
|
||||||
|
if (b == null) throw new IllegalStateException("No Group in intent.");
|
||||||
|
groupId = new GroupId(b);
|
||||||
|
|
||||||
|
setContentView(R.layout.activity_rss_feed_manage);
|
||||||
|
|
||||||
|
adapter = new RssFeedAdapter(this, this);
|
||||||
|
|
||||||
|
list = (BriarRecyclerView) findViewById(R.id.feedList);
|
||||||
|
list.setLayoutManager(new LinearLayoutManager(this));
|
||||||
|
list.setAdapter(adapter);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onResume() {
|
||||||
|
super.onResume();
|
||||||
|
loadFeeds();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean onCreateOptionsMenu(Menu menu) {
|
||||||
|
MenuInflater inflater = getMenuInflater();
|
||||||
|
inflater.inflate(R.menu.rss_feed_manage_actions, menu);
|
||||||
|
return super.onCreateOptionsMenu(menu);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean onOptionsItemSelected(MenuItem item) {
|
||||||
|
switch (item.getItemId()) {
|
||||||
|
case android.R.id.home:
|
||||||
|
onBackPressed();
|
||||||
|
return true;
|
||||||
|
case R.id.action_rss_feeds_import:
|
||||||
|
Intent i =
|
||||||
|
new Intent(this, RssFeedImportActivity.class);
|
||||||
|
i.putExtra(GROUP_ID, groupId.getBytes());
|
||||||
|
ActivityOptionsCompat options =
|
||||||
|
makeCustomAnimation(this, android.R.anim.slide_in_left,
|
||||||
|
android.R.anim.slide_out_right);
|
||||||
|
ActivityCompat.startActivity(this, i, options.toBundle());
|
||||||
|
return true;
|
||||||
|
default:
|
||||||
|
return super.onOptionsItemSelected(item);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void injectActivity(ActivityComponent component) {
|
||||||
|
component.inject(this);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onDeleteClick(final Feed feed) {
|
||||||
|
runOnDbThread(new Runnable() {
|
||||||
|
@Override
|
||||||
|
public void run() {
|
||||||
|
try {
|
||||||
|
feedManager.removeFeed(feed.getUrl());
|
||||||
|
onFeedDeleted(feed);
|
||||||
|
} catch (DbException e) {
|
||||||
|
if (LOG.isLoggable(WARNING))
|
||||||
|
LOG.log(WARNING, e.toString(), e);
|
||||||
|
onDeleteError();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
private void loadFeeds() {
|
||||||
|
runOnDbThread(new Runnable() {
|
||||||
|
@Override
|
||||||
|
public void run() {
|
||||||
|
try {
|
||||||
|
addFeeds(feedManager.getFeeds());
|
||||||
|
} catch (DbException e) {
|
||||||
|
if (LOG.isLoggable(WARNING))
|
||||||
|
LOG.log(WARNING, e.toString(), e);
|
||||||
|
list.setEmptyText(R.string.blogs_rss_feeds_manage_error);
|
||||||
|
list.showData();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
private void addFeeds(final List<Feed> feeds) {
|
||||||
|
runOnUiThread(new Runnable() {
|
||||||
|
@Override
|
||||||
|
public void run() {
|
||||||
|
if (feeds.size() == 0) list.showData();
|
||||||
|
else adapter.addAll(feeds);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
private void onFeedDeleted(final Feed feed) {
|
||||||
|
runOnUiThread(new Runnable() {
|
||||||
|
@Override
|
||||||
|
public void run() {
|
||||||
|
adapter.remove(feed);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
private void onDeleteError() {
|
||||||
|
runOnUiThread(new Runnable() {
|
||||||
|
@Override
|
||||||
|
public void run() {
|
||||||
|
Snackbar.make(list,
|
||||||
|
R.string.blogs_rss_feeds_manage_delete_error,
|
||||||
|
LENGTH_LONG).show();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
@@ -47,6 +47,9 @@ public class BriarRecyclerView extends FrameLayout {
|
|||||||
R.styleable.BriarRecyclerView);
|
R.styleable.BriarRecyclerView);
|
||||||
isScrollingToEnd = attributes
|
isScrollingToEnd = attributes
|
||||||
.getBoolean(R.styleable.BriarRecyclerView_scrollToEnd, true);
|
.getBoolean(R.styleable.BriarRecyclerView_scrollToEnd, true);
|
||||||
|
String emtpyText =
|
||||||
|
attributes.getString(R.styleable.BriarRecyclerView_emptyText);
|
||||||
|
if (emtpyText != null) setEmptyText(emtpyText);
|
||||||
attributes.recycle();
|
attributes.recycle();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -94,6 +97,11 @@ public class BriarRecyclerView extends FrameLayout {
|
|||||||
super.onItemRangeInserted(positionStart, itemCount);
|
super.onItemRangeInserted(positionStart, itemCount);
|
||||||
if (itemCount > 0) showData();
|
if (itemCount > 0) showData();
|
||||||
}
|
}
|
||||||
|
@Override
|
||||||
|
public void onItemRangeRemoved(int positionStart, int itemCount) {
|
||||||
|
super.onItemRangeRemoved(positionStart, itemCount);
|
||||||
|
if (itemCount > 0) showData();
|
||||||
|
}
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user