From a2362a2da8655dbd4d019eb12a2634c0b53ae350 Mon Sep 17 00:00:00 2001
From: BeomBeom2 <whwjdqja20@naver.com>
Date: Sat, 23 Nov 2024 15:04:04 +0900
Subject: [PATCH 1/3] =?UTF-8?q?[Refactor]=20=EB=BD=91=EA=B8=B0=20=EA=B2=B0?=
 =?UTF-8?q?=EA=B3=BC=20=EC=95=A0=EB=8B=88=EB=A9=94=EC=9D=B4=EC=85=98=20UI?=
 =?UTF-8?q?=20=EC=88=98=EC=A0=95=20=EC=A4=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

No Related Issue
---
 .idea/deploymentTargetSelector.xml            |  8 ++
 ...esultFragment.kt => DrawResultFragment.kt} | 77 ++++++++++++++-----
 .../ui/draw/DrawSelectCategoryFragment.kt     |  5 +-
 .../ui/draw/DrawSelectResultAdapter.kt        | 33 +-------
 .../presentation/ui/draw/DrawViewModel.kt     | 10 +--
 ...none.xml => all_radius_30_signature_1.xml} |  5 +-
 ...ct_result.xml => fragment_draw_result.xml} | 47 ++++++++---
 .../layout/item_draw_select_result_img.xml    | 18 ++---
 app/src/main/res/values/dimens.xml            |  1 -
 9 files changed, 120 insertions(+), 84 deletions(-)
 rename app/src/main/java/com/kust/kustaurant/presentation/ui/draw/{DrawSelectResultFragment.kt => DrawResultFragment.kt} (75%)
 rename app/src/main/res/drawable/{all_radius_30_none.xml => all_radius_30_signature_1.xml} (51%)
 rename app/src/main/res/layout/{fragment_draw_select_result.xml => fragment_draw_result.xml} (86%)

diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml
index b268ef3..de580ed 100644
--- a/.idea/deploymentTargetSelector.xml
+++ b/.idea/deploymentTargetSelector.xml
@@ -4,6 +4,14 @@
     <selectionStates>
       <SelectionState runConfigName="app">
         <option name="selectionMode" value="DROPDOWN" />
+        <DropdownSelection timestamp="2024-11-20T08:51:43.640204100Z">
+          <Target type="DEFAULT_BOOT">
+            <handle>
+              <DeviceId pluginId="LocalEmulator" identifier="path=C:\Users\user\.android\avd\Medium_Phone.avd" />
+            </handle>
+          </Target>
+        </DropdownSelection>
+        <DialogSelection />
       </SelectionState>
     </selectionStates>
   </component>
diff --git a/app/src/main/java/com/kust/kustaurant/presentation/ui/draw/DrawSelectResultFragment.kt b/app/src/main/java/com/kust/kustaurant/presentation/ui/draw/DrawResultFragment.kt
similarity index 75%
rename from app/src/main/java/com/kust/kustaurant/presentation/ui/draw/DrawSelectResultFragment.kt
rename to app/src/main/java/com/kust/kustaurant/presentation/ui/draw/DrawResultFragment.kt
index 4a92f43..7cffe33 100644
--- a/app/src/main/java/com/kust/kustaurant/presentation/ui/draw/DrawSelectResultFragment.kt
+++ b/app/src/main/java/com/kust/kustaurant/presentation/ui/draw/DrawResultFragment.kt
@@ -3,9 +3,9 @@ package com.kust.kustaurant.presentation.ui.draw
 import android.animation.ObjectAnimator
 import android.annotation.SuppressLint
 import android.content.Intent
+import android.content.res.Resources
 import android.graphics.drawable.GradientDrawable
 import android.os.Bundle
-import android.os.Handler
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -15,31 +15,31 @@ import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
 import androidx.recyclerview.widget.RecyclerView
 import androidx.viewpager2.widget.ViewPager2
+import com.bumptech.glide.Glide
+import com.bumptech.glide.load.resource.bitmap.CenterCrop
+import com.bumptech.glide.load.resource.bitmap.RoundedCorners
 import com.kust.kustaurant.R
 import com.kust.kustaurant.data.model.DrawRestaurantData
-import com.kust.kustaurant.databinding.FragmentDrawSelectResultBinding
+import com.kust.kustaurant.databinding.FragmentDrawResultBinding
 import com.kust.kustaurant.presentation.ui.detail.DetailActivity
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.cancel
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
-import kotlin.math.abs
 import kotlin.math.floor
 
