From 286ab8ebca82a236a5ea40bdf111cda1e87927ec Mon Sep 17 00:00:00 2001
From: Alex Ning <chineseperson5@gmail.com>
Date: Mon, 30 Dec 2019 22:46:45 +0800
Subject: [PATCH] Change text color in TableLayout in markdown. Change markdown
 TextView style.

---
 .../Activity/ViewSidebarActivity.java         | 21 +++++++++++++++++++
 .../CommentAndPostRecyclerViewAdapter.java    |  7 +++++++
 .../main/res/layout/activity_view_sidebar.xml |  3 +--
 .../main/res/layout/adapter_default_entry.xml |  2 --
 .../main/res/layout/adapter_table_block.xml   |  3 ++-
 app/src/main/res/layout/item_post_detail.xml  |  2 ++
 6 files changed, 33 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/ViewSidebarActivity.java b/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/ViewSidebarActivity.java
index 7470887a..936f4d48 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/ViewSidebarActivity.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/Activity/ViewSidebarActivity.java
@@ -7,17 +7,21 @@ import android.content.res.Resources;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
+import android.text.Spanned;
 import android.text.style.SuperscriptSpan;
 import android.text.util.Linkify;
+import android.util.TypedValue;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.Window;
 import android.view.WindowManager;
+import android.widget.TextView;
 import android.widget.Toast;
 
 import androidx.annotation.NonNull;
 import androidx.appcompat.widget.Toolbar;
+import androidx.core.content.ContextCompat;
 import androidx.lifecycle.ViewModelProvider;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
@@ -110,6 +114,17 @@ public class ViewSidebarActivity extends BaseActivity {
                 params.topMargin = getResources().getDimensionPixelSize(statusBarResourceId);
                 toolbar.setLayoutParams(params);
             }
+
+            int navBarResourceId = resources.getIdentifier("navigation_bar_height", "dimen", "android");
+            if (navBarResourceId > 0) {
+                int dp = 16;
+                int px = (int) TypedValue.applyDimension(
+                        TypedValue.COMPLEX_UNIT_DIP,
+                        dp,
+                        resources.getDisplayMetrics()
+                );
+                markdownRecyclerView.setPadding(px, px, px, resources.getDimensionPixelSize(navBarResourceId));
+            }
         }
 
         String subredditName = getIntent().getStringExtra(EXTRA_SUBREDDIT_NAME);
@@ -123,8 +138,14 @@ public class ViewSidebarActivity extends BaseActivity {
         setSupportActionBar(toolbar);
         getSupportActionBar().setDisplayHomeAsUpEnabled(true);
 
+        int markdownColor = ContextCompat.getColor(this, R.color.defaultTextColor);
         Markwon markwon = Markwon.builder(this)
                 .usePlugin(new AbstractMarkwonPlugin() {
+                    @Override
+                    public void beforeSetText(@NonNull TextView textView, @NonNull Spanned markdown) {
+                        textView.setTextColor(markdownColor);
+                    }
+
                     @Override
                     public void configureConfiguration(@NonNull MarkwonConfiguration.Builder builder) {
                         builder.linkResolver((view, link) -> {
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Adapter/CommentAndPostRecyclerViewAdapter.java b/app/src/main/java/ml/docilealligator/infinityforreddit/Adapter/CommentAndPostRecyclerViewAdapter.java
index cd56c175..fb285316 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Adapter/CommentAndPostRecyclerViewAdapter.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/Adapter/CommentAndPostRecyclerViewAdapter.java
@@ -8,6 +8,7 @@ import android.graphics.PorterDuff;
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.os.Bundle;
+import android.text.Spanned;
 import android.text.style.SuperscriptSpan;
 import android.text.util.Linkify;
 import android.util.TypedValue;
@@ -136,8 +137,14 @@ public class CommentAndPostRecyclerViewAdapter extends RecyclerView.Adapter<Recy
         mOauthRetrofit = oauthRetrofit;
         mRedditDataRoomDatabase = redditDataRoomDatabase;
         mGlide = glide;
+        int markdownColor = ContextCompat.getColor(activity, R.color.defaultTextColor);
         mMarkwon = Markwon.builder(mActivity)
                 .usePlugin(new AbstractMarkwonPlugin() {
+                    @Override
+                    public void beforeSetText(@NonNull TextView textView, @NonNull Spanned markdown) {
+                        textView.setTextColor(markdownColor);
+                    }
+
                     @Override
                     public void configureConfiguration(@NonNull MarkwonConfiguration.Builder builder) {
                         builder.linkResolver((view, link) -> {
diff --git a/app/src/main/res/layout/activity_view_sidebar.xml b/app/src/main/res/layout/activity_view_sidebar.xml
index ae9dca32..31ed1529 100644
--- a/app/src/main/res/layout/activity_view_sidebar.xml
+++ b/app/src/main/res/layout/activity_view_sidebar.xml
@@ -36,8 +36,7 @@
         android:id="@+id/markdown_recycler_view_view_sidebar_activity"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:paddingTop="16dp"
-        android:paddingBottom="16dp"
+        android:padding="16dp"
         android:clipToPadding="false"
         app:layout_behavior="@string/appbar_scrolling_view_behavior" />
 
diff --git a/app/src/main/res/layout/adapter_default_entry.xml b/app/src/main/res/layout/adapter_default_entry.xml
index bf91ef23..acc53340 100644
--- a/app/src/main/res/layout/adapter_default_entry.xml
+++ b/app/src/main/res/layout/adapter_default_entry.xml
@@ -3,6 +3,4 @@
     android:id="@+id/text"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginLeft="16dp"
-    android:layout_marginRight="16dp"
     android:textSize="?attr/content_font_default" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/adapter_table_block.xml b/app/src/main/res/layout/adapter_table_block.xml
index 35fc8986..ab8ddfb1 100644
--- a/app/src/main/res/layout/adapter_table_block.xml
+++ b/app/src/main/res/layout/adapter_table_block.xml
@@ -2,7 +2,8 @@
 <HorizontalScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_margin="16dp"
+    android:layout_marginTop="16dp"
+    android:layout_marginBottom="16dp"
     android:scrollbarStyle="outsideInset">
 
     <TableLayout
diff --git a/app/src/main/res/layout/item_post_detail.xml b/app/src/main/res/layout/item_post_detail.xml
index 2bf46902..e23da92c 100644
--- a/app/src/main/res/layout/item_post_detail.xml
+++ b/app/src/main/res/layout/item_post_detail.xml
@@ -86,6 +86,8 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_marginTop="16dp"
+        android:layout_marginStart="16dp"
+        android:layout_marginEnd="16dp"
         android:visibility="gone" />
 
     <com.nex3z.flowlayout.FlowLayout