From 588ff6da74cba358d8aa43c0e5c517c91965732a Mon Sep 17 00:00:00 2001 From: jakepurple13 Date: Fri, 9 Apr 2021 06:23:52 -0400 Subject: [PATCH] - cleaned up source chooser - made the notification navigate to the recent fragment so its easier to leave app --- .../java/com/programmersbox/uiviews/SettingsFragment.kt | 6 +----- .../main/java/com/programmersbox/uiviews/UpdateChecker.kt | 4 ++-- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/UIViews/src/main/java/com/programmersbox/uiviews/SettingsFragment.kt b/UIViews/src/main/java/com/programmersbox/uiviews/SettingsFragment.kt index 5dc075da4..ef6493585 100644 --- a/UIViews/src/main/java/com/programmersbox/uiviews/SettingsFragment.kt +++ b/UIViews/src/main/java/com/programmersbox/uiviews/SettingsFragment.kt @@ -100,11 +100,7 @@ class SettingsFragment : PreferenceFragmentCompat() { .setTitle("Choose a source") .setSingleChoiceItems( list.map { it.serviceName }.toTypedArray(), - list.indexOfFirst { - println(it) - println(service) - it.serviceName == service - }.also { println(it) } + list.indexOfFirst { it.serviceName == service } ) { d, i -> sourcePublish.onNext(list[i]) requireContext().currentService = list[i].serviceName diff --git a/UIViews/src/main/java/com/programmersbox/uiviews/UpdateChecker.kt b/UIViews/src/main/java/com/programmersbox/uiviews/UpdateChecker.kt index 3da9fd499..049a2b6fe 100644 --- a/UIViews/src/main/java/com/programmersbox/uiviews/UpdateChecker.kt +++ b/UIViews/src/main/java/com/programmersbox/uiviews/UpdateChecker.kt @@ -190,8 +190,8 @@ class UpdateNotification(private val context: Context) { } pendingIntent { context -> NavDeepLinkBuilder(context) - .setGraph(R.navigation.all_nav) - .setDestination(R.id.detailsFragment3) + .setGraph(R.navigation.recent_nav) + .setDestination(R.id.detailsFragment2) .setArguments(Bundle().apply { putSerializable("itemInfo", pair.second.toItemModel(pair.first!!.source)) }) .createPendingIntent() }