[MOD] #267 util/custom 패키지 아래에 있는 커스텀 클래스들의 패키지 위치 이동

leeeha · leeeha · commit 2eb0c18434aa · 2023-11-15T15:31:34.000+09:00
diff --git a/app/src/main/java/com/runnect/runnect/presentation/detail/CourseDetailActivity.kt b/app/src/main/java/com/runnect/runnect/presentation/detail/CourseDetailActivity.kt
@@ -35,11 +35,11 @@ import com.runnect.runnect.presentation.discover.search.DiscoverSearchActivity
 import com.runnect.runnect.presentation.login.LoginActivity
 import com.runnect.runnect.presentation.mypage.upload.MyUploadActivity
 import com.runnect.runnect.presentation.state.UiStateV2
-import com.runnect.runnect.util.custom.CommonDialogFragment
-import com.runnect.runnect.util.custom.PopupItem
-import com.runnect.runnect.util.custom.RequireLoginDialogFragment
-import com.runnect.runnect.util.custom.RunnectPopupMenu
-import com.runnect.runnect.util.custom.RunnectToast
+import com.runnect.runnect.util.custom.dialog.CommonDialogFragment
+import com.runnect.runnect.util.custom.popup.PopupItem
+import com.runnect.runnect.util.custom.dialog.RequireLoginDialogFragment
+import com.runnect.runnect.util.custom.popup.RunnectPopupMenu
+import com.runnect.runnect.util.custom.toast.RunnectToast
 import com.runnect.runnect.util.extension.getCompatibleSerializableExtra
 import com.runnect.runnect.util.extension.getStampResId
 import com.runnect.runnect.util.extension.hideKeyboard
diff --git a/app/src/main/java/com/runnect/runnect/presentation/discover/DiscoverFragment.kt b/app/src/main/java/com/runnect/runnect/presentation/discover/DiscoverFragment.kt
@@ -9,7 +9,6 @@ import android.os.Handler
 import android.os.Looper
 import android.view.View
 import androidx.activity.OnBackPressedCallback
-import androidx.activity.addCallback
 import androidx.activity.result.ActivityResultLauncher
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.core.view.isVisible
@@ -29,8 +28,8 @@ import com.runnect.runnect.presentation.discover.load.DiscoverLoadActivity
 import com.runnect.runnect.presentation.discover.search.DiscoverSearchActivity
 import com.runnect.runnect.presentation.state.UiState
 import com.runnect.runnect.presentation.storage.StorageScrapFragment
-import com.runnect.runnect.util.custom.RunnectToast
-import com.runnect.runnect.util.custom.GridSpacingItemDecoration
+import com.runnect.runnect.util.custom.toast.RunnectToast
+import com.runnect.runnect.util.custom.deco.GridSpacingItemDecoration
 import com.runnect.runnect.util.callback.OnBannerClick
 import com.runnect.runnect.util.callback.OnHeartClick
 import com.runnect.runnect.util.callback.OnItemClick
diff --git a/app/src/main/java/com/runnect/runnect/presentation/discover/adapter/CourseRecommendAdapter.kt b/app/src/main/java/com/runnect/runnect/presentation/discover/adapter/CourseRecommendAdapter.kt
@@ -10,7 +10,7 @@ import com.bumptech.glide.load.DecodeFormat
 import com.runnect.runnect.R
 import com.runnect.runnect.data.dto.RecommendCourseDTO
 import com.runnect.runnect.databinding.ItemDiscoverCourseInfoBinding
-import com.runnect.runnect.util.custom.RunnectToast
+import com.runnect.runnect.util.custom.toast.RunnectToast
 import com.runnect.runnect.util.callback.OnHeartClick
 import com.runnect.runnect.util.callback.OnItemClick
 import com.runnect.runnect.util.callback.ItemDiffCallback
diff --git a/app/src/main/java/com/runnect/runnect/presentation/discover/load/DiscoverLoadActivity.kt b/app/src/main/java/com/runnect/runnect/presentation/discover/load/DiscoverLoadActivity.kt
@@ -14,7 +14,7 @@ import com.runnect.runnect.presentation.discover.load.adapter.DiscoverLoadAdapte
 import com.runnect.runnect.presentation.discover.upload.DiscoverUploadActivity
 import com.runnect.runnect.presentation.search.SearchActivity
 import com.runnect.runnect.presentation.state.UiState
