Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cleanup after merging the UserProfileSlidingPane PR project-robius#78 #79

Merged
merged 8 commits into from
Jul 13, 2024
Merged

Cleanup after merging the UserProfileSlidingPane PR project-robius#78 #79

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
5ce2a63
WIP (panics)
kevinaboos Jul 11, 2024
2c0d26c
Fix live DSL errors; update makepad
kevinaboos Jul 11, 2024
f2d3c0b
Actions are being emitted and received properly, but the UserProfileS…
kevinaboos Jul 11, 2024
d9c08d9
Fix up icons and button alignment.
kevinaboos Jul 12, 2024
0aba8a6
Fix Z-ordering of close button in the user profile sliding pane
kevinaboos Jul 12, 2024
b6995e2
Sliding pane basics are fully working.
kevinaboos Jul 13, 2024
6025414
Cleanup after merging the UserProfileSlidingPane PR #78
kevinaboos Jul 13, 2024
0dbea37
Merge branch 'main' into cleanup_sliding_pane
kevinaboos Jul 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 0 additions & 36 deletions src/app.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,42 +267,6 @@ pub struct App {
ui: WidgetRef,
}


/*
// shared
crate::shared::styles::live_design(cx);
crate::shared::helpers::live_design(cx);
crate::shared::header::live_design(cx);
crate::shared::search_bar::live_design(cx);
crate::shared::popup_menu::live_design(cx);
crate::shared::dropdown_menu::live_design(cx);
crate::shared::clickable_view::live_design(cx);
crate::shared::avatar::live_design(cx);
crate::shared::text_or_image::live_design(cx);
crate::shared::html_or_plaintext::live_design(cx);

// home - chats
crate::home::home_screen::live_design(cx);
crate::home::rooms_list::live_design(cx);
crate::home::room_screen::live_design(cx);

// contacts
crate::contacts::contacts_screen::live_design(cx);
crate::contacts::contacts_group::live_design(cx);
crate::contacts::contacts_list::live_design(cx);
crate::contacts::add_contact_screen::live_design(cx);

// discover
crate::discover::discover_screen::live_design(cx);
crate::discover::moment_list::live_design(cx);
crate::discover::moments_screen::live_design(cx);

// profile
crate::profile::profile_screen::live_design(cx);
crate::profile::my_profile_screen::live_design(cx);

*/

impl LiveRegister for App {
fn live_register(cx: &mut Cx) {
// Order matters here, as some widget definitions depend on others.
Expand Down
12 changes: 6 additions & 6 deletions src/profile/user_profile.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ live_design! {
//
// Customized button widget, based on the RoundedView shaders with some modifications
// which is a better fit with our application UI design
MoxinButton = <Button> {
UserProfileActionButton = <Button> {
width: Fit,
height: Fit,
spacing: 10,
Expand Down Expand Up @@ -219,31 +219,31 @@ live_design! {
padding: {left: 25, bottom: 50 }


direct_message_button = <MoxinButton> {
direct_message_button = <UserProfileActionButton> {
draw_icon: {
svg_file: (ICON_DOUBLE_CHAT)
}
icon_walk: {width: 22, height: 16, margin: {left: -5, right: -3, top: 1, bottom: -1} }
text: "Direct Message"
}

copy_link_to_user_button = <MoxinButton> {
copy_link_to_user_button = <UserProfileActionButton> {
draw_icon: {
svg_file: (ICON_COPY)
}
icon_walk: {width: 16, height: 16, margin: {right: -2} }
text: "Copy Link to User"
}

jump_to_read_receipt_button = <MoxinButton> {
jump_to_read_receipt_button = <UserProfileActionButton> {
draw_icon: {
svg_file: (ICON_JUMP)
}
icon_walk: {width: 14, height: 16, margin: {left: -1, right: 2}}
text: "Jump to Read Receipt"
}

block_user_button = <MoxinButton> {
block_user_button = <UserProfileActionButton> {
draw_icon: {
svg_file: (ICON_BLOCK_USER)
color: (COLOR_DANGER_RED),
Expand Down Expand Up @@ -289,7 +289,7 @@ live_design! {
user_profile_view = <UserProfileView> { }

// The "X" close button on the top left
close_button = <MoxinButton> {
close_button = <UserProfileActionButton> {
width: Fit,
height: Fit,
align: {x: 0.0, y: 0.0},
Expand Down