From aa030e46355eda676152427d9d69745112a2e7c8 Mon Sep 17 00:00:00 2001 From: HeCodes2Much Date: Mon, 17 Jun 2024 16:55:58 +0100 Subject: [PATCH] Fix: Fixed the navigation well adding hidden apps to swipes Signed-off-by: HeCodes2Much --- .../launcher/ui/drawer/DrawFragment.kt | 2 +- .../launcher/ui/hidden/HiddenFragment.kt | 2 +- .../launcher/ui/hidden/HiddenViewHolder.kt | 14 +++++++++----- .../launcher/ui/home/HomeFragment.kt | 11 +++++++++++ .../droidworksstudio/launcher/utils/Constants.kt | 2 ++ app/src/main/res/layout/fragment_draw.xml | 6 ------ app/src/main/res/layout/fragment_hidden.xml | 11 +++-------- app/src/main/res/navigation/nav_graph.xml | 6 ++++++ app/src/main/res/values/strings.xml | 1 + 9 files changed, 34 insertions(+), 21 deletions(-) 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 99f2d6e..e7b2230 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 @@ -152,7 +152,7 @@ class DrawFragment : Fragment(), @SuppressLint("ClickableViewAccessibility") private fun observeSwipeTouchListener() { - binding.touchArea.setOnTouchListener(getSwipeGestureListener(context)) + binding.mainView.setOnTouchListener(getSwipeGestureListener(context)) binding.drawAdapter.setOnTouchListener(getSwipeGestureListener(context)) } 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 818b707..16a128d 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 @@ -98,7 +98,7 @@ class HiddenFragment : Fragment(), @SuppressLint("ClickableViewAccessibility") private fun observeSwipeTouchListener() { - binding.touchArea.setOnTouchListener(getSwipeGestureListener(context)) + binding.fragmentContainer.setOnTouchListener(getSwipeGestureListener(context)) binding.hiddenAdapter.setOnTouchListener(getSwipeGestureListener(context)) } diff --git a/app/src/main/java/com/github/droidworksstudio/launcher/ui/hidden/HiddenViewHolder.kt b/app/src/main/java/com/github/droidworksstudio/launcher/ui/hidden/HiddenViewHolder.kt index 742429b..db5c150 100644 --- a/app/src/main/java/com/github/droidworksstudio/launcher/ui/hidden/HiddenViewHolder.kt +++ b/app/src/main/java/com/github/droidworksstudio/launcher/ui/hidden/HiddenViewHolder.kt @@ -1,6 +1,7 @@ package com.github.droidworksstudio.launcher.ui.hidden import android.util.Log +import android.view.Gravity import android.view.View import androidx.appcompat.widget.LinearLayoutCompat import androidx.recyclerview.widget.RecyclerView @@ -19,11 +20,14 @@ class HiddenViewHolder( fun bind(appInfo: AppInfo) { binding.apply { // Get the current LayoutParams of appFavoriteName - val layoutParams = appHiddenName.layoutParams as LinearLayoutCompat.LayoutParams - - // Set the margins - layoutParams.topMargin = preferenceHelper.homeAppPadding.toInt() - layoutParams.bottomMargin = preferenceHelper.homeAppPadding.toInt() + val layoutParams = LinearLayoutCompat.LayoutParams( + LinearLayoutCompat.LayoutParams.WRAP_CONTENT, + LinearLayoutCompat.LayoutParams.WRAP_CONTENT + ).apply { + gravity = Gravity.START + topMargin = preferenceHelper.homeAppPadding.toInt() + bottomMargin = preferenceHelper.homeAppPadding.toInt() + } appHiddenName.layoutParams = layoutParams appHiddenName.text = appInfo.appName 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 5e734ae..30264d7 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 @@ -364,6 +364,17 @@ class HomeFragment : Fragment(), } } + Constants.Action.ShowHiddenList -> { + val actionTypeNavOptions: NavOptions = appHelper.getActionType(actionType) + Handler(Looper.getMainLooper()).post { + findNavController().navigate( + R.id.action_HomeFragment_to_HiddenFragment, + null, + actionTypeNavOptions + ) + } + } + Constants.Action.OpenQuickSettings -> { appHelper.expandQuickSettings(context) } diff --git a/app/src/main/java/com/github/droidworksstudio/launcher/utils/Constants.kt b/app/src/main/java/com/github/droidworksstudio/launcher/utils/Constants.kt index f1da0da..01af408 100644 --- a/app/src/main/java/com/github/droidworksstudio/launcher/utils/Constants.kt +++ b/app/src/main/java/com/github/droidworksstudio/launcher/utils/Constants.kt @@ -113,6 +113,7 @@ object Constants { ShowNotification, ShowAppList, ShowFavoriteList, + ShowHiddenList, OpenQuickSettings, ShowRecents, ShowWidgets, @@ -127,6 +128,7 @@ object Constants { ShowNotification -> context.getString(R.string.settings_actions_show_notifications) ShowAppList -> context.getString(R.string.settings_actions_show_app_list) ShowFavoriteList -> context.getString(R.string.settings_actions_show_favorite_list) + ShowHiddenList -> context.getString(R.string.settings_actions_show_hidden_list) OpenQuickSettings -> context.getString(R.string.settings_actions_open_quick_settings) ShowRecents -> context.getString(R.string.settings_actions_show_recents) ShowWidgets -> context.getString(R.string.settings_actions_show_widgets) diff --git a/app/src/main/res/layout/fragment_draw.xml b/app/src/main/res/layout/fragment_draw.xml index 4279b55..21464b3 100644 --- a/app/src/main/res/layout/fragment_draw.xml +++ b/app/src/main/res/layout/fragment_draw.xml @@ -7,12 +7,6 @@ android:id="@+id/draw_background" tools:context=".ui.drawer.DrawFragment"> - - - - + app:layout_constraintEnd_toEndOf="parent" + style="@style/TextDefaultStyle" /> + @@ -35,6 +38,9 @@ + Show Notifications Show Apps List Show Favorites List + Show Hidden List Open Quick Settings Show Recents Show Widgets