feat(client): redesign native UI, themes, settings and avatars

Separate conversation drafts and voice view state, add native settings and restricted CSS themes, implement validated avatar cropping, and refresh dependencies with documented desktop compatibility backports.
This commit is contained in:
Loki 2026-10-24 14:23:48 +02:00
parent 44d284a568
commit 8e5ab56611
Signed by: boba
GPG key ID: 253067914055423B
276 changed files with 53546 additions and 3399 deletions

View file

@ -6,6 +6,7 @@ use super::types::{ConnState, UiState, VoiceUiState};
impl Default for UiState {
fn default() -> Self {
Self {
appearance: crate::ui::appearance::AppearancePreferences::default(),
conn: ConnState::Disconnected,
connect_input: "127.0.0.1:7600".into(),
bookmarks: default_bookmarks(),
@ -15,6 +16,11 @@ impl Default for UiState {
active_channel: None,
messages: Default::default(),
chat_input: String::new(),
drafts: HashMap::new(),
browsing_dms: false,
showing_voice: false,
voice_target: None,
vault_enabled: false,
scroll_bottom: false,
voice: VoiceUiState::Off,
voice_joined_at: None,
@ -24,6 +30,7 @@ impl Default for UiState {
settings_open: false,
mic_enabled: true,
ptt_held: false,
deafen: false,
vad_mode: 0,
voice_bitrate: 64.0,
@ -63,20 +70,11 @@ impl Default for UiState {
replying_to_content: String::new(),
editing_message_id: None,
settings_passphrase_open: false,
settings_passphrase_input: String::new(),
settings_passphrase_confirm: String::new(),
settings_passphrase_error: None,
settings_export_open: false,
settings_export_pass: String::new(),
settings_export_confirm: String::new(),
settings_export_output: None,
settings_export_error: None,
settings_import_open: false,
settings_import_input: String::new(),
settings_import_pass: String::new(),
settings_import_error: None,
}
}

View file

@ -1,5 +1,6 @@
mod default;
mod models;
mod navigation;
mod types;
pub use models::{Channel, ChatMessage, DmConversation, FriendState, GuildState, NodeBookmark};
@ -34,47 +35,4 @@ impl UiState {
.map(|s| s.as_str())
.unwrap_or(sender_id)
}
pub fn seed_default_channels(&mut self) {
if !self.channels.is_empty() {
return;
}
self.channels = vec![
Channel {
id: "general".into(),
name: "general".into(),
kind: "text".into(),
guild_id: None,
members: Vec::new(),
},
Channel {
id: "dev-talk".into(),
name: "dev-talk".into(),
kind: "text".into(),
guild_id: None,
members: Vec::new(),
},
Channel {
id: "plugins".into(),
name: "plugins".into(),
kind: "text".into(),
guild_id: None,
members: Vec::new(),
},
Channel {
id: "lobby".into(),
name: "lobby".into(),
kind: "voice".into(),
guild_id: None,
members: Vec::new(),
},
Channel {
id: "gaming".into(),
name: "gaming".into(),
kind: "voice".into(),
guild_id: None,
members: Vec::new(),
},
];
}
}

131
src/ui/state/navigation.rs Normal file
View file

@ -0,0 +1,131 @@
use super::UiState;
impl UiState {
fn conversation_key(&self) -> Option<String> {
self.active_dm_id
.as_ref()
.map(|id| format!("dm:{id}"))
.or_else(|| {
self.active_channel
.as_ref()
.map(|id| format!("channel:{id}"))
})
}
pub fn remember_draft(&mut self, text: String) {
self.chat_input = text;
if let Some(key) = self.conversation_key() {
self.drafts.insert(key, self.chat_input.clone());
}
}
fn save_draft(&mut self) {
self.remember_draft(self.chat_input.clone());
}
fn restore_draft(&mut self) {
self.chat_input = self
.conversation_key()
.and_then(|key| self.drafts.get(&key).cloned())
.unwrap_or_default();
self.replying_to_message = None;
self.replying_to_sender.clear();
self.replying_to_content.clear();
self.editing_message_id = None;
}
pub fn select_text_channel(&mut self, channel_id: String) {
self.save_draft();
self.active_channel = Some(channel_id);
self.active_dm_id = None;
self.showing_voice = false;
self.browsing_dms = false;
self.restore_draft();
}
pub fn select_dm(&mut self, dm_id: String) {
self.save_draft();
self.active_dm_id = Some(dm_id);
self.active_channel = None;
self.showing_voice = false;
self.browsing_dms = true;
self.restore_draft();
}
pub fn clear_server_conversations(&mut self) {
self.chat_input.clear();
self.drafts.clear();
self.messages.clear();
self.dm_messages.clear();
self.dm_conversations.clear();
self.active_channel = None;
self.active_dm_id = None;
self.restore_draft();
}
pub fn select_friends(&mut self) {
self.save_draft();
self.active_dm_id = None;
self.active_channel = None;
self.showing_voice = false;
self.browsing_dms = true;
self.restore_draft();
}
}
#[cfg(test)]
mod tests {
use super::*;
#[test]
fn channel_and_dm_drafts_are_isolated_even_when_ids_match() {
let mut state = UiState::default();
state.select_text_channel("same-id".into());
state.remember_draft("channel draft".into());
state.select_dm("same-id".into());
assert!(state.chat_input.is_empty());
state.remember_draft("private draft".into());
state.select_text_channel("same-id".into());
assert_eq!(state.chat_input, "channel draft");
state.select_dm("same-id".into());
assert_eq!(state.chat_input, "private draft");
}
#[test]
fn browsing_text_and_dm_preserves_voice_target() {
let mut state = UiState {
voice_target: Some("voice-room".into()),
showing_voice: true,
..UiState::default()
};
state.select_text_channel("general".into());
assert_eq!(state.voice_target.as_deref(), Some("voice-room"));
assert!(!state.showing_voice);
state.select_dm("dm-id".into());
assert_eq!(state.voice_target.as_deref(), Some("voice-room"));
}
#[test]
fn sending_clears_only_current_draft() {
let mut state = UiState::default();
state.select_text_channel("a".into());
state.remember_draft("keep".into());
state.select_text_channel("b".into());
state.remember_draft("send".into());
state.remember_draft(String::new());
state.select_text_channel("a".into());
assert_eq!(state.chat_input, "keep");
state.select_text_channel("b".into());
assert!(state.chat_input.is_empty());
}
#[test]
fn leaving_server_does_not_expose_drafts_to_next_server() {
let mut state = UiState::default();
state.select_text_channel("general".into());
state.remember_draft("private to server A".into());
state.clear_server_conversations();
state.select_text_channel("general".into());
assert!(state.chat_input.is_empty());
assert!(state.drafts.is_empty());
}
}

View file

@ -25,6 +25,7 @@ pub enum ConnState {
}
pub struct UiState {
pub appearance: crate::ui::appearance::AppearancePreferences,
pub conn: ConnState,
pub connect_input: String,
pub bookmarks: Vec<super::NodeBookmark>,
@ -35,6 +36,11 @@ pub struct UiState {
pub active_channel: Option<String>,
pub messages: HashMap<String, Vec<super::ChatMessage>>,
pub chat_input: String,
pub drafts: HashMap<String, String>,
pub browsing_dms: bool,
pub showing_voice: bool,
pub voice_target: Option<String>,
pub vault_enabled: bool,
pub scroll_bottom: bool,
pub voice: VoiceUiState,
@ -46,6 +52,7 @@ pub struct UiState {
pub settings_open: bool,
pub mic_enabled: bool,
pub ptt_held: bool,
pub deafen: bool,
pub vad_mode: usize,
pub voice_bitrate: f32,
@ -91,19 +98,10 @@ pub struct UiState {
pub replying_to_content: String,
pub editing_message_id: Option<String>,
pub settings_passphrase_open: bool,
pub settings_passphrase_input: String,
pub settings_passphrase_confirm: String,
pub settings_passphrase_error: Option<String>,
pub settings_export_open: bool,
pub settings_export_pass: String,
pub settings_export_confirm: String,
pub settings_export_output: Option<String>,
pub settings_export_error: Option<String>,
pub settings_import_open: bool,
pub settings_import_input: String,
pub settings_import_pass: String,
pub settings_import_error: Option<String>,
}