[FEAT] 좌석시야 / 직관등록 구현

app/src/main/AndroidManifest.xml

@@ -92,6 +92,10 @@
             android:exported="false"
             android:screenOrientation="portrait"/>
 
+        <activity android:name="com.dpm.presentation.seatreview.SelectViewImageActivity"
+            android:exported="false"
+            android:screenOrientation="portrait"/>
+
         <activity android:name="com.dpm.presentation.seatreview.ReviewDoneActivity"
             android:exported="false"
             android:screenOrientation="portrait"/>

core/designsystem/src/main/res/drawable/ic_edittext_close.xml

@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M12,1C5.925,1 1,5.925 1,12C1,18.075 5.925,23 12,23C18.075,23 23,18.075 23,12C23,5.925 18.075,1 12,1ZM15.707,8.293C16.098,8.683 16.098,9.317 15.707,9.707L13.414,12L15.707,14.293C16.098,14.683 16.098,15.317 15.707,15.707C15.317,16.098 14.683,16.098 14.293,15.707L12,13.414L9.707,15.707C9.317,16.098 8.683,16.098 8.293,15.707C7.902,15.317 7.902,14.683 8.293,14.293L10.586,12L8.293,9.707C7.902,9.317 7.902,8.683 8.293,8.293C8.683,7.902 9.317,7.902 9.707,8.293L12,10.586L14.293,8.293C14.683,7.902 15.317,7.902 15.707,8.293Z"
+      android:fillColor="#868B94"
+      android:fillType="evenOdd"/>
+</vector>

core/designsystem/src/main/res/drawable/ic_setting_my_page.xml

@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M12,4C10.067,4 8.5,5.567 8.5,7.5C8.5,9.433 10.067,11 12,11C13.933,11 15.5,9.433 15.5,7.5C15.5,5.567 13.933,4 12,4ZM6.5,7.5C6.5,4.462 8.962,2 12,2C15.037,2 17.5,4.462 17.5,7.5C17.5,10.538 15.037,13 12,13C8.962,13 6.5,10.538 6.5,7.5ZM12,16C9.161,16 6.63,17.369 5.014,19.509C4.915,19.64 4.839,19.74 4.776,19.828C4.728,19.895 4.696,19.944 4.673,19.981C4.822,19.998 5.033,20 5.427,20H18.573C18.966,20 19.178,19.998 19.327,19.981C19.304,19.944 19.271,19.895 19.224,19.828C19.161,19.74 19.085,19.64 18.986,19.509C17.369,17.369 14.839,16 12,16ZM3.418,18.303C5.391,15.692 8.499,14 12,14C15.501,14 18.609,15.692 20.582,18.303C20.591,18.315 20.6,18.327 20.609,18.339C20.778,18.563 20.96,18.803 21.09,19.036C21.247,19.316 21.364,19.641 21.357,20.037C21.351,20.354 21.255,20.652 21.138,20.886C21.021,21.121 20.842,21.377 20.592,21.573C20.258,21.835 19.896,21.928 19.573,21.966C19.29,22 18.955,22 18.618,22C18.603,22 18.588,22 18.573,22H5.427C5.412,22 5.397,22 5.382,22C5.045,22 4.709,22 4.426,21.966C4.104,21.928 3.741,21.835 3.408,21.573C3.158,21.377 2.979,21.121 2.862,20.886C2.745,20.652 2.649,20.354 2.643,20.037C2.636,19.641 2.752,19.316 2.91,19.036C3.04,18.803 3.221,18.563 3.391,18.339C3.4,18.327 3.409,18.315 3.418,18.303Z"
+      android:fillColor="#4D5159"
+      android:fillType="evenOdd"/>
+</vector>

core/designsystem/src/main/res/drawable/ic_setting_to_link.xml

