Merge branch 'master' into ver2

royarg02 · Apr 6, 2020 · 8762b83 · 8762b83
2 parents 4cf1450 + 522d2b3
commit 8762b83
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 20 deletions.
diff --git a/.gitignore b/.gitignore
@@ -25,6 +25,7 @@
 .dart_tool/
 .flutter-plugins
 .flutter-plugins-dependencies
+flutter_export_environment.sh
 .packages
 .pub-cache/
 .pub/
@@ -64,6 +65,7 @@
 **/ios/Flutter/flutter_assets/
 **/ios/ServiceDefinitions.json
 **/ios/Runner/GeneratedPluginRegistrant.*
+**ios/Flutter/flutter_export_environment.sh
 
 # Exceptions to above rules.
 !**/ios/**/default.mode1v3
@@ -72,4 +74,5 @@
 !**/ios/**/default.perspectivev3
 !/packages/flutter_tools/test/data/dart_dependencies_test/**/.packages
 
-local.properties
+local.properties
+.flutter-
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
-# SOIF
+# <img src="assets/readme/Soif.png" height=100>
 
-[![Codacy Badge](https://api.codacy.com/project/badge/Grade/d94e74bd82544d2389ceda65e810ab96)](https://www.codacy.com/manual/RoyARG02/soil_moisture_app?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=RoyARG02/soil_moisture_app&amp;utm_campaign=Badge_Grade)
+[![GitHub Release](https://img.shields.io/badge/release-v1.0.3-blue)](https://github.com/RoyARG02/soil_moisture_app/releases) [![Codacy Badge](https://api.codacy.com/project/badge/Grade/d94e74bd82544d2389ceda65e810ab96)](https://www.codacy.com/manual/RoyARG02/soil_moisture_app?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=RoyARG02/soil_moisture_app&amp;utm_campaign=Badge_Grade) [![GPLv3 License](https://img.shields.io/badge/License-GPL%20v3-yellow.svg)](https://opensource.org/licenses/GPL-3.0)  
 
 This is a Flutter project, which will serve as the dashboard for the **Soil Moisture** content of a particular area.
 
@@ -11,8 +11,6 @@ Font: [JetBrains Mono](https://github.com/JetBrains/JetBrainsMono)
 ### Screenshots
 
 <p align = "middle">
-  <img src="assets/readme/Soif.png" height=100>
-  <br><br>
   <img src="assets/readme/overview.png" height=500>
   <img src="assets/readme/analysis_dark.png" height=500>
   <br><br>

diff --git a/android/build.gradle b/android/build.gradle
@@ -5,7 +5,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.3'
+        classpath 'com.android.tools.build:gradle:3.6.1'
     }
 }
 

diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon Oct 07 13:13:11 IST 2019
+#Mon Apr 06 13:07:01 IST 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
diff --git a/ios/Flutter/flutter_export_environment.sh b/ios/Flutter/flutter_export_environment.sh
diff --git a/lib/pages/Credits.dart b/lib/pages/Credits.dart
@@ -149,7 +149,8 @@ class _CreditsState extends State<Credits> {
                 strutStyle: StrutStyle(fontSize: 14.0),
                 text: TextSpan(
                   style: Theme.of(context).textTheme.body2.copyWith(
-                        color: (Provider.of<ThemeState>(context).isDarkTheme(context))
+                        color: (Provider.of<ThemeState>(context)
+                                .isDarkTheme(context))
                             ? subtleWhiteTextColor
                             : subtleBlackTextColor,
                       ),

diff --git a/lib/utils/app_info.dart b/lib/utils/app_info.dart
@@ -12,4 +12,4 @@ loadAppInfo() async {
   _appInfo = await PackageInfo.fromPlatform();
 }
 
-PackageInfo get getAppInfo => _appInfo;
+PackageInfo get getAppInfo => _appInfo;