nyancrimew
/
PlayerAndroid
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix crashing on Artists or Albums or Songs list

main
Hemanth S 2020-05-21 05:09:47 +05:30
parent 7db515bb16
commit 021e98d044
3 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/src/main/java/code/name/monkey/retromusic/adapter/album/AlbumAdapter.kt
View File

@ -2,6 +2,7 @@ package code.name.monkey.retromusic.adapter.album
import android.app.ActivityOptions import android.app.ActivityOptions
import android.content.res.ColorStateList import android.content.res.ColorStateList
import android.content.res.Resources
import android.graphics.drawable.Drawable import android.graphics.drawable.Drawable
import android.view.LayoutInflater import android.view.LayoutInflater
import android.view.MenuItem import android.view.MenuItem
@ -47,13 +48,12 @@ open class AlbumAdapter(
} }
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder { override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
println("onCreateViewHolder $itemLayoutRes") val view =
itemLayoutRes = if (itemLayoutRes >= -1) { try {
itemLayoutRes LayoutInflater.from(activity).inflate(itemLayoutRes, parent, false)
} else { } catch (e: Resources.NotFoundException) {
R.layout.item_grid LayoutInflater.from(activity).inflate(R.layout.item_grid, parent, false)
} }
val view = LayoutInflater.from(activity).inflate(itemLayoutRes, parent, false)
return createViewHolder(view, viewType) return createViewHolder(view, viewType)
} }

13
app/src/main/java/code/name/monkey/retromusic/adapter/artist/ArtistAdapter.kt
View File

@ -2,6 +2,7 @@ package code.name.monkey.retromusic.adapter.artist
import android.app.ActivityOptions import android.app.ActivityOptions
import android.content.res.ColorStateList import android.content.res.ColorStateList
import android.content.res.Resources
import android.view.LayoutInflater import android.view.LayoutInflater
import android.view.MenuItem import android.view.MenuItem
import android.view.View import android.view.View
@ -47,12 +48,12 @@ class ArtistAdapter(
} }
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder { override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
itemLayoutRes = if (itemLayoutRes >= -1) { val view =
itemLayoutRes try {
} else { LayoutInflater.from(activity).inflate(itemLayoutRes, parent, false)
R.layout.item_grid_circle } catch (e: Resources.NotFoundException) {
} LayoutInflater.from(activity).inflate(R.layout.item_grid_circle, parent, false)
val view = LayoutInflater.from(activity).inflate(itemLayoutRes, parent, false) }
return createViewHolder(view) return createViewHolder(view)
} }

8
app/src/main/java/code/name/monkey/retromusic/adapter/song/SongAdapter.kt
View File

@ -2,6 +2,7 @@ package code.name.monkey.retromusic.adapter.song
import android.app.ActivityOptions import android.app.ActivityOptions
import android.content.res.ColorStateList import android.content.res.ColorStateList
import android.content.res.Resources
import android.graphics.drawable.Drawable import android.graphics.drawable.Drawable
import android.view.LayoutInflater import android.view.LayoutInflater
import android.view.MenuItem import android.view.MenuItem
@ -63,7 +64,12 @@ open class SongAdapter(
} }
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder { override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
val view = LayoutInflater.from(activity).inflate(itemLayoutRes, parent, false) val view =
try {
LayoutInflater.from(activity).inflate(itemLayoutRes, parent, false)
} catch (e: Resources.NotFoundException) {
LayoutInflater.from(activity).inflate(R.layout.item_list, parent, false)
}
return createViewHolder(view) return createViewHolder(view)
} }