split is_mobile to is_narrow and is_oled

is_mobile doesn't really make sense for android tablets. We were
overloading this variable to mean "is_narrow". What we really want is
is_oled for mobile devices and is_narrow for if its phone-like.

Signed-off-by: William Casarin <jb55@jb55.com>
This commit is contained in:
William Casarin
2024-09-06 21:53:42 -07:00
parent 772bfbad5f
commit 4a4fb06425
9 changed files with 46 additions and 42 deletions

View File

@@ -2,6 +2,7 @@ use crate::colors::PINK;
use crate::{
account_manager::AccountManager,
app_style::NotedeckTextStyle,
ui,
ui::{profile_preview_controller, Preview, PreviewConfig, View},
Damus,
};
@@ -14,7 +15,7 @@ pub struct AccountManagementView {}
impl AccountManagementView {
pub fn ui(app: &mut Damus, ui: &mut egui::Ui) -> Option<Response> {
if app.is_mobile() {
if ui::is_narrow(ui.ctx()) {
AccountManagementView::show_mobile(app, ui);
None
} else {
@@ -216,22 +217,21 @@ mod preview {
use crate::test_data;
pub struct AccountManagementPreview {
is_mobile: bool,
app: Damus,
}
impl AccountManagementPreview {
fn new(is_mobile: bool) -> Self {
let app = test_data::test_app(is_mobile);
fn new() -> Self {
let app = test_data::test_app();
AccountManagementPreview { is_mobile, app }
AccountManagementPreview { app }
}
}
impl View for AccountManagementPreview {
fn ui(&mut self, ui: &mut egui::Ui) {
ui.add_space(24.0);
if self.is_mobile {
if ui::is_narrow(ui.ctx()) {
AccountManagementView::show_mobile(&mut self.app, ui);
} else {
AccountManagementView::show(&mut self.app, ui);
@@ -242,8 +242,8 @@ mod preview {
impl Preview for AccountManagementView {
type Prev = AccountManagementPreview;
fn preview(cfg: PreviewConfig) -> Self::Prev {
AccountManagementPreview::new(cfg.is_mobile)
fn preview(_cfg: PreviewConfig) -> Self::Prev {
AccountManagementPreview::new()
}
}
}