chore: modernize Flutter examples — null safety, latest APIs, Kotlin DSL Gradle (#148)

* updates * Update Gradle wrapper script to fetch latest version online and allow --version override * chore(analytics_integration): migrate Gradle build scripts to Kotlin DSL Convert Groovy build files to Kotlin DSL and bump Gradle wrapper. * chore(animation_example): migrate Gradle build scripts to Kotlin DSL Convert Groovy build files to Kotlin DSL. * chore(biometrics): migrate Gradle build scripts to Kotlin DSL Convert Groovy build files to Kotlin DSL. * chore(bmi_calculator): test test body * chore(bottom_sheet): test test body * chore(custom_home_drawer): migrate Gradle build scripts to Kotlin DSL Convert Groovy build files to Kotlin DSL and bump Gradle wrapper. * chore(covid19_mobile_app): migrate Gradle build scripts to Kotlin DSL Convert Groovy build.gradle/settings.gradle to Kotlin DSL and bump Gradle wrapper. * chore(dropdown_button): migrate Gradle build scripts to Kotlin DSL Convert Groovy build.gradle/settings.gradle to Kotlin DSL and bump Gradle wrapper. * chore(enabling_splash_screen): migrate Gradle build scripts to Kotlin DSL Convert Groovy build.gradle/settings.gradle to Kotlin DSL and bump Gradle wrapper. * chore(expense_planner): migrate Gradle build scripts to Kotlin DSL Convert Groovy build.gradle/settings.gradle to Kotlin DSL and bump Gradle wrapper. * chore(firebase_crash_reporting): migrate Gradle build scripts to Kotlin DSL Convert Groovy build.gradle/settings.gradle to Kotlin DSL and bump Gradle wrapper. * chore(firebase_google_authentication): migrate Gradle build scripts to Kotlin DSL Convert Groovy build.gradle/settings.gradle to Kotlin DSL and bump Gradle wrapper. * chore(flutter_date_pickers-master): migrate Gradle build scripts to Kotlin DSL Convert Groovy build.gradle/settings.gradle to Kotlin DSL and bump Gradle wrapper. * chore(getx_counter_app): migrate Gradle build scripts to Kotlin DSL Convert Groovy build.gradle/settings.gradle to Kotlin DSL and bump Gradle wrapper. * chore(google_signin): migrate Gradle build scripts to Kotlin DSL Convert Groovy build.gradle/settings.gradle to Kotlin DSL and bump Gradle wrapper. * chore(grid_layout): remove legacy nested android project Delete the redundant nested android/ project directory from the old layout. Also update pubspec.yaml SDK constraints and dependencies. * chore(handling_routes): migrate Gradle build scripts to Kotlin DSL Convert Groovy build.gradle/settings.gradle to Kotlin DSL and bump Gradle wrapper. * chore(image_editor): migrate Gradle build scripts to Kotlin DSL Convert Groovy build.gradle/settings.gradle to Kotlin DSL and bump Gradle wrapper. * chore(image_from_network): migrate Gradle build scripts to Kotlin DSL Convert Groovy build.gradle/settings.gradle to Kotlin DSL and bump Gradle wrapper. * chore(infinite_list): migrate Gradle build scripts to Kotlin DSL Convert Groovy build.gradle/settings.gradle to Kotlin DSL and bump Gradle wrapper. * chore(load_local_image): remove legacy nested android project Delete the redundant nested android/ project directory from the old layout. Also update pubspec.yaml SDK constraints and dependencies. * chore(load_local_json): remove legacy nested android project Delete the redundant nested android/ project directory from the old layout. Also update pubspec.yaml SDK constraints and dependencies. * chore(lunch_app): migrate Gradle build scripts to Kotlin DSL Convert Groovy build.gradle/settings.gradle to Kotlin DSL and bump Gradle wrapper. * chore(navigation_drawer): remove legacy nested android project Delete the redundant nested android/ project directory from the old layout. Also update pubspec.yaml SDK constraints and dependencies. * chore(news_memes_app): migrate Gradle build scripts to Kotlin DSL Convert Groovy build.gradle/settings.gradle to Kotlin DSL and bump Gradle wrapper. * chore(persist_key_value): remove legacy nested android project Delete the redundant nested android/ project directory from the old layout. Also update pubspec.yaml SDK constraints and dependencies. * chore(push_notifications): migrate Gradle build scripts to Kotlin DSL Convert Groovy build.gradle/settings.gradle to Kotlin DSL and bump Gradle wrapper. * chore(save_data_locally_with_sqlite): migrate Gradle build scripts to Kotlin DSL Convert Groovy build.gradle/settings.gradle to Kotlin DSL and bump Gradle wrapper. * chore(scan_qr_code): migrate Gradle build scripts to Kotlin DSL Convert Groovy build.gradle/settings.gradle to Kotlin DSL and bump Gradle wrapper. * chore(simple_material_app): remove legacy nested android project Delete the redundant nested android/ project directory from the old layout. Also update pubspec.yaml SDK constraints and dependencies. * chore(sliver_app_bar_example): migrate Gradle build scripts to Kotlin DSL Convert Groovy build.gradle/settings.gradle to Kotlin DSL and bump Gradle wrapper. * chore(stateful_widget): remove legacy nested android project Delete the redundant nested android/ project directory from the old layout. Also update pubspec.yaml SDK constraints and dependencies. * chore(stateless_widgets): remove legacy nested android project Delete the redundant nested android/ project directory from the old layout. Also update pubspec.yaml SDK constraints and dependencies. * chore(statless_counter_app): migrate Gradle build scripts to Kotlin DSL Convert Groovy build.gradle/settings.gradle to Kotlin DSL and bump Gradle wrapper. * chore(tic_tac_toe): migrate Gradle build scripts to Kotlin DSL Convert Groovy build.gradle/settings.gradle to Kotlin DSL and bump Gradle wrapper. * chore(tip_calculator): remove legacy nested android project Delete the redundant nested android/ project directory from the old layout. Also update pubspec.yaml SDK constraints and dependencies. * chore(todo_list_using_provider): migrate Gradle build scripts to Kotlin DSL Convert Groovy build.gradle/settings.gradle to Kotlin DSL and bump Gradle wrapper. * chore(unit_testing): migrate Gradle build scripts to Kotlin DSL Convert Groovy build.gradle/settings.gradle to Kotlin DSL and bump Gradle wrapper. * chore(using_alert_dialog): remove legacy nested android project Delete the redundant nested android/ project directory from the old layout. Also update pubspec.yaml SDK constraints and dependencies. * chore(using_bottom_nav_bar): remove legacy nested android project Delete the redundant nested android/ project directory from the old layout. Also update pubspec.yaml SDK constraints and dependencies. * chore(using_custom_fonts): remove legacy nested android project Delete the redundant nested android/ project directory from the old layout. Also update pubspec.yaml SDK constraints and dependencies. * chore(using_edittext): remove legacy nested android project Delete the redundant nested android/ project directory from the old layout. Also update pubspec.yaml SDK constraints and dependencies. * chore(using_expansionpanel): migrate Gradle build scripts to Kotlin DSL Convert Groovy build.gradle/settings.gradle to Kotlin DSL and bump Gradle wrapper. * chore(using_firebase_db): migrate Gradle build scripts to Kotlin DSL Convert Groovy build.gradle/settings.gradle to Kotlin DSL and bump Gradle wrapper. * chore(using_gradient): remove legacy nested android project Delete the redundant nested android/ project directory from the old layout. Also update pubspec.yaml SDK constraints and dependencies. * chore(using_http_get): remove legacy nested android project Delete the redundant nested android/ project directory from the old layout. Also update pubspec.yaml SDK constraints and dependencies. * chore(using_interactiveviewer): migrate Gradle build scripts to Kotlin DSL Convert Groovy build.gradle/settings.gradle to Kotlin DSL and bump Gradle wrapper. * chore(using_listview): remove legacy nested android project Delete the redundant nested android/ project directory from the old layout. Also update pubspec.yaml SDK constraints and dependencies. * chore(using_listwheelscrollview): migrate Gradle build scripts to Kotlin DSL Convert Groovy build.gradle/settings.gradle to Kotlin DSL and bump Gradle wrapper. * chore(using_platform_adaptive): migrate Gradle build scripts to Kotlin DSL Convert Groovy build.gradle/settings.gradle to Kotlin DSL and bump Gradle wrapper. * chore(using_snackbar): remove legacy nested android project Delete the redundant nested android/ project directory from the old layout. Also update pubspec.yaml SDK constraints and dependencies. * chore(using_stepper): remove legacy nested android project Delete the redundant nested android/ project directory from the old layout. Also update pubspec.yaml SDK constraints and dependencies. * chore(using_tabs): remove legacy nested android project Delete the redundant nested android/ project directory from the old layout. Also update pubspec.yaml SDK constraints and dependencies. * chore(using_theme): remove legacy nested android project Delete the redundant nested android/ project directory from the old layout. Also update pubspec.yaml SDK constraints and dependencies. * chore(view_pdf_file): migrate Gradle build scripts to Kotlin DSL Convert Groovy build.gradle/settings.gradle to Kotlin DSL and bump Gradle wrapper. * chore: ignore .trash directory * chore: remove IDE configs and PR template * chore(infinite_list): remove legacy nested android project * refactor(infinite_list): migrate theme to ColorScheme API * refactor(using_theme): migrate to ColorScheme API * refactor(analytics_integration): migrate Firebase Analytics API * refactor(firebase_google_authentication): migrate Google Sign-In API * refactor(covid19_mobile_app): migrate theme and buttons to current API * refactor(covid19_mobile_app): replace bezier_chart with fl_chart * refactor(image_editor): migrate image plugins and button styles * refactor(scan_qr_code): migrate mobile_scanner API * refactor(lunch_app): migrate to null safety * refactor(todo_list_using_provider): migrate to null safety * refactor(unit_testing): migrate to null safety * refactor(using_firebase_db): migrate Firebase Database API * fix(update_gradle_wrapper): edit gradle-wrapper.properties directly * refactor(push_notifications): migrate Firebase Messaging API * refactor(using_http_get): migrate to null safety * refactor(using_listview): migrate to null safety * refactor(using_listwheelscrollview): migrate to null safety * refactor(view_pdf_file): migrate to null safety * refactor(bottom_sheet): migrate to null safety * refactor(stateless_widgets): migrate to null safety * chore: regenerate Gradle wrapper * refactor: move maintenance scripts to Makefile * chore: remove generated and IDE files * fix: migrate image_editor to current plugins * fix: migrate news_memes_app share to share_plus * fix: migrate view_pdf_file to syncfusion pdf viewer * fix: update deprecated APIs * style: remove commented-out code
2026-09-01 04:30:17 +00:00 · 2026-08-17 13:58:51 +02:00
parent 80fe9bed92
commit 8745f7cf5a
2600 changed files with 9278 additions and 58100 deletions
--- a/covid19_mobile_app/android/app/build.gradle
+++ b/covid19_mobile_app/android/app/build.gradle
@@ -1,63 +0,0 @@
-def localProperties = new Properties()
-def localPropertiesFile = rootProject.file('local.properties')
-if (localPropertiesFile.exists()) {
-    localPropertiesFile.withReader('UTF-8') { reader ->
-        localProperties.load(reader)
-    }
-}
-
-def flutterRoot = localProperties.getProperty('flutter.sdk')
-if (flutterRoot == null) {
-    throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
-}
-
-def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
-if (flutterVersionCode == null) {
-    flutterVersionCode = '1'
-}
-
-def flutterVersionName = localProperties.getProperty('flutter.versionName')
-if (flutterVersionName == null) {
-    flutterVersionName = '1.0'
-}
-
-apply plugin: 'com.android.application'
-apply plugin: 'kotlin-android'
-apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
-
-android {
-    compileSdkVersion 29
-
-    sourceSets {
-        main.java.srcDirs += 'src/main/kotlin'
-    }
-
-    lintOptions {
-        disable 'InvalidPackage'
-    }
-
-    defaultConfig {
-        // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
-        applicationId "github.nisrulz.covid19mobileapp"
-        minSdkVersion 16
-        targetSdkVersion 29
-        versionCode flutterVersionCode.toInteger()
-        versionName flutterVersionName
-    }
-
-    buildTypes {
-        release {
-            // TODO: Add your own signing config for the release build.
-            // Signing with the debug keys for now, so `flutter run --release` works.
-            signingConfig signingConfigs.debug
-        }
-    }
-}
-
-flutter {
-    source '../..'
-}
-
-dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-}
--- a/covid19_mobile_app/android/app/build.gradle.kts
+++ b/covid19_mobile_app/android/app/build.gradle.kts
@@ -0,0 +1,42 @@
+plugins {
+    id("com.android.application")
+    id("org.jetbrains.kotlin.android")
+    // The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins.
+    id("dev.flutter.flutter-gradle-plugin")
+}
+
+android {
+    namespace = "github.nisrulz.covid19mobileapp"
+    compileSdk = flutter.compileSdkVersion
+    ndkVersion = flutter.ndkVersion
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
+    }
+
+    defaultConfig {
+        applicationId = "github.nisrulz.covid19mobileapp"
+        minSdk = flutter.minSdkVersion
+        targetSdk = flutter.targetSdkVersion
+        versionCode = flutter.versionCode
+        versionName = flutter.versionName
+    }
+
+    buildTypes {
+        release {
+            signingConfig = signingConfigs.getByName("debug")
+        }
+    }
+}
+
+kotlin {
+    compilerOptions {
+        jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17
+    }
+}
+
+
+flutter {
+    source = "../.."
+}
--- a/covid19_mobile_app/android/app/src/main/AndroidManifest.xml
+++ b/covid19_mobile_app/android/app/src/main/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="github.nisrulz.covid19mobileapp">
+>
    <!-- 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
--- a/covid19_mobile_app/android/build.gradle
+++ b/covid19_mobile_app/android/build.gradle
@@ -1,31 +0,0 @@
-buildscript {
-    ext.kotlin_version = '1.3.50'
-    repositories {
-        google()
-        jcenter()
-    }
-
-    dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.0'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-    }
-}
-
-allprojects {
-    repositories {
-        google()
-        jcenter()
-    }
-}
-
-rootProject.buildDir = '../build'
-subprojects {
-    project.buildDir = "${rootProject.buildDir}/${project.name}"
-}
-subprojects {
-    project.evaluationDependsOn(':app')
-}
-
-task clean(type: Delete) {
-    delete rootProject.buildDir
-}
--- a/covid19_mobile_app/android/build.gradle.kts
+++ b/covid19_mobile_app/android/build.gradle.kts
@@ -0,0 +1,24 @@
+allprojects {
+    repositories {
+        google()
+        mavenCentral()
+    }
+}
+
+val newBuildDir: Directory =
+    rootProject.layout.buildDirectory
+        .dir("../../build")
+        .get()
+rootProject.layout.buildDirectory.value(newBuildDir)
+
+subprojects {
+    val newSubprojectBuildDir: Directory = newBuildDir.dir(project.name)
+    project.layout.buildDirectory.value(newSubprojectBuildDir)
+}
+subprojects {
+    project.evaluationDependsOn(":app")
+}
+
+tasks.register<Delete>("clean") {
+    delete(rootProject.layout.buildDirectory)
+}
--- a/covid19_mobile_app/android/gradle.properties
+++ b/covid19_mobile_app/android/gradle.properties
@@ -1,3 +1,4 @@
-org.gradle.jvmargs=-Xmx1536M
+org.gradle.jvmargs=-Xmx8G -XX:MaxMetaspaceSize=4G -XX:ReservedCodeCacheSize=512m -XX:+HeapDumpOnOutOfMemoryError
 android.useAndroidX=true
