From 941b59ba8ed3ccff99c1e6bedd369508b315cd57 Mon Sep 17 00:00:00 2001 From: Dmitry Date: Thu, 27 Nov 2025 20:30:52 +0300 Subject: [PATCH] deploy --- .forgejo/workflows/deploy.yaml | 137 ++++- .../NativeAssetsManifest.json | 1 - .../unit_test_assets/shaders/ink_sparkle.frag | Bin 12936 -> 0 bytes .../build/web/flutter_bootstrap.js | 2 +- .../build/web/flutter_service_worker.js | 4 +- mnemo_cards_web_v2/build/web/main.dart.js | 567 +++++++++--------- .../lib/domain/config/api_config_v2.dart | 2 + .../presentation/pages/auth/auth_page.dart | 9 + .../pages/auth/auth_page_test.dart | 14 + 9 files changed, 424 insertions(+), 312 deletions(-) delete mode 100644 mnemo_cards_web_v2/build/unit_test_assets/NativeAssetsManifest.json delete mode 100644 mnemo_cards_web_v2/build/unit_test_assets/shaders/ink_sparkle.frag diff --git a/.forgejo/workflows/deploy.yaml b/.forgejo/workflows/deploy.yaml index 91601e8..2c03b8b 100644 --- a/.forgejo/workflows/deploy.yaml +++ b/.forgejo/workflows/deploy.yaml @@ -426,6 +426,8 @@ jobs: - name: Fix Permissions and Reload Nginx run: | ssh -o ServerAliveInterval=60 -o ServerAliveCountMax=3 -o ConnectTimeout=30 -o StrictHostKeyChecking=no ${{ secrets.SSH_USER }}@${{ secrets.SSH_HOST }} << 'ENDSSH' + # Set a global timeout for the entire step (20 minutes max) + timeout 1200 bash -c ' set -e echo "🔧 Setting correct permissions for web files..." chown -R www-data:www-data /var/www/mnemo_cards @@ -434,17 +436,32 @@ jobs: # Pre-reload diagnostics echo "🔍 Pre-reload diagnostics..." + + # Check running processes BEFORE reload + echo "📊 Processes BEFORE reload:" + echo "Forgejo processes:" + pgrep -f forgejo || echo "No forgejo processes" + echo "Backend processes:" + pgrep -f mnemo_cards_server || echo "No backend processes" + echo "Nginx processes:" + pgrep -f nginx || echo "No nginx processes" + echo "📊 Current nginx status:" sudo systemctl status nginx --no-pager || true + # Check system load and memory + echo "📊 System BEFORE reload:" + uptime || true + free -h || true + echo "🌐 Testing upstream connectivity before reload:" - if nc -z 127.0.0.1 3000 2>/dev/null; then + if timeout 10 nc -z 127.0.0.1 3000 2>/dev/null; then echo "✅ Forgejo (port 3000): reachable" else echo "❌ Forgejo (port 3000): NOT reachable before reload!" fi - if nc -z 127.0.0.1 8081 2>/dev/null; then + if timeout 10 nc -z 127.0.0.1 8081 2>/dev/null; then echo "✅ Backend (port 8081): reachable" else echo "❌ Backend (port 8081): NOT reachable before reload!" @@ -452,17 +469,17 @@ jobs: echo "🌐 Testing site accessibility before reload:" for site in "https://mnemo-cards.online/" "https://code.mnemo-cards.online/" "https://vscode.mnemo-cards.online/"; do - if curl -I --max-time 5 "$site" 2>/dev/null | grep -q "200\|301\|302"; then + if timeout 15 curl -I --max-time 10 "$site" 2>/dev/null | grep -q "200\|301\|302"; then echo "✅ $site accessible before reload" else echo "⚠️ $site not accessible before reload" - curl -I --max-time 5 "$site" || true + timeout 10 curl -I --max-time 5 "$site" || echo "Pre-reload check failed" fi done echo "🔄 Reloading nginx to serve new web app..." echo "📋 Current nginx configuration test:" - if sudo nginx -t 2>&1; then + if timeout 30 sudo nginx -t 2>&1; then echo "✅ nginx configuration is valid" echo "🚀 Executing nginx reload..." sudo systemctl reload nginx @@ -483,40 +500,97 @@ jobs: echo "⏳ Waiting for services to stabilize after reload..." sleep 5 + # IMMEDIATE upstream check after reload + echo "🔍 IMMEDIATE upstream check after reload (0 seconds wait):" + if timeout 5 nc -z 127.0.0.1 3000 2>/dev/null; then + echo "✅ Forgejo (port 3000): reachable immediately after reload" + else + echo "❌ CRITICAL: Forgejo (port 3000): NOT reachable immediately after reload!" + echo "🔍 Checking forgejo process:" + pgrep -f forgejo || echo "No forgejo process found" + ps aux | grep forgejo | grep -v grep || echo "No forgejo in ps" + echo "🔍 Checking forgejo service status:" + timeout 10 sudo systemctl status forgejo --no-pager || echo "Could not get forgejo status" + echo "🔍 Checking if port 3000 is bound:" + ss -tlnp | grep :3000 || echo "Port 3000 not bound" + fi + + if timeout 5 nc -z 127.0.0.1 8081 2>/dev/null; then + echo "✅ Backend (port 8081): reachable immediately after reload" + else + echo "❌ CRITICAL: Backend (port 8081): NOT reachable immediately after reload!" + echo "🔍 Checking backend process:" + pgrep -f mnemo_cards_server || echo "No backend process found" + ps aux | grep mnemo_cards_server | grep -v grep || echo "No backend in ps" + echo "🔍 Checking backend service status:" + timeout 10 sudo systemctl status mnemo_cards_server --no-pager || echo "Could not get backend status" + echo "🔍 Checking if port 8081 is bound:" + ss -tlnp | grep :8081 || echo "Port 8081 not bound" + fi + + # Check for OOM killer activity + echo "🚨 Checking for OOM killer activity:" + timeout 10 sudo dmesg | grep -i "oom\|kill" | tail -5 || echo "No OOM killer activity detected" + + # Check systemd logs for service events around reload time + echo "📋 Checking systemd journal for recent service events:" + timeout 10 sudo journalctl --since "5 minutes ago" --no-pager -u nginx -u mnemo_cards_server --grep "(start|stop|reload|fail)" | tail -10 || echo "No recent systemd events" + # Check nginx logs for errors after reload echo "📋 Checking nginx error logs after reload:" - sudo tail -20 /var/log/nginx/error.log || true + timeout 10 sudo tail -30 /var/log/nginx/error.log | grep -E "(connect|upstream|error)" | tail -10 || echo "No recent upstream errors in nginx logs" + + # Check running processes AFTER reload + echo "📊 Processes AFTER reload:" + echo "Forgejo processes:" + pgrep -f forgejo || echo "No forgejo processes" + echo "Backend processes:" + pgrep -f mnemo_cards_server || echo "No backend processes" + echo "Nginx processes:" + pgrep -f nginx || echo "No nginx processes" + + # Check system load and memory after reload + echo "📊 System AFTER reload:" + uptime || true + free -h || true # Check nginx status again echo "📊 Nginx status after reload:" - sudo systemctl status nginx --no-pager || true + timeout 15 sudo systemctl status nginx --no-pager || echo "Could not get nginx status" # Check all services status echo "📊 Checking service statuses after nginx reload..." # Check nginx - if sudo systemctl is-active --quiet nginx; then + echo "🔍 Checking nginx status..." + if timeout 30 sudo systemctl is-active --quiet nginx; then echo "✅ nginx: running" # Check loaded configuration echo "📋 Loaded nginx sites:" - ls -la /etc/nginx/sites-enabled/ || true + timeout 10 ls -la /etc/nginx/sites-enabled/ || echo "Could not list sites" else - echo "❌ nginx: not running" - sudo systemctl status nginx --no-pager || true + echo "❌ nginx: not running or status check timed out" + timeout 15 sudo systemctl status nginx --no-pager || echo "Could not get nginx status" fi # Check backend - if sudo systemctl is-active --quiet mnemo_cards_server; then + echo "🔍 Checking backend status..." + if timeout 30 sudo systemctl is-active --quiet mnemo_cards_server; then echo "✅ backend: running" else - echo "❌ backend: not running" - sudo systemctl status mnemo_cards_server --no-pager || true + echo "❌ backend: not running or status check timed out" + timeout 15 sudo systemctl status mnemo_cards_server --no-pager || echo "Could not get backend status" # Try to start it if it's stopped echo "🚀 Attempting to start backend..." - sudo systemctl start mnemo_cards_server || true - sleep 2 - if sudo systemctl is-active --quiet mnemo_cards_server; then - echo "✅ backend: started successfully" + if timeout 30 sudo systemctl start mnemo_cards_server; then + sleep 3 + if timeout 30 sudo systemctl is-active --quiet mnemo_cards_server; then + echo "✅ backend: started successfully" + else + echo "❌ backend: failed to start" + fi + else + echo "❌ backend start command timed out" fi fi @@ -559,35 +633,43 @@ jobs: # Check network connectivity to upstream services echo "🌐 Checking upstream connectivity..." - if nc -z 127.0.0.1 3000 2>/dev/null; then + if timeout 10 nc -z 127.0.0.1 3000 2>/dev/null; then echo "✅ Forgejo (port 3000): reachable" else - echo "⚠️ Forgejo (port 3000): not reachable" + echo "⚠️ Forgejo (port 3000): not reachable or check timed out" fi - if nc -z 127.0.0.1 8081 2>/dev/null; then + if timeout 10 nc -z 127.0.0.1 8081 2>/dev/null; then echo "✅ Backend (port 8081): reachable" else - echo "⚠️ Backend (port 8081): not reachable" + echo "⚠️ Backend (port 8081): not reachable or check timed out" fi # Wait a bit more before testing sites sleep 3 - # Test site accessibility with retries + # Test site accessibility with retries and timeouts echo "🌐 Testing site accessibility..." for site in "https://mnemo-cards.online/" "https://code.mnemo-cards.online/" "https://vscode.mnemo-cards.online/"; do for attempt in {1..3}; do - if curl -I --max-time 10 "$site" 2>/dev/null | grep -q "200\|301\|302"; then + echo "🔍 Testing $site (attempt $attempt)..." + if timeout 15 curl -I --max-time 10 "$site" 2>/dev/null | grep -q "200\|301\|302"; then echo "✅ $site accessible (attempt $attempt)" break else + CURL_EXIT=$? + if [ $CURL_EXIT -eq 124 ]; then + echo "⏰ Timeout testing $site (attempt $attempt)" + else + echo "❌ $site returned error (attempt $attempt)" + fi + if [ $attempt -eq 3 ]; then echo "❌ $site not accessible after 3 attempts" - curl -I --max-time 5 "$site" || true + timeout 10 curl -I --max-time 5 "$site" || echo "Final check also failed" else - echo "⏳ $site attempt $attempt failed, retrying..." - sleep 2 + echo "⏳ $site attempt $attempt failed, retrying in 3 seconds..." + sleep 3 fi fi done @@ -599,6 +681,7 @@ jobs: sudo nginx -t || true exit 1 fi + ' || echo "Step timed out after 20 minutes" ENDSSH final-verification: diff --git a/mnemo_cards_web_v2/build/unit_test_assets/NativeAssetsManifest.json b/mnemo_cards_web_v2/build/unit_test_assets/NativeAssetsManifest.json deleted file mode 100644 index 523bfc7..0000000 --- a/mnemo_cards_web_v2/build/unit_test_assets/NativeAssetsManifest.json +++ /dev/null @@ -1 +0,0 @@ -{"format-version":[1,0,0],"native-assets":{}} \ No newline at end of file diff --git a/mnemo_cards_web_v2/build/unit_test_assets/shaders/ink_sparkle.frag b/mnemo_cards_web_v2/build/unit_test_assets/shaders/ink_sparkle.frag deleted file mode 100644 index 85fc357599776eff60e9ca4b562d663223e44c8a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12936 zcmbVSX^>o16@Cek#9<5(6cSN<0+u~w(s^5N#3VgQCLuCFNCJh5K04DqGhONF9(oyO z2uQ%77KKaDvP^!spk-MWrIs7Y>Jo4ZqPUm-u*y2m9=CDu9Ci>x1=MLWxSv9;7%g8Mnv+3LPyY|mJ_)h?%lj6?ZKODj_6Tx+@N zpQBEfs&&e*NBahZtDr}GIob};n{Z!>cBSS~|uzUET5I?%hNpZhXd8_e z<>a?1j`%Wb6g2y%zarlWTKc2@)o9ca`E{U~8`|&1ox1dy{*h;X#h(4X0qr$kd$34* z@^3`@^s7Hr9L9R3-A!oJAuc-mK>upTgCoL^gMV&WWkhVs;Hg7gbZ!BC&o3U|B76t@ z#G3a<{5*KeI=ETn?@@f${sWqiT8KRP8$qM~@td8+{z1zo40O;REp8XA(mO{DGIGH*s#S0L^)i>u&|d{VVp{z;jOue;s)4W#M;& z=l+!b_ke%;_b;T3HKSuswI@%wPgXdad6P+iNjkQVo{VI53Y@%~a=^TpseNypT zqJEzO&-q{zn{O%|C+hdx;EAz`&eNd(d*`pCe!mO;i#fXsH2dQI62I>TO`JY3e}_O5V?5&5bKuz*YmNBzd(iC5$6fsT18Cx+ z^GBn@`Xf4j0!{onGoH89vWW2#EHD`1JI%aifDzwi;=2MgZHWuE0W@`p6XP@cwV zndIgI(DapY9X9=42#mUv-DR*fpovpga{UVM#90ROqqiUc;fLnxEDPA--<>#>!-}YVepi*CdnM!Z}d3_$AGhz zQcvdKy`VV<)RX-F69W{1@tG+3{TFEBqVsQ~vpc5qAJD`l-;bhCV!Q-<++c)d4xRu; zT=IPkG;N6s_9STP5SKZ43N&>olR5YZX!;tTg9m_7mok}ykAWsmU73SVfG5u9i_F0% z!4r?q!873L|5h~0`K*yS_%V3O`5cfr_=(Zy9Pk;$=MME`4t@%nb3i@m=OhN;{$Qie z+%HQ&6X%?X?OC9Svk$R78#Hk~d&G7*c%E4(6Ten~W*lqLDCfD7en>y>gpg;+yK$F! zKMcAE>|WeuZQKuz_sxq(8QT< zK6m$^KRz${jxq=hVtauBQs-vMuLVl{2GEp=9FWR6Wj7j}?=9~$Ie$Gc+E6C@^Npa1 zvvIy?dlP8(Ntx{bH-je5OR$>_M&D$;lz>r}GQq|{6Tby|jEQlV!Ane(i|&Nc<-3&V zPR4X8mvuD-n*C5N^HK#(obx5?p$?v7IcS^{>WJ)?n2dXdGU=-cn*C5m{A+<`f0T(I zK4{J(-_JxZ0LJ$>$|Q~qX!`LYG|I(33!39nE`H5{7N3`bppM86#AJNuqfC6h9W;HW zj`(s1X!b{$j9CE9SSSy*no38lX(#cn@gCK^^hsFlhEinT&ZAXvRXB)RU`0 zb4=C~%DHw`PRxG31{ihtUM_t<0Gc>!kzgMKMx4(L!9EV2INv>_Hhu(ltc{0&iw_Tg z2isGVsVDJ$6f}LJp7i}W7!cn9T;5f_0IUf9^SED!yVSogf~QPu9|BE#;v%Gs~Tz5|;1jW_0#cE^F^pOrR!@co|pn~-?E`%``b8hJF3*2~dWTbCi~ zRiOAKL|=nISA*pHCjBB^MB_ypxoi+ix|gQo2nONvHrzeBXLR=squaur+eWY1yL0=_ z(cR(poi|>;E1ax_+bR>KPOW`?y*kloPH(9-#`nW!4O+FnKWxpEn)_>&aH3h7oUYW{ zq56Ql(s~JUMUMyJ`%2t#Eje_NW!Z3+@6+ewzJ9&EcdFX5_w3&@X1AtFqSG^tR<&IT-5!}o3q(+fnW(XVPnYJxW~p55v=S!GN~-}^s*QTs z8ZXr<359y2+Nvy+Nyl0^GgWFO4acj^@mi&ilM43|18IFffj1lN68%f|B$8xbB0+Bh zDw~|&tva8229T9f4UTV!SXl}S;C;0YGAaS6|bC9@lY6!_n&CMhDnV}&B$aTTI(0IC0P8qLKy@L-i_9%>a zrj=f2mP7ZL^cY~JBxLb=u$xJs9#FLw zjhUHly&P2Jp$`@8G)5bT1Hu?DR)Q=0>~T zjkdkZeIHwJ^f&Z_AP%Z>nMz?XUT#miEW?xD5K8i--%}?|9U8Bdre{)4I?$yupLcQv zC+9lgJ#HPCLwc&pz}kW5G>V&grk%bhsRGxm)+ePV#hy_*$Gy+y_EdFzf4$P``>^ho z2Ts{+aw-AK<0n3WTmX6)L>7$@&tJEm^MM_gm6Cx@A?=c=XqYiadbTxl0Nks#Mx-0T~E)!Lv*W0Gr3A>=b>@AU4VnWlXE;g zhl8A#&7iVyBga&7nY0t2`ec0+ZUm#;$0ESV^0Y_f_7sjaaL7o)=`XKD#SA z-Zkq94ol|I?*;|Ob+b70`S~EHR$4qJ?K4XaOiUh5@z85=*PJ>2KGmaV_VkD>Rf~@w zyN*}l;nlnObk95*E%xN2EzDWT%=IF}Jkz;HcdgDii;WXoPtSA4^WChM58PZKUbf~g7NVdz;-oamENtWHL!SxMSrk-_&r&X{TLc{bqL9vvRAp7Exw7g-;VQD$Zv)v{V* z{LU49mN4H!5HL=5jp+MQdQSV?i9VC5ZzBmcQ-(XCdfQ*v$!*e!e#~~?n|g-2Rcq;T zh7pq6Ao)=xW`gr7=W7NT!09u36_yV*(J8fDspH$(e5hWDmC-tRukPqaqc-W;Q09EV zz`9@3^hoODkQl`*O?4KAW7xVrC^eS_?ZQ__iXrCaDjb%aj7W4o+Nm_YLpuzScg zJ+TJqP~r|5AcZ>L{!DXFRfFHB;xd`z=?T6k?U&GQM=PT7_k_=$IC=6i-1+yPylnNq{(Xcb z%+z%b{*S$0ThAFg;=FA2|C#JO>yrQK@%Z_|0nGz$Be7b zQ9kJVjh*}ov=}=NcHcI3{B56?t^Pm#c>GQ1Vc79+DENClFI)ZJ&Epco^Tyw_dnyC? ze;a%Ltt2m7{hu6{aNJ(~h63#FlRCegTVA&MKWTp+@Zb?`EKhYwf1DpFKkR3?Pe1fa^lfF`{Toxk o3G2MX&J*a5zXs}S1%6put^Be9u<;UUydTcJsUBze-OjT92P$;ORsaA1 diff --git a/mnemo_cards_web_v2/build/web/flutter_bootstrap.js b/mnemo_cards_web_v2/build/web/flutter_bootstrap.js index 04aa082..d47555e 100644 --- a/mnemo_cards_web_v2/build/web/flutter_bootstrap.js +++ b/mnemo_cards_web_v2/build/web/flutter_bootstrap.js @@ -38,6 +38,6 @@ _flutter.buildConfig = {"engineRevision":"d3d45dcf251823c1769909cd43698d126db38d _flutter.loader.load({ serviceWorkerSettings: { - serviceWorkerVersion: "1447658096" + serviceWorkerVersion: "1977728131" } }); diff --git a/mnemo_cards_web_v2/build/web/flutter_service_worker.js b/mnemo_cards_web_v2/build/web/flutter_service_worker.js index ecab572..dcbff49 100644 --- a/mnemo_cards_web_v2/build/web/flutter_service_worker.js +++ b/mnemo_cards_web_v2/build/web/flutter_service_worker.js @@ -3,11 +3,11 @@ const MANIFEST = 'flutter-app-manifest'; const TEMP = 'flutter-temp-cache'; const CACHE_NAME = 'flutter-app-cache'; -const RESOURCES = {"flutter_bootstrap.js": "d27e18c64dd0c621145dfce18b96c0a5", +const RESOURCES = {"flutter_bootstrap.js": "0dabf8154ea9f84b34d53a38f6c13480", "version.json": "28542ad255b8c0abed0b83ec843a2417", "index.html": "bea65743d155de5b43dd38c2a02fa14d", "/": "bea65743d155de5b43dd38c2a02fa14d", -"main.dart.js": "efd61556cfb88ace9d0e42213140da3c", +"main.dart.js": "3dc6e8335d2ee3822f44330f6c3e7b62", "flutter.js": "888483df48293866f9f41d3d9274a779", "mnemo_cards/fonts/Nunito-VariableFont_wght.ttf": "ea0ad4c72a135f9a43ec7bb83f2469aa", "favicon.png": "5dcef449791fa27946b3d35ad8803796", diff --git a/mnemo_cards_web_v2/build/web/main.dart.js b/mnemo_cards_web_v2/build/web/main.dart.js index 97355bf..c0f4392 100644 --- a/mnemo_cards_web_v2/build/web/main.dart.js +++ b/mnemo_cards_web_v2/build/web/main.dart.js @@ -204,7 +204,7 @@ bbM(a){return J.hT(a).gdf(a)}, dJ(a){return J.aj(a).gag(a)}, hU(a){return J.aj(a).gbM(a)}, aW(a){return J.cS(a).gam(a)}, -Rs(a){return J.er(a).gca(a)}, +Rs(a){return J.er(a).gcb(a)}, mf(a){return J.cS(a).gaf(a)}, bf(a){return J.aj(a).gC(a)}, bbN(a){return J.hT(a).gA0(a)}, @@ -1332,7 +1332,7 @@ case 8:return"900"}return""}, bq_(a,b){var s switch(a){case B.dQ:return"left" case B.oE:return"right" -case B.Y:return"center" +case B.X:return"center" case B.km:return"justify" case B.oF:switch(b.a){case 1:s="end" break @@ -15214,7 +15214,7 @@ o=q*c n=p*c m=(q-o)/2 l=(p-n)/2 -r=a.gcc(0) +r=a.gcd(0) k=b.b.a k===$&&A.a() k=J.aK(k.a.width()) @@ -19253,7 +19253,7 @@ b4M(a,b){var s,r,q,p,o,n,m,l,k,j,i,h,g=null $label0$0:{s=0 if(B.dQ===a)break $label0$0 if(B.oE===a){s=1 -break $label0$0}if(B.Y===a){s=0.5 +break $label0$0}if(B.X===a){s=0.5 break $label0$0}r=B.ap===a q=r p=!q @@ -30786,12 +30786,12 @@ aTY:function aTY(){}, aCH:function aCH(){}, bn1(a,b){var s,r if(a.gC(a)!==b.gC(b))return!1 -for(s=J.aW(a.gca(a));s.B();){r=s.gM(s) +for(s=J.aW(a.gcb(a));s.B();){r=s.gM(s) a.i(0,r) b.i(0,r)}return!0}, bn3(a,b){var s,r if(a.gC(a)!==b.gC(b))return!1 -for(s=J.aW(a.gca(a));s.B();){r=s.gM(s) +for(s=J.aW(a.gcb(a));s.B();){r=s.gM(s) a.i(0,r) b.i(0,r)}return!0}, b6Z(a,b){for(;!1;)return!1 @@ -32324,7 +32324,7 @@ return A.b2d(r,A.m(b).ax.b,new A.arL(r,b),23,23) case 1:try{s=B.e0.c7(t.VU.a(a).d) q=A.aXU(new Uint8Array(A.m8(s)),o) return q}catch(p){return B.ao}break -case 2:return A.Q(t.Ku.a(a).d,o,o,o,o,B.a3Y,B.Y,o,o) +case 2:return A.Q(t.Ku.a(a).d,o,o,o,o,B.a3Y,B.X,o,o) case 3:return B.ao}}, arL:function arL(a,b){this.a=a this.b=b}, @@ -33189,7 +33189,7 @@ return!0}, R1(a,b){var s,r=a.gC(a),q=b.gC(b) if(r!==q)return!1 if(a===b)return!0 -for(r=J.aW(a.gca(a));r.B();){s=r.gM(r) +for(r=J.aW(a.gcb(a));r.B();){s=r.gM(r) if(!b.aB(0,s)||!J.e(b.i(0,s),a.i(0,s)))return!1}return!0}, pF(a,b,c){var s,r,q,p=a.length if(p<2)return @@ -42495,7 +42495,7 @@ bO(a,b,c){var s=this.$ti return s.y[3].a(J.DN(this.a,s.c.a(b),new A.adU(this,c)))}, G(a,b){return this.$ti.h("4?").a(J.nD(this.a,b))}, an(a,b){J.iK(this.a,new A.adT(this,b))}, -gca(a){var s=this.$ti +gcb(a){var s=this.$ti return A.mq(J.Rs(this.a),s.c,s.y[2])}, gem(a){var s=this.$ti return A.mq(J.aWK(this.a),s.y[1],s.y[3])}, @@ -42846,7 +42846,7 @@ A.GT.prototype={ i(a,b){return this.aB(0,b)?J.az(this.a,A.d_(b)):null}, gC(a){return J.bf(this.a)}, gem(a){return A.hk(this.a,0,null,this.$ti.c)}, -gca(a){return new A.a3S(this.a)}, +gcb(a){return new A.a3S(this.a)}, gag(a){return J.dJ(this.a)}, gbM(a){return J.hU(this.a)}, aB(a,b){return A.pA(b)&&b>=0&&b") +q=p}while(true)switch(q){case 0:n=s.gcb(s),n=n.gam(n),m=A.l(s).h("aJ<1,2>") case 2:if(!n.B()){q=3 break}l=n.gM(n) q=4 @@ -42930,7 +42930,7 @@ i(a,b){if(!this.aB(0,b))return null return this.b[this.a[b]]}, an(a,b){var s,r,q=this.gXU(),p=this.b for(s=q.length,r=0;r"))}, +gcb(a){return new A.wQ(this.gXU(),this.$ti.h("wQ<1>"))}, gem(a){return new A.wQ(this.b,this.$ti.h("wQ<2>"))}} A.wQ.prototype={ gC(a){return this.a.length}, @@ -42954,7 +42954,7 @@ s.$map=r}return r}, aB(a,b){return this.of().aB(0,b)}, i(a,b){return this.of().i(0,b)}, an(a,b){this.of().an(0,b)}, -gca(a){var s=this.of() +gcb(a){var s=this.of() return new A.bO(s,A.l(s).h("bO<1>"))}, gem(a){var s=this.of() return new A.bo(s,A.l(s).h("bo<2>"))}, @@ -43097,7 +43097,7 @@ A.hB.prototype={ gC(a){return this.a}, gag(a){return this.a===0}, gbM(a){return this.a!==0}, -gca(a){return new A.bO(this,A.l(this).h("bO<1>"))}, +gcb(a){return new A.bO(this,A.l(this).h("bO<1>"))}, gem(a){return new A.bo(this,A.l(this).h("bo<2>"))}, gh6(a){return new A.ed(this,A.l(this).h("ed<1,2>"))}, aB(a,b){var s,r @@ -44875,7 +44875,7 @@ A.po.prototype={ gC(a){return this.a}, gag(a){return this.a===0}, gbM(a){return this.a!==0}, -gca(a){return new A.wM(this,A.l(this).h("wM<1>"))}, +gcb(a){return new A.wM(this,A.l(this).h("wM<1>"))}, gem(a){var s=A.l(this) return A.ol(new A.wM(this,s.h("wM<1>")),new A.aJi(this),s.c,s.y[1])}, aB(a,b){var s,r @@ -45391,7 +45391,7 @@ A.b9.prototype={ qr(a,b,c){var s=A.cq(a) return A.b2U(a,s.h("b9.K"),s.h("b9.V"),b,c)}, an(a,b){var s,r,q,p -for(s=J.aW(this.gca(a)),r=A.cq(a).h("b9.V");s.B();){q=s.gM(s) +for(s=J.aW(this.gcb(a)),r=A.cq(a).h("b9.V");s.B();){q=s.gM(s) p=this.i(a,q) b.$2(q,p==null?r.a(p):p)}}, bO(a,b,c){var s @@ -45408,12 +45408,12 @@ r.m(a,b,s) return s}throw A.f(A.fA(b,"key","Key not in map."))}, cJ(a,b,c){return this.aL8(a,b,c,null)}, a7y(a,b){var s,r,q,p -for(s=J.aW(this.gca(a)),r=A.cq(a).h("b9.V");s.B();){q=s.gM(s) +for(s=J.aW(this.gcb(a)),r=A.cq(a).h("b9.V");s.B();){q=s.gM(s) p=this.i(a,q) this.m(a,q,b.$2(q,p==null?r.a(p):p))}}, -gh6(a){return J.d0(this.gca(a),new A.anr(a),A.cq(a).h("aJ"))}, +gh6(a){return J.d0(this.gcb(a),new A.anr(a),A.cq(a).h("aJ"))}, m8(a,b,c,d){var s,r,q,p,o,n=A.z(c,d) -for(s=J.aW(this.gca(a)),r=A.cq(a).h("b9.V");s.B();){q=s.gM(s) +for(s=J.aW(this.gcb(a)),r=A.cq(a).h("b9.V");s.B();){q=s.gM(s) p=this.i(a,q) o=b.$2(q,p==null?r.a(p):p) n.m(0,o.a,o.b)}return n}, @@ -45421,13 +45421,13 @@ a1q(a,b){var s,r for(s=b.gam(b);s.B();){r=s.gM(s) this.m(a,r.a,r.b)}}, ml(a,b){var s,r,q,p,o=A.cq(a),n=A.b([],o.h("G")) -for(s=J.aW(this.gca(a)),o=o.h("b9.V");s.B();){r=s.gM(s) +for(s=J.aW(this.gcb(a)),o=o.h("b9.V");s.B();){r=s.gM(s) q=this.i(a,r) if(b.$2(r,q==null?o.a(q):q))n.push(r)}for(o=n.length,p=0;p"))}, j(a){return A.H0(a)}, $iay:1} @@ -45452,10 +45452,10 @@ gC(a){return J.bf(this.a)}, gag(a){return J.dJ(this.a)}, gbM(a){return J.hU(this.a)}, ga4(a){var s=this.a,r=J.er(s) -s=r.i(s,J.tn(r.gca(s))) +s=r.i(s,J.tn(r.gcb(s))) return s==null?this.$ti.y[1].a(s):s}, gaf(a){var s=this.a,r=J.er(s) -s=r.i(s,J.mf(r.gca(s))) +s=r.i(s,J.mf(r.gcb(s))) return s==null?this.$ti.y[1].a(s):s}, gam(a){var s=this.a return new A.a41(J.aW(J.Rs(s)),s,this.$ti.h("a41<1,2>"))}} @@ -45480,7 +45480,7 @@ an(a,b){J.iK(this.a,b)}, gag(a){return J.dJ(this.a)}, gbM(a){return J.hU(this.a)}, gC(a){return J.bf(this.a)}, -gca(a){return J.Rs(this.a)}, +gcb(a){return J.Rs(this.a)}, G(a,b){return J.nD(this.a,b)}, j(a){return J.bP(this.a)}, gem(a){return J.aWK(this.a)}, @@ -45801,7 +45801,7 @@ for(;q.e=null,q.J7();){s=q.gM(0) b.$2(s.a,s.b)}}, gC(a){return this.a}, aB(a,b){return this.kP(b)!=null}, -gca(a){return new A.pt(this,this.$ti.h("pt<1,iF<1,2>>"))}, +gcb(a){return new A.pt(this,this.$ti.h("pt<1,iF<1,2>>"))}, gem(a){return new A.x3(this,this.$ti.h("x3<1,2>"))}, gh6(a){return new A.OR(this,this.$ti.h("OR<1,2>"))}, aEy(){var s,r=this.d @@ -45981,7 +45981,7 @@ return typeof s=="undefined"?this.av0(b):s}}, gC(a){return this.b==null?this.c.a:this.t6().length}, gag(a){return this.gC(0)===0}, gbM(a){return this.gC(0)>0}, -gca(a){var s +gcb(a){var s if(this.b==null){s=this.c return new A.bO(s,A.l(s).h("bO<1>"))}return new A.a3E(this)}, gem(a){var s,r=this @@ -46033,9 +46033,9 @@ $S:311} A.a3E.prototype={ gC(a){return this.a.gC(0)}, bv(a,b){var s=this.a -return s.b==null?s.gca(0).bv(0,b):s.t6()[b]}, +return s.b==null?s.gcb(0).bv(0,b):s.t6()[b]}, gam(a){var s=this.a -if(s.b==null){s=s.gca(0) +if(s.b==null){s=s.gcb(0) s=s.gam(s)}else{s=s.t6() s=new J.dv(s,s.length,A.a_(s).h("dv<1>"))}return s}, p(a,b){return this.a.aB(0,b)}} @@ -47874,7 +47874,7 @@ if(r)return r=s.value[0] r.toString b.$2(r,A.l4(s.value[1]))}}, -gca(a){var s=A.b([],t.s) +gcb(a){var s=A.b([],t.s) this.an(a,new A.aqk(s)) return s}, gem(a){var s=A.b([],t.n4) @@ -47910,7 +47910,7 @@ if(r)return r=s.value[0] r.toString b.$2(r,A.l4(s.value[1]))}}, -gca(a){var s=A.b([],t.s) +gcb(a){var s=A.b([],t.s) this.an(a,new A.aqm(s)) return s}, gem(a){var s=A.b([],t.n4) @@ -48032,7 +48032,7 @@ if(r)return r=s.value[0] r.toString b.$2(r,A.l4(s.value[1]))}}, -gca(a){var s=A.b([],t.s) +gcb(a){var s=A.b([],t.s) this.an(a,new A.av9(s)) return s}, gem(a){var s=A.b([],t.n4) @@ -48135,7 +48135,7 @@ if(r==null)return q=a.getItem(r) q.toString b.$2(r,q)}}, -gca(a){var s=A.b([],t.s) +gcb(a){var s=A.b([],t.s) this.an(a,new A.ayU(s)) return s}, gem(a){var s=A.b([],t.s) @@ -48477,7 +48477,7 @@ s=this.a if(s.aB(0,a))return s.i(0,a) if(t.f.b(a)){r={} s.m(0,a,r) -for(s=J.er(a),q=J.aW(s.gca(a));q.B();){p=q.gM(q) +for(s=J.er(a),q=J.aW(s.gcb(a));q.B();){p=q.gM(q) r[p]=this.$1(s.i(a,p))}return r}else if(t.JY.b(a)){o=[] s.m(0,a,o) B.b.L(o,J.d0(a,this,t.z)) @@ -49448,7 +49448,7 @@ if(r)return r=s.value[0] r.toString b.$2(r,A.l4(s.value[1]))}}, -gca(a){var s=A.b([],t.s) +gcb(a){var s=A.b([],t.s) this.an(a,new A.acA(s)) return s}, gem(a){var s=A.b([],t.n4) @@ -49709,7 +49709,7 @@ return A.ol(new A.ed(s,r),new A.adJ(this),r.h("x.E"),this.$ti.h("aJ") an(a,b){this.c.an(0,new A.adK(this,b))}, gag(a){return this.c.a===0}, gbM(a){return this.c.a!==0}, -gca(a){var s=this.c,r=A.l(s).h("bo<2>") +gcb(a){var s=this.c,r=A.l(s).h("bo<2>") return A.ol(new A.bo(s,r),new A.adL(this),r.h("x.E"),this.$ti.h("ci.K"))}, gC(a){return this.c.a}, m8(a,b,c,d){var s=this.c @@ -49814,16 +49814,16 @@ s=J.aj(a) r=J.aj(b) if(s.gC(a)!==r.gC(b))return!1 q=A.jG(null,null,null,t.PJ,t.S) -for(p=J.aW(s.gca(a));p.B();){o=p.gM(p) +for(p=J.aW(s.gcb(a));p.B();){o=p.gM(p) n=new A.CC(this,o,s.i(a,o)) m=q.i(0,n) -q.m(0,n,(m==null?0:m)+1)}for(s=J.aW(r.gca(b));s.B();){o=s.gM(s) +q.m(0,n,(m==null?0:m)+1)}for(s=J.aW(r.gcb(b));s.B();){o=s.gM(s) n=new A.CC(this,o,r.i(b,o)) m=q.i(0,n) if(m==null||m===0)return!1 q.m(0,n,m-1)}return!0}, dn(a,b){var s,r,q,p,o,n,m,l,k -for(s=J.er(b),r=J.aW(s.gca(b)),q=this.a,p=this.b,o=this.$ti.y[1],n=0;r.B();){m=r.gM(r) +for(s=J.er(b),r=J.aW(s.gcb(b)),q=this.a,p=this.b,o=this.$ti.y[1],n=0;r.B();){m=r.gM(r) l=q.dn(0,m) k=s.i(b,m) n=n+3*l+7*p.dn(0,k==null?o.a(k):k)&2147483647}n=n+(n<<3>>>0)&2147483647 @@ -51654,7 +51654,7 @@ if(r!=null)r.J(0,s.ghB()) s.bE$=null s.ar()}, by(){this.co() -this.cb() +this.cc() this.hC()}} A.y8.prototype={ I(){return"CupertinoButtonSize."+this.b}} @@ -51816,7 +51816,7 @@ if(r!=null)r.J(0,s.ghB()) s.bE$=null s.ar()}, by(){this.co() -this.cb() +this.cc() this.hC()}} A.de.prototype={ gxa(){var s=this @@ -52110,7 +52110,7 @@ if(r!=null)r.J(0,s.ghB()) s.bE$=null s.ar()}, by(){this.co() -this.cb() +this.cc() this.hC()}} A.aeR.prototype={ $0(){return this.a.glf()}, @@ -52519,7 +52519,7 @@ r=A.n_(new A.J(0,7,0+k.gv(0).a,7+(k.gv(0).b-14)),B.eu).Ii() q=l.aiG(k,r) p=l.a9 if(p!=null){o=A.b3I(r.a,r.b,r.c,r.d+7,B.eu).dj(b.X(0,s.a).X(0,B.j)) -a.gcc(0).a.dO(o,new A.bH(0,B.V,p,B.j,15).hl())}p=l.bU +a.gcd(0).a.dO(o,new A.bH(0,B.V,p,B.j,15).hl())}p=l.bU n=l.cx n===$&&A.a() s=b.X(0,s.a) @@ -52826,7 +52826,7 @@ t.c.a(s) if(s.e){r=s.a.X(0,n.b) q=n.c q.dd(a,r) -if(s.az$!=null||a===n.a.ak){s=q.gcc(0) +if(s.az$!=null||a===n.a.ak){s=q.gcd(0) q=new A.j(a.gv(0).a,0).X(0,r) p=new A.j(a.gv(0).a,a.gv(0).b).X(0,r) $.at() @@ -52851,7 +52851,7 @@ A.wE.prototype={ I(){return"_CupertinoTextSelectionToolbarItemsSlot."+this.b}} A.Qi.prototype={ by(){this.co() -this.cb() +this.cc() this.e5()}, l(){var s=this,r=s.aV$ if(r!=null)r.J(0,s.gdV()) @@ -56114,7 +56114,7 @@ l.drawCircle(f,o,b,a) a.delete()}}} A.Qb.prototype={ by(){this.co() -this.cb() +this.cc() this.e5()}, l(){var s=this,r=s.aV$ if(r!=null)r.J(0,s.gdV()) @@ -56632,7 +56632,7 @@ $2(a,b){return this.a.D$.c4(a,this.b)}, $S:14} A.Qc.prototype={ by(){this.co() -this.cb() +this.cc() this.e5()}, l(){var s=this,r=s.aV$ if(r!=null)r.J(0,s.gdV()) @@ -57330,7 +57330,7 @@ if(r!=null)r.J(0,s.ghB()) s.bE$=null s.ar()}, by(){this.co() -this.cb() +this.cc() this.hC()}} A.aFl.prototype={ I(){return"_CardVariant."+this.b}} @@ -57998,7 +57998,7 @@ p=l.au if(q)p.saG(0,a.Ap(b,r,k,p.a)) else{p.saG(0,null) q=r!==255 -if(q){p=a.gcc(0) +if(q){p=a.gcd(0) o=l.c2$.i(0,B.br) o.toString n=o.b @@ -58012,7 +58012,7 @@ $.at() n=A.bk() n.r=s.gq(s) p.f3(o,n)}k.$2(a,b) -if(q)a.gcc(0).a.a.restore()}}, +if(q)a.gcd(0).a.a.restore()}}, Yz(a,b,c,d){var s,r,q,p,o,n=this,m=n.gKe(),l=m.gdW(m) if(n.av.gaR(0)!==B.ad){m=n.cx m===$&&A.a() @@ -58029,7 +58029,7 @@ r=c.gv(0) q=m.a m=m.b p=new A.J(q,m,q+r.a,m+r.b).dj(b) -r=a.gcc(0) +r=a.gcd(0) m=p.cH(20) $.at() q=A.bk() @@ -58039,7 +58039,7 @@ r.f3(m,q) q=c.b q.toString a.dd(c,s.a(q).a.X(0,b)) -a.gcc(0).a.a.restore()}}else{m=c.b +a.gcd(0).a.a.restore()}}else{m=c.b m.toString a.dd(c,t.q.a(m).a.X(0,b))}}, aE(a){var s,r,q=this @@ -58111,7 +58111,7 @@ j.toString o.r=j.gq(j) o.a=B.Gx n=l.b0.a90(p) -a.gcc(0).jz(n,o)}j=k.i(0,B.br) +a.gcd(0).jz(n,o)}j=k.i(0,B.br) j.toString j=j.gv(0) s=k.i(0,B.br) @@ -58125,7 +58125,7 @@ r=r.gv(0) k=k.i(0,B.br) k.toString m=s.X(0,new A.j(r.b*0.125,k.gv(0).b*0.125)) -l.au5(a.gcc(0),b.X(0,m),j.b*0.75)}}, +l.au5(a.gcd(0),b.X(0,m),j.b*0.75)}}, $S:15} A.aND.prototype={ $2(a,b){var s=this.a,r=s.b @@ -58181,7 +58181,7 @@ s.toString return s}} A.QB.prototype={ by(){this.co() -this.cb() +this.cc() this.e5()}, l(){var s=this,r=s.aV$ if(r!=null)r.J(0,s.gdV()) @@ -62795,7 +62795,7 @@ $S:49} A.a3v.prototype={} A.Qa.prototype={ by(){this.co() -this.cb() +this.cc() this.e5()}, l(){var s=this,r=s.aV$ if(r!=null)r.J(0,s.gdV()) @@ -62807,11 +62807,11 @@ if(r!=null)r.J(0,s.ghB()) s.bE$=null s.ar()}, by(){this.co() -this.cb() +this.cc() this.hC()}} A.Qu.prototype={ by(){this.co() -this.cb() +this.cc() this.e5()}, l(){var s=this,r=s.aV$ if(r!=null)r.J(0,s.gdV()) @@ -63281,7 +63281,7 @@ Eq(a){var s=this.bU;(s==null?this.bU=A.b([],t.VB):s).push(a) this.aK()}, iN(a){return this.a9}, aN(a,b){var s,r,q,p,o,n,m=this.bU -if(m!=null&&m.length!==0){s=a.gcc(0) +if(m!=null&&m.length!==0){s=a.gcd(0) r=s.a.a J.aK(r.save()) r.translate(b.a,b.b) @@ -63357,7 +63357,7 @@ aN(a,b){this.b.iV(a,new A.J(0,0,0+b.a,0+b.b),this.c)}, dT(a){return!a.b.k(0,this.b)}} A.a9R.prototype={ by(){this.co() -this.cb() +this.cc() this.e5()}, l(){var s=this,r=s.aV$ if(r!=null)r.J(0,s.gdV()) @@ -63823,7 +63823,7 @@ if(s){s=m.w s=$.bas().a8(0,s.gq(s)) s.toString r=s}else r=0 -if(r>0){s=a.gcc(0) +if(r>0){s=a.gcd(0) q=b.a p=b.b $.at() @@ -64304,7 +64304,7 @@ if(r!=null)r.J(0,s.ghB()) s.bE$=null s.ar()}, by(){this.co() -this.cb() +this.cc() this.hC()}} A.Qv.prototype={ l(){var s=this,r=s.bE$ @@ -64312,7 +64312,7 @@ if(r!=null)r.J(0,s.ghB()) s.bE$=null s.ar()}, by(){this.co() -this.cb() +this.cc() this.hC()}} A.zY.prototype={ gu(a){var s=this @@ -64581,7 +64581,7 @@ switch(0){case 0:return q}}, $S:61} A.NQ.prototype={ by(){this.co() -this.cb() +this.cc() this.e5()}, l(){var s=this,r=s.aV$ if(r!=null)r.J(0,s.gdV()) @@ -65075,7 +65075,7 @@ $2(a,b){if(!a.a)a.J(0,b)}, $S:31} A.On.prototype={ by(){this.co() -this.cb() +this.cc() this.e5()}, l(){var s=this,r=s.aV$ if(r!=null)r.J(0,s.gdV()) @@ -65083,7 +65083,7 @@ s.aV$=null s.ar()}} A.Oo.prototype={ by(){this.co() -this.cb() +this.cc() this.e5()}, l(){var s=this,r=s.aV$ if(r!=null)r.J(0,s.gdV()) @@ -65111,7 +65111,7 @@ r.b1$=null r.ae8()}} A.Qp.prototype={ by(){this.co() -this.cb() +this.cc() this.e5()}, l(){var s=this,r=s.aV$ if(r!=null)r.J(0,s.gdV()) @@ -66594,7 +66594,7 @@ return r==null?s.k2:r}, $S:5} A.Qw.prototype={ by(){this.co() -this.cb() +this.cc() this.e5()}, l(){var s=this,r=s.aV$ if(r!=null)r.J(0,s.gdV()) @@ -68417,7 +68417,7 @@ q.toString s=r.a(q).az$}}} A.aau.prototype={ by(){this.co() -this.cb() +this.cc() this.e5()}, l(){var s=this,r=s.aV$ if(r!=null)r.J(0,s.gdV()) @@ -68608,7 +68608,7 @@ B.b.L(p,new A.bo(r,q.h("bo<2>"))) p.push(s.a) p.push(s.b) r=s.c -B.b.L(p,r.gca(r)) +B.b.L(p,r.gcb(r)) B.b.L(p,r.gem(r)) p.push(s.e) p.push(s.f) @@ -69723,7 +69723,7 @@ b=a1.d.y b.toString a=d.x a0=d.y -return A.rq(A.b34(A.Bz(l,A.bg(a2,a2,A.wb(h===!0,b,p,!0,e,f,B.oJ,a2,d.z,new A.aJJ(a1),a0,a0,"hour_minute_text_form_field",i,B.Y,B.cR,c,a),!1,a2,a2,a2,!1,a2,!1,a2,a2,a2,a2,a2,a2,a2,a2,g,a2,a2,a2,a2,a2,a2,a2,a2,a2,a2,a2,a2,a2,a2,a2,a2,a2,a2,a2,a2,a2,a2,a2,a2,B.w,a2))),o)}} +return A.rq(A.b34(A.Bz(l,A.bg(a2,a2,A.wb(h===!0,b,p,!0,e,f,B.oJ,a2,d.z,new A.aJJ(a1),a0,a0,"hour_minute_text_form_field",i,B.X,B.cR,c,a),!1,a2,a2,a2,!1,a2,!1,a2,a2,a2,a2,a2,a2,a2,a2,g,a2,a2,a2,a2,a2,a2,a2,a2,a2,a2,a2,a2,a2,a2,a2,a2,a2,a2,a2,a2,a2,a2,a2,a2,B.w,a2))),o)}} A.aJL.prototype={ $0(){var s=this.a s.K(new A.aJK(s))}, @@ -70243,7 +70243,7 @@ if(r!=null)r.J(0,s.ghB()) s.bE$=null s.ar()}, by(){this.co() -this.cb() +this.cc() this.hC()}} A.Qs.prototype={ aC(a){this.aS(a) @@ -70646,7 +70646,7 @@ if(r!=null)r.J(0,s.ghB()) s.bE$=null s.ar()}, by(){this.co() -this.cb() +this.cc() this.hC()}} A.Kn.prototype={ gu(a){var s=this,r=null @@ -71459,24 +71459,24 @@ if(s!==0)return"CircleBorder("+this.a.j(0)+", eccentricity: "+A.o(s)+")" return"CircleBorder("+this.a.j(0)+")"}} A.ae6.prototype={ JR(a,b,c,d){var s,r=this -J.aK(r.gcc(0).a.a.save()) +J.aK(r.gcd(0).a.a.save()) switch(b.a){case 0:break case 1:a.$1(!1) break case 2:a.$1(!0) break case 3:a.$1(!0) -s=r.gcc(0) +s=r.gcd(0) $.at() s.f3(c,A.bk()) break}d.$0() -if(b===B.c0)r.gcc(0).a.a.restore() -r.gcc(0).a.a.restore()}, +if(b===B.c0)r.gcd(0).a.a.restore() +r.gcd(0).a.a.restore()}, aBl(a,b,c,d){this.JR(new A.ae7(this,a),b,c,d)}, aBn(a,b,c,d){this.JR(new A.ae8(this,a),b,c,d)}, aBo(a,b,c,d){this.JR(new A.ae9(this,a),b,c,d)}} A.ae7.prototype={ -$1(a){var s=this.a.gcc(0),r=this.b.ges().a +$1(a){var s=this.a.gcd(0),r=this.b.ges().a r===$&&A.a() r=r.a r.toString @@ -71484,11 +71484,11 @@ s.a.a.clipPath(r,$.l8(),a) return null}, $S:10} A.ae8.prototype={ -$1(a){this.a.gcc(0).a.a.clipRRect(A.mc(this.b),$.l8(),a) +$1(a){this.a.gcd(0).a.a.clipRRect(A.mc(this.b),$.l8(),a) return null}, $S:10} A.ae9.prototype={ -$1(a){this.a.gcc(0).a.a.clipRect(A.dB(this.b),$.nB()[1],a) +$1(a){this.a.gcd(0).a.a.clipRect(A.dB(this.b),$.nB()[1],a) return null}, $S:10} A.yK.prototype={ @@ -73451,7 +73451,7 @@ lZ(a,b){var s=null return this.hI(s,s,a,s,s,s,s,s,s,s,s,b,s,s,s,s,s,s,s,s,s,s,s,s,s,s)}, a2L(a,b,c){var s=null return this.hI(s,s,s,s,s,s,s,s,s,s,s,a,s,s,b,s,c,s,s,s,s,s,s,s,s,s)}, -cd(a,b){var s=null +ca(a,b){var s=null return this.hI(s,s,a,s,s,s,s,s,s,s,s,s,s,s,b,s,s,s,s,s,s,s,s,s,s,s)}, yt(a,b,c){var s=null return this.hI(s,s,a,s,s,s,s,s,s,s,s,b,s,s,c,s,s,s,s,s,s,s,s,s,s,s)}, @@ -74240,12 +74240,12 @@ if(!b.k(0,B.j))s.translate(b.a,b.b) c.aN(a,this.gv(0)) s.restore()}, aN(a,b){var s,r,q=this -if(q.t!=null){s=a.gcc(0) +if(q.t!=null){s=a.gcd(0) r=q.t r.toString q.YF(s,b,r) q.a_6(a)}q.io(a,b) -if(q.V!=null){s=a.gcc(0) +if(q.V!=null){s=a.gcd(0) r=q.V r.toString q.YF(s,b,r) @@ -74990,7 +74990,7 @@ if(!o)q.azj(p) s=q.A r=q.T if(r!=null)a.dd(r,b) -q.O.aN(a.gcc(0),p) +q.O.aN(a.gcd(0),p) q.a6j(a,p) if(s!=null)a.dd(s,b)}, ds(a,b){if(a===this.A||a===this.T)return @@ -75058,7 +75058,7 @@ q.J(0,s) a.Y(0,s)}}, aN(a,b){var s=t.CA.a(A.B.prototype.gaY.call(this,0)),r=this.A if(s!=null){s.kJ() -r.ib(a.gcc(0),this.gv(0),s)}}, +r.ib(a.gcd(0),this.gv(0),s)}}, aE(a){this.ep(a) this.A.Y(0,this.ge_())}, ao(a){this.A.J(0,this.ge_()) @@ -75213,7 +75213,7 @@ glx(){return!0}, iN(a){return!0}, cp(a){return a.b6(B.Zf)}, aN(a,b){var s,r,q,p,o,n,m,l,k,j=this -try{p=a.gcc(0) +try{p=a.gcd(0) o=j.gv(0) n=b.a m=b.b @@ -75230,7 +75230,7 @@ if(s>328){s-=128 r+=64}p.fV(new A.qY(s)) o=j.gv(0) if(o.b>96+p.f+12)q+=96 -o=a.gcc(0) +o=a.gcd(0) o.a.a3l(p,b.X(0,new A.j(r,q)))}}catch(k){}}} A.aKJ.prototype={} A.Uj.prototype={ @@ -75678,7 +75678,7 @@ ao(a){this.e3(0)}, aN(a,b){var s,r,q,p,o,n,m,l,k,j,i,h,g,f,e=this if(e.R==null)return e.ar7() -s=a.gcc(0) +s=a.gcd(0) r=e.gv(0) q=b.a p=b.b @@ -76209,7 +76209,7 @@ r.a.ED(0,s)}else{s=a.ay s===$&&A.a() if(s){a.ch.saG(0,null) a.LS(r,b)}else a.LS(r,b)}}, -gcc(a){var s +gcd(a){var s if(this.e==null)this.Ms() s=this.e s.toString @@ -76279,11 +76279,11 @@ o.eE(-q,-p,0,1) if(a){s=e==null?A.b4Z(null):e s.scz(0,o) r.vo(s,d,b,A.b31(o,r.b)) -return s}else{q=r.gcc(0) +return s}else{q=r.gcd(0) J.aK(q.a.a.save()) q.a8(0,o.a) d.$2(r,b) -r.gcc(0).a.a.restore() +r.gcd(0).a.a.restore() return null}}, Ap(a,b,c,d){var s=d==null?A.aYk():d s.sdW(0,b) @@ -77544,21 +77544,21 @@ if(m.aw){s=m.gv(0) r=b.a q=b.b p=new A.J(r,q,r+s.a,q+s.b) -if(m.ap!=null){s=a.gcc(0) +if(m.ap!=null){s=a.gcd(0) $.at() -s.f3(p,A.bk())}else J.aK(a.gcc(0).a.a.save()) -a.gcc(0).a.a.clipRect(A.dB(p),$.nB()[1],!0)}s=m.W +s.f3(p,A.bk())}else J.aK(a.gcd(0).a.a.save()) +a.gcd(0).a.a.clipRect(A.dB(p),$.nB()[1],!0)}s=m.W if(s!=null)for(r=s.length,o=0;o0&&m.b>0){m=a.gcc(0) +if(m.a>0&&m.b>0){m=a.gcd(0) s=n.gv(0) r=b.a q=b.b @@ -86698,7 +86698,7 @@ $0(){this.a.MR()}, $S:0} A.Qm.prototype={ by(){this.co() -this.cb() +this.cc() this.e5()}, l(){var s=this,r=s.aV$ if(r!=null)r.J(0,s.gdV()) @@ -88666,7 +88666,7 @@ this.hM$=null}this.o2()}} A.a2g.prototype={} A.Mg.prototype={ by(){this.co() -this.cb() +this.cc() this.e5()}, l(){var s=this,r=s.aV$ if(r!=null)r.J(0,s.gdV()) @@ -90521,7 +90521,7 @@ this.ar()}, Mv(a){var s,r,q,p,o=this,n=o.d n.toString o.d=A.z(t.u,t.cD) -for(s=J.aW(a.gca(a));s.B();){r=s.gM(s) +for(s=J.aW(a.gcb(a));s.B();){r=s.gM(s) q=o.d q.toString p=n.i(0,r) @@ -90530,7 +90530,7 @@ q=a.i(0,r) q.toString r=o.d.i(0,r) r.toString -q.a4I(r)}for(s=J.aW(n.gca(n));s.B();){r=s.gM(s) +q.a4I(r)}for(s=J.aW(n.gcb(n));s.B();){r=s.gM(s) if(!o.d.aB(0,r))n.i(0,r).l()}}, alw(a){var s,r for(s=this.d,s=J.aW(s.gem(s));s.B();){r=s.gM(s) @@ -91590,7 +91590,7 @@ if(r!=null)r.J(0,s.ghB()) s.bE$=null s.ar()}, by(){this.co() -this.cb() +this.cc() this.hC()}} A.j1.prototype={ cr(a){return new A.Gr(A.jG(null,null,null,t.h,t.X),this,B.ax,A.l(this).h("Gr"))}} @@ -93096,7 +93096,7 @@ $2(a,b){if(!a.a)a.J(0,b)}, $S:31} A.Np.prototype={ by(){this.co() -this.cb() +this.cc() this.e5()}, l(){var s=this,r=s.aV$ if(r!=null)r.J(0,s.gdV()) @@ -94009,7 +94009,7 @@ s=this.t if(s!=null)a.$1(s)}} A.a4O.prototype={ by(){this.co() -this.cb() +this.cc() this.e5()}, l(){var s=this,r=s.aV$ if(r!=null)r.J(0,s.gdV()) @@ -94464,7 +94464,7 @@ r=s===0?"local":"remote" a.push("depth: "+s+" ("+r+")")}} A.Qq.prototype={ by(){this.co() -this.cb() +this.cc() this.e5()}, l(){var s=this,r=s.aV$ if(r!=null)r.J(0,s.gdV()) @@ -94472,7 +94472,7 @@ s.aV$=null s.ar()}} A.QL.prototype={ by(){this.co() -this.cb() +this.cc() this.e5()}, l(){var s=this,r=s.aV$ if(r!=null)r.J(0,s.gdV()) @@ -97475,7 +97475,7 @@ goM(a){var s=this.y return(s==null?A.l(this).h("aq.T").a(s):s)!=null}} A.Oz.prototype={ by(){this.co() -this.cb() +this.cc() this.e5()}, l(){var s=this,r=s.aV$ if(r!=null)r.J(0,s.gdV()) @@ -98392,7 +98392,7 @@ PL(a){return!1}, ia(a){return A.b6Y(this.dZ,a)&&this.SM(a)}} A.CU.prototype={ by(){this.co() -this.cb() +this.cc() this.e5()}, l(){var s=this,r=s.aV$ if(r!=null)r.J(0,s.gdV()) @@ -101156,7 +101156,7 @@ if(r!=null)r.J(0,s.ghB()) s.bE$=null s.ar()}, by(){this.co() -this.cb() +this.cc() this.hC()}} A.QI.prototype={ l(){var s=this,r=s.bE$ @@ -101164,7 +101164,7 @@ if(r!=null)r.J(0,s.ghB()) s.bE$=null s.ar()}, by(){this.co() -this.cb() +this.cc() this.hC()}} A.K8.prototype={} A.ZU.prototype={ @@ -101200,7 +101200,7 @@ cD(a){return this.f!==a.f}} A.fP.prototype={ yD(a){var s,r=this r.dY$=new A.Bm(a) -r.cb() +r.cc() r.hC() s=r.dY$ s.toString @@ -101211,7 +101211,7 @@ else{s=this.bE$ s=!s.gq(s) r.sQ7(0,s) r=s}return r}, -cb(){var s,r=this,q=r.c +cc(){var s,r=this,q=r.c q.toString s=A.b4S(q) q=r.bE$ @@ -101221,7 +101221,7 @@ s.Y(0,r.ghB()) r.bE$=s}} A.dT.prototype={ yD(a){var s,r,q=this -if(q.aV$==null)q.cb() +if(q.aV$==null)q.cc() if(q.da$==null)q.da$=A.aL(t.Qx) s=new A.a9u(q,a) r=q.aV$ @@ -101232,7 +101232,7 @@ e5(){var s,r,q,p if(this.da$!=null){s=this.aV$ r=!s.gq(s) for(s=this.da$,s=A.cB(s,s.r,A.l(s).c),q=s.$ti.c;s.B();){p=s.d;(p==null?q.a(p):p).sQ7(0,r)}}}, -cb(){var s,r=this,q=r.c +cc(){var s,r=this,q=r.c q.toString s=A.b4S(q) q=r.aV$ @@ -104988,9 +104988,9 @@ s=s==null?p:A.aYN(s) s=A.e7(s==null?B.cn:s,1)}else s=p r=A.b([],t.p) q=n.e -if(q!=null)r.push(A.Q(q,p,p,p,p,A.dn(p,p,p,p,l?p:new A.aAL().$1(m),p,p,p,p,p,p,24,p,p,B.u,p,p,!0,p,p,p,p,p,p,p,p),B.Y,p,p)) +if(q!=null)r.push(A.Q(q,p,p,p,p,A.dn(p,p,p,p,l?p:new A.aAL().$1(m),p,p,p,p,p,p,24,p,p,B.u,p,p,!0,p,p,p,p,p,p,p,p),B.X,p,p)) n=n.f -if(n!=null)r.push(A.Q(n,p,p,p,p,A.dn(p,p,p,p,l?p:new A.aAM().$1(m),p,p,p,p,p,p,16,p,p,B.u,p,p,!0,p,p,p,p,p,p,p,p),B.Y,p,p)) +if(n!=null)r.push(A.Q(n,p,p,p,p,A.dn(p,p,p,p,l?p:new A.aAM().$1(m),p,p,p,p,p,p,16,p,p,B.u,p,p,!0,p,p,p,p,p,p,p,p),B.X,p,p)) return A.h7(!1,o,!0,A.aG(p,A.a9(r,B.k,B.i,B.h,0,B.l),B.m,p,p,new A.aO(p,p,s,p,p,p,B.t),p,p,p,p,B.aM,p,p,p),p,!0,p,p,p,p,p,p,p,p,p,p,p,k,p,p,p,p,p,p,p)}} A.aAK.prototype={ $1(a){return new A.aAJ(a)}, @@ -109311,7 +109311,7 @@ k=s.ok j=k.y i=j==null h=t.p -l=A.aV(A.b([l,B.aZ,A.aS(A.Q(o,d,d,d,d,i?d:j.cd(s.ax.k3,B.u),d,d,d),1)],h),B.k,B.i,B.h,0,d) +l=A.aV(A.b([l,B.aZ,A.aS(A.Q(o,d,d,d,d,i?d:j.ca(s.ax.k3,B.u),d,d,d),1)],h),B.k,B.i,B.h,0,d) j=i?d:j.aCU(s.ax.k3,"monospace",B.u) j=A.IZ("\u041a\u043e\u0434: "+c.a,j,d) i=n?"\u041e\u0441\u0442\u0430\u043b\u043e\u0441\u044c \u0432\u0440\u0435\u043c\u0435\u043d\u0438: "+this.alo():"\u041a\u043e\u0434 \u0431\u043e\u043b\u044c\u0448\u0435 \u043d\u0435 \u0430\u043a\u0442\u0438\u0432\u0435\u043d" @@ -109319,23 +109319,23 @@ g=k.z if(g==null)g=d else{f=s.ax e=f.rx -g=g.cd(e==null?f.k3:e,B.u)}h=A.b([l,B.bL,j,B.a1,A.Q(i,d,d,d,d,g,d,d,d)],h) +g=g.ca(e==null?f.k3:e,B.u)}h=A.b([l,B.bL,j,B.a1,A.Q(i,d,d,d,d,g,d,d,d)],h) if(r===B.i1){c=k.Q if(c==null)c=d else{r=s.ax l=r.rx -c=c.cd(l==null?r.k3:l,B.u)}h.push(new A.as(B.iX,A.Q("\u041a\u043e\u0434 \u043e\u0442\u043f\u0440\u0430\u0432\u043b\u0435\u043d. \u041d\u0430\u0436\u043c\u0438\u0442\u0435 \xab\u0412\u043e\u0439\u0442\u0438\xbb \u0434\u043b\u044f \u0437\u0430\u0432\u0435\u0440\u0448\u0435\u043d\u0438\u044f.",d,d,d,d,c,d,d,d),d))}else if(c.gGo()){c=k.Q +c=c.ca(l==null?r.k3:l,B.u)}h.push(new A.as(B.iX,A.Q("\u041a\u043e\u0434 \u043e\u0442\u043f\u0440\u0430\u0432\u043b\u0435\u043d. \u041d\u0430\u0436\u043c\u0438\u0442\u0435 \xab\u0412\u043e\u0439\u0442\u0438\xbb \u0434\u043b\u044f \u0437\u0430\u0432\u0435\u0440\u0448\u0435\u043d\u0438\u044f.",d,d,d,d,c,d,d,d),d))}else if(c.gGo()){c=k.Q if(c==null)c=d else{r=s.ax l=r.rx -c=c.cd(l==null?r.k3:l,B.u)}h.push(new A.as(B.iX,A.Q("\u041f\u043e\u043b\u0443\u0447\u0438\u0442\u0435 \u043d\u043e\u0432\u044b\u0439 \u043a\u043e\u0434 \u0438 \u043f\u043e\u0432\u0442\u043e\u0440\u0438\u0442\u0435 \u043f\u043e\u043f\u044b\u0442\u043a\u0443.",d,d,d,d,c,d,d,d),d))}else{c=k.Q +c=c.ca(l==null?r.k3:l,B.u)}h.push(new A.as(B.iX,A.Q("\u041f\u043e\u043b\u0443\u0447\u0438\u0442\u0435 \u043d\u043e\u0432\u044b\u0439 \u043a\u043e\u0434 \u0438 \u043f\u043e\u0432\u0442\u043e\u0440\u0438\u0442\u0435 \u043f\u043e\u043f\u044b\u0442\u043a\u0443.",d,d,d,d,c,d,d,d),d))}else{c=k.Q if(r===B.df){if(c==null)c=d else{r=s.ax l=r.rx -c=c.cd(l==null?r.k3:l,B.u)}h.push(new A.as(B.iX,A.Q("\u041a\u043e\u0434 \u0443\u0436\u0435 \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u043d \u0434\u043b\u044f \u0432\u0445\u043e\u0434\u0430.",d,d,d,d,c,d,d,d),d))}else{if(c==null)c=d +c=c.ca(l==null?r.k3:l,B.u)}h.push(new A.as(B.iX,A.Q("\u041a\u043e\u0434 \u0443\u0436\u0435 \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u043d \u0434\u043b\u044f \u0432\u0445\u043e\u0434\u0430.",d,d,d,d,c,d,d,d),d))}else{if(c==null)c=d else{r=s.ax l=r.rx -c=c.cd(l==null?r.k3:l,B.u)}h.push(new A.as(B.iX,A.Q("\u0411\u043e\u0442 \u0434\u043e\u043b\u0436\u0435\u043d \u043e\u0442\u043a\u0440\u044b\u0442\u044c\u0441\u044f \u0430\u0432\u0442\u043e\u043c\u0430\u0442\u0438\u0447\u0435\u0441\u043a\u0438. \u041e\u0442\u043f\u0440\u0430\u0432\u044c\u0442\u0435 \u043a\u043e\u0434 \u0432 \u0431\u043e\u0442\u0435, \u0447\u0442\u043e\u0431\u044b \u043f\u0440\u043e\u0434\u043e\u043b\u0436\u0438\u0442\u044c.",d,d,d,d,c,d,d,d),d))}}return A.fB(new A.as(B.W,A.a9(h,B.B,B.i,B.h,0,B.l),d),d,2,d,new A.cy(m,B.r))}, +c=c.ca(l==null?r.k3:l,B.u)}h.push(new A.as(B.iX,A.Q("\u0411\u043e\u0442 \u0434\u043e\u043b\u0436\u0435\u043d \u043e\u0442\u043a\u0440\u044b\u0442\u044c\u0441\u044f \u0430\u0432\u0442\u043e\u043c\u0430\u0442\u0438\u0447\u0435\u0441\u043a\u0438. \u041e\u0442\u043f\u0440\u0430\u0432\u044c\u0442\u0435 \u043a\u043e\u0434 \u0432 \u0431\u043e\u0442\u0435, \u0447\u0442\u043e\u0431\u044b \u043f\u0440\u043e\u0434\u043e\u043b\u0436\u0438\u0442\u044c.",d,d,d,d,c,d,d,d),d))}}return A.fB(new A.as(B.W,A.a9(h,B.B,B.i,B.h,0,B.l),d),d,2,d,new A.cy(m,B.r))}, Dr(a){return this.atX(a)}, atX(a){var s=0,r=A.u(t.H),q=1,p=[],o=this,n,m,l,k,j,i,h var $async$Dr=A.p(function(b,c){if(b===1){p.push(c) @@ -109393,64 +109393,69 @@ r=s.f r.ab$=$.au() r.O$=0 s.ar()}, -E(a1){var s,r,q,p,o,n,m,l,k,j,i,h,g=this,f=null,e=A.m(a1),d=A.ap(a1,f,t.w).w,c=e.ax,b=c.k2,a=e.ok,a0=a.r -a0=A.mj(f,b,f,0,f,f,A.Q("Login",f,f,f,f,a0==null?f:a0.cq(B.u),f,f,f)) -d=d.a.a<600?16:32 +E(a3){var s,r,q,p,o,n,m,l,k,j,i,h,g,f,e=this,d=null,c=A.m(a3),b=A.ap(a3,d,t.w).w,a=c.ax,a0=a.k2,a1=c.ok,a2=a1.r +a2=A.mj(d,a0,d,0,d,d,A.Q("Login",d,d,d,d,a2==null?d:a2.cq(B.u),d,d,d)) +b=b.a.a<600?16:32 s=A.aQ(16) -r=c.k3 -q=A.bl(B.O2,r,f,64) -p=a.e -p=A.Q("Sign in to your account",f,f,f,f,p==null?f:p.cd(r,B.u),B.Y,f,f) -o=a.z +r=a.k3 +q=A.bl(B.O2,r,d,64) +p=a1.e +p=A.Q("Sign in to your account",d,d,d,d,p==null?d:p.ca(r,B.u),B.X,d,d) +o=a1.z n=o==null -if(n)m=f -else{m=c.rx -m=o.cd(m==null?r:m,B.u)}l=t.p -m=A.b([q,B.aH,p,B.a1,A.Q("Save your progress and sync data",f,f,f,f,m,B.Y,f,f),B.de],l) -if(g.e!=null){q=B.ac.jM(0.1) +if(n)m=d +else{m=a.rx +m=o.ca(m==null?r:m,B.u)}l=t.p +m=A.b([q,B.aH,p,B.a1,A.Q("Save your progress and sync data",d,d,d,d,m,B.X,d,d),B.de],l) +if(e.e!=null){q=B.ac.jM(0.1) p=A.aQ(12) k=A.e7(B.ac.jM(0.3),1) -j=g.e -B.b.L(m,A.b([A.aG(f,A.b49(A.cl(A.b([B.Fp,B.Fo,A.cl(f,f,A.dn(f,f,B.ac,f,f,f,f,f,f,f,f,n?f:o.r,f,f,B.u,f,f,!0,f,f,f,f,f,f,f,f),j)],t.VO),f,f,f),B.Y),B.m,f,f,new A.aO(q,f,k,p,f,f,B.t),f,f,f,B.MP,B.W,f,f,f)],l))}q=g.d -p=q?f:new A.aEa(g,a1) -o=q?A.by(A.b0T(f,c.c,f,f,f,f,f,2,f,f),20,20):B.Os +j=e.e +B.b.L(m,A.b([A.aG(d,A.b49(A.cl(A.b([B.Fp,B.Fo,A.cl(d,d,A.dn(d,d,B.ac,d,d,d,d,d,d,d,d,n?d:o.r,d,d,B.u,d,d,!0,d,d,d,d,d,d,d,d),j)],t.VO),d,d,d),B.X),B.m,d,d,new A.aO(q,d,k,p,d,d,B.t),d,d,d,B.MP,B.W,d,d,d)],l))}q=e.d +p=q?d:new A.aEa(e,a3) +o=q?A.by(A.b0T(d,a.c,d,d,d,d,d,2,d,d),20,20):B.Os q=q?"Signing in...":"Sign in with Google" -n=a.as +n=a1.as k=n==null -m.push(A.by(A.i1(o,A.Q(q,f,f,f,f,k?f:n.cq(B.u),f,f,f),p,A.nY(f,f,f,f,f,f,f,f,f,f,f,f,f,f,new A.cy(A.aQ(12),B.r),f,f,f,f,f)),56,1/0)) +m.push(A.by(A.i1(o,A.Q(q,d,d,d,d,k?d:n.cq(B.u),d,d,d),p,A.nY(d,d,d,d,d,d,d,d,d,d,d,d,d,d,new A.cy(A.aQ(12),B.r),d,d,d,d,d)),56,1/0)) m.push(B.aH) -q=e.ch -p=A.aS(A.aXp(q,f,1),1) -o=a.Q -if(o==null)o=f -else{j=c.rx -o=o.cd(j==null?r:j,B.u)}m.push(A.aV(A.b([p,new A.as(B.bH,A.Q("OR",f,f,f,f,o,f,f,f),f),A.aS(A.aXp(q,f,1),1)],l),B.k,B.i,B.h,0,f)) +q=c.ch +p=A.aS(A.aXp(q,d,1),1) +o=a1.Q +j=o==null +if(j)i=d +else{i=a.rx +i=o.ca(i==null?r:i,B.u)}m.push(A.aV(A.b([p,new A.as(B.bH,A.Q("OR",d,d,d,d,i,d,d,d),d),A.aS(A.aXp(q,d,1),1)],l),B.k,B.i,B.h,0,d)) m.push(B.aH) -a=a.y -p=a==null -o=A.Q("\u0412\u0432\u0435\u0434\u0438\u0442\u0435 \u043a\u043e\u0434 \u0438\u0437 Telegram \u0431\u043e\u0442\u0430",f,f,f,f,p?f:a.cd(r,B.u),f,f,f) -j=g.d -i=p?f:a.cd(r,B.u) -h=p?f:a.cd(e.cy,B.u) -i=A.ZK(f,B.cq,!1,f,!0,B.E,f,A.aWg(),g.f,f,f,f,f,f,2,A.jJ(f,new A.dH(4,A.aQ(12),new A.b8(q,1,B.G,-1)),f,f,f,f,"",f,!0,new A.dH(4,A.aQ(12),new A.b8(q,1,B.G,-1)),f,f,f,f,f,e.at,!0,f,f,f,f,new A.dH(4,A.aQ(12),new A.b8(c.b,2,B.G,-1)),f,f,f,f,f,f,f,f,h,"123456",f,f,f,f,f,f,f,f,f,!0,!0,f,A.bl(B.NO,r,f,f),f,f,f,f,f,f,f,f,f,f,f,f),B.F,!0,f,!0,!j,!1,f,B.cU,f,f,f,f,B.oJ,f,6,f,1,f,f,!1,"\u2022",f,f,f,new A.aEb(g,a1),f,!1,f,f,!1,f,!0,f,B.eY,f,f,f,f,f,f,f,f,f,f,f,i,!0,B.ap,f,B.cR,f,B.i2,f,f) -j=g.d -h=j?f:new A.aEc(g,a1) -j=j?"\u0421\u043e\u0437\u0434\u0430\u043d\u0438\u0435...":"\u041f\u043e\u043b\u0443\u0447\u0438\u0442\u044c \u043a\u043e\u0434" -j=A.aS(A.i1(B.OT,A.Q(j,f,f,f,f,k?f:n.cq(B.u),f,f,f),h,A.nY(f,f,f,f,f,f,f,f,f,f,f,f,f,f,new A.cy(A.aQ(12),B.r),f,f,f,f,f)),1) -h=g.d?f:g.gatW() -q=A.b([o,B.bL,i,B.P,A.aV(A.b([j,B.bR,A.aS(A.HE(B.OF,A.Q("\u041e\u0442\u043a\u0440\u044b\u0442\u044c \u0431\u043e\u0442\u0430",f,f,f,f,k?f:n.cq(B.u),f,f,f),h,A.b3l(f,f,f,f,f,f,f,f,f,f,f,f,f,f,new A.cy(A.aQ(12),B.r),new A.b8(q,1,B.G,-1),f,f,f,f)),1)],l),B.k,B.i,B.h,0,f)],l) -if(g.r!=null)B.b.L(q,A.b([B.P,g.ahJ(a1)],l)) +a1=a1.y +p=a1==null +i=A.Q("\u0412\u0432\u0435\u0434\u0438\u0442\u0435 \u043a\u043e\u0434 \u0438\u0437 Telegram \u0431\u043e\u0442\u0430",d,d,d,d,p?d:a1.ca(r,B.u),d,d,d) +h=e.d +g=p?d:a1.ca(r,B.u) +f=p?d:a1.ca(c.cy,B.u) +g=A.ZK(d,B.cq,!1,d,!0,B.E,d,A.aWg(),e.f,d,d,d,d,d,2,A.jJ(d,new A.dH(4,A.aQ(12),new A.b8(q,1,B.G,-1)),d,d,d,d,"",d,!0,new A.dH(4,A.aQ(12),new A.b8(q,1,B.G,-1)),d,d,d,d,d,c.at,!0,d,d,d,d,new A.dH(4,A.aQ(12),new A.b8(a.b,2,B.G,-1)),d,d,d,d,d,d,d,d,f,"123456",d,d,d,d,d,d,d,d,d,!0,!0,d,A.bl(B.NO,r,d,d),d,d,d,d,d,d,d,d,d,d,d,d),B.F,!0,d,!0,!h,!1,d,B.cU,d,d,d,d,B.oJ,d,6,d,1,d,d,!1,"\u2022",d,d,d,new A.aEb(e,a3),d,!1,d,d,!1,d,!0,d,B.eY,d,d,d,d,d,d,d,d,d,d,d,g,!0,B.ap,d,B.cR,d,B.i2,d,d) +h=e.d +f=h?d:new A.aEc(e,a3) +h=h?"\u0421\u043e\u0437\u0434\u0430\u043d\u0438\u0435...":"\u041f\u043e\u043b\u0443\u0447\u0438\u0442\u044c \u043a\u043e\u0434" +h=A.aS(A.i1(B.OT,A.Q(h,d,d,d,d,k?d:n.cq(B.u),d,d,d),f,A.nY(d,d,d,d,d,d,d,d,d,d,d,d,d,d,new A.cy(A.aQ(12),B.r),d,d,d,d,d)),1) +f=e.d?d:e.gatW() +q=A.b([i,B.bL,g,B.P,A.aV(A.b([h,B.bR,A.aS(A.HE(B.OF,A.Q("\u041e\u0442\u043a\u0440\u044b\u0442\u044c \u0431\u043e\u0442\u0430",d,d,d,d,k?d:n.cq(B.u),d,d,d),f,A.b3l(d,d,d,d,d,d,d,d,d,d,d,d,d,d,new A.cy(A.aQ(12),B.r),new A.b8(q,1,B.G,-1),d,d,d,d)),1)],l),B.k,B.i,B.h,0,d)],l) +if(e.r!=null)B.b.L(q,A.b([B.P,e.ahJ(a3)],l)) m.push(A.a9(q,B.B,B.i,B.h,0,B.l)) m.push(B.aH) -q=g.d?f:new A.aEd(g,a1) -m.push(A.by(A.i1(B.OL,A.Q("\u0412\u043e\u0439\u0442\u0438 \u0441 \u043a\u043e\u0434\u043e\u043c Telegram",f,f,f,f,k?f:n.cq(B.u),f,f,f),q,A.nY(f,f,f,f,f,f,f,f,f,f,f,f,f,f,new A.cy(A.aQ(12),B.r),f,f,f,f,f)),56,1/0)) +q=e.d?d:new A.aEd(e,a3) +m.push(A.by(A.i1(B.OL,A.Q("\u0412\u043e\u0439\u0442\u0438 \u0441 \u043a\u043e\u0434\u043e\u043c Telegram",d,d,d,d,k?d:n.cq(B.u),d,d,d),q,A.nY(d,d,d,d,d,d,d,d,d,d,d,d,d,d,new A.cy(A.aQ(12),B.r),d,d,d,d,d)),56,1/0)) m.push(B.aH) -q=g.d?f:new A.aEe(a1) -o=A.w9(f,f,f,f,f,f,f,f,f,f,f,f,B.N2,f,f,f,f,f,f,f) -if(p)c=f -else{c=c.rx -c=a.cd(c==null?r:c,B.u)}m.push(A.f7(!1,A.Q("Continue as guest",f,f,f,f,c,f,f,f),f,f,f,f,f,f,q,f,o)) -return A.ja(a0,b,A.c0(A.io(new A.ef(B.H_,A.fB(new A.as(B.dy,A.a9(m,B.ba,B.i,B.a8,0,B.l),f),f,2,f,new A.cy(s,B.r)),f),f,B.F,new A.am(d,32,d,32),f,f,B.a6),f,f),f,f)}} +q=e.d?d:new A.aEe(a3) +n=A.w9(d,d,d,d,d,d,d,d,d,d,d,d,B.N2,d,d,d,d,d,d,d) +if(p)a1=d +else{p=a.rx +a1=a1.ca(p==null?r:p,B.u)}m.push(A.f7(!1,A.Q("Continue as guest",d,d,d,d,a1,d,d,d),d,d,d,d,d,d,q,d,n)) +m.push(B.P) +if(j)a=d +else{a=a.rx +a=o.ca(a==null?r:a,B.a2)}m.push(A.Q("Version 1.0.0",d,d,d,d,a,B.X,d,d)) +return A.ja(a2,a0,A.c0(A.io(new A.ef(B.H_,A.fB(new A.as(B.dy,A.a9(m,B.ba,B.i,B.a8,0,B.l),d),d,2,d,new A.cy(s,B.r)),d),d,B.F,new A.am(b,32,b,32),d,d,B.a6),d,d),d,d)}} A.aDR.prototype={ $0(){var s=this.a s.d=!0 @@ -109644,11 +109649,11 @@ s.push(A.i1(r,A.Q(m.XO(a)?"Finish":"Next",l,l,l,l,l,l,l,l),m.gasE(),l)) B.b.L(i,A.b([k,A.aV(s,B.k,B.U,B.h,0,l)],q))}return A.a9(A.b([g,A.aS(A.io(A.a9(i,B.ba,B.i,B.h,0,B.l),l,B.F,new A.am(h,h,h,h),l,l,B.a6),1)],q),B.k,B.i,B.h,0,B.l)}, ah2(a,b){var s,r,q,p,o,n,m,l=this,k=null,j=b.e,i=j>0?B.d.a5(b.d/j*100):0,h=24*$.bd().gdS(),g=A.aBk(new A.aIR(l,i),k,B.pV,B.Mx,k,new A.aF(0,1,t.Y),t.i),f=A.by(k,32*$.bd().gcf(),k),e=l.c e.toString -e=A.Q("Game Completed!",k,k,k,k,A.m(e).ok.e,B.Y,k,k) +e=A.Q("Game Completed!",k,k,k,k,A.m(e).ok.e,B.X,k,k) s=A.by(k,16*$.bd().gcf(),k) r=l.c r.toString -r=A.Q(""+b.d+"/"+j+" correct answers",k,k,k,k,A.m(r).ok.r,B.Y,k,k) +r=A.Q(""+b.d+"/"+j+" correct answers",k,k,k,k,A.m(r).ok.r,B.X,k,k) j=A.by(k,8*$.bd().gcf(),k) q=b.c.a p=B.e.cA(q,6e7) @@ -109658,7 +109663,7 @@ q=B.c.dh(B.e.j(q%60),2,"0") n=l.c n.toString m=t.p -return A.aG(k,A.a9(A.b([g,f,e,s,r,j,A.Q("Time: "+(o+":"+q),k,k,k,k,A.m(n).ok.y,B.Y,k,k),A.by(k,48*$.bd().gcf(),k),A.aV(A.b([A.HE(B.dD,B.a5z,l.gavJ(),k),A.by(k,k,16*$.bd().gdS()),A.i1(B.jj,B.a5k,new A.aIS(l),k)],m),B.k,B.U,B.h,0,k)],m),B.k,B.U,B.h,0,B.l),B.m,k,k,k,k,k,k,k,new A.am(h,h,h,h),k,k,k)}, +return A.aG(k,A.a9(A.b([g,f,e,s,r,j,A.Q("Time: "+(o+":"+q),k,k,k,k,A.m(n).ok.y,B.X,k,k),A.by(k,48*$.bd().gcf(),k),A.aV(A.b([A.HE(B.dD,B.a5z,l.gavJ(),k),A.by(k,k,16*$.bd().gdS()),A.i1(B.jj,B.a5k,new A.aIS(l),k)],m),B.k,B.U,B.h,0,k)],m),B.k,B.U,B.h,0,B.l),B.m,k,k,k,k,k,k,k,new A.am(h,h,h,h),k,k,k)}, axv(){var s,r,q=this.c q.toString s=A.da(q,!1,t.O) @@ -109685,7 +109690,7 @@ s=A.da(q,!1,t.O) r=s==null?null:s.gc5().gN(0).gcg(0) if(r!=null){r.gig().gN(0).glp().gN(0).aKb() this.qh()}}, -x_(a){if(a>=80)return B.X +x_(a){if(a>=80)return B.Y if(a>=60)return B.bc return B.ac}, XO(a){return a.vd(new A.aIT(),new A.aIU())}, @@ -109734,11 +109739,11 @@ m=A.bl(B.Oa,A.m(l).ax.b,p,m) l=A.by(p,24*$.bd().gcf(),p) s=o.c s.toString -s=A.Q("Ready to Start?",p,p,p,p,A.m(s).ok.e,B.Y,p,p) +s=A.Q("Ready to Start?",p,p,p,p,A.m(s).ok.e,B.X,p,p) r=A.by(p,16*$.bd().gcf(),p) q=o.c q.toString -return A.aG(p,A.a9(A.b([m,l,s,r,A.Q(a.b,p,p,p,p,A.m(q).ok.r,B.Y,p,p),A.by(p,32*$.bd().gcf(),p),A.i1(B.OM,B.a5c,o.gaxu(),A.nY(p,p,p,p,p,p,p,p,p,p,p,new A.E(200*$.bd().gdS(),56*$.bd().gcf()),p,p,p,p,p,p,A.dn(p,p,p,p,p,p,p,p,p,p,p,$.bd().j9(18),p,p,p,p,p,!0,p,p,p,p,p,p,p,p),p))],t.p),B.k,B.U,B.h,0,B.l),B.m,p,p,p,p,p,p,p,new A.am(n,n,n,n),p,p,p)}, +return A.aG(p,A.a9(A.b([m,l,s,r,A.Q(a.b,p,p,p,p,A.m(q).ok.r,B.X,p,p),A.by(p,32*$.bd().gcf(),p),A.i1(B.OM,B.a5c,o.gaxu(),A.nY(p,p,p,p,p,p,p,p,p,p,p,new A.E(200*$.bd().gdS(),56*$.bd().gcf()),p,p,p,p,p,p,A.dn(p,p,p,p,p,p,p,p,p,p,p,$.bd().j9(18),p,p,p,p,p,!0,p,p,p,p,p,p,p,p),p))],t.p),B.k,B.U,B.h,0,B.l),B.m,p,p,p,p,p,p,p,new A.am(n,n,n,n),p,p,p)}, $S:766} A.aIL.prototype={ $8(a,b,c,d,e,f,g,h){return this.a.agR(this.b,a,b,c,f,g,e)}, @@ -109819,11 +109824,11 @@ A.a3_.prototype={ E(a){var s=null return A.ja(A.mj(s,s,new A.vp(new A.as(B.aM,A.ZK(s,B.cq,!1,s,!0,B.E,s,A.aWg(),s,s,s,s,s,s,2,A.jJ(s,new A.dH(4,A.aQ(8),B.bX),s,s,s,s,s,s,!0,s,s,s,s,s,s,A.m(a).at,!0,s,s,s,s,s,s,s,s,s,s,s,s,s,s,"Search games...",s,s,s,s,s,s,s,s,s,!0,!0,s,B.tc,s,s,s,s,s,s,s,s,s,s,s,s),B.F,!0,s,!0,s,!1,s,B.cU,s,s,s,s,s,s,s,s,1,s,s,!1,"\u2022",s,new A.aJb(a),s,s,s,!1,s,s,!1,s,!0,s,B.eY,s,s,s,s,s,s,s,s,s,s,s,s,!0,B.ap,s,B.cR,s,s,s,s),s),B.hX,s),s,s,s,B.a57),s,new A.fO(s,new A.aJc(this),s,t.Zw),s,s)}, ah6(a,b){var s=null,r=b.length===0,q=A.bl(r?B.mS:B.rX,B.hA,s,80),p=t.p -q=A.b([q,B.P,A.Q(r?"No games available":'No games found for "'+b+'"',s,s,s,s,B.ks,B.Y,s,s)],p) +q=A.b([q,B.P,A.Q(r?"No games available":'No games found for "'+b+'"',s,s,s,s,B.ks,B.X,s,s)],p) if(!r)B.b.L(q,A.b([B.a1,A.f7(!1,B.ET,s,s,s,s,s,s,new A.aJ2(a),s,s)],p)) return A.c0(A.a9(q,B.k,B.U,B.h,0,B.l),s,s)}, ah7(a,b,c){var s=null -return A.c0(new A.as(B.dy,A.a9(A.b([B.jk,B.P,B.a5G,B.a1,A.IZ(b,B.kt,B.Y),B.aH,A.i1(B.dD,B.i5,new A.aJ3(c),s)],t.p),B.k,B.U,B.h,0,B.l),s),s,s)}} +return A.c0(new A.as(B.dy,A.a9(A.b([B.jk,B.P,B.a5G,B.a1,A.IZ(b,B.kt,B.X),B.aH,A.i1(B.dD,B.i5,new A.aJ3(c),s)],t.p),B.k,B.U,B.h,0,B.l),s),s,s)}} A.aJb.prototype={ $1(a){var s,r=A.da(this.a,!1,t.O) if(r!=null){s=r.gc5().gN(0).gcg(0) @@ -109885,11 +109890,11 @@ ahx(a,b){var s=J.aj(b) if(A.ap(a,null,t.w).w.a.a<600)return A.uK(new A.aJw(b),s.gC(b),B.aM,B.le,B.a6) else return A.yJ(null,B.F,new A.AJ(A.aYx(a),16,16,0.7),new A.aJx(b),s.gC(b),B.W,B.le,!1)}, ar2(a,b){var s=null,r=b.length===0,q=A.bl(r?B.ee:B.rX,B.hA,s,80),p=t.p -q=A.b([q,B.P,A.Q(r?"No packs available":'No packs found for "'+b+'"',s,s,s,s,B.ks,B.Y,s,s)],p) +q=A.b([q,B.P,A.Q(r?"No packs available":'No packs found for "'+b+'"',s,s,s,s,B.ks,B.X,s,s)],p) if(!r)B.b.L(q,A.b([B.a1,A.f7(!1,B.ET,s,s,s,s,s,s,new A.aJs(a),s,s)],p)) return A.c0(A.a9(q,B.k,B.U,B.h,0,B.l),s,s)}, ar3(a,b,c){var s=null -return A.c0(new A.as(B.dy,A.a9(A.b([B.jk,B.P,B.a5p,B.a1,A.IZ(b,B.kt,B.Y),B.aH,A.i1(B.dD,B.i5,new A.aJt(c),s)],t.p),B.k,B.U,B.h,0,B.l),s),s,s)}} +return A.c0(new A.as(B.dy,A.a9(A.b([B.jk,B.P,B.a5p,B.a1,A.IZ(b,B.kt,B.X),B.aH,A.i1(B.dD,B.i5,new A.aJt(c),s)],t.p),B.k,B.U,B.h,0,B.l),s),s,s)}} A.aJD.prototype={ $1(a){var s,r=A.da(this.a,!1,t.O) if(r!=null){s=r.gc5().gN(0).gcg(0) @@ -110038,7 +110043,7 @@ return A.ja(s,s,A.vD(!0,this.au0(),B.am,!0),s,s)}, au0(){var s,r=this,q=null if(r.e)return B.ck s=r.f -if(s!=null)return A.c0(new A.as(B.dy,A.a9(A.b([B.jk,B.P,B.a58,B.a1,A.IZ(s,B.kt,B.Y),B.aH,A.i1(B.dD,B.i5,r.garV(),q)],t.p),B.k,B.U,B.h,0,B.l),q),q,q) +if(s!=null)return A.c0(new A.as(B.dy,A.a9(A.b([B.jk,B.P,B.a58,B.a1,A.IZ(s,B.kt,B.X),B.aH,A.i1(B.dD,B.i5,r.garV(),q)],t.p),B.k,B.U,B.h,0,B.l),q),q,q) if(r.d==null)return B.qd return r.ahv()}, xo(){var s=0,r=A.u(t.H),q,p=2,o=[],n=[],m=this,l @@ -110089,7 +110094,7 @@ else{j=A.bl(B.Of,l,g,20) i=h.c i.toString i=A.m(i).ok.w -j=A.aV(A.b([j,B.aZ,A.Q("Buy Pack",g,g,g,g,i==null?g:i.cd(l,B.u),g,g,g)],s),B.k,B.U,B.h,0,g)}B.b.L(n,A.b([new A.as(B.bH,A.FO(j,m,k),g),B.P],s))}if(!r)B.b.L(n,A.b([new A.WC(h.r,new A.aM9(h),new A.aMa(h),new A.aMb(h),h.w,h.Q,h.ax,g),B.P],s)) +j=A.aV(A.b([j,B.aZ,A.Q("Buy Pack",g,g,g,g,i==null?g:i.ca(l,B.u),g,g,g)],s),B.k,B.U,B.h,0,g)}B.b.L(n,A.b([new A.as(B.bH,A.FO(j,m,k),g),B.P],s))}if(!r)B.b.L(n,A.b([new A.WC(h.r,new A.aM9(h),new A.aMa(h),new A.aMb(h),h.w,h.Q,h.ax,g),B.P],s)) n.push(A.aS(o?A.aV(A.b([A.aS(h.Uf(q,p),1),new A.WE(h.WG(),h.garG(),g)],s),B.B,B.i,B.h,0,g):A.a9(A.b([h.ahn(p),B.P,A.aS(h.Uf(q,p),1)],s),B.k,B.i,B.h,0,B.l),1)) return A.a9(n,B.k,B.i,B.h,0,B.l)}, ahn(a){var s=null,r=this.WG(),q=A.a_(r).h("a0<1,c>") @@ -110505,13 +110510,13 @@ g=s==null a=A.bl(B.mW,g?d:s,a2,16) f=f.Q if(f==null)s=a2 -else s=f.cd(g?d:s,B.u) +else s=f.ca(g?d:s,B.u) B.b.L(c,A.b([B.a1,A.aG(a2,A.aV(A.b([a,B.cx,A.Q("Premium",a2,a2,a2,a2,s,a2,a2,a2)],b),B.k,B.i,B.a8,0,a2),B.m,a2,a2,new A.aO(r,a2,a2,m,a2,a2,B.t),a2,a2,a2,a2,B.eZ,a2,a2,a2)],b))}s=A.fB(new A.as(B.W,A.aV(A.b([new A.SC(e,h,32,a2),B.cw,A.aS(A.a9(c,B.B,B.i,B.h,0,B.l),1)],b),B.k,B.i,B.h,0,a2),a2),a2,2,a2,a2) r=k.a a0=B.e.cA(r,36e8) r=""+B.e.aU(B.e.cA(r,6e7),60) a1=a0>0?""+a0+"h "+r+"m":r+"m" -r=A.aV(A.b([A.aS(new A.AX(B.Ob,"Learned Words",B.e.j(p*10),B.eo,a2),1),B.bR,A.aS(new A.AX(B.f8,"Tests Completed",B.e.j(n*5+l),B.X,a2),1),B.bR,A.aS(new A.AX(B.rZ,"Study Time",a1,B.bc,a2),1)],b),B.k,B.i,B.h,0,a2) +r=A.aV(A.b([A.aS(new A.AX(B.Ob,"Learned Words",B.e.j(p*10),B.eo,a2),1),B.bR,A.aS(new A.AX(B.f8,"Tests Completed",B.e.j(n*5+l),B.Y,a2),1),B.bR,A.aS(new A.AX(B.rZ,"Study Time",a1,B.bc,a2),1)],b),B.k,B.i,B.h,0,a2) p=A.m(a3).ok.w n=this.a return A.io(A.a9(A.b([s,B.aH,r,B.aH,new A.YQ(j,a2),B.aH,A.fB(A.a9(A.b([new A.as(B.W,A.Q("Account Info",a2,a2,a2,a2,p==null?a2:p.cq(B.u),a2,a2,a2),a2),B.h7,new A.OY(B.ee,"Packs",B.e.j(q.length),a2),B.h7,new A.OY(B.Oe,"Purchases",B.e.j(o.length),a2)],b),B.B,B.i,B.h,0,B.l),a2,2,a2,a2),B.aH,n.ahG(a3),B.aH,n.ahl(a3)],b),B.ba,B.i,B.h,0,B.l),a2,B.F,B.W,a2,a2,B.a6)}, @@ -110673,7 +110678,7 @@ s.push(new A.as(B.W,new A.a5E(o,r?q:new A.aN_(this,b),r,q),q)) s.push(B.de) return A.aS(A.a9(s,B.ba,B.i,B.h,0,B.l),1)}, ah1(a,b,c){var s=null -return A.c0(A.a9(A.b([B.OE,B.P,A.Q(c,s,s,s,s,A.m(a).ok.r,B.Y,s,s),B.de,A.FO(B.a53,new A.aMZ(a),s)],t.p),B.k,B.U,B.h,0,B.l),s,s)}, +return A.c0(A.a9(A.b([B.OE,B.P,A.Q(c,s,s,s,s,A.m(a).ok.r,B.X,s,s),B.de,A.FO(B.a53,new A.aMZ(a),s)],t.p),B.k,B.U,B.h,0,B.l),s,s)}, l(){this.d=null this.ar()}} A.aNd.prototype={ @@ -110755,7 +110760,7 @@ return null}, $S:0} A.a4P.prototype={ E(a){var s,r=null,q=A.m(a),p=this.d,o=A.b([p.aj(0.15),p.aj(0.05)],t.t_),n=this.c,m=q.ok,l=m.e -p=l==null?r:l.cd(p,B.u) +p=l==null?r:l.ca(p,B.u) p=A.Q(n.c,r,r,r,r,p,r,r,r) m=m.w if(m==null)m=r @@ -110796,7 +110801,7 @@ r=s==null q=r?i:s p=l.ok.as o=p==null -n=o?m:p.cd(i,B.aT) +n=o?m:p.ca(i,B.aT) if(o)s=m else s=p.aF(r?i:s) return A.ja(A.mj(m,j,new A.vp(A.aG(m,A.b4y(h,B.I,k.b,3,!0,i,n,m,new A.b5(B.I,t.rc),B.Es,B.Q6,q,s),B.m,m,m,new A.aO(j,m,new A.dL(B.r,B.r,new A.b8(l.ch,1,B.G,-1),B.r),m,m,m,B.t),m,m,m,m,m,m,m,m),B.on,m),0,i,m,B.a52),m,new A.fO(m,new A.aPP(this),m,t.sL),m,m)}, @@ -110853,7 +110858,7 @@ this.b.PW()}, $S:0} A.QK.prototype={ by(){this.co() -this.cb() +this.cc() this.e5()}, l(){var s=this,r=s.aV$ if(r!=null)r.J(0,s.gdV()) @@ -110894,7 +110899,7 @@ s=A.aQ(16) r=o.ok.z if(r==null)r=p else{q=n.e -r=r.cd(q==null?n.c:q,B.u)}return A.aG(p,A.Q(""+this.c+"/"+this.d,p,p,p,p,r,p,p,p),B.m,p,p,new A.aO(m,p,p,s,p,p,B.t),p,p,p,p,B.re,p,p,p)}} +r=r.ca(q==null?n.c:q,B.u)}return A.aG(p,A.Q(""+this.c+"/"+this.d,p,p,p,p,r,p,p,p),B.m,p,p,new A.aO(m,p,p,s,p,p,B.t),p,p,p,p,B.re,p,p,p)}} A.BO.prototype={ E(a){var s,r,q,p,o,n,m=null,l=A.m(a),k=l.ax,j=this.c,i=j.e,h=i==null,g=!h,f=j.r,e=g?2:1 if(g)s=A.a1(B.d.a5(25.5),B.d8.n()>>>16&255,B.d8.n()>>>8&255,B.d8.n()&255) @@ -110910,7 +110915,7 @@ p=s.w if(p==null)q=m else{if(g)q=k.k3 else{q=k.rx -if(q==null)q=k.k3}q=p.cd(q,B.u)}q=A.Q(j.b,m,m,m,m,q,m,m,m) +if(q==null)q=k.k3}q=p.ca(q,B.u)}q=A.Q(j.b,m,m,m,m,q,m,m,m) p=s.z if(p==null)p=m else{o=k.rx @@ -110918,11 +110923,11 @@ if(g){if(o==null)o=k.k3}else{if(o==null)o=k.k3 o=A.a1(153,o.n()>>>16&255,o.n()>>>8&255,o.n()&255)}o=p.aF(o) p=o}o=t.p p=A.aS(A.a9(A.b([q,B.b_,A.Q(j.c,m,m,m,m,p,m,m,m)],o),B.B,B.i,B.h,0,B.l),1) -if(g)j=A.a1(B.d.a5(25.5),B.X.n()>>>16&255,B.X.n()>>>8&255,B.X.n()&255) +if(g)j=A.a1(B.d.a5(25.5),B.Y.n()>>>16&255,B.Y.n()>>>8&255,B.Y.n()&255) else{j=k.ry if(j==null){j=k.A if(j==null)j=k.k3}j=j.aj(0.1)}q=g?B.f7:B.O1 -if(g)n=B.X +if(g)n=B.Y else{n=k.ry if(n==null){n=k.A if(n==null)n=k.k3}}j=A.b([A.aV(A.b([r,B.cw,p,A.aG(m,A.bl(q,n,m,20),B.m,m,m,new A.aO(j,m,m,m,m,m,B.ch),m,m,m,m,B.aM,m,m,m)],o),B.k,B.i,B.h,0,m)],o) @@ -110932,7 +110937,7 @@ if(r)q=m else{q=k.rx q=h.aF(q==null?k.k3:q)}q=A.Q("\u041f\u0440\u043e\u0433\u0440\u0435\u0441\u0441",m,m,m,m,q,m,m,m) p=B.d.a5(f*100) -h=r?m:h.cd(k.b,B.a2) +h=r?m:h.ca(k.b,B.a2) h=A.aV(A.b([q,A.Q(""+p+"%",m,m,m,m,h,m,m,m)],o),B.k,B.c5,B.h,0,m) p=k.ry if(p==null){r=k.A @@ -110969,7 +110974,7 @@ r=A.Q("\u0414\u043e\u0441\u0442\u0438\u0436\u0435\u043d\u0438\u044f \u0441\u043a s=s.z if(s==null)n=q else{if(m)n=o.k3 -n=s.aF(A.a1(B.d.a5(178.5),n.n()>>>16&255,n.n()>>>8&255,n.n()&255))}return A.c0(A.a9(A.b([l,B.P,r,B.a1,A.Q("\u041f\u0440\u043e\u0434\u043e\u043b\u0436\u0430\u0439\u0442\u0435 \u043e\u0431\u0443\u0447\u0435\u043d\u0438\u0435, \u0447\u0442\u043e\u0431\u044b \u0440\u0430\u0437\u0431\u043b\u043e\u043a\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u0434\u043e\u0441\u0442\u0438\u0436\u0435\u043d\u0438\u044f",q,q,q,q,n,B.Y,q,q)],t.p),B.k,B.U,B.h,0,B.l),q,q)}} +n=s.aF(A.a1(B.d.a5(178.5),n.n()>>>16&255,n.n()>>>8&255,n.n()&255))}return A.c0(A.a9(A.b([l,B.P,r,B.a1,A.Q("\u041f\u0440\u043e\u0434\u043e\u043b\u0436\u0430\u0439\u0442\u0435 \u043e\u0431\u0443\u0447\u0435\u043d\u0438\u0435, \u0447\u0442\u043e\u0431\u044b \u0440\u0430\u0437\u0431\u043b\u043e\u043a\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u0434\u043e\u0441\u0442\u0438\u0436\u0435\u043d\u0438\u044f",q,q,q,q,n,B.X,q,q)],t.p),B.k,B.U,B.h,0,B.l),q,q)}} A.HH.prototype={ a2(){return new A.a4Q()}, aIn(a){return this.e.$1(a)}} @@ -110977,7 +110982,7 @@ A.a4Q.prototype={ al(){this.aD() this.a.aIn(null)}, E(a){var s=this,r=null,q=A.m(a),p=q.ax,o=p.b,n=A.bl(B.mT,o,r,r),m=q.ok,l=m.w,k=l==null,j=A.Q("\u041f\u0440\u043e\u0433\u0440\u0435\u0441\u0441 \u043f\u043e \u043f\u0430\u043a\u0430\u043c",r,r,r,r,k?r:l.cq(B.u),r,r,r),i=s.a.d.gyp(),h=J.bf(s.a.c.b) -l=k?r:l.cd(o,B.u) +l=k?r:l.ca(o,B.u) k=t.p l=A.aV(A.b([n,B.aZ,j,B.c9,A.Q(""+i+"/"+h,r,r,r,r,l,r,r,r)],k),B.k,B.i,B.h,0,r) n=J.hU(s.a.c.b)?s.a.d.gyp()/J.bf(s.a.c.b):0 @@ -110995,8 +111000,8 @@ A.aMp.prototype={ $2(a,b){return new A.CN(J.az(this.a.a.c.b,b),null)}, $S:815} A.CN.prototype={ -E(a0){var s,r,q,p,o,n,m,l=this,k=null,j=A.m(a0),i=j.ax,h=l.c,g=h.gvn(),f=g>=1,e=h.w,d=f?2:1,c=f?A.a1(B.d.a5(25.5),B.X.n()>>>16&255,B.X.n()>>>8&255,B.X.n()&255):i.b.aj(0.1),b=A.aQ(8),a=f?B.f7:B.ji -c=A.aG(k,A.bl(a,f?B.X:i.b,k,k),B.m,k,k,new A.aO(c,k,k,b,k,k,B.t),k,k,k,k,B.aM,k,k,k) +E(a0){var s,r,q,p,o,n,m,l=this,k=null,j=A.m(a0),i=j.ax,h=l.c,g=h.gvn(),f=g>=1,e=h.w,d=f?2:1,c=f?A.a1(B.d.a5(25.5),B.Y.n()>>>16&255,B.Y.n()>>>8&255,B.Y.n()&255):i.b.aj(0.1),b=A.aQ(8),a=f?B.f7:B.ji +c=A.aG(k,A.bl(a,f?B.Y:i.b,k,k),B.m,k,k,new A.aO(c,k,k,b,k,k,B.t),k,k,k,k,B.aM,k,k,k) b=j.ok a=b.w a=a==null?k:a.cq(B.u) @@ -111006,7 +111011,7 @@ if(s==null)s=k else{r=i.rx s=s.aF(r==null?i.k3:r)}r=t.p s=A.aS(A.a9(A.b([a,A.Q(""+h.c+"/"+h.b+" \u0441\u043b\u043e\u0432 \u0438\u0437\u0443\u0447\u0435\u043d\u043e",k,k,k,k,s,k,k,k)],r),B.B,B.i,B.h,0,B.l),1) -if(f)a=A.a1(B.d.a5(25.5),B.X.n()>>>16&255,B.X.n()>>>8&255,B.X.n()&255) +if(f)a=A.a1(B.d.a5(25.5),B.Y.n()>>>16&255,B.Y.n()>>>8&255,B.Y.n()&255) else{a=i.ry if(a==null){a=i.A if(a==null)a=i.k3}a=a.aj(0.1)}q=A.aQ(12) @@ -111014,13 +111019,13 @@ p=f?"\u0417\u0430\u0432\u0435\u0440\u0448\u0435\u043d":""+B.d.a5(g*100)+"%" b=b.Q o=b==null if(o)n=k -else n=b.cd(f?B.X:i.b,B.a2) +else n=b.ca(f?B.Y:i.b,B.a2) q=A.aV(A.b([c,B.bR,s,A.aG(k,A.Q(p,k,k,k,k,n,k,k,k),B.m,k,k,new A.aO(a,k,k,q,k,k,B.t),k,k,k,k,B.eZ,k,k,k)],r),B.k,B.i,B.h,0,k) a=i.ry if(a==null){c=i.A if(c==null)c=i.k3}else c=a c=c.aj(0.2) -a=f?B.X:i.b +a=f?B.Y:i.b a=A.GS(c,k,g,new A.iN(a,t.ZU)) c=A.aS(new A.CO("\u0422\u043e\u0447\u043d\u043e\u0441\u0442\u044c",""+B.d.a5(e*100)+"%",B.NE,l.aly(e),k),1) s=i.y @@ -111039,7 +111044,7 @@ h=l.alj(h) if(o)c=k else{if(a)c=i.k3 c=b.aF(A.a1(153,c.n()>>>16&255,c.n()>>>8&255,c.n()&255))}B.b.L(s,A.b([B.a1,A.aV(A.b([q,B.cx,A.Q("\u041f\u043e\u0441\u043b\u0435\u0434\u043d\u0435\u0435 \u0438\u0437\u0443\u0447\u0435\u043d\u0438\u0435: "+h,k,k,k,k,c,k,k,k)],r),B.k,B.i,B.h,0,k)],r))}return A.fB(new A.as(B.W,A.a9(s,B.B,B.i,B.h,0,B.l),k),k,d,B.rd,k)}, -aly(a){if(a>=0.8)return B.X +aly(a){if(a>=0.8)return B.Y if(a>=0.6)return B.bc return B.ac}, aln(a){if(a<60)return""+a+"\u043c" @@ -111051,7 +111056,7 @@ else if(s<7)return""+s+" \u0434\u043d\u0435\u0439 \u043d\u0430\u0437\u0430\u0434 else return A.Ti("dd.MM.yyyy",null).oW(a)}} A.CO.prototype={ E(a){var s,r=this,q=null,p=A.m(a),o=r.f,n=A.bl(r.e,o,q,16),m=p.ok,l=m.z -o=l==null?q:l.cd(o,B.a2) +o=l==null?q:l.ca(o,B.a2) l=t.p o=A.aV(A.b([n,B.cx,A.Q(r.d,q,q,q,q,o,q,q,q)],l),B.k,B.i,B.a8,0,q) m=m.Q @@ -111070,7 +111075,7 @@ r=A.Q("\u041d\u0435\u0442 \u0434\u0430\u043d\u043d\u044b\u0445 \u043f\u043e \u04 s=s.z if(s==null)n=q else{if(m)n=o.k3 -n=s.aF(A.a1(B.d.a5(178.5),n.n()>>>16&255,n.n()>>>8&255,n.n()&255))}return A.c0(A.a9(A.b([l,B.P,r,B.a1,A.Q("\u041d\u0430\u0447\u043d\u0438\u0442\u0435 \u0438\u0437\u0443\u0447\u0435\u043d\u0438\u0435 \u043f\u0430\u043a\u043e\u0432, \u0447\u0442\u043e\u0431\u044b \u0443\u0432\u0438\u0434\u0435\u0442\u044c \u043f\u0440\u043e\u0433\u0440\u0435\u0441\u0441",q,q,q,q,n,B.Y,q,q)],t.p),B.k,B.U,B.h,0,B.l),q,q)}} +n=s.aF(A.a1(B.d.a5(178.5),n.n()>>>16&255,n.n()>>>8&255,n.n()&255))}return A.c0(A.a9(A.b([l,B.P,r,B.a1,A.Q("\u041d\u0430\u0447\u043d\u0438\u0442\u0435 \u0438\u0437\u0443\u0447\u0435\u043d\u0438\u0435 \u043f\u0430\u043a\u043e\u0432, \u0447\u0442\u043e\u0431\u044b \u0443\u0432\u0438\u0434\u0435\u0442\u044c \u043f\u0440\u043e\u0433\u0440\u0435\u0441\u0441",q,q,q,q,n,B.X,q,q)],t.p),B.k,B.U,B.h,0,B.l),q,q)}} A.Zp.prototype={ E(a){var s,r,q,p,o,n,m=this,l=null,k=A.m(a),j=k.ax,i=A.bl(B.t1,j.b,l,32),h=k.ok,g=h.f g=A.Q("\u0412\u0430\u0448\u0430 \u0441\u0442\u0430\u0442\u0438\u0441\u0442\u0438\u043a\u0430 \u043e\u0431\u0443\u0447\u0435\u043d\u0438\u044f",l,l,l,l,g==null?l:g.cq(B.u),l,l,l) @@ -111094,7 +111099,7 @@ n=i?l:B.e.cA(A.di(0,0,0,0,0).a,36e8) p=A.aV(A.b([o,B.bR,A.aS(new A.wS(B.f9,B.eo,"\u0412\u0440\u0435\u043c\u044f \u043e\u0431\u0443\u0447\u0435\u043d\u0438\u044f",p,""+(n==null?0:n)+" \u0447 \u0432\u0441\u0435\u0433\u043e",l),1)],q),B.k,B.i,B.h,0,l) if(i)o=l else{o=g.a -o=o==null?l:o.a.length}o=A.aS(new A.wS(B.ji,B.X,"\u0418\u0437\u0443\u0447\u0435\u043d\u043d\u044b\u0445 \u0441\u043b\u043e\u0432",""+(o==null?0:o),"\u0412\u0441\u0435\u0433\u043e \u0441\u043b\u043e\u0432 \u0432 \u0441\u043b\u043e\u0432\u0430\u0440\u0435",l),1) +o=o==null?l:o.a.length}o=A.aS(new A.wS(B.ji,B.Y,"\u0418\u0437\u0443\u0447\u0435\u043d\u043d\u044b\u0445 \u0441\u043b\u043e\u0432",""+(o==null?0:o),"\u0412\u0441\u0435\u0433\u043e \u0441\u043b\u043e\u0432 \u0432 \u0441\u043b\u043e\u0432\u0430\u0440\u0435",l),1) n=i?l:g.gyp() if(n==null)n=0 n=A.b([r,B.aH,p,B.bL,A.aV(A.b([o,B.bR,A.aS(new A.wS(B.mT,B.z5,"\u0417\u0430\u0432\u0435\u0440\u0448\u0435\u043d\u043d\u044b\u0445 \u043f\u0430\u043a\u043e\u0432",""+n,"\u0438\u0437 "+J.bf(s.b)+" \u0434\u043e\u0441\u0442\u0443\u043f\u043d\u044b\u0445",l),1)],q),B.k,B.i,B.h,0,l),B.aH],q) @@ -111139,7 +111144,7 @@ E(a){var s,r,q=this,p=null,o=A.m(a),n=o.ax,m=q.d,l=A.a1(B.d.a5(25.5),m.n()>>>16& k=A.aG(p,A.bl(q.c,m,p,20),B.m,p,p,new A.aO(l,p,p,k,p,p,B.t),p,p,p,p,B.aM,p,p,p) l=o.ok m=l.f -m=m==null?p:m.cd(n.b,B.u) +m=m==null?p:m.ca(n.b,B.u) s=t.p m=A.aV(A.b([k,B.c9,A.Q(q.f,p,p,p,p,m,p,p,p)],s),B.k,B.i,B.h,0,p) k=l.z @@ -111159,7 +111164,7 @@ l=A.Q(n.b,r,r,r,r,l,r,r,r) m=m.Q if(m==null)m=r else{s=p.rx -m=m.aF(s==null?p.k3:s)}return A.fB(A.b2O(o,A.Q(n.c,r,r,r,r,m,r,r,r),l,A.bl(B.f7,B.X,r,20)),r,1,B.eX,r)}} +m=m.aF(s==null?p.k3:s)}return A.fB(A.b2O(o,A.Q(n.c,r,r,r,r,m,r,r,r),l,A.bl(B.f7,B.Y,r,20)),r,1,B.eX,r)}} A.NG.prototype={ E(a){var s,r,q,p,o=null,n=A.m(a),m=n.ax,l=A.aQ(12),k=m.ry if(k==null){k=m.A @@ -111168,7 +111173,7 @@ s=A.aQ(12) r=m.b q=A.bl(this.c,r,o,18) p=n.ok.at -r=p==null?o:p.cd(r,B.a2) +r=p==null?o:p.ca(r,B.a2) return A.h7(!1,l,!0,A.aG(o,A.aV(A.b([q,B.aZ,A.Q(this.d,o,o,o,o,r,o,o,o)],t.p),B.k,B.U,B.h,0,o),B.m,o,o,new A.aO(o,o,k,s,o,o,B.t),o,o,o,o,B.rg,o,o,o),o,!0,o,o,o,o,o,o,o,o,o,o,o,this.e,o,o,o,o,o,o,o)}} A.a_R.prototype={ E(a){var s,r,q=null,p=A.m(a),o=A.bl(B.mX,p.ax.b,q,q),n=p.ok.w,m=t.p @@ -111180,12 +111185,12 @@ o=B.d.a5(o.r) return A.fB(new A.as(B.W,A.a9(A.b([n,B.P,A.aV(A.b([s,r,A.aS(new A.BQ("\u0421\u0440\u0435\u0434\u043d\u0435\u0435 \u0432 \u0434\u0435\u043d\u044c",""+o+"\u043c",B.NI,q),1)],m),B.k,B.i,B.h,0,q)],m),B.B,B.i,B.h,0,B.l),q),q,2,q,q)}} A.BQ.prototype={ E(a){var s=null,r=A.m(a),q=r.ax,p=q.b,o=A.bl(this.e,p,s,20),n=r.ok,m=n.w -p=m==null?s:m.cd(p,B.u) +p=m==null?s:m.ca(p,B.u) p=A.Q(this.d,s,s,s,s,p,s,s,s) n=n.Q if(n==null)n=s else{m=q.rx -n=n.aF(m==null?q.k3:m)}return A.a9(A.b([o,B.b_,p,B.hY,A.Q(this.c,s,s,s,s,n,B.Y,s,s)],t.p),B.k,B.i,B.h,0,B.l)}} +n=n.aF(m==null?q.k3:m)}return A.a9(A.b([o,B.b_,p,B.hY,A.Q(this.c,s,s,s,s,n,B.X,s,s)],t.p),B.k,B.i,B.h,0,B.l)}} A.Kg.prototype={ a2(){return new A.a8H()}, aIo(a,b,c){return this.d.$3(a,b,c)}} @@ -111212,7 +111217,7 @@ A.aSA.prototype={ $0(){return this.a.d=this.b}, $S:0} A.a8G.prototype={ -E(a){var s=null,r=this.c,q=A.aS(new A.x6("\u0410\u043a\u0442\u0438\u0432\u043d\u044b\u0445 \u0434\u043d\u0435\u0439",""+r.e,B.je,B.eo,s),1),p=A.aS(new A.x6("\u0412\u0441\u0435\u0433\u043e \u043c\u0438\u043d\u0443\u0442",""+r.f,B.f9,B.X,s),1),o=B.d.a5(r.r) +E(a){var s=null,r=this.c,q=A.aS(new A.x6("\u0410\u043a\u0442\u0438\u0432\u043d\u044b\u0445 \u0434\u043d\u0435\u0439",""+r.e,B.je,B.eo,s),1),p=A.aS(new A.x6("\u0412\u0441\u0435\u0433\u043e \u043c\u0438\u043d\u0443\u0442",""+r.f,B.f9,B.Y,s),1),o=B.d.a5(r.r) o=A.aS(new A.x6("\u0421\u0440\u0435\u0434\u043d\u0435\u0435 \u0432 \u0434\u0435\u043d\u044c",""+o+"\u043c",B.mX,B.bc,s),1) return A.aV(A.b([q,p,o,A.aS(new A.x6("\u0422\u0435\u043a\u0443\u0449\u0430\u044f \u0441\u0435\u0440\u0438\u044f",""+r.w,B.mU,B.ac,s),1)],t.p),B.k,B.i,B.h,0,s)}} A.x6.prototype={ @@ -111220,13 +111225,13 @@ E(a){var s,r,q=this,p=null,o=A.m(a),n=q.f,m=A.a1(B.d.a5(25.5),n.n()>>>16&255,n.n l=A.aG(p,A.bl(q.e,n,p,20),B.m,p,p,new A.aO(m,p,p,l,p,p,B.t),p,p,p,p,B.aM,p,p,p) m=o.ok s=m.w -n=s==null?p:s.cd(n,B.u) +n=s==null?p:s.ca(n,B.u) n=A.Q(q.d,p,p,p,p,n,p,p,p) m=m.Q if(m==null)m=p else{s=o.ax r=s.rx -m=m.aF(r==null?s.k3:r)}return A.a9(A.b([l,B.b_,n,B.hY,A.Q(q.c,2,p,p,p,m,B.Y,p,p)],t.p),B.k,B.i,B.h,0,B.l)}} +m=m.aF(r==null?s.k3:r)}return A.a9(A.b([l,B.b_,n,B.hY,A.Q(q.c,2,p,p,p,m,B.X,p,p)],t.p),B.k,B.i,B.h,0,B.l)}} A.Mk.prototype={ E(a){var s,r,q=null,p=A.m(a),o=p.ax,n=o.rx,m=n==null,l=m?o.k3:n l=A.bl(B.t5,A.a1(B.d.a5(127.5),l.n()>>>16&255,l.n()>>>8&255,l.n()&255),q,64) @@ -111238,7 +111243,7 @@ r=A.Q("\u041d\u0435\u0442 \u0434\u0430\u043d\u043d\u044b\u0445 \u043e\u0431 \u04 s=s.z if(s==null)n=q else{if(m)n=o.k3 -n=s.aF(A.a1(B.d.a5(178.5),n.n()>>>16&255,n.n()>>>8&255,n.n()&255))}return A.c0(A.a9(A.b([l,B.P,r,B.a1,A.Q("\u041d\u0430\u0447\u043d\u0438\u0442\u0435 \u043e\u0431\u0443\u0447\u0435\u043d\u0438\u0435, \u0447\u0442\u043e\u0431\u044b \u0443\u0432\u0438\u0434\u0435\u0442\u044c \u0433\u0440\u0430\u0444\u0438\u043a \u0430\u043a\u0442\u0438\u0432\u043d\u043e\u0441\u0442\u0438",q,q,q,q,n,B.Y,q,q)],t.p),B.k,B.U,B.h,0,B.l),q,q)}} +n=s.aF(A.a1(B.d.a5(178.5),n.n()>>>16&255,n.n()>>>8&255,n.n()&255))}return A.c0(A.a9(A.b([l,B.P,r,B.a1,A.Q("\u041d\u0430\u0447\u043d\u0438\u0442\u0435 \u043e\u0431\u0443\u0447\u0435\u043d\u0438\u0435, \u0447\u0442\u043e\u0431\u044b \u0443\u0432\u0438\u0434\u0435\u0442\u044c \u0433\u0440\u0430\u0444\u0438\u043a \u0430\u043a\u0442\u0438\u0432\u043d\u043e\u0441\u0442\u0438",q,q,q,q,n,B.X,q,q)],t.p),B.k,B.U,B.h,0,B.l),q,q)}} A.a8F.prototype={ E(a){var s,r,q,p,o,n=null,m=A.m(a),l=m.ax,k=this.c,j=A.l(k),i=j.h("bO<1>"),h=A.W(new A.bO(k,i),i.h("x.E")) B.b.fJ(h,new A.aSx()) @@ -111374,7 +111379,7 @@ r=A.Q("\u041d\u0435\u0442 \u0434\u0430\u043d\u043d\u044b\u0445 \u043f\u043e \u04 s=s.z if(s==null)n=q else{if(m)n=o.k3 -n=s.aF(A.a1(B.d.a5(178.5),n.n()>>>16&255,n.n()>>>8&255,n.n()&255))}return A.c0(A.a9(A.b([l,B.P,r,B.a1,A.Q("\u041d\u0430\u0447\u043d\u0438\u0442\u0435 \u0438\u0437\u0443\u0447\u0435\u043d\u0438\u0435 \u0441\u043b\u043e\u0432, \u0447\u0442\u043e\u0431\u044b \u0443\u0432\u0438\u0434\u0435\u0442\u044c \u0441\u0442\u0430\u0442\u0438\u0441\u0442\u0438\u043a\u0443",q,q,q,q,n,B.Y,q,q)],t.p),B.k,B.U,B.h,0,B.l),q,q)}} +n=s.aF(A.a1(B.d.a5(178.5),n.n()>>>16&255,n.n()>>>8&255,n.n()&255))}return A.c0(A.a9(A.b([l,B.P,r,B.a1,A.Q("\u041d\u0430\u0447\u043d\u0438\u0442\u0435 \u0438\u0437\u0443\u0447\u0435\u043d\u0438\u0435 \u0441\u043b\u043e\u0432, \u0447\u0442\u043e\u0431\u044b \u0443\u0432\u0438\u0434\u0435\u0442\u044c \u0441\u0442\u0430\u0442\u0438\u0441\u0442\u0438\u043a\u0443",q,q,q,q,n,B.X,q,q)],t.p),B.k,B.U,B.h,0,B.l),q,q)}} A.a9x.prototype={ E(a){var s,r,q,p,o=this,n=null,m=o.c,l=m.length,k=o.d,j=A.m(a).ok.Q if(j==null)j=n @@ -111415,12 +111420,12 @@ p=this.alN(j) h=h.Q o=h==null n=t.p -q=A.b([A.aV(A.b([g,A.aG(m,A.Q(p,m,m,m,m,o?m:h.cd(i,B.a2),m,m,m),B.m,m,m,new A.aO(r,m,m,q,m,m,B.t),m,m,m,m,B.eZ,m,m,m)],n),B.k,B.i,B.h,0,m),B.a1,A.aV(A.b([A.aS(new A.D9("\u041f\u0440\u0430\u0432\u0438\u043b\u044c\u043d\u043e",A.o(k.b),B.X,m),1),A.aS(new A.D9("\u041d\u0435\u043f\u0440\u0430\u0432\u0438\u043b\u044c\u043d\u043e",A.o(k.c),B.ac,m),1),A.aS(new A.D9("\u041f\u0440\u043e\u043f\u0443\u0449\u0435\u043d\u043e",A.o(k.d),B.bc,m),1)],n),B.k,B.i,B.h,0,m)],n) +q=A.b([A.aV(A.b([g,A.aG(m,A.Q(p,m,m,m,m,o?m:h.ca(i,B.a2),m,m,m),B.m,m,m,new A.aO(r,m,m,q,m,m,B.t),m,m,m,m,B.eZ,m,m,m)],n),B.k,B.i,B.h,0,m),B.a1,A.aV(A.b([A.aS(new A.D9("\u041f\u0440\u0430\u0432\u0438\u043b\u044c\u043d\u043e",A.o(k.b),B.Y,m),1),A.aS(new A.D9("\u041d\u0435\u043f\u0440\u0430\u0432\u0438\u043b\u044c\u043d\u043e",A.o(k.c),B.ac,m),1),A.aS(new A.D9("\u041f\u0440\u043e\u043f\u0443\u0449\u0435\u043d\u043e",A.o(k.d),B.bc,m),1)],n),B.k,B.i,B.h,0,m)],n) if(k.y){k=A.a1(s,B.bc.n()>>>16&255,B.bc.n()>>>8&255,B.bc.n()&255) g=A.aQ(8) s=A.bl(B.On,B.bc,m,16) -B.b.L(q,A.b([B.a1,A.aG(m,A.aV(A.b([s,B.cx,A.Q("\u041d\u0443\u0436\u0434\u0430\u0435\u0442\u0441\u044f \u0432 \u043f\u043e\u0432\u0442\u043e\u0440\u0435\u043d\u0438\u0438",m,m,m,m,o?m:h.cd(B.bc,B.a2),m,m,m)],n),B.k,B.i,B.a8,0,m),B.m,m,m,new A.aO(k,m,m,g,m,m,B.t),m,m,m,m,B.eZ,m,m,m)],n))}return A.fB(new A.as(B.W,A.a9(q,B.B,B.i,B.h,0,B.l),m),m,1,B.eX,m)}, -alM(a){if(a<0.3)return B.X +B.b.L(q,A.b([B.a1,A.aG(m,A.aV(A.b([s,B.cx,A.Q("\u041d\u0443\u0436\u0434\u0430\u0435\u0442\u0441\u044f \u0432 \u043f\u043e\u0432\u0442\u043e\u0440\u0435\u043d\u0438\u0438",m,m,m,m,o?m:h.ca(B.bc,B.a2),m,m,m)],n),B.k,B.i,B.a8,0,m),B.m,m,m,new A.aO(k,m,m,g,m,m,B.t),m,m,m,m,B.eZ,m,m,m)],n))}return A.fB(new A.as(B.W,A.a9(q,B.B,B.i,B.h,0,B.l),m),m,1,B.eX,m)}, +alM(a){if(a<0.3)return B.Y if(a<0.6)return B.bc return B.ac}, alN(a){if(a<0.3)return"\u041b\u0435\u0433\u043a\u043e" @@ -111428,7 +111433,7 @@ if(a<0.6)return"\u0421\u0440\u0435\u0434\u043d\u0435" return"\u0421\u043b\u043e\u0436\u043d\u043e"}} A.D9.prototype={ E(a){var s,r,q=null,p=A.m(a),o=p.ok,n=o.w -n=n==null?q:n.cd(this.e,B.u) +n=n==null?q:n.ca(this.e,B.u) n=A.Q(this.d,q,q,q,q,n,q,q,q) o=o.Q if(o==null)o=q @@ -111613,7 +111618,7 @@ p=q==null o=p?r:q n=j.ok.as m=n==null -l=m?k:n.cd(r,B.aT) +l=m?k:n.ca(r,B.aT) if(m)q=k else q=n.aF(p?r:q) return A.b4y(i,B.I,s.b,3,!1,r,l,new A.aR6(),k,k,B.QS,o,q)}, @@ -111663,7 +111668,7 @@ q=p.ok o=q.f o=A.Q("\u041d\u0435\u0442 \u0437\u0430\u0434\u0430\u043d\u0438\u0439",n,n,n,n,o==null?n:o.aF(m),n,n,n) q=q.z -return A.c0(A.a9(A.b([s,B.P,o,B.a1,A.Q("\u041d\u043e\u0432\u044b\u0445 \u0437\u0430\u0434\u0430\u043d\u0438\u0439 \u043f\u043e\u043a\u0430 \u043d\u0435\u0442. \u041f\u043e\u043f\u0440\u043e\u0431\u0443\u0439\u0442\u0435 \u043f\u043e\u0437\u0436\u0435!",n,n,n,n,q==null?n:q.aF(A.a1(B.d.a5(178.5),m.n()>>>16&255,m.n()>>>8&255,m.n()&255)),B.Y,n,n)],t.p),B.k,B.U,B.h,0,B.l),n,n)}return A.Xk(A.uK(new A.aR_(m,q),J.bf(s),B.W,n,B.a6),40,q.gLY())}, +return A.c0(A.a9(A.b([s,B.P,o,B.a1,A.Q("\u041d\u043e\u0432\u044b\u0445 \u0437\u0430\u0434\u0430\u043d\u0438\u0439 \u043f\u043e\u043a\u0430 \u043d\u0435\u0442. \u041f\u043e\u043f\u0440\u043e\u0431\u0443\u0439\u0442\u0435 \u043f\u043e\u0437\u0436\u0435!",n,n,n,n,q==null?n:q.aF(A.a1(B.d.a5(178.5),m.n()>>>16&255,m.n()>>>8&255,m.n()&255)),B.X,n,n)],t.p),B.k,B.U,B.h,0,B.l),n,n)}return A.Xk(A.uK(new A.aR_(m,q),J.bf(s),B.W,n,B.a6),40,q.gLY())}, $S:831} A.aQW.prototype={ $1(a){return a.r===this.a}, @@ -111709,7 +111714,7 @@ $0(){return A.ek(this.a,!1).ee(!0)}, $S:0} A.QM.prototype={ by(){this.co() -this.cb() +this.cc() this.e5()}, l(){var s=this,r=s.aV$ if(r!=null)r.J(0,s.gdV()) @@ -111822,7 +111827,7 @@ p=A.m(p).ok.w if(p==null)s=l else{s=m.c s.toString -s=p.cd(A.m(s).ax.b,B.aT)}s=A.Q("Question "+(j+1),l,l,l,l,s,l,l,l) +s=p.ca(A.m(s).ax.b,B.aT)}s=A.Q("Question "+(j+1),l,l,l,l,s,l,l,l) j=m.c j.toString j=A.m(j).ok.y @@ -111861,7 +111866,7 @@ s.push(A.aS(A.i1(p,A.Q(k?"Finish":"Next",l,l,l,l,l,l,l,l),m.gay_(),l),1)) return A.a9(A.b([q,j,A.aG(l,A.aV(s,B.k,B.i,B.h,0,l),B.m,l,l,l,l,l,l,l,B.W,l,l,l)],r),B.k,B.i,B.h,0,B.l)}, Cc(a,b){var s=null return new A.as(B.m1,A.aV(A.b([A.Q(a,s,s,s,s,s,s,s,s),A.Q(b,s,s,s,s,B.EO,s,s,s)],t.p),B.k,B.c5,B.h,0,s),s)}, -os(a){if(a>=80)return B.X +os(a){if(a>=80)return B.Y if(a>=60)return B.bc return B.ac}, ami(a){if(a>=80)return B.NK @@ -112211,12 +112216,12 @@ if(p==null||p.length===0){q=s.e p=A.a1(B.d.a5(25.5),q.n()>>>16&255,q.n()>>>8&255,q.n()&255) return A.aG(r,A.c0(A.bl(B.ee,A.a1(B.d.a5(76.5),q.n()>>>16&255,q.n()>>>8&255,q.n()&255),r,100),r,r),B.m,p,r,r,r,r,r,r,r,r,r,r)}return A.am0("https://api.mnemo-cards.online/api/v2"+("/packs/"+s.c+"/cards/"+q.a+"/image"),new A.aFj(s),B.fP,!1,new A.aFk(s))}, aha(){var s=null,r=t.p,q=A.b([],r),p=this.d,o=p.d -if(o!=null&&o.length!==0)q.push(A.lz(o,3,B.Y,A.dn(s,s,this.e,s,s,s,s,s,s,s,s,32,s,s,B.u,s,s,!0,s,s,s,s,s,s,s,s))) +if(o!=null&&o.length!==0)q.push(A.lz(o,3,B.X,A.dn(s,s,this.e,s,s,s,s,s,s,s,s,32,s,s,B.u,s,s,!0,s,s,s,s,s,s,s,s))) p=p.e if(p!=null&&p.length!==0)B.b.L(q,A.b([B.P,new A.dh(new A.aFi(this),s)],r)) return A.c0(A.io(A.a9(q,B.k,B.U,B.h,0,B.l),s,B.F,s,s,s,B.a6),s,s)}, agW(){var s=null,r=A.b([],t.p),q=this.d.c -if(q!=null&&q.length!==0)r.push(A.lz(q,5,B.Y,A.dn(s,s,this.e,s,s,s,s,s,s,s,s,28,s,s,B.u,s,s,!0,s,s,s,s,s,s,s,s))) +if(q!=null&&q.length!==0)r.push(A.lz(q,5,B.X,A.dn(s,s,this.e,s,s,s,s,s,s,s,s,28,s,s,B.u,s,s,!0,s,s,s,s,s,s,s,s))) else r.push(new A.dh(new A.aFh(),s)) return A.c0(A.io(A.a9(r,B.k,B.U,B.h,0,B.l),s,B.F,s,s,s,B.a6),s,s)}} A.aFk.prototype={ @@ -112228,14 +112233,14 @@ return A.aG(s,A.c0(A.bl(B.mO,A.a1(B.d.a5(76.5),r.n()>>>16&255,r.n()>>>8&255,r.n( $S:298} A.aFi.prototype={ $1(a){var s=null,r=A.m(a).ax.k3 -return A.lz(this.a.d.e,3,B.Y,A.dn(s,s,A.a1(153,r.n()>>>16&255,r.n()>>>8&255,r.n()&255),s,s,s,s,s,s,s,s,24,s,s,B.z,s,s,!0,s,s,s,s,s,s,s,s))}, +return A.lz(this.a.d.e,3,B.X,A.dn(s,s,A.a1(153,r.n()>>>16&255,r.n()>>>8&255,r.n()&255),s,s,s,s,s,s,s,s,24,s,s,B.z,s,s,!0,s,s,s,s,s,s,s,s))}, $S:846} A.aFh.prototype={ $1(a){var s=null,r=A.m(a).ax.k3 -return A.Q("\u041d\u0435\u0442 \u043c\u043d\u0435\u043c\u043e\u043d\u0438\u043a\u0438",s,s,s,s,A.dn(s,s,A.a1(97,r.n()>>>16&255,r.n()>>>8&255,r.n()&255),s,s,s,s,s,s,s,s,24,s,s,B.z,s,s,!0,s,s,s,s,s,s,s,s),B.Y,s,s)}, +return A.Q("\u041d\u0435\u0442 \u043c\u043d\u0435\u043c\u043e\u043d\u0438\u043a\u0438",s,s,s,s,A.dn(s,s,A.a1(97,r.n()>>>16&255,r.n()>>>8&255,r.n()&255),s,s,s,s,s,s,s,s,24,s,s,B.z,s,s,!0,s,s,s,s,s,s,s,s),B.X,s,s)}, $S:847} A.mA.prototype={ -E(a){var s=null,r=t.p,q=A.b([B.jk,B.P,A.Q(this.c,s,s,s,s,B.ku,s,s,s),B.a1,A.IZ(this.d,B.kt,B.Y)],r) +E(a){var s=null,r=t.p,q=A.b([B.jk,B.P,A.Q(this.c,s,s,s,s,B.ku,s,s,s),B.a1,A.IZ(this.d,B.kt,B.X)],r) B.b.L(q,A.b([B.aH,A.i1(B.dD,B.i5,this.e,s)],r)) return A.c0(new A.as(B.dy,A.a9(q,B.k,B.U,B.h,0,B.l),s),s,s)}} A.xB.prototype={ @@ -112243,10 +112248,10 @@ E(a){return A.za(new A.ac0(this))}, agS(a,b){var s,r,q=this,p={},o=q.d===b,n=b===q.c.f p.a=p.b=p.c=null if(q.f){if(o){s=q.r -p.c=s?A.a1(B.d.a5(25.5),B.X.n()>>>16&255,B.X.n()>>>8&255,B.X.n()&255):A.a1(B.d.a5(25.5),B.ac.n()>>>16&255,B.ac.n()>>>8&255,B.ac.n()&255) -p.b=s?B.X:B.ac -p.a=s?B.X:B.ac}else if(n){p.c=A.a1(B.d.a5(25.5),B.X.n()>>>16&255,B.X.n()>>>8&255,B.X.n()&255) -p.a=p.b=B.X}}else if(o){p.c=A.m(a).ax.b.aj(0.1) +p.c=s?A.a1(B.d.a5(25.5),B.Y.n()>>>16&255,B.Y.n()>>>8&255,B.Y.n()&255):A.a1(B.d.a5(25.5),B.ac.n()>>>16&255,B.ac.n()>>>8&255,B.ac.n()&255) +p.b=s?B.Y:B.ac +p.a=s?B.Y:B.ac}else if(n){p.c=A.a1(B.d.a5(25.5),B.Y.n()>>>16&255,B.Y.n()>>>8&255,B.Y.n()&255) +p.a=p.b=B.Y}}else if(o){p.c=A.m(a).ax.b.aj(0.1) p.b=A.m(a).ax.b p.a=A.m(a).ax.b}s=o?0.95:1 r=o?0.95:1 @@ -112285,7 +112290,7 @@ if(h)g=a0&&c.c else g=!0 i=A.e7(i,g?2:1) f=A.aQ(12) -if(a0&&c.c)a=A.b([new A.bH(1,B.V,A.a1(51,B.X.n()>>>16&255,B.X.n()>>>8&255,B.X.n()&255),B.j,8)],t.V) +if(a0&&c.c)a=A.b([new A.bH(1,B.V,A.a1(51,B.Y.n()>>>16&255,B.Y.n()>>>8&255,B.Y.n()&255),B.j,8)],t.V) else a=a0&&o&&!a.r?A.b([new A.bH(1,B.V,A.a1(51,B.ac.n()>>>16&255,B.ac.n()>>>8&255,B.ac.n()&255),B.j,8)],t.V):b if(h)g=a0&&c.c else g=!0 @@ -112369,7 +112374,7 @@ $2(a,b){var s,r,q,p,o,n,m,l,k,j=null,i=24*$.bd().gdS(),h=$.bd().gcf(),g=A.m(a),f f=A.aQ(16*Math.min(f.gdS(),f.gcf())) s=A.b([new A.bH(0,B.V,A.a1(B.d.a5(25.5),B.q.n()>>>16&255,B.q.n()>>>8&255,B.q.n()&255),B.dJ,8)],t.V) r=A.m(a).ok.r -r=A.Q("Fill in the blanks:",j,j,j,j,r==null?j:r.cq(B.aT),B.Y,j,j) +r=A.Q("Fill in the blanks:",j,j,j,j,r==null?j:r.cq(B.aT),B.X,j,j) q=A.by(j,16*$.bd().gcf(),j) p=this.a o=p.a.c.gaKD() @@ -112386,7 +112391,7 @@ g=12*$.bd().gcf() s=A.jJ(j,new A.dH(4,h,B.bX),j,new A.am(f,g,f,g),j,j,j,j,!0,j,j,j,j,j,j,s.ax.k2,!0,j,j,j,j,j,j,j,j,j,j,j,j,j,j,"Type the missing letters...",j,j,j,j,j,j,j,j,j,!0,!0,j,j,j,j,j,j,j,j,j,j,j,j,j,j) g=A.dn(j,j,j,j,j,j,j,j,j,j,j,$.bd().j9(18),j,j,B.a2,j,j,!0,j,2,j,j,j,j,j,j) f=p.gaxH() -g=A.aG(j,A.ZK(j,B.cq,!1,j,!0,B.E,j,A.aWg(),p.d,j,j,j,j,j,2,s,B.F,!0,j,!0,j,!1,p.e,B.cU,j,j,j,j,j,j,p.a.c.gaD4().length,j,1,j,j,!1,"\u2022",j,j,j,f,j,!1,j,j,!1,j,!0,j,B.eY,j,j,j,j,j,j,j,j,j,j,j,g,!0,B.Y,j,B.cR,j,j,j,j),B.m,j,new A.ah(0,b.b*0.8,0,1/0),j,j,j,j,j,j,j,j,j) +g=A.aG(j,A.ZK(j,B.cq,!1,j,!0,B.E,j,A.aWg(),p.d,j,j,j,j,j,2,s,B.F,!0,j,!0,j,!1,p.e,B.cU,j,j,j,j,j,j,p.a.c.gaD4().length,j,1,j,j,!1,"\u2022",j,j,j,f,j,!1,j,j,!1,j,!0,j,B.eY,j,j,j,j,j,j,j,j,j,j,j,g,!0,B.X,j,B.cR,j,j,j,j),B.m,j,new A.ah(0,b.b*0.8,0,1/0),j,j,j,j,j,j,j,j,j) s=A.by(j,24*$.bd().gcf(),j) h=p.f.length!==0?f:j return A.a9(A.b([i,g,s,A.i1(B.OP,B.a4O,h,A.nY(j,j,j,j,j,j,j,j,j,j,j,new A.E(200*$.bd().gdS(),48*$.bd().gcf()),j,j,j,j,j,j,A.dn(j,j,j,j,j,j,j,j,j,j,j,$.bd().j9(16),j,j,j,j,j,!0,j,j,j,j,j,j,j,j),j))],k),B.k,B.U,B.h,0,B.l)}, @@ -112401,7 +112406,7 @@ E(a0){var s,r,q,p,o,n,m,l,k,j=this,i=null,h=j.c,g=j.d,f=h/g,e=h>0?j.e/h:0,d=20*$ a=A.aQ(16*Math.min(a.gdS(),a.gcf())) s=A.b([new A.bH(0,B.V,A.a1(13,B.q.n()>>>16&255,B.q.n()>>>8&255,B.q.n()&255),B.dJ,8)],t.V) r=A.m(a0).ok.w -r=r==null?i:r.cd(A.m(a0).ax.b,B.u) +r=r==null?i:r.ca(A.m(a0).ax.b,B.u) r=A.Q(""+(h+1),i,i,i,i,r,i,i,i) h=A.m(a0).ok.w if(h==null)h=i @@ -112413,7 +112418,7 @@ q=A.m(a0).ok.z if(q==null)q=i else{p=A.m(a0).ax o=p.rx -q=q.cd(o==null?p.k3:o,B.a2)}p=t.p +q=q.ca(o==null?p.k3:o,B.a2)}p=t.p q=A.aV(A.b([r,h,B.c9,A.Q(""+g+"%",i,i,i,i,q,i,i,i)],p),B.k,B.i,B.h,0,i) g=A.by(i,8*$.bd().gcf(),i) h=$.bd().gcf() @@ -112426,17 +112431,17 @@ n=A.b([A.m(a0).ax.b,A.m(a0).ax.b.aj(0.8)],t.t_) m=$.bd() h=A.aG(i,new A.Uy(f,B.fL,A.aG(i,i,B.m,i,i,new A.aO(i,i,i,A.aQ(3*Math.min(m.gdS(),m.gcf())),i,new A.qI(B.fL,B.ig,B.dh,n,i,i),B.t),i,i,i,i,i,i,i,i),i),B.m,i,i,new A.aO(r,i,i,o,i,i,B.t),i,6*h,i,i,i,i,i,i) o=A.by(i,12*$.bd().gcf(),i) -r=j.Jz(B.X,a0,B.f7,"Correct",""+j.e) +r=j.Jz(B.Y,a0,B.f7,"Correct",""+j.e) n=j.f.a l=B.e.cA(n,6e7) n=B.c.dh(B.e.j(B.e.cA(n,1e6)%60),2,"0") n=j.Jz(A.m(a0).ax.b,a0,B.f9,"Time",""+l+":"+n) m=B.d.a5(e*100) -if(e>=0.8)k=B.X +if(e>=0.8)k=B.Y else k=e>=0.6?B.bc:B.ac return A.aG(i,A.a9(A.b([q,g,h,o,A.aV(A.b([r,n,j.Jz(k,a0,B.mX,"Accuracy",""+m+"%")],p),B.k,B.jC,B.h,0,i)],p),B.k,B.i,B.a8,0,B.l),B.m,i,i,new A.aO(b.ax.k2,i,i,a,s,i,B.t),i,i,i,i,new A.am(d,c,d,c),i,i,i)}, Jz(a,b,c,d,e){var s,r,q,p=null,o=A.bl(c,a,p,$.bd().j9(20)),n=A.by(p,4*$.bd().gcf(),p),m=A.m(b).ok.x -m=A.Q(e,p,p,p,p,m==null?p:m.cd(a,B.u),p,p,p) +m=A.Q(e,p,p,p,p,m==null?p:m.ca(a,B.u),p,p,p) s=A.m(b).ok.Q if(s==null)s=p else{r=A.m(b).ax @@ -112450,7 +112455,7 @@ return s.c.vV(new A.at_(s,a),new A.at0(s,a),new A.at1(s,a),new A.at2(s,a))}, Cb(a,b,c,d){var s,r=null,q=A.m(b),p=t.p,o=A.b([],p) if(c!=null){s=$.bd().gcf() B.b.L(o,A.b([A.aG(r,A.am0(c,new A.asY(),B.lg,!1,r),B.m,r,new A.ah(0,1/0,0,200*s),r,r,r,r,r,r,r,r,r),A.by(r,16*$.bd().gcf(),r)],p))}if(d.length!==0){q=q.ok.f -B.b.L(o,A.b([A.Q(d,r,r,r,r,q==null?r:q.a2L($.bd().j9(20),B.aT,1.4),B.Y,r,r)],p))}if(a!=null){q=A.by(r,12*$.bd().gcf(),r) +B.b.L(o,A.b([A.Q(d,r,r,r,r,q==null?r:q.a2L($.bd().j9(20),B.aT,1.4),B.X,r,r)],p))}if(a!=null){q=A.by(r,12*$.bd().gcf(),r) s=$.bd().j9(32) B.b.L(o,A.b([q,A.h5(r,r,A.bl(B.t0,A.m(b).ax.b,r,s),r,r,new A.asZ(b),r,r,r)],p))}return A.a9(o,B.k,B.U,B.h,0,B.l)}} A.at2.prototype={ @@ -112660,14 +112665,14 @@ else{p=t.p o=A.b([],p) n=i.d if(n!=null&&n.length!==0){m=A.m(a).ok.z -o.push(A.lz(n,2,B.Y,m==null?j:m.n7(14,B.aT)))}n=i.e +o.push(A.lz(n,2,B.X,m==null?j:m.n7(14,B.aT)))}n=i.e if(n!=null&&n.length!==0){m=A.m(a).ok.Q if(m==null)m=j else{l=A.m(a).ax.k3 l=m.yt(A.a1(B.d.a5(127.5),l.n()>>>16&255,l.n()>>>8&255,l.n()&255),11,B.u) -m=l}B.b.L(o,A.b([B.b_,A.lz(n,2,B.Y,m)],p))}i=i.c +m=l}B.b.L(o,A.b([B.b_,A.lz(n,2,B.X,m)],p))}i=i.c if(i!=null&&i.length!==0){n=A.m(a).ok.Q -B.b.L(o,A.b([B.c9,A.lz(i,2,B.Y,n==null?j:n.n7(10,B.u))],p))}i=new A.as(B.aM,A.a9(o,B.k,B.U,B.h,0,B.l),j)}return A.eh(j,A.aG(B.K,i,B.aX,j,j,new A.aO(h.fx,j,s,r,q,j,B.t),j,j,j,j,j,j,j,j),B.F,!1,j,j,j,j,j,j,j,j,j,j,j,j,j,j,j,k.f,j,j,j,j,j,j)}, +B.b.L(o,A.b([B.c9,A.lz(i,2,B.X,n==null?j:n.n7(10,B.u))],p))}i=new A.as(B.aM,A.a9(o,B.k,B.U,B.h,0,B.l),j)}return A.eh(j,A.aG(B.K,i,B.aX,j,j,new A.aO(h.fx,j,s,r,q,j,B.t),j,j,j,j,j,j,j,j),B.F,!1,j,j,j,j,j,j,j,j,j,j,j,j,j,j,j,k.f,j,j,j,j,j,j)}, ah0(a){return A.za(new A.arx(this))}, au_(a,b,c){var s=this.c,r=s.b if(r==null||r.length===0)return B.ao @@ -112675,16 +112680,16 @@ return A.EP(A.aQ(8),A.am0("https://api.mnemo-cards.online/api/v2"+("/packs/"+thi A.arx.prototype={ $2(a,b){var s,r,q,p=null,o=b.b,n=t.p,m=A.b([],n),l=this.a,k=l.c,j=k.d if(j!=null&&j.length!==0){s=A.m(a).ok.z -m.push(A.lz(j,1,B.Y,s==null?p:s.n7(Math.max(10,o*0.12),B.aT)))}j=k.e +m.push(A.lz(j,1,B.X,s==null?p:s.n7(Math.max(10,o*0.12),B.aT)))}j=k.e if(j!=null&&j.length!==0){s=A.m(a).ok.Q if(s==null)s=p else{r=Math.max(8,o*0.09) q=A.m(a).ax.k3 r=s.yt(A.a1(B.d.a5(127.5),q.n()>>>16&255,q.n()>>>8&255,q.n()&255),r,B.u) -s=r}m.push(A.lz(j,1,B.Y,s))}m=A.b([new A.as(B.dA,A.a9(m,B.k,B.i,B.h,0,B.l),p),A.aS(new A.as(B.dA,l.au_(a,o,b.d),p),1)],n) +s=r}m.push(A.lz(j,1,B.X,s))}m=A.b([new A.as(B.dA,A.a9(m,B.k,B.i,B.h,0,B.l),p),A.aS(new A.as(B.dA,l.au_(a,o,b.d),p),1)],n) k=k.c if(k!=null&&k.length!==0){j=A.m(a).ok.Q -m.push(new A.as(B.dA,A.lz(k,2,B.Y,j==null?p:j.n7(Math.max(8,o*0.1),B.u)),p))}return A.fS(B.bl,A.b([A.a9(m,B.k,B.i,B.h,0,B.l),A.mW(4,new A.dh(new A.arw(l),p),p,p,p,4,p,p)],n),B.E,B.b0,p)}, +m.push(new A.as(B.dA,A.lz(k,2,B.X,j==null?p:j.n7(Math.max(8,o*0.1),B.u)),p))}return A.fS(B.bl,A.b([A.a9(m,B.k,B.i,B.h,0,B.l),A.mW(4,new A.dh(new A.arw(l),p),p,p,p,4,p,p)],n),B.E,B.b0,p)}, $S:855} A.arw.prototype={ $1(a){var s=null,r=A.m(a).ax,q=this.a,p=r.k2,o=B.d.a5(229.5),n=A.a1(o,p.n()>>>16&255,p.n()>>>8&255,p.n()&255),m=A.aQ(4),l=q.r,k=l?B.jh:B.mR @@ -112760,7 +112765,7 @@ k=A.e7(l,1) s=A.aQ(12) r=o.ok.z if(r==null)n=p -else{r=r.cd(j,n?B.aT:B.z) +else{r=r.ca(j,n?B.aT:B.z) n=r}return A.aS(A.eh(p,A.aG(p,A.aV(A.b([i,B.aZ,A.Q(q.d,p,p,p,p,n,p,p,p)],t.p),B.k,B.U,B.h,0,p),B.m,p,p,new A.aO(m,p,k,s,p,p,B.t),p,48,p,p,p,p,p,p),B.F,!1,p,p,p,p,p,p,p,p,p,p,p,p,p,p,p,q.e,p,p,p,p,p,p),1)}} A.WD.prototype={ E(a){var s,r,q,p,o,n,m,l,k,j=this,i=null,h=A.m(a),g=j.c,f=g.e,e=f==null?i:A.p2(f) @@ -112818,7 +112823,7 @@ q=A.m(a).ax.b.aj(0.1) p=A.aQ(12) o=B.e.j(b.c) n=A.m(a).ok.Q -return A.eh(m,A.aG(m,A.aV(A.b([s,B.bR,r,A.aG(m,A.Q(o,m,m,m,m,n==null?m:n.cd(A.m(a).ax.b,B.aT),m,m,m),B.m,m,m,new A.aO(q,m,m,p,m,m,B.t),m,m,m,m,B.eZ,m,m,m)],t.p),B.k,B.i,B.h,0,m),B.m,m,m,new A.aO(k,m,l,j,m,m,B.t),m,m,m,B.eX,B.d3,m,m,m),B.F,!1,m,m,m,m,m,m,m,m,m,m,m,m,m,m,m,new A.arD(c,b),m,m,m,m,m,m)}} +return A.eh(m,A.aG(m,A.aV(A.b([s,B.bR,r,A.aG(m,A.Q(o,m,m,m,m,n==null?m:n.ca(A.m(a).ax.b,B.aT),m,m,m),B.m,m,m,new A.aO(q,m,m,p,m,m,B.t),m,m,m,m,B.eZ,m,m,m)],t.p),B.k,B.i,B.h,0,m),B.m,m,m,new A.aO(k,m,l,j,m,m,B.t),m,m,m,B.eX,B.d3,m,m,m),B.F,!1,m,m,m,m,m,m,m,m,m,m,m,m,m,m,m,new A.arD(c,b),m,m,m,m,m,m)}} A.arE.prototype={ $1(a){var s=this.a return s.ahM(this.b,a,s.d)}, @@ -112882,12 +112887,12 @@ s.push(A.Q(q,n,n,n,n,m.ok.Q,n,n,n)) return A.aS(new A.as(B.dz,A.a9(s,B.k,B.fc,B.h,0,B.l),n),1)}} A.AX.prototype={ E(a){var s,r=this,q=null,p=A.m(a),o=r.f,n=A.bl(r.c,o,q,40),m=p.ok,l=m.e -l=l==null?q:l.cd(o,B.u) +l=l==null?q:l.ca(o,B.u) l=A.Q(r.e,q,q,q,q,l,q,q,q) s=m.z if(s==null)m=q else{m=m.Q -m=s.aF(m==null?q:m.b)}return A.fB(new A.as(B.W,A.a9(A.b([n,B.bL,l,B.b_,A.Q(r.d,q,q,q,q,m,B.Y,q,q)],t.p),B.k,B.i,B.a8,0,B.l),q),q,2,q,q)}} +m=s.aF(m==null?q:m.b)}return A.fB(new A.as(B.W,A.a9(A.b([n,B.bL,l,B.b_,A.Q(r.d,q,q,q,q,m,B.X,q,q)],t.p),B.k,B.i,B.a8,0,B.l),q),q,2,q,q)}} A.B6.prototype={ E(a2){var s,r,q,p,o,n,m,l=this,k=null,j=A.m(a2),i=l.c,h=i.r,g=h===B.kj,f=i.b,e=i.c,d=A.e7(l.Wf(a2),1.5),c=A.aQ(12),b=A.b([new A.bH(0,B.V,l.Wf(a2).aj(0.1),B.dJ,4)],t.V),a=A.aG(k,k,B.m,k,k,new A.aO(l.am_(a2),k,k,B.GE,k,k,B.t),k,k,k,k,k,k,k,6),a0=j.ok,a1=a0.w if(a1==null)a1=k @@ -112900,7 +112905,7 @@ p=A.aQ(12) o=l.amp() n=r.ok.Q m=t.p -p=A.aV(A.b([a1,B.aZ,A.aG(k,A.Q(o,k,k,k,k,n==null?k:n.cd(q,B.a2),k,k,k),B.m,k,k,new A.aO(s,k,k,p,k,k,B.t),k,k,k,k,B.Na,k,k,k)],m),B.k,B.i,B.h,0,k) +p=A.aV(A.b([a1,B.aZ,A.aG(k,A.Q(o,k,k,k,k,n==null?k:n.ca(q,B.a2),k,k,k),B.m,k,k,new A.aO(s,k,k,p,k,k,B.t),k,k,k,k,B.Na,k,k,k)],m),B.k,B.i,B.h,0,k) a0=a0.z if(a0==null)a0=k else{if(g){a1=j.ay @@ -112920,7 +112925,7 @@ a1.push(B.c9) a1.push(l.agQ(a2)) return A.bg(!0,k,A.eh(k,A.aG(k,A.aV(A.b([a,A.aS(new A.as(B.d3,A.a9(A.b([p,B.b_,a0,B.a1,A.aV(a1,B.k,B.i,B.h,0,k)],m),B.B,B.i,B.h,0,B.l),k),1)],m),B.k,B.i,B.h,0,k),B.c0,k,k,new A.aO(j.at,k,d,c,b,k,B.t),k,140,k,B.N5,k,k,k,k),B.F,!1,k,k,k,k,k,k,k,k,k,k,k,k,k,k,k,new A.azI(l,a2),k,k,k,k,k,k),!1,k,k,k,!1,k,!1,k,k,k,k,k,k,k,k,"Task: "+f+". "+e+". Status: "+h.b,k,k,k,k,k,k,k,k,k,k,k,k,k,k,k,k,k,k,k,k,k,k,k,k,B.w,k)}, Wf(a){var s=A.m(a),r=this.c.r -if(r===B.dP)return B.X +if(r===B.dP)return B.Y else if(r===B.fz)return s.ax.b else if(r===B.kj)return s.ay else return s.ch}, @@ -112928,9 +112933,9 @@ am_(a){switch(this.c.d.a){case 0:return B.eo case 1:return B.bc case 2:return B.z5}}, amn(a){var s=A.m(a) -switch(this.c.r.a){case 0:return B.X +switch(this.c.r.a){case 0:return B.Y case 1:return s.ax.b -case 2:return B.X +case 2:return B.Y case 3:return s.ay case 4:return B.ac}}, amp(){switch(this.c.r.a){case 0:return"\u0414\u043e\u0441\u0442\u0443\u043f\u043d\u043e" @@ -112944,23 +112949,23 @@ n=A.b([],m) s=l>0 if(s){r=A.bl(B.mW,B.d8,p,14) q=o.ok.Q -q=q==null?p:q.cd(B.qk,B.a2) +q=q==null?p:q.ca(B.qk,B.a2) B.b.L(n,A.b([r,B.Ef,A.Q("+"+l,p,p,p,p,q,p,p,p)],m))}if(k>0){m=A.b([],m) if(s)m.push(B.aZ) m.push(A.bl(B.O5,B.bc,p,14)) m.push(B.Ef) s=o.ok.Q -s=s==null?p:s.cd(B.qv,B.a2) +s=s==null?p:s.ca(B.qv,B.a2) m.push(A.Q("+"+k,p,p,p,p,s,p,p,p)) B.b.L(n,m)}return A.aV(n,B.k,B.i,B.a8,0,p)}, -axU(a){switch(this.c.e.a){case 0:return B.X +axU(a){switch(this.c.e.a){case 0:return B.Y case 1:return B.bc case 2:return B.ac}}, alO(){switch(this.c.e.a){case 0:return"\u041b\u0435\u0433\u043a\u043e" case 1:return"\u0421\u0440\u0435\u0434\u043d\u0435" case 2:return"\u0421\u043b\u043e\u0436\u043d\u043e"}}, agQ(a){var s,r,q,p=null,o=A.m(a),n=this.c.r -if(n===B.dP)return A.bl(B.f7,B.X,p,24) +if(n===B.dP)return A.bl(B.f7,B.Y,p,24) if(n===B.kj)return A.bl(B.t_,o.ay,p,24) n=n===B.fz s=n?"\u0417\u0430\u0432\u0435\u0440\u0448\u0438\u0442\u044c":"\u041d\u0430\u0447\u0430\u0442\u044c" @@ -113764,7 +113769,7 @@ if(r!=null)r.J(0,s.ghB()) s.bE$=null s.ar()}, by(){this.co() -this.cb() +this.cc() this.hC()}} A.ayl.prototype={ gC(a){return this.c.length}, @@ -119870,8 +119875,8 @@ B.Js=new A.A(1,0.2196078431372549,0.5568627450980392,0.23529411764705882,B.f) B.Ki=new A.A(1,0.1803921568627451,0.49019607843137253,0.19607843137254902,B.f) B.JQ=new A.A(1,0.10588235294117647,0.3686274509803922,0.12549019607843137,B.f) B.Up=new A.bX([50,B.Lf,100,B.JU,200,B.L_,300,B.Lm,400,B.KA,500,B.Lh,600,B.Ll,700,B.Js,800,B.Ki,900,B.JQ],t.pl) -B.X=new A.jO(B.Up,1,0.2980392156862745,0.6862745098039216,0.3137254901960784,B.f) -B.OE=new A.c1(B.f7,80,B.X,null,null) +B.Y=new A.jO(B.Up,1,0.2980392156862745,0.6862745098039216,0.3137254901960784,B.f) +B.OE=new A.c1(B.f7,80,B.Y,null,null) B.NL=new A.aT(57694,"MaterialIcons",null,!0) B.tg=new A.c1(B.NL,null,null,null,null) B.t7=new A.aT(984454,"MaterialIcons",null,!1) @@ -120093,11 +120098,11 @@ B.a_K=new A.lS("\u0412\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u043d\u044b\u04 B.QS=s([B.a_J,B.a_M,B.a_K],t.p) B.dQ=new A.p4(0,"left") B.oE=new A.p4(1,"right") -B.Y=new A.p4(2,"center") +B.X=new A.p4(2,"center") B.km=new A.p4(3,"justify") B.ap=new A.p4(4,"start") B.oF=new A.p4(5,"end") -B.QT=s([B.dQ,B.oE,B.Y,B.km,B.ap,B.oF],A.al("G")) +B.QT=s([B.dQ,B.oE,B.X,B.km,B.ap,B.oF],A.al("G")) B.bq=new A.lV(0,"dial") B.cc=new A.lV(1,"input") B.fB=new A.lV(2,"dialOnly") @@ -121919,7 +121924,7 @@ B.ZV=new A.fR(B.a5f,null,null,null,null,null,null,null,null,null,null,null,null, B.a4F=new A.aX("Logged out successfully",null,null,null,null,null,null,null,null,null,null) B.ZW=new A.fR(B.a4F,null,null,null,null,null,null,null,null,null,null,null,null,B.bG,null,null,null,B.E,null) B.a5j=new A.aX("Purchase completed successfully!",null,null,null,null,null,null,null,null,null,null) -B.ZX=new A.fR(B.a5j,B.X,null,null,null,null,null,null,null,null,null,null,null,B.bG,null,null,null,B.E,null) +B.ZX=new A.fR(B.a5j,B.Y,null,null,null,null,null,null,null,null,null,null,null,B.bG,null,null,null,B.E,null) B.a5F=new A.aX("\u0412\u0432\u0435\u0434\u0438\u0442\u0435 \u043a\u043e\u0440\u0440\u0435\u043a\u0442\u043d\u043e\u0435 \u043a\u043e\u043b\u0438\u0447\u0435\u0441\u0442\u0432\u043e",null,null,null,null,null,null,null,null,null,null) B.ZY=new A.fR(B.a5F,null,null,null,null,null,null,null,null,null,null,null,null,B.bG,null,null,null,B.E,null) B.a4W=new A.aX("No tests available for this pack",null,null,null,null,null,null,null,null,null,null) @@ -121933,7 +121938,7 @@ B.a_1=new A.fR(B.a4X,B.bc,null,null,null,null,null,null,null,null,null,null,null B.a5d=new A.aX("\u0424\u0438\u043b\u044c\u0442\u0440\u044b \u0441\u043a\u043e\u0440\u043e \u0431\u0443\u0434\u0443\u0442 \u0434\u043e\u0441\u0442\u0443\u043f\u043d\u044b",null,null,null,null,null,null,null,null,null,null) B.a_2=new A.fR(B.a5d,null,null,null,null,null,null,null,null,null,null,null,null,B.bG,null,null,null,B.E,null) B.a51=new A.aX("\u0417\u0430\u0434\u0430\u043d\u0438\u0435 \u0443\u0441\u043f\u0435\u0448\u043d\u043e \u0441\u043e\u0437\u0434\u0430\u043d\u043e!",null,null,null,null,null,null,null,null,null,null) -B.a_3=new A.fR(B.a51,B.X,null,null,null,null,null,null,null,null,null,null,null,B.h8,null,null,null,B.E,null) +B.a_3=new A.fR(B.a51,B.Y,null,null,null,null,null,null,null,null,null,null,null,B.h8,null,null,null,B.E,null) B.a50=new A.aX("Audio playback not implemented yet",null,null,null,null,null,null,null,null,null,null) B.a_4=new A.fR(B.a50,null,null,null,null,null,null,null,null,null,null,null,null,B.bG,null,null,null,B.E,null) B.a4Z=new A.aX("\u0412\u044b\u0431\u0435\u0440\u0438\u0442\u0435 \u0442\u0438\u043f \u043d\u0430\u0433\u0440\u0430\u0434\u044b",null,null,null,null,null,null,null,null,null,null) @@ -122375,7 +122380,7 @@ B.a5n=new A.aX("Verify Payment",null,null,null,null,null,null,null,null,null,nul B.a5o=new A.aX("Test not found",null,null,null,null,null,null,null,null,null,null) B.a5p=new A.aX("Failed to load packs",null,B.ku,null,null,null,null,null,null,null,null) B.a5q=new A.aX("\u041e\u0431\u043d\u043e\u0432\u0438\u0442\u044c \u0441\u0442\u0430\u0442\u0438\u0441\u0442\u0438\u043a\u0443",null,null,null,null,null,null,null,null,null,null) -B.a5r=new A.aX("Sign in to save your progress",null,null,B.Y,null,null,null,null,null,null,null) +B.a5r=new A.aX("Sign in to save your progress",null,null,B.X,null,null,null,null,null,null,null) B.a1A=new A.D(!0,B.p,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null) B.a5s=new A.aX("Go to home page",null,B.a1A,null,null,null,null,null,null,null,null) B.a5t=new A.aX("\u041f\u043e\u0434\u0442\u0432\u0435\u0440\u0436\u0434\u0435\u043d\u0438\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0438\u044f",null,null,null,null,null,null,null,null,null,null) diff --git a/mnemo_cards_web_v2/lib/domain/config/api_config_v2.dart b/mnemo_cards_web_v2/lib/domain/config/api_config_v2.dart index 5216c74..5e438e5 100644 --- a/mnemo_cards_web_v2/lib/domain/config/api_config_v2.dart +++ b/mnemo_cards_web_v2/lib/domain/config/api_config_v2.dart @@ -7,6 +7,8 @@ /// - JSON API response format /// - API versioning via URL prefix class ApiConfigV2 { + /// App version from pubspec.yaml + static const String appVersion = '1.0.0'; /// Base URL for API v2 /// All v2 endpoints are prefixed with /api/v2 static String get baseUrl { diff --git a/mnemo_cards_web_v2/lib/presentation/pages/auth/auth_page.dart b/mnemo_cards_web_v2/lib/presentation/pages/auth/auth_page.dart index b62c1b0..bddab34 100644 --- a/mnemo_cards_web_v2/lib/presentation/pages/auth/auth_page.dart +++ b/mnemo_cards_web_v2/lib/presentation/pages/auth/auth_page.dart @@ -851,6 +851,15 @@ class _AuthPageState extends State { color: theme.colorScheme.onSurfaceVariant, ), ), + ), + const SizedBox(height: 16), + Text( + 'Version ${ApiConfigV2.appVersion}', + style: theme.textTheme.bodySmall?.copyWith( + fontWeight: FontWeight.w500, + color: theme.colorScheme.onSurfaceVariant, + ), + textAlign: TextAlign.center, ), ], ), diff --git a/mnemo_cards_web_v2/test/presentation/pages/auth/auth_page_test.dart b/mnemo_cards_web_v2/test/presentation/pages/auth/auth_page_test.dart index 913d462..d635339 100644 --- a/mnemo_cards_web_v2/test/presentation/pages/auth/auth_page_test.dart +++ b/mnemo_cards_web_v2/test/presentation/pages/auth/auth_page_test.dart @@ -306,5 +306,19 @@ void main() { // This is tested by ensuring the code compiles without deprecation warnings expect(find.byType(Container), findsWidgets); }); + + testWidgets('displays app version at bottom of auth page', (tester) async { + await tester.pumpWidget(createTestWidget(const AuthPage())); + + // Verify version text is displayed + expect(find.text('Version 1.0.0'), findsOneWidget); + + // Verify version text uses proper styling + final versionFinder = find.text('Version 1.0.0'); + final versionWidget = tester.widget(versionFinder); + expect(versionWidget.style?.fontWeight, FontWeight.w500); + expect(versionWidget.style?.color, isNotNull); + expect(versionWidget.textAlign, TextAlign.center); + }); }); }