diff --git a/app/src/main/java/com/appttude/h_mal/atlas_weather/data/network/response/forecast/Hour.kt b/app/src/main/java/com/appttude/h_mal/atlas_weather/data/network/response/forecast/Hour.kt new file mode 100644 index 0000000..48d1f5b --- /dev/null +++ b/app/src/main/java/com/appttude/h_mal/atlas_weather/data/network/response/forecast/Hour.kt @@ -0,0 +1,48 @@ +package com.appttude.h_mal.atlas_weather.data.network.response.forecast + +import com.google.gson.annotations.SerializedName + +data class Hour( + + @field:SerializedName("sunrise") + val sunrise: Int? = null, + + @field:SerializedName("temp") + val temp: Double? = null, + + @field:SerializedName("visibility") + val visibility: Int? = null, + + @field:SerializedName("uvi") + val uvi: Double? = null, + + @field:SerializedName("pressure") + val pressure: Int? = null, + + @field:SerializedName("clouds") + val clouds: Int? = null, + + @field:SerializedName("feels_like") + val feelsLike: Double? = null, + + @field:SerializedName("dt") + val dt: Int? = null, + + @field:SerializedName("wind_deg") + val windDeg: Int? = null, + + @field:SerializedName("dew_point") + val dewPoint: Double? = null, + + @field:SerializedName("sunset") + val sunset: Int? = null, + + @field:SerializedName("weather") + val weather: List? = null, + + @field:SerializedName("humidity") + val humidity: Int? = null, + + @field:SerializedName("wind_speed") + val windSpeed: Double? = null +) diff --git a/app/src/main/java/com/appttude/h_mal/atlas_weather/model/weather/Hour.kt b/app/src/main/java/com/appttude/h_mal/atlas_weather/model/weather/Hour.kt new file mode 100644 index 0000000..08f6200 --- /dev/null +++ b/app/src/main/java/com/appttude/h_mal/atlas_weather/model/weather/Hour.kt @@ -0,0 +1,19 @@ +package com.appttude.h_mal.atlas_weather.model.weather + +import com.appttude.h_mal.atlas_weather.utils.generateIconUrlString +import com.appttude.h_mal.atlas_weather.data.network.response.forecast.Hour as ForecastHour + + +data class Hour( + val dt: Int? = null, + val temp: Double? = null, + val icon: String? = null +){ + constructor(hour: ForecastHour) : this( + hour.dt, + hour.temp, + generateIconUrlString(hour.weather?.getOrNull(0)?.icon) + ) +} + + diff --git a/app/src/main/res/drawable-nodpi/example_appwidget_preview.png b/app/src/main/res/drawable-nodpi/example_appwidget_preview.png deleted file mode 100644 index 894b069..0000000 Binary files a/app/src/main/res/drawable-nodpi/example_appwidget_preview.png and /dev/null differ diff --git a/app/src/main/res/drawable-v24/calendar.png b/app/src/main/res/drawable-v24/calendar.png deleted file mode 100644 index 6d3ae44..0000000 Binary files a/app/src/main/res/drawable-v24/calendar.png and /dev/null differ diff --git a/app/src/main/res/drawable-v24/info.png b/app/src/main/res/drawable-v24/info.png deleted file mode 100644 index 97c195c..0000000 Binary files a/app/src/main/res/drawable-v24/info.png and /dev/null differ diff --git a/app/src/main/res/drawable/button_layout.xml b/app/src/main/res/drawable/button_layout.xml deleted file mode 100644 index e8dcb5d..0000000 --- a/app/src/main/res/drawable/button_layout.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/calendar.png b/app/src/main/res/drawable/calendar.png deleted file mode 100644 index 6d3ae44..0000000 Binary files a/app/src/main/res/drawable/calendar.png and /dev/null differ diff --git a/app/src/main/res/drawable/card_outlined.xml b/app/src/main/res/drawable/card_outlined.xml deleted file mode 100644 index 702fcda..0000000 --- a/app/src/main/res/drawable/card_outlined.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_android_black_24dp.xml b/app/src/main/res/drawable/ic_android_black_24dp.xml deleted file mode 100644 index 401cbf6..0000000 --- a/app/src/main/res/drawable/ic_android_black_24dp.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_info_black_24dp.xml b/app/src/main/res/drawable/ic_info_black_24dp.xml deleted file mode 100644 index 34b8202..0000000 --- a/app/src/main/res/drawable/ic_info_black_24dp.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml deleted file mode 100644 index d5fccc5..0000000 --- a/app/src/main/res/drawable/ic_launcher_background.xml +++ /dev/null @@ -1,170 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_notifications_black_24dp.xml b/app/src/main/res/drawable/ic_notifications_black_24dp.xml deleted file mode 100644 index e3400cf..0000000 --- a/app/src/main/res/drawable/ic_notifications_black_24dp.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_outline_error_outline_24.xml b/app/src/main/res/drawable/ic_outline_error_outline_24.xml deleted file mode 100644 index 45ba5f6..0000000 --- a/app/src/main/res/drawable/ic_outline_error_outline_24.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_sync_black_24dp.xml b/app/src/main/res/drawable/ic_sync_black_24dp.xml deleted file mode 100644 index 5a283aa..0000000 --- a/app/src/main/res/drawable/ic_sync_black_24dp.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/info.png b/app/src/main/res/drawable/info.png deleted file mode 100644 index 97c195c..0000000 Binary files a/app/src/main/res/drawable/info.png and /dev/null differ diff --git a/app/src/main/res/drawable/night_395.png b/app/src/main/res/drawable/night_395.png deleted file mode 100644 index ffbcefa..0000000 Binary files a/app/src/main/res/drawable/night_395.png and /dev/null differ diff --git a/app/src/main/res/drawable/notif_icon.png b/app/src/main/res/drawable/notif_icon.png deleted file mode 100644 index 17421bd..0000000 Binary files a/app/src/main/res/drawable/notif_icon.png and /dev/null differ diff --git a/app/src/main/res/drawable/sun.png b/app/src/main/res/drawable/sun.png deleted file mode 100644 index 99ccb08..0000000 Binary files a/app/src/main/res/drawable/sun.png and /dev/null differ diff --git a/app/src/main/res/layout/activity_main_navigation.xml b/app/src/main/res/layout/activity_main_navigation.xml index c0aca86..4b1fd9d 100644 --- a/app/src/main/res/layout/activity_main_navigation.xml +++ b/app/src/main/res/layout/activity_main_navigation.xml @@ -3,7 +3,6 @@ xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" - android:id="@+id/main_content" android:layout_width="match_parent" android:layout_height="match_parent" android:fitsSystemWindows="true"> @@ -43,7 +42,6 @@ tools:layout="@layout/fragment_home"/> + tools:context="com.appttude.h_mal.atlas_weather.monoWeather.ui.world.AddLocationFragment"> diff --git a/app/src/main/res/layout/info_dialog_item.xml b/app/src/main/res/layout/info_dialog_item.xml deleted file mode 100644 index e80c427..0000000 --- a/app/src/main/res/layout/info_dialog_item.xml +++ /dev/null @@ -1,78 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/info_dialog_layout.xml b/app/src/main/res/layout/info_dialog_layout.xml deleted file mode 100644 index ae9dac9..0000000 --- a/app/src/main/res/layout/info_dialog_layout.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/weather_app_widget.xml b/app/src/main/res/layout/weather_app_widget.xml index 636f4a5..3d1b7e7 100644 --- a/app/src/main/res/layout/weather_app_widget.xml +++ b/app/src/main/res/layout/weather_app_widget.xml @@ -21,7 +21,6 @@ android:layout_centerVertical="true" android:layout_marginStart="12dp"> - 0dp \ No newline at end of file diff --git a/app/src/main/res/values-w820dp/dimens.xml b/app/src/main/res/values-w820dp/dimens.xml index 63fc816..90bf001 100644 --- a/app/src/main/res/values-w820dp/dimens.xml +++ b/app/src/main/res/values-w820dp/dimens.xml @@ -2,5 +2,4 @@ - 64dp diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 0929d0d..33dd937 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -1,12 +1,8 @@ - @android:color/black @android:color/black @android:color/white #E8D0DD - #5F8E7B - #B3C0CA #8C98AD - #2E3532 diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index b2aa597..266bedc 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -1,16 +1,9 @@ - 16dp - 16dp - 16dp - 8dp - 8dp - 25dp - 0dp diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 4466f0f..64e8511 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -3,50 +3,9 @@ Settings - Data & sync - - °C - °F - - - - MpH - kpH - - - - mph - kph - - - - mm - In - - - - mm - in - - - - KM - Miles - - - - km - miles - - - New message notifications - - Vibrate submit - EXAMPLE - Add widget Home World Enter Location name diff --git a/app/src/main/res/web_hi_res_512.png b/app/src/main/res/web_hi_res_512.png new file mode 100644 index 0000000..b679994 Binary files /dev/null and b/app/src/main/res/web_hi_res_512.png differ diff --git a/app/src/monoWeather/res/layout/list_item_forecast.xml b/app/src/monoWeather/res/layout/list_item_forecast.xml index eba7b69..4fc787f 100644 --- a/app/src/monoWeather/res/layout/list_item_forecast.xml +++ b/app/src/monoWeather/res/layout/list_item_forecast.xml @@ -46,7 +46,6 @@ diff --git a/app/src/monoWeather/res/values/strings.xml b/app/src/monoWeather/res/values/strings.xml index 38b946a..bf2066a 100644 --- a/app/src/monoWeather/res/values/strings.xml +++ b/app/src/monoWeather/res/values/strings.xml @@ -3,52 +3,10 @@ Settings - Data & sync - - °C - °F - - - - MpH - kpH - - - - mph - kph - - - - mm - In - - - - mm - in - - - - KM - Miles - - - - km - miles - - - New message notifications - - Vibrate submit - EXAMPLE - Add widget Home World - Hello blank fragment diff --git a/app/src/monoWeather/res/values/styles.xml b/app/src/monoWeather/res/values/styles.xml index 202a86b..20fde5d 100644 --- a/app/src/monoWeather/res/values/styles.xml +++ b/app/src/monoWeather/res/values/styles.xml @@ -58,23 +58,8 @@ - - - - -