From 0df0482d458d91d3e1dba3b493285299f91fcc32 Mon Sep 17 00:00:00 2001
From: Alex Ning <chineseperson5@gmail.com>
Date: Wed, 17 Jun 2020 19:23:44 +0800
Subject: Add some padding between markdown paragraghs. Delete Caveat font.

---
 .../infinityforreddit/Font/ContentFontFamily.java      |   1 -
 .../infinityforreddit/Font/FontFamily.java             |   1 -
 .../infinityforreddit/Font/TitleFontFamily.java        |   1 -
 app/src/main/res/font/caveat.xml                       |  12 ------------
 app/src/main/res/font/caveat_bold.ttf                  | Bin 335416 -> 0 bytes
 app/src/main/res/font/caveat_regular.ttf               | Bin 330800 -> 0 bytes
 app/src/main/res/layout/adapter_default_entry.xml      |   1 +
 app/src/main/res/layout/fragment_font_preview.xml      |  12 ------------
 .../res/layout/item_post_detail_no_preview_link.xml    |   4 ++--
 app/src/main/res/layout/item_post_detail_text.xml      |   4 ++--
 app/src/main/res/values/arrays.xml                     |   2 --
 app/src/main/res/values/styles.xml                     |  12 ------------
 12 files changed, 5 insertions(+), 45 deletions(-)
 delete mode 100644 app/src/main/res/font/caveat.xml
 delete mode 100644 app/src/main/res/font/caveat_bold.ttf
 delete mode 100644 app/src/main/res/font/caveat_regular.ttf

(limited to 'app')

diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Font/ContentFontFamily.java b/app/src/main/java/ml/docilealligator/infinityforreddit/Font/ContentFontFamily.java
index f1659d68..6a00aec9 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Font/ContentFontFamily.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/Font/ContentFontFamily.java
@@ -10,7 +10,6 @@ public enum ContentFontFamily {
     HarmoniaSans(R.style.ContentFontFamily_HarmoniaSans, "HarmoniaSans"),
     Inter(R.style.ContentFontFamily_Inter, "Inter"),
     Manrope(R.style.ContentFontFamily_Manrope, "Manrope"),
-    Caveat(R.style.ContentFontFamily_Caveat, "Caveat"),
     BadScript(R.style.ContentFontFamily_BadScript, "BadScript"),
     Sriracha(R.style.ContentFontFamily_Sriracha, "Sriracha");
 
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Font/FontFamily.java b/app/src/main/java/ml/docilealligator/infinityforreddit/Font/FontFamily.java
index debd9b73..8a04a50e 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Font/FontFamily.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/Font/FontFamily.java
@@ -10,7 +10,6 @@ public enum FontFamily {
     HarmoniaSans(R.style.FontFamily_HarmoniaSans, "HarmoniaSans"),
     Inter(R.style.FontFamily_Inter, "Inter"),
     Manrope(R.style.FontFamily_Manrope, "Manrope"),
-    Caveat(R.style.FontFamily_Caveat, "Caveat"),
     BadScript(R.style.FontFamily_BadScript, "BadScript"),
     Sriracha(R.style.FontFamily_Sriracha, "Sriracha");
 
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Font/TitleFontFamily.java b/app/src/main/java/ml/docilealligator/infinityforreddit/Font/TitleFontFamily.java
index 0548f4e0..ffe319c4 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/Font/TitleFontFamily.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/Font/TitleFontFamily.java
@@ -10,7 +10,6 @@ public enum TitleFontFamily {
     HarmoniaSans(R.style.TitleFontFamily_HarmoniaSans, "HarmoniaSans"),
     Inter(R.style.TitleFontFamily_Inter, "Inter"),
     Manrope(R.style.TitleFontFamily_Manrope, "Manrope"),
-    Caveat(R.style.TitleFontFamily_Caveat, "Caveat"),
     BadScript(R.style.TitleFontFamily_BadScript, "BadScript"),
     Sriracha(R.style.TitleFontFamily_Sriracha, "Sriracha");
 
diff --git a/app/src/main/res/font/caveat.xml b/app/src/main/res/font/caveat.xml
deleted file mode 100644
index 57393ffd..00000000
--- a/app/src/main/res/font/caveat.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<font-family xmlns:app="http://schemas.android.com/apk/res-auto">
-    <font
-        app:fontStyle="normal"
-        app:fontWeight="400"
-        app:font="@font/caveat_regular" />
-
-    <font
-        app:fontStyle="normal"
-        app:fontWeight="700"
-        app:font="@font/caveat_bold" />
-</font-family>
\ No newline at end of file
diff --git a/app/src/main/res/font/caveat_bold.ttf b/app/src/main/res/font/caveat_bold.ttf
deleted file mode 100644
index e7e6a837..00000000
Binary files a/app/src/main/res/font/caveat_bold.ttf and /dev/null differ
diff --git a/app/src/main/res/font/caveat_regular.ttf b/app/src/main/res/font/caveat_regular.ttf
deleted file mode 100644
index 278a61c8..00000000
Binary files a/app/src/main/res/font/caveat_regular.ttf and /dev/null differ
diff --git a/app/src/main/res/layout/adapter_default_entry.xml b/app/src/main/res/layout/adapter_default_entry.xml
index c05db9ff..a02d03f0 100644
--- a/app/src/main/res/layout/adapter_default_entry.xml
+++ b/app/src/main/res/layout/adapter_default_entry.xml
@@ -3,5 +3,6 @@
     android:id="@+id/text"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:padding="8dp"
     android:textSize="?attr/content_font_default"
     android:fontFamily="?attr/content_font_family" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_font_preview.xml b/app/src/main/res/layout/fragment_font_preview.xml
index 4101473e..8cc543c8 100644
--- a/app/src/main/res/layout/fragment_font_preview.xml
+++ b/app/src/main/res/layout/fragment_font_preview.xml
@@ -89,18 +89,6 @@
         android:textSize="?attr/font_default"
         android:fontFamily="@font/manrope" />
 
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingTop="16dp"
-        android:paddingBottom="16dp"
-        android:paddingStart="72dp"
-        android:paddingEnd="16dp"
-        android:text="Caveat"
-        android:textColor="?attr/primaryTextColor"
-        android:textSize="?attr/font_default"
-        android:fontFamily="@font/caveat" />
-
     <TextView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/item_post_detail_no_preview_link.xml b/app/src/main/res/layout/item_post_detail_no_preview_link.xml
index e7640de2..7b1f1eb7 100644
--- a/app/src/main/res/layout/item_post_detail_no_preview_link.xml
+++ b/app/src/main/res/layout/item_post_detail_no_preview_link.xml
@@ -109,8 +109,8 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_marginTop="16dp"
-        android:layout_marginStart="16dp"
-        android:layout_marginEnd="16dp"
+        android:layout_marginStart="8dp"
+        android:layout_marginEnd="8dp"
         android:visibility="gone" />
 
     <com.nex3z.flowlayout.FlowLayout
diff --git a/app/src/main/res/layout/item_post_detail_text.xml b/app/src/main/res/layout/item_post_detail_text.xml
index 08a4598a..de939064 100644
--- a/app/src/main/res/layout/item_post_detail_text.xml
+++ b/app/src/main/res/layout/item_post_detail_text.xml
@@ -109,8 +109,8 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_marginTop="16dp"
-        android:layout_marginStart="16dp"
-        android:layout_marginEnd="16dp"
+        android:layout_marginStart="8dp"
+        android:layout_marginEnd="8dp"
         android:visibility="gone" />
 
     <com.nex3z.flowlayout.FlowLayout
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
index 768f5d0c..878bf61b 100644
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -131,7 +131,6 @@
         <item>Harmonia Sans</item>
         <item>Inter</item>
         <item>Manrope</item>
-        <item>Caveat</item>
         <item>Bad Script</item>
         <item>Sriracha</item>
     </string-array>
@@ -144,7 +143,6 @@
         <item>HarmoniaSans</item>
         <item>Inter</item>
         <item>Manrope</item>
-        <item>Caveat</item>
         <item>BadScript</item>
         <item>Sriracha</item>
     </string-array>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 770fc6b9..43df2318 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -262,10 +262,6 @@
         <item name="font_family">@font/manrope</item>
     </style>
 
-    <style name="FontFamily.Caveat">
-        <item name="font_family">@font/caveat</item>
-    </style>
-
     <style name="FontFamily.BadScript">
         <item name="font_family">@font/bad_script_regular</item>
     </style>
@@ -304,10 +300,6 @@
         <item name="title_font_family">@font/manrope</item>
     </style>
 
-    <style name="TitleFontFamily.Caveat">
-        <item name="title_font_family">@font/caveat</item>
-    </style>
-
     <style name="TitleFontFamily.BadScript">
         <item name="title_font_family">@font/bad_script_regular</item>
     </style>
@@ -346,10 +338,6 @@
         <item name="content_font_family">@font/manrope</item>
     </style>
 
-    <style name="ContentFontFamily.Caveat">
-        <item name="content_font_family">@font/caveat</item>
-    </style>
-
     <style name="ContentFontFamily.BadScript">
         <item name="content_font_family">@font/bad_script_regular</item>
     </style>
-- 
cgit v1.2.3