Add blessed build text coloring
This commit is contained in:
@@ -1,8 +1,8 @@
|
|||||||
use crate::AmongUsVersion;
|
use crate::AmongUsVersion;
|
||||||
use crate::AppData;
|
use crate::AppData;
|
||||||
use druid::{
|
use druid::{
|
||||||
widget::*, BoxConstraints, Env, Event, EventCtx, FileDialogOptions, LayoutCtx, LifeCycle,
|
widget::*, BoxConstraints, Color, Env, Event, EventCtx, FileDialogOptions, LayoutCtx,
|
||||||
LifeCycleCtx, PaintCtx, Selector, Size, UpdateCtx, WidgetExt, WidgetPod,
|
LifeCycle, LifeCycleCtx, PaintCtx, Selector, Size, UpdateCtx, WidgetExt, WidgetPod,
|
||||||
};
|
};
|
||||||
use std::{fs, io, path::PathBuf};
|
use std::{fs, io, path::PathBuf};
|
||||||
|
|
||||||
@@ -87,18 +87,28 @@ impl AmongUsLauncherWidget {
|
|||||||
for i in collection {
|
for i in collection {
|
||||||
let existing_ver_smash = i.unwrap().file_name();
|
let existing_ver_smash = i.unwrap().file_name();
|
||||||
let mut ver_smash_split = existing_ver_smash.to_str().unwrap().split('-');
|
let mut ver_smash_split = existing_ver_smash.to_str().unwrap().split('-');
|
||||||
|
let mut blessed_split = data.blessed_version.as_str().split('-');
|
||||||
|
let blessed_version = AmongUsVersion::from(blessed_split.next().unwrap());
|
||||||
let among_us_version = AmongUsVersion::from(ver_smash_split.next().unwrap());
|
let among_us_version = AmongUsVersion::from(ver_smash_split.next().unwrap());
|
||||||
let button_string: String =
|
let tou_version = ver_smash_split.next().unwrap();
|
||||||
format!("Town of Us {}", ver_smash_split.next().unwrap());
|
let blessed_tou_version = blessed_split.next().unwrap();
|
||||||
|
let button_string: String = format!("Town of Us {}", tou_version);
|
||||||
|
|
||||||
for (index, j) in auv_array.iter().enumerate() {
|
for (index, j) in auv_array.iter().enumerate() {
|
||||||
if j == &among_us_version {
|
if j == &among_us_version {
|
||||||
let mut clone: PathBuf = PathBuf::from(data.installs_path.clone());
|
let mut clone: PathBuf = PathBuf::from(data.installs_path.clone());
|
||||||
clone.push(existing_ver_smash.clone());
|
clone.push(existing_ver_smash.clone());
|
||||||
|
|
||||||
|
let mut button_label: Label<AppData> =
|
||||||
|
Label::new(button_string.as_str()).with_text_size(24.0);
|
||||||
|
|
||||||
|
if j == &blessed_version && tou_version == blessed_tou_version {
|
||||||
|
button_label.set_text_color(Color::GREEN);
|
||||||
|
}
|
||||||
|
|
||||||
let mut button_row: Flex<AppData> = Flex::row();
|
let mut button_row: Flex<AppData> = Flex::row();
|
||||||
|
|
||||||
let fybutton = druid::widget::Button::new(button_string.as_str())
|
let fybutton = druid::widget::Button::from_label(button_label)
|
||||||
.fix_height(45.0)
|
.fix_height(45.0)
|
||||||
.center()
|
.center()
|
||||||
.on_click(move |_, _: &mut AppData, _| {
|
.on_click(move |_, _: &mut AppData, _| {
|
||||||
|
|||||||
13
src/main.rs
13
src/main.rs
@@ -28,6 +28,8 @@ use druid::{
|
|||||||
WidgetPod, WindowDesc, WindowId,
|
WidgetPod, WindowDesc, WindowId,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
use reqwest::StatusCode;
|
||||||
|
|
||||||
#[derive(PartialEq, Eq, Data, Clone, Debug)]
|
#[derive(PartialEq, Eq, Data, Clone, Debug)]
|
||||||
pub enum InitializingState {
|
pub enum InitializingState {
|
||||||
StartingGUI,
|
StartingGUI,
|
||||||
@@ -58,6 +60,7 @@ pub struct AppData {
|
|||||||
pub among_us_version: AmongUsVersion,
|
pub among_us_version: AmongUsVersion,
|
||||||
pub data_path: String,
|
pub data_path: String,
|
||||||
pub app_state: GlobalAppState,
|
pub app_state: GlobalAppState,
|
||||||
|
pub blessed_version: String,
|
||||||
}
|
}
|
||||||
|
|
||||||
static AMONG_US_APPID: &str = "945360";
|
static AMONG_US_APPID: &str = "945360";
|
||||||
@@ -268,6 +271,15 @@ impl AppDelegate<AppData> for Delegate {
|
|||||||
fn main() {
|
fn main() {
|
||||||
let version = env!("CARGO_PKG_VERSION");
|
let version = env!("CARGO_PKG_VERSION");
|
||||||
let title_string: String = format!("Town of Us Updater - {}", version);
|
let title_string: String = format!("Town of Us Updater - {}", version);
|
||||||
|
let blessed_body = reqwest::blocking::get("https://tou.dormedas.com/blessed");
|
||||||
|
let response = blessed_body.unwrap();
|
||||||
|
|
||||||
|
let blessed_version: String = match response.status() {
|
||||||
|
StatusCode::OK => response.text().unwrap(),
|
||||||
|
_ => String::from("0.0.0-v0.0.0"),
|
||||||
|
};
|
||||||
|
|
||||||
|
println!("Blessed Version: {}", blessed_version);
|
||||||
|
|
||||||
// println!("Updater Version: {}", version);
|
// println!("Updater Version: {}", version);
|
||||||
// get_latest_updater_version().await.unwrap();
|
// get_latest_updater_version().await.unwrap();
|
||||||
@@ -310,6 +322,7 @@ fn main() {
|
|||||||
among_us_version: AmongUsVersion::default(),
|
among_us_version: AmongUsVersion::default(),
|
||||||
data_path: String::from(data_path.clone().to_str().unwrap()),
|
data_path: String::from(data_path.clone().to_str().unwrap()),
|
||||||
app_state: GlobalAppState::Initializing(InitializingState::StartingGUI),
|
app_state: GlobalAppState::Initializing(InitializingState::StartingGUI),
|
||||||
|
blessed_version,
|
||||||
};
|
};
|
||||||
|
|
||||||
let mut root_column: druid::widget::Flex<AppData> = druid::widget::Flex::column();
|
let mut root_column: druid::widget::Flex<AppData> = druid::widget::Flex::column();
|
||||||
|
|||||||
Reference in New Issue
Block a user