mirror of
https://github.com/aljazceru/notedeck.git
synced 2025-12-23 19:24:18 +01:00
feat(settings): show note full date
This commit is contained in:
1
Cargo.lock
generated
1
Cargo.lock
generated
@@ -3485,6 +3485,7 @@ dependencies = [
|
|||||||
"bincode",
|
"bincode",
|
||||||
"bitflags 2.9.1",
|
"bitflags 2.9.1",
|
||||||
"blurhash",
|
"blurhash",
|
||||||
|
"chrono",
|
||||||
"dirs",
|
"dirs",
|
||||||
"eframe",
|
"eframe",
|
||||||
"egui",
|
"egui",
|
||||||
|
|||||||
@@ -14,6 +14,7 @@ members = [
|
|||||||
|
|
||||||
[workspace.dependencies]
|
[workspace.dependencies]
|
||||||
opener = "0.8.2"
|
opener = "0.8.2"
|
||||||
|
chrono = "0.4.40"
|
||||||
base32 = "0.4.0"
|
base32 = "0.4.0"
|
||||||
base64 = "0.22.1"
|
base64 = "0.22.1"
|
||||||
rmpv = "1.3.0"
|
rmpv = "1.3.0"
|
||||||
|
|||||||
@@ -49,6 +49,7 @@ once_cell = { workspace = true }
|
|||||||
md5 = { workspace = true }
|
md5 = { workspace = true }
|
||||||
bitflags = { workspace = true }
|
bitflags = { workspace = true }
|
||||||
regex = "1"
|
regex = "1"
|
||||||
|
chrono = { workspace = true }
|
||||||
|
|
||||||
[dev-dependencies]
|
[dev-dependencies]
|
||||||
tempfile = { workspace = true }
|
tempfile = { workspace = true }
|
||||||
|
|||||||
@@ -80,6 +80,7 @@ pub use storage::{AccountStorage, DataPath, DataPathType, Directory};
|
|||||||
pub use style::NotedeckTextStyle;
|
pub use style::NotedeckTextStyle;
|
||||||
pub use theme::ColorTheme;
|
pub use theme::ColorTheme;
|
||||||
pub use time::time_ago_since;
|
pub use time::time_ago_since;
|
||||||
|
pub use time::time_format;
|
||||||
pub use timecache::TimeCached;
|
pub use timecache::TimeCached;
|
||||||
pub use unknowns::{get_unknown_note_ids, NoteRefsUnkIdAction, SingleUnkIdAction, UnknownIds};
|
pub use unknowns::{get_unknown_note_ids, NoteRefsUnkIdAction, SingleUnkIdAction, UnknownIds};
|
||||||
pub use urls::{supported_mime_hosted_at_url, SupportedMimeType, UrlMimes};
|
pub use urls::{supported_mime_hosted_at_url, SupportedMimeType, UrlMimes};
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
use crate::{tr, Localization};
|
use crate::{tr, Localization};
|
||||||
|
use chrono::DateTime;
|
||||||
use std::time::{SystemTime, UNIX_EPOCH};
|
use std::time::{SystemTime, UNIX_EPOCH};
|
||||||
|
|
||||||
// Time duration constants in seconds
|
// Time duration constants in seconds
|
||||||
@@ -83,6 +84,14 @@ fn time_ago_between(i18n: &mut Localization, timestamp: u64, now: u64) -> String
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub fn time_format(_i18n: &mut Localization, timestamp: i64) -> String {
|
||||||
|
// TODO: format this using the selected locale
|
||||||
|
DateTime::from_timestamp(timestamp, 0)
|
||||||
|
.unwrap()
|
||||||
|
.format("%Y-%m-%d %H:%M:%S")
|
||||||
|
.to_string()
|
||||||
|
}
|
||||||
|
|
||||||
pub fn time_ago_since(i18n: &mut Localization, timestamp: u64) -> String {
|
pub fn time_ago_since(i18n: &mut Localization, timestamp: u64) -> String {
|
||||||
let now = SystemTime::now()
|
let now = SystemTime::now()
|
||||||
.duration_since(UNIX_EPOCH)
|
.duration_since(UNIX_EPOCH)
|
||||||
|
|||||||
@@ -591,6 +591,7 @@ fn render_nav_body(
|
|||||||
)
|
)
|
||||||
.ui(ui)
|
.ui(ui)
|
||||||
.map(RenderNavAction::SettingsAction),
|
.map(RenderNavAction::SettingsAction),
|
||||||
|
|
||||||
Route::Reply(id) => {
|
Route::Reply(id) => {
|
||||||
let txn = if let Ok(txn) = Transaction::new(ctx.ndb) {
|
let txn = if let Ok(txn) = Transaction::new(ctx.ndb) {
|
||||||
txn
|
txn
|
||||||
|
|||||||
@@ -270,6 +270,7 @@ impl<'a> SettingsView<'a> {
|
|||||||
});
|
});
|
||||||
|
|
||||||
let txn = Transaction::new(self.note_context.ndb).unwrap();
|
let txn = Transaction::new(self.note_context.ndb).unwrap();
|
||||||
|
|
||||||
if let Some(note_id) = NoteId::from_bech(PREVIEW_NOTE_ID) {
|
if let Some(note_id) = NoteId::from_bech(PREVIEW_NOTE_ID) {
|
||||||
if let Ok(preview_note) =
|
if let Ok(preview_note) =
|
||||||
self.note_context.ndb.get_note_by_id(&txn, note_id.bytes())
|
self.note_context.ndb.get_note_by_id(&txn, note_id.bytes())
|
||||||
@@ -277,7 +278,6 @@ impl<'a> SettingsView<'a> {
|
|||||||
notedeck_ui::padding(8.0, ui, |ui| {
|
notedeck_ui::padding(8.0, ui, |ui| {
|
||||||
if is_narrow(ui.ctx()) {
|
if is_narrow(ui.ctx()) {
|
||||||
ui.set_max_width(ui.available_width());
|
ui.set_max_width(ui.available_width());
|
||||||
}
|
|
||||||
|
|
||||||
NoteView::new(
|
NoteView::new(
|
||||||
self.note_context,
|
self.note_context,
|
||||||
@@ -288,6 +288,7 @@ impl<'a> SettingsView<'a> {
|
|||||||
.actionbar(false)
|
.actionbar(false)
|
||||||
.options_button(false)
|
.options_button(false)
|
||||||
.show(ui);
|
.show(ui);
|
||||||
|
}
|
||||||
});
|
});
|
||||||
ui.separator();
|
ui.separator();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -18,7 +18,7 @@ serde_json = { workspace = true }
|
|||||||
serde = { workspace = true }
|
serde = { workspace = true }
|
||||||
nostrdb = { workspace = true }
|
nostrdb = { workspace = true }
|
||||||
hex = { workspace = true }
|
hex = { workspace = true }
|
||||||
chrono = "0.4.40"
|
chrono = { workspace = true }
|
||||||
rand = "0.9.0"
|
rand = "0.9.0"
|
||||||
bytemuck = "1.22.0"
|
bytemuck = "1.22.0"
|
||||||
futures = "0.3.31"
|
futures = "0.3.31"
|
||||||
|
|||||||
@@ -212,7 +212,7 @@ impl<'a, 'd> NoteView<'a, 'd> {
|
|||||||
let (_id, rect) = ui.allocate_space(egui::vec2(50.0, 20.0));
|
let (_id, rect) = ui.allocate_space(egui::vec2(50.0, 20.0));
|
||||||
ui.allocate_rect(rect, Sense::hover());
|
ui.allocate_rect(rect, Sense::hover());
|
||||||
ui.put(rect, |ui: &mut egui::Ui| {
|
ui.put(rect, |ui: &mut egui::Ui| {
|
||||||
render_reltime(ui, self.note_context.i18n, self.note.created_at(), false).response
|
render_notetime(ui, self.note_context.i18n, self.note.created_at(), false).response
|
||||||
});
|
});
|
||||||
let (_id, rect) = ui.allocate_space(egui::vec2(150.0, 20.0));
|
let (_id, rect) = ui.allocate_space(egui::vec2(150.0, 20.0));
|
||||||
ui.allocate_rect(rect, Sense::hover());
|
ui.allocate_rect(rect, Sense::hover());
|
||||||
@@ -369,7 +369,7 @@ impl<'a, 'd> NoteView<'a, 'd> {
|
|||||||
ui.spacing_mut().item_spacing.x = if is_narrow(ui.ctx()) { 1.0 } else { 2.0 };
|
ui.spacing_mut().item_spacing.x = if is_narrow(ui.ctx()) { 1.0 } else { 2.0 };
|
||||||
ui.add(Username::new(i18n, profile.as_ref().ok(), note.pubkey()).abbreviated(20));
|
ui.add(Username::new(i18n, profile.as_ref().ok(), note.pubkey()).abbreviated(20));
|
||||||
|
|
||||||
render_reltime(ui, i18n, note.created_at(), true);
|
render_notetime(ui, i18n, note.created_at(), true)
|
||||||
})
|
})
|
||||||
.response;
|
.response;
|
||||||
|
|
||||||
@@ -862,7 +862,7 @@ fn render_note_actionbar(
|
|||||||
}
|
}
|
||||||
|
|
||||||
#[profiling::function]
|
#[profiling::function]
|
||||||
fn render_reltime(
|
fn render_notetime(
|
||||||
ui: &mut egui::Ui,
|
ui: &mut egui::Ui,
|
||||||
i18n: &mut Localization,
|
i18n: &mut Localization,
|
||||||
created_at: u64,
|
created_at: u64,
|
||||||
|
|||||||
Reference in New Issue
Block a user