🛠️ 감정 이름 수정 | 지루함 -> 평온 (#114)

* [feat] Update Splash Page Status Bar Color * [feat] Modify Emotion Name | 지루함 -> 평온
MJU-SW-Contest-2024 · Aug 17, 2024 · 1f1aa13 · 1f1aa13
1 parent 283189b
commit 1f1aa13
Show file tree

Hide file tree

Showing 10 changed files with 22 additions and 16 deletions.
diff --git a/Nabi/presentation/src/main/AndroidManifest.xml b/Nabi/presentation/src/main/AndroidManifest.xml
@@ -31,7 +31,8 @@
 
         <activity
             android:name=".views.splash.StartActivity"
-            android:exported="true">
+            android:exported="true"
+            android:theme="@style/Theme.Nabi.TransparentStatusBar">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 

diff --git a/Nabi/presentation/src/main/java/com/nabi/nabi/views/diary/add/EmotionLoadingDialog.kt b/Nabi/presentation/src/main/java/com/nabi/nabi/views/diary/add/EmotionLoadingDialog.kt
@@ -4,7 +4,10 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.view.WindowManager
 import android.widget.Toast
+import androidx.core.content.ContextCompat
+import androidx.core.view.WindowCompat
 import androidx.fragment.app.DialogFragment
 import androidx.fragment.app.viewModels
 import com.nabi.nabi.R
@@ -23,7 +26,7 @@ class EmotionLoadingDialog(private val isEdit: Boolean, private val diaryId: Int
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        setStyle(STYLE_NO_TITLE, R.style.dialog_fullscreen)
+        setStyle(STYLE_NORMAL, R.style.dialog_fullscreen)
         isCancelable = false
     }
 

diff --git a/Nabi/presentation/src/main/java/com/nabi/nabi/views/diary/detail/DetailDiaryFragment.kt b/Nabi/presentation/src/main/java/com/nabi/nabi/views/diary/detail/DetailDiaryFragment.kt
@@ -123,7 +123,7 @@ class DetailDiaryFragment(
                         "우울" -> R.drawable.img_sadness
                         "화남" -> R.drawable.img_anger
                         "불안" -> R.drawable.img_anxiety
-                        "지루함" -> R.drawable.img_boredom
+                        "평온" -> R.drawable.img_boredom
                         else -> {
                             binding.btnEmotionReload.visibility = View.VISIBLE
                             R.drawable.img_no_emotion
@@ -174,7 +174,7 @@ class DetailDiaryFragment(
                         "우울" -> R.drawable.img_sadness
                         "화남" -> R.drawable.img_anger
                         "불안" -> R.drawable.img_anxiety
-                        "지루함" -> R.drawable.img_boredom
+                        "평온" -> R.drawable.img_boredom
                         else -> {
                             binding.btnEmotionReload.visibility = View.VISIBLE
                             R.drawable.img_no_emotion

diff --git a/Nabi/presentation/src/main/java/com/nabi/nabi/views/diary/detail/UpdateEmotionDialog.kt b/Nabi/presentation/src/main/java/com/nabi/nabi/views/diary/detail/UpdateEmotionDialog.kt
@@ -103,7 +103,7 @@ class UpdateEmotionDialog(
         val initialToggleButton = when (emotion) {
             "화남" -> binding.tbAnger
             "행복" -> binding.tbHappiness
-            "지루함" -> binding.tbBoredom
+            "평온" -> binding.tbBoredom
             "우울" -> binding.tbSadness
             "불안" -> binding.tbAnxiety
             else -> null
@@ -115,7 +115,7 @@ class UpdateEmotionDialog(
             val initialMessage = when (toggleButton) {
                 binding.tbAnger -> "화나"
                 binding.tbHappiness -> "행복해"
-                binding.tbBoredom -> "지루해"
+                binding.tbBoredom -> "평온해"
                 binding.tbSadness -> "슬퍼"
                 binding.tbAnxiety -> "불안해"
                 else -> ""
@@ -134,7 +134,7 @@ class UpdateEmotionDialog(
                     val msg = when (toggleButton) {
                         binding.tbAnger -> "화나"
                         binding.tbHappiness -> "행복해"
-                        binding.tbBoredom -> "지루해"
+                        binding.tbBoredom -> "평온해"
                         binding.tbSadness -> "슬퍼"
                         binding.tbAnxiety -> "불안해"
                         else -> ""
@@ -166,7 +166,7 @@ class UpdateEmotionDialog(
             val emotionString = when (lastCheckedButton) {
                 binding.tbAnger -> "화남"
                 binding.tbHappiness -> "행복"
-                binding.tbBoredom -> "지루함"
+                binding.tbBoredom -> "평온"
                 binding.tbSadness -> "우울"
                 binding.tbAnxiety -> "불안"
                 else -> ""

diff --git a/Nabi/presentation/src/main/java/com/nabi/nabi/views/diary/emotion/EmotionSearchFragment.kt b/Nabi/presentation/src/main/java/com/nabi/nabi/views/diary/emotion/EmotionSearchFragment.kt
@@ -81,7 +81,7 @@ class EmotionSearchFragment(
             }
         })
 
-        // 행복, 우울, 화남, 불안, 지루함
+        // 행복, 우울, 화남, 불안, 평온
         binding.ivEmotionAnger.setOnClickListener {
             viewModel.fetchData("화남", true)
             setCurrentEmotion()
@@ -91,7 +91,7 @@ class EmotionSearchFragment(
             setCurrentEmotion()
         }
         binding.ivEmotionBoredom.setOnClickListener {
-            viewModel.fetchData("지루함", true)
+            viewModel.fetchData("평온", true)
             setCurrentEmotion()
         }
         binding.ivEmotionSadness.setOnClickListener {
@@ -138,8 +138,8 @@ class EmotionSearchFragment(
                 )
             }
 
-            "지루함" -> {
-                titleText = "지루한 감정의 일기들"
+            "평온" -> {
+                titleText = "평온한 감정의 일기들"
                 resourceIds.addAll(
                     listOf(
                         R.drawable.img_anger_gray,

diff --git a/...resentation/src/main/java/com/nabi/nabi/views/diary/statistics/DiaryStatisticsFragment.kt b/...resentation/src/main/java/com/nabi/nabi/views/diary/statistics/DiaryStatisticsFragment.kt
@@ -72,7 +72,7 @@ class DiaryStatisticsFragment: BaseFragment<FragmentStatisticsDiaryBinding>(R.la
 
         binding.ivEmotionAnger.setOnClickListener { (requireActivity() as MainActivity).replaceFragment(EmotionSearchFragment("화남"), true)}
         binding.ivEmotionHappiness.setOnClickListener { (requireActivity() as MainActivity).replaceFragment(EmotionSearchFragment("행복"), true)}
-        binding.ivEmotionBoredom.setOnClickListener { (requireActivity() as MainActivity).replaceFragment(EmotionSearchFragment("지루함"), true)}
+        binding.ivEmotionBoredom.setOnClickListener { (requireActivity() as MainActivity).replaceFragment(EmotionSearchFragment("평온"), true)}
         binding.ivEmotionSadness.setOnClickListener { (requireActivity() as MainActivity).replaceFragment(EmotionSearchFragment("우울"), true)}
         binding.ivEmotionAnxiety.setOnClickListener { (requireActivity() as MainActivity).replaceFragment(EmotionSearchFragment("불안"), true)}
     }

diff --git a/...resentation/src/main/java/com/nabi/nabi/views/diary/view/SelectDiaryDayCalendarAdapter.kt b/...resentation/src/main/java/com/nabi/nabi/views/diary/view/SelectDiaryDayCalendarAdapter.kt
@@ -51,7 +51,7 @@ class SelectDiaryDayCalendarAdapter() : ListAdapter<Pair<String, DiaryInfo?>, Se
                     "우울" -> R.drawable.img_sadness_empty
                     "화남" -> R.drawable.img_anger_empty
                     "불안" -> R.drawable.img_anxiety_empty
-                    "지루함" -> R.drawable.img_boredom_empty
+                    "평온" -> R.drawable.img_boredom_empty
                     else -> R.drawable.img_boredom_empty_gray
                 }
                 binding.ivDiaryCheck.setImageResource(resourceId)

diff --git a/Nabi/presentation/src/main/java/com/nabi/nabi/views/diary/view/SelectDiaryFragment.kt b/Nabi/presentation/src/main/java/com/nabi/nabi/views/diary/view/SelectDiaryFragment.kt
@@ -147,7 +147,7 @@ class SelectDiaryFragment :
             )
         }
         binding.ivEmotionBoredom.setOnClickListener {
-            createEmotionTooltip("지루해").showAlignTop(
+            createEmotionTooltip("평온해").showAlignTop(
                 binding.ivEmotionBoredom
             )
         }

diff --git a/Nabi/presentation/src/main/res/layout/fragment_emotion_search.xml b/Nabi/presentation/src/main/res/layout/fragment_emotion_search.xml
@@ -33,7 +33,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
-                tools:text="지루한 감정의 일기들"
+                tools:text="평온한 감정의 일기들"
                 android:textColor="@color/black" />
         </Toolbar>
 

diff --git a/Nabi/presentation/src/main/res/values/themes.xml b/Nabi/presentation/src/main/res/values/themes.xml
@@ -46,11 +46,13 @@
         <item name="android:windowIsFloating">false</item>
         <item name="android:windowFullscreen">false</item>
         <item name="android:windowBackground">@android:color/transparent</item>
+        <item name="android:statusBarColor">@color/white</item>
     </style>
 
     <style name="Theme.Nabi.TransparentStatusBar" parent="Theme.AppCompat.Light.NoActionBar">
         <item name="android:windowTranslucentStatus">true</item>
         <item name="android:windowLightStatusBar">false</item>
         <item name="android:windowDrawsSystemBarBackgrounds">true</item>
+        <item name="android:statusBarColor">@color/white</item>
     </style>
 </resources>