Better formatting

This commit is contained in:
Leonie 2023-12-05 17:08:10 +01:00
parent 415428d790
commit 56074e5328
2 changed files with 49 additions and 60 deletions

View file

@ -1,6 +1,6 @@
use tokio;
use reqwest::Client; use reqwest::Client;
use serde::ser::Serialize; use serde::ser::Serialize;
use tokio;
#[tokio::main] #[tokio::main]
pub async fn post<T: Serialize>(addr: &String, form_a: &str, form_b: T) { pub async fn post<T: Serialize>(addr: &String, form_a: &str, form_b: T) {
let c = Client::new(); let c = Client::new();

View file

@ -1,19 +1,13 @@
use iced::executor;
use iced::widget::Column;
use iced::widget::container; use iced::widget::container;
use iced::widget::Column;
use iced::widget::{button, text_input, Slider}; use iced::widget::{button, text_input, Slider};
use iced::Renderer; use iced::{executor, Alignment, Application, Command, Element, Length, Renderer, Settings, Theme};
use iced::{ use kontroller::post;
Alignment, Application, Command, Element, Length, Settings, Theme, use std::sync::mpsc;
};
use reqwest::Client;
use std::sync::mpsc::Sender; use std::sync::mpsc::Sender;
use std::thread; use std::thread;
use std::sync::mpsc;
use kontroller::post;
pub fn main() -> iced::Result { pub fn main() -> iced::Result {
State::run(Settings { State::run(Settings {
exit_on_close_request: true, exit_on_close_request: true,
..Settings::default() ..Settings::default()
@ -23,7 +17,7 @@ pub fn main() -> iced::Result {
struct State { struct State {
addr: String, addr: String,
speed: f64, speed: f64,
tx: Sender<Task> tx: Sender<Task>,
} }
impl Default for State { impl Default for State {
@ -67,11 +61,9 @@ impl Default for State {
println!("Changed speed to {}", &speed.round()); println!("Changed speed to {}", &speed.round());
} }
} }
} }
} }
} });
);
State { State {
addr: String::default(), addr: String::default(),
@ -87,7 +79,7 @@ enum Message {
FW, FW,
BW, BW,
Stop, Stop,
Speed(f64) Speed(f64),
} }
enum Task { enum Task {
@ -95,7 +87,7 @@ enum Task {
BW, BW,
OFF, OFF,
Speed(f64), Speed(f64),
Addr(String) Addr(String),
} }
impl Application for State { impl Application for State {
@ -136,23 +128,23 @@ impl Application for State {
self.speed = speed; self.speed = speed;
Command::none() Command::none()
} }
} }
} }
fn view(&self) -> Element<Message> { fn view(&self) -> Element<Message> {
let input = text_input("ip with /motor attached", &self.addr) let input = text_input("ip with /motor attached", &self.addr)
.on_input(Message::Addr) .on_input(Message::Addr)
.padding(30) .padding(30)
.width(200); .width(200);
let fw_button: iced::widget::Button<'_, Message, Renderer> =
button("Forwords").on_press(Message::FW).padding(40);
let fw_button: iced::widget::Button<'_, Message, Renderer> = button("Forwords").on_press(Message::FW).padding(40); let bw_button: iced::widget::Button<'_, Message, Renderer> =
button("Backwords").on_press(Message::BW).padding(40);
let bw_button: iced::widget::Button<'_, Message, Renderer> = button("Backwords").on_press(Message::BW).padding(40); let stop_button: iced::widget::Button<'_, Message, Renderer> =
button("OFF").on_press(Message::Stop).padding(40);
let stop_button: iced::widget::Button<'_, Message, Renderer> = button("OFF").on_press(Message::Stop).padding(40);
let slider = Slider::new(0.0..=255.0, self.speed, Message::Speed).width(200); let slider = Slider::new(0.0..=255.0, self.speed, Message::Speed).width(200);
@ -172,7 +164,4 @@ impl Application for State {
.center_y() .center_y()
.into() .into()
} }
} }