Housekeeping: Moved around a few files to be cleaner.

Signed-off-by: HeCodes2Much <wayne6324@gmail.com>

app/src/main/java/com/github/droidworksstudio/ktx/ActivityExtensions.kt → app/src/main/java/com/github/droidworksstudio/common/ActivityExtensions.kt

@@ -1,4 +1,4 @@
-package com.github.droidworksstudio.ktx
+package com.github.droidworksstudio.common
 
 import android.app.Activity
 import android.content.Intent

app/src/main/java/com/github/droidworksstudio/ktx/ContextExtensions.kt → app/src/main/java/com/github/droidworksstudio/common/ContextExtensions.kt

@@ -1,4 +1,4 @@
-package com.github.droidworksstudio.ktx
+package com.github.droidworksstudio.common
 
 import android.app.SearchManager
 import android.content.ActivityNotFoundException
@@ -35,7 +35,7 @@ import androidx.core.graphics.drawable.toBitmap
 import androidx.core.os.ConfigurationCompat
 import androidx.lifecycle.LifecycleObserver
 import androidx.lifecycle.LifecycleOwner
-import com.github.droidworksstudio.launcher.Constants
+import com.github.droidworksstudio.launcher.utils.Constants
 import com.github.droidworksstudio.launcher.data.entities.AppInfo
 import com.github.droidworksstudio.launcher.helper.PreferenceHelper
 import com.github.droidworksstudio.launcher.ui.activities.FakeHomeActivity

app/src/main/java/com/github/droidworksstudio/ktx/FragmentExtensions.kt → app/src/main/java/com/github/droidworksstudio/common/FragmentExtensions.kt

@@ -1,4 +1,4 @@
-package com.github.droidworksstudio.ktx
+package com.github.droidworksstudio.common
 
 import android.content.Context
 import android.content.Intent

app/src/main/java/com/github/droidworksstudio/ktx/MetricsExtensions.kt → app/src/main/java/com/github/droidworksstudio/common/MetricsExtensions.kt

@@ -1,4 +1,4 @@
-package com.github.droidworksstudio.ktx
+package com.github.droidworksstudio.common
 
 import android.content.res.Resources
 import android.util.TypedValue

app/src/main/java/com/github/droidworksstudio/ktx/StringExtensions.kt → app/src/main/java/com/github/droidworksstudio/common/StringExtensions.kt

@@ -1,4 +1,4 @@
-package com.github.droidworksstudio.ktx
+package com.github.droidworksstudio.common
 
 import android.content.Context
 import android.graphics.Color

app/src/main/java/com/github/droidworksstudio/ktx/ViewExtensions.kt → app/src/main/java/com/github/droidworksstudio/common/ViewExtensions.kt

@@ -1,4 +1,4 @@
-package com.github.droidworksstudio.ktx
+package com.github.droidworksstudio.common
 
 import android.annotation.SuppressLint
 import android.content.Context

app/src/main/java/com/github/droidworksstudio/ktx/ViewGroupExtensions.kt → app/src/main/java/com/github/droidworksstudio/common/ViewGroupExtensions.kt

@@ -1,4 +1,4 @@
-package com.github.droidworksstudio.ktx
+package com.github.droidworksstudio.common
 
 import android.annotation.SuppressLint
 import android.view.ViewGroup

app/src/main/java/com/github/droidworksstudio/launcher/helper/AppHelper.kt

@@ -16,15 +16,13 @@ import android.view.Window
 import android.view.WindowInsets
 import android.widget.TextView
 import androidx.appcompat.widget.LinearLayoutCompat
-import androidx.fragment.app.viewModels
-import com.github.droidworksstudio.ktx.backupSharedPreferences
-import com.github.droidworksstudio.ktx.restoreSharedPreferences
-import com.github.droidworksstudio.ktx.showLongToast
+import com.github.droidworksstudio.common.backupSharedPreferences
+import com.github.droidworksstudio.common.restoreSharedPreferences
+import com.github.droidworksstudio.common.showLongToast
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
-import com.github.droidworksstudio.launcher.Constants
+import com.github.droidworksstudio.launcher.utils.Constants
 import com.github.droidworksstudio.launcher.R
 import com.github.droidworksstudio.launcher.accessibility.ActionService
-import com.github.droidworksstudio.launcher.viewmodel.PreferenceViewModel
 import java.util.Calendar
 import javax.inject.Inject
 

