Version 1.1.8

Author: PerrigoGames

README.md

@@ -5,7 +5,7 @@ An Android application to easily browse, track and manage your LIFE4 Trials.
 
 ### Installation
 APKs can currently only be downloaded from GitHub.
-- Download the latest APK version [here](https://github.com/PerrigoGames/Life4DDR-Trials/releases/download/v0.4.5/Life4Trials_0_4_5.apk).
+- Download the latest APK version [here](https://github.com/PerrigoGames/Life4DDR-Trials/releases/download/v1.0.0/Life4Trials_1_0_0.apk).
 - Ensure you have "Unknown sources" checked in Settings/Security.
 - Run the APK file to install.
 - Supports Android version 4.1 and higher

app/build.gradle

@@ -16,13 +16,13 @@ ext {
 android {
     signingConfigs {
         upload {
-            storeFile file('C:\\Users\\Corey\\Development\\keystores\\upload-keystore.jks')
+            storeFile file('../../../keystores/upload-keystore.jks')
             keyPassword 'FlOnG9T#0sNe41bXjKtVJi75Y'
             storePassword 'Ndb%TJQfsJ5c8%qLHP4QEG%Y@'
             keyAlias = 'upload'
         }
         debug {
-            storeFile file('C:\\Users\\Corey\\Development\\keystores\\debug-keystore.jks')
+            storeFile file('../../../keystores/debug-keystore.jks')
             keyPassword '9RA8qJW#hT^gI@T3UW0k$L3@W#'
             storePassword '!R35qX!&$P6wuEOI%lm6y&lAyq'
             keyAlias = 'debug'
@@ -33,8 +33,8 @@ android {
         applicationId "com.perrigogames.life4trials"
         minSdkVersion 16
         targetSdkVersion 28
-        versionCode 9
-        versionName "0.4.5"
+        versionCode 22
+        versionName "1.1.8"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         multiDexEnabled true
         signingConfig signingConfigs.upload
@@ -79,14 +79,14 @@ dependencies {
     implementation 'androidx.core:core-ktx:1.1.0-alpha05'
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
     implementation 'com.google.android.material:material:1.1.0-alpha06'
-    implementation 'com.google.firebase:firebase-core:16.0.9'
 
     implementation 'com.github.bumptech.glide:glide:4.9.0'
     implementation 'org.greenrobot:eventbus:3.1.1'
     implementation 'com.karumi:dexter:5.0.0'
 
     // Firebase
     implementation 'com.google.firebase:firebase-core:16.0.9'
+    implementation 'com.google.firebase:firebase-messaging:19.0.0'
     implementation 'com.crashlytics.sdk.android:crashlytics:2.10.0'
 
     // Retrofit2
@@ -117,6 +117,7 @@ dependencies {
     implementation "com.google.dagger:dagger-android-support:$dagger2_version"
     implementation 'androidx.lifecycle:lifecycle-extensions:2.0.0'
     implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.0.0'
+    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
     kapt "com.google.dagger:dagger-compiler:$dagger2_version"
     kapt "com.google.dagger:dagger-android-processor:$dagger2_version"
 

app/objectbox-models/default.json

@@ -75,9 +75,29 @@
         }
       ],
       "relations": []
+    },
+    {
+      "id": "3:5121322014264730323",
+      "lastPropertyId": "3:6482824092841661256",
+      "name": "GoalStatusDB",
+      "properties": [
+        {
+          "id": "1:1411004893783989070",
+          "name": "goalId"
+        },
+        {
+          "id": "2:8351987538112467256",
+          "name": "date"
+        },
+        {
+          "id": "3:6482824092841661256",
+          "name": "status"
+        }
+      ],
+      "relations": []
     }
   ],
-  "lastEntityId": "2:5753770248500082315",
+  "lastEntityId": "3:5121322014264730323",
   "lastIndexId": "1:5226183221815835245",
   "lastRelationId": "0:0",
   "lastSequenceId": "0:0",

app/src/debug/google-services.json

@@ -20,17 +20,22 @@
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
         tools:ignore="AllowBackup">
-        <activity android:name=".RankDetailsActivity"></activity>
-        <activity android:name=".activity.Life4DescriptionActivity" />
+
+        <meta-data
+            android:name="com.google.firebase.messaging.default_notification_channel_id"
+            android:value="ID_UPDATES_CHANNEL" />
+
+        <activity
+            android:name=".activity.FirstRunActivity"
+            android:theme="@style/AppTheme.NoActionBar"/>
         <activity
-            android:name=".activity.TrialsListActivity"
+            android:name=".activity.TrialListActivity"
             android:label="@string/app_name"
             android:screenOrientation="portrait"
-            android:theme="@style/AppTheme.NoActionBar">
+            android:theme="@style/AppTheme.Launcher">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <action android:name="android.intent.action.VIEW" />
-
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
@@ -45,9 +50,6 @@
             android:name=".activity.TrialSubmissionActivity"
             android:label="@string/confirm_trial_title"
             android:screenOrientation="portrait" />
-        <activity
-            android:name=".activity.GoogleDriveActivity"
-            android:screenOrientation="portrait" />
         <activity
             android:name=".activity.TrialRecordsActivity"
             android:label="@string/title_activity_records" />
@@ -57,8 +59,23 @@
         <activity
             android:name=".activity.SettingsActivity"
             android:label="@string/title_activity_settings" />
+        <activity
+            android:name=".activity.RankDetailsActivity"/>
+        <activity
+            android:name=".activity.Life4DescriptionActivity" />
+        <activity
+            android:name=".activity.PlacementDetailsActivity" />
+
+        <service
+            android:name=".api.Life4FirebaseMessagingService"
+            android:exported="false">
+            <intent-filter>
+                <action android:name="com.google.firebase.MESSAGING_EVENT" />
+            </intent-filter>
+        </service>
 
-        <receiver android:name=".util.NotificationCopyHandler"
+        <receiver
+            android:name=".util.NotificationCopyHandler"
             android:enabled="true">
             <intent-filter>
                 <action android:name="ACTION_COPY_CLIPBOARD"/>

app/src/main/AndroidManifest.xml

@@ -2,53 +2,53 @@ package com.perrigogames.life4trials
 
 import android.content.Context
 import androidx.multidex.MultiDexApplication
-import com.jakewharton.retrofit2.adapter.kotlin.coroutines.CoroutineCallAdapterFactory
-import com.perrigogames.life4trials.data.LadderRankData
+import com.perrigogames.life4trials.api.FirebaseUtil
 import com.perrigogames.life4trials.db.MyObjectBox
+import com.perrigogames.life4trials.manager.LadderManager
 import com.perrigogames.life4trials.manager.PlacementManager
 import com.perrigogames.life4trials.manager.TrialManager
-import com.perrigogames.life4trials.util.DataUtil
 import com.perrigogames.life4trials.util.NotificationUtil
-import com.perrigogames.life4trials.util.SharedPrefsUtils
-import com.perrigogames.life4trials.util.loadRawString
+import com.perrigogames.life4trials.util.SharedPrefsUtil
+import com.perrigogames.life4trials.util.SharedPrefsUtil.KEY_APP_CRASHED
 import io.objectbox.BoxStore
-import okhttp3.OkHttpClient
 import org.greenrobot.eventbus.EventBus
-import retrofit2.Retrofit
-import retrofit2.converter.gson.GsonConverterFactory
 
 class Life4Application: MultiDexApplication() {
 
-    lateinit var ladderRankData: LadderRankData
+    lateinit var ladderManager: LadderManager
     lateinit var placementManager: PlacementManager
     lateinit var trialManager: TrialManager
 
     override fun onCreate() {
         super.onCreate()
-        SharedPrefsUtils.initializeDefaults(this)
 
-        placementManager = PlacementManager(this)
-        trialManager = TrialManager(this)
-        ladderRankData = DataUtil.gson.fromJson(loadRawString(R.raw.ranks), LadderRankData::class.java)!!
+        val defaultHandler = Thread.getDefaultUncaughtExceptionHandler()
+        Thread.setDefaultUncaughtExceptionHandler { thread, exception ->
+            SharedPrefsUtil.setUserFlag(this@Life4Application, KEY_APP_CRASHED, true)
+            defaultHandler!!.uncaughtException(thread, exception)
+        }
+
+        SharedPrefsUtil.initializeDefaults(this)
 
         objectBox = MyObjectBox.builder()
             .androidContext(this)
             .build()
 
+        placementManager = PlacementManager(this)
+        trialManager = TrialManager(this)
+        ladderManager = LadderManager(this)
+
         NotificationUtil.setupNotifications(this)
+
+        if (BuildConfig.DEBUG) {
+            FirebaseUtil.getId(this)
+        }
     }
 
     companion object {
         val eventBus = EventBus()
 
         lateinit var objectBox: BoxStore
-
-        fun retrofit() : Retrofit = Retrofit.Builder()
-            .client(OkHttpClient().newBuilder().build())
-            .baseUrl("https://www.googleapis.com/drive/v2/")
-            .addConverterFactory(GsonConverterFactory.create())
-            .addCallAdapterFactory(CoroutineCallAdapterFactory())
-            .build()
     }
 }
 

app/src/main/java/com/perrigogames/life4trials/Life4Application.kt

@@ -0,0 +1,43 @@
+package com.perrigogames.life4trials.activity
+
+import android.os.Bundle
+import android.view.View
+import androidx.annotation.IdRes
+import androidx.appcompat.app.AppCompatActivity
+import com.perrigogames.life4trials.R
+import kotlinx.android.synthetic.main.activity_first_run.*
+
+/**
+ * A simple [Activity] intended to be shown when there is no user data and an initial rank needs to be established.
+ */
+class FirstRunActivity : AppCompatActivity() {
+
+    private var selectedOption: Int? = null
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_first_run)
+    }
+
+    fun onOptionSelected(v: View) {
+        if (selectedOption == null) {
+            return
+        }
+        selectedOption = v.id
+        when(selectedOption) {
+            R.id.text_option_new -> animateResponse(R.id.text_response_new)
+        R.id.text_option_familiar -> animateResponse(R.id.text_response_familiar)
+        R.id.text_option_login -> animateResponse(R.id.text_response_login)
+    }
+}
+
+fun animateResponse(@IdRes responseId: Int) {
+    listOf(text_option_new, text_option_familiar, text_option_login,
+            text_response_new, text_response_familiar, text_response_login).forEach {
+
+            if (it.id != responseId) {
+                it.visibility = View.GONE
+            }
+        }
+    }
+}