Merge pull request #6 from CodeDead/release/v0.1.1

Release/v0.1.1

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

@@ -1,20 +1,21 @@
 [package]
 name = "text-diff"
-version = "0.1.0"
+version = "0.1.1"
 edition = "2021"
 authors = ["CodeDead <[email protected]>"]
 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

@@ -4,6 +4,7 @@
 ![GitHub](https://img.shields.io/badge/language-Rust-green)
 ![GitHub](https://img.shields.io/github/license/CodeDead/text-diff-rs)
 [![Deploy](https://github.com/CodeDead/text-diff-rs/actions/workflows/rust.yml/badge.svg)](https://github.com/CodeDead/text-diff-rs/actions/workflows/rust.yml)
+[![Test](https://github.com/CodeDead/text-diff-rs/actions/workflows/test.yml/badge.svg)](https://github.com/CodeDead/text-diff-rs/actions/workflows/test.yml)
 
 ![text-diff](https://i.imgur.com/VrcSyMD.png)
 

README.md

@@ -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)
             }
         }