Migrate project to flutter 3

thecodepapaya · Apr 26, 2024 · 4053c0a · 4053c0a
1 parent b6e903f
commit 4053c0a
Show file tree

Hide file tree

Showing 17 changed files with 131 additions and 112 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -2,6 +2,7 @@
     "cmake.configureOnOpen": false,
     "cSpell.words": [
         "fase",
+        "Gandhinagar",
         "kowi",
         "linkedin",
         "meuzard",

diff --git a/lib/404.dart b/lib/404.dart
@@ -18,9 +18,9 @@ class _NotFound404State extends State<NotFound404> {
   Widget build(BuildContext context) {
     var textStyle = getValueForScreenType<TextStyle>(
       context: context,
-      mobile: Theme.of(context).textTheme.headline4!,
-      tablet: Theme.of(context).textTheme.headline2,
-      desktop: Theme.of(context).textTheme.headline1,
+      mobile: Theme.of(context).textTheme.headlineMedium!,
+      tablet: Theme.of(context).textTheme.displayMedium,
+      desktop: Theme.of(context).textTheme.displayLarge,
     );
 
     var padding = getValueForScreenType<EdgeInsets>(
@@ -67,7 +67,7 @@ class _NotFound404State extends State<NotFound404> {
                       S.of(context).notFoundHome,
                       style: Theme.of(context)
                           .textTheme
-                          .headline6
+                          .titleLarge
                           ?.copyWith(color: textColor),
                     ),
                   ),

diff --git a/lib/about/about.dart b/lib/about/about.dart
@@ -26,10 +26,10 @@ class About extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return ScreenTypeLayout(
-      desktop: desktopView(context),
-      tablet: tabletView(context),
-      mobile: mobileView(context),
+    return ScreenTypeLayout.builder(
+      desktop: (context) => desktopView(context),
+      tablet: (context) => tabletView(context),
+      mobile: (context) => mobileView(context),
     );
   }
 
@@ -49,12 +49,12 @@ class About extends StatelessWidget {
             crossAxisAlignment: CrossAxisAlignment.start,
             children: [
               Text(S.of(context).aboutGreeting(dayTime()),
-                  style: Theme.of(context).textTheme.headline3),
+                  style: Theme.of(context).textTheme.displaySmall),
               Text(S.of(context).title + '.',
-                  style: Theme.of(context).textTheme.headline1),
+                  style: Theme.of(context).textTheme.displayLarge),
               SizedBox(height: 40),
               Text(S.of(context).aboutDesc,
-                  style: Theme.of(context).textTheme.subtitle1),
+                  style: Theme.of(context).textTheme.titleMedium),
             ],
           ),
           Tabs(tabData: tabData),
@@ -84,16 +84,16 @@ class About extends StatelessWidget {
             children: [
               Text(
                 S.of(context).aboutGreeting(dayTime()),
-                style: Theme.of(context).textTheme.headline3,
+                style: Theme.of(context).textTheme.displaySmall,
               ),
               Text(
                 S.of(context).title + '.',
-                style: Theme.of(context).textTheme.headline1,
+                style: Theme.of(context).textTheme.displayLarge,
               ),
               SizedBox(height: 40),
               Text(
                 S.of(context).aboutDesc,
-                style: Theme.of(context).textTheme.subtitle1,
+                style: Theme.of(context).textTheme.titleMedium,
               ),
             ],
           ),
@@ -121,19 +121,19 @@ class About extends StatelessWidget {
               FittedBox(
                 child: Text(
                   S.of(context).aboutGreeting(dayTime()),
-                  style: Theme.of(context).textTheme.headline3,
+                  style: Theme.of(context).textTheme.displaySmall,
                 ),
               ),
               FittedBox(
                 child: Text(
                   S.of(context).title + '.',
-                  style: Theme.of(context).textTheme.headline1,
+                  style: Theme.of(context).textTheme.displayLarge,
                 ),
               ),
               SizedBox(height: 40),
               Text(
                 S.of(context).aboutDesc,
-                style: Theme.of(context).textTheme.subtitle1,
+                style: Theme.of(context).textTheme.titleMedium,
               ),
             ],
           ),

