diff --git a/app/src/main/java/com/sopetit/softie/ui/onboarding/themechoice/ChoiceThemeFragment.kt b/app/src/main/java/com/sopetit/softie/ui/onboarding/themechoice/ChoiceThemeFragment.kt index 1c8fe27e..7acfe5e7 100644 --- a/app/src/main/java/com/sopetit/softie/ui/onboarding/themechoice/ChoiceThemeFragment.kt +++ b/app/src/main/java/com/sopetit/softie/ui/onboarding/themechoice/ChoiceThemeFragment.kt @@ -1,7 +1,11 @@ package com.sopetit.softie.ui.onboarding.themechoice import android.os.Bundle +import android.text.SpannableStringBuilder +import android.text.Spanned +import android.text.style.ForegroundColorSpan import android.view.View +import androidx.core.content.ContextCompat import androidx.fragment.app.viewModels import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.GridLayoutManager @@ -20,13 +24,28 @@ class ChoiceThemeFragment : private val choiceThemeAdapter get() = requireNotNull(_choiceThemeAdapter) + override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) viewModel = ViewModelProvider(requireActivity()).get(OnboardingViewModel::class.java) binding.viewModel = viewModel - initChangeFragment() + binding.tvOnboardingChoiceThemeSpeech.text = + SpannableStringBuilder(getString(R.string.onboarding_choice_theme_speech)).apply { + setSpan( + ForegroundColorSpan( + ContextCompat.getColor( + requireActivity(), + R.color.onboarding_speech + ) + ), + 5, + 8, + Spanned.SPAN_EXCLUSIVE_EXCLUSIVE + ) + } + initMakeThemeAdapter() } diff --git a/app/src/main/res/layout/fragment_onboarding_choice_theme.xml b/app/src/main/res/layout/fragment_onboarding_choice_theme.xml index ad1f2bcc..ea176186 100644 --- a/app/src/main/res/layout/fragment_onboarding_choice_theme.xml +++ b/app/src/main/res/layout/fragment_onboarding_choice_theme.xml @@ -25,6 +25,32 @@ app:layout_constraintTop_toTopOf="parent" app:layout_constraintStart_toStartOf="parent" /> + + + + #FFD4BBA5 #FFC4AC98 + + + #FF259560 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index de2e12ac..18fce077 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -3,6 +3,7 @@ 다 선택했어 하루의 시작 + 안녕 난 애착이야!\n나와 함께 루틴을 만들어볼까? 행복루틴