From c79b1204f43d8ae914bb4ef59305d4e9c388f060 Mon Sep 17 00:00:00 2001 From: Apostolof Date: Sat, 22 Jul 2017 15:19:20 +0300 Subject: [PATCH] Bookmarks refresh on activity resume, fixed quote, embedded video overlay image and recyclerView bugs. Made activities SingeInstance. --- app/src/main/AndroidManifest.xml | 57 +++++---- .../main/assets/YouTube_light_color_icon.png | Bin 0 -> 13195 bytes .../activities/board/BoardActivity.java | 8 ++ .../mthmmy/activities/topic/Posting.java | 121 +++++++++++++----- .../activities/topic/TopicActivity.java | 4 +- .../mthmmy/activities/topic/TopicAdapter.java | 1 + .../gr/thmmy/mthmmy/base/BaseActivity.java | 30 ++++- .../gr/thmmy/mthmmy/utils/ParseHelpers.java | 2 +- 8 files changed, 156 insertions(+), 67 deletions(-) create mode 100644 app/src/main/assets/YouTube_light_color_icon.png diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 8a57fcbc..8e78f4e6 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,12 +1,12 @@ + package="gr.thmmy.mthmmy" + android:installLocation="auto"> - - - - + + + + - + - + - + - - + + + android:scheme="http" /> + android:scheme="http" /> + android:scheme="https" /> + android:scheme="https" /> - + + android:windowSoftInputMode="adjustPan" /> + android:value=".activities.main.MainActivity" /> + android:value=".activities.main.MainActivity" /> + android:theme="@style/AppTheme.NoActionBar" /> + android:value=".activities.main.MainActivity" /> + android:value=".activities.main.MainActivity" /> + android:value=".activities.main.MainActivity" /> + android:resource="@xml/provider_paths" /> + android:exported="false" /> - - + + diff --git a/app/src/main/assets/YouTube_light_color_icon.png b/app/src/main/assets/YouTube_light_color_icon.png new file mode 100644 index 0000000000000000000000000000000000000000..bfd6db39af520e36914c67a9bb9d0b151f3178cd GIT binary patch literal 13195 zcmaKTc_7r?7x$fE2uTYm6i*9E;t`Q`S|lxKkwWMxDJpB(%{P)K6+&8U(}Fg%35A)c zY!xMG5o60z*<~>1`<^?g-}C%_@B8+Tx%ZxX?pZ$P+;i{!cGAkiOj2A<93doWzHZGH zgoNQI_4OnX`136L^)mP~+sAZ=&sO(+KEAuXoYBg??teKenIGEi;=ILq_g;U`a%V$? zmZ_VsS-H*cF6y

l2P! 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 literal 0 HcmV?d00001 diff --git a/app/src/main/java/gr/thmmy/mthmmy/activities/board/BoardActivity.java b/app/src/main/java/gr/thmmy/mthmmy/activities/board/BoardActivity.java index 565b587a..633ab6ec 100644 --- a/app/src/main/java/gr/thmmy/mthmmy/activities/board/BoardActivity.java +++ b/app/src/main/java/gr/thmmy/mthmmy/activities/board/BoardActivity.java @@ -8,6 +8,7 @@ import android.support.v7.widget.DividerItemDecoration; import android.support.v7.widget.LinearLayoutManager; import android.support.v7.widget.RecyclerView; import android.support.v7.widget.Toolbar; +import android.util.Log; import android.view.View; import android.widget.ImageButton; import android.widget.ProgressBar; @@ -161,6 +162,13 @@ public class BoardActivity extends BaseActivity implements BoardAdapter.OnLoadMo } } + @Override + public void onResume() { + super.onResume(); + Log.d("Boardaa", "onResume called!"); + refreshBoardBookmark((ImageButton) findViewById(R.id.bookmark)); + } + @Override public void onDestroy() { super.onDestroy(); diff --git a/app/src/main/java/gr/thmmy/mthmmy/activities/topic/Posting.java b/app/src/main/java/gr/thmmy/mthmmy/activities/topic/Posting.java index f0220f82..3fe99911 100644 --- a/app/src/main/java/gr/thmmy/mthmmy/activities/topic/Posting.java +++ b/app/src/main/java/gr/thmmy/mthmmy/activities/topic/Posting.java @@ -1,5 +1,7 @@ package gr.thmmy.mthmmy.activities.topic; +import android.util.Log; + import org.jsoup.Jsoup; import org.jsoup.nodes.Document; @@ -11,11 +13,52 @@ import java.util.regex.Matcher; import okhttp3.Response; import timber.log.Timber; +/** + * This is a utility class containing a collection of static methods to help with topic replying. + */ class Posting { + /** + * {@link REPLY_STATUS} enum defines the different possible outcomes of a topic reply request. + */ enum REPLY_STATUS { - SUCCESSFUL, NO_SUBJECT, EMPTY_BODY, NEW_REPLY_WHILE_POSTING, NOT_FOUND, SESSION_ENDED, OTHER_ERROR + /** + * The request was successful + */ + SUCCESSFUL, + /** + * Request was lacking a subject + */ + NO_SUBJECT, + /** + * Request had empty body + */ + EMPTY_BODY, + /** + * There were new topic replies while making the request + */ + NEW_REPLY_WHILE_POSTING, + /** + * Error 404, page was not found + */ + NOT_FOUND, + /** + * User session ended while posting the reply + */ + SESSION_ENDED, + /** + * Other undefined of unidentified error + */ + OTHER_ERROR } + /** + * This method can be used to check whether a topic post request was successful or not and if + * not maybe get the reason why. + * + * @param response {@link okhttp3.Response} of the request + * @return a {@link REPLY_STATUS} that describes the response status + * @throws IOException method relies to {@link org.jsoup.Jsoup#parse(String)} + */ static REPLY_STATUS replyStatus(Response response) throws IOException { if (response.code() == 404) return REPLY_STATUS.NOT_FOUND; if (response.code() < 200 || response.code() >= 400) return REPLY_STATUS.OTHER_ERROR; @@ -44,10 +87,19 @@ class Posting { return REPLY_STATUS.SUCCESSFUL; } + /** + * This is a fucked up method.. Just don't waste your time here unless you have suicidal + * tendencies. + * + * @param html the html string to be transformed to BBcode + * @return the BBcode string + */ static String htmlToBBcode(String html) { + Log.d("Cancer", html); Map bbMap = new HashMap<>(); Map smileysMap1 = new HashMap<>(); Map smileysMap2 = new HashMap<>(); + smileysMap1.put("Smiley", ":)"); smileysMap1.put("Wink", ";)"); smileysMap1.put("Cheesy", ":D"); @@ -170,64 +222,66 @@ class Posting { //html stuff on the beginning bbMap.put("\n ", ""); //quotes and code headers - bbMap.put("\n\\s+?

\n (.+?)\n
", ""); - bbMap.put("\n\\s+?
\n (.+?)\n
", ""); - bbMap.put("\n\\s+?
\n (.+?)\n
", ""); - bbMap.put("
", "\n"); + bbMap.put("\\s*?
(.*?(\\n))*?.*?<\\/div>", ""); + bbMap.put("\\s*?
(.*?(\\n))+?.*?<\\/div>", ""); + bbMap.put("\\s*?
(.*?(\\n))+?.*?<\\/div>", ""); + bbMap.put("
", "\\\n"); + //Non-breaking space + bbMap.put(" ", " "); //bold - bbMap.put("\n\\s+?(.+?)", "\\[b\\]$1\\[/b\\]"); + bbMap.put("\\s*?([\\S\\s]+?)<\\/b>", "\\[b\\]$1\\[/b\\]"); //italics - bbMap.put("\n\\s+?(.+?)", "\\[i\\]$1\\[/i\\]"); + bbMap.put("\\s*?([\\S\\s]+?)<\\/i>", "\\[i\\]$1\\[/i\\]"); //underline - bbMap.put("\n\\s+?(.+?)", "\\[u\\]$1\\[/u\\]"); + bbMap.put("\\s*?([\\S\\s]+?)<\\/span>", "\\[u\\]$1\\[/u\\]"); //deleted - bbMap.put("\n\\s+?(.+?)", "\\[s\\]$1\\[/s\\]"); + bbMap.put("\\s*?([\\S\\s]+?)<\\/del>", "\\[s\\]$1\\[/s\\]"); //text color - bbMap.put("\n\\s+?(.+?)", "\\[color=$1\\]$2\\[/color\\]"); + bbMap.put("\\s*?([\\S\\s]+?)<\\/span>", "\\[color=$1\\]$2\\[/color\\]"); //glow - bbMap.put("\n\\s+?(.+?)", "\\[glow=$1,2,300\\]$2\\[/glow\\]"); + bbMap.put("\\s*?([\\S\\s]+?)<\\/span>", "\\[glow=$1,2,300\\]$2\\[/glow\\]"); //shadow - bbMap.put("\n\\s+?(.+?)", "\\[shadow=$1,$2\\]$3\\[/shadow\\]"); + bbMap.put("\\s*?([\\S\\s]+?)<\\/span>", "\\[shadow=$1,$2\\]$3\\[/shadow\\]"); //running text - bbMap.put("\\s+?\n (.+?)\n ", "\\[move\\]$1\\[/move\\]"); + bbMap.put("\\s*?\n ([\\S\\s]+?)\n <\\/marquee>", "\\[move\\]$1\\[/move\\]"); //alignment - bbMap.put("\n\\s+?
\n (.+?)\n
", "\\[center\\]$1\\[/center\\]"); - bbMap.put("\n\\s+?
\n (.+?)\n
", "\\[$1\\]$2\\[/$1\\]"); + bbMap.put("\\s*?
\n ([\\S\\s]+?)\n <\\/div>", "\\[center\\]$1\\[/center\\]"); + bbMap.put("\\s*?
\n ([\\S\\s]+?)\n <\\/div>", "\\[$1\\]$2\\[/$1\\]"); //preformated - bbMap.put("\n\\s+?
(.+?)
", "\\[pre\\]$1\\[/pre\\]"); + bbMap.put("\\s*?
([\\S\\s]+?)<\\/pre>", "\\[pre\\]$1\\[/pre\\]");
         //horizontal rule
-        bbMap.put("\n\\s+?
", "\\[hr\\]");
+        bbMap.put("\\s*?
", "\\[hr\\]");
         //resize
-        bbMap.put("\n\\s+?(.+?)", "\\[size=$1\\]$3\\[/size\\]");
+        bbMap.put("\\s*?([\\S\\s]+?)<\\/span>", "\\[size=$1\\]$3\\[/size\\]");
         //font
-        bbMap.put("\n\\s+?(.+?)", "\\[font=$1\\]$2\\[/font\\]");
+        bbMap.put("\\s*?([\\S\\s]+?)<\\/span>", "\\[font=$1\\]$2\\[/font\\]");
         //lists
-        bbMap.put("\\s+
  • (.+?)
    • ", "\\[li\\]$1\\[/li\\]");
-        bbMap.put("\n\\s+
      ([\\S\\s]+?)\n\\s+
    ",
+        bbMap.put("\\s+
  • (.+?)<\\/li>", "\\[li\\]$1\\[/li\\]");
+        bbMap.put("\n\\s+
      ([\\S\\s]+?)\n\\s+<\\/ul>",
                 "\\[list\\]\n$1\n\\[/list\\]");
         //latex code
-        bbMap.put("\n\\s+?", "\\[tex\\]$1\\[/tex\\]");
+        bbMap.put("\\s*?", "\\[tex\\]$1\\[/tex\\]");
         //code
-        bbMap.put("\n\\s+?
      \n  (.+?)\n 
      ", "\\[code\\]$1\\[/code\\]");
+        bbMap.put("\\s*?
      ((.*?(\\n))+?.*?)<\\/div>", "\\[code\\]$1\\[/code\\]");
         //teletype
-        bbMap.put("\n\\s+?(.+?)", "\\[tt\\]$1\\[/tt\\]");
+        bbMap.put("\\s*?([\\S\\s]+?)<\\/tt>", "\\[tt\\]$1\\[/tt\\]");
         //superscript/subscript
-        bbMap.put("\n\\s+?(.+?)", "\\[sub\\]$1\\[/sub\\]");
-        bbMap.put("\n\\s+?(.+?)", "\\[sup\\]$1\\[/sup\\]");
+        bbMap.put("\\s*?([\\S\\s]+?)<\\/sub>", "\\[sub\\]$1\\[/sub\\]");
+        bbMap.put("\\s*?([\\S\\s]+?)<\\/sup>", "\\[sup\\]$1\\[/sup\\]");
         //tables
-        bbMap.put("\\s+?([\\S\\s]+?)", "\\[td\\]$1\\[/td\\]");
-        bbMap.put("([\\S\\s]+?)\n   ", "\\[tr\\]$1\\[/tr\\]");
-        bbMap.put("\n\\s+?\n  \n   ([\\S\\s]+?)\n  \n 
      "
+        bbMap.put("\\s*?([\\S\\s]+?)<\\/td>", "\\[td\\]$1\\[/td\\]");
+        bbMap.put("([\\S\\s]+?)\n   <\\/tr>", "\\[tr\\]$1\\[/tr\\]");
+        bbMap.put("\\s*?\n  \n   ([\\S\\s]+?)\n  <\\/tbody>\n <\\/table>"
                 , "\\[table\\]$2\\[/table\\]");
         //videos
-        bbMap.put("\n\\s+?
      \n",
+        bbMap.put("\\s*?
      .+?watch\\?v=(.+?)\"((.|\\n)*?)/div>\n",
                 "[youtube]https://www.youtube.com/watch?v=$1[/youtube]");
         //ftp
-        bbMap.put("([\\S\\s]+?)", "\\[fpt=ftp:$1\\]$2\\[/ftp\\]");
+        bbMap.put("([\\S\\s]+?)<\\/a>", "\\[fpt=ftp:$1\\]$2\\[/ftp\\]");
         //mailto
-        bbMap.put("\n\\s+?([\\S\\s]+?)", "\\[email\\]$2\\[/email\\]");
+        bbMap.put("\\s*?([\\S\\s]+?)<\\/a>", "\\[email\\]$2\\[/email\\]");
         //links
-        bbMap.put("\n\\s+?([\\S\\s]+?)", "\\[url=$1\\]$2\\[/url\\]");
+        bbMap.put("\\s*?([\\S\\s]+?)", "\\[url=$1\\]$2\\[/url\\]");
         //smileys
         for (Map.Entry entry : smileysMap1.entrySet()) {
             bbMap.put("\n \""", "\\[img height=$2\\]$1\\[/img\\]");
         html = html.replaceAll("\\s+", "\\[img\\]$1\\[/img\\]");
 
+        Log.d("Cancer", html);
         return html;
     }
 }
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 8cb77d90..5c170204 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
@@ -226,6 +226,7 @@ public class TopicActivity extends BaseActivity {
         // Inflates the menu; this adds items to the action bar if it is present.
         getMenuInflater().inflate(R.menu.topic_menu, menu);
         setTopicBookmark(menu.getItem(0));
+        super.onCreateOptionsMenu(menu);
         return true;
     }
 
@@ -269,8 +270,9 @@ public class TopicActivity extends BaseActivity {
 
     @Override
     protected void onResume() {
-        drawer.setSelection(-1);
         super.onResume();
+        refreshTopicBookmark();
+        drawer.setSelection(-1);
     }
 
     @Override
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 b37ec5e4..aa17b311 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
@@ -181,6 +181,7 @@ class TopicAdapter extends RecyclerView.Adapter {
             //Post's WebView parameters
             holder.post.setClickable(true);
             holder.post.setWebViewClient(new LinkLauncher());
+            holder.post.setLayerType(View.LAYER_TYPE_SOFTWARE, null);
 
             //Avoids errors about layout having 0 width/height
             holder.thumbnail.setMinimumWidth(1);
diff --git a/app/src/main/java/gr/thmmy/mthmmy/base/BaseActivity.java b/app/src/main/java/gr/thmmy/mthmmy/base/BaseActivity.java
index f43d603f..f844573d 100644
--- a/app/src/main/java/gr/thmmy/mthmmy/base/BaseActivity.java
+++ b/app/src/main/java/gr/thmmy/mthmmy/base/BaseActivity.java
@@ -337,7 +337,7 @@ public abstract class BaseActivity extends AppCompatActivity {
 
         drawer = drawerBuilder.build();
 
-        if(!(BaseActivity.this instanceof MainActivity))
+        if (!(BaseActivity.this instanceof MainActivity))
             drawer.getActionBarDrawerToggle().setDrawerIndicatorEnabled(false);
 
         drawer.setOnDrawerNavigationListener(new Drawer.OnDrawerNavigationListener() {
@@ -396,7 +396,7 @@ public abstract class BaseActivity extends AppCompatActivity {
         protected void onPostExecute(Integer result) {
             Toast.makeText(getBaseContext(), "Logged out successfully!", Toast.LENGTH_LONG).show();
             updateDrawer();
-            if(mainActivity!=null)
+            if (mainActivity != null)
                 mainActivity.updateTabs();
             progressDialog.dismiss();
         }
@@ -422,6 +422,18 @@ public abstract class BaseActivity extends AppCompatActivity {
         }
     }
 
+    protected void refreshTopicBookmark() {
+        if (thisPageBookmarkMenuButton == null) {
+            return;
+        }
+        loadSavedBookmarks();
+        if (thisPageBookmark.matchExists(topicsBookmarked)) {
+            thisPageBookmarkMenuButton.setIcon(bookmarked);
+        } else {
+            thisPageBookmarkMenuButton.setIcon(notBookmarked);
+        }
+    }
+
     protected void topicMenuBookmarkClick() {
         if (thisPageBookmark.matchExists(topicsBookmarked)) {
             thisPageBookmarkMenuButton.setIcon(notBookmarked);
@@ -455,6 +467,17 @@ public abstract class BaseActivity extends AppCompatActivity {
         });
     }
 
+    protected void refreshBoardBookmark(final ImageButton thisPageBookmarkImageButton) {
+        if (thisPageBookmarkImageButton == null)
+            return;
+        loadSavedBookmarks();
+        if (thisPageBookmark.matchExists(boardsBookmarked)) {
+            thisPageBookmarkImageButton.setImageDrawable(bookmarked);
+        } else {
+            thisPageBookmarkImageButton.setImageDrawable(notBookmarked);
+        }
+    }
+
     private void loadSavedBookmarks() {
         String tmpString = bookmarksFile.getString(BOOKMARKED_TOPICS_KEY, null);
         if (tmpString != null)
@@ -568,8 +591,7 @@ public abstract class BaseActivity extends AppCompatActivity {
     }
 
     //----------------------------------MISC----------------------
-    protected void setMainActivity(MainActivity mainActivity)
-    {
+    protected void setMainActivity(MainActivity mainActivity) {
         this.mainActivity = mainActivity;
     }
 
diff --git a/app/src/main/java/gr/thmmy/mthmmy/utils/ParseHelpers.java b/app/src/main/java/gr/thmmy/mthmmy/utils/ParseHelpers.java
index 75a9fa72..a2e80cca 100644
--- a/app/src/main/java/gr/thmmy/mthmmy/utils/ParseHelpers.java
+++ b/app/src/main/java/gr/thmmy/mthmmy/utils/ParseHelpers.java
@@ -156,7 +156,7 @@ public class ParseHelpers {
                             + ""
                             + ""
+                            + "src=\"YouTube_light_color_icon.png\">"
                             + ""
                             + "