diff --git a/app/src/main/java/sopt/uni/presentation/IntroActivity.kt b/app/src/main/java/sopt/uni/presentation/IntroActivity.kt
index 2b7c4d1..c5938ed 100644
--- a/app/src/main/java/sopt/uni/presentation/IntroActivity.kt
+++ b/app/src/main/java/sopt/uni/presentation/IntroActivity.kt
@@ -7,18 +7,25 @@ import androidx.appcompat.app.AppCompatActivity
import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
import dagger.hilt.android.AndroidEntryPoint
import sopt.uni.data.datasource.local.SparkleStorage
+import sopt.uni.data.repository.shortgame.ShortGameRepository
import sopt.uni.presentation.home.HomeActivity
import sopt.uni.presentation.invite.NickNameActivity
import sopt.uni.presentation.onboarding.OnBoardingActivity
import sopt.uni.util.extension.startActivity
+import javax.inject.Inject
@AndroidEntryPoint
class IntroActivity : AppCompatActivity() {
+ @Inject
+ lateinit var shortGameRepository: ShortGameRepository
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
installSplashScreen()
checkUserStatus()
+
+ // 메모장 초기화
+ shortGameRepository.setMemoText("")
}
private fun checkUserStatus() {
diff --git a/app/src/main/res/drawable/ic_check.xml b/app/src/main/res/drawable/ic_check.xml
new file mode 100644
index 0000000..71fc610
--- /dev/null
+++ b/app/src/main/res/drawable/ic_check.xml
@@ -0,0 +1,20 @@
+
+
+
+
+
+
diff --git a/app/src/main/res/drawable/ic_memo.xml b/app/src/main/res/drawable/ic_memo.xml
new file mode 100644
index 0000000..487d3b0
--- /dev/null
+++ b/app/src/main/res/drawable/ic_memo.xml
@@ -0,0 +1,27 @@
+
+
+
+
+
+
+
+
diff --git a/app/src/main/res/drawable/ic_timer.xml b/app/src/main/res/drawable/ic_timer.xml
new file mode 100644
index 0000000..679a602
--- /dev/null
+++ b/app/src/main/res/drawable/ic_timer.xml
@@ -0,0 +1,24 @@
+
+
+
+
+
+
+
diff --git a/app/src/main/res/layout/activity_mission_record.xml b/app/src/main/res/layout/activity_mission_record.xml
index 1c2ad5e..7056312 100644
--- a/app/src/main/res/layout/activity_mission_record.xml
+++ b/app/src/main/res/layout/activity_mission_record.xml
@@ -47,6 +47,7 @@
android:id="@+id/scrollView"
android:layout_width="match_parent"
android:layout_height="0dp"
+ android:layout_marginBottom="28dp"
app:layout_constraintBottom_toTopOf="@+id/cl_bottom_navigation_bar"
app:layout_constraintTop_toBottomOf="@id/cl_toolbar">
@@ -176,10 +177,10 @@
android:layout_width="32dp"
android:layout_height="32dp"
android:layout_marginStart="18dp"
- android:src="@drawable/ic_heart_filled"
+ android:src="@drawable/ic_memo"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
- tools:src="@drawable/ic_heart_filled" />
+ tools:src="@drawable/ic_memo" />
+ tools:src="@drawable/ic_timer"/>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 4315713..9bfdf7a 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -133,7 +133,7 @@
한판 승부 진행중
나의 미션
- 상대가 미션을 수행하면 공개
+ 상대가 미션을 수행하면 공개돼요
미션 완료
미션 실패
승부 그만두기
@@ -210,7 +210,7 @@
승부 만들기가 완료되지 않았어요
- 여기서 나가실래요
+ 여기서 나가면 되돌릴 수 없어요
나가기
설정된 내용으로 승부를 만들까요?
한번 설정한 내용은 변경할 수 없어요