Feature leaderboard

.gitignore

@@ -10,4 +10,5 @@
 /build
 /captures
 .externalNativeBuild
-/app/google-services.json
+/app/google-services.json
+/app/fabric.properties

app/build.gradle

@@ -1,13 +1,15 @@
 apply plugin: 'com.android.application'
 
+apply plugin: 'io.fabric'
+
 android {
     compileSdkVersion 28
     defaultConfig {
         applicationId "com.app.horizon"
         minSdkVersion 15
         targetSdkVersion 28
-        versionCode 1
-        versionName "1.0"
+        versionCode 3
+        versionName '1.2'
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         dataBinding.enabled = true
 
@@ -27,9 +29,15 @@ android {
         exclude 'META-INF/rxjava.properties'
     }
     buildTypes {
+        debug {
+            buildConfigField 'String', "ApiKey", fabric_api_key
+            resValue 'string', "api_key", fabric_api_key
+        }
         release {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            buildConfigField 'String', "ApiKey", fabric_api_key
+            resValue 'string', "api_key", fabric_api_key
         }
     }
     lintOptions {
@@ -38,14 +46,17 @@ android {
         // but continue the build even when errors are found:
         abortOnError false
     }
+    productFlavors {
+    }
+
 }
 
 ext {
-    appcompatVersion = '28.0.0-rc01'
-    constraintLayoutVersion = '1.1.2'
+    appcompatVersion = '28.0.0'
+    constraintLayoutVersion = '1.1.3'
+    crashlyticsVersion = '2.9.5'
     daggerVersion = '2.14.1'
     espressoVersion = '3.0.2'
-    facebookSdkVersion = '4.27.0'
     firebaseCoreVersion = '16.0.1'
     firebaseAuthVersion = '16.0.3'
     firestoreVersion = '17.1.0'
@@ -56,31 +67,30 @@ ext {
     loggingInterceptorVersion = '3.8.1'
     multiDexVersion = '1.0.3'
     okhttpVersion = '3.10.0'
+    parcelerApiVersion = '1.0.4'
+    parcelerVersion = '1.0.4'
     retrofitAdaptersVersion = '2.3.0'
     retrofitVersion = '2.4.0'
-    roomVersion = '1.1.1'
     runnerVersion = '1.0.1'
-    rxBusVersion = '1.0.6'
     trelloLifecycleVersion = '2.2.1'
 
 
 }
 
 dependencies {
+
     //Loads packaged libraries in the libs folder
-    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation fileTree(include: ['*.jar'], dir: 'libs')
 
     //Android Libs
     implementation "com.android.support:appcompat-v7:$appcompatVersion"
     implementation "com.android.support:design:$appcompatVersion"
     implementation "com.android.support.constraint:constraint-layout:$constraintLayoutVersion"
     implementation "com.android.support:support-vector-drawable:$appcompatVersion"
-    implementation "com.android.support:support-v4:$appcompatVersion"
 
     //Dependency Injection
     implementation "com.google.dagger:dagger:$daggerVersion"
     implementation "com.google.dagger:dagger-android-support:$daggerVersion"
-    implementation 'com.android.support:support-v4:28.0.0-rc02'
     annotationProcessor "com.google.dagger:dagger-compiler:$daggerVersion"
     annotationProcessor "com.google.dagger:dagger-android-processor:$daggerVersion"
 
@@ -89,17 +99,11 @@ dependencies {
     androidTestImplementation "com.android.support.test:runner:$runnerVersion"
     androidTestImplementation "com.android.support.test.espresso:espresso-core:$espressoVersion"
 
-    //Event bus
-    implementation "com.hwangjr.rxbus:rxbus:$rxBusVersion"
-
     //RxJava
     implementation 'io.reactivex.rxjava2:rxjava:2.1.9'
     implementation 'io.reactivex.rxjava2:rxandroid:2.0.1'
     implementation 'com.jakewharton.retrofit:retrofit2-rxjava2-adapter:1.0.0'
 
-    //Lifecycle
-    implementation "com.trello.rxlifecycle2:rxlifecycle-components:$trelloLifecycleVersion"
-
     //Network
     implementation "com.squareup.okhttp3:okhttp:$okhttpVersion"
     implementation "com.squareup.okhttp3:logging-interceptor:$loggingInterceptorVersion"
@@ -110,11 +114,6 @@ dependencies {
     //Views and animations
     implementation "com.facebook.fresco:fresco:$frescoVersion"
 
-    //Persistence and storage
-    implementation "android.arch.persistence.room:runtime:$roomVersion"
-    annotationProcessor "android.arch.persistence.room:compiler:$roomVersion"
-    implementation "android.arch.persistence.room:rxjava2:$roomVersion"
-
     // view model
     implementation "android.arch.lifecycle:extensions:$lifecycle"
     annotationProcessor "android.arch.lifecycle:compiler:$lifecycle"
@@ -124,8 +123,11 @@ dependencies {
     implementation "com.google.firebase:firebase-auth:$firebaseAuthVersion"
     implementation "com.google.firebase:firebase-firestore:$firestoreVersion"
 
-    //Facebook Authentication
-    implementation "com.facebook.android:facebook-android-sdk:$facebookSdkVersion"
+    //Crashlytics
+    implementation "com.crashlytics.sdk.android:crashlytics:$crashlyticsVersion"
+
+    //HyperLog
+    implementation 'com.hypertrack:hyperlog:0.0.9'
 
     //Google Authentication
     implementation "com.google.android.gms:play-services-auth:$googleSignInVersion"
@@ -136,3 +138,6 @@ dependencies {
 }
 
 apply plugin: 'com.google.gms.google-services'
+
+// Work around for onesignal-gradle-plugin compatibility
+//com.google.gms.googleservices.GoogleServicesPlugin.config.disableVersionCheck = true

app/fabric.properties

@@ -0,0 +1,3 @@
+#Contains API Secret used to validate your application. Commit to internal source control; avoid making secret public.
+#Fri Oct 12 12:00:18 WAT 2018
+apiSecret=2cf1148333cfa47476f0fc3ac1fb3721852111c7b5390a774ea94a484ee7a99c

app/google-services.json

@@ -15,19 +15,27 @@
       },
       "oauth_client": [
         {
-          "client_id": "1032665251185-3trvep3uaeu1jum3g7l6993qrblsd33l.apps.googleusercontent.com",
+          "client_id": "1032665251185-h8ftse1hd56nvokidhfbe592tt7glb69.apps.googleusercontent.com",
+          "client_type": 1,
+          "android_info": {
+            "package_name": "com.app.horizon",
+            "certificate_hash": "9dab935c7e6ffe4d0e3d039b36132a77065680f5"
+          }
+        },
+        {
+          "client_id": "1032665251185-rvs66pd80quo8i20u0n7lnj9qr0trehn.apps.googleusercontent.com",
           "client_type": 1,
           "android_info": {
             "package_name": "com.app.horizon",
             "certificate_hash": "4f1874e0d54a31bd5668af5cada62dae46483fe3"
           }
         },
         {
-          "client_id": "1032665251185-e2d1jkpak6pje0548vhedmau7484vj7p.apps.googleusercontent.com",
+          "client_id": "1032665251185-c0o5u8b2ejlbdu89f562kvr5qtpsebbm.apps.googleusercontent.com",
           "client_type": 1,
           "android_info": {
             "package_name": "com.app.horizon",
-            "certificate_hash": "7d3a4200dc583b9ff4d88b06530a286541fdc73c"
+            "certificate_hash": "cbf43e190434cde7c7c1852ca9820877fa70e502"
           }
         },
         {

app/proguard-rules.pro

@@ -19,3 +19,8 @@
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
 #-renamesourcefileattribute SourceFile
+#-keep class com.google.android.gms.** { *; }
+#-dontwarn com.google.android.gms.**
+#-dontwarn com.google.errorprone.annotations.**
+
+#-ignorewarnings

app/release/output.json

@@ -0,0 +1 @@
+[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":3,"versionName":"1.2","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]

app/src/main/AndroidManifest.xml

@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="com.app.horizon">
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
 
 
     <application
@@ -13,7 +15,8 @@
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/AppTheme.NoActionBar">
+        android:theme="@style/AppTheme.NoActionBar"
+        tools:ignore="GoogleAppIndexingWarning">
         <activity
             android:name=".screens.splashscreen.SplashScreenActivity"
             android:theme="@style/AppTheme.Launcher"
@@ -44,14 +47,9 @@
             android:name=".screens.main.home.stage.StageActivity"
             android:screenOrientation="userPortrait"/>
 
-
-        <receiver
-            android:name=".ConnectivityReceiver"
-            android:enabled="true">
-            <intent-filter>
-                <action android:name="android.net.conn.CONNECTIVITY_CHANGE" />
-            </intent-filter>
-        </receiver>
+        <meta-data
+            android:name="io.fabric.ApiKey"
+            android:value="@string/api_key" />
 
     </application>