Merge branch 'develop' into AN/feature/409-studylist-inflate

woowacourse-teams · Oct 17, 2023 · 613fcfc · 613fcfc
2 parents 866f99e + e5ffb94
commit 613fcfc
Show file tree

Hide file tree

Showing 9 changed files with 36 additions and 111 deletions.
diff --git a/android/app/src/main/java/com/created/team201/data/mapper/StudyDetailMapper.kt b/android/app/src/main/java/com/created/team201/data/mapper/StudyDetailMapper.kt
@@ -8,19 +8,16 @@ import com.created.team201.data.remote.response.RoundResponseDto
 import com.created.team201.data.remote.response.StudyDetailResponseDto
 
 fun StudyDetailResponseDto.toDomain(): StudyDetail = StudyDetail(
-    id = this.id,
-    processingStatus = this.processingStatus,
-    name = this.name,
-    numberOfCurrentMembers = this.numberOfCurrentMembers,
-    numberOfMaximumMembers = this.numberOfMaximumMembers,
-    studyMasterId = this.studyMasterId,
-    startDate = this.startAt,
-    totalRoundCount = this.totalRoundCount,
-    cycle = this.periodOfRound,
-    currentRound = this.currentRound,
-    introduction = this.introduction,
-    members = this.members.map { it.toDomain() },
-    rounds = this.rounds.map { it.toDomain() },
+    id = id,
+    processingStatus = processingStatus,
+    name = name,
+    numberOfCurrentMembers = numberOfCurrentMembers,
+    numberOfMaximumMembers = numberOfMaximumMembers,
+    studyMasterId = studyMasterId,
+    meetingDaysCountPerWeek = meetingDaysCountPerWeek,
+    introduction = introduction,
+    members = members.map { it.toDomain() },
+    minimumWeeks = minimumWeeks,
 )
 
 fun MemberResponseDto.toDomain(): Member = Member(

diff --git a/android/app/src/main/java/com/created/team201/data/remote/response/StudyDetailResponseDto.kt b/android/app/src/main/java/com/created/team201/data/remote/response/StudyDetailResponseDto.kt
@@ -17,18 +17,12 @@ data class StudyDetailResponseDto(
     val numberOfMaximumMembers: Int,
     @SerialName("studyMasterId")
     val studyMasterId: Long,
-    @SerialName("startAt")
-    val startAt: String,
-    @SerialName("totalRoundCount")
-    val totalRoundCount: Int,
-    @SerialName("periodOfRound")
-    val periodOfRound: String,
-    @SerialName("currentRound")
-    val currentRound: Int,
+    @SerialName("meetingDaysCountPerWeek")
+    val meetingDaysCountPerWeek: Int,
     @SerialName("introduction")
     val introduction: String,
     @SerialName("members")
     val members: List<MemberResponseDto>,
-    @SerialName("rounds")
-    val rounds: List<RoundResponseDto>,
+    @SerialName("minimumWeeks")
+    val minimumWeeks: Int,
 )
diff --git a/...oid/app/src/main/java/com/created/team201/presentation/studyDetail/StudyDetailActivity.kt b/...oid/app/src/main/java/com/created/team201/presentation/studyDetail/StudyDetailActivity.kt
@@ -22,7 +22,6 @@ import com.created.team201.presentation.studyDetail.StudyDetailState.Guest
 import com.created.team201.presentation.studyDetail.StudyDetailState.Master
 import com.created.team201.presentation.studyDetail.adapter.StudyParticipantsAdapter
 import com.created.team201.presentation.studyDetail.bottomSheet.StudyStartBottomSheetFragment
-import com.created.team201.presentation.studyDetail.model.PeriodFormat
 import com.created.team201.presentation.studyDetail.model.StudyDetailUIModel
 import dagger.hilt.android.AndroidEntryPoint
 
@@ -142,13 +141,6 @@ class StudyDetailActivity :
         }
     }
 
