Merge branch 'release/v2.3.1'

* release/v2.3.1:
  Updated binary links and hashs
  Bump gradle and version
  Removed lombok jar
  Updated gradle for android studio 3.0
  Added catch for image that may have been deleted

README.md

@@ -2,9 +2,9 @@
 
 Welcome to grow tracker. This app was created to help record data about growing plants in order to monitor the growing conditions to help make the plants grow better, and identify potential issues during the grow process.
 
-[Latest APK: (MD5) bc9a631d80af4ac0d5ff6b49292219dd v2.3](https://github.com/7LPdWcaW/GrowTracker-Android/releases/download/v2.3/v2.3-production.apk)
+[Latest APK: (MD5) 4905c7663556dc94a08c48418a7b4c94 v2.3.1](https://github.com/7LPdWcaW/GrowTracker-Android/releases/download/v2.3.1/v2.3.1-production.apk)
 
-[Latest APK (Discrete): (MD5) f7ccf060a0ddc7356e67a7e6f23bbfbb v2.3](https://github.com/7LPdWcaW/GrowTracker-Android/releases/download/v2.3/v2.3-discrete.apk)
+[Latest APK (Discrete): (MD5) fd84ba3ac5c24a4b3f6ca16e5f3d5797 v2.3](https://github.com/7LPdWcaW/GrowTracker-Android/releases/download/v2.3.1/v2.3.1-discrete.apk)
 
 # Installation
 

app/build.gradle

@@ -6,27 +6,30 @@ repositories {
 
 android {
 	compileSdkVersion 25
-	buildToolsVersion "25.0.2"
+	buildToolsVersion "26.0.2"
 
 	defaultConfig {
 		applicationId "me.anon.grow"
 		minSdkVersion 17
 		targetSdkVersion 25
-		versionCode 14
-		versionName "2.3"
+		versionCode 15
+		versionName "2.3.1"
 	}
 
 	lintOptions {
 		abortOnError false
 	}
 
+	flavorDimensions "type"
 	productFlavors {
 		production {
 			buildConfigField "Boolean", "DISCRETE", "false"
 
 			manifestPlaceholders = [
 				"appType": "original"
 			]
+
+			dimension "type"
 		}
 
 		discrete {
@@ -35,6 +38,8 @@ android {
 			manifestPlaceholders = [
 				"appType": "discrete"
 			]
+
+			dimension "type"
 		}
 	}
 
@@ -46,19 +51,22 @@ android {
 }
 
 dependencies {
-	compile fileTree(dir: 'libs', include: ['*.jar'])
-	compile 'com.android.support:appcompat-v7:25.2.0'
-	compile 'com.android.support:recyclerview-v7:25.2.0'
-	compile 'com.android.support:cardview-v7:25.2.0'
-	compile 'com.android.support:design:25.2.0'
-	compile "com.android.support:exifinterface:25.2.0"
+	annotationProcessor 'org.projectlombok:lombok:1.16.14'
+	provided 'org.projectlombok:lombok:1.16.14'
+	provided 'org.glassfish:javax.annotation:10.0-b28'
+
+	implementation 'com.android.support:appcompat-v7:25.4.0'
+	implementation 'com.android.support:recyclerview-v7:25.4.0'
+	implementation 'com.android.support:cardview-v7:25.4.0'
+	implementation 'com.android.support:design:25.4.0'
+	implementation "com.android.support:exifinterface:25.4.0"
 
-	compile 'com.esotericsoftware:kryo:3.0.3'
-	compile 'com.google.code.gson:gson:2.7'
-	compile 'com.squareup:otto:1.3.8'
-	compile 'com.kennyc:snackbar:2.0.2'
-	compile 'com.github.PhilJay:MPAndroidChart:v2.1.0'
-	compile 'com.nostra13.universalimageloader:universal-image-loader:1.9.3'
-	compile 'com.davemorrissey.labs:subsampling-scale-image-view:3.1.4'
-	compile 'net.lingala.zip4j:zip4j:1.3.2'
+	implementation 'com.esotericsoftware:kryo:3.0.3'
+	implementation 'com.google.code.gson:gson:2.8.1'
+	implementation 'com.squareup:otto:1.3.8'
+	implementation 'com.kennyc:snackbar:2.0.2'
+	implementation 'com.github.PhilJay:MPAndroidChart:v2.1.0'
+	implementation 'com.nostra13.universalimageloader:universal-image-loader:1.9.5'
+	implementation 'com.davemorrissey.labs:subsampling-scale-image-view:3.6.0'
+	implementation 'net.lingala.zip4j:zip4j:1.3.2'
 }

app/src/main/java/me/anon/controller/provider/PlantWidgetProvider.java

@@ -191,7 +191,7 @@ private void setWidgetUi(int widgetId, RemoteViews view, Plant plant)
 			paint.setAntiAlias(true);
 			canvas.drawRoundRect(rectF, 8, 8, paint);
 
-			Bitmap lastImage;
+			Bitmap lastImage = null;
 
 			if (allowImage && plant.getImages().size() > 0)
 			{
@@ -200,7 +200,8 @@ private void setWidgetUi(int widgetId, RemoteViews view, Plant plant)
 				lastImage = BitmapFactory.decodeFile(plant.getImages().get(plant.getImages().size() - 1), opts);
 				lastImage = ThumbnailUtils.extractThumbnail(lastImage, size[0], size[1], 0);
 			}
-			else
+
+			if (lastImage == null)
 			{
 				BitmapFactory.Options opts = new BitmapFactory.Options();
 				opts.inSampleSize = recursiveSample(context.getResources(), R.drawable.default_plant, size[0], size[1]);
@@ -209,7 +210,11 @@ private void setWidgetUi(int widgetId, RemoteViews view, Plant plant)
 			}
 
 			paint.setXfermode(new PorterDuffXfermode(PorterDuff.Mode.SRC_IN));
-			canvas.drawBitmap(lastImage, rect, rect, paint);
+
+			if (lastImage != null)
+			{
+				canvas.drawBitmap(lastImage, rect, rect, paint);
+			}
 
 			Paint overlay = new Paint();
 			overlay.setColor(0x000000);

build.gradle

@@ -2,11 +2,13 @@
 
 buildscript {
 	repositories {
+		mavenCentral()
 		jcenter()
+		google()
 	}
 
 	dependencies {
-		classpath 'com.android.tools.build:gradle:2.3.3'
+		classpath 'com.android.tools.build:gradle:3.1.2'
 
 		// NOTE: Do not place your application dependencies here; they belong
 		// in the individual module build.gradle files
@@ -15,7 +17,12 @@ buildscript {
 
 allprojects {
 	repositories {
+		mavenCentral()
 		jcenter()
 		maven { url "https://jitpack.io" }
+		maven {
+			url 'https://maven.google.com/'
+			name 'Google'
+		}
 	}
 }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Fri Apr 21 20:29:47 BST 2017
+#Mon May 28 00:20:53 BST 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip