Skip to content

Commit 98413aa

Browse files
CreativeCodeCatCreativeCodeCat
committed
Fix: Fixed the swipes to not use actions.
1 parent 1d362a0 commit 98413aa

File tree

6 files changed

+23
-76
lines changed

6 files changed

+23
-76
lines changed

‎app/src/main/java/com/github/droidworksstudio/launcher/listener/OnSwipeTouchListener.kt‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ internal open class OnSwipeTouchListener(c: Context?) : OnTouchListener {
3535
private inner class GestureListener : SimpleOnGestureListener() {
3636
private val swipeThreshold: Int = 100
3737
private val swipeVelocityThreshold: Int = 100
38+
private val swipeScrollThreshold: Int = 100
3839

3940
override fun onDown(e: MotionEvent): Boolean {
4041
return true
@@ -82,13 +83,13 @@ internal open class OnSwipeTouchListener(c: Context?) : OnTouchListener {
8283

8384
// Horizontal swipe
8485
if (abs(diffX) > abs(diffY)) {
85-
if (abs(diffX) > swipeThreshold && abs(distanceX) > swipeVelocityThreshold) {
86+
if (abs(diffX) > swipeThreshold && abs(distanceX) > swipeScrollThreshold) {
8687
if (diffX > 0) onSwipeRight() else onSwipeLeft()
8788
}
8889
}
8990
// Vertical swipe
9091
else {
91-
if (abs(diffY) > swipeThreshold && abs(distanceY) > swipeVelocityThreshold) {
92+
if (abs(diffY) > swipeThreshold && abs(distanceY) > swipeScrollThreshold) {
9293
if (diffY > 0) onSwipeDown() else onSwipeUp()
9394
}
9495
}

‎app/src/main/java/com/github/droidworksstudio/launcher/ui/drawer/DrawFragment.kt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ class DrawFragment : Fragment(),
201201

202202
Handler(Looper.getMainLooper()).post {
203203
findNavController().navigate(
204-
R.id.action_DrawFragment_to_HomeFragment,
204+
R.id.HomeFragment,
205205
null,
206206
actionTypeNavOptions
207207
)
@@ -220,7 +220,7 @@ class DrawFragment : Fragment(),
220220

221221
Handler(Looper.getMainLooper()).post {
222222
findNavController().navigate(
223-
R.id.action_DrawFragment_to_HomeFragment,
223+
R.id.HomeFragment,
224224
null,
225225
actionTypeNavOptions
226226
)
@@ -244,7 +244,7 @@ class DrawFragment : Fragment(),
244244

245245
Handler(Looper.getMainLooper()).post {
246246
findNavController().navigate(
247-
R.id.action_DrawFragment_to_HomeFragment,
247+
R.id.HomeFragment,
248248
null,
249249
actionTypeNavOptions
250250
)
@@ -259,7 +259,7 @@ class DrawFragment : Fragment(),
259259

260260
Handler(Looper.getMainLooper()).post {
261261
findNavController().navigate(
262-
R.id.action_DrawFragment_to_HomeFragment,
262+
R.id.HomeFragment,
263263
null,
264264
actionTypeNavOptions
265265
)

‎app/src/main/java/com/github/droidworksstudio/launcher/ui/home/HomeFragment.kt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -423,7 +423,7 @@ class HomeFragment : Fragment(),
423423
else appHelper.getActionType(actionType)
424424
Handler(Looper.getMainLooper()).post {
425425
findNavController().navigate(
426-
R.id.action_HomeFragment_to_DrawFragment,
426+
R.id.DrawFragment,
427427
null,
428428
actionTypeNavOptions
429429
)
@@ -437,7 +437,7 @@ class HomeFragment : Fragment(),
437437
else appHelper.getActionType(actionType)
438438
Handler(Looper.getMainLooper()).post {
439439
findNavController().navigate(
440-
R.id.action_HomeFragment_to_FavoriteFragment,
440+
R.id.FavoriteFragment,
441441
null,
442442
actionTypeNavOptions
443443
)
@@ -450,7 +450,7 @@ class HomeFragment : Fragment(),
450450
else appHelper.getActionType(actionType)
451451
Handler(Looper.getMainLooper()).post {
452452
findNavController().navigate(
453-
R.id.action_HomeFragment_to_HiddenFragment,
453+
R.id.HiddenFragment,
454454
null,
455455
actionTypeNavOptions
456456
)
@@ -476,7 +476,7 @@ class HomeFragment : Fragment(),
476476
else appHelper.getActionType(actionType)
477477
Handler(Looper.getMainLooper()).post {
478478
findNavController().navigate(
479-
R.id.action_HomeFragment_to_WidgetsFragment,
479+
R.id.WidgetsFragment,
480480
null,
481481
actionTypeNavOptions
482482
)

‎app/src/main/java/com/github/droidworksstudio/launcher/ui/settings/SettingsFragment.kt‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -70,23 +70,23 @@ class SettingsFragment : Fragment(),
7070
private fun observeClickListener() {
7171
binding.apply {
7272
featuresSettings.setOnClickListener {
73-
navController.navigate(R.id.action_SettingsFragment_to_SettingsFeaturesFragment)
73+
navController.navigate(R.id.SettingsFeaturesFragment)
7474
}
7575

7676
lookFeelSettings.setOnClickListener {
77-
navController.navigate(R.id.action_SettingsFragment_to_SettingsLookFeelFragment)
77+
navController.navigate(R.id.SettingsLookFeelFragment)
7878
}
7979

8080
favoriteApps.setOnClickListener {
81-
navController.navigate(R.id.action_SettingsFragment_to_FavoriteFragment)
81+
navController.navigate(R.id.FavoriteFragment)
8282
}
8383

8484
hiddenApps.setOnClickListener {
85-
navController.navigate(R.id.action_SettingsFragment_to_HiddenFragment)
85+
navController.navigate(R.id.HiddenFragment)
8686
}
8787

8888
advancedSettings.setOnClickListener {
89-
navController.navigate(R.id.action_SettingsFragment_to_SettingsAdvancedFragment)
89+
navController.navigate(R.id.SettingsAdvancedFragment)
9090
}
9191
}
9292
}

‎app/src/main/java/com/github/droidworksstudio/launcher/ui/widgets/WidgetFragment.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -395,7 +395,7 @@ class WidgetFragment : Fragment(),
395395

396396
Handler(Looper.getMainLooper()).post {
397397
findNavController().navigate(
398-
R.id.action_WidgetsFragment_to_WidgetsSettingsFragment,
398+
R.id.WidgetsSettingsFragment,
399399
null,
400400
actionTypeNavOptions
401401
)
@@ -410,7 +410,7 @@ class WidgetFragment : Fragment(),
410410

411411
Handler(Looper.getMainLooper()).post {
412412
findNavController().navigate(
413-
R.id.action_WidgetsFragment_to_HomeFragment,
413+
R.id.HomeFragment,
414414
null,
415415
actionTypeNavOptions
416416
)
@@ -425,7 +425,7 @@ class WidgetFragment : Fragment(),
425425

426426
Handler(Looper.getMainLooper()).post {
427427
findNavController().navigate(
428-
R.id.action_WidgetsFragment_to_HomeFragment,
428+
R.id.HomeFragment,
429429
null,
430430
actionTypeNavOptions
431431
)

‎app/src/main/res/navigation/nav_graph.xml‎

Lines changed: 4 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -8,67 +8,19 @@
88
android:id="@+id/HomeFragment"
99
android:name="com.github.droidworksstudio.launcher.ui.home.HomeFragment"
1010
android:label="@string/home_fragment_label"
11-
tools:layout="@layout/fragment_home">
12-
13-
<action
14-
android:id="@+id/action_HomeFragment_to_DrawFragment"
15-
app:destination="@id/DrawFragment" />
16-
<action
17-
android:id="@+id/action_HomeFragment_to_SettingsFragment"
18-
app:destination="@id/SettingsFragment" />
19-
<action
20-
android:id="@+id/action_HomeFragment_to_FavoriteFragment"
21-
app:destination="@id/FavoriteFragment" />
22-
<action
23-
android:id="@+id/action_HomeFragment_to_HiddenFragment"
24-
app:destination="@id/HiddenFragment" />
25-
<action
26-
android:id="@+id/action_HomeFragment_to_WidgetsFragment"
27-
app:destination="@id/WidgetsFragment" />
28-
</fragment>
11+
tools:layout="@layout/fragment_home" />
2912

3013
<fragment
3114
android:id="@+id/SettingsFragment"
3215
android:name="com.github.droidworksstudio.launcher.ui.settings.SettingsFragment"
3316
android:label="@string/settings_fragment_label"
34-
tools:layout="@layout/fragment_settings">
35-
<action
36-
android:id="@+id/action_SettingsFragment_to_FavoriteFragment"
37-
app:destination="@id/FavoriteFragment" />
38-
<action
39-
android:id="@+id/action_SettingsFragment_to_HiddenFragment"
40-
app:destination="@id/HiddenFragment" />
41-
<action
42-
android:id="@+id/action_SettingsFragment_to_SettingsAdvancedFragment"
43-
app:destination="@id/SettingsAdvancedFragment" />
44-
<action
45-
android:id="@+id/action_SettingsFragment_to_SettingsFeaturesFragment"
46-
app:destination="@id/SettingsFeaturesFragment" />
47-
<action
48-
android:id="@+id/action_SettingsFragment_to_SettingsLookFeelFragment"
49-
app:destination="@id/SettingsLookFeelFragment" />
50-
<action
51-
android:id="@+id/action_SettingsFragment_to_WidgetsFragment"
52-
app:destination="@id/WidgetsFragment" />
53-
<action
54-
android:id="@+id/action_SettingsFragment_to_WidgetsSettingsFragment"
55-
app:destination="@id/WidgetsSettingsFragment" />
56-
</fragment>
17+
tools:layout="@layout/fragment_settings" />
5718

5819
<fragment
5920
android:id="@+id/WidgetsFragment"
6021
android:name="com.github.droidworksstudio.launcher.ui.widgets.WidgetFragment"
6122
android:label="@string/widgets_fragment_label"
62-
tools:layout="@layout/fragment_widgets">
63-
64-
<action
65-
android:id="@+id/action_WidgetsFragment_to_WidgetsSettingsFragment"
66-
app:destination="@id/WidgetsSettingsFragment" />
67-
68-
<action
69-
android:id="@+id/action_WidgetsFragment_to_HomeFragment"
70-
app:destination="@id/HomeFragment" />
71-
</fragment>
23+
tools:layout="@layout/fragment_widgets" />
7224

7325
<fragment
7426
android:id="@+id/SettingsFeaturesFragment"
@@ -86,13 +38,7 @@
8638
android:id="@+id/DrawFragment"
8739
android:name="com.github.droidworksstudio.launcher.ui.drawer.DrawFragment"
8840
android:label="@string/draw_fragment_label"
89-
tools:layout="@layout/fragment_draw">
90-
91-
<action
92-
android:id="@+id/action_DrawFragment_to_HomeFragment"
93-
app:destination="@id/HomeFragment" />
94-
</fragment>
95-
41+
tools:layout="@layout/fragment_draw" />
9642

9743
<fragment
9844
android:id="@+id/FavoriteFragment"

0 commit comments

Comments
 (0)