diff --git a/src/lib.rs b/src/lib.rs index 325b0a3f..51859df6 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -4,7 +4,6 @@ mod error; //mod note; //mod block; mod abbrev; -pub mod account_login_view; pub mod app_creation; mod app_style; mod colors; diff --git a/src/account_login_view.rs b/src/ui/account_login_view.rs similarity index 98% rename from src/account_login_view.rs rename to src/ui/account_login_view.rs index 13ba2be9..1435e0b5 100644 --- a/src/account_login_view.rs +++ b/src/ui/account_login_view.rs @@ -20,11 +20,13 @@ impl<'a> View for AccountLoginView<'a> { if let Some(key) = self.manager.check_for_successful_login() { // TODO: route to "home" println!("successful login with key: {:?}", key); + /* return if is_mobile { // route to "home" on mobile } else { // route to "home" on desktop }; + */ } if is_mobile { self.show_mobile(ui); @@ -206,7 +208,7 @@ impl<'a> AccountLoginView<'a> { ui.add_space(48.0); - let welcome_data = egui::include_image!("../assets/Welcome to Nostrdeck 2x.png"); + let welcome_data = egui::include_image!("../../assets/Welcome to Nostrdeck 2x.png"); ui.add(egui::Image::new(welcome_data).max_width(528.0)); ui.add_space(12.0); @@ -323,7 +325,7 @@ fn login_textedit_info_text() -> RichText { } fn logo_unformatted() -> Image<'static> { - let logo_gradient_data = egui::include_image!("../assets/Logo-Gradient-2x.png"); + let logo_gradient_data = egui::include_image!("../../assets/Logo-Gradient-2x.png"); return egui::Image::new(logo_gradient_data); } diff --git a/src/ui/mod.rs b/src/ui/mod.rs index 0a377b2b..efd57600 100644 --- a/src/ui/mod.rs +++ b/src/ui/mod.rs @@ -1,3 +1,4 @@ +pub mod account_login_view; pub mod anim; pub mod mention; pub mod note; diff --git a/src/ui_preview/main.rs b/src/ui_preview/main.rs index 224f7cb8..27649ae4 100644 --- a/src/ui_preview/main.rs +++ b/src/ui_preview/main.rs @@ -1,7 +1,7 @@ -use notedeck::account_login_view::AccountLoginView; use notedeck::app_creation::{ generate_mobile_emulator_native_options, generate_native_options, setup_cc, }; +use notedeck::ui::account_login_view::AccountLoginView; use notedeck::ui::{Preview, PreviewApp, ProfilePic, ProfilePreview, RelayView}; use std::env;