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

Merge branch 'master' of gitea.com:mmarif/GitNex

Browse Source 
# Conflicts:
#	app/src/main/java/org/mian/gitnex/activities/IssueDetailActivity.java
#	app/src/main/java/org/mian/gitnex/activities/MainActivity.java
#	app/src/main/java/org/mian/gitnex/adapters/AdminGetUsersAdapter.java
#	app/src/main/java/org/mian/gitnex/adapters/CollaboratorsAdapter.java
#	app/src/main/java/org/mian/gitnex/adapters/IssueCommentsAdapter.java
#	app/src/main/java/org/mian/gitnex/adapters/MembersByOrgAdapter.java
#	app/src/main/java/org/mian/gitnex/adapters/MyReposListAdapter.java
#	app/src/main/java/org/mian/gitnex/adapters/OrganizationsListAdapter.java
#	app/src/main/java/org/mian/gitnex/adapters/ProfileFollowersAdapter.java
#	app/src/main/java/org/mian/gitnex/adapters/ProfileFollowingAdapter.java
#	app/src/main/java/org/mian/gitnex/adapters/ReposListAdapter.java
#	app/src/main/java/org/mian/gitnex/adapters/RepositoriesByOrgAdapter.java
#	app/src/main/java/org/mian/gitnex/adapters/StarredReposListAdapter.java
#	app/src/main/java/org/mian/gitnex/adapters/TeamMembersByOrgAdapter.java
#	app/src/main/java/org/mian/gitnex/adapters/UserSearchAdapter.java
#	app/src/main/java/org/mian/gitnex/fragments/OrganizationInfoFragment.java
#	app/src/main/java/org/mian/gitnex/fragments/ProfileFragment.java
#	app/src/main/res/layout/activity_issue_detail.xml
#	app/src/main/res/layout/admin_users_list.xml
#	app/src/main/res/layout/fragment_profile.xml
#	app/src/main/res/layout/issue_comments.xml
#	app/src/main/res/layout/my_repos_list.xml
#	app/src/main/res/layout/nav_header.xml
#	app/src/main/res/layout/organizations_list.xml
#	app/src/main/res/layout/profile_followers_list.xml
#	app/src/main/res/layout/profile_following_list.xml
#	app/src/main/res/layout/repos_list.xml
#	app/src/main/res/layout/repositories_by_org_list.xml
#	app/src/main/res/layout/starred_repos_list.xml
This commit is contained in:
M M Arif
2019-10-01 10:14:45 +05:00
parent 5f402c2c60 85140fbee0
commit 62a5452437
403 changed files with 0 additions and 28060 deletions
Download Patch File Download Diff File Expand all files Collapse all files

198
app/src/main/res/layout/fragment_about.xml
View File

@@ -1,198 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent" >
<ScrollView android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/colorPrimary">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:theme="@style/AppTheme"
android:fitsSystemWindows="true"
android:gravity="start"
android:layout_marginStart="20dp"
android:layout_marginEnd="20dp"
android:id="@+id/aboutFrame">
<ImageView
android:layout_width="80dp"
android:layout_height="80dp"
android:layout_gravity="center_horizontal"
android:layout_marginTop="20dp"
android:baselineAligned="false"
android:contentDescription="@string/logo"
android:src="@mipmap/app_logo_round" />
<TextView
android:id="@+id/appName"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/app_name"
android:textIsSelectable="true"
android:layout_marginTop="5dp"
android:textSize="24sp"
android:textColor="@color/white"
android:layout_gravity="center_horizontal"/>
<TextView
android:id="@+id/appVerBuild"
android:text="@string/appVerBuild"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textIsSelectable="true"
android:layout_marginTop="5dp"
android:textSize="16sp"
android:textColor="@color/white"
android:layout_gravity="center_horizontal"/>
<TextView
android:id="@+id/appDesc"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/appDesc"
android:textIsSelectable="true"
android:layout_marginTop="25dp"
android:textSize="16sp"
android:textColor="@color/white"
android:padding="5dp"
android:background="@drawable/round_corners_with_background"
android:layout_gravity="center_horizontal"/>
<TextView
android:id="@+id/giteaVersion"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/commitPage"
android:layout_marginTop="15dp"
android:textSize="16sp"
android:textColor="@color/white"
android:padding="5dp"
android:background="@drawable/round_corners_with_background"
android:autoLink="web" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="15dp"
android:orientation="vertical"
android:padding="5dp"
android:background="@drawable/round_corners_with_background">
<TextView
android:id="@+id/donationLink"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/supportText"
android:textColor="@color/lightBlue"
android:textSize="16sp"
android:gravity="start"
android:autoLink="web"
android:visibility="visible"
android:layout_marginBottom="10dp"
android:textColorLink="@color/lightBlue" />
<TextView
android:id="@+id/donationLinkPatreon"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/supportTextPatreon"
android:textColor="@color/lightBlue"
android:textSize="16sp"
android:gravity="start"
android:autoLink="web"
android:visibility="visible"
android:textColorLink="@color/lightBlue" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="15dp"
android:orientation="vertical"
android:padding="5dp"
android:background="@drawable/round_corners_with_background">
<TextView
android:id="@+id/sponsorsButton"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/pageTitleSponsors"
android:textColor="@color/lightBlue"
android:textSize="16sp"
android:gravity="start"
android:autoLink="web"
android:visibility="visible"
android:layout_marginBottom="10dp"
android:textColorLink="@color/lightBlue" />
<TextView
android:id="@+id/creditsButton"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/pageTitleCredits"
android:textColor="@color/lightBlue"
android:textSize="16sp"
android:gravity="start"
android:autoLink="web"
android:visibility="visible"
android:layout_marginBottom="10dp"
android:textColorLink="@color/lightBlue" />
<TextView
android:id="@+id/appWebsite"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/appWebsite"
android:textColor="@color/lightBlue"
android:textSize="16sp"
android:gravity="start"
android:autoLink="web"
android:visibility="visible"
android:layout_marginBottom="10dp"
android:textColorLink="@color/lightBlue" />
<TextView
android:id="@+id/appRepo"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/appRepo"
android:textColor="@color/lightBlue"
android:textSize="16sp"
android:gravity="start"
android:autoLink="web"
android:visibility="visible"
android:textColorLink="@color/lightBlue" />
</LinearLayout>
<TextView
android:layout_width="wrap_content"
android:layout_height="25dp" />
</LinearLayout>
</ScrollView>
<RelativeLayout
android:id="@+id/progressBarLayout"
android:layout_width="match_parent"
android:layout_height="match_parent">
<ProgressBar
android:id="@+id/progress_bar"
style="@style/Base.Widget.AppCompat.ProgressBar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:indeterminate="true"
android:visibility="visible"
android:layout_centerInParent="true"
/>
</RelativeLayout>
</RelativeLayout>