Test

app/src/main/java/com/puzzling/puzzlingaos/data/model/response/ResponseDetailRetroDto.kt

@@ -0,0 +1,24 @@
+package com.puzzling.puzzlingaos.data.model.response
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class ResponseDetailRetroDto(
+    @SerialName("reviewId")
+    val reviewId: Int?,
+    @SerialName("reviewDay")
+    val reviewDay: String,
+    @SerialName("reviewDate")
+    val reviewDate: String,
+    @SerialName("contents")
+    val contents: List<Content>?,
+) {
+    @Serializable
+    data class Content(
+        @SerialName("title")
+        val title: String,
+        @SerialName("content")
+        val content: String,
+    )
+}

app/src/main/java/com/puzzling/puzzlingaos/presentation/detailRetrospect/DetailRetroActivity.kt

@@ -0,0 +1,125 @@
+package com.puzzling.puzzlingaos.presentation.detailRetrospect
+
+import android.os.Bundle
+import android.util.Log
+import android.view.LayoutInflater
+import androidx.constraintlayout.widget.ConstraintLayout
+import com.google.android.material.tabs.TabLayoutMediator
+import com.puzzling.puzzlingaos.R
+import com.puzzling.puzzlingaos.base.BaseActivity
+import com.puzzling.puzzlingaos.data.model.response.ResponseDetailRetroDto
+import com.puzzling.puzzlingaos.databinding.ActivityDetailRetroBinding
+import java.time.DayOfWeek
+import java.time.LocalDate
+import java.time.format.DateTimeFormatter
+
+class DetailRetroActivity :
+    BaseActivity<ActivityDetailRetroBinding>(R.layout.activity_detail_retro) {
+
+    private val tabTitle = getWeekDatesWithToday()
+
+    val week = listOf(
+        "월",
+        "화",
+        "수",
+        "목",
+        "금",
+        "토",
+        "일",
+    )
+
+    var num = mutableListOf(0, 0, 0, 0, 0, 0, 0)
+
+    companion object {
+        const val BLACK_TEXT = 1
+        const val BG_BLUE_100 = 2
+    }
+
+    private val dummyList = mutableListOf<ResponseDetailRetroDto>(
+        ResponseDetailRetroDto(null, "월", "2023-07-10", null),
+        ResponseDetailRetroDto(
+            4,
+            "화",
+            "2023-07-11",
+            listOf(
+                ResponseDetailRetroDto.Content("잘한점...", "잘한점 어쩌구...."),
+                ResponseDetailRetroDto.Content("아쉬운점...", "아쉬운점 어쩌구...."),
+                ResponseDetailRetroDto.Content("배운점...", "배운점 어쩌구...."),
+            ),
+        ),
+        ResponseDetailRetroDto(
+            9,
+            "목",
+            "2023-07-13",
+            listOf(
+                ResponseDetailRetroDto.Content("잘한점...", "잘한점 어쩌구...."),
+                ResponseDetailRetroDto.Content("아쉬운점...", "아쉬운점 어쩌구...."),
+                ResponseDetailRetroDto.Content("배운점...", "배운점 어쩌구...."),
+            ),
+        ),
+        ResponseDetailRetroDto(null, "금", "2023-07-10", null),
+    )
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        binding.viewPager.adapter = WeekTapAdapter(this)
+        TabLayoutMediator(binding.tlDetailRetroDate, binding.viewPager) { tab, position ->
+            tab.text = tabTitle[position]
+        }.attach()
+
+        for (day in dummyList) {
+            if (day.reviewId != null) {
+                num[week.indexOf(day.reviewDay)] = BG_BLUE_100
+            } else {
+                Log.d("회고 주기", "day : $day")
+                Log.d("회고 주기", "${day.reviewDay}")
+                Log.d("회고 주기", "${week.indexOf(day.reviewDay)}")
+                num[week.indexOf(day.reviewDay)] = BLACK_TEXT
+            }
+        }
+
+        for (i in 0..6) {
+            when (num[i]) {
+                BG_BLUE_100 -> {
+                    val tapItem = LayoutInflater.from(this)
+                        .inflate(R.layout.tab_text_color_blue100, null) as ConstraintLayout
+                    binding.tlDetailRetroDate.getTabAt(i)?.customView =
+                        tapItem
+                }
+                BLACK_TEXT -> {
+                    val tapItem =
+                        LayoutInflater.from(this)
+                            .inflate(R.layout.tab_title_text_black, null) as ConstraintLayout
+                    binding.tlDetailRetroDate.getTabAt(i)?.customView =
+                        tapItem
+                }
+                else -> {
+                    val tapItem =
+                        LayoutInflater.from(this)
+                            .inflate(R.layout.tab_title, null) as ConstraintLayout
+                    binding.tlDetailRetroDate.getTabAt(i)?.customView = tapItem
+                }
+            }
+        }
+    }
+
+    fun getWeekDatesWithToday(): List<String> {
+        val today = LocalDate.now()
+        val startOfWeek = today.with(DayOfWeek.MONDAY) // 해당 주의 시작일
+        val endOfWeek = today.with(DayOfWeek.SUNDAY) // 해당 주의 종료일
+
+        val dates = mutableListOf<String>()
+        var currentDate = startOfWeek
+
+        val dateFormatter = DateTimeFormatter.ofPattern("dd")
+
+        while (!currentDate.isAfter(endOfWeek)) {
+            val formattedDate = currentDate.format(dateFormatter)
+            dates.add(formattedDate)
+            currentDate = currentDate.plusDays(1)
+        }
+
+        return dates
+    }
+}

