[feat] 핑글 개최 프로세스 - 카테고리 선택 뷰 구현 #56
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
| 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.viewModels | ||
| import org.sopt.pingle.R | ||
| import org.sopt.pingle.databinding.FragmentPlanCategoryBinding | ||
| import org.sopt.pingle.util.base.BindingFragment | ||
|
|
||
| class PlanCategoryFragment : | ||
| BindingFragment<FragmentPlanCategoryBinding>(R.layout.fragment_plan_category) { | ||
| private val planViewModel by viewModels<PlanViewModel>() | ||
| override fun onViewCreated(view: View, savedInstanceState: Bundle?) { | ||
| super.onViewCreated(view, savedInstanceState) | ||
|
|
||
| binding.planViewModel = planViewModel | ||
| binding.lifecycleOwner = this | ||
|
|
||
| initLayout() | ||
| addListeners() | ||
| } | ||
|
|
||
| private fun initLayout() { | ||
| } | ||
|
|
||
|
Comment on lines
+23
to
+25
|
||
| private fun addListeners() { | ||
| with(binding) { | ||
| includePlanCategoryTypePlay.root.setOnClickListener { | ||
| } | ||
| includePlanCategoryTypeStudy.root.setOnClickListener { | ||
| } | ||
| includePlanCategoryTypeMulti.root.setOnClickListener { | ||
| } | ||
| includePlanCategoryTypeOthers.root.setOnClickListener { | ||
| } | ||
| } | ||
| } | ||
|
Comment on lines
+26
to
+37
|
||
| } | ||
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
|
There was a problem hiding this comment.
그리고 이 파일 없어져도 될 것 같습니다! |
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,6 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <shape xmlns:android="http://schemas.android.com/apk/res/android" | ||
| android:shape="rectangle"> | ||
| <solid android:color="@color/g_10"/> | ||
| <corners android:radius="10dp"/> | ||
| </shape> |
|
There was a problem hiding this comment.
네이밍 컨벤션 지켜주세요 그리고 다음과 같은 형식으로 작성해주세요 |
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,9 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <shape xmlns:android="http://schemas.android.com/apk/res/android" | ||
| android:shape="rectangle"> | ||
| <solid android:color="@color/g_10"/> | ||
| <stroke | ||
| android:width="1dp" | ||
| android:color="@color/white"/> | ||
| <corners android:radius="10dp"/> | ||
| </shape> |
|
There was a problem hiding this comment. 요기서도 아까 말했던 drawable 파일 사용해주면 되겠죠?? |
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,5 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <selector xmlns:android="http://schemas.android.com/apk/res/android"> | ||
| <item android:drawable="@drawable/background_disabled_plan_location_category" android:state_selected="false"/> | ||
| <item android:drawable="@drawable/background_enabled_plan_location_category" android:state_selected="true"/> | ||
| </selector> |
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,100 @@ | ||
| <?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" /> | ||
|
|
||
| <import type="org.sopt.pingle.presentation.type.CategoryType"></import> | ||
|
There was a problem hiding this comment. 어제 말했던 방식으로 해보고 얘 지워도되나 테스트 부탁해요 ~ |
||
| <variable | ||
| name="planCategory" | ||
|
There was a problem hiding this comment. categoryType으로 작성하는 게 더 가독성 좋을 듯 요 |
||
| type="org.sopt.pingle.presentation.type.CategoryType" /> | ||
| </data> | ||
|
|
||
| <androidx.constraintlayout.widget.ConstraintLayout | ||
| android:layout_width="match_parent" | ||
| android:layout_height="match_parent" | ||
| tools:context=".presentation.ui.plan.PlanLocationFragment"> | ||
|
|
||
| <TextView | ||
| android:id="@+id/tv_plan_location_title" | ||
| android:layout_width="wrap_content" | ||
| android:layout_height="wrap_content" | ||
| android:layout_marginStart="@dimen/spacing8" | ||
| android:text="@string/plan_category_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 | ||
| android:id="@+id/layout_plan_category_topCategory" | ||
| android:layout_width="wrap_content" | ||
| android:layout_height="wrap_content" | ||
| android:layout_marginTop="@dimen/spacing28" | ||
| app:layout_constraintEnd_toEndOf="parent" | ||
| app:layout_constraintStart_toStartOf="parent" | ||
| app:layout_constraintTop_toBottomOf="@id/tv_plan_location_title"> | ||
|
|
||
| <include | ||
| android:id="@+id/include_plan_category_type_play" | ||
| layout="@layout/view_plan_category_type" | ||
| android:layout_width="wrap_content" | ||
| android:layout_height="0dp" | ||
| selection="@{planViewModel.selectedCategory == planCategory.PLAY}" | ||
| android:onClick="@{()->planViewModel.setSelectedCategory(planCategory.PLAY)}" | ||
| app:categoryType="@{planCategory.PLAY}" | ||
| app:layout_constraintStart_toStartOf="parent" /> | ||
|
|
||
| <include | ||
| android:id="@+id/include_plan_category_type_study" | ||
| layout="@layout/view_plan_category_type" | ||
| android:layout_width="wrap_content" | ||
| android:layout_height="0dp" | ||
| selection="@{planViewModel.selectedCategory == planCategory.STUDY}" | ||
| android:onClick="@{()->planViewModel.setSelectedCategory(planCategory.STUDY)}" | ||
| android:layout_marginStart="@dimen/spacing9" | ||
|
|
||
| app:categoryType="@{planCategory.STUDY}" | ||
| app:layout_constraintEnd_toEndOf="parent" | ||
|
|
||
|
|
||
| app:layout_constraintStart_toEndOf="@id/include_plan_category_type_play" /> | ||
| </androidx.constraintlayout.widget.ConstraintLayout> | ||
|
Comment on lines
+33
to
+64
There was a problem hiding this comment. 두 개 씩 constraintLayout으로 묶어준 이유는 가운데 정렬을 하기 위함인가요? 잘 이해가 안 간다면 건빵 필터 선택 뷰의 빵 유형 선택 뷰가 이와 비슷한 형태이니 그걸 참고해주시면 좋을 것 같습니다 ! (체인을 적절하게 사용해주세요 ~) |
||
|
|
||
| <androidx.constraintlayout.widget.ConstraintLayout | ||
| android:id="@+id/layout_plan_category_bottomCategory" | ||
| android:layout_width="wrap_content" | ||
| android:layout_height="wrap_content" | ||
| android:layout_marginTop="@dimen/spacing11" | ||
| app:layout_constraintEnd_toEndOf="parent" | ||
| app:layout_constraintStart_toStartOf="parent" | ||
| app:layout_constraintTop_toBottomOf="@id/layout_plan_category_topCategory"> | ||
|
|
||
| <include | ||
| android:id="@+id/include_plan_category_type_multi" | ||
| layout="@layout/view_plan_category_type" | ||
| android:layout_width="wrap_content" | ||
| android:layout_height="0dp" | ||
|
Comment on lines
+78
to
+79
There was a problem hiding this comment. width -> 0dp 이유는 왤까요? |
||
| selection="@{planViewModel.selectedCategory == planCategory.MULTI}" | ||
| android:onClick="@{()->planViewModel.setSelectedCategory(planCategory.MULTI)}" | ||
| app:categoryType="@{planCategory.MULTI}" | ||
| app:layout_constraintStart_toStartOf="parent" /> | ||
|
|
||
| <include | ||
| android:id="@+id/include_plan_category_type_others" | ||
| layout="@layout/view_plan_category_type" | ||
| android:layout_width="wrap_content" | ||
| android:layout_height="0dp" | ||
| selection="@{planViewModel.selectedCategory == planCategory.OTHERS}" | ||
| android:onClick="@{()->planViewModel.setSelectedCategory(planCategory.OTHERS)}" | ||
| android:layout_marginStart="@dimen/spacing9" | ||
| app:categoryType="@{planCategory.OTHERS}" | ||
| app:layout_constraintEnd_toEndOf="parent" | ||
| app:layout_constraintStart_toEndOf="@id/include_plan_category_type_multi" /> | ||
| </androidx.constraintlayout.widget.ConstraintLayout> | ||
|
|
||
|
Comment on lines
+66
to
+97
There was a problem hiding this comment. 여기도 위와 동일합니다. 불필요한 depth를 줄여주세요 |
||
|
|
||
| </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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,66 @@ | ||
| <?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" /> | ||
|
|
||
|
Comment on lines
+8
to
+11
There was a problem hiding this comment. 여기에 뷰모델을 추가할 필요는 없어 보입니다 제거해주세요 |
||
| <variable | ||
| name="categoryType" | ||
| type="org.sopt.pingle.presentation.type.CategoryType" /> | ||
|
|
||
| <import type="org.sopt.pingle.presentation.type.CategoryType" /> | ||
|
|
||
| </data> | ||
|
|
||
| <androidx.constraintlayout.widget.ConstraintLayout | ||
| android:layout_width="wrap_content" | ||
| android:layout_height="wrap_content" | ||
| android:background="@drawable/selector_item_plan_location_category"> | ||
|
There was a problem hiding this comment. 요거 배경 바꾸면서 background tint 조절 고고 |
||
|
|
||
| <!--TODO image="@{categoryType.categoryIconRes}" --> | ||
| <ImageView | ||
| android:id="@+id/iv_plan_category_type" | ||
| android:layout_width="84dp" | ||
| android:layout_height="84dp" | ||
|
Comment on lines
+27
to
+28
There was a problem hiding this comment. 에셋 나오면 wrap_content나 0dp 로 설정해주는 거 알죵? |
||
| android:layout_marginHorizontal="38dp" | ||
|
There was a problem hiding this comment. 좌우 정렬을 모두 했으므로 이 마진값 제거해주세요 |
||
| android:layout_marginTop="@dimen/spacing13" | ||
| android:src="@drawable/ic_all_warning_notice_24" | ||
| app:layout_constraintDimensionRatio="1" | ||
| app:layout_constraintEnd_toEndOf="parent" | ||
| app:layout_constraintStart_toStartOf="parent" | ||
| app:layout_constraintTop_toTopOf="parent" /> | ||
|
|
||
| <TextView | ||
| android:id="@+id/tv_plan_category_name" | ||
| color="@{categoryType.textColor}" | ||
| android:layout_width="wrap_content" | ||
| android:layout_height="wrap_content" | ||
| android:layout_marginTop="@dimen/spacing3" | ||
| android:background="@color/g_10" | ||
| android:text="@{categoryType.categoryNameRes}" | ||
| android:textAppearance="@style/TextAppearance.Pingle.Title.Semi.20" | ||
|
|
||
| app:layout_constraintEnd_toEndOf="parent" | ||
| app:layout_constraintStart_toStartOf="parent" | ||
| app:layout_constraintTop_toBottomOf="@id/iv_plan_category_type" | ||
| tools:text="PLAY" /> | ||
|
|
||
| <TextView | ||
| android:id="@+id/tv_plan_category_description" | ||
| android:layout_width="wrap_content" | ||
| android:layout_height="wrap_content" | ||
| android:layout_marginTop="@dimen/spacing3" | ||
| android:layout_marginBottom="20dp" | ||
| android:text="@{categoryType.categoryDescriptionRes}" | ||
| android:textAppearance="@style/TextAppearance.Pingle.Cap.Med.12" | ||
| android:textColor="@color/g_04" | ||
| app:layout_constraintBottom_toBottomOf="parent" | ||
| app:layout_constraintEnd_toEndOf="parent" | ||
| app:layout_constraintStart_toStartOf="parent" | ||
| app:layout_constraintTop_toBottomOf="@id/tv_plan_category_name" | ||
| tools:text="설명 텍스트 미정" /> | ||
| </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.
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.
이거 이미 BindingFragmen에 있어서 적용해주지 않아도 됩니다.
또한, Fragment에서 lifecycleOwner를 잘 설정해주는 것이 중요한데요. 여기서 this를 사용하는 것이 적절할까요?
어떤 걸 쓰면 좋을지 고민해보구 그 이유를 알려주세용