From a6b3ee45ac3fe158dcd8033bfe46c567a3f3dfd6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=96ppen?= <oppen@oppenlab.net>
Date: Sat, 15 Aug 2020 22:14:08 +0100
Subject: [PATCH] tidy up

---
 .../tva/ui/{gemtext => }/GemtextAdapter.kt    | 38 +++++++++++++++----
 app/src/main/java/oppen/tva/ui/TvaActivity.kt |  3 +-
 .../main/java/oppen/tva/ui/gemtext/Gemtext.kt |  8 ----
 3 files changed, 31 insertions(+), 18 deletions(-)
 rename app/src/main/java/oppen/tva/ui/{gemtext => }/GemtextAdapter.kt (73%)
 delete mode 100644 app/src/main/java/oppen/tva/ui/gemtext/Gemtext.kt

diff --git a/app/src/main/java/oppen/tva/ui/gemtext/GemtextAdapter.kt b/app/src/main/java/oppen/tva/ui/GemtextAdapter.kt
similarity index 73%
rename from app/src/main/java/oppen/tva/ui/gemtext/GemtextAdapter.kt
rename to app/src/main/java/oppen/tva/ui/GemtextAdapter.kt
index ca90656..e8db9c0 100644
--- a/app/src/main/java/oppen/tva/ui/gemtext/GemtextAdapter.kt
+++ b/app/src/main/java/oppen/tva/ui/GemtextAdapter.kt
@@ -1,4 +1,4 @@
-package oppen.tva.ui.gemtext
+package oppen.tva.ui
 
 import android.view.LayoutInflater
 import android.view.View
@@ -38,13 +38,35 @@ class GemtextAdapter(val onLink: (link: URI) -> Unit): RecyclerView.Adapter<Gemt
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
         return when(viewType){
-            typeText -> ViewHolder.Text( LayoutInflater.from(parent.context).inflate(R.layout.gemtext_text, parent, false) )
-            typeH1 -> ViewHolder.H1( LayoutInflater.from(parent.context).inflate(R.layout.gemtext_h1, parent, false) )
-            typeH2 -> ViewHolder.H2( LayoutInflater.from(parent.context).inflate(R.layout.gemtext_h2, parent, false) )
-            typeH3 -> ViewHolder.H3( LayoutInflater.from(parent.context).inflate(R.layout.gemtext_h3, parent, false) )
-            typeListItem -> ViewHolder.ListItem( LayoutInflater.from(parent.context).inflate(R.layout.gemtext_text, parent, false) )
-            typeLink -> ViewHolder.Link( LayoutInflater.from(parent.context).inflate(R.layout.gemtext_link, parent, false) )
-            else -> ViewHolder.Text( LayoutInflater.from(parent.context).inflate(R.layout.gemtext_text, parent, false) )
+            typeText -> ViewHolder.Text(
+                LayoutInflater.from(parent.context).inflate(R.layout.gemtext_text, parent, false)
+            )
+            typeH1 -> ViewHolder.H1(
+                LayoutInflater.from(
+                    parent.context
+                ).inflate(R.layout.gemtext_h1, parent, false)
+            )
+            typeH2 -> ViewHolder.H2(
+                LayoutInflater.from(
+                    parent.context
+                ).inflate(R.layout.gemtext_h2, parent, false)
+            )
+            typeH3 -> ViewHolder.H3(
+                LayoutInflater.from(
+                    parent.context
+                ).inflate(R.layout.gemtext_h3, parent, false)
+            )
+            typeListItem -> ViewHolder.ListItem(
+                LayoutInflater.from(parent.context).inflate(R.layout.gemtext_text, parent, false)
+            )
+            typeLink -> ViewHolder.Link(
+                LayoutInflater.from(parent.context).inflate(R.layout.gemtext_link, parent, false)
+            )
+            else -> ViewHolder.Text(
+                LayoutInflater.from(
+                    parent.context
+                ).inflate(R.layout.gemtext_text, parent, false)
+            )
         }
     }
 
diff --git a/app/src/main/java/oppen/tva/ui/TvaActivity.kt b/app/src/main/java/oppen/tva/ui/TvaActivity.kt
index 7a436f9..96b0d0a 100644
--- a/app/src/main/java/oppen/tva/ui/TvaActivity.kt
+++ b/app/src/main/java/oppen/tva/ui/TvaActivity.kt
@@ -13,14 +13,13 @@ import oppen.tva.R
 import oppen.tva.databinding.ActivityTvaBinding
 import oppen.tva.io.TvaState
 import oppen.tva.io.history.CacheInterface
-import oppen.tva.ui.gemtext.GemtextAdapter
 
 
 class TvaActivity : AppCompatActivity() {
 
     private val model by viewModels<TvaViewModel>()
     private lateinit var binding: ActivityTvaBinding
-    private val adapter = GemtextAdapter{ uri ->
+    private val adapter = GemtextAdapter { uri ->
         model.request(uri)
     }
 
diff --git a/app/src/main/java/oppen/tva/ui/gemtext/Gemtext.kt b/app/src/main/java/oppen/tva/ui/gemtext/Gemtext.kt
deleted file mode 100644
index 6965481..0000000
--- a/app/src/main/java/oppen/tva/ui/gemtext/Gemtext.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package oppen.tva.ui.gemtext
-
-sealed class Gemtext {
-    data class Text(val text: String): Gemtext()
-    data class Header(val text: String): Gemtext()
-    data class HalfHeader(val text: String): Gemtext()
-    data class ThirdHeader(val text: String): Gemtext()
-}
\ No newline at end of file