Merge remote-tracking branch 'origin/develop' into feature/#52-fix-ha…

…ppy-empty-view

# Conflicts:
#	app/src/main/java/com/sopetit/softie/ui/happyroutine/HappyRoutineFragment.kt
#	app/src/main/java/com/sopetit/softie/ui/main/MainActivity.kt

app/src/main/java/com/sopetit/softie/ui/dailyroutine/DailyRoutineCompleteActivity.kt

@@ -6,11 +6,13 @@ import com.sopetit.softie.domain.entity.Bear
 import com.sopetit.softie.domain.entity.Cotton
 import com.sopetit.softie.util.RoutineCompleteActivity
 import com.sopetit.softie.util.intentSerializable
+import com.sopetit.softie.util.setStatusBarColorFromResource
 
 class DailyRoutineCompleteActivity() : RoutineCompleteActivity(Cotton.DAILY) {
     private lateinit var bear: Bear
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        setStatusBarColorFromResource(R.color.white)
 
         getBearType()
         setDailyRoutineImage()

app/src/main/java/com/sopetit/softie/ui/dailyroutine/dailyroutineadd/DailyRoutineAddActivity.kt

@@ -12,6 +12,7 @@ import com.sopetit.softie.R
 import com.sopetit.softie.databinding.ActivityDailyRoutineAddBinding
 import com.sopetit.softie.domain.entity.Theme
 import com.sopetit.softie.util.binding.BindingActivity
+import com.sopetit.softie.util.setStatusBarColorFromResource
 
 class DailyRoutineAddActivity :
     BindingActivity<ActivityDailyRoutineAddBinding>(R.layout.activity_daily_routine_add) {
@@ -25,6 +26,7 @@ class DailyRoutineAddActivity :
         super.onCreate(savedInstanceState)
         viewPager = binding.vpDailyRoutineAddCard
         binding.viewModel = dailyRoutineAddViewModel
+        setStatusBarColorFromResource(R.color.background)
 
         setupAdapter()
         setViewPager()

app/src/main/java/com/sopetit/softie/ui/happyroutine/HappyRoutineCompleteActivity.kt

@@ -6,11 +6,13 @@ import com.sopetit.softie.domain.entity.Bear
 import com.sopetit.softie.domain.entity.Cotton
 import com.sopetit.softie.util.RoutineCompleteActivity
 import com.sopetit.softie.util.intentSerializable
+import com.sopetit.softie.util.setStatusBarColorFromResource
 
 class HappyRoutineCompleteActivity : RoutineCompleteActivity(Cotton.HAPPINESS) {
     lateinit var bear: Bear
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        setStatusBarColorFromResource(R.color.white)
 
         getBearType()
         setHappyRoutineImage()

app/src/main/java/com/sopetit/softie/ui/happyroutine/adddetail/HappyDetailActivity.kt

@@ -15,6 +15,7 @@ import com.sopetit.softie.databinding.ActivityHappyAddDetailBinding
 import com.sopetit.softie.ui.happyroutine.addlist.HappyAddListActivity.Companion.ID
 import com.sopetit.softie.ui.main.MainActivity
 import com.sopetit.softie.util.binding.BindingActivity
+import com.sopetit.softie.util.setStatusBarColorFromResource
 
 class HappyDetailActivity :
     BindingActivity<ActivityHappyAddDetailBinding>(R.layout.activity_happy_add_detail) {
@@ -26,6 +27,7 @@ class HappyDetailActivity :
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         viewPager = binding.vpHappyAddDetailCard
+        setStatusBarColorFromResource(R.color.background)
 
         val categoryId = intent.getIntExtra(ID, -1)
         val viewModel = ViewModelProvider(this).get(HappyDetailCardViewModel::class.java)
@@ -61,10 +63,11 @@ class HappyDetailActivity :
     }
 
     private fun moveToProgress() {
-        Intent(this, MainActivity::class.java).apply {
-            putExtra("happy_progress_fragment", "happy_progress")
-            startActivity(this)
-        }
+        val intent = Intent(this, MainActivity::class.java)
+        intent.putExtra("happy_progress_fragment", "happy_progress")
+        intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK
+        startActivity(intent)
+        finish()
     }
 
     private fun setupAdapter(categoryId: Int) {

app/src/main/java/com/sopetit/softie/ui/happyroutine/addlist/HappyAddListActivity.kt

@@ -11,6 +11,7 @@ import com.sopetit.softie.ui.happyroutine.adddetail.HappyDetailActivity
 import com.sopetit.softie.util.HorizontalChipItemDecoration
 import com.sopetit.softie.util.VerticalItemDecoration
 import com.sopetit.softie.util.binding.BindingActivity
+import com.sopetit.softie.util.setStatusBarColorFromResource
 import dagger.hilt.android.AndroidEntryPoint
 
 @AndroidEntryPoint
@@ -30,6 +31,7 @@ class HappyAddListActivity :
         super.onCreate(savedInstanceState)
         binding = ActivityHappyAddListBinding.inflate(layoutInflater)
         setContentView(binding.root)
+        setStatusBarColorFromResource(R.color.background)
 
         setChipAdapters()
         setBackEnter()

app/src/main/java/com/sopetit/softie/ui/main/LoginActivity.kt

@@ -6,11 +6,13 @@ import com.sopetit.softie.R
 import com.sopetit.softie.databinding.ActivityLoginBinding
 import com.sopetit.softie.ui.storytelling.StoryTellingActivity
 import com.sopetit.softie.util.binding.BindingActivity
+import com.sopetit.softie.util.setStatusBarColorFromResource
 
 class LoginActivity : BindingActivity<ActivityLoginBinding>(R.layout.activity_login) {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        setStatusBarColorFromResource(R.color.background)
 
         initSetLogInBtn()
     }

app/src/main/java/com/sopetit/softie/ui/main/MainActivity.kt

@@ -23,10 +23,13 @@ class MainActivity : BindingActivity<ActivityMainBinding>(R.layout.activity_main
         initFragment()
         initBottomNavigation()
         setBottomNavigationClickListener()
+        changeToHappyProgressFragment()
+    }
 
+    private fun changeToHappyProgressFragment() {
         val fragmentToLoad = intent.getStringExtra("happy_progress_fragment")
         if (fragmentToLoad == "happy_progress") {
-            changeFragment(HappyProgressFragment())
+            loadHappyProgressFragment()
         }
     }
 
@@ -76,4 +79,12 @@ class MainActivity : BindingActivity<ActivityMainBinding>(R.layout.activity_main
             intArrayOf(selectedTextColor, unselectedTextColor)
         )
     }
+
+    private fun loadHappyProgressFragment() {
+        val fragmentTransaction = supportFragmentManager.beginTransaction()
+        setStatusBarColorFromResource(R.color.background)
+        binding.bnvMain.selectedItemId = R.id.bottom_navigation_happiness_routine
+        fragmentTransaction.replace(R.id.fcv_main, HappyProgressFragment())
+        fragmentTransaction.commit()
+    }
 }

app/src/main/java/com/sopetit/softie/ui/onboarding/bearnaming/BearNamingViewModel.kt

@@ -21,7 +21,11 @@ class BearNamingViewModel : ViewModel() {
             source
         } else {
             _isSpecialCharacterEntered.value = true
-            source.filter { it.isLetterOrDigit() }
+            if (source.length <= MAXIMUM_LENGTH) {
+                source.filter { it.isLetterOrDigit() }
+            } else {
+                source.substring(0, MAXIMUM_LENGTH)
+            }
         }
     }
 
@@ -34,7 +38,7 @@ class BearNamingViewModel : ViewModel() {
         private const val MINIMUM_LENGTH = 1
         private const val MAXIMUM_LENGTH = 10
         private const val NICKNAME_PATTERN =
-            "^[ㄱ-ㅣ가-힣a-zA-Z0-9\\u318D\\u119E\\u11A2\\u2022\\u2025a\\u00B7\\uFE55]+$"
+            "^[ㄱ-ㅣ가-힣a-zA-Z0-9\\u318D\\u119E\\u11A2\\u2022\\u2025a\\u00B7\\uFE55]{1,10}\$"
         val NICKNAME_REGEX: Pattern = Pattern.compile(NICKNAME_PATTERN)
     }
 }

