Restyle migrated to null-safety

android/app/src/main/AndroidManifest.xml

@@ -10,9 +10,12 @@
     <uses-permission android:name="android.permission.INTERNET"/>
 
     <application
-        android:name="io.flutter.app.FlutterApplication"
+        android:name="${applicationName}"
         android:label="Superhero App"
         android:icon="@mipmap/ic_launcher">
+        <meta-data
+            android:name="flutterEmbedding"
+            android:value="2" />
         <activity
             android:name=".MainActivity"
             android:launchMode="singleTop"

android/app/src/main/kotlin/com/jideguru/superhero_app/MainActivity.kt

@@ -1,13 +1,5 @@
 package com.jideguru.superhero_app
 
-import android.os.Bundle
+import io.flutter.embedding.android.FlutterActivity
 
-import io.flutter.app.FlutterActivity
-import io.flutter.plugins.GeneratedPluginRegistrant
-
-class MainActivity: FlutterActivity() {
-  override fun onCreate(savedInstanceState: Bundle?) {
-    super.onCreate(savedInstanceState)
-    GeneratedPluginRegistrant.registerWith(this)
-  }
-}
+class MainActivity: FlutterActivity() {}

android/build.gradle

@@ -1,12 +1,12 @@
 buildscript {
-    ext.kotlin_version = '1.2.71'
+    ext.kotlin_version = '1.6.0'
     repositories {
         google()
         jcenter()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:4.2.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }

android/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.2-all.zip

lib/main.dart

@@ -1,12 +1,10 @@
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
-import 'package:shared_preferences/shared_preferences.dart';
 import 'package:superhero_app/providers/app_provider.dart';
 import 'package:superhero_app/screens/home.dart';
 import 'package:superhero_app/util/const.dart';
 import 'package:superhero_app/util/theme_config.dart';
 
-
 void main() {
   runApp(
     MultiProvider(
@@ -35,4 +33,4 @@ class MyApp extends StatelessWidget {
       },
     );
   }
-}
+}

lib/providers/app_provider.dart

@@ -1,4 +1,3 @@
-import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:shared_preferences/shared_preferences.dart';
@@ -27,7 +26,8 @@ class AppProvider extends ChangeNotifier {
     theme = value;
     SharedPreferences.getInstance().then((prefs) {
       prefs.setString("theme", c).then((val) {
-        SystemChrome.setEnabledSystemUIOverlays(SystemUiOverlay.values);
+        SystemChrome.setEnabledSystemUIMode(SystemUiMode.manual,
+            overlays: SystemUiOverlay.values);
         SystemChrome.setSystemUIOverlayStyle(SystemUiOverlayStyle(
           statusBarColor:
               c == "dark" ? ThemeConfig.darkPrimary : ThemeConfig.lightPrimary,

lib/screens/details.dart

@@ -1,5 +1,3 @@
-import 'dart:ui';
-
 import 'package:flutter/material.dart';
 import 'package:percent_indicator/linear_percent_indicator.dart';
 import 'package:superhero_app/podo/heroitem.dart';
@@ -82,13 +80,13 @@ class _SuperheroDetailsState extends State<SuperheroDetails> {
             ),
             Text(
               widget.heroItem.name,
-              style: textTheme.title,
+              style: textTheme.headline6,
             ),
             Text(
               widget.heroItem.biography.fullName.isEmpty
                   ? widget.heroItem.name
                   : widget.heroItem.biography.fullName,
-              style: textTheme.subtitle.copyWith(
+              style: textTheme.subtitle1.copyWith(
                 fontWeight: FontWeight.w300,
               ),
             ),

lib/screens/home.dart

@@ -1,6 +1,4 @@
 import 'dart:convert';
-import 'dart:ui';
-
 import 'package:flutter/material.dart';
 import 'package:http/http.dart' as http;
 import 'package:superhero_app/podo/heroitem.dart';
@@ -23,7 +21,7 @@ class _HomeState extends State<Home> {
       _loading = true;
     });
     var url = 'https://akabab.github.io/superhero-api/api/all.json';
-    var res = await http.get(url);
+    var res = await http.get(Uri.parse(url));
     List decodedJson = jsonDecode(res.body);
 
     int code = res.statusCode;
@@ -58,12 +56,12 @@ class _HomeState extends State<Home> {
             icon: Icon(Icons.search),
             onPressed: responseList == null
                 ? null
-                : (){
-              showSearch(
-                context: context,
-                delegate: HeroSearch(all: responseList),
-              );
-            },
+                : () {
+                    showSearch(
+                      context: context,
+                      delegate: HeroSearch(all: responseList),
+                    );
+                  },
             tooltip: "Search",
           ),
           IconButton(
@@ -80,25 +78,24 @@ class _HomeState extends State<Home> {
           ),
         ],
       ),
-      body: _loading
-          ? _buildProgressIndicator()
-          : _buildList(),
+      body: _loading ? _buildProgressIndicator() : _buildList(),
     );
   }
 
-  _buildProgressIndicator(){
+  _buildProgressIndicator() {
     return Center(
       child: CircularProgressIndicator(
-        valueColor: AlwaysStoppedAnimation<Color>(Theme.of(context).accentColor),
+        valueColor:
+            AlwaysStoppedAnimation<Color>(Theme.of(context).accentColor),
       ),
     );
   }
 
-  _buildList(){
+  _buildList() {
     return Padding(
       padding: EdgeInsets.symmetric(horizontal: 16.0),
       child: ListView.builder(
-        itemCount: responseList?.length??0,
+        itemCount: responseList?.length ?? 0,
         itemBuilder: (BuildContext context, int index) {
           HeroItem heroItem = HeroItem.fromJson(responseList[index]);
 

lib/screens/search.dart

@@ -65,9 +65,9 @@ class HeroSearch extends SearchDelegate {
 
     var search;
 
-    if(query2.isNotEmpty){
-      search =all.where((hero) => hero['name'].contains(query2)).toList();
-    }else{
+    if (query2.isNotEmpty) {
+      search = all.where((hero) => hero['name'].contains(query2)).toList();
+    } else {
       search = all;
     }
 

lib/util/theme_config.dart

@@ -16,6 +16,8 @@ class ThemeConfig {
     scaffoldBackgroundColor: lightBG,
     appBarTheme: AppBarTheme(
       elevation: 0,
+      backgroundColor: lightBG,
+      foregroundColor: darkPrimary,
     ),
   );
 
@@ -28,6 +30,8 @@ class ThemeConfig {
     cursorColor: darkAccent,
     appBarTheme: AppBarTheme(
       elevation: 0,
+      backgroundColor: darkBG,
+      foregroundColor: lightPrimary,
     ),
   );
 }

lib/widget/superhero.dart

@@ -4,7 +4,7 @@ import 'package:superhero_app/screens/details.dart';
 import 'package:superhero_app/widget/superhero_avatar.dart';
 
 class SuperHero extends StatelessWidget {
-  HeroItem heroItem;
+  final HeroItem heroItem;
 
   SuperHero({
     Key key,
@@ -57,13 +57,13 @@ class SuperHero extends StatelessWidget {
                         children: <Widget>[
                           Text(
                             "${heroItem.name}",
-                            style: textTheme.title,
+                            style: textTheme.headline6,
                           ),
                           Text(
                             heroItem.biography.fullName.isEmpty
                                 ? heroItem.name
                                 : heroItem.biography.fullName,
-                            style: textTheme.subtitle.copyWith(
+                            style: textTheme.subtitle1.copyWith(
                               fontWeight: FontWeight.w300,
                             ),
                           ),