Merge pull request #134 from ZeusWPI/bibliotheek

Libraries and more

app/build.gradle

@@ -1,5 +1,4 @@
 apply plugin: 'com.android.application'
-//Enable this when disabling jack
 apply plugin: 'me.tatarka.retrolambda'
 apply plugin: 'com.cookpad.android.licensetools'
 
@@ -15,12 +14,6 @@ android {
         versionName "2.2.3"
         vectorDrawables.useSupportLibrary = true
 
-        //Enable jack support
-        //When disabling jack, DON'T forget to enable retrolambda
-//        jackOptions {
-//            enabled true
-//        }
-
         //Load the API keys from the file "secrets.progperties".
         Properties props = new Properties()
         props.load(new FileInputStream(file('secrets.properties')))
@@ -73,7 +66,7 @@ project.afterEvaluate {
 }
 
 //The support library version
-final SUPPORT_LIBRARY_VERSION = '25.1.0'
+final SUPPORT_LIBRARY_VERSION = '25.1.1'
 
 dependencies {
     compile fileTree(include: ['*.jar'], dir: 'libs')
@@ -84,23 +77,24 @@ dependencies {
     compile "com.android.support:support-v13:$SUPPORT_LIBRARY_VERSION"
     compile "com.android.support:preference-v7:$SUPPORT_LIBRARY_VERSION"
     compile "com.android.support:recyclerview-v7:$SUPPORT_LIBRARY_VERSION"
-    compile "com.android.support:gridlayout-v7:$SUPPORT_LIBRARY_VERSION"
     compile "com.android.support:design:$SUPPORT_LIBRARY_VERSION"
     compile "com.android.support:customtabs:$SUPPORT_LIBRARY_VERSION"
 
     compile 'org.springframework.android:spring-android-core:1.0.1.RELEASE'
     compile 'org.springframework.android:spring-android-rest-template:1.0.1.RELEASE'
     compile 'com.google.code.gson:gson:2.8.0'
     compile 'com.timehop.stickyheadersrecyclerview:library:0.4.3@aar'
-    compile 'com.jakewharton.threetenabp:threetenabp:1.0.4'
-    compile 'net.sourceforge.streamsupport:streamsupport:1.5.2'
+    compile 'com.jakewharton.threetenabp:threetenabp:1.0.5'
+    compile 'net.sourceforge.streamsupport:streamsupport:1.5.3'
     compile 'com.squareup.picasso:picasso:2.5.2'
     compile 'com.github.KyoSherlock:expandablelayout:master-SNAPSHOT'
+    compile 'net.cachapa.expandablelayout:expandablelayout:2.7'
     compile 'com.github.pluscubed:recycler-fast-scroll:0.3.2@aar'
-    compile 'com.futuremind.recyclerfastscroll:fastscroll:0.2.4'
+    compile 'com.futuremind.recyclerfastscroll:fastscroll:0.2.5'
     compile 'com.heinrichreimersoftware:material-intro:1.6'
     compile 'su.j2e:rv-joiner:1.0.9'
     compile 'com.github.alexfu:SQLiteQueryBuilder:0.3.0'
+    compile 'com.jonathanfinerty.once:once:1.2.1'
 
     // Used for the OAuth stuff
     compile ('org.apache.oltu.oauth2:org.apache.oltu.oauth2.client:1.0.2') {
@@ -121,7 +115,7 @@ dependencies {
 
     //Test code
     testCompile 'junit:junit:4.12'
-    testCompile 'org.mockito:mockito-core:2.2.9'
+    testCompile 'org.mockito:mockito-core:2.7.0'
 
     debugCompile 'com.squareup.leakcanary:leakcanary-android:1.5'
     releaseCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.5'
@@ -131,6 +125,15 @@ dependencies {
     testCompile ('org.threeten:threetenbp:1.3.2'){
         exclude group:'com.jakewharton.threetenabp', module:'threetenabp'
     }
+
+    testCompile 'nl.jqno.equalsverifier:equalsverifier:2.2.1'
+    testCompile ('com.shazam:shazamcrest:0.11') {
+        exclude group: 'com.google.code.gson', module: 'gson'
+    }
+    testCompile 'io.github.benas:random-beans:3.5.0'
+    testCompile 'org.apache.commons:commons-lang3:3.5'
+    testCompile 'org.hamcrest:hamcrest-core:1.3'
+    testCompile 'com.googlecode:openbeans:1.0'
 }
 
 apply plugin: 'com.google.gms.google-services'

app/licenses.yml

@@ -80,7 +80,19 @@
   name: No op LeakCanary for Android
   copyrightHolder: Square, Inc.
   license: The Apache Software License, Version 2.0
-  url: http://github.com/square/leakcanary/
+  url: http://github.com/square/leakcanary
+
+- artifact: net.cachapa.expandablelayout:expandablelayout:+
+  name: expandablelayout
+  copyrightHolder: Daniel Cachapa
+  license: The Apache Software License, Version 2.0
+  url: https://github.com/cachapa/ExpandableLayout
+
+- artifact: com.jonathanfinerty.once:once:+
+  name: Once
+  copyrightHolder: Jon Finerty
+  license: The Apache Software License, Version 2.0
+  url: https://github.com/jonfinerty/Once
 
 - artifact: net.sourceforge.streamsupport:streamsupport:+
   skip: true

app/src/main/AndroidManifest.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="be.ugent.zeus.hydra"
+<manifest xmlns:tools="http://schemas.android.com/tools"
+    package="be.ugent.zeus.hydra"
     xmlns:android="http://schemas.android.com/apk/res/android">
 
     <!-- Network permissions -->
@@ -32,12 +33,15 @@
         android:label="@string/app_name"
         android:logo="@drawable/logo"
         android:roundIcon="@mipmap/ic_launcher_round"
-        android:theme="@style/Hydra.Main.NoActionBar">
+        android:theme="@style/Hydra.Main.NoActionBar"
+        tools:ignore="ManifestResource"
+        tools:targetApi="25">
 
         <!-- Main activity -->
         <activity
             android:name=".activities.MainActivity"
-            android:launchMode="singleTop">
+            android:launchMode="singleTop"
+            android:theme="@style/Hydra.Main.NoActionBar.SystemWindows">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -53,8 +57,8 @@
         <activity
             android:name=".activities.preferences.SettingsActivity"
             android:label="@string/action_settings"
-            android:parentActivityName=".activities.MainActivity"
-            android:theme="@style/Hydra.Main" />
+            android:theme="@style/Hydra.Main.TextColorSelector"
+            android:parentActivityName=".activities.MainActivity" />
 
         <!-- Association select preference activity -->
         <activity
@@ -177,6 +181,13 @@
             android:name=".activities.ExceptionDialogActivity"
             android:theme="@style/Theme.AppCompat.Light.Dialog.Alert" />
 
+        <!-- Library details -->
+        <activity
+            android:name=".activities.LibraryDetailActivity"
+            android:label="Bibliotheek"
+            android:parentActivityName=".activities.MainActivity"
+            android:theme="@style/Hydra.Main.NoActionBar.SystemWindows" />
+
         <!-- Receiver for daily resto notifications -->
         <receiver android:name=".notifications.DailyNotificationReceiver" />
 

app/src/main/java/be/ugent/zeus/hydra/HydraApplication.java

@@ -8,6 +8,7 @@
 import com.google.android.gms.analytics.Tracker;
 import com.jakewharton.threetenabp.AndroidThreeTen;
 import com.squareup.leakcanary.LeakCanary;
+import jonathanfinerty.once.Once;
 
 /**
  * The Hydra application.
@@ -30,6 +31,7 @@ public void onCreate() {
         }
         AndroidThreeTen.init(this);
         LeakCanary.install(this);
+        Once.initialise(this);
     }
 
     /**