From ac417a4ffabea0227572e9900d4b0e6f160087cc Mon Sep 17 00:00:00 2001 From: Charles Lombardo Date: Sun, 2 Apr 2023 16:42:59 -0400 Subject: [PATCH] android: Only show company text view if it has content --- .../java/org/yuzu/yuzu_emu/adapters/GameAdapter.kt | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/adapters/GameAdapter.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/adapters/GameAdapter.kt index 0295801ad..d4613fa8c 100644 --- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/adapters/GameAdapter.kt +++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/adapters/GameAdapter.kt @@ -77,11 +77,6 @@ class GameAdapter(private val activity: AppCompatActivity) : RecyclerView.Adapte } } - holder.binding.textGameTitle.text = - cursor!!.getString(GameDatabase.GAME_COLUMN_TITLE) - .replace("[\\t\\n\\r]+".toRegex(), " ") - holder.binding.textGameCaption.text = cursor!!.getString(GameDatabase.GAME_COLUMN_CAPTION) - // TODO These shouldn't be necessary once the move to a DB-based model is complete. val game = Game( cursor!!.getString(GameDatabase.GAME_COLUMN_TITLE), @@ -92,6 +87,14 @@ class GameAdapter(private val activity: AppCompatActivity) : RecyclerView.Adapte cursor!!.getString(GameDatabase.GAME_COLUMN_CAPTION) ) holder.game = game + + holder.binding.textGameTitle.text = game.title.replace("[\\t\\n\\r]+".toRegex(), " ") + holder.binding.textGameCaption.text = game.company + + if (game.company.isEmpty()) { + holder.binding.textGameCaption.visibility = View.GONE + } + val backgroundColorId = if (isValidGame(holder.game.path)) R.attr.colorSurface else R.attr.colorErrorContainer val itemView = holder.itemView