Skip to content

Commit

Permalink
[CHORE/#27] 컴포넌트 명 변경
Browse files Browse the repository at this point in the history
  • Loading branch information
chattymin committed Jan 6, 2024
1 parent 4916696 commit 02d047a
Show file tree
Hide file tree
Showing 13 changed files with 43 additions and 63 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -93,10 +93,10 @@ class OnboardingProfileSettingActivity :
setBackground: (Int) -> Unit,
) {
val (color, background) = when {
viewModel.isNameAvailable.value != NameState.Blank && hasFocus -> R.color.gray_700 to R.drawable.sel_rounded_corner_edit_text
length == 0 -> R.color.gray_200 to R.drawable.sel_rounded_corner_edit_text_empty
viewModel.isNameAvailable.value == NameState.Blank && counter == binding.tvNameCounter -> R.color.red_500 to R.drawable.sel_rounded_corner_edit_text_error
else -> R.color.gray_700 to R.drawable.sel_rounded_corner_edit_text
viewModel.isNameAvailable.value != NameState.Blank && hasFocus -> R.color.gray_700 to R.drawable.shape_rounded_corner_edit_text
length == 0 -> R.color.gray_200 to R.drawable.shape_rounded_corner_edit_text_empty
viewModel.isNameAvailable.value == NameState.Blank && counter == binding.tvNameCounter -> R.color.red_500 to R.drawable.shape_rounded_corner_edit_text_error
else -> R.color.gray_700 to R.drawable.shape_rounded_corner_edit_text
}

setCounterColor(counter, color)
Expand Down
10 changes: 0 additions & 10 deletions presentation/src/main/res/drawable/sel_radiobutton_checked.xml

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

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">
<stroke android:width="1dp" />
<stroke android:color="@color/red_500" />
<corners android:radius="8dp" />
</shape>
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners android:radius="8dp" />
<solid android:color="@color/gray_50" />
</shape>
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">
<stroke android:width="1dp"/>
<stroke android:color="@color/gray_700"/>
<corners android:radius="4dp" />
</shape>
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">
<stroke android:width="1dp"/>
<stroke android:color="@color/gray_200"/>
<corners android:radius="4dp" />
</shape>
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">
<stroke android:width="1dp"/>
<stroke android:color="@color/red_500"/>
<corners android:radius="4dp" />
</shape>
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
android:layout_marginHorizontal="24dp"
android:layout_marginTop="6dp"
android:afterTextChanged="@{(text) -> viewModel.checkProfileAvailable()}"
android:background="@drawable/sel_rounded_corner_edit_text_empty"
android:background="@drawable/shape_rounded_corner_edit_text_empty"
android:hint="@string/onboarding_et_name_hint"
android:imeOptions="actionNext"
android:inputType="text"
Expand Down Expand Up @@ -100,7 +100,7 @@
android:layout_marginHorizontal="24dp"
android:layout_marginTop="6dp"
android:afterTextChanged="@{(text) -> viewModel.checkProfileAvailable()}"
android:background="@drawable/sel_rounded_corner_edit_text_empty"
android:background="@drawable/shape_rounded_corner_edit_text_empty"
android:hint="@string/onboarding_one_line_et_info"
android:imeOptions="actionDone"
android:inputType="text"
Expand Down
16 changes: 8 additions & 8 deletions presentation/src/main/res/layout/activity_tendency_test.xml
Original file line number Diff line number Diff line change
Expand Up @@ -78,15 +78,15 @@
style="@style/radio_button_style"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@{viewModel.isFirstChecked ? @drawable/sel_radiobutton_checked : @drawable/sel_radiobutton_unchecked}" />
android:background="@{viewModel.isFirstChecked ? @drawable/shape_radiobutton_checked : @drawable/shape_radiobutton_unchecked}" />

<TextView
android:id="@+id/tv_first_answer"
style="@style/radio_button_style"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:clickable="true"
android:background="@color/transparent"
android:clickable="true"
android:onClick="@{() -> viewModel.setCheckedValue(1)}"
android:text="@{viewModel.mockList.get(viewModel.step - 1).component2()}"
android:textAppearance="@style/TextAppearance.Doorip.Body3.Medi" />
Expand All @@ -106,15 +106,15 @@
style="@style/radio_button_style"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@{viewModel.isSecondChecked ? @drawable/sel_radiobutton_checked : @drawable/sel_radiobutton_unchecked}" />
android:background="@{viewModel.isSecondChecked ? @drawable/shape_radiobutton_checked : @drawable/shape_radiobutton_unchecked}" />

<TextView
android:id="@+id/tv_second_answer"
style="@style/radio_button_style"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:clickable="true"
android:background="@color/transparent"
android:clickable="true"
android:onClick="@{() -> viewModel.setCheckedValue(2)}"
android:text="@{viewModel.mockList.get(viewModel.step - 1).component3()}"
android:textAppearance="@style/TextAppearance.Doorip.Body3.Medi" />
Expand All @@ -134,15 +134,15 @@
style="@style/radio_button_style"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@{viewModel.isThirdChecked ? @drawable/sel_radiobutton_checked : @drawable/sel_radiobutton_unchecked}" />
android:background="@{viewModel.isThirdChecked ? @drawable/shape_radiobutton_checked : @drawable/shape_radiobutton_unchecked}" />

<TextView
android:id="@+id/tv_third_answer"
style="@style/radio_button_style"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:clickable="true"
android:background="@color/transparent"
android:clickable="true"
android:onClick="@{() -> viewModel.setCheckedValue(3)}"
android:text="@{viewModel.mockList.get(viewModel.step - 1).component4()}"
android:textAppearance="@style/TextAppearance.Doorip.Body3.Medi" />
Expand All @@ -162,15 +162,15 @@
style="@style/radio_button_style"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@{viewModel.isFourthChecked ? @drawable/sel_radiobutton_checked : @drawable/sel_radiobutton_unchecked}" />
android:background="@{viewModel.isFourthChecked ? @drawable/shape_radiobutton_checked : @drawable/shape_radiobutton_unchecked}" />

<TextView
android:id="@+id/tv_fourth_answer"
style="@style/radio_button_style"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:clickable="true"
android:background="@color/transparent"
android:clickable="true"
android:onClick="@{() -> viewModel.setCheckedValue(4)}"
android:text="@{viewModel.mockList.get(viewModel.step - 1).component5()}"
android:textAppearance="@style/TextAppearance.Doorip.Body3.Medi" />
Expand Down

0 comments on commit 02d047a

Please sign in to comment.