[FIX] week calendar

app/.gitignore

@@ -1 +1,2 @@
-/build
+/build
+kakao_string.xml

app/build.gradle

@@ -114,6 +114,10 @@ dependencies {
     implementation 'com.google.dagger:hilt-android:2.47'
     annotationProcessor 'com.google.dagger:hilt-compiler:2.47'
 
+    // viewmodel과 livedata
+    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.1"
+    implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.6.1"
+
 //    implementation "androidx.security:security-crypto:1.0.0"
 
 }

app/src/main/java/com/eatssu/android/data/model/response/GetMyReviewResponse.kt

@@ -7,9 +7,12 @@ data class GetMyReviewResponse(
 ){
     data class Data(
         val content: String,
-        val grade: Int,
+        val reviewId : Int,
+        val mainGrade: Int,
+        val amountGrade: Int,
+        val tasteGrade : Int,
         val imgUrlList: List<String>,
-        val tagList: List<String>,
-        val writeDate: String
+        val writeDate: String,
+        val menuName: String
     )
 }

app/src/main/java/com/eatssu/android/ui/calendar/CalendarActivity.kt

@@ -7,11 +7,9 @@ import android.os.Bundle
 import android.text.style.ForegroundColorSpan
 import android.text.style.RelativeSizeSpan
 import android.text.style.StyleSpan
-import android.util.Log
 import android.view.Window
 import androidx.appcompat.app.AppCompatActivity
 import com.eatssu.android.databinding.ActivityCalendarBinding
-import com.eatssu.android.ui.main.MainActivity
 import com.prolificinteractive.materialcalendarview.*
 import com.prolificinteractive.materialcalendarview.format.DateFormatTitleFormatter
 import com.prolificinteractive.materialcalendarview.format.TitleFormatter
