From d5fb9d546ef7dc1ccd075dcaa3e252108df8520f Mon Sep 17 00:00:00 2001 From: Frigyes Erdosi-Szucs Date: Fri, 22 Mar 2024 09:53:11 -0700 Subject: [PATCH] refactor(app): Use if-else instead of match over booleans --- src/gui/mod.rs | 11 ++++++----- src/gui/views/list.rs | 13 +++++++------ 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/src/gui/mod.rs b/src/gui/mod.rs index 8b84bcb..3ac7f11 100644 --- a/src/gui/mod.rs +++ b/src/gui/mod.rs @@ -344,13 +344,14 @@ impl Application for UadGui { } Message::ADBSatisfied(result) => { self.adb_satisfied = result; - match result { - true => self.update(Message::AppsAction(AppsMessage::ADBSatisfied( + if result { + self.update(Message::AppsAction(AppsMessage::ADBSatisfied( self.adb_satisfied, - ))), - false => self.update(Message::AppsAction(AppsMessage::ADBSatisfied( + ))) + } else { + self.update(Message::AppsAction(AppsMessage::ADBSatisfied( self.adb_satisfied, - ))), + ))) } } Message::Nothing => Command::none(), diff --git a/src/gui/views/list.rs b/src/gui/views/list.rs index 21f3f68..4a713ef 100644 --- a/src/gui/views/list.rs +++ b/src/gui/views/list.rs @@ -314,20 +314,21 @@ impl List { let text = "Downloading latest UAD-ng lists from GitHub. Please wait..."; waiting_view(settings, text, true, style::Text::Default) } - LoadingState::FindingPhones => match self.is_adb_satisfied { - true => waiting_view( + LoadingState::FindingPhones => if self.is_adb_satisfied { + waiting_view( settings, "Finding connected devices...", false, style::Text::Default, - ), - false => waiting_view( + ) + } else { + waiting_view( settings, "ADB is not installed on your system, install ADB and relaunch application.", false, style::Text::Danger, - ), - }, + ) + } LoadingState::LoadingPackages => { let text = "Pulling packages from the device. Please wait..."; waiting_view(settings, text, false, style::Text::Default)