* Added workflow for testing code format and tests

* Design takes up less space
* Refactoring of existing code
* Make use of native dialogs with improved translations

Author: CodeDead

.github/workflows/rust.yml

@@ -3,17 +3,14 @@ name: Deploy
 on:
   release:
     types: [ published ]
-  push:
-    branches:
-      - master
 
 jobs:
   build:
     runs-on: ubuntu-latest
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v1
+        uses: actions/checkout@v3
 
       - name: Install latest rust toolchain
         uses: actions-rs/toolchain@v1
@@ -39,7 +36,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v1
+        uses: actions/checkout@v3
 
       - name: Install latest rust toolchain
         uses: actions-rs/toolchain@v1
@@ -64,7 +61,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v1
+        uses: actions/checkout@v3
 
       - name: Install latest rust toolchain
         uses: actions-rs/toolchain@v1

.github/workflows/test.yml

@@ -0,0 +1,30 @@
+name: Test
+
+on:
+  pull_request:
+    types: [opened, reopened]
+  push:
+    branches:
+      - master
+      - development
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Install latest rust toolchain
+        uses: actions-rs/toolchain@v1
+        with:
+          toolchain: stable
+          default: true
+          override: true
+
+      - name: Check code formatting
+        run: cargo fmt --all -- --check
+
+      - name: Test code
+        run: cargo test --verbose --all

Cargo.lock

@@ -6,15 +6,16 @@ authors = ["CodeDead <admin@codedead.com>"]
 description = "A cross-platform GUI for comparing two text files"
 readme = "README.md"
 repository = "https://github.com/CodeDead/text-diff-rs"
+license = "GPL-3.0"
 license-file = "LICENSE"
 keywords = ["gui", "ui", "text-diff", "interface", "codedead", "diff", "difference"]
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
 iced = { git = "https://github.com/iced-rs/iced" }
-native-dialog = "0.6.3"
-serde = { version = "1.0", features = ["derive"] }
+native-dialog = { git = "https://github.com/CodeDead/native-dialog-rs" }
+serde = { version = "1.0" }
 serde_json = "1.0"
 
 [profile.release]

Cargo.toml

@@ -1,7 +1,7 @@
 use iced::window;
 use iced::{Sandbox, Settings};
 
-mod filereader;
+mod file_reader;
 mod style;
 mod vector_comparer;
 mod vector_exporter;
@@ -11,7 +11,7 @@ pub fn main() -> iced::Result {
     view::ApplicationContext::run(Settings {
         id: Some(String::from("text-diff")),
         window: window::Settings {
-            size: (800, 800),
+            size: (800, 720),
             position: window::Position::Centered,
             ..window::Settings::default()
         },

src/filereader.rs renamed to src/file_reader.rs

@@ -383,7 +383,7 @@ mod dark {
                     a: 0.8,
                     ..if is_checked { ACTIVE } else { SURFACE }
                 }
-                    .into(),
+                .into(),
                 ..self.active(is_checked)
             }
         }

src/main.rs

@@ -1,7 +1,7 @@
 use std::ffi::OsStr;
 use std::path::Path;
 
-use crate::filereader::FileReader;
+use crate::file_reader::FileReader;
 use crate::style;
 use crate::vector_comparer::{IVectorComparer, VectorComparer};
 use crate::vector_exporter::{ExportType, IVectorExporter, VectorExporter};
@@ -41,6 +41,30 @@ pub struct ApplicationContext {
     pub has_compared: bool,
 }
 
+impl ApplicationContext {
+    /// Display a native alert
+    ///
+    /// # Example
+    ///
+    /// ```rust
+    /// display_alert("hello", "world", MessageType::Info)
+    /// ```
+    ///
+    /// # Arguments
+    ///
+    /// * `title` - The alert title
+    /// * `content` - the content of the alert
+    /// * `message_type` - The `MessageType` for the alert
+    fn display_alert(&self, title: &str, content: &str, message_type: MessageType) {
+        MessageDialog::new()
+            .set_type(message_type)
+            .set_title(title)
+            .set_text(content)
+            .show_alert()
+            .unwrap();
+    }
+}
+
 impl Sandbox for ApplicationContext {
     type Message = Message;
 
@@ -86,12 +110,12 @@ impl Sandbox for ApplicationContext {
             }
             Message::ComparePressed => {
                 if self.first_file.is_empty() || self.second_file.is_empty() {
-                    MessageDialog::new()
-                        .set_type(MessageType::Warning)
-                        .set_title("text-diff")
-                        .set_text("Please select two files first!")
-                        .show_alert()
-                        .unwrap();
+                    ApplicationContext::display_alert(
+                        &self,
+                        "text-diff",
+                        "Please select two files first!",
+                        MessageType::Warning,
+                    );
                     return;
                 }
 
@@ -103,31 +127,25 @@ impl Sandbox for ApplicationContext {
                 let lines_first_file = match lines_first_file {
                     Ok(d) => d,
                     Err(e) => {
-                        MessageDialog::new()
-                            .set_type(MessageType::Error)
-                            .set_title("text-diff")
-                            .set_text(&format!(
-                                "Error while reading file {}!\n{}",
-                                &self.first_file, e
-                            ))
-                            .show_alert()
-                            .unwrap();
+                        ApplicationContext::display_alert(
+                            &self,
+                            "text-diff",
+                            &format!("Error while reading file {}!\n{}", &self.first_file, e),
+                            MessageType::Error,
+                        );
                         return;
                     }
                 };
 
                 let lines_second_file = match lines_second_file {
                     Ok(d) => d,
                     Err(e) => {
-                        MessageDialog::new()
-                            .set_type(MessageType::Error)
-                            .set_title("text-diff")
-                            .set_text(&format!(
-                                "Error while reading file {}!\n{}",
-                                &self.second_file, e
-                            ))
-                            .show_alert()
-                            .unwrap();
+                        ApplicationContext::display_alert(
+                            &self,
+                            "text-diff",
+                            &format!("Error while reading file {}!\n{}", &self.second_file, e),
+                            MessageType::Error,
+                        );
                         return;
                     }
                 };
@@ -179,23 +197,20 @@ impl Sandbox for ApplicationContext {
                     Ok(_) => return,
                     Err(e) => match e {
                         crate::vector_exporter::ExportError::IoError(e) => {
-                            MessageDialog::new()
-                                .set_type(MessageType::Error)
-                                .set_title("text-diff")
-                                .set_text(&format!("Error while writing to file {}!\n{}", &path, e))
-                                .show_alert()
-                                .unwrap();
+                            ApplicationContext::display_alert(
+                                &self,
+                                "text-diff",
+                                &format!("Error while writing to file {}!\n{}", &path, e),
+                                MessageType::Error,
+                            );
                         }
                         crate::vector_exporter::ExportError::JsonError(e) => {
-                            MessageDialog::new()
-                                .set_type(MessageType::Error)
-                                .set_title("text-diff")
-                                .set_text(&format!(
-                                    "Error while creating JSON for file {}!\n{}",
-                                    &path, e
-                                ))
-                                .show_alert()
-                                .unwrap();
+                            ApplicationContext::display_alert(
+                                &self,
+                                "text-diff",
+                                &format!("Error while creating JSON for file {}!\n{}", &path, e),
+                                MessageType::Error,
+                            );
                         }
                     },
                 };
@@ -206,15 +221,11 @@ impl Sandbox for ApplicationContext {
     fn view(&mut self) -> Element<'_, Self::Message> {
         let title = Text::new("text-diff")
             .width(Length::Fill)
-            .size(85)
-            .color([0.5, 0.5, 0.5])
+            .size(80)
             .horizontal_alignment(alignment::Horizontal::Center);
 
         let choose_theme = style::Theme::ALL.iter().fold(
-            Row::new()
-                .width(Length::Fill)
-                .align_items(Alignment::Center)
-                .spacing(10),
+            Row::new().width(Length::Fill).spacing(10),
             |row, theme| {
                 row.push(
                     Radio::new(
@@ -330,15 +341,16 @@ impl Sandbox for ApplicationContext {
                 diff_text = Text::new("No differences detected!")
             }
 
-            let diff_column = self.differences.iter().fold(
-                Column::new().spacing(10),
-                |column, theme| column.push(Text::new(format!("- {}", theme))),
-            );
+            let diff_column = self
+                .differences
+                .iter()
+                .fold(Column::new().spacing(10), |column, theme| {
+                    column.push(Text::new(format!("- {}", theme)))
+                });
 
             let scroll_container = Column::new().width(Length::Fill).push(diff_column);
             let scroll = Scrollable::new(&mut self.scrollable)
-                .push(Container::new(scroll_container)
-                .width(Length::Fill))
+                .push(Container::new(scroll_container).width(Length::Fill))
                 .max_height(150)
                 .style(self.theme);
 
@@ -357,19 +369,19 @@ impl Sandbox for ApplicationContext {
                 .on_press(Message::ExportPressed)
                 .style(self.theme);
 
-                content = content.push(
-                    Column::new()
-                        .width(Length::Fill)
-                        .align_items(Alignment::End)
-                        .spacing(20)
-                        .push(btn_export),
-                );
+                content = content
+                    .push(
+                        Column::new()
+                            .width(Length::Fill)
+                            .align_items(Alignment::End)
+                            .spacing(20)
+                            .push(btn_export),
+                    )
+                    .push(Rule::horizontal(20).style(self.theme));
             }
         }
 
-        content = content
-            .push(Rule::horizontal(20).style(self.theme))
-            .push(choose_theme);
+        content = content.push(choose_theme);
 
         Container::new(content)
             .width(Length::Fill)