gitnex/GitNex
gitnex/GitNex
Archived
14
57
Fork 14
Code Issues Pull Requests 2 Releases 22 Wiki Activity

Improving milestones. #525

Merged
mmarif merged 21 commits from :improve-layouts into master 2020-06-01 16:44:08 +00:00
Conversation 0 Commits 21 Files Changed 6 +2 -56
4 changed files with 2 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 639049f186 - Show all commits

13
app/src/main/java/org/mian/gitnex/adapters/MilestonesAdapter.java
View File

@ -112,7 +112,6 @@ public class MilestonesAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
private TextView msOpenIssues;
private TextView msClosedIssues;
private TextView msDueDate;
private TextView msStatus;
private ProgressBar msProgress;
private TextView milestoneStatus;
@ -122,7 +121,6 @@ public class MilestonesAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
milestoneId = itemView.findViewById(R.id.milestoneId);
msTitle = itemView.findViewById(R.id.milestoneTitle);
msStatus = itemView.findViewById(R.id.milestoneState);
msDescription = itemView.findViewById(R.id.milestoneDescription);
msOpenIssues = itemView.findViewById(R.id.milestoneIssuesOpen);
msClosedIssues = itemView.findViewById(R.id.milestoneIssuesClosed);
@ -239,17 +237,6 @@ public class MilestonesAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
Spanned msTitle_ = markwon.toMarkdown(dataModel.getTitle());
markwon.setParsedMarkdown(msTitle, msTitle_);
if(dataModel.getState().equals("open")) {
msStatus.setBackground(context.getResources().getDrawable(R.drawable.shape_milestone_open));
}
else {
msStatus.setBackground(context.getResources().getDrawable(R.drawable.shape_milestone_closed));
}
msStatus.setText(dataModel.getState());
if (!dataModel.getDescription().equals("")) {
CharSequence bodyWithMD = markwon.toMarkdown(EmojiParser.parseToUnicode(dataModel.getDescription()));

14
app/src/main/res/drawable/shape_milestone_closed.xml
View File

@ -1,14 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<shape
xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid
android:color="@color/colorRed">
</solid>
<corners
android:radius="5dp">
</corners>
</shape>

14
app/src/main/res/drawable/shape_milestone_open.xml
View File

@ -1,14 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<shape
xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid
android:color="@color/btnBackground">
</solid>
<corners
android:radius="5dp">
</corners>
</shape>

17
app/src/main/res/layout/list_milestones.xml
View File

@ -51,27 +51,14 @@
style="@style/Widget.AppCompat.ProgressBar.Horizontal"
android:layout_width="0dp"
android:layout_height="10dp"
android:layout_marginLeft="20dp"
android:layout_marginRight="20dp"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:layout_weight="1"
android:indeterminate="false"
android:progress="50"
android:progressDrawable="@drawable/progress_bar"
android:progressTint="@color/btnBackground" />
<TextView
android:id="@+id/milestoneState"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="0"
android:background="@drawable/shape_milestone_open"
android:gravity="end"
android:paddingLeft="8dp"
android:paddingRight="8dp"
android:textColor="@color/colorWhite"
android:textSize="16sp"
tools:text="@string/isOpen" />
</LinearLayout>
<LinearLayout