GitNex/GitNex
GitNex
/
GitNex
mirror of https://codeberg.org/gitnex/GitNex.git
2
5
Fork 0
Code Issues 1 Projects Releases Wiki Activity

Update and improve some strings (#1016) 

* delete some unused strings
* improvements to some strings
* replace duplicated strings

Addresses #1000

Co-authored-by: qwerty287 <ndev@web.de>
Reviewed-on: https://codeberg.org/gitnex/GitNex/pulls/1016
Reviewed-by: 6543 <6543@noreply.codeberg.org>
Co-authored-by: qwerty287 <qwerty287@noreply.codeberg.org>
Co-committed-by: qwerty287 <qwerty287@noreply.codeberg.org>
This commit is contained in:
qwerty287 2021-12-15 20:37:53 +01:00 committed by 6543
parent 3559f9c8bd
commit c2c8d111e4
42 changed files with 140 additions and 162 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/AndroidManifest.xml
View File

@ -65,7 +65,6 @@
<activity
android:name=".activities.OrganizationDetailActivity"
android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|uiMode|keyboard|keyboardHidden|navigation"
android:label="@string/titleActivityOrgDetail"
android:theme="@style/AppTheme.NoActionBar" />
<activity
android:name=".activities.CreateLabelActivity"
@ -83,7 +82,6 @@
<activity
android:name=".activities.RepoDetailActivity"
android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|uiMode|keyboard|keyboardHidden|navigation"
android:label="@string/titleActivityRepoDetail"
android:theme="@style/AppTheme.NoActionBar" />
<activity
android:name=".activities.MainActivity"

8
app/src/main/java/org/mian/gitnex/actions/CollaboratorActions.java
View File

@ -57,8 +57,8 @@ public class CollaboratorActions {
AlertDialogs.authorizationTokenRevokedDialog(context, context.getResources().getString(R.string.alertDialogTokenRevokedTitle),
context.getResources().getString(R.string.alertDialogTokenRevokedMessage),
context.getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton),
context.getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
context.getResources().getString(R.string.cancelButton),
context.getResources().getString(R.string.navLogout));
}
else if(response.code() == 403) {
@ -121,8 +121,8 @@ public class CollaboratorActions {
AlertDialogs.authorizationTokenRevokedDialog(context, context.getResources().getString(R.string.alertDialogTokenRevokedTitle),
context.getResources().getString(R.string.alertDialogTokenRevokedMessage),
context.getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton),
context.getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
context.getResources().getString(R.string.cancelButton),
context.getResources().getString(R.string.navLogout));
}
else if(response.code() == 403) {

12
app/src/main/java/org/mian/gitnex/actions/IssueActions.java
View File

@ -51,7 +51,7 @@ public class IssueActions {
case 401:
actionResult.finish(ActionResult.Status.FAILED, response);
AlertDialogs.authorizationTokenRevokedDialog(context, context.getResources().getString(R.string.alertDialogTokenRevokedTitle), context.getResources().getString(R.string.alertDialogTokenRevokedMessage), context.getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton), context.getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
AlertDialogs.authorizationTokenRevokedDialog(context, context.getResources().getString(R.string.alertDialogTokenRevokedTitle), context.getResources().getString(R.string.alertDialogTokenRevokedMessage), context.getResources().getString(R.string.cancelButton), context.getResources().getString(R.string.navLogout));
break;
default:
@ -117,7 +117,7 @@ public class IssueActions {
}
else if(response.code() == 401) {
AlertDialogs.authorizationTokenRevokedDialog(ctx, ctx.getResources().getString(R.string.alertDialogTokenRevokedTitle), ctx.getResources().getString(R.string.alertDialogTokenRevokedMessage), ctx.getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton), ctx.getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
AlertDialogs.authorizationTokenRevokedDialog(ctx, ctx.getResources().getString(R.string.alertDialogTokenRevokedTitle), ctx.getResources().getString(R.string.alertDialogTokenRevokedMessage), ctx.getResources().getString(R.string.cancelButton), ctx.getResources().getString(R.string.navLogout));
}
else if(response.code() == 403) {
@ -190,7 +190,7 @@ public class IssueActions {
}
else if(response.code() == 401) {
AlertDialogs.authorizationTokenRevokedDialog(ctx, ctx.getResources().getString(R.string.alertDialogTokenRevokedTitle), ctx.getResources().getString(R.string.alertDialogTokenRevokedMessage), ctx.getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton), ctx.getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
AlertDialogs.authorizationTokenRevokedDialog(ctx, ctx.getResources().getString(R.string.alertDialogTokenRevokedTitle), ctx.getResources().getString(R.string.alertDialogTokenRevokedMessage), ctx.getResources().getString(R.string.cancelButton), ctx.getResources().getString(R.string.navLogout));
}
else {
@ -249,7 +249,7 @@ public class IssueActions {
}
else if(response.code() == 401) {
AlertDialogs.authorizationTokenRevokedDialog(ctx, ctx.getResources().getString(R.string.alertDialogTokenRevokedTitle), ctx.getResources().getString(R.string.alertDialogTokenRevokedMessage), ctx.getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton), ctx.getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
AlertDialogs.authorizationTokenRevokedDialog(ctx, ctx.getResources().getString(R.string.alertDialogTokenRevokedTitle), ctx.getResources().getString(R.string.alertDialogTokenRevokedMessage), ctx.getResources().getString(R.string.cancelButton), ctx.getResources().getString(R.string.navLogout));
}
else {
@ -303,8 +303,8 @@ public class IssueActions {
AlertDialogs.authorizationTokenRevokedDialog(context, context.getString(R.string.alertDialogTokenRevokedTitle),
context.getString(R.string.alertDialogTokenRevokedMessage),
context.getString(R.string.alertDialogTokenRevokedCopyNegativeButton),
context.getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
context.getString(R.string.cancelButton),
context.getString(R.string.navLogout));
}
else {

8
app/src/main/java/org/mian/gitnex/actions/MilestoneActions.java
View File

@ -53,8 +53,8 @@ public class MilestoneActions {
AlertDialogs.authorizationTokenRevokedDialog(ctx, ctx.getResources().getString(R.string.alertDialogTokenRevokedTitle),
ctx.getResources().getString(R.string.alertDialogTokenRevokedMessage),
ctx.getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton),
ctx.getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
ctx.getResources().getString(R.string.cancelButton),
ctx.getResources().getString(R.string.navLogout));
}
else {
@ -109,8 +109,8 @@ public class MilestoneActions {
AlertDialogs.authorizationTokenRevokedDialog(ctx, ctx.getResources().getString(R.string.alertDialogTokenRevokedTitle),
ctx.getResources().getString(R.string.alertDialogTokenRevokedMessage),
ctx.getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton),
ctx.getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
ctx.getResources().getString(R.string.cancelButton),
ctx.getResources().getString(R.string.navLogout));
}
else {

2
app/src/main/java/org/mian/gitnex/actions/PullRequestActions.java
View File

@ -35,7 +35,7 @@ public class PullRequestActions {
else if(response.code() == 401) {
AlertDialogs
.authorizationTokenRevokedDialog(context, context.getResources().getString(R.string.alertDialogTokenRevokedTitle), context.getResources().getString(R.string.alertDialogTokenRevokedMessage), context.getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton), context.getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
.authorizationTokenRevokedDialog(context, context.getResources().getString(R.string.alertDialogTokenRevokedTitle), context.getResources().getString(R.string.alertDialogTokenRevokedMessage), context.getResources().getString(R.string.cancelButton), context.getResources().getString(R.string.navLogout));
}
else if(response.code() == 403) {

16
app/src/main/java/org/mian/gitnex/actions/RepositoryActions.java
View File

@ -51,8 +51,8 @@ public class RepositoryActions {
AlertDialogs.authorizationTokenRevokedDialog(context, context.getResources().getString(R.string.alertDialogTokenRevokedTitle),
context.getResources().getString(R.string.alertDialogTokenRevokedMessage),
context.getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton),
context.getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
context.getResources().getString(R.string.cancelButton),
context.getResources().getString(R.string.navLogout));
}
else if(response.code() == 403) {
@ -113,8 +113,8 @@ public class RepositoryActions {
AlertDialogs.authorizationTokenRevokedDialog(context, context.getResources().getString(R.string.alertDialogTokenRevokedTitle),
context.getResources().getString(R.string.alertDialogTokenRevokedMessage),
context.getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton),
context.getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
context.getResources().getString(R.string.cancelButton),
context.getResources().getString(R.string.navLogout));
}
else if(response.code() == 403) {
@ -175,8 +175,8 @@ public class RepositoryActions {
AlertDialogs.authorizationTokenRevokedDialog(context, context.getResources().getString(R.string.alertDialogTokenRevokedTitle),
context.getResources().getString(R.string.alertDialogTokenRevokedMessage),
context.getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton),
context.getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
context.getResources().getString(R.string.cancelButton),
context.getResources().getString(R.string.navLogout));
}
else if(response.code() == 403) {
@ -235,8 +235,8 @@ public class RepositoryActions {
AlertDialogs.authorizationTokenRevokedDialog(context, context.getResources().getString(R.string.alertDialogTokenRevokedTitle),
context.getResources().getString(R.string.alertDialogTokenRevokedMessage),
context.getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton),
context.getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
context.getResources().getString(R.string.cancelButton),
context.getResources().getString(R.string.navLogout));
}
else if(response.code() == 403) {

8
app/src/main/java/org/mian/gitnex/actions/TeamActions.java
View File

@ -49,8 +49,8 @@ public class TeamActions {
AlertDialogs.authorizationTokenRevokedDialog(context, context.getResources().getString(R.string.alertDialogTokenRevokedTitle),
context.getResources().getString(R.string.alertDialogTokenRevokedMessage),
context.getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton),
context.getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
context.getResources().getString(R.string.cancelButton),
context.getResources().getString(R.string.navLogout));
}
else if(response.code() == 403) {
@ -109,8 +109,8 @@ public class TeamActions {
AlertDialogs.authorizationTokenRevokedDialog(context, context.getResources().getString(R.string.alertDialogTokenRevokedTitle),
context.getResources().getString(R.string.alertDialogTokenRevokedMessage),
context.getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton),
context.getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
context.getResources().getString(R.string.cancelButton),
context.getResources().getString(R.string.navLogout));
}
else if(response.code() == 403) {

12
app/src/main/java/org/mian/gitnex/activities/CreateFileActivity.java
View File

@ -203,8 +203,8 @@ public class CreateFileActivity extends BaseActivity {
enableProcessButton();
AlertDialogs.authorizationTokenRevokedDialog(ctx, getResources().getString(R.string.alertDialogTokenRevokedTitle),
getResources().getString(R.string.alertDialogTokenRevokedMessage),
getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton),
getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
getResources().getString(R.string.cancelButton),
getResources().getString(R.string.navLogout));
break;
case 404:
@ -261,8 +261,8 @@ public class CreateFileActivity extends BaseActivity {
enableProcessButton();
AlertDialogs.authorizationTokenRevokedDialog(ctx, getResources().getString(R.string.alertDialogTokenRevokedTitle),
getResources().getString(R.string.alertDialogTokenRevokedMessage),
getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton),
getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
getResources().getString(R.string.cancelButton),
getResources().getString(R.string.navLogout));
break;
case 404:
@ -319,8 +319,8 @@ public class CreateFileActivity extends BaseActivity {
enableProcessButton();
AlertDialogs.authorizationTokenRevokedDialog(ctx, getResources().getString(R.string.alertDialogTokenRevokedTitle),
getResources().getString(R.string.alertDialogTokenRevokedMessage),
getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton),
getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
getResources().getString(R.string.cancelButton),
getResources().getString(R.string.navLogout));
break;
case 404:

4
app/src/main/java/org/mian/gitnex/activities/CreateIssueActivity.java
View File

@ -263,8 +263,8 @@ public class CreateIssueActivity extends BaseActivity implements View.OnClickLis
enableProcessButton();
AlertDialogs.authorizationTokenRevokedDialog(ctx, getResources().getString(R.string.alertDialogTokenRevokedTitle),
getResources().getString(R.string.alertDialogTokenRevokedMessage),
getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton),
getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
getResources().getString(R.string.cancelButton),
getResources().getString(R.string.navLogout));
}
else {

12
app/src/main/java/org/mian/gitnex/activities/CreateLabelActivity.java
View File

@ -239,8 +239,8 @@ public class CreateLabelActivity extends BaseActivity {
enableProcessButton();
AlertDialogs.authorizationTokenRevokedDialog(ctx, getResources().getString(R.string.alertDialogTokenRevokedTitle),
getResources().getString(R.string.alertDialogTokenRevokedMessage),
getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton),
getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
getResources().getString(R.string.cancelButton),
getResources().getString(R.string.navLogout));
}
else {
@ -302,8 +302,8 @@ public class CreateLabelActivity extends BaseActivity {
enableProcessButton();
AlertDialogs.authorizationTokenRevokedDialog(ctx, getResources().getString(R.string.alertDialogTokenRevokedTitle),
getResources().getString(R.string.alertDialogTokenRevokedMessage),
getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton),
getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
getResources().getString(R.string.cancelButton),
getResources().getString(R.string.navLogout));
}
else {
@ -379,8 +379,8 @@ public class CreateLabelActivity extends BaseActivity {
AlertDialogs.authorizationTokenRevokedDialog(ctx, getResources().getString(R.string.alertDialogTokenRevokedTitle),
getResources().getString(R.string.alertDialogTokenRevokedMessage),
getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton),
getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
getResources().getString(R.string.cancelButton),
getResources().getString(R.string.navLogout));
}
else {

4
app/src/main/java/org/mian/gitnex/activities/CreateMilestoneActivity.java
View File

@ -172,8 +172,8 @@ public class CreateMilestoneActivity extends BaseActivity implements View.OnClic
enableProcessButton();
AlertDialogs.authorizationTokenRevokedDialog(ctx, getResources().getString(R.string.alertDialogTokenRevokedTitle),
getResources().getString(R.string.alertDialogTokenRevokedMessage),
getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton),
getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
getResources().getString(R.string.cancelButton),
getResources().getString(R.string.navLogout));
}
else {

4
app/src/main/java/org/mian/gitnex/activities/CreateNewUserActivity.java
View File

@ -139,8 +139,8 @@ public class CreateNewUserActivity extends BaseActivity {
enableProcessButton();
AlertDialogs.authorizationTokenRevokedDialog(ctx, getResources().getString(R.string.alertDialogTokenRevokedTitle),
getResources().getString(R.string.alertDialogTokenRevokedMessage),
getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton),
getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
getResources().getString(R.string.cancelButton),
getResources().getString(R.string.navLogout));
}
else if(response.code() == 403) {

4
app/src/main/java/org/mian/gitnex/activities/CreateOrganizationActivity.java
View File

@ -155,8 +155,8 @@ public class CreateOrganizationActivity extends BaseActivity {
enableProcessButton();
AlertDialogs.authorizationTokenRevokedDialog(ctx, getResources().getString(R.string.alertDialogTokenRevokedTitle),
getResources().getString(R.string.alertDialogTokenRevokedMessage),
getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton),
getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
getResources().getString(R.string.cancelButton),
getResources().getString(R.string.navLogout));
}
else if(response.code() == 409) {

8
app/src/main/java/org/mian/gitnex/activities/CreateReleaseActivity.java
View File

@ -178,8 +178,8 @@ public class CreateReleaseActivity extends BaseActivity {
enableProcessButton();
AlertDialogs.authorizationTokenRevokedDialog(ctx, ctx.getResources().getString(R.string.alertDialogTokenRevokedTitle),
ctx.getResources().getString(R.string.alertDialogTokenRevokedMessage),
ctx.getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton),
ctx.getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
ctx.getResources().getString(R.string.cancelButton),
ctx.getResources().getString(R.string.navLogout));
}
else if(response.code() == 403) {
@ -247,8 +247,8 @@ public class CreateReleaseActivity extends BaseActivity {
AlertDialogs.authorizationTokenRevokedDialog(ctx, getResources().getString(R.string.alertDialogTokenRevokedTitle),
getResources().getString(R.string.alertDialogTokenRevokedMessage),
getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton),
getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
getResources().getString(R.string.cancelButton),
getResources().getString(R.string.navLogout));
}
}

6
app/src/main/java/org/mian/gitnex/activities/CreateRepoActivity.java
View File

@ -187,8 +187,8 @@ public class CreateRepoActivity extends BaseActivity {
enableProcessButton();
AlertDialogs.authorizationTokenRevokedDialog(ctx, getResources().getString(R.string.alertDialogTokenRevokedTitle),
getResources().getString(R.string.alertDialogTokenRevokedMessage),
getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton),
getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
getResources().getString(R.string.cancelButton),
getResources().getString(R.string.navLogout));
}
else if(response.code() == 409) {
@ -272,7 +272,7 @@ public class CreateRepoActivity extends BaseActivity {
enableProcessButton();
AlertDialogs.authorizationTokenRevokedDialog(ctx, getResources().getString(R.string.alertDialogTokenRevokedTitle), getResources().getString(R.string.alertDialogTokenRevokedMessage),
getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton), getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
getResources().getString(R.string.cancelButton), getResources().getString(R.string.navLogout));
}
}

4
app/src/main/java/org/mian/gitnex/activities/CreateTeamByOrgActivity.java
View File

@ -318,8 +318,8 @@ public class CreateTeamByOrgActivity extends BaseActivity implements View.OnClic
AlertDialogs.authorizationTokenRevokedDialog(ctx, getResources().getString(R.string.alertDialogTokenRevokedTitle),
getResources().getString(R.string.alertDialogTokenRevokedMessage),
getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton),
getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
getResources().getString(R.string.cancelButton),
getResources().getString(R.string.navLogout));
}
else {

8
app/src/main/java/org/mian/gitnex/activities/EditIssueActivity.java
View File

@ -206,8 +206,8 @@ public class EditIssueActivity extends BaseActivity implements View.OnClickListe
enableProcessButton();
AlertDialogs.authorizationTokenRevokedDialog(ctx, getResources().getString(R.string.alertDialogTokenRevokedTitle),
getResources().getString(R.string.alertDialogTokenRevokedMessage),
getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton),
getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
getResources().getString(R.string.cancelButton),
getResources().getString(R.string.navLogout));
}
else {
@ -346,8 +346,8 @@ public class EditIssueActivity extends BaseActivity implements View.OnClickListe
AlertDialogs.authorizationTokenRevokedDialog(ctx, getResources().getString(R.string.alertDialogTokenRevokedTitle),
getResources().getString(R.string.alertDialogTokenRevokedMessage),
getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton),
getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
getResources().getString(R.string.cancelButton),
getResources().getString(R.string.navLogout));
}
else {

4
app/src/main/java/org/mian/gitnex/activities/FileDiffActivity.java
View File

@ -109,8 +109,8 @@ public class FileDiffActivity extends BaseActivity {
runOnUiThread(() -> AlertDialogs.authorizationTokenRevokedDialog(ctx,
getString(R.string.alertDialogTokenRevokedTitle),
getString(R.string.alertDialogTokenRevokedMessage),
getString(R.string.alertDialogTokenRevokedCopyNegativeButton),
getString(R.string.alertDialogTokenRevokedCopyPositiveButton)));
getString(R.string.cancelButton),
getString(R.string.navLogout)));
break;
case 403:

