From 64d95e047ace7f24fbc5dc3a27f8d93cfa7d61ec Mon Sep 17 00:00:00 2001 From: sundaram123krishnan Date: Sat, 28 Sep 2024 22:27:24 +0530 Subject: [PATCH 1/7] Reduce spacing --- src/views/modal_handler.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/modal_handler.rs b/src/views/modal_handler.rs index 1b4b9088..628ffba5 100644 --- a/src/views/modal_handler.rs +++ b/src/views/modal_handler.rs @@ -205,7 +205,7 @@ impl DisplayModal { .on_press(Message::ModalHandle(ModalMessage::HideModal)) .style(MODAL_CONNECT_BUTTON_STYLE.get_button_style()), ) - .spacing(220); + .spacing(215); } container( From 9fe6b97eb7c72ced52e76a3d67caf820be5beb71 Mon Sep 17 00:00:00 2001 From: sundaram123krishnan Date: Sun, 29 Sep 2024 18:19:15 +0530 Subject: [PATCH 2/7] Force default text size to 14 pixels --- src/piggui.rs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/piggui.rs b/src/piggui.rs index 501a23a0..5c4ae117 100644 --- a/src/piggui.rs +++ b/src/piggui.rs @@ -12,9 +12,7 @@ use crate::Message::*; #[cfg(not(target_arch = "wasm32"))] use clap::{Arg, ArgMatches}; use iced::widget::{container, Column}; -use iced::{ - executor, window, Application, Command, Element, Length, Settings, Subscription, Theme, -}; +use iced::{executor, window, Application, Command, Element, Length, Settings, Subscription, Theme, Pixels}; use views::pin_state::PinState; #[cfg(any(feature = "iroh", feature = "tcp"))] @@ -111,6 +109,7 @@ fn main() -> Result<(), iced::Error> { Piggui::run(Settings { window, + default_text_size: Pixels(14.0), ..Default::default() }) } From bd35da05c86148320254bbdee00ef1030b83367c Mon Sep 17 00:00:00 2001 From: sundaram123krishnan Date: Sun, 29 Sep 2024 18:19:33 +0530 Subject: [PATCH 3/7] Increase spacing --- src/views/modal_handler.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/modal_handler.rs b/src/views/modal_handler.rs index 628ffba5..21687917 100644 --- a/src/views/modal_handler.rs +++ b/src/views/modal_handler.rs @@ -205,7 +205,7 @@ impl DisplayModal { .on_press(Message::ModalHandle(ModalMessage::HideModal)) .style(MODAL_CONNECT_BUTTON_STYLE.get_button_style()), ) - .spacing(215); + .spacing(250); } container( From 6cafa34bc3bcdd7c168db7b746d27e3672acfc5b Mon Sep 17 00:00:00 2001 From: sundaram123krishnan Date: Mon, 30 Sep 2024 20:19:04 +0530 Subject: [PATCH 4/7] Remove pick_list hardcoded text size --- src/views/hardware_view.rs | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/views/hardware_view.rs b/src/views/hardware_view.rs index 8592a5cd..bc353957 100644 --- a/src/views/hardware_view.rs +++ b/src/views/hardware_view.rs @@ -491,8 +491,6 @@ fn pullup_picklist( .placeholder("Select Pullup"); // select a slightly small font on RPi, to make it fit within pick_list - #[cfg(target_os = "linux")] - let pick_list = pick_list.text_size(14); pick_list.into() } @@ -660,8 +658,6 @@ fn create_pin_view_side<'a>( .placeholder("Select function"); // select a slightly small font on RPi, to make it fit within pick_list - #[cfg(target_os = "linux")] - let pick_list = pick_list.text_size(14); pin_options_row = pin_options_row.push(pick_list); pin_option = pin_option.push(pin_options_row); From 591332b2fe026e0a8225f9d75904d6adae3c78a5 Mon Sep 17 00:00:00 2001 From: sundaram123krishnan Date: Mon, 30 Sep 2024 20:59:41 +0530 Subject: [PATCH 5/7] Add space widget --- src/views/modal_handler.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/views/modal_handler.rs b/src/views/modal_handler.rs index 21687917..d96e4829 100644 --- a/src/views/modal_handler.rs +++ b/src/views/modal_handler.rs @@ -6,7 +6,7 @@ use crate::views::hardware_view::HardwareView; use crate::views::version::REPOSITORY; use crate::Message; use iced::keyboard::key; -use iced::widget::{button, column, container, text, Row, Text}; +use iced::widget::{button, column, container, text, Row, Text, Space}; use iced::{keyboard, window, Color, Command, Element, Event, Length}; use iced_futures::core::Alignment; use iced_futures::Subscription; @@ -198,14 +198,14 @@ impl DisplayModal { .push( button("Exit without saving") .on_press(Message::ModalHandle(ModalMessage::ExitApp)) - .style(MODAL_CANCEL_BUTTON_STYLE.get_button_style()), + .style(MODAL_CANCEL_BUTTON_STYLE.get_button_style()) ) + .push(Space::new(235, 10)) .push( button("Return to app") .on_press(Message::ModalHandle(ModalMessage::HideModal)) .style(MODAL_CONNECT_BUTTON_STYLE.get_button_style()), ) - .spacing(250); } container( From ae6861da7b16ad4dea9699b6b0489ea02554bae3 Mon Sep 17 00:00:00 2001 From: sundaram123krishnan Date: Mon, 30 Sep 2024 21:00:04 +0530 Subject: [PATCH 6/7] Rust fmt --- src/piggui.rs | 4 +++- src/views/modal_handler.rs | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/piggui.rs b/src/piggui.rs index 5c4ae117..56281444 100644 --- a/src/piggui.rs +++ b/src/piggui.rs @@ -12,7 +12,9 @@ use crate::Message::*; #[cfg(not(target_arch = "wasm32"))] use clap::{Arg, ArgMatches}; use iced::widget::{container, Column}; -use iced::{executor, window, Application, Command, Element, Length, Settings, Subscription, Theme, Pixels}; +use iced::{ + executor, window, Application, Command, Element, Length, Pixels, Settings, Subscription, Theme, +}; use views::pin_state::PinState; #[cfg(any(feature = "iroh", feature = "tcp"))] diff --git a/src/views/modal_handler.rs b/src/views/modal_handler.rs index d96e4829..5777e508 100644 --- a/src/views/modal_handler.rs +++ b/src/views/modal_handler.rs @@ -6,7 +6,7 @@ use crate::views::hardware_view::HardwareView; use crate::views::version::REPOSITORY; use crate::Message; use iced::keyboard::key; -use iced::widget::{button, column, container, text, Row, Text, Space}; +use iced::widget::{button, column, container, text, Row, Space, Text}; use iced::{keyboard, window, Color, Command, Element, Event, Length}; use iced_futures::core::Alignment; use iced_futures::Subscription; @@ -198,7 +198,7 @@ impl DisplayModal { .push( button("Exit without saving") .on_press(Message::ModalHandle(ModalMessage::ExitApp)) - .style(MODAL_CANCEL_BUTTON_STYLE.get_button_style()) + .style(MODAL_CANCEL_BUTTON_STYLE.get_button_style()), ) .push(Space::new(235, 10)) .push( From 23da56b36815ce2d23d20a81d4bf8d73c8bb0d0a Mon Sep 17 00:00:00 2001 From: Andrew Mackenzie Date: Fri, 4 Oct 2024 11:15:45 +0200 Subject: [PATCH 7/7] Update to explain manual testing --- RELEASING.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/RELEASING.md b/RELEASING.md index f461e8b2..29c6227d 100644 --- a/RELEASING.md +++ b/RELEASING.md @@ -4,6 +4,11 @@ We use `cargo dist` to automate our release and package publishing process. The steps to do a full release are: +- Merge all pending PRs planned for the release +- Create a new issue in GitHub based on the "release-manual-testing-template.md" and assign it to the milestone + for the release. +- Go through that new issue for manual testing, performing the manual tests in the matrix and checking them + off as done as you go, until all pass. - Update the version number (e.g. "1.2.3") in `Cargo.toml` in a new branch, push it, create a PR, wait for test sto pass, then merge that PR into master - checkout master, pull the latest version