Skip to content

Commit

Permalink
refactor : 키워드 화면 내 온보딩 아이디 오류 수정
Browse files Browse the repository at this point in the history
  • Loading branch information
@huiwoo-jo
huiwoo-jo committed Apr 1, 2024
1 parent 2cca5e4 commit eb1874b
Show file tree
Hide file tree
Showing 2 changed files with 33 additions and 33 deletions.
10 changes: 5 additions & 5 deletions app/src/main/java/com/dongyang/android/youdongknowme/ui/view/keyword/KeywordActivity.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@ class KeywordActivity : BaseActivity<ActivityKeywordBinding, KeywordViewModel>()
viewModel.setAllKeywords(t?.filter { it.isSubscribe }?.map { it.name }
?: listOf(""))
setCheckChipChange(
binding.chipGroupOnboardingKeywordClass,
binding.chipGroupOnboardingKeywordMoney,
binding.chipGroupOnboardingKeywordAcademic,
binding.chipGroupOnboardingKeywordEmployment,
binding.chipGroupOnboardingKeywordEtc
binding.chipGroupKeywordClass,
binding.chipGroupKeywordMoney,
binding.chipGroupKeywordAcademic,
binding.chipGroupKeywordEmployment,
binding.chipGroupKeywordEtc
)
viewModel.localKeywordList.removeObserver(this)
}
Expand Down
56 changes: 28 additions & 28 deletions app/src/main/res/layout/activity_keyword.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
app:title="@{@string/keyword_title}" />

<ScrollView
android:id="@+id/sv_onboarding_keyword"
android:id="@+id/sv_keyword"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
Expand All @@ -37,11 +37,11 @@
android:layout_height="wrap_content">

<LinearLayout
android:id="@+id/linearLayout_onboarding_keyword_class"
android:id="@+id/linearLayout_keyword_class"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
app:layout_constraintBottom_toTopOf="@id/view_onboarding_stroke_1"
app:layout_constraintBottom_toTopOf="@id/view_stroke_1"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">

Expand All @@ -54,7 +54,7 @@
android:textColor="@color/black" />

<com.google.android.material.chip.ChipGroup
android:id="@+id/chipGroup_onboarding_keyword_class"
android:id="@+id/chipGroup_keyword_class"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
Expand Down Expand Up @@ -82,22 +82,22 @@
</LinearLayout>

<View
android:id="@+id/view_onboarding_stroke_1"
android:id="@+id/view_stroke_1"
android:layout_width="match_parent"
android:layout_height="0.5dp"
android:layout_marginVertical="20dp"
android:background="@color/line"
app:layout_constraintBottom_toTopOf="@id/linearLayout_onboarding_keyword_academic"
app:layout_constraintTop_toBottomOf="@id/linearLayout_onboarding_keyword_class" />
app:layout_constraintBottom_toTopOf="@id/linearLayout_keyword_academic"
app:layout_constraintTop_toBottomOf="@id/linearLayout_keyword_class" />

<LinearLayout
android:id="@+id/linearLayout_onboarding_keyword_academic"
android:id="@+id/linearLayout_keyword_academic"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginVertical="20dp"
android:orientation="vertical"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/view_onboarding_stroke_1">
app:layout_constraintTop_toBottomOf="@id/view_stroke_1">

<TextView
style="@style/PretendardMedium20"
Expand All @@ -108,7 +108,7 @@
android:textColor="@color/black" />

<com.google.android.material.chip.ChipGroup
android:id="@+id/chipGroup_onboarding_keyword_academic"
android:id="@+id/chipGroup_keyword_academic"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
Expand Down Expand Up @@ -139,22 +139,22 @@
</LinearLayout>

<View
android:id="@+id/view_onboarding_stroke_2"
android:id="@+id/view_stroke_2"
android:layout_width="match_parent"
android:layout_height="0.5dp"
android:layout_marginTop="20dp"
android:background="@color/line"
app:layout_constraintBottom_toTopOf="@id/linearLayout_onboarding_keyword_money"
app:layout_constraintTop_toBottomOf="@id/linearLayout_onboarding_keyword_academic" />
app:layout_constraintBottom_toTopOf="@id/linearLayout_keyword_money"
app:layout_constraintTop_toBottomOf="@id/linearLayout_keyword_academic" />

<LinearLayout
android:id="@+id/linearLayout_onboarding_keyword_money"
android:id="@+id/linearLayout_keyword_money"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
android:orientation="vertical"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/view_onboarding_stroke_2">
app:layout_constraintTop_toBottomOf="@id/view_stroke_2">

<TextView
style="@style/PretendardMedium20"
Expand All @@ -165,7 +165,7 @@
android:textColor="@color/black" />

<com.google.android.material.chip.ChipGroup
android:id="@+id/chipGroup_onboarding_keyword_money"
android:id="@+id/chipGroup_keyword_money"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
Expand All @@ -188,22 +188,22 @@
</LinearLayout>

<View
android:id="@+id/view_onboarding_stroke_3"
android:id="@+id/view_stroke_3"
android:layout_width="match_parent"
android:layout_height="0.5dp"
android:layout_marginTop="20dp"
android:background="@color/line"
app:layout_constraintBottom_toTopOf="@id/linearLayout_onboarding_keyword_employment"
app:layout_constraintTop_toBottomOf="@id/linearLayout_onboarding_keyword_money" />
app:layout_constraintBottom_toTopOf="@id/linearLayout_keyword_employment"
app:layout_constraintTop_toBottomOf="@id/linearLayout_keyword_money" />

<LinearLayout
android:id="@+id/linearLayout_onboarding_keyword_employment"
android:id="@+id/linearLayout_keyword_employment"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
android:orientation="vertical"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/view_onboarding_stroke_3">
app:layout_constraintTop_toBottomOf="@id/view_stroke_3">

<TextView
style="@style/PretendardMedium20"
Expand All @@ -214,7 +214,7 @@
android:textColor="@color/black" />

<com.google.android.material.chip.ChipGroup
android:id="@+id/chipGroup_onboarding_keyword_employment"
android:id="@+id/chipGroup_keyword_employment"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
Expand Down Expand Up @@ -245,22 +245,22 @@
</LinearLayout>

<View
android:id="@+id/view_onboarding_stroke_4"
android:id="@+id/view_stroke_4"
android:layout_width="match_parent"
android:layout_height="0.5dp"
android:layout_marginTop="20dp"
android:background="@color/line"
app:layout_constraintBottom_toTopOf="@id/linearLayout_onboarding_keyword_etc"
app:layout_constraintTop_toBottomOf="@id/linearLayout_onboarding_keyword_employment" />
app:layout_constraintBottom_toTopOf="@id/linearLayout_keyword_etc"
app:layout_constraintTop_toBottomOf="@id/linearLayout_keyword_employment" />

<LinearLayout
android:id="@+id/linearLayout_onboarding_keyword_etc"
android:id="@+id/linearLayout_keyword_etc"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
android:orientation="vertical"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/view_onboarding_stroke_4">
app:layout_constraintTop_toBottomOf="@id/view_stroke_4">

<TextView
style="@style/PretendardMedium20"
Expand All @@ -271,7 +271,7 @@
android:textColor="@color/black" />

<com.google.android.material.chip.ChipGroup
android:id="@+id/chipGroup_onboarding_keyword_etc"
android:id="@+id/chipGroup_keyword_etc"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
Expand Down

0 comments on commit eb1874b

Please sign in to comment.