app/src/main/java/com/github/droidworksstudio/launcher/helper/FingerprintHelper.kt

@@ -5,7 +5,7 @@ import androidx.biometric.BiometricPrompt
 import androidx.core.content.ContextCompat
 import androidx.fragment.app.Fragment
 import androidx.navigation.fragment.findNavController
-import com.github.droidworksstudio.ktx.showLongToast
+import com.github.droidworksstudio.common.showLongToast
 import com.github.droidworksstudio.launcher.R
 import com.github.droidworksstudio.launcher.data.entities.AppInfo
 import javax.inject.Inject

app/src/main/java/com/github/droidworksstudio/launcher/helper/PreferenceHelper.kt

@@ -3,7 +3,7 @@ package com.github.droidworksstudio.launcher.helper
 import android.content.Context
 import android.content.SharedPreferences
 import android.view.Gravity
-import com.github.droidworksstudio.launcher.Constants
+import com.github.droidworksstudio.launcher.utils.Constants
 import dagger.hilt.android.qualifiers.ApplicationContext
 import javax.inject.Inject
 

app/src/main/java/com/github/droidworksstudio/launcher/listener/DeviceAdmin.kt

@@ -3,8 +3,7 @@ package com.github.droidworksstudio.launcher.listener
 import android.app.admin.DeviceAdminReceiver
 import android.content.Context
 import android.content.Intent
