Merge pull request #23 from nateshmbhat/null-safety-migration

Null safety migration 🥳 🎈
nateshmbhat · Apr 8, 2021 · c3136d8 · c3136d8
2 parents 0f11155 + 444cd62
commit c3136d8
Show file tree

Hide file tree

Showing 36 changed files with 581 additions and 675 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,6 @@
+# [1.0.0] - April 8 2021
+Migrated to Null Safety
+
 #### [0.2.1] - Apr 7 2021
 Updated the Example app and fixed minor bug
 

diff --git a/example/assets/demo-shapes.gif → assets/demo-shapes.gif b/example/assets/demo-shapes.gif → assets/demo-shapes.gif
diff --git a/example/assets/demo-smiley.gif → assets/demo-smiley.gif b/example/assets/demo-smiley.gif → assets/demo-smiley.gif
diff --git a/example/assets/logo/logo-14.svg → assets/logo/logo-14.svg b/example/assets/logo/logo-14.svg → assets/logo/logo-14.svg
diff --git a/example/android/app/src/debug/AndroidManifest.xml b/example/android/app/src/debug/AndroidManifest.xml
@@ -3,5 +3,5 @@
     <!-- Flutter needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.
     -->
-    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.INTERNET"/>
 </manifest>
diff --git a/example/android/app/src/main/AndroidManifest.xml b/example/android/app/src/main/AndroidManifest.xml
@@ -1,34 +1,35 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.geekytech.touchable.example">
-
-    <application
-        android:icon="@mipmap/ic_launcher"
-        android:label="example">
+   <application
+        android:label="example"
+        android:icon="@mipmap/ic_launcher">
         <activity
             android:name=".MainActivity"
-            android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
-            android:hardwareAccelerated="true"
             android:launchMode="singleTop"
             android:theme="@style/LaunchTheme"
+            android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
+            android:hardwareAccelerated="true"
             android:windowSoftInputMode="adjustResize">
             <!-- Specifies an Android theme to apply to this Activity as soon as
                  the Android process has started. This theme is visible to the user
                  while the Flutter UI initializes. After that, this theme continues
                  to determine the Window background behind the Flutter UI. -->
             <meta-data
-                android:name="io.flutter.embedding.android.NormalTheme"
-                android:resource="@style/NormalTheme" />
+              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" />
+              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" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
         <!-- Don't delete the meta-data below.

diff --git a/example/android/app/src/main/kotlin/com/geekytech/touchable/example/MainActivity.kt b/example/android/app/src/main/kotlin/com/geekytech/touchable/example/MainActivity.kt
@@ -2,5 +2,5 @@ package com.geekytech.touchable.example
 
 import io.flutter.embedding.android.FlutterActivity
 
