From 75aba6698731251fd1bec3b3a525f6ad65cd36e5 Mon Sep 17 00:00:00 2001
From: Tommaso Berlose <tommaso.berlose@gmail.com>
Date: Wed, 5 May 2021 18:23:01 +0200
Subject: [PATCH] Bugfixes

---
 .idea/caches/build_file_checksums.ser           | Bin 537 -> 537 bytes
 .idea/misc.xml                                  |   2 +-
 .idea/runConfigurations.xml                     |   1 +
 app/build.gradle                                |   2 +-
 .../activities/tabs/TimeZoneSelectorActivity.kt |   6 +++++-
 .../anotherwidget/ui/widgets/ClockWidget.kt     |   1 +
 .../res/layout/left_aligned_widget_sans.xml     |   1 +
 app/src/main/res/layout/the_widget_sans.xml     |   1 +
 build.gradle                                    |   2 +-
 gradle/wrapper/gradle-wrapper.properties        |   2 +-
 10 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index fde3a36205dacd8b7481759aeedc397d0430deae..26cae231c170a88de1387450aef4ee81c29a3b94 100644
GIT binary patch
delta 32
qcmV+*0N?+a1epYonFGNPys?~Y0TD(4t(H@$vcQ9d7t%q>D)@NWFb+%r

delta 32
qcmV+*0N?+a1epYonFE)O?XjF}0TC|B`&s5OBEXRZwc*nmn>l#yMGox%

diff --git a/.idea/misc.xml b/.idea/misc.xml
index 7dbe2e1..a303beb 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -61,7 +61,7 @@
       </profile-state>
     </entry>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
index 7f68460..e497da9 100644
--- a/.idea/runConfigurations.xml
+++ b/.idea/runConfigurations.xml
@@ -3,6 +3,7 @@
   <component name="RunConfigurationProducerService">
     <option name="ignoredProducers">
       <set>
+        <option value="com.android.tools.idea.compose.preview.runconfiguration.ComposePreviewRunConfigurationProducer" />
         <option value="org.jetbrains.plugins.gradle.execution.test.runner.AllInPackageGradleConfigurationProducer" />
         <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestClassGradleConfigurationProducer" />
         <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestMethodGradleConfigurationProducer" />
diff --git a/app/build.gradle b/app/build.gradle
index f0c3636..c0e9253 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -22,7 +22,7 @@ android {
         applicationId "com.tommasoberlose.anotherwidget"
         minSdkVersion 23
         targetSdkVersion 30
-        versionCode 130
+        versionCode 132
         versionName "2.3.1"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/activities/tabs/TimeZoneSelectorActivity.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/activities/tabs/TimeZoneSelectorActivity.kt
index 96de0f1..96dea63 100644
--- a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/activities/tabs/TimeZoneSelectorActivity.kt
+++ b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/activities/tabs/TimeZoneSelectorActivity.kt
@@ -74,7 +74,11 @@ class TimeZoneSelectorActivity : AppCompatActivity() {
                         if (id != null) {
                             Preferences.bulk {
                                 altTimezoneId = id
-                                altTimezoneLabel = item.locality
+                                altTimezoneLabel = try {
+                                    item.locality
+                                } catch (ex: Exception) {
+                                    item.getAddressLine(0)
+                                }
                             }
                             MainWidget.updateWidget(this@TimeZoneSelectorActivity)
                             setResult(Activity.RESULT_OK)
diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/widgets/ClockWidget.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/widgets/ClockWidget.kt
index 56dd810..ea3f81e 100644
--- a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/widgets/ClockWidget.kt
+++ b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/widgets/ClockWidget.kt
@@ -24,6 +24,7 @@ class ClockWidget(val context: Context) {
                 views.setViewVisibility(R.id.clock_bottom_margin_small, View.GONE)
                 views.setViewVisibility(R.id.clock_bottom_margin_medium, View.GONE)
                 views.setViewVisibility(R.id.clock_bottom_margin_large, View.GONE)
+                views.setViewVisibility(R.id.timezones_container, View.GONE)
             } else {
                 views.setTextColor(R.id.time, ColorHelper.getClockFontColor(context.isDarkTheme()))
                 views.setTextColor(R.id.time_am_pm, ColorHelper.getClockFontColor(context.isDarkTheme()))
diff --git a/app/src/main/res/layout/left_aligned_widget_sans.xml b/app/src/main/res/layout/left_aligned_widget_sans.xml
index 6915651..9d53e7b 100644
--- a/app/src/main/res/layout/left_aligned_widget_sans.xml
+++ b/app/src/main/res/layout/left_aligned_widget_sans.xml
@@ -47,6 +47,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:id="@+id/timezones_container"
+                android:visibility="gone"
                 android:layout_marginStart="16dp"
                 android:layout_marginEnd="0dp"
                 android:layout_marginTop="18dp"
diff --git a/app/src/main/res/layout/the_widget_sans.xml b/app/src/main/res/layout/the_widget_sans.xml
index c3b88dc..367dfd3 100644
--- a/app/src/main/res/layout/the_widget_sans.xml
+++ b/app/src/main/res/layout/the_widget_sans.xml
@@ -49,6 +49,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:id="@+id/timezones_container"
+                android:visibility="gone"
                 android:layout_marginStart="16dp"
                 android:layout_marginEnd="0dp"
                 android:layout_marginTop="20dp"
diff --git a/build.gradle b/build.gradle
index 8238dc1..bee755d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -10,7 +10,7 @@ buildscript {
         
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.3'
+        classpath 'com.android.tools.build:gradle:4.2.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath 'com.google.gms:google-services:4.3.5'
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 6257923..ab7c9d5 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip