- CHG: Changed from icons to buttons on data source view.

- NEW: Added an "refresh" button to data source view.
- DEL: Removed old Toast notification.
- CHG: Updated data source view layout to work better on all screen sizes.
- NEW: Added landscape layout for EULA view.
- NEW: We have added a new log feature that allows you to keep a history of diseases you found. They will be tagged with GPS data if available and you can add photos and notes to them as well. Share them with your colleagues and friends via social media!
- NEW: A new catalogue has been added to the side menu that shows all the diseases in a list for quicker access.

.gitignore

@@ -7,6 +7,7 @@
 /build
 /captures
 .externalNativeBuild
+*.apk
 
 */release.properties
 buntata.jks

app/build.gradle

@@ -15,8 +15,13 @@
  */
 
 apply plugin: 'com.android.application'
+apply plugin: 'kotlin-android'
 //apply plugin: 'android-apt'
 
+def propertiesFile = project.file("release.properties")
+def properties = new Properties()
+properties.load(new FileInputStream(propertiesFile))
+
 android {
     signingConfigs {
         release {
@@ -28,14 +33,14 @@ android {
         enabled = true
     }
 
-    compileSdkVersion 25
-    buildToolsVersion "25.0.2"
+    compileSdkVersion 27
+    buildToolsVersion '27.0.3'
     defaultConfig {
         applicationId "uk.ac.hutton.ics.buntata"
         minSdkVersion 16
-        targetSdkVersion 25
-        versionCode 13
-        versionName "1.17.05.10"
+        targetSdkVersion 27
+        versionCode 17
+        versionName "1.18.04.26"
         multiDexEnabled true
     }
 
@@ -52,6 +57,10 @@ android {
         }
     }
 
+    buildTypes.each {
+        it.manifestPlaceholders = [GOOGLE_MAPS_KEY: properties['googleMapsApiKey']]
+    }
+
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_7
         targetCompatibility JavaVersion.VERSION_1_7
@@ -74,29 +83,49 @@ android {
 
 repositories {
     mavenCentral() /* The standard Java Maven repository. */
+    maven { url "http://dl.bintray.com/journeyapps/maven" }
     maven { url 'https://jitpack.io' }
+    maven { url 'https://oss.sonatype.org/content/repositories/snapshots/' }
 }
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'com.google.android.gms:play-services-analytics:10.2.4'
-    compile 'com.android.support:appcompat-v7:25.3.1'
-    compile 'com.android.support:recyclerview-v7:25.3.1'
-    compile 'com.android.support:cardview-v7:25.3.1'
-    compile 'com.android.support:design:25.3.1'
-    compile 'com.android.support:palette-v7:25.3.1'
-    compile 'com.squareup.picasso:picasso:2.5.2'
+    compile 'com.google.android.gms:play-services-analytics:15.0.0'
+    compile 'com.google.android.gms:play-services-maps:15.0.0'
+    compile 'com.android.support:appcompat-v7:27.1.1'
+    compile 'com.android.support:recyclerview-v7:27.1.1'
+    compile 'com.android.support:cardview-v7:27.1.1'
+    compile 'com.android.support:design:27.1.1'
+    compile 'com.android.support:palette-v7:27.1.1'
+    implementation 'com.squareup.picasso:picasso:2.71828'
     compile 'com.heinrichreimersoftware:material-intro:1.6.2'
     compile 'me.relex:circleindicator:1.2.1@aar'
     compile 'com.andkulikov:transitionseverywhere:1.7.0'
     compile 'com.afollestad:sectioned-recyclerview:0.2.3'
     compile 'com.github.chrisbanes:PhotoView:1.3.1'
-    compile 'com.squareup.retrofit2:retrofit:2.0.0-beta3'
-    compile 'com.squareup.retrofit2:converter-jackson:2.0.0-beta3'
+    compile 'com.squareup.retrofit2:retrofit:2.1.0'
+    compile 'com.squareup.retrofit2:converter-jackson:2.1.0'
+    compile 'com.journeyapps:zxing-android-embedded:3.2.0@aar'
+    compile 'com.google.zxing:core:3.2.1'
     compile 'com.github.gabrielemariotti.changeloglib:changelog:2.1.0'
+    compile 'com.sothree.slidinguppanel:library:3.4.0'
     compile 'com.jakewharton:butterknife:8.5.1'
     annotationProcessor 'com.jakewharton:butterknife-compiler:8.5.1'
-//    apt 'com.jakewharton:butterknife-compiler:8.5.1'
+    compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
+    implementation 'com.github.esafirm:android-image-picker:1.12.0'
+    implementation 'com.github.bumptech.glide:glide:4.3.1'
+    annotationProcessor 'com.github.bumptech.glide:compiler:4.3.1'
+}
+
+configurations.all {
+    resolutionStrategy.eachDependency { DependencyResolveDetails details ->
+        def requested = details.requested
+        if (requested.group == 'com.android.support') {
+            if (!requested.name.startsWith("multidex")) {
+                details.useVersion '27.1.0'
+            }
+        }
+    }
 }
 
 // Get the key store information from the properties file

app/proguard-rules.pro

@@ -25,8 +25,12 @@
 -keep class com.google.android.gms.** { *; }
 -dontwarn com.google.android.gms.**
 
+-dontwarn okhttp3.**
 -dontwarn okio.**
 -dontwarn com.squareup.okhttp.**
+-dontwarn javax.annotation.**
+-dontwarn org.conscrypt.**
+-keepnames class okhttp3.internal.publicsuffix.PublicSuffixDatabase
 
 # Platform calls Class.forName on types which do not exist on Android to determine platform.
 -dontnote retrofit2.Platform

app/release.properties.sample

@@ -1,4 +1,6 @@
 keyStore=release.keystore
 keyStorePassword=mysecretpassword
 keyAlias=myapp-release
-keyAliasPassword=mysecretpassword
+keyAliasPassword=mysecretpassword
+
+googleMapsApiKey=

app/release/output.json

@@ -0,0 +1,18 @@
+[
+  {
+    "outputType": {
+      "type": "APK"
+    },
+    "apkInfo": {
+      "type": "MAIN",
+      "splits": [],
+      "versionCode": 17
+    },
+    "path": "app-release.apk",
+    "properties": {
+      "packageId": "uk.ac.hutton.ics.buntata",
+      "split": "",
+      "minSdkVersion": "16"
+    }
+  }
+]

app/src/main/AndroidManifest.xml

@@ -18,7 +18,10 @@
 		  xmlns:tools="http://schemas.android.com/tools"
 		  package="uk.ac.hutton.ics.buntata">
 
+	<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
 	<uses-permission android:name="android.permission.INTERNET"/>
+	<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
+	<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
 
 	<application
 		android:allowBackup="true"
@@ -49,7 +52,6 @@
 		<activity
 			android:name=".activity.NodeDetailsActivity"
 			android:parentActivityName=".activity.MainActivity">
-			can
 			<intent-filter android:label="@string/app_name">
 				<action android:name="android.intent.action.VIEW"/>
 
@@ -77,5 +79,23 @@
 		<activity android:name=".activity.VideoActivity"/>
 		<activity android:name=".activity.PreferencesActivity"/>
 		<activity android:name=".activity.ChangelogActivity"/>
+		<activity android:name=".activity.LogEntryActivity"/>
+		<activity android:name=".activity.NodeCatalogActivity"/>
+		<activity android:name=".activity.LogDetailsActivity"
+				  android:configChanges="orientation|screenSize"/>
+
+		<provider
+			android:name=".util.ShareImageFileProvider"
+			android:authorities="${applicationId}.fileprovider"
+			android:exported="false"
+			android:grantUriPermissions="true">
+			<meta-data
+				android:name="android.support.FILE_PROVIDER_PATHS"
+				android:resource="@xml/filepaths"/>
+		</provider>
+
+		<meta-data
+			android:name="com.google.android.geo.API_KEY"
+			android:value="${GOOGLE_MAPS_KEY}"/>
 	</application>
 </manifest>

app/src/main/java/uk/ac/hutton/ics/buntata/activity/AboutActivity.java

@@ -17,6 +17,7 @@
 package uk.ac.hutton.ics.buntata.activity;
 
 import android.content.*;
+import android.graphics.*;
 import android.os.*;
 import android.support.design.widget.*;
 import android.support.v4.app.*;
@@ -67,6 +68,10 @@ protected void onCreate(Bundle savedInstanceState)
 			getSupportActionBar().setHomeButtonEnabled(true);
 		}
 
+		getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_STABLE | View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN);
+		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP)
+			getWindow().setStatusBarColor(Color.TRANSPARENT);
+
 		/* Get the view pager and set the fragment adapter */
 		viewPager.setAdapter(new AboutFragmentPagerAdapter(getSupportFragmentManager(), this));
 		tabLayout.setupWithViewPager(viewPager);
