Merge pull request #224 from Hi-Knock-Knock/yjooooo

#223 [FIX] RealTalk : 대화 시 주의사항 부분 한줄로만 나오는 것 수정
Hi-Knock-Knock · Jun 17, 2021 · b8550f5 · b8550f5
2 parents 2adbeb0 + a52531d
commit b8550f5
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 25 deletions.
diff --git a/app/src/main/java/com/all_the_best/knock_knock/parent/talk/view/ParentRealTalkActivity.kt b/app/src/main/java/com/all_the_best/knock_knock/parent/talk/view/ParentRealTalkActivity.kt
@@ -8,7 +8,6 @@ import android.net.Uri
 import android.os.Bundle
 import android.util.Log
 import android.view.View
-import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.app.ActivityCompat
 import androidx.core.content.ContextCompat
@@ -17,7 +16,7 @@ import androidx.recyclerview.widget.PagerSnapHelper
 import com.all_the_best.knock_knock.R
 import com.all_the_best.knock_knock.databinding.ActivityParentRealTalkBinding
 import com.all_the_best.knock_knock.parent.talk.adapter.ParentTalkAcceptTipRcvAdapter
-import com.all_the_best.knock_knock.parent.talk.viewmodel.ParentTalkViewModel
+import com.all_the_best.knock_knock.parent.talk.model.ParentTalkAcceptTip
 import com.all_the_best.knock_knock.util.StatusBarUtil
 import com.google.firebase.database.*
 import com.google.firebase.storage.FirebaseStorage
@@ -31,7 +30,6 @@ import java.util.*
 
 class ParentRealTalkActivity : AppCompatActivity() {
     private lateinit var binding: ActivityParentRealTalkBinding
-    private val parentTalkViewModel: ParentTalkViewModel by viewModels()
 
     private var firebaseStorage: FirebaseStorage = FirebaseStorage.getInstance()
     private lateinit var pathReference: StorageReference
@@ -206,9 +204,20 @@ class ParentRealTalkActivity : AppCompatActivity() {
         fileName = fileNameFormat.format(currentTime).toString()
     }
 
+    private fun getTalkTipList() =
+        listOf(
+            ParentTalkAcceptTip(1, getString(R.string.talk_tip_1)),
+            ParentTalkAcceptTip(2, getString(R.string.talk_tip_2)),
+            ParentTalkAcceptTip(3, getString(R.string.talk_tip_3)),
+            ParentTalkAcceptTip(4, getString(R.string.talk_tip_4)),
+            ParentTalkAcceptTip(5, getString(R.string.talk_tip_5)),
+            ParentTalkAcceptTip(6, getString(R.string.talk_tip_6)),
+            ParentTalkAcceptTip(7, getString(R.string.talk_tip_7))
+        )
+
     private fun setTipRcvAdapter() {
         val tipRcvAdapter = ParentTalkAcceptTipRcvAdapter()
-        tipRcvAdapter.submitList(parentTalkViewModel.tipList)
+        tipRcvAdapter.submitList(getTalkTipList())
         binding.acceptTalkRcv.adapter = tipRcvAdapter
         val snapHelper = PagerSnapHelper()
         snapHelper.attachToRecyclerView(binding.acceptTalkRcv)

diff --git a/app/src/main/java/com/all_the_best/knock_knock/parent/talk/viewmodel/ParentTalkViewModel.kt b/app/src/main/java/com/all_the_best/knock_knock/parent/talk/viewmodel/ParentTalkViewModel.kt
diff --git a/app/src/main/res/layout/activity_parent_real_talk.xml b/app/src/main/res/layout/activity_parent_real_talk.xml
@@ -131,7 +131,7 @@
         <androidx.constraintlayout.widget.ConstraintLayout
             android:id="@+id/accept_talk_constraint_rcv"
             android:layout_width="0dp"
-            android:layout_height="wrap_content"
+            android:layout_height="102dp"
             android:layout_marginHorizontal="20dp"
             android:layout_marginTop="8dp"
             android:background="@drawable/bg_whitebox_10dp"
@@ -164,9 +164,8 @@
             <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/accept_talk_rcv"
                 android:layout_width="0dp"
-                android:layout_height="wrap_content"
+                android:layout_height="0dp"
                 android:layout_marginHorizontal="8dp"
-                android:layout_marginVertical="40dp"
                 android:orientation="horizontal"
                 app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
                 app:layout_constraintBottom_toBottomOf="parent"

diff --git a/app/src/main/res/layout/item_parent_accept_talk_rcv.xml b/app/src/main/res/layout/item_parent_accept_talk_rcv.xml
@@ -17,13 +17,14 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:fontFamily="@font/scdream5"
-            android:gravity="center"
             android:text="@{parentTalkTip.tip}"
+            android:gravity="center"
             android:textColor="#252525"
             android:textSize="15sp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent"/>
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -15,6 +15,13 @@
     <string name="talk_question_8">너는 가장 친한친구가 누구야?</string>
     <string name="talk_question_9">오늘 어린이집에서 재밌었어?</string>
     <string name="talk_question_10">오늘 친구하고 뭐하고 놀았어?</string>
+    <string name="talk_tip_1">아이의 말을 끝까지 들어주세요.</string>
+    <string name="talk_tip_2">아이의 입장에서\n꾸준히 공감하는 질문을 많이 해주세요.</string>
+    <string name="talk_tip_3">먼저 답을 정해놓고 아이에게 원하는\n대답을 듣는 것을 강요하지 마세요.</string>
+    <string name="talk_tip_4">아이의 말을 맞장구치며 듣는 것이\n중요해요. 함께 공감해주세요.</string>
+    <string name="talk_tip_5">아이에게 칭찬하는 것이 가장 중요해요.\n아낌없이 칭찬해주세요.</string>
+    <string name="talk_tip_6">아이와 대화 할 때\n\&apos;하지 마라\&apos;는 부정 지시어보다\n\&apos;하라\&apos;는 긍정 지시어를 사용해주세요.</string>
+    <string name="talk_tip_7">차분한 목소리로 대화해주세요.</string>
     <string name="faq_title_1">아이를\n바르게\n대하는 방법</string>
     <string name="faq_title_2">동생이\n밉다고\n느끼는 아이</string>
     <string name="faq_title_3">나쁜 말을\n하는 아이</string>