diff --git a/app/src/main/java/code/name/monkey/retromusic/adapter/album/AlbumAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/adapter/album/AlbumAdapter.kt index b7e613404..7b209ac6e 100644 --- a/app/src/main/java/code/name/monkey/retromusic/adapter/album/AlbumAdapter.kt +++ b/app/src/main/java/code/name/monkey/retromusic/adapter/album/AlbumAdapter.kt @@ -2,6 +2,7 @@ package code.name.monkey.retromusic.adapter.album import android.app.ActivityOptions import android.content.res.ColorStateList +import android.content.res.Resources import android.graphics.drawable.Drawable import android.view.LayoutInflater import android.view.MenuItem @@ -47,13 +48,12 @@ open class AlbumAdapter( } override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder { - println("onCreateViewHolder $itemLayoutRes") - itemLayoutRes = if (itemLayoutRes >= -1) { - itemLayoutRes - } else { - R.layout.item_grid - } - 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_grid, parent, false) + } return createViewHolder(view, viewType) } diff --git a/app/src/main/java/code/name/monkey/retromusic/adapter/artist/ArtistAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/adapter/artist/ArtistAdapter.kt index 4e0377986..e85504d19 100644 --- a/app/src/main/java/code/name/monkey/retromusic/adapter/artist/ArtistAdapter.kt +++ b/app/src/main/java/code/name/monkey/retromusic/adapter/artist/ArtistAdapter.kt @@ -2,6 +2,7 @@ package code.name.monkey.retromusic.adapter.artist import android.app.ActivityOptions import android.content.res.ColorStateList +import android.content.res.Resources import android.view.LayoutInflater import android.view.MenuItem import android.view.View @@ -47,12 +48,12 @@ class ArtistAdapter( } override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder { - itemLayoutRes = if (itemLayoutRes >= -1) { - itemLayoutRes - } else { - R.layout.item_grid_circle - } - 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_grid_circle, parent, false) + } return createViewHolder(view) } diff --git a/app/src/main/java/code/name/monkey/retromusic/adapter/song/SongAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/adapter/song/SongAdapter.kt index 693851b09..f744b3dad 100644 --- a/app/src/main/java/code/name/monkey/retromusic/adapter/song/SongAdapter.kt +++ b/app/src/main/java/code/name/monkey/retromusic/adapter/song/SongAdapter.kt @@ -2,6 +2,7 @@ package code.name.monkey.retromusic.adapter.song import android.app.ActivityOptions import android.content.res.ColorStateList +import android.content.res.Resources import android.graphics.drawable.Drawable import android.view.LayoutInflater import android.view.MenuItem @@ -63,7 +64,12 @@ open class SongAdapter( } 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) }