Skip to content

Commit

Permalink
Opening create milestone page by plus
Browse files Browse the repository at this point in the history
  • Loading branch information
@arepina
arepina committed Dec 17, 2017
1 parent 970e2d0 commit f7ba846
Show file tree
Hide file tree
Showing 4 changed files with 153 additions and 114 deletions.
42 changes: 36 additions & 6 deletions app/src/main/java/com/github/mobile/ui/milestone/EditMilestoneActivity.java
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package com.github.mobile.ui.milestone;


import android.accounts.Account;
import android.content.Intent;
import android.support.v7.app.ActionBar;
import android.os.Bundle;
Expand All @@ -17,15 +18,20 @@
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.ui.DialogFragmentActivity;
import com.github.mobile.ui.TextWatcherAdapter;
import com.github.mobile.ui.issue.AssigneeDialog;
import com.github.mobile.ui.issue.EditIssueActivity;
import com.github.mobile.ui.issue.LabelsDialog;
import com.github.mobile.ui.issue.MilestoneDialog;
import com.github.mobile.util.AvatarLoader;
import com.google.inject.Inject;

import org.eclipse.egit.github.core.Issue;
import org.eclipse.egit.github.core.Repository;
import org.eclipse.egit.github.core.RepositoryId;
import org.eclipse.egit.github.core.service.CollaboratorService;
import org.eclipse.egit.github.core.service.LabelService;
Expand All @@ -42,14 +48,15 @@
*/
public class EditMilestoneActivity extends DialogFragmentActivity {


/**
* Create intent to create a milestone
* Create intent for this activity
*
* @param issue
* @param repository
* @return intent
*/
public static Intent createIntent(Issue issue) {
return createIntent(null, issue);
public static Intent createIntent(Repository repository) {
return new Intents.Builder("repo.milestones.edit.VIEW").repo(repository).toIntent();
}


Expand Down Expand Up @@ -120,7 +127,7 @@ protected void onCreate(Bundle savedInstanceState) {
monthButton = finder.find(R.id.b_month);
clearText = finder.find(R.id.tv_clear);

//todo checkCollaboratorStatus();?
checkCollaboratorStatus();

Intent intent = getIntent();

Expand Down Expand Up @@ -223,6 +230,29 @@ public boolean onOptionsItemSelected(MenuItem item) {
}

private void checkCollaboratorStatus() {
//todo
new AuthenticatedUserTask<Boolean>(this) {

@Override
public Boolean run(Account account) throws Exception {
return collaboratorService.isCollaborator(
repository, AccountUtils.getLogin(EditMilestoneActivity.this));
}

@Override
protected void onSuccess(Boolean isCollaborator) throws Exception {
super.onSuccess(isCollaborator);

showMainContent();
if (isCollaborator)
showCollaboratorOptions();
}

@Override
protected void onException(Exception e) throws RuntimeException {
super.onException(e);

showMainContent();
}
}.execute();
}
}
9 changes: 7 additions & 2 deletions app/src/main/java/com/github/mobile/ui/repo/RepositoryMilestonesActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,11 @@

import com.github.mobile.Intents;
import com.github.mobile.R;
import com.github.mobile.api.model.Milestone;
import com.github.mobile.ui.DialogFragmentActivity;
import com.github.mobile.ui.milestone.EditMilestoneActivity;

import org.eclipse.egit.github.core.Issue;
import org.eclipse.egit.github.core.Repository;

/**
Expand Down Expand Up @@ -71,8 +74,10 @@ public boolean onOptionsItemSelected(MenuItem item) {
startActivity(intent);
return true;
case R.id.add_ms_menu_item:
//todo change on opening of milestone_create_page
Toast.makeText(this, "open milestone", Toast.LENGTH_SHORT).show();
//creating new milestone
Intent i = EditMilestoneActivity.createIntent(repository);
i.addFlags(FLAG_ACTIVITY_CLEAR_TOP | FLAG_ACTIVITY_SINGLE_TOP);
startActivity(i);
return true;
default:
return super.onOptionsItemSelected(item);
Expand Down
192 changes: 98 additions & 94 deletions app/src/main/res/layout/milestone_edit.xml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
Copyright 2012 GitHub Inc.
Licensed under the Apache License, Version 2.0 (the "License");
Expand Down Expand Up @@ -37,112 +36,117 @@
android:layout_below="@id/toolbar"
android:visibility="gone">

<TextView
android:id="@+id/tv_milestone_title"
style="@style/HeaderTitleText"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_alignParentStart="true"
android:layout_below="@+id/toolbar"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:layout_marginTop="10dp"
android:text="@string/title" />


<EditText
android:id="@+id/et_milestone_title"
style="@style/FormalSingleLineEditText"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/tv_milestone_title"
android:layout_marginTop="10dp"
android:layout_alignStart="@+id/tv_milestone_title"
android:layout_alignEnd="@+id/tv_milestone_title"
android:text="@string/title"/>

<TextView
android:id="@+id/tv_milestone_description"
style="@style/HeaderTitleText"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/et_milestone_title"
android:layout_marginTop="10dp"
android:layout_alignStart="@+id/tv_milestone_title"
android:layout_alignEnd="@+id/tv_milestone_title"
android:text="@string/description"/>

<EditText
android:id="@+id/et_milestone_description"
style="@style/FormalSingleLineEditText"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/tv_milestone_description"
android:layout_marginTop="10dp"
android:layout_alignStart="@+id/et_milestone_title"
android:layout_alignEnd="@+id/et_milestone_title"
android:text="@string/description" />

<LinearLayout
android:id="@+id/ll_textviews"
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignEnd="@+id/et_milestone_description"
android:layout_alignStart="@+id/et_milestone_description"
android:layout_below="@+id/et_milestone_description"
android:layout_marginTop="10dp">
android:layout_height="wrap_content">

<TextView
android:id="@+id/tv_milestone_date"
android:id="@+id/tv_milestone_title"
style="@style/HeaderTitleText"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="Date:" />
android:layout_alignParentEnd="true"
android:layout_alignParentStart="true"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:layout_marginTop="10dp"
android:text="@string/title" />

<TextView
android:id="@+id/tv_clear"

<EditText
android:id="@+id/et_milestone_title"
style="@style/FormalSingleLineEditText"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
android:text="@string/clear" />

</LinearLayout>
android:layout_alignEnd="@+id/tv_milestone_title"
android:layout_alignStart="@+id/tv_milestone_title"
android:layout_below="@+id/tv_milestone_title"
android:layout_marginTop="10dp"
android:text="@string/title" />

<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/ll_textviews"
android:layout_alignStart="@+id/ll_textviews"
android:layout_alignEnd="@+id/ll_textviews"
android:layout_marginTop="10dp"
android:id="@+id/ll_buttons">

<Button
android:id="@+id/b_two_weeks"
<TextView
android:id="@+id/tv_milestone_description"
style="@style/HeaderTitleText"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignEnd="@+id/tv_milestone_title"
android:layout_alignStart="@+id/tv_milestone_title"
android:layout_below="@+id/et_milestone_title"
android:layout_marginTop="10dp"
android:text="@string/description" />

<EditText
android:id="@+id/et_milestone_description"
style="@style/FormalSingleLineEditText"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="2 weeks" />
android:layout_alignEnd="@+id/et_milestone_title"
android:layout_alignStart="@+id/et_milestone_title"
android:layout_below="@+id/tv_milestone_description"
android:layout_marginTop="10dp"
android:text="@string/description" />

<LinearLayout
android:id="@+id/ll_textviews"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignEnd="@+id/et_milestone_description"
android:layout_alignStart="@+id/et_milestone_description"
android:layout_below="@+id/et_milestone_description"
android:layout_marginTop="10dp">

<TextView
android:id="@+id/tv_milestone_date"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="Date:" />

<TextView
android:id="@+id/tv_clear"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
android:text="@string/clear" />

</LinearLayout>

<LinearLayout
android:id="@+id/ll_buttons"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignEnd="@+id/ll_textviews"
android:layout_alignStart="@+id/ll_textviews"
android:layout_below="@+id/ll_textviews"
android:layout_marginTop="10dp">

<Button
android:id="@+id/b_two_weeks"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="2 weeks" />

<Button
android:id="@+id/b_month"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="month" />

</LinearLayout>

<Button
android:id="@+id/b_month"
android:id="@+id/b_choose_date"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="month" />

</LinearLayout>

<Button
android:id="@+id/b_choose_date"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignStart="@+id/ll_buttons"
android:layout_below="@+id/ll_buttons"
android:layout_marginTop="15dp"
android:text="Choose date"
android:layout_alignEnd="@+id/ll_buttons" />
android:layout_alignEnd="@+id/ll_buttons"
android:layout_alignStart="@+id/ll_buttons"
android:layout_below="@+id/ll_buttons"
android:layout_marginTop="15dp"
android:text="Choose date" />

</RelativeLayout>
</ScrollView>
</RelativeLayout>
24 changes: 12 additions & 12 deletions app/src/main/res/layout/milestone_item.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,43 +20,43 @@
android:orientation="horizontal">

<LinearLayout
android:layout_width="match_parent"
android:id="@+id/ll_milestone_issues"
android:layout_width="100dp"
android:layout_height="match_parent"
android:layout_toLeftOf="@id/ll_milestone_issues"
android:layout_alignParentRight="true"
android:orientation="vertical">

<TextView
android:id="@+id/tv_milestone_title"
style="@style/ListTitleText"
android:paddingBottom="0dp"
android:id="@+id/tv_milestone_opened_iss_number"
style="@style/ListSubtitleText"
android:paddingLeft="10dp"
android:singleLine="true"
android:textStyle="normal" />

<TextView
android:id="@+id/tv_milestone_due_to"
android:id="@+id/tv_milestone_closed_iss_number"
style="@style/ListSubtitleText"
android:paddingLeft="10dp"
android:singleLine="true"
android:textStyle="normal" />
</LinearLayout>

<LinearLayout
android:id="@+id/ll_milestone_issues"
android:layout_width="100dp"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_alignParentRight="true"
android:layout_toLeftOf="@id/ll_milestone_issues"
android:orientation="vertical">

<TextView
android:id="@+id/tv_milestone_opened_iss_number"
style="@style/ListSubtitleText"
android:id="@+id/tv_milestone_title"
style="@style/ListTitleText"
android:paddingBottom="0dp"
android:paddingLeft="10dp"
android:singleLine="true"
android:textStyle="normal" />

<TextView
android:id="@+id/tv_milestone_closed_iss_number"
android:id="@+id/tv_milestone_due_to"
style="@style/ListSubtitleText"
android:paddingLeft="10dp"
android:singleLine="true"
Expand Down

0 comments on commit f7ba846

Please sign in to comment.