github-starred/gitnex
2
0
Fork 0
mirror of https://github.com/gitnex-org/gitnex.git synced 2026-07-22 18:40:58 -05:00
Code Issues Packages Projects Releases Wiki Activity

Move issue/pr screen bottomsheet to new UI

Browse Source
This commit is contained in:
M M Arif
2022-04-20 16:59:41 +05:00
parent 42f8cb0915
commit 0ed9d95b4d
23 changed files with 254 additions and 249 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/org/mian/gitnex/fragments/BottomSheetOrganizationFragment.java
+1 -1
View File
@@ -40,7 +40,7 @@ public class BottomSheetOrganizationFragment extends BottomSheetDialogFragment {
bottomSheetOrganizationBinding.createTeam.setVisibility(View.GONE);
}
if(!permissions.isCanCreateRepository() || !permissions.isIsOwner()) {
bottomSheetOrganizationBinding.orgCreate.setVisibility(View.GONE);
bottomSheetOrganizationBinding.organizationHeadFrame.setVisibility(View.GONE);
bottomSheetOrganizationBinding.orgCreateSection.setVisibility(View.GONE);
bottomSheetOrganizationBinding.orgDivider.setVisibility(View.GONE);
}
app/src/main/java/org/mian/gitnex/fragments/BottomSheetSingleIssueFragment.java
+10 -14
View File
@@ -84,9 +84,7 @@ public class BottomSheetSingleIssueFragment extends BottomSheetDialogFragment {
if(issue.getIssueType().equalsIgnoreCase("Pull")) {
binding.editIssue.setText(R.string.editPrText);
binding.copyIssueUrl.setText(R.string.copyPrUrlText);
binding.shareIssue.setText(R.string.sharePr);
binding.editIssue.setText(R.string.menuEditText);
boolean canPushPullSource = issue.getPullRequest().getHead().getRepo().getPermissions().isPush();
if(issue.getPullRequest().isMerged() || issue.getIssue().getState().equals("closed")) {
@@ -198,13 +196,16 @@ public class BottomSheetSingleIssueFragment extends BottomSheetDialogFragment {
dismiss();
});
if(issue.getIssueType().equalsIgnoreCase("pull")) {
binding.bottomSheetHeader.setText(R.string.pullRequest);
}
if(issue.getIssue().getState().equals("open")) { // close issue
if(!userIsCreator && !canPush) {
binding.closeIssue.setVisibility(View.GONE);
binding.dividerCloseReopenIssue.setVisibility(View.GONE);
}
else if(issue.getIssueType().equalsIgnoreCase("Pull")) {
binding.closeIssue.setText(R.string.closePr);
binding.closeIssue.setText(R.string.close);
}
binding.closeIssue.setOnClickListener(closeSingleIssue -> {
IssueActions.closeReopenIssue(ctx, "closed", issue);
@@ -213,16 +214,10 @@ public class BottomSheetSingleIssueFragment extends BottomSheetDialogFragment {
}
else if(issue.getIssue().getState().equals("closed")) {
if(userIsCreator || canPush) {
if(issue.getIssueType().equalsIgnoreCase("Pull")) {
binding.closeIssue.setText(R.string.reopenPr);
}
else {
binding.closeIssue.setText(R.string.reOpenIssue);
}
binding.closeIssue.setText(R.string.reopen);
}
else {
binding.closeIssue.setVisibility(View.GONE);
binding.dividerCloseReopenIssue.setVisibility(View.GONE);
}
binding.closeIssue.setOnClickListener(closeSingleIssue -> {
IssueActions.closeReopenIssue(ctx, "open", issue);
@@ -259,10 +254,11 @@ public class BottomSheetSingleIssueFragment extends BottomSheetDialogFragment {
binding.editIssue.setVisibility(View.GONE);
binding.editLabels.setVisibility(View.GONE);
binding.closeIssue.setVisibility(View.GONE);
binding.dividerCloseReopenIssue.setVisibility(View.GONE);
binding.addRemoveAssignees.setVisibility(View.GONE);
binding.commentReactionButtons.setVisibility(View.GONE);
binding.shareDivider.setVisibility(View.GONE);
binding.reactionDivider.setVisibility(View.GONE);
binding.bottomSheetHeaderFrame.setVisibility(View.GONE);
binding.issuePrDivider.setVisibility(View.GONE);
}
return binding.getRoot();
app/src/main/res/layout/bottom_sheet_admin_users.xml
+2 -2
View File
@@ -19,9 +19,9 @@
android:orientation="vertical">
<LinearLayout
android:id="@+id/adminUsersHeadFrame"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/orgCreate"
android:padding="8dp"
android:orientation="vertical">
@@ -37,9 +37,9 @@
</LinearLayout>
<com.google.android.flexbox.FlexboxLayout
android:id="@+id/giteaUsersAdminSection"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:id="@+id/giteaUsersAdminSection"
app:flexWrap="wrap"
app:alignItems="stretch"
android:padding="8dp"
app/src/main/res/layout/bottom_sheet_drafts.xml
+2 -2
View File
@@ -19,9 +19,9 @@
android:orientation="vertical">
<LinearLayout
android:id="@+id/draftsHeadFrame"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/orgCreate"
android:padding="8dp"
android:orientation="vertical">
@@ -37,9 +37,9 @@
</LinearLayout>
<com.google.android.flexbox.FlexboxLayout
android:id="@+id/draftsSection"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:id="@+id/draftsSection"
app:flexWrap="wrap"
app:alignItems="stretch"
android:padding="8dp"
app/src/main/res/layout/bottom_sheet_file_viewer.xml
+2 -2
View File
@@ -19,9 +19,9 @@
android:layout_height="wrap_content">
<LinearLayout
android:id="@+id/filesHeadFrame"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/orgCreate"
android:padding="8dp"
android:orientation="vertical">
@@ -37,9 +37,9 @@
</LinearLayout>
<com.google.android.flexbox.FlexboxLayout
android:id="@+id/filesSection"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:id="@+id/labelsListSection"
app:flexWrap="wrap"
app:alignItems="stretch"
android:padding="8dp"
app/src/main/res/layout/bottom_sheet_issue_comments.xml
+5 -5
View File
@@ -29,14 +29,14 @@
android:layout_width="match_parent"
android:layout_height="4dp"
android:id="@+id/reactionDivider"
android:layout_marginTop="16dp"
android:layout_marginTop="12dp"
android:layout_marginBottom="16dp"
android:background="?attr/dividerColor" />
<LinearLayout
android:id="@+id/issueComments"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/orgCreate"
android:padding="8dp"
android:orientation="vertical">
@@ -52,9 +52,9 @@
</LinearLayout>
<com.google.android.flexbox.FlexboxLayout
android:id="@+id/issueCommentsSection"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:id="@+id/issueCommentSection"
app:flexWrap="wrap"
app:alignItems="stretch"
android:padding="8dp"
@@ -115,16 +115,16 @@
</com.google.android.flexbox.FlexboxLayout>
<View
android:id="@+id/commentDivider"
android:layout_width="match_parent"
android:layout_height="4dp"
android:id="@+id/commentDivider"
android:layout_marginBottom="16dp"
android:background="?attr/dividerColor" />
<com.google.android.flexbox.FlexboxLayout
android:id="@+id/issueOtherSection"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:id="@+id/issueOtherSection"
app:flexWrap="wrap"
app:alignItems="stretch"
android:padding="8dp"
app/src/main/res/layout/bottom_sheet_issues_filter.xml
+2 -2
View File
@@ -19,9 +19,9 @@
android:layout_height="wrap_content">
<LinearLayout
android:id="@+id/issuesFilterHeadFrame"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/orgCreate"
android:padding="8dp"
android:orientation="vertical">
@@ -37,9 +37,9 @@
</LinearLayout>
<com.google.android.flexbox.FlexboxLayout
android:id="@+id/issuesFilterSection"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:id="@+id/issuesFilterSection"
app:flexWrap="wrap"
app:alignItems="stretch"
android:padding="8dp"
app/src/main/res/layout/bottom_sheet_labels_in_list.xml
+2 -2
View File
@@ -19,9 +19,9 @@
android:layout_height="wrap_content">
<LinearLayout
android:id="@+id/labelsListHeadFrame"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/orgCreate"
android:padding="8dp"
android:orientation="vertical">
@@ -37,9 +37,9 @@
</LinearLayout>
<com.google.android.flexbox.FlexboxLayout
android:id="@+id/labelsListSection"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:id="@+id/labelsListSection"
app:flexWrap="wrap"
app:alignItems="stretch"
android:padding="8dp"
app/src/main/res/layout/bottom_sheet_milestones_filter.xml
+2 -2
View File
@@ -19,9 +19,9 @@
android:layout_height="wrap_content">
<LinearLayout
android:id="@+id/milestonesFilterHeadFrame"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/orgCreate"
android:padding="8dp"
android:orientation="vertical">
@@ -37,9 +37,9 @@
</LinearLayout>
<com.google.android.flexbox.FlexboxLayout
android:id="@+id/milestonesFilterSection"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:id="@+id/milestonesFilterSection"
app:flexWrap="wrap"
app:alignItems="stretch"
android:padding="8dp"
app/src/main/res/layout/bottom_sheet_milestones_in_list.xml
+2 -2
View File
@@ -19,9 +19,9 @@
android:layout_height="wrap_content">
<LinearLayout
android:id="@+id/milestonesListHeadFrame"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/orgCreate"
android:padding="8dp"
android:orientation="vertical">
@@ -37,9 +37,9 @@
</LinearLayout>
<com.google.android.flexbox.FlexboxLayout
android:id="@+id/milestonesListSection"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:id="@+id/milestonesListSection"
app:flexWrap="wrap"
app:alignItems="stretch"
android:padding="8dp"
app/src/main/res/layout/bottom_sheet_my_issues_filter.xml
+2 -2
View File
@@ -19,9 +19,9 @@
android:layout_height="wrap_content">
<LinearLayout
android:id="@+id/myIssuesFilterHeadFrame"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/repoCreate"
android:padding="8dp"
android:orientation="vertical">
@@ -37,9 +37,9 @@
</LinearLayout>
<com.google.android.flexbox.FlexboxLayout
android:id="@+id/myIssuesSection"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:id="@+id/repoCreateSection"
app:flexWrap="wrap"
app:alignItems="stretch"
android:padding="8dp"
app/src/main/res/layout/bottom_sheet_notifications.xml
+2 -2
View File
@@ -18,9 +18,9 @@
android:layout_height="wrap_content">
<LinearLayout
android:id="@+id/notificationsHeadFrame"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/orgCreate"
android:padding="8dp"
android:orientation="vertical">
@@ -36,9 +36,9 @@
</LinearLayout>
<com.google.android.flexbox.FlexboxLayout
android:id="@+id/notificationsListSection"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:id="@+id/notificationsListSection"
app:flexWrap="wrap"
app:alignItems="stretch"
android:padding="8dp"
app/src/main/res/layout/bottom_sheet_notifications_filter.xml
+2 -2
View File
@@ -19,9 +19,9 @@
android:layout_height="wrap_content">
<LinearLayout
android:id="@+id/notificationsFilterHeadFrame"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/orgCreate"
android:padding="8dp"
android:orientation="vertical">
@@ -37,9 +37,9 @@
</LinearLayout>
<com.google.android.flexbox.FlexboxLayout
android:id="@+id/notificationsFilterSection"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:id="@+id/notificationsFilterSection"
app:flexWrap="wrap"
app:alignItems="stretch"
android:padding="8dp"
app/src/main/res/layout/bottom_sheet_organization.xml
+3 -2
View File
@@ -19,9 +19,9 @@
android:layout_height="wrap_content">
<LinearLayout
android:id="@+id/organizationHeadFrame"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/orgCreate"
android:padding="8dp"
android:orientation="vertical">
@@ -37,9 +37,9 @@
</LinearLayout>
<com.google.android.flexbox.FlexboxLayout
android:id="@+id/orgCreateSection"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:id="@+id/orgCreateSection"
app:flexWrap="wrap"
app:alignItems="stretch"
android:padding="8dp"
@@ -94,6 +94,7 @@
android:background="?attr/dividerColor" />
<LinearLayout
android:id="@+id/organizationShareHeadFrame"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="8dp"
app/src/main/res/layout/bottom_sheet_organization_teams.xml
+2 -2
View File
@@ -19,9 +19,9 @@
android:layout_height="wrap_content">
<LinearLayout
android:id="@+id/orgTeamHeadFrame"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/orgCreate"
android:padding="8dp"
android:orientation="vertical">
@@ -37,9 +37,9 @@
</LinearLayout>
<com.google.android.flexbox.FlexboxLayout
android:id="@+id/orgTeamSection"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:id="@+id/orgTeamSection"
app:flexWrap="wrap"
app:alignItems="stretch"
android:padding="8dp"
app/src/main/res/layout/bottom_sheet_profile.xml
+2 -2
View File
@@ -19,9 +19,9 @@
android:layout_height="wrap_content">
<LinearLayout
android:id="@+id/myProfileHeadFrame"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/orgCreate"
android:padding="8dp"
android:orientation="vertical">
@@ -37,9 +37,9 @@
</LinearLayout>
<com.google.android.flexbox.FlexboxLayout
android:id="@+id/myProfileSection"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:id="@+id/myProfileSection"
app:flexWrap="wrap"
app:alignItems="stretch"
android:padding="8dp"
app/src/main/res/layout/bottom_sheet_pull_request_filter.xml
+2 -2
View File
@@ -19,9 +19,9 @@
android:layout_height="wrap_content">
<LinearLayout
android:id="@+id/prFilterHeadFrame"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/orgCreate"
android:padding="8dp"
android:orientation="vertical">
@@ -37,9 +37,9 @@
</LinearLayout>
<com.google.android.flexbox.FlexboxLayout
android:id="@+id/prFilterSection"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:id="@+id/prFilterSection"
app:flexWrap="wrap"
app:alignItems="stretch"
android:padding="8dp"
app/src/main/res/layout/bottom_sheet_releases_tags.xml
+2 -2
View File
@@ -19,9 +19,9 @@
android:layout_height="wrap_content">
<LinearLayout
android:id="@+id/releasesTagsHeadFrame"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/orgCreate"
android:padding="8dp"
android:orientation="vertical">
@@ -37,9 +37,9 @@
</LinearLayout>
<com.google.android.flexbox.FlexboxLayout
android:id="@+id/releasesTagsFilterSection"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:id="@+id/releasesTagsFilterSection"
app:flexWrap="wrap"
app:alignItems="stretch"
android:padding="8dp"
app/src/main/res/layout/bottom_sheet_repo.xml
+4 -2
View File
@@ -19,9 +19,9 @@
android:layout_height="wrap_content">
<LinearLayout
android:id="@+id/repoCreateHeadFrame"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/repoCreate"
android:padding="8dp"
android:orientation="vertical">
@@ -37,9 +37,9 @@
</LinearLayout>
<com.google.android.flexbox.FlexboxLayout
android:id="@+id/repoCreateSection"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:id="@+id/repoCreateSection"
app:flexWrap="wrap"
app:alignItems="stretch"
android:padding="8dp"
@@ -146,6 +146,7 @@
android:background="?attr/dividerColor" />
<LinearLayout
android:id="@+id/repoOthersHeadFrame"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="8dp"
@@ -163,6 +164,7 @@
</LinearLayout>
<com.google.android.flexbox.FlexboxLayout
android:id="@+id/repoOthersSection"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:flexWrap="wrap"
app/src/main/res/layout/bottom_sheet_single_issue.xml
+197 -187
View File
@@ -2,7 +2,6 @@
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
@@ -26,207 +25,218 @@
android:layout_marginBottom="5dp"
android:orientation="horizontal" />
<TextView
android:id="@+id/openFilesDiff"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:background="?android:attr/selectableItemBackground"
android:focusable="true"
android:clickable="true"
android:drawablePadding="24dp"
android:padding="12dp"
android:text="@string/openFileDiffText"
android:textColor="?attr/primaryTextColor"
android:textSize="16sp"
android:visibility="gone"
app:drawableStartCompat="@drawable/ic_file"
tools:visibility="visible" />
<TextView
android:id="@+id/mergePullRequest"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:background="?android:attr/selectableItemBackground"
android:focusable="true"
android:clickable="true"
android:drawablePadding="24dp"
android:padding="12dp"
android:text="@string/mergePullRequestText"
android:textColor="?attr/primaryTextColor"
android:textSize="16sp"
app:drawableStartCompat="@drawable/ic_pull_request" />
<TextView
android:id="@+id/updatePullRequest"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:background="?android:attr/selectableItemBackground"
android:focusable="true"
android:clickable="true"
android:drawablePadding="24dp"
android:padding="12dp"
android:text="@string/updatePullRequestText"
android:textColor="?attr/primaryTextColor"
android:textSize="16sp"
app:drawableStartCompat="@drawable/ic_update" />
<TextView
android:id="@+id/deletePrHeadBranch"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:background="?android:attr/selectableItemBackground"
android:focusable="true"
android:clickable="true"
android:drawablePadding="24dp"
android:padding="12dp"
android:text="@string/deletePrHeadBranch"
android:textColor="?attr/primaryTextColor"
android:textSize="16sp"
app:drawableStartCompat="@drawable/ic_branch" />
<TextView
android:id="@+id/editIssue"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:background="?android:attr/selectableItemBackground"
android:focusable="true"
android:clickable="true"
android:drawablePadding="24dp"
android:padding="12dp"
android:text="@string/editIssue"
android:textColor="?attr/primaryTextColor"
android:textSize="16sp"
app:drawableStartCompat="@drawable/ic_edit" />
<TextView
android:id="@+id/addRemoveAssignees"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:background="?android:attr/selectableItemBackground"
android:focusable="true"
android:clickable="true"
android:drawablePadding="24dp"
android:padding="12dp"
android:text="@string/addRemoveAssignees"
android:textColor="?attr/primaryTextColor"
android:textSize="16sp"
app:drawableStartCompat="@drawable/ic_person_add" />
<TextView
android:id="@+id/editLabels"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:background="?android:attr/selectableItemBackground"
android:focusable="true"
android:clickable="true"
android:drawablePadding="24dp"
android:padding="12dp"
android:text="@string/singleIssueEditLabels"
android:textColor="?attr/primaryTextColor"
android:textSize="16sp"
app:drawableStartCompat="@drawable/ic_label" />
<TextView
android:id="@+id/subscribeIssue"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:background="?android:attr/selectableItemBackground"
android:focusable="true"
android:clickable="true"
android:drawablePadding="24dp"
android:padding="12dp"
android:text="@string/singleIssueSubscribe"
android:textColor="?attr/primaryTextColor"
android:textSize="16sp"
app:drawableStartCompat="@drawable/ic_unwatch" />
<TextView
android:id="@+id/unsubscribeIssue"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:background="?android:attr/selectableItemBackground"
android:focusable="true"
android:clickable="true"
android:drawablePadding="24dp"
android:padding="12dp"
android:text="@string/singleIssueUnSubscribe"
android:textColor="?attr/primaryTextColor"
android:textSize="16sp"
android:visibility="gone"
app:drawableStartCompat="@drawable/ic_watchers"
tools:visibility="visible" />
<View
android:id="@+id/shareDivider"
android:id="@+id/reactionDivider"
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_height="4dp"
android:layout_marginTop="12dp"
android:layout_marginBottom="12dp"
android:layout_marginStart="64dp"
android:layout_marginBottom="16dp"
android:background="?attr/dividerColor" />
<TextView
android:id="@+id/shareIssue"
<LinearLayout
android:id="@+id/bottomSheetHeaderFrame"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:background="?android:attr/selectableItemBackground"
android:focusable="true"
android:clickable="true"
android:drawablePadding="24dp"
android:padding="12dp"
android:text="@string/shareIssue"
android:textColor="?attr/primaryTextColor"
android:textSize="16sp"
app:drawableStartCompat="@drawable/ic_share" />
android:padding="8dp"
android:orientation="vertical">
<TextView
android:id="@+id/copyIssueUrl"
<TextView
android:id="@+id/bottomSheetHeader"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:text="@string/issue"
android:textColor="?attr/primaryTextColor"
android:textSize="16sp" />
</LinearLayout>
<com.google.android.flexbox.FlexboxLayout
android:id="@+id/issuePrtSection"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:background="?android:attr/selectableItemBackground"
android:focusable="true"
android:clickable="true"
android:drawablePadding="24dp"
android:padding="12dp"
android:text="@string/copyIssueUrl"
android:textColor="?attr/primaryTextColor"
android:textSize="16sp"
app:drawableStartCompat="@drawable/ic_copy" />
android:layout_height="match_parent"
app:flexWrap="wrap"
app:alignItems="stretch"
android:padding="8dp"
app:alignContent="stretch" >
<TextView
android:id="@+id/openFilesDiff"
android:layout_width="98dp"
android:layout_height="100dp"
android:padding="8dp"
android:background="?android:attr/selectableItemBackgroundBorderless"
android:gravity="center"
app:layout_alignSelf="flex_start"
app:drawableTopCompat="@drawable/ic_file"
android:text="@string/tabTextFiles"
android:textColor="?attr/primaryTextColor"
android:visibility="gone"
android:textSize="16sp" />
<TextView
android:id="@+id/mergePullRequest"
android:layout_width="98dp"
android:layout_height="100dp"
android:padding="8dp"
android:background="?android:attr/selectableItemBackgroundBorderless"
android:gravity="center"
app:layout_alignSelf="flex_start"
app:drawableTopCompat="@drawable/ic_pull_request"
android:text="@string/mergePullRequestButtonText"
android:textColor="?attr/primaryTextColor"
android:textSize="16sp" />
<TextView
android:id="@+id/updatePullRequest"
android:layout_width="98dp"
android:layout_height="100dp"
android:padding="8dp"
android:background="?android:attr/selectableItemBackgroundBorderless"
android:gravity="center"
app:layout_alignSelf="flex_start"
app:drawableTopCompat="@drawable/ic_update"
android:text="@string/newUpdateButtonCopy"
android:textColor="?attr/primaryTextColor"
android:textSize="16sp" />
<TextView
android:id="@+id/deletePrHeadBranch"
android:layout_width="98dp"
android:layout_height="100dp"
android:padding="8dp"
android:background="?android:attr/selectableItemBackgroundBorderless"
android:gravity="center"
app:layout_alignSelf="flex_start"
app:drawableTopCompat="@drawable/ic_branch"
android:text="@string/menuDeleteText"
android:textColor="?attr/primaryTextColor"
android:textSize="16sp" />
<TextView
android:id="@+id/editIssue"
android:layout_width="98dp"
android:layout_height="100dp"
android:padding="8dp"
android:background="?android:attr/selectableItemBackgroundBorderless"
android:gravity="center"
app:layout_alignSelf="flex_start"
app:drawableTopCompat="@drawable/ic_edit"
android:text="@string/menuEditText"
android:textColor="?attr/primaryTextColor"
android:textSize="16sp" />
<TextView
android:id="@+id/addRemoveAssignees"
android:layout_width="98dp"
android:layout_height="100dp"
android:padding="8dp"
android:background="?android:attr/selectableItemBackgroundBorderless"
android:gravity="center"
app:layout_alignSelf="flex_start"
app:drawableTopCompat="@drawable/ic_person_add"
android:text="@string/newIssueAssigneesListTitle"
android:textColor="?attr/primaryTextColor"
android:textSize="16sp" />
<TextView
android:id="@+id/editLabels"
android:layout_width="98dp"
android:layout_height="100dp"
android:padding="8dp"
android:background="?android:attr/selectableItemBackgroundBorderless"
android:gravity="center"
app:layout_alignSelf="flex_start"
app:drawableTopCompat="@drawable/ic_label"
android:text="@string/newIssueLabelsTitle"
android:textColor="?attr/primaryTextColor"
android:textSize="16sp" />
<TextView
android:id="@+id/subscribeIssue"
android:layout_width="98dp"
android:layout_height="100dp"
android:padding="8dp"
android:background="?android:attr/selectableItemBackgroundBorderless"
android:gravity="center"
app:layout_alignSelf="flex_start"
app:drawableTopCompat="@drawable/ic_unwatch"
android:text="@string/singleIssueSubscribe"
android:textColor="?attr/primaryTextColor"
android:textSize="16sp" />
<TextView
android:id="@+id/unsubscribeIssue"
android:layout_width="98dp"
android:layout_height="100dp"
android:padding="8dp"
android:background="?android:attr/selectableItemBackgroundBorderless"
android:gravity="center"
app:layout_alignSelf="flex_start"
app:drawableTopCompat="@drawable/ic_watchers"
android:text="@string/singleIssueUnSubscribe"
android:textColor="?attr/primaryTextColor"
android:visibility="gone"
android:textSize="16sp" />
<TextView
android:id="@+id/closeIssue"
android:layout_width="98dp"
android:layout_height="100dp"
android:padding="8dp"
android:background="?android:attr/selectableItemBackgroundBorderless"
android:gravity="center"
app:layout_alignSelf="flex_start"
app:drawableTopCompat="@drawable/ic_issue_closed"
android:text="@string/close"
android:textColor="?attr/primaryTextColor"
android:textSize="16sp" />
</com.google.android.flexbox.FlexboxLayout>
<View
android:id="@+id/dividerCloseReopenIssue"
android:id="@+id/issuePrDivider"
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginTop="12dp"
android:layout_marginBottom="12dp"
android:layout_marginStart="64dp"
android:layout_height="4dp"
android:layout_marginBottom="16dp"
android:background="?attr/dividerColor" />
<TextView
android:id="@+id/closeIssue"
<com.google.android.flexbox.FlexboxLayout
android:id="@+id/issuePrShareSection"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:background="?android:attr/selectableItemBackground"
android:focusable="true"
android:clickable="true"
android:drawablePadding="24dp"
android:padding="12dp"
android:text="@string/closeIssue"
android:textColor="?attr/primaryTextColor"
android:textSize="16sp"
app:drawableStartCompat="@drawable/ic_issue_closed" />
android:layout_height="match_parent"
app:flexWrap="wrap"
app:alignItems="stretch"
android:padding="8dp"
app:alignContent="stretch" >
<TextView
android:id="@+id/copyIssueUrl"
android:layout_width="98dp"
android:layout_height="100dp"
android:padding="8dp"
android:background="?android:attr/selectableItemBackgroundBorderless"
android:gravity="center"
app:layout_alignSelf="flex_start"
app:drawableTopCompat="@drawable/ic_copy"
android:text="@string/genericCopyUrl"
android:textColor="?attr/primaryTextColor"
android:textSize="16sp" />
<TextView
android:id="@+id/shareIssue"
android:layout_width="98dp"
android:layout_height="100dp"
android:padding="8dp"
android:background="?android:attr/selectableItemBackgroundBorderless"
android:gravity="center"
app:layout_alignSelf="flex_start"
app:drawableTopCompat="@drawable/ic_share"
android:text="@string/share"
android:textColor="?attr/primaryTextColor"
android:textSize="16sp" />
</com.google.android.flexbox.FlexboxLayout>
</LinearLayout>
app/src/main/res/layout/bottom_sheet_tag_in_list.xml
+2 -2
View File
@@ -19,9 +19,9 @@
android:layout_height="wrap_content">
<LinearLayout
android:id="@+id/tagsListHeadFrame"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/orgCreate"
android:padding="8dp"
android:orientation="vertical">
@@ -37,9 +37,9 @@
</LinearLayout>
<com.google.android.flexbox.FlexboxLayout
android:id="@+id/tagsListSection"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:id="@+id/tagsSection"
app:flexWrap="wrap"
app:alignItems="stretch"
android:padding="8dp"
app/src/main/res/layout/bottom_sheet_user_profile.xml
+2 -2
View File
@@ -19,9 +19,9 @@
android:orientation="vertical">
<LinearLayout
android:id="@+id/usersProfileHeadFrame"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/orgCreate"
android:padding="8dp"
android:orientation="vertical">
@@ -37,9 +37,9 @@
</LinearLayout>
<com.google.android.flexbox.FlexboxLayout
android:id="@+id/usersProfileSection"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:id="@+id/usersProfileSection"
app:flexWrap="wrap"
app:alignItems="stretch"
android:padding="8dp"
app/src/main/res/values/strings.xml
+2 -6
View File
@@ -123,6 +123,7 @@
<string name="tabTextBranches">Branches</string>
<string name="tabTextCollaborators">Collaborators</string>
<string name="tabPullRequests">Pull Requests</string>
<string name="pullRequest">Pull Request</string>
<string name="infoTabRepoSize">Size</string>
<string name="infoTabRepoDefaultBranch">Default Branch</string>
@@ -499,6 +500,7 @@
<string name="organization">Organization</string>
<string name="addRemove">Add / Remove</string>
<string name="download">Download</string>
<string name="reopen">Reopen</string>
<!-- generic copy -->
<string name="exploreUsers">Explore users</string>
@@ -522,8 +524,6 @@
<string name="loginTokenError">Token is required</string>
<string name="prDeletedFork">Deleted Fork</string>
<string name="editPrText">Edit Pull Request</string>
<string name="copyPrUrlText">Copy Pull Request URL</string>
<string name="editPrNavHeader">Edit Pull Request #%1$s</string>
<string name="editPrSuccessMessage">Pull Request updated</string>
<string name="fileDiffViewHeader">%1$s Files Changed</string>
@@ -531,7 +531,6 @@
<string name="updatePullRequestText">Update Pull Request</string>
<string name="openFileDiffText">Show Changed Files</string>
<string name="mergePullRequestText">Merge Pull Request</string>
<string name="deletePrHeadBranch">Delete head branch</string>
<string name="deleteBranchSuccess">Branch deleted successfully</string>
<string name="deleteBranchError">Could not delete branch</string>
<string name="deleteBranchErrorNotFound">Branch does not exist</string>
@@ -563,7 +562,6 @@
<string name="sizeCopy">Size</string>
<string name="shareIssue">Share Issue</string>
<string name="sharePr">Share Pull Request</string>
<string name="shareRepository">Share Repository</string>
<string name="createRepository">Create Repository</string>
<string name="commitTitle">Commits</string>
@@ -739,8 +737,6 @@
<string name="updateStrategyRebase">Rebase</string>
<string name="selectUpdateStrategy">Select Update Strategy</string>
<string name="closePr">Close Pull Request</string>
<string name="reopenPr">Reopen Pull Request</string>
<string name="userAvatar">Avatar</string>
<string name="tags">Tags</string>
<string name="releasesTags">Releases/Tags</string>