4
app/src/main/java/org/mian/gitnex/activities/FileViewActivity.java
View File

@ -195,8 +195,8 @@ public class FileViewActivity extends BaseActivity implements BottomSheetListene
runOnUiThread(() -> AlertDialogs.authorizationTokenRevokedDialog(ctx,
getResources().getString(R.string.alertDialogTokenRevokedTitle),
getResources().getString(R.string.alertDialogTokenRevokedMessage),
getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton),
getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton)));
getResources().getString(R.string.cancelButton),
getResources().getString(R.string.navLogout)));
break;
case 403:

12
app/src/main/java/org/mian/gitnex/activities/IssueDetailActivity.java
View File

@ -344,8 +344,8 @@ public class IssueDetailActivity extends BaseActivity implements LabelsListAdapt
AlertDialogs.authorizationTokenRevokedDialog(ctx, getResources().getString(R.string.alertDialogTokenRevokedTitle),
getResources().getString(R.string.alertDialogTokenRevokedMessage),
getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton),
getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
getResources().getString(R.string.cancelButton),
getResources().getString(R.string.navLogout));
}
else if(response2.code() == 403) {
@ -398,8 +398,8 @@ public class IssueDetailActivity extends BaseActivity implements LabelsListAdapt
AlertDialogs.authorizationTokenRevokedDialog(ctx, getResources().getString(R.string.alertDialogTokenRevokedTitle),
getResources().getString(R.string.alertDialogTokenRevokedMessage),
getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton),
getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
getResources().getString(R.string.cancelButton),
getResources().getString(R.string.navLogout));
}
else if(response.code() == 403) {
@ -801,8 +801,8 @@ public class IssueDetailActivity extends BaseActivity implements LabelsListAdapt
AlertDialogs.authorizationTokenRevokedDialog(ctx, getResources().getString(R.string.alertDialogTokenRevokedTitle),
getResources().getString(R.string.alertDialogTokenRevokedMessage),
getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton),
getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
getResources().getString(R.string.cancelButton),
getResources().getString(R.string.navLogout));
}
else if(response.code() == 404) {

32
app/src/main/java/org/mian/gitnex/activities/MainActivity.java
View File

@ -118,7 +118,7 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig
if(tinyDB.getInt("currentActiveAccountId", -1) <= 0) {
AlertDialogs.forceLogoutDialog(ctx,
getResources().getString(R.string.forceLogoutDialogHeader),
getResources().getString(R.string.forceLogoutDialogDescription), getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
getResources().getString(R.string.forceLogoutDialogDescription), getResources().getString(R.string.navLogout));
}
Toolbar toolbar = activityMainBinding.toolbar;
@ -147,16 +147,16 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig
Fragment fragmentById = fm.findFragmentById(R.id.fragment_container);
if(fragmentById instanceof SettingsFragment) {
toolbarTitle.setText(getResources().getString(R.string.pageTitleSettings));
toolbarTitle.setText(getResources().getString(R.string.navSettings));
}
else if(fragmentById instanceof MyRepositoriesFragment) {
toolbarTitle.setText(getResources().getString(R.string.pageTitleMyRepos));
toolbarTitle.setText(getResources().getString(R.string.navMyRepos));
}
else if(fragmentById instanceof StarredRepositoriesFragment) {
toolbarTitle.setText(getResources().getString(R.string.pageTitleStarredRepos));
}
else if(fragmentById instanceof OrganizationsFragment) {
toolbarTitle.setText(getResources().getString(R.string.pageTitleOrganizations));
toolbarTitle.setText(getResources().getString(R.string.navOrg));
}
else if(fragmentById instanceof ExploreFragment) {
toolbarTitle.setText(getResources().getString(R.string.pageTitleExplore));
@ -165,7 +165,7 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig
toolbarTitle.setText(R.string.pageTitleNotifications);
}
else if(fragmentById instanceof MyProfileFragment) {
toolbarTitle.setText(getResources().getString(R.string.pageTitleProfile));
toolbarTitle.setText(getResources().getString(R.string.navProfile));
}
else if(fragmentById instanceof DraftsFragment) {
toolbarTitle.setText(getResources().getString(R.string.titleDrafts));
@ -269,7 +269,7 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig
userAvatar.setOnClickListener(v -> {
toolbarTitle.setText(getResources().getString(R.string.pageTitleProfile));
toolbarTitle.setText(getResources().getString(R.string.navProfile));
getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new MyProfileFragment()).commit();
navigationView.setCheckedItem(R.id.nav_profile);
drawer.closeDrawers();
@ -379,19 +379,19 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig
break;
case 2:
toolbarTitle.setText(getResources().getString(R.string.pageTitleOrganizations));
toolbarTitle.setText(getResources().getString(R.string.navOrg));
getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new OrganizationsFragment()).commit();
navigationView.setCheckedItem(R.id.nav_organizations);
break;
case 3:
toolbarTitle.setText(getResources().getString(R.string.pageTitleRepositories));
toolbarTitle.setText(getResources().getString(R.string.navRepos));
getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new RepositoriesFragment()).commit();
navigationView.setCheckedItem(R.id.nav_repositories);
break;
case 4:
toolbarTitle.setText(getResources().getString(R.string.pageTitleProfile));
toolbarTitle.setText(getResources().getString(R.string.navProfile));
getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new MyProfileFragment()).commit();
navigationView.setCheckedItem(R.id.nav_profile);
break;
@ -415,7 +415,7 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig
break;
default:
toolbarTitle.setText(getResources().getString(R.string.pageTitleMyRepos));
toolbarTitle.setText(getResources().getString(R.string.navMyRepos));
getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new MyRepositoriesFragment()).commit();
navigationView.setCheckedItem(R.id.nav_home);
break;
@ -519,27 +519,27 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig
if(id == R.id.nav_home) {
toolbarTitle.setText(getResources().getString(R.string.pageTitleMyRepos));
toolbarTitle.setText(getResources().getString(R.string.navMyRepos));
getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new MyRepositoriesFragment()).commit();
}
else if(id == R.id.nav_organizations) {
toolbarTitle.setText(getResources().getString(R.string.pageTitleOrganizations));
toolbarTitle.setText(getResources().getString(R.string.navOrg));
getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new OrganizationsFragment()).commit();
}
else if(id == R.id.nav_profile) {
toolbarTitle.setText(getResources().getString(R.string.pageTitleProfile));
toolbarTitle.setText(getResources().getString(R.string.navProfile));
getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new MyProfileFragment()).commit();
}
else if(id == R.id.nav_repositories) {
toolbarTitle.setText(getResources().getString(R.string.pageTitleRepositories));
toolbarTitle.setText(getResources().getString(R.string.navRepos));
getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new RepositoriesFragment()).commit();
}
else if(id == R.id.nav_settings) {
toolbarTitle.setText(getResources().getString(R.string.pageTitleSettings));
toolbarTitle.setText(getResources().getString(R.string.navSettings));
getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new SettingsFragment()).commit();
}
else if(id == R.id.nav_logout) {
@ -678,7 +678,7 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig
}
else if(response.code() == 401) {
AlertDialogs.authorizationTokenRevokedDialog(ctx, getResources().getString(R.string.alertDialogTokenRevokedTitle), getResources().getString(R.string.alertDialogTokenRevokedMessage), getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton), getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
AlertDialogs.authorizationTokenRevokedDialog(ctx, getResources().getString(R.string.alertDialogTokenRevokedTitle), getResources().getString(R.string.alertDialogTokenRevokedMessage), getResources().getString(R.string.cancelButton), getResources().getString(R.string.navLogout));
}
else {

3
app/src/main/java/org/mian/gitnex/activities/MergePullRequestActivity.java
View File

@ -8,7 +8,6 @@ import android.view.View;
import android.view.inputmethod.InputMethodManager;
import android.widget.ArrayAdapter;
import androidx.annotation.NonNull;
import com.google.gson.JsonElement;
import org.gitnex.tea4j.models.MergePullRequest;
import org.gitnex.tea4j.models.MergePullRequestSpinner;
import org.mian.gitnex.R;
@ -223,7 +222,7 @@ public class MergePullRequestActivity extends BaseActivity {
else if(response.code() == 401) {
enableProcessButton();
AlertDialogs.authorizationTokenRevokedDialog(ctx, getResources().getString(R.string.alertDialogTokenRevokedTitle), getResources().getString(R.string.alertDialogTokenRevokedMessage), getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton), getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
AlertDialogs.authorizationTokenRevokedDialog(ctx, getResources().getString(R.string.alertDialogTokenRevokedTitle), getResources().getString(R.string.alertDialogTokenRevokedMessage), getResources().getString(R.string.cancelButton), getResources().getString(R.string.navLogout));
}
else if(response.code() == 404) {

4
app/src/main/java/org/mian/gitnex/activities/MyProfileEmailActivity.java
View File

@ -128,8 +128,8 @@ public class MyProfileEmailActivity extends BaseActivity {
enableProcessButton();
AlertDialogs.authorizationTokenRevokedDialog(ctx, getResources().getString(R.string.alertDialogTokenRevokedTitle),
getResources().getString(R.string.alertDialogTokenRevokedMessage),
getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton),
getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
getResources().getString(R.string.cancelButton),
getResources().getString(R.string.navLogout));
}
else if(response.code() == 403) {

8
app/src/main/java/org/mian/gitnex/activities/SettingsGeneralActivity.java
View File

@ -54,7 +54,7 @@ public class SettingsGeneralActivity extends BaseActivity {
if(homeScreenSelectedChoice == 0) {
homeScreenSelectedChoice = tinyDB.getInt("homeScreenId");
viewBinding.homeScreenSelected.setText(getResources().getString(R.string.pageTitleMyRepos));
viewBinding.homeScreenSelected.setText(getResources().getString(R.string.navMyRepos));
}
if(homeScreenSelectedChoice == 1) {
@ -63,15 +63,15 @@ public class SettingsGeneralActivity extends BaseActivity {
}
else if(homeScreenSelectedChoice == 2) {
viewBinding.homeScreenSelected.setText(getResources().getString(R.string.pageTitleOrganizations));
viewBinding.homeScreenSelected.setText(getResources().getString(R.string.navOrg));
}
else if(homeScreenSelectedChoice == 3) {
viewBinding.homeScreenSelected.setText(getResources().getString(R.string.pageTitleRepositories));
viewBinding.homeScreenSelected.setText(getResources().getString(R.string.navRepos));
}
else if(homeScreenSelectedChoice == 4) {
viewBinding.homeScreenSelected.setText(getResources().getString(R.string.pageTitleProfile));
viewBinding.homeScreenSelected.setText(getResources().getString(R.string.navProfile));
}
else if(homeScreenSelectedChoice == 5) {

4
app/src/main/java/org/mian/gitnex/adapters/AdminCronTasksAdapter.java
View File

@ -138,8 +138,8 @@ public class AdminCronTasksAdapter extends RecyclerView.Adapter<AdminCronTasksAd
case 401:
AlertDialogs.authorizationTokenRevokedDialog(ctx, ctx.getString(R.string.alertDialogTokenRevokedTitle),
ctx.getResources().getString(R.string.alertDialogTokenRevokedMessage),
ctx.getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton),
ctx.getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
ctx.getResources().getString(R.string.cancelButton),
ctx.getResources().getString(R.string.navLogout));
break;
case 403:

4
app/src/main/java/org/mian/gitnex/adapters/IssueCommentsAdapter.java
View File

@ -276,8 +276,8 @@ public class IssueCommentsAdapter extends RecyclerView.Adapter<IssueCommentsAdap
case 401:
AlertDialogs.authorizationTokenRevokedDialog(ctx, ctx.getResources().getString(R.string.alertDialogTokenRevokedTitle),
ctx.getResources().getString(R.string.alertDialogTokenRevokedMessage),
ctx.getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton),
ctx.getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
ctx.getResources().getString(R.string.cancelButton),
ctx.getResources().getString(R.string.navLogout));
break;
case 403:

4
app/src/main/java/org/mian/gitnex/adapters/LabelsAdapter.java
View File

@ -82,8 +82,8 @@ public class LabelsAdapter extends RecyclerView.Adapter<LabelsAdapter.LabelsView
AlertDialogs.labelDeleteDialog(context, labels.getName(), String.valueOf(labels.getId()),
context.getResources().getString(R.string.labelDeleteTitle),
context.getResources().getString(R.string.labelDeleteMessage),
context.getResources().getString(R.string.labelDeleteTitle),
context.getResources().getString(R.string.labelDeleteNegativeButton),
context.getResources().getString(R.string.menuDeleteText),
context.getResources().getString(R.string.cancelButton),
type, orgName);
dialog.dismiss();
});

2
app/src/main/java/org/mian/gitnex/fragments/ExploreFragment.java
View File

@ -60,7 +60,7 @@ public class ExploreFragment extends Fragment {
viewPager.setAdapter(new ViewPagerAdapter(this));
String[] tabTitles = {getResources().getString(R.string.pageTitleRepositories), getResources().getString(R.string.pageTitleIssues), getResources().getString(R.string.pageTitleOrganizations), getResources().getString(R.string.pageTitleUsers)};
String[] tabTitles = {getResources().getString(R.string.navRepos), getResources().getString(R.string.pageTitleIssues), getResources().getString(R.string.navOrg), getResources().getString(R.string.pageTitleUsers)};
new TabLayoutMediator(tabLayout, viewPager, (tab, position) -> tab.setText(tabTitles[position])).attach();
for (int j = 0; j < tabTitles.length; j++) {

4
app/src/main/java/org/mian/gitnex/fragments/RepoInfoFragment.java
View File

@ -336,8 +336,8 @@ public class RepoInfoFragment extends Fragment {
case 401:
AlertDialogs.authorizationTokenRevokedDialog(ctx, getResources().getString(R.string.alertDialogTokenRevokedTitle),
getResources().getString(R.string.alertDialogTokenRevokedMessage),
getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton),
getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
getResources().getString(R.string.cancelButton),
getResources().getString(R.string.navLogout));
break;
case 403:

2
app/src/main/java/org/mian/gitnex/fragments/profile/DetailFragment.java
View File

@ -137,7 +137,7 @@ public class DetailFragment extends Fragment {
case 401:
AlertDialogs
.authorizationTokenRevokedDialog(context, context.getResources().getString(R.string.alertDialogTokenRevokedTitle), context.getResources().getString(R.string.alertDialogTokenRevokedMessage), context.getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton), context.getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
.authorizationTokenRevokedDialog(context, context.getResources().getString(R.string.alertDialogTokenRevokedTitle), context.getResources().getString(R.string.alertDialogTokenRevokedMessage), context.getResources().getString(R.string.cancelButton), context.getResources().getString(R.string.navLogout));
break;
case 403:

8
app/src/main/java/org/mian/gitnex/fragments/profile/FollowersFragment.java
View File

@ -135,8 +135,8 @@ public class FollowersFragment extends Fragment {
case 401:
AlertDialogs.authorizationTokenRevokedDialog(context, getResources().getString(R.string.alertDialogTokenRevokedTitle),
getResources().getString(R.string.alertDialogTokenRevokedMessage), getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton),
getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
getResources().getString(R.string.alertDialogTokenRevokedMessage), getResources().getString(R.string.cancelButton),
getResources().getString(R.string.navLogout));
break;
case 403:
@ -195,8 +195,8 @@ public class FollowersFragment extends Fragment {
case 401:
AlertDialogs.authorizationTokenRevokedDialog(context, getResources().getString(R.string.alertDialogTokenRevokedTitle),
getResources().getString(R.string.alertDialogTokenRevokedMessage), getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton),
getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
getResources().getString(R.string.alertDialogTokenRevokedMessage), getResources().getString(R.string.cancelButton),
getResources().getString(R.string.navLogout));
break;
case 403:

8
app/src/main/java/org/mian/gitnex/fragments/profile/FollowingFragment.java
View File

@ -135,8 +135,8 @@ public class FollowingFragment extends Fragment {
case 401:
AlertDialogs.authorizationTokenRevokedDialog(context, getResources().getString(R.string.alertDialogTokenRevokedTitle),
getResources().getString(R.string.alertDialogTokenRevokedMessage), getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton),
getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
getResources().getString(R.string.alertDialogTokenRevokedMessage), getResources().getString(R.string.cancelButton),
getResources().getString(R.string.navLogout));
break;
case 403:
@ -195,8 +195,8 @@ public class FollowingFragment extends Fragment {
case 401:
AlertDialogs.authorizationTokenRevokedDialog(context, getResources().getString(R.string.alertDialogTokenRevokedTitle),
getResources().getString(R.string.alertDialogTokenRevokedMessage), getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton),
getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
getResources().getString(R.string.alertDialogTokenRevokedMessage), getResources().getString(R.string.cancelButton),
getResources().getString(R.string.navLogout));
break;
case 403:

8
app/src/main/java/org/mian/gitnex/fragments/profile/OrganizationsFragment.java
View File

@ -137,8 +137,8 @@ public class OrganizationsFragment extends Fragment {
case 401:
AlertDialogs.authorizationTokenRevokedDialog(context, getResources().getString(R.string.alertDialogTokenRevokedTitle),
getResources().getString(R.string.alertDialogTokenRevokedMessage), getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton),
getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
getResources().getString(R.string.alertDialogTokenRevokedMessage), getResources().getString(R.string.cancelButton),
getResources().getString(R.string.navLogout));
break;
case 403:
@ -197,8 +197,8 @@ public class OrganizationsFragment extends Fragment {
case 401:
AlertDialogs.authorizationTokenRevokedDialog(context, getResources().getString(R.string.alertDialogTokenRevokedTitle),
getResources().getString(R.string.alertDialogTokenRevokedMessage), getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton),
getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
getResources().getString(R.string.alertDialogTokenRevokedMessage), getResources().getString(R.string.cancelButton),
getResources().getString(R.string.navLogout));
break;
case 403:

8
app/src/main/java/org/mian/gitnex/fragments/profile/RepositoriesFragment.java
View File

@ -136,8 +136,8 @@ public class RepositoriesFragment extends Fragment {
case 401:
AlertDialogs.authorizationTokenRevokedDialog(context, getResources().getString(R.string.alertDialogTokenRevokedTitle),
getResources().getString(R.string.alertDialogTokenRevokedMessage), getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton),
getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
getResources().getString(R.string.alertDialogTokenRevokedMessage), getResources().getString(R.string.cancelButton),
getResources().getString(R.string.navLogout));
break;
case 403:
@ -194,8 +194,8 @@ public class RepositoriesFragment extends Fragment {
case 401:
AlertDialogs.authorizationTokenRevokedDialog(context, getResources().getString(R.string.alertDialogTokenRevokedTitle),
getResources().getString(R.string.alertDialogTokenRevokedMessage), getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton),
getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
getResources().getString(R.string.alertDialogTokenRevokedMessage), getResources().getString(R.string.cancelButton),
getResources().getString(R.string.navLogout));
break;
case 403:

8
app/src/main/java/org/mian/gitnex/fragments/profile/StarredRepositoriesFragment.java
View File

@ -137,8 +137,8 @@ public class StarredRepositoriesFragment extends Fragment {
case 401:
AlertDialogs.authorizationTokenRevokedDialog(context, getResources().getString(R.string.alertDialogTokenRevokedTitle),
getResources().getString(R.string.alertDialogTokenRevokedMessage), getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton),
getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
getResources().getString(R.string.alertDialogTokenRevokedMessage), getResources().getString(R.string.cancelButton),
getResources().getString(R.string.navLogout));
break;
case 403:
@ -197,8 +197,8 @@ public class StarredRepositoriesFragment extends Fragment {
case 401:
AlertDialogs.authorizationTokenRevokedDialog(context, getResources().getString(R.string.alertDialogTokenRevokedTitle),
getResources().getString(R.string.alertDialogTokenRevokedMessage), getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton),
getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
getResources().getString(R.string.alertDialogTokenRevokedMessage), getResources().getString(R.string.cancelButton),
getResources().getString(R.string.navLogout));
break;
case 403:

2
app/src/main/java/org/mian/gitnex/helpers/AlertDialogs.java
View File

@ -70,7 +70,7 @@ public class AlertDialogs {
public static void labelDeleteDialog(final Context context, final String labelTitle, final String labelId, String title, String message, String positiveButton, String negativeButton, String type, String orgName) {
new AlertDialog.Builder(context)
.setTitle(title + labelTitle)
.setTitle(String.format(title, labelTitle))
.setMessage(message)
.setIcon(R.drawable.ic_delete)
.setPositiveButton(positiveButton, (dialog, whichButton) -> {

4
app/src/main/java/org/mian/gitnex/viewmodels/AdminCronTasksViewModel.java
View File

@ -51,8 +51,8 @@ public class AdminCronTasksViewModel extends ViewModel {
AlertDialogs.authorizationTokenRevokedDialog(ctx, ctx.getResources().getString(R.string.alertDialogTokenRevokedTitle),
ctx.getResources().getString(R.string.alertDialogTokenRevokedMessage),
ctx.getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton),
ctx.getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
ctx.getResources().getString(R.string.cancelButton),
ctx.getResources().getString(R.string.navLogout));
}
else if(response.code() == 403) {

4
app/src/main/java/org/mian/gitnex/viewmodels/AdminGetUsersViewModel.java
View File

@ -51,8 +51,8 @@ public class AdminGetUsersViewModel extends ViewModel {
AlertDialogs.authorizationTokenRevokedDialog(ctx, ctx.getResources().getString(R.string.alertDialogTokenRevokedTitle),
ctx.getResources().getString(R.string.alertDialogTokenRevokedMessage),
ctx.getResources().getString(R.string.alertDialogTokenRevokedCopyNegativeButton),
ctx.getResources().getString(R.string.alertDialogTokenRevokedCopyPositiveButton));
ctx.getResources().getString(R.string.cancelButton),
ctx.getResources().getString(R.string.navLogout));
}
else if(response.code() == 403) {

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

@ -84,7 +84,7 @@
android:layout_width="match_parent"
android:layout_height="60dp"
android:layout_marginTop="8dp"
android:text="@string/profileEmailButton"
android:text="@string/saveButton"
android:textColor="@color/btnTextColor" />
</LinearLayout>

4
app/src/main/res/layout/bottom_sheet_labels_in_list.xml
View File

@ -46,7 +46,7 @@
android:clickable="true"
android:drawablePadding="24dp"
android:padding="12dp"
android:text="@string/labelMenuEdit"
android:text="@string/menuEditText"
android:textColor="?attr/primaryTextColor"
android:textSize="16sp"
app:drawableStartCompat="@drawable/ic_edit" />
@ -61,7 +61,7 @@
android:clickable="true"
android:drawablePadding="24dp"
android:padding="12dp"
android:text="@string/labelMenuDelete"
android:text="@string/menuDeleteText"
android:textColor="?attr/primaryTextColor"
android:textSize="16sp"
app:drawableStartCompat="@drawable/ic_delete" />

16
app/src/main/res/values/settings.xml
View File

@ -41,21 +41,21 @@
</string-array>
<string-array name="appDefaultHomeScreen">
<item>@string/pageTitleMyRepos</item>
<item>@string/navMyRepos</item>
<item>@string/pageTitleStarredRepos</item>
<item>@string/pageTitleOrganizations</item>
<item>@string/pageTitleRepositories</item>
<item>@string/pageTitleProfile</item>
<item>@string/navOrg</item>
<item>@string/navRepos</item>
<item>@string/navProfile</item>
<item>@string/pageTitleExplore</item>
<item>@string/titleDrafts</item>
</string-array>
<string-array name="appDefaultHomeScreenNew">
<item>@string/pageTitleMyRepos</item>
<item>@string/navMyRepos</item>
<item>@string/pageTitleStarredRepos</item>
<item>@string/pageTitleOrganizations</item>
<item>@string/pageTitleRepositories</item>
<item>@string/pageTitleProfile</item>
<item>@string/navOrg</item>
<item>@string/navRepos</item>
<item>@string/navProfile</item>
<item>@string/pageTitleExplore</item>
<item>@string/titleDrafts</item>
<item>@string/pageTitleNotifications</item>

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

@ -32,14 +32,8 @@
<!-- menu items -->
<!-- page titles -->
<string name="pageTitleAbout">About</string>
<string name="pageTitleMyRepos">My Repositories</string>
<string name="pageTitleRepositories">Repositories</string>
<string name="pageTitleProfile">Profile</string>
<string name="pageTitleNewRepo">New Repository</string>
<string name="pageTitleOrganizations">Organizations</string>
<string name="pageTitleIssues">Issues</string>
<string name="pageTitleSettings">Settings</string>
<string name="pageTitleCreateOrganization">New Organization</string>
<string name="pageTitleCreateMilestone">New Milestone</string>
<string name="pageTitleCreateNewIssue">New Issue</string>
@ -47,7 +41,6 @@
<string name="pageTitleCredits">Credits</string>
<string name="pageTitleChooseBranch">Select Branch</string>
<string name="pageTitleLabelUpdate">Update Label</string>
<string name="pageTitleSponsors">Donators</string>
<string name="pageTitleStarredRepos">Starred Repositories</string>
<string name="pageTitleCreateTeam">New Team</string>
<string name="pageTitleAddEmail">Add Email Address</string>
@ -60,12 +53,10 @@
<!-- page titles -->
<string name="repoName">Demo repo</string>
<string name="repoFullName">Repo with ORG</string>
<string name="repoDescription">Demo description</string>
<string name="noData">No repositories found</string>
<string name="orgName">Demo organization</string>
<string name="orgDescription">Demo description</string>
<string name="noDataOrg">No organizations found</string>
<string name="newCreateButtonCopy">Create</string>
@ -133,7 +124,6 @@
<string name="removeContent">Remove</string>
<string name="genericApiStatusError">Instance has returned an error. Code\u0020</string>
<string name="titleActivityRepoDetail">RepoDetailActivity</string>
<string name="tabTextInfo">Details</string>
<string name="tabTextFiles">Files</string>
<string name="tabTextMl">Milestones</string>
@ -292,8 +282,6 @@
<string name="noDataLabelsTab">No labels found</string>
<string name="labelMenuContentDesc">Desc</string>
<string name="labelMenuEdit">Edit</string>
<string name="labelMenuDelete">Delete</string>
<string name="labelDeleteText">Label deleted</string>
<string name="labelDeleteErrorText">Something went wrong, please try again</string>
@ -302,15 +290,10 @@
<string name="alertDialogTokenRevokedTitle">Authorization Error</string>
<string name="alertDialogTokenRevokedMessage">It seems that the Access Token is revoked OR your are not allowed to see these contents.\n\nIn case of revoked Token, please logout and login again</string>
<string name="alertDialogTokenRevokedCopyNegativeButton">Cancel</string>
<string name="alertDialogTokenRevokedCopyPositiveButton">Logout</string>
<string name="labelDeleteTitle">Delete\u0020</string>
<string name="labelDeleteTitle">Delete %s</string>
<string name="labelDeleteMessage">Do you really want to delete this label?</string>
<string name="labelDeletePositiveButton">OK</string>
<string name="labelDeleteNegativeButton">Cancel</string>
<!-- org tabbed layout str -->
<string name="titleActivityOrgDetail">OrgDetailActivity</string>
<string name="orgTabRepos">Repositories</string>
<string name="orgTabTeams">Teams</string>
<string name="orgTabMembers">Members</string>
@ -352,7 +335,6 @@
<!-- issue comments -->
<string name="editCommentTitle">Edit Comment</string>
<string name="editCommentButtonText">Edit</string>
<string name="editCommentUpdatedText">Comment updated</string>
<string name="issueCommentShare">Share Comment</string>
<string name="deleteCommentSuccess">Comment deleted successfully</string>
@ -373,7 +355,6 @@
<string name="profileTabFollowers">Followers</string>
<string name="profileTabFollowing">Following</string>
<string name="profileCreateNewEmailAddress">Add Email Address</string>
<string name="profileEmailButton">Save</string>
<string name="profileEmailTitle">Email Address</string>
<string name="emailAddedText">New email added successfully</string>
<string name="emailErrorEmpty">Email address is empty</string>