From 57ae06a83c07b9bebace8620aa77b764ccdbb601 Mon Sep 17 00:00:00 2001
From: Mathias Boulay <mathiasboulay@free.fr>
Date: Sat, 5 Aug 2023 18:53:06 +0200
Subject: [PATCH] Fix[profile-editor]: Spinner height aligned with the rest,
 better selected visibility

---
 .../fragments/ProfileEditorFragment.java      |  2 +-
 .../pojavlaunch/multirt/RTSpinnerAdapter.java |  2 +-
 .../res/drawable/background_line_selected.xml |  4 ----
 .../drawable/background_line_unselected.xml   |  4 ++--
 .../res/layout/fragment_profile_editor.xml    |  6 ++---
 .../main/res/layout/item_simple_list_1.xml    | 24 +++++++++++++++++++
 .../src/main/res/values/dimens.xml            |  4 ++++
 7 files changed, 35 insertions(+), 11 deletions(-)
 create mode 100644 app_pojavlauncher/src/main/res/layout/item_simple_list_1.xml

diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/fragments/ProfileEditorFragment.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/fragments/ProfileEditorFragment.java
index 5df28efa7..f01ee9407 100644
--- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/fragments/ProfileEditorFragment.java
+++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/fragments/ProfileEditorFragment.java
@@ -75,7 +75,7 @@ public class ProfileEditorFragment extends Fragment {
         List<String> renderList = new ArrayList<>(5);
         Collections.addAll(renderList, getResources().getStringArray(R.array.renderer));
         renderList.add("Default");
-        mDefaultRenderer.setAdapter(new ArrayAdapter<>(getContext(), android.R.layout.simple_list_item_1, renderList));
+        mDefaultRenderer.setAdapter(new ArrayAdapter<>(getContext(), R.layout.item_simple_list_1, renderList));
 
         // Set up behaviors
         mSaveButton.setOnClickListener(v -> {
diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/multirt/RTSpinnerAdapter.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/multirt/RTSpinnerAdapter.java
index e5548fceb..f7de37374 100644
--- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/multirt/RTSpinnerAdapter.java
+++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/multirt/RTSpinnerAdapter.java
@@ -56,7 +56,7 @@ public class RTSpinnerAdapter implements SpinnerAdapter {
     public View getView(int position, @Nullable View convertView, @NonNull ViewGroup parent) {
         View view = convertView != null?
                 convertView:
-                LayoutInflater.from(mContext).inflate(android.R.layout.simple_list_item_1, parent,false);
+                LayoutInflater.from(mContext).inflate(R.layout.item_simple_list_1, parent,false);
 
         Runtime runtime = mRuntimes.get(position);
         if(position == mRuntimes.size() - 1 ){
diff --git a/app_pojavlauncher/src/main/res/drawable/background_line_selected.xml b/app_pojavlauncher/src/main/res/drawable/background_line_selected.xml
index 56fa839b7..f962a8189 100644
--- a/app_pojavlauncher/src/main/res/drawable/background_line_selected.xml
+++ b/app_pojavlauncher/src/main/res/drawable/background_line_selected.xml
@@ -7,10 +7,6 @@
 
             <corners android:radius="@dimen/_2sdp" />
 
-            <padding
-                android:bottom="@dimen/_12sdp"
-                android:top="@dimen/_11sdp" />
-
             <stroke
                 android:width="@dimen/_2sdp"
                 android:color="@color/minebutton_color"/>
diff --git a/app_pojavlauncher/src/main/res/drawable/background_line_unselected.xml b/app_pojavlauncher/src/main/res/drawable/background_line_unselected.xml
index d1cd8faba..1c95d5431 100644
--- a/app_pojavlauncher/src/main/res/drawable/background_line_unselected.xml
+++ b/app_pojavlauncher/src/main/res/drawable/background_line_unselected.xml
@@ -8,8 +8,8 @@
             <corners android:radius="@dimen/_2sdp" />
 
             <padding
-                android:bottom="@dimen/_12sdp"
-                android:top="@dimen/_11sdp" />
+                android:bottom="@dimen/padding_input_bottom"
+                android:top="@dimen/padding_input_top" />
 
             <stroke
                 android:width="@dimen/_2sdp"
diff --git a/app_pojavlauncher/src/main/res/layout/fragment_profile_editor.xml b/app_pojavlauncher/src/main/res/layout/fragment_profile_editor.xml
index 435b4d8f1..9ca3a1ef0 100644
--- a/app_pojavlauncher/src/main/res/layout/fragment_profile_editor.xml
+++ b/app_pojavlauncher/src/main/res/layout/fragment_profile_editor.xml
@@ -184,11 +184,11 @@
             android:layout_marginTop="32dp"
             android:background="@drawable/background_line"
             android:paddingVertical="0px"
-            android:textSize="@dimen/_13ssp"
+
 
             app:layout_constraintTop_toBottomOf="@+id/vprof_editor_path"
 
-            tools:paddingVertical="@dimen/_16sdp" />
+            tools:paddingVertical="@dimen/_12sdp" />
 
         <ImageView
             android:layout_width="wrap_content"
@@ -221,7 +221,7 @@
 
 
             app:layout_constraintTop_toBottomOf="@+id/vprof_editor_spinner_runtime"
-            tools:paddingVertical="@dimen/_16sdp" />
+            tools:paddingVertical="@dimen/_12sdp" />
 
         <ImageView
             android:layout_width="wrap_content"
diff --git a/app_pojavlauncher/src/main/res/layout/item_simple_list_1.xml b/app_pojavlauncher/src/main/res/layout/item_simple_list_1.xml
new file mode 100644
index 000000000..a29d3a2d3
--- /dev/null
+++ b/app_pojavlauncher/src/main/res/layout/item_simple_list_1.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    A modified version of the simple_list_item_1 android offers
+    So I could modify it to suit the standard look and feel of the app
+-->
+
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@android:id/text1"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+
+    android:paddingTop="@dimen/padding_input_top"
+    android:paddingBottom="@dimen/padding_input_bottom"
+    android:textAppearance="?android:attr/textAppearanceListItemSmall"
+
+
+    android:textSize="@dimen/_13ssp"
+    android:gravity="center_vertical"
+    android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
+    android:minHeight="?android:attr/listPreferredItemHeightSmall"
+    tools:text="PojavLauncher version: Edelweiss"
+    />
diff --git a/app_pojavlauncher/src/main/res/values/dimens.xml b/app_pojavlauncher/src/main/res/values/dimens.xml
index c4dfec7d0..3a04517e8 100644
--- a/app_pojavlauncher/src/main/res/values/dimens.xml
+++ b/app_pojavlauncher/src/main/res/values/dimens.xml
@@ -16,6 +16,10 @@
     <dimen name="padding_extra_large">@dimen/_24sdp</dimen>
     <dimen name="padding_extra_extra_large">@dimen/_32sdp</dimen>
 
+    <!-- Input text padding -->
+    <dimen name="padding_input_bottom">@dimen/padding_heavy</dimen>
+    <dimen name="padding_input_top">@dimen/_11sdp</dimen>
+
     <!-- Main Activity components -->
     <dimen name="empty_icon_width">60dp</dimen>
     <dimen name="empty_icon_height">60dp</dimen>