[Add] 온보딩 구현 완료, 1일차 엔딩뷰 구현 완료

wogus0333 · wogus0333 · commit 5d411160e39c · 2021-01-16T09:02:18.000+09:00
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -48,7 +48,7 @@
         <activity android:name=".ui.onboarding.StartActivity" />
         <activity
             android:name=".ui.onboarding.CallActivity"
-            android:exported="true" />
+             />
         <activity android:name=".ui.main.MusicActivity" />
         <activity android:name=".ui.main.MainActivity" />
         <activity android:name=".ui.main.ApophisActivity" />
@@ -58,7 +58,7 @@
         <activity android:name=".ui.main.letter.ReceiveLetterActivity" />
         <activity android:name=".ui.main.letter.SendLetterActivity" />
 
-        <activity android:name=".ui.firstDay.FirstDayChatActivity" />
+        <activity android:name=".ui.firstDay.FirstDayChatActivity" android:exported="true" />
         <activity android:name=".ui.firstDay.FirstDayChatEndingActivity"/>
         <activity
             android:name=".ui.firstDay.CameraActivity"
diff --git a/app/src/main/java/com/example/apophis_android/ui/firstDay/FirstDayChatActivity.kt b/app/src/main/java/com/example/apophis_android/ui/firstDay/FirstDayChatActivity.kt
@@ -21,7 +21,6 @@ import com.example.apophis_android.data.remote.response.ChoiceChatResponse
 import com.example.apophis_android.ui.firstDay.adapter.FirstDayChatAdapter
 import com.example.apophis_android.ui.main.MainActivity.Companion.countCameraChange
 import kotlinx.android.synthetic.main.activity_first_day_chat.*
-import kotlinx.android.synthetic.main.activity_second_day_chat.*
 import retrofit2.Call
 import retrofit2.Callback
 import retrofit2.Response
