Add issue to dialog logic

app/src/main/java/com/github/mobile/core/milestone/AddIssueTask.java

@@ -0,0 +1,112 @@
+/*
+ * Copyright 2012 GitHub Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.github.mobile.core.milestone;
+
+import android.accounts.Account;
+
+import com.github.mobile.R;
+import com.github.mobile.api.model.Issue;
+import com.github.mobile.api.service.IssueService;
+import com.github.mobile.api.service.MilestoneService;
+import com.github.mobile.core.issue.IssueStore;
+import com.github.mobile.ui.DialogFragmentActivity;
+import com.github.mobile.ui.ProgressDialogTask;
+import com.github.mobile.ui.milestone.IssueDialog;
+import com.google.inject.Inject;
+
+import org.eclipse.egit.github.core.IRepositoryIdProvider;
+import org.eclipse.egit.github.core.Milestone;
+
+import static com.github.mobile.RequestCodes.ISSUE_MILESTONE_UPDATE;
+
+/**
+ * Task to add an issue to a milestone
+ */
+public class AddIssueTask extends ProgressDialogTask<com.github.mobile.api.model.Milestone> {
+
+    @Inject
+    private IssueService service;
+
+    @Inject
+    private MilestoneService milestoneService;
+
+    @Inject
+    private IssueStore store;
+
+    private final IssueDialog issueDialog;
+
+    private final IRepositoryIdProvider repositoryId;
+
+    private int issueNumber;
+
+    private final int milestoneNumber;
+
+    /**
+     * Create task to add an issue to a milestone
+     *
+     * @param activity
+     * @param repositoryId
+     * @param milestoneNumber
+     */
+    public AddIssueTask(final DialogFragmentActivity activity,
+                        final IRepositoryIdProvider repositoryId, final int milestoneNumber) {
+        super(activity);
+
+        this.repositoryId = repositoryId;
+        this.milestoneNumber = milestoneNumber;
+        issueDialog = new IssueDialog(activity, ISSUE_MILESTONE_UPDATE,
+                repositoryId, service);
+    }
+
+    @Override
+    protected com.github.mobile.api.model.Milestone run(Account account) throws Exception {
+        org.eclipse.egit.github.core.Issue editedIssue = new org.eclipse.egit.github.core.Issue();
+        editedIssue.setNumber(issueNumber);
+        editedIssue.setMilestone(new Milestone().setNumber(milestoneNumber));
+        store.editIssue(repositoryId, editedIssue);
+        String[] rep = repositoryId.generateId().split("/");
+        return milestoneService.getMilestone(rep[0], rep[1], milestoneNumber).execute().body();
+    }
+
+    /**
+     * Prompt for issue selection
+     *
+     * @return this task
+     */
+    public AddIssueTask prompt() {
+        issueDialog.show();
+        return this;
+    }
+
+    /**
+     * Add issue to the milestone
+     *
+     * @param issue
+     * @return this task
+     */
+    public AddIssueTask edit(Issue issue) {
+        if (issue != null)
+            issueNumber = issue.number;
+        else
+            issueNumber = -1;
+
+        showIndeterminate(R.string.updating_milestone);
+
+        super.execute();
+
+        return this;
+    }
+}

app/src/main/java/com/github/mobile/ui/milestone/MilestoneViewActivity.java

@@ -9,10 +9,14 @@
 
 import com.github.mobile.Intents;
 import com.github.mobile.R;
+import com.github.mobile.api.model.Issue;
 import com.github.mobile.api.model.Milestone;
+import com.github.mobile.api.service.IssueService;
 import com.github.mobile.core.issue.IssueFilter;
+import com.github.mobile.core.milestone.AddIssueTask;
 import com.github.mobile.ui.DialogFragmentActivity;
 import com.github.mobile.ui.issue.IssuesFragment;
+import com.google.inject.Inject;
 
 import org.eclipse.egit.github.core.Repository;
 import org.eclipse.egit.github.core.User;
@@ -23,6 +27,7 @@
 import static com.github.mobile.Intents.EXTRA_REPOSITORY_NAME;
 import static com.github.mobile.Intents.EXTRA_REPOSITORY_OWNER;
 import static com.github.mobile.Intents.EXTRA_USER;
+import static com.github.mobile.RequestCodes.ISSUE_MILESTONE_UPDATE;
 import static com.github.mobile.RequestCodes.MILESTONE_EDIT;
 
 /**
@@ -43,6 +48,12 @@ public static Intent createIntent(Repository repository, Milestone milestone, in
 
     private Repository repository;
     private Milestone milestone;
+    private IssueDialog issueDialog;
+
+    private AddIssueTask issueTask;
+
+    @Inject
+    private IssueService issueService;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -58,6 +69,8 @@ protected void onCreate(Bundle savedInstanceState) {
         actionBar.setSubtitle(R.string.milestone);
         actionBar.setDisplayHomeAsUpEnabled(true);
 
+        DialogFragmentActivity dialogActivity = (DialogFragmentActivity) this;
+
         MilestoneFragment milestoneFragment = new MilestoneFragment();
 
         Bundle args = new Bundle();
@@ -82,6 +95,21 @@ protected void onCreate(Bundle savedInstanceState) {
         transaction.add(R.id.ms_issues, issuesFragment);
 
         transaction.commit();
+
+        issueTask = new AddIssueTask(dialogActivity, repository,
+                milestone.number) {
+
+            @Override
+            protected void onSuccess(Milestone editedMilestone) throws Exception {
+                super.onSuccess(editedMilestone);
+                IssuesFragment issuesFragment = new IssuesFragment();
+                FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
+                transaction.replace(R.id.ms_issues, issuesFragment);
+                transaction.commit();
+                milestone = editedMilestone;
+                updateMilestone();
+            }
+        };
     }
 
     @Override
@@ -91,7 +119,7 @@ public boolean onOptionsItemSelected(MenuItem item) {
                 finish();
                 return true;
             case R.id.add_ms_menu_item:
-                //todo add issues to milestone
+                issueTask.prompt();
                 return true;
             case R.id.m_edit: {
                 Intent intent = EditMilestoneActivity.createIntent(milestone, repository,
@@ -121,6 +149,19 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         }
     }
 
+    @Override
+    public void onDialogResult(int requestCode, int resultCode, Bundle arguments) {
+        if (RESULT_OK != resultCode)
+            return;
+
+        switch (requestCode) {
+            case ISSUE_MILESTONE_UPDATE:
+                Issue issue = IssueDialogFragment.getSelected(arguments);
+                issueTask.edit(issue);
+                break;
+        }
+    }
+
     private void updateMilestone() {
         if(milestone != null) {
             MilestoneFragment milestoneFragment = new MilestoneFragment();
@@ -142,7 +183,7 @@ private void updateMilestone() {
 
             FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
 
-            transaction.add(R.id.ms_description, milestoneFragment);
+            transaction.replace(R.id.ms_description, milestoneFragment);
             transaction.commit();
         }
     }