From ecd1b1f92ca78a577967f7168ab5c6b89e995e3a Mon Sep 17 00:00:00 2001 From: oogee Date: Tue, 20 Nov 2018 22:08:47 +0200 Subject: [PATCH] draft fixes --- .../mthmmy/activities/topic/TopicActivity.java | 15 ++++++--------- .../mthmmy/activities/topic/TopicAdapter.java | 4 ++-- .../main/java/gr/thmmy/mthmmy/model/Post.java | 12 ++++++++++-- .../thmmy/mthmmy/viewmodel/TopicViewModel.java | 17 ----------------- 4 files changed, 18 insertions(+), 30 deletions(-) diff --git a/app/src/main/java/gr/thmmy/mthmmy/activities/topic/TopicActivity.java b/app/src/main/java/gr/thmmy/mthmmy/activities/topic/TopicActivity.java index ead5b63e..af4586c1 100644 --- a/app/src/main/java/gr/thmmy/mthmmy/activities/topic/TopicActivity.java +++ b/app/src/main/java/gr/thmmy/mthmmy/activities/topic/TopicActivity.java @@ -274,9 +274,8 @@ public class TopicActivity extends BaseActivity implements TopicAdapter.OnPostFo } else if (viewModel.isWritingReply()) { // persist reply SharedPreferences drafts = getSharedPreferences(getString(R.string.pref_topic_drafts_key), MODE_PRIVATE); - Editable cachedReply = viewModel.getCachedReply(); - if (cachedReply != null) - drafts.edit().putString(String.valueOf(viewModel.getTopicId()), cachedReply.toString()).apply(); + Post reply = (Post) topicItems.get(topicItems.size() - 1); + drafts.edit().putString(String.valueOf(viewModel.getTopicId()), reply.getContent()).apply(); topicItems.remove(topicItems.size() - 1); topicAdapter.notifyItemRemoved(topicItems.size()); @@ -317,9 +316,8 @@ public class TopicActivity extends BaseActivity implements TopicAdapter.OnPostFo // persist reply if (viewModel.isWritingReply()) { SharedPreferences drafts = getSharedPreferences(getString(R.string.pref_topic_drafts_key), MODE_PRIVATE); - Editable cachedReply = viewModel.getCachedReply(); - if (cachedReply != null) - drafts.edit().putString(String.valueOf(viewModel.getTopicId()), cachedReply.toString()).apply(); + Post reply = (Post) topicItems.get(topicItems.size() - 1); + drafts.edit().putString(String.valueOf(viewModel.getTopicId()), reply.getContent()).apply(); } } @@ -536,11 +534,10 @@ public class TopicActivity extends BaseActivity implements TopicAdapter.OnPostFo break; case NEW_REPLY_WHILE_POSTING: Timber.i("New reply while writing a reply"); - Editable subject = viewModel.getCachedSubject(); - Editable message = viewModel.getCachedReply(); + Post reply = (Post) topicItems.get(topicItems.size() - 1); Runnable addReply = () -> { viewModel.setWritingReply(true); - topicItems.add(Post.newQuickReply(subject.toString(), message.toString())); + topicItems.add(Post.newQuickReply(reply.getSubject(), reply.getContent())); topicAdapter.notifyItemInserted(topicItems.size()); recyclerView.scrollToPosition(topicItems.size() - 1); replyFAB.hide(); diff --git a/app/src/main/java/gr/thmmy/mthmmy/activities/topic/TopicAdapter.java b/app/src/main/java/gr/thmmy/mthmmy/activities/topic/TopicAdapter.java index 849067f2..bb8bdeb2 100644 --- a/app/src/main/java/gr/thmmy/mthmmy/activities/topic/TopicAdapter.java +++ b/app/src/main/java/gr/thmmy/mthmmy/activities/topic/TopicAdapter.java @@ -672,7 +672,7 @@ class TopicAdapter extends RecyclerView.Adapter { @Override public void afterTextChanged(Editable editable) { - viewModel.setCachedReply(editable); + ((Post) topicItems.get(holder.getAdapterPosition())).setContent(editable.toString()); } }); @@ -693,7 +693,7 @@ class TopicAdapter extends RecyclerView.Adapter { @Override public void afterTextChanged(Editable editable) { - viewModel.setCachedSubject(editable); + ((Post) topicItems.get(holder.getAdapterPosition())).setSubject(editable.toString()); } }); } else if (currentHolder instanceof EditMessageViewHolder) { diff --git a/app/src/main/java/gr/thmmy/mthmmy/model/Post.java b/app/src/main/java/gr/thmmy/mthmmy/model/Post.java index da68d1e6..9560ef49 100644 --- a/app/src/main/java/gr/thmmy/mthmmy/model/Post.java +++ b/app/src/main/java/gr/thmmy/mthmmy/model/Post.java @@ -23,8 +23,8 @@ public class Post extends TopicItem { //Standard info (exists in every post) private final String thumbnailUrl; private final String author; - private final String subject; - private final String content; + private String subject; + private String content; private final int postIndex; private final int postNumber; private final String postDate; @@ -408,4 +408,12 @@ public class Post extends TopicItem { public void setPostType(int postType) { this.postType = postType; } + + public void setContent(String content) { + this.content = content; + } + + public void setSubject(String subject) { + this.subject = subject; + } } diff --git a/app/src/main/java/gr/thmmy/mthmmy/viewmodel/TopicViewModel.java b/app/src/main/java/gr/thmmy/mthmmy/viewmodel/TopicViewModel.java index a4816479..5663fe5b 100644 --- a/app/src/main/java/gr/thmmy/mthmmy/viewmodel/TopicViewModel.java +++ b/app/src/main/java/gr/thmmy/mthmmy/viewmodel/TopicViewModel.java @@ -41,7 +41,6 @@ public class TopicViewModel extends BaseViewModel implements TopicTask.OnTopicTa */ private boolean editingPost = false; private boolean writingReply = false; - private Editable cachedSubject, cachedReply; /** * A list of {@link Post#getPostIndex()} for building quotes for replying */ @@ -488,20 +487,4 @@ public class TopicViewModel extends BaseViewModel implements TopicTask.OnTopicTa throw new NullPointerException("No page has been loaded yet!"); return topicItems.getValue().size(); } - - public Editable getCachedSubject() { - return cachedSubject; - } - - public void setCachedSubject(Editable cachedSubject) { - this.cachedSubject = cachedSubject; - } - - public Editable getCachedReply() { - return cachedReply; - } - - public void setCachedReply(Editable cachedReply) { - this.cachedReply = cachedReply; - } }