Compare commits

..

No commits in common. "18af36ddeba9a97789bade785b8c623a407dbe4f" and "3e86e4f05328497e59d98d808bef071b2984f73f" have entirely different histories.

3 changed files with 4 additions and 44 deletions

View file

@ -9,9 +9,7 @@ to make major changes and refactors until the main roadmap is complete.**
Currently supports a variety of stripe flags. Currently supports a variety of stripe flags.
## Variant Flag Branch Under Construction features:
- [Variant Flags](https://git.vwolfe.io/valerie/pride/src/branch/variant)
This branch adds flag variants. Currently, it adds two for the rainbow pride flag: - ["Complex" Flags](https://git.vwolfe.io/valerie/pride/src/branch/complex)
- Gilbert Baker/Sex and Magic: original 1978 eight-color rainbow flag
- Philadelphia: 2017 rainbow flag with black and brown stripes

View file

@ -5,7 +5,6 @@ use pico_args::Arguments;
mod color; mod color;
mod draw; mod draw;
mod flag; mod flag;
mod variant;
use crate::color::Colors; use crate::color::Colors;
@ -39,17 +38,7 @@ fn main() {
let colors: Colors = match subcommand.as_deref() { let colors: Colors = match subcommand.as_deref() {
Some("pride" | "gay") Some("pride" | "gay")
=> { => flag::pride(),
let variant = args.subcommand().unwrap_or(None);
match variant.as_deref() {
Some("8-color" | "gilbert-baker" | "sex-and-magic")
=> variant::gilbert_baker(),
Some("philadelphia")
=> variant::philadelphia(),
_
=> flag::pride()
}
},
Some("transgender" | "trans") Some("transgender" | "trans")
=> flag::transgender(), => flag::transgender(),

View file

@ -1,27 +0,0 @@
use crate::{
color::*,
flag
};
pub fn gilbert_baker() -> Colors {
let pink = rgb(0xFF69B4); // sex
let cyan = rgb(0x00C0C0); // magic
let mut output = flag::pride();
output.insert(0, pink);
output.insert(5, cyan);
output
}
pub fn philadelphia() -> Colors {
let brown = rgb(0x784F17);
let mut output = flag::pride();
output.insert(0, BLACK);
output.insert(1, brown);
output
}