From cc646f1a6a58af0fc6c2d77e822fa74f7a4c2048 Mon Sep 17 00:00:00 2001 From: Ed B Date: Wed, 6 Mar 2024 22:01:48 +0200 Subject: [PATCH 1/3] feat(ui): Consitent buttons placements - moved buttons, so that they are consistent if device is not found vs found --- src/gui/widgets/navigation_menu.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gui/widgets/navigation_menu.rs b/src/gui/widgets/navigation_menu.rs index 8fe846d..8c162a2 100644 --- a/src/gui/widgets/navigation_menu.rs +++ b/src/gui/widgets/navigation_menu.rs @@ -84,8 +84,8 @@ pub fn nav_menu<'a>( let row = match selected_device { Some(phone) => row![ - apps_refresh_tooltip, reboot_btn, + apps_refresh_tooltip, pick_list(device_list, Some(phone), Message::DeviceSelected,), Space::new(Length::Fill, Length::Shrink), uad_version_text, From 0b38a6e0338d3e8bf6209ed7d8bf6228f8547de8 Mon Sep 17 00:00:00 2001 From: Ed B Date: Wed, 6 Mar 2024 22:12:11 +0200 Subject: [PATCH 2/3] feat(ui): Consitent buttons placements - changed wording for update info, on small window size previous wording takes a lot of screen. Updated is not ideal, but takes less screen. --- src/gui/widgets/navigation_menu.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gui/widgets/navigation_menu.rs b/src/gui/widgets/navigation_menu.rs index 8c162a2..545976c 100644 --- a/src/gui/widgets/navigation_menu.rs +++ b/src/gui/widgets/navigation_menu.rs @@ -44,7 +44,7 @@ pub fn nav_menu<'a>( Text::new("Updating please wait...") } else { Text::new(format!( - "New UAD-ng version available {} -> {}", + "Update available: {} -> {}", env!("CARGO_PKG_VERSION"), r.tag_name )) From 363480cd681c4f8180524fa5d7431f82c3d67fd8 Mon Sep 17 00:00:00 2001 From: Ed B Date: Wed, 6 Mar 2024 22:23:43 +0200 Subject: [PATCH 3/3] feat(ui): consistent wording - changed wording like in list.rs file. Uppercased text if device wasn't found --- src/gui/widgets/navigation_menu.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gui/widgets/navigation_menu.rs b/src/gui/widgets/navigation_menu.rs index 545976c..e6c7edd 100644 --- a/src/gui/widgets/navigation_menu.rs +++ b/src/gui/widgets/navigation_menu.rs @@ -78,8 +78,8 @@ pub fn nav_menu<'a>( .style(style::Button::Primary); let device_list_text = match apps_view.loading_state { - ListLoadingState::FindingPhones => text("finding connected phone..."), - _ => text("no devices/emulators found"), + ListLoadingState::FindingPhones => text("Finding connected devices..."), + _ => text("No devices/emulators found"), }; let row = match selected_device {