Skip to content

Commit

Permalink
Merge pull request #41 from Team-Sopetit/feature/#40-fix-issue
Browse files Browse the repository at this point in the history 
#40 [ui] 온보딩 테마&루틴 선택 뷰 수정
  • Loading branch information
@emjayMJkim
emjayMJkim authored Jan 13, 2024
2 parents 32356af + b7ab7c1 commit cb152cd
Show file tree
Hide file tree
Showing 4 changed files with 68 additions and 42 deletions.
8 changes: 8 additions & 0 deletions app/src/main/res/drawable/shape_background_gradation_bot_fill_0_rect.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<gradient
android:startColor="@color/background"
android:angle="90"/>

</shape>
8 changes: 8 additions & 0 deletions app/src/main/res/drawable/shape_background_gradation_top_fill_0_rect.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<gradient
android:endColor="@color/background"
android:angle="90"/>

</shape>
86 changes: 47 additions & 39 deletions app/src/main/res/layout/fragment_onboarding_choice_routine.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@

<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="match_parent"
android:background="@color/background">

<ImageView
android:id="@+id/iv_onboarding_choice_routine_title_bear"
Expand Down Expand Up @@ -67,11 +68,27 @@
android:scrollbarStyle="outsideInset"
android:scrollbarThumbVertical="@drawable/ic_scrollbar"
app:layout_constraintTop_toBottomOf="@id/iv_onboarding_choice_routine_speech_background"
app:layout_constraintBottom_toTopOf="@id/cl_onboarding_choice_routine_btn"
app:layout_constraintBottom_toTopOf="@id/btn_onboarding_routine_back_theme"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
tools:listitem="@layout/item_onboarding_choice_routine" />

<ImageView
android:layout_width="0dp"
android:layout_height="30dp"
android:background="@drawable/shape_background_gradation_top_fill_0_rect"
app:layout_constraintTop_toTopOf="@id/rv_onboarding_choice_routine"
app:layout_constraintStart_toStartOf="@id/rv_onboarding_choice_routine"
app:layout_constraintEnd_toEndOf="@id/rv_onboarding_choice_routine" />

<ImageView
android:layout_width="0dp"
android:layout_height="30dp"
android:background="@drawable/shape_background_gradation_bot_fill_0_rect"
app:layout_constraintBottom_toBottomOf="@id/rv_onboarding_choice_routine"
app:layout_constraintStart_toStartOf="@id/rv_onboarding_choice_routine"
app:layout_constraintEnd_toEndOf="@id/rv_onboarding_choice_routine" />

<TextView
android:id="@+id/tv_onboarding_choice_routine_notice"
android:layout_width="wrap_content"
Expand All @@ -81,52 +98,43 @@
android:textAppearance="@style/body4"
android:textColor="@color/red"
android:visibility="@{routineViewModel.isNoticeVisible ? View.VISIBLE : View.INVISIBLE}"
app:layout_constraintBottom_toTopOf="@id/cl_onboarding_choice_routine_btn"
app:layout_constraintBottom_toTopOf="@id/btn_onboarding_routine_back_theme"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent" />

<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/cl_onboarding_choice_routine_btn"
<androidx.appcompat.widget.AppCompatButton
android:id="@+id/btn_onboarding_routine_back_theme"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:text="@string/onboarding_routine_back_btn"
android:textAppearance="@style/body1"
android:textColor="@color/gray300"
android:paddingVertical="20dp"
android:background="@drawable/shape_gray100_fill_12_rect"
android:layout_marginStart="20dp"
android:layout_marginBottom="33dp"
android:layout_marginHorizontal="20dp"
android:outlineProvider="none"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_chainStyle="spread_inside">

<androidx.appcompat.widget.AppCompatButton
android:id="@+id/btn_onboarding_routine_back_theme"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:text="@string/onboarding_routine_back_btn"
android:textAppearance="@style/body1"
android:textColor="@color/gray300"
android:paddingVertical="20dp"
android:background="@drawable/shape_gray100_fill_12_rect"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toStartOf="@id/btn_onboarding_routine_select_routine" />

<androidx.appcompat.widget.AppCompatButton
android:id="@+id/btn_onboarding_routine_select_routine"
android:layout_width="0dp"
android:layout_height="0dp"
android:text="@string/onboarding_routine_select_btn"
android:textAppearance="@style/body1"
android:textColor="@color/gray000"
android:layout_marginStart="10dp"
android:background="@{routineViewModel.isRoutineBtnEnabled ? @drawable/shape_main1_fill_12_rect : @drawable/shape_gray200_fill_12_rect}"
android:enabled="@{routineViewModel.isRoutineBtnEnabled ? true : false}"
android:clickable="@{routineViewModel.isRoutineBtnEnabled ? true : false}"
app:layout_constraintTop_toTopOf="@id/btn_onboarding_routine_back_theme"
app:layout_constraintBottom_toBottomOf="@id/btn_onboarding_routine_back_theme"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/btn_onboarding_routine_back_theme" />
app:layout_constraintEnd_toStartOf="@id/btn_onboarding_routine_select_routine" />

</androidx.constraintlayout.widget.ConstraintLayout>
<androidx.appcompat.widget.AppCompatButton
android:id="@+id/btn_onboarding_routine_select_routine"
android:layout_width="0dp"
android:layout_height="0dp"
android:text="@string/onboarding_routine_select_btn"
android:textAppearance="@style/body1"
android:textColor="@color/gray000"
android:layout_marginStart="10dp"
android:layout_marginEnd="20dp"
android:background="@{routineViewModel.isRoutineBtnEnabled ? @drawable/shape_main1_fill_12_rect : @drawable/shape_gray200_fill_12_rect}"
android:enabled="@{routineViewModel.isRoutineBtnEnabled ? true : false}"
android:clickable="@{routineViewModel.isRoutineBtnEnabled ? true : false}"
android:outlineProvider="none"
app:layout_constraintTop_toTopOf="@id/btn_onboarding_routine_back_theme"
app:layout_constraintBottom_toBottomOf="@id/btn_onboarding_routine_back_theme"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/btn_onboarding_routine_back_theme" />

</androidx.constraintlayout.widget.ConstraintLayout>
</layout>
8 changes: 5 additions & 3 deletions app/src/main/res/layout/fragment_onboarding_choice_theme.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,14 @@
android:id="@+id/rv_onboarding_choice_theme"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginHorizontal="21dp"
android:layout_marginTop="34dp"
android:layout_marginBottom="21dp"
android:layout_marginHorizontal="21dp"
app:layout_constraintStart_toStartOf="parent"
android:overScrollMode="never"
app:layout_constraintBottom_toTopOf="@id/btn_onboarding_choice_theme"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/iv_onboarding_choice_theme_title_bear"
app:layout_constraintBottom_toTopOf="@id/btn_onboarding_choice_theme"
tools:listitem="@layout/item_onboarding_choice_theme" />

<androidx.appcompat.widget.AppCompatButton
Expand All @@ -44,6 +45,7 @@
android:background="@{themeViewModel.themeBtnEnabled ? @drawable/shape_main1_fill_12_rect : @drawable/shape_gray200_fill_12_rect}"
android:enabled="@{themeViewModel.themeBtnEnabled ? true : false}"
android:clickable="@{themeViewModel.themeBtnEnabled ? true : false}"
android:outlineProvider="none"
android:layout_marginHorizontal="20dp"
android:layout_marginBottom="34dp"
app:layout_constraintStart_toStartOf="parent"
Expand Down

0 comments on commit cb152cd

Please sign in to comment.