From b60ad4bb725fe899d5a9cb09b0a14de4629a422e Mon Sep 17 00:00:00 2001 From: Valerie Date: Mon, 26 Jun 2023 11:07:34 -0400 Subject: [PATCH] added mlm pride flag, made null subcommand display rainbow pride flag --- src/flag.rs | 11 +++++++++++ src/main.rs | 11 ++++++++--- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/src/flag.rs b/src/flag.rs index 2da1984..eb2c31c 100644 --- a/src/flag.rs +++ b/src/flag.rs @@ -62,6 +62,17 @@ pub fn bisexual() -> Colors { vec![magenta, magenta, purple, blue, blue] } +pub fn gay() -> Colors { + let green1 = rgb(0x00906D); + let green2 = rgb(0x00D1A7); + let green3 = rgb(0x7EEBC1); + let blue1 = rgb(0x6CAEE8); + let blue2 = rgb(0x5543D3); + let blue3 = rgb(0x461280); + + vec![green1, green2, green3, WHITE, blue1, blue2, blue3] +} + pub fn genderfluid() -> Colors { let pink = rgb(0xFF75A2); let violet = rgb(0xBE18D6); diff --git a/src/main.rs b/src/main.rs index 439b0ad..324e23d 100644 --- a/src/main.rs +++ b/src/main.rs @@ -38,7 +38,8 @@ fn main() { let subcommand = args.subcommand().unwrap(); let colors: Colors = match subcommand.as_deref() { - Some("pride" | "gay") + Some("pride") + | None => { let variant = args.subcommand().unwrap_or(None); match variant.as_deref() { @@ -70,6 +71,9 @@ fn main() { Some("bisexual" | "bi") => flag::bisexual(), + Some("gay" | "mlm") + => flag::gay(), + Some("genderfluid") => flag::genderfluid(), @@ -104,7 +108,7 @@ fn help_text() { println!("Valerie Wolfe "); println!("Show pride flags in the terminal.\n"); - println!("usage: pride [flags] \n"); + println!("usage: pride [flags] [name]\n"); println!("args:"); println!(" The pride flag to display\n"); @@ -127,7 +131,7 @@ fn list_text() { println!(" ace, asexual asexual pride flag"); println!(" bigender bigender pride flag"); println!(" bi, bisexual bisexual pride flag"); - println!(" gay, pride six-color rainbow flag"); + println!(" gay, mlm gay men pride flag"); println!(" genderfluid genderfluid pride flag"); println!(" genderqueer genderqueer pride flag"); println!(" gendervoid gendervoid pride flag"); @@ -135,6 +139,7 @@ fn list_text() { println!(" multigender multigender pride flag"); println!(" nb, nonbinary nonbinary pride flag"); println!(" pan, pansexual pansexual pride flag"); + println!(" pride six-color rainbow flag"); // println!(" progress progress arrow flag"); println!(" trans, transgender transgender pride flag"); }