Skip to content

Commit f42fd07

Browse files
Fix: Fixed settings hidden for 3 button navigation mode.
1 parent cc8a476 commit f42fd07

File tree

4 files changed

+27
-7
lines changed

4 files changed

+27
-7
lines changed

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

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ import androidx.navigation.fragment.findNavController
4646
import com.github.droidworksstudio.common.launchCalendar
4747
import com.github.droidworksstudio.common.openAccessibilitySettings
4848
import com.github.droidworksstudio.common.openAlarmApp
49+
import com.github.droidworksstudio.common.openBatteryManager
4950
import com.github.droidworksstudio.common.openCameraApp
5051
import com.github.droidworksstudio.common.openDialerApp
5152
import com.github.droidworksstudio.common.openDigitalWellbeing
@@ -233,7 +234,7 @@ class HomeFragment : Fragment(), View.OnClickListener, View.OnLongClickListener
233234
}
234235

235236
R.id.battery -> {
236-
openBatteryUsage()
237+
requireContext().openBatteryManager()
237238
}
238239

239240
else -> {
@@ -247,11 +248,6 @@ class HomeFragment : Fragment(), View.OnClickListener, View.OnLongClickListener
247248
}
248249
}
249250

250-
private fun openBatteryUsage() {
251-
val batteryUsageIntent = Intent(Intent.ACTION_POWER_USAGE_SUMMARY)
252-
startActivity(batteryUsageIntent)
253-
}
254-
255251
override fun onLongClick(view: View): Boolean {
256252
if (prefs.homeLocked) return true
257253

@@ -488,7 +484,7 @@ class HomeFragment : Fragment(), View.OnClickListener, View.OnLongClickListener
488484
if (prefs.appDoubleTap.activityPackage.isNotEmpty())
489485
launchApp(prefs.appDoubleTap)
490486
else
491-
requireContext().openAccessibilitySettings()
487+
AppReloader.restartApp(requireContext())
492488
}
493489

494490
// This function handles all swipe actions that a independent of the actual swipe direction

app/src/main/java/com/github/droidworksstudio/mlauncher/ui/settings/FeaturesFragment.kt

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ import androidx.fragment.app.Fragment
2626
import androidx.lifecycle.ViewModelProvider
2727
import androidx.navigation.fragment.findNavController
2828
import com.github.droidworksstudio.common.isBiometricEnabled
29+
import com.github.droidworksstudio.common.isGestureNavigationEnabled
2930
import com.github.droidworksstudio.mlauncher.MainViewModel
3031
import com.github.droidworksstudio.mlauncher.R
3132
import com.github.droidworksstudio.mlauncher.data.Constants
@@ -443,6 +444,13 @@ class FeaturesFragment : Fragment() {
443444
prefs.showBatteryIcon = toggledShowBatteryIcon
444445
}
445446
)
447+
448+
if (!isGestureNavigationEnabled(requireContext())) {
449+
Spacer(
450+
modifier = Modifier
451+
.height(52.dp)
452+
)
453+
}
446454
}
447455
}
448456

app/src/main/java/com/github/droidworksstudio/mlauncher/ui/settings/GesturesFragment.kt

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ import androidx.core.os.bundleOf
2525
import androidx.fragment.app.Fragment
2626
import androidx.lifecycle.ViewModelProvider
2727
import androidx.navigation.fragment.findNavController
28+
import com.github.droidworksstudio.common.isGestureNavigationEnabled
2829
import com.github.droidworksstudio.mlauncher.MainViewModel
2930
import com.github.droidworksstudio.mlauncher.R
3031
import com.github.droidworksstudio.mlauncher.data.Constants
@@ -481,6 +482,13 @@ class GesturesFragment : Fragment() {
481482
)
482483
}
483484
)
485+
486+
if (!isGestureNavigationEnabled(requireContext())) {
487+
Spacer(
488+
modifier = Modifier
489+
.height(52.dp)
490+
)
491+
}
484492
}
485493
}
486494

app/src/main/java/com/github/droidworksstudio/mlauncher/ui/settings/LookFeelFragment.kt

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ import androidx.compose.ui.unit.sp
2727
import androidx.fragment.app.Fragment
2828
import androidx.lifecycle.ViewModelProvider
2929
import androidx.navigation.fragment.findNavController
30+
import com.github.droidworksstudio.common.isGestureNavigationEnabled
3031
import com.github.droidworksstudio.mlauncher.MainViewModel
3132
import com.github.droidworksstudio.mlauncher.R
3233
import com.github.droidworksstudio.mlauncher.data.Constants
@@ -641,6 +642,13 @@ class LookFeelFragment : Fragment() {
641642
})
642643
}
643644
)
645+
646+
if (!isGestureNavigationEnabled(requireContext())) {
647+
Spacer(
648+
modifier = Modifier
649+
.height(52.dp)
650+
)
651+
}
644652
}
645653
}
646654

0 commit comments

Comments
 (0)