[feat] 핑글 개최 프로세스 - 내용요약/확인 뷰 구현 #65

HAJIEUN02 · 2024-01-09T04:33:34Z

Related issue 🛠

closed [feat] 핑글 개최 프로세스 - 내용요약/확인 뷰 구현 #42

Work Description ✏️

개최 프로세스 과정에서 로컬에 저장된 정보들 한번에 출력
핑글 제목이 2줄인 경우 고려
선택된 CategoryType에 따라 칩/핑글 제목 색상 변화
HH:MM;SS 형태 가공해 출력 -> 오전 오후 떼고 시간만 출력하라고 디자인 전달받음 오늘!
번개 제목 스타일 변경으로 인한 text_appearance 추가 및 적용

Screenshot 📸

XRecorder_10012024_001717.mp4

Uncompleted Tasks 😅

개최 프로세스 버튼 활성/비활성화 조건 확인 후 연결

To Reviewers 📢

이제 큰 산은 넘었슴미다..... 허엉ㅜ step0 후딱 하구 피알 올릴게욥
커밋메시지가 뭔가 이슈번호가 좀 왔다갔다인데 저도 왜그런지 모르겠어요
뷰모델 때문에 브랜치 옮겨다니면서 작업해서 그런듯.......
깃허브 아직 참 어렵ㄸㅏ..

# Conflicts: # app/src/main/res/values/strings.xml

# Conflicts: # app/src/main/java/org/sopt/pingle/presentation/ui/main/plan/PlanCategoryFragment.kt

# Conflicts: # app/src/main/java/org/sopt/pingle/presentation/ui/main/plan/PlanViewModel.kt # app/src/main/res/values/strings.xml

# Conflicts: # app/src/main/res/values/strings.xml

jihyunniiii · 2024-01-09T09:05:01Z

app/src/main/AndroidManifest.xml

        <activity
            android:name=".presentation.ui.main.plan.PlanActivity"
-            android:exported="false"
+            android:exported="true"
            android:windowSoftInputMode="adjustNothing"
            android:screenOrientation="portrait"
-            tools:ignore="LockedOrientationActivity" />
+            tools:ignore="LockedOrientationActivity" >
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>


여기 복구 시켜주세요

jihyunniiii · 2024-01-09T09:06:03Z

app/src/main/java/org/sopt/pingle/presentation/ui/main/plan/PlanCategoryFragment.kt

+        viewModel.selectedCategory.flowWithLifecycle(lifecycle).onEach {
+            Timber.tag("observe:categoryType").d(viewModel.selectedCategory.value?.name.toString())
+        }.launchIn(lifecycleScope)


timber나 로그 코드 모두 삭제해주세요

jihyunniiii · 2024-01-09T09:19:45Z

app/src/main/java/org/sopt/pingle/presentation/ui/main/plan/PlanSummaryConfirmationFragment.kt

+                badgePlanSummaryConfirmationCategory.setBadgeCategoryType(category)
+                tvPlanSummaryConfirmationName.setTextColor(colorOf((category.textColor)))
+                tvPlanSummaryConfirmationName.text = viewModel.planTitle.value
+                tvPlanSummaryConfirmationOwnerName.text = "개최자"


이거 나중에 서버통신으로 사용자 정보 받아와서 개최자 닉네임 넣어주는 로직으로 수정해주는 거 맞죠?

넵 API명세서에 있는 거 씁니둥,,

jihyunniiii · 2024-01-09T09:22:52Z

app/src/main/res/values/strings.xml

+    <string name="plan_summary_confirmation_recruitment_number">%1$s명</string>
 ]


이건 뭔가요

string 동적으로 넣어줄 때 첫번째 매개변수라는 뜻인데 여기서는 하나밖에 없으니까 그냥 %s로 변경하겠습니당~

jihyunniiii · 2024-01-09T09:23:45Z

app/src/main/java/org/sopt/pingle/presentation/ui/main/plan/PlanSummaryConfirmationFragment.kt

+                tvPlanSummaryConfirmationName.text = viewModel.planTitle.value
+                tvPlanSummaryConfirmationOwnerName.text = "개최자"
+                tvPlanSummaryConfirmationCalenderDetail.text =
+                    viewModel.planDate.value + "\n" + makeTimeClean(viewModel.startTime.value) + " ~ " + makeTimeClean(viewModel.endTime.value)


