🛠️ 감정분석 화면, 스크롤 뷰 문제 해결 (#100)

* [refactoring] 분석된 감정 응답 후 띄우기

* [feat] 공지 페이지 view

* [style] string 정리

Nabi/presentation/src/main/java/com/nabi/nabi/views/home/HomeFragment.kt

@@ -69,7 +69,10 @@ class HomeFragment : BaseFragment<FragmentHomeBinding>(R.layout.fragment_home) {
         super.initListener()
 
         binding.ibNotification.setOnClickListener {
-
+            val ft = requireActivity().supportFragmentManager.beginTransaction()
+            ft.replace(R.id.fl_main, NotifyFragment())
+            ft.addToBackStack("notify")
+            ft.commit()
         }
 
         binding.ibMypage.setOnClickListener {

Nabi/presentation/src/main/java/com/nabi/nabi/views/home/NotifyFragment.kt

@@ -0,0 +1,12 @@
+package com.nabi.nabi.views.home
+
+import com.nabi.nabi.R
+import com.nabi.nabi.base.BaseFragment
+import com.nabi.nabi.databinding.FragmentMypageBinding
+
+class NotifyFragment: BaseFragment<FragmentMypageBinding>(R.layout.fragment_mypage) {
+    override fun initView() {
+        TODO("Not yet implemented")
+    }
+
+}

Nabi/presentation/src/main/res/layout/fragment_chat.xml

@@ -25,7 +25,7 @@
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="대화하기"
+                android:text="@string/text_chat_title"
                 style="@style/heading4"
                 android:textColor="@color/black"
                 android:layout_gravity="center"/>
@@ -88,7 +88,7 @@
 
                 tools:text="안녕하세요\n안녕하세요\n안녕하세요안녕하세요안녕하세요안녕하세요안녕하세요"
                 style="@style/chat_send_msg_text_regular_16px"
-                android:hint="내용을 입력하세요"
+                android:hint="@string/hint_chat"
                 android:textColor="@color/black"
                 android:textColorHint="@color/gray2" />
 

Nabi/presentation/src/main/res/layout/fragment_detail_diary.xml

@@ -9,8 +9,8 @@
 
     <ScrollView
         android:layout_width="match_parent"
-        android:fillViewport="true"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
+        android:fillViewport="true">
 
         <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
@@ -50,7 +50,7 @@
 
                     android:layout_gravity="end"
                     android:background="@color/transparent"
-                    android:text="수정"
+                    android:text="@string/text_modify"
                     android:textColor="@color/black" />
 
                 <androidx.appcompat.widget.AppCompatButton
@@ -62,7 +62,7 @@
 
                     android:layout_gravity="end"
                     android:background="@color/transparent"
-                    android:text="삭제"
+                    android:text="@string/text_delete"
                     android:textColor="@color/red" />
             </Toolbar>
 
@@ -72,21 +72,21 @@
                 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"
 
-                app:layout_constraintTop_toBottomOf="@id/tb_diary_detail" />
+                tools:src="@drawable/img_no_emotion" />
 
             <androidx.appcompat.widget.AppCompatButton
                 android:id="@+id/btn_emotion_reload"
-                android:layout_width="104dp"
+                android:layout_width="108dp"
                 android:layout_height="28dp"
                 android:layout_marginTop="4dp"
                 android:background="@color/primary"
-                android:text="일기 감정 분석하기"
-                android:visibility="gone"
+                android:text="@string/text_emotion_reload"
                 android:textSize="12sp"
+                android:visibility="gone"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/iv_emotion" />
@@ -107,14 +107,14 @@
 
             <TextView
                 android:id="@+id/tv_diary_content"
-                android:padding="12dp"
                 style="@style/body2"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginHorizontal="40dp"
                 android:layout_marginVertical="12dp"
                 android:layout_marginBottom="36dp"
                 android:gravity="center|top"
+                android:padding="12dp"
                 android:textColor="@color/black"
 
                 app:layout_constraintEnd_toEndOf="parent"

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"
-                android:text="지루한 감정의 일기들"
+                tools:text="지루한 감정의 일기들"
                 android:textColor="@color/black" />
         </Toolbar>
 

Nabi/presentation/src/main/res/layout/fragment_search_diary.xml

@@ -44,7 +44,7 @@
             style="@style/search_keyword_regular_16px"
             android:textColor="@color/black"
             android:textColorHint="@color/gray2"
-            android:hint="검색어를 입력해주세요"
+            android:hint="@string/hint_search_diary"
 
             android:importantForAutofill="no"
             android:inputType="text"

Nabi/presentation/src/main/res/layout/fragment_statistics_diary.xml

@@ -34,7 +34,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
-                android:text="감정 통계"
+                android:text="@string/text_emotion_statistic_title"
                 android:textColor="@color/black" />
         </Toolbar>
 
@@ -251,7 +251,7 @@
 
             android:gravity="center"
 
-            android:text="감정 고양이들을 선택해 해당 감정의 일기들을 확인해보세요!"
+            android:text="@string/text_select_cat"
             android:fontFamily="@font/pretendard_medium"
             android:textSize="14sp"
             android:textColor="@color/black"/>

Nabi/presentation/src/main/res/values/strings.xml

@@ -13,7 +13,7 @@
 
     <!-- 로그인 페이지 -->
     <string name="text_recent_login">최근에 이용했어요!</string>
-    <string name="text_team_name">Team 나비</string>
+    <string name="text_team_name">Team 너의비밀친구</string>
 
     <!-- 달력 -->
     <string name="text_week_monday">M</string>
@@ -24,6 +24,14 @@
     <string name="text_week_saturday">S</string>
     <string name="text_week_sunday">S</string>
 
+    <!-- 일기 보기 - 일기 상세 페이지 -->
+    <string name="text_modify">수정</string>
+    <string name="text_delete">삭제</string>
+    <string name="text_emotion_reload">일기 감정 분석하기</string>
+
+    <!-- 일기 보기 - 일기 검색 페이지 -->
+    <string name="hint_search_diary">검색어를 입력해주세요</string>
+
     <!-- 일기 보기 - 날짜 선택 페이지 -->
     <string name="text_move_statistics">내 감정 통계 보러가기</string>
     <string name="text_select_diary_title">일기 보기</string>
@@ -35,7 +43,15 @@
     <string name="text_warning1">앱을 종료하면 문제가 생길 수 있습니다.</string>
     <string name="text_warning2">조금만 기다려주세요!</string>
 
-    <!-- 일기 작성 - 일기 작성 페이지 -->
+    <!-- 일기 보기 - 감정 통계 페이지 -->
+    <string name="text_emotion_statistic_title">감정 통계</string>
+    <string name="text_select_cat">감정 고양이들을 선택해 해당 감정의 일기들을 확인해보세요!</string>
+
+    <!-- 대화하기 - 채팅 페이지 -->
+    <string name="text_chat_title">대화하기</string>
+    <string name="hint_chat">내용을 입력하세요</string>
+
+    <!-- 마이페이지 -->
     <string name="text_change_nickname">닉네임 변경하기</string>
     <string name="text_load_diary">일기 가져오기</string>
     <string name="text_withdraw">회원 탈퇴</string>