@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="20dp"
+    android:height="20dp"
+    android:viewportWidth="20"
+    android:viewportHeight="20">
+  <path
+      android:pathData="M11.667,2.501C11.667,2.041 12.04,1.668 12.5,1.668H17.5C17.96,1.668 18.333,2.041 18.333,2.501L18.333,7.501C18.333,7.962 17.96,8.335 17.5,8.335C17.04,8.335 16.667,7.962 16.667,7.501L16.667,4.513L11.422,9.757C11.097,10.083 10.569,10.083 10.244,9.757C9.918,9.432 9.918,8.904 10.244,8.579L15.488,3.335H12.5C12.04,3.335 11.667,2.962 11.667,2.501Z"
+      android:fillColor="#D1D3D8"/>
+  <path
+      android:pathData="M6.465,3.335L8.333,3.335C8.793,3.335 9.167,3.708 9.167,4.168C9.167,4.628 8.793,5.001 8.333,5.001H6.5C5.786,5.001 5.301,5.002 4.926,5.033C4.56,5.062 4.374,5.117 4.243,5.183C3.93,5.343 3.675,5.598 3.515,5.911C3.448,6.042 3.394,6.228 3.364,6.594C3.334,6.969 3.333,7.454 3.333,8.168V13.501C3.333,14.215 3.334,14.7 3.364,15.075C3.394,15.441 3.448,15.628 3.515,15.758C3.675,16.072 3.93,16.326 4.243,16.486C4.374,16.553 4.56,16.607 4.926,16.637C5.301,16.667 5.786,16.668 6.5,16.668H11.833C12.547,16.668 13.032,16.667 13.407,16.637C13.773,16.607 13.96,16.553 14.09,16.486C14.403,16.326 14.658,16.072 14.818,15.758C14.885,15.628 14.939,15.441 14.969,15.075C14.999,14.7 15,14.215 15,13.501V11.668C15,11.208 15.373,10.835 15.833,10.835C16.293,10.835 16.667,11.208 16.667,11.668V13.536C16.667,14.207 16.667,14.76 16.63,15.211C16.591,15.68 16.509,16.11 16.303,16.515C15.984,17.142 15.474,17.652 14.847,17.971C14.442,18.177 14.011,18.26 13.543,18.298C13.092,18.335 12.538,18.335 11.868,18.335H6.465C5.795,18.335 5.241,18.335 4.79,18.298C4.322,18.26 3.891,18.177 3.487,17.971C2.859,17.652 2.349,17.142 2.03,16.515C1.824,16.11 1.742,15.68 1.703,15.211C1.666,14.76 1.666,14.207 1.666,13.536V8.134C1.666,7.463 1.666,6.909 1.703,6.458C1.742,5.99 1.824,5.559 2.03,5.155C2.349,4.527 2.859,4.018 3.487,3.698C3.891,3.492 4.322,3.41 4.79,3.371C5.241,3.335 5.795,3.335 6.465,3.335Z"
+      android:fillColor="#D1D3D8"/>
+</vector>

data/src/main/java/com/dpm/data/model/request/seatreview/RequestSeatReviewDto.kt

