From 656a947f5a44f616eb1964ffa59682d68a97e45f Mon Sep 17 00:00:00 2001 From: Torsten Grote Date: Mon, 31 Oct 2016 13:13:59 -0200 Subject: [PATCH] Last minor review comments addressed --- .../src/org/briarproject/android/forum/ForumActivity.java | 2 +- .../android/privategroup/conversation/GroupActivity.java | 2 +- .../privategroup/conversation/GroupMessageAdapter.java | 6 +++--- ...ssageItemHolder.java => JoinMessageItemViewHolder.java} | 4 ++-- .../briarproject/android/threaded/ThreadItemAdapter.java | 2 +- .../briarproject/android/threaded/ThreadListActivity.java | 7 ++++--- ...ThreadItemViewHolder.java => ThreadPostViewHolder.java} | 4 ++-- 7 files changed, 14 insertions(+), 13 deletions(-) rename briar-android/src/org/briarproject/android/privategroup/conversation/{JoinMessageItemHolder.java => JoinMessageItemViewHolder.java} (90%) rename briar-android/src/org/briarproject/android/threaded/{ThreadItemViewHolder.java => ThreadPostViewHolder.java} (96%) diff --git a/briar-android/src/org/briarproject/android/forum/ForumActivity.java b/briar-android/src/org/briarproject/android/forum/ForumActivity.java index 31816fa8f..36d552473 100644 --- a/briar-android/src/org/briarproject/android/forum/ForumActivity.java +++ b/briar-android/src/org/briarproject/android/forum/ForumActivity.java @@ -36,7 +36,7 @@ import static android.widget.Toast.LENGTH_SHORT; import static org.briarproject.api.forum.ForumConstants.MAX_FORUM_POST_BODY_LENGTH; public class ForumActivity extends - ThreadListActivity> { + ThreadListActivity { private static final int REQUEST_FORUM_SHARED = 3; diff --git a/briar-android/src/org/briarproject/android/privategroup/conversation/GroupActivity.java b/briar-android/src/org/briarproject/android/privategroup/conversation/GroupActivity.java index 71a4865b5..d17ed8d66 100644 --- a/briar-android/src/org/briarproject/android/privategroup/conversation/GroupActivity.java +++ b/briar-android/src/org/briarproject/android/privategroup/conversation/GroupActivity.java @@ -22,7 +22,7 @@ import javax.inject.Inject; import static org.briarproject.api.privategroup.PrivateGroupConstants.MAX_GROUP_POST_BODY_LENGTH; public class GroupActivity extends - ThreadListActivity { + ThreadListActivity { @Inject GroupController controller; diff --git a/briar-android/src/org/briarproject/android/privategroup/conversation/GroupMessageAdapter.java b/briar-android/src/org/briarproject/android/privategroup/conversation/GroupMessageAdapter.java index 58eec2938..c042a1829 100644 --- a/briar-android/src/org/briarproject/android/privategroup/conversation/GroupMessageAdapter.java +++ b/briar-android/src/org/briarproject/android/privategroup/conversation/GroupMessageAdapter.java @@ -10,7 +10,7 @@ import android.view.ViewGroup; import org.briarproject.R; import org.briarproject.android.threaded.BaseThreadItemViewHolder; import org.briarproject.android.threaded.ThreadItemAdapter; -import org.briarproject.android.threaded.ThreadItemViewHolder; +import org.briarproject.android.threaded.ThreadPostViewHolder; @UiThread public class GroupMessageAdapter extends ThreadItemAdapter { @@ -34,9 +34,9 @@ public class GroupMessageAdapter extends ThreadItemAdapter { View v = LayoutInflater.from(parent.getContext()) .inflate(type, parent, false); if (type == R.layout.list_item_thread_notice) { - return new JoinMessageItemHolder(v); + return new JoinMessageItemViewHolder(v); } - return new ThreadItemViewHolder<>(v); + return new ThreadPostViewHolder<>(v); } } diff --git a/briar-android/src/org/briarproject/android/privategroup/conversation/JoinMessageItemHolder.java b/briar-android/src/org/briarproject/android/privategroup/conversation/JoinMessageItemViewHolder.java similarity index 90% rename from briar-android/src/org/briarproject/android/privategroup/conversation/JoinMessageItemHolder.java rename to briar-android/src/org/briarproject/android/privategroup/conversation/JoinMessageItemViewHolder.java index 8a2942a4c..972a6149e 100644 --- a/briar-android/src/org/briarproject/android/privategroup/conversation/JoinMessageItemHolder.java +++ b/briar-android/src/org/briarproject/android/privategroup/conversation/JoinMessageItemViewHolder.java @@ -11,10 +11,10 @@ import org.briarproject.api.nullsafety.NotNullByDefault; @UiThread @NotNullByDefault -public class JoinMessageItemHolder +public class JoinMessageItemViewHolder extends BaseThreadItemViewHolder { - public JoinMessageItemHolder(View v) { + public JoinMessageItemViewHolder(View v) { super(v); } diff --git a/briar-android/src/org/briarproject/android/threaded/ThreadItemAdapter.java b/briar-android/src/org/briarproject/android/threaded/ThreadItemAdapter.java index 21425ced3..7c3ee9079 100644 --- a/briar-android/src/org/briarproject/android/threaded/ThreadItemAdapter.java +++ b/briar-android/src/org/briarproject/android/threaded/ThreadItemAdapter.java @@ -50,7 +50,7 @@ public class ThreadItemAdapter ViewGroup parent, int viewType) { View v = LayoutInflater.from(parent.getContext()) .inflate(R.layout.list_item_thread, parent, false); - return new ThreadItemViewHolder<>(v); + return new ThreadPostViewHolder<>(v); } @Override diff --git a/briar-android/src/org/briarproject/android/threaded/ThreadListActivity.java b/briar-android/src/org/briarproject/android/threaded/ThreadListActivity.java index 268fdcca9..eff17e175 100644 --- a/briar-android/src/org/briarproject/android/threaded/ThreadListActivity.java +++ b/briar-android/src/org/briarproject/android/threaded/ThreadListActivity.java @@ -35,7 +35,7 @@ import static android.support.design.widget.Snackbar.make; import static android.view.View.GONE; import static android.view.View.VISIBLE; -public abstract class ThreadListActivity> +public abstract class ThreadListActivity extends BriarActivity implements ThreadListListener, TextInputListener, ThreadItemListener { @@ -46,7 +46,7 @@ public abstract class ThreadListActivity adapter; protected BriarRecyclerView list; protected TextInputView textInput; protected GroupId groupId; @@ -88,7 +88,8 @@ public abstract class ThreadListActivity createAdapter( + LinearLayoutManager layoutManager); protected void loadNamedGroup() { getController().loadNamedGroup( diff --git a/briar-android/src/org/briarproject/android/threaded/ThreadItemViewHolder.java b/briar-android/src/org/briarproject/android/threaded/ThreadPostViewHolder.java similarity index 96% rename from briar-android/src/org/briarproject/android/threaded/ThreadItemViewHolder.java rename to briar-android/src/org/briarproject/android/threaded/ThreadPostViewHolder.java index c59eac8a4..bffd1d6ea 100644 --- a/briar-android/src/org/briarproject/android/threaded/ThreadItemViewHolder.java +++ b/briar-android/src/org/briarproject/android/threaded/ThreadPostViewHolder.java @@ -14,14 +14,14 @@ import static android.view.View.VISIBLE; @UiThread @NotNullByDefault -public class ThreadItemViewHolder +public class ThreadPostViewHolder extends BaseThreadItemViewHolder { private final TextView lvlText, repliesText; private final View[] lvls; private final View chevron, replyButton; - public ThreadItemViewHolder(View v) { + public ThreadPostViewHolder(View v) { super(v); lvlText = (TextView) v.findViewById(R.id.nested_line_text);