-import android.widget.Toast
-import com.github.droidworksstudio.ktx.showLongToast
+import com.github.droidworksstudio.common.showLongToast
 
 class DeviceAdmin : DeviceAdminReceiver() {
     override fun onEnabled(context: Context, intent: Intent) {

app/src/main/java/com/github/droidworksstudio/launcher/listener/OnSwipeTouchListener.kt

@@ -7,7 +7,7 @@ import android.view.GestureDetector.SimpleOnGestureListener
 import android.view.MotionEvent
 import android.view.View
 import android.view.View.OnTouchListener
-import com.github.droidworksstudio.launcher.Constants
+import com.github.droidworksstudio.launcher.utils.Constants
 import java.util.*
 import kotlin.concurrent.schedule
 import kotlin.math.abs

app/src/main/java/com/github/droidworksstudio/launcher/repository/AppInfoRepository.kt

@@ -8,7 +8,7 @@ import android.os.UserHandle
 import android.os.UserManager
 import android.util.Log
 import androidx.annotation.RequiresApi
-import com.github.droidworksstudio.launcher.Constants
+import com.github.droidworksstudio.launcher.utils.Constants
 import com.github.droidworksstudio.launcher.data.dao.AppInfoDAO
 import com.github.droidworksstudio.launcher.data.entities.AppInfo
 import kotlinx.coroutines.Dispatchers

app/src/main/java/com/github/droidworksstudio/launcher/ui/activities/MainActivity.kt

@@ -16,7 +16,7 @@ import androidx.navigation.findNavController
 import androidx.navigation.fragment.NavHostFragment
 import androidx.navigation.ui.AppBarConfiguration
 import androidx.navigation.ui.navigateUp
-import com.github.droidworksstudio.ktx.isTablet
+import com.github.droidworksstudio.common.isTablet
 import com.github.droidworksstudio.launcher.R
 import com.github.droidworksstudio.launcher.databinding.ActivityMainBinding
 import com.github.droidworksstudio.launcher.helper.AppHelper

app/src/main/java/com/github/droidworksstudio/launcher/ui/bottomsheetdialog/AppInfoBottomSheetFragment.kt

@@ -11,9 +11,9 @@ import android.view.ViewGroup
 import androidx.annotation.RequiresApi
 import androidx.core.content.ContextCompat
 import androidx.fragment.app.viewModels
-import com.github.droidworksstudio.ktx.appInfo
-import com.github.droidworksstudio.ktx.showLongToast
-import com.github.droidworksstudio.ktx.unInstallApp
+import com.github.droidworksstudio.common.appInfo
+import com.github.droidworksstudio.common.showLongToast
+import com.github.droidworksstudio.common.unInstallApp
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment
 import com.github.droidworksstudio.launcher.R
 import com.github.droidworksstudio.launcher.data.entities.AppInfo

app/src/main/java/com/github/droidworksstudio/launcher/ui/bottomsheetdialog/ColorBottomSheetDialogFragment.kt

@@ -10,7 +10,7 @@ import android.view.ViewGroup
 import android.widget.TextView
 import androidx.annotation.RequiresApi
 import androidx.fragment.app.viewModels
-import com.github.droidworksstudio.ktx.showLongToast
+import com.github.droidworksstudio.common.showLongToast
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment
 import com.github.droidworksstudio.launcher.databinding.BottomsheetdialogColorSettingsBinding
 import com.github.droidworksstudio.launcher.helper.BottomDialogHelper

app/src/main/java/com/github/droidworksstudio/launcher/ui/drawer/DrawFragment.kt

@@ -16,13 +16,13 @@ import androidx.lifecycle.coroutineScope
 import androidx.lifecycle.lifecycleScope
 import androidx.navigation.fragment.findNavController
 import androidx.recyclerview.widget.StaggeredGridLayoutManager
-import com.github.droidworksstudio.ktx.hideKeyboard
-import com.github.droidworksstudio.ktx.launchApp
-import com.github.droidworksstudio.ktx.openSearch
-import com.github.droidworksstudio.ktx.searchCustomSearchEngine
-import com.github.droidworksstudio.ktx.searchOnPlayStore
-import com.github.droidworksstudio.ktx.showKeyboard
-import com.github.droidworksstudio.ktx.showLongToast
+import com.github.droidworksstudio.common.hideKeyboard
+import com.github.droidworksstudio.common.launchApp
+import com.github.droidworksstudio.common.openSearch
+import com.github.droidworksstudio.common.searchCustomSearchEngine
+import com.github.droidworksstudio.common.searchOnPlayStore
+import com.github.droidworksstudio.common.showKeyboard
+import com.github.droidworksstudio.common.showLongToast
 import com.github.droidworksstudio.launcher.R
 import com.github.droidworksstudio.launcher.data.entities.AppInfo
 import com.github.droidworksstudio.launcher.databinding.FragmentDrawBinding

app/src/main/java/com/github/droidworksstudio/launcher/ui/drawer/DrawViewHolder.kt

@@ -6,8 +6,8 @@ import android.view.View
 import androidx.appcompat.content.res.AppCompatResources
 import androidx.appcompat.widget.LinearLayoutCompat
 import androidx.recyclerview.widget.RecyclerView
-import com.github.droidworksstudio.ktx.dpToPx
-import com.github.droidworksstudio.ktx.isWorkProfileEnabled
+import com.github.droidworksstudio.common.dpToPx
+import com.github.droidworksstudio.common.isWorkProfileEnabled
 import com.github.droidworksstudio.launcher.R
 import com.github.droidworksstudio.launcher.data.entities.AppInfo
 import com.github.droidworksstudio.launcher.databinding.ItemDrawBinding

app/src/main/java/com/github/droidworksstudio/launcher/ui/favorite/FavoriteFragment.kt

@@ -16,8 +16,8 @@ import androidx.navigation.fragment.findNavController
 import androidx.recyclerview.widget.ItemTouchHelper
 import androidx.recyclerview.widget.RecyclerView
 import androidx.recyclerview.widget.StaggeredGridLayoutManager
-import com.github.droidworksstudio.ktx.launchApp
-import com.github.droidworksstudio.ktx.showLongToast
+import com.github.droidworksstudio.common.launchApp
+import com.github.droidworksstudio.common.showLongToast
 import com.github.droidworksstudio.launcher.R
 import com.github.droidworksstudio.launcher.data.entities.AppInfo
 import com.github.droidworksstudio.launcher.databinding.FragmentFavoriteBinding

app/src/main/java/com/github/droidworksstudio/launcher/ui/hidden/HiddenFragment.kt

@@ -13,8 +13,8 @@ import androidx.fragment.app.viewModels
 import androidx.lifecycle.lifecycleScope
 import androidx.navigation.fragment.findNavController
 import androidx.recyclerview.widget.StaggeredGridLayoutManager
-import com.github.droidworksstudio.ktx.launchApp
-import com.github.droidworksstudio.ktx.showLongToast
+import com.github.droidworksstudio.common.launchApp
+import com.github.droidworksstudio.common.showLongToast
 import com.github.droidworksstudio.launcher.R
 import com.github.droidworksstudio.launcher.data.entities.AppInfo
 import com.github.droidworksstudio.launcher.databinding.FragmentHiddenBinding

app/src/main/java/com/github/droidworksstudio/launcher/ui/home/HomeFragment.kt

@@ -20,13 +20,13 @@ import androidx.fragment.app.viewModels
 import androidx.lifecycle.lifecycleScope
 import androidx.navigation.fragment.findNavController
 import androidx.recyclerview.widget.StaggeredGridLayoutManager
-import com.github.droidworksstudio.ktx.hideKeyboard
-import com.github.droidworksstudio.ktx.launchApp
-import com.github.droidworksstudio.ktx.launchCalendar
-import com.github.droidworksstudio.ktx.launchClock
-import com.github.droidworksstudio.ktx.openBatteryManager
-import com.github.droidworksstudio.ktx.searchView
-import com.github.droidworksstudio.ktx.showLongToast
+import com.github.droidworksstudio.common.hideKeyboard
+import com.github.droidworksstudio.common.launchApp
+import com.github.droidworksstudio.common.launchCalendar
+import com.github.droidworksstudio.common.launchClock
+import com.github.droidworksstudio.common.openBatteryManager
+import com.github.droidworksstudio.common.searchView
+import com.github.droidworksstudio.common.showLongToast
 import com.github.droidworksstudio.launcher.R
 import com.github.droidworksstudio.launcher.accessibility.ActionService
 import com.github.droidworksstudio.launcher.data.entities.AppInfo

app/src/main/java/com/github/droidworksstudio/launcher/ui/settings/SettingsFragment.kt

@@ -11,9 +11,9 @@ import androidx.fragment.app.Fragment
 import androidx.fragment.app.viewModels
 import androidx.navigation.NavController
 import androidx.navigation.fragment.findNavController
-import com.github.droidworksstudio.ktx.resetDefaultLauncher
-import com.github.droidworksstudio.ktx.restartApp
-import com.github.droidworksstudio.launcher.Constants
+import com.github.droidworksstudio.common.resetDefaultLauncher
+import com.github.droidworksstudio.common.restartApp
+import com.github.droidworksstudio.launcher.utils.Constants
 import com.github.droidworksstudio.launcher.R
 import com.github.droidworksstudio.launcher.databinding.FragmentSettingsBinding
 import com.github.droidworksstudio.launcher.helper.AppHelper

app/src/main/java/com/github/droidworksstudio/launcher/ui/widgetmanager/WidgetManagerFragment.kt

@@ -14,7 +14,7 @@ import androidx.activity.result.ActivityResultLauncher
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.fragment.app.Fragment
 import androidx.recyclerview.widget.LinearLayoutManager
-import com.github.droidworksstudio.launcher.Constants
+import com.github.droidworksstudio.launcher.utils.Constants
 import com.github.droidworksstudio.launcher.databinding.FragmentWidgetManagerBinding
 import com.github.droidworksstudio.launcher.helper.AppHelper
 import dagger.hilt.android.AndroidEntryPoint

app/src/main/java/com/github/droidworksstudio/launcher/ui/widgetmanager/WidgetOptionsDialogFragment.kt

@@ -4,7 +4,7 @@ import android.app.Dialog
 import android.os.Bundle
 import androidx.appcompat.app.AlertDialog
 import androidx.fragment.app.DialogFragment
-import com.github.droidworksstudio.launcher.Constants
+import com.github.droidworksstudio.launcher.utils.Constants
 
 class WidgetOptionsDialogFragment : DialogFragment() {
 

app/src/main/java/com/github/droidworksstudio/launcher/Constants.kt → app/src/main/java/com/github/droidworksstudio/launcher/utils/Constants.kt

@@ -1,6 +1,7 @@
-package com.github.droidworksstudio.launcher
+package com.github.droidworksstudio.launcher.utils
 
 import android.content.Context
+import com.github.droidworksstudio.launcher.R
 
 object Constants {
     const val PACKAGE_NAME = "app.easy.launcher"

app/src/main/java/com/github/droidworksstudio/launcher/viewmodel/PreferenceViewModel.kt

@@ -2,7 +2,7 @@ package com.github.droidworksstudio.launcher.viewmodel
 
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
-import com.github.droidworksstudio.launcher.Constants
+import com.github.droidworksstudio.launcher.utils.Constants
 import com.github.droidworksstudio.launcher.helper.PreferenceHelper
 import dagger.hilt.android.lifecycle.HiltViewModel
 import javax.inject.Inject