app/src/main/java/com/puzzling/puzzlingaos/presentation/detailRetrospect/DetailRetroFragment.kt

@@ -0,0 +1,14 @@
+package com.puzzling.puzzlingaos.presentation.detailRetrospect
+
+import android.os.Bundle
+import android.view.View
+import com.puzzling.puzzlingaos.R
+import com.puzzling.puzzlingaos.base.BaseFragment
+import com.puzzling.puzzlingaos.databinding.FragmentDetailRetroBinding
+
+class DetailRetroFragment(private val date: String) :
+    BaseFragment<FragmentDetailRetroBinding>(R.layout.fragment_detail_retro) {
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+    }
+}

app/src/main/java/com/puzzling/puzzlingaos/presentation/detailRetrospect/WeekTapAdapter.kt

@@ -0,0 +1,24 @@
+package com.puzzling.puzzlingaos.presentation.detailRetrospect
+
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.FragmentActivity
+import androidx.viewpager2.adapter.FragmentStateAdapter
+
+class WeekTapAdapter(fragmentActivity: FragmentActivity) : FragmentStateAdapter(fragmentActivity) {
+    override fun getItemCount(): Int {
+        return 7
+    }
+
+    override fun createFragment(position: Int): Fragment {
+        return when (position) {
+            0 -> DetailRetroFragment("5")
+            1 -> DetailRetroFragment("6")
+            2 -> DetailRetroFragment("7")
+            3 -> DetailRetroFragment("8")
+            4 -> DetailRetroFragment("9")
+            5 -> DetailRetroFragment("10")
+            6 -> DetailRetroFragment("11")
+            else -> DetailRetroFragment("5")
+        }
+    }
+}

app/src/main/java/com/puzzling/puzzlingaos/presentation/invitationCode/InputCodeFragment.kt

