Skip to content

Commit

Permalink
5.2.1 commit
Browse files Browse the repository at this point in the history
  • Loading branch information
XilinJia committed May 16, 2024
1 parent 6d22cf5 commit ef5fe70
Show file tree
Hide file tree
Showing 9 changed files with 38 additions and 41 deletions.
10 changes: 5 additions & 5 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ plugins {
id('com.android.application')
id 'kotlin-android'
id 'kotlin-kapt'
// id 'com.google.devtools.ksp'
id 'com.google.devtools.ksp'
id('com.github.triplet.play') version '3.8.3' apply false
}

Expand Down Expand Up @@ -159,8 +159,8 @@ android {
// Version code schema (not used):
// "1.2.3-beta4" -> 1020304
// "1.2.3" -> 1020395
versionCode 3020143
versionName "5.2.0"
versionCode 3020144
versionName "5.2.1"

def commit = ""
try {
Expand Down Expand Up @@ -213,7 +213,6 @@ android {
}
}


androidResources {
additionalParameters "--no-version-vectors"
}
Expand All @@ -233,7 +232,8 @@ dependencies {
}
}

kapt "androidx.annotation:annotation:1.7.1"
// doesn't work with ksp??
kapt "androidx.annotation:annotation:1.8.0"

implementation "androidx.appcompat:appcompat:1.6.1"
implementation 'androidx.coordinatorlayout:coordinatorlayout:1.2.0'
Expand Down
10 changes: 5 additions & 5 deletions app/src/main/assets/licenses.xml
Original file line number Diff line number Diff line change
Expand Up @@ -61,11 +61,11 @@
license="Apache 2.0"
licenseText="LICENSE_APACHE-2.0.txt" />
<library
name="Glide"
author="bumptech"
website="https://github.com/bumptech/glide"
license="Simplified BSD"
licenseText="LICENSE_GLIDE.txt" />
name="Coil"
author="Colin White et.al"
website="https://github.com/coil-kt/coil"
license="Apache 2.0"
licenseText="LICENSE_APACHE-2.0.txt" />
<library
name="Iconify"
author="Joan Zapata"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@ import com.google.android.material.snackbar.Snackbar
import com.joanzapata.iconify.Iconify
import com.leinardi.android.speeddial.SpeedDialActionItem
import com.leinardi.android.speeddial.SpeedDialView
import io.reactivex.disposables.Disposable
import kotlinx.coroutines.*
import org.apache.commons.lang3.StringUtils
import org.greenrobot.eventbus.EventBus
Expand Down Expand Up @@ -128,10 +127,8 @@ class FeedItemlistFragment : Fragment(), AdapterView.OnItemClickListener, Toolba
val iconTintManager: ToolbarIconTintManager = object : ToolbarIconTintManager(
requireContext(), binding.toolbar, binding.collapsingToolbar) {
override fun doTint(themedContext: Context) {
binding.toolbar.menu.findItem(R.id.refresh_item)
.setIcon(AppCompatResources.getDrawable(themedContext, R.drawable.ic_refresh))
binding.toolbar.menu.findItem(R.id.action_search)
.setIcon(AppCompatResources.getDrawable(themedContext, R.drawable.ic_search))
binding.toolbar.menu.findItem(R.id.refresh_item).setIcon(AppCompatResources.getDrawable(themedContext, R.drawable.ic_refresh))
binding.toolbar.menu.findItem(R.id.action_search).setIcon(AppCompatResources.getDrawable(themedContext, R.drawable.ic_search))
}
}
iconTintManager.updateTint()
Expand Down Expand Up @@ -357,13 +354,13 @@ class FeedItemlistFragment : Fragment(), AdapterView.OnItemClickListener, Toolba
@UnstableApi @Subscribe(threadMode = ThreadMode.MAIN)
fun favoritesChanged(event: FavoritesEvent?) {
Logd(TAG, "favoritesChanged called")
updateUi()
loadItems()
}

@UnstableApi @Subscribe(threadMode = ThreadMode.MAIN)
fun onQueueChanged(event: QueueEvent?) {
Logd(TAG, "onQueueChanged called")
updateUi()
loadItems()
}

override fun onStartSelectMode() {
Expand All @@ -386,27 +383,23 @@ class FeedItemlistFragment : Fragment(), AdapterView.OnItemClickListener, Toolba
swipeActions.attachTo(binding.recyclerView)
}

@UnstableApi private fun updateUi() {
loadItems()
}

@UnstableApi @Subscribe(threadMode = ThreadMode.MAIN)
fun onPlayerStatusChanged(event: PlayerStatusEvent?) {
Logd(TAG, "onPlayerStatusChanged called")
updateUi()
loadItems()
}

@UnstableApi @Subscribe(threadMode = ThreadMode.MAIN)
fun onUnreadItemsChanged(event: UnreadItemsUpdateEvent?) {
Logd(TAG, "onUnreadItemsChanged called")
updateUi()
loadItems()
}

@UnstableApi @Subscribe(threadMode = ThreadMode.MAIN)
fun onFeedListChanged(event: FeedListUpdateEvent) {
if (feed != null && event.contains(feed!!)) {
Logd(TAG, "onFeedListChanged called")
updateUi()
loadItems()
}
}

