2019.1 Release

- fix themes on older devices
- remove analytics plugins completely

app/build.gradle

@@ -39,8 +39,8 @@ android {
         minSdkVersion 16
         targetSdkVersion 28
         multiDexEnabled true
-        versionCode 18 //Next public release: 19
-        versionName "2019.1-rc"
+        versionCode 19 //Next public release: 20
+        versionName "2019.1"
         resConfigs "en"
     }
 
@@ -55,8 +55,6 @@ android {
         debug {
             versionNameSuffix '-' + getDate() //Append build timestamp to version for debug builds
 
-            ext.enableCrashlytics = false //Disable Crashlytics mapping on debug builds
-
             //ONLY FOR TESTING - SLOWS DOWN BUILD TIME
             //minifyEnabled true
             //useProguard true
@@ -119,6 +117,4 @@ static def getDate() {
     def df = new SimpleDateFormat("yyyy-MM-dd-HH:mm:ss")
     df.setTimeZone(TimeZone.getTimeZone("UTC"))
     return df.format(new Date())
-}
-
-apply plugin: 'com.google.gms.google-services'
+}

app/src/main/java/com/team980/thunderscout/MainActivity.java

@@ -203,11 +203,11 @@ private void updateAccountHeader() {
 
         ImageView image = navigationView.getHeaderView(0).findViewById(R.id.account_image);
 
-        image.setImageDrawable(AppCompatResources.getDrawable(this, R.drawable.ic_account_circle_72dp)); //TODO better image
+        image.setImageDrawable(AppCompatResources.getDrawable(this, R.drawable.ic_app_badge_48dp));
 
         ((TextView) navigationView.getHeaderView(0).findViewById(R.id.account_name)).setText(sharedPrefs
                 .getString(getResources().getString(R.string.pref_device_name), Build.MANUFACTURER + " " + Build.MODEL));
-        ((TextView) navigationView.getHeaderView(0).findViewById(R.id.account_id)).setText("Local storage");
+        ((TextView) navigationView.getHeaderView(0).findViewById(R.id.account_id)).setText(BuildConfig.VERSION_NAME);
     }
 
     public interface BackPressListener {

app/src/main/java/com/team980/thunderscout/analytics/TeamComparator.java

@@ -62,7 +62,7 @@ public int compare(TeamWrapper o1, TeamWrapper o2) {
         }
     },
 
-    SORT_STORM_ROCKET_HATCH_AVERAGE("Avg. storm Rocket hatches") {
+    SORT_STORM_ROCKET_HATCH_AVERAGE("Avg. Storm Rocket hatches") {
         public int compare(TeamWrapper o1, TeamWrapper o2) {
             return Double.compare(ScoutDataStatistics.getAverage(o1.getDataList(), ScoutData::getStormHighRocketHatchCount)
                             + ScoutDataStatistics.getAverage(o1.getDataList(), ScoutData::getStormMidRocketHatchCount)
@@ -73,14 +73,14 @@ public int compare(TeamWrapper o1, TeamWrapper o2) {
         }
     },
 
-    SORT_STORM_CARGO_SHIP_HATCH_AVERAGE("Avg. storm Cargo Ship hatches") {
+    SORT_STORM_CARGO_SHIP_HATCH_AVERAGE("Avg. Storm Cargo Ship hatches") {
         public int compare(TeamWrapper o1, TeamWrapper o2) {
             return Double.compare(ScoutDataStatistics.getAverage(o1.getDataList(), ScoutData::getStormCargoShipHatchCount),
                     ScoutDataStatistics.getAverage(o2.getDataList(), ScoutData::getStormCargoShipHatchCount));
         }
     },
 
-    SORT_STORM_ROCKET_CARGO_AVERAGE("Avg. storm Rocket cargo") {
+    SORT_STORM_ROCKET_CARGO_AVERAGE("Avg. Storm Rocket cargo") {
         public int compare(TeamWrapper o1, TeamWrapper o2) {
             return Double.compare(ScoutDataStatistics.getAverage(o1.getDataList(), ScoutData::getStormHighRocketCargoCount)
                             + ScoutDataStatistics.getAverage(o1.getDataList(), ScoutData::getStormMidRocketCargoCount)
@@ -91,14 +91,14 @@ public int compare(TeamWrapper o1, TeamWrapper o2) {
         }
     },
 
-    SORT_STORM_CARGO_SHIP_CARGO_AVERAGE("Avg. storm Cargo Ship cargo") {
+    SORT_STORM_CARGO_SHIP_CARGO_AVERAGE("Avg. Storm Cargo Ship cargo") {
         public int compare(TeamWrapper o1, TeamWrapper o2) {
             return Double.compare(ScoutDataStatistics.getAverage(o1.getDataList(), ScoutData::getStormCargoShipCargoCount),
                     ScoutDataStatistics.getAverage(o2.getDataList(), ScoutData::getStormCargoShipCargoCount));
         }
     },
 
-    SORT_TELEOP_ROCKET_HATCH_AVERAGE("Avg. teleop Rocket hatches") {
+    SORT_TELEOP_ROCKET_HATCH_AVERAGE("Avg. Teleop Rocket hatches") {
         public int compare(TeamWrapper o1, TeamWrapper o2) {
             return Double.compare(ScoutDataStatistics.getAverage(o1.getDataList(), ScoutData::getTeleopHighRocketHatchCount)
                             + ScoutDataStatistics.getAverage(o1.getDataList(), ScoutData::getTeleopMidRocketHatchCount)
@@ -109,14 +109,14 @@ public int compare(TeamWrapper o1, TeamWrapper o2) {
         }
     },
 
-    SORT_TELEOP_CARGO_SHIP_HATCH_AVERAGE("Avg. teleop Cargo Ship hatches") {
+    SORT_TELEOP_CARGO_SHIP_HATCH_AVERAGE("Avg. Teleop Cargo Ship hatches") {
         public int compare(TeamWrapper o1, TeamWrapper o2) {
             return Double.compare(ScoutDataStatistics.getAverage(o1.getDataList(), ScoutData::getTeleopCargoShipHatchCount),
                     ScoutDataStatistics.getAverage(o2.getDataList(), ScoutData::getTeleopCargoShipHatchCount));
         }
     },
 
-    SORT_TELEOP_ROCKET_CARGO_AVERAGE("Avg. teleop Rocket cargo") {
+    SORT_TELEOP_ROCKET_CARGO_AVERAGE("Avg. Teleop Rocket cargo") {
         public int compare(TeamWrapper o1, TeamWrapper o2) {
             return Double.compare(ScoutDataStatistics.getAverage(o1.getDataList(), ScoutData::getTeleopHighRocketCargoCount)
                             + ScoutDataStatistics.getAverage(o1.getDataList(), ScoutData::getTeleopMidRocketCargoCount)
@@ -127,7 +127,7 @@ public int compare(TeamWrapper o1, TeamWrapper o2) {
         }
     },
 
-    SORT_TELEOP_CARGO_SHIP_CARGO_AVERAGE("Avg. teleop Cargo Ship cargo") {
+    SORT_TELEOP_CARGO_SHIP_CARGO_AVERAGE("Avg. Teleop Cargo Ship cargo") {
         public int compare(TeamWrapper o1, TeamWrapper o2) {
             return Double.compare(ScoutDataStatistics.getAverage(o1.getDataList(), ScoutData::getTeleopCargoShipCargoCount),
                     ScoutDataStatistics.getAverage(o2.getDataList(), ScoutData::getTeleopCargoShipCargoCount));