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

Proper URL parsing, label redesign and other improvements. (#564)

Browse Source 
Final improvements.

Fixing reply mention.

Do NOT use "instanceUrlRaw" as of now.

Minor fixes

Merge remote-tracking branch 'remotes/main/master' into login-fix

URL parsing, label and other improvements.

Co-authored-by: opyale <opyale@noreply.gitea.io>
Reviewed-on: https://codeberg.org/gitnex/GitNex/pulls/564
Reviewed-by: M M Arif <mmarif@noreply.codeberg.org>
This commit is contained in:
opyale
2020-06-30 16:43:27 +02:00
committed by M M Arif
parent 5672208fd0
commit e872069093
16 changed files with 284 additions and 176 deletions
Download Patch File Download Diff File Expand all files Collapse all files

105
app/src/main/res/layout/list_labels.xml
View File

@ -1,61 +1,86 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/linearLayoutMainFrame"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:id="@+id/relativeLayoutMainFrame"
android:background="?attr/primaryBackgroundColor">
android:background="?attr/primaryBackgroundColor"
android:orientation="horizontal"
android:padding="10dp">
<TextView
android:id="@+id/labelTitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:visibility="gone"
android:id="@+id/labelTitle"/>
android:layout_weight="1"
android:visibility="gone" />
<TextView
android:id="@+id/labelId"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:visibility="gone"
android:id="@+id/labelId"/>
android:layout_weight="1"
android:visibility="gone" />
<TextView
android:id="@+id/labelColor"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:visibility="gone"
android:id="@+id/labelColor"/>
android:layout_weight="1"
android:visibility="gone" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_margin="15dp"
android:id="@+id/labelsFrame"
android:orientation="horizontal">
<androidx.cardview.widget.CardView
android:id="@+id/labelView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:cardCornerRadius="5dp"
app:cardElevation="0dp"
app:contentPaddingBottom="3dp"
app:contentPaddingLeft="10dp"
app:contentPaddingRight="10dp"
app:contentPaddingTop="3dp">
<ImageView
android:id="@+id/labelsView"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="start"
android:paddingTop="5dp"
android:contentDescription="@string/labelMenuContentDesc"
android:gravity="start"
android:layout_weight="1"
android:scaleType="fitStart"
android:src="@drawable/ic_label" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center_vertical"
android:orientation="horizontal">
<ImageView
android:id="@+id/labelsOptionsMenu"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="end"
android:layout_weight="0.15"
android:contentDescription="@string/labelMenuContentDesc"
android:gravity="end"
android:scaleType="fitEnd"
android:src="@drawable/ic_dotted_menu_horizontal" />
<ImageView
android:id="@+id/labelIcon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="0"
android:contentDescription="@string/generalImgContentText"
android:tint="@color/colorWhite"
app:srcCompat="@drawable/ic_label" />
</LinearLayout>
<TextView
android:id="@+id/labelName"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:layout_weight="1"
android:textColor="@color/colorWhite"
android:textSize="16sp"
android:textStyle="bold" />
</LinearLayout>
</RelativeLayout>
</androidx.cardview.widget.CardView>
<Space
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1" />
<ImageView
android:id="@+id/labelsOptionsMenu"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical|end"
android:contentDescription="@string/labelMenuContentDesc"
android:paddingLeft="10dp"
android:src="@drawable/ic_dotted_menu_horizontal" />
</LinearLayout>

29
app/src/main/res/layout/list_releases.xml
View File

@ -27,8 +27,7 @@
android:singleLine="true"
android:textColor="?attr/primaryTextColor"
android:textSize="18sp"
android:textStyle="bold"
tools:text="3.0.0-rc1" />
android:textStyle="bold" />
<TextView
android:id="@+id/releaseType"
@ -68,8 +67,7 @@
android:layout_height="wrap_content"
android:layout_marginStart="5dp"
android:textColor="?attr/primaryTextColor"
android:textSize="14sp"
tools:text="Published by @mmarif" />
android:textSize="14sp" />
</LinearLayout>
@ -99,8 +97,7 @@
android:layout_marginStart="5dp"
android:singleLine="true"
android:textColor="?attr/primaryTextColor"
android:textSize="14sp"
tools:text="3.0.0-rc1" />
android:textSize="14sp" />
</LinearLayout>
@ -125,8 +122,7 @@
android:layout_marginStart="5dp"
android:singleLine="true"
android:textColor="?attr/primaryTextColor"
android:textSize="14sp"
tools:text="8b1c79c0c3" />
android:textSize="14sp" />
</LinearLayout>
@ -150,8 +146,7 @@
android:layout_marginStart="5dp"
android:singleLine="true"
android:textColor="?attr/primaryTextColor"
android:textSize="14sp"
tools:text="1 day ago" />
android:textSize="14sp" />
</LinearLayout>
@ -172,9 +167,10 @@
android:id="@+id/releaseBodyContent"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:autoLink="web|email"
android:textColorLink="@color/lightBlue"
android:textColor="?attr/primaryTextColor"
android:textSize="14sp"
tools:text="Put your release body here" />
android:textSize="14sp" />
</LinearLayout>
@ -207,8 +203,7 @@
android:layout_marginStart="3dp"
android:textColor="?attr/primaryTextColor"
android:textSize="14sp"
android:text="@string/releaseDownloadText"
tools:text="Downloads" />
android:text="@string/releaseDownloadText" />
</LinearLayout>
@ -229,8 +224,7 @@
android:drawableStart="@drawable/ic_file_download_24dp"
android:drawablePadding="8dp"
android:textColor="?attr/primaryTextColor"
android:textSize="14sp"
tools:text="Source code (ZIP)" />
android:textSize="14sp" />
<TextView
android:id="@+id/releaseTarDownload"
@ -241,8 +235,7 @@
android:drawableStart="@drawable/ic_file_download_24dp"
android:drawablePadding="8dp"
android:textColor="?attr/primaryTextColor"
android:textSize="14sp"
tools:text="Source code (TAR)" />
android:textSize="14sp" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/downloadList"

5
app/src/main/res/layout/nav_header.xml
View File

@ -29,19 +29,17 @@
android:id="@+id/userAvatar"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic_android"
android:maxHeight="24dp"
android:maxWidth="24dp"
android:paddingStart="20dp"
android:paddingEnd="5dp"
android:contentDescription="@string/app_name"/>
android:contentDescription="@string/generalImgContentText"/>
<TextView
android:id="@+id/userFullname"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingTop="10dp"
android:text="@string/app_name"
android:textSize="18sp"
android:textIsSelectable="true"
android:textColor="@color/white"
@ -59,7 +57,6 @@
android:layout_width="0dp"
android:layout_weight="0.85"
android:layout_height="wrap_content"
android:text="@string/appEmail"
android:textSize="14sp"
android:textIsSelectable="true"
android:textColor="@color/white"