Merge branch 'master' into milestone_view

app/src/main/java/com/github/mobile/Intents.java

@@ -18,6 +18,7 @@
 import static org.eclipse.egit.github.core.RepositoryId.createFromUrl;
 import android.content.Intent;
 
+import com.github.mobile.api.model.Milestone;
 import com.github.mobile.api.model.Project;
 import com.github.mobile.api.model.Team;
 
@@ -27,7 +28,6 @@
 import org.eclipse.egit.github.core.Gist;
 import org.eclipse.egit.github.core.GistFile;
 import org.eclipse.egit.github.core.Issue;
-import org.eclipse.egit.github.core.Milestone;
 import org.eclipse.egit.github.core.Repository;
 import org.eclipse.egit.github.core.RepositoryId;
 import org.eclipse.egit.github.core.User;

app/src/main/java/com/github/mobile/RequestCodes.java

@@ -114,4 +114,9 @@ public interface RequestCodes {
      * Request to view milestone
      */
     int MILESTONE_VIEW = 16;
+
+    /**
+     * Request to edit milestone
+     */
+    int MILESTONE_EDIT = 17;
 }

app/src/main/java/com/github/mobile/api/model/Milestone.java

@@ -15,9 +15,10 @@
  */
 package com.github.mobile.api.model;
 
+import java.io.Serializable;
 import java.util.Date;
 
