Merge branch 'main' into lucas/no-verbose

Author: lucasmerlin

Cargo.lock

@@ -26,7 +26,7 @@ eframe = { version = "0.33.0", features = ["glow", "default", "persistence", "ro
 egui_extras = { version = "0.33.0", features = ["image", "file", "http"] }
 egui_inbox = { version = "0.10.0", features = ["async", "tokio"] }
 ehttp = { version = "0.5.0", features = ["native-async"] }
-env_logger = { version = "0.11.8", default-features=false, features = ["auto-color", "humantime"] }
+env_logger = { version = "0.11.8", default-features = false, features = ["auto-color", "humantime"] }
 flate2 = { version = "1.1" }
 futures = "0.3.31"
 getrandom = { version = "0.3", features = ["wasm_js"] }
@@ -38,7 +38,7 @@ octocrab = { version = "0.47.0", default-features = false, features = ["stream"]
 octocrab-wasm = { path = "crates/octocrab-wasm" }
 re_ui = { git = "https://github.com/rerun-io/rerun", branch = "main" }
 reqwest = { version = "0.12.23", default-features = false, features = [
-    "rustls-tls",
+    "rustls-tls", "rustls-tls-webpki-roots"
 ] }
 serde = "1.0"
 serde_json = "1.0"
@@ -54,7 +54,7 @@ zip = { version = "6.0.0", default-features = false, features = ["deflate"] }
 axum = "0.8.6"
 clap = { version = "4.5", features = ["derive"] }
 env_logger = "0.11.8"
-git2 = { version = "0.20.2" }
+gix = { version = "0.73", default-features = false, features = ["blocking-network-client", "blob-diff", "merge"] }
 ignore = { version = "0.4" }
 tokio = { version = "1.47", features = ["full"] }
 

Cargo.toml

@@ -1,9 +1,9 @@
-use crate::config::Config;
 use crate::diff_image_loader::DiffImageLoader;
 use crate::settings::Settings;
 use crate::state::{AppState, AppStateRef, PageRef, SystemCommand, ViewerSystemCommand};
 use crate::{DiffSource, bar, home, viewer};
-use eframe::egui::{Context, Key, Modifiers};
+use crate::{config::Config, state::View};
+use eframe::egui::{Context, Modifiers};
 use eframe::{Frame, Storage, egui};
 use egui_extras::install_image_loaders;
 use egui_inbox::UiInbox;
@@ -172,21 +172,15 @@ impl App {
                     state.send(ViewerSystemCommand::SelectSnapshot(new_index));
                 }
 
-                let handle_key = |key: Key, toggle: &mut bool| {
-                    if ctx.input_mut(|i| i.key_pressed(key)) {
-                        *toggle = true;
+                let mut new_view = vs.state.view;
+                for view in View::ALL {
+                    if ctx.input_mut(|i| i.consume_key(Default::default(), view.key())) {
+                        new_view = view;
                     }
-                    if ctx.input_mut(|i| i.key_released(key)) {
-                        *toggle = false;
-                    }
-                };
-
-                let mut view_filter = vs.state.view_filter;
-                handle_key(Key::Num1, &mut view_filter.show_old);
-                handle_key(Key::Num2, &mut view_filter.show_new);
-                handle_key(Key::Num3, &mut view_filter.show_diff);
-                if view_filter != vs.state.view_filter {
-                    state.send(ViewerSystemCommand::SetViewFilter(view_filter));
+                }
+
+                if new_view != vs.state.view {
+                    state.send(ViewerSystemCommand::SetView(new_view));
                 }
             }
         }

src/app.rs

@@ -18,7 +18,7 @@ pub enum Commands {
     Files { directory: Option<String> },
     /// Compare images between current branch and default branch
     Git { repo_path: Option<String> },
-    /// Compare images between PR branches from GitHub PR URL (needs to be run from within the repo)
+    /// Compare images between PR branches from GitHub PR URL
     Pr { url: String },
     /// Load and compare snapshot files from a zip archive (URL or local file)
     Archive { source: String },