Merge branch 'refs/heads/worksoup-dev' into dev

# Conflicts:
#	cxlib
#	src/lib.rs

Cargo.toml

@@ -24,7 +24,9 @@ crate-type = ["lib", "cdylib", "staticlib"]
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 [features]
-default = ["completions"]
+default = ["completions", "ui_solver"]
+all_ui_solver = ["slide_ui_solver", "ui_solver", "obstacle_ui_solver"]
+ui_solver = ["rotate_ui_solver", "icon_click_ui_solver", "text_click_ui_solver"]
 completions = ["completion-nu", "completion-carapace", "completion-fig"]
 completion-nu = ["clap_complete_command", "clap_complete_command/nushell"]
 completion-carapace = ["clap_complete_command", "clap_complete_command/carapace"]

src/lib.rs

@@ -22,13 +22,13 @@ use clap::CommandFactory;
 use cli::arg::{AccountSubCommand, Args, MainCommand};
 use cxlib::{
     activity::{Activity, RawSign},
+    captcha::CaptchaType,
     default_impl::store::{AccountTable, DataBase, ExcludeTable},
     sign::SignTrait,
     store::Dir,
     types::Location,
     user::{DefaultLoginSolver, LoginSolverTrait, LoginSolverWrapper, LoginSolvers, Session},
 };
-use cxlib_captcha::CaptchaType;
 use log::{error, info, warn};
 use std::{collections::HashMap, io::stdout};
 use x_l4rs::IDSLoginImpl;