6.11.2 commit

XilinJia · Oct 15, 2024 · b50f06a · b50f06a
1 parent 5ea458e
commit b50f06a
Show file tree

Hide file tree

Showing 23 changed files with 433 additions and 664 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -31,8 +31,8 @@ android {
         testApplicationId "ac.mdiq.podcini.tests"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
-        versionCode 3020271
-        versionName "6.11.1"
+        versionCode 3020272
+        versionName "6.11.2"
 
         applicationId "ac.mdiq.podcini.R"
         def commit = ""

diff --git a/app/src/main/kotlin/ac/mdiq/podcini/preferences/fragments/SwipePreferencesFragment.kt b/app/src/main/kotlin/ac/mdiq/podcini/preferences/fragments/SwipePreferencesFragment.kt
@@ -4,8 +4,9 @@ import android.os.Bundle
 import androidx.preference.Preference
 import androidx.preference.PreferenceFragmentCompat
 import ac.mdiq.podcini.R
+import ac.mdiq.podcini.ui.actions.SwipeActions.Companion.showSettingDialog
 import ac.mdiq.podcini.ui.activity.PreferenceActivity
-import ac.mdiq.podcini.ui.dialog.SwipeActionsDialog
+//import ac.mdiq.podcini.ui.dialog.SwipeActionsDialog
 import ac.mdiq.podcini.ui.fragment.*
 import androidx.annotation.OptIn
 import androidx.media3.common.util.UnstableApi
@@ -15,33 +16,38 @@ class SwipePreferencesFragment : PreferenceFragmentCompat() {
         addPreferencesFromResource(R.xml.preferences_swipe)
 
         findPreference<Preference>(Prefs.prefSwipeQueue.name)?.onPreferenceClickListener = Preference.OnPreferenceClickListener {
-            SwipeActionsDialog(requireContext(), QueuesFragment.TAG).show(object : SwipeActionsDialog.Callback {
-                override fun onCall() {}
-            })
+//            SwipeActionsDialog(requireContext(), QueuesFragment.TAG).show(object : SwipeActionsDialog.Callback {
+//                override fun onCall() {}
+//            })
+            showSettingDialog(this, QueuesFragment.TAG)
             true
         }
         findPreference<Preference>(Prefs.prefSwipeEpisodes.name)?.onPreferenceClickListener = Preference.OnPreferenceClickListener {
-            SwipeActionsDialog(requireContext(), AllEpisodesFragment.TAG).show (object : SwipeActionsDialog.Callback {
-                override fun onCall() {}
-            })
+//            SwipeActionsDialog(requireContext(), AllEpisodesFragment.TAG).show (object : SwipeActionsDialog.Callback {
+//                override fun onCall() {}
+//            })
+            showSettingDialog(this, AllEpisodesFragment.TAG)
             true
         }
         findPreference<Preference>(Prefs.prefSwipeDownloads.name)?.onPreferenceClickListener = Preference.OnPreferenceClickListener {
-            SwipeActionsDialog(requireContext(), DownloadsFragment.TAG).show (object : SwipeActionsDialog.Callback {
-                override fun onCall() {}
-            })
+//            SwipeActionsDialog(requireContext(), DownloadsFragment.TAG).show (object : SwipeActionsDialog.Callback {
+//                override fun onCall() {}
+//            })
+            showSettingDialog(this, DownloadsFragment.TAG)
             true
         }
         findPreference<Preference>(Prefs.prefSwipeFeed.name)?.onPreferenceClickListener = Preference.OnPreferenceClickListener {
-            SwipeActionsDialog(requireContext(), FeedEpisodesFragment.TAG).show (object : SwipeActionsDialog.Callback {
-                override fun onCall() {}
-            })
+//            SwipeActionsDialog(requireContext(), FeedEpisodesFragment.TAG).show (object : SwipeActionsDialog.Callback {
+//                override fun onCall() {}
+//            })
+            showSettingDialog(this, FeedEpisodesFragment.TAG)
             true
         }
         findPreference<Preference>(Prefs.prefSwipeHistory.name)?.onPreferenceClickListener = Preference.OnPreferenceClickListener {
-            SwipeActionsDialog(requireContext(), HistoryFragment.TAG).show (object : SwipeActionsDialog.Callback {
-                override fun onCall() {}
-            })
+//            SwipeActionsDialog(requireContext(), HistoryFragment.TAG).show (object : SwipeActionsDialog.Callback {
+//                override fun onCall() {}
+//            })
+            showSettingDialog(this, HistoryFragment.TAG)
             true
         }
     }
@@ -51,6 +57,7 @@ class SwipePreferencesFragment : PreferenceFragmentCompat() {
         (activity as PreferenceActivity).supportActionBar?.setTitle(R.string.swipeactions_label)
     }
 
+    @Suppress("EnumEntryName")
     private enum class Prefs {
         prefSwipeQueue,
 //        prefSwipeStatistics,

diff --git a/app/src/main/kotlin/ac/mdiq/podcini/storage/database/RealmDB.kt b/app/src/main/kotlin/ac/mdiq/podcini/storage/database/RealmDB.kt
@@ -13,14 +13,10 @@ import io.realm.kotlin.dynamic.DynamicMutableRealmObject
 import io.realm.kotlin.dynamic.DynamicRealmObject
 import io.realm.kotlin.dynamic.getValue
 import io.realm.kotlin.ext.isManaged
-import io.realm.kotlin.migration.AutomaticSchemaMigration
-import io.realm.kotlin.types.BaseRealmObject
-import io.realm.kotlin.types.RealmList
 import io.realm.kotlin.types.RealmObject
 import io.realm.kotlin.types.TypedRealmObject
 import kotlinx.coroutines.*
 import kotlin.coroutines.ContinuationInterceptor
-import kotlin.reflect.KClass
 
 object RealmDB {
     private val TAG: String = RealmDB::class.simpleName ?: "Anonymous"