From 888dc032c14df5717bd7031068bc884027938187 Mon Sep 17 00:00:00 2001 From: Josia Pietsch Date: Mon, 5 Aug 2024 15:10:37 +0200 Subject: [PATCH] chore: code cleanup --- .../java/de/jrpie/android/launcher/HomeActivity.kt | 14 +++++++------- .../android/launcher/list/apps/ListFragmentApps.kt | 2 +- .../launcher/list/other/ListFragmentOther.kt | 2 +- .../settings/actions/SettingsFragmentActions.kt | 2 +- .../actions/SettingsFragmentActionsRecycler.kt | 6 +++--- .../settings/launcher/SettingsFragmentLauncher.kt | 4 ++-- .../launcher/settings/meta/SettingsFragmentMeta.kt | 2 +- .../tutorial/tabs/TutorialFragmentConcept.kt | 2 +- .../tutorial/tabs/TutorialFragmentFinish.kt | 2 +- .../tutorial/tabs/TutorialFragmentStart.kt | 2 +- 10 files changed, 19 insertions(+), 19 deletions(-) diff --git a/app/src/main/java/de/jrpie/android/launcher/HomeActivity.kt b/app/src/main/java/de/jrpie/android/launcher/HomeActivity.kt index fd20091..6c103b4 100644 --- a/app/src/main/java/de/jrpie/android/launcher/HomeActivity.kt +++ b/app/src/main/java/de/jrpie/android/launcher/HomeActivity.kt @@ -121,11 +121,11 @@ class HomeActivity: UIObject, AppCompatActivity(), this@HomeActivity.runOnUiThread { val t = timeFormat.format(Date()) if (binding.homeLowerView.text != t) - binding.homeLowerView.setText(t) + binding.homeLowerView.text = t val d = dateFormat.format(Date()) if (binding.homeUpperView.text != d) - binding.homeUpperView.setText(d) + binding.homeUpperView.text = d } } } @@ -146,7 +146,7 @@ class HomeActivity: UIObject, AppCompatActivity(), override fun onFling(e1: MotionEvent?, e2: MotionEvent, dX: Float, dY: Float): Boolean { - if (e1 == null) return false; + if (e1 == null) return false val width = displayMetrics.widthPixels val height = displayMetrics.heightPixels @@ -184,15 +184,15 @@ class HomeActivity: UIObject, AppCompatActivity(), if (edgeActions) { if(max(e1.x, e2.x) < edgeStrictness * width){ - gesture = gesture?.let{it.getEdgeVariant(Gesture.Edge.LEFT)}; + gesture = gesture?.let{it.getEdgeVariant(Gesture.Edge.LEFT)} } else if (min(e1.x, e2.x) > (1-edgeStrictness) * width){ - gesture = gesture?.let{it.getEdgeVariant(Gesture.Edge.RIGHT)}; + gesture = gesture?.let{it.getEdgeVariant(Gesture.Edge.RIGHT)} } if(max(e1.y, e2.y) < edgeStrictness * height){ - gesture = gesture?.let{it.getEdgeVariant(Gesture.Edge.TOP)}; + gesture = gesture?.let{it.getEdgeVariant(Gesture.Edge.TOP)} } else if (min(e1.y, e2.y) > (1-edgeStrictness) * height){ - gesture = gesture?.let{it.getEdgeVariant(Gesture.Edge.BOTTOM)}; + gesture = gesture?.let{it.getEdgeVariant(Gesture.Edge.BOTTOM)} } } gesture?.invoke(this) diff --git a/app/src/main/java/de/jrpie/android/launcher/list/apps/ListFragmentApps.kt b/app/src/main/java/de/jrpie/android/launcher/list/apps/ListFragmentApps.kt index 183dc00..656ab36 100644 --- a/app/src/main/java/de/jrpie/android/launcher/list/apps/ListFragmentApps.kt +++ b/app/src/main/java/de/jrpie/android/launcher/list/apps/ListFragmentApps.kt @@ -27,7 +27,7 @@ class ListFragmentApps : Fragment(), UIObject { override fun onCreateView( inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle? - ): View? { + ): View { binding = ListAppsBinding.inflate(inflater) return binding.root } diff --git a/app/src/main/java/de/jrpie/android/launcher/list/other/ListFragmentOther.kt b/app/src/main/java/de/jrpie/android/launcher/list/other/ListFragmentOther.kt index f324877..2c73aea 100644 --- a/app/src/main/java/de/jrpie/android/launcher/list/other/ListFragmentOther.kt +++ b/app/src/main/java/de/jrpie/android/launcher/list/other/ListFragmentOther.kt @@ -22,7 +22,7 @@ class ListFragmentOther : Fragment() { override fun onCreateView( inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle? - ): View? { + ): View { binding = ListOtherBinding.inflate(inflater) return binding.root } diff --git a/app/src/main/java/de/jrpie/android/launcher/settings/actions/SettingsFragmentActions.kt b/app/src/main/java/de/jrpie/android/launcher/settings/actions/SettingsFragmentActions.kt index 5bfe246..069c4c5 100644 --- a/app/src/main/java/de/jrpie/android/launcher/settings/actions/SettingsFragmentActions.kt +++ b/app/src/main/java/de/jrpie/android/launcher/settings/actions/SettingsFragmentActions.kt @@ -40,7 +40,7 @@ SettingsFragmentActions : Fragment(), UIObject { override fun onCreateView( inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle? - ): View? { + ): View { getPreferences(requireContext()).registerOnSharedPreferenceChangeListener(sharedPreferencesListener) binding = SettingsActionsBinding.inflate(inflater, container, false) return binding!!.root diff --git a/app/src/main/java/de/jrpie/android/launcher/settings/actions/SettingsFragmentActionsRecycler.kt b/app/src/main/java/de/jrpie/android/launcher/settings/actions/SettingsFragmentActionsRecycler.kt index 3e609c4..b53f63c 100644 --- a/app/src/main/java/de/jrpie/android/launcher/settings/actions/SettingsFragmentActionsRecycler.kt +++ b/app/src/main/java/de/jrpie/android/launcher/settings/actions/SettingsFragmentActionsRecycler.kt @@ -28,11 +28,11 @@ import java.lang.Exception class SettingsFragmentActionsRecycler : Fragment(), UIObject { private lateinit var binding: SettingsActionsRecyclerBinding - public var actionViewAdapter: ActionsRecyclerAdapter? = null + var actionViewAdapter: ActionsRecyclerAdapter? = null override fun onCreateView( inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle? - ): View? { + ): View { binding = SettingsActionsRecyclerBinding.inflate(inflater, container, false) return binding.root } @@ -128,7 +128,7 @@ class ActionsRecyclerAdapter(val activity: Activity): && (edgeActions || !it.isEdgeVariant())} as ArrayList } - public fun updateActions() { + fun updateActions() { val doubleActions = getPreferences(activity).getBoolean(PREF_DOUBLE_ACTIONS_ENABLED, false) val edgeActions = getPreferences(activity).getBoolean(PREF_EDGE_ACTIONS_ENABLED, false) this.gesturesList.clear() diff --git a/app/src/main/java/de/jrpie/android/launcher/settings/launcher/SettingsFragmentLauncher.kt b/app/src/main/java/de/jrpie/android/launcher/settings/launcher/SettingsFragmentLauncher.kt index 9ca2fe3..f9feb14 100644 --- a/app/src/main/java/de/jrpie/android/launcher/settings/launcher/SettingsFragmentLauncher.kt +++ b/app/src/main/java/de/jrpie/android/launcher/settings/launcher/SettingsFragmentLauncher.kt @@ -45,7 +45,7 @@ class SettingsFragmentLauncher : Fragment(), UIObject { override fun onCreateView( inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle? - ): View? { + ): View { binding = SettingsLauncherBinding.inflate(inflater, container, false) return binding.root } @@ -81,7 +81,7 @@ class SettingsFragmentLauncher : Fragment(), UIObject { preferences.edit() .putBoolean(pref, isChecked) .apply() - onChange(isChecked); + onChange(isChecked) } } diff --git a/app/src/main/java/de/jrpie/android/launcher/settings/meta/SettingsFragmentMeta.kt b/app/src/main/java/de/jrpie/android/launcher/settings/meta/SettingsFragmentMeta.kt index 90a04c9..aee0095 100644 --- a/app/src/main/java/de/jrpie/android/launcher/settings/meta/SettingsFragmentMeta.kt +++ b/app/src/main/java/de/jrpie/android/launcher/settings/meta/SettingsFragmentMeta.kt @@ -33,7 +33,7 @@ class SettingsFragmentMeta : Fragment(), UIObject { override fun onCreateView( inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle? - ): View? { + ): View { binding = SettingsMetaBinding.inflate(inflater, container, false) return binding.root } diff --git a/app/src/main/java/de/jrpie/android/launcher/tutorial/tabs/TutorialFragmentConcept.kt b/app/src/main/java/de/jrpie/android/launcher/tutorial/tabs/TutorialFragmentConcept.kt index e35a7c7..ffeb464 100644 --- a/app/src/main/java/de/jrpie/android/launcher/tutorial/tabs/TutorialFragmentConcept.kt +++ b/app/src/main/java/de/jrpie/android/launcher/tutorial/tabs/TutorialFragmentConcept.kt @@ -19,7 +19,7 @@ class TutorialFragmentConcept : Fragment(), UIObject { override fun onCreateView( inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle? - ): View? { + ): View { val binding = TutorialConceptBinding.inflate(inflater, container, false) binding.tutorialConceptBadgeVersion.text = BuildConfig.VERSION_NAME return binding.root diff --git a/app/src/main/java/de/jrpie/android/launcher/tutorial/tabs/TutorialFragmentFinish.kt b/app/src/main/java/de/jrpie/android/launcher/tutorial/tabs/TutorialFragmentFinish.kt index 36f4be3..ef9dd02 100644 --- a/app/src/main/java/de/jrpie/android/launcher/tutorial/tabs/TutorialFragmentFinish.kt +++ b/app/src/main/java/de/jrpie/android/launcher/tutorial/tabs/TutorialFragmentFinish.kt @@ -21,7 +21,7 @@ class TutorialFragmentFinish : Fragment(), UIObject { override fun onCreateView( inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle? - ): View? { + ): View { binding = TutorialFinishBinding.inflate(inflater, container, false) return binding.root } diff --git a/app/src/main/java/de/jrpie/android/launcher/tutorial/tabs/TutorialFragmentStart.kt b/app/src/main/java/de/jrpie/android/launcher/tutorial/tabs/TutorialFragmentStart.kt index 4b82cb9..0fdd08e 100644 --- a/app/src/main/java/de/jrpie/android/launcher/tutorial/tabs/TutorialFragmentStart.kt +++ b/app/src/main/java/de/jrpie/android/launcher/tutorial/tabs/TutorialFragmentStart.kt @@ -19,7 +19,7 @@ class TutorialFragmentStart : Fragment(), UIObject { override fun onCreateView( inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle? - ): View? { + ): View { binding = TutorialStartBinding.inflate(inflater, container, false) return binding.root }