Skip to content

Commit 3fa2fd7

Browse files
Fix: Fixed the slider for pages to stay up to date.
1 parent e418010 commit 3fa2fd7

File tree

3 files changed

+23
-16
lines changed

3 files changed

+23
-16
lines changed

app/src/main/java/com/github/droidworksstudio/mlauncher/data/Constants.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,10 @@ object Constants {
5757
const val HOLD_DURATION_THRESHOLD = 1000L // Adjust as needed
5858

5959
// Update SWIPE_DISTANCE_THRESHOLD dynamically based on screen dimensions
60-
var SWIPE_DISTANCE_THRESHOLD: Float = 0f
60+
var SWIPE_DISTANCE_THRESHOLD = 0f
6161

6262
// Update MAX_HOME_PAGES dynamically based on MAX_HOME_APPS
63-
var MAX_HOME_PAGES: Int = 5
63+
var MAX_HOME_PAGES = 10
6464

6565
fun updateMaxHomePages(context: Context) {
6666
val prefs = Prefs(context)

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

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,6 @@ class FeaturesFragment : Fragment() {
101101
var toggledShowBatteryIcon by remember { mutableStateOf(prefs.showBatteryIcon) }
102102

103103
val fs = remember { mutableStateOf(fontSize) }
104-
Constants.updateMaxHomePages(requireContext())
105104

106105
val titleFontSize = if (fs.value.isSpecified) {
107106
(fs.value.value * 1.5).sp
@@ -304,6 +303,13 @@ class FeaturesFragment : Fragment() {
304303
selectedHomeAppsNum = newHomeAppsNum // Update state
305304
prefs.homeAppsNum = newHomeAppsNum // Persist selection in preferences
306305
viewModel.homeAppsNum.value = newHomeAppsNum
306+
307+
// Check if homeAppsNum is less than homePagesNum and update homePagesNum accordingly
308+
if (newHomeAppsNum < selectedHomePagesNum) {
309+
selectedHomePagesNum = newHomeAppsNum
310+
prefs.homePagesNum = newHomeAppsNum // Persist the new homePagesNum
311+
viewModel.homePagesNum.value = newHomeAppsNum
312+
}
307313
}
308314
)
309315
}
@@ -314,6 +320,7 @@ class FeaturesFragment : Fragment() {
314320
option = selectedHomePagesNum.toString(),
315321
fontSize = titleFontSize,
316322
onClick = {
323+
Constants.updateMaxHomePages(requireContext())
317324
dialogBuilder.showSliderDialog(
318325
context = requireContext(),
319326
title = getString(R.string.pages_on_home_screen),

gradle/libs.versions.toml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# gradle/libs.versions.toml
22

33
[versions]
4-
agp = "8.8.0"
4+
agp = "8.8.1"
55
kotlin = "2.1.10"
66

77
# AndroidX Core and AppCompat
@@ -15,9 +15,9 @@ lifecycle-extensions = "2.2.0"
1515
lifecycle-viewmodel-ktx = "2.8.7"
1616

1717
# Navigation
18-
navigation-fragment-ktx = "2.8.6"
19-
navigation-ui-ktx = "2.8.6"
20-
navigation-testing = "2.8.6"
18+
navigation-fragment-ktx = "2.8.7"
19+
navigation-ui-ktx = "2.8.7"
20+
navigation-testing = "2.8.7"
2121

2222
# Work Manager
2323
work-runtime-ktx = "2.10.0"
@@ -28,12 +28,12 @@ constraintlayout-compose = "1.1.0"
2828

2929
# Compose Versions
3030
activity-compose = "1.10.0"
31-
compose-android = "1.7.7"
32-
compose-material = "1.7.7"
33-
compose-animation = "1.7.7"
34-
compose-ui = "1.7.7"
35-
compose-foundation = "1.7.7"
36-
compose-ui-tooling = "1.7.7"
31+
compose-android = "1.7.8"
32+
compose-material = "1.7.8"
33+
compose-animation = "1.7.8"
34+
compose-ui = "1.7.8"
35+
compose-foundation = "1.7.8"
36+
compose-ui-tooling = "1.7.8"
3737

3838
# Other Libraries
3939
commons-text = "1.13.0"
@@ -48,9 +48,9 @@ espresso = "3.6.1"
4848
test-core-ktx = "1.6.1"
4949
test-runner = "1.6.2"
5050
test-rules = "1.6.1"
51-
fragment-testing = "1.8.5"
52-
ui-test-junit4 = "1.7.7"
53-
ui-test-manifest = "1.7.7"
51+
fragment-testing = "1.8.6"
52+
ui-test-junit4 = "1.7.8"
53+
ui-test-manifest = "1.7.8"
5454

5555
[libraries]
5656
# Core Libraries

0 commit comments

Comments
 (0)