Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

gui: logo & version name updates for 21st Capital #8

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion gui/src/app/view/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,14 @@ pub fn sidebar<'a>(menu: &Menu, cache: &'a Cache) -> Container<'a, Message> {
Column::new()
.push(
Column::new()
.push(Container::new(retailer_logo()).padding(10))
.push(
Container::new(
retailer_logo()
.height(Length::Fixed(200.0))
.width(Length::Fixed(200.0)),
)
.padding(10),
)
.push(home_button)
.push(spend_button)
.push(receive_button)
Expand Down
5 changes: 4 additions & 1 deletion gui/src/app/view/settings.rs
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,10 @@ pub fn about_section<'a>(
.push(
Row::new().push(Space::with_width(Length::Fill)).push(
Column::new()
.push(text(format!("liana-gui v{}", crate::RETAILER_VERSION)))
.push(text(format!(
"liana-gui Smart Vault - v{}",
crate::RETAILER_VERSION
)))
.push_maybe(
lianad_version
.map(|version| text(format!("lianad v{}", version))),
Expand Down
6 changes: 3 additions & 3 deletions gui/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -145,8 +145,8 @@ impl Application for GUI {

fn title(&self) -> String {
match self.state {
State::Installer(_) => format!("Liana v{} Installer", VERSION),
_ => format!("Liana v{}", VERSION),
State::Installer(_) => format!("Smart Vault - Liana v{} Installer", VERSION),
_ => format!("Smart Vault - Liana v{}", VERSION),
}
}

Expand Down Expand Up @@ -564,7 +564,7 @@ fn main() -> Result<(), Box<dyn Error>> {
setup_panic_hook();

let mut settings = Settings::with_flags((config, log_level));
settings.window.icon = Some(image::liana_app_icon());
settings.window.icon = Some(image::retailer_app_icon());
settings.window.min_size = Some(Size {
width: 1000.0,
height: 650.0,
Expand Down
5 changes: 5 additions & 0 deletions gui/ui/src/image.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ const LIANA_LOGO_GREY: &[u8] = include_bytes!("../static/logos/LIANA_SYMBOL_Gray
const LIANA_BRAND_GREY: &[u8] = include_bytes!("../static/logos/LIANA_BRAND_Gray.svg");
const WIZARDSARDINE_LETTERING: &[u8] = include_bytes!("../static/logos/logo-wizardsardine.svg");

const RETAILER_ICON: &[u8] = include_bytes!("../static/logos/21st-capital-app-icon.png");
const RETAILER_LOGO: &[u8] = include_bytes!("../static/logos/21ST_CAPITAL_White.svg");

pub fn liana_app_icon() -> icon::Icon {
Expand All @@ -22,6 +23,10 @@ pub fn retailer_logo() -> Svg {
Svg::new(h)
}

pub fn retailer_app_icon() -> icon::Icon {
icon::from_file_data(RETAILER_ICON, None).unwrap()
}

pub fn liana_brand_grey() -> Svg {
let h = Handle::from_memory(LIANA_BRAND_GREY.to_vec());
Svg::new(h)
Expand Down
Binary file added gui/ui/static/logos/21st-capital-app-icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading