Merge pull request #24 from SmallPlanetAndroid/master

Merging all the work made by SmallPlanet from August 2018 to October 2018
blockchain-certificates · Oct 5, 2018 · 89b4f1e · 89b4f1e
2 parents 15e6374 + b215804
commit 89b4f1e
Show file tree

Hide file tree

Showing 223 changed files with 3,574 additions and 31,766 deletions.
diff --git a/LearningMachine/app/build.gradle b/LearningMachine/app/build.gradle
@@ -1,23 +1,22 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 26
-    buildToolsVersion '26.0.2'
+    compileSdkVersion 27
+    buildToolsVersion '27.0.3'
     dexOptions {
-        incremental true
         javaMaxHeapSize "4g"
     }
     defaultConfig {
         applicationId "com.learningmachine.android.app"
         minSdkVersion 19
-        targetSdkVersion 25
-        versionName "3.0.5"
+        targetSdkVersion 26
+        versionName "3.0.4"
         def buildNumber = System.getenv("BUILD_NUMBER")
         if (buildNumber != null) {
             versionCode buildNumber.toInteger()
             versionNameSuffix "-" + buildNumber
         } else {
-            versionCode 23
+            versionCode 29
         }
 
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
@@ -94,22 +93,25 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
             signingConfig signingConfigs.LearningMachineRelease
         }
-
         debug {
             if (System.getenv("BUILD_NUMBER") == null) {
                 versionNameSuffix "-debug"
             }
             buildConfigField "boolean", "DEBUG_BUILD", "true"
-
+            debuggable true
         }
     }
 
     dataBinding {
         enabled = true
     }
+
+    lintOptions {
+        abortOnError false
+    }
 }
 
-final SUPPORT_VERSION = '27.0.2'
+final SUPPORT_VERSION = '27.1.1'
 final MULTIDEX_VERSION = '1.0.1'
 final DAGGER_VERSION = '2.11'
 final SLF4J_VERSION = '1.7.25'
@@ -158,6 +160,7 @@ dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     implementation "com.android.support:appcompat-v7:$SUPPORT_VERSION"
     implementation "com.android.support:recyclerview-v7:$SUPPORT_VERSION"
+    implementation "com.android.support:cardview-v7:$SUPPORT_VERSION"
     implementation "com.android.support:design:$SUPPORT_VERSION"
     implementation "com.android.support:multidex:$MULTIDEX_VERSION"
     implementation "org.slf4j:slf4j-log4j12:$SLF4J_VERSION"
@@ -179,8 +182,10 @@ dependencies {
     implementation "nl.littlerobots.rxlint:rxlint:$RXLINT_VERSION"
     implementation "com.squareup.picasso:picasso:$PICASSO_VERSION"
     implementation "com.google.guava:guava:$GUAVA_VERSION"
+    implementation 'com.bugsee:bugsee-android:1.12.3'
+
+    implementation 'com.google.android.exoplayer:exoplayer:2.8.4'
 
-    compile 'com.google.android.exoplayer:exoplayer:2.7.0'
 
     androidTestImplementation("com.android.support.test.espresso:espresso-core:$ESPRESSO_VERSION", {
         exclude group: 'com.android.support', module: 'support-annotations'

diff --git a/LearningMachine/app/src/main/AndroidManifest.xml b/LearningMachine/app/src/main/AndroidManifest.xml
@@ -25,15 +25,6 @@
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
-            <intent-filter>
-                <data
-                    android:host="certificates.learningmachine.com"
-                    android:scheme="https"/>
-                <action android:name="android.intent.action.VIEW"/>
-
-                <category android:name="android.intent.category.BROWSABLE"/>
-                <category android:name="android.intent.category.DEFAULT"/>
-            </intent-filter>
             <intent-filter>
                 <data
                     android:host="wallet.blockcerts.org"
@@ -85,12 +76,13 @@
 
         <activity
             android:name=".ui.settings.passphrase.RevealPassphraseActivity"
-            android:label="@string/reveal_passphrase_title"
+            android:label="@string/settings_reveal_passphrase"
             android:screenOrientation="portrait"
             android:launchMode="singleTask"/>
 
         <activity
             android:name=".ui.cert.CertificateActivity"
+            android:theme="@style/AppThemeLight"
             android:screenOrientation="portrait"
             android:launchMode="singleTask"/>
 
@@ -109,10 +101,15 @@
             android:name=".ui.cert.CertificateInfoActivity"
             android:screenOrientation="portrait"
             android:launchMode="singleTask"/>
+
         <activity android:name=".ui.WebAuthActivity"
             android:screenOrientation="portrait"
             android:launchMode="singleTask"/>
 
+        <activity android:name=".ui.cert.VerifyCertificateActivity"
+            android:screenOrientation="portrait"
+            android:launchMode="singleTask"/>
+
         <provider
             android:name="android.support.v4.content.FileProvider"
             android:authorities="com.learningmachine.android.app.fileprovider"