From 98f8b269b0fde159848a3874e3de739f1f754bcd Mon Sep 17 00:00:00 2001
From: Thomas <tschneider.ac@gmail.com>
Date: Wed, 7 Dec 2022 18:12:32 +0100
Subject: [PATCH] Some fixes

---
 .../activities/FollowedTagActivity.java       |  4 +--
 .../app/fedilab/android/helper/Helper.java    |  2 +-
 app/src/main/res/values-night/themes.xml      | 36 +++++++++----------
 app/src/main/res/values/colors.xml            |  5 ++-
 4 files changed, 25 insertions(+), 22 deletions(-)

diff --git a/app/src/main/java/app/fedilab/android/activities/FollowedTagActivity.java b/app/src/main/java/app/fedilab/android/activities/FollowedTagActivity.java
index 8dbd904d..bd5732e3 100644
--- a/app/src/main/java/app/fedilab/android/activities/FollowedTagActivity.java
+++ b/app/src/main/java/app/fedilab/android/activities/FollowedTagActivity.java
@@ -108,7 +108,7 @@ public class FollowedTagActivity extends BaseBarActivity implements FollowedTagA
                         fragmentMastodonTimeline.onDestroyView();
                     }
                     invalidateOptionsMenu();
-                    setTitle(R.string.action_lists);
+                    setTitle(R.string.followed_tags);
                 });
                 if (tagList.size() == 0) {
                     binding.notContent.setVisibility(View.VISIBLE);
@@ -177,7 +177,7 @@ public class FollowedTagActivity extends BaseBarActivity implements FollowedTagA
                     fragmentMastodonTimeline.onDestroyView();
                 }
             });
