From ffa65a7dd86cd97673ef261235ce6ba8f521cf85 Mon Sep 17 00:00:00 2001
From: Alex Ning <chineseperson5@gmail.com>
Date: Fri, 26 Feb 2021 17:06:33 +0800
Subject: Change some colors. Add a current user icon.

---
 .../infinityforreddit/RedditDataRoomDatabase.java  |  2 +-
 .../CommentAndPostRecyclerViewAdapter.java         |  3 +++
 .../customtheme/CustomThemeWrapper.java            | 26 +++++++++++-----------
 app/src/main/res/drawable/ic_current_user_14dp.xml |  4 ++++
 4 files changed, 21 insertions(+), 14 deletions(-)
 create mode 100644 app/src/main/res/drawable/ic_current_user_14dp.xml

(limited to 'app/src/main')

diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/RedditDataRoomDatabase.java b/app/src/main/java/ml/docilealligator/infinityforreddit/RedditDataRoomDatabase.java
index 641f508a..3ebfcfc2 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/RedditDataRoomDatabase.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/RedditDataRoomDatabase.java
@@ -321,7 +321,7 @@ public abstract class RedditDataRoomDatabase extends RoomDatabase {
     private static final Migration MIGRATION_17_18 = new Migration(17, 18) {
         @Override
         public void migrate(@NonNull SupportSQLiteDatabase database) {
-            database.execSQL("ALTER TABLE custom_themes ADD COLUMN current_user INTEGER DEFAULT " + Color.parseColor("#A202EE") + " NOT NULL");
+            database.execSQL("ALTER TABLE custom_themes ADD COLUMN current_user INTEGER DEFAULT " + Color.parseColor("#00D5EA") + " NOT NULL");
             database.execSQL("ALTER TABLE custom_themes ADD COLUMN upvote_ratio_icon_tint INTEGER DEFAULT " + Color.parseColor("#0256EE") + " NOT NULL");
         }
     };
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/adapters/CommentAndPostRecyclerViewAdapter.java b/app/src/main/java/ml/docilealligator/infinityforreddit/adapters/CommentAndPostRecyclerViewAdapter.java
index 1ceec9a5..bfa2e0b1 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/adapters/CommentAndPostRecyclerViewAdapter.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/adapters/CommentAndPostRecyclerViewAdapter.java
@@ -1070,6 +1070,9 @@ public class CommentAndPostRecyclerViewAdapter extends RecyclerView.Adapter<Recy
                         moderatorDrawable, null, null, null);
             } else if (comment.getAuthor().equals(mAccountName)) {
                 ((CommentViewHolder) holder).authorTextView.setTextColor(mCurrentUserColor);
+                Drawable currentUserDrawable = Utils.getTintedDrawable(mActivity, R.drawable.ic_current_user_14dp, mCurrentUserColor);
+                ((CommentViewHolder) holder).authorTextView.setCompoundDrawablesWithIntrinsicBounds(
+                        currentUserDrawable, null, null, null);
             }
 
             if (mShowElapsedTime) {
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/customtheme/CustomThemeWrapper.java b/app/src/main/java/ml/docilealligator/infinityforreddit/customtheme/CustomThemeWrapper.java
index cbdc58ea..84c8f326 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/customtheme/CustomThemeWrapper.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/customtheme/CustomThemeWrapper.java
@@ -329,7 +329,7 @@ public class CustomThemeWrapper {
 
     public int getCurrentUser() {
         return getThemeSharedPreferences().getInt(CustomThemeSharedPreferencesUtils.CURRENT_USER,
-                getDefaultColor("#A202EE", "#A202EE", "#A202EE"));
+                getDefaultColor("#00D5EA", "#00D5EA", "#00D5EA"));
     }
 
     public int getSingleCommentThreadBackgroundColor() {
@@ -564,7 +564,7 @@ public class CustomThemeWrapper {
         customTheme.authorFlairTextColor = Color.parseColor("#EE02C4");
         customTheme.submitter = Color.parseColor("#EE8A02");
         customTheme.moderator = Color.parseColor("#00BA81");
-        customTheme.currentUser = Color.parseColor("#A202EE");
+        customTheme.currentUser = Color.parseColor("#00D5EA");
         customTheme.singleCommentThreadBackgroundColor = Color.parseColor("#B3E5F9");
         customTheme.unreadMessageBackgroundColor = Color.parseColor("#B3E5F9");
         customTheme.dividerColor = Color.parseColor("#E0E0E0");
@@ -655,7 +655,7 @@ public class CustomThemeWrapper {
         customTheme.authorFlairTextColor = Color.parseColor("#EE02C4");
         customTheme.submitter = Color.parseColor("#EE8A02");
         customTheme.moderator = Color.parseColor("#00BA81");
-        customTheme.currentUser = Color.parseColor("#A202EE");
+        customTheme.currentUser = Color.parseColor("#00D5EA");
         customTheme.singleCommentThreadBackgroundColor = Color.parseColor("#123E77");
         customTheme.unreadMessageBackgroundColor = Color.parseColor("#123E77");
         customTheme.dividerColor = Color.parseColor("#69666C");
@@ -746,7 +746,7 @@ public class CustomThemeWrapper {
         customTheme.authorFlairTextColor = Color.parseColor("#EE02C4");
         customTheme.submitter = Color.parseColor("#EE8A02");
         customTheme.moderator = Color.parseColor("#00BA81");
-        customTheme.currentUser = Color.parseColor("#A202EE");
+        customTheme.currentUser = Color.parseColor("#00D5EA");
         customTheme.singleCommentThreadBackgroundColor = Color.parseColor("#123E77");
         customTheme.unreadMessageBackgroundColor = Color.parseColor("#123E77");
         customTheme.dividerColor = Color.parseColor("#69666C");
@@ -837,7 +837,7 @@ public class CustomThemeWrapper {
         customTheme.authorFlairTextColor = Color.parseColor("#EE02C4");
         customTheme.submitter = Color.parseColor("#EE8A02");
         customTheme.moderator = Color.parseColor("#00BA81");
-        customTheme.currentUser = Color.parseColor("#A202EE");
+        customTheme.currentUser = Color.parseColor("#00D5EA");
         customTheme.singleCommentThreadBackgroundColor = Color.parseColor("#B3E5F9");
         customTheme.unreadMessageBackgroundColor = Color.parseColor("#B3E5F9");
         customTheme.dividerColor = Color.parseColor("#E0E0E0");
@@ -928,7 +928,7 @@ public class CustomThemeWrapper {
         customTheme.authorFlairTextColor = Color.parseColor("#EE02C4");
         customTheme.submitter = Color.parseColor("#EE8A02");
         customTheme.moderator = Color.parseColor("#00BA81");
-        customTheme.currentUser = Color.parseColor("#A202EE");
+        customTheme.currentUser = Color.parseColor("#00D5EA");
         customTheme.singleCommentThreadBackgroundColor = Color.parseColor("#123E77");
         customTheme.unreadMessageBackgroundColor = Color.parseColor("#123E77");
         customTheme.dividerColor = Color.parseColor("#69666C");
@@ -1019,7 +1019,7 @@ public class CustomThemeWrapper {
         customTheme.authorFlairTextColor = Color.parseColor("#EE02C4");
         customTheme.submitter = Color.parseColor("#EE8A02");
         customTheme.moderator = Color.parseColor("#00BA81");
-        customTheme.currentUser = Color.parseColor("#A202EE");
+        customTheme.currentUser = Color.parseColor("#00D5EA");
         customTheme.singleCommentThreadBackgroundColor = Color.parseColor("#123E77");
         customTheme.unreadMessageBackgroundColor = Color.parseColor("#123E77");
         customTheme.dividerColor = Color.parseColor("#69666C");
@@ -1110,7 +1110,7 @@ public class CustomThemeWrapper {
         customTheme.authorFlairTextColor = Color.parseColor("#EE02C4");
         customTheme.submitter = Color.parseColor("#EE8A02");
         customTheme.moderator = Color.parseColor("#00BA81");
-        customTheme.currentUser = Color.parseColor("#A202EE");
+        customTheme.currentUser = Color.parseColor("#00D5EA");
         customTheme.singleCommentThreadBackgroundColor = Color.parseColor("#B3E5F9");
         customTheme.unreadMessageBackgroundColor = Color.parseColor("#B3E5F9");
         customTheme.dividerColor = Color.parseColor("#E0E0E0");
@@ -1201,7 +1201,7 @@ public class CustomThemeWrapper {
         customTheme.authorFlairTextColor = Color.parseColor("#EE02C4");
         customTheme.submitter = Color.parseColor("#EE8A02");
         customTheme.moderator = Color.parseColor("#00BA81");
-        customTheme.currentUser = Color.parseColor("#A202EE");
+        customTheme.currentUser = Color.parseColor("#00D5EA");
         customTheme.singleCommentThreadBackgroundColor = Color.parseColor("#123E77");
         customTheme.unreadMessageBackgroundColor = Color.parseColor("#123E77");
         customTheme.dividerColor = Color.parseColor("#69666C");
@@ -1292,7 +1292,7 @@ public class CustomThemeWrapper {
         customTheme.authorFlairTextColor = Color.parseColor("#EE02C4");
         customTheme.submitter = Color.parseColor("#EE8A02");
         customTheme.moderator = Color.parseColor("#00BA81");
-        customTheme.currentUser = Color.parseColor("#A202EE");
+        customTheme.currentUser = Color.parseColor("#00D5EA");
         customTheme.singleCommentThreadBackgroundColor = Color.parseColor("#123E77");
         customTheme.unreadMessageBackgroundColor = Color.parseColor("#123E77");
         customTheme.dividerColor = Color.parseColor("#69666C");
@@ -1374,7 +1374,7 @@ public class CustomThemeWrapper {
         customTheme.lockedIconTint = Color.parseColor("#EE7302");
         customTheme.crosspostIconTint = Color.parseColor("#FF4081");
         customTheme.upvoteRatioIconTint = Color.parseColor("#0256EE");
-        customTheme.stickiedPostIconTint = Color.parseColor("#0D47A1");
+        customTheme.stickiedPostIconTint = Color.parseColor("#02ABEE");
         customTheme.noPreviewPostTypeIconTint = Color.parseColor("#FFFFFF");
         customTheme.subscribed = Color.parseColor("#FF4081");
         customTheme.unsubscribed = Color.parseColor("#0D47A1");
@@ -1383,7 +1383,7 @@ public class CustomThemeWrapper {
         customTheme.authorFlairTextColor = Color.parseColor("#EE02C4");
         customTheme.submitter = Color.parseColor("#EE8A02");
         customTheme.moderator = Color.parseColor("#00BA81");
-        customTheme.currentUser = Color.parseColor("#A202EE");
+        customTheme.currentUser = Color.parseColor("#00D5EA");
         customTheme.singleCommentThreadBackgroundColor = Color.parseColor("#5F5B85");
         customTheme.unreadMessageBackgroundColor = Color.parseColor("#5F5B85");
         customTheme.dividerColor = Color.parseColor("#69666C");
@@ -1474,7 +1474,7 @@ public class CustomThemeWrapper {
         customTheme.authorFlairTextColor = Color.parseColor("#EE02C4");
         customTheme.submitter = Color.parseColor("#EE8A02");
         customTheme.moderator = Color.parseColor("#00BA81");
-        customTheme.currentUser = Color.parseColor("#A202EE");
+        customTheme.currentUser = Color.parseColor("#00D5EA");
         customTheme.singleCommentThreadBackgroundColor = Color.parseColor("#25D5E5");
         customTheme.unreadMessageBackgroundColor = Color.parseColor("#25D5E5");
         customTheme.dividerColor = Color.parseColor("#E0E0E0");
diff --git a/app/src/main/res/drawable/ic_current_user_14dp.xml b/app/src/main/res/drawable/ic_current_user_14dp.xml
new file mode 100644
index 00000000..26750fd4
--- /dev/null
+++ b/app/src/main/res/drawable/ic_current_user_14dp.xml
@@ -0,0 +1,4 @@
+<vector android:height="14dp" android:viewportHeight="24"
+    android:viewportWidth="24" android:width="14dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#000000" android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,5c1.66,0 3,1.34 3,3s-1.34,3 -3,3 -3,-1.34 -3,-3 1.34,-3 3,-3zM12,19.2c-2.5,0 -4.71,-1.28 -6,-3.22 0.03,-1.99 4,-3.08 6,-3.08 1.99,0 5.97,1.09 6,3.08 -1.29,1.94 -3.5,3.22 -6,3.22z"/>
+</vector>
-- 
cgit v1.2.3