v0.10.0

Cargo.toml

@@ -17,16 +17,20 @@ osx_minimum_system_version = "10.7"
 [dependencies]
 anyhow = "1.0"
 bitar = { version = "0.12", features = ["rustls-tls"] }
-time = "0.3"
+cp_r = "0.5"
+dark-light = "1.0"
 dmg = "0.1.2"
 espim = "0.2"
 flate2 = "1.0"
 fs_extra = "1.3.0"
 futures = "0.3"
-iced_aw = { git = "https://github.com/iced-rs/iced_aw.git", rev = "9ed46bffd0d819f22e07db6c282fbef733007df5", default-features = false, features = ["tabs", "icons"] }
-lazy_static = "1.5"
+iced_aw = { version = "0.13.0", default-features = false, features = [
+    "tabs",
+] }
+iced_dialog = "0.14.0"
 log = { version = "0.4.22", features = ["std"] }
 open = "5"
+parking_lot = "0.12"
 parse_link_header = "0.4"
 platform-dirs = "0.3.0"
 progress-streams = "1.1.0"
@@ -36,21 +40,37 @@ serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 serde-xml-rs = "0.6"
 simplelog = "0.12.2"
+sipper = "0.1"
 tar = "0.4"
+time = "0.3"
 tokio = { version = "1", default-features = false, features = ["fs"] }
 ureq = { version = "2.10", default-features = false, features = ["json", "tls"] }
 version = "3"
-zip-extract = { version = "0.1.3", default-features = false, features = ["deflate"] }
+zip-extract = { version = "0.1.3", default-features = false, features = [
+    "deflate",
+] }
+rfd = { version = "0.14.1", default-features = false, features = [
+    "tokio",
+    "xdg-portal",
+] }
 
 [dependencies.iced]
-version = "0.12.1"
+version = "0.14"
 default-features = false
-features = ["web-colors", "advanced", "image", "tokio"]
+features = [
+    "web-colors",
+    "advanced",
+    "image",
+    "sipper",
+    "tokio",
+    "wgpu", # iced will use wgpu by default and fall back to tiny-skia
+    "tiny-skia",
+]
 
 [target.'cfg(windows)'.build-dependencies]
 winres = "0.1"
 
 [profile.release]
 strip = true
-opt-level = 'z'  # Optimize for size.
-lto = true
+opt-level = 'z' # Optimize for size.
+lto = true

src/install_frame.rs

@@ -1,9 +1,9 @@
-use crate::instance::{get_instances_dir, InstanceType};
+use crate::instance::InstanceType;
 use crate::style::text_button;
-use crate::{instance, Message};
+use crate::{instance, Message, SharedSettings};
 use core::fmt;
 use iced::widget::{Button, Column, Container, Radio, Scrollable, Text, TextInput};
-use iced::{alignment, Alignment, Command, Element, Length};
+use iced::{alignment, Alignment, Element, Length, Task};
 use serde::{Deserialize, Serialize};
 
 // Characters that shall not be allowed to enter. This does not cover all cases!
@@ -57,23 +57,22 @@ impl fmt::Display for InstanceSourceType {
 }
 
 impl InstallFrame {
-    pub fn update(&mut self, message: InstallFrameMessage) -> Command<Message> {
+    pub fn update(
+        &mut self,
+        message: InstallFrameMessage,
+        settings: SharedSettings,
+    ) -> Task<Message> {
         match message {
             InstallFrameMessage::StartInstallation(instance_type) => {
-                if let Some(mut destination) = get_instances_dir() {
-                    destination.push(&self.name);
-                    return Command::perform(
-                        instance::perform_install(
-                            destination,
-                            self.name.clone(),
-                            instance_type,
-                            self.source.clone(),
-                        ),
-                        Message::Dummy,
-                    );
-                } else {
-                    error!("Could not get instances directory from AppDirs");
-                }
+                return Task::perform(
+                    instance::perform_install(
+                        settings.read().install_dir.join(&self.name),
+                        self.name.clone(),
+                        instance_type,
+                        self.source.clone(),
+                    ),
+                    Message::Dummy,
+                );
             }
             InstallFrameMessage::SourceTypeChanged(source_type) => self.source.r#type = source_type,
             InstallFrameMessage::NameChanged(name) => {
@@ -87,7 +86,7 @@ impl InstallFrame {
                 self.source.identifier = identifier;
             }
         }
-        Command::none()
+        Task::none()
     }
 
     pub fn view(&self) -> Element<InstallFrameMessage> {
@@ -110,7 +109,7 @@ impl InstallFrame {
             );
         }
 
-        let mut install_button = Button::new(Text::new("Install")).style(text_button());
+        let mut install_button = Button::new(Text::new("Install")).style(text_button);
         if !self.name.trim().is_empty() {
             install_button =
                 install_button.on_press(InstallFrameMessage::StartInstallation(if cfg!(windows) {
@@ -127,7 +126,7 @@ impl InstallFrame {
                 .padding(20)
                 .push(
                     Text::new("Install")
-                        .horizontal_alignment(alignment::Horizontal::Center)
+                        .align_x(alignment::Horizontal::Center)
                         .width(Length::Fill)
                         .size(26),
                 )
@@ -139,7 +138,7 @@ impl InstallFrame {
                 .push(controls)
                 .push(install_button)
                 .spacing(20)
-                .align_items(Alignment::End),
+                .align_x(Alignment::End),
         ))
         .width(Length::FillPortion(2))
         .into()