Skip to content

🧹 Refactor spawn_curriculum_section into smaller helper functions #14

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.

Sign up for GitHub

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

Draft
dynamikdev wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

🧹 Refactor spawn_curriculum_section into smaller helper functions #14

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
231 changes: 120 additions & 111 deletions src/ui/settings.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,161 +77,170 @@ fn spawn_curriculum_section(parent: &mut ChildSpawnerCommands, typography: &Typo
},
));

// Toggle Curriculum Button
spawn_curriculum_toggle_button(parent, typography);
spawn_curriculum_grade_button(parent, typography);
spawn_curriculum_document_button(parent, typography);
spawn_curriculum_navigation_row(parent, typography);
});
}

fn spawn_curriculum_toggle_button(parent: &mut ChildSpawnerCommands, typography: &Typography) {
parent.spawn((
Button,
Node {
width: Val::Percent(100.0),
height: Val::Px(45.0),
border: UiRect::all(Val::Px(1.0)),
justify_content: JustifyContent::Center,
align_items: AlignItems::Center,
margin: UiRect::bottom(Val::Px(15.0)),
..default()
},
BorderColor::all(GHOST_BORDER),
BackgroundColor(Color::NONE),
crate::components::CurriculumToggleButton,
)).with_children(|parent| {
parent.spawn((
Button,
Node {
width: Val::Percent(100.0),
height: Val::Px(45.0),
border: UiRect::all(Val::Px(1.0)),
justify_content: JustifyContent::Center,
align_items: AlignItems::Center,
margin: UiRect::bottom(Val::Px(15.0)),
Text::new("Open Curriculum"),
TextFont {
font: typography.work_sans.clone(),
font_size: 16.0,
..default()
},
BorderColor::all(GHOST_BORDER),
BackgroundColor(Color::NONE),
crate::components::CurriculumToggleButton,
)).with_children(|parent| {
parent.spawn((
Text::new("Open Curriculum"),
TextFont {
font: typography.work_sans.clone(),
font_size: 16.0,
..default()
},
TextColor(NEUTRAL_TEXT),
));
});
TextColor(NEUTRAL_TEXT),
));
});
}

fn spawn_curriculum_grade_button(parent: &mut ChildSpawnerCommands, typography: &Typography) {
parent.spawn((
Button,
Node {
width: Val::Percent(100.0),
height: Val::Px(45.0),
border: UiRect::all(Val::Px(1.0)),
justify_content: JustifyContent::Center,
align_items: AlignItems::Center,
margin: UiRect::bottom(Val::Px(15.0)),
..default()
},
BorderColor::all(GHOST_BORDER),
BackgroundColor(Color::NONE),
crate::components::CurriculumGradeButton,
)).with_children(|parent| {
parent.spawn((
Text::new("Grade: Niveau 1.1"),
TextFont {
font: typography.work_sans.clone(),
font_size: 14.0,
..default()
},
TextColor(NEUTRAL_TEXT),
crate::ui::systems::ParentButton::<crate::components::CurriculumGradeButton>(std::marker::PhantomData),
));
});
}

// Grade Selection Button
fn spawn_curriculum_document_button(parent: &mut ChildSpawnerCommands, typography: &Typography) {
parent.spawn((
Button,
Node {
width: Val::Percent(100.0),
height: Val::Px(45.0),
border: UiRect::all(Val::Px(1.0)),
justify_content: JustifyContent::Center,
align_items: AlignItems::Center,
margin: UiRect::bottom(Val::Px(15.0)),
..default()
},
BorderColor::all(GHOST_BORDER),
BackgroundColor(Color::NONE),
crate::components::CurriculumDocumentButton,
)).with_children(|parent| {
parent.spawn((
Text::new("Doc: Passage de Grade 1.1"),
TextFont {
font: typography.work_sans.clone(),
font_size: 12.0,
..default()
},
TextColor(NEUTRAL_TEXT),
crate::ui::systems::ParentButton::<crate::components::CurriculumDocumentButton>(std::marker::PhantomData),
));
});
}

