Merge branch 'feature/fix' into develop

Finished fixing
martin-headspace · Feb 17, 2020 · 9b27a76 · 9b27a76
2 parents 0c87de3 + 668142b
commit 9b27a76
Show file tree

Hide file tree

Showing 30 changed files with 620 additions and 9 deletions.
diff --git a/.idea/libraries/Flutter_Plugins.xml b/.idea/libraries/Flutter_Plugins.xml
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/android/.gradle/5.6.2/executionHistory/executionHistory.bin b/android/.gradle/5.6.2/executionHistory/executionHistory.bin
diff --git a/android/.gradle/5.6.2/executionHistory/executionHistory.lock b/android/.gradle/5.6.2/executionHistory/executionHistory.lock
diff --git a/android/.gradle/5.6.2/fileChanges/last-build.bin b/android/.gradle/5.6.2/fileChanges/last-build.bin
diff --git a/android/.gradle/5.6.2/fileContent/fileContent.lock b/android/.gradle/5.6.2/fileContent/fileContent.lock
diff --git a/android/.gradle/5.6.2/fileHashes/fileHashes.bin b/android/.gradle/5.6.2/fileHashes/fileHashes.bin
diff --git a/android/.gradle/5.6.2/fileHashes/fileHashes.lock b/android/.gradle/5.6.2/fileHashes/fileHashes.lock
diff --git a/android/.gradle/5.6.2/fileHashes/resourceHashesCache.bin b/android/.gradle/5.6.2/fileHashes/resourceHashesCache.bin
diff --git a/android/.gradle/5.6.2/gc.properties b/android/.gradle/5.6.2/gc.properties
diff --git a/android/.gradle/5.6.2/javaCompile/classAnalysis.bin b/android/.gradle/5.6.2/javaCompile/classAnalysis.bin
diff --git a/android/.gradle/5.6.2/javaCompile/jarAnalysis.bin b/android/.gradle/5.6.2/javaCompile/jarAnalysis.bin
diff --git a/android/.gradle/5.6.2/javaCompile/javaCompile.lock b/android/.gradle/5.6.2/javaCompile/javaCompile.lock
diff --git a/android/.gradle/5.6.2/javaCompile/taskHistory.bin b/android/.gradle/5.6.2/javaCompile/taskHistory.bin
diff --git a/android/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/android/.gradle/buildOutputCleanup/buildOutputCleanup.lock
diff --git a/android/.gradle/buildOutputCleanup/cache.properties b/android/.gradle/buildOutputCleanup/cache.properties
@@ -0,0 +1,2 @@
+#Sun Feb 16 22:51:16 CST 2020
+gradle.version=5.6.2
diff --git a/android/.gradle/buildOutputCleanup/outputFiles.bin b/android/.gradle/buildOutputCleanup/outputFiles.bin
diff --git a/android/.gradle/vcs-1/gc.properties b/android/.gradle/vcs-1/gc.properties
diff --git a/android/app/src/main/java/io/flutter/plugins/GeneratedPluginRegistrant.java b/android/app/src/main/java/io/flutter/plugins/GeneratedPluginRegistrant.java
@@ -0,0 +1,17 @@
+package io.flutter.plugins;
+
+import androidx.annotation.Keep;
+import androidx.annotation.NonNull;
+import io.flutter.embedding.engine.FlutterEngine;
+
+/**
+ * Generated file. Do not edit.
+ * This file is generated by the Flutter tool based on the
+ * plugins that support the Android platform.
+ */
+@Keep
+public final class GeneratedPluginRegistrant {
+  public static void registerWith(@NonNull FlutterEngine flutterEngine) {
+    flutterEngine.getPlugins().add(new io.flutter.plugins.sharedpreferences.SharedPreferencesPlugin());
+  }
+}
diff --git a/android/gradle/wrapper/gradle-wrapper.jar b/android/gradle/wrapper/gradle-wrapper.jar