From 5cb3af8d12b8af2a04340a82d32f3c5c0c7499a8 Mon Sep 17 00:00:00 2001
From: dece <shgck@pistache.land>
Date: Sat, 11 Dec 2021 01:26:12 +0100
Subject: [PATCH] improve the default rendering for all elements

---
 .../java/dev/lowrespalmtree/comet/ContentRecycler.kt | 11 +++++++++--
 app/src/main/res/layout/gemtext_blockquote.xml       |  8 +++++++-
 app/src/main/res/layout/gemtext_empty.xml            |  8 +++-----
 app/src/main/res/layout/gemtext_link.xml             |  6 +++---
 app/src/main/res/layout/gemtext_list_item.xml        |  7 ++++++-
 app/src/main/res/layout/gemtext_paragraph.xml        |  8 ++++----
 app/src/main/res/layout/gemtext_preformatted.xml     |  9 ++++++++-
 app/src/main/res/layout/gemtext_title1.xml           | 12 ++++++------
 app/src/main/res/layout/gemtext_title2.xml           | 12 ++++++------
 app/src/main/res/layout/gemtext_title3.xml           | 12 ++++++------
 app/src/main/res/values-night/themes.xml             |  2 +-
 app/src/main/res/values/colors.xml                   |  1 +
 app/src/main/res/values/themes.xml                   |  2 ++
 13 files changed, 62 insertions(+), 36 deletions(-)

diff --git a/app/src/main/java/dev/lowrespalmtree/comet/ContentRecycler.kt b/app/src/main/java/dev/lowrespalmtree/comet/ContentRecycler.kt
index e64b97f..77996f7 100644
--- a/app/src/main/java/dev/lowrespalmtree/comet/ContentRecycler.kt
+++ b/app/src/main/java/dev/lowrespalmtree/comet/ContentRecycler.kt
@@ -55,11 +55,12 @@ class ContentAdapter(private var content: List<Line>, private val listener: Cont
         }
     }
 
+    @SuppressLint("SetTextI18n")
     override fun onBindViewHolder(holder: ContentViewHolder, position: Int) {
         val line = content[position]
         when (holder) {
-            is ContentViewHolder.Paragraph -> holder.binding.textView.text =
-                (line as ParagraphLine).text
+            is ContentViewHolder.Paragraph ->
+                holder.binding.textView.text = (line as ParagraphLine).text
             is ContentViewHolder.Title1 -> holder.binding.textView.text = (line as TitleLine).text
             is ContentViewHolder.Title2 -> holder.binding.textView.text = (line as TitleLine).text
             is ContentViewHolder.Title3 -> holder.binding.textView.text = (line as TitleLine).text
@@ -70,6 +71,12 @@ class ContentAdapter(private var content: List<Line>, private val listener: Cont
                 holder.binding.textView.text = underlined
                 holder.binding.root.setOnClickListener { listener.onLinkClick(line.url) }
             }
+            is ContentViewHolder.PreText ->
+                holder.binding.textView.text = (line as PreTextLine).text
+            is ContentViewHolder.Blockquote ->
+                holder.binding.textView.text = (line as BlockquoteLine).text
+            is ContentViewHolder.ListItem ->
+                holder.binding.textView.text = "\u25CF ${(line as ListItemLine).text}"
             else -> {}
         }
     }
diff --git a/app/src/main/res/layout/gemtext_blockquote.xml b/app/src/main/res/layout/gemtext_blockquote.xml
index 2d46bbf..f43a280 100644
--- a/app/src/main/res/layout/gemtext_blockquote.xml
+++ b/app/src/main/res/layout/gemtext_blockquote.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/text_view"
+    android:textSize="16sp"
+    android:textColor="@color/text"
+    android:textStyle="italic"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@color/teal_200" />
\ No newline at end of file
+    android:paddingStart="32dp"
+    android:paddingEnd="16dp"
+    android:paddingTop="4dp"
+    android:paddingBottom="4dp" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/gemtext_empty.xml b/app/src/main/res/layout/gemtext_empty.xml
index b6998cf..70b62ee 100644
--- a/app/src/main/res/layout/gemtext_empty.xml
+++ b/app/src/main/res/layout/gemtext_empty.xml
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Space xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="8dp"
-    android:background="@color/black"
-    android:orientation="vertical"></Space>
\ No newline at end of file
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="0dp"
+    android:layout_height="4dp" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/gemtext_link.xml b/app/src/main/res/layout/gemtext_link.xml
index bc27299..b89c227 100644
--- a/app/src/main/res/layout/gemtext_link.xml
+++ b/app/src/main/res/layout/gemtext_link.xml
@@ -2,11 +2,11 @@
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/text_view"
     android:textSize="16sp"
+    android:textColor="@color/teal_700"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:paddingStart="8dp"
-    android:paddingEnd="8dp"
+    android:paddingStart="16dp"
+    android:paddingEnd="16dp"
     android:paddingTop="4dp"
     android:paddingBottom="4dp"
-    android:background="@color/teal_200"
     android:textIsSelectable="false" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/gemtext_list_item.xml b/app/src/main/res/layout/gemtext_list_item.xml
