From 5a8b75194df3622e008a4ed316ccce1fd4ab6c75 Mon Sep 17 00:00:00 2001
From: Jarne Demeulemeester <jarnedemeulemeester@gmail.com>
Date: Mon, 31 Jul 2023 23:37:38 +0200
Subject: [PATCH] refactor(discovered_server_item): remove databinding

---
 .../adapters/DiscoveredServerListAdapter.kt   |  3 +-
 .../res/layout/discovered_server_item.xml     | 95 ++++++++-----------
 2 files changed, 43 insertions(+), 55 deletions(-)

diff --git a/app/phone/src/main/java/dev/jdtech/jellyfin/adapters/DiscoveredServerListAdapter.kt b/app/phone/src/main/java/dev/jdtech/jellyfin/adapters/DiscoveredServerListAdapter.kt
index 251eff1d..06c2d31b 100644
--- a/app/phone/src/main/java/dev/jdtech/jellyfin/adapters/DiscoveredServerListAdapter.kt
+++ b/app/phone/src/main/java/dev/jdtech/jellyfin/adapters/DiscoveredServerListAdapter.kt
@@ -17,8 +17,7 @@ class DiscoveredServerListAdapter(
     class DiscoveredServerViewHolder(private var binding: DiscoveredServerItemBinding) :
         RecyclerView.ViewHolder(binding.root) {
         fun bind(server: DiscoveredServer) {
-            binding.server = server
-            binding.executePendingBindings()
+            binding.serverName.text = server.name
         }
     }
 
diff --git a/app/phone/src/main/res/layout/discovered_server_item.xml b/app/phone/src/main/res/layout/discovered_server_item.xml
index 3e8f12e2..2c4af382 100644
--- a/app/phone/src/main/res/layout/discovered_server_item.xml
+++ b/app/phone/src/main/res/layout/discovered_server_item.xml
@@ -1,59 +1,48 @@
 <?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools">
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="64dp"
+    android:layout_height="wrap_content"
+    android:layout_marginHorizontal="12dp"
+    android:clickable="true"
+    android:focusable="true"
+    android:foreground="@drawable/ripple_background">
 
-    <data>
+    <FrameLayout
+        android:id="@+id/server_icon"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_marginBottom="8dp"
+        android:background="@drawable/button_setup_background"
+        app:layout_constraintDimensionRatio="w,1:1"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
 
-        <variable
-            name="server"
-            type="dev.jdtech.jellyfin.models.DiscoveredServer" />
-    </data>
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="64dp"
-        android:layout_height="wrap_content"
-        android:layout_marginHorizontal="12dp"
-        android:clickable="true"
-        android:focusable="true"
-        android:foreground="@drawable/ripple_background">
-
-        <FrameLayout
-            android:id="@+id/server_icon"
-            android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:layout_marginBottom="8dp"
-            android:background="@drawable/button_setup_background"
-            app:layout_constraintDimensionRatio="w,1:1"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent">
-
-            <ImageView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:importantForAccessibility="no"
-                app:srcCompat="@drawable/ic_server"
-                app:tint="?attr/colorOnPrimary" />
-
-        </FrameLayout>
-
-        <TextView
-            android:id="@+id/server_name"
-            android:layout_width="match_parent"
+        <ImageView
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="8dp"
-            android:maxLines="1"
-            android:ellipsize="end"
-            android:text="@{server.name}"
-            android:textAlignment="center"
-            android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/server_icon"
-            tools:text="server name" />
-    </androidx.constraintlayout.widget.ConstraintLayout>
+            android:layout_gravity="center"
+            android:importantForAccessibility="no"
+            app:srcCompat="@drawable/ic_server"
+            app:tint="?attr/colorOnPrimary" />
 
-</layout>
\ No newline at end of file
+    </FrameLayout>
+
+    <TextView
+        android:id="@+id/server_name"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="8dp"
+        android:ellipsize="end"
+        android:maxLines="1"
+        android:text="@{server.name}"
+        android:textAlignment="center"
+        android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/server_icon"
+        tools:text="server name" />
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file