refactoring

assets/text.json

@@ -13,7 +13,7 @@
 		"- The 'Info' button provides information on the build currently running.",
 		"- The Sun/Moon button toggles Dark and Light mode."
 	],
-	"help_function": [
+	"help_func": [
 		"(From Left to Right)",
 		"- The `✖` allows you to delete the function in question. Deleting a function is prevented if only 1 function exists.",
 		"- The `∫` indicates whether to integrate the function in question.",
@@ -24,7 +24,7 @@
 		"- Extrema (local minimums and maximums) and Roots (intersections with the x-axis) are displayed though yellow and light blue points on the graph. You can toggle these in the Side Panel.",
 		"- In some edge cases, math functions may not parse correctly. More specifically with implicit multiplication. If you incounter this issue, please do report it on the project's Github page (linked on the side panel). But a current workaround would be explicitly stating a multiplication operation through the use of an asterisk."
 	],
-	"license_info": "The AGPL license ensures that the end user, even if not hosting the program itself, is still guaranteed access to the source code of the project in question.",
+	"agpl_info": "The AGPL license ensures that the end user, even if not hosting the program itself, is still guaranteed access to the source code of the project in question.",
 	"welcome": [
 		"Welcome to the (Yet-to-be-named) Graphing Software!",
 		"This project aims to provide an intuitive experience graphing mathematical functions with features such as Integration, differentiation, extrema, roots, and much more! (see Help menu for more details)"

src/function_manager.rs

@@ -7,11 +7,11 @@ use parsing::suggestions::Hint;
 use std::ops::BitXorAssign;
 use uuid::Uuid;
 
-pub struct Manager {
+pub struct FunctionManager {
 	functions: Vec<(Uuid, FunctionEntry)>,
 }
 
-impl Default for Manager {
+impl Default for FunctionManager {
 	fn default() -> Self {
 		Self {
 			functions: vec![(Uuid::new_v4(), DEFAULT_FUNCTION_ENTRY.clone())],
@@ -19,7 +19,7 @@ impl Default for Manager {
 	}
 }
 
-impl Manager {
+impl FunctionManager {
 	pub fn display_entries(&mut self, ui: &mut egui::Ui) {
 		// ui.label("Functions:");
 		let can_remove = self.functions.len() > 1;

src/math_app.rs

@@ -1,12 +1,11 @@
 use crate::consts::*;
 use crate::function_entry::Riemann;
-use crate::function_manager::Manager;
-use crate::misc::{dyn_mut_iter, option_vec_printer, SerdeValueHelper, TextData};
-use egui::style::Margin;
-use egui::Frame;
+use crate::function_manager::FunctionManager;
+use crate::misc::{dyn_mut_iter, option_vec_printer, TextData};
 use egui::{
-	plot::Plot, vec2, Button, CentralPanel, Color32, ComboBox, Context, FontData, FontDefinitions,
-	FontFamily, Key, RichText, SidePanel, Slider, TopBottomPanel, Vec2, Visuals, Window,
+	plot::Plot, style::Margin, vec2, Button, CentralPanel, Color32, ComboBox, Context, FontData,
+	FontDefinitions, FontFamily, Frame, Key, RichText, SidePanel, Slider, TopBottomPanel, Vec2,
+	Visuals, Window,
 };
 use emath::Align2;
 use epaint::Rounding;
@@ -102,12 +101,12 @@ impl Default for Opened {
 /// The actual application
 pub struct MathApp {
 	/// Stores vector of functions
-	functions: Manager,
+	functions: FunctionManager,
 
 	/// Contains the list of Areas calculated (the vector of f64) and time it took for the last frame (the Duration). Stored in a Tuple.
 	last_info: (Vec<Option<f64>>, Option<Duration>),
 
-	/// Stores whether or not dark mode is enabled
+	toggle_visuals: bool,
 	dark_mode: bool,
 
 	/// Stores opened windows/elements for later reference
@@ -124,6 +123,7 @@ impl MathApp {
 	#[allow(dead_code)] // This is used lol
 	/// Create new instance of [`MathApp`] and return it
 	pub fn new(cc: &eframe::CreationContext<'_>) -> Self {
+		let ctx = &cc.egui_ctx;
 		let start = instant::Instant::now();
 
 		// Remove loading indicator on wasm
@@ -197,10 +197,9 @@ impl MathApp {
 					}
 				}
 			} else if path_string == "text.json" {
-				text_data = Some(
-					SerdeValueHelper::new(str::from_utf8(&data).expect("unable to read text.json"))
-						.parse_values(),
-				);
+				text_data = Some(TextData::from_json_str(
+					str::from_utf8(&data).expect("unable to read text.json"),
+				));
 			} else {
 				panic!("File {} not expected!", path_string);
 			}
@@ -247,16 +246,20 @@ impl MathApp {
 		};
 
 		// Initialize fonts
-		// this used to be in the `update` method, but (after a ton of digging) this actually caused OOMs. that was a pain to debug
-		cc.egui_ctx.set_fonts(fonts);
+		// This used to be in the `update` method, but (after a ton of digging) this actually caused OOMs. that was a pain to debug
+		ctx.set_fonts(fonts);
+
+		// Set dark mode by default
+		ctx.set_visuals(Visuals::dark());
 
 		tracing::info!("Initialized! Took: {:?}", start.elapsed());
 
 		Self {
 			functions: Default::default(),
 			last_info: (vec![None], None),
-			dark_mode: true,
-			text: text_data.expect("text.json failed to load"),
+			toggle_visuals: false,
+			dark_mode: true, // dark mode is default and is previously set
+			text: text_data.expect("Didn't find text.json"),
 			opened: Opened::default(),
 			settings: Default::default(),
 		}
@@ -389,11 +392,15 @@ impl epi::App for MathApp {
 			None
 		};
 
-		// Set dark/light mode depending on the variable `self.dark_mode`
-		ctx.set_visuals(match self.dark_mode {
-			true => Visuals::dark(),
-			false => Visuals::light(),
-		});
+		// Toggle visuals if requested
+		if self.toggle_visuals {
+			ctx.set_visuals(match self.dark_mode {
+				true => Visuals::light(),
+				false => Visuals::dark(),
+			});
+			self.dark_mode.bitxor_assign(true);
+			self.toggle_visuals = false;
+		}
 
 		// If keyboard input isn't being grabbed, check for key combos
 		if !ctx.wants_keyboard_input() {
@@ -449,8 +456,8 @@ impl epi::App for MathApp {
 				);
 
 				// Toggles dark/light mode
-				self.dark_mode.bitxor_assign(
-					ui.add(Button::new(match self.dark_mode {
+				self.toggle_visuals = ui
+					.add(Button::new(match self.dark_mode {
 						true => "🌞",
 						false => "🌙",
 					}))
@@ -458,8 +465,7 @@ impl epi::App for MathApp {
 						true => "Turn the Lights on!",
 						false => "Turn the Lights off.",
 					})
-					.clicked(),
-				);
+					.clicked();
 
 				// Display Area and time of last frame
 				if self.last_info.0.iter().filter(|e| e.is_some()).count() > 0 {

src/misc.rs

@@ -192,43 +192,35 @@ pub struct TextData {
 	pub welcome: String,
 }
 
-/// Helps parsing text data from `text.json`
-pub struct SerdeValueHelper {
-	value: JsonValue,
+/// Parses an array of strings at `self.value[key]` as a multiline string
+fn parse_multiline(value: &JsonValue, key: &str) -> String {
+	(value[key])
+		.as_array()
+		.expect("Cannot cast to array")
+		.iter()
+		.map(|ele| ele.as_str().unwrap())
+		.fold(String::new(), |s, l| s + l + "\n")
+		.trim_end()
+		.to_owned()
 }
 
-impl SerdeValueHelper {
-	pub fn new(string: &str) -> Self {
+/// Parses `self.value[key]` as a single line string
+fn parse_singleline(value: &JsonValue, key: &str) -> String {
+	value[key].as_str().expect("cannot cast to str").to_owned()
+}
+
+impl TextData {
+	pub fn from_json_str(string: &str) -> Self {
+		let value = serde_json::from_str(string).expect("Cannot parse json file");
+
 		Self {
-			value: serde_json::from_str(string).unwrap(),
-		}
-	}
-
-	/// Parses an array of strings at `self.value[key]` as a multiline string
-	fn parse_multiline(&self, key: &str) -> String {
-		(&self.value[key])
-			.as_array()
-			.expect("Cannot call as_array")
-			.iter()
-			.map(|ele| ele.as_str().unwrap())
-			.fold(String::new(), |s, l| s + l + "\n")
-			.trim_end()
-			.to_owned()
-	}
-
-	/// Parses `self.value[key]` as a single line string
-	fn parse_singleline(&self, key: &str) -> String { self.value[key].as_str().unwrap().to_owned() }
-
-	/// Used to parse `text.json`
-	pub fn parse_values(&self) -> TextData {
-		TextData {
-			help_expr: self.parse_multiline("help_expr"),
-			help_vars: self.parse_multiline("help_vars"),
-			help_panel: self.parse_multiline("help_panel"),
-			help_function: self.parse_multiline("help_function"),
-			help_other: self.parse_multiline("help_other"),
-			license_info: self.parse_singleline("license_info"),
-			welcome: self.parse_multiline("welcome"),
+			help_expr: parse_multiline(&value, "help_expr"),
+			help_vars: parse_multiline(&value, "help_vars"),
+			help_panel: parse_multiline(&value, "help_panel"),
+			help_function: parse_multiline(&value, "help_func"),
+			help_other: parse_multiline(&value, "help_other"),
+			license_info: parse_singleline(&value, "agpl_info"),
+			welcome: parse_multiline(&value, "welcome"),
 		}
 	}
 }