[FIX] #93 - 주차 에러 수정 및 코드 다듬기

app/src/main/java/org/mydaily/ui/adapter/ReportDetailAdapter.kt

@@ -18,7 +18,7 @@ class ReportDetailAdapter(private val context: Context, private val keyword: Str
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
         binding = DataBindingUtil.inflate(
-            LayoutInflater.from(context),
+            LayoutInflater.from(parent.context),
             R.layout.item_report_list, parent, false)
         return ViewHolder(binding)
     }
@@ -51,8 +51,7 @@ class ReportDetailAdapter(private val context: Context, private val keyword: Str
 
         private fun dateConvert(date : String): String {
             val from = SimpleDateFormat("yyyy-MM-dd").parse(date)
-            val to = SimpleDateFormat("yyyy. MM. dd").format(from)
-            return to
+            return SimpleDateFormat("yyyy. MM. dd").format(from)
         }
     }
 

app/src/main/java/org/mydaily/ui/adapter/ReportKeywordAdapter.kt

@@ -11,12 +11,11 @@ import androidx.recyclerview.widget.RecyclerView
 import org.mydaily.R
 import org.mydaily.data.model.network.response.ResReportGet
 import org.mydaily.databinding.ItemKeywordListBinding
-import org.mydaily.ui.view.remind.OnItemClick
+import org.mydaily.ui.view.remind.ReportFragment
 
-class ReportKeywordAdapter(private val context: Context, listener : OnItemClick) : RecyclerView.Adapter<ReportKeywordAdapter.ViewHolder>() {
+class ReportKeywordAdapter(private val context: Context) : RecyclerView.Adapter<ReportKeywordAdapter.ViewHolder>() {
     private lateinit var binding: ItemKeywordListBinding
     var data = mutableListOf<ResReportGet.Data.Result>()
-    private val mCallback = listener
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
         binding = DataBindingUtil.inflate(LayoutInflater.from(context),
@@ -35,9 +34,9 @@ class ReportKeywordAdapter(private val context: Context, listener : OnItemClick)
         RecyclerView.ViewHolder(binding.root) {
 
         fun bind(data: ResReportGet.Data.Result, pos : Int) {
-            val tasknum = data.taskCnt.toString()
+            val taskNum = data.taskCnt.toString()
             binding.reportlistdata = data
-            binding.tvTasknum.text = "총 "+tasknum+"개"
+            binding.tvTasknum.text = "총 "+taskNum+"개"
             binding.tvRate.text = data.taskSatisAvg
             binding.tvRate.setTextColor(ContextCompat.getColor(context, R.color.carrot))
 
@@ -49,8 +48,8 @@ class ReportKeywordAdapter(private val context: Context, listener : OnItemClick)
                 }
             })//시크바 터치 prevent
 
-            binding.root.setOnClickListener{
-                mCallback.onClick(data.Id, data.keyword)
+            binding.root.setOnClickListener {
+                ReportFragment().containerClick(data.Id, data.keyword)
             }
 
         }

app/src/main/java/org/mydaily/ui/view/remind/RemindFragment.kt

@@ -28,7 +28,7 @@ class RemindFragment : BaseFragment<FragmentRemindBinding, RemindViewModel>() {
     private val nowCalendar = Calendar.getInstance(Locale.KOREA)
 
     private var startCalendar: Calendar = Calendar.getInstance(Locale.KOREA).apply {
-        set(Calendar.DAY_OF_WEEK, Calendar.MONDAY)
+        set(Calendar.DAY_OF_WEEK, Calendar.MONDAY)//
         set(Calendar.HOUR, 0)
         set(Calendar.MINUTE, 0)
         set(Calendar.SECOND, 0)
@@ -148,15 +148,15 @@ class RemindFragment : BaseFragment<FragmentRemindBinding, RemindViewModel>() {
     }
 
     private fun createViewPager() {
-        var tab_label = listOf(getString(R.string.report), getString(R.string.remind))
+        var tabLabel = listOf(getString(R.string.report), getString(R.string.remind))
         var fragmentList = listOf(ReportFragment(), RemindFragment())
         val remindAdapter = RemindViewPagerAdapter(this)
         remindAdapter.fragmentList = fragmentList
 
         vp_remind.adapter = remindAdapter
 
         TabLayoutMediator(tb_remind, vp_remind) { tab, position ->
-            tab.text = tab_label[position]
+            tab.text = tabLabel[position]
         }.attach()
 
         binding.vpRemind.registerOnPageChangeCallback(object : ViewPager2.OnPageChangeCallback() {
@@ -176,10 +176,13 @@ class RemindFragment : BaseFragment<FragmentRemindBinding, RemindViewModel>() {
     }
 
     private fun dateInit() {
+        if(nowCalendar.get(Calendar.DAY_OF_WEEK) == Calendar.SUNDAY) {//일요일일때는~ 다음주로 인식되서..
+            startCalendar.add(Calendar.DATE, -7)
+            endCalendar.add(Calendar.DATE, -7)
+            nowCalendar.add(Calendar.DATE, - 1)//일단 임시로 토요일로 변경
+        }
         binding.tvDate.text = CalendarUtil.convertCalendarToWeekString(startCalendar)
         convertDateStatus()
-
-        //값전달
     }
 
     override fun onStart() {

app/src/main/java/org/mydaily/ui/view/remind/ReportFragment.kt

@@ -10,6 +10,10 @@ import org.mydaily.ui.adapter.ReportKeywordAdapter
 import org.mydaily.ui.base.BaseFragment
 import org.mydaily.ui.viewmodel.RemindViewModel
 
+interface OnItemClick {
+    fun onClick(value : Int, keyword : String)
+}
+
 class ReportFragment : BaseFragment<FragmentReportBinding, RemindViewModel>(), OnItemClick {
     override val layoutResourceId: Int
         get() = R.layout.fragment_report
@@ -56,7 +60,7 @@ class ReportFragment : BaseFragment<FragmentReportBinding, RemindViewModel>(), O
     }
 
     private fun createReportAdapter() {
-        reportKeywordAdapter = activity?.let { ReportKeywordAdapter(it, this) }!!
+        reportKeywordAdapter = ReportKeywordAdapter(requireContext())
         binding.rcvReport.adapter = reportKeywordAdapter
         binding.rcvReport.layoutManager = LinearLayoutManager(activity)
     }
@@ -72,4 +76,8 @@ class ReportFragment : BaseFragment<FragmentReportBinding, RemindViewModel>(), O
             .replace(R.id.container_main, reportDetailFragment)
             .addToBackStack(null).commit()
     }
+
+    public fun containerClick(id: Int, keyword: String) {
+        return onClick(id, keyword)
+    }
 }