U-is-Ni-in-Korea · taeheeL · Feb 18, 2024 · Nov 26, 2023 · Dec 3, 2023 · Dec 30, 2023
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/app/build.gradle b/app/build.gradle
@@ -137,4 +137,6 @@ dependencies {
     // Splash Screen
     implementation 'androidx.core:core-splashscreen:1.0.1'
 
+    // In App Update
+    implementation 'com.google.android.play:app-update-ktx:2.1.0'
 }
diff --git a/app/src/main/java/sopt/uni/data/datasource/local/SparkleStorage.kt b/app/src/main/java/sopt/uni/data/datasource/local/SparkleStorage.kt
@@ -42,6 +42,14 @@ object SparkleStorage {
         )
     }
 
+    fun setUpdateAvailableBoolean(key: String, value: Boolean) {
+        pref.edit { putBoolean(key, value) }
+    }
+
+    fun getUpdateAvailableBoolean(key: String): Boolean {
+        return pref.getBoolean(key, false)
+    }
+
     var accessToken: String?
         get() = pref.getString(ACCESS_TOKEN, null)
         set(value) = pref.edit { putString(ACCESS_TOKEN, value).apply() }

diff --git a/app/src/main/java/sopt/uni/di/AppModule.kt b/app/src/main/java/sopt/uni/di/AppModule.kt
@@ -0,0 +1,21 @@
+package sopt.uni.di
+
+import android.content.Context
+import com.google.android.play.core.appupdate.AppUpdateManager
+import com.google.android.play.core.appupdate.AppUpdateManagerFactory
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.android.qualifiers.ApplicationContext
+import dagger.hilt.components.SingletonComponent
+import javax.inject.Singleton
+
+@Module
+@InstallIn(SingletonComponent::class)
+object AppModule {
+
+    @Provides
+    @Singleton
+    fun provideAppUpdateManager(@ApplicationContext context: Context): AppUpdateManager =
+        AppUpdateManagerFactory.create(context)
+}
diff --git a/app/src/main/java/sopt/uni/presentation/IntroActivity.kt b/app/src/main/java/sopt/uni/presentation/IntroActivity.kt
@@ -5,30 +5,66 @@ import android.os.Bundle
 import android.util.Log
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
+import com.google.android.play.core.appupdate.AppUpdateManager
+import com.google.android.play.core.install.model.AppUpdateType
+import com.google.android.play.core.install.model.UpdateAvailability
 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.home.UpdateDialogFragment
 import sopt.uni.presentation.invite.NickNameActivity
 import sopt.uni.presentation.invite.ShareInviteCodeActivity
 import sopt.uni.presentation.onboarding.OnBoardingActivity
 import sopt.uni.util.extension.startActivity
+import timber.log.Timber
 import javax.inject.Inject
 
 @AndroidEntryPoint
 class IntroActivity : AppCompatActivity() {
     @Inject
     lateinit var shortGameRepository: ShortGameRepository
+
+    @Inject
+    lateinit var appUpdateManager: AppUpdateManager
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         installSplashScreen()
 
-        checkUserStatus()
+        checkUpdateAvailability()
 
         // 메모장 초기화
         shortGameRepository.setMemoText("")
     }
 
