github/xmrwallet
1
Fork 0
mirror of https://github.com/m2049r/xmrwallet synced 2024-11-24 14:37:14 +01:00
Code Releases Activity

confirm checkboxes for delete confirmation dialogs (#759)

Browse Source
This commit is contained in:
m2049r 2021-04-25 14:26:46 +02:00 committed by GitHub
parent 5df323bacb
commit 2746c52d7b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
26 changed files with 55 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
app/src/main/java/com/m2049r/xmrwallet/LoginActivity.java
View File

@ -44,6 +44,7 @@ import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentManager;
import androidx.fragment.app.FragmentTransaction;
import com.google.android.material.checkbox.MaterialCheckBox;
import com.google.android.material.dialog.MaterialAlertDialogBuilder;
import com.m2049r.xmrwallet.data.DefaultNodes;
import com.m2049r.xmrwallet.data.Node;
@ -554,12 +555,18 @@ public class LoginActivity extends BaseActivity
}
};
AlertDialog.Builder builder = new MaterialAlertDialogBuilder(this);
builder.setMessage(getString(R.string.delete_alert_message))
final AlertDialog.Builder builder = new MaterialAlertDialogBuilder(this);
final AlertDialog confirm = builder.setMessage(getString(R.string.delete_alert_message))
.setTitle(walletName)
.setPositiveButton(getString(R.string.delete_alert_yes), dialogClickListener)
.setNegativeButton(getString(R.string.delete_alert_no), dialogClickListener)
.setView(View.inflate(builder.getContext(), R.layout.checkbox_confirm, null))
.show();
confirm.getButton(DialogInterface.BUTTON_POSITIVE).setEnabled(false);
final MaterialCheckBox checkBox = confirm.findViewById(R.id.checkbox);
checkBox.setOnCheckedChangeListener((buttonView, isChecked) -> {
confirm.getButton(DialogInterface.BUTTON_POSITIVE).setEnabled(isChecked);
});
}
@Override
@ -579,12 +586,18 @@ public class LoginActivity extends BaseActivity
}
};
AlertDialog.Builder builder = new MaterialAlertDialogBuilder(this);
builder.setMessage(getString(R.string.deletecache_alert_message, walletName))
final AlertDialog.Builder builder = new MaterialAlertDialogBuilder(this);
final AlertDialog confirm = builder.setMessage(getString(R.string.deletecache_alert_message))
.setTitle(walletName)
.setPositiveButton(getString(R.string.delete_alert_yes), dialogClickListener)
.setNegativeButton(getString(R.string.delete_alert_no), dialogClickListener)
.setView(View.inflate(builder.getContext(), R.layout.checkbox_confirm, null))
.show();
confirm.getButton(DialogInterface.BUTTON_POSITIVE).setEnabled(false);
final MaterialCheckBox checkBox = confirm.findViewById(R.id.checkbox);
checkBox.setOnCheckedChangeListener((buttonView, isChecked) -> {
confirm.getButton(DialogInterface.BUTTON_POSITIVE).setEnabled(isChecked);
});
}
void reloadWalletList() {

13
app/src/main/res/layout/checkbox_confirm.xml Normal file
View File

@ -0,0 +1,13 @@
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<com.google.android.material.checkbox.MaterialCheckBox
android:id="@+id/checkbox"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end"
android:paddingEnd="16dp"
android:text="@string/onboarding_agree" />
</FrameLayout>

2
app/src/main/res/values-cat/strings.xml
View File

@ -417,7 +417,7 @@
<string name="subaddress_select_label">Select a subaddress</string>
<string name="subaddress_details_hint">Long-press for details</string>
<string name="delete_alert_message">This wallet will be deleted!</string>
<string name="delete_alert_message">This wallet will be deleted. Your funds will be gone forever unless you have your seed or a working backup to recover it.</string>
<string name="menu_delete">Delete</string><!-- like: "Delete wallet!" -->
<string name="delete_failed">Delete failed!</string>

2
app/src/main/res/values-de/strings.xml
View File

@ -266,7 +266,7 @@
<string name="details_alert_no">Nein, doch nicht!</string>
<string name="details_title">Details</string>
<string name="delete_alert_message">Das Wallet wird gelöscht!</string>
<string name="delete_alert_message">Das Wallet wird gelöscht. Dein Geld wird für immer verloren sein, außer wenn Du den Seed oder ein funktionierendes Backup hast um es wiederherzustellen.</string>
<string name="delete_alert_yes">Ja, mach das!</string>
<string name="delete_alert_no">Nein, danke!</string>

2
app/src/main/res/values-el/strings.xml
View File

@ -419,7 +419,7 @@
<string name="subaddress_select_label">Select a subaddress</string>
<string name="subaddress_details_hint">Long-press for details</string>
<string name="delete_alert_message">This wallet will be deleted!</string>
<string name="delete_alert_message">This wallet will be deleted. Your funds will be gone forever unless you have your seed or a working backup to recover it.</string>
<string name="menu_delete">Delete</string><!-- like: "Delete wallet!" -->
<string name="delete_failed">Delete failed!</string>

2
app/src/main/res/values-eo/strings.xml
View File

@ -419,7 +419,7 @@
<string name="subaddress_select_label">Select a subaddress</string>
<string name="subaddress_details_hint">Long-press for details</string>
<string name="delete_alert_message">This wallet will be deleted!</string>
<string name="delete_alert_message">This wallet will be deleted. Your funds will be gone forever unless you have your seed or a working backup to recover it.</string>
<string name="menu_delete">Delete</string><!-- like: "Delete wallet!" -->
<string name="delete_failed">Delete failed!</string>

2
app/src/main/res/values-es/strings.xml
View File

@ -207,7 +207,7 @@
<string name="details_alert_no">¡Llévame de vuelta!</string>
<string name="details_title">Detalles</string>
<string name="delete_alert_message">¡El monedero será borrado!</string>
<string name="delete_alert_message">Este monedero será borrado. Tus fondos se irán para siempre a menos que tengas tu semilla o una copia de seguridad funcional para recuperarlo.</string>
<string name="delete_alert_yes">¡Sí, hazlo!</string>
<string name="delete_alert_no">¡No, gracias!</string>

2
app/src/main/res/values-et/strings.xml
View File

@ -417,7 +417,7 @@
<string name="subaddress_select_label">Select a subaddress</string>
<string name="subaddress_details_hint">Long-press for details</string>
<string name="delete_alert_message">This wallet will be deleted!</string>
<string name="delete_alert_message">This wallet will be deleted. Your funds will be gone forever unless you have your seed or a working backup to recover it.</string>
<string name="menu_delete">Delete</string><!-- like: "Delete wallet!" -->
<string name="delete_failed">Delete failed!</string>

2
app/src/main/res/values-fr/strings.xml
View File

@ -267,7 +267,7 @@
<string name="details_alert_no">Non merci !</string>
<string name="details_title">Détails</string>
<string name="delete_alert_message">Le portefeuille sera supprimé !</string>
<string name="delete_alert_message">Ce portefeuille sera supprimé. Vos fonds seront perdus à jamais, sauf si vous disposez de votre semence ou d\'une sauvegarde fonctionnelle pour les récupérer.</string>
<string name="delete_alert_yes">Oui, procéder !</string>
<string name="delete_alert_no">Non merci !</string>

2
app/src/main/res/values-hu/strings.xml
View File

@ -421,7 +421,7 @@
<string name="subaddress_select_label">Select a subaddress</string>
<string name="subaddress_details_hint">Long-press for details</string>
<string name="delete_alert_message">This wallet will be deleted!</string>
<string name="delete_alert_message">This wallet will be deleted. Your funds will be gone forever unless you have your seed or a working backup to recover it.</string>
<string name="menu_delete">Delete</string><!-- like: "Delete wallet!" -->
<string name="delete_failed">Delete failed!</string>

4
app/src/main/res/values-it/strings.xml
View File

@ -266,7 +266,7 @@
<string name="details_alert_no">Torna indietro!</string>
<string name="details_title">Dettagli</string>
<string name="delete_alert_message">Il portafoglio verrà eliminato!</string>
<string name="delete_alert_message">Questo portafoglio sarà cancellato. I tuoi fondi saranno andati per sempre a meno che tu non abbia il tuo seme o un backup funzionante per recuperarli.</string>
<string name="delete_alert_yes">Sì, procedi!</string>
<string name="delete_alert_no">No grazie!</string>
@ -366,7 +366,7 @@
<string name="menu_rescan">Rescan!</string>
<string name="onboarding_agree">I get it!</string>
<string name="onboarding_agree">Ho capito!</string>
<string name="onboarding_button_next">Next</string>
<string name="onboarding_button_ready">I\'m ready!</string>

2
app/src/main/res/values-ja/strings.xml
View File

@ -422,7 +422,7 @@
<string name="subaddress_select_label">Select a subaddress</string>
<string name="subaddress_details_hint">Long-press for details</string>
<string name="delete_alert_message">This wallet will be deleted!</string>
<string name="delete_alert_message">This wallet will be deleted. Your funds will be gone forever unless you have your seed or a working backup to recover it.</string>
<string name="menu_delete">Delete</string><!-- like: "Delete wallet!" -->
<string name="delete_failed">Delete failed!</string>

2
app/src/main/res/values-nb/strings.xml
View File

@ -419,7 +419,7 @@
<string name="subaddress_select_label">Select a subaddress</string>
<string name="subaddress_details_hint">Long-press for details</string>
<string name="delete_alert_message">This wallet will be deleted!</string>
<string name="delete_alert_message">This wallet will be deleted. Your funds will be gone forever unless you have your seed or a working backup to recover it.</string>
<string name="menu_delete">Delete</string><!-- like: "Delete wallet!" -->
<string name="delete_failed">Delete failed!</string>

2
app/src/main/res/values-nl/strings.xml
View File

@ -261,7 +261,7 @@
<string name="details_alert_no">Ga terug!</string>
<string name="details_title">Details</string>
<string name="delete_alert_message">Er wordt de portemonnee verwijderd!</string>
<string name="delete_alert_message">Deze portemonnee zal worden verwijderd. Uw geld zal voor altijd weg zijn, tenzij u uw zaad of een werkende back-up hebt om het te herstellen.</string>
<string name="delete_alert_yes">Ja, doe dat!</string>
<string name="delete_alert_no">Nee, niet doen!</string>

2
app/src/main/res/values-pt-rBR/strings.xml
View File

@ -411,7 +411,7 @@
<string name="subaddress_select_label">Selecione um subendereço</string>
<string name="subaddress_details_hint">Toque e segure para mais detalhes</string>
<string name="delete_alert_message">This wallet will be deleted!</string>
<string name="delete_alert_message">This wallet will be deleted. Your funds will be gone forever unless you have your seed or a working backup to recover it.</string>
<string name="menu_delete">Delete</string><!-- like: "Delete wallet!" -->
<string name="delete_failed">Delete failed!</string>

2
app/src/main/res/values-pt/strings.xml
View File

@ -423,7 +423,7 @@
<string name="subaddress_select_label">Select a subaddress</string>
<string name="subaddress_details_hint">Long-press for details</string>
<string name="delete_alert_message">This wallet will be deleted!</string>
<string name="delete_alert_message">This wallet will be deleted. Your funds will be gone forever unless you have your seed or a working backup to recover it.</string>
<string name="menu_delete">Delete</string><!-- like: "Delete wallet!" -->
<string name="delete_failed">Delete failed!</string>

2
app/src/main/res/values-ro/strings.xml
View File

@ -419,7 +419,7 @@
<string name="subaddress_select_label">Selectează o subadresă</string>
<string name="subaddress_details_hint">Atinge lung pentru detalii</string>
<string name="delete_alert_message">This wallet will be deleted!</string>
<string name="delete_alert_message">This wallet will be deleted. Your funds will be gone forever unless you have your seed or a working backup to recover it.</string>
<string name="menu_delete">Delete</string><!-- like: "Delete wallet!" -->
<string name="delete_failed">Delete failed!</string>

2
app/src/main/res/values-ru/strings.xml
View File

@ -265,7 +265,7 @@
<string name="details_alert_no">Верните меня обратно!</string>
<string name="details_title">Подробная информация</string>
<string name="delete_alert_message">Этот кошелек будет удален!</string>
<string name="delete_alert_message">Этот кошелек будет удален. Твои деньги исчезнут навсегда, если у тебя нет сид-фразы или рабочей резервной копии для их восстановления.</string>
<string name="delete_alert_yes">Да, сделай это!</string>
<string name="delete_alert_no">Нет, спасибо!</string>

2
app/src/main/res/values-sk/strings.xml
View File

@ -262,7 +262,7 @@
<string name="details_alert_no">Naspäť!</string>
<string name="details_title">Detaily</string>
<string name="delete_alert_message">Peňaženka bude zmazaná!</string>
<string name="delete_alert_message">Táto peňaženka bude zmazaná. Vaše finančné prostriedky budú navždy preč, pokiaľ nemáte svoj seed alebo funkčnú zálohu na ich obnovenie.</string>
<string name="delete_alert_yes">Áno, poďme na to!</string>
<string name="delete_alert_no">Nie, díky!</string>

2
app/src/main/res/values-sr/strings.xml
View File

@ -272,7 +272,7 @@
<string name="details_alert_no">Vrati me nazad!</string>
<string name="details_title">Detalji</string>
<string name="delete_alert_message">Novčanik će biti obrisan!</string>
<string name="delete_alert_message">Ovaj novčanik će biti obrisan. Vaša sredstva će zauvek nestati ako nemate svoje seme ili ispravnu rezervnu kopiju da biste ih vratili.</string>
<string name="delete_alert_yes">Da, uradi to!</string>
<string name="delete_alert_no">Ne, hvala!</string>

2
app/src/main/res/values-sv/strings.xml
View File

@ -411,7 +411,7 @@
<string name="subaddress_select_label">Välj en subadress</string>
<string name="subaddress_details_hint">Tryck länge för mer detaljerad info</string>
<string name="delete_alert_message">Denna plånbok kommer förstöras!</string>
<string name="delete_alert_message">Denna plånbok kommer att raderas. Dina pengar kommer att vara borta för alltid om du inte har din seed eller en fungerande säkerhetskopia för att återställa dem.</string>
<string name="menu_delete">Förstöra</string><!-- like: "Delete wallet!" -->
<string name="delete_failed">Förstöringen misslyckades!</string>

2
app/src/main/res/values-uk/strings.xml
View File

@ -265,7 +265,7 @@
<string name="details_alert_no">Поверніть мене назад!</string>
<string name="details_title">Детальна інформація</string>
<string name="delete_alert_message">Цей гаманець буде знищено!</string>
<string name="delete_alert_message">Цей гаманець буде знищено. Ваші кошти назавжди зникнуть, якщо у вас немає насіння або діючої резервної копії для його відновлення. </string>
<string name="delete_alert_yes">Так, зроби це!</string>
<string name="delete_alert_no">Ні, дякую!</string>

2
app/src/main/res/values-zh-rCN/strings.xml
View File

@ -343,7 +343,7 @@
<string name="subaddress_select_label">Select a subaddress</string>
<string name="subaddress_details_hint">Long-press for details</string>
<string name="delete_alert_message">This wallet will be deleted!</string>
<string name="delete_alert_message">This wallet will be deleted. Your funds will be gone forever unless you have your seed or a working backup to recover it.</string>
<string name="menu_delete">Delete</string><!-- like: "Delete wallet!" -->
<string name="delete_failed">Delete failed!</string>

2
app/src/main/res/values-zh-rTW/strings.xml
View File

@ -418,7 +418,7 @@
<string name="subaddress_select_label">Select a subaddress</string>
<string name="subaddress_details_hint">Long-press for details</string>
<string name="delete_alert_message">This wallet will be deleted!</string>
<string name="delete_alert_message">This wallet will be deleted. Your funds will be gone forever unless you have your seed or a working backup to recover it.</string>
<string name="menu_delete">Delete</string><!-- like: "Delete wallet!" -->
<string name="delete_failed">Delete failed!</string>

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

@ -278,7 +278,7 @@
<string name="details_alert_no">Take me back!</string>
<string name="details_title">Details</string>
<string name="delete_alert_message">This wallet will be deleted!</string>
<string name="delete_alert_message">This wallet will be deleted. Your funds will be gone forever unless you have your seed or a working backup to recover it.</string>
<string name="delete_alert_yes">Yes, do that!</string>
<string name="delete_alert_no">No thanks!</string>

2
external-libs/VERSION
View File

@ -1 +1 @@
MONERUJO_monero feature_updatedocker with monero release-v0.17.2.0-monerujo
MONERUJO_monero master with monero release-v0.17.2.0-monerujo