@@ -106,7 +111,7 @@ public void onOffsetChanged(AppBarLayout appBarLayout, int verticalOffset)
 				}
 				else if (show)
 				{
-					collapsingToolbarLayout.setTitle(" "); // careful there should a space between double quote otherwise it wont work
+					collapsingToolbarLayout.setTitle(" "); // careful there should a space between double quote otherwise it won't work
 					show = false;
 				}
 			}

app/src/main/java/uk/ac/hutton/ics/buntata/activity/BaseActivity.java

@@ -25,15 +25,16 @@
 import android.support.annotation.*;
 import android.support.design.widget.*;
 import android.support.v7.app.*;
-import android.support.v7.widget.*;
+import android.support.v7.widget.Toolbar;
 import android.view.*;
+import android.widget.*;
 
 import com.google.android.gms.analytics.*;
 
 import java.util.*;
 import java.util.concurrent.*;
 
-import uk.ac.hutton.ics.buntata.R;
+import uk.ac.hutton.ics.buntata.*;
 import uk.ac.hutton.ics.buntata.util.*;
 
 /**
@@ -136,7 +137,7 @@ public void uncaughtException(Thread thread, Throwable ex)
 					ex.printStackTrace();
 
 					GoogleAnalyticsUtils.trackEvent(BaseActivity.this, getTracker(TrackerName.APP_TRACKER), getString(R.string.ga_event_category_exception), ex.getLocalizedMessage());
-					ToastUtils.createToast(BaseActivity.this, getString(R.string.toast_exception, ex.getLocalizedMessage()), ToastUtils.LENGTH_LONG);
+					ToastUtils.INSTANCE.createToast(BaseActivity.this, getString(R.string.toast_exception, ex.getLocalizedMessage()), Toast.LENGTH_LONG);
 
 					System.exit(1);
 				}
@@ -213,7 +214,7 @@ public void onClick(View view)
 	 */
 	protected abstract Integer getToolbarId();
 
-	protected View getSnackbarParentView()
+	public View getSnackbarParentView()
 	{
 		return findViewById(android.R.id.content);
 	}