-class MainActivity : FlutterActivity() {
+class MainActivity: FlutterActivity() {
 }
diff --git a/example/android/app/src/main/res/drawable-v21/launch_background.xml b/example/android/app/src/main/res/drawable-v21/launch_background.xml
@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?><!-- Modify this file to customize your launch splash screen -->
+<?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" />
 

diff --git a/example/android/app/src/main/res/drawable/launch_background.xml b/example/android/app/src/main/res/drawable/launch_background.xml
@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?><!-- Modify this file to customize your launch splash screen -->
+<?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:color/white" />
 

diff --git a/example/android/app/src/profile/AndroidManifest.xml b/example/android/app/src/profile/AndroidManifest.xml
@@ -3,5 +3,5 @@
     <!-- Flutter needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.
     -->
-    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.INTERNET"/>
 </manifest>
diff --git a/example/android/gradle.properties b/example/android/gradle.properties
@@ -1,4 +1,3 @@
 org.gradle.jvmargs=-Xmx1536M
 android.useAndroidX=true
 android.enableJetifier=true
-android.enableR8=true
diff --git a/example/example.dart b/example/example.dart
diff --git a/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json b/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json
@@ -1,122 +1,122 @@
 {
-  "images": [
+  "images" : [
     {
-      "size": "20x20",
-      "idiom": "iphone",
-      "filename": "[email protected]",
-      "scale": "2x"
+      "size" : "20x20",
+      "idiom" : "iphone",
+      "filename" : "[email protected]",
+      "scale" : "2x"
     },
     {
-      "size": "20x20",
-      "idiom": "iphone",
-      "filename": "[email protected]",
-      "scale": "3x"
+      "size" : "20x20",
+      "idiom" : "iphone",
+      "filename" : "[email protected]",
+      "scale" : "3x"
     },
     {
-      "size": "29x29",
-      "idiom": "iphone",
-      "filename": "[email protected]",
-      "scale": "1x"
+      "size" : "29x29",
+      "idiom" : "iphone",
+      "filename" : "[email protected]",
+      "scale" : "1x"
     },
     {
-      "size": "29x29",
-      "idiom": "iphone",
-      "filename": "[email protected]",
-      "scale": "2x"
+      "size" : "29x29",
+      "idiom" : "iphone",
+      "filename" : "[email protected]",
+      "scale" : "2x"
     },
     {
-      "size": "29x29",
-      "idiom": "iphone",
-      "filename": "[email protected]",
-      "scale": "3x"
+      "size" : "29x29",
+      "idiom" : "iphone",
+      "filename" : "[email protected]",
+      "scale" : "3x"
     },
     {
-      "size": "40x40",
-      "idiom": "iphone",
-      "filename": "[email protected]",
-      "scale": "2x"
+      "size" : "40x40",
+      "idiom" : "iphone",
+      "filename" : "[email protected]",
+      "scale" : "2x"
     },
     {
-      "size": "40x40",
-      "idiom": "iphone",
-      "filename": "[email protected]",
-      "scale": "3x"
+      "size" : "40x40",
+      "idiom" : "iphone",
+      "filename" : "[email protected]",
+      "scale" : "3x"
     },
     {
-      "size": "60x60",
-      "idiom": "iphone",
-      "filename": "[email protected]",
-      "scale": "2x"
+      "size" : "60x60",
+      "idiom" : "iphone",
+      "filename" : "[email protected]",
+      "scale" : "2x"
     },
     {
-      "size": "60x60",
-      "idiom": "iphone",
-      "filename": "[email protected]",
-      "scale": "3x"
+      "size" : "60x60",
+      "idiom" : "iphone",
+      "filename" : "[email protected]",
+      "scale" : "3x"
     },
     {
-      "size": "20x20",
-      "idiom": "ipad",
-      "filename": "[email protected]",
-      "scale": "1x"
+      "size" : "20x20",
+      "idiom" : "ipad",
+      "filename" : "[email protected]",
+      "scale" : "1x"
     },
     {
-      "size": "20x20",
-      "idiom": "ipad",
-      "filename": "[email protected]",
-      "scale": "2x"
+      "size" : "20x20",
+      "idiom" : "ipad",
+      "filename" : "[email protected]",
+      "scale" : "2x"
     },
     {
-      "size": "29x29",
-      "idiom": "ipad",
-      "filename": "[email protected]",
-      "scale": "1x"
+      "size" : "29x29",
+      "idiom" : "ipad",
+      "filename" : "[email protected]",
+      "scale" : "1x"
     },
     {
-      "size": "29x29",
-      "idiom": "ipad",
-      "filename": "[email protected]",
-      "scale": "2x"
+      "size" : "29x29",
+      "idiom" : "ipad",
+      "filename" : "[email protected]",
+      "scale" : "2x"
     },
     {
-      "size": "40x40",
-      "idiom": "ipad",
-      "filename": "[email protected]",
-      "scale": "1x"
+      "size" : "40x40",
+      "idiom" : "ipad",
+      "filename" : "[email protected]",
+      "scale" : "1x"
     },
     {
-      "size": "40x40",
-      "idiom": "ipad",
-      "filename": "[email protected]",
-      "scale": "2x"
+      "size" : "40x40",
+      "idiom" : "ipad",
+      "filename" : "[email protected]",
+      "scale" : "2x"
     },
     {
-      "size": "76x76",
-      "idiom": "ipad",
-      "filename": "[email protected]",
-      "scale": "1x"
+      "size" : "76x76",
+      "idiom" : "ipad",
+      "filename" : "[email protected]",
+      "scale" : "1x"
     },
     {
-      "size": "76x76",
-      "idiom": "ipad",
-      "filename": "[email protected]",
-      "scale": "2x"
+      "size" : "76x76",
+      "idiom" : "ipad",
+      "filename" : "[email protected]",
+      "scale" : "2x"
     },
     {
-      "size": "83.5x83.5",
-      "idiom": "ipad",
-      "filename": "[email protected]",
-      "scale": "2x"
+      "size" : "83.5x83.5",
+      "idiom" : "ipad",
+      "filename" : "[email protected]",
+      "scale" : "2x"
     },
     {
-      "size": "1024x1024",
-      "idiom": "ios-marketing",
-      "filename": "[email protected]",
-      "scale": "1x"
+      "size" : "1024x1024",
+      "idiom" : "ios-marketing",
+      "filename" : "[email protected]",
+      "scale" : "1x"
     }
   ],
-  "info": {
-    "version": 1,
-    "author": "xcode"
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
   }
 }
diff --git a/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json b/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json
@@ -1,23 +1,23 @@
 {
-  "images": [
+  "images" : [
     {
-      "idiom": "universal",
-      "filename": "LaunchImage.png",
-      "scale": "1x"
+      "idiom" : "universal",
+      "filename" : "LaunchImage.png",
+      "scale" : "1x"
     },
     {
-      "idiom": "universal",
-      "filename": "[email protected]",
-      "scale": "2x"
+      "idiom" : "universal",
+      "filename" : "[email protected]",
+      "scale" : "2x"
     },
     {
-      "idiom": "universal",
-      "filename": "[email protected]",
-      "scale": "3x"
+      "idiom" : "universal",
+      "filename" : "[email protected]",
+      "scale" : "3x"
     }
   ],
-  "info": {
-    "version": 1,
-    "author": "xcode"
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
   }
 }