theme improvements

[?]

May 17, 2025, 4:04 PM

PKJCFSBMXXA2H3US47IJEB7QMIYLEKTLGWQUYEZSKCDODDQTD6HQC

Dependencies

[2] GWZGYNIB add view crate
[3] 23SFYK4Q big view refactor into a new crate
[4] OPXFZKEB view tests setup
[5] 3QVNMRNM test non-empty repo app view
[6] MYGIBRRH wip custom theme

Change contents

edit in inflorescence_view/src/theme.rs at line 6

[6.260]

[6.260]

gradient::{ColorStop, Linear},
replacement in inflorescence_view/src/theme.rs at line 13

[6.391]→[6.391:430](∅→∅)

window, Background, Border, Color,

[6.391]

[6.430]

window, Background, Border, Color, Gradient, Radians,
replacement in inflorescence_view/src/theme.rs at line 16

[6.434]→[6.434:556](∅→∅)

const DARK_BLUE: Color = color!(0x010032);
const TEAL: Color = color!(0x3b8588);
const MAGENTA: Color = color!(0xe933f6);

[6.434]

[6.556]

const BLUE: Color = color!(0x010032);
const BLUE_DARKER: Color = color!(0x010022);
const BLUE_LIGHT: Color = color!(0x020056);
const BLUE_DARK: Color = color!(0x000002);

const TEAL: Color = color!(0x3B8588);
const TEAL_LIGHTEST: Color = color!(0x97C9CB);
const TEAL_LIGHT: Color = color!(0x5F9FA2);
const TEAL_DARK: Color = color!(0x247074);
const TEAL_DARKEST: Color = color!(0x115B5E);

const MAGENTA: Color = color!(0xE933F6);
const MAGENTA_LIGHT: Color = color!(0xEE5DF8);
const MAGENTA_LIGHTEST: Color = color!(0xF38EFA);
const MAGENTA_DARK: Color = color!(0xE208F1);
const MAGENTA_DARKEST: Color = color!(0x68436B);
edit in inflorescence_view/src/theme.rs at line 34

[6.598]

[6.598]

const TURQOISE_LIGHT: Color = color!(0xA5FDE2);
const TURQOISE_DARK: Color = color!(0x4CF5C2);

const TEXT_COLOR: Color = TEAL_LIGHTEST;

const APP_BG: Background = Background::Gradient(Gradient::Linear(Linear {
angle: Radians(0.),
stops: [
Some(ColorStop {
offset: 0.,
color: BLUE,
}),
Some(ColorStop {
offset: 1.,
color: BLUE_DARKER,
}),
None,
None,
None,
None,
None,
None,
],
}));
replacement in inflorescence_view/src/theme.rs at line 61

[6.682]→[6.682:709](∅→∅)

background: DARK_BLUE,

[6.682]

[6.709]

background: BLUE,
edit in inflorescence_view/src/theme.rs at line 76

[6.952]

[6.952]

}

#[derive(Debug, Clone, Copy)]
pub enum Container {
Normal,
AppBg,
}

