touching up navbar options

This commit is contained in:
Gabriel 2025-12-04 22:56:33 -05:00
parent f4a9bc0f72
commit b37c73cf14
4 changed files with 30 additions and 15 deletions

View file

@ -14,7 +14,6 @@ chrono = "0.4.41"
rss_content = { git = "https://code.gabe.rocks/gabriel/rss_content", version = "0.1.1" } rss_content = { git = "https://code.gabe.rocks/gabriel/rss_content", version = "0.1.1" }
url = "2.5.4" url = "2.5.4"
#rfd = "0.15.4" (for importing files) #rfd = "0.15.4" (for importing files)
[profile.dev] [profile.dev]
debug=true debug=true
incremental = true incremental = true

View file

@ -3,4 +3,5 @@
⚠️ I don't actually recommend you do this, but it's an option for those interested in experiencing the project as it evolves. ⚠️ I don't actually recommend you do this, but it's an option for those interested in experiencing the project as it evolves.
Things are very basic right now, but you're welcome to `cargo install --git "https://code.gabe.rocks/gabriel/rss-tool"` and try it out. Eventually I will learn how to make upgrades seamless... Things are very basic right now, but you're welcome to `cargo install --git "https://code.gabe.rocks/gabriel/rss-tool"` and try it out.
Eventually I will learn how to make upgrades seamless...

View file

@ -167,7 +167,7 @@ fn home(state: &State) -> Element<'_, Message> {
.height(iced::Fill), .height(iced::Fill),
button("Go to test!").on_press(Message::ChangePage(Page::Testing)) button("Go to test!").on_press(Message::ChangePage(Page::Testing))
)) ))
.padding(15) .padding(0)
.height(Fill) .height(Fill)
.width(Fill) .width(Fill)
.into() .into()
@ -175,7 +175,7 @@ fn home(state: &State) -> Element<'_, Message> {
fn feed_layout(state: &State) -> Element<'_, Message> { fn feed_layout(state: &State) -> Element<'_, Message> {
container(column!( container(column!(
button(text("Home")).on_press(Message::ChangePage(Page::Home)), widgets::navbar(state),
scrollable(widgets::list_items(state.current_feed)) scrollable(widgets::list_items(state.current_feed))
.width(iced::Fill) .width(iced::Fill)
.height(iced::Fill), .height(iced::Fill),
@ -191,12 +191,7 @@ fn item_view(state: &State) -> Element<'_, Message> {
None => {"".to_owned()} None => {"".to_owned()}
}; };
container(column!( container(column!(
row!( widgets::navbar(state),
button(text("Home")).on_press(Message::ChangePage(Page::Home)),
button(text("Feed")).on_press(Message::ChangePage(Page::FeedView))
)
.spacing(10),
text(title).size(34),
media_view(state), media_view(state),
content_view(state), content_view(state),
)) ))
@ -230,6 +225,7 @@ fn category_view(state: &State) -> Element<'_,Message> {
fn testing(state: &State) -> Element<'_, Message> { fn testing(state: &State) -> Element<'_, Message> {
column!( column!(
widgets::navbar(state),
text("Dev Panel"), text("Dev Panel"),
button("Add gabe.rocks").on_press(Message::AddFeed(String::from("https://gabe.rocks/rss"))), button("Add gabe.rocks").on_press(Message::AddFeed(String::from("https://gabe.rocks/rss"))),
button("Add LSN").on_press(Message::AddFeed(String::from( button("Add LSN").on_press(Message::AddFeed(String::from(

View file

@ -106,19 +106,38 @@ pub fn navbar (state: &ui::State) -> Element<Message>{
row::Row::new().push( row::Row::new().push(
button("All Items").on_press(Message::ChangePage(Page::AllItems)) button("All Items").on_press(Message::ChangePage(Page::AllItems))
).push(button("Categories").on_press(Message::ChangePage(Page::CategoryView))) ).push(button("Categories").on_press(Message::ChangePage(Page::CategoryView)))
.push(button("Dev Panel").on_press(Message::ChangePage(Page::Testing)))
.spacing(5).padding(5) .spacing(5).padding(5)
}, },
Page::FeedView => { Page::FeedView => {
row::Row::new().push(button("Home").on_press(Message::ChangePage(Page::Home))).spacing(5).padding(5) row::Row::new().push(button("Home").on_press(Message::ChangePage(Page::Home)))
.push(
button("All Items").on_press(Message::ChangePage(Page::AllItems))
)
.spacing(5).padding(5)
}, },
Page::AllItems => { Page::AllItems => {
row::Row::new().push(button("Home").on_press(Message::ChangePage(Page::Home))).spacing(5).padding(5)} row::Row::new().push(button("Home").on_press(Message::ChangePage(Page::Home)))
.push(button("Dev Panel").on_press(Message::ChangePage(Page::Testing)))
.spacing(5).padding(5)}
Page::CategoryView => { Page::CategoryView => {
row::Row::new().push(button("Home").on_press(Message::ChangePage(Page::Home))).spacing(5).padding(5)} row::Row::new().push(button("Home").on_press(Message::ChangePage(Page::Home)))
.push(
button("All Items").on_press(Message::ChangePage(Page::AllItems))
)
.spacing(5).padding(5)}
Page::Testing => { Page::Testing => {
row::Row::new().push(button("Home").on_press(Message::ChangePage(Page::Home))).spacing(5).padding(5)} row::Row::new().push(button("Home").on_press(Message::ChangePage(Page::Home)))
.push(
button("All Items").on_press(Message::ChangePage(Page::AllItems))
)
.spacing(5).padding(5)}
Page::ItemView => { Page::ItemView => {
row::Row::new().push(button("Home").on_press(Message::ChangePage(Page::Home))).spacing(5).padding(5)} row::Row::new().push(button("Home").on_press(Message::ChangePage(Page::Home)))
.push(
button("All Items").on_press(Message::ChangePage(Page::AllItems))
)
.spacing(5).padding(5)}
}.into() }.into()
} }