diff --git a/assets/me.webp b/assets/me.webp index daa5bda..e3156fa 100644 Binary files a/assets/me.webp and b/assets/me.webp differ diff --git a/lib/about/contact.dart b/lib/about/contact.dart index f8ea2a7..0177945 100644 --- a/lib/about/contact.dart +++ b/lib/about/contact.dart @@ -21,8 +21,7 @@ class Contact extends StatelessWidget { SizedBox(width: 50), contactIcon( iconData: FontAwesomeIcons.briefcase, - url: - "https://my-portfolio-ashutosh-singh.s3.ap-south-1.amazonaws.com/Ashutosh_Resume.pdf", + url: "https://www.linkedin.com/in/thecodepapaya/", tooltip: "Ashutosh's Resume", ), contactIcon( @@ -42,7 +41,7 @@ class Contact extends StatelessWidget { ), contactIcon( iconData: FontAwesomeIcons.linkedinIn, - url: "https://linkedin.com/in/ashutoshsingh05as", + url: "https://www.linkedin.com/in/thecodepapaya/", tooltip: "Ashutosh's LinkedIn profile", ), contactIcon( diff --git a/lib/experience/experience.dart b/lib/experience/experience.dart index fd6e06b..7c105b3 100644 --- a/lib/experience/experience.dart +++ b/lib/experience/experience.dart @@ -58,7 +58,8 @@ final data = [ organizationName: "Even Healthcare", position: "Software Engineer", description: - "Building an awesome product for creators all around the world.", + "Build a new kind of health cover, One that keeps you healthy and " + "out of hospitals.", startYearMonth: "Aug 23", endYearMonth: "Present", ), @@ -66,7 +67,9 @@ final data = [ organizationName: "Qoohoo", position: "Product Engineer", description: - "Building an awesome product for creators all around the world.", + "Lead mobile engineer, designed and implemented several high impact " + "project from ground up including push notification system, payment " + "and ledger system and referral system.", startYearMonth: "Oct 21", endYearMonth: "July 23", ), @@ -74,7 +77,8 @@ final data = [ organizationName: "National Informatics Centre | Govt of India", position: "Trainee", description: - "Developed frontend components to house image processing utilities on NIC website. Integrated microservice APIs with Angular frontend.", + "Developed frontend components to house image processing utilities " + "on NIC website. Integrated microservice APIs with Angular frontend.", startYearMonth: "Jun 21", endYearMonth: "Jul 21", ), @@ -82,7 +86,8 @@ final data = [ organizationName: "Kowi Lifestyle Pvt Ltd", position: "Full stack Developer", description: - "Created company's core product from scratch. Wore different hats including SDE, DevOps and QA.", + "Created company's core product from scratch. Wore different hats " + "including SDE, DevOps and QA.", startYearMonth: "May 21", endYearMonth: "Jul 21", ), @@ -90,7 +95,8 @@ final data = [ organizationName: "Blindside HB GmbH", position: "Software Developer", description: - "Worked on the company's core product to enhance UX, add backend connectivity and modularize existing code.", + "Worked on the company's core product to enhance UX, add backend " + "connectivity and modularize existing code.", startYearMonth: "Sep 20", endYearMonth: "Nov 20", ), diff --git a/lib/generated/intl/messages_all.dart b/lib/generated/intl/messages_all.dart index e11aaca..203415c 100644 --- a/lib/generated/intl/messages_all.dart +++ b/lib/generated/intl/messages_all.dart @@ -11,6 +11,7 @@ import 'dart:async'; +import 'package:flutter/foundation.dart'; import 'package:intl/intl.dart'; import 'package:intl/message_lookup_by_library.dart'; import 'package:intl/src/intl_helpers.dart'; @@ -19,7 +20,7 @@ import 'messages_en.dart' as messages_en; typedef Future 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