Version 1.8.1

5 years ago · de4b9a2e14
46 changed files with 152 additions and 95 deletions
--- a/app/build.gradle
+++ b/app/build.gradle
@ -14,8 +14,8 @@ android {
        applicationId "gr.thmmy.mthmmy"
        minSdkVersion 19
        targetSdkVersion 29
-        versionCode 23
+        versionCode 24
-        versionName "1.8.0"
+        versionName "1.8.1"
        archivesBaseName = "mTHMMY-v$versionName"
        buildConfigField "String", "CURRENT_BRANCH", "\"" + getCurrentBranch() + "\""
        buildConfigField "String", "COMMIT_HASH", "\"" + getCommitHash() + "\""
@ -27,6 +27,7 @@ android {
            minifyEnabled true
            shrinkResources true
            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
            multiDexKeepProguard file('proguard-rules.pro') //TODO: Remove when minSdkVersion >= 21
        }
        debug {
            multiDexEnabled true
@ -83,20 +84,22 @@ dependencies {
    implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
    implementation 'androidx.exifinterface:exifinterface:1.2.0'
    implementation 'androidx.multidex:multidex:2.0.1'  //TODO: Remove when minSdkVersion >= 21
    implementation 'com.google.android.material:material:1.1.0'
-    implementation 'com.google.firebase:firebase-analytics:17.4.2'
+    implementation 'com.google.firebase:firebase-analytics:17.4.3'
    implementation 'com.google.firebase:firebase-messaging:20.2.0'
    implementation 'com.crashlytics.sdk.android:crashlytics:2.10.1'
    implementation 'com.snatik:storage:2.1.0'
-    implementation 'com.squareup.okhttp3:okhttp:3.12.12' //TODO: Warning: okhttp has dropped support for Android v.19 since okhttp 3.13!
+    implementation ('com.squareup.okhttp3:okhttp:3.12.12') {  //TODO: Warning: OkHttp has dropped support for Android 19 since OkHttp 3.13!
-    implementation 'org.jsoup:jsoup:1.10.3' //TODO: Warning: upgrading from 1.10.3 will break stuff!
+        force = true    //TODO: Remove when minSdkVersion >= 21
    }
    implementation 'org.jsoup:jsoup:1.13.1'
    implementation 'joda-time:joda-time:2.10.4'
    implementation 'com.github.franmontiel:PersistentCookieJar:1.0.1'
    implementation 'com.github.PhilJay:MPAndroidChart:3.0.3'
    implementation 'com.mikepenz:materialdrawer:6.1.1'
    implementation 'com.mikepenz:fontawesome-typeface:4.7.0.0@aar'
    implementation 'com.mikepenz:google-material-typeface:3.0.1.2.original@aar'
    implementation 'pl.droidsonroids.gif:android-gif-drawable:1.2.19'
    implementation 'com.bignerdranch.android:expandablerecyclerview:3.0.0-RC1'//TODO: deprecated!
    implementation 'com.github.chrisbanes:PhotoView:2.3.0'
    implementation 'me.zhanghai.android.materialprogressbar:library:1.4.2'
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@ -43,9 +43,6 @@
    <fields>;
 }
 # android-gif-drawable
 -keep public class pl.droidsonroids.gif.GifIOException{<init>(int, java.lang.String);}
 # JSoup
 -keep class org.jsoup.**
--- a/app/src/main/assets/mit_libraries.html
+++ b/app/src/main/assets/mit_libraries.html
@ -6,10 +6,7 @@
 <body>
 <ul>
    <li>
-        <h5><a href="https://jsoup.org">jsoup</a>&nbsp;v1.10.3 (Copyright ©2009-2017, Jonathan Hedley &lt;jonathan@hedley.net&gt;)</h5>
+        <h5><a href="https://jsoup.org">jsoup</a>&nbsp;v1.13.1 (Copyright ©2009-2020, Jonathan Hedley &lt;jonathan@hedley.net&gt;)</h5>
    </li>
    <li>
        <h5><a href="https://github.com/koral--/android-gif-drawable">android-gif-drawable</a>&nbsp;v1.2.19 (Copyright ©2013 -2020 Karol Wrótniak, Droids on Roids)</h5>
    </li>
    <li>
        <h5><a href="https://github.com/bignerdranch/expandable-recycler-view">Expandable RecyclerView</a>&nbsp;v3.0.0-RC1 (Copyright ©2015, Big Nerd Ranch)</h5>
--- a/app/src/main/assets/style.css
+++ b/app/src/main/assets/style.css
@ -519,7 +519,7 @@ img
 }
 .customSignature{
-    background: #323232;
+    background: #3C3F41;
 }
 [style="color: blue;"]
--- a/app/src/main/ic_launcher-playstore.png
+++ b/app/src/main/ic_launcher-playstore.png
--- a/app/src/main/java/gr/thmmy/mthmmy/activities/LoginActivity.java
+++ b/app/src/main/java/gr/thmmy/mthmmy/activities/LoginActivity.java
@ -6,6 +6,7 @@ import android.os.Bundle;
 import android.view.View;
 import android.view.inputmethod.InputMethodManager;
 import android.widget.EditText;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.ScrollView;
 import android.widget.Toast;
@ -13,6 +14,7 @@ import android.widget.Toast;
 import androidx.appcompat.widget.AppCompatButton;
 import androidx.preference.PreferenceManager;
 import com.bumptech.glide.Glide;
 import com.google.firebase.analytics.FirebaseAnalytics;
 import gr.thmmy.mthmmy.R;
@ -35,6 +37,7 @@ public class LoginActivity extends BaseActivity {
    private AppCompatButton btnLogin;
    private EditText inputUsername;
    private EditText inputPassword;
    private ImageView logo;
    private String username;
    private String password;
    /* --Graphics End-- */
@ -56,6 +59,9 @@ public class LoginActivity extends BaseActivity {
        inputPassword = findViewById(R.id.password);
        btnLogin = findViewById(R.id.btnLogin);
        AppCompatButton btnGuest = findViewById(R.id.btnContinueAsGuest);
        logo = findViewById(R.id.logo);
        Glide.with(this).load(R.drawable.logo_animated).into(logo);
        //Login button Click Event
        btnLogin.setOnClickListener(view -> {
--- a/app/src/main/java/gr/thmmy/mthmmy/activities/board/BoardAdapter.java
+++ b/app/src/main/java/gr/thmmy/mthmmy/activities/board/BoardAdapter.java
@ -77,11 +77,11 @@ class BoardAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
            subBoardTitle.setText(context.getString(R.string.child_board_title));
            subBoardTitle.setTypeface(subBoardTitle.getTypeface(), Typeface.BOLD);
            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-                subBoardTitle.setBackgroundColor(context.getColor(R.color.card_background));
+                subBoardTitle.setBackgroundColor(context.getColor(R.color.background_light));
                subBoardTitle.setTextColor(context.getColor(R.color.accent));
            } else {
                //noinspection deprecation
-                subBoardTitle.setBackgroundColor(context.getResources().getColor(R.color.card_background));
+                subBoardTitle.setBackgroundColor(context.getResources().getColor(R.color.background_light));
                //noinspection deprecation
                subBoardTitle.setTextColor(context.getResources().getColor(R.color.accent));
            }
--- a/app/src/main/java/gr/thmmy/mthmmy/activities/profile/latestPosts/LatestPostsAdapter.java
+++ b/app/src/main/java/gr/thmmy/mthmmy/activities/profile/latestPosts/LatestPostsAdapter.java
@ -53,12 +53,12 @@ class LatestPostsAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
    public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
        if (viewType == VIEW_TYPE_EMPTY) {
            View view = LayoutInflater.from(parent.getContext()).
-                    inflate(R.layout.fragment_latest_posts_empty_message, parent, false);
+                    inflate(R.layout.fragment_profile_latest_posts_empty_message, parent, false);
            return new RecyclerView.ViewHolder(view){};
        }
        if (viewType == VIEW_TYPE_ITEM) {
            View view = LayoutInflater.from(parent.getContext()).
-                    inflate(R.layout.fragment_latest_posts_row, parent, false);
+                    inflate(R.layout.fragment_profile_latest_posts_row, parent, false);
            return new LatestPostViewHolder(view);
        } else if (viewType == VIEW_TYPE_LOADING) {
            View view = LayoutInflater.from(parent.getContext()).
--- a/app/src/main/java/gr/thmmy/mthmmy/activities/profile/latestPosts/LatestPostsFragment.java
+++ b/app/src/main/java/gr/thmmy/mthmmy/activities/profile/latestPosts/LatestPostsFragment.java
@ -84,7 +84,7 @@ public class LatestPostsFragment extends BaseFragment implements LatestPostsAdap
    @Override
    public View onCreateView(LayoutInflater inflater, ViewGroup container,
                             Bundle savedInstanceState) {
-        final View rootView = inflater.inflate(R.layout.fragment_latest_posts, container, false);
+        final View rootView = inflater.inflate(R.layout.fragment_profile_latest_posts, container, false);
        latestPostsAdapter = new LatestPostsAdapter(this.getContext(), fragmentInteractionListener, parsedTopicSummaries);
        RecyclerView mainContent = rootView.findViewById(R.id.profile_latest_posts_recycler);
        mainContent.setAdapter(latestPostsAdapter);
--- a/app/src/main/java/gr/thmmy/mthmmy/activities/profile/stats/StatsFragment.java
+++ b/app/src/main/java/gr/thmmy/mthmmy/activities/profile/stats/StatsFragment.java
@ -36,6 +36,8 @@ import org.jsoup.select.Elements;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import javax.net.ssl.SSLHandshakeException;
@ -90,7 +92,7 @@ public class StatsFragment extends Fragment {
    @Override
    public View onCreateView(LayoutInflater inflater, ViewGroup container,
                             Bundle savedInstanceState) {
-        final View rootView = inflater.inflate(R.layout.fragment_stats, container, false);
+        final View rootView = inflater.inflate(R.layout.fragment_profile_stats, container, false);
        mainContent = rootView.findViewById(R.id.main_content);
        progressBar = rootView.findViewById(R.id.progressBar);
        if (profileStatsTask!=null && profileStatsTask.getStatus() == AsyncTask.Status.FINISHED)
@ -172,6 +174,11 @@ public class StatsFragment extends Fragment {
            {
                Elements titleRows = statsPage.select("table.bordercolor[align]>tbody>tr.titlebg");
                generalStatisticsTitle = titleRows.first().text();
                Pattern pattern = Pattern.compile("(.+)\\s-");
                Matcher matcher = pattern.matcher(generalStatisticsTitle);
                if (matcher.find())
                    generalStatisticsTitle = matcher.group(1);
                if (userHasPosts) {
                    postingActivityByTimeTitle = titleRows.get(1).text();
                    mostPopularBoardsByPostsTitle = titleRows.last().select("td").first().text();
--- a/app/src/main/java/gr/thmmy/mthmmy/activities/profile/summary/SummaryFragment.java
+++ b/app/src/main/java/gr/thmmy/mthmmy/activities/profile/summary/SummaryFragment.java
@ -9,7 +9,6 @@ import android.text.method.LinkMovementMethod;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.webkit.WebView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
@ -25,6 +24,7 @@ import java.util.Objects;
 import gr.thmmy.mthmmy.R;
 import gr.thmmy.mthmmy.utils.parsing.ParseHelpers;
 import gr.thmmy.mthmmy.views.ReactiveWebView;
 import timber.log.Timber;
 /**
@ -76,7 +76,7 @@ public class SummaryFragment extends Fragment {
    @Override
    public View onCreateView(LayoutInflater inflater, ViewGroup container,
                             Bundle savedInstanceState) {
-        final View rootView = inflater.inflate(R.layout.fragment_summary, container, false);
+        final View rootView = inflater.inflate(R.layout.fragment_profile_summary, container, false);
        mainContent = rootView.findViewById(R.id.profile_activity_content);
        if (!parsedProfileSummaryData.isEmpty() && isAdded())
            populateLayout();
@ -169,7 +169,7 @@ public class SummaryFragment extends Fragment {
        for (String profileSummaryRow : parsedProfileSummaryData) {
            if (profileSummaryRow.contains("Signature")
                    || profileSummaryRow.contains("Υπογραφή")) { //This may contain css
-                WebView signatureEntry = new WebView(this.getContext());
+                ReactiveWebView signatureEntry = new ReactiveWebView(this.getContext());
                signatureEntry.setBackgroundColor(Color.argb(1, 255, 255, 255));
                signatureEntry.loadDataWithBaseURL("file:///android_asset/", profileSummaryRow,
                        "text/html", "UTF-8", null);
--- a/app/src/main/java/gr/thmmy/mthmmy/activities/topic/tasks/TopicTask.java
+++ b/app/src/main/java/gr/thmmy/mthmmy/activities/topic/tasks/TopicTask.java
@ -92,10 +92,10 @@ public class TopicTask extends AsyncTask<String, Void, TopicTaskResult> {
            String topicTitle = topic.select("td[id=top_subject]").first().text();
            if (topicTitle.contains("Topic:"))
                topicTitle = topicTitle.substring(topicTitle.indexOf("Topic:") + 7
-                        , topicTitle.indexOf("(Read") - 2);
+                        , topicTitle.indexOf("(Read") - 1);
            else
                topicTitle = topicTitle.substring(topicTitle.indexOf("Θέμα:") + 6
-                        , topicTitle.indexOf("(Αναγνώστηκε") - 2);
+                        , topicTitle.indexOf("(Αναγνώστηκε") - 1);
            //Finds current page's index
            int currentPageIndex = TopicParser.parseCurrentPageIndex(topic, language);
--- a/app/src/main/java/gr/thmmy/mthmmy/base/BaseApplication.java
+++ b/app/src/main/java/gr/thmmy/mthmmy/base/BaseApplication.java
@ -1,6 +1,5 @@
 package gr.thmmy.mthmmy.base;
 import android.app.Application;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.graphics.drawable.Drawable;
@ -11,6 +10,7 @@ import android.util.DisplayMetrics;
 import android.widget.ImageView;
 import androidx.core.content.ContextCompat;
 import androidx.multidex.MultiDexApplication;
 import androidx.preference.PreferenceManager;
 import com.bumptech.glide.Glide;
@ -50,7 +50,7 @@ import timber.log.Timber;
 import static gr.thmmy.mthmmy.activities.settings.SettingsActivity.DISPLAY_RELATIVE_TIME;
-public class BaseApplication extends Application {
+public class BaseApplication extends MultiDexApplication {
    private static BaseApplication baseApplication; //BaseApplication singleton
    //Firebase
--- a/app/src/main/res/drawable/ic_launcher_foreground.xml
+++ b/app/src/main/res/drawable/ic_launcher_foreground.xml
@ -12,12 +12,7 @@
      <clip-path
          android:pathData="M0,358.69a358.58,358.69 0,1 0,717.16 0a358.58,358.69 0,1 0,-717.16 0z"/>
      <path
-          android:pathData="M358.66,367.61c1,0 26,-75 37,-108.48 1.54,-4.68 7,-5.52 8.66,-0.27L493.66,473.03a4.29,4.29 0,0 0,7.93 0l27.28,-66.77a4.1,4.1 0,0 1,4 -2.43c61.43,0.08 122.87,-0.08 184.31,0"
+          android:pathData="M717.16,406.8c-61.44,-0.08 -122.88,0.08 -184.31,0a4.1,4.1 0,0 0,-4 2.43l-27.28,66.77a4.29,4.29 0,0 1,-7.93 0L404.35,261.86c-1.69,-5.25 -7.12,-4.41 -8.66,0.27C384.66,295.61 359.66,370.61 358.66,370.61s-26,-75 -37,-108.48c-1.54,-4.68 -7,-5.52 -8.66,-0.27L223.66,476.03a4.29,4.29 0,0 1,-7.93 0l-27.28,-66.77a4.1,4.1 0,0 0,-4 -2.43c-61.43,0.08 -122.87,-0.08 -184.31,0"
          android:strokeWidth="28"
          android:fillColor="#00000000"
          android:strokeColor="#6bdad5"/>
      <path
          android:pathData="M358.66,367.61c-1,0 -26,-75 -37,-108.48 -1.54,-4.68 -7,-5.52 -8.66,-0.27L223.66,473.03a4.29,4.29 0,0 1,-7.93 0l-27.28,-66.77a4.1,4.1 0,0 0,-4 -2.43c-61.43,0.08 -122.87,-0.08 -184.31,0"
          android:strokeWidth="28"
          android:fillColor="#00000000"
          android:strokeColor="#6bdad5"/>
--- a/app/src/main/res/drawable/logo_animated.gif
+++ b/app/src/main/res/drawable/logo_animated.gif
--- a/app/src/main/res/drawable/member_of_the_month_card.xml
+++ b/app/src/main/res/drawable/member_of_the_month_card.xml
@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/card_background"/>
+    <solid android:color="@color/background_light"/>
    <stroke
        android:width="1dip"
        android:color="@color/member_of_the_month"/>
--- a/app/src/main/res/drawable/mention_card.xml
+++ b/app/src/main/res/drawable/mention_card.xml
@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/card_background"/>
+    <solid android:color="@color/background_light"/>
    <stroke
        android:width="1dip"
        android:color="@color/mention_color"/>
--- a/app/src/main/res/layout-v21/activity_topic_post_row.xml
+++ b/app/src/main/res/layout-v21/activity_topic_post_row.xml
@ -15,7 +15,7 @@
        android:layout_height="match_parent"
        android:layout_gravity="center"
        android:foreground="?android:attr/selectableItemBackground"
-        card_view:cardBackgroundColor="@color/card_background"
+        card_view:cardBackgroundColor="@color/background_light"
        card_view:cardCornerRadius="5dp"
        card_view:cardElevation="2dp"
        card_view:cardPreventCornerOverlap="false"
@ -89,7 +89,7 @@
                    android:layout_width="@dimen/post_image_button"
                    android:layout_height="@dimen/post_image_button"
                    android:layout_marginTop="9dp"
-                    android:background="@color/card_background"
+                    android:background="@color/background_light"
                    android:clickable="true"
                    android:contentDescription="@string/post_quote_button"
                    android:focusable="true"
@ -111,7 +111,7 @@
                    android:layout_height="@dimen/post_image_button"
                    android:layout_marginTop="9dp"
                    android:layout_marginEnd="9dp"
-                    android:background="@color/card_background"
+                    android:background="@color/background_light"
                    android:clickable="true"
                    android:contentDescription="@string/post_overflow_menu_button"
                    android:focusable="true"
@ -232,7 +232,7 @@
                    android:layout_gravity="center"
                    android:layout_marginLeft="16dp"
                    android:layout_marginRight="16dp"
-                    android:background="@color/card_background"
+                    android:background="@color/background_light"
                    android:clickable="true"
                    android:focusable="true"
                    android:text="@string/post" />
--- a/app/src/main/res/layout-v23/activity_topic_overflow_menu.xml
+++ b/app/src/main/res/layout-v23/activity_topic_overflow_menu.xml
@ -0,0 +1,52 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
    android:layout_width="wrap_content"
    android:layout_height="wrap_content"
    android:background="@color/background_light"
    android:orientation="vertical">
    <TextView
        android:id="@+id/post_share_button"
        android:layout_width="wrap_content"
        android:layout_height="35dp"
        android:background="@color/background_light"
        android:foreground="?android:attr/selectableItemBackground"
        android:drawablePadding="5dp"
        android:gravity="center_vertical"
        android:paddingBottom="6dp"
        android:paddingEnd="12dp"
        android:paddingStart="12dp"
        android:paddingTop="6dp"
        android:text="@string/post_share_button"
        android:textColor="@color/primary_text" />
    <TextView
        android:id="@+id/edit_post"
        android:layout_width="wrap_content"
        android:layout_height="35dp"
        android:background="@color/background_light"
        android:foreground="?android:attr/selectableItemBackground"
        android:drawablePadding="5dp"
        android:gravity="center_vertical"
        android:paddingBottom="6dp"
        android:paddingEnd="12dp"
        android:paddingStart="12dp"
        android:paddingTop="6dp"
        android:text="@string/post_edit_button"
        android:textColor="@color/primary_text" />
    <TextView
        android:id="@+id/delete_post"
        android:layout_width="wrap_content"
        android:layout_height="35dp"
        android:background="@color/background_light"
        android:foreground="?android:attr/selectableItemBackground"
        android:drawablePadding="5dp"
        android:gravity="center_vertical"
        android:paddingBottom="6dp"
        android:paddingEnd="12dp"
        android:paddingStart="12dp"
        android:paddingTop="6dp"
        android:text="@string/post_delete_button"
        android:textColor="@color/primary_text" />
 </LinearLayout>
--- a/app/src/main/res/layout/activity_board_sub_board_row.xml
+++ b/app/src/main/res/layout/activity_board_sub_board_row.xml
@ -3,7 +3,7 @@
    xmlns:app="http://schemas.android.com/apk/res-auto"
    android:layout_width="match_parent"
    android:layout_height="wrap_content"
-    android:background="@color/card_background">
+    android:background="@color/background_light">
    <LinearLayout
        android:id="@+id/child_board_row"
--- a/app/src/main/res/layout/activity_downloads_row.xml
+++ b/app/src/main/res/layout/activity_downloads_row.xml
@ -5,7 +5,7 @@
    android:id="@+id/upper_linear"
    android:layout_width="match_parent"
    android:layout_height="wrap_content"
-    android:background="@color/card_background"
+    android:background="@color/background_light"
    android:orientation="vertical">
    <LinearLayout
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@ -24,21 +24,20 @@
            <Space
                android:layout_width="match_parent"
                android:layout_height="0dp"
-                android:layout_weight="0.4"/>
+                android:layout_weight="0.45"/>
-            <pl.droidsonroids.gif.GifImageView
+            <ImageView
                android:id="@+id/logo"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:layout_gravity="center_horizontal"
                android:contentDescription="@string/thmmy_img_description"
                android:src="@drawable/logo_animated"
                />
            <Space
                android:layout_width="match_parent"
                android:layout_height="0dp"
-                android:layout_weight="0.45"/>
+                android:layout_weight="0.35"/>
            <!--  Username Label -->
            <com.google.android.material.textfield.TextInputLayout
@ -49,8 +48,9 @@
                    android:id="@+id/username"
                    android:layout_width="match_parent"
                    android:layout_height="wrap_content"
                    android:inputType="textPersonName"
                    android:hint="@string/hint_username"
-                    android:inputType="textPersonName"/>
+                    android:autofillHints="username" />
            </com.google.android.material.textfield.TextInputLayout>
            <Space
@ -62,14 +62,16 @@
            <com.google.android.material.textfield.TextInputLayout
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
-                app:passwordToggleEnabled="true">
+                app:passwordToggleEnabled="true"
                app:passwordToggleTint="@color/primary_text">
                <EditText
                    android:id="@+id/password"
                    android:layout_width="match_parent"
                    android:layout_height="wrap_content"
                    android:inputType="textPassword"
                    android:hint="@string/hint_password"
-                    android:inputType="textPassword"/>
+                    android:autofillHints="password" />
            </com.google.android.material.textfield.TextInputLayout>
            <Space
--- a/app/src/main/res/layout/activity_topic_edit_row.xml
+++ b/app/src/main/res/layout/activity_topic_edit_row.xml
@ -13,7 +13,7 @@
        android:layout_height="match_parent"
        android:layout_gravity="center"
        android:foreground="?android:attr/selectableItemBackground"
-        card_view:cardBackgroundColor="@color/card_background"
+        card_view:cardBackgroundColor="@color/background_light"
        card_view:cardCornerRadius="5dp"
        card_view:cardElevation="2dp"
        card_view:cardPreventCornerOverlap="false"
@ -82,7 +82,7 @@
                android:layout_height="wrap_content"
                android:layout_marginStart="16dp"
                android:layout_marginEnd="16dp"
-                android:background="@color/card_background"
+                android:background="@color/background_light"
                card_view:hint="Post message" />
        </LinearLayout>
    </androidx.cardview.widget.CardView>
--- a/app/src/main/res/layout/activity_topic_overflow_menu.xml
+++ b/app/src/main/res/layout/activity_topic_overflow_menu.xml
@ -45,5 +45,4 @@
        android:paddingTop="6dp"
        android:text="@string/post_delete_button"
        android:textColor="@color/primary_text" />
 </LinearLayout>
--- a/app/src/main/res/layout/activity_topic_post_row.xml
+++ b/app/src/main/res/layout/activity_topic_post_row.xml
@ -15,7 +15,7 @@
        android:layout_height="match_parent"
        android:layout_gravity="center"
        android:foreground="?android:attr/selectableItemBackground"
-        card_view:cardBackgroundColor="@color/card_background"
+        card_view:cardBackgroundColor="@color/background_light"
        card_view:cardCornerRadius="5dp"
        card_view:cardElevation="2dp"
        card_view:cardPreventCornerOverlap="false"
@ -88,7 +88,7 @@
                    android:layout_width="@dimen/post_image_button"
                    android:layout_height="@dimen/post_image_button"
                    android:layout_marginTop="9dp"
-                    android:background="@color/card_background"
+                    android:background="@color/background_light"
                    android:clickable="true"
                    android:contentDescription="@string/post_quote_button"
                    android:focusable="true"
@ -110,7 +110,7 @@
                    android:layout_height="@dimen/post_image_button"
                    android:layout_marginTop="9dp"
                    android:layout_marginEnd="9dp"
-                    android:background="@color/card_background"
+                    android:background="@color/background_light"
                    android:clickable="true"
                    android:contentDescription="@string/post_overflow_menu_button"
                    android:focusable="true"
@ -232,7 +232,7 @@
                    android:layout_gravity="center"
                    android:layout_marginLeft="16dp"
                    android:layout_marginRight="16dp"
-                    android:background="@color/card_background"
+                    android:background="@color/background_light"
                    android:clickable="true"
                    android:focusable="true"
                    android:text="@string/post" />
--- a/app/src/main/res/layout/activity_topic_quick_reply_row.xml
+++ b/app/src/main/res/layout/activity_topic_quick_reply_row.xml
@ -13,7 +13,7 @@
        android:layout_height="match_parent"
        android:layout_gravity="center"
        android:foreground="?android:attr/selectableItemBackground"
-        card_view:cardBackgroundColor="@color/card_background"
+        card_view:cardBackgroundColor="@color/background_light"
        card_view:cardCornerRadius="5dp"
        card_view:cardElevation="2dp"
        card_view:cardPreventCornerOverlap="false"
@ -82,7 +82,7 @@
                android:layout_height="wrap_content"
                android:layout_marginStart="16dp"
                android:layout_marginEnd="16dp"
-                android:background="@color/card_background"
+                android:background="@color/background_light"
                card_view:hint="Post message" />
        </LinearLayout>
    </androidx.cardview.widget.CardView>
--- a/app/src/main/res/layout/editor_view_color_picker.xml
+++ b/app/src/main/res/layout/editor_view_color_picker.xml
@ -2,16 +2,18 @@
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
    android:layout_width="wrap_content"
    android:layout_height="wrap_content"
-    android:background="@color/card_background">
+    android:background="@color/background_light">
-    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    <LinearLayout
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:paddingTop="8dp"
        android:paddingBottom="8dp"
        android:orientation="vertical">
        <TextView
            android:id="@+id/black"
-            style="@style/PopupMenuItem.TopItem"
+            style="@style/PopupMenuItem"
            android:text="@string/black"
            android:textColor="@color/black" />
@ -89,7 +91,7 @@
        <TextView
            android:id="@+id/lime_green"
-            style="@style/PopupMenuItem.BottomItem"
+            style="@style/PopupMenuItem"
            android:text="@string/lime_green"
            android:textColor="@color/lime_green" />
    </LinearLayout>
--- a/app/src/main/res/layout/fragment_profile_latest_posts.xml
+++ b/app/src/main/res/layout/fragment_profile_latest_posts.xml
--- a/app/src/main/res/layout/fragment_profile_latest_posts_empty_message.xml
+++ b/app/src/main/res/layout/fragment_profile_latest_posts_empty_message.xml
--- a/app/src/main/res/layout/fragment_profile_latest_posts_row.xml
+++ b/app/src/main/res/layout/fragment_profile_latest_posts_row.xml
@ -3,7 +3,7 @@
    xmlns:android="http://schemas.android.com/apk/res/android"
    android:layout_width="match_parent"
    android:layout_height="wrap_content"
-    android:background="@color/card_background">
+    android:background="@color/background_light">
    <RelativeLayout
        android:id="@+id/latest_posts_row"
@ -54,7 +54,7 @@
                android:id="@+id/post"
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
-                android:background="@color/card_background"
+                android:background="@color/background_light"
                android:text="@string/post"/>
        </FrameLayout>
    </RelativeLayout>
--- a/app/src/main/res/layout/fragment_profile_stats.xml
+++ b/app/src/main/res/layout/fragment_profile_stats.xml
@ -3,7 +3,8 @@
    xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:app="http://schemas.android.com/apk/res-auto"
    android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
    android:background="@color/background_light">
    <androidx.core.widget.NestedScrollView
        android:layout_width="match_parent"
@ -12,7 +13,7 @@
        android:layout_marginEnd="16dp"
        android:layout_marginStart="16dp"
        android:layout_marginTop="4dp"
-        android:background="@color/background">
+        android:background="@color/background_light">
        <LinearLayout
            android:id="@+id/main_content"
@ -24,10 +25,11 @@
                android:id="@+id/general_statistics_title"
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
-                android:background="@color/card_background"
+                android:paddingTop="10dp"
                android:paddingBottom="10dp"
                android:text="@string/general_statistics_title"
                android:textAlignment="center"
-                android:textColor="@color/primary_text"
+                android:textColor="@color/accent"
                android:textStyle="bold"/>
            <TextView
@ -41,10 +43,10 @@
                android:id="@+id/posting_activity_by_time_title"
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
-                android:background="@color/card_background"
+                android:layout_marginTop="@dimen/profile_stats_category_margin_top"
                android:text="@string/posting_activity_by_time_title"
                android:textAlignment="center"
-                android:textColor="@color/primary_text"
+                android:textColor="@color/accent"
                android:textStyle="bold"/>
            <com.github.mikephil.charting.charts.LineChart
@ -57,10 +59,10 @@
                android:id="@+id/most_popular_boards_by_posts_title"
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
-                android:background="@color/card_background"
+                android:layout_marginTop="@dimen/profile_stats_category_margin_top"
                android:text="@string/most_popular_boards_by_posts_title"
                android:textAlignment="center"
-                android:textColor="@color/primary_text"
+                android:textColor="@color/accent"
                android:textStyle="bold"/>
            <com.github.mikephil.charting.charts.HorizontalBarChart
@ -73,17 +75,17 @@
                android:id="@+id/most_popular_boards_by_activity_title"
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
-                android:background="@color/card_background"
+                android:layout_marginTop="@dimen/profile_stats_category_margin_top"
                android:text="@string/most_popular_boards_by_activity_title"
                android:textAlignment="center"
-                android:textColor="@color/primary_text"
+                android:textColor="@color/accent"
                android:textStyle="bold"/>
            <com.github.mikephil.charting.charts.HorizontalBarChart
                android:id="@+id/most_popular_boards_by_activity_chart"
                android:layout_width="match_parent"
                android:layout_height="250dp"
-                android:layout_marginBottom="4dp"/>
+                android:layout_marginBottom="14dp"/>
        </LinearLayout>
    </androidx.core.widget.NestedScrollView>
--- a/app/src/main/res/layout/fragment_profile_summary.xml
+++ b/app/src/main/res/layout/fragment_profile_summary.xml
@ -4,7 +4,7 @@
    android:id="@+id/nested_scroll"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
-    android:background="@color/background"
+    android:background="@color/background_light"
    android:paddingEnd="16dp"
    android:paddingStart="16dp"
    android:scrollbars="none">
--- a/app/src/main/res/layout/fragment_shoutbox_shout_row.xml
+++ b/app/src/main/res/layout/fragment_shoutbox_shout_row.xml
@ -8,7 +8,7 @@
    android:layout_marginEnd="8dp"
    android:foreground="?android:attr/selectableItemBackground"
    android:orientation="vertical"
-    card_view:cardBackgroundColor="@color/card_background"
+    card_view:cardBackgroundColor="@color/background_light"
    card_view:cardCornerRadius="5dp"
    card_view:cardElevation="2dp"
    card_view:cardPreventCornerOverlap="false"
@ -57,7 +57,7 @@
            android:layout_gravity="center"
            android:layout_marginLeft="16dp"
            android:layout_marginRight="16dp"
-            android:background="@color/card_background"
+            android:background="@color/background_light"
            android:clickable="true"
            android:focusable="true"
            android:scrollbars="none"
--- a/app/src/main/res/mipmap-hdpi/ic_launcher.png
+++ b/app/src/main/res/mipmap-hdpi/ic_launcher.png
--- a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
+++ b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
--- a/app/src/main/res/mipmap-mdpi/ic_launcher.png
+++ b/app/src/main/res/mipmap-mdpi/ic_launcher.png
--- a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
+++ b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
--- a/app/src/main/res/mipmap-xhdpi/ic_launcher.png
+++ b/app/src/main/res/mipmap-xhdpi/ic_launcher.png
--- a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
+++ b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
--- a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
+++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
--- a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
+++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
--- a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
+++ b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
--- a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
+++ b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@ -14,7 +14,7 @@
    <color name="primary_text">#E7E7E7</color>
    <color name="secondary_text">#757575</color>
    <color name="background">#323232</color>
-    <color name="card_background">#3C3F41</color>
+    <color name="background_light">#3C3F41</color>
    <color name="divider">#8B8B8B</color>
    <color name="link_color">#FF9800</color>
    <color name="mention_color">#FAA61A</color>
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@ -14,4 +14,5 @@
    <dimen name="refresh_label_border_radius">12dp</dimen>
    <dimen name="material_drawer_account_header_title">16sp</dimen>
    <dimen name="profile_activity_avatar_size">90dp</dimen>
    <dimen name="profile_stats_category_margin_top">28dp</dimen>
 </resources>
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@ -7,7 +7,7 @@
        <item name="android:textColorPrimary">@color/primary_text</item>
        <item name="android:textColorSecondary">@color/secondary_text</item>
        <item name="android:windowBackground">@color/primary</item>
-        <item name="cardBackgroundColor">@color/card_background</item>
+        <item name="cardBackgroundColor">@color/background_light</item>
        <item name="colorControlNormal">@color/iron</item>
        <item name="colorControlActivated">@color/white</item>
@ -44,20 +44,13 @@
    <style name="PopupMenuItem" parent="Widget.AppCompat.PopupMenu">
        <item name="android:layout_height">32dp</item>
        <item name="android:layout_width">128dp</item>
-        <item name="android:background">?android:attr/selectableItemBackground</item>
+        <item name="android:background">@color/background_light</item>
        <item name="android:foreground">?android:attr/selectableItemBackground</item>
        <item name="android:gravity">center_vertical</item>
        <item name="android:paddingStart">16dp</item>
        <item name="android:textColor">@color/primary_text</item>
    </style>
    <style name="PopupMenuItem.TopItem" parent="PopupMenuItem">
        <item name="android:paddingTop">8dp</item>
    </style>
    <style name="PopupMenuItem.BottomItem" parent="PopupMenuItem">
        <item name="android:paddingBottom">8dp</item>
    </style>
    <style name="PopupWindow" parent="Widget.AppCompat.PopupWindow">
        <item name="android:background">@android:color/transparent</item>
    </style>
@ -79,6 +72,7 @@
        <item name="colorAccent">@color/accent</item>
        <item name="android:textColorPrimary">@color/primary_text</item>
        <item name="android:colorBackground">@color/dialog_bg_semi_transparent_dark</item>
        <item name="android:windowBackground">@color/dialog_bg_semi_transparent_dark</item>
    </style>
    <style name="AppCompatAlertDialogStyleTitle" parent="@android:style/TextAppearance.DialogWindowTitle">