[feat] 핑글 개최 프로세스 - 내용요약/확인 뷰 구현 #65
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
| @@ -0,0 +1,38 @@ | ||||||
| package org.sopt.pingle.presentation.ui.main.plan | ||||||
|
|
||||||
| import android.os.Bundle | ||||||
| import android.view.View | ||||||
| import androidx.fragment.app.activityViewModels | ||||||
| import org.sopt.pingle.R | ||||||
| import org.sopt.pingle.databinding.FragmentPlanSummaryConfirmationBinding | ||||||
| import org.sopt.pingle.presentation.type.CategoryType | ||||||
| import org.sopt.pingle.util.base.BindingFragment | ||||||
| import org.sopt.pingle.util.fragment.colorOf | ||||||
|
|
||||||
| class PlanSummaryConfirmationFragment : | ||||||
| BindingFragment<FragmentPlanSummaryConfirmationBinding>(R.layout.fragment_plan_summary_confirmation) { | ||||||
| private val viewModel by activityViewModels<PlanViewModel>() | ||||||
| override fun onViewCreated(view: View, savedInstanceState: Bundle?) { | ||||||
| super.onViewCreated(view, savedInstanceState) | ||||||
|
|
||||||
| initLayout() | ||||||
| } | ||||||
|
|
||||||
| private fun initLayout() { | ||||||
| val category: CategoryType? = viewModel.selectedCategory.value | ||||||
| if (category != null) { | ||||||
| with(binding) { | ||||||
| badgePlanSummaryConfirmationCategory.setBadgeCategoryType(category) | ||||||
| tvPlanSummaryConfirmationName.setTextColor(colorOf((category.textColor))) | ||||||
| tvPlanSummaryConfirmationName.text = viewModel.planTitle.value | ||||||
| tvPlanSummaryConfirmationOwnerName.text = "개최자" | ||||||
|
There was a problem hiding this comment. 이거 나중에 서버통신으로 사용자 정보 받아와서 개최자 닉네임 넣어주는 로직으로 수정해주는 거 맞죠? There was a problem hiding this comment. 넵 API명세서에 있는 거 씁니둥,, |
||||||
| tvPlanSummaryConfirmationCalenderDetail.text = | ||||||
| viewModel.planDate.value + "\n" + makeTimeClean(viewModel.startTime.value) + " ~ " + makeTimeClean(viewModel.endTime.value) | ||||||
|
There was a problem hiding this comment. 이건 나중에 서버통신으로 없앨 부분이라 그냥 둘게욥 |
||||||
| tvPlanSummaryConfirmationMapDetail.text = viewModel.selectedLocation.value?.location | ||||||
| tvPlanSummaryConfirmationRecruitmentDetail.text = getString(R.string.plan_summary_confirmation_recruitment_number, viewModel.selectedRecruitment.value) | ||||||
| } | ||||||
| } | ||||||
| } | ||||||
|
|
||||||
| private fun makeTimeClean(time: String): String = time.substring(0, 5) | ||||||
|
There was a problem hiding this comment.
Suggested change
이런 식으로 네이밍하는 게 좋을 것 같고 0이랑 5는 상수화 해주세요 There was a problem hiding this comment. 뭔가 직관적이지 않은 것 같아서 convertDateFormat, convertTimeFormat으로 수정했슴둥 |
||||||
| } | ||||||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
| @@ -0,0 +1,201 @@ | ||||||
| <?xml version="1.0" encoding="utf-8"?> | ||||||
| <layout xmlns:android="http://schemas.android.com/apk/res/android" | ||||||
| xmlns:app="http://schemas.android.com/apk/res-auto" | ||||||
| xmlns:tools="http://schemas.android.com/tools"> | ||||||
|
|
||||||
| <data> | ||||||
|
|
||||||
| <variable | ||||||
| name="planViewModel" | ||||||
| type="org.sopt.pingle.presentation.ui.main.plan.PlanViewModel" /> | ||||||
| </data> | ||||||
|
|
||||||
| <androidx.constraintlayout.widget.ConstraintLayout | ||||||
| android:id="@+id/layout_plan_summary_confirmation" | ||||||
| android:layout_width="match_parent" | ||||||
| android:layout_height="match_parent"> | ||||||
|
|
||||||
| <TextView | ||||||
| android:id="@+id/tv_plan_summary_confirmation_title" | ||||||
| android:layout_width="wrap_content" | ||||||
| android:layout_height="wrap_content" | ||||||
| android:layout_marginStart="@dimen/spacing8" | ||||||
| android:text="@string/plan_summary_confirmation_title" | ||||||
| android:textAppearance="@style/TextAppearance.Pingle.Title.Semi.24" | ||||||
| android:textColor="@color/white" | ||||||
| app:layout_constraintStart_toStartOf="parent" | ||||||
| app:layout_constraintTop_toTopOf="parent" /> | ||||||
|
|
||||||
| <androidx.constraintlayout.widget.ConstraintLayout | ||||||
|
There was a problem hiding this comment. 제목 2줄 되었을 때에도 카드 크기 고정되어야 합니다. 대응했나요? There was a problem hiding this comment. 디자인 측에서 늘어나는게 맞다고 해서 그렇게 반영했습니당! (1/9 기준) |
||||||
| android:id="@+id/layout_plan_summary_confirmation_card_top" | ||||||
| android:layout_width="0dp" | ||||||
| android:layout_height="wrap_content" | ||||||
| android:layout_marginTop="@dimen/spacing25" | ||||||
| android:background="@drawable/shape_border_radius_15" | ||||||
| android:backgroundTint="@color/g_10" | ||||||
| app:layout_constraintEnd_toEndOf="parent" | ||||||
| app:layout_constraintStart_toStartOf="parent" | ||||||
| app:layout_constraintTop_toBottomOf="@id/tv_plan_summary_confirmation_title"> | ||||||
|
|
||||||
| <org.sopt.pingle.util.component.PingleBadge | ||||||
| android:id="@+id/badge_plan_summary_confirmation_category" | ||||||
| android:layout_width="wrap_content" | ||||||
| android:layout_height="wrap_content" | ||||||
| android:layout_marginStart="@dimen/spacing24" | ||||||
| android:layout_marginTop="@dimen/spacing22" | ||||||
| app:layout_constraintStart_toStartOf="parent" | ||||||
| app:layout_constraintTop_toTopOf="parent" /> | ||||||
|
|
||||||
| <TextView | ||||||
| android:id="@+id/tv_plan_summary_confirmation_name" | ||||||
| android:layout_width="0dp" | ||||||
| android:layout_height="wrap_content" | ||||||
| android:layout_marginStart="@dimen/spacing24" | ||||||
| android:layout_marginTop="8dp" | ||||||
| android:layout_marginEnd="@dimen/spacing25" | ||||||
| android:maxLines="2" | ||||||
| android:textAppearance="@style/TextAppearance.Pingle.Sub.Bold.16" | ||||||
| android:textColor="@color/pingle_orange" | ||||||
|
|
||||||
| app:layout_constraintEnd_toEndOf="parent" | ||||||
| app:layout_constraintStart_toStartOf="parent" | ||||||
|
|
||||||
| app:layout_constraintTop_toBottomOf="@id/badge_plan_summary_confirmation_category" | ||||||
| tools:text="강남 모각작팟" /> | ||||||
|
|
||||||
| <TextView | ||||||
| android:id="@+id/tv_plan_summary_confirmation_owner_name" | ||||||
| android:layout_width="wrap_content" | ||||||
| android:layout_height="wrap_content" | ||||||
| android:layout_marginStart="@dimen/spacing24" | ||||||
| android:layout_marginTop="4dp" | ||||||
|
There was a problem hiding this comment.
Suggested change
There was a problem hiding this comment. 피그마 보니까 8dp길래 8dp로 수정했습니다!!!! |
||||||
| android:layout_marginBottom="@dimen/spacing22" | ||||||
| android:textAppearance="@style/TextAppearance.Pingle.Body.Med.14" | ||||||
| android:textColor="@color/g_03" | ||||||
| app:layout_constraintBottom_toBottomOf="parent" | ||||||
| app:layout_constraintStart_toStartOf="parent" | ||||||
|
There was a problem hiding this comment. 얘도 badge 에 제약 주세요. 아니면 가이드 라인 사용해주세요 |
||||||
| app:layout_constraintTop_toBottomOf="@id/tv_plan_summary_confirmation_name" | ||||||
| tools:text="개최자" /> | ||||||
| </androidx.constraintlayout.widget.ConstraintLayout> | ||||||
|
|
||||||
| <androidx.constraintlayout.widget.ConstraintLayout | ||||||
| android:id="@+id/layout_plan_summary_confirmation_card_bottom" | ||||||
| android:layout_width="0dp" | ||||||
| android:layout_height="wrap_content" | ||||||
| android:background="@drawable/shape_border_radius_15" | ||||||
| android:backgroundTint="@color/g_10" | ||||||
| app:layout_constraintEnd_toEndOf="parent" | ||||||
| app:layout_constraintStart_toStartOf="parent" | ||||||
| app:layout_constraintTop_toBottomOf="@id/layout_plan_summary_confirmation_card_top"> | ||||||
|
|
||||||
| <ImageView | ||||||
| android:id="@+id/iv_plan_summary_confirmation_calendar" | ||||||
| android:layout_width="wrap_content" | ||||||
| android:layout_height="wrap_content" | ||||||
| android:layout_marginStart="@dimen/spacing24" | ||||||
| android:layout_marginTop="29dp" | ||||||
| android:src="@drawable/ic_all_calendar_24" | ||||||
| app:layout_constraintStart_toStartOf="parent" | ||||||
| app:layout_constraintTop_toTopOf="parent" /> | ||||||
|
|
||||||
| <TextView | ||||||
| android:id="@+id/tv_plan_summary_confirmation_calender_title" | ||||||
| android:layout_width="wrap_content" | ||||||
| android:layout_height="wrap_content" | ||||||
| android:text="@string/plan_summary_confirmation_date" | ||||||
| android:textAppearance="@style/TextAppearance.Pingle.Body.Semi.14" | ||||||
| android:textColor="@color/g_01" | ||||||
| app:layout_constraintBottom_toBottomOf="@id/iv_plan_summary_confirmation_calendar" | ||||||
| app:layout_constraintStart_toEndOf="@id/iv_plan_summary_confirmation_calendar" | ||||||
| app:layout_constraintTop_toTopOf="@id/iv_plan_summary_confirmation_calendar" /> | ||||||
|
|
||||||
| <TextView | ||||||
|
There was a problem hiding this comment. 텍스트 최대 길이 확인해주시고 반영해주세요. |
||||||
| android:id="@+id/tv_plan_summary_confirmation_calender_detail" | ||||||
| android:layout_width="0dp" | ||||||
| android:layout_height="wrap_content" | ||||||
| android:layout_marginStart="50dp" | ||||||
| android:textAppearance="@style/TextAppearance.Pingle.Body.Med.14" | ||||||
| android:textColor="@color/g_03" | ||||||
| app:layout_constraintStart_toEndOf="@id/tv_plan_summary_confirmation_calender_title" | ||||||
| app:layout_constraintTop_toTopOf="@id/iv_plan_summary_confirmation_calendar" | ||||||
| tools:text="0000년 00월 00일\n00:00 ~ 00:00" /> | ||||||
|
|
||||||
| <ImageView | ||||||
| android:id="@+id/iv_plan_summary_confirmation_map" | ||||||
| android:layout_width="wrap_content" | ||||||
| android:layout_height="wrap_content" | ||||||
| android:layout_marginStart="@dimen/spacing24" | ||||||
| android:layout_marginTop="@dimen/spacing14" | ||||||
| android:src="@drawable/ic_all_map_24" | ||||||
| app:layout_constraintStart_toStartOf="parent" | ||||||
| app:layout_constraintTop_toBottomOf="@id/tv_plan_summary_confirmation_calender_detail" /> | ||||||
|
|
||||||
| <TextView | ||||||
|
There was a problem hiding this comment. 여기도 텍스트 최대 길이 확인해주시고 적용해주세요 |
||||||
| android:id="@+id/tv_plan_summary_confirmation_map_title" | ||||||
| android:layout_width="wrap_content" | ||||||
| android:layout_height="wrap_content" | ||||||
| android:text="@string/plan_summary_confirmation_location" | ||||||
| android:textAppearance="@style/TextAppearance.Pingle.Body.Semi.14" | ||||||
| android:textColor="@color/g_01" | ||||||
| app:layout_constraintBottom_toBottomOf="@id/iv_plan_summary_confirmation_map" | ||||||
| app:layout_constraintStart_toEndOf="@id/iv_plan_summary_confirmation_map" | ||||||
|
There was a problem hiding this comment. startToStartOf로 일시 텍스트에 제약 주세요 아래 모집인원 상세 정보도 마찬가지 |
||||||
| app:layout_constraintTop_toTopOf="@id/iv_plan_summary_confirmation_map" /> | ||||||
|
|
||||||
| <TextView | ||||||
|
There was a problem hiding this comment. 가운데 정렬 아니에요 피그마 다시 확인하고 수정해주세요 |
||||||
| android:id="@+id/tv_plan_summary_confirmation_map_detail" | ||||||
| android:layout_width="0dp" | ||||||
| android:layout_height="wrap_content" | ||||||
| android:layout_marginStart="50dp" | ||||||
| android:textAppearance="@style/TextAppearance.Pingle.Body.Med.14" | ||||||
| android:textColor="@color/g_03" | ||||||
| app:layout_constraintBottom_toBottomOf="@id/tv_plan_summary_confirmation_map_title" | ||||||
| app:layout_constraintStart_toEndOf="@id/tv_plan_summary_confirmation_map_title" | ||||||
| app:layout_constraintTop_toTopOf="@id/tv_plan_summary_confirmation_map_title" | ||||||
| tools:text="장소 이름" /> | ||||||
|
|
||||||
| <ImageView | ||||||
| android:id="@+id/iv_plan_summary_confirmation_recruitment" | ||||||
| android:layout_width="wrap_content" | ||||||
| android:layout_height="wrap_content" | ||||||
| android:layout_marginStart="@dimen/spacing24" | ||||||
| android:layout_marginTop="@dimen/spacing20" | ||||||
| android:layout_marginBottom="@dimen/spacing30" | ||||||
| android:src="@drawable/ic_all_user_24" | ||||||
| app:layout_constraintBottom_toBottomOf="parent" | ||||||
| app:layout_constraintStart_toStartOf="parent" | ||||||
| app:layout_constraintTop_toBottomOf="@id/iv_plan_summary_confirmation_map" /> | ||||||
|
|
||||||
| <TextView | ||||||
| android:id="@+id/tv_plan_summary_confirmation_recruitment_title" | ||||||
| android:layout_width="wrap_content" | ||||||
| android:layout_height="wrap_content" | ||||||
| android:text="@string/plan_summary_confirmation_recruitment" | ||||||
| android:textAppearance="@style/TextAppearance.Pingle.Body.Semi.14" | ||||||
| android:textColor="@color/g_01" | ||||||
| app:layout_constraintBottom_toBottomOf="@id/iv_plan_summary_confirmation_recruitment" | ||||||
| app:layout_constraintStart_toEndOf="@id/iv_plan_summary_confirmation_recruitment" | ||||||
| app:layout_constraintTop_toTopOf="@id/iv_plan_summary_confirmation_recruitment" /> | ||||||
|
|
||||||
| <TextView | ||||||
|
There was a problem hiding this comment. 여기도 텍스트 최대 길이 확인해주시고 적용해주세요 |
||||||
| android:id="@+id/tv_plan_summary_confirmation_recruitment_detail" | ||||||
| android:layout_width="0dp" | ||||||
| android:layout_height="wrap_content" | ||||||
| android:layout_marginStart="26dp" | ||||||
| android:textAppearance="@style/TextAppearance.Pingle.Body.Med.14" | ||||||
| android:textColor="@color/g_03" | ||||||
| app:layout_constraintBottom_toBottomOf="@id/tv_plan_summary_confirmation_recruitment_title" | ||||||
| app:layout_constraintStart_toEndOf="@id/tv_plan_summary_confirmation_recruitment_title" | ||||||
| app:layout_constraintTop_toTopOf="@id/tv_plan_summary_confirmation_recruitment_title" | ||||||
| tools:text="0명" /> | ||||||
| </androidx.constraintlayout.widget.ConstraintLayout> | ||||||
|
|
||||||
| <View | ||||||
| android:id="@+id/view_plan_summary_confirmation_middle_line" | ||||||
| android:layout_width="0dp" | ||||||
| android:layout_height="1dp" | ||||||
| android:layout_marginHorizontal="21dp" | ||||||
| android:background="@color/g_07" | ||||||
| app:layout_constraintEnd_toEndOf="parent" | ||||||
| app:layout_constraintStart_toStartOf="parent" | ||||||
| app:layout_constraintTop_toBottomOf="@id/layout_plan_summary_confirmation_card_top" /> | ||||||
|
|
||||||
| </androidx.constraintlayout.widget.ConstraintLayout> | ||||||
| </layout> | ||||||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
여기 복구 시켜주세요