GRIN/grim
1
0
Fork 1
mirror of https://code.gri.mw/GUI/grim.git synced 2026-07-10 08:54:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

modal: close refactoring

Browse Source
This commit is contained in:
ardocrat
2025-05-27 22:14:43 +03:00
parent 1ff2b27edc
commit 6c04eec026
26 changed files with 129 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gui/views/content.rs
+16 -19
View File
@@ -89,9 +89,9 @@ impl ModalContainer for Content {
cb: &dyn PlatformCallbacks) {
match modal.id {
Self::EXIT_CONFIRMATION_MODAL => self.exit_modal_content(ui, modal, cb),
Self::SETTINGS_MODAL => self.settings_modal_ui(ui, modal),
ANDROID_INTEGRATED_NODE_WARNING_MODAL => self.android_warning_modal_ui(ui, modal),
CRASH_REPORT_MODAL => self.crash_report_modal_ui(ui, modal, cb),
Self::SETTINGS_MODAL => self.settings_modal_ui(ui),
ANDROID_INTEGRATED_NODE_WARNING_MODAL => self.android_warning_modal_ui(ui),
CRASH_REPORT_MODAL => self.crash_report_modal_ui(ui, cb),
_ => {}
}
}
@@ -189,7 +189,7 @@ impl Content {
if !Node::is_running() {
self.exit_allowed = true;
cb.exit();
modal.close();
Modal::close();
}
ui.add_space(16.0);
ui.vertical_centered(|ui| {
@@ -215,7 +215,7 @@ impl Content {
ui.columns(2, |columns| {
columns[0].vertical_centered_justified(|ui| {
View::button(ui, t!("modal.cancel"), Colors::white_or_black(false), || {
modal.close();
Modal::close();
});
});
columns[1].vertical_centered_justified(|ui| {
@@ -223,7 +223,7 @@ impl Content {
if !Node::is_running() {
self.exit_allowed = true;
cb.exit();
modal.close();
Modal::close();
} else {
Node::stop(true);
modal.disable_closing();
@@ -247,7 +247,7 @@ impl Content {
}
/// Draw creating wallet name/password input [`Modal`] content.
pub fn settings_modal_ui(&mut self, ui: &mut egui::Ui, modal: &Modal) {
pub fn settings_modal_ui(&mut self, ui: &mut egui::Ui) {
ui.add_space(6.0);
// Show theme selection.
@@ -268,7 +268,7 @@ impl Content {
// Draw available list of languages to select.
let locales = rust_i18n::available_locales!();
for (index, locale) in locales.iter().enumerate() {
Self::language_item_ui(locale, ui, index, locales.len(), modal);
Self::language_item_ui(locale, ui, index, locales.len());
}
ui.add_space(8.0);
@@ -276,7 +276,7 @@ impl Content {
// Show button to close modal.
ui.vertical_centered_justified(|ui| {
View::button(ui, t!("close"), Colors::white_or_black(false), || {
modal.close();
Modal::close();
});
});
ui.add_space(6.0);
@@ -309,7 +309,7 @@ impl Content {
}
/// Draw language selection item content.
fn language_item_ui(locale: &str, ui: &mut egui::Ui, index: usize, len: usize, modal: &Modal) {
fn language_item_ui(locale: &str, ui: &mut egui::Ui, index: usize, len: usize) {
// Setup layout size.
let mut rect = ui.available_rect_before_wrap();
rect.set_height(50.0);
@@ -334,7 +334,7 @@ impl Content {
View::item_button(ui, View::item_rounding(index, len, true), CHECK, None, || {
rust_i18n::set_locale(locale);
AppConfig::save_locale(locale);
modal.close();
Modal::close();
});
} else {
ui.add_space(14.0);
@@ -363,7 +363,7 @@ impl Content {
}
/// Draw content for integrated node warning [`Modal`] on Android.
fn android_warning_modal_ui(&mut self, ui: &mut egui::Ui, modal: &Modal) {
fn android_warning_modal_ui(&mut self, ui: &mut egui::Ui) {
ui.add_space(6.0);
ui.vertical_centered(|ui| {
ui.label(RichText::new(t!("network.android_warning"))
@@ -374,17 +374,14 @@ impl Content {
ui.vertical_centered_justified(|ui| {
View::button(ui, t!("continue"), Colors::white_or_black(false), || {
AppConfig::show_android_integrated_node_warning();
modal.close();
Modal::close();
});
});
ui.add_space(6.0);
}
/// Draw content for integrated node warning [`Modal`] on Android.
fn crash_report_modal_ui(&mut self,
ui: &mut egui::Ui,
modal: &Modal,
cb: &dyn PlatformCallbacks) {
fn crash_report_modal_ui(&mut self, ui: &mut egui::Ui, cb: &dyn PlatformCallbacks) {
ui.add_space(6.0);
ui.vertical_centered(|ui| {
ui.label(RichText::new(t!("crash_report_warning"))
@@ -399,7 +396,7 @@ impl Content {
let _ = cb.share_data(name, data.as_bytes().to_vec());
}
Settings::delete_crash_report();
modal.close();
Modal::close();
});
});
ui.add_space(8.0);
@@ -408,7 +405,7 @@ impl Content {
ui.vertical_centered_justified(|ui| {
View::button(ui, t!("modal.cancel"), Colors::white_or_black(false), || {
Settings::delete_crash_report();
modal.close();
Modal::close();
});
});
ui.add_space(6.0);
src/gui/views/modal.rs
+5 -10
View File
@@ -73,10 +73,11 @@ impl Modal {
w_state.modal.as_mut().unwrap().position = position;
}
/// Close [`Modal`] by clearing its state..
pub fn close(&self) {
/// Close [`Modal`] by clearing its state.
pub fn close() {
let mut w_nav = MODAL_STATE.write();
w_nav.modal = None;
// Hide keyboard.
KeyboardContent::hide();
}
@@ -116,14 +117,8 @@ impl Modal {
/// Remove [`Modal`] from [`ModalState`] if it's showing and can be closed.
/// Return `false` if modal existed in state before call.
pub fn on_back() -> bool {
let mut w_state = MODAL_STATE.write();
// If Modal is showing and closeable, remove it from state.
if w_state.modal.is_some() {
let modal = w_state.modal.as_ref().unwrap();
if modal.is_closeable() {
w_state.modal = None;
}
if Self::opened().is_some() {
Self::close();
return false;
}
true
src/gui/views/network/modals/ext_conn.rs
+2 -2
View File
@@ -88,7 +88,7 @@ impl ExternalConnectionModal {
m.ext_node_url_edit = "".to_string();
m.ext_node_secret_edit = "".to_string();
m.ext_node_url_error = false;
modal.close();
Modal::close();
}
};
@@ -148,7 +148,7 @@ impl ExternalConnectionModal {
self.ext_node_url_edit = "".to_string();
self.ext_node_secret_edit = "".to_string();
self.ext_node_url_error = false;
modal.close();
Modal::close();
});
});
columns[1].vertical_centered_justified(|ui| {
src/gui/views/network/settings.rs
+4 -4
View File
@@ -69,7 +69,7 @@ impl ModalContainer for NetworkSettings {
modal: &Modal,
_: &dyn PlatformCallbacks) {
match modal.id {
RESET_SETTINGS_CONFIRMATION_MODAL => reset_settings_confirmation_modal(ui, modal),
RESET_SETTINGS_CONFIRMATION_MODAL => reset_settings_confirmation_modal(ui),
_ => {}
}
}
@@ -230,7 +230,7 @@ fn reset_settings_ui(ui: &mut egui::Ui) {
}
/// Confirmation to reset settings to default values.
fn reset_settings_confirmation_modal(ui: &mut egui::Ui, modal: &Modal) {
fn reset_settings_confirmation_modal(ui: &mut egui::Ui) {
ui.add_space(6.0);
ui.vertical_centered(|ui| {
let reset_text = format!("{}?", t!("network_settings.reset_settings_desc"));
@@ -249,12 +249,12 @@ fn reset_settings_confirmation_modal(ui: &mut egui::Ui, modal: &Modal) {
columns[0].vertical_centered_justified(|ui| {
View::button(ui, t!("network_settings.reset"), Colors::white_or_black(false), || {
NodeConfig::reset_to_default();
modal.close();
Modal::close();
});
});
columns[1].vertical_centered_justified(|ui| {
View::button(ui, t!("modal.cancel"), Colors::white_or_black(false), || {
modal.close();
Modal::close();
});
});
});
src/gui/views/network/setup/dandelion.rs
+8 -8
View File
@@ -159,7 +159,7 @@ impl DandelionSetup {
let on_save = |c: &mut DandelionSetup| {
if let Ok(epoch) = c.epoch_edit.parse::<u16>() {
NodeConfig::save_dandelion_epoch(epoch);
modal.close();
Modal::close();
}
};
@@ -198,7 +198,7 @@ impl DandelionSetup {
columns[0].vertical_centered_justified(|ui| {
View::button(ui, t!("modal.cancel"), Colors::white_or_black(false), || {
// Close modal.
modal.close();
Modal::close();
});
});
columns[1].vertical_centered_justified(|ui| {
@@ -237,7 +237,7 @@ impl DandelionSetup {
let on_save = |c: &mut DandelionSetup| {
if let Ok(embargo) = c.embargo_edit.parse::<u16>() {
NodeConfig::save_dandelion_embargo(embargo);
modal.close();
Modal::close();
}
};
@@ -276,7 +276,7 @@ impl DandelionSetup {
columns[0].vertical_centered_justified(|ui| {
View::button(ui, t!("modal.cancel"), Colors::white_or_black(false), || {
// Close modal.
modal.close();
Modal::close();
});
});
columns[1].vertical_centered_justified(|ui| {
@@ -316,7 +316,7 @@ impl DandelionSetup {
let on_save = |c: &mut DandelionSetup| {
if let Ok(embargo) = c.aggregation_edit.parse::<u16>() {
NodeConfig::save_dandelion_aggregation(embargo);
modal.close();
Modal::close();
}
};
@@ -355,7 +355,7 @@ impl DandelionSetup {
columns[0].vertical_centered_justified(|ui| {
View::button(ui, t!("modal.cancel"), Colors::white_or_black(false), || {
// Close modal.
modal.close();
Modal::close();
});
});
columns[1].vertical_centered_justified(|ui| {
@@ -395,7 +395,7 @@ impl DandelionSetup {
let on_save = |c: &mut DandelionSetup| {
if let Ok(prob) = c.stem_prob_edit.parse::<u8>() {
NodeConfig::save_stem_probability(prob);
modal.close();
Modal::close();
}
};
@@ -434,7 +434,7 @@ impl DandelionSetup {
columns[0].vertical_centered_justified(|ui| {
View::button(ui, t!("modal.cancel"), Colors::white_or_black(false), || {
// Close modal.
modal.close();
Modal::close();
});
});
columns[1].vertical_centered_justified(|ui| {
src/gui/views/network/setup/node.rs
+6 -6
View File
@@ -292,7 +292,7 @@ impl NodeSetup {
Node::restart();
}
c.is_api_port_available = true;
modal.close();
Modal::close();
}
};
@@ -330,7 +330,7 @@ impl NodeSetup {
ui.columns(2, |columns| {
columns[0].vertical_centered_justified(|ui| {
View::button(ui, t!("modal.cancel"), Colors::white_or_black(false), || {
modal.close();
Modal::close();
});
});
columns[1].vertical_centered_justified(|ui| {
@@ -389,7 +389,7 @@ impl NodeSetup {
NodeConfig::save_foreign_api_secret(&secret);
}
};
modal.close();
Modal::close();
};
ui.add_space(6.0);
@@ -431,7 +431,7 @@ impl NodeSetup {
ui.columns(2, |columns| {
columns[0].vertical_centered_justified(|ui| {
View::button(ui, t!("modal.cancel"), Colors::white_or_black(false), || {
modal.close();
Modal::close();
});
});
columns[1].vertical_centered_justified(|ui| {
@@ -477,7 +477,7 @@ impl NodeSetup {
let on_save = |c: &mut NodeSetup| {
if let Ok(ftl) = c.ftl_edit.parse::<u64>() {
NodeConfig::save_ftl(ftl);
modal.close();
Modal::close();
}
};
@@ -516,7 +516,7 @@ impl NodeSetup {
columns[0].vertical_centered_justified(|ui| {
View::button(ui, t!("modal.cancel"), Colors::white_or_black(false), || {
// Close modal.
modal.close();
Modal::close();
});
});
columns[1].vertical_centered_justified(|ui| {
src/gui/views/network/setup/p2p.rs
+10 -10
View File
@@ -284,7 +284,7 @@ impl P2PSetup {
Node::restart();
}
c.is_port_available = true;
modal.close();
Modal::close();
}
};
@@ -321,7 +321,7 @@ impl P2PSetup {
columns[0].vertical_centered_justified(|ui| {
View::button(ui, t!("modal.cancel"), Colors::white_or_black(false), || {
// Close modal.
modal.close();
Modal::close();
});
});
columns[1].vertical_centered_justified(|ui| {
@@ -429,7 +429,7 @@ impl P2PSetup {
}
c.is_port_available = true;
modal.close();
Modal::close();
}
};
@@ -467,7 +467,7 @@ impl P2PSetup {
columns[0].vertical_centered_justified(|ui| {
View::button(ui, t!("modal.cancel"), Colors::white_or_black(false), || {
// Close modal.
modal.close();
Modal::close();
});
});
columns[1].vertical_centered_justified(|ui| {
@@ -534,7 +534,7 @@ impl P2PSetup {
let on_save = |c: &mut P2PSetup| {
if let Ok(ban_window) = c.ban_window_edit.parse::<i64>() {
NodeConfig::save_p2p_ban_window(ban_window);
modal.close();
Modal::close();
}
};
@@ -572,7 +572,7 @@ impl P2PSetup {
ui.columns(2, |columns| {
columns[0].vertical_centered_justified(|ui| {
View::button(ui, t!("modal.cancel"), Colors::white_or_black(false), || {
modal.close();
Modal::close();
});
});
columns[1].vertical_centered_justified(|ui| {
@@ -613,7 +613,7 @@ impl P2PSetup {
let on_save = |c: &mut P2PSetup| {
if let Ok(max_inbound) = c.max_inbound_count.parse::<u32>() {
NodeConfig::save_max_inbound_peers(max_inbound);
modal.close();
Modal::close();
}
};
@@ -651,7 +651,7 @@ impl P2PSetup {
ui.columns(2, |columns| {
columns[0].vertical_centered_justified(|ui| {
View::button(ui, t!("modal.cancel"), Colors::white_or_black(false), || {
modal.close();
Modal::close();
});
});
columns[1].vertical_centered_justified(|ui| {
@@ -691,7 +691,7 @@ impl P2PSetup {
let on_save = |c: &mut P2PSetup| {
if let Ok(max_outbound) = c.max_outbound_count.parse::<u32>() {
NodeConfig::save_max_outbound_peers(max_outbound);
modal.close();
Modal::close();
}
};
@@ -730,7 +730,7 @@ impl P2PSetup {
columns[0].vertical_centered_justified(|ui| {
View::button(ui, t!("modal.cancel"), Colors::white_or_black(false), || {
// Close modal.
modal.close();
Modal::close();
});
});
columns[1].vertical_centered_justified(|ui| {
src/gui/views/network/setup/pool.rs
+10 -10
View File
@@ -162,7 +162,7 @@ impl PoolSetup {
let on_save = |c: &mut PoolSetup| {
if let Ok(fee) = c.fee_base_edit.parse::<u64>() {
NodeConfig::save_base_fee(fee);
modal.close();
Modal::close();
}
};
@@ -200,7 +200,7 @@ impl PoolSetup {
columns[0].vertical_centered_justified(|ui| {
View::button(ui, t!("modal.cancel"), Colors::white_or_black(false), || {
// Close modal.
modal.close();
Modal::close();
});
});
columns[1].vertical_centered_justified(|ui| {
@@ -241,7 +241,7 @@ impl PoolSetup {
let on_save = |c: &mut PoolSetup| {
if let Ok(period) = c.reorg_period_edit.parse::<u32>() {
NodeConfig::save_reorg_cache_period(period);
modal.close();
Modal::close();
}
};
@@ -279,7 +279,7 @@ impl PoolSetup {
columns[0].vertical_centered_justified(|ui| {
View::button(ui, t!("modal.cancel"), Colors::white_or_black(false), || {
// Close modal.
modal.close();
Modal::close();
});
});
columns[1].vertical_centered_justified(|ui| {
@@ -319,7 +319,7 @@ impl PoolSetup {
let on_save = |c: &mut PoolSetup| {
if let Ok(size) = c.pool_size_edit.parse::<usize>() {
NodeConfig::save_max_pool_size(size);
modal.close();
Modal::close();
}
};
@@ -357,7 +357,7 @@ impl PoolSetup {
columns[0].vertical_centered_justified(|ui| {
View::button(ui, t!("modal.cancel"), Colors::white_or_black(false), || {
// Close modal.
modal.close();
Modal::close();
});
});
columns[1].vertical_centered_justified(|ui| {
@@ -399,7 +399,7 @@ impl PoolSetup {
let on_save = |c: &mut PoolSetup| {
if let Ok(size) = c.stempool_size_edit.parse::<usize>() {
NodeConfig::save_max_stempool_size(size);
modal.close();
Modal::close();
}
};
@@ -437,7 +437,7 @@ impl PoolSetup {
columns[0].vertical_centered_justified(|ui| {
View::button(ui, t!("modal.cancel"), Colors::white_or_black(false), || {
// Close modal.
modal.close();
Modal::close();
});
});
columns[1].vertical_centered_justified(|ui| {
@@ -479,7 +479,7 @@ impl PoolSetup {
let on_save = |c: &mut PoolSetup| {
if let Ok(weight) = c.max_weight_edit.parse::<u64>() {
NodeConfig::save_mineable_max_weight(weight);
modal.close();
Modal::close();
}
};
@@ -517,7 +517,7 @@ impl PoolSetup {
columns[0].vertical_centered_justified(|ui| {
View::button(ui, t!("modal.cancel"), Colors::white_or_black(false), || {
// Close modal.
modal.close();
Modal::close();
});
});
columns[1].vertical_centered_justified(|ui| {
src/gui/views/network/setup/stratum.rs
+6 -6
View File
@@ -300,7 +300,7 @@ impl StratumSetup {
NodeConfig::save_stratum_address(&stratum_ip, &c.stratum_port_edit);
c.is_port_available = true;
modal.close();
Modal::close();
}
};
@@ -339,7 +339,7 @@ impl StratumSetup {
columns[0].vertical_centered_justified(|ui| {
View::button(ui, t!("modal.cancel"), Colors::white_or_black(false), || {
// Close modal.
modal.close();
Modal::close();
});
});
columns[1].vertical_centered_justified(|ui| {
@@ -385,7 +385,7 @@ impl StratumSetup {
let on_save = |c: &mut StratumSetup| {
if let Ok(time) = c.attempt_time_edit.parse::<u32>() {
NodeConfig::save_stratum_attempt_time(time);
modal.close();
Modal::close();
}
};
@@ -424,7 +424,7 @@ impl StratumSetup {
columns[0].vertical_centered_justified(|ui| {
View::button(ui, t!("modal.cancel"), Colors::white_or_black(false), || {
// Close modal.
modal.close();
Modal::close();
});
});
columns[1].vertical_centered_justified(|ui| {
@@ -464,7 +464,7 @@ impl StratumSetup {
let on_save = |c: &mut StratumSetup| {
if let Ok(diff) = c.min_share_diff_edit.parse::<u64>() {
NodeConfig::save_stratum_min_share_diff(diff);
modal.close();
Modal::close();
}
};
@@ -503,7 +503,7 @@ impl StratumSetup {
columns[0].vertical_centered_justified(|ui| {
View::button(ui, t!("modal.cancel"), Colors::white_or_black(false), || {
// Close modal.
modal.close();
Modal::close();
});
});
columns[1].vertical_centered_justified(|ui| {
src/gui/views/scan.rs
+3 -4
View File
@@ -42,7 +42,6 @@ impl CameraScanModal {
/// Draw [`Modal`] content.
pub fn ui(&mut self,
ui: &mut egui::Ui,
modal: &Modal,
cb: &dyn PlatformCallbacks,
mut on_result: impl FnMut(&QrScanResult)) {
// Show scan result if exists or show camera content while scanning.
@@ -75,7 +74,7 @@ impl CameraScanModal {
View::button(ui, copy_text, Colors::white_or_black(false), || {
cb.copy_string_to_buffer(result_text.to_string());
self.qr_scan_result = None;
modal.close();
Modal::close();
});
});
ui.add_space(10.0);
@@ -90,7 +89,7 @@ impl CameraScanModal {
View::button(ui, t!("close"), Colors::white_or_black(false), || {
self.qr_scan_result = None;
self.camera_content = None;
modal.close();
Modal::close();
});
});
columns[1].vertical_centered_justified(|ui| {
@@ -120,7 +119,7 @@ impl CameraScanModal {
View::button(ui, t!("modal.cancel"), Colors::white_or_black(false), || {
cb.stop_camera();
self.camera_content = None;
modal.close();
Modal::close();
});
});
}
src/gui/views/wallets/creation/creation.rs
+3 -3
View File
@@ -67,15 +67,15 @@ impl ModalContainer for WalletCreation {
match modal.id {
QR_CODE_PHRASE_SCAN_MODAL => {
if let Some(content) = self.scan_modal_content.as_mut() {
content.ui(ui, modal, cb, |result| {
content.ui(ui, cb, |result| {
match result {
QrScanResult::Text(text) => {
self.mnemonic_setup.mnemonic.import(&text);
modal.close();
Modal::close();
}
QrScanResult::SeedQR(text) => {
self.mnemonic_setup.mnemonic.import(&text);
modal.close();
Modal::close();
}
_ => {}
}
src/gui/views/wallets/creation/mnemonic.rs
+2 -2
View File
@@ -255,7 +255,7 @@ impl MnemonicSetup {
(!next_word.as_ref().unwrap().text.is_empty() &&
next_word.unwrap().valid);
if close_modal {
modal.close();
Modal::close();
} else {
c.word_index_edit += 1;
c.word_edit = String::from("");
@@ -295,7 +295,7 @@ impl MnemonicSetup {
columns[0].vertical_centered_justified(|ui| {
View::button(ui, t!("modal.cancel"), Colors::white_or_black(false), || {
// Close modal.
modal.close();
Modal::close();
});
});
columns[1].vertical_centered_justified(|ui| {
src/gui/views/wallets/modals/add.rs
+2 -2
View File
@@ -49,7 +49,7 @@ impl AddWalletModal {
if name.is_empty() || pass.is_empty() {
return;
}
modal.close();
Modal::close();
on_input(name, ZeroingString::from(pass));
};
ui.vertical_centered(|ui| {
@@ -94,7 +94,7 @@ impl AddWalletModal {
columns[0].vertical_centered_justified(|ui| {
View::button(ui, t!("modal.cancel"), Colors::white_or_black(false), || {
// Close modal.
modal.close();
Modal::close();
});
});
columns[1].vertical_centered_justified(|ui| {
src/gui/views/wallets/modals/conn.rs
+3 -3
View File
@@ -82,7 +82,7 @@ impl WalletConnectionModal {
_ => {
View::item_button(ui, View::item_rounding(0, 1, true), CHECK, None, || {
on_select(ConnectionMethod::Integrated);
modal.close();
Modal::close();
});
}
}
@@ -118,7 +118,7 @@ impl WalletConnectionModal {
on_select(
ConnectionMethod::External(conn.id, conn.url.clone())
);
modal.close();
Modal::close();
});
} else {
ui.add_space(12.0);
@@ -140,7 +140,7 @@ impl WalletConnectionModal {
// Show button to close modal.
ui.vertical_centered_justified(|ui| {
View::button(ui, t!("modal.cancel"), Colors::white_or_black(false), || {
modal.close();
Modal::close();
});
});
ui.add_space(6.0);
src/gui/views/wallets/modals/open.rs
+2 -2
View File
@@ -59,7 +59,7 @@ impl OpenWalletModal {
match m.wallet.open(ZeroingString::from(pass)) {
Ok(_) => {
m.pass_edit = "".to_string();
modal.close();
Modal::close();
on_continue(m.wallet.clone(), m.data.clone());
}
Err(_) => m.wrong_pass = true
@@ -105,7 +105,7 @@ impl OpenWalletModal {
columns[0].vertical_centered_justified(|ui| {
View::button(ui, t!("modal.cancel"), Colors::white_or_black(false), || {
// Close modal.
modal.close();
Modal::close();
});
});
columns[1].vertical_centered_justified(|ui| {
src/gui/views/wallets/modals/wallets.rs
+2 -2
View File
@@ -74,7 +74,7 @@ impl WalletsModal {
for wallet in wallets.list() {
// Draw wallet list item.
self.wallet_item_ui(ui, wallet, || {
modal.close();
Modal::close();
on_select(wallet.clone(), data.clone());
});
ui.add_space(5.0);
@@ -90,7 +90,7 @@ impl WalletsModal {
ui.vertical_centered_justified(|ui| {
View::button(ui, t!("modal.cancel"), Colors::white_or_black(false), || {
self.data = None;
modal.close();
Modal::close();
});
});
ui.add_space(6.0);
src/gui/views/wallets/wallet/messages/content.rs
+3 -3
View File
@@ -145,10 +145,10 @@ impl WalletMessages {
SCAN_QR_MODAL => {
let mut result = None;
if let Some(content) = self.scan_modal_content.as_mut() {
Modal::ui(ui.ctx(), |ui, modal| {
content.ui(ui, modal, cb, |res| {
Modal::ui(ui.ctx(), |ui, _| {
content.ui(ui, cb, |res| {
result = Some(res.clone());
modal.close();
Modal::close();
});
});
}
src/gui/views/wallets/wallet/messages/request.rs
+1 -1
View File
@@ -194,7 +194,7 @@ impl MessageRequestModal {
View::button(ui, t!("modal.cancel"), Colors::white_or_black(false), || {
self.amount_edit = "".to_string();
self.request_error = None;
modal.close();
Modal::close();
});
});
columns[1].vertical_centered_justified(|ui| {
src/gui/views/wallets/wallet/modals/accounts.rs
+5 -6
View File
@@ -73,7 +73,7 @@ impl WalletAccountsModal {
match wallet.create_account(label) {
Ok(_) => {
let _ = wallet.set_active_account(label);
modal.close();
Modal::close();
},
Err(_) => m.account_creation_error = true
};
@@ -111,7 +111,7 @@ impl WalletAccountsModal {
columns[0].vertical_centered_justified(|ui| {
View::button(ui, t!("modal.cancel"), Colors::white_or_black(false), || {
// Close modal.
modal.close();
Modal::close();
});
});
columns[1].vertical_centered_justified(|ui| {
@@ -138,7 +138,7 @@ impl WalletAccountsModal {
ui.add_space(4.0);
}
let acc = self.accounts.get(index).unwrap();
account_item_ui(ui, modal, wallet, acc, index, size);
account_item_ui(ui, wallet, acc, index, size);
if index == size - 1 {
ui.add_space(4.0);
}
@@ -156,7 +156,7 @@ impl WalletAccountsModal {
ui.columns(2, |columns| {
columns[0].vertical_centered_justified(|ui| {
View::button(ui, t!("modal.cancel"), Colors::white_or_black(false), || {
modal.close();
Modal::close();
});
});
columns[1].vertical_centered_justified(|ui| {
@@ -175,7 +175,6 @@ const ACCOUNT_ITEM_HEIGHT: f32 = 75.0;
/// Draw account item.
fn account_item_ui(ui: &mut egui::Ui,
modal: &Modal,
wallet: &Wallet,
acc: &WalletAccount,
index: usize,
@@ -201,7 +200,7 @@ fn account_item_ui(ui: &mut egui::Ui,
let button_rounding = View::item_rounding(index, size, true);
View::item_button(ui, button_rounding, CHECK, None, || {
let _ = wallet.set_active_account(&acc.label);
modal.close();
Modal::close();
});
} else {
ui.add_space(12.0);
src/gui/views/wallets/wallet/settings/common.rs
+6 -6
View File
@@ -175,7 +175,7 @@ impl CommonSettings {
let on_save = |c: &mut CommonSettings| {
if !c.name_edit.is_empty() {
wallet.change_name(c.name_edit.clone());
modal.close();
Modal::close();
}
};
@@ -203,7 +203,7 @@ impl CommonSettings {
columns[0].vertical_centered_justified(|ui| {
View::button(ui, t!("modal.cancel"), Colors::white_or_black(false), || {
// Close modal.
modal.close();
Modal::close();
});
});
columns[1].vertical_centered_justified(|ui| {
@@ -235,7 +235,7 @@ impl CommonSettings {
c.old_pass_edit = "".to_string();
c.new_pass_edit = "".to_string();
// Close modal.
modal.close();
Modal::close();
}
Err(_) => c.wrong_pass = true
}
@@ -298,7 +298,7 @@ impl CommonSettings {
columns[0].vertical_centered_justified(|ui| {
View::button(ui, t!("modal.cancel"), Colors::white_or_black(false), || {
// Close modal.
modal.close();
Modal::close();
});
});
columns[1].vertical_centered_justified(|ui| {
@@ -320,7 +320,7 @@ impl CommonSettings {
let on_save = |c: &mut CommonSettings| {
if let Ok(min_conf) = c.min_confirmations_edit.parse::<u64>() {
wallet.update_min_confirmations(min_conf);
modal.close();
Modal::close();
}
};
@@ -357,7 +357,7 @@ impl CommonSettings {
columns[0].vertical_centered_justified(|ui| {
View::button(ui, t!("modal.cancel"), Colors::white_or_black(false), || {
// Close modal.
modal.close();
Modal::close();
});
});
columns[1].vertical_centered_justified(|ui| {
src/gui/views/wallets/wallet/settings/recovery.rs
+7 -8
View File
@@ -153,8 +153,8 @@ impl RecoverySettings {
});
}
DELETE_CONFIRMATION_MODAL => {
Modal::ui(ui.ctx(), |ui, modal| {
self.deletion_modal_ui(ui, wallet, modal);
Modal::ui(ui.ctx(), |ui, _| {
self.deletion_modal_ui(ui, wallet);
});
}
_ => {}
@@ -205,7 +205,7 @@ impl RecoverySettings {
ui.vertical_centered_justified(|ui| {
View::button(ui, t!("close"), Colors::white_or_black(false), || {
self.recovery_phrase = None;
modal.close();
Modal::close();
});
});
} else {
@@ -248,7 +248,7 @@ impl RecoverySettings {
columns[0].vertical_centered_justified(|ui| {
View::button(ui, t!("modal.cancel"), Colors::white_or_black(false), || {
self.recovery_phrase = None;
modal.close();
Modal::close();
});
});
columns[1].vertical_centered_justified(|ui| {
@@ -265,8 +265,7 @@ impl RecoverySettings {
/// Draw wallet deletion [`Modal`] content.
fn deletion_modal_ui(&mut self,
ui: &mut egui::Ui,
wallet: &Wallet,
modal: &Modal) {
wallet: &Wallet) {
ui.add_space(8.0);
ui.vertical_centered(|ui| {
ui.label(RichText::new(t!("wallets.delete_conf"))
@@ -283,13 +282,13 @@ impl RecoverySettings {
ui.columns(2, |columns| {
columns[0].vertical_centered_justified(|ui| {
View::button(ui, t!("modal.cancel"), Colors::white_or_black(false), || {
modal.close();
Modal::close();
});
});
columns[1].vertical_centered_justified(|ui| {
View::button(ui, t!("delete"), Colors::white_or_black(false), || {
wallet.delete_wallet();
modal.close();
Modal::close();
});
});
});
src/gui/views/wallets/wallet/transport/content.rs
+4 -5
View File
@@ -109,8 +109,8 @@ impl WalletTransport {
}
}
QR_ADDRESS_MODAL => {
Modal::ui(ui.ctx(), |ui, modal| {
self.qr_address_modal_ui(ui, modal, cb);
Modal::ui(ui.ctx(), |ui, _| {
self.qr_address_modal_ui(ui, cb);
});
}
_ => {}
@@ -316,7 +316,6 @@ impl WalletTransport {
/// Draw QR code image address [`Modal`] content.
fn qr_address_modal_ui(&mut self,
ui: &mut egui::Ui,
modal: &Modal,
cb: &dyn PlatformCallbacks) {
ui.add_space(6.0);
@@ -324,14 +323,14 @@ impl WalletTransport {
if let Some(content) = self.qr_address_content.as_mut() {
content.ui(ui, cb);
} else {
modal.close();
Modal::close();
return;
}
ui.vertical_centered_justified(|ui| {
View::button(ui, t!("close"), Colors::white_or_black(false), || {
self.qr_address_content = None;
modal.close();
Modal::close();
});
});
ui.add_space(6.0);
src/gui/views/wallets/wallet/transport/send.rs
+5 -5
View File
@@ -117,7 +117,7 @@ impl TransportSendModal {
View::button(ui, t!("close"), Colors::white_or_black(false), || {
on_stop();
self.address_scan_content = None;
modal.close();
Modal::close();
});
});
cols[1].vertical_centered_justified(|ui| {
@@ -235,7 +235,7 @@ impl TransportSendModal {
ui.columns(2, |columns| {
columns[0].vertical_centered_justified(|ui| {
View::button(ui, t!("modal.cancel"), Colors::white_or_black(false), || {
self.close(modal);
self.close();
});
});
columns[1].vertical_centered_justified(|ui| {
@@ -263,7 +263,7 @@ impl TransportSendModal {
ui.columns(2, |columns| {
columns[0].vertical_centered_justified(|ui| {
View::button(ui, t!("modal.cancel"), Colors::white_or_black(false), || {
self.close(modal);
self.close();
});
});
columns[1].vertical_centered_justified(|ui| {
@@ -276,7 +276,7 @@ impl TransportSendModal {
}
/// Close modal and clear data.
fn close(&mut self, modal: &Modal) {
fn close(&mut self) {
self.amount_edit = "".to_string();
self.address_edit = "".to_string();
@@ -286,7 +286,7 @@ impl TransportSendModal {
self.tx_info_content = None;
self.address_scan_content = None;
modal.close();
Modal::close();
}
/// Send entered amount to address.
src/gui/views/wallets/wallet/transport/settings.rs
+2 -2
View File
@@ -84,7 +84,7 @@ impl TransportSettingsModal {
View::button(ui, t!("close"), Colors::white_or_black(false), || {
on_stop();
self.bridge_qr_scan_content = None;
modal.close();
Modal::close();
});
});
cols[1].vertical_centered_justified(|ui| {
@@ -246,7 +246,7 @@ impl TransportSettingsModal {
Tor::rebuild_client();
}
}
modal.close();
Modal::close();
});
});
ui.add_space(6.0);
src/gui/views/wallets/wallet/txs/content.rs
+6 -6
View File
@@ -253,8 +253,8 @@ impl WalletTransactions {
});
}
CANCEL_TX_CONFIRMATION_MODAL => {
Modal::ui(ui.ctx(), |ui, modal| {
self.cancel_confirmation_modal(ui, wallet, modal);
Modal::ui(ui.ctx(), |ui, _| {
self.cancel_confirmation_modal(ui, wallet);
});
}
_ => {}
@@ -463,7 +463,7 @@ impl WalletTransactions {
}
/// Confirmation [`Modal`] to cancel transaction.
fn cancel_confirmation_modal(&mut self, ui: &mut egui::Ui, wallet: &Wallet, modal: &Modal) {
fn cancel_confirmation_modal(&mut self, ui: &mut egui::Ui, wallet: &Wallet) {
ui.add_space(6.0);
ui.vertical_centered(|ui| {
// Setup confirmation text.
@@ -473,7 +473,7 @@ impl WalletTransactions {
.filter(|tx| tx.data.id == self.confirm_cancel_tx_id.unwrap())
.collect::<Vec<WalletTransaction>>();
if txs.is_empty() {
modal.close();
Modal::close();
return;
}
let tx = txs.get(0).unwrap();
@@ -501,14 +501,14 @@ impl WalletTransactions {
columns[0].vertical_centered_justified(|ui| {
View::button(ui, t!("modal.cancel"), Colors::white_or_black(false), || {
self.confirm_cancel_tx_id = None;
modal.close();
Modal::close();
});
});
columns[1].vertical_centered_justified(|ui| {
View::button(ui, "OK".to_string(), Colors::white_or_black(false), || {
wallet.cancel(self.confirm_cancel_tx_id.unwrap());
self.confirm_cancel_tx_id = None;
modal.close();
Modal::close();
});
});
});
src/gui/views/wallets/wallet/txs/tx.rs
+6 -6
View File
@@ -107,7 +107,7 @@ impl WalletTransactionModal {
// Check values and setup transaction data.
let wallet_data = wallet.get_data();
if wallet_data.is_none() {
modal.close();
Modal::close();
return;
}
let data = wallet_data.unwrap();
@@ -116,7 +116,7 @@ impl WalletTransactionModal {
.filter(|tx| tx.data.id == self.tx_id)
.collect::<Vec<WalletTransaction>>();
if txs.is_empty() {
modal.close();
Modal::close();
return;
}
let tx = txs.get(0).unwrap();
@@ -141,7 +141,7 @@ impl WalletTransactionModal {
cols[0].vertical_centered_justified(|ui| {
View::button(ui, t!("close"), Colors::white_or_black(false), || {
self.qr_code_content = None;
modal.close();
Modal::close();
});
});
cols[1].vertical_centered_justified(|ui| {
@@ -158,7 +158,7 @@ impl WalletTransactionModal {
View::button(ui, t!("close"), Colors::white_or_black(false), || {
cb.stop_camera();
self.scan_qr_content = None;
modal.close();
Modal::close();
});
});
cols[1].vertical_centered_justified(|ui| {
@@ -177,7 +177,7 @@ impl WalletTransactionModal {
// Show button to close modal.
ui.vertical_centered_justified(|ui| {
View::button(ui, t!("close"), Colors::white_or_black(false), || {
modal.close();
Modal::close();
});
});
}
@@ -483,7 +483,7 @@ impl WalletTransactionModal {
if tx.can_finalize {
self.show_finalization = true;
} else {
modal.close();
Modal::close();
}
});
});