From 7dfddc79452203716716e6688b180566ef07668e Mon Sep 17 00:00:00 2001 From: HeCodes2Much Date: Tue, 21 May 2024 17:08:22 +0100 Subject: [PATCH] Fix: Fixed a few DEPRECATION warning. --- .../launcher/helper/AppHelper.kt | 1 - .../launcher/helper/BottomDialogHelper.kt | 1 + .../launcher/ui/favorite/FavoriteFragment.kt | 17 +++---- .../launcher/ui/hidden/HiddenFragment.kt | 3 +- .../launcher/viewmodel/PreferenceViewModel.kt | 44 +++++++++---------- gradle.properties | 2 +- 6 files changed, 31 insertions(+), 37 deletions(-) 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 a420c04..5e7ec83 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 @@ -21,7 +21,6 @@ import android.view.View import android.view.Window import android.view.WindowInsets import android.view.WindowManager -import android.view.inputmethod.InputMethodManager import android.widget.TextView import android.widget.Toast import androidx.appcompat.widget.LinearLayoutCompat diff --git a/app/src/main/java/com/github/droidworksstudio/launcher/helper/BottomDialogHelper.kt b/app/src/main/java/com/github/droidworksstudio/launcher/helper/BottomDialogHelper.kt index c428cae..a9d89f9 100644 --- a/app/src/main/java/com/github/droidworksstudio/launcher/helper/BottomDialogHelper.kt +++ b/app/src/main/java/com/github/droidworksstudio/launcher/helper/BottomDialogHelper.kt @@ -15,6 +15,7 @@ class BottomDialogHelper @Inject constructor() { val window = dialog?.window if (window != null) { window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS) + @Suppress("DEPRECATION") window.clearFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS) window.statusBarColor = Color.TRANSPARENT } 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 4acd8da..90bae46 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 @@ -24,7 +24,6 @@ import com.github.droidworksstudio.launcher.helper.FingerprintHelper import com.github.droidworksstudio.launcher.helper.PreferenceHelper import com.github.droidworksstudio.launcher.listener.OnItemClickedListener import com.github.droidworksstudio.launcher.listener.OnItemMoveListener -import com.github.droidworksstudio.launcher.ui.bottomsheetdialog.AppInfoBottomSheetFragment import com.github.droidworksstudio.launcher.viewmodel.AppViewModel import dagger.hilt.android.AndroidEntryPoint import kotlinx.coroutines.launch @@ -36,7 +35,8 @@ import javax.inject.Inject class FavoriteFragment : Fragment(), OnItemClickedListener.OnAppsClickedListener, OnItemClickedListener.BottomSheetDismissListener, OnItemClickedListener.OnAppStateClickListener, - FingerprintHelper.Callback,OnItemMoveListener.OnItemActionListener{ + OnItemMoveListener.OnItemActionListener, + FingerprintHelper.Callback { private var _binding: FragmentFavoriteBinding? = null private val binding get() = _binding!! @@ -103,10 +103,10 @@ class FavoriteFragment : Fragment(), OnItemClickedListener.OnAppsClickedListener private fun observeHomeAppOrder() { - //binding.favoriteAdapter.adapter = favoriteAdapter + binding.favoriteAdapter.adapter = favoriteAdapter val listener: OnItemMoveListener.OnItemActionListener = favoriteAdapter - val simpleItemTouchCallback = object : ItemTouchHelper.Callback() { + val simpleItemTouchCallback = object : ItemTouchHelper.Callback() { override fun onChildDraw( canvas: Canvas, recyclerView: RecyclerView, @@ -152,6 +152,7 @@ class FavoriteFragment : Fragment(), OnItemClickedListener.OnAppsClickedListener } override fun onSwiped(viewHolder: RecyclerView.ViewHolder, direction: Int) { + @Suppress("DEPRECATION") listener.onViewSwiped(viewHolder.adapterPosition) } @@ -181,14 +182,6 @@ class FavoriteFragment : Fragment(), OnItemClickedListener.OnAppsClickedListener } } - private fun showSelectedApp(appInfo: AppInfo) { - val bottomSheetFragment = AppInfoBottomSheetFragment(appInfo) - bottomSheetFragment.setOnBottomSheetDismissedListener(this) - bottomSheetFragment.setOnAppStateClickListener(this) - bottomSheetFragment.show(parentFragmentManager, "BottomSheetDialog") - - } - override fun onBottomSheetDismissed() { TODO("Not yet implemented") } 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 88c8f58..29767a0 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 @@ -29,7 +29,7 @@ class HiddenFragment : Fragment(), OnItemClickedListener.OnAppsClickedListener, OnItemClickedListener.OnAppLongClickedListener, OnItemClickedListener.BottomSheetDismissListener, OnItemClickedListener.OnAppStateClickListener, - FingerprintHelper.Callback{ + FingerprintHelper.Callback { private var _binding: FragmentHiddenBinding? = null private val binding get() = _binding!! @@ -78,6 +78,7 @@ class HiddenFragment : Fragment(), OnItemClickedListener.OnAppsClickedListener, private fun observeHiddenApps() { viewModel.compareInstalledAppInfo() + @Suppress("DEPRECATION") viewLifecycleOwner.lifecycleScope.launchWhenCreated { viewModel.hiddenApps.collect { hiddenAdapter.updateData(it) 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 27661ce..9f1499b 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 @@ -11,33 +11,33 @@ class PreferenceViewModel @Inject constructor( private val preferenceHelper: PreferenceHelper) : ViewModel() { - val firstLaunchLiveData: MutableLiveData = MutableLiveData() + private val firstLaunchLiveData: MutableLiveData = MutableLiveData() val showStatusBarLiveData: MutableLiveData = MutableLiveData() val showTimeLiveData: MutableLiveData = MutableLiveData() val showDateLiveData: MutableLiveData = MutableLiveData() val showDailyWordLiveData: MutableLiveData = MutableLiveData() val showBatteryLiveData: MutableLiveData = MutableLiveData() - val showAppIconLiveData: MutableLiveData = MutableLiveData() - val homeAppAlignmentLiveData: MutableLiveData = MutableLiveData() - val homeDateAlignmentLiveData: MutableLiveData = MutableLiveData() - val homeTimeAlignmentLiveData: MutableLiveData = MutableLiveData() - val homeDailyWordAlignmentLiveData: MutableLiveData = MutableLiveData() - val dateColorLiveData: MutableLiveData = MutableLiveData() - val timeColorLiveData: MutableLiveData = MutableLiveData() - val batteryColorLiveData: MutableLiveData = MutableLiveData() - val dailyWordColorLiveData: MutableLiveData = MutableLiveData() - val appColorLiveData: MutableLiveData = MutableLiveData() - val dateTextSizeLiveData: MutableLiveData = MutableLiveData() - val timeTextSizeLiveData: MutableLiveData = MutableLiveData() - val appTextSizeLiveData: MutableLiveData = MutableLiveData() - val batteryTextSizeLiveData: MutableLiveData = MutableLiveData() - val tapLockScreenLiveData: MutableLiveData = MutableLiveData() - val swipeNotificationLiveData: MutableLiveData = MutableLiveData() - val swipeSearchLiveData: MutableLiveData = MutableLiveData() - val autoOpenAppsLiveData: MutableLiveData = MutableLiveData() - val autoKeyboardLiveData: MutableLiveData = MutableLiveData() - val lockSettingsLiveData: MutableLiveData = MutableLiveData() - val appPaddingSizeLiveData: MutableLiveData = MutableLiveData() + private val showAppIconLiveData: MutableLiveData = MutableLiveData() + private val homeAppAlignmentLiveData: MutableLiveData = MutableLiveData() + private val homeDateAlignmentLiveData: MutableLiveData = MutableLiveData() + private val homeTimeAlignmentLiveData: MutableLiveData = MutableLiveData() + private val homeDailyWordAlignmentLiveData: MutableLiveData = MutableLiveData() + private val dateColorLiveData: MutableLiveData = MutableLiveData() + private val timeColorLiveData: MutableLiveData = MutableLiveData() + private val batteryColorLiveData: MutableLiveData = MutableLiveData() + private val dailyWordColorLiveData: MutableLiveData = MutableLiveData() + private val appColorLiveData: MutableLiveData = MutableLiveData() + private val dateTextSizeLiveData: MutableLiveData = MutableLiveData() + private val timeTextSizeLiveData: MutableLiveData = MutableLiveData() + private val appTextSizeLiveData: MutableLiveData = MutableLiveData() + private val batteryTextSizeLiveData: MutableLiveData = MutableLiveData() + private val tapLockScreenLiveData: MutableLiveData = MutableLiveData() + private val swipeNotificationLiveData: MutableLiveData = MutableLiveData() + private val swipeSearchLiveData: MutableLiveData = MutableLiveData() + private val autoOpenAppsLiveData: MutableLiveData = MutableLiveData() + private val autoKeyboardLiveData: MutableLiveData = MutableLiveData() + private val lockSettingsLiveData: MutableLiveData = MutableLiveData() + private val appPaddingSizeLiveData: MutableLiveData = MutableLiveData() fun setFirstLaunch(firstLaunch: Boolean) { preferenceHelper.firstLaunch = firstLaunch diff --git a/gradle.properties b/gradle.properties index f19c7b9..34daaeb 100644 --- a/gradle.properties +++ b/gradle.properties @@ -21,4 +21,4 @@ kotlin.code.style=official # resources declared in the library itself and none from the library's dependencies, # thereby reducing the size of the R class for that library android.nonTransitiveRClass=true -android.nonFinalResIds=false \ No newline at end of file +android.nonFinalResIds=true \ No newline at end of file