Fix bookmark bug + add reset bookmarks setting

Author: GewoonJaap

app/.idea/deploymentTargetDropDown.xml

@@ -1,13 +1,10 @@
 package nl.gardensnakes.ukrainefield
 
-import android.content.SharedPreferences
 import android.os.Bundle
 import android.preference.*
-import androidx.fragment.app.Fragment
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
+import androidx.preference.Preference
 import androidx.preference.PreferenceFragmentCompat
+import nl.gardensnakes.ukrainefield.helper.BookmarkHelper
 
 class SettingsFragment : PreferenceFragmentCompat() {
 
@@ -17,5 +14,9 @@ class SettingsFragment : PreferenceFragmentCompat() {
 
     override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
         setPreferencesFromResource(R.xml.settings, rootKey)
+        findPreference<Preference>("reset_bookmarks")?.setOnPreferenceClickListener {
+            context?.let { context -> BookmarkHelper().resetBookmarks(context) }
+            true
+        }
     }
 }

app/.idea/misc.xml

@@ -28,6 +28,10 @@ class BookmarkHelper {
         if(json != null) saveToJsonFile(json, context)
     }
 
+    fun resetBookmarks(context: Context){
+        saveToJsonFile("", context)
+    }
+
 
     fun isFavorite(messageUrl: String, context: Context): Boolean {
         return getAll(context)?.any {

app/app/src/main/java/nl/gardensnakes/ukrainefield/SettingsFragment.kt

@@ -3,7 +3,6 @@ package nl.gardensnakes.ukrainefield.view.adapter
 import android.content.Context
 import android.content.Intent
 import android.net.Uri
-import android.provider.Settings.Global.getString
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -13,7 +12,6 @@ import androidx.recyclerview.widget.RecyclerView
 import com.afdhal_fa.imageslider.ImageSlider
 import com.afdhal_fa.imageslider.`interface`.ItemClickListener
 import com.afdhal_fa.imageslider.model.SlideUIModel
-import com.bumptech.glide.Glide
 import nl.gardensnakes.ukrainefield.MediaDetailActivity
 import nl.gardensnakes.ukrainefield.R
 import nl.gardensnakes.ukrainefield.data.remote.HttpRoutes
@@ -72,7 +70,7 @@ class FeedCardAdapter(private var mList: List<FeedMessageResponse>, private val
         holder.postedAtText.text =
             "${context.getString(R.string.posted_at)} ${TimeHelper.epochToTimeString(feedData.epochTime.toLong())}"
 
-        updateBookmarkText(bookmarkHelper, feedData.messageURL ?: "", holder, position)
+        updateBookmarkText(feedData.messageURL ?: "", holder, position)
 
         if (feedData.videos.isEmpty() && feedData.images.isEmpty()) {
             holder.imageSlide.visibility = View.GONE
@@ -121,8 +119,8 @@ class FeedCardAdapter(private var mList: List<FeedMessageResponse>, private val
         }
 
         holder.bookmarkButton.setOnClickListener {
-            bookmarkHelper.bookmark(feedData, context)
-            updateBookmarkText(bookmarkHelper, feedData.messageURL ?: "", holder, position)
+            BookmarkHelper().bookmark(feedData, context)
+            updateBookmarkText(feedData.messageURL ?: "", holder, position)
         }
 
     }
@@ -132,8 +130,8 @@ class FeedCardAdapter(private var mList: List<FeedMessageResponse>, private val
         return mList.size
     }
 
-    private fun updateBookmarkText(bookmarkHelper: BookmarkHelper, messageUrl: String, holder: ViewHolder, position: Int){
-        var isBookmarked = bookmarkHelper.isFavorite(messageUrl, context)
+    private fun updateBookmarkText(messageUrl: String, holder: ViewHolder, position: Int){
+        var isBookmarked = BookmarkHelper().isFavorite(messageUrl, context)
         if(isBookmarked){
             holder.bookmarkButton.text = context.getString(R.string.remove_bookmark)
         }

app/app/src/main/java/nl/gardensnakes/ukrainefield/helper/BookmarkHelper.kt

@@ -16,4 +16,7 @@
     <string name="ukraine_map">Ukraine Map</string>
     <string name="bookmarks">Bookmarks</string>
     <string name="settings">Settings</string>
+    <string name="other">Other</string>
+    <string name="reset_bookmarks_summary">Removes all bookmarked items</string>
+    <string name="reset_bookmarks">Reset bookmarks</string>
 </resources>

app/app/src/main/java/nl/gardensnakes/ukrainefield/view/adapter/FeedCardAdapter.kt

@@ -11,4 +11,16 @@
         app:defaultValue="true"/>
     </PreferenceCategory>
 
+    <PreferenceCategory
+        app:key="other_category"
+        app:title="@string/other">
+
+        <Preference
+            app:key="reset_bookmarks"
+            app:summary="@string/reset_bookmarks_summary"
+            app:title="@string/reset_bookmarks"/>
+
+    </PreferenceCategory>
+
+
 </PreferenceScreen>