From 7e1a3de0311a20fa30e61f69aa6401a593b234ad Mon Sep 17 00:00:00 2001 From: Laurent Date: Mon, 19 Oct 2020 18:32:17 +0200 Subject: [PATCH] Clean code --- .../pokeranalytics/android/ui/view/RowViewType.kt | 14 +++++++------- app/src/main/res/layout/fragment_filters.xml | 1 + 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/net/pokeranalytics/android/ui/view/RowViewType.kt b/app/src/main/java/net/pokeranalytics/android/ui/view/RowViewType.kt index 9c111d0b..e1e049cd 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/view/RowViewType.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/view/RowViewType.kt @@ -415,10 +415,11 @@ enum class RowViewType(private var layoutRes: Int) : ViewIdentifier { inner class RowButtonViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView), BindableHolder { override fun onBind(position: Int, row: RowRepresentable, adapter: RecyclerAdapter) { - itemView.findViewById(R.id.title).text = - row.localizedTitle(itemView.context) - itemView.findViewById(R.id.title).isVisible = - !adapter.dataSource.boolForRow(row) + + val titleTextView = itemView.findViewById(R.id.title) + titleTextView.text = row.localizedTitle(itemView.context) + titleTextView.isVisible = !adapter.dataSource.boolForRow(row) + itemView.findViewById(R.id.progressBar).isVisible = adapter.dataSource.boolForRow(row) val listener = View.OnClickListener { @@ -532,9 +533,8 @@ enum class RowViewType(private var layoutRes: Int) : ViewIdentifier { override fun onBind(position: Int, row: RowRepresentable, adapter: RecyclerAdapter) { if (row is Player) { - itemView.findViewById(R.id.player_image)?.let { playerImageView -> - playerImageView.setPlayer(row, PlayerImageView.Size.SMALL) - } + itemView.findViewById(R.id.player_image)?.setPlayer(row, PlayerImageView.Size.SMALL) + itemView.findViewById(R.id.playerName)?.let { textView -> textView.text = row.name } diff --git a/app/src/main/res/layout/fragment_filters.xml b/app/src/main/res/layout/fragment_filters.xml index 4fe5cd4f..e00a80a0 100644 --- a/app/src/main/res/layout/fragment_filters.xml +++ b/app/src/main/res/layout/fragment_filters.xml @@ -1,4 +1,5 @@ +