From 6d7d90e7627a71ddea00df94f9a5776d7e5a4bb5 Mon Sep 17 00:00:00 2001
From: azuo <azuo.lee@sohu.com>
Date: Tue, 14 Sep 2021 13:49:52 +0800
Subject: [PATCH] Correct the algorithm to check if to show weather as a glance
 provider.

---
 .../anotherwidget/helpers/GlanceProviderHelper.kt           | 6 +++---
 .../anotherwidget/ui/widgets/AlignedWidget.kt               | 4 ++--
 .../anotherwidget/ui/widgets/StandardWidget.kt              | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/helpers/GlanceProviderHelper.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/helpers/GlanceProviderHelper.kt
index 01a1391..76bb3ab 100644
--- a/app/src/main/java/com/tommasoberlose/anotherwidget/helpers/GlanceProviderHelper.kt
+++ b/app/src/main/java/com/tommasoberlose/anotherwidget/helpers/GlanceProviderHelper.kt
@@ -114,11 +114,11 @@ object GlanceProviderHelper {
                 (MediaPlayerHelper.isSomeonePlaying(context)) ||
                 (Preferences.showBatteryCharging && Preferences.isCharging || Preferences.isBatteryLevelLow) ||
                 (Preferences.customNotes.isNotEmpty()) ||
-                (Preferences.showWeatherAsGlanceProvider && Preferences.weatherIcon != "") ||
+                (Preferences.showWeatherAsGlanceProvider && Preferences.showWeather && Preferences.weatherIcon != "") ||
                 (Preferences.showDailySteps && Preferences.googleFitSteps > 0) ||
                 (Preferences.showGreetings && GreetingsHelper.showGreetings()) ||
-                        (Preferences.showEventsAsGlanceProvider && Preferences.showEvents && context.checkGrantedPermission(
-                            Manifest.permission.READ_CALENDAR) && eventRepository.getNextEvent() != null)
+                (Preferences.showEventsAsGlanceProvider && Preferences.showEvents && context.checkGrantedPermission(
+                    Manifest.permission.READ_CALENDAR) && eventRepository.getNextEvent() != null)
             )
         eventRepository.close()
         return showGlance
diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/widgets/AlignedWidget.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/widgets/AlignedWidget.kt
index 3c3816b..dab8f56 100644
--- a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/widgets/AlignedWidget.kt
+++ b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/widgets/AlignedWidget.kt
@@ -366,7 +366,7 @@ class AlignedWidget(val context: Context, val rightAligned: Boolean = false) {
                             }
                         }
                         Constants.GlanceProviderId.WEATHER -> {
-                            if (Preferences.showWeather && Preferences.weatherIcon != "") {
+                            if (Preferences.showWeatherAsGlanceProvider && Preferences.showWeather && Preferences.weatherIcon != "") {
                                 val i = Intent(context, WidgetClickListenerReceiver::class.java)
                                 i.action = Actions.ACTION_OPEN_WEATHER_INTENT
                                 val weatherPIntent = PendingIntent.getBroadcast(context, widgetID, i, 0)
@@ -742,7 +742,7 @@ class AlignedWidget(val context: Context, val rightAligned: Boolean = false) {
                             }
                         }
                         Constants.GlanceProviderId.WEATHER -> {
-                            if (Preferences.showWeatherAsGlanceProvider && Preferences.weatherIcon != "") {
+                            if (Preferences.showWeatherAsGlanceProvider && Preferences.showWeather && Preferences.weatherIcon != "") {
                                 bindingView.subLineText.text = String.format(
                                     Locale.getDefault(),
                                     "%d°%s  %s",
diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/widgets/StandardWidget.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/widgets/StandardWidget.kt
index f2f2252..bbca281 100644
--- a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/widgets/StandardWidget.kt
+++ b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/widgets/StandardWidget.kt
@@ -394,7 +394,7 @@ class StandardWidget(val context: Context) {
                             }
                         }
                         Constants.GlanceProviderId.WEATHER -> {
-                            if (Preferences.showWeather && Preferences.weatherIcon != "") {
+                            if (Preferences.showWeatherAsGlanceProvider && Preferences.showWeather && Preferences.weatherIcon != "") {
                                 val i = Intent(context, WidgetClickListenerReceiver::class.java)
                                 i.action = Actions.ACTION_OPEN_WEATHER_INTENT
                                 val weatherPIntent = PendingIntent.getBroadcast(context, widgetID, i, 0)
@@ -774,7 +774,7 @@ class StandardWidget(val context: Context) {
                             }
                         }
                         Constants.GlanceProviderId.WEATHER -> {
-                            if (Preferences.showWeatherAsGlanceProvider && Preferences.weatherIcon != "") {
+                            if (Preferences.showWeatherAsGlanceProvider && Preferences.showWeather && Preferences.weatherIcon != "") {
                                 bindingView.subLineText.text = String.format(
                                     Locale.getDefault(),
                                     "%d°%s  %s",