mirror of
https://github.com/mediathekview/zapp.git
synced 2024-09-20 04:12:14 +02:00
Merge branch 'main' into develop-next
# Conflicts: # app/src/main/res/raw/changelog.md
This commit is contained in:
commit
8378a19e22
@ -13,8 +13,8 @@ android {
|
||||
applicationId "de.christinecoenen.code.zapp"
|
||||
minSdkVersion 23
|
||||
targetSdkVersion 31
|
||||
versionCode 53
|
||||
versionName "6.0.0"
|
||||
versionCode 54
|
||||
versionName "6.0.1"
|
||||
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
|
||||
}
|
||||
|
||||
|
@ -1,5 +1,6 @@
|
||||
package de.christinecoenen.code.zapp.app.livestream.ui.list
|
||||
|
||||
import android.annotation.SuppressLint
|
||||
import android.os.Bundle
|
||||
import android.view.*
|
||||
import android.widget.PopupMenu
|
||||
@ -48,10 +49,15 @@ class ChannelListFragment : Fragment(), ListItemListener {
|
||||
return binding.root
|
||||
}
|
||||
|
||||
@SuppressLint("NotifyDataSetChanged")
|
||||
override fun onResume() {
|
||||
super.onResume()
|
||||
|
||||
channelList.reloadChannelOrder()
|
||||
|
||||
// We do not know if the channels changed, so we need to reload them all.
|
||||
// Otherwise outdated data may cause null pointers in the adapter.
|
||||
gridAdapter.notifyDataSetChanged()
|
||||
}
|
||||
|
||||
override fun onItemClick(channel: ChannelModel) {
|
||||
|
@ -41,5 +41,5 @@ class ChannelListAdapter(
|
||||
|
||||
override fun getItemCount() = channelList.size()
|
||||
|
||||
override fun getItemId(position: Int) = position.toLong()
|
||||
override fun getItemId(position: Int) = channelList[position].hashCode().toLong()
|
||||
}
|
||||
|
@ -39,6 +39,12 @@ class ChannelViewHolder(
|
||||
}
|
||||
|
||||
fun setChannel(programInfoViewModel: ProgramInfoViewModel, channel: ChannelModel) {
|
||||
if (channel.id == this.channel?.id) {
|
||||
return
|
||||
}
|
||||
|
||||
recycle()
|
||||
|
||||
this.currentViewModel = programInfoViewModel
|
||||
this.channel = channel
|
||||
|
||||
@ -49,6 +55,9 @@ class ChannelViewHolder(
|
||||
fun recycle() {
|
||||
stopLoadingProgramInfo()
|
||||
setViewLoading()
|
||||
|
||||
currentViewModel = null
|
||||
channel = null
|
||||
}
|
||||
|
||||
private fun onShowTitleChanged(title: String) {
|
||||
|
@ -1,6 +1,7 @@
|
||||
package de.christinecoenen.code.zapp.app.player
|
||||
|
||||
import android.content.Context
|
||||
import android.content.res.Resources
|
||||
import android.graphics.Bitmap
|
||||
import androidx.core.graphics.drawable.toBitmap
|
||||
import androidx.vectordrawable.graphics.drawable.VectorDrawableCompat
|
||||
@ -10,11 +11,16 @@ import java.io.IOException
|
||||
object VideoInfoArtworkExtensions {
|
||||
|
||||
fun VideoInfo.getArtworkByteArray(context: Context): ByteArray {
|
||||
val vectorDrawable = VectorDrawableCompat.create(
|
||||
context.resources,
|
||||
artworkVectorDrawableResId,
|
||||
context.theme
|
||||
)
|
||||
val vectorDrawable = try {
|
||||
VectorDrawableCompat.create(
|
||||
context.resources,
|
||||
artworkVectorDrawableResId,
|
||||
context.theme
|
||||
)
|
||||
} catch (e: Resources.NotFoundException) {
|
||||
throw IOException("Could read artwork vector drawable.", e)
|
||||
}
|
||||
|
||||
val bitmap = vectorDrawable?.toBitmap(
|
||||
vectorDrawable.intrinsicWidth,
|
||||
vectorDrawable.intrinsicHeight
|
||||
|
@ -3,6 +3,11 @@
|
||||
* Abspielfehler bei manchen Mediathek-Sendungen behoben
|
||||
* Deaktivierter Download-Button bei manchen Mediathek-Sendungen behoben
|
||||
|
||||
# 6.0.1
|
||||
* Absturz nach dem Bearbeiten der Senderliste behoben
|
||||
* Absturz beim Starten von Tagesschau24 auf Android 6 behoben
|
||||
* Springender Fortschrittsbalken in der Senderliste auf Android 6 behoben
|
||||
|
||||
# 6.0.0
|
||||
* Mediathek-Suche erweitert: Filtern nach Sender und Sendungslänge
|
||||
* Suchvorschläge entfernt
|
||||
|
3
fastlane/metadata/android/de/changelogs/54.txt
Normal file
3
fastlane/metadata/android/de/changelogs/54.txt
Normal file
@ -0,0 +1,3 @@
|
||||
* Absturz nach dem Bearbeiten der Senderliste behoben
|
||||
* Absturz beim Starten von Tagesschau24 auf Android 6 behoben
|
||||
* Springender Fortschrittsbalken in der Senderliste auf Android 6 behoben
|
3
fastlane/metadata/android/en-US/changelogs/54.txt
Normal file
3
fastlane/metadata/android/en-US/changelogs/54.txt
Normal file
@ -0,0 +1,3 @@
|
||||
* Fixed crash after editing channel list
|
||||
* Fixed crash when starting Tagessschau24 on Android 6
|
||||
* Fixed jumping progress bar in channel list on Android 6
|
Loading…
Reference in New Issue
Block a user