github-starred/gitnex
2
0
Fork 0
mirror of https://github.com/gitnex-org/gitnex.git synced 2026-04-29 12:03:46 -05:00
Code Issues Packages Projects Releases Wiki Activity

Port missing dialogs to M3

Browse Source
This commit is contained in:
M M Arif
2022-08-11 09:52:42 +05:00
parent 95c3b05e6e
commit e2c4299c0a
4 changed files with 36 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
app/src/main/java/org/mian/gitnex/activities/AddNewAccountActivity.java
View File

@@ -7,7 +7,7 @@ import android.util.Log;
import android.view.View; import android.view.View;
import android.widget.ArrayAdapter; import android.widget.ArrayAdapter;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.appcompat.app.AlertDialog; import com.google.android.material.dialog.MaterialAlertDialogBuilder;
import org.gitnex.tea4j.v2.models.GeneralAPISettings; import org.gitnex.tea4j.v2.models.GeneralAPISettings;
import org.gitnex.tea4j.v2.models.ServerVersion; import org.gitnex.tea4j.v2.models.ServerVersion;
import org.gitnex.tea4j.v2.models.User; import org.gitnex.tea4j.v2.models.User;
@@ -152,22 +152,17 @@ public class AddNewAccountActivity extends BaseActivity {
if(giteaVersion.less(getString(R.string.versionLow))) { if(giteaVersion.less(getString(R.string.versionLow))) {
AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(ctx).setTitle(getString(R.string.versionAlertDialogHeader)) MaterialAlertDialogBuilder materialAlertDialogBuilder = new MaterialAlertDialogBuilder(ctx)
.setMessage(getResources().getString(R.string.versionUnsupportedOld, version.getVersion())).setIcon(R.drawable.ic_warning) .setTitle(getString(R.string.versionAlertDialogHeader))
.setCancelable(true); .setMessage(getResources().getString(R.string.versionUnsupportedOld, version.getVersion()))
.setNeutralButton(getString(R.string.cancelButton), null)
.setPositiveButton(getString(R.string.textContinue), (dialog, which) -> {
alertDialogBuilder.setNeutralButton(getString(R.string.cancelButton), (dialog, which) -> { dialog.dismiss();
login(instanceUrl, loginToken);
});
dialog.dismiss(); materialAlertDialogBuilder.create().show();
});
alertDialogBuilder.setPositiveButton(getString(R.string.textContinue), (dialog, which) -> {
dialog.dismiss();
login(instanceUrl, loginToken);
});
alertDialogBuilder.create().show();
} }
else if(giteaVersion.lessOrEqual(getString(R.string.versionHigh))) { else if(giteaVersion.lessOrEqual(getString(R.string.versionHigh))) {

29
app/src/main/java/org/mian/gitnex/activities/LoginActivity.java
View File

@@ -9,7 +9,7 @@ import android.widget.Button;
import android.widget.EditText; import android.widget.EditText;
import android.widget.RadioGroup; import android.widget.RadioGroup;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.appcompat.app.AlertDialog; import com.google.android.material.dialog.MaterialAlertDialogBuilder;
import org.gitnex.tea4j.v2.models.AccessToken; import org.gitnex.tea4j.v2.models.AccessToken;
import org.gitnex.tea4j.v2.models.CreateAccessTokenOption; import org.gitnex.tea4j.v2.models.CreateAccessTokenOption;
import org.gitnex.tea4j.v2.models.GeneralAPISettings; import org.gitnex.tea4j.v2.models.GeneralAPISettings;
@@ -277,24 +277,21 @@ public class LoginActivity extends BaseActivity {
if(giteaVersion.less(getString(R.string.versionLow))) { if(giteaVersion.less(getString(R.string.versionLow))) {
AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(ctx).setTitle(getString(R.string.versionAlertDialogHeader)) MaterialAlertDialogBuilder materialAlertDialogBuilder = new MaterialAlertDialogBuilder(ctx)
.setMessage(getResources().getString(R.string.versionUnsupportedOld, version.getVersion())).setIcon(R.drawable.ic_warning) .setTitle(getString(R.string.versionAlertDialogHeader))
.setCancelable(true); .setMessage(getResources().getString(R.string.versionUnsupportedOld, version.getVersion()))
.setNeutralButton(getString(R.string.cancelButton), (dialog, which) -> {
alertDialogBuilder.setNeutralButton(getString(R.string.cancelButton), (dialog, which) -> { dialog.dismiss();
enableProcessButton();
})
.setPositiveButton(getString(R.string.textContinue), (dialog, which) -> {
dialog.dismiss(); dialog.dismiss();
enableProcessButton(); login(loginType, loginUid, loginPass, loginOTP, loginToken);
}); });
alertDialogBuilder.setPositiveButton(getString(R.string.textContinue), (dialog, which) -> {
dialog.dismiss();
login(loginType, loginUid, loginPass, loginOTP, loginToken);
});
alertDialogBuilder.create().show();
materialAlertDialogBuilder.create().show();
} }
else if(giteaVersion.lessOrEqual(getString(R.string.versionHigh))) { else if(giteaVersion.lessOrEqual(getString(R.string.versionHigh))) {

11
app/src/main/java/org/mian/gitnex/activities/WikiActivity.java
View File

@@ -8,7 +8,7 @@ import android.view.MenuInflater;
import android.view.MenuItem; import android.view.MenuItem;
import android.view.View; import android.view.View;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.appcompat.app.AlertDialog; import com.google.android.material.dialog.MaterialAlertDialogBuilder;
import com.vdurmont.emoji.EmojiParser; import com.vdurmont.emoji.EmojiParser;
import org.gitnex.tea4j.v2.models.CreateWikiPageOptions; import org.gitnex.tea4j.v2.models.CreateWikiPageOptions;
import org.gitnex.tea4j.v2.models.WikiPage; import org.gitnex.tea4j.v2.models.WikiPage;
@@ -269,10 +269,10 @@ public class WikiActivity extends BaseActivity implements BottomSheetListener {
private void deleteWiki(final String owner, final String repo, final String pageName) { private void deleteWiki(final String owner, final String repo, final String pageName) {
new AlertDialog.Builder(ctx) MaterialAlertDialogBuilder materialAlertDialogBuilder = new MaterialAlertDialogBuilder(ctx)
.setTitle(String.format(ctx.getString(R.string.deleteGenericTitle), pageName)) .setTitle(String.format(ctx.getString(R.string.deleteGenericTitle), pageName))
.setMessage(ctx.getString(R.string.deleteWikiPageMessage, pageName)) .setMessage(ctx.getString(R.string.deleteWikiPageMessage, pageName))
.setIcon(R.drawable.ic_delete) .setNeutralButton(R.string.cancelButton, null)
.setPositiveButton(R.string.menuDeleteText, (dialog, whichButton) -> RetrofitClient .setPositiveButton(R.string.menuDeleteText, (dialog, whichButton) -> RetrofitClient
.getApiInterface(ctx).repoDeleteWikiPage(owner, repo, pageName).enqueue(new Callback<>() { .getApiInterface(ctx).repoDeleteWikiPage(owner, repo, pageName).enqueue(new Callback<>() {
@@ -297,8 +297,9 @@ public class WikiActivity extends BaseActivity implements BottomSheetListener {
Toasty.error(ctx, ctx.getString(R.string.genericError)); Toasty.error(ctx, ctx.getString(R.string.genericError));
} }
})) }));
.setNeutralButton(R.string.cancelButton, null).show();
materialAlertDialogBuilder.create().show();
} }
@Override @Override

16
app/src/main/java/org/mian/gitnex/helpers/ChangeLog.java
View File

@@ -5,8 +5,8 @@ import android.content.pm.PackageManager;
import android.content.res.Resources; import android.content.res.Resources;
import android.content.res.XmlResourceParser; import android.content.res.XmlResourceParser;
import android.util.Log; import android.util.Log;
import androidx.appcompat.app.AlertDialog;
import androidx.core.text.HtmlCompat; import androidx.core.text.HtmlCompat;
import com.google.android.material.dialog.MaterialAlertDialogBuilder;
import org.mian.gitnex.R; import org.mian.gitnex.R;
import org.xmlpull.v1.XmlPullParser; import org.xmlpull.v1.XmlPullParser;
import org.xmlpull.v1.XmlPullParserException; import org.xmlpull.v1.XmlPullParserException;
@@ -90,15 +90,13 @@ public class ChangeLog {
String changelogMessage = getChangelog(resId, res); String changelogMessage = getChangelog(resId, res);
AlertDialog.Builder builder = new AlertDialog.Builder(changelogActivity); MaterialAlertDialogBuilder materialAlertDialogBuilder = new MaterialAlertDialogBuilder(changelogActivity)
.setTitle(R.string.changelogTitle)
builder.setTitle(R.string.changelogTitle); .setMessage(HtmlCompat.fromHtml("<small>" + changelogMessage + "</small>", HtmlCompat.FROM_HTML_MODE_LEGACY))
builder.setMessage(HtmlCompat.fromHtml("<small>" + changelogMessage + "</small>", HtmlCompat.FROM_HTML_MODE_LEGACY)); .setCancelable(false)
builder.setNeutralButton(R.string.close, null); .setNeutralButton(R.string.close, null);
builder.setCancelable(false);
builder.create().show();
materialAlertDialogBuilder.create().show();
} }
} }