Adding a team to a list from within the Picks activity now moves a te…

…am instead of adding as new
widavies · Apr 19, 2018 · e2ae035 · e2ae035
1 parent 19028a9
commit e2ae035
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 4 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -27,7 +27,7 @@ android {
         applicationId "com.cpjd.roblu"
         minSdkVersion 19
         targetSdkVersion 27
-        versionCode 64
+        versionCode 65
         versionName "4.5.7"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
 

diff --git a/app/src/main/java/com/cpjd/roblu/ui/pickList/PickListFragment.java b/app/src/main/java/com/cpjd/roblu/ui/pickList/PickListFragment.java
@@ -123,6 +123,7 @@ public void teamSelected(View v) {
         startView.putExtra("teamID", team.getID());
         startView.putExtra("eventID", event.getID());
         startView.putExtra("editable", true);
+        startView.putExtra("originalList", position);
         startActivityForResult(startView, Constants.GENERAL);
     }
 

diff --git a/app/src/main/java/com/cpjd/roblu/ui/team/TeamViewer.java b/app/src/main/java/com/cpjd/roblu/ui/team/TeamViewer.java
@@ -393,7 +393,7 @@ public boolean onMenuItemClick(MenuItem item) {
                 }
                 if(item.getItemId() == R.id.add_to_picks) {
                     // Show dialog
-                    Utils.launchListPicker(TeamViewer.this, event.getID(), team);
+                    Utils.launchListPicker(TeamViewer.this, event.getID(), team, getIntent().getIntExtra("originalList", -1));
                 }
                 return true;
             }

diff --git a/app/src/main/java/com/cpjd/roblu/utils/Utils.java b/app/src/main/java/com/cpjd/roblu/utils/Utils.java
@@ -44,6 +44,7 @@
 import com.cpjd.roblu.models.metrics.RStopwatch;
 import com.cpjd.roblu.models.metrics.RTextfield;
 import com.cpjd.roblu.ui.events.EventDrawerManager;
+import com.cpjd.roblu.ui.pickList.PickList;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
@@ -282,14 +283,14 @@ public void onClick(View v) {
         return true;
     }
 
-    public static boolean launchListPicker(final Context context, final int eventID, final RTeam team) {
+    public static boolean launchListPicker(final Context context, final int eventID, final RTeam team, final int originalListPosition) {
         final Dialog d = new Dialog(context);
         d.setTitle("Pick event:");
         d.setContentView(R.layout.add_to_list_dialog);
         final Spinner spinner = d.findViewById(R.id.type);
         String[] values;
 
-        final RPickLists lists = new IO(context).loadPickLists(eventID);
+        final RPickLists lists = PickList.pickLists;
         if(lists == null || lists.getPickLists() == null || lists.getPickLists().size() == 0) {
             Toast.makeText(context, "No lists found", Toast.LENGTH_LONG).show();
             return false;
@@ -307,6 +308,18 @@ public static boolean launchListPicker(final Context context, final int eventID,
         button.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
+                /*
+                 * Remove the team from the list it was originally on
+                 */
+                if(originalListPosition != -1) {
+                    for(int i = 0; i < PickList.pickLists.getPickLists().get(originalListPosition).getTeamIDs().size(); i++) {
+                        if(PickList.pickLists.getPickLists().get(originalListPosition).getTeamIDs().get(i) == team.getID()) {
+                            PickList.pickLists.getPickLists().get(originalListPosition).getTeamIDs().remove(i);
+                            break;
+                        }
+                    }
+                }
+
                 lists.getPickLists().get(spinner.getSelectedItemPosition()).getTeamIDs().add(team.getID());
                 new IO(context).savePickLists(eventID, lists);
                 Toast.makeText(context, team.getName()+" was saved to pick list "+lists.getPickLists().get(spinner.getSelectedItemPosition()).getTitle(), Toast.LENGTH_LONG).show();