From 0677e3792cfa662625010d4fa733ae5e87318e54 Mon Sep 17 00:00:00 2001 From: HeCodes2Much Date: Sun, 2 Jun 2024 09:02:48 +0100 Subject: [PATCH] Housekeeping: Moved around a few files to be cleaner. Signed-off-by: HeCodes2Much --- .../{ktx => common}/ActivityExtensions.kt | 2 +- .../{ktx => common}/ContextExtensions.kt | 4 ++-- .../{ktx => common}/FragmentExtensions.kt | 2 +- .../{ktx => common}/MetricsExtensions.kt | 2 +- .../{ktx => common}/StringExtensions.kt | 2 +- .../{ktx => common}/ViewExtensions.kt | 2 +- .../{ktx => common}/ViewGroupExtensions.kt | 2 +- .../droidworksstudio/launcher/helper/AppHelper.kt | 10 ++++------ .../launcher/helper/FingerprintHelper.kt | 2 +- .../launcher/helper/PreferenceHelper.kt | 2 +- .../launcher/listener/DeviceAdmin.kt | 3 +-- .../launcher/listener/OnSwipeTouchListener.kt | 2 +- .../launcher/repository/AppInfoRepository.kt | 2 +- .../launcher/ui/activities/MainActivity.kt | 2 +- .../AppInfoBottomSheetFragment.kt | 6 +++--- .../ColorBottomSheetDialogFragment.kt | 2 +- .../launcher/ui/drawer/DrawFragment.kt | 14 +++++++------- .../launcher/ui/drawer/DrawViewHolder.kt | 4 ++-- .../launcher/ui/favorite/FavoriteFragment.kt | 4 ++-- .../launcher/ui/hidden/HiddenFragment.kt | 4 ++-- .../launcher/ui/home/HomeFragment.kt | 14 +++++++------- .../launcher/ui/settings/SettingsFragment.kt | 6 +++--- .../ui/widgetmanager/WidgetManagerFragment.kt | 2 +- .../widgetmanager/WidgetOptionsDialogFragment.kt | 2 +- .../launcher/{ => utils}/Constants.kt | 3 ++- .../launcher/viewmodel/PreferenceViewModel.kt | 2 +- 26 files changed, 50 insertions(+), 52 deletions(-) rename app/src/main/java/com/github/droidworksstudio/{ktx => common}/ActivityExtensions.kt (98%) rename app/src/main/java/com/github/droidworksstudio/{ktx => common}/ContextExtensions.kt (99%) rename app/src/main/java/com/github/droidworksstudio/{ktx => common}/FragmentExtensions.kt (96%) rename app/src/main/java/com/github/droidworksstudio/{ktx => common}/MetricsExtensions.kt (97%) rename app/src/main/java/com/github/droidworksstudio/{ktx => common}/StringExtensions.kt (98%) rename app/src/main/java/com/github/droidworksstudio/{ktx => common}/ViewExtensions.kt (99%) rename app/src/main/java/com/github/droidworksstudio/{ktx => common}/ViewGroupExtensions.kt (97%) rename app/src/main/java/com/github/droidworksstudio/launcher/{ => utils}/Constants.kt (97%) diff --git a/app/src/main/java/com/github/droidworksstudio/ktx/ActivityExtensions.kt b/app/src/main/java/com/github/droidworksstudio/common/ActivityExtensions.kt similarity index 98% rename from app/src/main/java/com/github/droidworksstudio/ktx/ActivityExtensions.kt rename to app/src/main/java/com/github/droidworksstudio/common/ActivityExtensions.kt index e0d49c8..5b619de 100644 --- a/app/src/main/java/com/github/droidworksstudio/ktx/ActivityExtensions.kt +++ b/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 diff --git a/app/src/main/java/com/github/droidworksstudio/ktx/ContextExtensions.kt b/app/src/main/java/com/github/droidworksstudio/common/ContextExtensions.kt similarity index 99% rename from app/src/main/java/com/github/droidworksstudio/ktx/ContextExtensions.kt rename to app/src/main/java/com/github/droidworksstudio/common/ContextExtensions.kt index 7c564c6..d97a51b 100644 --- a/app/src/main/java/com/github/droidworksstudio/ktx/ContextExtensions.kt +++ b/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 diff --git a/app/src/main/java/com/github/droidworksstudio/ktx/FragmentExtensions.kt b/app/src/main/java/com/github/droidworksstudio/common/FragmentExtensions.kt similarity index 96% rename from app/src/main/java/com/github/droidworksstudio/ktx/FragmentExtensions.kt rename to app/src/main/java/com/github/droidworksstudio/common/FragmentExtensions.kt index 353334e..8028778 100644 --- a/app/src/main/java/com/github/droidworksstudio/ktx/FragmentExtensions.kt +++ b/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 diff --git a/app/src/main/java/com/github/droidworksstudio/ktx/MetricsExtensions.kt b/app/src/main/java/com/github/droidworksstudio/common/MetricsExtensions.kt similarity index 97% rename from app/src/main/java/com/github/droidworksstudio/ktx/MetricsExtensions.kt rename to app/src/main/java/com/github/droidworksstudio/common/MetricsExtensions.kt index ed8d845..3b584d4 100644 --- a/app/src/main/java/com/github/droidworksstudio/ktx/MetricsExtensions.kt +++ b/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 diff --git a/app/src/main/java/com/github/droidworksstudio/ktx/StringExtensions.kt b/app/src/main/java/com/github/droidworksstudio/common/StringExtensions.kt similarity index 98% rename from app/src/main/java/com/github/droidworksstudio/ktx/StringExtensions.kt rename to app/src/main/java/com/github/droidworksstudio/common/StringExtensions.kt index a51bffc..803f5f6 100644 --- a/app/src/main/java/com/github/droidworksstudio/ktx/StringExtensions.kt +++ b/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 diff --git a/app/src/main/java/com/github/droidworksstudio/ktx/ViewExtensions.kt b/app/src/main/java/com/github/droidworksstudio/common/ViewExtensions.kt similarity index 99% rename from app/src/main/java/com/github/droidworksstudio/ktx/ViewExtensions.kt rename to app/src/main/java/com/github/droidworksstudio/common/ViewExtensions.kt index cf82c1b..520d207 100644 --- a/app/src/main/java/com/github/droidworksstudio/ktx/ViewExtensions.kt +++ b/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 diff --git a/app/src/main/java/com/github/droidworksstudio/ktx/ViewGroupExtensions.kt b/app/src/main/java/com/github/droidworksstudio/common/ViewGroupExtensions.kt similarity index 97% rename from app/src/main/java/com/github/droidworksstudio/ktx/ViewGroupExtensions.kt rename to app/src/main/java/com/github/droidworksstudio/common/ViewGroupExtensions.kt index 5ce6452..2c654bf 100644 --- a/app/src/main/java/com/github/droidworksstudio/ktx/ViewGroupExtensions.kt +++ b/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 diff --git a/app/src/main/java/com/github/droidworksstudio/launcher/helper/AppHelper.kt b/app/src/main/java/com/github/droidworksstudio/launcher/helper/AppHelper.kt index 960eb7c..4d7ecab 100644 --- a/app/src/main/java/com/github/droidworksstudio/launcher/helper/AppHelper.kt +++ b/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 diff --git a/app/src/main/java/com/github/droidworksstudio/launcher/helper/FingerprintHelper.kt b/app/src/main/java/com/github/droidworksstudio/launcher/helper/FingerprintHelper.kt index 8180a2f..ae16d95 100644 --- a/app/src/main/java/com/github/droidworksstudio/launcher/helper/FingerprintHelper.kt +++ b/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 diff --git a/app/src/main/java/com/github/droidworksstudio/launcher/helper/PreferenceHelper.kt b/app/src/main/java/com/github/droidworksstudio/launcher/helper/PreferenceHelper.kt index acbd44d..77984b7 100644 --- a/app/src/main/java/com/github/droidworksstudio/launcher/helper/PreferenceHelper.kt +++ b/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 diff --git a/app/src/main/java/com/github/droidworksstudio/launcher/listener/DeviceAdmin.kt b/app/src/main/java/com/github/droidworksstudio/launcher/listener/DeviceAdmin.kt index ad4ff17..1313e5c 100644 --- a/app/src/main/java/com/github/droidworksstudio/launcher/listener/DeviceAdmin.kt +++ b/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) { diff --git a/app/src/main/java/com/github/droidworksstudio/launcher/listener/OnSwipeTouchListener.kt b/app/src/main/java/com/github/droidworksstudio/launcher/listener/OnSwipeTouchListener.kt index 0bafdda..619cc63 100644 --- a/app/src/main/java/com/github/droidworksstudio/launcher/listener/OnSwipeTouchListener.kt +++ b/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 diff --git a/app/src/main/java/com/github/droidworksstudio/launcher/repository/AppInfoRepository.kt b/app/src/main/java/com/github/droidworksstudio/launcher/repository/AppInfoRepository.kt index a8ff0c3..19359d3 100644 --- a/app/src/main/java/com/github/droidworksstudio/launcher/repository/AppInfoRepository.kt +++ b/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 diff --git a/app/src/main/java/com/github/droidworksstudio/launcher/ui/activities/MainActivity.kt b/app/src/main/java/com/github/droidworksstudio/launcher/ui/activities/MainActivity.kt index bdecfcf..0551897 100644 --- a/app/src/main/java/com/github/droidworksstudio/launcher/ui/activities/MainActivity.kt +++ b/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 diff --git a/app/src/main/java/com/github/droidworksstudio/launcher/ui/bottomsheetdialog/AppInfoBottomSheetFragment.kt b/app/src/main/java/com/github/droidworksstudio/launcher/ui/bottomsheetdialog/AppInfoBottomSheetFragment.kt index bcc4686..e228401 100644 --- a/app/src/main/java/com/github/droidworksstudio/launcher/ui/bottomsheetdialog/AppInfoBottomSheetFragment.kt +++ b/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 diff --git a/app/src/main/java/com/github/droidworksstudio/launcher/ui/bottomsheetdialog/ColorBottomSheetDialogFragment.kt b/app/src/main/java/com/github/droidworksstudio/launcher/ui/bottomsheetdialog/ColorBottomSheetDialogFragment.kt index 8882a5c..060a073 100644 --- a/app/src/main/java/com/github/droidworksstudio/launcher/ui/bottomsheetdialog/ColorBottomSheetDialogFragment.kt +++ b/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 diff --git a/app/src/main/java/com/github/droidworksstudio/launcher/ui/drawer/DrawFragment.kt b/app/src/main/java/com/github/droidworksstudio/launcher/ui/drawer/DrawFragment.kt index 511eaeb..754e4ba 100644 --- a/app/src/main/java/com/github/droidworksstudio/launcher/ui/drawer/DrawFragment.kt +++ b/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 diff --git a/app/src/main/java/com/github/droidworksstudio/launcher/ui/drawer/DrawViewHolder.kt b/app/src/main/java/com/github/droidworksstudio/launcher/ui/drawer/DrawViewHolder.kt index 91a0927..97a5648 100644 --- a/app/src/main/java/com/github/droidworksstudio/launcher/ui/drawer/DrawViewHolder.kt +++ b/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 diff --git a/app/src/main/java/com/github/droidworksstudio/launcher/ui/favorite/FavoriteFragment.kt b/app/src/main/java/com/github/droidworksstudio/launcher/ui/favorite/FavoriteFragment.kt index eeb80e5..78a6504 100644 --- a/app/src/main/java/com/github/droidworksstudio/launcher/ui/favorite/FavoriteFragment.kt +++ b/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 diff --git a/app/src/main/java/com/github/droidworksstudio/launcher/ui/hidden/HiddenFragment.kt b/app/src/main/java/com/github/droidworksstudio/launcher/ui/hidden/HiddenFragment.kt index dbb5cc2..075d50c 100644 --- a/app/src/main/java/com/github/droidworksstudio/launcher/ui/hidden/HiddenFragment.kt +++ b/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 diff --git a/app/src/main/java/com/github/droidworksstudio/launcher/ui/home/HomeFragment.kt b/app/src/main/java/com/github/droidworksstudio/launcher/ui/home/HomeFragment.kt index c9b3e7b..6ffca95 100644 --- a/app/src/main/java/com/github/droidworksstudio/launcher/ui/home/HomeFragment.kt +++ b/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 diff --git a/app/src/main/java/com/github/droidworksstudio/launcher/ui/settings/SettingsFragment.kt b/app/src/main/java/com/github/droidworksstudio/launcher/ui/settings/SettingsFragment.kt index fa44e9a..f6337c6 100644 --- a/app/src/main/java/com/github/droidworksstudio/launcher/ui/settings/SettingsFragment.kt +++ b/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 diff --git a/app/src/main/java/com/github/droidworksstudio/launcher/ui/widgetmanager/WidgetManagerFragment.kt b/app/src/main/java/com/github/droidworksstudio/launcher/ui/widgetmanager/WidgetManagerFragment.kt index edaf472..4cbb23e 100644 --- a/app/src/main/java/com/github/droidworksstudio/launcher/ui/widgetmanager/WidgetManagerFragment.kt +++ b/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 diff --git a/app/src/main/java/com/github/droidworksstudio/launcher/ui/widgetmanager/WidgetOptionsDialogFragment.kt b/app/src/main/java/com/github/droidworksstudio/launcher/ui/widgetmanager/WidgetOptionsDialogFragment.kt index 6b361f9..156b965 100644 --- a/app/src/main/java/com/github/droidworksstudio/launcher/ui/widgetmanager/WidgetOptionsDialogFragment.kt +++ b/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() { diff --git a/app/src/main/java/com/github/droidworksstudio/launcher/Constants.kt b/app/src/main/java/com/github/droidworksstudio/launcher/utils/Constants.kt similarity index 97% rename from app/src/main/java/com/github/droidworksstudio/launcher/Constants.kt rename to app/src/main/java/com/github/droidworksstudio/launcher/utils/Constants.kt index d54f6c1..841f107 100644 --- a/app/src/main/java/com/github/droidworksstudio/launcher/Constants.kt +++ b/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" diff --git a/app/src/main/java/com/github/droidworksstudio/launcher/viewmodel/PreferenceViewModel.kt b/app/src/main/java/com/github/droidworksstudio/launcher/viewmodel/PreferenceViewModel.kt index 5c16178..f869c08 100644 --- a/app/src/main/java/com/github/droidworksstudio/launcher/viewmodel/PreferenceViewModel.kt +++ b/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