More styling
This commit is contained in:
+28
-40
@@ -3,12 +3,12 @@ use crate::dictionary::app_data_dir;
|
||||
use crate::navigation::Page::PreviousPage;
|
||||
use crate::navigation::{NavigatedPage, Page};
|
||||
use crate::styling::*;
|
||||
use crate::sync::SyncMessage::NextAnimation;
|
||||
use crate::sync::SyncMessage::*;
|
||||
use crate::{fill_state, AppState, RootMessage};
|
||||
use iced::widget::button::danger;
|
||||
use iced::widget::container::rounded_box;
|
||||
use iced::widget::{button, column, container, progress_bar, row, space, text};
|
||||
use iced::{Center, Element, Fill, Font, Left, Length, Task};
|
||||
use iced::{Center, Element, Fill, Font, Length, Task};
|
||||
use std::io;
|
||||
use std::sync::{Arc, Mutex};
|
||||
use std::time::Duration;
|
||||
@@ -41,7 +41,7 @@ pub struct SyncState {
|
||||
|
||||
impl NavigatedPage<SyncMessage> for SyncState {
|
||||
fn navigate(&self, message: &SyncMessage) -> Option<Page> {
|
||||
if let SyncMessage::Back = message
|
||||
if let Back = message
|
||||
&& !self.frozen
|
||||
{
|
||||
Some(PreviousPage)
|
||||
@@ -62,25 +62,25 @@ impl SyncState {
|
||||
|
||||
pub fn update(&mut self, message: SyncMessage) -> Task<RootMessage> {
|
||||
match message {
|
||||
SyncMessage::Back => {}
|
||||
SyncMessage::CopyKey => {
|
||||
Back => {}
|
||||
CopyKey => {
|
||||
let state = self.state.lock().unwrap();
|
||||
let key = state.sync_data.key.clone().unwrap();
|
||||
return iced::clipboard::write(key)
|
||||
.map(|_val: String| RootMessage::Sync(SyncMessage::KeyCopied));
|
||||
.map(|_val: String| RootMessage::Sync(KeyCopied));
|
||||
}
|
||||
SyncMessage::InitSync => {
|
||||
InitSync => {
|
||||
return Task::perform(first_sync(), |id| {
|
||||
RootMessage::Sync(SyncMessage::IdReceived(id))
|
||||
RootMessage::Sync(IdReceived(id))
|
||||
});
|
||||
}
|
||||
SyncMessage::GetKey => {
|
||||
GetKey => {
|
||||
return iced::clipboard::read().map(|key| {
|
||||
RootMessage::Sync(SyncMessage::IdReceived(key.unwrap_or_else(String::new)))
|
||||
RootMessage::Sync(IdReceived(key.unwrap_or_else(String::new)))
|
||||
});
|
||||
}
|
||||
SyncMessage::KeyCopied => {}
|
||||
SyncMessage::IdReceived(new_id) => {
|
||||
KeyCopied => {}
|
||||
IdReceived(new_id) => {
|
||||
if validate_id(&new_id) == false {
|
||||
return Task::none();
|
||||
}
|
||||
@@ -88,7 +88,7 @@ impl SyncState {
|
||||
state.sync_data.key = Some(new_id.clone());
|
||||
set_setting("SYNC_KEY".to_string(), new_id, &state.connection);
|
||||
}
|
||||
SyncMessage::Send => {
|
||||
Send => {
|
||||
self.prepare_to_db_interaction();
|
||||
|
||||
let id = self.state.lock().unwrap().sync_data.key.clone().unwrap();
|
||||
@@ -98,13 +98,13 @@ impl SyncState {
|
||||
|_| RootMessage::Sync(NextAnimation),
|
||||
),
|
||||
Task::perform(send_data(id), |_| {
|
||||
RootMessage::Sync(SyncMessage::NetworkFinished)
|
||||
RootMessage::Sync(NetworkFinished)
|
||||
}),
|
||||
]);
|
||||
|
||||
return tasks;
|
||||
}
|
||||
SyncMessage::GetLast => {
|
||||
GetLast => {
|
||||
let id = self.state.lock().unwrap().sync_data.key.clone().unwrap();
|
||||
let tasks = Task::batch([
|
||||
Task::perform(
|
||||
@@ -112,7 +112,7 @@ impl SyncState {
|
||||
|_| RootMessage::Sync(NextAnimation),
|
||||
),
|
||||
Task::perform(load_data(id), |_| {
|
||||
RootMessage::Sync(SyncMessage::NetworkFinished)
|
||||
RootMessage::Sync(NetworkFinished)
|
||||
}),
|
||||
]);
|
||||
|
||||
@@ -130,7 +130,7 @@ impl SyncState {
|
||||
);
|
||||
}
|
||||
}
|
||||
SyncMessage::NetworkFinished => {
|
||||
NetworkFinished => {
|
||||
self.frozen = false;
|
||||
let mut updated_state = AppState::new();
|
||||
fill_state(&mut updated_state);
|
||||
@@ -143,8 +143,8 @@ impl SyncState {
|
||||
state.word_groups = updated_state.word_groups;
|
||||
|
||||
}
|
||||
SyncMessage::Disable => {}
|
||||
SyncMessage::DisableSync => {
|
||||
Disable => {}
|
||||
DisableSync => {
|
||||
let mut state = self.state.lock().unwrap();
|
||||
state.sync_data.key = None;
|
||||
|
||||
@@ -155,21 +155,9 @@ impl SyncState {
|
||||
}
|
||||
|
||||
pub fn view(&self) -> Element<'_, SyncMessage> {
|
||||
container(
|
||||
column![
|
||||
button("Назад").style(jl_button).on_press(SyncMessage::Back),
|
||||
row![space().width(Fill), self.sync_column(), space().width(Fill)]
|
||||
.spacing(DEFAULT_SPACING)
|
||||
.width(Fill)
|
||||
]
|
||||
.align_x(Left)
|
||||
.width(Fill)
|
||||
.height(Fill)
|
||||
.spacing(DEFAULT_SPACING),
|
||||
)
|
||||
.center_x(Fill)
|
||||
.padding(10)
|
||||
.into()
|
||||
back_overlay(row![space().width(Fill), self.sync_column(), space().width(Fill)]
|
||||
.spacing(DEFAULT_SPACING)
|
||||
.width(Fill).into(), Back)
|
||||
}
|
||||
|
||||
fn sync_column(&self) -> Element<'_, SyncMessage> {
|
||||
@@ -188,23 +176,23 @@ impl SyncState {
|
||||
|
||||
.style(rounded_box),
|
||||
button("Скопировать в буфер обмена").style(jl_button)
|
||||
.on_press(SyncMessage::CopyKey)
|
||||
.on_press(CopyKey)
|
||||
.width(Fill),
|
||||
row![
|
||||
button("↑ Отправить").style(jl_button).on_press(SyncMessage::Send),
|
||||
button("↑ Отправить").style(jl_button).on_press(Send),
|
||||
space().width(Fill),
|
||||
button("↓ Скачать").style(jl_button).on_press(SyncMessage::GetLast)
|
||||
button("↓ Скачать").style(jl_button).on_press(GetLast)
|
||||
]
|
||||
.spacing(DEFAULT_SPACING),
|
||||
container(network_view).width(Fill),
|
||||
button("Отключить синхронизацию")
|
||||
.style(danger)
|
||||
.on_press(SyncMessage::DisableSync),
|
||||
.on_press(DisableSync),
|
||||
]
|
||||
} else {
|
||||
column![
|
||||
button("Создать сохранение").style(jl_button).on_press(SyncMessage::InitSync),
|
||||
button("Вставить ключ из буфера").style(jl_button).on_press(SyncMessage::GetKey),
|
||||
button("Создать сохранение").style(jl_button).on_press(InitSync),
|
||||
button("Вставить ключ из буфера").style(jl_button).on_press(GetKey),
|
||||
]
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user