여기도 스트링 추출해서 사용해주세요

이건 나중에 서버통신으로 없앨 부분이라 그냥 둘게욥

jihyunniiii · 2024-01-09T09:40:42Z

app/src/main/res/layout/fragment_plan_summary_confirmation.xml

+                app:layout_constraintStart_toEndOf="@id/iv_plan_summary_confirmation_calendar"
+                app:layout_constraintTop_toTopOf="@id/iv_plan_summary_confirmation_calendar" />
+
+            <TextView


텍스트 최대 길이 확인해주시고 반영해주세요.

jihyunniiii · 2024-01-09T09:41:09Z

app/src/main/res/layout/fragment_plan_summary_confirmation.xml

+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/tv_plan_summary_confirmation_calender_detail" />
+
+            <TextView


여기도 텍스트 최대 길이 확인해주시고 적용해주세요

jihyunniiii · 2024-01-09T09:41:35Z

app/src/main/res/layout/fragment_plan_summary_confirmation.xml

+                app:layout_constraintStart_toEndOf="@id/iv_plan_summary_confirmation_recruitment"
+                app:layout_constraintTop_toTopOf="@id/iv_plan_summary_confirmation_recruitment" />
+
+            <TextView


여기도 텍스트 최대 길이 확인해주시고 적용해주세요

jihyunniiii · 2024-01-09T09:43:01Z

app/src/main/res/layout/fragment_plan_summary_confirmation.xml

+                app:layout_constraintStart_toEndOf="@id/iv_plan_summary_confirmation_map"
+                app:layout_constraintTop_toTopOf="@id/iv_plan_summary_confirmation_map" />
+
+            <TextView


가운데 정렬 아니에요 피그마 다시 확인하고 수정해주세요

jihyunniiii · 2024-01-09T09:44:25Z

app/src/main/res/values/text_appearance.xml

    <!-- Subtitle -->
+    <style name="TextAppearance.Pingle.Sub.Bold.16" parent="TextAppearance.Pingle">
+        <item name="android:textSize">16dp</item>
+        <item name="android:lineHeight">25dp</item>
+        <item name="android:fontFamily">@font/suit_bold</item>
+    </style>
+
    <style name="TextAppearance.Pingle.Sub.Bold.18" parent="TextAppearance.Pingle">
        <item name="android:textSize">18dp</item>
-        <item name="android:lineHeight">25dp</item>
+        <item name="android:lineHeight">22dp</item>
        <item name="android:fontFamily">@font/suit_bold</item>


이거 왜 수정되었나요?

새로운 폰트 스타일 추가됐다고 해서 넣었어염 순서 바꾸고 18 16 다 확인했슴당

# Conflicts: # app/src/main/res/values/strings.xml

jihyunniiii

머지합시다

jihyunniiii · 2024-01-09T09:48:30Z

app/src/main/java/org/sopt/pingle/presentation/ui/main/plan/PlanSummaryConfirmationFragment.kt

+    private fun makeDateClean(date: String): String {
+        val year = date.substring(0, 4)
+        val month = date.substring(5, 7)
+        val day = date.substring(8, 10)
+        return year + YEAR + month + MONTH + day + DAY
+    }


이거 위랑 비슷하게 네이밍 해주시고 상수화 진행해주세요

HAJIEUN02 added 13 commits January 6, 2024 06:25

[add] #42 내용 요약/확인 뷰string 리소스 추가

0e4f8d0

[chore] #42 PlanActivity fragmentList에 내용 요약/확인 프래그먼트 추가

7bdcadd

Merge branch 'develop' into feat-plan-summary-confirmation

9f44ed5

# Conflicts: # app/src/main/res/values/strings.xml

[feat] #39 내용 요약/확인 페이지 구현

b636da2

[mod] #39 viewModel 호출 로직수정

9cc5d0e

Merge branch 'develop' into feat-plan-summary-confirmation

664d517

# Conflicts: # app/src/main/java/org/sopt/pingle/presentation/ui/main/plan/PlanCategoryFragment.kt

Merge branch 'develop' into feat-plan-summary-confirmation

5c6af6c

# Conflicts: # app/src/main/java/org/sopt/pingle/presentation/ui/main/plan/PlanViewModel.kt # app/src/main/res/values/strings.xml

[chore] #60 viewModel binding 선언

9b1a288

[chore] #60 viewModel -> activityViewModel로 수정

de8f744

Merge branch 'develop' into feat-plan-summary-confirmation

ded080d

# Conflicts: # app/src/main/res/values/strings.xml

[chore] #42 viewModel -> activityViewModel로 수정

bfb3843

[feat] #42 내용 요약/확인 뷰 구현

0f2d198

[chore] #42 ktlint 적용

0f4b962

HAJIEUN02 added ✨ feat ✨ 🐹 지은 🐹 😵‍💫 Code Review wanted 😵‍💫 labels Jan 9, 2024

HAJIEUN02 added this to the 1차 스프린트 뷰 작업 milestone Jan 9, 2024

HAJIEUN02 self-assigned this Jan 9, 2024

HAJIEUN02 requested a review from a team as a code owner January 9, 2024 04:33

HAJIEUN02 linked an issue Jan 9, 2024 that may be closed by this pull request

[feat] 핑글 개최 프로세스 - 내용요약/확인 뷰 구현 #42

Closed

3 tasks

HAJIEUN02 added 4 commits January 9, 2024 15:55

[feat] #42 start/end시간 출력형태 가공 함수 추가

40737a4

[add] #42 text_appearance 추가 및 UI 수정

7c99cab

[chore] #42 maxLines=2로 수정

b6205e9

[feat] #42 date 출력형태 가공 함수 추가

17a8d76

jihyunniiii reviewed Jan 9, 2024

View reviewed changes

HAJIEUN02 added 5 commits January 9, 2024 23:30

[chore] #42 코드리뷰 반영

884dc9c

[chore] #42 코드리뷰 반영2

7d06e51

[chore] #42 코드리뷰 반영3

9b877f5

[chore] #42 상수화 및 제약 수정

0bf7f3e

Merge branch 'develop' into feat-plan-summary-confirmation

88597a8

# Conflicts: # app/src/main/res/values/strings.xml

jihyunniiii approved these changes Jan 9, 2024

View reviewed changes

HAJIEUN02 merged commit 07d6244 into develop Jan 9, 2024
1 check passed

jihyunniiii removed the 😵‍💫 Code Review wanted 😵‍💫 label Jan 9, 2024

HAJIEUN02 deleted the feat-plan-summary-confirmation branch January 12, 2024 10:13

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[feat] 핑글 개최 프로세스 - 내용요약/확인 뷰 구현 #65

[feat] 핑글 개최 프로세스 - 내용요약/확인 뷰 구현 #65

HAJIEUN02 commented Jan 9, 2024 •

edited

Loading

jihyunniiii Jan 9, 2024

jihyunniiii Jan 9, 2024

jihyunniiii Jan 9, 2024

HAJIEUN02 Jan 9, 2024

jihyunniiii Jan 9, 2024

HAJIEUN02 Jan 9, 2024

jihyunniiii Jan 9, 2024

HAJIEUN02 Jan 9, 2024

jihyunniiii Jan 9, 2024

jihyunniiii Jan 9, 2024

jihyunniiii Jan 9, 2024

jihyunniiii Jan 9, 2024

jihyunniiii Jan 9, 2024

HAJIEUN02 Jan 9, 2024

jihyunniiii left a comment

jihyunniiii Jan 9, 2024

		<string name="plan_summary_confirmation_recruitment_number">%1$s명</string>
		]

[feat] 핑글 개최 프로세스 - 내용요약/확인 뷰 구현 #65

[feat] 핑글 개최 프로세스 - 내용요약/확인 뷰 구현 #65

Conversation

HAJIEUN02 commented Jan 9, 2024 • edited Loading

Related issue 🛠

Work Description ✏️

Screenshot 📸

Uncompleted Tasks 😅

To Reviewers 📢

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jihyunniiii left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

HAJIEUN02 commented Jan 9, 2024 •

edited

Loading