diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index cebaf33..f8737bc 100644 Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ diff --git a/app/build.gradle b/app/build.gradle index 54991d6..78eecac 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -18,8 +18,8 @@ android { applicationId "com.tommasoberlose.anotherwidget" minSdkVersion 23 targetSdkVersion 29 - versionCode 96 - versionName "2.0.9" + versionCode 97 + versionName "2.0.10" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } diff --git a/app/release/app-release.aab b/app/release/app-release.aab index 95d59bb..0d84260 100644 Binary files a/app/release/app-release.aab and b/app/release/app-release.aab differ diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/global/Constants.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/global/Constants.kt index 61013cc..b8d58b5 100644 --- a/app/src/main/java/com/tommasoberlose/anotherwidget/global/Constants.kt +++ b/app/src/main/java/com/tommasoberlose/anotherwidget/global/Constants.kt @@ -31,6 +31,7 @@ object Constants { enum class WeatherIconPack(val value: Int) { DEFAULT(0), - MINIMAL(1) + MINIMAL(1), + COOL(2) } } \ No newline at end of file diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/helpers/IntentHelper.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/helpers/IntentHelper.kt index 2b8b71d..da994bc 100644 --- a/app/src/main/java/com/tommasoberlose/anotherwidget/helpers/IntentHelper.kt +++ b/app/src/main/java/com/tommasoberlose/anotherwidget/helpers/IntentHelper.kt @@ -128,10 +128,8 @@ object IntentHelper { putExtra(CalendarContract.EXTRA_EVENT_BEGIN_TIME, e.startDate + start.timeZone.getOffset(start.timeInMillis)) putExtra(CalendarContract.EXTRA_EVENT_END_TIME, e.endDate + end.timeZone.getOffset(end.timeInMillis)) -// putExtra(CalendarContract.EXTRA_EVENT_ALL_DAY, 1) + putExtra(CalendarContract.EXTRA_EVENT_ALL_DAY, 1) } - - Log.d("ciao", "intent: ${this} - extras: ${this.extras}") } } else { getCalendarIntent(context).apply { diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/helpers/WeatherHelper.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/helpers/WeatherHelper.kt index ffb15fc..1f76cdb 100644 --- a/app/src/main/java/com/tommasoberlose/anotherwidget/helpers/WeatherHelper.kt +++ b/app/src/main/java/com/tommasoberlose/anotherwidget/helpers/WeatherHelper.kt @@ -47,81 +47,177 @@ object WeatherHelper { } fun getWeatherIconResource(icon: String): Int { - when (icon) { + return when (icon) { "01d" -> { - return if (Preferences.weatherIconPack == Constants.WeatherIconPack.DEFAULT.value) R.drawable.clear_day else R.drawable.clear_day_2 + when (Preferences.weatherIconPack) { + Constants.WeatherIconPack.COOL.value -> R.drawable.clear_day_3 + Constants.WeatherIconPack.MINIMAL.value -> R.drawable.clear_day_2 + else -> R.drawable.clear_day + } } "02d" -> { - return if (Preferences.weatherIconPack == Constants.WeatherIconPack.DEFAULT.value) R.drawable.partly_cloudy else R.drawable.partly_cloudy_2 + when (Preferences.weatherIconPack) { + Constants.WeatherIconPack.COOL.value -> R.drawable.partly_cloudy_3 + Constants.WeatherIconPack.MINIMAL.value -> R.drawable.partly_cloudy_2 + else -> R.drawable.partly_cloudy + } } "03d" -> { - return if (Preferences.weatherIconPack == Constants.WeatherIconPack.DEFAULT.value) R.drawable.mostly_cloudy else R.drawable.mostly_cloudy_2 + when (Preferences.weatherIconPack) { + Constants.WeatherIconPack.COOL.value -> R.drawable.mostly_cloudy_3 + Constants.WeatherIconPack.MINIMAL.value -> R.drawable.mostly_cloudy_2 + else -> R.drawable.mostly_cloudy + } } "04d" -> { - return if (Preferences.weatherIconPack == Constants.WeatherIconPack.DEFAULT.value) R.drawable.cloudy_weather else R.drawable.cloudy_weather_2 + when (Preferences.weatherIconPack) { + Constants.WeatherIconPack.COOL.value -> R.drawable.cloudy_weather_3 + Constants.WeatherIconPack.MINIMAL.value -> R.drawable.cloudy_weather_2 + else -> R.drawable.cloudy_weather + } } "09d" -> { - return if (Preferences.weatherIconPack == Constants.WeatherIconPack.DEFAULT.value) R.drawable.storm_weather_day else R.drawable.storm_weather_day_2 + when (Preferences.weatherIconPack) { + Constants.WeatherIconPack.COOL.value -> R.drawable.storm_weather_day_3 + Constants.WeatherIconPack.MINIMAL.value -> R.drawable.storm_weather_day_2 + else -> R.drawable.storm_weather_day + } } "10d" -> { - return if (Preferences.weatherIconPack == Constants.WeatherIconPack.DEFAULT.value) R.drawable.rainy_day else R.drawable.rainy_day_2 + when (Preferences.weatherIconPack) { + Constants.WeatherIconPack.COOL.value -> R.drawable.rainy_day_3 + Constants.WeatherIconPack.MINIMAL.value -> R.drawable.rainy_day_2 + else -> R.drawable.rainy_day + } } "11d" -> { - return if (Preferences.weatherIconPack == Constants.WeatherIconPack.DEFAULT.value) R.drawable.thunder_day else R.drawable.thunder_day_2 + when (Preferences.weatherIconPack) { + Constants.WeatherIconPack.COOL.value -> R.drawable.thunder_day_3 + Constants.WeatherIconPack.MINIMAL.value -> R.drawable.thunder_day_2 + else -> R.drawable.thunder_day + } } "13d" -> { - return if (Preferences.weatherIconPack == Constants.WeatherIconPack.DEFAULT.value) R.drawable.snow_day else R.drawable.snow_day_2 + when (Preferences.weatherIconPack) { + Constants.WeatherIconPack.COOL.value -> R.drawable.snow_day_3 + Constants.WeatherIconPack.MINIMAL.value -> R.drawable.snow_day_2 + else -> R.drawable.snow_day + } } "50d" -> { - return if (Preferences.weatherIconPack == Constants.WeatherIconPack.DEFAULT.value) R.drawable.haze_day else R.drawable.haze_day_2 + when (Preferences.weatherIconPack) { + Constants.WeatherIconPack.COOL.value -> R.drawable.haze_day_3 + Constants.WeatherIconPack.MINIMAL.value -> R.drawable.haze_day_2 + else -> R.drawable.haze_day + } } "80d" -> { - return if (Preferences.weatherIconPack == Constants.WeatherIconPack.DEFAULT.value) R.drawable.windy_day else R.drawable.windy_day_2 + when (Preferences.weatherIconPack) { + Constants.WeatherIconPack.COOL.value -> R.drawable.windy_day_3 + Constants.WeatherIconPack.MINIMAL.value -> R.drawable.windy_day_2 + else -> R.drawable.windy_day + } } "81d" -> { - return if (Preferences.weatherIconPack == Constants.WeatherIconPack.DEFAULT.value) R.drawable.rain_snow_day else R.drawable.rain_snow_day_2 + when (Preferences.weatherIconPack) { + Constants.WeatherIconPack.COOL.value -> R.drawable.rain_snow_day_3 + Constants.WeatherIconPack.MINIMAL.value -> R.drawable.rain_snow_day_2 + else -> R.drawable.rain_snow_day + } } "82d" -> { - return if (Preferences.weatherIconPack == Constants.WeatherIconPack.DEFAULT.value) R.drawable.haze_weather else R.drawable.haze_weather_2 + when (Preferences.weatherIconPack) { + Constants.WeatherIconPack.COOL.value -> R.drawable.haze_weather_3 + Constants.WeatherIconPack.MINIMAL.value -> R.drawable.haze_weather_2 + else -> R.drawable.haze_weather + } } "01n" -> { - return if (Preferences.weatherIconPack == Constants.WeatherIconPack.DEFAULT.value) R.drawable.clear_night else R.drawable.clear_night_2 + when (Preferences.weatherIconPack) { + Constants.WeatherIconPack.COOL.value -> R.drawable.clear_night_3 + Constants.WeatherIconPack.MINIMAL.value -> R.drawable.clear_night_2 + else -> R.drawable.clear_night + } } "02n" -> { - return if (Preferences.weatherIconPack == Constants.WeatherIconPack.DEFAULT.value) R.drawable.partly_cloudy_night else R.drawable.partly_cloudy_night_2 + when (Preferences.weatherIconPack) { + Constants.WeatherIconPack.COOL.value -> R.drawable.partly_cloudy_night_3 + Constants.WeatherIconPack.MINIMAL.value -> R.drawable.partly_cloudy_night_2 + else -> R.drawable.partly_cloudy_night + } } "03n" -> { - return if (Preferences.weatherIconPack == Constants.WeatherIconPack.DEFAULT.value) R.drawable.mostly_cloudy_night else R.drawable.mostly_cloudy_night_2 + when (Preferences.weatherIconPack) { + Constants.WeatherIconPack.COOL.value -> R.drawable.mostly_cloudy_night_3 + Constants.WeatherIconPack.MINIMAL.value -> R.drawable.mostly_cloudy_night_2 + else -> R.drawable.mostly_cloudy_night + } } "04n" -> { - return if (Preferences.weatherIconPack == Constants.WeatherIconPack.DEFAULT.value) R.drawable.cloudy_weather else R.drawable.cloudy_weather_2 + when (Preferences.weatherIconPack) { + Constants.WeatherIconPack.COOL.value -> R.drawable.cloudy_weather_3 + Constants.WeatherIconPack.MINIMAL.value -> R.drawable.cloudy_weather_2 + else -> R.drawable.cloudy_weather + } } "09n" -> { - return if (Preferences.weatherIconPack == Constants.WeatherIconPack.DEFAULT.value) R.drawable.storm_weather_night else R.drawable.storm_weather_night_2 + when (Preferences.weatherIconPack) { + Constants.WeatherIconPack.COOL.value -> R.drawable.storm_weather_night_3 + Constants.WeatherIconPack.MINIMAL.value -> R.drawable.storm_weather_night_2 + else -> R.drawable.storm_weather_night + } } "10n" -> { - return if (Preferences.weatherIconPack == Constants.WeatherIconPack.DEFAULT.value) R.drawable.rainy_night else R.drawable.rainy_night_2 + when (Preferences.weatherIconPack) { + Constants.WeatherIconPack.COOL.value -> R.drawable.rainy_night_3 + Constants.WeatherIconPack.MINIMAL.value -> R.drawable.rainy_night_2 + else -> R.drawable.rainy_night + } } "11n" -> { - return if (Preferences.weatherIconPack == Constants.WeatherIconPack.DEFAULT.value) R.drawable.thunder_night else R.drawable.thunder_night_2 + when (Preferences.weatherIconPack) { + Constants.WeatherIconPack.COOL.value -> R.drawable.thunder_night_3 + Constants.WeatherIconPack.MINIMAL.value -> R.drawable.thunder_night_2 + else -> R.drawable.thunder_night + } } "13n" -> { - return if (Preferences.weatherIconPack == Constants.WeatherIconPack.DEFAULT.value) R.drawable.snow_night else R.drawable.snow_night_2 + when (Preferences.weatherIconPack) { + Constants.WeatherIconPack.COOL.value -> R.drawable.snow_night_3 + Constants.WeatherIconPack.MINIMAL.value -> R.drawable.snow_night_2 + else -> R.drawable.snow_night + } } "50n" -> { - return if (Preferences.weatherIconPack == Constants.WeatherIconPack.DEFAULT.value) R.drawable.haze_night else R.drawable.haze_night_2 + when (Preferences.weatherIconPack) { + Constants.WeatherIconPack.COOL.value -> R.drawable.haze_night_3 + Constants.WeatherIconPack.MINIMAL.value -> R.drawable.haze_night_2 + else -> R.drawable.haze_night + } } "80n" -> { - return if (Preferences.weatherIconPack == Constants.WeatherIconPack.DEFAULT.value) R.drawable.windy_night else R.drawable.windy_night_2 + when (Preferences.weatherIconPack) { + Constants.WeatherIconPack.COOL.value -> R.drawable.windy_night_3 + Constants.WeatherIconPack.MINIMAL.value -> R.drawable.windy_night_2 + else -> R.drawable.windy_night + } } "81n" -> { - return if (Preferences.weatherIconPack == Constants.WeatherIconPack.DEFAULT.value) R.drawable.rain_snow_night else R.drawable.rain_snow_night_2 + when (Preferences.weatherIconPack) { + Constants.WeatherIconPack.COOL.value -> R.drawable.rain_snow_night_3 + Constants.WeatherIconPack.MINIMAL.value -> R.drawable.rain_snow_night_2 + else -> R.drawable.rain_snow_night + } } "82n" -> { - return if (Preferences.weatherIconPack == Constants.WeatherIconPack.DEFAULT.value) R.drawable.haze_weather else R.drawable.haze_weather_2 + when (Preferences.weatherIconPack) { + Constants.WeatherIconPack.COOL.value -> R.drawable.haze_weather_3 + Constants.WeatherIconPack.MINIMAL.value -> R.drawable.haze_weather_2 + else -> R.drawable.haze_weather + } } else -> { return R.drawable.unknown diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/WeatherTabFragment.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/WeatherTabFragment.kt index 8e10b01..bb5961e 100644 --- a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/WeatherTabFragment.kt +++ b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/WeatherTabFragment.kt @@ -10,6 +10,7 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import androidx.core.content.ContextCompat +import androidx.core.os.BuildCompat import androidx.core.view.isVisible import androidx.databinding.DataBindingUtil import androidx.fragment.app.Fragment @@ -28,7 +29,9 @@ import com.tommasoberlose.anotherwidget.databinding.FragmentWeatherSettingsBindi import com.tommasoberlose.anotherwidget.global.Constants import com.tommasoberlose.anotherwidget.global.Preferences import com.tommasoberlose.anotherwidget.global.RequestCode +import com.tommasoberlose.anotherwidget.helpers.ColorHelper import com.tommasoberlose.anotherwidget.helpers.SettingsStringHelper +import com.tommasoberlose.anotherwidget.helpers.WeatherHelper import com.tommasoberlose.anotherwidget.receivers.WeatherReceiver import com.tommasoberlose.anotherwidget.ui.activities.ChooseApplicationActivity import com.tommasoberlose.anotherwidget.ui.activities.CustomLocationActivity @@ -129,9 +132,12 @@ class WeatherTabFragment : Fragment() { viewModel.weatherIconPack.observe(viewLifecycleOwner, Observer { maintainScrollPosition { - label_weather_icon_pack?.text = when (it) { - Constants.WeatherIconPack.MINIMAL.value -> getString(R.string.settings_weather_icon_pack_minimal) - else -> getString(R.string.settings_weather_icon_pack_default) + label_weather_icon_pack?.text = getString(R.string.settings_weather_icon_pack_default).format((it + 1)) + weather_icon_pack.setImageDrawable(ContextCompat.getDrawable(requireContext(), WeatherHelper.getWeatherIconResource("01d"))) + if (it == Constants.WeatherIconPack.MINIMAL.value) { + weather_icon_pack.setColorFilter(ContextCompat.getColor(requireContext(), R.color.colorPrimaryText)) + } else { + weather_icon_pack.setColorFilter(ContextCompat.getColor(requireContext(), android.R.color.transparent)) } } checkLocationPermission() @@ -230,10 +236,11 @@ class WeatherTabFragment : Fragment() { action_weather_icon_pack.setOnClickListener { if (Preferences.showWeather) { - BottomSheetMenu(requireContext(), header = getString(R.string.settings_weather_icon_pack_title)).setSelectedValue(Preferences.weatherIconPack) - .addItem(getString(R.string.settings_weather_icon_pack_default), Constants.WeatherIconPack.DEFAULT.value) - .addItem(getString(R.string.settings_weather_icon_pack_minimal), Constants.WeatherIconPack.MINIMAL.value) - .addOnSelectItemListener { value -> + val dialog = BottomSheetMenu(requireContext(), header = getString(R.string.settings_weather_icon_pack_title)).setSelectedValue(Preferences.weatherIconPack) + Constants.WeatherIconPack.values().forEach { + dialog.addItem(getString(R.string.settings_weather_icon_pack_default).format(it.value + 1), it.value) + } + dialog.addOnSelectItemListener { value -> Preferences.weatherIconPack = value }.show() } diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/widgets/MainWidget.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/widgets/MainWidget.kt index b4296a6..fdbcb14 100644 --- a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/widgets/MainWidget.kt +++ b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/widgets/MainWidget.kt @@ -625,7 +625,7 @@ class MainWidget : AppWidgetProvider() { it.setTextColor(ColorHelper.getFontColor()) } - if (Preferences.weatherIconPack == Constants.WeatherIconPack.DEFAULT.value) { + if (Preferences.weatherIconPack == Constants.WeatherIconPack.DEFAULT.value || Preferences.weatherIconPack == Constants.WeatherIconPack.COOL.value) { listOf(v.action_next, v.action_previous) } else { listOf(v.action_next, v.action_previous, v.empty_weather_icon, v.special_weather_icon) @@ -637,7 +637,7 @@ class MainWidget : AppWidgetProvider() { it.setTextColor(ColorHelper.getSecondaryFontColor()) } - if (Preferences.weatherIconPack == Constants.WeatherIconPack.DEFAULT.value) { + if (Preferences.weatherIconPack == Constants.WeatherIconPack.DEFAULT.value || Preferences.weatherIconPack == Constants.WeatherIconPack.COOL.value) { listOf(v.second_row_icon) } else { listOf(v.second_row_icon, v.weather_icon) diff --git a/app/src/main/res/drawable/clear_day_3.png b/app/src/main/res/drawable/clear_day_3.png new file mode 100644 index 0000000..78c0b47 Binary files /dev/null and b/app/src/main/res/drawable/clear_day_3.png differ diff --git a/app/src/main/res/drawable/clear_night_3.png b/app/src/main/res/drawable/clear_night_3.png new file mode 100644 index 0000000..635f52d Binary files /dev/null and b/app/src/main/res/drawable/clear_night_3.png differ diff --git a/app/src/main/res/drawable/cloudy_weather_3.png b/app/src/main/res/drawable/cloudy_weather_3.png new file mode 100644 index 0000000..65f7c2d Binary files /dev/null and b/app/src/main/res/drawable/cloudy_weather_3.png differ diff --git a/app/src/main/res/drawable/haze_day_3.png b/app/src/main/res/drawable/haze_day_3.png new file mode 100644 index 0000000..c86b2da Binary files /dev/null and b/app/src/main/res/drawable/haze_day_3.png differ diff --git a/app/src/main/res/drawable/haze_night_3.png b/app/src/main/res/drawable/haze_night_3.png new file mode 100644 index 0000000..dc8815d Binary files /dev/null and b/app/src/main/res/drawable/haze_night_3.png differ diff --git a/app/src/main/res/drawable/haze_weather_3.png b/app/src/main/res/drawable/haze_weather_3.png new file mode 100644 index 0000000..ea3c55b Binary files /dev/null and b/app/src/main/res/drawable/haze_weather_3.png differ diff --git a/app/src/main/res/drawable/mostly_cloudy_3.png b/app/src/main/res/drawable/mostly_cloudy_3.png new file mode 100644 index 0000000..640e742 Binary files /dev/null and b/app/src/main/res/drawable/mostly_cloudy_3.png differ diff --git a/app/src/main/res/drawable/mostly_cloudy_night_3.png b/app/src/main/res/drawable/mostly_cloudy_night_3.png new file mode 100644 index 0000000..faf4d72 Binary files /dev/null and b/app/src/main/res/drawable/mostly_cloudy_night_3.png differ diff --git a/app/src/main/res/drawable/partly_cloudy_3.png b/app/src/main/res/drawable/partly_cloudy_3.png new file mode 100644 index 0000000..f4c96d0 Binary files /dev/null and b/app/src/main/res/drawable/partly_cloudy_3.png differ diff --git a/app/src/main/res/drawable/partly_cloudy_night_3.png b/app/src/main/res/drawable/partly_cloudy_night_3.png new file mode 100644 index 0000000..e684b7e Binary files /dev/null and b/app/src/main/res/drawable/partly_cloudy_night_3.png differ diff --git a/app/src/main/res/drawable/rain_snow_3.png b/app/src/main/res/drawable/rain_snow_3.png new file mode 100644 index 0000000..26ce378 Binary files /dev/null and b/app/src/main/res/drawable/rain_snow_3.png differ diff --git a/app/src/main/res/drawable/rain_snow_day_3.png b/app/src/main/res/drawable/rain_snow_day_3.png new file mode 100644 index 0000000..76c4b41 Binary files /dev/null and b/app/src/main/res/drawable/rain_snow_day_3.png differ diff --git a/app/src/main/res/drawable/rain_snow_night_3.png b/app/src/main/res/drawable/rain_snow_night_3.png new file mode 100644 index 0000000..fb0daaa Binary files /dev/null and b/app/src/main/res/drawable/rain_snow_night_3.png differ diff --git a/app/src/main/res/drawable/rainy_day_3.png b/app/src/main/res/drawable/rainy_day_3.png new file mode 100644 index 0000000..570167a Binary files /dev/null and b/app/src/main/res/drawable/rainy_day_3.png differ diff --git a/app/src/main/res/drawable/rainy_night_3.png b/app/src/main/res/drawable/rainy_night_3.png new file mode 100644 index 0000000..2cb23ad Binary files /dev/null and b/app/src/main/res/drawable/rainy_night_3.png differ diff --git a/app/src/main/res/drawable/rainy_weather_2.png b/app/src/main/res/drawable/rainy_weather_2.png index 173bc9a..233b5f7 100644 Binary files a/app/src/main/res/drawable/rainy_weather_2.png and b/app/src/main/res/drawable/rainy_weather_2.png differ diff --git a/app/src/main/res/drawable/rainy_weather_3.png b/app/src/main/res/drawable/rainy_weather_3.png new file mode 100644 index 0000000..bcb9364 Binary files /dev/null and b/app/src/main/res/drawable/rainy_weather_3.png differ diff --git a/app/src/main/res/drawable/showcase_3.png b/app/src/main/res/drawable/showcase_3.png new file mode 100644 index 0000000..3f20fe9 Binary files /dev/null and b/app/src/main/res/drawable/showcase_3.png differ diff --git a/app/src/main/res/drawable/snow_day_3.png b/app/src/main/res/drawable/snow_day_3.png new file mode 100644 index 0000000..b4fd9b4 Binary files /dev/null and b/app/src/main/res/drawable/snow_day_3.png differ diff --git a/app/src/main/res/drawable/snow_night_3.png b/app/src/main/res/drawable/snow_night_3.png new file mode 100644 index 0000000..0a17fb8 Binary files /dev/null and b/app/src/main/res/drawable/snow_night_3.png differ diff --git a/app/src/main/res/drawable/snow_weather_3.png b/app/src/main/res/drawable/snow_weather_3.png new file mode 100644 index 0000000..40db12e Binary files /dev/null and b/app/src/main/res/drawable/snow_weather_3.png differ diff --git a/app/src/main/res/drawable/storm_weather_3.png b/app/src/main/res/drawable/storm_weather_3.png new file mode 100644 index 0000000..35db862 Binary files /dev/null and b/app/src/main/res/drawable/storm_weather_3.png differ diff --git a/app/src/main/res/drawable/storm_weather_day_3.png b/app/src/main/res/drawable/storm_weather_day_3.png new file mode 100644 index 0000000..3f20fe9 Binary files /dev/null and b/app/src/main/res/drawable/storm_weather_day_3.png differ diff --git a/app/src/main/res/drawable/storm_weather_night_3.png b/app/src/main/res/drawable/storm_weather_night_3.png new file mode 100644 index 0000000..d4a7632 Binary files /dev/null and b/app/src/main/res/drawable/storm_weather_night_3.png differ diff --git a/app/src/main/res/drawable/thunder_day_3.png b/app/src/main/res/drawable/thunder_day_3.png new file mode 100644 index 0000000..b5d2cb3 Binary files /dev/null and b/app/src/main/res/drawable/thunder_day_3.png differ diff --git a/app/src/main/res/drawable/thunder_night_3.png b/app/src/main/res/drawable/thunder_night_3.png new file mode 100644 index 0000000..8a0a66a Binary files /dev/null and b/app/src/main/res/drawable/thunder_night_3.png differ diff --git a/app/src/main/res/drawable/thunder_weather_3.png b/app/src/main/res/drawable/thunder_weather_3.png new file mode 100644 index 0000000..50beefa Binary files /dev/null and b/app/src/main/res/drawable/thunder_weather_3.png differ diff --git a/app/src/main/res/drawable/unknown_3.png b/app/src/main/res/drawable/unknown_3.png new file mode 100644 index 0000000..5de0d4a Binary files /dev/null and b/app/src/main/res/drawable/unknown_3.png differ diff --git a/app/src/main/res/drawable/windy_day_3.png b/app/src/main/res/drawable/windy_day_3.png new file mode 100644 index 0000000..20c1e44 Binary files /dev/null and b/app/src/main/res/drawable/windy_day_3.png differ diff --git a/app/src/main/res/drawable/windy_night_3.png b/app/src/main/res/drawable/windy_night_3.png new file mode 100644 index 0000000..e6bb172 Binary files /dev/null and b/app/src/main/res/drawable/windy_night_3.png differ diff --git a/app/src/main/res/drawable/windy_weather_3.png b/app/src/main/res/drawable/windy_weather_3.png new file mode 100644 index 0000000..e740d67 Binary files /dev/null and b/app/src/main/res/drawable/windy_weather_3.png differ diff --git a/app/src/main/res/layout/fragment_weather_settings.xml b/app/src/main/res/layout/fragment_weather_settings.xml index 39e1571..4ba620f 100644 --- a/app/src/main/res/layout/fragment_weather_settings.xml +++ b/app/src/main/res/layout/fragment_weather_settings.xml @@ -327,6 +327,7 @@ android:layout_width="48dp" android:layout_height="48dp" android:padding="12dp" + android:id="@+id/weather_icon_pack" android:src="@drawable/round_cloud_queue" android:tint="@color/colorPrimaryText"/> Gå til OpenWeatherMap.com Der kan gå op til 10 minutter inden din API nøgle er aktiveret. Vejret vil blive opdateret så snart det er tilgængeligt. Ikonpakke - Standard - Minimal + Ikonpakke %d Ur diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index ea164b4..96720b6 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -104,8 +104,7 @@ Kunjungi OpenWeatherMap.com Mungkin membutuhkan lebih kurang 10 menit sebelum kunci API anda diaktifkan. Cuaca akan diperbarui segera setelah data tersedia. Paket ikon - Bawaan - Minimal + Paket ikon %d Jam diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index dcc520e..7b96f78 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -102,9 +102,8 @@ Copia qui la chiave API e salva la nuova configurazione. Apri OpenWeatherMap.com La chiave API potrebbe aver bisogno di più di 20 minuti per diventare attiva, aggiorneremo il meteo non appena sarà possibile. - Stile icone - Default - Minimal + Icon pack + Icon pack %d Orologio diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 3844912..064438d 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -103,8 +103,7 @@ Перейти на OpenWeatherMap.com Активация ключа может занять до десяти минут. Погода обновится как только появится возможность. Набор иконок - По умолчанию - Минималистичный + Набор иконок %d Часы diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 7b46a3a..90f7046 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -106,8 +106,7 @@ Go to OpenWeatherMap.com It may take up to ten minutes before your API key is activated. The weather will be updated as soon as it is available. Icon pack - Default - Minimal + Icon pack %d Clock