update weather

Author: tsynik

app/src/main/java/com/amazon/tv/leanbacklauncher/MainActivity.kt

@@ -33,6 +33,7 @@ import android.widget.TextView
 import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.widget.AppCompatImageView
 import androidx.core.content.res.ResourcesCompat
+import androidx.core.text.isDigitsOnly
 import androidx.leanback.widget.BaseGridView
 import androidx.leanback.widget.OnChildViewHolderSelectedListener
 import androidx.leanback.widget.VerticalGridView
@@ -587,20 +588,38 @@ class MainActivity : AppCompatActivity(), OnEditModeChangedListener,
                 lw.useCurrentLocation = true
                 lw.updateCurrentLocation = true
             } else {
+                lw.useCurrentLocation = false
                 RowPreferences.getUserLocation(this)?.let { loc ->
                     if (loc.isNotEmpty())
-                        lw.fetchCurrentWeatherByCityName(loc)
+                        if (loc.isDigitsOnly()) { // assume city id, ex. 524901
+                            if (BuildConfig.DEBUG) Log.d(TAG, "fetchCurrentWeatherByCityId($loc)")
+                            lw.fetchCurrentWeatherByCityId(loc)
+                        } else if (loc.split(", ").size == 2 &&
+                            loc.split(", ").first().toDoubleOrNull() != null &&
+                            loc.split(", ").last().toDoubleOrNull() != null
+                        ) { // assume coordinates, ex. 45.75 47.61
+                            val lat = loc.split(", ").first().toDouble()
+                            val lon = loc.split(", ").last().toDouble()
+                            if (BuildConfig.DEBUG) Log.d(TAG, "fetchCurrentWeatherByLocation($lat,$lon)")
+                                lw.fetchCurrentWeatherByLocation(lat, lon)
+                        } else {
+                            if (BuildConfig.DEBUG) Log.d(TAG, "fetchCurrentWeatherByCityName($loc)")
+                            lw.fetchCurrentWeatherByCityName(loc)
+                        }
+                    else
+                        LauncherApplication.Toast(R.string.user_location_warning, true)
                 }
             }
 
             lw.weatherCallback = object : LocalWeather.WeatherCallback {
                 override fun onSuccess(weather: Weather) {
-                    if (BuildConfig.DEBUG) Log.d(TAG, "LocalWeather onSuccess()")
+                    if (BuildConfig.DEBUG) Log.d(TAG, "LocalWeather onSuccess() -> updateWeatherDetails")
                     updateWeatherDetails(weather)
                 }
 
                 override fun onFailure(exception: Throwable?) {
                     Log.e(TAG, "Weather fetching exception ${exception!!.message!!}")
+                    LauncherApplication.Toast("Weather error: ${exception!!.message!!}", true)
                 }
             }
 

app/src/main/res/layout/clock.xml

@@ -77,7 +77,7 @@
         android:fontFamily="@string/light_font"
         android:gravity="center"
         android:textColor="@color/clock_text_color"
-        android:textSize="18sp"
+        android:textSize="16sp"
         android:visibility="gone" />
 
 </LinearLayout>

app/src/main/res/values-ru/strings.xml

@@ -214,11 +214,12 @@ com.amazon.device.sale.service
     <string name="use_current_location_title">Текущее местоположение</string>
     <string name="use_current_location_description">Использовать местоположение из ОС (требуется разрешение на местоположение и сервисы Google)</string>
     <string name="user_location_title">Местоположение пользователя</string>
+    <string name="user_location_warning">Местоположение для погоды не задано в настройках</string>
     <string name="v7_preference_off">ВЫКЛ</string>
     <string name="v7_preference_on">ВКЛ</string>
     <string name="videos_row_title">Раздел «Видео»</string>
     <string name="wallpaper_title">Фон по умолчанию</string>
     <string name="wallpaper_choose">Поместите изображение фона в корневой каталог хранилища и выберите здесь</string>
     <string name="weather_home_title">Настройки погоды</string>
     <string name="weather_home_description">Местная погода и прогноз на главной странице</string>
-</resources>
+</resources>

app/src/main/res/values/strings.xml

@@ -263,6 +263,7 @@ or recommendations will not work properly."</string>
     <string name="use_current_location_title">Use current location</string>
     <string name="use_current_location_description">Autodetect location by OS (Google services and location permission required)</string>
     <string name="user_location_title">User location</string>
+    <string name="user_location_warning">User location for weather not set in preferences</string>
     <string name="error_app_not_found">No suitable applications found</string>
     <string name="v7_preference_off">OFF</string>
     <string name="v7_preference_on">ON</string>