Fix sort error

Team980 · Apr 15, 2018 · d9f5e09 · d9f5e09
1 parent 3ec19af
commit d9f5e09
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/.../java/com/team980/thunderscout/analytics/rankings/breakdown/TeamInfoViewPagerAdapter.java b/.../java/com/team980/thunderscout/analytics/rankings/breakdown/TeamInfoViewPagerAdapter.java
@@ -34,6 +34,7 @@
 
 import java.io.Serializable;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 public class TeamInfoViewPagerAdapter extends FragmentPagerAdapter {
@@ -47,6 +48,8 @@ public TeamInfoViewPagerAdapter(final FragmentManager fm, List<ScoutData> dataLi
         tabs = new ArrayList<>();
         matches = dataList;
 
+        Collections.sort(matches, (o1, o2) -> Integer.compare(o1.getMatchNumber(), o2.getMatchNumber()));
+
         TeamInfoFragment teamInfo = new TeamInfoFragment();
 
         Bundle args = new Bundle();

diff --git a/app/src/main/java/com/team980/thunderscout/preferences/AccountSettingsActivity.java b/app/src/main/java/com/team980/thunderscout/preferences/AccountSettingsActivity.java
@@ -57,7 +57,7 @@ protected void onCreate(Bundle savedInstanceState) {
 
         if (user == null) {
             super.onCreate(savedInstanceState);
-            //TODO show first run dialog
+            //TODO show first run dialog?
 
             startActivityForResult(AuthUI.getInstance()
                             .createSignInIntentBuilder()
@@ -73,11 +73,12 @@ protected void onCreate(Bundle savedInstanceState) {
         }
 
         setTheme(R.style.ThunderScout_BaseTheme_ActionBar);
-        getSupportActionBar().setDisplayHomeAsUpEnabled(true);
 
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_account_settings);
 
+        getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+
         TextView nameView = findViewById(R.id.name);
         nameView.setText(user.getDisplayName());