diff --git a/app/src/main/java/com/github/droidworksstudio/launcher/helper/weather/WeatherResponse.kt b/app/src/main/java/com/github/droidworksstudio/launcher/helper/weather/WeatherResponse.kt index 1e13d8b..9279091 100644 --- a/app/src/main/java/com/github/droidworksstudio/launcher/helper/weather/WeatherResponse.kt +++ b/app/src/main/java/com/github/droidworksstudio/launcher/helper/weather/WeatherResponse.kt @@ -2,6 +2,7 @@ package com.github.droidworksstudio.launcher.helper.weather data class WeatherResponse( val name: String, + val dt: Long, val main: Main, val wind: Wind, val sys: Sys, @@ -22,13 +23,13 @@ data class Main( val humidity: Int ) -data class Weather( - val description: String, - val id: Int -) - data class Sys( val country: String, val sunrise: Int, val sunset: Int +) + +data class Weather( + val description: String, + val id: Int ) \ No newline at end of file diff --git a/app/src/main/java/com/github/droidworksstudio/launcher/ui/activities/MainActivity.kt b/app/src/main/java/com/github/droidworksstudio/launcher/ui/activities/MainActivity.kt index 0f474a1..92e8aec 100644 --- a/app/src/main/java/com/github/droidworksstudio/launcher/ui/activities/MainActivity.kt +++ b/app/src/main/java/com/github/droidworksstudio/launcher/ui/activities/MainActivity.kt @@ -20,7 +20,6 @@ import android.os.Environment import android.os.Handler import android.os.Looper import android.provider.Settings -import android.util.Log import android.view.Menu import android.view.MenuItem import android.view.WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS @@ -338,8 +337,6 @@ class MainActivity : AppCompatActivity(), LocationListener { val assets = jsonObject.getJSONArray("assets") val apkUrl = (assets.get(1) as JSONObject).getString("browser_download_url") - Log.d("testingIssues", "$latestVersion > $currentVersion") - if (latestVersion > currentVersion) { val sharedPreferences = getSharedPreferences("update_prefs", Context.MODE_PRIVATE) val declinedVersion = sharedPreferences.getString("declined_version", "") diff --git a/app/src/main/java/com/github/droidworksstudio/launcher/ui/widgets/WidgetFragment.kt b/app/src/main/java/com/github/droidworksstudio/launcher/ui/widgets/WidgetFragment.kt index 911e52a..0e0282b 100644 --- a/app/src/main/java/com/github/droidworksstudio/launcher/ui/widgets/WidgetFragment.kt +++ b/app/src/main/java/com/github/droidworksstudio/launcher/ui/widgets/WidgetFragment.kt @@ -46,7 +46,6 @@ import java.util.Calendar import java.util.Date import java.util.Locale import javax.inject.Inject -import kotlin.math.absoluteValue @AndroidEntryPoint @@ -127,7 +126,6 @@ class WidgetFragment : Fragment(), context.getSharedPreferences(Constants.WEATHER_PREFS, Context.MODE_PRIVATE) val latitude = sharedPreferences.getFloat(Constants.LATITUDE, 0f) val longitude = sharedPreferences.getFloat(Constants.LONGITUDE, 0f) - val timestamp = convertTimestampToReadableDate(sharedPreferences.getLong("cachedDataTimestamp", 0)) // Pre-fetch preferences val showWeatherWidget = preferenceHelper.showWeatherWidget @@ -162,6 +160,7 @@ class WidgetFragment : Fragment(), Log.d("weatherResponse", "$weatherResponse") withContext(Dispatchers.Main) { + val timestamp = convertTimestampToReadableDate(weatherResponse.dt) binding.apply { weatherCity.text = getString(R.string.widget_weather_location, weatherResponse.name, weatherResponse.sys.country) weatherTemperature.text = getString(R.string.widget_weather_temp, weatherResponse.main.temp, temperatureScale) @@ -230,11 +229,13 @@ class WidgetFragment : Fragment(), } private fun convertTimestampToReadableDate(timestamp: Long): String { - val date = Date(timestamp) + // Multiply by 1000 to convert seconds to milliseconds if the timestamp is in seconds + val date = Date(timestamp * 1000) val format = SimpleDateFormat("hh:mm aa", Locale.getDefault()) return format.format(date) } + private fun setupBatteryWidget() { lifecycleScope.launch { if (!preferenceHelper.showBatteryWidget) return@launch