Expand Down Expand Up @@ -461,7 +454,6 @@ class FeedItemlistFragment : Fragment(), AdapterView.OnItemClickListener, Toolba
@UnstableApi private fun setupHeaderView() {
if (feed == null || headerCreated) return

// https://github.com/bumptech/glide/issues/529
binding.imgvBackground.colorFilter = LightingColorFilter(-0x99999a, 0x000000)
binding.header.imgvCover.setOnClickListener { showFeedInfo() }
binding.header.butShowSettings.setOnClickListener {
Expand Down Expand Up @@ -572,7 +564,7 @@ class FeedItemlistFragment : Fragment(), AdapterView.OnItemClickListener, Toolba
val feed_ = loadData()
if (feed_ != null) {
var hasNonMediaItems = false
for (item in feed_!!.items) {
for (item in feed_.items) {
if (item.media == null) {
hasNonMediaItems = true
break
Expand Down
15 changes: 6 additions & 9 deletions app/src/main/java/ac/mdiq/podcini/ui/fragment/QueueFragment.kt
Original file line number Diff line number Diff line change
Expand Up @@ -134,8 +134,7 @@ class QueueFragment : Fragment(), Toolbar.OnMenuItemClickListener, SelectableAda
recyclerAdapter = object : QueueRecyclerAdapter(activity as MainActivity, swipeActions) {
override fun onCreateContextMenu(menu: ContextMenu, v: View, menuInfo: ContextMenu.ContextMenuInfo?) {
super.onCreateContextMenu(menu, v, menuInfo)
MenuItemUtils.setOnClickListeners(menu
) { item: MenuItem -> this@QueueFragment.onContextItemSelected(item) }
MenuItemUtils.setOnClickListeners(menu) { item: MenuItem -> this@QueueFragment.onContextItemSelected(item) }
}
}
recyclerAdapter?.setOnSelectModeListener(this)
Expand Down Expand Up @@ -163,7 +162,6 @@ class QueueFragment : Fragment(), Toolbar.OnMenuItemClickListener, SelectableAda
override fun onMainActionSelected(): Boolean {
return false
}

override fun onToggleChanged(open: Boolean) {
if (open && recyclerAdapter!!.selectedCount == 0) {
(activity as MainActivity).showSnackbarAbovePlayer(R.string.no_items_selected, Snackbar.LENGTH_SHORT)
Expand Down Expand Up @@ -193,11 +191,10 @@ class QueueFragment : Fragment(), Toolbar.OnMenuItemClickListener, SelectableAda
recyclerView.saveScrollPosition(TAG)
}

override fun onStop() {
super.onStop()
scope.cancel()
// disposable?.dispose()
}
// override fun onStop() {
// super.onStop()
//// disposable?.dispose()
// }

@Subscribe(threadMode = ThreadMode.MAIN)
fun onEventMainThread(event: QueueEvent) {
Expand Down Expand Up @@ -340,6 +337,7 @@ class QueueFragment : Fragment(), Toolbar.OnMenuItemClickListener, SelectableAda
recyclerAdapter?.endSelectMode()
recyclerAdapter = null
EventBus.getDefault().unregister(this)
scope.cancel()

toolbar.setOnMenuItemClickListener(null)
toolbar.setOnLongClickListener(null)
Expand Down Expand Up @@ -518,7 +516,6 @@ class QueueFragment : Fragment(), Toolbar.OnMenuItemClickListener, SelectableAda
Log.e(TAG, Log.getStackTraceString(e))
}
}

}

override fun onStartSelectMode() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -107,8 +107,8 @@ class EpisodeItemViewHolder(private val activity: MainActivity, parent: ViewGrou
container.alpha = if (item.isPlayed()) 0.75f else 1.0f

val newButton = ItemActionButton.forItem(item)
// Log.d(TAG, "bind ${actionButton?.TAG} ${newButton.TAG} ${item.title}")
// not using a new button to ensure valid progress values
Logd(TAG, "bind ${actionButton?.TAG} ${newButton.TAG} ${item.title}")
// not using a new button to ensure valid progress values, for TTS audio generation
if (!(actionButton?.TAG == TTSActionButton::class.simpleName && newButton.TAG == TTSActionButton::class.simpleName)) {
actionButton = newButton
actionButton?.configure(secondaryActionButton, secondaryActionIcon, activity)
Expand Down
6 changes: 3 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ buildscript {
}
}

//plugins {
// id 'com.google.devtools.ksp' version '1.9.22-1.0.17' apply false
//}
plugins {
id 'com.google.devtools.ksp' version '1.9.24-1.0.20' apply false
}

allprojects {
repositories {
Expand Down
4 changes: 4 additions & 0 deletions changelog.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## 5.2.1

* fixed issue of play/pause button not correctly updated in Queue

## 5.2.0

* suppressed log.d messages in release app (unbelievable incomplete suppression last time)
Expand Down
4 changes: 4 additions & 0 deletions fastlane/metadata/android/en-US/changelogs/3020144.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@

Version 5.2.1 brings several changes:

* fixed issue of play/pause button not correctly updated in Queue
2 changes: 1 addition & 1 deletion fastlane/metadata/android/en-US/full_description.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

Podcini is an open source podcast instrument, attuned to Puccini, adorned with pasticcini and aromatized with porcini.
Podcini, an open source podcast instrument, attuned to Puccini, adorned with pasticcini and aromatized with porcini, invites your harmonious heartbeats.

It allows you to subscribe to any RSS feed (with or without media), gives you instant access to millions of free and paid podcasts or plain RSS feeds, from independent podcasters to large publishing houses such as the BBC, NPR and CNN. Add, import and export their feeds hassle-free using the Apple Podcasts database, OPML files or simple RSS URLs.

Expand Down

0 comments on commit ef5fe70

Please sign in to comment.