+    private fun checkUpdateAvailability() {
+        val appUpdateInfoTask = appUpdateManager.appUpdateInfo
+        appUpdateInfoTask.addOnSuccessListener { appUpdateInfo ->
+            if (appUpdateInfo.updateAvailability() == UpdateAvailability.UPDATE_AVAILABLE && appUpdateInfo.isUpdateTypeAllowed(
+                    AppUpdateType.IMMEDIATE,
+                )
+            ) {
+                showUpdateDialog()
+            } else {
+                checkUserStatus()
+            }
+        }
+        appUpdateInfoTask.addOnFailureListener { exception ->
+            Timber.tag("inappUpdate").e("업데이트 체크 실패: ${exception.message}")
+            checkUserStatus()
+        }
+    }
+
+    private fun showUpdateDialog() {
+        val dialogFragment = UpdateDialogFragment(
+            onDismissOrComplete = {
+                checkUserStatus()
+            },
+        )
+        dialogFragment.show(supportFragmentManager, "UpdateDialog")
+    }
+
     private fun checkUserStatus() {
         if (SparkleStorage.accessToken != null) {
             Log.e("accessToken", SparkleStorage.accessToken.toString())

diff --git a/app/src/main/java/sopt/uni/presentation/home/UpdateDialogFragment.kt b/app/src/main/java/sopt/uni/presentation/home/UpdateDialogFragment.kt
@@ -0,0 +1,80 @@
+package sopt.uni.presentation.home
+
+import android.app.Activity
+import android.os.Bundle
+import android.util.Log
+import android.view.View
+import androidx.activity.result.contract.ActivityResultContracts
+import com.google.android.play.core.appupdate.AppUpdateManager
+import com.google.android.play.core.appupdate.AppUpdateOptions
+import com.google.android.play.core.install.model.AppUpdateType
+import com.google.android.play.core.install.model.UpdateAvailability
+import dagger.hilt.android.AndroidEntryPoint
+import sopt.uni.R
+import sopt.uni.data.datasource.local.SparkleStorage
+import sopt.uni.databinding.TitleAction2DialogBinding
+import sopt.uni.util.binding.BindingDialogFragment
+import sopt.uni.util.extension.setOnSingleClickListener
+import sopt.uni.util.extension.showSnackbar
+import timber.log.Timber
+import javax.inject.Inject
+
+@AndroidEntryPoint
+class UpdateDialogFragment(private val onDismissOrComplete: () -> Unit) :
+    BindingDialogFragment<TitleAction2DialogBinding>(R.layout.title_action2_dialog) {
+
+    @Inject
+    lateinit var appUpdateManager: AppUpdateManager
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        setLayoutSizeRatio(0.778f, 0.2f)
+
+        with(binding) {
+            dialogTitle.setText(getString(R.string.update_dialog_title))
+            dialogBody.setText(getString(R.string.update_dialog_body))
+            btnRight.setText(getString(R.string.update_dialog_ok))
+            btnLeft.setOnSingleClickListener {
+                dismiss()
+                onDismissOrComplete()
+            }
+            btnRight.setOnSingleClickListener {
+                updateSparkle()
+            }
+        }
+    }
+
+    private fun updateSparkle() {
+        appUpdateManager.appUpdateInfo.addOnSuccessListener { appUpdateInfo ->
+            if (appUpdateInfo.updateAvailability() == UpdateAvailability.UPDATE_AVAILABLE &&
+                appUpdateInfo.isUpdateTypeAllowed(AppUpdateType.IMMEDIATE)
+            ) {
+                appUpdateManager.startUpdateFlowForResult(
+                    appUpdateInfo,
+                    startForResult,
+                    AppUpdateOptions.newBuilder(AppUpdateType.IMMEDIATE).build(),
+                )
+            }
+        }.addOnFailureListener {
+            Timber.tag("updateSparkleFail").e("업뎃실패ㅠ")
+        }
+    }
+
+    private val startForResult =
+        registerForActivityResult(ActivityResultContracts.StartIntentSenderForResult()) {
+            if (it.resultCode != Activity.RESULT_OK) {
+                showSnackbar(binding.root, "업데이트에 실패했습니다. 다시 시도해주세요.")
+                Log.e("update", it.resultCode.toString())
+            } else {
+                SparkleStorage.setUpdateAvailableBoolean(
+                    IS_UPDATE_AVAILABLE,
+                    true,
+                )
+                onDismissOrComplete()
+            }
+        }
+
+    companion object {
+        const val IS_UPDATE_AVAILABLE = "IS_UPDATE_AVAILABLE"
+    }
+}
diff --git a/app/src/main/java/sopt/uni/presentation/mypage/MypageAccountDialogFragment.kt b/app/src/main/java/sopt/uni/presentation/mypage/MypageAccountDialogFragment.kt
@@ -9,15 +9,16 @@ import sopt.uni.data.datasource.local.SparkleStorage
 import sopt.uni.databinding.NoBodyAction2DialogBinding
 import sopt.uni.databinding.TitleAction2DialogBinding
 import sopt.uni.di.ServicePool
-import sopt.uni.presentation.BindingDialogFragment
 import sopt.uni.presentation.invite.NickNameActivity
 import sopt.uni.presentation.login.LoginActivity
+import sopt.uni.util.binding.BindingDialogFragment
 import sopt.uni.util.extension.setOnSingleClickListener
 
 class MypageAccountLogoutDialogFragment :
     BindingDialogFragment<NoBodyAction2DialogBinding>(R.layout.no_body_action2_dialog) {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
+        setLayoutSizeRatio(0.778f, 0.16f)
 
         with(binding) {
             dialogTitle.setText(getString(R.string.logout_dialog_title))
@@ -47,6 +48,7 @@ class MypageAccountDeleteDialogFragment :
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
+        setLayoutSizeRatio(0.778f, 0.22f)
 
         with(binding) {
             dialogTitle.setText(getString(R.string.delete_dialog_title))
@@ -77,6 +79,7 @@ class MypageAccountCoupleDisconnectDialogFragment :
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
+        setLayoutSizeRatio(0.778f, 0.22f)
 
         with(binding) {
             dialogTitle.setText(getString(R.string.disconnect_dialog_title))

diff --git a/app/src/main/java/sopt/uni/presentation/mypage/MypageDatePickerDialogFragment.kt b/app/src/main/java/sopt/uni/presentation/mypage/MypageDatePickerDialogFragment.kt
@@ -4,14 +4,13 @@ import android.os.Bundle
 import android.view.View
 import sopt.uni.R
 import sopt.uni.databinding.DatepickerDialogBinding
-import sopt.uni.presentation.BindingDialogFragment
+import sopt.uni.util.binding.BindingDialogFragment
 import sopt.uni.util.extension.setOnSingleClickListener
 import java.util.Calendar
 
 class MypageDatePickerDialogFragment :
     BindingDialogFragment<DatepickerDialogBinding>(
         R.layout.datepicker_dialog,
-        isWrapContent = true,
     ) {
     private var listener: DatePickerDialogListener? = null
 
@@ -21,6 +20,7 @@ class MypageDatePickerDialogFragment :
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
+        setLayoutSizeRatio(0.77f, 0.34f)
 
         setMaxDate()
 

diff --git a/...a/sopt/uni/presentation/shortgame/createshortgame/dialog/CreateShortGameDialogFragment.kt b/...a/sopt/uni/presentation/shortgame/createshortgame/dialog/CreateShortGameDialogFragment.kt
@@ -4,7 +4,7 @@ import android.os.Bundle
 import android.view.View
 import sopt.uni.R
 import sopt.uni.databinding.TitleAction2DialogBinding
-import sopt.uni.presentation.BindingDialogFragment
+import sopt.uni.util.binding.BindingDialogFragment
 
 class CreateShortGameDialogFragment :
     BindingDialogFragment<TitleAction2DialogBinding>(R.layout.title_action2_dialog) {

diff --git a/app/src/main/java/sopt/uni/presentation/timer/TimerDialogFragment.kt b/app/src/main/java/sopt/uni/presentation/timer/TimerDialogFragment.kt
@@ -4,7 +4,7 @@ import android.os.Bundle
 import android.view.View
 import sopt.uni.R
 import sopt.uni.databinding.TitleAction2DialogBinding
-import sopt.uni.presentation.BindingDialogFragment
+import sopt.uni.util.binding.BindingDialogFragment
 import sopt.uni.util.extension.setOnSingleClickListener
 
 class TimerDialogFragment :

diff --git a/app/src/main/java/sopt/uni/presentation/wish/fragment/NewWishDialogFragment.kt b/app/src/main/java/sopt/uni/presentation/wish/fragment/NewWishDialogFragment.kt
@@ -4,7 +4,7 @@ import android.os.Bundle
 import android.view.View
 import sopt.uni.R
 import sopt.uni.databinding.TitleAction2DialogBinding
-import sopt.uni.presentation.BindingDialogFragment
+import sopt.uni.util.binding.BindingDialogFragment
 import sopt.uni.util.extension.setOnSingleClickListener
 
 class NewWishDialogFragment :

diff --git a/app/src/main/java/sopt/uni/presentation/wish/fragment/UseWishDialogFragment.kt b/app/src/main/java/sopt/uni/presentation/wish/fragment/UseWishDialogFragment.kt
@@ -4,7 +4,7 @@ import android.os.Bundle
 import android.view.View
 import sopt.uni.R
 import sopt.uni.databinding.TitleAction2DialogBinding
-import sopt.uni.presentation.BindingDialogFragment
+import sopt.uni.util.binding.BindingDialogFragment
 
 class UseWishDialogFragment :
     BindingDialogFragment<TitleAction2DialogBinding>(R.layout.title_action2_dialog) {

diff --git a/app/src/main/java/sopt/uni/util/binding/BindingDialogFragment.kt b/app/src/main/java/sopt/uni/util/binding/BindingDialogFragment.kt
@@ -1,5 +1,7 @@
-package sopt.uni.presentation
+package sopt.uni.util.binding
 
+import android.graphics.Color
+import android.graphics.drawable.ColorDrawable
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
@@ -10,21 +12,11 @@ import androidx.databinding.ViewDataBinding
 import androidx.fragment.app.DialogFragment
 import sopt.uni.R
 
-abstract class BindingDialogFragment<B : ViewDataBinding>(
+abstract class BindingDialogFragment<T : ViewDataBinding>(
     @LayoutRes private val layoutRes: Int,
-    private val isWrapContent: Boolean = false,
-) :
-    DialogFragment() {
-    private var _binding: B? = null
-    val binding get() = requireNotNull(_binding!!) { "${this::class.java.simpleName}에서 에러가 발생했습니다." }
-
-    override fun onStart() {
-        super.onStart()
-        val width = if (isWrapContent) ViewGroup.LayoutParams.WRAP_CONTENT else resources.getDimensionPixelSize(R.dimen.dialog_width)
-        val height = if (isWrapContent) ViewGroup.LayoutParams.WRAP_CONTENT else resources.getDimensionPixelSize(R.dimen.dialog_height)
-        dialog?.window?.setLayout(width, height)
-        dialog?.window?.setBackgroundDrawableResource(android.R.color.transparent)
-    }
+) : DialogFragment() {
+    private var _binding: T? = null
+    protected val binding get() = _binding ?: error(getString(R.string.binding_error))
 
     override fun onCreateView(
         inflater: LayoutInflater,
@@ -35,8 +27,22 @@ abstract class BindingDialogFragment<B : ViewDataBinding>(
         return binding.root
     }
 
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        dialog?.window?.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT))
+    }
+
+    protected fun setLayoutSizeRatio(widthPercent: Float, heightPercent: Float) {
+        context?.resources?.displayMetrics?.let { metrics ->
+            binding.root.layoutParams.apply {
+                width = ((metrics.widthPixels * widthPercent).toInt())
+                height = ((metrics.heightPixels * heightPercent).toInt())
+            }
+        }
+    }
+
     override fun onDestroyView() {
-        super.onDestroyView()
         _binding = null
+        super.onDestroyView()
     }
 }
diff --git a/app/src/main/res/layout/title_action2_dialog.xml b/app/src/main/res/layout/title_action2_dialog.xml
@@ -47,7 +47,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="30dp"
             android:layout_marginEnd="10dp"
-            android:layout_marginBottom="16dp"
+            android:layout_marginBottom="45dp"
             android:paddingHorizontal="14dp"
             android:paddingVertical="7dp"
             android:text="@string/dialog_cancel_text"
@@ -62,7 +62,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginHorizontal="10dp"
-            android:layout_marginBottom="16dp"
+            android:layout_marginBottom="45dp"
             android:paddingHorizontal="14dp"
             android:paddingVertical="7dp"
             android:text="@string/dialog_ok_text"

diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
@@ -3,9 +3,6 @@
     <dimen name="home_lightblue_background">158dp</dimen>
     <dimen name="divider_width">49dp</dimen>
     <dimen name="on_boarding_image">328dp</dimen>
-    <dimen name="dialog_width">300dp</dimen>
-    <dimen name="dialog_height">165dp</dimen>
-
     <!-- Button -->
     <dimen name="long_button_height">48dp</dimen>
 </resources>

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -121,6 +121,11 @@
     <string name="dialog_ok_text">확인</string>
     <string name="dialog_title_text">Title</string>
 
+    <!-- updateDialog -->
+    <string name="update_dialog_title">새로운 버전이 업데이트 되었어요</string>
+    <string name="update_dialog_body">새로운 버전으로 업데이트 하시겠습니까?</string>
+    <string name="update_dialog_ok">업데이트</string>
+
     <!-- createShortGame -->
     <string name="create_short_game_title">한판승부</string>
     <string name="create_short_game_select_mission">미션 카테고리 선택하기</string>