diff --git a/app/build.gradle b/app/build.gradle
index a3637072..9f9d94c0 100644
--- a/app/build.gradle
+++ b/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'
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/team980/thunderscout/MainActivity.java b/app/src/main/java/com/team980/thunderscout/MainActivity.java
index 56a67309..8e82cce0 100644
--- a/app/src/main/java/com/team980/thunderscout/MainActivity.java
+++ b/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 {
diff --git a/app/src/main/java/com/team980/thunderscout/analytics/TeamComparator.java b/app/src/main/java/com/team980/thunderscout/analytics/TeamComparator.java
index 42fd12d7..a381f331 100644
--- a/app/src/main/java/com/team980/thunderscout/analytics/TeamComparator.java
+++ b/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));
diff --git a/app/src/main/res/font/allerta.xml b/app/src/main/res/font/allerta.xml
deleted file mode 100644
index 99452b1f..00000000
--- a/app/src/main/res/font/allerta.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
-
\ No newline at end of file
diff --git a/app/src/main/res/font/allerta_stencil.xml b/app/src/main/res/font/allerta_stencil.xml
deleted file mode 100644
index 51ad1008..00000000
--- a/app/src/main/res/font/allerta_stencil.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
-
\ No newline at end of file
diff --git a/app/src/main/res/font/libre_franklin_semibold.xml b/app/src/main/res/font/libre_franklin_semibold.xml
deleted file mode 100644
index a870fc47..00000000
--- a/app/src/main/res/font/libre_franklin_semibold.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-
-
diff --git a/app/src/main/res/font/montserrat.xml b/app/src/main/res/font/montserrat.xml
deleted file mode 100644
index 453bd066..00000000
--- a/app/src/main/res/font/montserrat.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
-
\ No newline at end of file
diff --git a/app/src/main/res/font/oswald.xml b/app/src/main/res/font/oswald.xml
deleted file mode 100644
index 6c7a5f48..00000000
--- a/app/src/main/res/font/oswald.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
-
\ No newline at end of file
diff --git a/app/src/main/res/font/roboto.xml b/app/src/main/res/font/roboto.xml
deleted file mode 100644
index db6fbbc5..00000000
--- a/app/src/main/res/font/roboto.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
-
\ No newline at end of file
diff --git a/app/src/main/res/font/roboto_mono.xml b/app/src/main/res/font/roboto_mono.xml
deleted file mode 100644
index b3964c36..00000000
--- a/app/src/main/res/font/roboto_mono.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
-
\ No newline at end of file
diff --git a/app/src/main/res/font/source_sans_pro.xml b/app/src/main/res/font/source_sans_pro.xml
deleted file mode 100644
index 9408d9cb..00000000
--- a/app/src/main/res/font/source_sans_pro.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
-
\ No newline at end of file
diff --git a/app/src/main/res/font/sunflower.xml b/app/src/main/res/font/sunflower.xml
deleted file mode 100644
index b33fcc13..00000000
--- a/app/src/main/res/font/sunflower.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
-
\ No newline at end of file
diff --git a/app/src/main/res/layout/nav_header.xml b/app/src/main/res/layout/nav_header.xml
index c364b8fd..c9f6f456 100644
--- a/app/src/main/res/layout/nav_header.xml
+++ b/app/src/main/res/layout/nav_header.xml
@@ -44,7 +44,7 @@
android:layout_width="72dp"
android:layout_height="72dp"
android:layout_marginTop="24dp"
- android:src="@drawable/ic_account_circle_72dp" />
+ android:src="@drawable/ic_app_badge_48dp" />
-
+
+ #fafafa
+
+ @color/background
+ #32000000
+
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 686c7b0b..42d7d387 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -45,10 +45,9 @@
#EEEEEE
#FFFFFF
- #fafafa
+ #212121
- @color/background
- #32000000
+ @color/black
#ffffffff
#ff000000
diff --git a/app/src/main/res/values/preloaded_fonts.xml b/app/src/main/res/values/preloaded_fonts.xml
index f0399de8..bd994c27 100644
--- a/app/src/main/res/values/preloaded_fonts.xml
+++ b/app/src/main/res/values/preloaded_fonts.xml
@@ -24,16 +24,6 @@
- - @font/allerta
- - @font/allerta_stencil
- @font/arimo
- - @font/libre_franklin_bold
- - @font/libre_franklin_semibold
- - @font/montserrat
- - @font/oswald
- - @font/roboto
- - @font/roboto_mono
- - @font/source_sans_pro
- - @font/sunflower
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 4a2d8b8b..9191d876 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -31,13 +31,10 @@
\nTo get started, configure your device in the app settings, or dive in and scout your first match!
-
+
ThunderScout 2019.1 adds support for the 2019 game, DESTINATION: DEEP SPACE.
\nThe app also sports a new coat of paint (including a light theme, for the one person who wanted one).
- \n
- \nNote: Telemetry and ThunderCloud have been removed from the 2019 release.
- \nI don\'t have anything to share about this now, but I will share more information about the future of ThunderScout post-2019 at a later date.
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index a0dec7b1..907bb7fa 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -45,8 +45,7 @@
- @style/ThunderScout.AlertDialog
- @style/ThunderScout.AlertDialog
- - @color/navigation_bar
-
+ - @color/navigation_bar
-
@color/navigation_bar_divider
@@ -72,7 +71,7 @@
- @style/ThunderScout.AlertDialog
- @style/ThunderScout.AlertDialog
- - @color/navigation_bar
+
- @color/navigation_bar
-
@color/navigation_bar_divider
@@ -101,7 +100,7 @@
- @style/ThunderScout.AlertDialog
- @style/ThunderScout.AlertDialog
- - @color/navigation_bar
+
- @color/navigation_bar
-
@color/navigation_bar_divider
@@ -122,7 +121,7 @@
- @style/ThunderScout.AlertDialog
- @style/ThunderScout.AlertDialog
- - @color/navigation_bar
+
- @color/navigation_bar
-
@color/navigation_bar_divider
@@ -141,7 +140,7 @@
- @style/ThunderScout.AlertDialog
- @style/ThunderScout.AlertDialog
- - @color/navigation_bar
+
- @color/navigation_bar
-
@color/navigation_bar_divider
@@ -167,7 +166,7 @@
- @color/splash_background
- @drawable/splash_background
- -
+
-
@color/splash_background
-
diff --git a/build.gradle b/build.gradle
index c76c4e45..1a87bf7d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -35,7 +35,6 @@ buildscript {
}
dependencies {
classpath 'com.android.tools.build:gradle:3.3.2'
- classpath 'com.google.gms:google-services:4.2.0'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
}