From 138cd2710919db4b5db55797dbdff5f4ebef3846 Mon Sep 17 00:00:00 2001 From: jacquarg Date: Mon, 28 Mar 2022 09:11:01 +0200 Subject: 5161 display message when trackers graphs empty. --- .../e/privacycentralapp/widget/WidgetUI.kt | 35 ++++++++++++++++------ 1 file changed, 26 insertions(+), 9 deletions(-) (limited to 'app/src/main/java/foundation/e/privacycentralapp/widget') diff --git a/app/src/main/java/foundation/e/privacycentralapp/widget/WidgetUI.kt b/app/src/main/java/foundation/e/privacycentralapp/widget/WidgetUI.kt index ae2238f..1196920 100644 --- a/app/src/main/java/foundation/e/privacycentralapp/widget/WidgetUI.kt +++ b/app/src/main/java/foundation/e/privacycentralapp/widget/WidgetUI.kt @@ -124,16 +124,33 @@ fun render( setViewVisibility(R.id.state_ip_address_loader, if (loading) View.VISIBLE else View.GONE) - val graphHeightPx = 26.dpToPxF(context) - val maxValue = state.dayStatistics.maxOrNull().let { if (it == null || it == 0) 1 else it } - val ratio = graphHeightPx / maxValue - - state.dayStatistics.zip(barIds).forEach { (value, viewId) -> - val topPadding = graphHeightPx - value * ratio - setViewPadding(viewId, 0, topPadding.toInt(), 0, 0) + if (state.dayStatistics.all { it == 0 }) { + setViewVisibility(R.id.graph, View.GONE) + setViewVisibility(R.id.graph_legend, View.GONE) + setViewVisibility(R.id.graph_empty, View.VISIBLE) + } else { + setViewVisibility(R.id.graph, View.VISIBLE) + setViewVisibility(R.id.graph_legend, View.VISIBLE) + setViewVisibility(R.id.graph_empty, View.GONE) + + val graphHeightPx = 26.dpToPxF(context) + val maxValue = + state.dayStatistics.maxOrNull().let { if (it == null || it == 0) 1 else it } + val ratio = graphHeightPx / maxValue + + state.dayStatistics.zip(barIds).forEach { (value, viewId) -> + val topPadding = graphHeightPx - value * ratio + setViewPadding(viewId, 0, topPadding.toInt(), 0, 0) + } + + setTextViewText( + R.id.graph_legend, + context.getString( + R.string.widget_graph_trackers_legend, + state.activeTrackersCount.toString() + ) + ) } - - setTextViewText(R.id.graph_legend, context.getString(R.string.widget_graph_trackers_legend, state.activeTrackersCount.toString())) } appWidgetManager.updateAppWidget(ComponentName(context, Widget::class.java), views) -- cgit v1.2.3 From 387e9b0cb1673ebf7fad23e7973312bf366d89b2 Mon Sep 17 00:00:00 2001 From: jacquarg Date: Mon, 28 Mar 2022 09:16:31 +0200 Subject: 5076 fix ipscrambling on state label on widget. --- app/src/main/java/foundation/e/privacycentralapp/widget/WidgetUI.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/src/main/java/foundation/e/privacycentralapp/widget') diff --git a/app/src/main/java/foundation/e/privacycentralapp/widget/WidgetUI.kt b/app/src/main/java/foundation/e/privacycentralapp/widget/WidgetUI.kt index 1196920..070d053 100644 --- a/app/src/main/java/foundation/e/privacycentralapp/widget/WidgetUI.kt +++ b/app/src/main/java/foundation/e/privacycentralapp/widget/WidgetUI.kt @@ -111,7 +111,7 @@ fun render( context.getString( if (state.internetPrivacyMode != InternetPrivacyMode.HIDE_IP) R.string.widget_state_ipaddress_off - else R.string.widget_state_title_on + else R.string.widget_state_ipaddress_on ) ) -- cgit v1.2.3