Skip to content

Commit

Permalink
Fix layout
Browse files Browse the repository at this point in the history
  • Loading branch information
@phansier
phansier committed Dec 17, 2017
1 parent e98304c commit a49d793
Show file tree
Hide file tree
Showing 2 changed files with 33 additions and 34 deletions.
8 changes: 3 additions & 5 deletions app/src/main/java/com/github/mobile/ui/milestone/EditMilestoneActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -170,8 +170,6 @@ public void onClick(View v) {
clear.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
titleText.setText("");
descriptionText.setText("");
dateText.setText("");
}
});
Expand All @@ -195,7 +193,7 @@ public void onClick(View v) {
actionBar.setDisplayHomeAsUpEnabled(true);
if (milestone.getNumber() > 0)
actionBar.setTitle(getString(R.string.milestone)
+ milestone.getNumber());
+ milestone.getNumber());
else
actionBar.setTitle(R.string.new_milestone);
actionBar.setSubtitle(repository.generateId());
Expand Down Expand Up @@ -239,12 +237,12 @@ private void updateMilestone() {
if (dueOn != null) {
dateText.setText(dueOn.toString());
} else {
dateText.setText(R.string.none);
dateText.setText("");
}
} else {
titleText.setText(R.string.none);
descriptionText.setText(R.string.none);
dateText.setText(R.string.none);
dateText.setText("");
}
}

Expand Down
59 changes: 30 additions & 29 deletions app/src/main/res/layout/milestone_edit.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,44 +89,45 @@
android:lines="5"
/>

<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">
<View
android:id="@+id/strut"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_centerHorizontal="true" />

<TextView
android:id="@+id/tv_milestone_date_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/ms_due_by" />
<Button
android:id="@+id/b_clear"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_alignLeft="@id/strut"
android:layout_alignParentEnd="true"
android:layout_below="@id/et_milestone_description"
android:text="@string/clear" />

<TextView
android:id="@+id/tv_milestone_date"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/text"
android:layout_weight="1"/>
<TextView
android:id="@+id/tv_milestone_date_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignBaseline="@id/b_clear"
android:layout_alignStart="@id/et_milestone_description"
android:text="@string/ms_due_by" />

<Button
android:id="@+id/b_clear"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="@string/clear" />
<TextView
android:id="@+id/tv_milestone_date"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignBaseline="@id/b_clear"
android:layout_toEndOf="@id/tv_milestone_date_label"
android:textColor="@color/text" />

</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_alignParentEnd="true"
android:layout_alignParentStart="true"
android:layout_below="@+id/b_clear"
android:layout_marginTop="10dp">

<Button
Expand Down

0 comments on commit a49d793

Please sign in to comment.