@@ -38,7 +37,7 @@ class FirstDayChatActivity : AppCompatActivity() {
     private val apophisService = ApophisService
     private val jwt = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJVc2VySWR4IjoxMiwiaWF0IjoxNjEwNjUyOTk2LCJleHAiOjE2MTEyNTc3OTYsImlzcyI6ImFwb3BoaXMifQ.dWYb7OFX-mxfQNVvtPL7VomaS6I9yIvTkUROKMAqOVI"
         //"eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJVc2VySWR4Ijo2LCJpYXQiOjE2MTAxNjM5NjIsImV4cCI6MTYxMDc2ODc2MiwiaXNzIjoiYXBvcGhpcyJ9.gM5avYDIhGybMsXqlvaWwqJCsTfkAjo1lYD2tvxZAdw"
-    private var chatDetailsIdx = 9
+    private var chatDetailsIdx = 21
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -197,7 +196,7 @@ class FirstDayChatActivity : AppCompatActivity() {
                                         val user = ""
                                         val chat = OurUserChat(mutableListOf(user), 11)
                                         userChatAdapter.addChat(chat)
-                                        btn_chat_send.setOnClickListener(null)
+                                        btn_first_send.setOnClickListener(null)
                                 }
                                 else -> {
                                     /* 메세지 전송 버튼 클릭 시 */
diff --git a/app/src/main/java/com/example/apophis_android/ui/firstDay/FirstDayChatEndingActivity.kt b/app/src/main/java/com/example/apophis_android/ui/firstDay/FirstDayChatEndingActivity.kt
@@ -5,14 +5,14 @@ import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
 import com.example.apophis_android.R
 import com.example.apophis_android.ui.main.MainActivity
-import kotlinx.android.synthetic.main.activity_second_day_chat_ending.*
+import kotlinx.android.synthetic.main.activity_first_day_chat_ending.*
 
 class FirstDayChatEndingActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_first_day_chat_ending)
 
-        btn_back_main.setOnClickListener {
+        btn_firstday_back_main.setOnClickListener {
             val intent = Intent(this, MainActivity::class.java)
             startActivity(intent)
             finish()
diff --git a/app/src/main/java/com/example/apophis_android/ui/main/SplashActivity.kt b/app/src/main/java/com/example/apophis_android/ui/main/SplashActivity.kt
@@ -1,10 +1,11 @@
 package com.example.apophis_android.ui.main
 
 import android.content.Intent
-import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
 import android.os.Handler
+import androidx.appcompat.app.AppCompatActivity
 import com.example.apophis_android.R
+import com.example.apophis_android.ui.onboarding.NewsActivity
 import kotlinx.android.synthetic.main.activity_splash.*
 
 class SplashActivity : AppCompatActivity() {
@@ -18,7 +19,7 @@ class SplashActivity : AppCompatActivity() {
         lottie.playAnimation()
 
         Handler().postDelayed({
-            val intent = Intent(this, MusicActivity::class.java)
+            val intent = Intent(this, NewsActivity::class.java)
             intent.addFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION)
             startActivity(intent)
             finish()
diff --git a/app/src/main/java/com/example/apophis_android/ui/onboarding/CallActivity.kt b/app/src/main/java/com/example/apophis_android/ui/onboarding/CallActivity.kt
@@ -20,7 +20,7 @@ class CallActivity : AppCompatActivity() {
         val callfragment = CallFragment()
 
         iv_answer_call.setOnClickListener {
-            if(true) {
+            if(countPushButton) {
                 supportFragmentManager.beginTransaction()
                     .add(R.id.fragment_container_view_call, callfragment).commit()
             } else {
diff --git a/app/src/main/java/com/example/apophis_android/ui/onboarding/CallFragment.kt b/app/src/main/java/com/example/apophis_android/ui/onboarding/CallFragment.kt
@@ -17,10 +17,15 @@ import java.util.*
  */
 
 class CallFragment : Fragment() {
-    val callMessage: MutableList<String> = mutableListOf("안녕", "쟈기야", "ㅎㅇㅎㅇ", "머해")
+    val callMessage: MutableList<String> = mutableListOf("어, 드디어 받았다.", "안녕. 전화 잠깐 끊지 말아주라.",
+            "방금 7일 후에 지구멸망한다는 뉴스 속보 봤어?", "넌 남은 일주일을 어떻게 보낼 생각이야?",
+            "내가 누구냐고?", "음.. 그냥 아무 번호나 찍어서 전화했어.", "죽기 전에 이런거 한 번쯤 해보고 싶었거든.",
+            "사실 당황스럽겠지만, 내가 연락할 사람이\n한 명도 없어서 그러는데.", "남은 일주일 동안 나랑 연락하면서 지내주면 안될까?",
+            "만약 괜찮다면... 계속 연락하고 싶어.")
+    var index = 0
     override fun onCreateView(
-        inflater: LayoutInflater, container: ViewGroup?,
-        savedInstanceState: Bundle?
+            inflater: LayoutInflater, container: ViewGroup?,
+            savedInstanceState: Bundle?
     ): View? {
         // Inflate the layout for this fragment
         return inflater.inflate(R.layout.fragment_call, container, false)
@@ -32,42 +37,44 @@ class CallFragment : Fragment() {
         callStart()
     }
 
-    // call message start each time
-    var index = -1
+
+//    // call message start each time
+
     private lateinit var second: TimerTask
     private val handler = Handler()
     val timer = Timer()
     fun callStart() {
 
-        second = object: TimerTask() {
+        second = object : TimerTask() {
             override fun run() {
                 Update()
             }
         }
-
         timer.schedule(second, 0, 1500)
     }
+
     protected fun Update() {
-        val updater = object:Runnable {
+        val updater = object : Runnable {
             override fun run() {
-                index++
-                if(index == callMessage.size){
+                Log.i("index", index.toString())
+                if (index == callMessage.size) {
                     timer.cancel()
+                    Log.i("index", index.toString())
                     (activity as CallActivity).changeCallText()
                     activity?.supportFragmentManager
-                        ?.beginTransaction()
-                        ?.remove(this@CallFragment)
-                        ?.commit()
-                    Log.i("end","end")
-                }else {
-                    tv_call_message.setText(callMessage[index])
+                            ?.beginTransaction()
+                            ?.remove(this@CallFragment)
+                            ?.commit()
+                } else {
+                    tv_call_message.setText(callMessage[index++])
                     tv_call_message.animation =
-                        AnimationUtils.loadAnimation(context, R.anim.fade_in)
+                            AnimationUtils.loadAnimation(context, R.anim.fade_in_onboarding)
                     tv_call_message.animation =
-                        AnimationUtils.loadAnimation(context, R.anim.fade_out)
+                            AnimationUtils.loadAnimation(context, R.anim.fade_out_onboarding)
                 }
             }
         }
         handler.post(updater)
     }
 }
+
diff --git a/app/src/main/java/com/example/apophis_android/ui/onboarding/NewsActivity.kt b/app/src/main/java/com/example/apophis_android/ui/onboarding/NewsActivity.kt
@@ -9,7 +9,6 @@ import android.widget.VideoView
 import androidx.appcompat.app.AppCompatActivity
 import com.example.apophis_android.R
 import com.example.apophis_android.data.entity.CommentNews
-import com.example.apophis_android.ui.main.MainActivity
 import com.example.apophis_android.ui.onboarding.adapter.NewsAdapter
 import kotlinx.android.synthetic.main.activity_news.*
 
@@ -62,9 +61,11 @@ class NewsActivity : AppCompatActivity() {
         )
         newsAdapter.notifyDataSetChanged()
 
+        newsAdapter.addComment(CommentNews(R.drawable.img_nickname_1, "오후 8:17", "마피아혜인", "일단 마피아게임 할 사람?"))
+
         Handler().postDelayed({
             //method
-            val intent = Intent(this,MainActivity::class.java)
+            val intent = Intent(this, CallActivity::class.java)
             startActivity(intent)
         }, 44000)
     }
diff --git a/app/src/main/java/com/example/apophis_android/ui/onboarding/StartActivity.kt b/app/src/main/java/com/example/apophis_android/ui/onboarding/StartActivity.kt
@@ -4,6 +4,7 @@ import android.content.Intent
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
 import com.example.apophis_android.R
+import com.example.apophis_android.ui.main.MusicActivity
 import kotlinx.android.synthetic.main.activity_start.*
 
 class StartActivity : AppCompatActivity() {
@@ -12,7 +13,7 @@ class StartActivity : AppCompatActivity() {
         setContentView(R.layout.activity_start)
 
         btn_onboarding_start.setOnClickListener {
-            val intent = Intent(this, NewsActivity::class.java)
+            val intent = Intent(this, MusicActivity::class.java)
             startActivity(intent)
         }
     }
diff --git a/app/src/main/res/anim/fade_in_onboarding.xml b/app/src/main/res/anim/fade_in_onboarding.xml
@@ -4,4 +4,4 @@
     android:fromAlpha="0.0"
     android:toAlpha="1.0"
     android:fillAfter="true"
-    android:duration="2000" />
+    android:duration="1000" />
diff --git a/app/src/main/res/anim/fade_out_onboarding.xml b/app/src/main/res/anim/fade_out_onboarding.xml
@@ -4,4 +4,4 @@
     android:fromAlpha="1.0"
     android:toAlpha="0.0"
     android:fillAfter="true"
-    android:duration="2000" />
+    android:duration="1000" />
diff --git a/app/src/main/res/anim/translate_up.xml b/app/src/main/res/anim/translate_up.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <set xmlns:android="http://schemas.android.com/apk/res/android"
-    android:duration="2000">
+    android:duration="1500">
     <translate
         android:interpolator="@android:anim/accelerate_decelerate_interpolator"
         android:fromYDelta="50%p"
diff --git a/app/src/main/res/layout/activity_day.xml b/app/src/main/res/layout/activity_day.xml
@@ -12,7 +12,7 @@
         android:id="@+id/tv_first"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="105dp"
+        android:layout_marginTop="80dp"
         android:fontFamily="@font/gmarket_sans_medium"
         android:text="1일차"
         android:textColor="@color/white"
diff --git a/app/src/main/res/layout/fragment_call.xml b/app/src/main/res/layout/fragment_call.xml
@@ -15,6 +15,7 @@
         android:layout_marginTop="243dp"
         android:layout_marginBottom="309dp"
         android:text=""
+        android:gravity="center"
         android:fontFamily="@font/gmarket_sans_medium"
         android:textColor="@color/purpleAB70F5"
         android:textSize="16sp"

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@ import android.content.Intent`
`4`	`4`	`import android.os.Bundle`
`5`	`5`	`import androidx.appcompat.app.AppCompatActivity`
`6`	`6`	`import com.example.apophis_android.R`
	`7`	`+import com.example.apophis_android.ui.main.MusicActivity`
`7`	`8`	`import kotlinx.android.synthetic.main.activity_start.*`
`8`	`9`
`9`	`10`	`class StartActivity : AppCompatActivity() {`
`@@ -12,7 +13,7 @@ class StartActivity : AppCompatActivity() {`
`12`	`13`	`setContentView(R.layout.activity_start)`
`13`	`14`
`14`	`15`	`btn_onboarding_start.setOnClickListener {`
`15`		`- val intent = Intent(this, NewsActivity::class.java)`
	`16`	`+ val intent = Intent(this, MusicActivity::class.java)`
`16`	`17`	`startActivity(intent)`
`17`	`18`	`}`
`18`	`19`	`}`