move the port selection in settings page to reduce clutter

Author: wiiznokes

RustApp/.gitignore

@@ -9,4 +9,5 @@
 /flatpak-out
 /repo
 /log
-/config/
+/config/
+/src/streamer/_.rs

RustApp/i18n/en/android_mic.ftl

@@ -31,6 +31,8 @@ channel_count = Channel count
 audio_format = Audio format
 use_recommended_audio_format = Use Recommended Audio Format
 
+title_connection = Connection
+
 denoise = Noise reduction
 denoise_enabled = Enabled
 denoise_type = Type

RustApp/src/ui/app.rs

@@ -561,26 +561,6 @@ impl Application for AppState {
                 self.network_adapter = Some(adapter.clone());
                 return self.add_log(format!("Selected network adapter: {adapter}").as_str());
             }
-            AppMsg::PortTextInput(text) => {
-                self.port_input = text;
-            }
-            AppMsg::PortSave => {
-                let port = if self.port_input.is_empty() {
-                    55555
-                } else {
-                    match self.port_input.parse() {
-                        Ok(p) => p,
-                        Err(_) => {
-                            self.port_input = "55555".to_string();
-                            self.config.update(|c| c.port = 55555);
-                            return self.add_log("Invalid port number, using default 55555");
-                        }
-                    }
-                };
-                self.config.update(|c| c.port = port);
-                self.port_input = port.to_string();
-                return self.add_log(format!("Changed port to {}", port).as_str());
-            }
             AppMsg::Connect => {
                 return self.connect();
             }
@@ -613,6 +593,27 @@ impl Application for AppState {
                 }
             },
             AppMsg::Config(msg) => match msg {
+                ConfigMsg::PortTextInput(text) => {
+                    self.port_input = text;
+                }
+                ConfigMsg::PortSave => {
+                    let port = if self.port_input.is_empty() {
+                        55555
+                    } else {
+                        match self.port_input.parse() {
+                            Ok(p) => p,
+                            Err(_) => {
+                                self.port_input = "55555".to_string();
+                                self.config.update(|c| c.port = 55555);
+                                return self.add_log("Invalid port number, using default 55555");
+                            }
+                        }
+                    };
+                    self.config.update(|c| c.port = port);
+                    self.port_input = port.to_string();
+                    return self.add_log(format!("Changed port to {}", port).as_str());
+                }
+
                 ConfigMsg::SampleRate(sample_rate) => {
                     self.config.update(|s| s.sample_rate = sample_rate);
                     return self.update_audio_stream();

RustApp/src/ui/message.rs

@@ -15,8 +15,6 @@ pub enum AppMsg {
     Streamer(StreamerMsg),
     Device(AudioDevice),
     Adapter(NetworkAdapter),
-    PortTextInput(String),
-    PortSave,
     Connect,
     Stop,
     ToggleSettingsWindow,
@@ -55,6 +53,8 @@ pub enum ConfigMsg {
     Amplify(bool),
     AmplifyValue(f32),
     ToggleAboutWindow,
+    PortTextInput(String),
+    PortSave,
 }
 
 #[derive(Debug, Clone, PartialEq, Eq, Copy)]

RustApp/src/ui/view.rs

@@ -44,9 +44,9 @@ pub fn main_window(app: &AppState) -> Element<'_, AppMsg> {
             column()
                 .width(Length::FillPortion(1))
                 .height(Length::Fill)
+                .spacing(35)
                 .align_x(Horizontal::Center)
                 .push(network_adapter(app))
-                .push(port(app))
                 .push(audio(app))
                 .push(vertical_space())
                 .push(connection_type(app)),
@@ -159,25 +159,6 @@ fn network_adapter(app: &AppState) -> Element<'_, AppMsg> {
         .into()
 }
 
-fn port(app: &AppState) -> Element<'_, AppMsg> {
-    column()
-        .spacing(20)
-        .align_x(Horizontal::Center)
-        .push(text::title4(fl!("port")))
-        .push(
-            row()
-                .width(Length::Fill)
-                .spacing(5)
-                .push(
-                    text_input("", &app.port_input)
-                        .on_input(AppMsg::PortTextInput)
-                        .width(Length::Fixed(150.0)),
-                )
-                .push(button::text(fl!("save")).on_press(AppMsg::PortSave)),
-        )
-        .into()
-}
-
 fn connection_type(app: &AppState) -> Element<'_, AppMsg> {
     let connection_mode = &app.config.data().connection_mode;
 
@@ -299,6 +280,22 @@ pub fn settings_window(app: &AppState) -> Element<'_, ConfigMsg> {
                             .push(horizontal_space()),
                     ),
             )
+            .push(
+                settings::section().title(fl!("title_connection")).add(
+                    row()
+                        .width(Length::Fill)
+                        .align_y(Vertical::Center)
+                        .spacing(5)
+                        .push(text(fl!("port")))
+                        .push(horizontal_space())
+                        .push(
+                            text_input("", &app.port_input)
+                                .on_input(ConfigMsg::PortTextInput)
+                                .width(Length::Fixed(150.0)),
+                        )
+                        .push(button::text(fl!("save")).on_press(ConfigMsg::PortSave)),
+                ),
+            )
             .push(
                 settings::section()
                     .title(fl!("denoise"))