#121 / 다이얼로그 프래그먼트 기본생성자 제거 밑 setLayoutSizeRatio 함수 추가

U-is-Ni-in-Korea · Jan 28, 2024 · 004e3b7 · 004e3b7
1 parent f27a766
commit 004e3b7
Show file tree

Hide file tree

Showing 11 changed files with 45 additions and 36 deletions.
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/app/src/main/java/sopt/uni/presentation/IntroActivity.kt b/app/src/main/java/sopt/uni/presentation/IntroActivity.kt
@@ -50,8 +50,9 @@ class IntroActivity : AppCompatActivity() {
                 checkUserStatus()
             }
         }
-        appUpdateInfoTask.addOnFailureListener {exception ->
+        appUpdateInfoTask.addOnFailureListener { exception ->
             Timber.tag("inappUpdate").e("업데이트 체크 실패: ${exception.message}")
+            showUpdateDialog()
         }
     }
 

diff --git a/app/src/main/java/sopt/uni/presentation/home/UpdateDialogFragment.kt b/app/src/main/java/sopt/uni/presentation/home/UpdateDialogFragment.kt
@@ -13,7 +13,7 @@ import dagger.hilt.android.AndroidEntryPoint
 import sopt.uni.R
 import sopt.uni.data.datasource.local.SparkleStorage
 import sopt.uni.databinding.TitleAction2DialogBinding
-import sopt.uni.presentation.BindingDialogFragment
+import sopt.uni.util.binding.BindingDialogFragment
 import sopt.uni.util.extension.setOnSingleClickListener
 import javax.inject.Inject
 
@@ -26,6 +26,7 @@ class UpdateDialogFragment :
 
     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))
@@ -56,7 +57,7 @@ class UpdateDialogFragment :
                 Log.e("update", it.resultCode.toString())
             } else {
                 SparkleStorage.setUpdateAvailableBoolean(
-                    UpdateDialogFragment.IS_UPDATE_AVAILABLE,
+                    IS_UPDATE_AVAILABLE,
                     true,
                 )
             }

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/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>