Fix for Flutter 3.x (#87)

* apply dart fix

* fixes for share plus

* removing problematic package

* update

* upgrade android version

* upgrading and fixing few issues

* more fixes

* more fixes

* more fixes

* more fixes

* more fixes

* more fixes

* fix more errors

* android fixes

Author: lohanidamodar

.metadata

@@ -1,10 +1,30 @@
 # This file tracks properties of this Flutter project.
 # Used by Flutter tool to assess capabilities and perform upgrades etc.
 #
-# This file should be version controlled and should not be manually edited.
+# This file should be version controlled.
 
 version:
-  revision: 5391447fae6209bb21a89e6a5a6583cac1af9b4b
+  revision: b8f7f1f9869bb2d116aa6a70dbeac61000b52849
   channel: stable
 
 project_type: app
+
+# Tracks metadata for the flutter migrate command
+migration:
+  platforms:
+    - platform: root
+      create_revision: b8f7f1f9869bb2d116aa6a70dbeac61000b52849
+      base_revision: b8f7f1f9869bb2d116aa6a70dbeac61000b52849
+    - platform: android
+      create_revision: b8f7f1f9869bb2d116aa6a70dbeac61000b52849
+      base_revision: b8f7f1f9869bb2d116aa6a70dbeac61000b52849
+
+  # User provided section
+
+  # List of Local paths (relative to this file) that should be
+  # ignored by the migrate tool.
+  #
+  # Files that are not part of the templates will be ignored by default.
+  unmanaged_files:
+    - 'lib/main.dart'
+    - 'ios/Runner.xcodeproj/project.pbxproj'

analysis_options.yaml

@@ -0,0 +1,29 @@
+# This file configures the analyzer, which statically analyzes Dart code to
+# check for errors, warnings, and lints.
+#
+# The issues identified by the analyzer are surfaced in the UI of Dart-enabled
+# IDEs (https://dart.dev/tools#ides-and-editors). The analyzer can also be
+# invoked from the command line by running `flutter analyze`.
+
+# The following line activates a set of recommended lints for Flutter apps,
+# packages, and plugins designed to encourage good coding practices.
+include: package:flutter_lints/flutter.yaml
+
+linter:
+  # The lint rules applied to this project can be customized in the
+  # section below to disable rules from the `package:flutter_lints/flutter.yaml`
+  # included above or to enable additional rules. A list of all available lints
+  # and their documentation is published at
+  # https://dart-lang.github.io/linter/lints/index.html.
+  #
+  # Instead of disabling a lint rule for the entire project in the
+  # section below, it can also be suppressed for a single line of code
+  # or a specific dart file by using the `// ignore: name_of_lint` and
+  # `// ignore_for_file: name_of_lint` syntax on the line or in the file
+  # producing the lint.
+  rules:
+    # avoid_print: false  # Uncomment to disable the `avoid_print` rule
+    # prefer_single_quotes: true  # Uncomment to enable the `prefer_single_quotes` rule
+
+# Additional information about this file can be found at
+# https://dart.dev/guides/language/analysis-options

android/app/build.gradle

@@ -26,21 +26,26 @@ apply plugin: 'kotlin-android'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 33
+    ndkVersion flutter.ndkVersion
 
-    sourceSets {
-        main.java.srcDirs += 'src/main/kotlin'
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+
+    kotlinOptions {
+        jvmTarget = '1.8'
     }
 
-    lintOptions {
-        disable 'InvalidPackage'
+    sourceSets {
+        main.java.srcDirs += 'src/main/kotlin'
     }
 
     defaultConfig {
-        // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
         applicationId "com.popupbits.flutteruichallenges"
-        minSdkVersion 16
-        targetSdkVersion 28
+        minSdkVersion flutter.minSdkVersion
+        targetSdkVersion 33
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
     }

android/app/src/main/AndroidManifest.xml

@@ -1,16 +1,12 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.popupbits.flutteruichallenges">
-    <!-- io.flutter.app.FlutterApplication is an android.app.Application that
-         calls FlutterMain.startInitialization(this); in its onCreate method.
-         In most cases you can leave this as-is, but you if you want to provide
-         additional functionality it is fine to subclass or reimplement
-         FlutterApplication and put your custom class here. -->
     <application
-        android:name="io.flutter.app.FlutterApplication"
+        android:name="${applicationName}"
         android:label="flutteruichallenges"
         android:icon="@mipmap/ic_launcher">
         <activity
             android:name=".MainActivity"
+            android:exported="true"
             android:launchMode="singleTop"
             android:theme="@style/LaunchTheme"
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
@@ -24,15 +20,6 @@
               android:name="io.flutter.embedding.android.NormalTheme"
               android:resource="@style/NormalTheme"
               />
-            <!-- Displays an Android View that continues showing the launch screen
-                 Drawable until Flutter paints its first frame, then this splash
-                 screen fades out. A splash screen is useful to avoid any visual
-                 gap between the end of Android's launch screen and the painting of
-                 Flutter's first frame. -->
-            <meta-data
-              android:name="io.flutter.embedding.android.SplashScreenDrawable"
-              android:resource="@drawable/launch_background"
-              />
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.LAUNCHER"/>

android/app/src/main/res/drawable-v21/launch_background.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Modify this file to customize your launch splash screen -->
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="?android:colorBackground" />
+
+    <!-- You can insert your own image assets here -->
+    <!-- <item>
+        <bitmap
+            android:gravity="center"
+            android:src="@mipmap/launch_image" />
+    </item> -->
+</layer-list>

android/app/src/main/res/values-night/styles.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Theme applied to the Android Window while the process is starting when the OS's Dark Mode setting is on -->
+    <style name="LaunchTheme" parent="@android:style/Theme.Black.NoTitleBar">
+        <!-- Show a splash screen on the activity. Automatically removed when
+             the Flutter engine draws its first frame -->
+        <item name="android:windowBackground">@drawable/launch_background</item>
+    </style>
+    <!-- Theme applied to the Android Window as soon as the process has started.
+         This theme determines the color of the Android Window while your
+         Flutter UI initializes, as well as behind your Flutter UI while its
+         running.
+
+         This Theme is only used starting with V2 of Flutter's Android embedding. -->
+    <style name="NormalTheme" parent="@android:style/Theme.Black.NoTitleBar">
+        <item name="android:windowBackground">?android:colorBackground</item>
+    </style>
+</resources>

android/build.gradle

@@ -1,20 +1,20 @@
 buildscript {
-    ext.kotlin_version = '1.3.50'
+    ext.kotlin_version = '1.6.10'
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.0'
+        classpath 'com.android.tools.build:gradle:7.1.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
 
 allprojects {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 }
 

android/gradle.properties

@@ -1,4 +1,3 @@
 org.gradle.jvmargs=-Xmx1536M
-android.enableR8=true
 android.useAndroidX=true
 android.enableJetifier=true

android/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,5 @@
-#Fri Jun 23 08:50:38 CEST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip

android/settings.gradle

@@ -1,15 +1,11 @@
 include ':app'
 
-def flutterProjectRoot = rootProject.projectDir.parentFile.toPath()
+def localPropertiesFile = new File(rootProject.projectDir, "local.properties")
+def properties = new Properties()
 
-def plugins = new Properties()
-def pluginsFile = new File(flutterProjectRoot.toFile(), '.flutter-plugins')
-if (pluginsFile.exists()) {
-    pluginsFile.withReader('UTF-8') { reader -> plugins.load(reader) }
-}
+assert localPropertiesFile.exists()
+localPropertiesFile.withReader("UTF-8") { reader -> properties.load(reader) }
 
-plugins.each { name, path ->
-    def pluginDirectory = flutterProjectRoot.resolve(path).resolve('android').toFile()
-    include ":$name"
-    project(":$name").projectDir = pluginDirectory
-}
+def flutterSdkPath = properties.getProperty("flutter.sdk")
+assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
+apply from: "$flutterSdkPath/packages/flutter_tools/gradle/app_plugin_loader.gradle"

lib/core/constants.dart

@@ -30,4 +30,5 @@ const List<Developer> DEVELOPERS = [
   ),
 ];
 
-const String privacyUrl = "https://popupbits.com/contact/flutter-ui-challenges-privacy-policy/";
+const String privacyUrl =
+    "https://popupbits.com/contact/flutter-ui-challenges-privacy-policy/";

lib/core/data/models/developer.dart

@@ -5,5 +5,6 @@ class Developer {
   final String? address;
   final String? github;
 
-  const Developer({this.name, this.github, this.imageUrl, this.profession, this.address});
-}
+  const Developer(
+      {this.name, this.github, this.imageUrl, this.profession, this.address});
+}

lib/core/data/models/menu.dart

@@ -1,5 +1,4 @@
-
-import 'package:flutter/material.dart';
+import 'package:flutter/material.dart' hide MenuItem;
 
 class MenuItem {
   final String title;

lib/core/presentation/pages/main_menu.dart

@@ -4,7 +4,7 @@
   */
 
 import 'package:flutter/material.dart';
-import 'package:flutter_ui_challenges/core/data/models/menu.dart';
+import 'package:flutter_ui_challenges/core/data/models/menu.dart' as menu;
 import 'package:flutter_ui_challenges/core/presentation/widgets/preview.dart';
 import 'package:flutter_ui_challenges/core/presentation/widgets/rounded_bordered_container.dart';
 import 'package:flutter_ui_challenges/src/pages/bike/bike_details.dart';
@@ -30,7 +30,7 @@ class _MainMenuState extends State<MainMenu> {
     return ListView(
       physics: BouncingScrollPhysics(),
       children: <Widget>[
-        ...pages.map((page) => page is MenuItem
+        ...pages.map((page) => page is menu.MenuItem
             ? _buildExpandableMenu(page, context)
             : BorderedContainer(
                 margin: const EdgeInsets.symmetric(
@@ -43,7 +43,7 @@ class _MainMenuState extends State<MainMenu> {
     );
   }
 
-  Widget _buildExpandableMenu(MenuItem page, BuildContext context) {
+  Widget _buildExpandableMenu(menu.MenuItem page, BuildContext context) {
     return RoundedContainer(
       margin: EdgeInsets.symmetric(
           horizontal:
@@ -69,13 +69,14 @@ class _MainMenuState extends State<MainMenu> {
     );
   }
 
-  List<Widget> _buildSubMenus(List<SubMenuItem> items, BuildContext context) {
+  List<Widget> _buildSubMenus(
+      List<menu.SubMenuItem> items, BuildContext context) {
     final List<Widget> subMenus = [];
     items.forEach((item) => subMenus.add(_buildSubMenu(item, context)));
     return subMenus;
   }
 
-  Widget _buildSubMenu(SubMenuItem item, BuildContext context) {
+  Widget _buildSubMenu(menu.SubMenuItem item, BuildContext context) {
     return Padding(
       padding: const EdgeInsets.only(left: 32.0),
       child: ListTile(
@@ -88,7 +89,7 @@ class _MainMenuState extends State<MainMenu> {
           children: <Widget>[
             IconButton(
               icon: Icon(Icons.code),
-              onPressed: () => _openPage(context, item, OpenMode.CODE),
+              onPressed: () => _openPage(context, item, menu.OpenMode.CODE),
             ),
           ],
         ),
@@ -99,16 +100,17 @@ class _MainMenuState extends State<MainMenu> {
               .subtitle1!
               .copyWith(color: Colors.black87),
         ),
-        onTap: () => _openPage(context, item, OpenMode.PREVIEW),
+        onTap: () => _openPage(context, item, menu.OpenMode.PREVIEW),
       ),
     );
   }
 
-  void _openPage(BuildContext context, SubMenuItem item, OpenMode mode) {
+  void _openPage(
+      BuildContext context, menu.SubMenuItem item, menu.OpenMode mode) {
     Navigator.push(
         context,
         MaterialPageRoute(
-          builder: (context) => mode == OpenMode.CODE
+          builder: (context) => mode == menu.OpenMode.CODE
               ? DesignPreviewsPage(
                   page: item.page, title: item.title, path: item.path)
               : item.page,

lib/core/presentation/res/assets.dart

@@ -133,14 +133,16 @@ const String pineapple =
 const String vegetables =
     'https://firebasestorage.googleapis.com/v0/b/dl-flutter-ui-challenges.appspot.com/o/grocery%2Fvegetables.png?alt=mediroom4ia';
 
-const INVITE_ILLUSTRATION = "https://firebasestorage.googleapis.com/v0/b/dl-flutter-ui-challenges.appspot.com/o/img%2Finvite.png?alt=media";
+const INVITE_ILLUSTRATION =
+    "https://firebasestorage.googleapis.com/v0/b/dl-flutter-ui-challenges.appspot.com/o/img%2Finvite.png?alt=media";
 
-const String bike = "https://firebasestorage.googleapis.com/v0/b/dl-flutter-ui-challenges.appspot.com/o/bike%2Fbike1.jpg?alt=media";
+const String bike =
+    "https://firebasestorage.googleapis.com/v0/b/dl-flutter-ui-challenges.appspot.com/o/bike%2Fbike1.jpg?alt=media";
 
 const String room4 = "assets/hotel/room4.jpg";
 
 const List<String> introIllus = [
   'https://firebasestorage.googleapis.com/v0/b/dl-flutter-ui-challenges.appspot.com/o/intro%2F1.png?alt=media',
   'https://firebasestorage.googleapis.com/v0/b/dl-flutter-ui-challenges.appspot.com/o/intro%2F2.png?alt=media',
   'https://firebasestorage.googleapis.com/v0/b/dl-flutter-ui-challenges.appspot.com/o/intro%2F3.png?alt=media'
-];
+];

lib/core/presentation/res/code_highlighter.dart

@@ -6,7 +6,7 @@
  * Author: Damodar Lohani
  * profile: https://github.com/lohanidamodar
   */
-  
+
 import 'package:flutter/material.dart';
 import 'package:string_scanner/string_scanner.dart';
 
@@ -367,4 +367,4 @@ class _HighlightSpan {
     else
       return style!.baseStyle;
   }
-}
+}

lib/core/presentation/res/colors.dart

@@ -1,4 +1,4 @@
 import 'package:flutter/material.dart';
 
 final Color bgColor = Color(0xfff2f2f2);
-final Color borderColor = Color(0xffd6d6d6);
+final Color borderColor = Color(0xffd6d6d6);

lib/core/presentation/res/functions.dart

@@ -4,7 +4,7 @@ PreferredSize customAppBar({required BuildContext context}) {
   return PreferredSize(
     preferredSize: Size.fromHeight(100),
     child: Container(
-      height: kToolbarHeight+20,
+      height: kToolbarHeight + 20,
       child: ListTile(
         contentPadding: const EdgeInsets.all(0),
         trailing: Container(
@@ -20,7 +20,10 @@ PreferredSize customAppBar({required BuildContext context}) {
           ),
         ),
         title: Padding(
-          padding: const EdgeInsets.only(top: 35.0, left: 16.0,),
+          padding: const EdgeInsets.only(
+            top: 35.0,
+            left: 16.0,
+          ),
         ),
       ),
     ),