diff --git a/android/app/src/main/res/drawable-hdpi/ic_launcher_foreground.png b/android/app/src/main/res/drawable-hdpi/ic_launcher_foreground.png index d99f85c..8043cbf 100644 Binary files a/android/app/src/main/res/drawable-hdpi/ic_launcher_foreground.png and b/android/app/src/main/res/drawable-hdpi/ic_launcher_foreground.png differ diff --git a/android/app/src/main/res/drawable-mdpi/ic_launcher_foreground.png b/android/app/src/main/res/drawable-mdpi/ic_launcher_foreground.png index c01d960..0a24356 100644 Binary files a/android/app/src/main/res/drawable-mdpi/ic_launcher_foreground.png and b/android/app/src/main/res/drawable-mdpi/ic_launcher_foreground.png differ diff --git a/android/app/src/main/res/drawable-xhdpi/ic_launcher_foreground.png b/android/app/src/main/res/drawable-xhdpi/ic_launcher_foreground.png index 2be4858..0626131 100644 Binary files a/android/app/src/main/res/drawable-xhdpi/ic_launcher_foreground.png and b/android/app/src/main/res/drawable-xhdpi/ic_launcher_foreground.png differ diff --git a/android/app/src/main/res/drawable-xxhdpi/ic_launcher_foreground.png b/android/app/src/main/res/drawable-xxhdpi/ic_launcher_foreground.png index 7ff1640..cf74fd4 100644 Binary files a/android/app/src/main/res/drawable-xxhdpi/ic_launcher_foreground.png and b/android/app/src/main/res/drawable-xxhdpi/ic_launcher_foreground.png differ diff --git a/android/app/src/main/res/drawable-xxxhdpi/ic_launcher_foreground.png b/android/app/src/main/res/drawable-xxxhdpi/ic_launcher_foreground.png index a2e8805..986e96b 100644 Binary files a/android/app/src/main/res/drawable-xxxhdpi/ic_launcher_foreground.png and b/android/app/src/main/res/drawable-xxxhdpi/ic_launcher_foreground.png differ diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher.png index 24efe01..9ac1bf5 100644 Binary files a/android/app/src/main/res/mipmap-hdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher.png index 6a60140..fa9db57 100644 Binary files a/android/app/src/main/res/mipmap-mdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png index 21e5e27..a505d41 100644 Binary files a/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png index b0c0369..d8736db 100644 Binary files a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png index b29fc27..997e80f 100644 Binary files a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/assets/icons/icon.png b/assets/icons/icon.png index a85a4fc..fe0595b 100644 Binary files a/assets/icons/icon.png and b/assets/icons/icon.png differ diff --git a/lib/app/modules/weather.dart b/lib/app/modules/weather.dart index 1c64ac9..c1901de 100644 --- a/lib/app/modules/weather.dart +++ b/lib/app/modules/weather.dart @@ -255,7 +255,9 @@ class _WeatherPageState extends State { height: 130, margin: const EdgeInsets.symmetric(vertical: 15), padding: const EdgeInsets.symmetric( - horizontal: 15, vertical: 5), + horizontal: 15, + vertical: 5, + ), decoration: BoxDecoration( color: context.theme.colorScheme.primaryContainer, borderRadius: @@ -268,7 +270,9 @@ class _WeatherPageState extends State { height: 130, margin: const EdgeInsets.symmetric(vertical: 15), padding: const EdgeInsets.symmetric( - horizontal: 15, vertical: 5), + horizontal: 15, + vertical: 5, + ), decoration: BoxDecoration( color: context.theme.colorScheme.primaryContainer, borderRadius: @@ -294,7 +298,9 @@ class _WeatherPageState extends State { child: Container( margin: const EdgeInsets.symmetric(vertical: 5), padding: const EdgeInsets.symmetric( - horizontal: 20, vertical: 5), + horizontal: 20, + vertical: 5, + ), decoration: BoxDecoration( color: i == getTime ? Get.isDarkMode @@ -325,7 +331,9 @@ class _WeatherPageState extends State { height: 350, margin: const EdgeInsets.only(bottom: 15), padding: const EdgeInsets.symmetric( - horizontal: 15, vertical: 12), + horizontal: 15, + vertical: 12, + ), decoration: BoxDecoration( color: context.theme.colorScheme.primaryContainer, borderRadius: @@ -337,7 +345,9 @@ class _WeatherPageState extends State { return Container( margin: const EdgeInsets.only(bottom: 15), padding: const EdgeInsets.symmetric( - horizontal: 15, vertical: 12), + horizontal: 15, + vertical: 12, + ), decoration: BoxDecoration( color: context.theme.colorScheme.primaryContainer, borderRadius: @@ -355,19 +365,19 @@ class _WeatherPageState extends State { DescWeather( imageName: 'assets/images/wind.png', value: - '${weather.windspeed10M[getTime!]} ${'km'.tr}', + '${weather.windspeed10M[getTime!].round()} ${'km/h'.tr}', desc: 'wind'.tr, ), DescWeather( imageName: 'assets/images/foggy.png', value: - '${weather.visibility[getTime!].round().toInt()} ${'m'.tr}', + '${weather.visibility[getTime!] > 1000 ? (weather.visibility[getTime!] / 1000).round() : (weather.visibility[getTime!] / 1000)} ${'km'.tr}', desc: 'visibility'.tr, ), DescWeather( imageName: 'assets/images/temperature.png', value: - '${weather.apparentTemperature[getTime!].round().toInt()}°', + '${weather.apparentTemperature[getTime!].round()}°', desc: 'feels'.tr, ), DescWeather( @@ -390,7 +400,7 @@ class _WeatherPageState extends State { DescWeather( imageName: 'assets/images/atmospheric.png', value: - '${weather.surfacePressure[getTime!]} ${'hPa'.tr}', + '${weather.surfacePressure[getTime!].round()} ${'hPa'.tr}', desc: 'pressure'.tr, ), DescWeather( @@ -415,7 +425,9 @@ class _WeatherPageState extends State { height: 405, margin: const EdgeInsets.only(bottom: 15), padding: const EdgeInsets.symmetric( - horizontal: 15, vertical: 5), + horizontal: 15, + vertical: 5, + ), decoration: BoxDecoration( color: context.theme.colorScheme.primaryContainer, borderRadius: @@ -428,7 +440,9 @@ class _WeatherPageState extends State { height: 405, margin: const EdgeInsets.only(bottom: 15), padding: const EdgeInsets.symmetric( - horizontal: 15, vertical: 5), + horizontal: 15, + vertical: 5, + ), decoration: BoxDecoration( color: context.theme.colorScheme.primaryContainer, borderRadius: diff --git a/lib/app/widgets/desc.dart b/lib/app/widgets/desc.dart index 2734dea..c2ac8d7 100644 --- a/lib/app/widgets/desc.dart +++ b/lib/app/widgets/desc.dart @@ -33,7 +33,7 @@ class DescWeather extends StatelessWidget { child: Text( desc, style: context.theme.textTheme.bodySmall, - overflow: TextOverflow.visible, + overflow: TextOverflow.ellipsis, textAlign: TextAlign.center, ), ), diff --git a/lib/app/widgets/weather_now.dart b/lib/app/widgets/weather_now.dart index 14555e4..a9c3489 100644 --- a/lib/app/widgets/weather_now.dart +++ b/lib/app/widgets/weather_now.dart @@ -48,7 +48,7 @@ class _WeatherNowState extends State { const SizedBox(height: 5), Text( DateFormat.MMMMEEEEd('${locale?.languageCode}').format( - DateTime.now(), + DateTime.parse(widget.time), ), style: context.theme.textTheme.labelLarge?.copyWith( color: Colors.grey, diff --git a/lib/l10n/translation.dart b/lib/l10n/translation.dart index 63d429c..a149757 100644 --- a/lib/l10n/translation.dart +++ b/lib/l10n/translation.dart @@ -28,8 +28,8 @@ class Translation extends Translations { 'heavy_rains': 'Ливневые дожди', 'snow': 'Снег', 'thunderstorm': 'Гроза', - 'km': 'км/ч', - 'm': 'м', + 'km/h': 'км/ч', + 'km': 'км', 'mm': 'мм', 'hPa': 'ГПа', 'no_inter': 'Нет интернета', @@ -65,8 +65,8 @@ class Translation extends Translations { 'heavy_rains': 'Rain showers', 'snow': 'Snow', 'thunderstorm': 'Thunderstorm', - 'km': 'km/h', - 'm': 'm', + 'km/h': 'km/h', + 'km': 'km', 'mm': 'mm', 'hPa': 'hPa', 'no_inter': 'There is no Internet',