-import com.runnect.runnect.util.custom.GridSpacingItemDecoration
+import com.runnect.runnect.util.custom.deco.GridSpacingItemDecoration
 import com.runnect.runnect.util.callback.OnRecommendCourseClick
 import dagger.hilt.android.AndroidEntryPoint
 import timber.log.Timber
diff --git a/app/src/main/java/com/runnect/runnect/presentation/discover/search/DiscoverSearchActivity.kt b/app/src/main/java/com/runnect/runnect/presentation/discover/search/DiscoverSearchActivity.kt
@@ -9,7 +9,6 @@ import android.view.MotionEvent
 import android.view.inputmethod.EditorInfo.IME_ACTION_SEARCH
 import android.widget.TextView
 import androidx.activity.OnBackPressedCallback
-import androidx.activity.result.contract.ActivityResultContracts
 import androidx.activity.viewModels
 import androidx.core.view.isVisible
 import androidx.recyclerview.widget.GridLayoutManager
@@ -20,12 +19,11 @@ import com.runnect.runnect.presentation.detail.CourseDetailActivity
 import com.runnect.runnect.presentation.detail.CourseDetailRootScreen
 import com.runnect.runnect.presentation.discover.search.adapter.DiscoverSearchAdapter
 import com.runnect.runnect.presentation.state.UiState
-import com.runnect.runnect.util.custom.GridSpacingItemDecoration
+import com.runnect.runnect.util.custom.deco.GridSpacingItemDecoration
 import com.runnect.runnect.util.callback.OnHeartClick
 import com.runnect.runnect.util.callback.OnItemClick
 import com.runnect.runnect.util.extension.hideKeyboard
 import com.runnect.runnect.util.extension.setFocusAndShowKeyboard
-import com.runnect.runnect.util.extension.showSnackbar
 import dagger.hilt.android.AndroidEntryPoint
 import timber.log.Timber
 
diff --git a/app/src/main/java/com/runnect/runnect/presentation/draw/DrawActivity.kt b/app/src/main/java/com/runnect/runnect/presentation/draw/DrawActivity.kt
@@ -1,6 +1,5 @@
 package com.runnect.runnect.presentation.draw
 
-import android.content.Context
 import android.content.Intent
 import android.graphics.Bitmap
 import android.graphics.Color
@@ -12,7 +11,6 @@ import android.view.View
 import android.view.ViewGroup
 import android.view.animation.Animation
 import android.view.animation.AnimationUtils
-import android.view.inputmethod.InputMethodManager
 import android.widget.Toast
 import androidx.activity.viewModels
 import androidx.core.content.FileProvider
@@ -45,7 +43,7 @@ import com.runnect.runnect.databinding.BottomsheetRequireCourseNameBinding
 import com.runnect.runnect.presentation.MainActivity
 import com.runnect.runnect.presentation.countdown.CountDownActivity
 import com.runnect.runnect.presentation.state.UiState
-import com.runnect.runnect.util.custom.RequireLoginDialogFragment
+import com.runnect.runnect.util.custom.dialog.RequireLoginDialogFragment
 import com.runnect.runnect.util.multipart.ContentUriRequestBody
 import com.runnect.runnect.util.DepartureSetMode
 import com.runnect.runnect.util.extension.hideKeyboard
diff --git a/app/src/main/java/com/runnect/runnect/presentation/endrun/EndRunActivity.kt b/app/src/main/java/com/runnect/runnect/presentation/endrun/EndRunActivity.kt
@@ -17,7 +17,7 @@ import com.runnect.runnect.data.dto.request.RequestPostRecordDTO
 import com.runnect.runnect.databinding.ActivityEndRunBinding
 import com.runnect.runnect.presentation.MainActivity
 import com.runnect.runnect.presentation.state.UiState
-import com.runnect.runnect.util.custom.RunnectToast
+import com.runnect.runnect.util.custom.toast.RunnectToast
 import com.runnect.runnect.util.extension.hideKeyboard
 import com.runnect.runnect.util.extension.round
 import dagger.hilt.android.AndroidEntryPoint