fn spawn_curriculum_navigation_row(parent: &mut ChildSpawnerCommands, typography: &Typography) {
parent.spawn(Node {
display: Display::Flex,
flex_direction: FlexDirection::Row,
justify_content: JustifyContent::SpaceBetween,
align_items: AlignItems::Center,
margin: UiRect::bottom(Val::Px(15.0)),
..default()
}).with_children(|parent| {
// Previous Button
parent.spawn((
Button,
Node {
width: Val::Percent(100.0),
width: Val::Px(45.0),
height: Val::Px(45.0),
border: UiRect::all(Val::Px(1.0)),
justify_content: JustifyContent::Center,
align_items: AlignItems::Center,
margin: UiRect::bottom(Val::Px(15.0)),
..default()
},
BorderColor::all(GHOST_BORDER),
BackgroundColor(Color::NONE),
crate::components::CurriculumGradeButton,
crate::components::CurriculumPrevPageButton,
)).with_children(|parent| {
parent.spawn((
Text::new("Grade: Niveau 1.1"),
Text::new("<"),
TextFont {
font: typography.work_sans.clone(),
font_size: 14.0,
font_size: 20.0,
..default()
},
TextColor(NEUTRAL_TEXT),
crate::ui::systems::ParentButton::<crate::components::CurriculumGradeButton>(std::marker::PhantomData),
));
});

// Document Selection Button
// Page Counter
parent.spawn((
Text::new("Page: -- / --"),
TextFont {
font: typography.work_sans.clone(),
font_size: 14.0,
..default()
},
TextColor(NEUTRAL_TEXT),
crate::components::CurriculumPageText,
));

// Next Button
parent.spawn((
Button,
Node {
width: Val::Percent(100.0),
width: Val::Px(45.0),
height: Val::Px(45.0),
border: UiRect::all(Val::Px(1.0)),
justify_content: JustifyContent::Center,
align_items: AlignItems::Center,
margin: UiRect::bottom(Val::Px(15.0)),
..default()
},
BorderColor::all(GHOST_BORDER),
BackgroundColor(Color::NONE),
crate::components::CurriculumDocumentButton,
crate::components::CurriculumNextPageButton,
)).with_children(|parent| {
parent.spawn((
Text::new("Doc: Passage de Grade 1.1"),
Text::new(">"),
TextFont {
font: typography.work_sans.clone(),
font_size: 12.0,
..default()
},
TextColor(NEUTRAL_TEXT),
crate::ui::systems::ParentButton::<crate::components::CurriculumDocumentButton>(std::marker::PhantomData),
));
});

// Page Navigation Row
parent.spawn(Node {
display: Display::Flex,
flex_direction: FlexDirection::Row,
justify_content: JustifyContent::SpaceBetween,
align_items: AlignItems::Center,
margin: UiRect::bottom(Val::Px(15.0)),
..default()
}).with_children(|parent| {
// Previous Button
parent.spawn((
Button,
Node {
width: Val::Px(45.0),
height: Val::Px(45.0),
border: UiRect::all(Val::Px(1.0)),
justify_content: JustifyContent::Center,
align_items: AlignItems::Center,
..default()
},
BorderColor::all(GHOST_BORDER),
BackgroundColor(Color::NONE),
crate::components::CurriculumPrevPageButton,
)).with_children(|parent| {
parent.spawn((
Text::new("<"),
TextFont {
font: typography.work_sans.clone(),
font_size: 20.0,
..default()
},
TextColor(NEUTRAL_TEXT),
));
});

// Page Counter
parent.spawn((
Text::new("Page: -- / --"),
TextFont {
font: typography.work_sans.clone(),
font_size: 14.0,
font_size: 20.0,
..default()
},
TextColor(NEUTRAL_TEXT),
crate::components::CurriculumPageText,
));

// Next Button
parent.spawn((
Button,
Node {
width: Val::Px(45.0),
height: Val::Px(45.0),
border: UiRect::all(Val::Px(1.0)),
justify_content: JustifyContent::Center,
align_items: AlignItems::Center,
..default()
},
BorderColor::all(GHOST_BORDER),
BackgroundColor(Color::NONE),
crate::components::CurriculumNextPageButton,
)).with_children(|parent| {
parent.spawn((
Text::new(">"),
TextFont {
font: typography.work_sans.clone(),
font_size: 20.0,
..default()
},
TextColor(NEUTRAL_TEXT),
));
});
});
});
}
Expand Down