shihaam/GitNex
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Improve single issue UI (#518)

Browse Source 
Merge branch 'master' into single-issue-ui

Add progressbar, match the ui to other ui for views(lines etc). And other refactors.

Reviewed-on: https://gitea.com/gitnex/GitNex/pulls/518
Reviewed-by: opyale <opyale@noreply.gitea.io>
This commit is contained in:
M M Arif
2020-05-30 16:59:52 +00:00
parent 0f9e130cf4
commit 6721b09de9
3 changed files with 331 additions and 322 deletions
Download Patch File Download Diff File Expand all files Collapse all files

273
app/src/main/res/layout/activity_issue_detail.xml
View File

@ -1,10 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout android:layout_width="match_parent"
android:layout_height="match_parent"
<LinearLayout
xmlns:app="http://schemas.android.com/apk/res-auto"
android:orientation="vertical"
android:fitsSystemWindows="true"
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:background="?attr/primaryBackgroundColor">
<com.google.android.material.appbar.AppBarLayout
@ -46,7 +46,7 @@
android:layout_height="wrap_content">
<ScrollView
android:layout_width="fill_parent"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/scrollViewComments"
android:fillViewport="true">
@ -54,157 +54,170 @@
<RelativeLayout
android:id="@+id/relativeLayoutFrame"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="15dp">
<ImageView
android:id="@+id/assigneeAvatar"
android:layout_width="48dp"
android:layout_height="48dp"
android:layout_marginEnd="15dp"
android:contentDescription="@string/generalImgContentText" />
<TextView
android:id="@+id/issueTitle"
android:layout_toEndOf="@+id/assigneeAvatar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="start"
android:textColor="?attr/primaryTextColor"
android:textIsSelectable="true"
android:textSize="18sp" />
android:layout_height="wrap_content">
<RelativeLayout
android:id="@+id/msdueFrame"
android:layout_toEndOf="@+id/assigneeAvatar"
android:layout_below="@+id/issueTitle"
android:id="@+id/mainIssueLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dp" >
android:orientation="vertical"
android:padding="15dp">
<ImageView
android:id="@+id/assigneeAvatar"
android:layout_width="48dp"
android:layout_height="48dp"
android:layout_marginEnd="15dp"
android:contentDescription="@string/generalImgContentText" />
<TextView
android:id="@+id/issueDueDate"
android:id="@+id/issueTitle"
android:layout_toEndOf="@+id/assigneeAvatar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="start"
android:layout_alignParentStart="true"
android:layout_gravity="start"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="?attr/primaryTextColor"
android:textSize="14sp" />
android:textIsSelectable="true"
android:textSize="18sp" />
<RelativeLayout
android:id="@+id/msdueFrame"
android:layout_toEndOf="@+id/assigneeAvatar"
android:layout_below="@+id/issueTitle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dp" >
<TextView
android:id="@+id/issueDueDate"
android:gravity="start"
android:layout_alignParentStart="true"
android:layout_gravity="start"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="?attr/primaryTextColor"
android:textSize="14sp" />
<TextView
android:layout_toEndOf="@+id/issueDueDate"
android:id="@+id/issueMilestone"
android:gravity="end"
android:layout_gravity="end"
android:layout_alignParentEnd="true"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="?attr/primaryTextColor"
android:textSize="14sp" />
</RelativeLayout>
<HorizontalScrollView
android:layout_below="@+id/msdueFrame"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/assigneesScrollView"
android:layout_alignParentEnd="false"
android:foregroundGravity="right"
android:scrollbarThumbHorizontal="@android:color/transparent"
android:fillViewport="true">
<LinearLayout
android:id="@+id/frameAssignees"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:layout_gravity="end"
android:gravity="end"
android:layout_marginTop="10dp">
</LinearLayout>
</HorizontalScrollView>
<TextView
android:layout_toEndOf="@+id/issueDueDate"
android:id="@+id/issueMilestone"
android:gravity="end"
android:layout_gravity="end"
android:layout_alignParentEnd="true"
android:layout_width="wrap_content"
android:id="@+id/issueDescription"
android:layout_below="@+id/assigneesScrollView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="start"
android:textColor="?attr/primaryTextColor"
android:textSize="14sp" />
android:autoLink="web"
android:textColorLink="@color/lightBlue"
android:textIsSelectable="true"
android:textSize="16sp" />
</RelativeLayout>
<HorizontalScrollView
android:layout_below="@+id/issueDescription"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/labelsScrollView"
android:layout_alignParentEnd="false"
android:foregroundGravity="right"
android:scrollbarThumbHorizontal="@android:color/transparent"
android:fillViewport="true">
<HorizontalScrollView
android:layout_below="@+id/msdueFrame"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/assigneesScrollView"
android:layout_alignParentEnd="false"
android:foregroundGravity="right"
android:scrollbarThumbHorizontal="@android:color/transparent"
android:fillViewport="true">
<LinearLayout
android:id="@+id/frameLabels"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:layout_marginTop="10dp">
<LinearLayout
android:id="@+id/frameAssignees"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:layout_gravity="end"
android:gravity="end"
android:layout_marginTop="10dp">
</LinearLayout>
</HorizontalScrollView>
<TextView
android:id="@+id/issueDescription"
android:layout_below="@+id/assigneesScrollView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="start"
android:textColor="?attr/primaryTextColor"
android:autoLink="web"
android:textColorLink="@color/lightBlue"
android:textIsSelectable="true"
android:textSize="16sp" />
<HorizontalScrollView
android:layout_below="@+id/issueDescription"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/labelsScrollView"
android:layout_alignParentEnd="false"
android:foregroundGravity="right"
android:scrollbarThumbHorizontal="@android:color/transparent"
android:fillViewport="true">
<LinearLayout
android:id="@+id/frameLabels"
</LinearLayout>
</HorizontalScrollView>
<RelativeLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/issueTimeFrame"
android:layout_below="@+id/labelsScrollView"
android:orientation="horizontal"
android:layout_marginTop="10dp">
</LinearLayout>
</HorizontalScrollView>
<TextView
android:id="@+id/issueCreatedTime"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="start"
android:text="@string/createdText"
android:visibility="gone"
android:textColor="?attr/primaryTextColor"
android:textSize="12sp" />
<RelativeLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/issueTimeFrame"
android:layout_below="@+id/labelsScrollView"
android:orientation="horizontal"
android:layout_marginTop="10dp">
<TextView
android:id="@+id/issueModified"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="?attr/primaryTextColor"
android:layout_toEndOf="@+id/issueCreatedTime"
android:textSize="12sp"
android:visibility="gone"
android:text="@string/modifiedText" />
<TextView
android:id="@+id/issueCreatedTime"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="start"
android:text="@string/createdText"
android:visibility="gone"
android:textColor="?attr/primaryTextColor"
android:textSize="12sp" />
<TextView
android:id="@+id/issueModified"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="?attr/primaryTextColor"
android:layout_toEndOf="@+id/issueCreatedTime"
android:textSize="12sp"
android:visibility="gone"
android:text="@string/modifiedText" />
</RelativeLayout>
</RelativeLayout>
<View
android:layout_below="@id/issueTimeFrame"
android:layout_below="@id/mainIssueLayout"
android:layout_width="match_parent"
android:layout_height="1dp"
android:id="@+id/divider"
android:layout_marginTop="15dp"
android:background="?attr/inputBackgroundColor" />
android:visibility="gone"
android:background="?attr/dividerColor" />
<androidx.recyclerview.widget.RecyclerView
android:layout_below="@+id/divider"
android:id="@+id/recyclerView"
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?attr/primaryBackgroundColor"
android:padding="4dp"
android:scrollbars="vertical" />
android:layout_height="wrap_content"
android:layout_below="@+id/divider">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recyclerView"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?attr/primaryBackgroundColor"
android:scrollbars="vertical" />
</LinearLayout>
</RelativeLayout>
@ -225,6 +238,14 @@
android:padding="@dimen/fab_padding"
android:contentDescription="@string/addNewContent" />
<ProgressBar
android:id="@+id/progressBar"
style="@style/Base.Widget.AppCompat.ProgressBar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:visibility="visible"
android:layout_centerInParent="true" />
</RelativeLayout>
</LinearLayout>
</LinearLayout>

8
app/src/main/res/layout/list_issue_comments.xml
View File

@ -1,13 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
xmlns:tools="http://schemas.android.com/tools"
android:orientation="vertical"
android:paddingTop="10dp"
android:paddingBottom="10dp"
android:padding="15dp"
android:id="@+id/relativeLayoutMainFrame"
tools:context=".activities.RepoDetailActivity"
android:background="?attr/primaryBackgroundColor">
<TextView