chakanysystems/hoot
1
0
Fork 0
Code Issues 3 Pull requests Projects 1 Releases Packages Wiki Activity Actions

change app.current_page to app.page

Browse source
This commit is contained in:
Jack Chakany 2024-08-18 12:23:32 -04:00
parent 3b98296dd6
commit 3088a7a9da
2 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/main.rs
View file

@ -71,7 +71,7 @@ pub struct HootState {
}
pub struct Hoot {
pub current_page: Page,
pub page: Page,
focused_post: String,
status: HootStatus,
state: HootState,
@ -133,10 +133,10 @@ fn render_app(app: &mut Hoot, ctx: &egui::Context) {
#[cfg(feature = "profiling")]
puffin::profile_function!();
if app.current_page == Page::Onboarding
|| app.current_page == Page::OnboardingNew
|| app.current_page == Page::OnboardingNewShowKey
|| app.current_page == Page::OnboardingReturning
if app.page == Page::Onboarding
|| app.page == Page::OnboardingNew
|| app.page == Page::OnboardingNewShowKey
|| app.page == Page::OnboardingReturning
{
egui::CentralPanel::default().show(ctx, |ui| {
ui::onboarding::OnboardingScreen::ui(app, ui);
@ -145,13 +145,13 @@ fn render_app(app: &mut Hoot, ctx: &egui::Context) {
egui::SidePanel::left("Side Navbar").show(ctx, |ui| {
ui.heading("Hoot");
if ui.button("Inbox").clicked() {
app.current_page = Page::Inbox;
app.page = Page::Inbox;
}
if ui.button("Drafts").clicked() {
app.current_page = Page::Drafts;
app.page = Page::Drafts;
}
if ui.button("Settings").clicked() {
app.current_page = Page::Settings;
app.page = Page::Settings;
}
});
@ -165,7 +165,7 @@ fn render_app(app: &mut Hoot, ctx: &egui::Context) {
window.show(ui);
}
if app.current_page == Page::Inbox {
if app.page == Page::Inbox {
ui.label("hello there!");
if ui.button("Compose").clicked() {
let mut new_window = Box::new(ui::compose_window::ComposeWindow::new());
@ -269,7 +269,7 @@ fn render_app(app: &mut Hoot, ctx: &egui::Context) {
});
});
});
} else if app.current_page == Page::Settings {
} else if app.page == Page::Settings {
ui.label("Settings");
ui.label(format!(
"Connected Relays: {}",
@ -300,7 +300,7 @@ impl Hoot {
let ndb = nostrdb::Ndb::new(storage_dir.to_str().unwrap(), &ndb_config)
.expect("could not load nostrdb");
Self {
current_page: Page::Inbox,
page: Page::Inbox,
focused_post: "".into(),
status: HootStatus::Initalizing,
state: Default::default(),

14
src/ui/onboarding.rs
View file

@ -14,7 +14,7 @@ impl OnboardingScreen {
pub fn ui(app: &mut Hoot, ui: &mut egui::Ui) {
ui.heading("Welcome to Hoot Mail!");
match app.current_page {
match app.page {
Page::Onboarding => Self::onboarding_home(app, ui),
Page::OnboardingNew => Self::onboarding_new(app, ui),
Page::OnboardingNewShowKey => Self::onboarding_new_keypair_generated(app, ui),
@ -25,23 +25,23 @@ impl OnboardingScreen {
fn onboarding_home(app: &mut Hoot, ui: &mut egui::Ui) {
if ui.button("I am new to Hoot Mail").clicked() {
app.current_page = Page::OnboardingNew;
app.page = Page::OnboardingNew;
}
if ui.button("I have used Hoot Mail before.").clicked() {
app.current_page = Page::OnboardingReturning;
app.page = Page::OnboardingReturning;
}
}
fn onboarding_new(app: &mut Hoot, ui: &mut egui::Ui) {
if ui.button("Go Back").clicked() {
app.current_page = Page::Onboarding;
app.page = Page::Onboarding;
}
ui.label("To setup Hoot Mail, you need a nostr identity.");
if ui.button("Create new keypair").clicked() {
let _ = app.account_manager.generate_keys();
app.current_page = Page::OnboardingNewShowKey;
app.page = Page::OnboardingNewShowKey;
}
}
@ -60,13 +60,13 @@ impl OnboardingScreen {
.add_key(&first_key)
.expect("could not write key");
app.current_page = Page::Inbox;
app.page = Page::Inbox;
}
}
fn onboarding_returning(app: &mut Hoot, ui: &mut egui::Ui) {
if ui.button("Go Back").clicked() {
app.current_page = Page::Onboarding;
app.page = Page::Onboarding;
}
ui.label("Welcome Back!");
ui.text_edit_singleline(&mut app.state.onboarding.secret_input);