fix: 제보하기 레이아웃 수정 (#47)

ZZANZU · web-flow · commit 35d2f8930573 · 2023-06-13T22:17:30.000+09:00
* feat: 메뉴 제보하기 버튼 랜덤 표시 로직 구현

* feat: 온라인으로 메뉴가 수집 가능/불가능한 경우의 제보하기 레이아웃 텍스트 변경 로직 구현

* feat: 메뉴 제보 관련 정보 표시 이미지 추가

* chore: 패키지 구조 수정

* feat: 제보하기 도움말 다이얼로그 표시 로직 구현
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -19,7 +19,7 @@
         android:usesCleartextTraffic="true"
         tools:targetApi="31">
         <activity
-            android:name="com.woozoo.menumonya.MainActivity"
+            android:name="com.woozoo.menumonya.ui.screen.MainActivity"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
diff --git a/app/src/main/java/com/woozoo/menumonya/Application.kt b/app/src/main/java/com/woozoo/menumonya/Application.kt
@@ -2,7 +2,7 @@ package com.woozoo.menumonya
 
 import android.app.Application
 import android.content.Context
-import com.woozoo.menumonya.repository.RemoteConfigRepositoryImpl
+import com.woozoo.menumonya.data.repository.RemoteConfigRepositoryImpl
 import dagger.hilt.android.HiltAndroidApp
 import javax.inject.Inject
 
diff --git a/app/src/main/java/com/woozoo/menumonya/data/model/Food.kt b/app/src/main/java/com/woozoo/menumonya/data/model/Food.kt
@@ -1,4 +1,4 @@
-package com.woozoo.menumonya.model
+package com.woozoo.menumonya.data.model
 
 data class Food(
     val date: String = "",
diff --git a/app/src/main/java/com/woozoo/menumonya/data/model/Menu.kt b/app/src/main/java/com/woozoo/menumonya/data/model/Menu.kt
@@ -1,4 +1,4 @@
-package com.woozoo.menumonya.model
+package com.woozoo.menumonya.data.model
 
 data class Menu (
     val restaurantId: String = "",
diff --git a/app/src/main/java/com/woozoo/menumonya/data/model/Region.kt b/app/src/main/java/com/woozoo/menumonya/data/model/Region.kt
@@ -1,4 +1,4 @@
-package com.woozoo.menumonya.model
+package com.woozoo.menumonya.data.model
 
 import com.woozoo.menumonya.Constants.Companion.REGION_BUTTON_TYPE
 
diff --git a/app/src/main/java/com/woozoo/menumonya/data/model/ReportButtonText.kt b/app/src/main/java/com/woozoo/menumonya/data/model/ReportButtonText.kt
@@ -0,0 +1,3 @@
+package com.woozoo.menumonya.data.model
+
+data class ReportButtonText(val description: String="")
diff --git a/app/src/main/java/com/woozoo/menumonya/data/model/Restaurant.kt b/app/src/main/java/com/woozoo/menumonya/data/model/Restaurant.kt
@@ -1,4 +1,4 @@
-package com.woozoo.menumonya.model
+package com.woozoo.menumonya.data.model
 
 
 data class Restaurant(
@@ -12,7 +12,8 @@ data class Restaurant(
     val time: Time = Time(),
     val phoneNumber: String = "",
     var todayMenu: Food = Food(),
-    val updatedTime: String = ""
+    val updatedTime: String = "",
+    val menuAvailableOnline: Boolean = false,
 )
 
 data class Location(
diff --git a/app/src/main/java/com/woozoo/menumonya/data/repository/DataStoreRepository.kt b/app/src/main/java/com/woozoo/menumonya/data/repository/DataStoreRepository.kt
@@ -1,4 +1,4 @@
-package com.woozoo.menumonya.repository
+package com.woozoo.menumonya.data.repository
 
 import androidx.datastore.preferences.core.Preferences
 
diff --git a/app/src/main/java/com/woozoo/menumonya/data/repository/DataStoreRepositoryImpl.kt b/app/src/main/java/com/woozoo/menumonya/data/repository/DataStoreRepositoryImpl.kt
@@ -1,4 +1,4 @@
-package com.woozoo.menumonya.repository
+package com.woozoo.menumonya.data.repository
 
 import androidx.datastore.core.DataStore
 import androidx.datastore.preferences.core.Preferences
diff --git a/app/src/main/java/com/woozoo/menumonya/data/repository/FireStoreRepository.kt b/app/src/main/java/com/woozoo/menumonya/data/repository/FireStoreRepository.kt
@@ -0,0 +1,13 @@
+package com.woozoo.menumonya.data.repository
+
+import com.woozoo.menumonya.data.model.Region
+import com.woozoo.menumonya.data.model.Restaurant
+
+interface FireStoreRepository {
+
+    suspend fun getRestaurantInRegion(region: String): ArrayList<Restaurant>
+
+    suspend fun getRegionList(): ArrayList<Region>
+
+    suspend fun getReportButtonText(): ArrayList<String>
+}
diff --git a/app/src/main/java/com/woozoo/menumonya/data/repository/FireStoreRepositoryImpl.kt b/app/src/main/java/com/woozoo/menumonya/data/repository/FireStoreRepositoryImpl.kt
@@ -1,9 +1,10 @@
-package com.woozoo.menumonya.repository
+package com.woozoo.menumonya.data.repository
 
 import com.google.firebase.firestore.FirebaseFirestore
 import com.google.firebase.firestore.ktx.toObject
-import com.woozoo.menumonya.model.Region
-import com.woozoo.menumonya.model.Restaurant
+import com.woozoo.menumonya.data.model.Region
+import com.woozoo.menumonya.data.model.ReportButtonText
+import com.woozoo.menumonya.data.model.Restaurant
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.tasks.await
 import kotlinx.coroutines.withContext
@@ -58,4 +59,20 @@ class FireStoreRepositoryImpl @Inject constructor(
 
         return regionInfo
     }
+
+    override suspend fun getReportButtonText(): ArrayList<String> {
+        val reportButtonTextList = ArrayList<String>()
+        val reportButtonTextRef = db.collection("menu-report-text")
+
+        val result = reportButtonTextRef.get().await()
+        val documents = result.documents
+
+        for (document in documents) {
+            val text = document.toObject<ReportButtonText>()
+
+            if (text != null && text.description != "") reportButtonTextList.add(text.description)
+        }
+
+        return reportButtonTextList
+    }
 }
diff --git a/app/src/main/java/com/woozoo/menumonya/data/repository/RemoteConfigRepository.kt b/app/src/main/java/com/woozoo/menumonya/data/repository/RemoteConfigRepository.kt
@@ -1,4 +1,4 @@
-package com.woozoo.menumonya.repository
+package com.woozoo.menumonya.data.repository
 
 interface RemoteConfigRepository {
 
diff --git a/app/src/main/java/com/woozoo/menumonya/data/repository/RemoteConfigRepositoryImpl.kt b/app/src/main/java/com/woozoo/menumonya/data/repository/RemoteConfigRepositoryImpl.kt
@@ -1,4 +1,4 @@
-package com.woozoo.menumonya.repository
+package com.woozoo.menumonya.data.repository
 
 import android.util.Log
 import com.google.firebase.remoteconfig.FirebaseRemoteConfig
diff --git a/app/src/main/java/com/woozoo/menumonya/di/RepositoryModule.kt b/app/src/main/java/com/woozoo/menumonya/di/RepositoryModule.kt
@@ -1,6 +1,6 @@
 package com.woozoo.menumonya.di
 
-import com.woozoo.menumonya.repository.*
+import com.woozoo.menumonya.data.repository.*
 import dagger.Binds
 import dagger.Module
 import dagger.hilt.InstallIn
diff --git a/app/src/main/java/com/woozoo/menumonya/repository/FireStoreRepository.kt b/app/src/main/java/com/woozoo/menumonya/repository/FireStoreRepository.kt
diff --git a/app/src/main/java/com/woozoo/menumonya/ui/adapter/RegionAdapter.kt b/app/src/main/java/com/woozoo/menumonya/ui/adapter/RegionAdapter.kt
@@ -1,4 +1,4 @@
-package com.woozoo.menumonya
+package com.woozoo.menumonya.ui.adapter
 
 import android.content.Context
 import android.content.Intent
@@ -11,9 +11,10 @@ import androidx.recyclerview.widget.RecyclerView
 import com.woozoo.menumonya.Constants.Companion.REGION_BUTTON_TYPE
 import com.woozoo.menumonya.Constants.Companion.REGION_REPORT
 import com.woozoo.menumonya.Constants.Companion.REGION_REPORT_TYPE
+import com.woozoo.menumonya.R
 import com.woozoo.menumonya.databinding.ItemRegionBinding
-import com.woozoo.menumonya.model.Region
-import com.woozoo.menumonya.repository.RemoteConfigRepository
+import com.woozoo.menumonya.data.model.Region
+import com.woozoo.menumonya.data.repository.RemoteConfigRepository
 import com.woozoo.menumonya.util.AnalyticsUtils
 import com.woozoo.menumonya.util.AnalyticsUtils.Companion.CONTENT_TYPE_REPORT_REGION_BUTTON
 
diff --git a/app/src/main/java/com/woozoo/menumonya/ui/adapter/RestaurantAdapter.kt b/app/src/main/java/com/woozoo/menumonya/ui/adapter/RestaurantAdapter.kt
@@ -1,4 +1,4 @@
-package com.woozoo.menumonya
+package com.woozoo.menumonya.ui.adapter
 
 import android.content.Context
 import android.content.Intent
@@ -11,15 +11,19 @@ import com.bumptech.glide.Glide
 import com.bumptech.glide.load.engine.DiskCacheStrategy
 import com.woozoo.menumonya.Constants.Companion.GLIDE_IMAGE_SIZE_HEIGHT
 import com.woozoo.menumonya.Constants.Companion.GLIDE_IMAGE_SIZE_WIDTH
+import com.woozoo.menumonya.R
 import com.woozoo.menumonya.databinding.ItemRestaurantBinding
-import com.woozoo.menumonya.model.Restaurant
-import com.woozoo.menumonya.repository.RemoteConfigRepository
+import com.woozoo.menumonya.data.model.Restaurant
+import com.woozoo.menumonya.data.repository.RemoteConfigRepository
+import com.woozoo.menumonya.ui.dialog.ImageDialog
+import com.woozoo.menumonya.ui.dialog.MenuDialog
 import com.woozoo.menumonya.util.AnalyticsUtils
 import com.woozoo.menumonya.util.AnalyticsUtils.Companion.CONTENT_TYPE_REPORT_BUTTON
 import com.woozoo.menumonya.util.DateUtils.Companion.getTodayDate
 import com.woozoo.menumonya.util.DateUtils.Companion.getTodayMenuDateText
 
 class RestaurantAdapter(private var restaurantInfoArray: ArrayList<Restaurant>,
+                        private var buttonTextList: ArrayList<String>,
                         private val context: Context,
                         private val remoteConfigRepository: RemoteConfigRepository,
                         private val analyticsUtils: AnalyticsUtils
@@ -30,7 +34,8 @@ class RestaurantAdapter(private var restaurantInfoArray: ArrayList<Restaurant>,
     class ItemViewHolder(val binding: ItemRestaurantBinding,
                          private val context: Context,
                          private val remoteConfigRepository: RemoteConfigRepository,
-                         private val analyticsUtils: AnalyticsUtils
+                         private val analyticsUtils: AnalyticsUtils,
+                         private var buttonTextList: ArrayList<String>
     ): RecyclerView.ViewHolder(binding.root) {
 
         fun bind(data: Restaurant) {
@@ -39,6 +44,11 @@ class RestaurantAdapter(private var restaurantInfoArray: ArrayList<Restaurant>,
             binding.restaurantTimeTv.text = data.time.openTime + " ~ " + data.time.closeTime
             binding.restaurantPhoneNumberTv.text = data.phoneNumber
             binding.restaurantLocationDescriptionTv.text = data.location.description
+            binding.menuReportDescriptionTv.text = if (data.menuAvailableOnline) {
+                context.resources.getString(R.string.restaurant_info_menu_report_description_online_available)
+            } else {
+                context.resources.getString(R.string.restaurant_info_menu_report_description)
+            }
 
             if (data.todayMenu.date == getTodayDate()) { // 오늘 메뉴인 경우에만 표시함.
                 // (1) 메뉴 레이아웃 표시
@@ -66,13 +76,19 @@ class RestaurantAdapter(private var restaurantInfoArray: ArrayList<Restaurant>,
                 binding.menuReportLayout.visibility = View.VISIBLE
                 binding.restaurantMenuLayout.visibility = View.GONE
                 binding.restaurantMenuMoreTv.visibility = View.GONE
+                binding.menuReportBtn.text = buttonTextList.random()
                 binding.menuReportBtn.setOnClickListener {
                     analyticsUtils.saveContentSelectionLog(CONTENT_TYPE_REPORT_BUTTON, data.name)
 
                     val menuReportUrl = remoteConfigRepository.getReportMenuUrlConfig()
                     val intent = Intent(Intent.ACTION_VIEW, Uri.parse(menuReportUrl))
                     context.startActivity(intent)
                 }
+                binding.menuReportInfoIv.setOnClickListener {
+                    // TODO: 메뉴 수집 관련 정보 다이얼로그 표시
+                    val imageDialog = ImageDialog(context)
+                    imageDialog.show()
+                }
             }
 
             Glide.with(binding.root)
@@ -89,7 +105,7 @@ class RestaurantAdapter(private var restaurantInfoArray: ArrayList<Restaurant>,
         viewType: Int
     ): ItemViewHolder {
         binding = ItemRestaurantBinding.inflate(LayoutInflater.from(parent.context), parent, false)
-        return ItemViewHolder(binding, context, remoteConfigRepository, analyticsUtils)
+        return ItemViewHolder(binding, context, remoteConfigRepository, analyticsUtils, buttonTextList)
     }
 
     override fun onBindViewHolder(holder: ItemViewHolder, position: Int) {
diff --git a/app/src/main/java/com/woozoo/menumonya/ui/dialog/ImageDialog.kt b/app/src/main/java/com/woozoo/menumonya/ui/dialog/ImageDialog.kt
@@ -0,0 +1,31 @@
+package com.woozoo.menumonya.ui.dialog
+
+import android.app.Dialog
+import android.content.Context
+import android.graphics.Color
+import android.graphics.drawable.ColorDrawable
+import android.os.Bundle
+import android.view.Gravity
+import com.woozoo.menumonya.R
+import com.woozoo.menumonya.databinding.DialogImageBinding
+
+class ImageDialog(context: Context): Dialog(context) {
+
+    private lateinit var binding: DialogImageBinding
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        window?.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT)) // xml의 background 적용되도록 함.
+        window?.setGravity(Gravity.CENTER)
+
+        super.onCreate(savedInstanceState)
+        binding = DialogImageBinding.inflate(layoutInflater)
+        setContentView(binding.root)
+
+        setCancelable(true)
+
+        binding.dialogIv.setImageResource(R.drawable.menu_report_info_image)
+        binding.dialogIv.layoutParams.width = context.resources.getDimension(R.dimen.menu_report_info_image_width).toInt()
+        binding.dialogIv.layoutParams.height = context.resources.getDimension(R.dimen.menu_report_info_image_height).toInt()
+        binding.dialogIv.requestLayout()
+    }
+}
diff --git a/app/src/main/java/com/woozoo/menumonya/ui/dialog/LocationPermissionDialog.kt b/app/src/main/java/com/woozoo/menumonya/ui/dialog/LocationPermissionDialog.kt
@@ -1,4 +1,4 @@
-package com.woozoo.menumonya
+package com.woozoo.menumonya.ui.dialog
 
 import android.app.Dialog
 import android.content.Context
@@ -14,6 +14,7 @@ import android.text.style.UnderlineSpan
 import android.view.Gravity.BOTTOM
 import android.view.View
 import android.view.View.OnClickListener
+import com.woozoo.menumonya.R
 import com.woozoo.menumonya.databinding.DialogLocationPermissionBinding
 
 class LocationPermissionDialog(context: Context, private val listener: OnClickListener)
diff --git a/app/src/main/java/com/woozoo/menumonya/ui/dialog/MenuDialog.kt b/app/src/main/java/com/woozoo/menumonya/ui/dialog/MenuDialog.kt
@@ -1,15 +1,18 @@
-package com.woozoo.menumonya
+package com.woozoo.menumonya.ui.dialog
 
 import android.app.Dialog
 import android.content.Context
 import android.graphics.Color
 import android.graphics.drawable.ColorDrawable
 import android.os.Bundle
 import android.view.ViewGroup.LayoutParams.MATCH_PARENT
+import com.woozoo.menumonya.R
 import com.woozoo.menumonya.databinding.DialogMenuBinding
-import com.woozoo.menumonya.model.Restaurant
+import com.woozoo.menumonya.data.model.Restaurant
 
-class MenuDialog(context: Context, val data: Restaurant) : Dialog(context, R.style.custom_style_dialog) {
+class MenuDialog(context: Context, val data: Restaurant) : Dialog(context,
+    R.style.custom_style_dialog
+) {
     private lateinit var binding: DialogMenuBinding
 
     override fun onCreate(savedInstanceState: Bundle?) {
diff --git a/app/src/main/java/com/woozoo/menumonya/ui/dialog/NoticeDialog.kt b/app/src/main/java/com/woozoo/menumonya/ui/dialog/NoticeDialog.kt
@@ -1,4 +1,4 @@
-package com.woozoo.menumonya
+package com.woozoo.menumonya.ui.dialog
 
 import android.app.Dialog
 import android.content.Context
@@ -14,14 +14,15 @@ import android.text.style.UnderlineSpan
 import android.view.Gravity
 import android.view.View
 import android.view.View.OnClickListener
+import com.woozoo.menumonya.R
 import com.woozoo.menumonya.databinding.DialogNoticeBinding
 
 class NoticeDialog(context: Context): Dialog(context), OnClickListener {
     private lateinit var binding: DialogNoticeBinding
 
     override fun onCreate(savedInstanceState: Bundle?) {
         window?.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT)) // xml의 background 적용되도록 함.
-        window?.setGravity(Gravity.CENTER) // 다이얼로그가 하단에 표시되도록 설정
+        window?.setGravity(Gravity.CENTER)
 
         super.onCreate(savedInstanceState)
         binding = DialogNoticeBinding.inflate(layoutInflater)
diff --git a/app/src/main/java/com/woozoo/menumonya/ui/screen/MainActivity.kt b/app/src/main/java/com/woozoo/menumonya/ui/screen/MainActivity.kt
@@ -1,4 +1,4 @@
-package com.woozoo.menumonya
+package com.woozoo.menumonya.ui.screen
 
 import android.Manifest
 import android.content.ActivityNotFoundException
@@ -18,10 +18,16 @@ import androidx.recyclerview.widget.RecyclerView
 import androidx.recyclerview.widget.SimpleItemAnimator
 import androidx.viewpager2.widget.ViewPager2
 import androidx.viewpager2.widget.ViewPager2.OnPageChangeCallback
-import com.woozoo.menumonya.MainViewModel.Event
+import com.woozoo.menumonya.R
+import com.woozoo.menumonya.ui.screen.MainViewModel.Event
 import com.woozoo.menumonya.databinding.ActivityMainBinding
-import com.woozoo.menumonya.model.Region
-import com.woozoo.menumonya.repository.RemoteConfigRepository
+import com.woozoo.menumonya.data.model.Region
+import com.woozoo.menumonya.repeatOnStarted
+import com.woozoo.menumonya.data.repository.RemoteConfigRepository
+import com.woozoo.menumonya.ui.adapter.RegionAdapter
+import com.woozoo.menumonya.ui.adapter.RestaurantAdapter
+import com.woozoo.menumonya.ui.dialog.LocationPermissionDialog
+import com.woozoo.menumonya.ui.dialog.NoticeDialog
 import com.woozoo.menumonya.util.AnalyticsUtils
 import com.woozoo.menumonya.util.PermissionUtils.Companion.ACCESS_FINE_LOCATION_REQUEST_CODE
 import com.woozoo.menumonya.util.PermissionUtils.Companion.requestLocationPermission
@@ -114,7 +120,7 @@ class MainActivity : AppCompatActivity(), View.OnClickListener {
         }
         is Event.ShowRestaurantView -> {
             if (viewPager.adapter == null) {
-                restaurantAdapter = RestaurantAdapter(event.data, this, remoteConfigRepository, analyticsUtils)
+                restaurantAdapter = RestaurantAdapter(event.data, event.buttonTextList, this, remoteConfigRepository, analyticsUtils)
                 viewPager.adapter = restaurantAdapter
                 if (event.markerIndex != -1) {
                     viewPager.setCurrentItem(event.markerIndex, false)
diff --git a/app/src/main/java/com/woozoo/menumonya/ui/screen/MainViewModel.kt b/app/src/main/java/com/woozoo/menumonya/ui/screen/MainViewModel.kt
diff --git a/app/src/main/res/drawable/menu_report_info.xml b/app/src/main/res/drawable/menu_report_info.xml
diff --git a/app/src/main/res/drawable/menu_report_info_image.png b/app/src/main/res/drawable/menu_report_info_image.png
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
diff --git a/app/src/main/res/layout/dialog_image.xml b/app/src/main/res/layout/dialog_image.xml
diff --git a/app/src/main/res/layout/item_restaurant.xml b/app/src/main/res/layout/item_restaurant.xml
diff --git a/app/src/main/res/values-hdpi/dimens.xml b/app/src/main/res/values-hdpi/dimens.xml
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.woozoo.menumonya.model`
	`1`	`+package com.woozoo.menumonya.data.model`
`2`	`2`
`3`	`3`	`data class Food(`
`4`	`4`	`val date: String = "",`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+package com.woozoo.menumonya.data.model`
	`2`	`+`
	`3`	`+data class ReportButtonText(val description: String="")`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.woozoo.menumonya.repository`
	`1`	`+package com.woozoo.menumonya.data.repository`
`2`	`2`
`3`	`3`	`import androidx.datastore.preferences.core.Preferences`
`4`	`4`