Fixed some default colors.

4 files changed, 31 insertions, 31 deletions

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 7f137eed..3a30ba62 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/CustomTheme/CustomThemeWrapper.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/CustomTheme/CustomThemeWrapper.java
@@ -404,12 +404,12 @@ public class CustomThemeWrapper {
 
     public int getFullyCollapsedCommentBackgroundColor() {
         return getThemeSharedPreferences().getInt(CustomThemeSharedPreferencesUtils.FULLY_COLLAPSED_COMMENT_BACKGROUND_COLOR,
-                getDefaultColor("#4185F4", "#4185F4", "#4185F4"));
+                getDefaultColor("#8EDFBA", "#21C561", "#21C561"));
     }
 
     public int getAwardedCommentBackgroundColor() {
         return getThemeSharedPreferences().getInt(CustomThemeSharedPreferencesUtils.AWARDED_COMMENT_BACKGROUND_COLOR,
-                getDefaultColor("#EEAB02", "#EEAB02", "#EEAB02"));
+                getDefaultColor("#FFF162", "#FF6400", "#FF6400"));
     }
 
     public int getNavBarColor() {
@@ -549,8 +549,8 @@ public class CustomThemeWrapper {
         customTheme.receivedMessageBackgroundColor = Color.parseColor("#4185F4");
         customTheme.sentMessageBackgroundColor = Color.parseColor("#31BF7D");
         customTheme.sendMessageIconColor = Color.parseColor("#4185F4");
-        customTheme.fullyCollapsedCommentBackgroundColor = Color.parseColor("#4185F4");
-        customTheme.awardedCommentBackgroundColor = Color.parseColor("#EEAB02");
+        customTheme.fullyCollapsedCommentBackgroundColor = Color.parseColor("#8EDFBA");
+        customTheme.awardedCommentBackgroundColor = Color.parseColor("#FFF162");
         customTheme.navBarColor = Color.parseColor("#FFFFFF");
         customTheme.isLightStatusBar = false;
         customTheme.isLightNavBar = true;
@@ -634,8 +634,8 @@ public class CustomThemeWrapper {
         customTheme.receivedMessageBackgroundColor = Color.parseColor("#4185F4");
         customTheme.sentMessageBackgroundColor = Color.parseColor("#31BF7D");
         customTheme.sendMessageIconColor = Color.parseColor("#4185F4");
-        customTheme.fullyCollapsedCommentBackgroundColor = Color.parseColor("#4185F4");
-        customTheme.awardedCommentBackgroundColor = Color.parseColor("#EEAB02");
+        customTheme.fullyCollapsedCommentBackgroundColor = Color.parseColor("#21C561");
+        customTheme.awardedCommentBackgroundColor = Color.parseColor("#FF6400");
         customTheme.navBarColor = Color.parseColor("#121212");
         customTheme.isLightStatusBar = false;
         customTheme.isLightNavBar = false;
@@ -719,8 +719,8 @@ public class CustomThemeWrapper {
         customTheme.receivedMessageBackgroundColor = Color.parseColor("#4185F4");
         customTheme.sentMessageBackgroundColor = Color.parseColor("#31BF7D");
         customTheme.sendMessageIconColor = Color.parseColor("#4185F4");
-        customTheme.fullyCollapsedCommentBackgroundColor = Color.parseColor("#4185F4");
-        customTheme.awardedCommentBackgroundColor = Color.parseColor("#EEAB02");
+        customTheme.fullyCollapsedCommentBackgroundColor = Color.parseColor("#21C561");
+        customTheme.awardedCommentBackgroundColor = Color.parseColor("#FF6400");
         customTheme.navBarColor = Color.parseColor("#000000");
         customTheme.isLightStatusBar = false;
         customTheme.isLightNavBar = false;
@@ -804,8 +804,8 @@ public class CustomThemeWrapper {
         customTheme.receivedMessageBackgroundColor = Color.parseColor("#4185F4");
         customTheme.sentMessageBackgroundColor = Color.parseColor("#31BF7D");
         customTheme.sendMessageIconColor = Color.parseColor("#4185F4");
-        customTheme.fullyCollapsedCommentBackgroundColor = Color.parseColor("#4185F4");
-        customTheme.awardedCommentBackgroundColor = Color.parseColor("#EEAB02");
+        customTheme.fullyCollapsedCommentBackgroundColor = Color.parseColor("#8EDFBA");
+        customTheme.awardedCommentBackgroundColor = Color.parseColor("#FFF162");
         customTheme.navBarColor = Color.parseColor("#FFFFFF");
         customTheme.isLightStatusBar = true;
         customTheme.isLightNavBar = true;
@@ -889,8 +889,8 @@ public class CustomThemeWrapper {
         customTheme.receivedMessageBackgroundColor = Color.parseColor("#4185F4");
         customTheme.sentMessageBackgroundColor = Color.parseColor("#31BF7D");
         customTheme.sendMessageIconColor = Color.parseColor("#4185F4");
-        customTheme.fullyCollapsedCommentBackgroundColor = Color.parseColor("#4185F4");
-        customTheme.awardedCommentBackgroundColor = Color.parseColor("#EEAB02");
+        customTheme.fullyCollapsedCommentBackgroundColor = Color.parseColor("#21C561");
+        customTheme.awardedCommentBackgroundColor = Color.parseColor("#FF6400");
         customTheme.navBarColor = Color.parseColor("#121212");
         customTheme.isLightStatusBar = false;
         customTheme.isLightNavBar = false;
@@ -974,8 +974,8 @@ public class CustomThemeWrapper {
         customTheme.receivedMessageBackgroundColor = Color.parseColor("#4185F4");
         customTheme.sentMessageBackgroundColor = Color.parseColor("#31BF7D");
         customTheme.sendMessageIconColor = Color.parseColor("#4185F4");
-        customTheme.fullyCollapsedCommentBackgroundColor = Color.parseColor("#4185F4");
-        customTheme.awardedCommentBackgroundColor = Color.parseColor("#EEAB02");
+        customTheme.fullyCollapsedCommentBackgroundColor = Color.parseColor("#21C561");
+        customTheme.awardedCommentBackgroundColor = Color.parseColor("#FF6400");
         customTheme.navBarColor = Color.parseColor("#000000");
         customTheme.isLightStatusBar = false;
         customTheme.isLightNavBar = false;
@@ -1059,8 +1059,8 @@ public class CustomThemeWrapper {
         customTheme.receivedMessageBackgroundColor = Color.parseColor("#4185F4");
         customTheme.sentMessageBackgroundColor = Color.parseColor("#31BF7D");
         customTheme.sendMessageIconColor = Color.parseColor("#4185F4");
-        customTheme.fullyCollapsedCommentBackgroundColor = Color.parseColor("#4185F4");
-        customTheme.awardedCommentBackgroundColor = Color.parseColor("#EEAB02");
+        customTheme.fullyCollapsedCommentBackgroundColor = Color.parseColor("#8EDFBA");
+        customTheme.awardedCommentBackgroundColor = Color.parseColor("#FFF162");
         customTheme.navBarColor = Color.parseColor("#FFFFFF");
         customTheme.isLightStatusBar = false;
         customTheme.isLightNavBar = true;
@@ -1144,8 +1144,8 @@ public class CustomThemeWrapper {
         customTheme.receivedMessageBackgroundColor = Color.parseColor("#4185F4");
         customTheme.sentMessageBackgroundColor = Color.parseColor("#31BF7D");
         customTheme.sendMessageIconColor = Color.parseColor("#4185F4");
-        customTheme.fullyCollapsedCommentBackgroundColor = Color.parseColor("#4185F4");
-        customTheme.awardedCommentBackgroundColor = Color.parseColor("#EEAB02");
+        customTheme.fullyCollapsedCommentBackgroundColor = Color.parseColor("#21C561");
+        customTheme.awardedCommentBackgroundColor = Color.parseColor("#FF6400");
         customTheme.navBarColor = Color.parseColor("#121212");
         customTheme.isLightStatusBar = false;
         customTheme.isLightNavBar = false;
@@ -1229,8 +1229,8 @@ public class CustomThemeWrapper {
         customTheme.receivedMessageBackgroundColor = Color.parseColor("#4185F4");
         customTheme.sentMessageBackgroundColor = Color.parseColor("#31BF7D");
         customTheme.sendMessageIconColor = Color.parseColor("#4185F4");
-        customTheme.fullyCollapsedCommentBackgroundColor = Color.parseColor("#4185F4");
-        customTheme.awardedCommentBackgroundColor = Color.parseColor("#EEAB02");
+        customTheme.fullyCollapsedCommentBackgroundColor = Color.parseColor("#21C561");
+        customTheme.awardedCommentBackgroundColor = Color.parseColor("#FF6400");
         customTheme.navBarColor = Color.parseColor("#000000");
         customTheme.isLightStatusBar = false;
         customTheme.isLightNavBar = false;
@@ -1314,8 +1314,8 @@ public class CustomThemeWrapper {
         customTheme.receivedMessageBackgroundColor = Color.parseColor("#4185F4");
         customTheme.sentMessageBackgroundColor = Color.parseColor("#31BF7D");
         customTheme.sendMessageIconColor = Color.parseColor("#4185F4");
-        customTheme.fullyCollapsedCommentBackgroundColor = Color.parseColor("#4185F4");
-        customTheme.awardedCommentBackgroundColor = Color.parseColor("#EEAB02");
+        customTheme.fullyCollapsedCommentBackgroundColor = Color.parseColor("#21C561");
+        customTheme.awardedCommentBackgroundColor = Color.parseColor("#FF6400");
         customTheme.navBarColor = Color.parseColor("#393A59");
         customTheme.isLightStatusBar = false;
         customTheme.isLightNavBar = false;
@@ -1399,8 +1399,8 @@ public class CustomThemeWrapper {
         customTheme.receivedMessageBackgroundColor = Color.parseColor("#4185F4");
         customTheme.sentMessageBackgroundColor = Color.parseColor("#31BF7D");
         customTheme.sendMessageIconColor = Color.parseColor("#4185F4");
-        customTheme.fullyCollapsedCommentBackgroundColor = Color.parseColor("#4185F4");
-        customTheme.awardedCommentBackgroundColor = Color.parseColor("#EEAB02");
+        customTheme.fullyCollapsedCommentBackgroundColor = Color.parseColor("#8EDFBA");
+        customTheme.awardedCommentBackgroundColor = Color.parseColor("#FFF162");
         customTheme.navBarColor = Color.parseColor("#D48AE0");
         customTheme.isLightStatusBar = true;
         customTheme.isLightNavBar = true;
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Fragment/ThemePreviewCommentsFragment.java b/app/src/main/java/ml/docilealligator/infinityforreddit/Fragment/ThemePreviewCommentsFragment.java
index bab3db01..7dff8e8c 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Fragment/ThemePreviewCommentsFragment.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/Fragment/ThemePreviewCommentsFragment.java
@@ -89,8 +89,8 @@ public class ThemePreviewCommentsFragment extends Fragment {
     LinearLayout linearLayoutFullyCollapsed;
     @BindView(R.id.vertical_block_fully_collapsed_theme_preview_comments_fragment)
     View verticalBlockFullyCollapsed;
-    @BindView(R.id.user_name_text_view_fully_collapsed_theme_preview_comments_fragment)
-    TextView usernameTextView;
+    @BindView(R.id.author_text_view_fully_collapsed_theme_preview_comments_fragment)
+    TextView authorTextViewFullyCollapsed;
     @BindView(R.id.score_text_view_fully_collapsed_theme_preview_comments_fragment)
     TextView scoreTextViewFullyCollapsed;
     @BindView(R.id.time_text_view_fully_collapsed_theme_preview_comments_fragment)
@@ -140,8 +140,8 @@ public class ThemePreviewCommentsFragment extends Fragment {
         replyButtonAwardBackground.setColorFilter(customTheme.commentIconAndInfoColor, android.graphics.PorterDuff.Mode.SRC_IN);
 
         linearLayoutFullyCollapsed.setBackgroundColor(customTheme.fullyCollapsedCommentBackgroundColor);
-        usernameTextView.setTextColor(customTheme.username);
-        scoreTextView.setTextColor(customTheme.secondaryTextColor);
+        authorTextViewFullyCollapsed.setTextColor(customTheme.username);
+        scoreTextViewFullyCollapsed.setTextColor(customTheme.secondaryTextColor);
         timeTextViewFullyCollapsed.setTextColor(customTheme.secondaryTextColor);
         return rootView;
     }
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/RedditDataRoomDatabase.java b/app/src/main/java/ml/docilealligator/infinityforreddit/RedditDataRoomDatabase.java
index d2d0d079..72ce475a 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/RedditDataRoomDatabase.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/RedditDataRoomDatabase.java
@@ -203,9 +203,9 @@ public abstract class RedditDataRoomDatabase extends RoomDatabase {
             database.execSQL("ALTER TABLE custom_themes"
                     + " ADD COLUMN send_message_icon_color INTEGER DEFAULT " + Color.parseColor("#4185F4") + " NOT NULL");
             database.execSQL("ALTER TABLE custom_themes"
-                    + " ADD COLUMN fully_collapsed_comment_background_color INTEGER DEFAULT " + Color.parseColor("#4185F4") + " NOT NULL");
+                    + " ADD COLUMN fully_collapsed_comment_background_color INTEGER DEFAULT " + Color.parseColor("#8EDFBA") + " NOT NULL");
             database.execSQL("ALTER TABLE custom_themes"
-                    + " ADD COLUMN awarded_comment_background_color INTEGER DEFAULT " + Color.parseColor("#EEAB02") + " NOT NULL");
+                    + " ADD COLUMN awarded_comment_background_color INTEGER DEFAULT " + Color.parseColor("#FFF162") + " NOT NULL");
 
         }
     };
diff --git a/app/src/main/res/layout/fragment_theme_preview_comments.xml b/app/src/main/res/layout/fragment_theme_preview_comments.xml
index a772b8ff..69e8d7f3 100644
--- a/app/src/main/res/layout/fragment_theme_preview_comments.xml
+++ b/app/src/main/res/layout/fragment_theme_preview_comments.xml
@@ -440,7 +440,7 @@
                 android:layout_height="match_parent" />
 
             <TextView
-                android:id="@+id/user_name_text_view_fully_collapsed_theme_preview_comments_fragment"
+                android:id="@+id/author_text_view_fully_collapsed_theme_preview_comments_fragment"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"