diff --git a/app/src/main/java/com/runnect/runnect/presentation/mypage/history/MyHistoryActivity.kt b/app/src/main/java/com/runnect/runnect/presentation/mypage/history/MyHistoryActivity.kt
@@ -17,7 +17,7 @@ import com.runnect.runnect.presentation.mypage.history.adapter.MyHistoryAdapter
 import com.runnect.runnect.presentation.mypage.history.detail.MyHistoryDetailActivity
 import com.runnect.runnect.presentation.search.SearchActivity
 import com.runnect.runnect.presentation.state.UiState
-import com.runnect.runnect.util.custom.RecyclerOffsetDecorationHeight
+import com.runnect.runnect.util.custom.deco.RecyclerOffsetDecorationHeight
 import com.runnect.runnect.util.callback.OnHistoryItemClick
 import com.runnect.runnect.util.extension.setCustomDialog
 import com.runnect.runnect.util.extension.setDialogButtonClickListener
diff --git a/app/src/main/java/com/runnect/runnect/presentation/mypage/history/detail/MyHistoryDetailActivity.kt b/app/src/main/java/com/runnect/runnect/presentation/mypage/history/detail/MyHistoryDetailActivity.kt
@@ -18,9 +18,9 @@ import com.runnect.runnect.data.dto.HistoryInfoDTO
 import com.runnect.runnect.databinding.ActivityMyHistoryDetailBinding
 import com.runnect.runnect.presentation.mypage.history.MyHistoryActivity
 import com.runnect.runnect.presentation.state.UiStateV2
-import com.runnect.runnect.util.custom.CommonDialogFragment
-import com.runnect.runnect.util.custom.PopupItem
-import com.runnect.runnect.util.custom.RunnectPopupMenu
+import com.runnect.runnect.util.custom.dialog.CommonDialogFragment
+import com.runnect.runnect.util.custom.popup.PopupItem
+import com.runnect.runnect.util.custom.popup.RunnectPopupMenu
 import com.runnect.runnect.util.extension.getCompatibleSerializableExtra
 import com.runnect.runnect.util.extension.hideKeyboard
 import com.runnect.runnect.util.extension.setFocusAndShowKeyboard
diff --git a/app/src/main/java/com/runnect/runnect/presentation/mypage/reward/MyRewardActivity.kt b/app/src/main/java/com/runnect/runnect/presentation/mypage/reward/MyRewardActivity.kt
@@ -12,7 +12,7 @@ import com.runnect.runnect.data.dto.RewardStampDTO
 import com.runnect.runnect.databinding.ActivityMyRewardBinding
 import com.runnect.runnect.presentation.mypage.reward.adapter.MyRewardAdapter
 import com.runnect.runnect.presentation.state.UiState
-import com.runnect.runnect.util.custom.GridSpacingItemDecoration
+import com.runnect.runnect.util.custom.deco.GridSpacingItemDecoration
 import com.runnect.runnect.util.extension.getStampResId
 import dagger.hilt.android.AndroidEntryPoint
 import timber.log.Timber
diff --git a/app/src/main/java/com/runnect/runnect/presentation/mypage/upload/MyUploadActivity.kt b/app/src/main/java/com/runnect/runnect/presentation/mypage/upload/MyUploadActivity.kt
@@ -17,7 +17,7 @@ import com.runnect.runnect.presentation.detail.CourseDetailRootScreen
 import com.runnect.runnect.presentation.discover.load.DiscoverLoadActivity
 import com.runnect.runnect.presentation.mypage.upload.adapter.MyUploadAdapter
 import com.runnect.runnect.presentation.state.UiState
-import com.runnect.runnect.util.custom.GridSpacingItemDecoration
+import com.runnect.runnect.util.custom.deco.GridSpacingItemDecoration
 import com.runnect.runnect.util.callback.OnUploadItemClick
 import com.runnect.runnect.util.extension.setCustomDialog
 import com.runnect.runnect.util.extension.setDialogButtonClickListener
diff --git a/app/src/main/java/com/runnect/runnect/presentation/storage/StorageMyDrawFragment.kt b/app/src/main/java/com/runnect/runnect/presentation/storage/StorageMyDrawFragment.kt
@@ -21,7 +21,7 @@ import com.runnect.runnect.presentation.mydrawdetail.MyDrawDetailActivity
 import com.runnect.runnect.presentation.search.SearchActivity
 import com.runnect.runnect.presentation.state.UiState
 import com.runnect.runnect.presentation.storage.adapter.StorageMyDrawAdapter
