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

Improving design of organisation detail page. (#534)

Browse Source 
Design changes and updating dependencies.

Small fix.

Adding missing library.

Cleanup.

Improving design of organisation detail page.

Co-authored-by: opyale <opyale@noreply.gitea.io>
Reviewed-by: M M Arif <mmarif@noreply.codeberg.org>
This commit is contained in:
opyale
2020-06-08 08:34:53 +02:00
committed by M M Arif
parent acc55e3433
commit 4a8ee2ea96
8 changed files with 171 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

164
app/src/main/res/layout/fragment_organization_info.xml
View File

@ -1,6 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent">
@ -11,85 +13,131 @@
android:layout_height="match_parent">
<LinearLayout
android:padding="15dp"
android:orientation="vertical"
android:id="@+id/orgInfoLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:visibility="gone">
android:orientation="vertical"
android:padding="15dp"
android:visibility="gone"
tools:visibility="visible">
<ImageView
android:id="@+id/orgAvatar"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginTop="10dp"
android:contentDescription="@string/orgContentAvatar"
android:layout_marginBottom="15dp"/>
android:layout_marginTop="20dp"
android:layout_marginBottom="30dp"
android:contentDescription="@string/orgContentAvatar" />
<TextView
android:id="@+id/orgNameInfo"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:gravity="center"
android:textIsSelectable="true"
android:textSize="16sp"
android:textColor="?attr/primaryTextColor"/>
<TextView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:text="@string/descriptionText"
android:textSize="16sp"
android:layout_height="wrap_content"
android:textColor="?attr/primaryTextColor"
android:layout_marginTop="15dp"/>
android:layout_marginBottom="5dp"
android:textSize="22sp"
android:textStyle="bold" />
<TextView
android:id="@+id/orgDescInfo"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:textIsSelectable="true"
android:textSize="16sp"
android:paddingTop="5dp"
android:textColor="?attr/primaryTextColor"/>
<TextView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:text="@string/websiteText"
android:textSize="16sp"
android:layout_height="wrap_content"
android:autoLink="web"
android:ellipsize="end"
android:maxLines="3"
android:textColor="?attr/primaryTextColor"
android:layout_marginTop="15dp"/>
<TextView
android:id="@+id/orgWebsiteInfo"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:textIsSelectable="true"
android:textSize="16sp"
android:paddingTop="5dp"
android:textColorLink="@color/lightBlue"
android:autoLink="web"
android:textColor="?attr/primaryTextColor"/>
android:textSize="16sp" />
<TextView
<View
android:layout_width="match_parent"
android:layout_height="match_parent"
android:text="@string/locationText"
android:textSize="16sp"
android:textColor="?attr/primaryTextColor"
android:layout_marginTop="15dp"/>
android:layout_height="1dp"
android:layout_marginTop="25dp"
android:layout_marginBottom="25dp"
android:background="?attr/dividerColor" />
<TextView
android:id="@+id/orgLocationInfo"
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:textIsSelectable="true"
android:textSize="16sp"
android:paddingTop="5dp"
android:autoLink="web"
android:textColor="?attr/primaryTextColor"/>
android:layout_height="wrap_content"
android:layout_marginBottom="20dp"
android:orientation="horizontal"
android:paddingLeft="15dp"
android:paddingRight="15dp">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:contentDescription="@string/websiteText"
app:srcCompat="@drawable/ic_link_24dp" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="15dp"
android:gravity="center_vertical"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/websiteText"
android:textColor="?attr/primaryTextColor"
android:textSize="16sp" />
<TextView
android:id="@+id/orgWebsiteInfo"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:alpha="0.9"
android:autoLink="web"
android:textColor="?attr/primaryTextColor"
android:textColorLink="@color/lightBlue"
android:textSize="14sp"
tools:text="29" />
</LinearLayout>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="20dp"
android:orientation="horizontal"
android:paddingLeft="15dp"
android:paddingRight="15dp">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:contentDescription="@string/locationText"
app:srcCompat="@drawable/ic_location" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="15dp"
android:gravity="center_vertical"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/locationText"
android:textColor="?attr/primaryTextColor"
android:textSize="16sp" />
<TextView
android:id="@+id/orgLocationInfo"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:alpha="0.9"
android:textColor="?attr/primaryTextColor"
android:textSize="14sp"
tools:text="29" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
@ -100,13 +148,15 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
<ProgressBar android:id="@+id/progress_bar"
<ProgressBar
android:id="@+id/progress_bar"
style="@style/Base.Widget.AppCompat.ProgressBar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:indeterminate="true"
android:visibility="visible"
android:layout_centerInParent="true" />
tools:visibility="gone" />
</RelativeLayout>

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

@ -62,9 +62,9 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="?attr/primaryTextColor"
android:layout_marginBottom="5dp"
android:textSize="22sp"
android:textStyle="bold"
tools:text="GitNex" />
android:textStyle="bold" />
<TextView
android:id="@+id/repoMetaDescription"
@ -75,12 +75,12 @@
android:ellipsize="end"
android:maxLines="3"
android:textColor="?attr/primaryTextColor"
android:textSize="16sp"
tools:text="Android client for Gitea https://gitnex.com" />
android:textColorLink="@color/lightBlue"
android:textSize="16sp" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
android:baselineAligned="false"
android:orientation="horizontal">
@ -88,7 +88,7 @@
<LinearLayout
android:id="@+id/repoMetaStarsFrame"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
android:orientation="vertical">
@ -110,7 +110,7 @@
<LinearLayout
android:id="@+id/repoMetaPullRequestsFrame"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
android:orientation="vertical">
@ -132,7 +132,7 @@
<LinearLayout
android:id="@+id/repoMetaForksFrame"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
android:orientation="vertical">
@ -154,7 +154,7 @@
<LinearLayout
android:id="@+id/repoMetaWatchersFrame"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
android:orientation="vertical">
@ -179,12 +179,11 @@
android:layout_height="1dp"
android:layout_marginTop="25dp"
android:layout_marginBottom="25dp"
android:alpha="0.2"
android:background="@color/lightGray" />
android:background="?attr/dividerColor" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="20dp"
android:orientation="horizontal"
android:paddingLeft="15dp"
@ -224,7 +223,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="20dp"
android:orientation="horizontal"
android:paddingLeft="15dp"
@ -264,7 +263,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="20dp"
android:orientation="horizontal"
android:paddingLeft="15dp"
@ -387,4 +386,4 @@
</RelativeLayout>
</RelativeLayout>
</RelativeLayout>