@@ -20,6 +20,8 @@ data class RequestSeatReviewDto(
     val content: String?,
     @SerialName("dateTime")
     val dateTime: String,
+    @SerialName("reviewType")
+    val reviewType: String?,
 )
 
 fun RequestSeatReview.toSeatReview() = RequestSeatReviewDto(
@@ -30,4 +32,5 @@ fun RequestSeatReview.toSeatReview() = RequestSeatReviewDto(
     bad = bad,
     content = content,
     dateTime = dateTime,
+    reviewType = reviewType,
 )

domain/src/main/java/com/dpm/domain/entity/request/seatreview/RequestSeatReview.kt

@@ -8,4 +8,5 @@ data class RequestSeatReview(
     val bad: List<String>,
     val content: String?,
     val dateTime: String,
+    val reviewType: String?,
 )

domain/src/main/java/com/dpm/domain/model/seatreview/ReviewMethod.kt

@@ -0,0 +1,6 @@
+package com.dpm.domain.model.seatreview
+
+enum class ReviewMethod {
+    VIEW,
+    FEED,
+}

presentation/src/main/java/com/dpm/presentation/home/HomeActivity.kt

@@ -1,5 +1,6 @@
 package com.dpm.presentation.home
 
+import ReviewData
 import android.content.Intent
 import android.os.Bundle
 import android.view.View
@@ -10,16 +11,20 @@ import com.depromeet.presentation.databinding.ActivityHomeBinding
 import com.dpm.core.base.BaseActivity
 import com.dpm.core.state.UiState
 import com.dpm.designsystem.SpotImageSnackBar
+import com.dpm.designsystem.SpotSnackBar
 import com.dpm.domain.entity.response.home.ResponseHomeFeed
 import com.dpm.domain.entity.response.viewfinder.ResponseStadiums
+import com.dpm.domain.model.seatreview.ReviewMethod
 import com.dpm.presentation.extension.dpToPx
 import com.dpm.presentation.home.adapter.StadiumAdapter
 import com.dpm.presentation.home.dialog.LevelDescriptionDialog
 import com.dpm.presentation.home.dialog.LevelupDialog
 import com.dpm.presentation.home.viewmodel.HomeGuiViewModel
 import com.dpm.presentation.seatrecord.SeatRecordActivity
 import com.dpm.presentation.seatrecord.adapter.LinearSpacingItemDecoration
-import com.dpm.presentation.seatreview.ReviewActivity
+import com.dpm.presentation.seatreview.dialog.ReviewTypeDialog
+import com.dpm.presentation.seatreview.dialog.feed.FeedUploadDialog
+import com.dpm.presentation.seatreview.dialog.view.ViewUploadDialog
 import com.dpm.presentation.setting.SettingActivity
 import com.dpm.presentation.util.Utils
 import com.dpm.presentation.viewfinder.StadiumActivity
@@ -34,6 +39,12 @@ class HomeActivity : BaseActivity<ActivityHomeBinding>(
         const val STADIUM_EXTRA_ID = "stadium_id"
         private const val START_SPACING_DP = 16
         private const val BETWEEN_SPADING_DP = 8
+        private const val VIEW_UPLOAD_DIALOG = "ViewUploadDialog"
+        private const val FEED_UPLOAD_DIALOG = "FeedUploadDialog"
+        private const val REVIEW_DATA = "REVIEW_DATA"
+        private const val DIALOG_TYPE = "DIALOG_TYPE"
+        private const val CANCEL_SNACKBAR = "CANCEL_SNACKBAR"
+        private const val UPLOAD_SNACKBAR = "UPLOAD_SNACKBAR"
     }
 
     private val homeViewModel: HomeGuiViewModel by viewModels()
@@ -54,11 +65,40 @@ class HomeActivity : BaseActivity<ActivityHomeBinding>(
     }
 
     private fun initView() {
+        initReviewDialog()
         initViewStatusBar()
         homeViewModel.getStadiums()
         setStadiumAdapter()
     }
 
+    private fun initReviewDialog() {
+        val reviewData = intent.getParcelableExtra<ReviewData>(REVIEW_DATA)
+
+        when (intent?.getSerializableExtra(DIALOG_TYPE) as? ReviewMethod) {
+            ReviewMethod.VIEW -> ViewUploadDialog().show(supportFragmentManager, VIEW_UPLOAD_DIALOG)
+            ReviewMethod.FEED -> FeedUploadDialog().apply {
+                arguments = Bundle().apply { putParcelable(REVIEW_DATA, reviewData) }
+            }.show(supportFragmentManager, FEED_UPLOAD_DIALOG)
+            else -> {}
+        }
+
+        intent.getBooleanExtra(CANCEL_SNACKBAR, false).takeIf { it }?.run {
+            makeSpotImageAppbar("다음에는 좌석 시야 공유도 기대할게요!")
+        }
+
+        intent.getBooleanExtra(UPLOAD_SNACKBAR, false).takeIf { it }?.run {
+            SpotSnackBar.make(
+                view = binding.root,
+                message = "시야찾기에 내 게시글이 올라갔어요!",
+                endMessage = "확인하러 가기",
+            ) {
+                // TODO : onclick -> 방금 작성한 시야 후기 상세페이지 게시물 화면으로 이동
+            }.show()
+        }
+    }
+
+
+
     private fun initEvent() = with(binding) {
         clHomeArchiving.setOnClickListener { startSeatRecordActivity() }
         ivHomeInfo.setOnClickListener { showLevelDescriptionDialog() }
@@ -215,7 +255,7 @@ class HomeActivity : BaseActivity<ActivityHomeBinding>(
     }
 
     private fun navigateToReviewActivity() {
-        Intent(this, ReviewActivity::class.java).apply { startActivity(this) }
+        ReviewTypeDialog().show(supportFragmentManager, "MyDialog")
     }
 
     private fun setHomeFeedShimmer(isLoading: Boolean) = with(binding) {

presentation/src/main/java/com/dpm/presentation/login/ui/NicknameInputActivity.kt

@@ -24,10 +24,18 @@ class NicknameInputActivity: BaseActivity<FragmentNicknameInputBinding>({
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
+        initView()
         initClickListener()
         initObserver()
     }
 
+    private fun initView() {
+        binding.etProfileEditNickname.backgroundTintList = getColorStateList(
+            this@NicknameInputActivity,
+            com.depromeet.designsystem.R.color.color_gray_200
+        )
+    }
+
     private fun initClickListener() = with(binding) {
         ivBack.setOnClickListener {
              finish()
@@ -53,7 +61,7 @@ class NicknameInputActivity: BaseActivity<FragmentNicknameInputBinding>({
         etProfileEditNickname.setOnEditorActionListener { v, actionId, event ->
             if (actionId == EditorInfo.IME_ACTION_DONE) {
                 if (etProfileEditNickname.text.isNotEmpty()) {
-                    //Todo : 서버 API 연동 및 닉네임 중복 검사
+                    signUpViewModel.checkDuplicateNickname(etProfileEditNickname.text.toString())
                 }
                 true
             } else {
@@ -66,18 +74,12 @@ class NicknameInputActivity: BaseActivity<FragmentNicknameInputBinding>({
         }
 
         tvNicknameNextBtn.setOnClickListener {
-            //Todo : 서버 API 연동 및 닉네임 중복 검사
-            //임시로 응원하는 팀 선택 화면으로 이동
-            Intent(this@NicknameInputActivity, TeamSelectActivity::class.java).apply {
-                putExtra("nickname", etProfileEditNickname.text.toString())
-                putExtra("kakaoToken", intent.getStringExtra("kakaoToken"))
-                startActivity(this)
-            }
+            signUpViewModel.checkDuplicateNickname(etProfileEditNickname.text.toString())
         }
     }
 
     private fun initObserver() = with(binding) {
-        signUpViewModel.nicknameInputState.asLiveData().observe(this@NicknameInputActivity) { state ->
+        signUpViewModel.nicknameInputState.observe(this@NicknameInputActivity) { state ->
             when (state) {
                 NicknameInputState.EMPTY -> {
                     clNicknameInputWarning.visibility = View.GONE
@@ -87,6 +89,13 @@ class NicknameInputActivity: BaseActivity<FragmentNicknameInputBinding>({
                     clNicknameInputWarning.visibility = View.GONE
                     updateButtonEnabled(true)
                 }
+                NicknameInputState.NICKNAME_SUCCESS -> {
+                    Intent(this@NicknameInputActivity, TeamSelectActivity::class.java).apply {
+                        putExtra("nickname", etProfileEditNickname.text.toString())
+                        putExtra("kakaoToken", intent.getStringExtra("kakaoToken"))
+                        startActivity(this)
+                    }
+                }
                 NicknameInputState.INVALID_LENGTH -> {
                     clNicknameInputWarning.visibility = View.VISIBLE
                     tvNicknameWarning.text = getString(R.string.profile_edit_error_length)

presentation/src/main/java/com/dpm/presentation/login/ui/SignUpActivity.kt

@@ -10,6 +10,7 @@ import com.dpm.presentation.home.HomeActivity
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
+import timber.log.Timber
 import javax.inject.Inject
 
 @AndroidEntryPoint
@@ -29,6 +30,7 @@ class SignUpActivity : BaseActivity<ActivitySignupBinding>({
         lifecycleScope.launch {
             delay(1500)
             if (sharedPreference.token.isNotEmpty()) {
+                Timber.d("access token: ${sharedPreference.token}")
                 navigateToNextScreen(HomeActivity::class.java)
             } else {
                 navigateToNextScreen(KakaoSignupActivity::class.java)

presentation/src/main/java/com/dpm/presentation/login/ui/SignUpCompleteActivity.kt

@@ -1,7 +1,11 @@
 package com.dpm.presentation.login.ui
 
 import android.content.Intent
+import android.graphics.Color
 import android.os.Bundle
+import android.text.Spannable
+import android.text.SpannableString
+import android.text.style.ForegroundColorSpan
 import com.depromeet.presentation.databinding.ActivitySignupCompleteBinding
 import com.dpm.core.base.BaseActivity
 import com.dpm.presentation.home.HomeActivity
@@ -12,9 +16,45 @@ class SignUpCompleteActivity : BaseActivity<ActivitySignupCompleteBinding>(
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
+        initView()
         initEvent()
     }
 
+    private fun initView() {
+        welcomeSetText()
+        welcomeImageSetAnimation()
+    }
+
+    private fun welcomeSetText() {
+        val nickname = intent.getStringExtra("nickname") ?: ""
+        val welcomeMessage = "${nickname}님 반가워요!"
+
+        val spannableString = SpannableString(welcomeMessage)
+
+        spannableString.setSpan(
+            ForegroundColorSpan(Color.parseColor("#42D596")),
+            0,
+            nickname.length,
+            Spannable.SPAN_EXCLUSIVE_EXCLUSIVE
+        )
+
+        binding.tvSignupCompleteTitle.text = spannableString
+    }
+
+    private fun welcomeImageSetAnimation() {
+        binding.ivSignupComplete.apply {
+            alpha = 0f
+            scaleX = 0.5f
+            scaleY = 0.5f
+            animate()
+                .alpha(1f)
+                .scaleX(1f)
+                .scaleY(1f)
+                .setDuration(1000)
+                .start()
+        }
+    }
+
     private fun initEvent() {
         binding.tvSignupCompleteBtn.setOnClickListener {
             Intent(this, HomeActivity::class.java).apply {

presentation/src/main/java/com/dpm/presentation/login/ui/TeamSelectActivity.kt

@@ -35,14 +35,16 @@ class TeamSelectActivity: BaseActivity<FragmentTeamSelectBinding>(
         signupViewModel.getBaseballTeam()
         signupViewModel.teamSelectUiState.asLiveData().observe(this) {
             when (it) {
-                SignupUiState.Failure -> { }
-                SignupUiState.Initial -> {
+                is SignupUiState.Failure -> { }
+                is SignupUiState.Initial -> {
                     initView()
                     initEvent()
                 }
-                SignupUiState.Loading -> { }
-                SignupUiState.SignUpSuccess -> {
+                is SignupUiState.Loading -> { }
+                is SignupUiState.SignUpSuccess -> {
                     Intent(this, SignUpCompleteActivity::class.java).apply {
+                        putExtra("nickname", it.nickname)
+                        flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK
                         startActivity(this)
                         finish()
                     }

presentation/src/main/java/com/dpm/presentation/login/ui/compose/KakaoSignupScreen.kt

@@ -33,6 +33,8 @@ import androidx.compose.ui.unit.sp
 import com.depromeet.presentation.R
 import com.dpm.designsystem.compose.ui.SpotTheme
 import com.dpm.presentation.extension.noRippleClickable
+import com.dpm.presentation.util.HighlightedText
+import com.dpm.presentation.util.MultiStyleText
 import kotlinx.coroutines.delay
 
 
@@ -42,18 +44,17 @@ fun KakaoSignupScreen(
     onKakaoLoginClick: () -> Unit = {}
 ) {
     val onBoardingList = listOf(
-        Triple("시야찾기로 원하는 야구장\n" +
-                "자리를 빠르게 알아봐요!", 0, 3),
-        Triple("내 시야 후기를 올려서\n" +
-                "캐릭터를 성장시켜요!", 0, 6),
-        Triple("내 소중한 시야 기록을\n" +
-                "한 자리에서 봐요!", 6, 10),
+        Pair("시야찾기로 원하는 야구장\n자리를 빠르게 알아봐요!", listOf(0..3)),
+        Pair("내 시야 후기를 올려서\n캐릭터를 성장시켜요!", listOf(0..6)),
+        Pair("내 소중한 시야 기록을\n한 자리에서 봐요!", listOf(6..10)),
+        Pair("내 직관 후기를 기록하면서\n좌석 시야도 공유할 수 있어요", listOf(2..6, 14..19))
     )
 
     val onboardingImageList = listOf(
-        R.drawable.ic_signup_image_1,
-        R.drawable.ic_signup_image_3,
-        R.drawable.ic_signup_image_2,
+        com.depromeet.designsystem.R.drawable.ic_signup_image_1,
+        com.depromeet.designsystem.R.drawable.ic_signup_image_2,
+        com.depromeet.designsystem.R.drawable.ic_signup_image_3,
+        com.depromeet.designsystem.R.drawable.ic_signup_image_4
     )
 
     val pageCount = onBoardingList.size
@@ -106,15 +107,13 @@ fun KakaoSignupScreen(
             ) { page ->
                 Box(
                     modifier = Modifier.fillMaxWidth(),
-                    contentAlignment = Alignment.Center
+                    contentAlignment = Alignment.Center,
                 ) {
-                    Text(
-                        modifier = Modifier.padding(top = 44.dp, bottom = 20.dp),
+                    HighlightedText(
                         text = onBoardingList[page].first,
-                        fontSize = 22.sp,
-                        textAlign = TextAlign.Center,
-                        color = SpotTheme.colors.transferBlack03,
-                        fontWeight = FontWeight(600),
+                        style = SpotTheme.typography.title04,
+                        highlightRanges = onBoardingList[page].second,
+                        modifier = Modifier.padding(top = 44.dp, bottom = 20.dp)
                     )
                 }
             }