-class DrawSelectResultFragment : Fragment() {
-    private var _binding: FragmentDrawSelectResultBinding? = null
+class DrawResultFragment : Fragment() {
+    private var _binding: FragmentDrawResultBinding? = null
     private lateinit var viewPager: ViewPager2
     private lateinit var adapter: DrawSelectResultAdapter
     private var restaurantList = mutableListOf<DrawRestaurantData>()
     private val viewModel: DrawViewModel by activityViewModels()
-    private var handler: Handler? = null
-    private var runnable: Runnable? = null
     val binding get() = _binding!!
     private val animationScope = CoroutineScope(Dispatchers.Main)
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
-        _binding = FragmentDrawSelectResultBinding.inflate(inflater, container, false)
+        _binding = FragmentDrawResultBinding.inflate(inflater, container, false)
         setupViewPager()
         loadRestaurants()
         setupButton()
@@ -57,33 +57,37 @@ class DrawSelectResultFragment : Fragment() {
 
         viewModel.selectedRestaurant.observe(viewLifecycleOwner) { selected ->
             if (_binding == null) {
-                _binding = FragmentDrawSelectResultBinding.inflate(layoutInflater)
+                _binding = FragmentDrawResultBinding.inflate(layoutInflater)
             }
 
             displaySelectedRestaurantInfo(selected)
         }
     }
 
-
     @SuppressLint("SetTextI18n")
     private fun displaySelectedRestaurantInfo(restaurant: DrawRestaurantData) {
         binding.drawTvRestaurantName.text = restaurant.restaurantName
         binding.drawTvRestaurantMenu.text = restaurant.restaurantCuisine
-
     }
 
     private fun setupViewPager() {
+        val viewPagerHeight = calculateViewHeight(267f) // 동적 높이 계산
+
         viewPager = binding.drawViewPager
         adapter = DrawSelectResultAdapter(restaurantList)
         viewPager.adapter = adapter
         viewPager.isUserInputEnabled = false // 스크롤 비활성화
         viewPager.offscreenPageLimit = 1
+
+        // ViewPager의 높이를 동적으로 설정
+        viewPager.layoutParams = viewPager.layoutParams.apply {
+            height = viewPagerHeight
+        }
+
+        // 페이지 전환 애니메이션 설정
         val pageTransformer = ViewPager2.PageTransformer { page, position ->
-            val absPosition = abs(position)
             page.apply {
-                rotationY = -30 * position
-                scaleX = 0.8f + (1 - absPosition) * 0.2f
-                scaleY = scaleX
+                translationX = 30 * position
             }
         }
         viewPager.setPageTransformer(pageTransformer)
@@ -118,7 +122,7 @@ class DrawSelectResultFragment : Fragment() {
             binding.drawTvRestaurantScore.text = ""
             binding.drawTvRestaurantPartnershipInfo.text = ""
             binding.drawLlScoreImgGroup.visibility = View.GONE
-
+            binding.drawIvSelect.visibility = View.INVISIBLE
             loadRestaurants()
         }
 
@@ -129,6 +133,7 @@ class DrawSelectResultFragment : Fragment() {
                 .commit()
         }
     }
+
     private fun loadRestaurants() {
         viewModel.drawRestaurants()
 
@@ -145,7 +150,6 @@ class DrawSelectResultFragment : Fragment() {
     private fun highlightCenterImage() {
         val centerPosition = viewPager.currentItem
         adapter.highlightItem(centerPosition)
-
     }
 
     private fun startAnimation() = animationScope.launch {
@@ -155,7 +159,7 @@ class DrawSelectResultFragment : Fragment() {
 
         var currentPage = adapter.itemCount - 1
         while (currentPage >= 0) {
-            if (!isAdded) return@launch  // Fragment가 아직 활성 상태인지 확인
+            if (!isAdded) return@launch // Fragment가 아직 활성 상태인지 확인
 
             viewPager.setCurrentItem(currentPage, true)
             delay(1700L / adapter.itemCount)
@@ -163,18 +167,22 @@ class DrawSelectResultFragment : Fragment() {
             currentPage--
         }
 
-        // 애니메이션 종료 후, 중앙에 선택된 음식점 배치
+        // 애니메이션 종료 후, 중앙에 선택된 음식점 배치 및 이미지 표시
         viewModel.selectedRestaurant.value?.let { selected ->
             val selectedIndex = restaurantList.indexOf(selected)
             viewPager.setCurrentItem(selectedIndex, true)
             displaySelectedRestaurantInfo(selected)
 
+            // 선택된 음식점 정보 표시
             val roundedScore = selected.restaurantScore?.let { floor(it * 2) / 2 } ?: "평가 없음"
             binding.drawTvRestaurantScore.text = roundedScore.toString()
             binding.drawTvRestaurantPartnershipInfo.text = selected.partnershipInfo ?: "제휴 해당사항 없음"
             updateStarRating(selected.restaurantScore ?: 0.0)
             binding.drawLlScoreImgGroup.visibility = View.VISIBLE
 
+            // 선택된 이미지 표시
+            displaySelectedRestaurantImage(selected)
+
             highlightCenterImage()
             enableButtons()
 
@@ -184,6 +192,30 @@ class DrawSelectResultFragment : Fragment() {
         }
     }
 
+    private fun displaySelectedRestaurantImage(restaurant: DrawRestaurantData) {
+        val calculateHeight = calculateViewHeight(297f)
+
+        // gl_start와 gl_end의 위치를 기준으로 너비 계산
+        val startX = binding.glStart.x
+        val endX = binding.glEnd.x
+        val calculatedWidth = (endX - startX).toInt()
+
+        // 선택된 이미지의 크기를 설정
+        binding.drawIvSelect.layoutParams = binding.drawIvSelect.layoutParams.apply {
+            width = calculatedWidth
+            height = calculateHeight
+        }
+
+        // Glide를 사용하여 이미지 로드 및 둥근 모서리 처리
+        Glide.with(this)
+            .load(restaurant.restaurantImgUrl)
+            .transform(CenterCrop(), RoundedCorners(78)) // RoundedCorners와 CenterCrop을 조합
+            .into(binding.drawIvSelect)
+
+        binding.drawIvSelect.visibility = View.VISIBLE
+    }
+
+
     private fun disableButtons() {
         binding.drawBtnCategoryReset.isClickable = false
         binding.drawBtnRetry.isClickable = false
@@ -208,7 +240,12 @@ class DrawSelectResultFragment : Fragment() {
 
     override fun onDestroyView() {
         super.onDestroyView()
-        animationScope.cancel()  // 코루틴 취소
+        animationScope.cancel()
         _binding = null
     }
+
+    private fun calculateViewHeight(height : Float): Int {
+        val screenDensity = Resources.getSystem().displayMetrics.density
+        return (height * screenDensity).toInt()
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/kust/kustaurant/presentation/ui/draw/DrawSelectCategoryFragment.kt b/app/src/main/java/com/kust/kustaurant/presentation/ui/draw/DrawSelectCategoryFragment.kt
index a78d0a1..ca4b346 100644
--- a/app/src/main/java/com/kust/kustaurant/presentation/ui/draw/DrawSelectCategoryFragment.kt
+++ b/app/src/main/java/com/kust/kustaurant/presentation/ui/draw/DrawSelectCategoryFragment.kt
@@ -7,7 +7,6 @@ import androidx.fragment.app.Fragment
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.widget.LinearLayout
 import android.widget.TextView
 import android.widget.ToggleButton
 import androidx.constraintlayout.widget.ConstraintLayout
@@ -22,7 +21,7 @@ class DrawSelectCategoryFragment : Fragment() {
     private var _binding : FragmentDrawSelectCategoryBinding? = null
     private val binding get() = _binding!!
     private val viewModel : DrawViewModel by activityViewModels()
-    private var selectedMenus = mutableSetOf<String>("전체")
+    private var selectedMenus = mutableSetOf("전체")
     private lateinit var allMenuViews: List<ConstraintLayout>
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?,
@@ -65,7 +64,7 @@ class DrawSelectCategoryFragment : Fragment() {
             viewModel.applyFilters(selectedMenus,selectedLocation)
 
             parentFragmentManager.beginTransaction()
-                .replace(R.id.draw_fragment_container, DrawSelectResultFragment())
+                .replace(R.id.draw_fragment_container, DrawResultFragment())
                 .addToBackStack(null)
                 .commit()
         }
diff --git a/app/src/main/java/com/kust/kustaurant/presentation/ui/draw/DrawSelectResultAdapter.kt b/app/src/main/java/com/kust/kustaurant/presentation/ui/draw/DrawSelectResultAdapter.kt
index 544c7dc..7890cb7 100644
--- a/app/src/main/java/com/kust/kustaurant/presentation/ui/draw/DrawSelectResultAdapter.kt
+++ b/app/src/main/java/com/kust/kustaurant/presentation/ui/draw/DrawSelectResultAdapter.kt
@@ -1,23 +1,16 @@
 package com.kust.kustaurant.presentation.ui.draw
 
 import android.content.Context
-import android.graphics.drawable.GradientDrawable
-import android.util.TypedValue
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.ImageView
-import androidx.core.content.ContextCompat
-import androidx.core.view.setPadding
 import androidx.recyclerview.widget.RecyclerView
 import com.bumptech.glide.Glide
-import com.bumptech.glide.load.resource.bitmap.CenterCrop
-import com.bumptech.glide.load.resource.bitmap.RoundedCorners
-import com.bumptech.glide.request.RequestOptions
 import com.kust.kustaurant.R
 import com.kust.kustaurant.data.model.DrawRestaurantData
 
-class DrawSelectResultAdapter(private val restaurants: MutableList<DrawRestaurantData>) :
+class DrawSelectResultAdapter(val restaurants: MutableList<DrawRestaurantData>) :
     RecyclerView.Adapter<DrawSelectResultAdapter.RestaurantViewHolder>() {
 
     private var highlightedPosition: Int = RecyclerView.NO_POSITION
@@ -30,31 +23,8 @@ class DrawSelectResultAdapter(private val restaurants: MutableList<DrawRestauran
 
     override fun onBindViewHolder(holder: RestaurantViewHolder, position: Int) {
         holder.bind(restaurants[position])
-
-        // Highlight with stroke if needed
-        if (position == highlightedPosition) {
-            val drawable = GradientDrawable().apply {
-                shape = GradientDrawable.RECTANGLE
-
-                // dp를 px로 변환
-                val strokeWidth = TypedValue.applyDimension(
-                    TypedValue.COMPLEX_UNIT_DIP,
-                    3f, // 스트로크 너비 2dp
-                    holder.itemView.context.resources.displayMetrics
-                ).toInt()
-
-                setStroke(strokeWidth, ContextCompat.getColor(holder.itemView.context, R.color.signature_1))
-                cornerRadius = 30f
-            }
-
-            holder.imageView.background = drawable
-
-            holder.imageView.setPadding(3)
-
-        } else {
             holder.imageView.background = null
             holder.imageView.setPadding(0, 0, 0, 0)
-        }
     }
  
     fun highlightItem(position: Int) {
@@ -73,7 +43,6 @@ class DrawSelectResultAdapter(private val restaurants: MutableList<DrawRestauran
         fun bind(restaurant: DrawRestaurantData) {
             Glide.with(context)
                 .load(restaurant.restaurantImgUrl)
-                .apply(RequestOptions().transform(CenterCrop(), RoundedCorners(30)))
                 .into(imageView)
 
         }
diff --git a/app/src/main/java/com/kust/kustaurant/presentation/ui/draw/DrawViewModel.kt b/app/src/main/java/com/kust/kustaurant/presentation/ui/draw/DrawViewModel.kt
index 71fed59..d4912db 100644
--- a/app/src/main/java/com/kust/kustaurant/presentation/ui/draw/DrawViewModel.kt
+++ b/app/src/main/java/com/kust/kustaurant/presentation/ui/draw/DrawViewModel.kt
@@ -19,11 +19,10 @@ class DrawViewModel @Inject constructor(
     private val _drawList = MutableLiveData<List<DrawRestaurantData>>()
     val drawList: LiveData<List<DrawRestaurantData>> = _drawList
     private var sameDrawList = 3
-    // LiveData for storing selected filters
-    private val _selectedMenus = MutableLiveData<Set<String>>(setOf("전체"))
+    private val _selectedMenus = MutableLiveData(setOf("전체"))
     val selectedMenus: LiveData<Set<String>> = _selectedMenus
 
-    private val _selectedLocations = MutableLiveData<Set<String>>(setOf("전체"))
+    private val _selectedLocations = MutableLiveData(setOf("전체"))
     val selectedLocations: LiveData<Set<String>> = _selectedLocations
 
     private var _initialSelectedMenus = setOf("전체")
@@ -38,7 +37,6 @@ class DrawViewModel @Inject constructor(
                     (selectedLocations.value == _initialSelectedLocations)
 
             if (checkSameCategory && sameDrawList < 2) {
-                Log.d("DrawViewModel", "just random algorithm")
                 sameDrawList++
                 _drawList.value?.let { currentList ->
                     if (currentList.isNotEmpty()) {
@@ -48,7 +46,6 @@ class DrawViewModel @Inject constructor(
                     }
                 }
             } else {
-                Log.d("DrawViewModel", "draw Restaurants from Backend")
                 sameDrawList = 0
 
                 val mappedMenus = selectedMenus.value?.let { CategoryIdMapper.mapMenus(it) }
@@ -65,9 +62,6 @@ class DrawViewModel @Inject constructor(
                     val selected = getRandomRestaurants(drawRestaurantsListData)
                     _selectedRestaurant.value = selected
                     updateSelectedIndex(drawRestaurantsListData, selected)
-
-                    Log.d("DrawViewModel", "Draw restaurant data: $drawRestaurantsListData")
-                    Log.d("DrawViewModel", "Draw selected restaurant data: $selectedRestaurant")
                 } else {
                     Log.e("DrawViewModel", "Menus or Locations mapping failed. Menus: $mappedMenus, Locations: $mappedLocations")
                 }
diff --git a/app/src/main/res/drawable/all_radius_30_none.xml b/app/src/main/res/drawable/all_radius_30_signature_1.xml
similarity index 51%
rename from app/src/main/res/drawable/all_radius_30_none.xml
rename to app/src/main/res/drawable/all_radius_30_signature_1.xml
index 160bc52..2e8cfb7 100644
--- a/app/src/main/res/drawable/all_radius_30_none.xml
+++ b/app/src/main/res/drawable/all_radius_30_signature_1.xml
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <corners android:radius="30dp"/>
+<corners android:radius="30dp"/>
+<stroke
+    android:width="1dp"
+    android:color="@color/signature_1"/>
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_draw_select_result.xml b/app/src/main/res/layout/fragment_draw_result.xml
similarity index 86%
rename from app/src/main/res/layout/fragment_draw_select_result.xml
rename to app/src/main/res/layout/fragment_draw_result.xml
index 0644d52..0cb4444 100644
--- a/app/src/main/res/layout/fragment_draw_select_result.xml
+++ b/app/src/main/res/layout/fragment_draw_result.xml
@@ -3,8 +3,9 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
+    android:layout_marginTop="40dp"
     android:layout_height="match_parent"
-    tools:context=".presentation.ui.draw.DrawSelectResultFragment">
+    tools:context=".presentation.ui.draw.DrawResultFragment">
 
     <ScrollView
         android:layout_width="match_parent"
@@ -23,26 +24,54 @@
                 android:id="@+id/draw_selected_tv_clickable_info"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="40dp"
+                app:layout_constraintBottom_toTopOf="@id/draw_iv_select"
                 android:fontFamily="@font/pretendard_regular"
                 android:gravity="center"
+                android:layout_marginBottom="27dp"
                 android:text="@string/draw_selected_category_result_clickable_info"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintHorizontal_bias="0.0"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
 
+            <androidx.constraintlayout.widget.Guideline
+                android:id="@+id/gl_start"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                app:layout_constraintGuide_percent="0.07" />
+
+            <androidx.constraintlayout.widget.Guideline
+                android:id="@+id/gl_end"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                app:layout_constraintGuide_percent="0.93" />
+
             <androidx.viewpager2.widget.ViewPager2
                 android:id="@+id/draw_viewPager"
                 android:layout_width="match_parent"
-                android:layout_height="0dp"
-                android:layout_marginTop="27dp"
-                app:layout_constraintBottom_toTopOf="@id/draw_tv_restaurant_menu"
-                app:layout_constraintDimensionRatio="360:293"
+                android:layout_height="wrap_content"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/draw_selected_tv_clickable_info"
-                tools:layout_height="290dp" />
+                app:layout_constraintBottom_toBottomOf="@id/draw_iv_select"
+                app:layout_constraintTop_toTopOf="@id/draw_iv_select"
+                tools:layout_height="267dp" />
+
+            <ImageView
+                android:id="@+id/draw_iv_select"
+                android:layout_width="0dp"
+                android:layout_height="0dp"
+                android:visibility="invisible"
+                app:layout_constraintBottom_toTopOf="@id/draw_tv_restaurant_menu"
+                tools:visibility="visible"
+                android:scaleType="centerCrop"
+                android:padding="1dp"
+                app:layout_constraintEnd_toEndOf="@id/gl_end"
+                app:layout_constraintDimensionRatio="289:296"
+                android:background="@drawable/all_radius_30_signature_1"
+                app:layout_constraintStart_toStartOf="@id/gl_start"
+                app:layout_constraintTop_toBottomOf="@id/draw_selected_tv_clickable_info"/>
 
             <TextView
                 android:id="@+id/draw_tv_restaurant_menu"
@@ -56,7 +85,7 @@
                 android:textSize="17sp"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/draw_viewPager"
+                app:layout_constraintTop_toBottomOf="@id/draw_iv_select"
                 tools:text="일식" />
 
             <TextView
diff --git a/app/src/main/res/layout/item_draw_select_result_img.xml b/app/src/main/res/layout/item_draw_select_result_img.xml
index 000d724..9d16755 100644
--- a/app/src/main/res/layout/item_draw_select_result_img.xml
+++ b/app/src/main/res/layout/item_draw_select_result_img.xml
@@ -1,14 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+android:layout_width="match_parent"
+android:layout_height="match_parent">
+
+<ImageView
+    android:id="@+id/draw_iv_image_Restaurant"
     android:layout_width="match_parent"
-    android:layout_height="match_parent" >
-    <ImageView
-        android:id="@+id/draw_iv_image_Restaurant"
-        android:layout_width="291dp"
-        android:layout_height="291dp"
-        android:padding="2dp"
-        android:background="@drawable/all_radius_30_none"
-        android:scaleType="centerCrop"
-        android:layout_gravity="center_horizontal"
-        android:contentDescription="@string/draw_selected_restaurant_img_info" />
+    android:layout_height="match_parent"
+    android:scaleType="centerCrop"
+    android:contentDescription="@string/draw_selected_restaurant_img_info" />
 </FrameLayout>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 89ac66f..f80f6fb 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -5,5 +5,4 @@
 
     <dimen name="design_bottom_navigation_active_text_size" tools:override="true">13sp</dimen>
     <dimen name="design_bottom_navigation_text_size" tools:override="true">11sp</dimen>
-
 </resources>
\ No newline at end of file

From 91efbd596f152785c0a2671aeca3059e9ab55e1c Mon Sep 17 00:00:00 2001
From: BeomBeom2 <whwjdqja20@naver.com>
Date: Mon, 25 Nov 2024 13:32:19 +0900
Subject: [PATCH 2/3] =?UTF-8?q?[Refector]=20=EB=BD=91=EA=B8=B0(DrawResultF?=
 =?UTF-8?q?ragment)=20=ED=9A=8C=EC=A0=84=20=EB=AA=A8=EC=85=98=20=EC=9B=B9,?=
 =?UTF-8?q?=20IOS=20=ED=86=B5=EC=9D=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

No Related Issue
---
 .idea/runConfigurations.xml                   |  4 ++
 .../ui/draw/DrawResultFragment.kt             | 51 ++++++-------------
 .../ui/draw/DrawSelectCategoryFragment.kt     | 47 ++++++++---------
 .../ui/draw/DrawSelectResultAdapter.kt        |  9 ----
 .../presentation/ui/draw/DrawViewModel.kt     | 35 ++++++-------
 .../main/res/layout/fragment_draw_result.xml  | 20 ++++----
 .../layout/fragment_draw_select_category.xml  |  2 +-
 7 files changed, 72 insertions(+), 96 deletions(-)

diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
index 931b96c..16660f1 100644
--- a/.idea/runConfigurations.xml
+++ b/.idea/runConfigurations.xml
@@ -5,8 +5,12 @@
       <set>
         <option value="com.intellij.execution.junit.AbstractAllInDirectoryConfigurationProducer" />
         <option value="com.intellij.execution.junit.AllInPackageConfigurationProducer" />
+        <option value="com.intellij.execution.junit.PatternConfigurationProducer" />
         <option value="com.intellij.execution.junit.TestInClassConfigurationProducer" />
         <option value="com.intellij.execution.junit.UniqueIdConfigurationProducer" />
+        <option value="com.intellij.execution.junit.testDiscovery.JUnitTestDiscoveryConfigurationProducer" />
+        <option value="org.jetbrains.kotlin.idea.junit.KotlinJUnitRunConfigurationProducer" />
+        <option value="org.jetbrains.kotlin.idea.junit.KotlinPatternConfigurationProducer" />
       </set>
     </option>
   </component>
diff --git a/app/src/main/java/com/kust/kustaurant/presentation/ui/draw/DrawResultFragment.kt b/app/src/main/java/com/kust/kustaurant/presentation/ui/draw/DrawResultFragment.kt
index 7cffe33..230a873 100644
--- a/app/src/main/java/com/kust/kustaurant/presentation/ui/draw/DrawResultFragment.kt
+++ b/app/src/main/java/com/kust/kustaurant/presentation/ui/draw/DrawResultFragment.kt
@@ -13,7 +13,6 @@ import android.widget.ImageView
 import androidx.core.content.ContextCompat
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
-import androidx.recyclerview.widget.RecyclerView
 import androidx.viewpager2.widget.ViewPager2
 import com.bumptech.glide.Glide
 import com.bumptech.glide.load.resource.bitmap.CenterCrop
@@ -48,13 +47,6 @@ class DrawResultFragment : Fragment() {
     }
 
     private fun setupObservers() {
-        viewModel.selectedIndex.observe(viewLifecycleOwner) { index ->
-            if (index != null && index != RecyclerView.NO_POSITION) {
-                viewPager.setCurrentItem(index, true)
-                adapter.highlightItem(index)
-            }
-        }
-
         viewModel.selectedRestaurant.observe(viewLifecycleOwner) { selected ->
             if (_binding == null) {
                 _binding = FragmentDrawResultBinding.inflate(layoutInflater)
@@ -87,7 +79,7 @@ class DrawResultFragment : Fragment() {
         // 페이지 전환 애니메이션 설정
         val pageTransformer = ViewPager2.PageTransformer { page, position ->
             page.apply {
-                translationX = 30 * position
+                translationX = 20 * position
             }
         }
         viewPager.setPageTransformer(pageTransformer)
@@ -140,20 +132,14 @@ class DrawResultFragment : Fragment() {
         viewModel.drawList.observe(viewLifecycleOwner) { list ->
             restaurantList.clear()
             restaurantList.addAll(list)
-            adapter.notifyDataSetChanged()
+            adapter.notifyItemRangeInserted(0, list.size)
 
-            // 애니메이션 시작
             startAnimation()
         }
     }
 
-    private fun highlightCenterImage() {
-        val centerPosition = viewPager.currentItem
-        adapter.highlightItem(centerPosition)
-    }
-
     private fun startAnimation() = animationScope.launch {
-        disableButtons() // 애니메이션 시작 시 버튼 비활성화
+        disableButtons()
         val textView = binding.drawSelectedTvClickableInfo
         textView.alpha = 0f
 
@@ -171,51 +157,44 @@ class DrawResultFragment : Fragment() {
         viewModel.selectedRestaurant.value?.let { selected ->
             val selectedIndex = restaurantList.indexOf(selected)
             viewPager.setCurrentItem(selectedIndex, true)
-            displaySelectedRestaurantInfo(selected)
 
-            // 선택된 음식점 정보 표시
+            delay(500L)
+            displaySelectedRestaurantInfo(selected)
             val roundedScore = selected.restaurantScore?.let { floor(it * 2) / 2 } ?: "평가 없음"
             binding.drawTvRestaurantScore.text = roundedScore.toString()
             binding.drawTvRestaurantPartnershipInfo.text = selected.partnershipInfo ?: "제휴 해당사항 없음"
             updateStarRating(selected.restaurantScore ?: 0.0)
             binding.drawLlScoreImgGroup.visibility = View.VISIBLE
 
-            // 선택된 이미지 표시
             displaySelectedRestaurantImage(selected)
-
-            highlightCenterImage()
             enableButtons()
 
             val fadeIn = ObjectAnimator.ofFloat(textView, "alpha", 0f, 1f)
-            fadeIn.duration = 500
+            fadeIn.duration = 1000
             fadeIn.start()
         }
     }
 
     private fun displaySelectedRestaurantImage(restaurant: DrawRestaurantData) {
-        val calculateHeight = calculateViewHeight(297f)
-
-        // gl_start와 gl_end의 위치를 기준으로 너비 계산
-        val startX = binding.glStart.x
-        val endX = binding.glEnd.x
-        val calculatedWidth = (endX - startX).toInt()
 
-        // 선택된 이미지의 크기를 설정
-        binding.drawIvSelect.layoutParams = binding.drawIvSelect.layoutParams.apply {
-            width = calculatedWidth
-            height = calculateHeight
-        }
 
-        // Glide를 사용하여 이미지 로드 및 둥근 모서리 처리
         Glide.with(this)
             .load(restaurant.restaurantImgUrl)
-            .transform(CenterCrop(), RoundedCorners(78)) // RoundedCorners와 CenterCrop을 조합
+            .transform(CenterCrop(), RoundedCorners(78))
             .into(binding.drawIvSelect)
 
+        binding.drawIvSelect.alpha = 0f
         binding.drawIvSelect.visibility = View.VISIBLE
+
+        binding.drawIvSelect.animate()
+            .alpha(1f)
+            .setDuration(1000)
+            .setListener(null)
+            .start()
     }
 
 
+
     private fun disableButtons() {
         binding.drawBtnCategoryReset.isClickable = false
         binding.drawBtnRetry.isClickable = false
diff --git a/app/src/main/java/com/kust/kustaurant/presentation/ui/draw/DrawSelectCategoryFragment.kt b/app/src/main/java/com/kust/kustaurant/presentation/ui/draw/DrawSelectCategoryFragment.kt
index ca4b346..d0b426f 100644
--- a/app/src/main/java/com/kust/kustaurant/presentation/ui/draw/DrawSelectCategoryFragment.kt
+++ b/app/src/main/java/com/kust/kustaurant/presentation/ui/draw/DrawSelectCategoryFragment.kt
@@ -35,33 +35,15 @@ class DrawSelectCategoryFragment : Fragment() {
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        allMenuViews= listOf(
-            binding.homeBtnAll,
-            binding.homeBtnKorea,
-            binding.homeBtnJapan,
-            binding.homeBtnChina,
-            binding.homeBtnWestern,
-            binding.homeBtnAsian,
-            binding.homeBtnMeat,
-            binding.homeBtnSeafood,
-            binding.homeBtnChicken,
-            binding.homeBtnHamburgerPizza,
-            binding.homeBtnTteokbokki,
-            binding.homeBtnBeer,
-            binding.homeBtnCafe,
-            binding.homeBtnBakery,
-            binding.homeBtnSalad,
-            binding.homeBtnBenefit
-        )
-
+        allMenuViews = getMenuList()
         setupToggleGroups()
         observeViewModel()
 
-        binding.drawBtnDrawRandomRestaurants.setOnClickListener {
+        binding.drawBtnDrawResult.setOnClickListener {
             //val selectedSituation = getSelectedTogglesText(binding.tierToggleSituationGroup)
             val selectedLocation = getSelectedTogglesText(binding.tierToggleLocationGroup)
 
-            viewModel.applyFilters(selectedMenus,selectedLocation)
+            viewModel.applyFilters(selectedMenus, selectedLocation)
 
             parentFragmentManager.beginTransaction()
                 .replace(R.id.draw_fragment_container, DrawResultFragment())
@@ -94,14 +76,12 @@ class DrawSelectCategoryFragment : Fragment() {
                     toggleButton.isChecked = true
                 } else {
                     if (isChecked) {
-                        // Change the text color to active
                         toggleButton.setTextColor(ContextCompat.getColor(requireContext(), R.color.signature_1))
 
                         if (toggleButton.text.toString() == "전체" || toggleButton.text.toString() == "제휴업체") {
                             clearOtherToggles(toggleGroup, toggleButton)
                         }
                     } else {
-                        // Change the text color to inactive
                         toggleButton.setTextColor(ContextCompat.getColor(requireContext(), R.color.cement_4))
                     }
 
@@ -260,4 +240,25 @@ class DrawSelectCategoryFragment : Fragment() {
             view.setBackgroundResource(R.drawable.all_radius_15_none)
         }
     }
+
+    private fun getMenuList(): List<ConstraintLayout> {
+        return listOf(
+            binding.homeBtnAll,
+            binding.homeBtnKorea,
+            binding.homeBtnJapan,
+            binding.homeBtnChina,
+            binding.homeBtnWestern,
+            binding.homeBtnAsian,
+            binding.homeBtnMeat,
+            binding.homeBtnSeafood,
+            binding.homeBtnChicken,
+            binding.homeBtnHamburgerPizza,
+            binding.homeBtnTteokbokki,
+            binding.homeBtnBeer,
+            binding.homeBtnCafe,
+            binding.homeBtnBakery,
+            binding.homeBtnSalad,
+            binding.homeBtnBenefit
+        )
+    }
 }
diff --git a/app/src/main/java/com/kust/kustaurant/presentation/ui/draw/DrawSelectResultAdapter.kt b/app/src/main/java/com/kust/kustaurant/presentation/ui/draw/DrawSelectResultAdapter.kt
index 7890cb7..00d4fc4 100644
--- a/app/src/main/java/com/kust/kustaurant/presentation/ui/draw/DrawSelectResultAdapter.kt
+++ b/app/src/main/java/com/kust/kustaurant/presentation/ui/draw/DrawSelectResultAdapter.kt
@@ -13,8 +13,6 @@ import com.kust.kustaurant.data.model.DrawRestaurantData
 class DrawSelectResultAdapter(val restaurants: MutableList<DrawRestaurantData>) :
     RecyclerView.Adapter<DrawSelectResultAdapter.RestaurantViewHolder>() {
 
-    private var highlightedPosition: Int = RecyclerView.NO_POSITION
-
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RestaurantViewHolder {
         val view = LayoutInflater.from(parent.context)
             .inflate(R.layout.item_draw_select_result_img, parent, false)
@@ -26,13 +24,6 @@ class DrawSelectResultAdapter(val restaurants: MutableList<DrawRestaurantData>)
             holder.imageView.background = null
             holder.imageView.setPadding(0, 0, 0, 0)
     }
- 
-    fun highlightItem(position: Int) {
-        val previousHighlightedPosition = highlightedPosition
-        highlightedPosition = position
-        notifyItemChanged(previousHighlightedPosition)
-        notifyItemChanged(position)
-    }
 
     override fun getItemCount() = restaurants.size
 
diff --git a/app/src/main/java/com/kust/kustaurant/presentation/ui/draw/DrawViewModel.kt b/app/src/main/java/com/kust/kustaurant/presentation/ui/draw/DrawViewModel.kt
index d4912db..b1f888a 100644
--- a/app/src/main/java/com/kust/kustaurant/presentation/ui/draw/DrawViewModel.kt
+++ b/app/src/main/java/com/kust/kustaurant/presentation/ui/draw/DrawViewModel.kt
@@ -18,26 +18,25 @@ class DrawViewModel @Inject constructor(
 ) : ViewModel() {
     private val _drawList = MutableLiveData<List<DrawRestaurantData>>()
     val drawList: LiveData<List<DrawRestaurantData>> = _drawList
-    private var sameDrawList = 3
+    private var _sameDrawList = 0 // limit 3 times + manage first draw
     private val _selectedMenus = MutableLiveData(setOf("전체"))
     val selectedMenus: LiveData<Set<String>> = _selectedMenus
 
     private val _selectedLocations = MutableLiveData(setOf("전체"))
     val selectedLocations: LiveData<Set<String>> = _selectedLocations
 
-    private var _initialSelectedMenus = setOf("전체")
-    private var _initialSelectedLocations = setOf("전체")
+    private var _previousSelectedMenus = setOf("")
+    private var _previousSelectedLocations = setOf("")
 
     private val _selectedRestaurant = MutableLiveData<DrawRestaurantData>()
     val selectedRestaurant: LiveData<DrawRestaurantData> = _selectedRestaurant
 
     fun drawRestaurants() {
         viewModelScope.launch {
-            val checkSameCategory = (selectedMenus.value == _initialSelectedMenus) &&
-                    (selectedLocations.value == _initialSelectedLocations)
+            isResetFilter()
 
-            if (checkSameCategory && sameDrawList < 2) {
-                sameDrawList++
+            if (_sameDrawList < 2) {
+                _sameDrawList++
                 _drawList.value?.let { currentList ->
                     if (currentList.isNotEmpty()) {
                         val selected = getRandomRestaurants(currentList)
@@ -46,24 +45,23 @@ class DrawViewModel @Inject constructor(
                     }
                 }
             } else {
-                sameDrawList = 0
+                _sameDrawList = 0
 
                 val mappedMenus = selectedMenus.value?.let { CategoryIdMapper.mapMenus(it) }
                 val mappedLocations = selectedLocations.value?.let { CategoryIdMapper.mapLocations(it) }
 
                 if (mappedMenus != null && mappedLocations != null) {
-                    Log.d("DrawViewModel", "$mappedMenus $mappedLocations")
                     val drawRestaurantsListData = getDrawRestaurantUseCase(
                         mappedMenus,
                         mappedLocations
                     )
-                    _drawList.value = drawRestaurantsListData
+                    _drawList.value = drawRestaurantsListData.shuffled().take(20)
 
-                    val selected = getRandomRestaurants(drawRestaurantsListData)
+                    val selected = getRandomRestaurants(_drawList.value!!)
                     _selectedRestaurant.value = selected
                     updateSelectedIndex(drawRestaurantsListData, selected)
                 } else {
-                    Log.e("DrawViewModel", "Menus or Locations mapping failed. Menus: $mappedMenus, Locations: $mappedLocations")
+                     Log.e("DrawViewModel", "Menus or Locations mapping failed. Menus: $mappedMenus, Locations: $mappedLocations")
                 }
             }
         }
@@ -91,12 +89,15 @@ class DrawViewModel @Inject constructor(
     fun applyFilters(types: Set<String>, locations: Set<String>) {
         setSelectedTypes(types)
         setSelectedLocations(locations)
+    }
 
-        // 현재 선택된 값들을 새로운 "초기" 값으로 설정
-        _initialSelectedMenus = types
-        _initialSelectedLocations = locations
-
-        sameDrawList = 3
+    private fun isResetFilter() {
+        if(!((selectedMenus.value == _previousSelectedMenus) &&
+                (selectedLocations.value == _previousSelectedLocations))) {
+            _sameDrawList = 3
+            _previousSelectedMenus = selectedMenus.value!!
+            _previousSelectedLocations = selectedLocations.value!!
+        }
     }
 }
 
diff --git a/app/src/main/res/layout/fragment_draw_result.xml b/app/src/main/res/layout/fragment_draw_result.xml
index 0cb4444..6c956fc 100644
--- a/app/src/main/res/layout/fragment_draw_result.xml
+++ b/app/src/main/res/layout/fragment_draw_result.xml
@@ -3,8 +3,8 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_marginTop="40dp"
     android:layout_height="match_parent"
+    android:layout_marginTop="10dp"
     tools:context=".presentation.ui.draw.DrawResultFragment">
 
     <ScrollView
@@ -24,11 +24,11 @@
                 android:id="@+id/draw_selected_tv_clickable_info"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                app:layout_constraintBottom_toTopOf="@id/draw_iv_select"
+                android:layout_marginBottom="27dp"
                 android:fontFamily="@font/pretendard_regular"
                 android:gravity="center"
-                android:layout_marginBottom="27dp"
                 android:text="@string/draw_selected_category_result_clickable_info"
+                app:layout_constraintBottom_toTopOf="@id/draw_iv_select"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintHorizontal_bias="0.0"
                 app:layout_constraintStart_toStartOf="parent"
@@ -52,9 +52,9 @@
                 android:id="@+id/draw_viewPager"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                app:layout_constraintBottom_toBottomOf="@id/draw_iv_select"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintBottom_toBottomOf="@id/draw_iv_select"
                 app:layout_constraintTop_toTopOf="@id/draw_iv_select"
                 tools:layout_height="267dp" />
 
@@ -62,16 +62,16 @@
                 android:id="@+id/draw_iv_select"
                 android:layout_width="0dp"
                 android:layout_height="0dp"
+                android:background="@drawable/all_radius_30_signature_1"
+                android:padding="1dp"
+                android:scaleType="centerCrop"
                 android:visibility="invisible"
                 app:layout_constraintBottom_toTopOf="@id/draw_tv_restaurant_menu"
-                tools:visibility="visible"
-                android:scaleType="centerCrop"
-                android:padding="1dp"
-                app:layout_constraintEnd_toEndOf="@id/gl_end"
                 app:layout_constraintDimensionRatio="289:296"
-                android:background="@drawable/all_radius_30_signature_1"
+                app:layout_constraintEnd_toEndOf="@id/gl_end"
                 app:layout_constraintStart_toStartOf="@id/gl_start"
-                app:layout_constraintTop_toBottomOf="@id/draw_selected_tv_clickable_info"/>
+                app:layout_constraintTop_toBottomOf="@id/draw_selected_tv_clickable_info"
+                tools:visibility="visible" />
 
             <TextView
                 android:id="@+id/draw_tv_restaurant_menu"
diff --git a/app/src/main/res/layout/fragment_draw_select_category.xml b/app/src/main/res/layout/fragment_draw_select_category.xml
index fd5e383..fbefe8d 100644
--- a/app/src/main/res/layout/fragment_draw_select_category.xml
+++ b/app/src/main/res/layout/fragment_draw_select_category.xml
@@ -822,7 +822,7 @@
                 </androidx.constraintlayout.widget.ConstraintLayout>
 
                 <Button
-                    android:id="@+id/draw_btn_draw_random_restaurants"
+                    android:id="@+id/draw_btn_draw_result"
                     android:layout_width="0dp"
                     android:layout_height="52dp"
                     android:layout_marginTop="27dp"

From 8af8ceec16863ff2d64dfe93350ea2491f3c7791 Mon Sep 17 00:00:00 2001
From: BeomBeom2 <whwjdqja20@naver.com>
Date: Sat, 30 Nov 2024 09:55:10 +0900
Subject: [PATCH 3/3] =?UTF-8?q?[Clean=20up]=20=EC=BB=A4=EB=AE=A4=EB=8B=88?=
 =?UTF-8?q?=ED=8B=B0=20=EA=B4=80=EB=A0=A8=20=EC=BD=94=EB=93=9C=20Clean=20u?=
 =?UTF-8?q?p?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

No Related Issue
---
 .../ui/community/CommunityBlankFragment.kt    |  34 ------
 .../community/CommunityPostDetailFragment.kt  |  16 ++-
 .../community/CommunityPostDetailViewModel.kt |   5 +-
 .../ui/community/CommunityPostListAdapter.kt  |   6 +-
 .../ui/community/CommunityPostListFragment.kt | 108 ++++++++----------
 .../community/CommunityPostRankingFragment.kt |   9 --
 .../ui/community/CommunityViewModel.kt        |   4 +-
 .../res/layout/fragment_community_blank.xml   |  98 ----------------
 8 files changed, 61 insertions(+), 219 deletions(-)
 delete mode 100644 app/src/main/java/com/kust/kustaurant/presentation/ui/community/CommunityBlankFragment.kt
 delete mode 100644 app/src/main/res/layout/fragment_community_blank.xml

diff --git a/app/src/main/java/com/kust/kustaurant/presentation/ui/community/CommunityBlankFragment.kt b/app/src/main/java/com/kust/kustaurant/presentation/ui/community/CommunityBlankFragment.kt
deleted file mode 100644
index 472ff47..0000000
--- a/app/src/main/java/com/kust/kustaurant/presentation/ui/community/CommunityBlankFragment.kt
+++ /dev/null
@@ -1,34 +0,0 @@
-package com.kust.kustaurant.presentation.ui.community
-
-import android.content.Intent
-import android.os.Bundle
-import androidx.fragment.app.Fragment
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import com.kust.kustaurant.R
-import com.kust.kustaurant.databinding.FragmentCommunityBinding
-import com.kust.kustaurant.databinding.FragmentCommunityBlankBinding
-import com.kust.kustaurant.presentation.ui.search.SearchActivity
-
-class CommunityBlankFragment : Fragment() {
-    lateinit var binding : FragmentCommunityBlankBinding
-
-    override fun onCreateView(
-        inflater: LayoutInflater, container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View? {
-        binding = FragmentCommunityBlankBinding.inflate(layoutInflater)
-
-        initSearch()
-        return binding.root
-    }
-
-    private fun initSearch() {
-        binding.communityFlIvSearch.setOnClickListener {
-            val intent = Intent(requireContext(), SearchActivity::class.java)
-            startActivity(intent)
-        }
-    }
-
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/kust/kustaurant/presentation/ui/community/CommunityPostDetailFragment.kt b/app/src/main/java/com/kust/kustaurant/presentation/ui/community/CommunityPostDetailFragment.kt
index 47ab11b..a217e9b 100644
--- a/app/src/main/java/com/kust/kustaurant/presentation/ui/community/CommunityPostDetailFragment.kt
+++ b/app/src/main/java/com/kust/kustaurant/presentation/ui/community/CommunityPostDetailFragment.kt
@@ -58,14 +58,9 @@ class CommunityPostDetailFragment : Fragment() {
 
         setupButton()
         setupObservers()
-
-        binding.communityLlBtnPostLike.background = GradientDrawable().apply {
-            shape = GradientDrawable.RECTANGLE
-            cornerRadius = 100f
-            setStroke(1, ContextCompat.getColor(requireContext(), R.color.signature_1))
-        }
     }
 
+    @SuppressLint("SetTextI18n")
     private fun setupObservers() {
         parentViewModel.selectedPostDetailId.observe(viewLifecycleOwner) { postId ->
             postId?.let {
@@ -109,7 +104,6 @@ class CommunityPostDetailFragment : Fragment() {
         viewModel.postDelete.observe(viewLifecycleOwner) { result ->
             if (result) {
                 Toast.makeText(requireContext(), "게시글이 삭제되었습니다.", Toast.LENGTH_SHORT).show()
-
                 viewModel.resetPostDelete()
                 requireActivity().supportFragmentManager.popBackStack()
             }
@@ -142,8 +136,6 @@ class CommunityPostDetailFragment : Fragment() {
     private fun loadPostBodyToWebView(postBody: String) {
         val webView = binding.communityWvMiddleContent
         webView.settings.javaScriptEnabled = false
-
-        // CSS를 추가하여 WebView 내용이 화면 너비에 맞게 조정되도록 함
         val htmlContent = """
         <html>
         <head>
@@ -172,6 +164,12 @@ class CommunityPostDetailFragment : Fragment() {
             binding.communityIvPostDetailDots.isVisible = viewModel.postMine.value!!
         }
 
+        binding.communityLlBtnPostLike.background = GradientDrawable().apply {
+            shape = GradientDrawable.RECTANGLE
+            cornerRadius = 100f
+            setStroke(1, ContextCompat.getColor(requireContext(), R.color.signature_1))
+        }
+
         binding.btnBack.setOnClickListener {
             (requireActivity() as? MainActivity)?.supportFragmentManager?.popBackStack()
         }
diff --git a/app/src/main/java/com/kust/kustaurant/presentation/ui/community/CommunityPostDetailViewModel.kt b/app/src/main/java/com/kust/kustaurant/presentation/ui/community/CommunityPostDetailViewModel.kt
index 238d294..03c2dd5 100644
--- a/app/src/main/java/com/kust/kustaurant/presentation/ui/community/CommunityPostDetailViewModel.kt
+++ b/app/src/main/java/com/kust/kustaurant/presentation/ui/community/CommunityPostDetailViewModel.kt
@@ -35,10 +35,10 @@ class CommunityPostDetailViewModel @Inject constructor(
     private val _communityPostDetail = MutableLiveData<CommunityPost>()
     val communityPostDetail: LiveData<CommunityPost> = _communityPostDetail
 
-    private val _postMine = MutableLiveData<Boolean>(true)
+    private val _postMine = MutableLiveData(true)
     val postMine: LiveData<Boolean> = _postMine
 
-    private val _postDelete = MutableLiveData<Boolean>(false)
+    private val _postDelete = MutableLiveData(false)
     val postDelete: LiveData<Boolean> = _postDelete
 
     private val _postScrapInfo = MutableLiveData<CommunityPostScrapResponse>()
@@ -48,7 +48,6 @@ class CommunityPostDetailViewModel @Inject constructor(
     val postLikeInfo: LiveData<CommunityPostLikeResponse> = _postLikeInfo
 
     private val _commentReply = MutableLiveData<CommunityPostComment>()
-    val commentReply: LiveData<CommunityPostComment> = _commentReply
 
     private val _uiState = MutableLiveData<UiState>(UiState.Idle)
     val uiState: LiveData<UiState> = _uiState
diff --git a/app/src/main/java/com/kust/kustaurant/presentation/ui/community/CommunityPostListAdapter.kt b/app/src/main/java/com/kust/kustaurant/presentation/ui/community/CommunityPostListAdapter.kt
index 90e7d26..fe91775 100644
--- a/app/src/main/java/com/kust/kustaurant/presentation/ui/community/CommunityPostListAdapter.kt
+++ b/app/src/main/java/com/kust/kustaurant/presentation/ui/community/CommunityPostListAdapter.kt
@@ -1,5 +1,6 @@
 package com.kust.kustaurant.presentation.ui.community
 
+import android.annotation.SuppressLint
 import android.text.Html
 import android.view.LayoutInflater
 import android.view.View
@@ -30,13 +31,14 @@ class CommunityPostListAdapter() :
 
         init {
             itemView.setOnClickListener {
-                val position = adapterPosition
+                val position = bindingAdapterPosition
                 if (position != RecyclerView.NO_POSITION) {
-                    itemClickListener?.onItemClicked(getItem(position))
+                    itemClickListener.onItemClicked(getItem(position))
                 }
             }
         }
 
+        @SuppressLint("SetTextI18n")
         fun bind(item: CommunityPost) {
             viewBinding.communityTvCategory.text = item.postCategory
 
diff --git a/app/src/main/java/com/kust/kustaurant/presentation/ui/community/CommunityPostListFragment.kt b/app/src/main/java/com/kust/kustaurant/presentation/ui/community/CommunityPostListFragment.kt
index b54fba0..5cda489 100644
--- a/app/src/main/java/com/kust/kustaurant/presentation/ui/community/CommunityPostListFragment.kt
+++ b/app/src/main/java/com/kust/kustaurant/presentation/ui/community/CommunityPostListFragment.kt
@@ -6,6 +6,7 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.CompoundButton
 import android.widget.LinearLayout
 import android.widget.PopupWindow
 import androidx.core.content.ContextCompat
@@ -38,81 +39,43 @@ class CommunityPostListFragment : Fragment() {
         binding.lifecycleOwner = viewLifecycleOwner
         binding.viewModel = viewModel
 
-        commuAdapter = CommunityPostListAdapter()
+        setupRecyclerView()
+        setupUI()
+
+        return binding.root
+    }
+
+    private fun setupRecyclerView() {
+        commuAdapter = CommunityPostListAdapter().apply {
+            setOnItemClickListener(object : CommunityPostListAdapter.OnItemClickListener {
+                override fun onItemClicked(data: CommunityPost) {
+                    navigateToPostDetail(data.postId)
+                }
+            })
+        }
+
         binding.communityRecyclerView.apply {
             layoutManager = LinearLayoutManager(context)
             adapter = commuAdapter
         }
+    }
 
-        setupUI()
-
-        return binding.root
+    private fun navigateToPostDetail(postId: Int) {
+        viewModel.selectPost(postId)
+        requireActivity().supportFragmentManager.beginTransaction()
+            .replace(R.id.main_frm, CommunityPostDetailFragment())
+            .addToBackStack(null)
+            .commit()
     }
 
     private fun setupUI() {
         setupFloatingWriteBtn()
 
-        commuAdapter.setOnItemClickListener(object : CommunityPostListAdapter.OnItemClickListener {
-            override fun onItemClicked(data: CommunityPost) {
-                viewModel.selectPost(data.postId)
-
-                requireActivity().supportFragmentManager.beginTransaction()
-                    .replace(R.id.main_frm, CommunityPostDetailFragment())
-                    .addToBackStack(null)
-                    .commit()
-            }
-        })
-
         binding.communityToggleLastestSort.setOnCheckedChangeListener { buttonView, isChecked ->
-            if (isChecked) {
-                viewModel.updateSortAndLoadPosts("recent")
-                binding.communityRecyclerView.scrollToPosition(0)
-                binding.communityTogglePopularSort.isChecked = false
-                buttonView.setTextColor(
-                    ContextCompat.getColor(
-                        requireContext(),
-                        R.color.signature_1
-                    )
-                )
-            } else {
-                // 이미 체크된 버튼을 다시 누를 경우 체크를 유지
-                if (!binding.communityTogglePopularSort.isChecked) {
-                    buttonView.isChecked = true
-                } else {
-                    buttonView.setTextColor(
-                        ContextCompat.getColor(
-                            requireContext(),
-                            R.color.cement_4
-                        )
-                    )
-                }
-            }
+            handleSortToggle(buttonView, isChecked, "recent", binding.communityTogglePopularSort)
         }
-
         binding.communityTogglePopularSort.setOnCheckedChangeListener { buttonView, isChecked ->
-            if (isChecked) {
-                viewModel.updateSortAndLoadPosts("popular")
-                binding.communityRecyclerView.scrollToPosition(0)
-                binding.communityToggleLastestSort.isChecked = false
-                buttonView.setTextColor(
-                    ContextCompat.getColor(
-                        requireContext(),
-                        R.color.signature_1
-                    )
-                )
-            } else {
-                // 이미 체크된 버튼을 다시 누를 경우 체크를 유지
-                if (!binding.communityToggleLastestSort.isChecked) {
-                    buttonView.isChecked = true
-                } else {
-                    buttonView.setTextColor(
-                        ContextCompat.getColor(
-                            requireContext(),
-                            R.color.cement_4
-                        )
-                    )
-                }
-            }
+            handleSortToggle(buttonView, isChecked, "popular", binding.communityToggleLastestSort)
         }
 
         binding.commuBtnWritePost.setOnClickListener {
@@ -151,6 +114,27 @@ class CommunityPostListFragment : Fragment() {
         }
     }
 
+    private fun handleSortToggle(
+        buttonView: CompoundButton,
+        isChecked: Boolean,
+        sortType: String,
+        otherToggle: CompoundButton
+    ) {
+        if (isChecked) {
+            viewModel.updateSortAndLoadPosts(sortType)
+            binding.communityRecyclerView.scrollToPosition(0)
+            otherToggle.isChecked = false
+            buttonView.setTextColor(ContextCompat.getColor(requireContext(), R.color.signature_1))
+        } else {
+            // 유지 조건
+            if (!otherToggle.isChecked) {
+                buttonView.isChecked = true
+            } else {
+                buttonView.setTextColor(ContextCompat.getColor(requireContext(), R.color.cement_4))
+            }
+        }
+    }
+
     private fun showPopupWindow() {
         val popupBinding = PopupCommuPostListSortBinding.inflate(layoutInflater)
         val popupWindow = PopupWindow(
diff --git a/app/src/main/java/com/kust/kustaurant/presentation/ui/community/CommunityPostRankingFragment.kt b/app/src/main/java/com/kust/kustaurant/presentation/ui/community/CommunityPostRankingFragment.kt
index b26dd13..4618c54 100644
--- a/app/src/main/java/com/kust/kustaurant/presentation/ui/community/CommunityPostRankingFragment.kt
+++ b/app/src/main/java/com/kust/kustaurant/presentation/ui/community/CommunityPostRankingFragment.kt
@@ -26,7 +26,6 @@ class CommunityPostRankingFragment : Fragment() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
-        // ViewModel의 랭킹 데이터를 관찰하여 UI 업데이트
         viewModel.communityRanking.observe(viewLifecycleOwner) { rankings ->
             val (topRankers, remainingRankings) = viewModel.onRankingDataChanged(rankings)
             bindTopRankers(topRankers)
@@ -77,7 +76,6 @@ class CommunityPostRankingFragment : Fragment() {
         binding.communityToggleQuarterly.isChecked = true
         binding.communityTogglePopularSort.isChecked = false
 
-        // 초기 상태에 맞게 텍스트 색상 설정
         binding.communityToggleQuarterly.setTextColor(ContextCompat.getColor(requireContext(), R.color.signature_1))
         binding.communityTogglePopularSort.setTextColor(ContextCompat.getColor(requireContext(), R.color.cement_4))
 
@@ -87,28 +85,21 @@ class CommunityPostRankingFragment : Fragment() {
                 binding.communityTogglePopularSort.isChecked = false
                 viewModel.onSortTypeChanged("quarterly")
 
-                // 분기순 버튼 텍스트 색상 변경
                 binding.communityToggleQuarterly.setTextColor(ContextCompat.getColor(requireContext(), R.color.signature_1))
-                // 누적순 버튼 텍스트 색상 기본으로 변경
                 binding.communityTogglePopularSort.setTextColor(ContextCompat.getColor(requireContext(), R.color.cement_4))
             } else {
-                // 분기순 버튼이 체크 해제되었을 때 (옵션)
                 binding.communityToggleQuarterly.setTextColor(ContextCompat.getColor(requireContext(), R.color.cement_4))
             }
         }
 
-        // 누적순 버튼 클릭 이벤트 처리
         binding.communityTogglePopularSort.setOnCheckedChangeListener { _, isChecked ->
             if (isChecked) {
                 binding.communityToggleQuarterly.isChecked = false
                 viewModel.onSortTypeChanged("cumulative")
 
-                // 누적순 버튼 텍스트 색상 변경
                 binding.communityTogglePopularSort.setTextColor(ContextCompat.getColor(requireContext(), R.color.signature_1))
-                // 분기순 버튼 텍스트 색상 기본으로 변경
                 binding.communityToggleQuarterly.setTextColor(ContextCompat.getColor(requireContext(), R.color.cement_4))
             } else {
-                // 누적순 버튼이 체크 해제되었을 때 (옵션)
                 binding.communityTogglePopularSort.setTextColor(ContextCompat.getColor(requireContext(), R.color.cement_4))
             }
         }
diff --git a/app/src/main/java/com/kust/kustaurant/presentation/ui/community/CommunityViewModel.kt b/app/src/main/java/com/kust/kustaurant/presentation/ui/community/CommunityViewModel.kt
index 569980c..4548afb 100644
--- a/app/src/main/java/com/kust/kustaurant/presentation/ui/community/CommunityViewModel.kt
+++ b/app/src/main/java/com/kust/kustaurant/presentation/ui/community/CommunityViewModel.kt
@@ -60,7 +60,7 @@ class CommunityViewModel @Inject constructor(
                     _communityPosts.postValue(currentPosts)
                 }
             } catch (e: Exception) {
-                Log.e("CommunityViewModel", "loadCommunityPosts Error", e)
+                Log.e("CommunityViewModel", "From loadCommunityPosts Err is ", e)
             } finally {  }
         }
     }
@@ -124,7 +124,7 @@ class CommunityViewModel @Inject constructor(
                 val rankings = getCommunityRankingListUseCase(sort)
                 _communityRanking.value = rankings
             } catch (e: Exception) {
-                Log.e("CommunityViewModel", "loadCommunityRanking Error", e)
+                Log.e("CommunityViewModel", "From loadCommunityRanking Err is ", e)
             }
         }
     }
diff --git a/app/src/main/res/layout/fragment_community_blank.xml b/app/src/main/res/layout/fragment_community_blank.xml
deleted file mode 100644
index 320f6f5..0000000
--- a/app/src/main/res/layout/fragment_community_blank.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/white"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    tools:context=".presentation.ui.community.CommunityBlankFragment">
-
-    <androidx.constraintlayout.widget.Guideline
-        android:id="@+id/gl_start"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        app:layout_constraintGuide_percent="0.05"/>
-
-    <androidx.constraintlayout.widget.Guideline
-        android:id="@+id/gl_end"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        app:layout_constraintGuide_percent="0.95"/>
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/top_bar"
-        android:elevation="1dp"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        app:layout_constraintDimensionRatio="360:63"
-        app:layout_constraintEnd_toEndOf="@id/gl_end"
-        app:layout_constraintStart_toStartOf="@id/gl_start"
-        app:layout_constraintTop_toTopOf="parent">
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:fontFamily="@font/pretendard_semibold"
-            android:text="커뮤니티"
-            android:textColor="@color/black"
-            android:textSize="17sp"
-            android:textStyle="bold"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <FrameLayout
-            android:id="@+id/community_fl_iv_search"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            app:layout_constraintStart_toStartOf="@id/community_iv_search"
-            app:layout_constraintEnd_toEndOf="@id/community_iv_search"
-            app:layout_constraintTop_toTopOf="@id/community_iv_search"
-            app:layout_constraintBottom_toBottomOf="@id/community_iv_search"
-            android:padding="20dp"/>
-
-        <ImageView
-            android:id="@+id/community_iv_search"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:contentDescription="@string/search_btn_info"
-            android:src="@drawable/ic_search"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
-    <View
-        android:id="@+id/divider"
-        android:layout_width="0dp"
-        android:layout_height="1dp"
-        android:background="@color/cement_2"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintBottom_toBottomOf="@id/top_bar"/>
-
-    <TextView
-        android:id="@+id/tv_blank"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="업데이트 될 예정입니다!"
-        android:layout_marginBottom="10dp"
-        app:layout_constraintBottom_toTopOf="@id/iv_blank"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"/>
-
-    <ImageView
-        android:id="@+id/iv_blank"
-        android:layout_width="100dp"
-        android:layout_height="100dp"
-        android:src="@drawable/ic_gray_logo"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/top_bar"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file