app/src/main/java/com/sopetit/softie/ui/onboarding/splash/SplashActivity.kt

@@ -8,6 +8,7 @@ import com.sopetit.softie.R
 import com.sopetit.softie.databinding.ActivitySplashBinding
 import com.sopetit.softie.ui.main.LoginActivity
 import com.sopetit.softie.util.binding.BindingActivity
+import com.sopetit.softie.util.setStatusBarColorFromResource
 import kotlin.random.Random
 
 class SplashActivity : BindingActivity<ActivitySplashBinding>(R.layout.activity_splash) {
@@ -20,13 +21,18 @@ class SplashActivity : BindingActivity<ActivitySplashBinding>(R.layout.activity_
 
     private fun initCreateRandomVersion() {
         when (Random.nextInt(1, 5)) {
-            1 -> makeSplashImg(R.drawable.ic_splash1)
-            2 -> makeSplashImg(R.drawable.ic_splash2)
-            3 -> makeSplashImg(R.drawable.ic_splash3)
-            4 -> makeSplashImg(R.drawable.ic_splash4)
+            1 -> initSplash(R.drawable.ic_splash1, R.color.main2)
+            2 -> initSplash(R.drawable.ic_splash2, R.color.main2)
+            3 -> initSplash(R.drawable.ic_splash3, R.color.main1)
+            4 -> initSplash(R.drawable.ic_splash4, R.color.main1)
         }
     }
 
+    private fun initSplash(image: Int, color: Int) {
+        makeSplashImg(image)
+        setStatusBarColorFromResource(color)
+    }
+
     private fun makeSplashImg(image: Int) {
         binding.ivSplashBackground.setBackgroundResource(image)
         initMakeSplash()

app/src/main/java/com/sopetit/softie/ui/setting/SettingActivity.kt

@@ -6,6 +6,7 @@ import androidx.fragment.app.Fragment
 import com.sopetit.softie.R
 import com.sopetit.softie.databinding.ActivitySettingBinding
 import com.sopetit.softie.util.binding.BindingActivity
+import com.sopetit.softie.util.setStatusBarColorFromResource
 
 class SettingActivity : BindingActivity<ActivitySettingBinding>(R.layout.activity_setting) {
 
@@ -14,12 +15,14 @@ class SettingActivity : BindingActivity<ActivitySettingBinding>(R.layout.activit
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         binding.viewModel = viewModel
+        setStatusBarColorFromResource(R.color.white)
 
         initMakeInitFragment()
         initChangeFragment()
     }
 
     private fun initMakeInitFragment() {
+        viewModel.setSettingFragment(SETTING_INIT)
         val currentFragment = supportFragmentManager.findFragmentById(R.id.fcv_setting)
         if (currentFragment == null) {
             supportFragmentManager.beginTransaction()
@@ -29,6 +32,11 @@ class SettingActivity : BindingActivity<ActivitySettingBinding>(R.layout.activit
     }
 
     private fun initChangeFragment() {
+        setClickBackBtnInDetailView(SettingUserExitFragment())
+        setCLickSettingMenu()
+    }
+
+    private fun setCLickSettingMenu() {
         viewModel.settingFragment.observe(this) { clickSetting ->
             when (clickSetting) {
                 USER_SECURITY -> changeFragment(SettingUserSecurityFragment())
@@ -42,13 +50,12 @@ class SettingActivity : BindingActivity<ActivitySettingBinding>(R.layout.activit
         supportFragmentManager.beginTransaction()
             .replace(R.id.fcv_setting, fragment)
             .addToBackStack(FRAGMENT_STACK_TAG).commitAllowingStateLoss()
-
-        setClickBackBtnInDetailView(fragment)
     }
 
     private fun setClickBackBtnInDetailView(fragment: Fragment) {
         binding.btnSettingBack.setOnClickListener {
-            backInitView(fragment)
+            if (viewModel.settingFragment.value == SETTING_INIT) finish()
+            else backInitView(fragment)
         }
     }
 

app/src/main/res/layout/activity_daily_routine_add.xml

@@ -14,15 +14,16 @@
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        tools:context=".ui.dailyroutine.dailyroutineadd.DailyRoutineAddActivity"
-        android:fitsSystemWindows="true">
+        android:background="@color/background"
+        android:fitsSystemWindows="true"
+        tools:context=".ui.dailyroutine.dailyroutineadd.DailyRoutineAddActivity">
 
         <ImageView
             android:id="@+id/iv_daily_routine_add_back"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="18dp"
-            android:layout_marginTop="40dp"
+            android:layout_marginTop="16dp"
             android:background="@drawable/ic_daily_back"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
@@ -62,14 +63,14 @@
             android:id="@+id/vp_daily_routine_add_card"
             android:layout_width="match_parent"
             android:layout_height="0dp"
-            android:clipChildren="false"
-            android:clipToPadding="false"
             android:layout_marginTop="27dp"
             android:layout_marginBottom="91dp"
-            app:layout_constraintStart_toStartOf="parent"
+            android:clipChildren="false"
+            android:clipToPadding="false"
+            app:layout_constraintBottom_toTopOf="@id/btn_daily_routine_add"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/v_daily_routine_add_line"
-            app:layout_constraintBottom_toTopOf="@id/btn_daily_routine_add" />
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/v_daily_routine_add_line" />
 
         <com.tbuonomo.viewpagerdotsindicator.DotsIndicator
             android:id="@+id/di_daily_routine_add_indicator"
@@ -80,9 +81,9 @@
             app:dotsSize="6dp"
             app:dotsSpacing="6dp"
             app:dotsWidthFactor="1"
+            app:layout_constraintBottom_toTopOf="@id/btn_daily_routine_add"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintBottom_toTopOf="@id/btn_daily_routine_add"
             app:selectedDotColor="@color/main1" />
 
         <androidx.appcompat.widget.AppCompatButton
@@ -92,7 +93,8 @@
             android:layout_marginStart="20dp"
             android:layout_marginEnd="20dp"
             android:layout_marginBottom="34dp"
-            android:background="@drawable/shape_black_fill_20_rect"
+            android:background="@drawable/shape_main1_fill_12_rect"
+            style="?android:attr/borderlessButtonStyle"
             android:text="@string/daily_routine_add_btn"
             android:textAppearance="@style/body1"
             android:textColor="@color/gray000"

app/src/main/res/layout/activity_routine_complete.xml

@@ -9,7 +9,8 @@
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
+        android:background="@color/white">
 
         <TextView
             android:id="@+id/tv_routine_complete_title"

app/src/main/res/layout/fragment_happy_progress.xml

@@ -19,20 +19,22 @@
             android:layout_height="wrap_content"
             android:layout_marginStart="18dp"
             android:layout_marginTop="40dp"
-            android:visibility="visible"
             android:text="@string/happy_progress_title"
+            android:visibility="visible"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
         <TextView
             android:id="@+id/tv_happy_progress_edit"
+            style="@style/body4"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="44dp"
             android:layout_marginEnd="19dp"
             android:text="@string/happy_progress_edit"
+            android:textColor="@color/gray400"
+            app:layout_constraintBottom_toBottomOf="@id/tv_happy_progress_title"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+            app:layout_constraintTop_toTopOf="@id/tv_happy_progress_title" />
 
         <ImageView
             android:id="@+id/iv_happy_progress_mention"

app/src/main/res/layout/fragment_happy_routine.xml

@@ -13,7 +13,7 @@
 
         <TextView
             android:id="@+id/tv_happy_routine_title"
-            style="@style/head3"
+            style="@style/body1"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="20dp"
@@ -101,6 +101,5 @@
 
         </androidx.constraintlayout.widget.ConstraintLayout>
 
-
     </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>

app/src/main/res/layout/fragment_onboarding_bear_naming.xml

@@ -98,6 +98,7 @@
             android:clickable="@{viewModel.isNickNameValid ? true : false}"
             android:enabled="@{viewModel.isNickNameValid ? true : false}"
             android:text="@string/bear_naming_button"
+            style="?android:attr/borderlessButtonStyle"
             android:textAppearance="@style/body1"
             android:textColor="@color/gray000"
             app:layout_constraintBottom_toBottomOf="parent"

app/src/main/res/layout/fragment_onboarding_bear_selection.xml

@@ -95,6 +95,7 @@
             android:layout_height="57dp"
             android:layout_marginHorizontal="20dp"
             android:layout_marginBottom="34dp"
+            style="?android:attr/borderlessButtonStyle"
             android:background="@{viewModel.selectedBearType != 0 ? @drawable/shape_main1_fill_12_rect : @drawable/shape_gray200_fill_12_rect}"
             android:clickable="@{viewModel.selectedBearType != 0 ? true : false}"
             android:enabled="@{viewModel.selectedBearType != 0 ? true : false}"

app/src/main/res/values/themes.xml

@@ -39,6 +39,7 @@
         <item name="chipMinHeight">0dp</item>
         <item name="chipStartPadding">0dp</item>
         <item name="chipCornerRadius">99dp</item>
+        <item name="android:textAppearance">@style/body4</item>
         <item name="chipBackgroundColor">@color/selector_happy_type_filter_background</item>
         <item name="textStartPadding">14dp</item>
         <item name="textEndPadding">14dp</item>