#[derive(Debug, Clone, Copy)]
pub enum Text {
Normal,
replacement in inflorescence_view/src/theme.rs at line 96

[6.1120]→[6.1120:1208](∅→∅)

background_color: PALETTE.background,
text_color: PALETTE.text,

[6.1120]

[6.1208]

background_color: BLUE,
text_color: TEXT_COLOR,
replacement in inflorescence_view/src/theme.rs at line 102

[6.1275]→[6.1275:1297](∅→∅)

Some(PALETTE)

[6.1275]

[6.1297]

None
edit in inflorescence_view/src/theme.rs at line 118

[6.1560]→[6.1560:1708](∅→∅)

let primary = palette::Primary::generate(
PALETTE.primary,
PALETTE.background,
PALETTE.text,
);
replacement in inflorescence_view/src/theme.rs at line 119

[6.1743]→[6.1743:1895](∅→∅)

background: Some(Background::Color(primary.base.color)),
text_color: primary.base.text,
border: border::rounded(2),

[6.1743]

[6.1895]

background: Some(Background::Color(TURQOISE)),
text_color: TEAL_DARKEST,
replacement in inflorescence_view/src/theme.rs at line 127

[6.2105]→[6.2105:2180](∅→∅)

background: Some(Background::Color(primary.strong.color)),

[6.2105]

[6.2180]

background: Some(Background::Color(TURQOISE_LIGHT)),
text_color: BLUE,
edit in inflorescence_view/src/theme.rs at line 140

[6.2519]

[6.2519]

let border_radius = border::radius(2.);
let border_width = 1.;
replacement in inflorescence_view/src/theme.rs at line 146

[6.2667]→[6.2667:2731](∅→∅)

width: 1.0,
..default()

[6.2667]

[6.2731]

width: border_width,
radius: border_radius,
replacement in inflorescence_view/src/theme.rs at line 152

[6.2836]→[6.2836:2898](∅→∅)

background: Some(Background::Color(MAGENTA)),

[6.2836]

[6.2898]

background: Some(Background::Color(MAGENTA_LIGHTEST)),
text_color: BLUE_DARK,
replacement in inflorescence_view/src/theme.rs at line 155

[6.2931]→[6.2931:3036](∅→∅)

color: Color::WHITE,
width: 1.0,
..default()

[6.2931]

[6.3036]

color: MAGENTA,
width: border_width,
radius: border_radius,
replacement in inflorescence_view/src/theme.rs at line 166

[6.3148]→[6.3148:3173](∅→∅)

type Class<'a> = ();

[6.3148]

[6.3173]

type Class<'a> = Container;
replacement in inflorescence_view/src/theme.rs at line 169

[6.3216]→[6.3216:3227](∅→∅)

()

[6.3216]

[6.3227]

Container::Normal
replacement in inflorescence_view/src/theme.rs at line 173

[6.3301]→[6.3301:3337](∅→∅)

container::Style::default()

[6.3301]

[6.3337]

match class {
Container::Normal => container::Style::default(),
Container::AppBg => container::Style {
background: Some(APP_BG),
..default()
},
}
replacement in inflorescence_view/src/theme.rs at line 216

[6.4254]→[6.4254:4279](∅→∅)

type Class<'a> = ();

[6.4254]

[6.4279]

type Class<'a> = Text;
replacement in inflorescence_view/src/theme.rs at line 219

[6.4322]→[6.4322:4333](∅→∅)

()

[6.4322]

[6.4333]

Text::Normal
replacement in inflorescence_view/src/theme.rs at line 223

[6.4401]→[6.4401:4437](∅→∅)

text::Style { color: None }

[6.4401]

[6.4437]

match item {
Text::Normal => text::Style { color: None },
}
edit in inflorescence_view/src/theme.rs at line 265

[6.5453]→[6.5453:5868](∅→∅)

// pub fn theme<S>(_state: &S, _window_id: window::Id) -> Theme {
// let text = scale_rgb(TEAL, 2.);
// Theme::custom(
// "Inflorescence".to_string(),
// theme::Palette {
// background: DARK_BLUE,
// text,
// primary: MAGENTA,
// success: TURQOISE,
// warning: MAGENTA,
// danger: MAGENTA,
// },
// )
// }
replacement in inflorescence_view/src/lib.rs at line 5

[4.4148]→[3.273:283](∅→∅),[6.6289]→[3.273:283](∅→∅),[3.273]→[3.273:283](∅→∅)

mod util;

[6.6289]

[2.122]

mod element;
edit in inflorescence_view/src/lib.rs at line 8

[2.123]

[6.6290]

pub use element::el;
edit in inflorescence_view/src/lib.rs at line 10

[6.6321]→[3.311:329](∅→∅),[3.311]→[3.311:329](∅→∅)

pub use util::el;
file move: util.rs (----------) → element.rs (----------)

[2.85]

[3.17]
replacement in inflorescence_view/src/app.rs at line 8

[3.12453]→[3.12453:12512](∅→∅)

use iced::widget::{button, column, row, scrollable, text};

[3.12453]

[6.7662]

use iced::widget::{button, column, container, row, scrollable, text};
replacement in inflorescence_view/src/app.rs at line 154

[3.15637]→[3.15637:15683](∅→∅)

if let Some(repo) = state.repo.as_ref() {

[3.15637]

[3.15683]

let inner = if let Some(repo) = state.repo.as_ref() {
replacement in inflorescence_view/src/app.rs at line 171

[3.16299]→[3.16299:16338](∅→∅)

button(text(path))

[3.16299]

[3.16338]

button(text(path)
.wrapping(text::Wrapping::WordOrGlyph)
)
replacement in inflorescence_view/src/app.rs at line 191

[3.17028]→[3.17028:17061](∅→∅)

text(file_path))

[3.17028]

[3.17061]

text(file_path)
.wrapping(text::Wrapping::WordOrGlyph)
)
replacement in inflorescence_view/src/app.rs at line 372

[3.24338]→[3.24338:24344](∅→∅)

}

[3.24338]

[3.24344]

};
el(container(inner)
.class(theme::Container::AppBg)
.width(Length::Fill)
.height(Length::Fill))
edit in inflorescence_view/src/app/test.rs at line 82

[5.767]→[5.767:873](∅→∅)

"a_very_veeeerrrrrrrrrryyyyyy_looooooooooonnnnnggggggg_name.rs"
.to_string(),
replacement in inflorescence_view/src/app/test.rs at line 84

[5.955]→[5.955:1375](∅→∅)

changed_files: BTreeMap::from_iter([(
"changed_file.rs".to_string(),
BTreeSet::default(),
),
(
"also_a_very_veeeerrrrrrrrrryyyyyy_looooooooooonnnnnggggggg_name.rs"
.to_string(),
BTreeSet::default(),
),
(
"a/sub/dir/somewhere/deep/changed_file.rs".to_string(),
BTreeSet::default(),
),

[5.955]

[5.1375]

changed_files: BTreeMap::from_iter([
("changed_file.rs".to_string(), BTreeSet::default()),
(
"a/sub/dir/somewhere/deep/changed_file.rs".to_string(),
BTreeSet::default(),
),
replacement in inflorescence_view/src/app/test.rs at line 117

[6.8830]→[6.8830:8849](∅→∅)

ix: 1,

[6.8830]

[6.8849]

ix: 0,