index 2d46bbf..1f133bb 100644
--- a/app/src/main/res/layout/gemtext_list_item.xml
+++ b/app/src/main/res/layout/gemtext_list_item.xml
@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/text_view"
+    android:textSize="16sp"
+    android:textColor="@color/text"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@color/teal_200" />
\ No newline at end of file
+    android:paddingStart="32dp"
+    android:paddingEnd="16dp"
+    android:paddingTop="2dp"
+    android:paddingBottom="2dp" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/gemtext_paragraph.xml b/app/src/main/res/layout/gemtext_paragraph.xml
index 3868c58..18028b9 100644
--- a/app/src/main/res/layout/gemtext_paragraph.xml
+++ b/app/src/main/res/layout/gemtext_paragraph.xml
@@ -2,10 +2,10 @@
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/text_view"
     android:textSize="16sp"
+    android:textColor="@color/text"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:paddingStart="8dp"
-    android:paddingEnd="8dp"
+    android:paddingStart="16dp"
+    android:paddingEnd="16dp"
     android:paddingTop="4dp"
-    android:paddingBottom="4dp"
-    android:background="@color/teal_200" />
\ No newline at end of file
+    android:paddingBottom="4dp" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/gemtext_preformatted.xml b/app/src/main/res/layout/gemtext_preformatted.xml
index 2d46bbf..6c564a8 100644
--- a/app/src/main/res/layout/gemtext_preformatted.xml
+++ b/app/src/main/res/layout/gemtext_preformatted.xml
@@ -1,6 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/text_view"
+    android:textSize="14sp"
+    android:textColor="@color/text"
+    android:typeface="monospace"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@color/teal_200" />
\ No newline at end of file
+    android:paddingStart="16dp"
+    android:paddingEnd="8dp"
+    android:paddingTop="2dp"
+    android:paddingBottom="2dp"
+    android:background="@color/purple_200" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/gemtext_title1.xml b/app/src/main/res/layout/gemtext_title1.xml
index fc0095f..a9c1475 100644
--- a/app/src/main/res/layout/gemtext_title1.xml
+++ b/app/src/main/res/layout/gemtext_title1.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/text_view"
+    android:textSize="30sp"
+    android:textColor="@color/text"
+    android:textStyle="bold"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:textSize="30sp"
-    android:textStyle="bold"
-    android:paddingStart="8dp"
-    android:paddingEnd="8dp"
+    android:paddingStart="16dp"
+    android:paddingEnd="16dp"
     android:paddingTop="16dp"
-    android:paddingBottom="4dp"
-    android:background="@color/teal_700" />
\ No newline at end of file
+    android:paddingBottom="4dp" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/gemtext_title2.xml b/app/src/main/res/layout/gemtext_title2.xml
index b02f206..06d5d36 100644
--- a/app/src/main/res/layout/gemtext_title2.xml
+++ b/app/src/main/res/layout/gemtext_title2.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/text_view"
+    android:textSize="24sp"
+    android:textColor="@color/text"
+    android:textStyle="bold"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:textSize="24sp"
-    android:textStyle="bold"
-    android:paddingStart="8dp"
-    android:paddingEnd="8dp"
+    android:paddingStart="16dp"
+    android:paddingEnd="16dp"
     android:paddingTop="8dp"
-    android:paddingBottom="4dp"
-    android:background="@color/teal_700" />
\ No newline at end of file
+    android:paddingBottom="4dp" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/gemtext_title3.xml b/app/src/main/res/layout/gemtext_title3.xml
index 0887625..77b6b63 100644
--- a/app/src/main/res/layout/gemtext_title3.xml
+++ b/app/src/main/res/layout/gemtext_title3.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/text_view"
+    android:textSize="18sp"
+    android:textColor="@color/text"
+    android:textStyle="bold"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:textSize="18sp"
-    android:textStyle="bold"
-    android:paddingStart="8dp"
-    android:paddingEnd="8dp"
+    android:paddingStart="16dp"
+    android:paddingEnd="16dp"
     android:paddingTop="8dp"
-    android:paddingBottom="4dp"
-    android:background="@color/teal_700" />
\ No newline at end of file
+    android:paddingBottom="4dp" />
\ No newline at end of file
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
index 1621d5f..66c0579 100644
--- a/app/src/main/res/values-night/themes.xml
+++ b/app/src/main/res/values-night/themes.xml
@@ -1,6 +1,6 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
     <!-- Base application theme. -->
-    <style name="Theme.Comet" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
+    <style name="Theme.Comet" parent="Theme.MaterialComponents.DayNight.NoActionBar">
         <!-- Primary brand color. -->
         <item name="colorPrimary">@color/purple_200</item>
         <item name="colorPrimaryVariant">@color/purple_700</item>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index f8c6127..26e9727 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -7,4 +7,5 @@
     <color name="teal_700">#FF018786</color>
     <color name="black">#FF000000</color>
     <color name="white">#FFFFFFFF</color>
+    <color name="text">#222222</color>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 6f5cd53..97f48d5 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -9,6 +9,8 @@
         <item name="colorSecondary">@color/teal_200</item>
         <item name="colorSecondaryVariant">@color/teal_700</item>
         <item name="colorOnSecondary">@color/black</item>
+        <!-- Status bar color. -->
+        <item name="android:statusBarColor" tools:targetApi="l">?attr/colorPrimaryVariant</item>
         <!-- Customize your theme here. -->
     </style>
 </resources>
\ No newline at end of file