Skip to content

Commit 806ea26

Browse files
Fix: Fixed the last updated time.
1 parent d8af7a6 commit 806ea26

3 files changed

Lines changed: 10 additions & 11 deletions

File tree

app/src/main/java/com/github/droidworksstudio/launcher/helper/weather/WeatherResponse.kt

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package com.github.droidworksstudio.launcher.helper.weather
22

33
data class WeatherResponse(
44
val name: String,
5+
val dt: Long,
56
val main: Main,
67
val wind: Wind,
78
val sys: Sys,
@@ -22,13 +23,13 @@ data class Main(
2223
val humidity: Int
2324
)
2425

25-
data class Weather(
26-
val description: String,
27-
val id: Int
28-
)
29-
3026
data class Sys(
3127
val country: String,
3228
val sunrise: Int,
3329
val sunset: Int
30+
)
31+
32+
data class Weather(
33+
val description: String,
34+
val id: Int
3435
)

app/src/main/java/com/github/droidworksstudio/launcher/ui/activities/MainActivity.kt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ import android.os.Environment
2020
import android.os.Handler
2121
import android.os.Looper
2222
import android.provider.Settings
23-
import android.util.Log
2423
import android.view.Menu
2524
import android.view.MenuItem
2625
import android.view.WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS
@@ -338,8 +337,6 @@ class MainActivity : AppCompatActivity(), LocationListener {
338337
val assets = jsonObject.getJSONArray("assets")
339338
val apkUrl = (assets.get(1) as JSONObject).getString("browser_download_url")
340339

341-
Log.d("testingIssues", "$latestVersion > $currentVersion")
342-
343340
if (latestVersion > currentVersion) {
344341
val sharedPreferences = getSharedPreferences("update_prefs", Context.MODE_PRIVATE)
345342
val declinedVersion = sharedPreferences.getString("declined_version", "")

app/src/main/java/com/github/droidworksstudio/launcher/ui/widgets/WidgetFragment.kt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ import java.util.Calendar
4646
import java.util.Date
4747
import java.util.Locale
4848
import javax.inject.Inject
49-
import kotlin.math.absoluteValue
5049

5150

5251
@AndroidEntryPoint
@@ -127,7 +126,6 @@ class WidgetFragment : Fragment(),
127126
context.getSharedPreferences(Constants.WEATHER_PREFS, Context.MODE_PRIVATE)
128127
val latitude = sharedPreferences.getFloat(Constants.LATITUDE, 0f)
129128
val longitude = sharedPreferences.getFloat(Constants.LONGITUDE, 0f)
130-
val timestamp = convertTimestampToReadableDate(sharedPreferences.getLong("cachedDataTimestamp", 0))
131129

132130
// Pre-fetch preferences
133131
val showWeatherWidget = preferenceHelper.showWeatherWidget
@@ -162,6 +160,7 @@ class WidgetFragment : Fragment(),
162160
Log.d("weatherResponse", "$weatherResponse")
163161

164162
withContext(Dispatchers.Main) {
163+
val timestamp = convertTimestampToReadableDate(weatherResponse.dt)
165164
binding.apply {
166165
weatherCity.text = getString(R.string.widget_weather_location, weatherResponse.name, weatherResponse.sys.country)
167166
weatherTemperature.text = getString(R.string.widget_weather_temp, weatherResponse.main.temp, temperatureScale)
@@ -230,11 +229,13 @@ class WidgetFragment : Fragment(),
230229
}
231230

232231
private fun convertTimestampToReadableDate(timestamp: Long): String {
233-
val date = Date(timestamp)
232+
// Multiply by 1000 to convert seconds to milliseconds if the timestamp is in seconds
233+
val date = Date(timestamp * 1000)
234234
val format = SimpleDateFormat("hh:mm aa", Locale.getDefault())
235235
return format.format(date)
236236
}
237237

238+
238239
private fun setupBatteryWidget() {
239240
lifecycleScope.launch {
240241
if (!preferenceHelper.showBatteryWidget) return@launch

0 commit comments

Comments
 (0)