This commit is contained in:
Yoshi 2023-02-16 09:37:08 +03:00
parent 4bde800f3e
commit 0424d03a25
15 changed files with 31 additions and 17 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.5 KiB

After

Width:  |  Height:  |  Size: 7.5 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.4 KiB

After

Width:  |  Height:  |  Size: 4.4 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 11 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 20 KiB

After

Width:  |  Height:  |  Size: 21 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 32 KiB

After

Width:  |  Height:  |  Size: 32 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.6 KiB

After

Width:  |  Height:  |  Size: 2.6 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.7 KiB

After

Width:  |  Height:  |  Size: 3.8 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.4 KiB

After

Width:  |  Height:  |  Size: 6.4 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.4 KiB

After

Width:  |  Height:  |  Size: 9.4 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 49 KiB

After

Width:  |  Height:  |  Size: 49 KiB

Before After
Before After

View file

@ -255,7 +255,9 @@ class _WeatherPageState extends State<WeatherPage> {
height: 130, height: 130,
margin: const EdgeInsets.symmetric(vertical: 15), margin: const EdgeInsets.symmetric(vertical: 15),
padding: const EdgeInsets.symmetric( padding: const EdgeInsets.symmetric(
horizontal: 15, vertical: 5), horizontal: 15,
vertical: 5,
),
decoration: BoxDecoration( decoration: BoxDecoration(
color: context.theme.colorScheme.primaryContainer, color: context.theme.colorScheme.primaryContainer,
borderRadius: borderRadius:
@ -268,7 +270,9 @@ class _WeatherPageState extends State<WeatherPage> {
height: 130, height: 130,
margin: const EdgeInsets.symmetric(vertical: 15), margin: const EdgeInsets.symmetric(vertical: 15),
padding: const EdgeInsets.symmetric( padding: const EdgeInsets.symmetric(
horizontal: 15, vertical: 5), horizontal: 15,
vertical: 5,
),
decoration: BoxDecoration( decoration: BoxDecoration(
color: context.theme.colorScheme.primaryContainer, color: context.theme.colorScheme.primaryContainer,
borderRadius: borderRadius:
@ -294,7 +298,9 @@ class _WeatherPageState extends State<WeatherPage> {
child: Container( child: Container(
margin: const EdgeInsets.symmetric(vertical: 5), margin: const EdgeInsets.symmetric(vertical: 5),
padding: const EdgeInsets.symmetric( padding: const EdgeInsets.symmetric(
horizontal: 20, vertical: 5), horizontal: 20,
vertical: 5,
),
decoration: BoxDecoration( decoration: BoxDecoration(
color: i == getTime color: i == getTime
? Get.isDarkMode ? Get.isDarkMode
@ -325,7 +331,9 @@ class _WeatherPageState extends State<WeatherPage> {
height: 350, height: 350,
margin: const EdgeInsets.only(bottom: 15), margin: const EdgeInsets.only(bottom: 15),
padding: const EdgeInsets.symmetric( padding: const EdgeInsets.symmetric(
horizontal: 15, vertical: 12), horizontal: 15,
vertical: 12,
),
decoration: BoxDecoration( decoration: BoxDecoration(
color: context.theme.colorScheme.primaryContainer, color: context.theme.colorScheme.primaryContainer,
borderRadius: borderRadius:
@ -337,7 +345,9 @@ class _WeatherPageState extends State<WeatherPage> {
return Container( return Container(
margin: const EdgeInsets.only(bottom: 15), margin: const EdgeInsets.only(bottom: 15),
padding: const EdgeInsets.symmetric( padding: const EdgeInsets.symmetric(
horizontal: 15, vertical: 12), horizontal: 15,
vertical: 12,
),
decoration: BoxDecoration( decoration: BoxDecoration(
color: context.theme.colorScheme.primaryContainer, color: context.theme.colorScheme.primaryContainer,
borderRadius: borderRadius:
@ -355,19 +365,19 @@ class _WeatherPageState extends State<WeatherPage> {
DescWeather( DescWeather(
imageName: 'assets/images/wind.png', imageName: 'assets/images/wind.png',
value: value:
'${weather.windspeed10M[getTime!]} ${'km'.tr}', '${weather.windspeed10M[getTime!].round()} ${'km/h'.tr}',
desc: 'wind'.tr, desc: 'wind'.tr,
), ),
DescWeather( DescWeather(
imageName: 'assets/images/foggy.png', imageName: 'assets/images/foggy.png',
value: 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, desc: 'visibility'.tr,
), ),
DescWeather( DescWeather(
imageName: 'assets/images/temperature.png', imageName: 'assets/images/temperature.png',
value: value:
'${weather.apparentTemperature[getTime!].round().toInt()}°', '${weather.apparentTemperature[getTime!].round()}°',
desc: 'feels'.tr, desc: 'feels'.tr,
), ),
DescWeather( DescWeather(
@ -390,7 +400,7 @@ class _WeatherPageState extends State<WeatherPage> {
DescWeather( DescWeather(
imageName: 'assets/images/atmospheric.png', imageName: 'assets/images/atmospheric.png',
value: value:
'${weather.surfacePressure[getTime!]} ${'hPa'.tr}', '${weather.surfacePressure[getTime!].round()} ${'hPa'.tr}',
desc: 'pressure'.tr, desc: 'pressure'.tr,
), ),
DescWeather( DescWeather(
@ -415,7 +425,9 @@ class _WeatherPageState extends State<WeatherPage> {
height: 405, height: 405,
margin: const EdgeInsets.only(bottom: 15), margin: const EdgeInsets.only(bottom: 15),
padding: const EdgeInsets.symmetric( padding: const EdgeInsets.symmetric(
horizontal: 15, vertical: 5), horizontal: 15,
vertical: 5,
),
decoration: BoxDecoration( decoration: BoxDecoration(
color: context.theme.colorScheme.primaryContainer, color: context.theme.colorScheme.primaryContainer,
borderRadius: borderRadius:
@ -428,7 +440,9 @@ class _WeatherPageState extends State<WeatherPage> {
height: 405, height: 405,
margin: const EdgeInsets.only(bottom: 15), margin: const EdgeInsets.only(bottom: 15),
padding: const EdgeInsets.symmetric( padding: const EdgeInsets.symmetric(
horizontal: 15, vertical: 5), horizontal: 15,
vertical: 5,
),
decoration: BoxDecoration( decoration: BoxDecoration(
color: context.theme.colorScheme.primaryContainer, color: context.theme.colorScheme.primaryContainer,
borderRadius: borderRadius:

View file

@ -33,7 +33,7 @@ class DescWeather extends StatelessWidget {
child: Text( child: Text(
desc, desc,
style: context.theme.textTheme.bodySmall, style: context.theme.textTheme.bodySmall,
overflow: TextOverflow.visible, overflow: TextOverflow.ellipsis,
textAlign: TextAlign.center, textAlign: TextAlign.center,
), ),
), ),

View file

@ -48,7 +48,7 @@ class _WeatherNowState extends State<WeatherNow> {
const SizedBox(height: 5), const SizedBox(height: 5),
Text( Text(
DateFormat.MMMMEEEEd('${locale?.languageCode}').format( DateFormat.MMMMEEEEd('${locale?.languageCode}').format(
DateTime.now(), DateTime.parse(widget.time),
), ),
style: context.theme.textTheme.labelLarge?.copyWith( style: context.theme.textTheme.labelLarge?.copyWith(
color: Colors.grey, color: Colors.grey,

View file

@ -28,8 +28,8 @@ class Translation extends Translations {
'heavy_rains': 'Ливневые дожди', 'heavy_rains': 'Ливневые дожди',
'snow': 'Снег', 'snow': 'Снег',
'thunderstorm': 'Гроза', 'thunderstorm': 'Гроза',
'km': 'км/ч', 'km/h': 'км/ч',
'm': 'м', 'km': 'км',
'mm': 'мм', 'mm': 'мм',
'hPa': 'ГПа', 'hPa': 'ГПа',
'no_inter': 'Нет интернета', 'no_inter': 'Нет интернета',
@ -65,8 +65,8 @@ class Translation extends Translations {
'heavy_rains': 'Rain showers', 'heavy_rains': 'Rain showers',
'snow': 'Snow', 'snow': 'Snow',
'thunderstorm': 'Thunderstorm', 'thunderstorm': 'Thunderstorm',
'km': 'km/h', 'km/h': 'km/h',
'm': 'm', 'km': 'km',
'mm': 'mm', 'mm': 'mm',
'hPa': 'hPa', 'hPa': 'hPa',
'no_inter': 'There is no Internet', 'no_inter': 'There is no Internet',