Skip to content

Commit 59e0ded

Browse files
Fix: Fixed the goBackToSettings function.
1 parent 74b021c commit 59e0ded

File tree

1 file changed

+39
-7
lines changed
  • app/src/main/java/com/github/droidworksstudio/launcher/ui/activities

1 file changed

+39
-7
lines changed

app/src/main/java/com/github/droidworksstudio/launcher/ui/activities/MainActivity.kt

Lines changed: 39 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ import androidx.annotation.RequiresApi
2222
import androidx.appcompat.app.AppCompatActivity
2323
import androidx.core.app.ActivityCompat
2424
import androidx.core.content.ContextCompat
25-
import androidx.fragment.app.FragmentManager
2625
import androidx.lifecycle.lifecycleScope
2726
import androidx.navigation.NavController
27+
import androidx.navigation.NavOptions
2828
import androidx.navigation.findNavController
2929
import androidx.navigation.fragment.NavHostFragment
3030
import androidx.navigation.ui.AppBarConfiguration
@@ -285,19 +285,51 @@ class MainActivity : AppCompatActivity() {
285285

286286
private fun goBackToSettings() {
287287
navController = findNavController(R.id.nav_host_fragment_content_main)
288-
val fragmentManager: FragmentManager = supportFragmentManager
289288
when (navController.currentDestination?.id) {
290-
R.id.SettingsFragment,
291289
R.id.SettingsFeaturesFragment,
292290
R.id.SettingsLookFeelFragment,
291+
R.id.SettingsAdvancedFragment,
293292
R.id.FavoriteFragment,
294-
R.id.HiddenFragment,
295-
R.id.SettingsAdvancedFragment -> {
296-
fragmentManager.popBackStack()
293+
R.id.HiddenFragment -> {
294+
val actionTypeNavOptions: NavOptions? =
295+
if (preferenceHelper.disableAnimations) null
296+
else appHelper.getActionType(Constants.Swipe.Up)
297+
298+
Handler(Looper.getMainLooper()).post {
299+
navController.navigate(
300+
R.id.SettingsFragment,
301+
null,
302+
actionTypeNavOptions
303+
)
304+
}
305+
}
306+
307+
R.id.SettingsFragment -> {
308+
val actionTypeNavOptions: NavOptions? =
309+
if (preferenceHelper.disableAnimations) null
310+
else appHelper.getActionType(Constants.Swipe.Up)
311+
312+
Handler(Looper.getMainLooper()).post {
313+
navController.navigate(
314+
R.id.HomeFragment,
315+
null,
316+
actionTypeNavOptions
317+
)
318+
}
297319
}
298320

299321
else -> {
300-
navController.navigate(R.id.HomeFragment)
322+
val actionTypeNavOptions: NavOptions? =
323+
if (preferenceHelper.disableAnimations) null
324+
else appHelper.getActionType(Constants.Swipe.Up)
325+
326+
Handler(Looper.getMainLooper()).post {
327+
navController.navigate(
328+
R.id.HomeFragment,
329+
null,
330+
actionTypeNavOptions
331+
)
332+
}
301333
}
302334
}
303335
}

0 commit comments

Comments
 (0)