GUI/grim
1
1
Fork 0
Code Issues 6 Pull requests Projects Releases 8 Packages Wiki Activity Actions

camera: ur scan progress

Browse source
This commit is contained in:
ardocrat 2024-05-27 01:12:52 +03:00
parent 3f03d145e8
commit 0d4dee5124
1 changed files with 32 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
src/gui/views/camera.rs
View file

@ -17,7 +17,7 @@ use parking_lot::RwLock;
use std::thread; use std::thread;
use eframe::emath::Align; use eframe::emath::Align;
use egui::load::SizedTexture; use egui::load::SizedTexture;
use egui::{Layout, Pos2, Rect, TextureOptions, Widget}; use egui::{Layout, Pos2, Rect, RichText, TextureOptions, Widget};
use image::{DynamicImage, EncodableLayout, ImageFormat}; use image::{DynamicImage, EncodableLayout, ImageFormat};
use grin_util::ZeroingString; use grin_util::ZeroingString;
@ -38,9 +38,7 @@ pub struct CameraContent {
qr_scan_state: Arc<RwLock<QrScanState>>, qr_scan_state: Arc<RwLock<QrScanState>>,
/// Uniform Resources URIs collected from QR code scanning. /// Uniform Resources URIs collected from QR code scanning.
ur_data: Arc<RwLock<Option<Vec<String>>>>, ur_data: Arc<RwLock<Option<(Vec<String>, usize)>>>,
start: i64,
} }
impl Default for CameraContent { impl Default for CameraContent {
@ -48,7 +46,6 @@ impl Default for CameraContent {
Self { Self {
qr_scan_state: Arc::new(RwLock::new(QrScanState::default())), qr_scan_state: Arc::new(RwLock::new(QrScanState::default())),
ur_data: Arc::new(RwLock::new(None)), ur_data: Arc::new(RwLock::new(None)),
start: 0,
} }
} }
} }
@ -107,6 +104,20 @@ impl CameraContent {
.ui(ui); .ui(ui);
}); });
// Show UR scan progress.
let show_ur_progress = {
self.ur_data.clone().read().is_some()
};
let ur_progress = self.ur_progress();
if show_ur_progress && ur_progress != 0 {
ui.add_space(-52.0);
ui.vertical_centered(|ui| {
ui.label(RichText::new(format!("{}%", ur_progress))
.size(16.0)
.color(Colors::YELLOW));
});
}
// Show button to switch cameras. // Show button to switch cameras.
if cb.can_switch_camera() { if cb.can_switch_camera() {
ui.add_space(-52.0); ui.add_space(-52.0);
@ -148,7 +159,20 @@ impl CameraContent {
/// Get UR scanning progress in percents. /// Get UR scanning progress in percents.
fn ur_progress(&self) -> i32 { fn ur_progress(&self) -> i32 {
0 // Setup data.
let r_data = self.ur_data.read();
let (data, total) = r_data.clone().unwrap_or((vec![], 0));
if data.is_empty() {
return 0;
}
// Calculate progress.
let mut complete = 0;
for i in &data {
if !i.is_empty() {
complete += 1;
}
}
(100 * complete / total) as i32
} }
/// Parse QR code from provided image data. /// Parse QR code from provided image data.
@ -198,7 +222,7 @@ impl CameraContent {
let mut cur_data = { let mut cur_data = {
let r_data = ur_data.read(); let r_data = ur_data.read();
let mut cur_data = vec!["".to_string(); total]; let mut cur_data = vec!["".to_string(); total];
if let Some(d) = r_data.clone() { if let Some((d, _)) = r_data.clone() {
cur_data = d; cur_data = d;
} }
cur_data cur_data
@ -208,7 +232,7 @@ impl CameraContent {
{ {
cur_data.insert(index, uri); cur_data.insert(index, uri);
let mut w_data = ur_data.write(); let mut w_data = ur_data.write();
*w_data = Some(cur_data.clone()); *w_data = Some((cur_data.clone(), total));
} }
// Setup UR decoder. // Setup UR decoder.
let mut decoder = ur::Decoder::default(); let mut decoder = ur::Decoder::default();
@ -271,7 +295,6 @@ impl CameraContent {
fn parse_qr_code(data: Vec<u8>) -> QrScanResult { fn parse_qr_code(data: Vec<u8>) -> QrScanResult {
// Check if string starts with Grin address prefix. // Check if string starts with Grin address prefix.
let text_string = String::from_utf8(data.clone()).unwrap_or("".to_string()); let text_string = String::from_utf8(data.clone()).unwrap_or("".to_string());
println!("data: {}", text_string);
let text = text_string.trim(); let text = text_string.trim();
if text.starts_with("tgrin") || text.starts_with("grin") { if text.starts_with("tgrin") || text.starts_with("grin") {
if SlatepackAddress::try_from(text).is_ok() { if SlatepackAddress::try_from(text).is_ok() {