From a763423409d33d149ea8c9e8fff26ee280581d03 Mon Sep 17 00:00:00 2001 From: "ashutosh.s" Date: Fri, 26 Apr 2024 21:08:13 +0530 Subject: [PATCH] Update experience --- assets/me.webp | Bin 4840 -> 2346 bytes lib/about/contact.dart | 5 ++-- lib/experience/experience.dart | 16 ++++++++---- lib/generated/intl/messages_all.dart | 11 ++++---- lib/generated/intl/messages_en.dart | 8 +++--- lib/generated/l10n.dart | 16 ++++++------ lib/homepage.dart | 37 ++++++++++++++------------- lib/l10n/intl_en.arb | 8 +++--- 8 files changed, 54 insertions(+), 47 deletions(-) diff --git a/assets/me.webp b/assets/me.webp index daa5bda24ca8f0fc0931117e01eff8970ab641c4..e3156fae8d70b0e52f024c3f7effc83d60442710 100644 GIT binary patch literal 2346 zcmV+_3Dx#eNk&E@2><|BMM6+kP&gnK2><|aCIFoQDr5j;06tM7jYOlOAr*<{TsQ>; zv4CN=hJ89EYL(CCKp&Jh#QBQoXT1#^W5XXDUg(w8EC0a$Ida$?WI<;n}6X*W@y5L$c5i$o-wr!z{!dkJ&sf|O<-{!jgDCOse z)dbObXqfpnv{kC7#dWGO=Und*LfF)MJRU+uyfzd36fZ1BO=<_V9BHDYxi`+P?c`csqXRpk_@-nIw}Ol!EnG?u`E z8wS6C_~ujKEZo;ohH@GQwP`}{ta<7aP^*_rbx=$I{_!yzv0gZE!INPt@pEYp8Xh3h z(b*IF&Ns}jobtU)Z#Z}d__%{{^dyZ^}z*Ncx_S(*CpP7aaYhXpx&J)=xKXU?y<$inMQdbI-P7@0CSjuJW2a zlM|S-{fPse+Kv2_(}Le3_q@7Gz*YJ`rZBkVuc3hl&vk;$|?VfGO^ZzM+$nK!;>L3^%Q9&8MO zL_my3zEg-PWD>=M zTvUXvs*@{A1?YwceueHNA8(pm_zHi9L?2Is^!5S}eavO+|Bz;4B#j}x`IV7K&|NKx zrRd*_;7$i8;Z%O-FbtI)#~|4LgxY209aq^x5-To>_cEX-*=CNw6X>(| zTPohS5S^V_x7p&s8lPU zQ{0l65G+m#=Y;1(Y+_EqUY zAd!b*Si{F+dAQ?CLZs6H!6z17sTTt}?j@2LGj&&_@;^rT^k z>wv@gL5itA%CD4FMhk}Ozy<#E)d%$we@LW|J8>Bt2`kz=ZUfpJ41K#p!9HLr_6Pfi z)4k5@o>N0gwN52X4GA^N!?`-aY{!~5xgY1z*v3~EL5N}NK=trflQU=GwHT#(QeR0v}{QKA$O zeX1Y9t2ou|W;lkCU+`le95X1FvSg?KZ^wrYIvV?fwwN93rVq)&v?<>DZf_%yW{>%+ zH{FxrZ+hRe>->07Z8Wi}@Zx8-fxNG^ecxyzFxLEVV80?aqc1pTz|F4kG;CTj=|bf5 zgs-vEuQ|6p1n}i1c~rV`gE+~ z)Fya~6-LfQ74vVXq8AG1J)j(YKW!Cw^i$^8#^_>v&3n!1_i(0!o>{m|K-R;ovwzzs=WWQlw5~YFn1jZj_5Q!qfFlv8wTfrMv z#K73;`^>b~aX>)OoCPsW^$X*T1a9RXXyBX(g{*z~<6G0(9;87XMHjPl&^bjcR3d{5 zDR_A1BVNUk1zh(D2+r1(N9B3m^S;8Jx8)VxqT28ab%n#Nh5ZcMrYN@%A`lW}b(hxI zN5d{#wmncXpV5@3lxE^g*D(HDaJc)PFL4IXz}roXS3tJ&FK8JB%TeiK&}h^w)G zH|ZQJnwQCi-L?7I@#5gs-zvT{<|JTI7GcX9Ar*PTnm2%WIy-0s&;V`jvi#uv1)7Hthq zqtMORPOI+!J~dJ~tD^Um;T3%gOIL%n^GtFZsG_W+^vJH&U=hn4NdD;$YtXSR>FLBE z`EnA^OX|YGLsRR!eNAEoJNhQ)$1RvPVccQuYboNld1ul;GJTZr^SEhyUUS~9=O>0_ z%4}k%_-5ZgfE}kthwv;pt2m5g!A)HM^f;IUmj(6?Nx|xz`77oNuY*3XsnpVER2FZD zmW5bd=!y{rH+Z77Hd8W4%tYb^jGVoTmg_&iW_wyg*v!|kMInt`qCWu|t{Z2%tg4$x QwqVnEX%x0EgV12mk;8 literal 4840 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 z LibraryLoader(); Map _deferredLibraries = { - 'en': () => new Future.value(null), + 'en': () => new SynchronousFuture(null), }; MessageLookupByLibrary? _findExact(String localeName) { @@ -32,18 +33,18 @@ MessageLookupByLibrary? _findExact(String localeName) { } /// User programs should call this before using [localeName] for messages. -Future initializeMessages(String localeName) async { +Future initializeMessages(String localeName) { var availableLocale = Intl.verifiedLocale( localeName, (locale) => _deferredLibraries[locale] != null, onFailure: (_) => null); if (availableLocale == null) { - return new Future.value(false); + return new SynchronousFuture(false); } var lib = _deferredLibraries[availableLocale]; - await (lib == null ? new Future.value(false) : lib()); + lib == null ? new SynchronousFuture(false) : lib(); initializeInternalMessageLookup(() => new CompositeMessageLookup()); messageLookup.addLocale(availableLocale, _findGeneratedMessagesFor); - return new Future.value(true); + return new SynchronousFuture(true); } bool _messagesExistFor(String locale) { diff --git a/lib/generated/intl/messages_en.dart b/lib/generated/intl/messages_en.dart index 2ffd273..f987a12 100644 --- a/lib/generated/intl/messages_en.dart +++ b/lib/generated/intl/messages_en.dart @@ -27,12 +27,12 @@ class MessageLookup extends MessageLookupByLibrary { 'e': 'Good Evening', 'n': 'Hi there, night owl', 'other': 'Hello', - })}. I\'m "; + })}. I\'\'m "; final messages = _notInlinedMessages(_notInlinedMessages); static Map _notInlinedMessages(_) => { "aboutDesc": MessageLookupByLibrary.simpleMessage( - "I am Ashutosh Singh, also known by the username thecodepapaya, freshly graduated from Indian Institute of Information Technology Vadodara. I love building delightful user experiences and system verticals."), + "I am Ashutosh Singh, also known by the username thecodepapaya. I\'\'m Passionate about crafting high-quality software that transforms industries and enhances the lives of individuals with a particular interest in healthcare and energy sectors."), "aboutGreeting": m0, "blogMinutes": MessageLookupByLibrary.simpleMessage("Min"), "footerCredit": MessageLookupByLibrary.simpleMessage( @@ -46,8 +46,8 @@ class MessageLookup extends MessageLookupByLibrary { "notFoundInterjection": MessageLookupByLibrary.simpleMessage("Oh no!"), "tabBlog": MessageLookupByLibrary.simpleMessage("03. Blogs"), "tabExperience": - MessageLookupByLibrary.simpleMessage("02. Experience"), - "tabProjects": MessageLookupByLibrary.simpleMessage("01. Projects"), + MessageLookupByLibrary.simpleMessage("01. Experience"), + "tabProjects": MessageLookupByLibrary.simpleMessage("02. Projects"), "title": MessageLookupByLibrary.simpleMessage("Ashutosh Singh") }; } diff --git a/lib/generated/l10n.dart b/lib/generated/l10n.dart index 9869f88..bd5e8a6 100644 --- a/lib/generated/l10n.dart +++ b/lib/generated/l10n.dart @@ -50,17 +50,17 @@ class S { return Localizations.of(context, S); } - /// `I am Ashutosh Singh, also known by the username thecodepapaya, freshly graduated from Indian Institute of Information Technology Vadodara. I love building delightful user experiences and system verticals.` + /// `I am Ashutosh Singh, also known by the username thecodepapaya. I''m Passionate about crafting high-quality software that transforms industries and enhances the lives of individuals with a particular interest in healthcare and energy sectors.` String get aboutDesc { return Intl.message( - 'I am Ashutosh Singh, also known by the username thecodepapaya, freshly graduated from Indian Institute of Information Technology Vadodara. I love building delightful user experiences and system verticals.', + 'I am Ashutosh Singh, also known by the username thecodepapaya. I\'\'m Passionate about crafting high-quality software that transforms industries and enhances the lives of individuals with a particular interest in healthcare and energy sectors.', name: 'aboutDesc', desc: '', args: [], ); } - /// `{greeting, select, em {Good morning, early bird} m {Good Morning} a {Good Afternoon} e {Good Evening} n {Hi there, night owl} other {Hello}}. I'm ` + /// `{greeting, select, em {Good morning, early bird} m {Good Morning} a {Good Afternoon} e {Good Evening} n {Hi there, night owl} other {Hello}}. I''m ` String aboutGreeting(Object greeting) { return Intl.message( '${Intl.select(greeting, { @@ -70,7 +70,7 @@ class S { 'e': 'Good Evening', 'n': 'Hi there, night owl', 'other': 'Hello' - })}. I\'m ', + })}. I\'\'m ', name: 'aboutGreeting', desc: '', args: [greeting], @@ -147,20 +147,20 @@ class S { ); } - /// `02. Experience` + /// `01. Experience` String get tabExperience { return Intl.message( - '02. Experience', + '01. Experience', name: 'tabExperience', desc: '', args: [], ); } - /// `01. Projects` + /// `02. Projects` String get tabProjects { return Intl.message( - '01. Projects', + '02. Projects', name: 'tabProjects', desc: '', args: [], diff --git a/lib/homepage.dart b/lib/homepage.dart index 52c8adf..1ad8edf 100644 --- a/lib/homepage.dart +++ b/lib/homepage.dart @@ -29,23 +29,23 @@ class _HomePageState extends State { List tabData = []; - double projectPercent = 1; - double experiencePercent = 0; + double experiencePercent = 1; + double projectPercent = 0; double blogPercent = 0; @override void didChangeDependencies() { super.didChangeDependencies(); tabData = [ + TabData( + globalKey: experienceKey, + tabName: S.of(context).tabExperience, + ), TabData( globalKey: projectKey, tabName: S.of(context).tabProjects, isSelected: true, ), - TabData( - globalKey: experienceKey, - tabName: S.of(context).tabExperience, - ), TabData( globalKey: blogKey, tabName: S.of(context).tabBlog, @@ -82,16 +82,16 @@ class _HomePageState extends State { controller: _controller, child: Column( children: [ - VisibilityDetector( - key: Key(tabData[0].tabName), - child: Projects(key: projectKey), - onVisibilityChanged: projectVisibility, - ), VisibilityDetector( key: Key(tabData[1].tabName), child: Experience(key: experienceKey), onVisibilityChanged: experienceVisibility, ), + VisibilityDetector( + key: Key(tabData[0].tabName), + child: Projects(key: projectKey), + onVisibilityChanged: projectVisibility, + ), VisibilityDetector( key: Key(tabData[2].tabName), child: Blogs(key: blogKey), @@ -119,23 +119,23 @@ class _HomePageState extends State { child: Padding( padding: const EdgeInsets.all(Constants.cardMargin), child: Text( - S.of(context).tabProjects, + S.of(context).tabExperience, style: Theme.of(context).textTheme.headlineSmall, ), ), ), - Projects(), + Experience(), Align( alignment: Alignment.centerLeft, child: Padding( padding: const EdgeInsets.all(Constants.cardMargin), child: Text( - S.of(context).tabExperience, + S.of(context).tabProjects, style: Theme.of(context).textTheme.headlineSmall, ), ), ), - Experience(), + Projects(), Align( alignment: Alignment.centerLeft, child: Padding( @@ -157,8 +157,8 @@ class _HomePageState extends State { List mobileWidgets = [ About(tabData: tabData), SizedBox(height: 50), - projectHeader(), experienceHeader(), + projectHeader(), blogHeader(), Footer(), ]; @@ -241,18 +241,19 @@ class _HomePageState extends State { } void handleChange() { - if (projectPercent > experiencePercent && projectPercent > blogPercent) { + if (experiencePercent > projectPercent && experiencePercent > blogPercent) { setAllFalse(); setState(() { tabData[0].isSelected = true; }); } - if (experiencePercent > projectPercent && experiencePercent > blogPercent) { + if (projectPercent > experiencePercent && projectPercent > blogPercent) { setAllFalse(); setState(() { tabData[1].isSelected = true; }); } + if (blogPercent > experiencePercent && blogPercent > projectPercent) { setAllFalse(); setState(() { diff --git a/lib/l10n/intl_en.arb b/lib/l10n/intl_en.arb index 9bf4690..c5edea2 100644 --- a/lib/l10n/intl_en.arb +++ b/lib/l10n/intl_en.arb @@ -1,6 +1,6 @@ { - "aboutDesc": "I am Ashutosh Singh, also known by the username thecodepapaya, freshly graduated from Indian Institute of Information Technology Vadodara. I love building delightful user experiences and system verticals.", - "aboutGreeting": "{greeting, select, em {Good morning, early bird} m {Good Morning} a {Good Afternoon} e {Good Evening} n {Hi there, night owl} other {Hello}}. I'm ", + "aboutDesc": "I am Ashutosh Singh, also known by the username thecodepapaya. I''m Passionate about crafting high-quality software that transforms industries and enhances the lives of individuals with a particular interest in healthcare and energy sectors.", + "aboutGreeting": "{greeting, select, em {Good morning, early bird} m {Good Morning} a {Good Afternoon} e {Good Evening} n {Hi there, night owl} other {Hello}}. I''m ", "blogMinutes": "Min", "footerCredit": "Based on designs by Nicolas Meuzard", "footerPower": "Powered by Flutter", @@ -8,7 +8,7 @@ "notFoundHome": "Take me back to 127.0.0.1", "notFoundInterjection": "Oh no!", "tabBlog": "03. Blogs", - "tabExperience": "02. Experience", - "tabProjects": "01. Projects", + "tabExperience": "01. Experience", + "tabProjects": "02. Projects", "title": "Ashutosh Singh" } \ No newline at end of file