ThunderScout 2018.2-beta1

ThunderCloud, plus one

app/build.gradle

@@ -40,8 +40,8 @@ android {
         minSdkVersion 16
         targetSdkVersion 27
         multiDexEnabled true
-        versionCode 16 //Next public release: 17
-        versionName "2018.1"
+        versionCode 17 //Next public release: 18
+        versionName "2018.2-beta1"
         resConfigs "en"
     }
 
@@ -71,16 +71,14 @@ android {
     }
 }
 
-dependencies {
+dependencies { //TODO use the ${thingy}
     implementation fileTree(include: ['*.jar'], dir: 'libs')
 
-    def firebaseVersion = '11.8.0'
-    def supportVersion = '27.1.0'
+    def firebaseVersion = '15.0.0'
+    def supportVersion = '27.1.1'
 
     //Firebase Crashlytics
-    implementation('com.crashlytics.sdk.android:crashlytics:2.9.1@aar') {
-        transitive = true
-    }
+    implementation 'com.crashlytics.sdk.android:crashlytics:2.9.1'
 
     //Firebase
     implementation 'com.google.firebase:firebase-auth:' + firebaseVersion
@@ -90,7 +88,7 @@ dependencies {
     implementation 'com.google.android.gms:play-services-auth:' + firebaseVersion
 
     //FirebaseUI
-    implementation 'com.firebaseui:firebase-ui-auth:3.2.2'
+    implementation 'com.firebaseui:firebase-ui-auth:3.3.0'
 
     //Android Support
     implementation 'com.android.support:support-v4:' + supportVersion
@@ -104,22 +102,20 @@ dependencies {
 
     implementation 'com.android.support:preference-v14:' + supportVersion
 
+    implementation 'com.android.support:support-annotations:' + supportVersion
     implementation 'com.android.support:support-vector-drawable:' + supportVersion
     implementation 'com.android.support:design:' + supportVersion
     implementation 'com.android.support:customtabs:' + supportVersion
-    implementation 'com.android.support.constraint:constraint-layout:1.0.2'
+    implementation 'com.android.support.constraint:constraint-layout:1.1.0'
 
     implementation 'com.android.support:multidex:1.0.3'
 
     //Material About, Library Info
     implementation 'com.github.daniel-stoneuk:material-about-library:2.2.4'
-    //Weird version system
-    implementation('com.mikepenz:aboutlibraries:6.0.6@aar') {
-        transitive = true
-    }
+    implementation 'com.mikepenz:aboutlibraries:6.0.8'
 
     //Glide (image loading)
-    implementation ("com.github.bumptech.glide:glide:4.6.1") {
+    implementation ("com.github.bumptech.glide:glide:4.7.1") {
         exclude group: "com.android.support"
     }
 

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

@@ -24,6 +24,7 @@
 
 package com.team980.thunderscout.preferences;
 
+import android.app.FragmentTransaction;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Build;
@@ -166,7 +167,7 @@ public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
 
                     HeaderPreferenceFragment.this.getFragmentManager().beginTransaction()
                             .replace(android.R.id.content, fragment)
-                            //.setTransition(FragmentTransaction.TRANSIT_FRAGMENT_FADE) //this mimics how some Google apps do it
+                            .setTransition(FragmentTransaction.TRANSIT_FRAGMENT_FADE) //this mimics how some Google apps do it
                             .addToBackStack(preference.getFragment())
                             .commit();
 

app/src/main/res/values/colors.xml

@@ -23,8 +23,8 @@
   -->
 
 <resources>
-    <color name="primary">#78909C</color>
-    <color name="primary_dark">#546E7A</color>
+    <color name="primary">#78909C</color> <!-- TODO #222 -->
+    <color name="primary_dark">#546E7A</color> <!-- TODO #111 -->
 
     <color name="secondary">#757575</color>
     <color name="secondary_dark">#424242</color>

app/src/main/res/values/strings.xml

@@ -39,20 +39,30 @@
         \nYou can opt out of telemetry in the app settings.
     </string>
 
-    <!--- TODO Last update: v16 -->
+    <!--- TODO Last update: v17 -->
     <string name="update_notes">
-        ThunderScout 2018.1 now supports 2018\'s FIRST POWER UP, as well as improving the stability since the previous release.
+        Introducing ThunderCloud! With ThunderCloud, your data gains an additional home on Google\'s Firebase cloud servers.
+        \nSigning in with an email or Google account allows you to store data online, separately from what\'s already saved on your local device.
+        \nThis data can then be viewed on other devices signed in to ThunderScout with this account.
         \n
-        \nIn 2018, it\'s all about Power Cubes, and the scouting flow has been updated to match.
-        \nThe backend that provides for statistical calculations has also been updated, which will allow more types of statistics to be added in a future release.
-    </string>
+        \nThunderCloud is still in its infancy, and much of its design is not final - so your feedback would be very much appreciated!
+        \n
+        \n(Oh, and the team info screen now incorporates individual match tabs.)
+        \n
+        \nTechnical note: ThunderCloud is being in a separate branch from the rest of the app, and may change significantly or disappear in subsequent releases.
+        </string>
 
-    <!--- TODO remove before flight -->
-    <string name="thundercloud_disclaimer">ThunderCloud is currently in beta. No guarantees are made as to the preservation of your data.
-        \n\nIt is recommenced to use ThunderCloud while online. Offline caching has not been tested, and may not work as intended.
-        \n\nA server wipe is not expected until after the Houston Championship. Make sure to backup your data locally during and after the event.
-        \n\nThunderCloud is not guaranteed to ship with the 2018.2 release, and may change significantly in future releases.
-        \n\nFor more information, please contact the developer at [email protected].</string>
+    <!--- TODO remove before flight (stable) -->
+    <string name="thundercloud_disclaimer">
+        ThunderCloud is currently in beta. No guarantees are made as to the preservation of your data.
+        \n
+        \nIt is recommenced to use ThunderCloud while online. Offline caching has not been tested, and may not work as intended.
+        \n
+        \nA server wipe is not expected until after the Houston Championship. Make sure to backup your data locally during and after the event.
+        \n
+        \nThunderCloud is not guaranteed to ship with the 2018.2 release, and may change significantly in future releases.
+        \n
+        \nFor more information, please contact the developer at [email protected].</string>
 
     <string-array name="alliance_stations_array">
         <item>Red 1</item>

build.gradle

@@ -37,7 +37,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.1'
+        classpath 'com.android.tools.build:gradle:3.1.1'
         classpath 'io.fabric.tools:gradle:1.25.1'
         classpath 'com.google.gms:google-services:3.1.1'
         // NOTE: Do not place your application dependencies here; they belong

gradle/wrapper/gradle-wrapper.properties

@@ -21,8 +21,10 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
+
+#Sat Apr 14 18:33:09 PDT 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip