diff --git a/app/src/main/java/org/mian/gitnex/activities/AddNewAccountActivity.java b/app/src/main/java/org/mian/gitnex/activities/AddNewAccountActivity.java
index 0acefd13..e8d120f1 100644
--- a/app/src/main/java/org/mian/gitnex/activities/AddNewAccountActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/AddNewAccountActivity.java
@@ -41,7 +41,7 @@ public class AddNewAccountActivity extends BaseActivity {
private String spinnerSelectedValue;
private Version giteaVersion;
private int maxResponseItems = 50;
- private int defaultPagingNumber = 25;
+ private int defaultPagingNumber = 30;
@Override
public void onCreate(Bundle savedInstanceState) {
diff --git a/app/src/main/java/org/mian/gitnex/database/db/GitnexDatabase.java b/app/src/main/java/org/mian/gitnex/database/db/GitnexDatabase.java
index 0f826b6e..ed74a9b1 100644
--- a/app/src/main/java/org/mian/gitnex/database/db/GitnexDatabase.java
+++ b/app/src/main/java/org/mian/gitnex/database/db/GitnexDatabase.java
@@ -57,7 +57,7 @@ public abstract class GitnexDatabase extends RoomDatabase {
@Override
public void migrate(@NonNull SupportSQLiteDatabase database) {
database.execSQL("ALTER TABLE 'userAccounts' ADD COLUMN 'maxResponseItems' INTEGER NOT NULL DEFAULT 50");
- database.execSQL("ALTER TABLE 'userAccounts' ADD COLUMN 'defaultPagingNumber' INTEGER NOT NULL DEFAULT 25");
+ database.execSQL("ALTER TABLE 'userAccounts' ADD COLUMN 'defaultPagingNumber' INTEGER NOT NULL DEFAULT 30");
}
};
diff --git a/app/src/main/java/org/mian/gitnex/fragments/BottomSheetSingleIssueFragment.java b/app/src/main/java/org/mian/gitnex/fragments/BottomSheetSingleIssueFragment.java
index 21445715..f0239d5a 100644
--- a/app/src/main/java/org/mian/gitnex/fragments/BottomSheetSingleIssueFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/BottomSheetSingleIssueFragment.java
@@ -249,7 +249,11 @@ public class BottomSheetSingleIssueFragment extends BottomSheetDialogFragment {
binding.commentReactionButtons.setVisibility(View.GONE);
binding.reactionDivider.setVisibility(View.GONE);
binding.bottomSheetHeaderFrame.setVisibility(View.GONE);
- binding.issuePrDivider.setVisibility(View.GONE);
+ binding.mergePullRequest.setVisibility(View.GONE);
+ binding.updatePullRequest.setVisibility(View.GONE);
+ if(issue.getIssueType().equalsIgnoreCase("issue")) {
+ binding.issuePrDivider.setVisibility(View.GONE);
+ }
}
else if(!canPush) {
binding.addRemoveAssignees.setVisibility(View.GONE);
diff --git a/app/src/main/res/layout/bottom_sheet_issue_comments.xml b/app/src/main/res/layout/bottom_sheet_issue_comments.xml
index 8a2ea86a..418f5e90 100644
--- a/app/src/main/res/layout/bottom_sheet_issue_comments.xml
+++ b/app/src/main/res/layout/bottom_sheet_issue_comments.xml
@@ -165,7 +165,7 @@
android:gravity="center"
app:layout_alignSelf="flex_start"
app:drawableTopCompat="@drawable/ic_browser"
- android:text="@string/isOpen"
+ android:text="@string/openInBrowser"
android:textColor="?attr/primaryTextColor"
android:textSize="16sp" />
diff --git a/app/src/main/res/layout/bottom_sheet_organization.xml b/app/src/main/res/layout/bottom_sheet_organization.xml
index 710452f0..718d8a37 100644
--- a/app/src/main/res/layout/bottom_sheet_organization.xml
+++ b/app/src/main/res/layout/bottom_sheet_organization.xml
@@ -154,7 +154,7 @@
android:gravity="center"
app:layout_alignSelf="flex_start"
app:drawableTopCompat="@drawable/ic_browser"
- android:text="@string/isOpen"
+ android:text="@string/openInBrowser"
android:textColor="?attr/primaryTextColor"
android:textSize="16sp" />
diff --git a/app/src/main/res/layout/bottom_sheet_repo.xml b/app/src/main/res/layout/bottom_sheet_repo.xml
index 886e120b..53348845 100644
--- a/app/src/main/res/layout/bottom_sheet_repo.xml
+++ b/app/src/main/res/layout/bottom_sheet_repo.xml
@@ -259,7 +259,7 @@
app:layout_alignSelf="flex_start"
android:gravity="center"
app:drawableTopCompat="@drawable/ic_browser"
- android:text="@string/isOpen"
+ android:text="@string/openInBrowser"
android:textColor="?attr/primaryTextColor"
android:textSize="16sp" />
diff --git a/app/src/main/res/layout/bottom_sheet_single_issue.xml b/app/src/main/res/layout/bottom_sheet_single_issue.xml
index feb69301..48f68b24 100644
--- a/app/src/main/res/layout/bottom_sheet_single_issue.xml
+++ b/app/src/main/res/layout/bottom_sheet_single_issue.xml
@@ -85,6 +85,7 @@
app:drawableTopCompat="@drawable/ic_pull_request"
android:text="@string/mergePullRequestButtonText"
android:textColor="?attr/primaryTextColor"
+ android:visibility="gone"
android:textSize="16sp" />
@@ -245,7 +247,7 @@
android:gravity="center"
app:layout_alignSelf="flex_start"
app:drawableTopCompat="@drawable/ic_browser"
- android:text="@string/isOpen"
+ android:text="@string/openInBrowser"
android:textColor="?attr/primaryTextColor"
android:textSize="16sp" />
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index e01345a8..90908b6c 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -505,6 +505,7 @@
Add / Remove
Download
Reopen
+ Open in Browser
Explore users
@@ -553,6 +554,7 @@
Merge Strategy
Select merge strategy
Not allowed to merge [Reason: Does not have enough approvals]
+ Delete Branch
Please wait for the file to load to memory
File saved successfully