-    fun convertPeriodOfCountFormat(periodOfCount: String): String {
-        if (periodOfCount == "") return ""
-        val stringRes =
-            PeriodFormat.valueOf(periodOfCount.last()).res
-        return getString(stringRes, periodOfCount.dropLast(STRING_LAST_INDEX).toInt())
-    }
-
     fun initMainButtonOnClick(role: Role) {
         when (role) {
             Role.MASTER -> onMasterClickMainButton()
@@ -240,7 +232,6 @@ class StudyDetailActivity :
 
     companion object {
         private const val NON_EXISTENCE_STUDY_ID = 0L
-        private const val STRING_LAST_INDEX = 1
         private const val KEY_STUDY_ID = "KEY_STUDY_ID"
         fun getIntent(context: Context, studyId: Long): Intent =
             Intent(context, StudyDetailActivity::class.java).apply {

diff --git a/android/app/src/main/java/com/created/team201/presentation/studyDetail/model/PeriodFormat.kt b/android/app/src/main/java/com/created/team201/presentation/studyDetail/model/PeriodFormat.kt
diff --git a/...pp/src/main/java/com/created/team201/presentation/studyDetail/model/StudyDetailUIModel.kt b/...pp/src/main/java/com/created/team201/presentation/studyDetail/model/StudyDetailUIModel.kt
@@ -11,9 +11,8 @@ data class StudyDetailUIModel(
     val introduction: String,
     val peopleCount: Int,
     val role: Role,
-    val startDate: String,
-    val period: String,
-    val cycle: String,
+    val minimumWeeks: Int,
+    val meetingDaysCountPerWeek: Int,
     val memberCount: Int,
     val canStartStudy: Boolean,
     val studyMembers: List<StudyMemberUIModel>,
@@ -26,9 +25,8 @@ data class StudyDetailUIModel(
             introduction = "",
             peopleCount = 0,
             role = Role.NOTHING,
-            startDate = "",
-            period = "",
-            cycle = "",
+            minimumWeeks = 0,
+            meetingDaysCountPerWeek = 0,
             memberCount = 0,
             canStartStudy = false,
             studyMembers = listOf(),
@@ -42,15 +40,14 @@ data class StudyDetailUIModel(
                 introduction = studyDetail.introduction,
                 peopleCount = studyDetail.numberOfMaximumMembers,
                 role = role,
-                startDate = studyDetail.startDate,
-                period = studyDetail.totalRoundCount.toString(),
-                cycle = studyDetail.cycle,
+                minimumWeeks = studyDetail.minimumWeeks,
+                meetingDaysCountPerWeek = studyDetail.meetingDaysCountPerWeek,
                 memberCount = studyDetail.numberOfCurrentMembers,
                 canStartStudy = StudyDetail.canStartStudy(studyDetail.numberOfCurrentMembers),
                 studyMembers = studyDetail.members.map {
                     it.toUiModel(
                         studyDetail.studyMasterId,
-                        isApplicant = false
+                        isApplicant = false,
                     )
                 },
             )

diff --git a/android/app/src/main/res/layout/activity_study_detail.xml b/android/app/src/main/res/layout/activity_study_detail.xml
@@ -84,22 +84,9 @@
                 app:iconResource="@drawable/ic_people_capacity"
                 app:information="@{@string/icon_text_button_formatter_information_people_count(viewModel.study.peopleCount)}"
                 app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toStartOf="@id/itb_study_detail_start_date"
-                app:layout_constraintHorizontal_bias="0.5"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/view_study_detail_information_divider" />
-
-            <com.created.team201.presentation.studyDetail.custom.IconTextButton
-                android:id="@+id/itb_study_detail_start_date"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                app:buttonName="@string/icon_text_button_name_start_date"
-                app:iconResource="@drawable/ic_start_date"
-                app:information="@{viewModel.study.startDate.toString()}"
-                app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toStartOf="@id/itb_study_detail_period"
                 app:layout_constraintHorizontal_bias="0.5"
-                app:layout_constraintStart_toEndOf="@id/itb_study_detail_capacity"
+                app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/view_study_detail_information_divider" />
 
             <com.created.team201.presentation.studyDetail.custom.IconTextButton
@@ -108,11 +95,11 @@
                 android:layout_height="wrap_content"
                 app:buttonName="@string/icon_text_button_name_period"
                 app:iconResource="@drawable/ic_period"
-                app:information="@{@string/study_detail_period_format(viewModel.study.period)}"
+                app:information="@{@string/icon_text_button_formatter_information_cycle(viewModel.study.minimumWeeks)}"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toStartOf="@id/itb_study_detail_cycle"
                 app:layout_constraintHorizontal_bias="0.5"
-                app:layout_constraintStart_toEndOf="@id/itb_study_detail_start_date"
+                app:layout_constraintStart_toEndOf="@id/itb_study_detail_capacity"
                 app:layout_constraintTop_toBottomOf="@id/view_study_detail_information_divider" />
 
             <com.created.team201.presentation.studyDetail.custom.IconTextButton
@@ -121,12 +108,12 @@
                 android:layout_height="wrap_content"
                 app:buttonName="@string/icon_text_button_name_cycle"
                 app:iconResource="@drawable/ic_cycle"
-                app:information="@{activity.convertPeriodOfCountFormat(viewModel.study.cycle) }"
+                app:information="@{@string/icon_text_button_formatter_information_period(viewModel.study.meetingDaysCountPerWeek) }"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintHorizontal_bias="0.5"
                 app:layout_constraintStart_toEndOf="@id/itb_study_detail_period"
-                app:layout_constraintTop_toBottomOf="@id/view_study_detail_information_divider" />
+                app:layout_constraintTop_toTopOf="@id/view_study_detail_information_divider" />
 
         </androidx.constraintlayout.widget.ConstraintLayout>
 

diff --git a/android/app/src/main/res/layout/dialog_study_informaion.xml b/android/app/src/main/res/layout/dialog_study_informaion.xml
@@ -65,22 +65,9 @@
                 app:iconResource="@drawable/ic_people_capacity"
                 app:information="@{@string/icon_text_button_formatter_information_people_count(studyDetail.memberCount)}"
                 app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toStartOf="@id/itb_study_information_start_date"
-                app:layout_constraintHorizontal_bias="0.5"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/view_study_information_header_divider" />
-
-            <com.created.team201.presentation.studyDetail.custom.IconTextButton
-                android:id="@+id/itb_study_information_start_date"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                app:buttonName="@string/icon_text_button_name_start_date"
-                app:iconResource="@drawable/ic_start_date"
-                app:information="@{studyDetail.startDate}"
-                app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toStartOf="@id/itb_study_information_period"
                 app:layout_constraintHorizontal_bias="0.5"
-                app:layout_constraintStart_toEndOf="@id/itb_study_information_capacity"
+                app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/view_study_information_header_divider" />
 
             <com.created.team201.presentation.studyDetail.custom.IconTextButton
@@ -89,11 +76,11 @@
                 android:layout_height="wrap_content"
                 app:buttonName="@string/icon_text_button_name_period"
                 app:iconResource="@drawable/ic_period"
-                app:information="@{@string/study_detail_period_format(String.valueOf(studyDetail.period))}"
+                app:information="@{@string/icon_text_button_formatter_information_cycle(studyDetail.minimumWeeks)}"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toStartOf="@id/itb_study_information_cycle"
                 app:layout_constraintHorizontal_bias="0.5"
-                app:layout_constraintStart_toEndOf="@id/itb_study_information_start_date"
+                app:layout_constraintStart_toEndOf="@id/itb_study_information_capacity"
                 app:layout_constraintTop_toBottomOf="@id/view_study_information_header_divider" />
 
             <com.created.team201.presentation.studyDetail.custom.IconTextButton
@@ -102,6 +89,7 @@
                 android:layout_height="wrap_content"
                 app:buttonName="@string/icon_text_button_name_cycle"
                 app:iconResource="@drawable/ic_cycle"
+                app:information="@{@string/icon_text_button_formatter_information_period(studyDetail.meetingDaysCountPerWeek) }"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintHorizontal_bias="0.5"

diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml
@@ -94,11 +94,11 @@
 
     <!-- 아이콘 텍스트 버튼 커스텀 뷰 -->
     <string name="icon_text_button_name_people_count">인원 수</string>
-    <string name="icon_text_button_name_start_date">예상시작일</string>
-    <string name="icon_text_button_name_period">스터디기간</string>
-    <string name="icon_text_button_name_cycle">스터디주기</string>
+    <string name="icon_text_button_name_period">기간</string>
+    <string name="icon_text_button_name_cycle">주</string>
     <string name="icon_text_button_formatter_information_people_count">%d명</string>
-    <string name="icon_text_button_formatter_information_period">%d회차</string>
+    <string name="icon_text_button_formatter_information_cycle">%d주</string>
+    <string name="icon_text_button_formatter_information_period">%d회</string>
 
     <!--스터디 상세보기 뷰-->
     <string name="study_detail_app_bar_title">스터디 상세보기</string>
@@ -111,9 +111,6 @@
     <string name="study_detail_study_accept_waiting">수락을 기다리고 있어요</string>
     <string name="study_detail_study_start_waiting">시작을 기다리고 있어요</string>
     <string name="study_detail_do_not_accept_member_anymore">더이상 스터디 멤버를 받을 수 없습니다.</string>
-    <string name="study_detail_period_of_count_day">%d일</string>
-    <string name="study_detail_period_of_count_week">%d주</string>
-    <string name="study_detail_period_format">%s회차</string>
     <string name="study_detail_notify_invalid_study">스터디를 찾을 수 없습니다.</string>
     <string name="study_detail_notify_cant_participant">더는 참가할 수 없어요</string>
     <string name="study_detail_not_yet">아직 준비중입니다</string>

diff --git a/android/domain/src/main/java/com/created/domain/model/StudyDetail.kt b/android/domain/src/main/java/com/created/domain/model/StudyDetail.kt
@@ -7,13 +7,10 @@ data class StudyDetail(
     val numberOfCurrentMembers: Int,
     val numberOfMaximumMembers: Int,
     val studyMasterId: Long,
-    val startDate: String,
-    val totalRoundCount: Int,
-    val cycle: String,
-    val currentRound: Int,
+    val meetingDaysCountPerWeek: Int,
     val introduction: String,
     val members: List<Member>,
-    val rounds: List<Round>,
+    val minimumWeeks: Int,
 ) {
     companion object {
         private const val START_MEMBER_CONDITION = 2