From a7ece19ea384c39337952c7ffed2b98c040efca1 Mon Sep 17 00:00:00 2001 From: Pranshul Date: Sat, 6 Sep 2025 19:54:52 +0530 Subject: [PATCH] fixed cloud animation, fixed #625 --- lib/screens/daily_forecast.dart | 11 +++++++---- lib/screens/settings_unit.dart | 8 ++++++-- lib/utils/animation_map.dart | 14 ++++++++++++-- lib/widgets/current_conditions_card.dart | 7 +++++-- .../.gradle/8.9/fileHashes/fileHashes.bin | Bin 28497 -> 28497 bytes .../.gradle/8.9/fileHashes/fileHashes.lock | Bin 17 -> 17 bytes .../8.9/fileHashes/resourceHashesCache.bin | Bin 23053 -> 23121 bytes .../cxx/create_cxx_tasks_38_timing.txt | 16 ++++++++++++++++ .../cxx/create_cxx_tasks_39_timing.txt | 11 +++++++++++ 9 files changed, 57 insertions(+), 10 deletions(-) diff --git a/lib/screens/daily_forecast.dart b/lib/screens/daily_forecast.dart index fca21fc5f..17b8c6cd6 100644 --- a/lib/screens/daily_forecast.dart +++ b/lib/screens/daily_forecast.dart @@ -1295,10 +1295,13 @@ class ConditionsWidgetsForecast extends StatelessWidget { .onSurface, fontSize: isFoldableLayout(context) ? 60 - : MediaQuery.of(context) - .size - .width * - 0.1, + : context.locale.languageCode == + 'bg' + ? 24 + : MediaQuery.of(context) + .size + .width * + 0.1, ), ), ), diff --git a/lib/screens/settings_unit.dart b/lib/screens/settings_unit.dart index 42213a5c9..9da8aebec 100644 --- a/lib/screens/settings_unit.dart +++ b/lib/screens/settings_unit.dart @@ -118,7 +118,9 @@ class _AppUnitsPageState extends State { ? "M/s" : currentWindMode == "Bft" ? "Bft" - : "Km/h"]!), + : currentWindMode == "Kt" + ? "Kt" + : "Km/h"]!), dialogTitle: 'wind_unit'.tr(), options: optionsWind.values.toList(), initialOption: optionsWind[currentWindMode == "Mph" @@ -127,7 +129,9 @@ class _AppUnitsPageState extends State { ? "M/s" : currentWindMode == "Bft" ? "Bft" - : "Km/h"], + : currentWindMode == "Kt" + ? "Kt" + : "Km/h"], onSubmitted: (value) { final selectedKey = optionsWind.entries .firstWhere((e) => e.value == value) diff --git a/lib/utils/animation_map.dart b/lib/utils/animation_map.dart index 70da0a1d7..872c68024 100644 --- a/lib/utils/animation_map.dart +++ b/lib/utils/animation_map.dart @@ -146,10 +146,20 @@ class WeatherConditionAnimationMapper { ), ), Positioned( - top: -MediaQuery.of(context).padding.top, + top: (setFullDisplay && + secondaryAnimationUrl + .contains('cloudy_background.json') && + animationUrl.contains('cloudy_background.json')) + ? -MediaQuery.of(context).padding.top - (topMain ?? 0) + : -MediaQuery.of(context).padding.top, left: 0, right: 0, - height: diffHeight ?? 500, + // height: diffHeight ?? 500, + height: (isSunAnim == true && !isNightBool) + ? diffHeight ?? 500 + : setFullDisplay + ? MediaQuery.of(context).size.height + : diffHeight ?? 500, child: RepaintBoundary( child: Lottie.asset( secondaryAnimationUrl, diff --git a/lib/widgets/current_conditions_card.dart b/lib/widgets/current_conditions_card.dart index 65b9fda93..b6fcdfac2 100644 --- a/lib/widgets/current_conditions_card.dart +++ b/lib/widgets/current_conditions_card.dart @@ -763,7 +763,10 @@ class _ConditionsWidgetsState extends State { color: Theme.of(context).colorScheme.onSurface, fontSize: isFoldableLayout(context) ? 60 - : MediaQuery.of(context).size.width * 0.1, + : context.locale.languageCode == 'bg' + ? 24 + : MediaQuery.of(context).size.width * + 0.1, ), ), ), @@ -780,7 +783,7 @@ class _ConditionsWidgetsState extends State { color: Theme.of(context) .colorScheme .onSurfaceVariant, - fontSize: 16, + fontSize: 18, ), maxLines: 1, overflow: TextOverflow.ellipsis, diff --git a/settings_tiles_custom/example/android/.gradle/8.9/fileHashes/fileHashes.bin b/settings_tiles_custom/example/android/.gradle/8.9/fileHashes/fileHashes.bin index bc16c426473c261ae17ef0ce931df73f98fbc446..5d72c38e95773c7eba7630f106b2fd753e2992f5 100644 GIT binary patch delta 1928 zcmYk5e@xVM9LBi`v1PQ_mrcD!Crh)OZ9qH4F}sR$8b4VV$s0C;KS3Kd6mzN# z)q<0V2;RjFQ+X(8#rmBzpMp;iMA%g3c5=@_?dY)?%Ob3nzEHY`?Hc)f%N zaTcBuruCpta2D4DXAl$g!c|I7KZ*r?iHZ}WrS=`hdN8YMH~tW`VAU=ToP%31h@gQh zf(!V~fVG?E2=W9UpvAzn;C=ie0Ma}(pT}#0Fpe0Q6ugI@1s@`{jOJ!+7DQ1m7{jPw z1h)jEaCm7R!ApW+)OdNCLpr$S9oSlC;Y%+MZX7?#_7VOSj3c|82@|LiT*9DW5xoLH!^Zz4X9KjoXm zV)c@Ct&eRh5#vNu;wgOLqvd2GfpCgZxs~*$VS6R3=_X3;>uPUY8uhY?I&Gptj5=3k z|GnZb>iCk^qp0#Z`!ioLk+MCzmn-gO4^F!Z|(4xmBdO34h!h`R0A>}4g%Wv7wlpRcIl5kT@NOUsgwnP_2N)2b;LS_xW z(rqHU5K?736Xxa1GjFEDyqUy1PQ01w1B}^*)&q=r)5K`Whib1wdM(>)nCYwKP>>1X zrD9GZ3wPvSYvS7I_2~9;nbIfm0wxYJTb4%`+)lr%jtf1HO?9+nn>hQ8IWentKjzgQ zTDs$i+3`iQB$#AJ@LombEHc}BHJgej&ahE3cs{b>#K4`6KrKQV0L zM%bQIJBn*+M-dZ@vAwyG(_<)Zt83|U!&$fB?tz7`X5mT#Pa|E delta 1929 zcmYk5Z%ox?9L1poT}T_dG`*K0GL&WpYPB(6xOB}aN%!&}u5d42ul&9Ii7ms;S)*Pw z)*7=jOX81ReyLFwBBNTQb|Gb^L|5#EYr$G$E;k}ywB>3me&^h02XQ#htr$Iea>fztykfWU~W)x5I8YjcxfZbh}gS#QREk z(-Ek0U_yyAxa;P_29V?-oWU-^hiDUgim>1l%o<22WOxX9f?+fYK1Z+M0;UBY<39sC zia2#1LBSwS3Bs5XSa@h)Yca!T;S-!gx8Ng0in-@=+EL;tB1ar}yu@K|^9wB|yoLwW z4(u-BL41XZ61H7Lm*7i`3oc<%FoKLyX2wutAfwcU{!;r6`$jOP)nVKdgyAgXz}Gk+ zxPlV~h6Pvgs{uzj!xPvmm_&zJ84^VBv*24KS1^1T&kMdmyI>rafu985VRa?L{n#nE zhLGSU`UN*IBlsTiUWTXetbtlDPjgZSm-GhqR620U%Y(ax8;VWiAHgl;9Av`}s1f{# zlY%HF1-J2+U1De2lo4BZNX`xA~d9k9~f7b#Td4$-YM0N?uWA zC7G&HQ)Pn-@6_0TFKdmCZ`D?K{Mq(vt~HfqjAb3-%RkM^GKnn|Z%I@#w%EX!7turZ ztytNy&p8L-fCC!>_N`b?nQAX*Is=?}k!_)<P}IWdCcN2_`pF diff --git a/settings_tiles_custom/example/android/.gradle/8.9/fileHashes/fileHashes.lock b/settings_tiles_custom/example/android/.gradle/8.9/fileHashes/fileHashes.lock index 284555406b83fbc55299db8e0b05173a3e1fa337..19a0859d03c1d55809e12976ede4bb7e964e40d8 100644 GIT binary patch literal 17 VcmZRMz56`-dT#I<1~3Q-0RTQB1$zJh literal 17 VcmZRMz56`-dT#I<1~3SE1^_;<1`7ZH diff --git a/settings_tiles_custom/example/android/.gradle/8.9/fileHashes/resourceHashesCache.bin b/settings_tiles_custom/example/android/.gradle/8.9/fileHashes/resourceHashesCache.bin index ac0bbc7a7c0ee661e0a42aac59c8d841899513e2..ebada849f321d64598354dc148b017258de129c7 100644 GIT binary patch delta 79 zcmeC(!gz5D;|3E6#*WRV5;vFyb}s%u;p8?he+Dp!;@!+D)4(k7|J%z@mCI)rLPhmA c*UAU8GG5%M_(Oc7fd}_yM~^dtljD6{0Da6H6aWAK delta 41 zcmV+^0M`G}v;mE@0kAX}0fw_R7}x`|B^-DIv$Y>f1p%S4A@~=uFn9~IK}gIIN=^@L diff --git a/settings_tiles_custom/example/build/app/intermediates/cxx/create_cxx_tasks_38_timing.txt b/settings_tiles_custom/example/build/app/intermediates/cxx/create_cxx_tasks_38_timing.txt index aaa7792df..241ef6923 100644 --- a/settings_tiles_custom/example/build/app/intermediates/cxx/create_cxx_tasks_38_timing.txt +++ b/settings_tiles_custom/example/build/app/intermediates/cxx/create_cxx_tasks_38_timing.txt @@ -777,3 +777,19 @@ create_cxx_tasks [gap of 34ms] create_cxx_tasks completed in 314ms +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model + create-module-model 54ms + create-variant-model 17ms + create-ARMEABI_V7A-model 57ms + create-ARM64_V8A-model 10ms + [gap of 37ms] + create-ARM64_V8A-model 10ms + create-X86-model 12ms + create-module-model 10ms + [gap of 33ms] + create-initial-cxx-model completed in 257ms + [gap of 29ms] +create_cxx_tasks completed in 298ms + diff --git a/settings_tiles_custom/example/build/app/intermediates/cxx/create_cxx_tasks_39_timing.txt b/settings_tiles_custom/example/build/app/intermediates/cxx/create_cxx_tasks_39_timing.txt index 164eb7f64..aa02bf7db 100644 --- a/settings_tiles_custom/example/build/app/intermediates/cxx/create_cxx_tasks_39_timing.txt +++ b/settings_tiles_custom/example/build/app/intermediates/cxx/create_cxx_tasks_39_timing.txt @@ -212,3 +212,14 @@ create_cxx_tasks [gap of 32ms] create_cxx_tasks completed in 439ms +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model + create-module-model 34ms + create-variant-model 14ms + create-ARMEABI_V7A-model 33ms + [gap of 84ms] + create-initial-cxx-model completed in 169ms + [gap of 32ms] +create_cxx_tasks completed in 207ms +