@@ -18,7 +18,10 @@ class InputCodeFragment : BaseFragment<FragmentInputCodeBinding>(R.layout.fragme
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
-        viewModel = ViewModelProvider(requireActivity(), ViewModelFactory(requireContext()))[InvitationCodeViewModel::class.java]
+        viewModel = ViewModelProvider(
+            requireActivity(),
+            ViewModelFactory(requireContext()),
+        )[InvitationCodeViewModel::class.java]
 
         binding.vm = viewModel
         binding.lifecycleOwner = viewLifecycleOwner

app/src/main/java/com/puzzling/puzzlingaos/presentation/invitationCode/InputProfileFragment.kt

@@ -6,6 +6,7 @@ import androidx.lifecycle.ViewModelProvider
 import com.puzzling.puzzlingaos.R
 import com.puzzling.puzzlingaos.base.BaseFragment
 import com.puzzling.puzzlingaos.databinding.FragmentInputProfileBinding
+import com.puzzling.puzzlingaos.util.ViewModelFactory
 
 class InputProfileFragment :
     BaseFragment<FragmentInputProfileBinding>(R.layout.fragment_input_profile) {
@@ -14,7 +15,11 @@ class InputProfileFragment :
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        viewModel = ViewModelProvider(requireActivity())[InvitationCodeViewModel::class.java]
+        viewModel = ViewModelProvider(
+            requireActivity(),
+            ViewModelFactory(requireContext()),
+        )[InvitationCodeViewModel::class.java]
+
         binding.lifecycleOwner = viewLifecycleOwner
         binding.vm = viewModel
     }

app/src/main/java/com/puzzling/puzzlingaos/presentation/invitationCode/InvitationCodeActivity.kt

@@ -6,11 +6,12 @@ import androidx.fragment.app.viewModels
 import com.puzzling.puzzlingaos.R
 import com.puzzling.puzzlingaos.base.BaseActivity
 import com.puzzling.puzzlingaos.databinding.ActivityInvitationCodeBinding
+import com.puzzling.puzzlingaos.util.ViewModelFactory
 
 class InvitationCodeActivity :
     BaseActivity<ActivityInvitationCodeBinding>(R.layout.activity_invitation_code) {
 
-    private val viewModel by viewModels<InvitationCodeViewModel>()
+    private val viewModel: InvitationCodeViewModel by viewModels { ViewModelFactory(this) }
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)

app/src/main/java/com/puzzling/puzzlingaos/presentation/main/MainActivity.kt

@@ -7,7 +7,7 @@ import com.puzzling.puzzlingaos.R
 import com.puzzling.puzzlingaos.base.BaseActivity
 import com.puzzling.puzzlingaos.databinding.ActivityMainBinding
 import com.puzzling.puzzlingaos.presentation.home.HomeFragment
-import com.puzzling.puzzlingaos.presentation.home.mypage.MyPageFragment
+import com.puzzling.puzzlingaos.presentation.mypage.MyPageFragment
 
 class MainActivity : BaseActivity<ActivityMainBinding>(R.layout.activity_main) {
     override fun onCreate(savedInstanceState: Bundle?) {

app/src/main/java/com/puzzling/puzzlingaos/presentation/home/mypage/ChooseProjectBottomFragment.kt → app/src/main/java/com/puzzling/puzzlingaos/presentation/mypage/ChooseProjectBottomFragment.kt

@@ -1,12 +1,12 @@
-package com.puzzling.puzzlingaos.presentation.home.mypage
+package com.puzzling.puzzlingaos.presentation.mypage
 
 import android.os.Bundle
 import android.view.View
 import com.puzzling.puzzlingaos.R
 import com.puzzling.puzzlingaos.base.BottomSheetDialogFragment
 import com.puzzling.puzzlingaos.data.model.response.ResponseMyPageProjectDto
 import com.puzzling.puzzlingaos.databinding.FragmentBottomChooseProjectBinding
-import com.puzzling.puzzlingaos.presentation.home.mypage.adapter.ChooseProjectAdapter
+import com.puzzling.puzzlingaos.presentation.mypage.adapter.ChooseProjectAdapter
 
 class ChooseProjectBottomFragment :
     BottomSheetDialogFragment<FragmentBottomChooseProjectBinding>(R.layout.fragment_bottom_choose_project) {

app/src/main/java/com/puzzling/puzzlingaos/presentation/home/mypage/MyPageFragment.kt → app/src/main/java/com/puzzling/puzzlingaos/presentation/mypage/MyPageFragment.kt

@@ -1,4 +1,4 @@
-package com.puzzling.puzzlingaos.presentation.home.mypage
+package com.puzzling.puzzlingaos.presentation.mypage
 
 import android.os.Bundle
 import android.view.View
@@ -8,9 +8,9 @@ import com.puzzling.puzzlingaos.R
 import com.puzzling.puzzlingaos.base.BaseFragment
 import com.puzzling.puzzlingaos.data.model.response.ResponseMyPageProjectDto
 import com.puzzling.puzzlingaos.databinding.FragmentMyPageBinding
-import com.puzzling.puzzlingaos.presentation.home.mypage.adapter.MyProjectAdapter
-import com.puzzling.puzzlingaos.presentation.home.mypage.adapter.MyProjectBottomAdapter
-import com.puzzling.puzzlingaos.presentation.home.mypage.adapter.MyProjectTopAdapter
+import com.puzzling.puzzlingaos.presentation.mypage.adapter.MyProjectContentAdapter
+import com.puzzling.puzzlingaos.presentation.mypage.adapter.MyProjectBottomAdapter
+import com.puzzling.puzzlingaos.presentation.mypage.adapter.MyProjectTitleAdapter
 
 class MyPageFragment : BaseFragment<FragmentMyPageBinding>(R.layout.fragment_my_page) {
 
@@ -30,17 +30,17 @@ class MyPageFragment : BaseFragment<FragmentMyPageBinding>(R.layout.fragment_my_
     }
 
     private fun initAdapter() {
-        val myProjectAdapter = MyProjectAdapter()
+        val myProjectContentAdapter = MyProjectContentAdapter()
         val concatAdapter =
-            ConcatAdapter(MyProjectTopAdapter("지니"), myProjectAdapter, MyProjectBottomAdapter())
+            ConcatAdapter(MyProjectTitleAdapter("지니"), myProjectContentAdapter, MyProjectBottomAdapter())
 
         with(binding) {
             rcvMyPageMain.adapter = concatAdapter
             rcvMyPageMain.layoutManager = LinearLayoutManager(activity)
         }
-        myProjectAdapter.submitList(dummyItemList)
+        myProjectContentAdapter.submitList(dummyItemList)
 
-        myProjectAdapter.setOnItemClickListener(object : MyProjectAdapter.OnItemClickListener {
+        myProjectContentAdapter.setOnItemClickListener(object : MyProjectContentAdapter.OnItemClickListener {
             override fun onItemClick(v: View, data: ResponseMyPageProjectDto, pos: Int) {
                 requireActivity().supportFragmentManager.beginTransaction()
                     .replace(R.id.fcv_main_container, MyRetrospectFragment()).addToBackStack(null)

app/src/main/java/com/puzzling/puzzlingaos/presentation/home/mypage/MyRetrospectFragment.kt → app/src/main/java/com/puzzling/puzzlingaos/presentation/mypage/MyRetrospectFragment.kt

@@ -1,4 +1,4 @@
-package com.puzzling.puzzlingaos.presentation.home.mypage
+package com.puzzling.puzzlingaos.presentation.mypage
 
 import android.os.Bundle
 import android.view.View
@@ -9,8 +9,8 @@ import com.puzzling.puzzlingaos.R
 import com.puzzling.puzzlingaos.base.BaseFragment
 import com.puzzling.puzzlingaos.data.model.response.ResponseMyRetroListDto
 import com.puzzling.puzzlingaos.databinding.FragmentMyRetrospectBinding
-import com.puzzling.puzzlingaos.presentation.home.mypage.adapter.MyRetroAdapter
-import com.puzzling.puzzlingaos.presentation.home.mypage.adapter.MyRetroTopAdapter
+import com.puzzling.puzzlingaos.presentation.mypage.adapter.MyRetroContentAdapter
+import com.puzzling.puzzlingaos.presentation.mypage.adapter.MyRetroTitleAdapter
 
 class MyRetrospectFragment :
     BaseFragment<FragmentMyRetrospectBinding>(R.layout.fragment_my_retrospect) {
@@ -44,22 +44,22 @@ class MyRetrospectFragment :
     }
 
     private fun initAdapter() {
-        val myRetroAdapter = MyRetroAdapter()
-        val myRetroTopAdapter = MyRetroTopAdapter("Piickle")
+        val myRetroContentAdapter = MyRetroContentAdapter()
+        val myRetroTitleAdapter = MyRetroTitleAdapter("Piickle")
 
-        myRetroAdapter.submitList(dummyItemList)
+        myRetroContentAdapter.submitList(dummyItemList)
 
-        myRetroTopAdapter.setOnItemClickListener(object : MyRetroTopAdapter.OnItemClickListener {
+        myRetroTitleAdapter.setOnItemClickListener(object : MyRetroTitleAdapter.OnItemClickListener {
             override fun onItemClick(v: View, data: String, pos: Int) {
                 val chooseProjectBottomFragment = ChooseProjectBottomFragment()
                 chooseProjectBottomFragment.show(requireActivity().supportFragmentManager, "show")
             }
         })
-        val concatAdapter = ConcatAdapter(myRetroTopAdapter, myRetroAdapter)
+        val concatAdapter = ConcatAdapter(myRetroTitleAdapter, myRetroContentAdapter)
 
-        with(binding) {
-            rcvMyRetroMain.adapter = concatAdapter
-            rcvMyRetroMain.layoutManager = LinearLayoutManager(activity)
+        with(binding.rcvMyRetroMain) {
+            adapter = concatAdapter
+            layoutManager = LinearLayoutManager(activity)
         }
     }
 }

app/src/main/java/com/puzzling/puzzlingaos/presentation/home/mypage/adapter/ChooseProjectAdapter.kt → app/src/main/java/com/puzzling/puzzlingaos/presentation/mypage/adapter/ChooseProjectAdapter.kt

@@ -1,4 +1,4 @@
-package com.puzzling.puzzlingaos.presentation.home.mypage.adapter
+package com.puzzling.puzzlingaos.presentation.mypage.adapter
 
 import android.view.LayoutInflater
 import android.view.ViewGroup

app/src/main/java/com/puzzling/puzzlingaos/presentation/home/mypage/adapter/MyProjectBottomAdapter.kt → app/src/main/java/com/puzzling/puzzlingaos/presentation/mypage/adapter/MyProjectBottomAdapter.kt

@@ -1,26 +1,26 @@
-package com.puzzling.puzzlingaos.presentation.home.mypage.adapter
+package com.puzzling.puzzlingaos.presentation.mypage.adapter
 
 import android.view.LayoutInflater
 import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
 import com.puzzling.puzzlingaos.databinding.ItemBottomLogoutBinding
 
 class MyProjectBottomAdapter() :
-    RecyclerView.Adapter<MyProjectBottomAdapter.BottomViewHolder>() {
+    RecyclerView.Adapter<MyProjectBottomAdapter.MyProjectBottomViewHolder>() {
 
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): BottomViewHolder {
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): MyProjectBottomViewHolder {
         val binding: ItemBottomLogoutBinding =
             ItemBottomLogoutBinding.inflate(LayoutInflater.from(parent.context), parent, false)
-        return BottomViewHolder(binding)
+        return MyProjectBottomViewHolder(binding)
     }
 
     override fun getItemCount(): Int {
         return 1
     }
 
-    override fun onBindViewHolder(holder: BottomViewHolder, position: Int) {
+    override fun onBindViewHolder(holder: MyProjectBottomViewHolder, position: Int) {
     }
 
-    class BottomViewHolder(private val binding: ItemBottomLogoutBinding) :
+    class MyProjectBottomViewHolder(private val binding: ItemBottomLogoutBinding) :
         RecyclerView.ViewHolder(binding.root)
 }