Skip to content

Commit

Permalink
Add Delete Button and Github Repo Link
Browse files Browse the repository at this point in the history
  • Loading branch information
@C0D3-M4513R
C0D3-M4513R committed May 31, 2024
1 parent 75c8acf commit e54df3d
Show file tree
Hide file tree
Showing 3 changed files with 84 additions and 50 deletions.
126 changes: 81 additions & 45 deletions counter/src/app.rs
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,21 @@
pub(crate) mod popup;

use std::ops::{Index, IndexMut};
use std::sync::Arc;
use std::time::Duration;
use eframe::{Frame, Storage};
use egui::{Context, Widget};
use eframe::emath::Align;
use egui::{Context, Layout, Widget};
use egui::ahash::HashMap;
use egui_extras::Column;
use serde::{Deserialize, Serialize};
use tokio::time::Instant;
use crate::counter_or_timer::CounterTimer;
use crate::get_runtime;

const LINK_LATEST:&str = "https://github.com/C0D3-M4513R/time/releases/latest";
const CURRENT_VERSION:&str = "-\tCurrent Version: v0.2.1";

#[derive(Default, Deserialize, Serialize)]
pub(crate) struct App{
next_name: String,
Expand All @@ -18,16 +24,10 @@ pub(crate) struct App{
#[serde(skip)]
other_app_state: OtherAppState,
}
#[derive(Default)]
struct OtherAppState{
popup: popup::ArcPopupStore
}

impl Default for OtherAppState {
fn default() -> Self {
Self {
popup: Arc::new(Default::default()),
}
}
popup: popup::ArcPopupStore,
text_err: Option<(&'static str, Instant)>,
}

impl App {
Expand Down Expand Up @@ -105,11 +105,23 @@ impl eframe::App for App{
};
egui::CentralPanel::default().show(ctx, |ui|{
ui.horizontal(|ui|{
ui.text_edit_singleline(&mut self.next_name);
let text_resp = ui.text_edit_singleline(&mut self.next_name);
if ui.button("Add new Counter").clicked(){
let name:Arc<str> = Arc::from(core::mem::take(&mut self.next_name));
self.names.push(name.clone());
self.counters.insert(name.clone(), default_fn(name));
if !self.names.contains(&name) {
self.other_app_state.text_err = None;
self.names.push(name.clone());
self.counters.insert(name.clone(), default_fn(name));
}else{
self.other_app_state.text_err = Some(("This name is already taken. Please provide a uniqe name.", Instant::now()));
}
}
if let Some((err_text, time)) = self.other_app_state.text_err {
text_resp.ctx.debug_painter()
.error(text_resp.rect.left_bottom(), err_text);
if time.elapsed().as_secs() > crate::NOTIFICATION_TIMEOUT {
self.other_app_state.text_err = None;
}
}
if ui.button("Start Everything").clicked(){
for i in self.counters.values_mut(){
Expand All @@ -122,40 +134,64 @@ impl eframe::App for App{
}
}
});
egui_extras::TableBuilder::new(ui)
.resizable(true)
.striped(true)
.column(Column::initial(100.))
.column(Column::remainder())
.header(25., |mut row|{
for i in ["Name", "Counter Ui"]{
row.col(|ui|{ ui.label(i); });
}
})
.body(|body|{
body.rows(
65.,
self.names.len(),
|mut row|{
if let Some(name) = self.names.get_mut(row.index()){
row.col(|ui|{
let mut new_name:String = name.as_ref().into();
if ui.text_edit_singleline(&mut new_name).changed() {
let mut counter = self.counters.remove(&*name).unwrap_or_else(||default_fn(name.clone()));
let new_name:Arc<str> = Arc::from(new_name);
counter.name = new_name.clone();
self.counters.insert(new_name.clone(), counter);
*name = new_name;
}
});
row.col(|ui|{ self.counters.entry(name.clone()).or_insert_with(||default_fn(name.clone())).ui(ui); });
}else{
row.col(|ui|{ ui.label("Error: Overread"); });
row.col(|ui|{ ui.label("Error: Overread"); });
ui.with_layout(Layout::bottom_up(Align::Min), |ui|{
ui.horizontal(|ui|{
ui.hyperlink_to("The releases and the Source Code can be found on Github.", LINK_LATEST);
ui.label(CURRENT_VERSION);
});
ui.with_layout(Layout::default(), |ui|{
egui_extras::TableBuilder::new(ui)
.resizable(true)
.striped(true)
.column(Column::initial(100.))
.column(Column::remainder())
.header(25., |mut row|{
for i in ["Name", "Counter Ui"]{
row.col(|ui|{ ui.label(i); });
}
})
.body(|body|{
body.rows(
65.,
self.names.len(),
|mut row|{
let index = row.index();
let mut deleted = false;
if index < self.names.len() {
//all index ops should be valid here
row.col(|ui|{
let name = self.names.index_mut(index);
let mut new_name: String = name.as_ref().into();
if ui.text_edit_singleline(&mut new_name).changed() {
let mut counter = self.counters.remove(&*name).unwrap_or_else(|| default_fn(name.clone()));
let new_name: Arc<str> = Arc::from(new_name);
counter.name = new_name.clone();
self.counters.insert(new_name.clone(), counter);
*name = new_name;
}
if ui.button("Delete").clicked(){
deleted = true;
self.counters.remove(&self.names.remove(index));
}
});
if !deleted {
row.col(|ui|{
let name = self.names.index(index);
self.counters.entry(name.clone()).or_insert_with(||default_fn(name.clone())).ui(ui);
});
} else {
ctx.request_repaint();
}
} else {
ctx.request_repaint();
row.col(|ui|{ ui.label("Error: Overread"); });
row.col(|ui|{ ui.label("Error: Overread"); });
}
}
}
)
)
});
})
});
});
self.display_popups(ctx, frame)
}
Expand Down
6 changes: 2 additions & 4 deletions counter/src/counter_or_timer.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@ use crate::app::popup;
use crate::app::popup::{handle_display_popup_arc, popup_creator};
use crate::get_runtime;

const NOTIFICATION_TIMEOUT:u64 = 30;

const SECONDS_IN_MINUTE: u64 = 60;
const MINUTES_IN_HOUR: u64 = 60;
const HOURS_IN_DAY: u64 = 24;
Expand Down Expand Up @@ -227,7 +225,7 @@ impl CounterTimer {
let (s, m, h, neg, maxed) = mode.get_timestamp(&s, start_s, overall_change);
if let Some(file) = file.as_mut() {
if let Err(err) = file.seek(SeekFrom::Start(0)).await {
if last_message.map_or(true, |insant: Instant|insant.elapsed().as_secs() > NOTIFICATION_TIMEOUT){
if last_message.map_or(true, |insant: Instant|insant.elapsed().as_secs() > crate::NOTIFICATION_TIMEOUT){
last_message = Some(Instant::now());
log::error!("Error moving Cursor: {err}");
crate::app::popup::handle_display_popup_arc(
Expand All @@ -239,7 +237,7 @@ impl CounterTimer {
}
}else{
if let Err(err) = file.write_all(format!("{0}{h:02}:{m:02}:{s:02}", if neg {"-"} else {""}).as_bytes()).await {
if last_message.map_or(true, |insant: Instant|insant.elapsed().as_secs() > NOTIFICATION_TIMEOUT){
if last_message.map_or(true, |insant: Instant|insant.elapsed().as_secs() > crate::NOTIFICATION_TIMEOUT){
last_message = Some(Instant::now());
log::error!("Error writing to File: {err}");
crate::app::popup::handle_display_popup_arc(
Expand Down
2 changes: 1 addition & 1 deletion counter/src/main.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ use std::sync::OnceLock;
use std::time::Duration;
use tokio::runtime::{Builder, Runtime};


pub const NOTIFICATION_TIMEOUT:u64 = 30;
pub const PERIOD:Duration = Duration::from_secs(1);


Expand Down

0 comments on commit e54df3d

Please sign in to comment.