yusdacra/icy_matrix - Change CEXASC5XWUEA4SWUKX6HSAXV7DSZTIIBXIQEFZAHAFZ7NUIWQLXAC

replace the bottom user bar with a pick list

Created by Yusuf Bera Ertan on November 17, 2020

CEXASC5XWUEA4SWUKX6HSAXV7DSZTIIBXIQEFZAHAFZ7NUIWQLXAC

Dependencies

In channels

main

Change contents

Insertion in src/client/mod.rs at line 9 [3.104841]
[3.105097]
[3.105097]
```
            membership::join_room_by_id_or_alias,
```

Insertion in src/client/mod.rs at line 295 [3.104841]

[3.113412]

    pub async fn join_room(
        inner: InnerClient,
        room_id_or_alias: ruma::RoomIdOrAliasId,
    ) -> Result<join_room_by_id_or_alias::Response, ClientError> {
        inner
            .request(join_room_by_id_or_alias::Request::new(&room_id_or_alias))
            .await
            .map_err(|e| e.into())
    }

Replacement in src/ui/screen/main.rs at line 12 [3.22734]

B:BD[3.23106] → [3.23106:23256]

    button, scrollable, text_input, Align, Button, Color, Column, Command, Container, Element,
    Length, Row, Space, Subscription, Text, TextInput,

[3.23106]

[3.23256]

    button, pick_list, scrollable, text_input, Align, Button, Color, Column, Command, Container,
    Element, Length, PickList, Row, Space, Subscription, Text, TextInput,

Replacement in src/ui/screen/main.rs at line 65 [3.22734]
B:BD[3.24245] → [3.24245:24266]
```
    LogoutInitiated,
```
[3.24245]
[3.24266]
```
    SelectedMenuOption(String),
```
Replacement in src/ui/screen/main.rs at line 92 [3.22734]
B:BD[3.25379] → [3.25379:25416]
```
    logout_but_state: button::State,
```
[3.25379]
[3.25416]
```
    menu_state: pick_list::State<String>,
```

Replacement in src/ui/screen/main.rs at line 120 [3.22734]

B:BD[3.26769] → [3.26769:26819]

            logout_but_state: Default::default(),

[3.26769]

[3.26819]

            menu_state: Default::default(),

Deletion in src/ui/screen/main.rs at line 219 [3.22734]

B:BD[3.31099] → [3.31099:31304]


        let logout = Button::new(&mut self.logout_but_state, Text::new("Logout").size(16))
            .width(Length::Fill)
            .on_press(Message::LogoutInitiated)
            .style(DarkButton);

Replacement in src/ui/screen/main.rs at line 220 [3.22734]

B:BD[3.31305] → [3.31305:31560]

        let user_name = Text::new(self.client.current_user_id().localpart())
            .size(16)
            .width(Length::Fill);
        let user_area =
            Row::with_children(vec![logout.into(), user_name.into()]).align_items(Align::Center);

[3.31305]

[3.31560]

        let username = self.client.current_user_id().localpart().to_string();
        let menu = PickList::new(
            &mut self.menu_state,
            vec![
                username.clone(),
                "Join Room".to_string(),
                "Logout".to_string(),
            ],
            Some(username),
            Message::SelectedMenuOption,
        )
        .style(theme);

Replacement in src/ui/screen/main.rs at line 233 [3.22734]

B:BD[3.31561] → [3.31561:31676]

        let rooms_area =
            Column::with_children(vec![room_list, user_area.width(Length::Fill).into()]);

[3.31561]

[3.31676]

        let rooms_area = Column::with_children(vec![room_list, menu.width(Length::Fill).into()]);

Deletion in src/ui/screen/main.rs at line 563 [3.22734]

B:BD[3.44721] → [3.44721:44825]

            }
            Message::LogoutInitiated => {
                self.logging_out = Some(false);

Insertion in src/ui/screen/main.rs at line 564 [3.22734]

[3.44839]

            Message::SelectedMenuOption(option) => match option.as_str() {
                "Logout" => {
                    self.logging_out = Some(false);
                }
                "Join Room" => println!("aaaaaa"),
                u if u == self.client.current_user_id().localpart() => println!("bbbbbbbb"),
                _ => unreachable!(),
            },

Deletion in src/ui/screen/main.rs at line 1093 [3.22734]
B:BD[2.8896] → [2.8896:8925]
∅:D[2.8925] → [3.56552:56553]
B:BD[3.56552] → [3.56552:56553]
```
        println!("subbing");
```

Replacement in src/ui/style.rs at line 2 [3.24]

B:BD[3.37] → [3.37:136]

    button, checkbox, container, progress_bar, radio, rule, scrollable, slider, text_input, Color,

[3.37]

[3.136]

    button, checkbox, container, pick_list, progress_bar, radio, rule, scrollable, slider,
    text_input, Color,

Insertion in src/ui/style.rs at line 181 [3.24]

[3.4765]

        }
    }
}
impl From<Theme> for Box<dyn pick_list::StyleSheet> {
    fn from(theme: Theme) -> Self {
        match theme {
            Theme::Light => Default::default(),
            Theme::Dark => dark::PickList.into(),

Replacement in src/ui/style.rs at line 271 [3.24]

B:BD[3.6621] → [3.6621:6732]

        button, checkbox, container, progress_bar, radio, rule, scrollable, slider, text_input,
        Color,

[3.6621]

[3.6732]

        button, checkbox, container, pick_list, progress_bar, radio, rule, scrollable, slider,
        text_input, Color,

Insertion in src/ui/style.rs at line 648 [3.24]
[3.16550]
[3.16550]
```
    pub struct PickList;
```

Insertion in src/ui/style.rs at line 651 [3.24]

[3.16551]

    impl pick_list::StyleSheet for PickList {
        fn menu(&self) -> pick_list::Menu {
            pick_list::Menu {
                background: BRIGHT_BG.into(),
                text_color: Color::WHITE,
                selected_background: ACCENT.into(),
                selected_text_color: Color::WHITE,
                border_width: 0,
                ..pick_list::Menu::default()
            }
        }
        fn active(&self) -> pick_list::Style {
            pick_list::Style {
                background: DARK_BG.into(),
                text_color: Color::WHITE,
                border_width: 0,
                ..pick_list::Style::default()
            }
        }
        fn hovered(&self) -> pick_list::Style {
            pick_list::Style {
                background: ACCENT.into(),
                ..self.active()
            }
        }
    }