From 74b9860784913c097ae59e58b0958da7744ebc2e Mon Sep 17 00:00:00 2001 From: Guillaume Jacquart Date: Fri, 9 Jun 2023 06:34:09 +0000 Subject: 1227: use navigation graph component, avoid view (fragments) duplications --- .../foundation/e/advancedprivacy/widget/WidgetUI.kt | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) (limited to 'app/src/main/java/foundation/e/advancedprivacy/widget') diff --git a/app/src/main/java/foundation/e/advancedprivacy/widget/WidgetUI.kt b/app/src/main/java/foundation/e/advancedprivacy/widget/WidgetUI.kt index f1edb36..bfd7d1a 100644 --- a/app/src/main/java/foundation/e/advancedprivacy/widget/WidgetUI.kt +++ b/app/src/main/java/foundation/e/advancedprivacy/widget/WidgetUI.kt @@ -1,4 +1,5 @@ /* + * Copyright (C) 2023 MURENA SAS * Copyright (C) 2022 E FOUNDATION * * This program is free software: you can redistribute it and/or modify @@ -33,6 +34,7 @@ import foundation.e.advancedprivacy.common.extensions.dpToPxF import foundation.e.advancedprivacy.domain.entities.InternetPrivacyMode import foundation.e.advancedprivacy.domain.entities.QuickPrivacyState import foundation.e.advancedprivacy.domain.entities.TrackerMode +import foundation.e.advancedprivacy.features.dashboard.DashboardFragmentArgs import foundation.e.advancedprivacy.main.MainActivity import foundation.e.advancedprivacy.widget.WidgetCommandReceiver.Companion.ACTION_TOGGLE_IPSCRAMBLING import foundation.e.advancedprivacy.widget.WidgetCommandReceiver.Companion.ACTION_TOGGLE_LOCATION @@ -179,12 +181,9 @@ fun render( setViewVisibility(R.id.graph_legend_values, View.VISIBLE) setViewVisibility(R.id.graph_view_trackers_btn, View.VISIBLE) - val pIntent = PendingIntent.getActivity( - context, - REQUEST_CODE_TRACKERS, - MainActivity.createTrackersIntent(context), - FLAG_IMMUTABLE or FLAG_UPDATE_CURRENT - ) + val pIntent = MainActivity.deepLinkBuilder(context) + .setDestination(R.id.trackersFragment) + .createPendingIntent() setOnClickPendingIntent(R.id.graph_view_trackers_btn, pIntent) @@ -205,11 +204,10 @@ fun render( val topPadding = graphHeightPx - (blocked + leaked) * ratio setViewPadding(leakedBarIds[index], 0, topPadding.toInt(), 0, 0) - val highlightPIntent = PendingIntent.getActivity( - context, REQUEST_CODE_HIGHLIGHT + index, - MainActivity.createHighlightLeaksIntent(context, index), - FLAG_IMMUTABLE or FLAG_UPDATE_CURRENT - ) + val highlightPIntent = MainActivity.deepLinkBuilder(context) + .setDestination(R.id.dashboardFragment) + .setArguments(DashboardFragmentArgs(highlightLeaks = index).toBundle()) + .createPendingIntent() setOnClickPendingIntent(containerBarIds[index], highlightPIntent) } -- cgit v1.2.3