diff --git a/scoutingapp/src/main/java/org/usfirst/frc/team25/scouting/data/thebluealliance/DataDownloader.java b/scoutingapp/src/main/java/org/usfirst/frc/team25/scouting/data/thebluealliance/DataDownloader.java index fa85cea..cda9aaf 100644 --- a/scoutingapp/src/main/java/org/usfirst/frc/team25/scouting/data/thebluealliance/DataDownloader.java +++ b/scoutingapp/src/main/java/org/usfirst/frc/team25/scouting/data/thebluealliance/DataDownloader.java @@ -83,7 +83,7 @@ protected String doInBackground(Void... voids) { return "Invalid Blue Alliance API key"; } - if (!eventCode.equals("")) { + if (!eventCode.isEmpty()) { try { FileManager.saveFile(scoreBreakdownFilePath, getEventMatchData(eventCode), c); @@ -93,7 +93,7 @@ protected String doInBackground(Void... voids) { String teamList = getTeamList(eventCode); - if (teamList.equals("")) { + if (teamList.isEmpty()) { return "Event data not found on The Blue Alliance"; } else { FileManager.saveFile(teamListFilePath, teamList, c); @@ -101,7 +101,7 @@ protected String doInBackground(Void... voids) { String matchList = getMatchList(eventCode); - if (matchList.equals("")) { + if (matchList.isEmpty()) { return "Only team list downloaded"; } else { FileManager.saveFile(matchListFilePath, matchList, c); @@ -160,9 +160,11 @@ private String getMatchList(String eventCode) throws IOException { matchList.append(match.getBlueAlliance().getTeamKeys()[j].split("frc")[1]).append(","); } } - matchList.append(",\n"); + } + matchList.append("\n"); + } @@ -181,7 +183,7 @@ protected void onPostExecute(String message) { super.onPostExecute(message); // Display response message, if any - if (!message.equals("")) { + if (!message.isEmpty()) { Toast.makeText(c, message, Toast.LENGTH_SHORT).show(); } } diff --git a/scoutingapp/src/main/res/layout/activity_menu.xml b/scoutingapp/src/main/res/layout/activity_menu.xml index ac7ad33..74bb2bc 100644 --- a/scoutingapp/src/main/res/layout/activity_menu.xml +++ b/scoutingapp/src/main/res/layout/activity_menu.xml @@ -163,24 +163,32 @@ android:layout_above="@+id/current_info_label" android:layout_below="@id/settings" android:layout_centerHorizontal="true" - android:layout_marginTop="60dp"> - - + android:layout_marginTop="60dp"> - + + + + + + diff --git a/scoutingapp/src/main/res/values/strings.xml b/scoutingapp/src/main/res/values/strings.xml index 5ca2d34..19cd80e 100644 --- a/scoutingapp/src/main/res/values/strings.xml +++ b/scoutingapp/src/main/res/values/strings.xml @@ -11,7 +11,7 @@ note that there is no trailing zero for the patch version. Tags on GitHub follow the same scheme, except the letter "v" is appended to the version number. Version 1.0 was created for the 2017 FRC season (FIRST Steamworks).--> - v3.1 + v3.11 Deep Space Cheatsheet.pdf