* Refactoring

* Added a text when no differences are detected
* Added the ability to quickly clear differences

Author: CodeDead

src/main.rs

@@ -4,6 +4,7 @@ use iced::{Sandbox, Settings};
 mod view;
 mod style;
 mod filereader;
+mod vector_comparer;
 
 pub fn main() -> iced::Result {
     view::ApplicationContext::run(Settings {

src/vector_comparer.rs

@@ -0,0 +1,78 @@
+pub trait IVectorComparer<T> {
+    fn new(vec1: Vec<T>, vec2: Vec<T>) -> Self;
+    fn get_differences(&self) -> Vec<T>;
+}
+
+#[derive(Debug, Clone)]
+pub struct VectorComparer<T> {
+    pub vec1: Vec<T>,
+    pub vec2: Vec<T>,
+}
+
+impl IVectorComparer<String> for VectorComparer<String> {
+    /// Initialize a new VectorComparer for type `String`
+    ///
+    /// # Example
+    ///
+    /// ```rust
+    /// let vector_comparer: VectorComparer<String> = IVectorComparer::<String>::new(vec![], vec![]);
+    /// ```
+    ///
+    /// # Retuns
+    ///
+    /// A `VectorComparer` that can be used to compare two `Vec` structs of type `String`
+    fn new(vec1: Vec<String>, vec2: Vec<String>) -> VectorComparer<String> {
+        VectorComparer::<String> { vec1, vec2 }
+    }
+
+    /// Get the differences between the two given `Vec` structs of type `String`
+    ///
+    /// # Example
+    ///
+    /// ```rust
+    /// let differences: Vec<String> = vector_comparer.get_differences();
+    /// ```
+    ///
+    /// # Returns
+    ///
+    /// A `Vec` struct of type `String` that contains the differences between the two given `Vec` structs of type `String`
+    fn get_differences(&self) -> Vec<String> {
+        if self.vec1.is_empty() {
+            return self.vec2.clone();
+        } else if self.vec2.is_empty() {
+            return self.vec1.clone();
+        }
+
+        let mut diff = vec![];
+        for f in &self.vec1 {
+            let mut included = false;
+            for d in &self.vec2 {
+                if f.eq(d) {
+                    included = true;
+                }
+            }
+
+            if !included {
+                diff.push(String::from(f));
+            }
+        }
+
+        for f in &self.vec2 {
+            let mut included = false;
+            for d in &self.vec1 {
+                if f.eq(d) {
+                    included = true;
+                }
+            }
+
+            if !included {
+                let n = String::from(f);
+                if !diff.contains(&n) {
+                    diff.push(n);
+                }
+            }
+        }
+
+        diff
+    }
+}

src/view.rs

@@ -1,5 +1,6 @@
 use crate::filereader::FileReader;
 use crate::style;
+use crate::vector_comparer::{IVectorComparer, VectorComparer};
 use iced::{alignment, scrollable, Rule};
 use iced::{
     button, text_input, Alignment, Button, Column, Container, Element, Length, Radio, Row, Sandbox,
@@ -15,6 +16,7 @@ pub enum Message {
     SelectFirstFilePressed,
     SelectSecondFilePressed,
     ComparePressed,
+    ClearComparePressed,
 }
 
 #[derive(Default)]
@@ -27,8 +29,10 @@ pub struct ApplicationContext {
     pub btn_select_first_file: button::State,
     pub btn_select_second_file: button::State,
     pub btn_compare: button::State,
+    pub btn_clean_compare: button::State,
     pub scrollable: scrollable::State,
     pub differences: Vec<String>,
+    pub has_compared: bool,
 }
 
 impl Sandbox for ApplicationContext {
@@ -49,6 +53,7 @@ impl Sandbox for ApplicationContext {
             Message::SelectFirstFilePressed => {
                 let path = FileDialog::new()
                     .add_filter("Text file", &["txt"])
+                    .add_filter("All files", &["*"])
                     .show_open_single_file()
                     .unwrap();
 
@@ -62,6 +67,7 @@ impl Sandbox for ApplicationContext {
             Message::SelectSecondFilePressed => {
                 let path = FileDialog::new()
                     .add_filter("Text file", &["txt"])
+                    .add_filter("All files", &["*"])
                     .show_open_single_file()
                     .unwrap();
 
@@ -94,7 +100,7 @@ impl Sandbox for ApplicationContext {
                         MessageDialog::new()
                             .set_type(MessageType::Error)
                             .set_title("text-diff")
-                            .set_text(&format!("Error while reading file!\n{}", e))
+                            .set_text(&format!("Error while reading file {}!\n{}", &self.first_file, e))
                             .show_alert()
                             .unwrap();
                         return;
@@ -107,46 +113,26 @@ impl Sandbox for ApplicationContext {
                         MessageDialog::new()
                             .set_type(MessageType::Error)
                             .set_title("text-diff")
-                            .set_text(&format!("Error while reading file!\n{}", e))
+                            .set_text(&format!("Error while reading file {}!\n{}", &self.second_file, e))
                             .show_alert()
                             .unwrap();
                         return;
                     }
                 };
 
-                let mut diff = vec![];
-                for f in &lines_first_file {
-                    let mut included = false;
-                    for d in &lines_second_file {
-                        if f.eq(d) {
-                            included = true;
-                        }
-                    }
-
-                    if !included {
-                        diff.push(String::from(f));
-                    }
-                }
+                let vector_comparer: VectorComparer<String> =
+                    IVectorComparer::<String>::new(lines_first_file, lines_second_file);
 
-                for f in &lines_second_file {
-                    let mut included = false;
-                    for d in &lines_first_file {
-                        if f.eq(d) {
-                            included = true;
-                        }
-                    }
-
-                    if !included {
-                        let n = String::from(f);
-                        if !diff.contains(&n) {
-                            diff.push(n);
-                        }
-                    }
-                }
-
-                self.differences = diff;
+                self.differences = vector_comparer.get_differences();
+                self.has_compared = true;
             }
             Message::ThemeChanged(d) => self.theme = d,
+            Message::ClearComparePressed => {
+                self.first_file = String::new();
+                self.second_file = String::new();
+                self.has_compared = false;
+                self.differences = vec![];
+            }
         };
     }
 
@@ -213,11 +199,44 @@ impl Sandbox for ApplicationContext {
         .on_press(Message::SelectSecondFilePressed)
         .style(self.theme);
 
-        let btn_compare = Button::new(&mut self.btn_compare, Text::new("Compare"))
+        let btn_compare = Button::new(
+            &mut self.btn_compare,
+            Text::new("Compare").horizontal_alignment(alignment::Horizontal::Center),
+        )
+        .padding(10)
+        .min_width(100)
+        .on_press(Message::ComparePressed)
+        .style(self.theme);
+
+        let mut compare_row = Row::new().spacing(10);
+
+        if self.has_compared {
+            let btn_clean_compare = Button::new(
+                &mut self.btn_clean_compare,
+                Text::new("Clear").horizontal_alignment(alignment::Horizontal::Center),
+            )
             .padding(10)
-            .on_press(Message::ComparePressed)
+            .min_width(100)
+            .on_press(Message::ClearComparePressed)
             .style(self.theme);
 
+            compare_row = compare_row.push(
+                Column::new()
+                    .width(Length::Fill)
+                    .align_items(Alignment::Start)
+                    .spacing(20)
+                    .push(btn_clean_compare),
+            );
+        }
+
+        compare_row = compare_row.push(
+            Column::new()
+                .width(Length::Fill)
+                .align_items(Alignment::End)
+                .spacing(20)
+                .push(btn_compare),
+        );
+
         let mut content = Column::new()
             .spacing(15)
             .padding(20)
@@ -236,27 +255,24 @@ impl Sandbox for ApplicationContext {
                     .push(second_file_input)
                     .push(btn_select_second_file),
             )
-            .push(
-                Row::new().spacing(10).push(
-                    Column::new()
-                        .width(Length::Fill)
-                        .align_items(Alignment::End)
-                        .spacing(20)
-                        .push(btn_compare),
-                ),
-            );
+            .push(compare_row);
 
-        if !self.differences.is_empty() {
-            let choose_theme = self.differences.iter().fold(
+        if self.has_compared {
+            let mut diff_text = Text::new("Differences:");
+            if self.differences.is_empty() {
+                diff_text = Text::new("No differences detected!")
+            }
+            
+            let diff_column = self.differences.iter().fold(
                 Column::new()
                     .spacing(10)
-                    .push(Text::new("Differences:").size(30)),
+                    .push(diff_text.size(30)),
                 |column, theme| column.push(Text::new(format!("{}", theme))),
             );
 
             content = content
                 .push(Rule::horizontal(20).style(self.theme))
-                .push(choose_theme);
+                .push(diff_column);
         }
 
         content = content