From cbbc1a306567ff2abae47539ade07631ad8af6ba Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Wed, 23 Aug 2023 09:02:52 +0200
Subject: [PATCH] Refactoring

---
 .../email/FragmentDialogSelectAccount.java    |  2 +-
 .../email/FragmentDialogSelectIdentity.java   |  2 +-
 .../main/res/layout/item_account_select.xml   | 36 +++++++++++++++++++
 app/src/main/res/layout/spinner_account.xml   | 30 ----------------
 4 files changed, 38 insertions(+), 32 deletions(-)
 create mode 100644 app/src/main/res/layout/item_account_select.xml
 delete mode 100644 app/src/main/res/layout/spinner_account.xml

diff --git a/app/src/main/java/eu/faircode/email/FragmentDialogSelectAccount.java b/app/src/main/java/eu/faircode/email/FragmentDialogSelectAccount.java
index f41179abc9..86f9a6bb99 100644
--- a/app/src/main/java/eu/faircode/email/FragmentDialogSelectAccount.java
+++ b/app/src/main/java/eu/faircode/email/FragmentDialogSelectAccount.java
@@ -186,7 +186,7 @@ public class FragmentDialogSelectAccount extends FragmentDialogBase {
         @Override
         @NonNull
         public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-            return new ViewHolder(inflater.inflate(R.layout.spinner_account, parent, false));
+            return new ViewHolder(inflater.inflate(R.layout.item_account_select, parent, false));
         }
 
         @Override
diff --git a/app/src/main/java/eu/faircode/email/FragmentDialogSelectIdentity.java b/app/src/main/java/eu/faircode/email/FragmentDialogSelectIdentity.java
index fc707e6245..4bdae0cc79 100644
--- a/app/src/main/java/eu/faircode/email/FragmentDialogSelectIdentity.java
+++ b/app/src/main/java/eu/faircode/email/FragmentDialogSelectIdentity.java
@@ -174,7 +174,7 @@ public class FragmentDialogSelectIdentity extends FragmentDialogBase {
         @Override
         @NonNull
         public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-            return new ViewHolder(inflater.inflate(R.layout.spinner_account, parent, false));
+            return new ViewHolder(inflater.inflate(R.layout.item_account_select, parent, false));
         }
 
         @Override
diff --git a/app/src/main/res/layout/item_account_select.xml b/app/src/main/res/layout/item_account_select.xml
new file mode 100644
index 0000000000..13abee384b
--- /dev/null
+++ b/app/src/main/res/layout/item_account_select.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="?attr/selectableItemBackground"
+        android:paddingHorizontal="12dp">
+
+        <eu.faircode.email.ViewStripe
+            android:id="@+id/vwColor"
+            android:layout_width="6dp"
+            android:layout_height="0dp"
+            android:layout_marginVertical="3dp"
+            android:layout_marginStart="6dp"
+            app:layout_constraintBottom_toBottomOf="@android:id/text1"
+            app:layout_constraintEnd_toStartOf="@android:id/text1"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="@android:id/text1" />
+
+        <TextView
+            android:id="@android:id/text1"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="12dp"
+            android:paddingVertical="12dp"
+            android:text="Text1"
+            android:textAppearance="@style/TextAppearance.AppCompat.Medium"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toEndOf="@+id/vwColor"
+            app:layout_constraintTop_toTopOf="parent" />
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/spinner_account.xml b/app/src/main/res/layout/spinner_account.xml
deleted file mode 100644
index 297edaf5d6..0000000000
--- a/app/src/main/res/layout/spinner_account.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:paddingHorizontal="12dp">
-
-    <eu.faircode.email.ViewStripe
-        android:id="@+id/vwColor"
-        android:layout_width="6dp"
-        android:layout_height="0dp"
-        android:layout_marginVertical="3dp"
-        android:layout_marginStart="6dp"
-        app:layout_constraintBottom_toBottomOf="@android:id/text1"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toStartOf="@android:id/text1"
-        app:layout_constraintTop_toTopOf="@android:id/text1" />
-
-    <TextView
-        android:id="@android:id/text1"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="12dp"
-        android:paddingVertical="12dp"
-        android:text="Text1"
-        android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toEndOf="@+id/vwColor"
-        app:layout_constraintTop_toTopOf="parent" />
-</androidx.constraintlayout.widget.ConstraintLayout>