-            setTitle(R.string.action_lists);
+            setTitle(R.string.followed_tags);
             invalidateOptionsMenu();
         } else {
             super.onBackPressed();
diff --git a/app/src/main/java/app/fedilab/android/helper/Helper.java b/app/src/main/java/app/fedilab/android/helper/Helper.java
index 09ed1de6..8b10a874 100644
--- a/app/src/main/java/app/fedilab/android/helper/Helper.java
+++ b/app/src/main/java/app/fedilab/android/helper/Helper.java
@@ -323,7 +323,7 @@ public class Helper {
 
             Pattern.CASE_INSENSITIVE | Pattern.MULTILINE | Pattern.DOTALL);*/
 
-    public static final Pattern hashtagPattern = Pattern.compile("(#[\\w_A-zÀ-ÿ]+)");
+    public static final Pattern hashtagPattern = Pattern.compile("(^|\\s+|[.,;?!-]+)(#[\\w_A-zÀ-ÿ]+)");
     public static final Pattern groupPattern = Pattern.compile("(![\\w_]+)");
     public static final Pattern mentionPattern = Pattern.compile("(@[\\w_.-]+[\\w])");
     public static final Pattern mentionLongPattern = Pattern.compile("(@[\\w_.-]+@[a-zA-Z0-9][a-zA-Z0-9.-]{1,61}[a-zA-Z0-9](?:\\.[a-zA-Z]{2,})+)");
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
index e4ca4922..90a50a64 100644
--- a/app/src/main/res/values-night/themes.xml
+++ b/app/src/main/res/values-night/themes.xml
@@ -228,18 +228,18 @@
     <!-- BLACK THEME -->
 
     <style name="BlackAppTheme" parent="AppTheme">
-        <item name="linkColor">@color/md_theme_dark_primary</item>
+        <item name="linkColor">@color/black_200</item>
         <item name="colorPrimary">@color/dracula_comment</item>
         <item name="colorOnPrimary">@color/white</item>
-        <item name="colorPrimaryContainer">@color/dracula_comment</item>
+        <item name="colorPrimaryContainer">@color/black_400</item>
         <item name="colorOnPrimaryContainer">@color/white</item>
-        <item name="colorSecondary">@color/dracula_comment</item>
+        <item name="colorSecondary">@color/black_400</item>
         <item name="colorOnSecondary">@color/white</item>
-        <item name="colorSecondaryContainer">@color/dracula_comment</item>
+        <item name="colorSecondaryContainer">@color/black_400</item>
         <item name="colorOnSecondaryContainer">@color/white</item>
-        <item name="colorTertiary">@color/dracula_comment</item>
+        <item name="colorTertiary">@color/black_400</item>
         <item name="colorOnTertiary">@color/white</item>
-        <item name="colorTertiaryContainer">@color/dracula_comment</item>
+        <item name="colorTertiaryContainer">@color/black_400</item>
         <item name="colorOnTertiaryContainer">@color/white</item>
         <item name="colorError">@color/solarized_md_theme_dark_error</item>
         <item name="colorErrorContainer">@color/solarized_md_theme_dark_errorContainer</item>
@@ -258,18 +258,18 @@
     </style>
 
     <style name="BlackAppThemeBar" parent="AppThemeBar">
-        <item name="linkColor">@color/md_theme_dark_primary</item>
+        <item name="linkColor">@color/black_200</item>
         <item name="colorPrimary">@color/dracula_comment</item>
         <item name="colorOnPrimary">@color/white</item>
-        <item name="colorPrimaryContainer">@color/dracula_comment</item>
+        <item name="colorPrimaryContainer">@color/black_400</item>
         <item name="colorOnPrimaryContainer">@color/white</item>
-        <item name="colorSecondary">@color/dracula_comment</item>
+        <item name="colorSecondary">@color/black_400</item>
         <item name="colorOnSecondary">@color/white</item>
-        <item name="colorSecondaryContainer">@color/dracula_comment</item>
+        <item name="colorSecondaryContainer">@color/black_400</item>
         <item name="colorOnSecondaryContainer">@color/white</item>
-        <item name="colorTertiary">@color/dracula_comment</item>
+        <item name="colorTertiary">@color/black_400</item>
         <item name="colorOnTertiary">@color/white</item>
-        <item name="colorTertiaryContainer">@color/dracula_comment</item>
+        <item name="colorTertiaryContainer">@color/black_400</item>
         <item name="colorOnTertiaryContainer">@color/white</item>
         <item name="colorError">@color/solarized_md_theme_dark_error</item>
         <item name="colorErrorContainer">@color/solarized_md_theme_dark_errorContainer</item>
@@ -296,18 +296,18 @@
     </style>
 
     <style name="BlackAlertDialog" parent="Theme.Material3.Dark.Dialog.Alert">
-        <item name="linkColor">@color/md_theme_dark_primary</item>
+        <item name="linkColor">@color/black_200</item>
         <item name="colorPrimary">@color/dracula_comment</item>
         <item name="colorOnPrimary">@color/white</item>
-        <item name="colorPrimaryContainer">@color/dracula_comment</item>
+        <item name="colorPrimaryContainer">@color/black_400</item>
         <item name="colorOnPrimaryContainer">@color/white</item>
-        <item name="colorSecondary">@color/dracula_comment</item>
+        <item name="colorSecondary">@color/black_400</item>
         <item name="colorOnSecondary">@color/white</item>
-        <item name="colorSecondaryContainer">@color/dracula_comment</item>
+        <item name="colorSecondaryContainer">@color/black_400</item>
         <item name="colorOnSecondaryContainer">@color/white</item>
-        <item name="colorTertiary">@color/dracula_comment</item>
+        <item name="colorTertiary">@color/black_400</item>
         <item name="colorOnTertiary">@color/white</item>
-        <item name="colorTertiaryContainer">@color/dracula_comment</item>
+        <item name="colorTertiaryContainer">@color/black_400</item>
         <item name="colorOnTertiaryContainer">@color/white</item>
         <item name="colorError">@color/solarized_md_theme_dark_error</item>
         <item name="colorErrorContainer">@color/solarized_md_theme_dark_errorContainer</item>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index c4a24ad3..f31664d8 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -62,7 +62,10 @@
     <color name="md_theme_dark_surfaceTint">#CDBDFF</color>
     <color name="md_theme_dark_outlineVariant">#48454E</color>
     <color name="md_theme_dark_scrim">#000000</color>
-    
+
+    <color name="black_400">#78909C</color>
+    <color name="black_200">#B0BEC5</color>
+
 
     <color name="dracula_pink">#ff79c6</color>
     <color name="dracula_green">#50fa7b</color>