From 8f12714e0898a17502ca9dff29904783f60d9a68 Mon Sep 17 00:00:00 2001
From: Patrick Schneider <urulu@student.kit.edu>
Date: Sat, 4 Nov 2023 11:52:35 +0100
Subject: [PATCH] Improves dark mode stylings.

---
 .../privacyfriendlynotes/ui/adapter/NoteAdapter.kt    | 11 +++++++----
 app/src/main/res/layout/activity_sketch.xml           |  2 +-
 app/src/main/res/layout/item_category.xml             |  2 +-
 app/src/main/res/menu/main.xml                        |  2 +-
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/org/secuso/privacyfriendlynotes/ui/adapter/NoteAdapter.kt b/app/src/main/java/org/secuso/privacyfriendlynotes/ui/adapter/NoteAdapter.kt
index f32ad933..b092d770 100644
--- a/app/src/main/java/org/secuso/privacyfriendlynotes/ui/adapter/NoteAdapter.kt
+++ b/app/src/main/java/org/secuso/privacyfriendlynotes/ui/adapter/NoteAdapter.kt
@@ -13,7 +13,6 @@
  */
 package org.secuso.privacyfriendlynotes.ui.adapter
 
-import android.opengl.Visibility
 import android.preference.PreferenceManager
 import android.text.Html
 import android.util.Log
@@ -35,8 +34,7 @@ import org.secuso.privacyfriendlynotes.ui.main.MainActivityViewModel
  * @see org.secuso.privacyfriendlynotes.ui.RecycleActivity
  */
 class NoteAdapter(private val mainActivityViewModel: MainActivityViewModel) : RecyclerView.Adapter<NoteAdapter.NoteHolder>() {
-    private var notes: List<Note> = ArrayList()
-    private val notesFilteredList: List<Note> = ArrayList()
+    private var notes: MutableList<Note> = ArrayList()
     private var listener: ((Note) -> Unit)? = null
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): NoteHolder {
         val itemView = LayoutInflater.from(parent.context)
@@ -57,6 +55,10 @@ class NoteAdapter(private val mainActivityViewModel: MainActivityViewModel) : Re
         holder.textViewDescription.text = ""
         val pref = PreferenceManager.getDefaultSharedPreferences(holder.itemView.context)
         holder.textViewDescription.visibility = if (pref.getBoolean("settings_show_preview", true)) View.VISIBLE else View.GONE
+        holder.textViewExtraText.visibility = View.GONE
+        holder.textViewExtraText.text = null
+        holder.imageViewcategory.visibility = View.GONE
+        holder.imageViewcategory.setImageResource(0)
         when (currentNote.type) {
             DbContract.NoteEntry.TYPE_TEXT -> {
                 holder.textViewDescription.text = Html.fromHtml(currentNote.content)
@@ -100,7 +102,8 @@ class NoteAdapter(private val mainActivityViewModel: MainActivityViewModel) : Re
     }
 
     fun setNotes(notes: List<Note>) {
-        this.notes = notes
+        this.notes.clear()
+        this.notes.addAll(notes)
         notifyDataSetChanged()
     }
 
diff --git a/app/src/main/res/layout/activity_sketch.xml b/app/src/main/res/layout/activity_sketch.xml
index 2c84cf93..4fc05af0 100644
--- a/app/src/main/res/layout/activity_sketch.xml
+++ b/app/src/main/res/layout/activity_sketch.xml
@@ -38,7 +38,7 @@
         android:layout_height="0dp"
         android:layout_weight="1"
         android:id="@+id/draw_view"
-        android:background="@drawable/border"
+        android:background="?attr/colorSurface"
         android:padding="3dp"/>
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/item_category.xml b/app/src/main/res/layout/item_category.xml
index 62b17a1a..dcbe67a8 100644
--- a/app/src/main/res/layout/item_category.xml
+++ b/app/src/main/res/layout/item_category.xml
@@ -9,7 +9,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_weight="1"
-        android:textColor="@color/black"
+        android:textColor="?attr/colorOnBackground"
         android:textSize="20sp"
         android:layout_margin="10dp"/>
 
diff --git a/app/src/main/res/menu/main.xml b/app/src/main/res/menu/main.xml
index 66eda19d..14127251 100644
--- a/app/src/main/res/menu/main.xml
+++ b/app/src/main/res/menu/main.xml
@@ -5,6 +5,6 @@
         android:id="@+id/action_sort_alphabetical"
         android:orderInCategory="100"
         android:title="@string/action_sort_alphabetical"
-        android:icon="@drawable/ic_sort_by_alpha_white_24dp"
+        android:icon="@drawable/ic_sort_by_alpha_icon_24dp"
         app:showAsAction="ifRoom" />
 </menu>