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

Refactor issues (#380)

Browse Source 
new strings for tabs

Merge branch 'refactor-issues' of gitea.com:gitnex/GitNex into refactor-issues

Fix conflicts and files refactors

Merge branch 'master' into refactor-issues

Merge branch 'master' into refactor-issues

refactored closed issues in new tab

Added gitea ver check, minor ui fixes

Merge branch 'master' into refactor-issues

# Conflicts:
#	app/src/main/java/org/mian/gitnex/adapters/IssuesAdapter.java

Refactored open issues

Added parent fragment

Co-authored-by: 6543 <6543@noreply.gitea.io>
Reviewed-on: https://gitea.com/gitnex/GitNex/pulls/380
This commit is contained in:
M M Arif
2020-04-14 20:55:04 +00:00
parent b8d8b34b0e
commit 7caecadb32
27 changed files with 811 additions and 858 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -77,7 +77,7 @@
android:background="@drawable/shape_inputs"
android:textColor="?attr/inputTextColor"
android:textColorHint="?attr/hintColor"
android:textColorHighlight="?attr/primaryTextColor"/>
android:textColorHighlight="?attr/primaryTextColor" />
<TextView
android:layout_width="match_parent"
@ -102,10 +102,10 @@
android:scrollbars="vertical"
android:gravity="top|start"
android:textSize="14sp"
android:textColor="@color/white"
android:textColorHint="@color/white"
android:inputType="textCapSentences|textMultiLine"
android:textColorHighlight="@color/white" />
android:textColor="?attr/inputTextColor"
android:textColorHint="?attr/hintColor"
android:textColorHighlight="?attr/primaryTextColor" />
<TextView
android:layout_width="match_parent"
@ -124,8 +124,8 @@
android:textSize="14sp"
tools:ignore="Autofill"
android:background="@drawable/shape_inputs"
android:textColor="?attr/primaryTextColor"
android:textColorHint="?attr/primaryTextColor"
android:textColor="?attr/inputTextColor"
android:textColorHint="?attr/hintColor"
android:inputType="none"
android:textColorHighlight="?attr/primaryTextColor"/>
@ -180,8 +180,8 @@
android:textSize="14sp"
tools:ignore="Autofill"
android:background="@drawable/shape_inputs"
android:textColor="?attr/primaryTextColor"
android:textColorHint="?attr/primaryTextColor"
android:textColor="?attr/inputTextColor"
android:textColorHint="?attr/hintColor"
android:inputType="none"
android:textColorHighlight="?attr/primaryTextColor"/>
@ -203,8 +203,8 @@
android:textSize="14sp"
tools:ignore="Autofill"
android:background="@drawable/shape_inputs"
android:textColor="?attr/primaryTextColor"
android:textColorHint="?attr/primaryTextColor"
android:textColor="?attr/inputTextColor"
android:textColorHint="?attr/hintColor"
android:textColorHighlight="?attr/primaryTextColor"/>
<Button

2
app/src/main/res/layout/activity_main.xml
View File

@ -22,7 +22,7 @@
android:id="@+id/toolbar"
app:titleTextColor="?attr/primaryTextColor"
app:popupTheme="@style/ThemeOverlay.AppCompat.Light"
android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
android:theme="@style/Widget.AppCompat.SearchView"
android:elevation="4dp">
<TextView

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

@ -60,13 +60,7 @@
android:id="@+id/tabItem2_issues"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/tab_text_issues" />
<com.google.android.material.tabs.TabItem
android:id="@+id/tabItemCloseIssues"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/tabItemCloseIssues" />
android:text="@string/pageTitleIssues" />
<com.google.android.material.tabs.TabItem
android:id="@+id/tabItemPullRequests"

2
app/src/main/res/layout/badge_issue.xml
View File

@ -11,7 +11,7 @@
android:gravity="center"
android:textSize="16sp"
app:textAllCaps="true"
android:text="@string/tab_text_issues"
android:text="@string/pageTitleIssues"
android:textColor="@color/lightGray" />
<TextView

48
app/src/main/res/layout/fragment_issues_main.xml Normal file
View File

@ -0,0 +1,48 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/primaryBackgroundColor"
android:orientation="vertical"
android:id="@+id/issuesMain">
<com.google.android.material.appbar.AppBarLayout
android:id="@+id/appbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:theme="@style/AppTheme.AppBarOverlay">
<com.google.android.material.tabs.TabLayout
android:id="@+id/tabs"
app:tabMode="fixed"
app:tabTextAppearance="@style/customTabLayout"
android:layout_width="match_parent"
android:background="?attr/primaryBackgroundColor"
app:tabTextColor="?attr/primaryTextColor"
android:layout_height="wrap_content">
<com.google.android.material.tabs.TabItem
android:id="@+id/issuesTabOpen"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/tabIssueOpen" />
<com.google.android.material.tabs.TabItem
android:id="@+id/issuesTabClosed"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/tabIssueClosed" />
</com.google.android.material.tabs.TabLayout>
</com.google.android.material.appbar.AppBarLayout>
<androidx.viewpager.widget.ViewPager
android:id="@+id/issuesContainer"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:layout_behavior="@string/appbar_scrolling_view_behavior" />
</LinearLayout>

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

@ -16,7 +16,7 @@
<include
android:id="@+id/timeLayout"
layout="@layout/layout_settings_appearance" />
layout="@layout/settings_appearance" />
<View
android:id="@+id/fileViewDivider"
@ -30,7 +30,7 @@
<include
android:id="@+id/fileViewLayout"
layout="@layout/layout_settings_fileview"/>
layout="@layout/settings_fileview"/>
<View
android:id="@+id/securityDivider"
@ -44,7 +44,7 @@
<include
android:id="@+id/securityLayout"
layout="@layout/layout_settings_security" />
layout="@layout/settings_security" />
<View
android:id="@+id/translationDivider"
@ -58,7 +58,7 @@
<include
android:id="@+id/langLayout"
layout="@layout/layout_settings_languages" />
layout="@layout/settings_languages" />
</RelativeLayout>

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

@ -2,7 +2,7 @@
<RelativeLayout
xmlns:tools="http://schemas.android.com/tools"
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/relativeLayoutFrame"
android:id="@+id/relativeLayoutFrameIssuesList"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="15dp"

0
app/src/main/res/layout/layout_settings_appearance.xml → app/src/main/res/layout/settings_appearance.xml
View File

0
app/src/main/res/layout/layout_settings_fileview.xml → app/src/main/res/layout/settings_fileview.xml
View File

0
app/src/main/res/layout/layout_settings_languages.xml → app/src/main/res/layout/settings_languages.xml
View File

0
app/src/main/res/layout/layout_settings_security.xml → app/src/main/res/layout/settings_security.xml
View File

7
app/src/main/res/values/strings.xml
View File

@ -165,8 +165,8 @@
<string name="infoTabRepoZero" translatable="false">0</string>
<string name="infoTabRepoDefaultBranchText" translatable="false">master</string>
<string name="infoShowMoreInformation">Show more information</string>
<string name="infoMoreInformation">More information</string>
<string name="infoShowMoreInformation">Show More Information</string>
<string name="infoMoreInformation">More Information</string>
<string name="timeAtText">at</string>
<string name="hash" translatable="false">#</string>
@ -613,4 +613,7 @@
<string name="closeMilestone">Close Milestone</string>
<string name="openMilestone">Open Milestone</string>
<string name="milestoneStatusUpdate">Milestone status updated successfully</string>
<string name="tabIssueOpen">Open</string>
<string name="tabIssueClosed">Closed</string>
</resources>