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

Improve layouts #524

Merged
mmarif merged 12 commits from improve-layouts into master 2020-06-01 15:54:11 +00:00
Conversation 0 Commits 12 Files Changed 36 +131 -119
5 changed files with 131 additions and 119 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 2f212246ff - Show all commits

2
app/src/main/java/org/mian/gitnex/adapters/PullRequestsAdapter.java
View File

@ -188,9 +188,11 @@ public class PullRequestsAdapter extends RecyclerView.Adapter<RecyclerView.ViewH
prNumber.setText(String.valueOf(prModel.getNumber()));
prMergeable.setText(String.valueOf(prModel.isMergeable()));
if(prModel.getHead() != null) {
prHeadBranch.setText(prModel.getHead().getRef());
prIsFork.setText(String.valueOf(prModel.getHead().getRepo().isFork()));
prForkFullName.setText(prModel.getHead().getRepo().getFull_name());
}
prCommentsCount.setText(String.valueOf(prModel.getComments()));
prCreatedTime.setText(TimeHelper.formatTime(prModel.getCreated_at(), new Locale(locale), timeFormat, context));

1
app/src/main/res/layout/fragment_issues.xml
View File

@ -16,7 +16,6 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?attr/primaryBackgroundColor"
android:padding="4dp"
android:scrollbars="vertical" />
</androidx.swiperefreshlayout.widget.SwipeRefreshLayout>

1
app/src/main/res/layout/fragment_pull_requests.xml
View File

@ -16,7 +16,6 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?attr/primaryBackgroundColor"
android:padding="4dp"
android:scrollbars="vertical" />
</androidx.swiperefreshlayout.widget.SwipeRefreshLayout>

20
app/src/main/res/layout/list_issues.xml
View File

@ -1,15 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout
xmlns:tools="http://schemas.android.com/tools"
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/relativeLayoutFrameIssuesList"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="15dp"
android:layout_marginStart="15dp"
android:layout_marginEnd="15dp"
android:background="?attr/primaryBackgroundColor"
tools:context=".activities.RepoDetailActivity">
android:background="?attr/primaryBackgroundColor">
<TextView
android:id="@+id/issueNumber"
@ -17,6 +12,14 @@
android:layout_height="wrap_content"
android:visibility="invisible" />
<RelativeLayout
android:id="@+id/mainFrame"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:layout_margin="15dp"
android:orientation="vertical">
<ImageView
android:id="@+id/assigneeAvatar"
android:layout_width="48dp"
@ -91,12 +94,13 @@
</LinearLayout>
</RelativeLayout>
<View
android:layout_below="@id/infoSection"
android:layout_below="@id/mainFrame"
android:layout_width="match_parent"
android:layout_height="1dp"
android:id="@+id/divider"
android:layout_marginTop="15dp"
android:background="?attr/dividerColor" />
</RelativeLayout>

14
app/src/main/res/layout/list_pr.xml
View File

@ -1,12 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout
xmlns:tools="http://schemas.android.com/tools"
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/relativeLayoutFrame"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="15dp"
tools:context=".activities.RepoDetailActivity">
android:background="?attr/primaryBackgroundColor">
<TextView
android:id="@+id/prNumber"
@ -38,6 +36,14 @@
android:layout_height="wrap_content"
android:visibility="invisible"/>
<RelativeLayout
android:id="@+id/mainFrame"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:layout_margin="15dp"
android:orientation="vertical">
<ImageView
android:id="@+id/assigneeAvatar"
android:layout_width="48dp"
@ -112,3 +118,5 @@
</LinearLayout>
</RelativeLayout>
</RelativeLayout>