Skip to content

Commit 6b29cc3

Browse files
XilinJiaXilinJia
committed
6.12.6 commit
1 parent 974bea7 commit 6b29cc3

File tree

18 files changed

+294
-127
lines changed

18 files changed

+294
-127
lines changed

‎app/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ android {
3131
testApplicationId "ac.mdiq.podcini.tests"
3232
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
3333

34-
versionCode 3020283
35-
versionName "6.12.5"
34+
versionCode 3020284
35+
versionName "6.12.6"
3636

3737
applicationId "ac.mdiq.podcini.R"
3838
def commit = ""

‎app/src/main/kotlin/ac/mdiq/podcini/net/sync/wifi/WifiSyncService.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ import kotlin.math.min
247247
// only push downloaded items
248248
val pausedItems = getEpisodes(0, Int.MAX_VALUE, EpisodeFilter(EpisodeFilter.States.paused.name), EpisodeSortOrder.DATE_NEW_OLD)
249249
val readItems = getEpisodes(0, Int.MAX_VALUE, EpisodeFilter(EpisodeFilter.States.played.name), EpisodeSortOrder.DATE_NEW_OLD)
250-
val favoriteItems = getEpisodes(0, Int.MAX_VALUE, EpisodeFilter(EpisodeFilter.States.is_favorite.name), EpisodeSortOrder.DATE_NEW_OLD)
250+
val favoriteItems = getEpisodes(0, Int.MAX_VALUE, EpisodeFilter(EpisodeFilter.States.favorite.name), EpisodeSortOrder.DATE_NEW_OLD)
251251
val comItems = mutableSetOf<Episode>()
252252
comItems.addAll(pausedItems)
253253
comItems.addAll(readItems)

‎app/src/main/kotlin/ac/mdiq/podcini/preferences/fragments/ImportExportPreferencesFragment.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -959,7 +959,7 @@ class ImportExportPreferencesFragment : PreferenceFragmentCompat() {
959959
val queuedEpisodeActions: MutableList<EpisodeAction> = mutableListOf()
960960
val pausedItems = getEpisodes(0, Int.MAX_VALUE, EpisodeFilter(EpisodeFilter.States.paused.name), EpisodeSortOrder.DATE_NEW_OLD)
961961
val readItems = getEpisodes(0, Int.MAX_VALUE, EpisodeFilter(EpisodeFilter.States.played.name), EpisodeSortOrder.DATE_NEW_OLD)
962-
val favoriteItems = getEpisodes(0, Int.MAX_VALUE, EpisodeFilter(EpisodeFilter.States.is_favorite.name), EpisodeSortOrder.DATE_NEW_OLD)
962+
val favoriteItems = getEpisodes(0, Int.MAX_VALUE, EpisodeFilter(EpisodeFilter.States.favorite.name), EpisodeSortOrder.DATE_NEW_OLD)
963963
val comItems = mutableSetOf<Episode>()
964964
comItems.addAll(pausedItems)
965965
comItems.addAll(readItems)
@@ -1018,7 +1018,7 @@ class ImportExportPreferencesFragment : PreferenceFragmentCompat() {
10181018
val favTemplate = IOUtils.toString(favTemplateStream, UTF_8)
10191019
val feedTemplateStream = context.assets.open(FEED_TEMPLATE)
10201020
val feedTemplate = IOUtils.toString(feedTemplateStream, UTF_8)
1021-
val allFavorites = getEpisodes(0, Int.MAX_VALUE, EpisodeFilter(EpisodeFilter.States.is_favorite.name), EpisodeSortOrder.DATE_NEW_OLD)
1021+
val allFavorites = getEpisodes(0, Int.MAX_VALUE, EpisodeFilter(EpisodeFilter.States.favorite.name), EpisodeSortOrder.DATE_NEW_OLD)
10221022
val favoritesByFeed = buildFeedMap(allFavorites)
10231023
writer!!.append(templateParts[0])
10241024
for (feedId in favoritesByFeed.keys) {

‎app/src/main/kotlin/ac/mdiq/podcini/storage/database/Queues.kt

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@ import ac.mdiq.podcini.util.EventFlow
1919
import ac.mdiq.podcini.util.FlowEvent
2020
import android.util.Log
2121
import androidx.annotation.OptIn
22+
import androidx.compose.runtime.getValue
23+
import androidx.compose.runtime.mutableStateOf
24+
import androidx.compose.runtime.setValue
2225
import androidx.media3.common.util.UnstableApi
2326
import kotlinx.coroutines.Job
2427
import java.util.*
@@ -30,12 +33,6 @@ object Queues {
3033
BACK, FRONT, AFTER_CURRENTLY_PLAYING, RANDOM
3134
}
3235

33-
var isQueueLocked: Boolean
34-
get() = appPrefs.getBoolean(UserPreferences.Prefs.prefQueueLocked.name, false)
35-
set(locked) {
36-
appPrefs.edit().putBoolean(UserPreferences.Prefs.prefQueueLocked.name, locked).apply()
37-
}
38-
3936
/**
4037
* Returns if the queue is in keep sorted mode.
4138
* Enables/disables the keep sorted mode of the queue.
@@ -66,8 +63,7 @@ object Queues {
6663
var enqueueLocation: EnqueueLocation
6764
get() {
6865
val valStr = appPrefs.getString(UserPreferences.Prefs.prefEnqueueLocation.name, EnqueueLocation.BACK.name)
69-
try {
70-
return EnqueueLocation.valueOf(valStr!!)
66+
try { return EnqueueLocation.valueOf(valStr!!)
7167
} catch (t: Throwable) {
7268
// should never happen but just in case
7369
Log.e(TAG, "getEnqueueLocation: invalid value '$valStr' Use default.", t)

‎app/src/main/kotlin/ac/mdiq/podcini/storage/model/EpisodeFilter.kt

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,21 @@ package ac.mdiq.podcini.storage.model
22

33
import ac.mdiq.podcini.R
44
import ac.mdiq.podcini.storage.database.Queues.inAnyQueue
5+
import ac.mdiq.podcini.util.Logd
56
import java.io.Serializable
67

78
class EpisodeFilter(vararg properties_: String) : Serializable {
89
val properties: HashSet<String> = setOf(*properties_).filter { it.isNotEmpty() }.map {it.trim()}.toHashSet()
910

10-
val showPlayed: Boolean = properties.contains(States.played.name)
11-
val showUnplayed: Boolean = properties.contains(States.unplayed.name)
12-
val showNew: Boolean = properties.contains(States.new.name)
11+
// val showPlayed: Boolean = properties.contains(States.played.name)
12+
// val showUnplayed: Boolean = properties.contains(States.unplayed.name)
13+
// val showNew: Boolean = properties.contains(States.new.name)
1314
val showQueued: Boolean = properties.contains(States.queued.name)
1415
val showNotQueued: Boolean = properties.contains(States.not_queued.name)
1516
val showDownloaded: Boolean = properties.contains(States.downloaded.name)
1617
val showNotDownloaded: Boolean = properties.contains(States.not_downloaded.name)
17-
val showIsFavorite: Boolean = properties.contains(States.is_favorite.name)
18-
val showNotFavorite: Boolean = properties.contains(States.not_favorite.name)
18+
// val showIsFavorite: Boolean = properties.contains(States.is_favorite.name)
19+
// val showNotFavorite: Boolean = properties.contains(States.not_favorite.name)
1920

2021
constructor(properties: String) : this(*(properties.split(",").toTypedArray()))
2122

@@ -30,11 +31,11 @@ class EpisodeFilter(vararg properties_: String) : Serializable {
3031

3132
fun queryString(): String {
3233
val statements: MutableList<String> = mutableListOf()
33-
when {
34-
showPlayed -> statements.add("playState >= ${PlayState.PLAYED.code}")
35-
showUnplayed -> statements.add(" playState < ${PlayState.PLAYED.code} ") // Match "New" items (read = -1) as well
36-
showNew -> statements.add("playState == -1 ")
37-
}
34+
// when {
35+
//// showPlayed -> statements.add("playState >= ${PlayState.PLAYED.code}")
36+
//// showUnplayed -> statements.add(" playState < ${PlayState.PLAYED.code} ") // Match "New" items (read = -1) as well
37+
//// showNew -> statements.add("playState == -1 ")
38+
// }
3839

3940
val mediaTypeQuerys = mutableListOf<String>()
4041
if (properties.contains(States.unknown.name)) mediaTypeQuerys.add(" media == nil OR media.mimeType == nil OR media.mimeType == '' ")
@@ -118,10 +119,10 @@ class EpisodeFilter(vararg properties_: String) : Serializable {
118119
properties.contains(States.has_comments.name) -> statements.add(" comment != '' ")
119120
properties.contains(States.no_comments.name) -> statements.add(" comment == '' ")
120121
}
121-
when {
122-
showIsFavorite -> statements.add("rating == ${Rating.FAVORITE.code} ")
123-
showNotFavorite -> statements.add("rating != ${Rating.FAVORITE.code} ")
124-
}
122+
// when {
123+
// showIsFavorite -> statements.add("rating == ${Rating.FAVORITE.code} ")
124+
// showNotFavorite -> statements.add("rating != ${Rating.FAVORITE.code} ")
125+
// }
125126

126127
if (statements.isEmpty()) return "id > 0"
127128
val query = StringBuilder(" (" + statements[0])
@@ -130,6 +131,7 @@ class EpisodeFilter(vararg properties_: String) : Serializable {
130131
query.append(r)
131132
}
132133
query.append(") ")
134+
Logd("EpisodeFilter", "queryString: $query")
133135
return query.toString()
134136
}
135137

@@ -154,8 +156,8 @@ class EpisodeFilter(vararg properties_: String) : Serializable {
154156
audio_app,
155157
paused,
156158
not_paused,
157-
is_favorite,
158-
not_favorite,
159+
// is_favorite,
160+
// not_favorite,
159161
has_media,
160162
no_media,
161163
has_comments,

‎app/src/main/kotlin/ac/mdiq/podcini/ui/actions/SwipeActions.kt

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ import ac.mdiq.podcini.ui.fragment.*
2828
import ac.mdiq.podcini.ui.utils.LocalDeleteModal.deleteEpisodesWarnLocal
2929
import ac.mdiq.podcini.util.EventFlow
3030
import ac.mdiq.podcini.util.FlowEvent
31+
import ac.mdiq.podcini.util.Logd
3132
import android.content.Context
3233
import android.content.SharedPreferences
3334
import android.util.TypedValue
@@ -92,6 +93,7 @@ open class SwipeActions(private val fragment: Fragment, private val tag: String)
9293
// EventFlow.postEvent(FlowEvent.SwipeActionsChangedEvent())
9394
// }
9495
// })
96+
Logd("SwipeActions", "showDialog()")
9597
val composeView = ComposeView(fragment.requireContext()).apply {
9698
setContent {
9799
val showDialog = remember { mutableStateOf(true) }
@@ -101,6 +103,7 @@ open class SwipeActions(private val fragment: Fragment, private val tag: String)
101103
(fragment.view as? ViewGroup)?.removeView(this@apply)
102104
}) {
103105
actions = getPrefs(this@SwipeActions.tag)
106+
// TODO: remove the need of event
104107
EventFlow.postEvent(FlowEvent.SwipeActionsChangedEvent())
105108
}
106109
}
@@ -149,7 +152,8 @@ open class SwipeActions(private val fragment: Fragment, private val tag: String)
149152
}
150153

151154
override fun willRemove(filter: EpisodeFilter, item: Episode): Boolean {
152-
return filter.showQueued || filter.showNew
155+
return false
156+
// return filter.showQueued || filter.showNew
153157
}
154158
}
155159

@@ -208,7 +212,8 @@ open class SwipeActions(private val fragment: Fragment, private val tag: String)
208212
}
209213

210214
override fun willRemove(filter: EpisodeFilter, item: Episode): Boolean {
211-
return filter.showQueued || filter.showNew
215+
return false
216+
// return filter.showQueued || filter.showNew
212217
}
213218
}
214219

@@ -274,7 +279,8 @@ open class SwipeActions(private val fragment: Fragment, private val tag: String)
274279
}
275280

276281
override fun willRemove(filter: EpisodeFilter, item: Episode): Boolean {
277-
return filter.showIsFavorite || filter.showNotFavorite
282+
return false
283+
// return filter.showIsFavorite || filter.showNotFavorite
278284
}
279285
}
280286

@@ -479,8 +485,9 @@ open class SwipeActions(private val fragment: Fragment, private val tag: String)
479485
}
480486

481487
override fun willRemove(filter: EpisodeFilter, item: Episode): Boolean {
482-
return if (item.playState == PlayState.NEW.code) filter.showPlayed || filter.showNew
483-
else filter.showUnplayed || filter.showPlayed || filter.showNew
488+
return false
489+
// return if (item.playState == PlayState.NEW.code) filter.showPlayed || filter.showNew
490+
// else filter.showUnplayed || filter.showPlayed || filter.showNew
484491
}
485492
}
486493

0 commit comments

Comments
 (0)