🔎 감정 분석 재요청 기능 (#94)

* [fix] scrollview 버그 수정 * [feat] 일기 감정분석 재요청 기능 추가
MJU-SW-Contest-2024 · Aug 14, 2024 · 6203cf5 · 6203cf5
1 parent 0c4c7ea
commit 6203cf5
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 14 deletions.
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
@@ -11,6 +11,7 @@ import com.nabi.nabi.utils.LoggerUtils
 import com.nabi.nabi.utils.UiState
 import com.nabi.nabi.views.MainActivity
 import com.nabi.nabi.views.diary.add.AddDiaryFragment
+import com.nabi.nabi.views.diary.add.EmotionLoadingDialog
 import com.nabi.nabi.views.diary.view.SelectDiaryFragment
 import dagger.hilt.android.AndroidEntryPoint
 
@@ -109,11 +110,21 @@ class DetailDiaryFragment(
                         "화남" -> R.drawable.img_anger
                         "불안" -> R.drawable.img_anxiety
                         "지루함" -> R.drawable.img_boredom
-                        else -> R.drawable.shape_circle
+                        else -> {
+                            binding.btnEmotionReload.visibility = View.VISIBLE
+                            R.drawable.img_no_emotion
+                        }
                     }
+
+                    binding.btnEmotionReload.setOnClickListener {
+                        (requireActivity() as MainActivity).replaceFragment(
+                            EmotionLoadingDialog(false, diaryId),
+                            false
+                        )
+                    }
+
                     binding.ivEmotion.setImageResource(resourceId)
-                    if (resourceId == R.drawable.shape_circle) binding.ivEmotion.visibility =
-                        View.GONE
+                    if (resourceId == R.drawable.shape_circle) binding.ivEmotion.visibility = View.GONE
 
                     binding.ibBookmark.setImageResource(
                         if (it.data.isBookmarked) R.drawable.ic_heart_filled else R.drawable.ic_heart
@@ -131,7 +142,7 @@ class DetailDiaryFragment(
 
                 is UiState.Success -> {
                     LoggerUtils.d(it.data.message)
-                    requireActivity().supportFragmentManager.popBackStack()
+                    popBackStack()
                 }
             }
         }

diff --git a/Nabi/presentation/src/main/res/drawable/img_no_emotion.png b/Nabi/presentation/src/main/res/drawable/img_no_emotion.png
diff --git a/Nabi/presentation/src/main/res/layout/fragment_detail_diary.xml b/Nabi/presentation/src/main/res/layout/fragment_detail_diary.xml
@@ -9,6 +9,7 @@
 
     <ScrollView
         android:layout_width="match_parent"
+        android:fillViewport="true"
         android:layout_height="match_parent">
 
         <androidx.constraintlayout.widget.ConstraintLayout
@@ -71,36 +72,50 @@
                 android:layout_height="100dp"
 
                 android:contentDescription="@null"
+                android:src="@drawable/img_no_emotion"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/tb_diary_detail"
 
-                tools:src="@drawable/img_happiness" />
+                app:layout_constraintTop_toBottomOf="@id/tb_diary_detail" />
+
+            <androidx.appcompat.widget.AppCompatButton
+                android:id="@+id/btn_emotion_reload"
+                android:layout_width="104dp"
+                android:layout_height="28dp"
+                android:layout_marginTop="4dp"
+                android:background="@color/primary"
+                android:text="일기 감정 분석하기"
+                android:visibility="gone"
+                android:textSize="12sp"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/iv_emotion" />
 
             <TextView
                 android:id="@+id/tv_diary_date"
                 style="@style/heading2"
                 android:layout_width="wrap_content"
-
                 android:layout_height="wrap_content"
-                android:layout_marginTop="28dp"
+                android:layout_marginTop="20dp"
                 android:textColor="@color/black"
-                app:layout_constraintEnd_toEndOf="parent"
 
+                app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/iv_emotion"
+                app:layout_constraintTop_toBottomOf="@id/btn_emotion_reload"
+                app:layout_goneMarginTop="12dp"
                 tools:text="2024년 7월 27일" />
 
             <TextView
                 android:id="@+id/tv_diary_content"
+                android:padding="12dp"
                 style="@style/body2"
                 android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_marginHorizontal="52dp"
-                android:layout_marginVertical="28dp"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="40dp"
+                android:layout_marginVertical="12dp"
+                android:layout_marginBottom="36dp"
                 android:gravity="center|top"
                 android:textColor="@color/black"
-                app:layout_constraintBottom_toBottomOf="parent"
 
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"