Merge pull request 'prepare release 2.5' (#434) from prepare-release-2.5 into release-2.5

Reviewed-on: https://gitea.com/gitnex/GitNex/pulls/434

app/build.gradle

@@ -6,8 +6,8 @@ android {
         applicationId "org.mian.gitnex"
         minSdkVersion 21
         targetSdkVersion 29
-        versionCode 104
+        versionCode 250
-        versionName "2.5.0-rc4"
+        versionName "2.5.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     buildTypes {

app/src/main/java/org/mian/gitnex/actions/IssueActions.java

@@ -120,11 +120,18 @@ public class IssueActions {
 
                         tinyDb.putBoolean("resumeIssues", true);
                         tinyDb.putBoolean("resumeClosedIssues", true);
+
                         if(issueState.equals("closed")) {
+
                             Toasty.info(ctx, ctx.getString(R.string.issueStateClosed));
+                            tinyDb.putString("issueState", "closed");
+
                         }
                         else if(issueState.equals("open")) {
+
                             Toasty.info(ctx, ctx.getString(R.string.issueStateReopened));
+                            tinyDb.putString("issueState", "open");
+
                         }
 
                     }
@@ -191,9 +198,14 @@ public class IssueActions {
 
                 if(response.isSuccessful()) {
 
-                    Toasty.info(ctx, ctx.getString(R.string.issueSubscribtion));
+                    if(response.code() == 201) {
-                    subscribeIssue.setVisibility(View.GONE);
+
                         unsubscribeIssue.setVisibility(View.VISIBLE);
+                        subscribeIssue.setVisibility(View.GONE);
+                        Toasty.info(ctx, ctx.getString(R.string.issueSubscribtion));
+                        tinyDB.putString("issueSubscriptionState", "unsubscribeToIssue");
+
+                    }
 
                 }
                 else if(response.code() == 401) {
@@ -248,9 +260,14 @@ public class IssueActions {
 
                 if(response.isSuccessful()) {
 
-                    Toasty.info(ctx, ctx.getString(R.string.issueUnsubscribtion));
+                    if(response.code() == 201) {
+
                         unsubscribeIssue.setVisibility(View.GONE);
                         subscribeIssue.setVisibility(View.VISIBLE);
+                        Toasty.info(ctx, ctx.getString(R.string.issueUnsubscribtion));
+                        tinyDB.putString("issueSubscriptionState", "subscribeToIssue");
+
+                    }
 
                 }
                 else if(response.code() == 401) {

app/src/main/java/org/mian/gitnex/activities/RepoDetailActivity.java

@@ -165,8 +165,8 @@ public class RepoDetailActivity extends BaseActivity implements BottomSheetRepoF
 
             // pull count
             if (textViewBadgePull.getText() != "") { // only show if API returned a number
-                Objects.requireNonNull(tabLayout.getTabAt(3)).setCustomView(tabHeader4);
+                Objects.requireNonNull(tabLayout.getTabAt(4)).setCustomView(tabHeader4);
-                TabLayout.Tab tabOpenPulls = tabLayout.getTabAt(3);
+                TabLayout.Tab tabOpenPulls = tabLayout.getTabAt(4);
                 assert tabOpenPulls != null;
                 TextView openPullTabView = Objects.requireNonNull(tabOpenPulls.getCustomView()).findViewById(R.id.counterBadgePullText);
                 openPullTabView.setTextColor(textColor);
@@ -299,18 +299,18 @@ public class RepoDetailActivity extends BaseActivity implements BottomSheetRepoF
 
             Fragment fragment = null;
             switch (position) {
-                case 0: // information
+                case 0: // files
-                    return RepoInfoFragment.newInstance(repoOwner, repoName);
-                case 1: // files
                     return FilesFragment.newInstance(repoOwner, repoName);
+                case 1: // information
+                    return RepoInfoFragment.newInstance(repoOwner, repoName);
                 case 2: // issues
                     fragment = new IssuesMainFragment();
                     break;
-                case 3: // pull requests
+                case 3: // branches
+                    return BranchesFragment.newInstance(repoOwner, repoName);
+                case 4: // pull requests
                     fragment = new PullRequestsFragment();
                     break;
-                case 4: // branches
-                    return BranchesFragment.newInstance(repoOwner, repoName);
                 case 5: // releases
                     return ReleasesFragment.newInstance(repoOwner, repoName);
                 case 6: // milestones

app/src/main/java/org/mian/gitnex/fragments/BottomSheetSingleIssueFragment.java

@@ -15,9 +15,6 @@ import org.mian.gitnex.activities.AddRemoveLabelsActivity;
 import org.mian.gitnex.activities.EditIssueActivity;
 import org.mian.gitnex.activities.FileDiffActivity;
 import org.mian.gitnex.activities.MergePullRequestActivity;
-import org.mian.gitnex.activities.ReplyToIssueActivity;
-import org.mian.gitnex.clients.RetrofitClient;
-import org.mian.gitnex.helpers.AlertDialogs;
 import org.mian.gitnex.helpers.Toasty;
 import org.mian.gitnex.util.TinyDB;
 import androidx.annotation.NonNull;
@@ -25,8 +22,6 @@ import androidx.annotation.Nullable;
 import android.content.ClipboardManager;
 import android.content.ClipData;
 import java.util.Objects;
-import retrofit2.Call;
-import retrofit2.Callback;
 
 /**
  * Author M M Arif
@@ -187,30 +182,26 @@ public class BottomSheetSingleIssueFragment extends BottomSheetDialogFragment {
             if (tinyDB.getString("issueState").equals("open")) { // close issue
 
                 reOpenIssue.setVisibility(View.GONE);
+                closeIssue.setVisibility(View.VISIBLE);
 
-                closeIssue.setOnClickListener(new View.OnClickListener() {
+                closeIssue.setOnClickListener(closeSingleIssue -> {
-                    @Override
-                    public void onClick(View v) {
 
                     IssueActions.closeReopenIssue(ctx, Integer.parseInt(tinyDB.getString("issueNumber")), "closed");
                     dismiss();
 
-                    }
                 });
 
             }
             else if (tinyDB.getString("issueState").equals("closed")) {
 
                 closeIssue.setVisibility(View.GONE);
+                reOpenIssue.setVisibility(View.VISIBLE);
 
-                reOpenIssue.setOnClickListener(new View.OnClickListener() {
+                reOpenIssue.setOnClickListener(reOpenSingleIssue -> {
-                    @Override
-                    public void onClick(View v) {
 
                     IssueActions.closeReopenIssue(ctx, Integer.parseInt(tinyDB.getString("issueNumber")), "open");
                     dismiss();
 
-                    }
                 });
 
             }
@@ -223,22 +214,18 @@ public class BottomSheetSingleIssueFragment extends BottomSheetDialogFragment {
 
         }
 
-        subscribeIssue.setOnClickListener(new View.OnClickListener() {
+        subscribeIssue.setOnClickListener(subscribeToIssue -> {
-            @Override
-            public void onClick(View v) {
 
             IssueActions.subscribe(ctx, subscribeIssue, unsubscribeIssue);
+            //dismiss();
 
-            }
         });
 
-        unsubscribeIssue.setOnClickListener(new View.OnClickListener() {
+        unsubscribeIssue.setOnClickListener(unsubscribeToIssue -> {
-            @Override
-            public void onClick(View v) {
 
             IssueActions.unsubscribe(ctx, subscribeIssue, unsubscribeIssue);
+            //dismiss();
 
-            }
         });
 
         //if RepoWatch True Provide Unsubscribe first

app/src/main/res/layout/activity_repo_detail.xml

@@ -44,36 +44,36 @@
             app:tabTextColor="?attr/primaryTextColor"
             android:layout_height="wrap_content">
 
-            <com.google.android.material.tabs.TabItem
-                android:id="@+id/tabItem1_info"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/tab_text_info" />
-
             <com.google.android.material.tabs.TabItem
                 android:id="@+id/tabItemFiles"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@string/tab_text_files" />
 
+            <com.google.android.material.tabs.TabItem
+                android:id="@+id/tabItem1_info"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/tab_text_info" />
+
             <com.google.android.material.tabs.TabItem
                 android:id="@+id/tabItem2_issues"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@string/pageTitleIssues" />
 
-            <com.google.android.material.tabs.TabItem
-                android:id="@+id/tabItemPullRequests"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/tabPullRequests" />
-
             <com.google.android.material.tabs.TabItem
                 android:id="@+id/tabItem5_branches"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@string/tab_text_branches" />
 
+            <com.google.android.material.tabs.TabItem
+                android:id="@+id/tabItemPullRequests"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/tabPullRequests" />
+
             <com.google.android.material.tabs.TabItem
                 android:id="@+id/tabItem6_releases"
                 android:layout_width="wrap_content"

app/src/main/res/layout/bottom_sheet_single_issue_layout.xml

@@ -88,7 +88,8 @@
                 android:drawablePadding="24dp"
                 android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
-                android:padding="16dp" />
+                android:padding="16dp"
+                android:visibility="gone" />
 
             <TextView
                 android:id="@+id/unsubscribeIssue"

app/src/main/res/values-ar/strings.xml

@@ -497,4 +497,10 @@
     <string name="milestoneStatusUpdate">Milestone status updated successfully</string>
     <string name="tabIssueOpen">Open</string>
     <string name="tabIssueClosed">Closed</string>
+    <string name="errorOnLogin">We cannot reach the server, please check your server status</string>
+    <string name="reportViewerHeader">Crash Reports</string>
+    <string name="settingsEnableReportsText">Enable Crash Reports</string>
+    <string name="crashTitle">GitNex has stopped :(</string>
+    <string name="setCrashReports">Crash reports</string>
+    <string name="crashMessage">You can tap the OK button to send the crash report by email. It will help to fix it :)\n\nYou can also add additional content in the email. Thank you!</string>
 </resources>

app/src/main/res/values-de/strings.xml

@@ -70,7 +70,7 @@
     <string name="emptyFieldUsername">Benutzername ist erforderlich</string>
     <string name="emptyFieldPassword">Passwort ist erforderlich</string>
     <string name="checkNetConnection">Kann nicht auf das Netzwerk zugreifen. Bitte überprüfe die Internetverbindung</string>
-    <string name="netConnectionIsBack">Juhu, wir haben Internetverbindung!</string>
+    <string name="netConnectionIsBack">Juhu, wir haben eine Internetverbindung!</string>
     <string name="repoNameErrorEmpty">Der Repository Name ist leer.</string>
     <string name="repoNameErrorInvalid">Der Repository Name ist nicht gültig. [a&#8211;z A&#8211;Z 0&#8211;9 &#8211; _]</string>
     <string name="repoNameErrorReservedName">Repository-Name ist reserviert</string>
@@ -495,6 +495,12 @@
     <string name="closeMilestone">Meilenstein schließen</string>
     <string name="openMilestone">Meilenstein wieder öffnen</string>
     <string name="milestoneStatusUpdate">Meilensteinstatus erfolgreich aktualisiert</string>
-    <string name="tabIssueOpen">Offene</string>
+    <string name="tabIssueOpen">Offen</string>
-    <string name="tabIssueClosed">Geschlossene</string>
+    <string name="tabIssueClosed">Geschlossen</string>
+    <string name="errorOnLogin">Der Server kann nicht erreicht werden, bitte überprüfe deinen Serverstatus</string>
+    <string name="reportViewerHeader">Absturzberichte</string>
+    <string name="settingsEnableReportsText">Absturzberichte aktivieren</string>
+    <string name="crashTitle">GitNex hat gestoppt :(</string>
+    <string name="setCrashReports">Absturzberichte</string>
+    <string name="crashMessage">Klicke auf OK, um den Absturzbericht per E-Mail zu senden. Es wird helfen, diesen zu beheben :)\n\nDu könntest auch zusätzliche Infos in der E-Mail angeben. Danke für deine Hilfe!</string>
 </resources>

app/src/main/res/values-es/strings.xml

@@ -497,4 +497,10 @@
     <string name="milestoneStatusUpdate">Milestone status updated successfully</string>
     <string name="tabIssueOpen">Open</string>
     <string name="tabIssueClosed">Closed</string>
+    <string name="errorOnLogin">We cannot reach the server, please check your server status</string>
+    <string name="reportViewerHeader">Crash Reports</string>
+    <string name="settingsEnableReportsText">Enable Crash Reports</string>
+    <string name="crashTitle">GitNex has stopped :(</string>
+    <string name="setCrashReports">Crash reports</string>
+    <string name="crashMessage">You can tap the OK button to send the crash report by email. It will help to fix it :)\n\nYou can also add additional content in the email. Thank you!</string>
 </resources>

app/src/main/res/values-fa/strings.xml

@@ -500,4 +500,10 @@
     <string name="milestoneStatusUpdate">Milestone status updated successfully</string>
     <string name="tabIssueOpen">Open</string>
     <string name="tabIssueClosed">Closed</string>
+    <string name="errorOnLogin">We cannot reach the server, please check your server status</string>
+    <string name="reportViewerHeader">Crash Reports</string>
+    <string name="settingsEnableReportsText">Enable Crash Reports</string>
+    <string name="crashTitle">GitNex has stopped :(</string>
+    <string name="setCrashReports">Crash reports</string>
+    <string name="crashMessage">You can tap the OK button to send the crash report by email. It will help to fix it :)\n\nYou can also add additional content in the email. Thank you!</string>
 </resources>

app/src/main/res/values-fi/strings.xml

@@ -497,4 +497,10 @@
     <string name="milestoneStatusUpdate">Milestone status updated successfully</string>
     <string name="tabIssueOpen">Open</string>
     <string name="tabIssueClosed">Closed</string>
+    <string name="errorOnLogin">We cannot reach the server, please check your server status</string>
+    <string name="reportViewerHeader">Crash Reports</string>
+    <string name="settingsEnableReportsText">Enable Crash Reports</string>
+    <string name="crashTitle">GitNex has stopped :(</string>
+    <string name="setCrashReports">Crash reports</string>
+    <string name="crashMessage">You can tap the OK button to send the crash report by email. It will help to fix it :)\n\nYou can also add additional content in the email. Thank you!</string>
 </resources>

app/src/main/res/values-fr/strings.xml

@@ -120,8 +120,8 @@
     <string name="infoTabRepoForksCount">Bifurcations</string>
     <string name="infoTabRepoCreatedAt">Créé</string>
     <string name="infoTabRepoUpdatedAt">Dernière modification</string>
-    <string name="infoShowMoreInformation">Show More Information</string>
+    <string name="infoShowMoreInformation">Voir plus d’informations</string>
-    <string name="infoMoreInformation">More Information</string>
+    <string name="infoMoreInformation">Plus d’informations</string>
     <string name="timeAtText">à</string>
     <string name="createdText">Ouvert\u0020</string>
     <string name="dueDateText">Échéance</string>
@@ -213,8 +213,8 @@
     <string name="settingsPdfModeHeaderText">PDF mode nuit</string>
     <string name="fileViewerHeader">Visionneuse de fichiers</string>
     <string name="settingsCounterBadges">Compteurs</string>
-    <string name="settingsFileviewerSourceCodeHeaderText">Source Code Theme</string>
+    <string name="settingsFileviewerSourceCodeHeaderText">Thème du code source</string>
-    <string name="fileviewerSourceCodeThemeSelectorDialogTitle">Select Source Code Theme</string>
+    <string name="fileviewerSourceCodeThemeSelectorDialogTitle">Thème du code source</string>
     <!-- settings -->
     <string name="noMoreData">Aucune donnée</string>
     <string name="createLabel">Nouvelle étiquette</string>
@@ -495,6 +495,12 @@
     <string name="closeMilestone">Fermer le jalon</string>
     <string name="openMilestone">Ouvrir le jalon</string>
     <string name="milestoneStatusUpdate">Jalon mis à jour</string>
-    <string name="tabIssueOpen">Open</string>
+    <string name="tabIssueOpen">Ouvert</string>
-    <string name="tabIssueClosed">Closed</string>
+    <string name="tabIssueClosed">Fermé</string>
+    <string name="errorOnLogin">Impossible d’accéder au serveur, veuillez vérifier son statut</string>
+    <string name="reportViewerHeader">Rapports de plantage</string>
+    <string name="settingsEnableReportsText">Activer les rapports de plantage</string>
+    <string name="crashTitle">GitNex s’est arrêté :(</string>
+    <string name="setCrashReports">Rapports de plantage</string>
+    <string name="crashMessage">Appuyez sur OK pour nous envoyer le rapport de plantage par e-mail. Cela nous aidera à corriger le problème :)\n\nVous pouvez également y ajouter vos propres remarques. Merci !</string>
 </resources>

app/src/main/res/values-it/strings.xml

@@ -499,4 +499,10 @@ autorizzazione</string>
     <string name="milestoneStatusUpdate">Milestone status updated successfully</string>
     <string name="tabIssueOpen">Open</string>
     <string name="tabIssueClosed">Closed</string>
+    <string name="errorOnLogin">We cannot reach the server, please check your server status</string>
+    <string name="reportViewerHeader">Crash Reports</string>
+    <string name="settingsEnableReportsText">Enable Crash Reports</string>
+    <string name="crashTitle">GitNex has stopped :(</string>
+    <string name="setCrashReports">Crash reports</string>
+    <string name="crashMessage">You can tap the OK button to send the crash report by email. It will help to fix it :)\n\nYou can also add additional content in the email. Thank you!</string>
 </resources>

app/src/main/res/values-lv/strings.xml

@@ -497,4 +497,10 @@
     <string name="milestoneStatusUpdate">Milestone status updated successfully</string>
     <string name="tabIssueOpen">Open</string>
     <string name="tabIssueClosed">Closed</string>
+    <string name="errorOnLogin">We cannot reach the server, please check your server status</string>
+    <string name="reportViewerHeader">Crash Reports</string>
+    <string name="settingsEnableReportsText">Enable Crash Reports</string>
+    <string name="crashTitle">GitNex has stopped :(</string>
+    <string name="setCrashReports">Crash reports</string>
+    <string name="crashMessage">You can tap the OK button to send the crash report by email. It will help to fix it :)\n\nYou can also add additional content in the email. Thank you!</string>
 </resources>

app/src/main/res/values-pl/strings.xml

@@ -70,7 +70,7 @@
     <string name="emptyFieldUsername">Nazwa użytkownika jest wymagana</string>
     <string name="emptyFieldPassword">Hasło jest wymagane</string>
     <string name="checkNetConnection">Nie można uzyskać dostępu do sieci, sprawdź swoje połączenie internetowe</string>
-    <string name="netConnectionIsBack">Yay, We have Internet connection!</string>
+    <string name="netConnectionIsBack">Jej, mamy połączenie z Internetem!</string>
     <string name="repoNameErrorEmpty">Nazwa repozytorium jest pusta</string>
     <string name="repoNameErrorInvalid">Nazwa repozytorium jest nieprawidłowa. [a&#8211;z A&#8211;Z 0&#8211;9 &#8211; _]</string>
     <string name="repoNameErrorReservedName">Nazwa repozytorium jest zarezerwowana</string>
@@ -120,8 +120,8 @@
     <string name="infoTabRepoForksCount">Forki</string>
     <string name="infoTabRepoCreatedAt">Utworzono</string>
     <string name="infoTabRepoUpdatedAt">Ostatnia aktualizacja</string>
-    <string name="infoShowMoreInformation">Show More Information</string>
+    <string name="infoShowMoreInformation">Pokaż więcej informacji</string>
-    <string name="infoMoreInformation">More Information</string>
+    <string name="infoMoreInformation">Więcej informacji</string>
     <string name="timeAtText">w</string>
     <string name="createdText">Otwarty\u0020</string>
     <string name="dueDateText">Termin</string>
@@ -135,7 +135,7 @@
     <string name="issueTypePullRequest">Typ: Pull Request</string>
     <string name="issueCommenter">Komentujący:\u0020</string>
     <string name="issueMilestone">Etap %1$s</string>
-    <string name="dueDate">Due on %1$s</string>
+    <string name="dueDate">Termin %1$s</string>
     <string name="createdTime">Otwarto %1$s</string>
     <string name="assignedTo">Przypisano do: %1$s</string>
     <string name="commentButtonText">Komentarz</string>
@@ -143,15 +143,15 @@
     <string name="commentSuccess">Komentarz wysłany</string>
     <string name="commentError">Coś poszło nie tak, spróbuj ponownie</string>
     <string name="generalImgContentText">Awatar</string>
-    <string name="noDataMilestonesTab">Nie znaleziono kamieni milowych</string>
+    <string name="noDataMilestonesTab">Nie znaleziono etapów</string>
-    <string name="commitAuthor">Autor commit: %1$s</string>
+    <string name="commitAuthor">Autor commitu: %1$s</string>
     <string name="commitHash">Hash commita \n%1$s%2$s</string>
     <string name="releaseTitle">Tytuł wydania</string>
     <string name="releaseDescription">Opis wydania</string>
     <string name="releaseDownloadText">Pobrania</string>
     <string name="releaseType">Typ wydania</string>
-    <string name="releaseZip">Wydaj Zip</string>
+    <string name="releaseZip">Wydanie Zip</string>
-    <string name="releaseTar">Wydaj Tar</string>
+    <string name="releaseTar">Wydanie Tar</string>
     <string name="noDataReleasesTab">Nie znaleziono wydań</string>
     <string name="releaseTag">Tag: %1$s</string>
     <string name="collaboratorsNameToast">Współpracujący: %1$s</string>
@@ -213,8 +213,8 @@
     <string name="settingsPdfModeHeaderText">Tryb nocny PDF</string>
     <string name="fileViewerHeader">Przeglądarka plików</string>
     <string name="settingsCounterBadges">Odznaki liczników</string>
-    <string name="settingsFileviewerSourceCodeHeaderText">Source Code Theme</string>
+    <string name="settingsFileviewerSourceCodeHeaderText">Motyw kodu źródłowego</string>
-    <string name="fileviewerSourceCodeThemeSelectorDialogTitle">Select Source Code Theme</string>
+    <string name="fileviewerSourceCodeThemeSelectorDialogTitle">Wybierz motyw kodu źródłowego</string>
     <!-- settings -->
     <string name="noMoreData">Brak dostępnych danych</string>
     <string name="createLabel">Nowa etykieta</string>
@@ -245,10 +245,10 @@
     <!-- org tabbed layout str -->
     <string name="title_activity_org_detail">Szczegółowa aktywność organizacji</string>
     <string name="orgTabRepos">Repozytoria</string>
-    <string name="orgTabTeams">Drużyny</string>
+    <string name="orgTabTeams">Zespoły</string>
     <string name="orgTabMembers">Członkowie</string>
     <string name="orgCreateTeam">Nowy zespół</string>
-    <string name="noDataTeams">Nie znaleziono drużyn</string>
+    <string name="noDataTeams">Nie znaleziono zespołów</string>
     <string name="teamTitle">Nazwa zespołu</string>
     <string name="teamDescription">Opis zespołu</string>
     <string name="teamPermission">Pozwolenie: %1$s</string>
@@ -311,8 +311,8 @@
     <string name="addRemoveAssignees2">Dodaj przypisanych osób</string>
     <string name="addRemoveAssignees">Dodaj / Usuń przypisanych osób</string>
     <string name="assigneesUpdated">Zaktualizowano przypisanych</string>
-    <string name="singleIssueSubscribe">Subscribe</string>
+    <string name="singleIssueSubscribe">Subskrybuj</string>
-    <string name="singleIssueUnSubscribe">Unsubscribe</string>
+    <string name="singleIssueUnSubscribe">Anuluj subskrypcję</string>
     <!-- single issue section -->
     <!-- multi select dialog -->
     <string name="select_entry">Wybierz wpisy</string>
@@ -366,11 +366,11 @@
     <string name="repoWatchersInMenu">Obserwatorzy</string>
     <string name="noDataStargazers">Nie znaleziono gwiazdek</string>
     <string name="noDataWatchers">Nie znaleziono obserwatorów</string>
-    <string name="noDataWebsite">No website found</string>
+    <string name="noDataWebsite">Nie znaleziono strony internetowej</string>
     <string name="starMember">Gwiazdka</string>
     <string name="watcherMember">Obserwujący</string>
     <string name="commitLinkBranchesTab">Commit</string>
-    <string name="zipArchiveDownloadReleasesTab">Archiwum ZIP</string>
+    <string name="zipArchiveDownloadReleasesTab">Archiwum Zip</string>
     <string name="tarArchiveDownloadReleasesTab">Archiwum Tar</string>
     <!-- new file -->
     <string name="newFileNameTintCopy">Nazwa pliku</string>
@@ -433,7 +433,7 @@
     <string name="unWatchRepositorySuccess">Repozytorium usunięte z listy obserwacyjnej</string>
     <string name="versionUnsupportedOld">Wykryto nieobsługiwaną starą wersję(%1$s) Gitea. Proszę zaktualizować do najnowszej stabilnej wersji. Jeśli kontynuujesz, aplikacja może nie działać poprawnie.</string>
     <string name="versionSupportedOld">Wykryto starą wersję Gitea, proszę zaktualizować do najnowszej stabilnej wersji</string>
-    <string name="versionUnsupportedNew">Wykryto nową wersję Gitea! Proszę AKTUALIZUJ GitNex!</string>
+    <string name="versionUnsupportedNew">Wykryto nową wersję Gitea! Proszę ZAKTUALIZOWAĆ GitNex!</string>
     <string name="versionSupportedLatest">Wersja Gitea jest aktualna</string>
     <string name="versionDevelopment">Wersja rozwojowa Gitea</string>
     <string name="versionUnknow">Nie wykryto Gitea!</string>
@@ -446,7 +446,7 @@
     <string name="noDataPullRequests">Nie znaleziono pull requestów</string>
     <string name="prCreator">Twórca:\u0020</string>
     <string name="editPrText">Edytuj Pull Request</string>
-    <string name="copyPrUrlText">Skopiuj Pull Request URL</string>
+    <string name="copyPrUrlText">Skopiuj adres URL Pull Requesta</string>
     <string name="editPrNavHeader">Edytuj Pull Request #%1$s</string>
     <string name="editPrSuccessMessage">Zaktualizowano Pull Request</string>
     <string name="fileDiffViewHeader">%1$s Plików zmienionych</string>
@@ -488,13 +488,19 @@
     <string name="mtm_decision_once">Raz</string>
     <string name="mtm_decision_abort">Przerwij</string>
     <string name="issueCommentShare">Udostępnij komentarz</string>
-    <string name="issueSubscribtion">Issue Subscribed</string>
+    <string name="issueSubscribtion">Problem zasubskrybowany</string>
-    <string name="issueSubscribtionError">Issue Subscription failed</string>
+    <string name="issueSubscribtionError">Błąd subskrypcji</string>
-    <string name="issueUnsubscribtion">Issue Unsubscribed</string>
+    <string name="issueUnsubscribtion">Subskrypcja problemu anulowana</string>
-    <string name="issueUnsubscribtionError">Issue Un-Subscription failed</string>
+    <string name="issueUnsubscribtionError">Błąd anulowania subskrypcji</string>
-    <string name="closeMilestone">Close Milestone</string>
+    <string name="closeMilestone">Zamknij etap</string>
-    <string name="openMilestone">Open Milestone</string>
+    <string name="openMilestone">Otwórz etap</string>
-    <string name="milestoneStatusUpdate">Milestone status updated successfully</string>
+    <string name="milestoneStatusUpdate">Status etapu zaktualizowany pomyślnie</string>
-    <string name="tabIssueOpen">Open</string>
+    <string name="tabIssueOpen">Otwarte</string>
-    <string name="tabIssueClosed">Closed</string>
+    <string name="tabIssueClosed">Zamknięte</string>
+    <string name="errorOnLogin">Nie możemy połączyć się z serwerem, sprawdź status serwera</string>
+    <string name="reportViewerHeader">Raporty awarii</string>
+    <string name="settingsEnableReportsText">Włącz raporty awarii</string>
+    <string name="crashTitle">GitNex zatrzymał się :(</string>
+    <string name="setCrashReports">Raporty awarii</string>
+    <string name="crashMessage">Możesz nacisnąć przycisk OK, aby wysłać raport o awarii pocztą elektroniczną. Pomoże to naprawić to :)\n\nMożesz również dodać dodatkowe treści w wiadomości e-mail. Dziękujemy!</string>
 </resources>

app/src/main/res/values-pt/strings.xml

@@ -497,4 +497,10 @@
     <string name="milestoneStatusUpdate">Milestone status updated successfully</string>
     <string name="tabIssueOpen">Open</string>
     <string name="tabIssueClosed">Closed</string>
+    <string name="errorOnLogin">We cannot reach the server, please check your server status</string>
+    <string name="reportViewerHeader">Crash Reports</string>
+    <string name="settingsEnableReportsText">Enable Crash Reports</string>
+    <string name="crashTitle">GitNex has stopped :(</string>
+    <string name="setCrashReports">Crash reports</string>
+    <string name="crashMessage">You can tap the OK button to send the crash report by email. It will help to fix it :)\n\nYou can also add additional content in the email. Thank you!</string>
 </resources>

app/src/main/res/values-ru/strings.xml

@@ -497,4 +497,10 @@
     <string name="milestoneStatusUpdate">Milestone status updated successfully</string>
     <string name="tabIssueOpen">Open</string>
     <string name="tabIssueClosed">Closed</string>
+    <string name="errorOnLogin">We cannot reach the server, please check your server status</string>
+    <string name="reportViewerHeader">Crash Reports</string>
+    <string name="settingsEnableReportsText">Enable Crash Reports</string>
+    <string name="crashTitle">GitNex has stopped :(</string>
+    <string name="setCrashReports">Crash reports</string>
+    <string name="crashMessage">You can tap the OK button to send the crash report by email. It will help to fix it :)\n\nYou can also add additional content in the email. Thank you!</string>
 </resources>

app/src/main/res/values-sr/strings.xml

@@ -497,4 +497,10 @@
     <string name="milestoneStatusUpdate">Фаза је ажурирана</string>
     <string name="tabIssueOpen">Open</string>
     <string name="tabIssueClosed">Closed</string>
+    <string name="errorOnLogin">We cannot reach the server, please check your server status</string>
+    <string name="reportViewerHeader">Crash Reports</string>
+    <string name="settingsEnableReportsText">Enable Crash Reports</string>
+    <string name="crashTitle">GitNex has stopped :(</string>
+    <string name="setCrashReports">Crash reports</string>
+    <string name="crashMessage">You can tap the OK button to send the crash report by email. It will help to fix it :)\n\nYou can also add additional content in the email. Thank you!</string>
 </resources>

app/src/main/res/values-tr/strings.xml

@@ -497,4 +497,10 @@
     <string name="milestoneStatusUpdate">Milestone status updated successfully</string>
     <string name="tabIssueOpen">Open</string>
     <string name="tabIssueClosed">Closed</string>
+    <string name="errorOnLogin">We cannot reach the server, please check your server status</string>
+    <string name="reportViewerHeader">Crash Reports</string>
+    <string name="settingsEnableReportsText">Enable Crash Reports</string>
+    <string name="crashTitle">GitNex has stopped :(</string>
+    <string name="setCrashReports">Crash reports</string>
+    <string name="crashMessage">You can tap the OK button to send the crash report by email. It will help to fix it :)\n\nYou can also add additional content in the email. Thank you!</string>
 </resources>

app/src/main/res/values-uk/strings.xml

@@ -497,4 +497,10 @@
     <string name="milestoneStatusUpdate">Milestone status updated successfully</string>
     <string name="tabIssueOpen">Open</string>
     <string name="tabIssueClosed">Closed</string>
+    <string name="errorOnLogin">We cannot reach the server, please check your server status</string>
+    <string name="reportViewerHeader">Crash Reports</string>
+    <string name="settingsEnableReportsText">Enable Crash Reports</string>
+    <string name="crashTitle">GitNex has stopped :(</string>
+    <string name="setCrashReports">Crash reports</string>
+    <string name="crashMessage">You can tap the OK button to send the crash report by email. It will help to fix it :)\n\nYou can also add additional content in the email. Thank you!</string>
 </resources>

app/src/main/res/values-zh/strings.xml

@@ -63,7 +63,7 @@
     <string name="logo">登录到 Gitea</string>
     <string name="urlInfoTooltip">1- 选择协议 (https 或 http). \n2- 输入Gitea访问地址(可带端口) 例如: try.gitea.io:3000. \n3- 如已启用双重验证，请在OTP输入有效代码。 \n4- 在 URL 字段中使用 USERNAME@DOMAIN.COM 进行 HTTP 基本身份验证。</string>
     <string name="loginFailed">用户名或密码错误</string>
-    <string name="malformedUrl">Couldn\'t connect to host. Please check your URL or port for any errors.</string>
+    <string name="malformedUrl">无法连接到主机，请检查您的URL或端口是否有任何错误。</string>
     <string name="protocolError">非本地网络建议使用HTTPS安全协议进行访问。</string>
     <string name="malformedJson">JSON 格式错误。服务器响应不成功。</string>
     <string name="emptyFieldURL">未填写 Gitea访问地址</string>
@@ -497,4 +497,10 @@
     <string name="milestoneStatusUpdate">Milestone status updated successfully</string>
     <string name="tabIssueOpen">Open</string>
     <string name="tabIssueClosed">Closed</string>
+    <string name="errorOnLogin">We cannot reach the server, please check your server status</string>
+    <string name="reportViewerHeader">Crash Reports</string>
+    <string name="settingsEnableReportsText">Enable Crash Reports</string>
+    <string name="crashTitle">GitNex has stopped :(</string>
+    <string name="setCrashReports">Crash reports</string>
+    <string name="crashMessage">You can tap the OK button to send the crash report by email. It will help to fix it :)\n\nYou can also add additional content in the email. Thank you!</string>
 </resources>

app/src/main/res/xml/changelog.xml

@@ -1,9 +1,42 @@
 <?xml version="1.0" encoding="utf-8"?>
 <changelog>
 
-    <release version="2.5.0-rc4" versioncode="104">
+    <release version="2.5.0" versioncode="250">
-        <change>Release notes will be published with the stable release.</change>
+        <change>New: Share issues, repositories, comments</change>
-        <change>In the mean time check the milestone 2.5.0 for pull requests and issues that are merged/closed.</change>
+        <change>New: Changelog popup</change>
+        <change>New: Show size of files in Files tab</change>
+        <change>New: Repository commits</change>
+        <change>New: Self signed certificates support</change>
+        <change>New: Counter badges for PR and Releases</change>
+        <change>New: Subscribe/unsubscribe to issue</change>
+        <change>New: Redesign repo info screen</change>
+        <change>New: Close / Reopen milestone</change>
+        <change>New: Theme auto switcher (choose from settings)</change>
+        <change>New: Merge open and closed issues under one tab</change>
+        <change>New: Integrate crash reporting</change>
+        <change>Improvement: Better detection of internet connection on login screen</change>
+        <change>Improvement: Token login is now prioritized (login via token is recommended)</change>
+        <change>Improvement: Focus on input and trigger keyboard</change>
+        <change>Improvement: Create repo from organization</change>
+        <change>Improvement: Show useful message for reserved keywords</change>
+        <change>Improvement: Placeholder for images</change>
+        <change>Improvement: Bottomsheets instead of popup menus</change>
+        <change>Improvement: Caching images for offline mode</change>
+        <change>Improvement: FAB button to comment on issue</change>
+        <change>Improvement: Snackbar (login screen)</change>
+        <change>Improvement: Refactor Issues tabs</change>
+        <change>Improvement: Multiple merge options like web UI</change>
+        <change>Improvement: Manrope as default font</change>
+        <change>Improvement: Remember login type</change>
+        <change>Improvement: Improve labels</change>
+        <change>Improvement: Hide collaborators tab for non admins</change>
+        <change>Bugfix: Use correct protocol when open repo in browser</change>
+        <change>Bugfix: Can't choose token selector when internet is Off</change>
+        <change>Bugfix: Empty repositories screen on new logins</change>
+        <change>Bugfix: Issues search bug</change>
+        <change>Bugfix: Crash on version API when REQUIRE_SIGNIN_VIEW is set to true</change>
+        <change>Bugfix: Milestone desc and due date disappreance bug</change>
+        <change>Bugfix: Date/time in issue comments bug</change>
     </release>
 
 </changelog>

build.gradle

@@ -7,7 +7,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.6.2'
+        classpath 'com.android.tools.build:gradle:3.6.3'
 
     }
 }

fastlane/metadata/android/en-US/changelogs/250.txt

@@ -0,0 +1,18 @@
+2.5.0
+
+New:
+- Share issues, repositories, comments
+- Changelog popup
+- Show size of files in Files tab
+- Repository commits
+- Self signed certificates support
+- Counter badges for PR and Releases
+- Subscribe/unsubscribe to issue
+- Redesign repo info screen
+- Close / Reopen milestone
+- Theme auto switcher (choose from settings)
+- Merge open and closed issues under one tab
+- Integrate crash reporting
+
+Check release notes for complete list
+https://gitea.com/gitnex/GitNex/releases