@@ -21,6 +19,7 @@ import java.util.*
 class CalendarActivity : AppCompatActivity() {
     private lateinit var binding: ActivityCalendarBinding
     lateinit var calendar: MaterialCalendarView
+    private lateinit var viewModel: CalendarViewModel
 
     val today = CalendarDay.today()
 

app/src/main/java/com/eatssu/android/ui/calendar/CalendarAdapter.kt

@@ -1,38 +1,55 @@
 package com.eatssu.android.ui.calendar
 
+import android.content.Intent
 import android.os.Build
+import android.os.Bundle
 import android.util.Log
 import android.view.LayoutInflater
+import android.view.View
 import android.view.ViewGroup
 import androidx.annotation.RequiresApi
+import androidx.core.content.ContextCompat
 import androidx.recyclerview.widget.RecyclerView
 import com.eatssu.android.R
 import com.eatssu.android.databinding.ItemCalendarListBinding
+import com.eatssu.android.ui.main.MainActivity
 import java.time.LocalDate
 import java.time.format.DateTimeFormatter
 import java.util.*
 
+
 class CalendarAdapter(private val cList: List<CalendarData>) :
     RecyclerView.Adapter<CalendarAdapter.CalendarViewHolder>() {
+    private var allViewHolders : List<CalendarViewHolder> = mutableListOf()
+    private var mListener: OnItemClickListener? = null
 
-    class CalendarViewHolder(private val binding: ItemCalendarListBinding) :
+    inner class CalendarViewHolder(val binding: ItemCalendarListBinding) :
         RecyclerView.ViewHolder(binding.root) {
+
+        private var selectedDate: String? = null
+        lateinit var today : String
+        lateinit var day : String
+
         @RequiresApi(Build.VERSION_CODES.O)
         fun bind(item: CalendarData) {
             binding.date.text = item.cl_date
             binding.day.text = item.cl_day
 
-            var today = binding.date.text
-            var day = binding.day.text
+            today = binding.date.text as String
+            day = binding.day.text as String
 
             // 오늘 날짜
             val now = LocalDate.now()
-                .format(DateTimeFormatter.ofPattern("dd").withLocale(Locale.forLanguageTag("ko")))
+                .format(
+                    DateTimeFormatter.ofPattern("dd").withLocale(Locale.forLanguageTag("ko"))
+                )
+
             // 오늘 날짜와 캘린더의 오늘 날짜가 같을 경우 background_blue 적용하기
-            if (today == now) {
+            if (now.equals(today)) {
+                binding.date.isSelected = true;
+                binding.day.isSelected = true;
                 binding.weekCardview.setBackgroundResource(R.drawable.selector_background_blue)
             }
-            Log.i("now", now)
         }
     }
 
@@ -45,9 +62,31 @@ class CalendarAdapter(private val cList: List<CalendarData>) :
     @RequiresApi(Build.VERSION_CODES.O)
     override fun onBindViewHolder(holder: CalendarViewHolder, position: Int) {
         holder.bind(cList[position])
+
+        allViewHolders = allViewHolders.plus(holder)
+
+        holder.itemView.setOnClickListener { v ->
+            val pos = holder.adapterPosition
+            if (pos != RecyclerView.NO_POSITION) {
+                mListener?.onItemClick(v, cList.get(position))
+            }
+        }
+
     }
 
     override fun getItemCount(): Int {
         return cList.size
     }
+
+    fun setOnItemClickListener(listener: OnItemClickListener?) {
+        mListener = listener
+    }
+
+    fun returnViewHolderList(): List<CalendarViewHolder> {
+        return allViewHolders
+    }
 }
+
+    interface OnItemClickListener {
+        fun onItemClick(v: View?, data: CalendarData)
+    }

app/src/main/java/com/eatssu/android/ui/calendar/CalendarFragment.kt

@@ -1,26 +1,30 @@
 package com.eatssu.android.ui.calendar
 
+import android.annotation.SuppressLint
 import android.content.Intent
-import android.content.Intent.getIntent
 import android.os.Build
 import android.os.Bundle
 import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.widget.TextView
+import android.widget.Toast
 import androidx.annotation.RequiresApi
 import androidx.fragment.app.Fragment
 import androidx.recyclerview.widget.GridLayoutManager
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
 import com.eatssu.android.R
 import com.eatssu.android.databinding.FragmentCalendarBinding
+import com.prolificinteractive.materialcalendarview.DayViewFacade
 import java.time.DayOfWeek
+import java.time.LocalDate
 import java.time.LocalDateTime
 import java.time.format.DateTimeFormatter
+import java.time.format.TextStyle
 import java.time.temporal.TemporalAdjusters
 import java.util.*
 
-
 class CalendarFragment : Fragment() {
 
     private var _binding: FragmentCalendarBinding? = null
@@ -48,24 +52,25 @@ class CalendarFragment : Fragment() {
 
         calendarAdapter = CalendarAdapter(calendarList)
 
-
-
         calendarList.apply {
             val dateFormat =
                 DateTimeFormatter.ofPattern("dd").withLocale(Locale.forLanguageTag("ko"))
             val monthFormat = DateTimeFormatter.ofPattern("yyyy . MM . dd")
                 .withLocale(Locale.forLanguageTag("ko"))
 
             val localDate = LocalDateTime.now().format(monthFormat)
-            binding.textYearMonth.text = localDate
+            val newDate = arguments?.getString("Date")
 
+            if (newDate != null) {
+                Log.d("Date", newDate)
+            }
 
-            var preSunday: LocalDateTime = LocalDateTime.now().with(
+            val preSunday: LocalDateTime = LocalDateTime.now().with(
                 TemporalAdjusters.previous(
                     DayOfWeek.SUNDAY
                 )
             )
-
+            Log.d("preSunday", preSunday.toString())
             for (i in 0..6) {
                 Log.d("날짜만", week_day[i])
 
@@ -79,35 +84,14 @@ class CalendarFragment : Fragment() {
                 }
                 Log.d("저번 주 일요일 기준으로 시작!", preSunday.plusDays(i.toLong()).format(dateFormat))
             }
-        }
-        binding.weekRecycler.adapter = calendarAdapter
-        binding.weekRecycler.layoutManager = GridLayoutManager(context, 7)
+            binding.weekRecycler.adapter = calendarAdapter
+            binding.weekRecycler.layoutManager = GridLayoutManager(context, 7)
 
-        binding.textYearMonth.setOnClickListener {
-            val intent = Intent(context, CalendarActivity::class.java);
-            startActivity(intent);
         }
-
-
-
     }
 
     override fun onResume() {
-        val intent = Intent()
-        //text 키값으로 데이터를 받는다. String을 받아야 하므로 getStringExtra()를 사용함
-        /*val selectdate = this.arguments?.getString("changedate")
-        Log.d("selectdate", selectdate.toString())*/
-        val intentdate = intent.getStringExtra("intentdate")
-        Log.d("intentdate", intentdate.toString())
-
-        binding.btnCalendarLeft.setOnClickListener {
-            binding.textYearMonth.text = null
-            binding.textYearMonth.text = intentdate
-            /*binding.btnCalendarRight.setOnClickListener{
-            binding.textYearMonth.text = null
-            binding.textYearMonth.text = LocalDateTime.now().plusDays(1).format(monthFormat).toString()
-        }*/
-        }
         super.onResume()
+        Log.d("fragment", "onResumed")
     }
 }

app/src/main/java/com/eatssu/android/ui/calendar/CalendarViewModel.kt

@@ -0,0 +1,17 @@
+package com.eatssu.android.ui.calendar
+
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.ViewModel
+
+class CalendarViewModel : ViewModel() {
+    private val data = MutableLiveData<String>()
+
+    fun setData(dataToSend: String) {
+        data.value = dataToSend
+    }
+
+    fun getData(): LiveData<String> {
+        return data
+    }
+}

app/src/main/java/com/eatssu/android/ui/calendar/MenuDate.kt

@@ -0,0 +1,5 @@
+package com.eatssu.android.ui.calendar
+
+class MenuDate(date: String){
+    var date: String = date // 날짜
+}

app/src/main/java/com/eatssu/android/ui/infopage/InfoActivity_Dodam.kt

@@ -90,4 +90,8 @@ class InfoActivity_Dodam : AppCompatActivity() {
 
     private fun getNonFixed() {
     }
+
+    override fun finish() {
+        super.finish()
+    }
 }

app/src/main/java/com/eatssu/android/ui/infopage/InfoActivity_Food.kt

@@ -85,4 +85,8 @@ class InfoActivity_Food : AppCompatActivity() {
 
     private fun getNonFixed() {
     }
+
+    override fun finish() {
+        super.finish()
+    }
 }

app/src/main/java/com/eatssu/android/ui/infopage/InfoActivity_Gisik.kt

@@ -1,20 +1,15 @@
 package com.eatssu.android.ui.infopage
 
-import android.icu.text.IDNA.Info
+import RetrofitImpl
+import android.R
 import android.os.Build
-import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
 import android.util.Log
-import android.widget.Toast
 import androidx.annotation.RequiresApi
-import androidx.recyclerview.widget.RecyclerView
+import androidx.appcompat.app.AppCompatActivity
 import com.eatssu.android.data.enums.RestaurantType
-import com.eatssu.android.data.model.request.ChangeNickname
-import com.eatssu.android.data.model.response.GetMenuInfoListResponse
 import com.eatssu.android.data.model.response.InfoResponse
 import com.eatssu.android.data.service.InfoService
-import com.eatssu.android.data.service.MenuService
-import com.eatssu.android.data.service.UserService
 import com.eatssu.android.databinding.ActivityInfoGisikBinding
 import net.daum.mf.map.api.MapPOIItem
 import net.daum.mf.map.api.MapPoint
@@ -24,7 +19,8 @@ import retrofit2.Callback
 import retrofit2.Response
 import retrofit2.Retrofit
 
-class InfoActivity_Gisik : AppCompatActivity() {
+
+class InfoActivity_Gisik : AppCompatActivity(){
     private lateinit var viewBinding: ActivityInfoGisikBinding
     lateinit var retrofit: Retrofit
     private lateinit var infoService: InfoService
@@ -43,7 +39,6 @@ class InfoActivity_Gisik : AppCompatActivity() {
 
         // 중심점 변경 - 레지던스홀
         mapview.setMapCenterPoint(MapPoint.mapPointWithGeoCoord(37.495488,126.959173), true);
-        //mapview.zoomIn(true)
 
         val marker = MapPOIItem()
         marker.apply {
@@ -101,4 +96,10 @@ class InfoActivity_Gisik : AppCompatActivity() {
 
     private fun getNonFixed() {
     }
+
+    override fun finish() {
+        super.finish()
+    }
+
+
 }

app/src/main/java/com/eatssu/android/ui/infopage/InfoActivity_Haksik.kt

@@ -84,4 +84,8 @@ class InfoActivity_Haksik : AppCompatActivity() {
 
         private fun getNonFixed() {
         }
+
+    override fun finish() {
+        super.finish()
+    }
 }

app/src/main/java/com/eatssu/android/ui/infopage/InfoActivity_Kitchen.kt

@@ -85,4 +85,8 @@ class InfoActivity_Kitchen : AppCompatActivity() {
 
     private fun getNonFixed() {
     }
+
+    override fun finish() {
+        super.finish()
+    }
 }

app/src/main/java/com/eatssu/android/ui/infopage/InfoActivity_Snack.kt

@@ -85,4 +85,8 @@ class InfoActivity_Snack : AppCompatActivity() {
 
     private fun getNonFixed() {
     }
+
+    override fun finish() {
+        super.finish()
+    }
 }