diff --git a/presentation/src/main/java/com/going/presentation/onboarding/OnboardingProfileSettingActivity.kt b/presentation/src/main/java/com/going/presentation/onboarding/OnboardingProfileSettingActivity.kt index 7e7aedfe..ae68cc7c 100644 --- a/presentation/src/main/java/com/going/presentation/onboarding/OnboardingProfileSettingActivity.kt +++ b/presentation/src/main/java/com/going/presentation/onboarding/OnboardingProfileSettingActivity.kt @@ -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) diff --git a/presentation/src/main/res/drawable/sel_radiobutton_checked.xml b/presentation/src/main/res/drawable/sel_radiobutton_checked.xml deleted file mode 100644 index 18735f5f..00000000 --- a/presentation/src/main/res/drawable/sel_radiobutton_checked.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/presentation/src/main/res/drawable/sel_radiobutton_unchecked.xml b/presentation/src/main/res/drawable/sel_radiobutton_unchecked.xml deleted file mode 100644 index ea534d53..00000000 --- a/presentation/src/main/res/drawable/sel_radiobutton_unchecked.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/presentation/src/main/res/drawable/sel_rounded_corner_edit_text.xml b/presentation/src/main/res/drawable/sel_rounded_corner_edit_text.xml deleted file mode 100644 index cbe3888c..00000000 --- a/presentation/src/main/res/drawable/sel_rounded_corner_edit_text.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/presentation/src/main/res/drawable/sel_rounded_corner_edit_text_empty.xml b/presentation/src/main/res/drawable/sel_rounded_corner_edit_text_empty.xml deleted file mode 100644 index 0c2bf580..00000000 --- a/presentation/src/main/res/drawable/sel_rounded_corner_edit_text_empty.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/presentation/src/main/res/drawable/sel_rounded_corner_edit_text_error.xml b/presentation/src/main/res/drawable/sel_rounded_corner_edit_text_error.xml deleted file mode 100644 index f8a3f0b8..00000000 --- a/presentation/src/main/res/drawable/sel_rounded_corner_edit_text_error.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/presentation/src/main/res/drawable/shape_radiobutton_checked.xml b/presentation/src/main/res/drawable/shape_radiobutton_checked.xml new file mode 100644 index 00000000..3b32dd95 --- /dev/null +++ b/presentation/src/main/res/drawable/shape_radiobutton_checked.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/presentation/src/main/res/drawable/shape_radiobutton_unchecked.xml b/presentation/src/main/res/drawable/shape_radiobutton_unchecked.xml new file mode 100644 index 00000000..e8aa7c58 --- /dev/null +++ b/presentation/src/main/res/drawable/shape_radiobutton_unchecked.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/presentation/src/main/res/drawable/shape_rounded_corner_edit_text.xml b/presentation/src/main/res/drawable/shape_rounded_corner_edit_text.xml new file mode 100644 index 00000000..b62c8374 --- /dev/null +++ b/presentation/src/main/res/drawable/shape_rounded_corner_edit_text.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/presentation/src/main/res/drawable/shape_rounded_corner_edit_text_empty.xml b/presentation/src/main/res/drawable/shape_rounded_corner_edit_text_empty.xml new file mode 100644 index 00000000..136ddda6 --- /dev/null +++ b/presentation/src/main/res/drawable/shape_rounded_corner_edit_text_empty.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/presentation/src/main/res/drawable/shape_rounded_corner_edit_text_error.xml b/presentation/src/main/res/drawable/shape_rounded_corner_edit_text_error.xml new file mode 100644 index 00000000..b77c8d14 --- /dev/null +++ b/presentation/src/main/res/drawable/shape_rounded_corner_edit_text_error.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/presentation/src/main/res/layout/activity_onboarding_profile_setting.xml b/presentation/src/main/res/layout/activity_onboarding_profile_setting.xml index f9099d0e..b2370812 100644 --- a/presentation/src/main/res/layout/activity_onboarding_profile_setting.xml +++ b/presentation/src/main/res/layout/activity_onboarding_profile_setting.xml @@ -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" @@ -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" diff --git a/presentation/src/main/res/layout/activity_tendency_test.xml b/presentation/src/main/res/layout/activity_tendency_test.xml index a4a80452..8cd774e9 100644 --- a/presentation/src/main/res/layout/activity_tendency_test.xml +++ b/presentation/src/main/res/layout/activity_tendency_test.xml @@ -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}" /> @@ -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}" /> @@ -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}" /> @@ -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}" />