-import com.runnect.runnect.util.custom.GridSpacingItemDecoration
+import com.runnect.runnect.util.custom.deco.GridSpacingItemDecoration
 import com.runnect.runnect.util.callback.ItemCount
 import com.runnect.runnect.util.callback.OnMyDrawClick
 import com.runnect.runnect.util.extension.setFragmentDialog
diff --git a/app/src/main/java/com/runnect/runnect/presentation/storage/StorageScrapFragment.kt b/app/src/main/java/com/runnect/runnect/presentation/storage/StorageScrapFragment.kt
@@ -18,7 +18,7 @@ import com.runnect.runnect.presentation.detail.CourseDetailActivity
 import com.runnect.runnect.presentation.detail.CourseDetailRootScreen
 import com.runnect.runnect.presentation.state.UiState
 import com.runnect.runnect.presentation.storage.adapter.StorageScrapAdapter
-import com.runnect.runnect.util.custom.GridSpacingItemDecoration
+import com.runnect.runnect.util.custom.deco.GridSpacingItemDecoration
 import com.runnect.runnect.util.callback.ItemCount
 import com.runnect.runnect.util.callback.OnHeartClick
 import com.runnect.runnect.util.callback.OnScrapCourseClick
diff --git a/app/src/main/java/com/runnect/runnect/util/custom/deco/GridSpacingItemDecoration.kt b/app/src/main/java/com/runnect/runnect/util/custom/deco/GridSpacingItemDecoration.kt
@@ -1,4 +1,4 @@
-package com.runnect.runnect.util.custom
+package com.runnect.runnect.util.custom.deco
 
 import android.content.Context
 import android.graphics.Rect
diff --git a/app/src/main/java/com/runnect/runnect/util/custom/deco/RecyclerOffsetDecorationHeight.kt b/app/src/main/java/com/runnect/runnect/util/custom/deco/RecyclerOffsetDecorationHeight.kt
@@ -1,4 +1,4 @@
-package com.runnect.runnect.util.custom
+package com.runnect.runnect.util.custom.deco
 
 import android.content.Context
 import android.graphics.Rect
diff --git a/app/src/main/java/com/runnect/runnect/util/custom/dialog/RequireLoginDialogFragment.kt b/app/src/main/java/com/runnect/runnect/util/custom/dialog/RequireLoginDialogFragment.kt
@@ -1,4 +1,4 @@
-package com.runnect.runnect.util.custom
+package com.runnect.runnect.util.custom.dialog
 
 import android.content.Intent
 import android.os.Bundle
@@ -37,4 +37,9 @@ class RequireLoginDialogFragment
             startActivity(this)
         }
     }
+
+//    companion object {
+//        @JvmStatic
+//        fun newInstance() = RequireLoginDialogFragment()
+//    }
 }
diff --git a/app/src/main/java/com/runnect/runnect/util/custom/popup/PopupItem.kt b/app/src/main/java/com/runnect/runnect/util/custom/popup/PopupItem.kt
@@ -1,4 +1,4 @@
-package com.runnect.runnect.util.custom
+package com.runnect.runnect.util.custom.popup
 
 data class PopupItem(
     val resId: Int,
diff --git a/app/src/main/java/com/runnect/runnect/util/custom/popup/RunnectPopupMenu.kt b/app/src/main/java/com/runnect/runnect/util/custom/popup/RunnectPopupMenu.kt
@@ -1,4 +1,4 @@
-package com.runnect.runnect.util.custom
+package com.runnect.runnect.util.custom.popup
 
 import android.content.Context
 import android.util.TypedValue
diff --git a/app/src/main/java/com/runnect/runnect/util/custom/toast/RunnectToast.kt b/app/src/main/java/com/runnect/runnect/util/custom/toast/RunnectToast.kt
@@ -1,4 +1,4 @@
-package com.runnect.runnect.util.custom
+package com.runnect.runnect.util.custom.toast
 
 import android.content.Context
 import android.content.res.Resources
