Added view of milestone

jonan · Jan 1, 2018 · 01ed3cc · 01ed3cc
1 parent ee9cd86
commit 01ed3cc
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 44 deletions.
diff --git a/app/src/main/java/com/github/mobile/ui/milestone/EditMilestoneActivity.java b/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.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.Milestone;
 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;
@@ -188,8 +184,7 @@ public void onClick(View v) {
         ActionBar actionBar = getSupportActionBar();
         actionBar.setDisplayHomeAsUpEnabled(true);
         if (milestone.getNumber() > 0)
-            actionBar.setTitle(getString(R.string.milestone)
-                    + milestone.getNumber());
+            actionBar.setTitle(milestone.getTitle());
         else
             actionBar.setTitle(R.string.new_milestone);
         actionBar.setSubtitle(repository.generateId());
@@ -231,7 +226,15 @@ private void updateMilestone() {
             descriptionText.setText(milestone.getDescription());
             Date dueOn = milestone.getDueOn();
             if (dueOn != null) {
-                dateText.setText(dueOn.toString());
+                SimpleDateFormat sd = new SimpleDateFormat("dd-MM-yyyy");
+                try {
+                    Date date = sd.parse(dueOn.toString());
+                    dateText.setText(date.toString());
+                }
+                catch (ParseException e){
+                    e.printStackTrace(); //todo fix the unparseable date
+                    dateText.setText(dueOn.toString());
+                }
             } else {
                 dateText.setText("");
             }
@@ -271,13 +274,7 @@ 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());
@@ -290,7 +287,21 @@ public boolean onOptionsItemSelected(MenuItem item) {
                 catch (ParseException e){
                     e.printStackTrace();
                 }
-                //todo run EditMilestoneTask
+
+//                new EditMilestoneTask(this, repository.getOwner(), repository, 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);

diff --git a/app/src/main/java/com/github/mobile/ui/milestone/MilestoneFragment.java b/app/src/main/java/com/github/mobile/ui/milestone/MilestoneFragment.java
@@ -1,7 +1,6 @@
 package com.github.mobile.ui.milestone;
 
 import android.content.Context;
-import android.content.Intent;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.Menu;
@@ -16,15 +15,11 @@
 import com.github.mobile.ui.DialogFragment;
 
 import org.eclipse.egit.github.core.Milestone;
-import org.eclipse.egit.github.core.RepositoryId;
 
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 
 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;
-import static com.github.mobile.RequestCodes.MILESTONE_EDIT;
 
 public class MilestoneFragment extends DialogFragment {
     private Milestone milestone;
@@ -35,8 +30,6 @@ public class MilestoneFragment extends DialogFragment {
     private ProgressBar milestoneProgress;
     private TextView milestoneProgressPercentage;
 
-    private RepositoryId repositoryId;
-
     @Override
     public void onAttach(Context context) {
         super.onAttach(context);
@@ -53,11 +46,6 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-
-        Bundle args = getArguments();
-        repositoryId = RepositoryId.create(
-                args.getString(EXTRA_REPOSITORY_OWNER),
-                args.getString(EXTRA_REPOSITORY_NAME));
     }
 
     @Override
@@ -82,13 +70,6 @@ public void onActivityCreated(Bundle savedInstanceState) {
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         switch (item.getItemId()) {
-            case R.id.m_edit:
-                if (milestone != null) {
-                    Intent intent = EditMilestoneActivity.createIntent(milestone,
-                            repositoryId.getOwner(), repositoryId.getName());
-                    startActivityForResult(intent, MILESTONE_EDIT);
-                }
-                return true;
             default:
                 return super.onOptionsItemSelected(item);
         }
@@ -97,13 +78,6 @@ public boolean onOptionsItemSelected(MenuItem item) {
     @Override
     public void onCreateOptionsMenu(Menu optionsMenu, MenuInflater inflater) {
         inflater.inflate(R.menu.milestone_view, optionsMenu);
-        MenuItem editItem = optionsMenu.findItem(R.id.m_edit);
-        if (editItem != null) {
-            boolean canEdit = false;
-            if (milestone != null)
-                canEdit = true;
-            editItem.setVisible(canEdit);
-        }
     }
 
     private void updateMilestone(final Milestone milestone){

diff --git a/app/src/main/java/com/github/mobile/ui/milestone/MilestoneViewActivity.java b/app/src/main/java/com/github/mobile/ui/milestone/MilestoneViewActivity.java
@@ -23,6 +23,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.MILESTONE_EDIT;
 
 
 public class MilestoneViewActivity extends DialogFragmentActivity {
@@ -89,14 +90,21 @@ public boolean onOptionsItemSelected(MenuItem item) {
                 return true;
             case R.id.add_ms_menu_item:
                 //todo add issues to milestone
+                return true;
+            case R.id.m_edit: {
+                Intent intent = EditMilestoneActivity.createIntent(milestone,
+                        repository.getOwner().getLogin(), repository.getName());
+                startActivityForResult(intent, MILESTONE_EDIT);
+                return true;
+            }
             default:
                 return super.onOptionsItemSelected(item);
         }
     }
 
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
-        getMenuInflater().inflate(R.menu.milestone, menu);
+        getMenuInflater().inflate(R.menu.milestone_view, menu);
         return true;
     }
 }
diff --git a/app/src/main/res/menu/milestone_view.xml b/app/src/main/res/menu/milestone_view.xml
@@ -17,6 +17,12 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
+    <item
+        android:id="@+id/add_ms_menu_item"
+        android:icon="@drawable/ic_add_white_24dp"
+        app:showAsAction="always">
+    </item>
+
     <item
         android:id="@+id/m_edit"
         android:title="@string/edit"