-public class Milestone {
+public class Milestone implements Serializable {
     public long id;
 
     public int number;
@@ -41,4 +42,43 @@ public class Milestone {
     public Date closed_at;
 
     public Date due_on;
+
+    private String url;
+
+    public Milestone() {
+    }
+
+    public Milestone(org.eclipse.egit.github.core.Milestone milestone) {
+        //todo this.id=?
+        //there are two variants of id usage
+        //1)id is like an id in Issues, but it is in old Issues class too - the remove field
+        //2)id is like an serialVersionUID - then generate it using "serialver -classpath . Milestone" in terminal
+        this.number = milestone.getNumber();
+        this.state = milestone.getState();
+        this.title = milestone.getTitle();
+        this.description = milestone.getDescription();
+        this.creator = new User(milestone.getCreator());
+        this.open_issues = milestone.getOpenIssues();
+        this.closed_issues = milestone.getClosedIssues();
+        this.created_at = milestone.getCreatedAt();
+        this.url = milestone.getUrl();
+        //todo this.updated_at=???
+        this.due_on = milestone.getDueOn();
+    }
+
+    public org.eclipse.egit.github.core.Milestone getOldModel() {
+        org.eclipse.egit.github.core.Milestone milestone = new org.eclipse.egit.github.core.Milestone();
+        milestone.setCreatedAt(created_at);
+        milestone.setDueOn(due_on);
+        milestone.setClosedIssues(closed_issues);
+        milestone.setNumber(number);
+        milestone.setOpenIssues(open_issues);
+        milestone.setDescription(description);
+        milestone.setState(state);
+        milestone.setTitle(title);
+        milestone.setUrl(url);
+        milestone.setCreator(creator.getOldModel());
+
+        return milestone;
+    }
 }

app/src/main/java/com/github/mobile/core/issue/IssueFilter.java

@@ -15,6 +15,8 @@
  */
 package com.github.mobile.core.issue;
 
+import com.github.mobile.api.model.Milestone;
+
 import static java.lang.String.CASE_INSENSITIVE_ORDER;
 import static org.eclipse.egit.github.core.service.IssueService.DIRECTION_DESCENDING;
 import static org.eclipse.egit.github.core.service.IssueService.FIELD_DIRECTION;
@@ -39,7 +41,6 @@
 import java.util.TreeSet;
 
 import org.eclipse.egit.github.core.Label;
-import org.eclipse.egit.github.core.Milestone;
 import org.eclipse.egit.github.core.Repository;
 import org.eclipse.egit.github.core.User;
 
@@ -185,7 +186,7 @@ public Map<String, String> toFilterMap() {
 
         if (milestone != null)
             filter.put(FILTER_MILESTONE,
-                    Integer.toString(milestone.getNumber()));
+                    Integer.toString(milestone.number));
 
         if (labels != null && !labels.isEmpty()) {
             StringBuilder labelsQuery = new StringBuilder();
@@ -217,7 +218,7 @@ public CharSequence toDisplay() {
             segments.add("Assignee: " + assignee.getLogin());
 
         if (milestone != null)
-            segments.add("Milestone: " + milestone.getTitle());
+            segments.add("Milestone: " + milestone.title);
 
         if (labels != null && !labels.isEmpty()) {
             StringBuilder builder = new StringBuilder("Labels: ");
@@ -243,7 +244,7 @@ public CharSequence toDisplay() {
     public int hashCode() {
         return Arrays.hashCode(new Object[] { open,
                 assignee != null ? assignee.getId() : null,
-                milestone != null ? milestone.getNumber() : null,
+                milestone != null ? milestone.number : null,
                 assignee != null ? assignee.getId() : null,
                 repository != null ? repository.getId() : null, labels });
     }
@@ -257,7 +258,7 @@ private boolean isEqual(Object a, Object b) {
     private boolean isEqual(Milestone a, Milestone b) {
         if (a == null && b == null)
             return true;
-        return a != null && b != null && a.getNumber() == b.getNumber();
+        return a != null && b != null && a.number == b.number;
     }
 
     private boolean isEqual(User a, User b) {

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

@@ -59,7 +59,7 @@ public EditMilestoneTask(final Activity activity,
      *
      * @return this task
      */
-    public EditMilestoneTask create() {
+    public EditMilestoneTask edit() {
         showIndeterminate(R.string.updating_milestone);
 
         execute();

app/src/main/java/com/github/mobile/ui/issue/EditIssuesFilterActivity.java

@@ -145,7 +145,7 @@ public void onClick(View v) {
                     milestoneDialog = new MilestoneDialog(
                             EditIssuesFilterActivity.this, REQUEST_MILESTONE,
                             repository, milestones);
-                milestoneDialog.show(filter.getMilestone());
+                milestoneDialog.show(filter.getMilestone().getOldModel());
             }
         };
 
@@ -236,7 +236,7 @@ private void updateLabels() {
     }
 
     private void updateMilestone() {
-        Milestone selected = filter.getMilestone();
+        Milestone selected = filter.getMilestone().getOldModel();
         if (selected != null)
             milestoneText.setText(selected.getTitle());
         else
@@ -265,7 +265,7 @@ public void onDialogResult(int requestCode, int resultCode, Bundle arguments) {
             updateLabels();
             break;
         case REQUEST_MILESTONE:
-            filter.setMilestone(MilestoneDialogFragment.getSelected(arguments));
+            filter.setMilestone(new com.github.mobile.api.model.Milestone(MilestoneDialogFragment.getSelected(arguments)));
             updateMilestone();
             break;
         case REQUEST_ASSIGNEE:

app/src/main/java/com/github/mobile/ui/issue/FilterListAdapter.java

@@ -76,7 +76,7 @@ protected void update(int position, IssueFilter filter) {
         } else
             setGone(3, true);
 
-        Milestone milestone = filter.getMilestone();
+        Milestone milestone = filter.getMilestone().getOldModel();
         if (milestone != null)
             ViewUtils.setGone(setText(4, milestone.getTitle()), false);
         else

app/src/main/java/com/github/mobile/ui/issue/IssuesFragment.java

@@ -151,7 +151,7 @@ private void updateFilterSummary() {
         } else
             labels.setVisibility(GONE);
 
-        Milestone filterMilestone = filter.getMilestone();
+        Milestone filterMilestone = filter.getMilestone().getOldModel();
         if (filterMilestone != null) {
             milestone.setText(filterMilestone.getTitle());
             milestone.setVisibility(VISIBLE);

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

@@ -19,19 +19,17 @@
 import com.github.mobile.Intents;
 import com.github.mobile.R;
 
-import org.eclipse.egit.github.core.Milestone;
-
 import com.github.mobile.accounts.AccountUtils;
 import com.github.mobile.accounts.AuthenticatedUserTask;
+import com.github.mobile.api.model.Milestone;
+import com.github.mobile.core.milestone.EditMilestoneTask;
 import com.github.mobile.ui.DialogFragmentActivity;
 import com.github.mobile.ui.TextWatcherAdapter;
 import com.github.mobile.ui.issue.MilestoneDialog;
-import com.github.mobile.ui.repo.RepositoryViewActivity;
 import com.google.inject.Inject;
 
 import org.eclipse.egit.github.core.Repository;
 import org.eclipse.egit.github.core.RepositoryId;
-import org.eclipse.egit.github.core.User;
 import org.eclipse.egit.github.core.service.CollaboratorService;
 import org.eclipse.egit.github.core.service.MilestoneService;
 
@@ -40,8 +38,6 @@
 import java.util.Calendar;
 import java.util.Date;
 
-import static android.content.Intent.FLAG_ACTIVITY_CLEAR_TOP;
-import static android.content.Intent.FLAG_ACTIVITY_SINGLE_TOP;
 import static com.github.mobile.Intents.EXTRA_MILESTONE;
 import static com.github.mobile.Intents.EXTRA_REPOSITORY_NAME;
 import static com.github.mobile.Intents.EXTRA_REPOSITORY_OWNER;
@@ -125,7 +121,7 @@ public void onDateSet(DatePicker view, int year, int monthOfYear, int dayOfMonth
                         dateAndTime.set(Calendar.YEAR, year);
                         dateAndTime.set(Calendar.MONTH, monthOfYear);
                         dateAndTime.set(Calendar.DAY_OF_MONTH, dayOfMonth);
-                        SimpleDateFormat sd = new SimpleDateFormat("dd-MM-yyyy");
+                        SimpleDateFormat sd = new SimpleDateFormat(getApplicationContext().getString(R.string.ms_date_format));
                         final Date startDate = dateAndTime.getTime();
                         String fdate = sd.format(startDate);
                         dateText.setText(fdate);
@@ -144,7 +140,7 @@ public void onClick(View v) {
                 Calendar calendar = Calendar.getInstance();
                 calendar.setTime(dateOfOrder);
                 dateAndTime.add(Calendar.DAY_OF_YEAR, noOfDays);
-                SimpleDateFormat sd = new SimpleDateFormat("dd-MM-yyyy");
+                SimpleDateFormat sd = new SimpleDateFormat(getApplicationContext().getString(R.string.ms_date_format));
                 final Date startDate = dateAndTime.getTime();
                 String fdate = sd.format(startDate);
                 dateText.setText(fdate);
@@ -156,7 +152,7 @@ public void onClick(View v) {
             public void onClick(View v) {
                 final Calendar dateAndTime = Calendar.getInstance();
                 dateAndTime.add(Calendar.MONTH, 1);
-                SimpleDateFormat sd = new SimpleDateFormat("dd-MM-yyyy");
+                SimpleDateFormat sd = new SimpleDateFormat(getApplicationContext().getString(R.string.ms_date_format));
                 final Date startDate = dateAndTime.getTime();
                 String fdate = sd.format(startDate);
                 dateText.setText(fdate);
@@ -187,9 +183,8 @@ public void onClick(View v) {
 
         ActionBar actionBar = getSupportActionBar();
         actionBar.setDisplayHomeAsUpEnabled(true);
-        if (milestone.getNumber() > 0)
-            actionBar.setTitle(getString(R.string.milestone)
-                    + milestone.getNumber());
+        if (milestone.number > 0)
+            actionBar.setTitle(milestone.title);
         else
             actionBar.setTitle(R.string.new_milestone);
         actionBar.setSubtitle(repository.generateId());
@@ -203,8 +198,8 @@ public void afterTextChanged(Editable s) {
         });
 
         updateSaveMenu();
-        titleText.setText(milestone.getTitle());
-        descriptionText.setText(milestone.getDescription());
+        titleText.setText(milestone.title);
+        descriptionText.setText(milestone.description);
     }
 
     @Override
@@ -227,11 +222,12 @@ private void showCollaboratorOptions() {
 
     private void updateMilestone() {
         if (milestone != null) {
-            titleText.setText(milestone.getTitle());
-            descriptionText.setText(milestone.getDescription());
-            Date dueOn = milestone.getDueOn();
+            titleText.setText(milestone.title);
+            descriptionText.setText(milestone.description);
+            Date dueOn = milestone.due_on;
             if (dueOn != null) {
-                dateText.setText(dueOn.toString());
+                SimpleDateFormat sd = new SimpleDateFormat(getApplicationContext().getString(R.string.ms_date_format));
+                dateText.setText(sd.format(dueOn));
             } else {
                 dateText.setText("");
             }
@@ -271,26 +267,35 @@ public boolean onCreateOptionsMenu(Menu options) {
     public boolean onOptionsItemSelected(MenuItem item) {
         switch (item.getItemId()) {
             case android.R.id.home:
-                Repository repo = new Repository();
-                repo.setName(repository.getName());
-                repo.setOwner(new User().setLogin(repository.getOwner()));
-                Intent intent = RepositoryViewActivity.createIntent(repo);
-                intent.addFlags(FLAG_ACTIVITY_CLEAR_TOP
-                        | FLAG_ACTIVITY_SINGLE_TOP);
-                startActivity(intent);
+                finish();
                 return true;
             case R.id.m_apply:
-                milestone.setTitle(titleText.getText().toString());
-                milestone.setDescription(descriptionText.getText().toString());
-                SimpleDateFormat sd = new SimpleDateFormat("dd-MM-yyyy");
+                ActionBar actionBar = getSupportActionBar();
+                actionBar.setTitle(milestone.title);
+                milestone.title = titleText.getText().toString();
+                milestone.description = descriptionText.getText().toString();
+                SimpleDateFormat sd = new SimpleDateFormat(getApplicationContext().getString(R.string.ms_date_format));
                 try {
                     Date date = sd.parse(dateText.getText().toString());
-                    milestone.setDueOn(date);
-                }
-                catch (ParseException e){
+                    milestone.due_on = date;
+                } catch (ParseException e) {
                     e.printStackTrace();
                 }
-                //todo run EditMilestoneTask
+
+                new EditMilestoneTask(this, repository.getOwner(), repository.getName(), milestone) {
+
+                    @Override
+                    protected void onSuccess(Milestone editedMilestone)
+                            throws Exception {
+                        super.onSuccess(editedMilestone);
+
+                        Intent intent = new Intent();
+                        intent.putExtra(EXTRA_MILESTONE, editedMilestone);
+                        setResult(RESULT_OK, intent);
+                        finish();
+                    }
+                }.edit();
+
                 return true;
             default:
                 return super.onOptionsItemSelected(item);