diff --git a/lib/about/contact.dart b/lib/about/contact.dart
@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 import 'package:portfolio/components/analytics.dart';
 import 'package:portfolio/utils/constants.dart';
-import 'package:url_launcher/url_launcher.dart';
+import 'package:url_launcher/url_launcher_string.dart';
 
 class Contact extends StatelessWidget {
   const Contact({Key? key}) : super(key: key);
@@ -66,7 +66,7 @@ class Contact extends StatelessWidget {
   }) {
     return IconButton(
       onPressed: () {
-        launch(url);
+        launchUrlString(url);
         PortfolioAnalytics.log(LogType.contactClick, property: url);
       },
       tooltip: tooltip,

diff --git a/lib/blogs/blog_card.dart b/lib/blogs/blog_card.dart
@@ -2,12 +2,12 @@ import 'package:flutter/material.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 import 'package:portfolio/blogs/blog_data.dart';
 import 'package:portfolio/components/analytics.dart';
-import 'package:portfolio/components/portfolio_card.dart';
-import 'package:portfolio/utils/constants.dart';
 import 'package:portfolio/components/card_tag.dart';
-import 'package:portfolio/style/colours.dart';
-import 'package:url_launcher/url_launcher.dart';
+import 'package:portfolio/components/portfolio_card.dart';
 import 'package:portfolio/generated/l10n.dart';
+import 'package:portfolio/style/colors.dart';
+import 'package:portfolio/utils/constants.dart';
+import 'package:url_launcher/url_launcher_string.dart';
 
 class BlogCard extends StatelessWidget {
   const BlogCard({
@@ -21,7 +21,7 @@ class BlogCard extends StatelessWidget {
   Widget build(BuildContext context) {
     return GestureDetector(
       onTap: () {
-        launch(data.url);
+        launchUrlString(data.url);
         PortfolioAnalytics.log(LogType.cardClick, property: data.url);
       },
       child: PortfolioCard(
@@ -48,7 +48,7 @@ class BlogCard extends StatelessWidget {
             ),
             Text(
               data.title,
-              style: Theme.of(context).textTheme.headline6,
+              style: Theme.of(context).textTheme.titleLarge,
               maxLines: 1,
               overflow: TextOverflow.ellipsis,
             ),

diff --git a/lib/blogs/blogs.dart b/lib/blogs/blogs.dart
@@ -9,10 +9,10 @@ class Blogs extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return ScreenTypeLayout(
-      desktop: desktopView(),
-      tablet: tabletView(),
-      mobile: mobileView(),
+    return ScreenTypeLayout.builder(
+      desktop: (_) => desktopView(),
+      tablet: (_) => tabletView(),
+      mobile: (_) => mobileView(),
     );
   }
 

diff --git a/lib/components/card_tag.dart b/lib/components/card_tag.dart
@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:portfolio/style/colours.dart';
+import 'package:portfolio/style/colors.dart';
 
 class CardTag extends StatelessWidget {
   const CardTag({
@@ -20,7 +20,7 @@ class CardTag extends StatelessWidget {
         padding: EdgeInsets.all(tagSize),
         child: Text(
           tag.toUpperCase(),
-          style: Theme.of(context).textTheme.overline,
+          style: Theme.of(context).textTheme.labelSmall,
         ),
       ),
     );

diff --git a/lib/components/footer.dart b/lib/components/footer.dart
@@ -1,19 +1,19 @@
 import 'package:flutter/material.dart';
 import 'package:portfolio/components/analytics.dart';
-import 'package:portfolio/utils/constants.dart';
 import 'package:portfolio/generated/l10n.dart';
+import 'package:portfolio/utils/constants.dart';
 import 'package:responsive_builder/responsive_builder.dart';
-import 'package:url_launcher/url_launcher.dart';
+import 'package:url_launcher/url_launcher_string.dart';
 
 class Footer extends StatelessWidget {
   const Footer({Key? key}) : super(key: key);
 
   @override
   Widget build(BuildContext context) {
-    return ScreenTypeLayout(
-      desktop: desktopView(context),
-      tablet: tabletView(context),
-      mobile: mobileView(context),
+    return ScreenTypeLayout.builder(
+      desktop: (context) => desktopView(context),
+      tablet: (context) => tabletView(context),
+      mobile: (context) => mobileView(context),
     );
   }
 
@@ -29,7 +29,7 @@ class Footer extends StatelessWidget {
               S.of(context).footerPower +
               "."),
           onTap: () {
-            launch("https://dribbble.com/NicolasMzrd");
+            launchUrlString("https://dribbble.com/NicolasMzrd");
             PortfolioAnalytics.log(LogType.footerCreditClick);
           },
         ),
@@ -46,7 +46,7 @@ class Footer extends StatelessWidget {
         child: GestureDetector(
           child: Text(S.of(context).footerCredit),
           onTap: () {
-            launch("https://dribbble.com/NicolasMzrd");
+            launchUrlString("https://dribbble.com/NicolasMzrd");
           },
         ),
       ),
@@ -62,7 +62,7 @@ class Footer extends StatelessWidget {
         child: GestureDetector(
           child: Text(S.of(context).footerCredit),
           onTap: () {
-            launch("https://dribbble.com/NicolasMzrd");
+            launchUrlString("https://dribbble.com/NicolasMzrd");
           },
         ),
       ),

diff --git a/lib/experience/experience.dart b/lib/experience/experience.dart
@@ -9,10 +9,10 @@ class Experience extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return ScreenTypeLayout(
-      desktop: desktopView(),
-      tablet: tabletView(),
-      mobile: mobileView(),
+    return ScreenTypeLayout.builder(
+      desktop: (_) => desktopView(),
+      tablet: (_) => tabletView(),
+      mobile: (_) => mobileView(),
     );
   }
 
@@ -54,13 +54,21 @@ class Experience extends StatelessWidget {
 }
 
 final data = [
+  ExperienceData(
+    organizationName: "Even Healthcare",
+    position: "Software Engineer",
+    description:
+        "Building an awesome product for creators all around the world.",
+    startYearMonth: "Aug 23",
+    endYearMonth: "Present",
+  ),
   ExperienceData(
     organizationName: "Qoohoo",
-    position: "Product Engineer Intern",
+    position: "Product Engineer",
     description:
         "Building an awesome product for creators all around the world.",
     startYearMonth: "Oct 21",
-    endYearMonth: "Present",
+    endYearMonth: "July 23",
   ),
   ExperienceData(
     organizationName: "National Informatics Centre | Govt of India",

diff --git a/lib/experience/experience_card.dart b/lib/experience/experience_card.dart
@@ -4,7 +4,7 @@ import 'package:portfolio/components/portfolio_card.dart';
 import 'package:portfolio/utils/constants.dart';
 import 'package:portfolio/experience/experience_data.dart';
 import 'package:portfolio/components/card_tag.dart';
-import 'package:portfolio/style/colours.dart';
+import 'package:portfolio/style/colors.dart';
 
 class ExperienceCard extends StatelessWidget {
   const ExperienceCard({
@@ -35,7 +35,7 @@ class ExperienceCard extends StatelessWidget {
           ),
           Text(
             data.organizationName,
-            style: Theme.of(context).textTheme.headline6,
+            style: Theme.of(context).textTheme.titleLarge,
             maxLines: 1,
             overflow: TextOverflow.ellipsis,
           ),

diff --git a/lib/homepage.dart b/lib/homepage.dart
@@ -3,7 +3,7 @@ import 'package:portfolio/about/about.dart';
 import 'package:portfolio/about/tabs.dart';
 import 'package:portfolio/blogs/blogs.dart';
 import 'package:portfolio/components/footer.dart';
-import 'package:portfolio/style/colours.dart';
+import 'package:portfolio/style/colors.dart';
 import 'package:portfolio/utils/constants.dart';
 import 'package:portfolio/experience/experience.dart';
 import 'package:portfolio/generated/l10n.dart';
@@ -58,10 +58,10 @@ class _HomePageState extends State<HomePage> {
     return Scaffold(
       body: Padding(
         padding: const EdgeInsets.all(Constants.globalPadding),
-        child: ScreenTypeLayout(
-          desktop: desktopView(),
-          tablet: tabletView(context),
-          mobile: mobileView(context),
+        child: ScreenTypeLayout.builder(
+          desktop: (context) => desktopView(),
+          tablet: (context) => tabletView(context),
+          mobile: (context) => mobileView(context),
         ),
       ),
     );
@@ -120,7 +120,7 @@ class _HomePageState extends State<HomePage> {
               padding: const EdgeInsets.all(Constants.cardMargin),
               child: Text(
                 S.of(context).tabProjects,
-                style: Theme.of(context).textTheme.headline5,
+                style: Theme.of(context).textTheme.headlineSmall,
               ),
             ),
           ),
@@ -131,7 +131,7 @@ class _HomePageState extends State<HomePage> {
               padding: const EdgeInsets.all(Constants.cardMargin),
               child: Text(
                 S.of(context).tabExperience,
-                style: Theme.of(context).textTheme.headline5,
+                style: Theme.of(context).textTheme.headlineSmall,
               ),
             ),
           ),
@@ -142,7 +142,7 @@ class _HomePageState extends State<HomePage> {
               padding: const EdgeInsets.all(Constants.cardMargin),
               child: Text(
                 S.of(context).tabBlog,
-                style: Theme.of(context).textTheme.headline5,
+                style: Theme.of(context).textTheme.headlineSmall,
               ),
             ),
           ),
@@ -181,7 +181,7 @@ class _HomePageState extends State<HomePage> {
           padding: const EdgeInsets.all(Constants.cardMargin),
           child: Text(
             S.of(context).tabProjects.split("  ")[1],
-            style: Theme.of(context).textTheme.headline5,
+            style: Theme.of(context).textTheme.headlineSmall,
           ),
         ),
       ),
@@ -199,7 +199,7 @@ class _HomePageState extends State<HomePage> {
           padding: const EdgeInsets.all(Constants.cardMargin),
           child: Text(
             S.of(context).tabExperience.split("  ")[1],
-            style: Theme.of(context).textTheme.headline5,
+            style: Theme.of(context).textTheme.headlineSmall,
           ),
         ),
       ),
@@ -217,7 +217,7 @@ class _HomePageState extends State<HomePage> {
           padding: const EdgeInsets.all(Constants.cardMargin),
           child: Text(
             S.of(context).tabBlog.split("  ")[1],
-            style: Theme.of(context).textTheme.headline5,
+            style: Theme.of(context).textTheme.headlineSmall,
           ),
         ),
       ),

diff --git a/lib/main.dart b/lib/main.dart
@@ -5,7 +5,7 @@ import 'package:flutter_web_plugins/flutter_web_plugins.dart';
 import 'package:portfolio/firebase_options.dart';
 import 'package:portfolio/generated/l10n.dart';
 import 'package:portfolio/style/app_theme.dart';
-import 'package:portfolio/style/colours.dart';
+import 'package:portfolio/style/colors.dart';
 import 'package:portfolio/utils/constants.dart';
 import 'package:portfolio/utils/routes.dart';
 import 'package:responsive_builder/responsive_builder.dart';
@@ -45,6 +45,7 @@ class MyApp extends StatelessWidget {
         Locale('en', ''),
       ],
       theme: ThemeData(
+        useMaterial3: false,
         scaffoldBackgroundColor: ColorPalette.background,
         primaryColor: ColorPalette.background,
         cardTheme: PortfolioTheme.cardTheme(context),