Just release 2.0 already

Who cares that the patch notes are too long

Author: 19lmyers

CREDITS.MD

@@ -14,6 +14,9 @@ https://developer.android.com/topic/libraries/support-library/
 ### Material About Library
 https://github.com/daniel-stoneuk/material-about-library
 
+### AboutLibraries
+https://github.com/mikepenz/AboutLibraries
+
 ### OpenCSV
 http://opencsv.sourceforge.net
 

LICENSE.MD

@@ -1,6 +1,6 @@
-The MIT License
+MIT License
 
-Copyright (c) 2016-2017 Luke Myers (FRC Team 980 ThunderBots)
+Copyright (c) 2016 - 2018 Luke Myers (FRC Team 980 ThunderBots)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.MD

@@ -1,19 +1,6 @@
-# ThunderScout: Scout with power [![Build Status](https://travis-ci.org/Team980/ThunderScout-Android.svg?branch=master)](https://travis-ci.org/Team980/ThunderScout-Android)
+# ThunderScout [![Build Status](https://travis-ci.org/Team980/ThunderScout-Android.svg?branch=master)](https://travis-ci.org/Team980/ThunderScout-Android)
 
-ThunderScout is an app for FIRST Robotics Competition teams to facilitate the scouting process at competition events. Created by FRC Team 980 Thunderbots, ThunderScout is made to help you get your job done, simpler and faster.
+ThunderScout is designed by FRC Team 980 ThunderBots to help you scout matches quickly and powerfully.
+With an intuitively designed scouting flow, robust configuration framework, and intelligent data presentation, ThunderScout can adapt to fit any team's needs.
 
-## Designed from the beginning for the user experience
-From the scouting process to post-match analysis, ThunderScout has been designed with the end user experience as a top priority. 
-The development process has integrated user testing and feedback into the design process to guarantee that the interface is simple and easy to understand, and the app's quantatative, objective, and detailed dataset gives you all the information you need to make your decisions.
-
-## Adjustable to fit any scouting team
-ThunderScout is robust, modular, and makes no assumptions. It can be configured to suit a wide array of hardware configurations, and data transfer can be scheduled automatically or be triggered at will. With this many different options for configuration, you'll definitely be able to build a scouting system that's a perfect fit for your team.
-
-## Integrates with third party services
-ThunderScout has been built from the ground up to seamlessly integrate with third-party services. You can instantly export your data to a CSV file that you can send to your computer and view in whatever program you like,  whether it's a spreadsheet viewer, cutting-edge data visualization software, or a custom application built by your team. Integration with multiple online services is also included - with Google Sheets synchronization in development and other integrations soon to follow, ThunderScout will give you all the tools you need to get your data where it needs to go.
-
-## Built with the community in mind
-Since the very beginning ThunderScout has been developed with the community at the forefront. An open beta on Chief Delphi, the leading FRC community forum, enabled interested participants to engage with the app early in its development, and feedback was swiftly turned into feature additions and improvements for the following releases. The source code has been publicly available on GitHub since its inception, and contributions to further the capabilities of the app are always welcome. ThunderScout was installed on over a hundred devices during the beta period alone- so why not yours?
-
-## Get the app
-ThunderScout is now available to download on [GitHub](https://github.com/Team980/ThunderScout-Android/releases), [Google Play](https://play.google.com/store/apps/details?id=com.team980.thunderscout), and the [Amazon Appstore](https://www.amazon.com/gp/mas/dl/android?p=com.team980.thunderscout).
+ThunderScout is available to download on [GitHub](https://github.com/Team980/ThunderScout-Android/releases), [Google Play](https://play.google.com/store/apps/details?id=com.team980.thunderscout), and the [Amazon Appstore](https://www.amazon.com/gp/mas/dl/android?p=com.team980.thunderscout).

app/build.gradle

@@ -40,8 +40,8 @@ android {
         minSdkVersion 16
         targetSdkVersion 27
         multiDexEnabled true
-        versionCode 15 //Next public release: 15
-        versionName "2.0-pre" //2018 will be when I make the semantic change
+        versionCode 15 //Next public release: 16
+        versionName "2.0" //The 2018 dataset will be when I make the semantic change
         resConfigs "en"
     }
 

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

@@ -127,11 +127,12 @@ public void onCreate() { //This isn't why loading is slow
 
         if (BuildConfig.DEBUG) {
             //Disable Firebase Analytics on debug builds
+            FirebaseAnalytics.getInstance(this).setAnalyticsCollectionEnabled(false);
 
             //Init, but disable, Crashlytics on debug builds
             Crashlytics crashlyticsKit = new Crashlytics.Builder()
                     .core(new CrashlyticsCore.Builder()
-                            .disabled(BuildConfig.DEBUG).build())
+                            .disabled(true).build())
                     .build();
             Fabric.with(this, crashlyticsKit);
         } else {
@@ -162,7 +163,7 @@ public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, Strin
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
                 TileService.requestListeningState(this, new ComponentName(this, BluetoothQuickTileService.class));
             }
-        } else if (key.equals(getResources().getString(R.string.pref_enable_analytics))) {
+        } else if (key.equals(getResources().getString(R.string.pref_enable_analytics)) && !BuildConfig.DEBUG) {
             FirebaseAnalytics.getInstance(this).setAnalyticsCollectionEnabled(sharedPreferences.getBoolean(getResources().getString(R.string.pref_enable_analytics), true));
         }
     }

app/src/main/java/com/team980/thunderscout/analytics/matches/MatchesFragment.java

@@ -24,7 +24,6 @@
 
 package com.team980.thunderscout.analytics.matches;
 
-import android.bluetooth.BluetoothAdapter;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.DialogInterface;
@@ -219,16 +218,6 @@ public boolean onOptionsItemSelected(MenuItem item) {
         }
 
         if (id == R.id.action_bluetooth_transfer) {
-            if (!BluetoothAdapter.getDefaultAdapter().isEnabled()) {
-                new AlertDialog.Builder(getContext())
-                        .setTitle("Bluetooth is disabled")
-                        .setIcon(R.drawable.ic_warning_white_24dp)
-                        .setMessage("Please enable Bluetooth and try again")
-                        .setPositiveButton("OK", null)
-                        .create()
-                        .show();
-            }
-
             BluetoothDeviceManager bdm = new BluetoothDeviceManager(getContext());
             bdm.pickDevice(device -> {
                 if (device == null) {

app/src/main/java/com/team980/thunderscout/analytics/rankings/RankingsFragment.java

@@ -24,7 +24,6 @@
 
 package com.team980.thunderscout.analytics.rankings;
 
-import android.bluetooth.BluetoothAdapter;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.DialogInterface;
@@ -301,16 +300,6 @@ public boolean onOptionsItemSelected(MenuItem item) {
         }
 
         if (id == R.id.action_bluetooth_transfer) {
-            if (!BluetoothAdapter.getDefaultAdapter().isEnabled()) {
-                new AlertDialog.Builder(getContext())
-                        .setTitle("Bluetooth is disabled")
-                        .setIcon(R.drawable.ic_warning_white_24dp)
-                        .setMessage("Please enable Bluetooth and try again")
-                        .setPositiveButton("OK", null)
-                        .create()
-                        .show();
-            }
-
             BluetoothDeviceManager bdm = new BluetoothDeviceManager(getContext());
             bdm.pickDevice(device -> {
                 if (device == null) {

app/src/main/java/com/team980/thunderscout/home/HomeFragment.java

@@ -251,6 +251,7 @@ public void refreshFixedCards() {
                 intent.putExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT, SettingsActivity.GeneralPreferenceFragment.class.getName());
                 startActivity(intent);
                 adapter.dismissCard(card);
+                sharedPrefs.edit().putBoolean(getResources().getString(R.string.pref_shown_telemetry_card), true).apply();
             }));
             telemetryCard.addAction(new CardAction("Dismiss", (card, action) -> {
                 int index = adapter.indexOf(card);

app/src/main/java/com/team980/thunderscout/preferences/SettingsActivity.java

@@ -39,6 +39,7 @@
 import android.support.v7.preference.PreferenceManager;
 import android.view.MenuItem;
 
+import com.team980.thunderscout.BuildConfig;
 import com.team980.thunderscout.R;
 
 public class SettingsActivity extends AppCompatActivity {
@@ -205,6 +206,12 @@ public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
             activity.getSupportActionBar().setTitle("General settings");
 
             bindPreferenceSummaryToValue(findPreference(getResources().getString(R.string.pref_device_name)));
+
+            if (BuildConfig.DEBUG) { //Disable analytics on debug builds
+                findPreference(getResources().getString(R.string.pref_enable_analytics)).setEnabled(false);
+                findPreference(getResources().getString(R.string.pref_enable_crashlytics)).setEnabled(false);
+                //findPreference(getResources().getString(R.string.pref_enable_performance_monitoring)).setEnabled(false);
+            }
         }
     }