diff --git a/common-ui/src/main/res/layout/dialog_for_permission.xml b/common-ui/src/main/res/layout/dialog_for_permission.xml
index 346d6f4..693e118 100644
--- a/common-ui/src/main/res/layout/dialog_for_permission.xml
+++ b/common-ui/src/main/res/layout/dialog_for_permission.xml
@@ -27,22 +27,26 @@
app:layout_constraintTop_toTopOf="parent" />
@@ -52,10 +56,12 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
+ android:lineSpacingExtra="2sp"
android:text="확인을 누르시면 동의 및 다음 단계로 넘어갑니다."
+ android:textSize="10sp"
app:layout_constraintBottom_toBottomOf="parent"
- app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/dialog_button" />
diff --git a/onboarding/src/main/java/com/najudoryeong/mineme/onboarding/ui/OnBoardingViewPagerFragment.kt b/onboarding/src/main/java/com/najudoryeong/mineme/onboarding/ui/OnBoardingViewPagerFragment.kt
index af64aac..ed2eaf5 100644
--- a/onboarding/src/main/java/com/najudoryeong/mineme/onboarding/ui/OnBoardingViewPagerFragment.kt
+++ b/onboarding/src/main/java/com/najudoryeong/mineme/onboarding/ui/OnBoardingViewPagerFragment.kt
@@ -24,7 +24,7 @@ import dagger.hilt.android.AndroidEntryPoint
@AndroidEntryPoint
class OnBoardingViewPagerFragment : Fragment() {
- companion object{
+ companion object {
var viewpagerNum = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) 3 else 2
}
@@ -36,7 +36,14 @@ class OnBoardingViewPagerFragment : Fragment() {
//todo companion?
- private val messageArray = arrayOf("gps 권한", "알림 권한", "카메라 권한")
+ private val messageArray = arrayOf(
+ "기록을 위해서 갤러리 및\n" +
+ " 위치 접근 동의가 필요해요. ",
+ "사진을 찍기 위해서\n" +
+ "카메라 접근 동의가 필요해요",
+ "알림을 하기 위해서\n" +
+ "푸시 동의가 필요해요."
+ )
private val imageArray = arrayOf(R.drawable.img_gps, R.drawable.img_gps, R.drawable.img_gps)
private val permissionArray = arrayOf(
arrayOf(
diff --git a/onboarding/src/main/res/layout/fragment_login.xml b/onboarding/src/main/res/layout/fragment_login.xml
index 60364c7..afd9615 100644
--- a/onboarding/src/main/res/layout/fragment_login.xml
+++ b/onboarding/src/main/res/layout/fragment_login.xml
@@ -14,6 +14,7 @@
android:id="@+id/app_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:layout_marginTop="16dp"
android:text="Mineme"
android:textColor="@color/black"
android:textSize="24sp"
@@ -21,11 +22,13 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
-
diff --git a/onboarding/src/main/res/layout/fragment_on_boarding_view_pager.xml b/onboarding/src/main/res/layout/fragment_on_boarding_view_pager.xml
index 21bbf71..e8edf55 100644
--- a/onboarding/src/main/res/layout/fragment_on_boarding_view_pager.xml
+++ b/onboarding/src/main/res/layout/fragment_on_boarding_view_pager.xml
@@ -11,6 +11,7 @@
(Story_Foundation_Info) {
private val viewModel: StoryViewModel by viewModels()
- private val storyOutAdapter : StoryOutAdapter by lazy {
+ private val storyOutAdapter: StoryOutAdapter by lazy {
StoryOutAdapter()
}
override fun initView() {
- /// 이거는 바깥 그거에 넣어줄 데이터
+
viewModel.raedStory()
+ /// 이거는 바깥 그거에 넣어줄 데이터
+ lifecycleScope.launch {
+ repeatOnLifecycle(Lifecycle.State.STARTED) {
+ launch {
+ viewModel.storyList.collect()
+ }
+ }
+ }
+
+
binding.apply {
//todo callback
- this.adapter = storyOutAdapter
- this.list = dummy
this.lifecycleOwner = viewLifecycleOwner
+ this.adapter = storyOutAdapter
+ this.viewModel = viewModel
}
}
diff --git a/story/src/main/java/com/najudoryeong/mineme/story/ui/StoryViewModel.kt b/story/src/main/java/com/najudoryeong/mineme/story/ui/StoryViewModel.kt
index 3de4941..b73a4dc 100644
--- a/story/src/main/java/com/najudoryeong/mineme/story/ui/StoryViewModel.kt
+++ b/story/src/main/java/com/najudoryeong/mineme/story/ui/StoryViewModel.kt
@@ -2,17 +2,13 @@ package com.najudoryeong.mineme.story.ui
import android.util.Log
import androidx.lifecycle.ViewModel
-import androidx.lifecycle.viewModelScope
import com.najudoryeong.mineme.common.domain.entity.Story
import com.najudoryeong.mineme.story.domain.entity.StoryListWithDate
import com.najudoryeong.mineme.common.domain.usecase.DataStoreUseCase
import com.najudoryeong.mineme.story.domain.usecase.StoryUseCase
-
import dagger.hilt.android.lifecycle.HiltViewModel
import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.StateFlow
-import kotlinx.coroutines.flow.first
-import kotlinx.coroutines.launch
import javax.inject.Inject
var dummy = mutableListOf(
diff --git a/story/src/main/res/layout/fragment_story.xml b/story/src/main/res/layout/fragment_story.xml
index 1a5e31a..870fcc8 100644
--- a/story/src/main/res/layout/fragment_story.xml
+++ b/story/src/main/res/layout/fragment_story.xml
@@ -47,7 +47,7 @@