feat: 앱이 백그라운드 상태에서 포그라운드로 돌아온 경우 식당 정보를 업데이트하는 로직 구현 (#40)

ZZANZU · web-flow · commit 6845f6868a91 · 2023-05-17T18:32:04.000+09:00
* fix: 함수명 통일

* fix: 마커 클릭시 ViewPager의 item이 표시되는 애니메이션 제거

* fix: 식당 정보 업데이트 로직 구현(개선 필요)

* fix: 코드 가독성을 위해 scope 함수 적용
diff --git a/app/src/main/java/com/woozoo/menumonya/MainActivity.kt b/app/src/main/java/com/woozoo/menumonya/MainActivity.kt
@@ -36,6 +36,7 @@ class MainActivity : AppCompatActivity(), View.OnClickListener {
     private lateinit var binding: ActivityMainBinding
 
     private lateinit var viewPager: ViewPager2
+    private var restaurantAdapter: RestaurantAdapter? = null
     private lateinit var locationPermissionDialog: LocationPermissionDialog
 
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -100,19 +101,25 @@ class MainActivity : AppCompatActivity(), View.OnClickListener {
 
     private fun handleEvent(event: Event) = when (event) {
         is Event.ShowToast -> Toast.makeText(this, event.text, Toast.LENGTH_SHORT).show()
+        is Event.FetchRestaurantInfo -> {
+            if (restaurantAdapter != null) {
+                restaurantAdapter?.setData(event.data)
+                viewPager.adapter?.notifyDataSetChanged()
+            } else { }
+        }
         is Event.OnMarkerClicked -> {
             if (viewPager.adapter != null) {
-                viewPager.currentItem = event.markerIndex
+                viewPager.setCurrentItem(event.markerIndex, false)
             } else {
                 viewModel.showLocationViewPager(event.markerIndex)
             }
         }
         is Event.ShowRestaurantView -> {
             if (viewPager.adapter == null) {
-                viewPager.adapter =
-                    RestaurantAdapter(event.data, this, remoteConfigRepository, analyticsUtils)
+                restaurantAdapter = RestaurantAdapter(event.data, this, remoteConfigRepository, analyticsUtils)
+                viewPager.adapter = restaurantAdapter
                 if (event.markerIndex != -1) {
-                    viewPager.currentItem = event.markerIndex
+                    viewPager.setCurrentItem(event.markerIndex, false)
                 } else { }
             } else { }
         }
@@ -177,6 +184,9 @@ class MainActivity : AppCompatActivity(), View.OnClickListener {
         binding.naverMap.onResume()
 
         viewModel.checkLatestAppVersion()
+        if (viewPager != null && restaurantAdapter != null) {
+            viewModel.updateLocationInfo(viewPager.currentItem)
+        }
     }
 
     override fun onPause() {
@@ -211,28 +221,30 @@ class MainActivity : AppCompatActivity(), View.OnClickListener {
                 viewPager.adapter = null
                 viewModel.showLocationInfo("강남")
                 
-                binding.locationGnBtn.background = applicationContext.getDrawable(R.drawable.color_button_background)
-                binding.locationYsBtn.background = applicationContext.getDrawable(R.drawable.white_button_background)
-                binding.locationGnBtn.setTextColor(applicationContext.getColor(R.color.white))
-                binding.locationYsBtn.setTextColor(applicationContext.getColor(R.color.gray600))
-
-                binding.currentLocationBtn.background = resources.getDrawable(R.drawable.current_location_button)
-                binding.currentLocationTv.setTextColor(resources.getColor(R.color.colorPrimary))
-                binding.currentLocationIv.setColorFilter(resources.getColor(R.color.colorPrimary))
+                binding.apply {
+                    locationGnBtn.background = applicationContext.getDrawable(R.drawable.color_button_background)
+                    locationYsBtn.background = applicationContext.getDrawable(R.drawable.white_button_background)
+                    locationGnBtn.setTextColor(applicationContext.getColor(R.color.white))
+                    locationYsBtn.setTextColor(applicationContext.getColor(R.color.gray600))
+                    currentLocationBtn.background = resources.getDrawable(R.drawable.current_location_button)
+                    currentLocationTv.setTextColor(resources.getColor(R.color.colorPrimary))
+                    currentLocationIv.setColorFilter(resources.getColor(R.color.colorPrimary))
+                }
             }
             R.id.location_ys_btn -> {
                 viewPager.invalidate()
                 viewPager.adapter = null
                 viewModel.showLocationInfo("역삼")
                 
-                binding.locationYsBtn.background = applicationContext.getDrawable(R.drawable.color_button_background)
-                binding.locationGnBtn.background = applicationContext.getDrawable(R.drawable.white_button_background)
-                binding.locationYsBtn.setTextColor(applicationContext.getColor(R.color.white))
-                binding.locationGnBtn.setTextColor(applicationContext.getColor(R.color.gray600))
-
-                binding.currentLocationBtn.background = resources.getDrawable(R.drawable.current_location_button)
-                binding.currentLocationTv.setTextColor(resources.getColor(R.color.colorPrimary))
-                binding.currentLocationIv.setColorFilter(resources.getColor(R.color.colorPrimary))
+                binding.apply {
+                    locationYsBtn.background = applicationContext.getDrawable(R.drawable.color_button_background)
+                    locationGnBtn.background = applicationContext.getDrawable(R.drawable.white_button_background)
+                    locationYsBtn.setTextColor(applicationContext.getColor(R.color.white))
+                    locationGnBtn.setTextColor(applicationContext.getColor(R.color.gray600))
+                    currentLocationBtn.background = resources.getDrawable(R.drawable.current_location_button)
+                    currentLocationTv.setTextColor(resources.getColor(R.color.colorPrimary))
+                    currentLocationIv.setColorFilter(resources.getColor(R.color.colorPrimary))
+                }
             }
             R.id.feedback_iv -> {
                 val feedbackUrl = viewModel.getFeedbackUrl()
diff --git a/app/src/main/java/com/woozoo/menumonya/MainViewModel.kt b/app/src/main/java/com/woozoo/menumonya/MainViewModel.kt
@@ -54,6 +54,7 @@ class MainViewModel @Inject constructor(
     private var mRestaurantInfoArray: ArrayList<Restaurant> = ArrayList()
     private var markerList: ArrayList<Marker> = ArrayList()
     private var selectedLocation: String = ""
+    private var isInitialized: Boolean = false
 
     init {
         locationManager = application.getSystemService(LOCATION_SERVICE) as LocationManager
@@ -77,8 +78,10 @@ class MainViewModel @Inject constructor(
                 minZoom = MAP_MIN_ZOOM
             }
 
-            moveCameraCoord(LATLNG_GN.latitude, LATLNG_GN.longitude)
+            moveCameraToCoord(LATLNG_GN.latitude, LATLNG_GN.longitude)
             showLocationInfo("강남")
+
+            isInitialized = true
         }
     }
 
@@ -116,7 +119,7 @@ class MainViewModel @Inject constructor(
         }
     }
 
-    private fun moveCameraCoord(latitude: Double, longitude: Double) {
+    private fun moveCameraToCoord(latitude: Double, longitude: Double) {
         val coord = LatLng(latitude, longitude)
         val cameraUpdateParams = CameraUpdateParams().apply {
             scrollTo(coord)
@@ -141,8 +144,8 @@ class MainViewModel @Inject constructor(
             selectedLocation = location
 
             when (selectedLocation) {
-                "강남" -> moveCameraCoord(LATLNG_GN.latitude, LATLNG_GN.longitude)
-                "역삼" -> moveCameraCoord(LATLNG_YS.latitude, LATLNG_YS.longitude)
+                "강남" -> moveCameraToCoord(LATLNG_GN.latitude, LATLNG_GN.longitude)
+                "역삼" -> moveCameraToCoord(LATLNG_YS.latitude, LATLNG_YS.longitude)
             }
 
             mRestaurantInfoArray = fireStoreRepository.getRestaurantInLocation(location)
@@ -152,7 +155,26 @@ class MainViewModel @Inject constructor(
         }
     }
 
-    private fun setMarkers(restaurantInfo: ArrayList<Restaurant>) {
+    fun updateLocationInfo(currentViewPagerIndex: Int) {
+        if (isInitialized) {
+            showLoading(true)
+            viewModelScope.launch {
+                mRestaurantInfoArray = fireStoreRepository.getRestaurantInLocation(selectedLocation)
+                setMarkers(mRestaurantInfoArray, currentViewPagerIndex)
+
+                fetchRestaurantInfo(mRestaurantInfoArray)
+                showLoading(false)
+            }
+        }
+    }
+
+    /**
+     * 지도에 식당 마커들을 표시함.
+     * selectedIndex 값을 지정할 경우, 해당 인덱스의 마커를 클릭된 아이콘(@drawable/restaurant_marker_selected)으로 표시함.
+     *
+     * @param selectedIndex  선택된 아이콘으로 변경할 마커의 인덱스.
+     */
+    private fun setMarkers(restaurantInfo: ArrayList<Restaurant>, selectedIndex: Int = -1) {
         if (restaurantInfo.size > 0) {
             // 마커 표시 초기화
             for (marker in markerList) {
@@ -181,6 +203,14 @@ class MainViewModel @Inject constructor(
                 markerList.add(marker)
             }
 
+            // 클릭된 아이콘으로 변경
+            if (selectedIndex != -1) {
+                markerList[selectedIndex].apply {
+                    icon = OverlayImage.fromResource(R.drawable.restaurant_marker_selected)
+                    zIndex = Marker.DEFAULT_GLOBAL_Z_INDEX + 1
+                }
+            }
+
             markerList.forEach { marker ->
                 marker.map = naverMap
             }
@@ -206,7 +236,7 @@ class MainViewModel @Inject constructor(
                     locationManager,
                     LocationListener { location ->
                         // 내 위치로 카메라 이동, 내 위치 표시
-                        moveCameraCoord(location.latitude, location.longitude)
+                        moveCameraToCoord(location.latitude, location.longitude)
                         naverMap.apply {
                             locationSource = FusedLocationSource(activity, LOCATION_PERMISSION_REQUEST_CODE)
                             locationTrackingMode = LocationTrackingMode.Follow
@@ -262,9 +292,13 @@ class MainViewModel @Inject constructor(
         event(Event.ShowUpdateDialog(""))
     }
 
+    private fun fetchRestaurantInfo(data: ArrayList<Restaurant>) {
+        event(Event.FetchRestaurantInfo(data))
+    }
+
     sealed class Event {
         /**
-         * MainActivity에 전달할 이벤트를 이곳에 정
+         * MainActivity에 전달할 이벤트를 이 곳에 정의함.
          *
          * (ex) data class ShowToast(val text: String) : Event()
          */
@@ -276,5 +310,7 @@ class MainViewModel @Inject constructor(
         data class MoveToCurrentLocation(val data: String): Event()
         data class ShowLoading(val visibility: Boolean): Event()
         data class ShowUpdateDialog(val data: String): Event()
+
+        data class FetchRestaurantInfo(val data: ArrayList<Restaurant>): Event()
     }
 }
diff --git a/app/src/main/java/com/woozoo/menumonya/RestaurantAdapter.kt b/app/src/main/java/com/woozoo/menumonya/RestaurantAdapter.kt
@@ -19,7 +19,7 @@ import com.woozoo.menumonya.util.AnalyticsUtils.Companion.CONTENT_TYPE_REPORT_BU
 import com.woozoo.menumonya.util.DateUtils.Companion.getTodayDate
 import com.woozoo.menumonya.util.DateUtils.Companion.getTodayMenuDateText
 
-class RestaurantAdapter(private val restaurantInfoArray: ArrayList<Restaurant>,
+class RestaurantAdapter(private var restaurantInfoArray: ArrayList<Restaurant>,
                         private val context: Context,
                         private val remoteConfigRepository: RemoteConfigRepository,
                         private val analyticsUtils: AnalyticsUtils
@@ -100,4 +100,7 @@ class RestaurantAdapter(private val restaurantInfoArray: ArrayList<Restaurant>,
         return restaurantInfoArray.size
     }
 
+    fun setData(data: ArrayList<Restaurant>) {
+        restaurantInfoArray = data
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ import com.woozoo.menumonya.util.AnalyticsUtils.Companion.CONTENT_TYPE_REPORT_BU`
`19`	`19`	`import com.woozoo.menumonya.util.DateUtils.Companion.getTodayDate`
`20`	`20`	`import com.woozoo.menumonya.util.DateUtils.Companion.getTodayMenuDateText`
`21`	`21`
`22`		`-class RestaurantAdapter(private val restaurantInfoArray: ArrayList<Restaurant>,`
	`22`	`+class RestaurantAdapter(private var restaurantInfoArray: ArrayList<Restaurant>,`
`23`	`23`	`private val context: Context,`
`24`	`24`	`private val remoteConfigRepository: RemoteConfigRepository,`
`25`	`25`	`private val analyticsUtils: AnalyticsUtils`
`@@ -100,4 +100,7 @@ class RestaurantAdapter(private val restaurantInfoArray: ArrayList<Restaurant>,`
`100`	`100`	`return restaurantInfoArray.size`
`101`	`101`	`}`
`102`	`102`
	`103`	`+ fun setData(data: ArrayList<Restaurant>) {`
	`104`	`+ restaurantInfoArray = data`
	`105`	`+ }`
`103`	`106`	`}`