From dd5ebd3a888cfc345bb4b41983a2e75ee67c2201 Mon Sep 17 00:00:00 2001
From: MunJangHun <105299421+moondev03@users.noreply.github.com>
Date: Wed, 25 Sep 2024 13:50:25 +0900
Subject: [PATCH] =?UTF-8?q?=F0=9F=8E=A8=20Campus=20Filter=20Dropdown=20Ite?=
 =?UTF-8?q?m=20Size=20=EC=88=98=EC=A0=95=20(#39)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../view/notice/CampusSpinnerAdapter.kt       |  5 +++-
 .../view/notice/CommonNoticeFragment.kt       |  2 +-
 .../res/layout/fragment_common_notice.xml     |  1 -
 .../layout/item_spinner_campus_dropdown.xml   | 24 +++++++++++++++++++
 .../src/main/res/values/themes.xml            | 10 --------
 5 files changed, 29 insertions(+), 13 deletions(-)
 create mode 100644 ThinkerBell/presentation/src/main/res/layout/item_spinner_campus_dropdown.xml

diff --git a/ThinkerBell/presentation/src/main/java/com/neverland/thinkerbell/view/notice/CampusSpinnerAdapter.kt b/ThinkerBell/presentation/src/main/java/com/neverland/thinkerbell/view/notice/CampusSpinnerAdapter.kt
index 7346aee..8628348 100644
--- a/ThinkerBell/presentation/src/main/java/com/neverland/thinkerbell/view/notice/CampusSpinnerAdapter.kt
+++ b/ThinkerBell/presentation/src/main/java/com/neverland/thinkerbell/view/notice/CampusSpinnerAdapter.kt
@@ -9,6 +9,7 @@ import android.widget.ArrayAdapter
 import android.widget.TextView
 import androidx.annotation.LayoutRes
 import com.neverland.thinkerbell.databinding.ItemSpinnerCampusBinding
+import com.neverland.thinkerbell.databinding.ItemSpinnerCampusDropdownBinding
 
 class CampusSpinnerAdapter(
     context: Context,
@@ -35,10 +36,12 @@ class CampusSpinnerAdapter(
             return emptyView
         }
 
-        val binding = ItemSpinnerCampusBinding.inflate(LayoutInflater.from(parent.context), parent, false)
+        val binding = ItemSpinnerCampusDropdownBinding.inflate(LayoutInflater.from(parent.context), parent, false)
         binding.tvSpinnerItem.text = spinnerList[position]
         binding.tvSpinnerItem.textAlignment = TextView.TEXT_ALIGNMENT_CENTER
 
+        binding.divider.visibility = if(position == count-1) View.GONE else View.VISIBLE
+
         return binding.root
     }
 
diff --git a/ThinkerBell/presentation/src/main/java/com/neverland/thinkerbell/view/notice/CommonNoticeFragment.kt b/ThinkerBell/presentation/src/main/java/com/neverland/thinkerbell/view/notice/CommonNoticeFragment.kt
index 49abbe2..34abe64 100644
--- a/ThinkerBell/presentation/src/main/java/com/neverland/thinkerbell/view/notice/CommonNoticeFragment.kt
+++ b/ThinkerBell/presentation/src/main/java/com/neverland/thinkerbell/view/notice/CommonNoticeFragment.kt
@@ -327,7 +327,7 @@ class CommonNoticeFragment(
             override fun onNothingSelected(parent: AdapterView<*>?) {}
         }
 
-        binding.spinnerCampus.dropDownHorizontalOffset = -24
+        binding.spinnerCampus.dropDownHorizontalOffset = -36
         binding.spinnerCampus.dropDownVerticalOffset = 10
     }
 
diff --git a/ThinkerBell/presentation/src/main/res/layout/fragment_common_notice.xml b/ThinkerBell/presentation/src/main/res/layout/fragment_common_notice.xml
index 92ee485..4f0fbfc 100644
--- a/ThinkerBell/presentation/src/main/res/layout/fragment_common_notice.xml
+++ b/ThinkerBell/presentation/src/main/res/layout/fragment_common_notice.xml
@@ -124,7 +124,6 @@
                 android:paddingStart="10dp"
                 android:paddingEnd="30dp"
 
-                android:theme="@style/SpinnerDivideStyle"
                 app:layout_constraintBottom_toTopOf="@id/rv_notice"
 
                 app:layout_constraintEnd_toEndOf="parent"
diff --git a/ThinkerBell/presentation/src/main/res/layout/item_spinner_campus_dropdown.xml b/ThinkerBell/presentation/src/main/res/layout/item_spinner_campus_dropdown.xml
new file mode 100644
index 0000000..e8ccd74
--- /dev/null
+++ b/ThinkerBell/presentation/src/main/res/layout/item_spinner_campus_dropdown.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="@color/primary2"
+    android:orientation="vertical">
+
+    <TextView
+        android:id="@+id/tv_spinner_item"
+        android:layout_width="match_parent"
+        android:layout_height="40dp"
+        android:gravity="center"
+        tools:text="전체"
+        style="@style/Label_Medium"
+        android:textColor="@color/red_gray_800" />
+
+    <View
+        android:id="@+id/divider"
+        android:layout_width="match_parent"
+        android:layout_height="0.7dp"
+        android:background="@color/red_gray_400"/>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/ThinkerBell/presentation/src/main/res/values/themes.xml b/ThinkerBell/presentation/src/main/res/values/themes.xml
index bd86051..229bd2d 100644
--- a/ThinkerBell/presentation/src/main/res/values/themes.xml
+++ b/ThinkerBell/presentation/src/main/res/values/themes.xml
@@ -23,16 +23,6 @@
         <item name="android:textColor">#BABABA</item>
     </style>
 
-    <!-- Spinner -->
-    <style name="SpinnerDivideStyle" parent="android:style/Widget.ListView.DropDown">
-        <item name="android:divider">@color/primary1</item> <!-- divider 색 -->
-        <item name="android:dividerHeight">0.5dp</item> <!-- divider 높이 -->
-    </style>
-
-    <style name="SpinnerTheme">
-        <item name="android:dropDownListViewStyle">@style/SpinnerDivideStyle</item>
-    </style>
-
     <style name="alarm_toggle">
         <item name="thumbTint">@color/primary2</item>
         <item name="track">@drawable/toggle_track</item>