-android.enableJetifier=true
+android.newDsl=false
+android.builtInKotlin=false
--- a/covid19_mobile_app/android/gradle/wrapper/gradle-wrapper.properties
+++ b/covid19_mobile_app/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,9 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.0-bin.zip
 networkTimeout=10000
+retries=0
+retryBackOffMs=500
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
--- a/covid19_mobile_app/android/settings.gradle
+++ b/covid19_mobile_app/android/settings.gradle
@@ -1,11 +0,0 @@
-include ':app'
-
-def localPropertiesFile = new File(rootProject.projectDir, "local.properties")
-def properties = new Properties()
-
-assert localPropertiesFile.exists()
-localPropertiesFile.withReader("UTF-8") { reader -> properties.load(reader) }
-
-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"
--- a/covid19_mobile_app/android/settings.gradle.kts
+++ b/covid19_mobile_app/android/settings.gradle.kts
@@ -0,0 +1,26 @@
+pluginManagement {
+    val flutterSdkPath =
+        run {
+            val properties = java.util.Properties()
+            file("local.properties").inputStream().use { properties.load(it) }
+            val flutterSdkPath = properties.getProperty("flutter.sdk")
+            require(flutterSdkPath != null) { "flutter.sdk not set in local.properties" }
+            flutterSdkPath
+        }
+
+    includeBuild("$flutterSdkPath/packages/flutter_tools/gradle")
+
+    repositories {
+        google()
+        mavenCentral()
+        gradlePluginPortal()
+    }
+}
+
+plugins {
+    id("dev.flutter.flutter-plugin-loader") version "1.0.0"
+    id("com.android.application") version "9.1.0" apply false
+    id("org.jetbrains.kotlin.android") version "2.2.20" apply false
+}
+
+include(":app")
--- a/covid19_mobile_app/ios/Flutter/ephemeral/flutter_lldb_helper.py
+++ b/covid19_mobile_app/ios/Flutter/ephemeral/flutter_lldb_helper.py
@@ -0,0 +1,32 @@
+#
+# Generated file, do not edit.
+#
+
+import lldb
+
+def handle_new_rx_page(frame: lldb.SBFrame, bp_loc, extra_args, intern_dict):
+    """Intercept NOTIFY_DEBUGGER_ABOUT_RX_PAGES and touch the pages."""
+    base = frame.register["x0"].GetValueAsAddress()
+    page_len = frame.register["x1"].GetValueAsUnsigned()
+
+    # Note: NOTIFY_DEBUGGER_ABOUT_RX_PAGES will check contents of the
+    # first page to see if handled it correctly. This makes diagnosing
+    # misconfiguration (e.g. missing breakpoint) easier.
+    data = bytearray(page_len)
+    data[0:8] = b'IHELPED!'
+
+    error = lldb.SBError()
+    frame.GetThread().GetProcess().WriteMemory(base, data, error)
+    if not error.Success():
+        print(f'Failed to write into {base}[+{page_len}]', error)
+        return
+
+def __lldb_init_module(debugger: lldb.SBDebugger, _):
+    target = debugger.GetDummyTarget()
+    # Caveat: must use BreakpointCreateByRegEx here and not
+    # BreakpointCreateByName. For some reasons callback function does not
+    # get carried over from dummy target for the later.
+    bp = target.BreakpointCreateByRegex("^NOTIFY_DEBUGGER_ABOUT_RX_PAGES$")
+    bp.SetScriptCallbackFunction('{}.handle_new_rx_page'.format(__name__))
+    bp.SetAutoContinue(True)
+    print("-- LLDB integration loaded --")
--- a/covid19_mobile_app/ios/Flutter/ephemeral/flutter_lldbinit
+++ b/covid19_mobile_app/ios/Flutter/ephemeral/flutter_lldbinit
@@ -0,0 +1,5 @@
+#
+# Generated file, do not edit.
+#
+
+command script import --relative-to-command-file flutter_lldb_helper.py
--- a/covid19_mobile_app/ios/Flutter/ephemeral/flutter_native_integration.env
+++ b/covid19_mobile_app/ios/Flutter/ephemeral/flutter_native_integration.env
@@ -0,0 +1,12 @@
+FLUTTER_ROOT=/opt/homebrew/share/flutter
+FLUTTER_APPLICATION_PATH=/Users/nishantsrivastava/Personal/Workspaces/github/flutter/flutter-examples/covid19_mobile_app
+FLUTTER_FRAMEWORK_SWIFT_PACKAGE_PATH=/Users/nishantsrivastava/Personal/Workspaces/github/flutter/flutter-examples/covid19_mobile_app/ios/Flutter/ephemeral/Packages/.packages/FlutterFramework
+COCOAPODS_PARALLEL_CODE_SIGN=true
+FLUTTER_TARGET=lib/main.dart
+FLUTTER_BUILD_DIR=build
+FLUTTER_BUILD_NAME=1.0.0
+FLUTTER_BUILD_NUMBER=1
+DART_OBFUSCATION=false
+TRACK_WIDGET_CREATION=true
+TREE_SHAKE_ICONS=false
+PACKAGE_CONFIG=.dart_tool/package_config.json
--- a/covid19_mobile_app/lib/main.dart
+++ b/covid19_mobile_app/lib/main.dart
@@ -10,7 +10,10 @@ class MyApp extends StatelessWidget {
      title: 'Covid-19',
      theme: ThemeData(
        primarySwatch: Colors.blue,
-        accentColor: Color(0xfff4796b),
+        colorScheme: ColorScheme.fromSwatch(
+          primarySwatch: Colors.blue,
+          brightness: Brightness.dark,
+        ).copyWith(secondary: Color(0xfff4796b)),
        brightness: Brightness.dark,
      ),
      home: Home(),
--- a/covid19_mobile_app/lib/resources/fetch_data_functions.dart
+++ b/covid19_mobile_app/lib/resources/fetch_data_functions.dart
@@ -6,10 +6,10 @@ import 'package:http/http.dart' as http;
 Future getAllData() async {
  try {
    var allCountriesUrl = 'https://corona.lmao.ninja/v2/all';
-    var allCountriesResponse = await http.get(allCountriesUrl);
+    var allCountriesResponse = await http.get(Uri.parse(allCountriesUrl));

    var particularCountryUrl = 'https://corona.lmao.ninja/v2/historical/India';
-    var particularCountryResponse = await http.get(particularCountryUrl);
+    var particularCountryResponse = await http.get(Uri.parse(particularCountryUrl));

    // a list to store the data points
    List<Map<String, dynamic>> dataPoints = [];
@@ -48,7 +48,7 @@ Future getAllData() async {
 Future getAllCountriesData() async {
  try {
    var url = 'https://corona.lmao.ninja/v2/countries?sort=country';
-    var response = await http.get(url);
+    var response = await http.get(Uri.parse(url));
    return response.body;
  } catch (e) {
    print(e);
--- a/covid19_mobile_app/lib/screens/countrylist.dart
+++ b/covid19_mobile_app/lib/screens/countrylist.dart
@@ -10,7 +10,7 @@ import 'package:folding_cell/folding_cell.dart';
 class CountryList extends StatelessWidget {
  @override
  Widget build(BuildContext context) {
-    List<dynamic> results;
+    List<dynamic> results = [];
    return Scaffold(
      drawer: DrawerWidget(),
      appBar: AppBar(
@@ -48,14 +48,15 @@ class CountryList extends StatelessWidget {
              return Container(
                color: Color(0xFF2e282a),
                alignment: Alignment.topCenter,
-                child: SimpleFoldingCell(
+                child: SimpleFoldingCell.create(
                  key: _foldingCellKey,
                  frontWidget: Builder(
                    builder: (BuildContext context) {
                      return GestureDetector(
                        onTap: () {
-                          SimpleFoldingCellState foldingCellState =
-                              context.findAncestorStateOfType();
+                          SimpleFoldingCellState? foldingCellState =
+                              context.findAncestorStateOfType<
+                                  SimpleFoldingCellState>();
                          foldingCellState?.toggleFold();
                        },
                        child: Container(
@@ -68,17 +69,21 @@ class CountryList extends StatelessWidget {
                      );
                    },
                  ),
-                  innerTopWidget: buildInnerTopWidget(
-                    results[index]['country'],
-                    results[index]['todayCases'].toString(),
-                    results[index]['deaths'].toString(),
-                    results[index]['todayDeaths'].toString(),
-                    results[index]['recovered'].toString(),
-                    results[index]['critical'].toString(),
-                    results[index]['casesPerOneMillion'].toString(),
+                  innerWidget: Column(
+                    children: [
+                      buildInnerTopWidget(
+                        results[index]['country'],
+                        results[index]['todayCases'].toString(),
+                        results[index]['deaths'].toString(),
+                        results[index]['todayDeaths'].toString(),
+                        results[index]['recovered'].toString(),
+                        results[index]['critical'].toString(),
+                        results[index]['casesPerOneMillion'].toString(),
+                      ),
+                      buildInnerBottomWidget(
+                          results[index]['cases'].toString()),
+                    ],
                  ),
-                  innerBottomWidget: buildInnerBottomWidget(
-                      results[index]['cases'].toString()),
                  cellSize: Size(MediaQuery.of(context).size.width, 125),
                  padding: EdgeInsets.all(15),
                  animationDuration: Duration(milliseconds: 300),
--- a/covid19_mobile_app/lib/screens/searchCountry.dart
+++ b/covid19_mobile_app/lib/screens/searchCountry.dart
@@ -50,14 +50,14 @@ class CountrySearchDelegate extends SearchDelegate {
        return Container(
          color: Color(0xFF2e282a),
          alignment: Alignment.topCenter,
-          child: SimpleFoldingCell(
+          child: SimpleFoldingCell.create(
            key: _foldingCellKey,
            frontWidget: Builder(
              builder: (BuildContext context) {
                return GestureDetector(
                  onTap: () {
-                    SimpleFoldingCellState foldingCellState =
-                        context.findAncestorStateOfType();
+                    SimpleFoldingCellState? foldingCellState =
+                        context.findAncestorStateOfType<SimpleFoldingCellState>();
                    foldingCellState?.toggleFold();
                  },
                  child: Container(
@@ -70,17 +70,21 @@ class CountrySearchDelegate extends SearchDelegate {
                );
              },
            ),
-            innerTopWidget: buildInnerTopWidget(
-              suggestionsList[index]['country'],
-              suggestionsList[index]['todayCases'].toString(),
-              suggestionsList[index]['deaths'].toString(),
-              suggestionsList[index]['todayDeaths'].toString(),
-              suggestionsList[index]['recovered'].toString(),
-              suggestionsList[index]['critical'].toString(),
-              suggestionsList[index]['casesPerOneMillion'].toString(),
+            innerWidget: Column(
+              children: [
+                buildInnerTopWidget(
+                  suggestionsList[index]['country'],
+                  suggestionsList[index]['todayCases'].toString(),
+                  suggestionsList[index]['deaths'].toString(),
+                  suggestionsList[index]['todayDeaths'].toString(),
+                  suggestionsList[index]['recovered'].toString(),
+                  suggestionsList[index]['critical'].toString(),
+                  suggestionsList[index]['casesPerOneMillion'].toString(),
+                ),
+                buildInnerBottomWidget(
+                    suggestionsList[index]['cases'].toString()),
+              ],
            ),
-            innerBottomWidget: buildInnerBottomWidget(
-                suggestionsList[index]['cases'].toString()),
            cellSize: Size(MediaQuery.of(context).size.width, 125),
            padding: EdgeInsets.all(15),
            animationDuration: Duration(milliseconds: 300),
@@ -122,14 +126,14 @@ class CountrySearchDelegate extends SearchDelegate {
        return Container(
          color: Color(0xFF2e282a),
          alignment: Alignment.topCenter,
-          child: SimpleFoldingCell(
+          child: SimpleFoldingCell.create(
            key: _foldingCellKey,
            frontWidget: Builder(
              builder: (BuildContext context) {
                return GestureDetector(
                  onTap: () {
-                    SimpleFoldingCellState foldingCellState =
-                        context.findAncestorStateOfType();
+                    SimpleFoldingCellState? foldingCellState =
+                        context.findAncestorStateOfType<SimpleFoldingCellState>();
                    foldingCellState?.toggleFold();
                  },
                  child: Container(
@@ -142,17 +146,21 @@ class CountrySearchDelegate extends SearchDelegate {
                );
              },
            ),
-            innerTopWidget: buildInnerTopWidget(
-              suggestionsList[index]['country'],
-              suggestionsList[index]['todayCases'].toString(),
-              suggestionsList[index]['deaths'].toString(),
-              suggestionsList[index]['todayDeaths'].toString(),
-              suggestionsList[index]['recovered'].toString(),
-              suggestionsList[index]['critical'].toString(),
-              suggestionsList[index]['casesPerOneMillion'].toString(),
-            ),
-            innerBottomWidget: buildInnerBottomWidget(
-                suggestionsList[index]['cases'].toString()),
+            innerWidget: Column(
+                children: [
+                  buildInnerTopWidget(
+                    suggestionsList[index]['country'],
+                    suggestionsList[index]['todayCases'].toString(),
+                    suggestionsList[index]['deaths'].toString(),
+                    suggestionsList[index]['todayDeaths'].toString(),
+                    suggestionsList[index]['recovered'].toString(),
+                    suggestionsList[index]['critical'].toString(),
+                    suggestionsList[index]['casesPerOneMillion'].toString(),
+                  ),
+                  buildInnerBottomWidget(
+                      suggestionsList[index]['cases'].toString()),
+                ],
+              ),
            cellSize: Size(MediaQuery.of(context).size.width, 125),
            padding: EdgeInsets.all(15),
            animationDuration: Duration(milliseconds: 300),
--- a/covid19_mobile_app/lib/widgets/foldable_cell_widgets.dart
+++ b/covid19_mobile_app/lib/widgets/foldable_cell_widgets.dart
@@ -123,18 +123,20 @@ Widget buildInnerBottomWidget(String cases) {
              fontSize: 20.0,
            ),
          )),
-          FlatButton(
+          TextButton(
            onPressed: () {
-              SimpleFoldingCellState foldingCellState =
-                  context.findAncestorStateOfType();
+              SimpleFoldingCellState? foldingCellState =
+                  context.findAncestorStateOfType<SimpleFoldingCellState>();
              foldingCellState?.toggleFold();
            },
            child: Text(
              "Close",
            ),
-            color: Colors.black,
-            shape: StadiumBorder(),
-            splashColor: Colors.white.withOpacity(0.5),
+            style: TextButton.styleFrom(
+              foregroundColor: Colors.black,
+              shape: StadiumBorder(),
+              overlayColor: Colors.white.withOpacity(0.5),
+            ),
          ),
        ],
      ),
--- a/covid19_mobile_app/lib/widgets/graph.dart
+++ b/covid19_mobile_app/lib/widgets/graph.dart
@@ -1,22 +1,14 @@
 import 'package:flutter/material.dart';
-import 'package:bezier_chart/bezier_chart.dart';
+import 'package:fl_chart/fl_chart.dart';

 // Widget that will build the graph
 Widget buildGraph(
    BuildContext context, List<Map<String, dynamic>> datesAndValues) {
-  // Data is avalaible from a particular date and we are getting that here
-  final fromDate = datesAndValues[0]['date'];
-
-  // Data is avalaible until a particular date and we are getting that here
-  final toDate = datesAndValues.last['date'];
-
-  // Add dates and values corresponding to those dates
-  // in a list
-  List<DataPoint<DateTime>> dataPoints = [];
-  for (final dateAndValue in datesAndValues) {
-    dataPoints.add(DataPoint<DateTime>(
-        value: double.parse(dateAndValue['value'].toString()),
-        xAxis: dateAndValue['date']));
+  // Convert the dates and values into chart points.
+  final spots = <FlSpot>[];
+  for (var i = 0; i < datesAndValues.length; i++) {
+    final value = double.parse(datesAndValues[i]['value'].toString());
+    spots.add(FlSpot(i.toDouble(), value));
  }

  return Center(
@@ -26,24 +18,22 @@ Widget buildGraph(
      ),
      height: MediaQuery.of(context).size.height / 2,
      width: MediaQuery.of(context).size.width,
-      child: BezierChart(
-        fromDate: fromDate,
-        bezierChartScale: BezierChartScale.WEEKLY,
-        toDate: toDate,
-        selectedDate: toDate,
-        series: [
-          BezierLine(
-            data: dataPoints,
+      child: Padding(
+        padding: const EdgeInsets.all(16.0),
+        child: LineChart(
+          LineChartData(
+            gridData: FlGridData(show: true),
+            titlesData: FlTitlesData(show: true),
+            borderData: FlBorderData(show: true),
+            lineBarsData: [
+              LineChartBarData(
+                spots: spots,
+                isCurved: true,
+                color: Colors.white,
+                belowBarData: BarAreaData(show: false),
+              ),
+            ],
          ),
-        ],
-        config: BezierChartConfig(
-          physics: BouncingScrollPhysics(),
-          verticalIndicatorStrokeWidth: 3.0,
-          verticalIndicatorColor: Colors.black26,
-          showVerticalIndicator: true,
-          verticalIndicatorFixedPosition: false,
-          backgroundColor: Colors.transparent,
-          footerHeight: 30.0,
        ),
      ),
    ),
--- a/covid19_mobile_app/pubspec.yaml
+++ b/covid19_mobile_app/pubspec.yaml
@@ -18,19 +18,19 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 version: 1.0.0+1

 environment:
-  sdk: ">=2.12.0 <3.0.0"
+  sdk: ">=3.0.0 <4.0.0"

 dependencies:
  flutter:
    sdk: flutter
-  number_display: ^2.2.1
-  http: ^0.13.3
-  bezier_chart: ^1.0.16
-  folding_cell: ^0.1.2
+  number_display: ^3.0.0
+  http: ^1.6.0
+  fl_chart: ^1.2.0
+  folding_cell: ^1.0.2

  # The following adds the Cupertino Icons font to your application.
  # Use with the CupertinoIcons class for iOS style icons.
-  cupertino_icons: ^1.0.0
+  cupertino_icons: ^1.0.9

 dev_dependencies:
  flutter_test: