1 files changed, 44 insertions, 36 deletions

diff --git a/examples/websocket/src/main.rs b/examples/websocket/src/main.rs
index c03a9f3a..3902e04c 100644
--- a/examples/websocket/src/main.rs
+++ b/examples/websocket/src/main.rs
@@ -1,13 +1,12 @@
 mod echo;
 
 use iced::alignment::{self, Alignment};
-use iced::button::{self, Button};
 use iced::executor;
-use iced::scrollable::{self, Scrollable};
-use iced::text_input::{self, TextInput};
+use iced::widget::{
+    button, column, container, row, scrollable, text, text_input, Column,
+};
 use iced::{
-    Application, Color, Column, Command, Container, Element, Length, Row,
-    Settings, Subscription, Text,
+    Application, Color, Command, Element, Length, Settings, Subscription, Theme,
 };
 
 pub fn main() -> iced::Result {
@@ -17,10 +16,7 @@ pub fn main() -> iced::Result {
 #[derive(Default)]
 struct WebSocket {
     messages: Vec<echo::Message>,
-    message_log: scrollable::State,
     new_message: String,
-    new_message_state: text_input::State,
-    new_message_button: button::State,
     state: State,
 }
 
@@ -34,6 +30,7 @@ enum Message {
 
 impl Application for WebSocket {
     type Message = Message;
+    type Theme = Theme;
     type Flags = ();
     type Executor = executor::Default;
 
@@ -52,46 +49,53 @@ impl Application for WebSocket {
         match message {
             Message::NewMessageChanged(new_message) => {
                 self.new_message = new_message;
+
+                Command::none()
             }
             Message::Send(message) => match &mut self.state {
                 State::Connected(connection) => {
                     self.new_message.clear();
 
                     connection.send(message);
+
+                    Command::none()
                 }
-                State::Disconnected => {}
+                State::Disconnected => Command::none(),
             },
             Message::Echo(event) => match event {
                 echo::Event::Connected(connection) => {
                     self.state = State::Connected(connection);
 
                     self.messages.push(echo::Message::connected());
+
+                    Command::none()
                 }
                 echo::Event::Disconnected => {
                     self.state = State::Disconnected;
 
                     self.messages.push(echo::Message::disconnected());
+
+                    Command::none()
                 }
                 echo::Event::MessageReceived(message) => {
                     self.messages.push(message);
-                    self.message_log.snap_to(1.0);
+
+                    scrollable::snap_to(MESSAGE_LOG.clone(), 1.0)
                 }
             },
-            Message::Server => {}
+            Message::Server => Command::none(),
         }
-
-        Command::none()
     }
 
     fn subscription(&self) -> Subscription<Message> {
         echo::connect().map(Message::Echo)
     }
 
-    fn view(&mut self) -> Element<Message> {
-        let message_log = if self.messages.is_empty() {
-            Container::new(
-                Text::new("Your messages will appear here...")
-                    .color(Color::from_rgb8(0x88, 0x88, 0x88)),
+    fn view(&self) -> Element<Message> {
+        let message_log: Element<_> = if self.messages.is_empty() {
+            container(
+                text("Your messages will appear here...")
+                    .style(Color::from_rgb8(0x88, 0x88, 0x88)),
             )
             .width(Length::Fill)
             .height(Length::Fill)
@@ -99,31 +103,33 @@ impl Application for WebSocket {
             .center_y()
             .into()
         } else {
-            self.messages
-                .iter()
-                .cloned()
-                .fold(
-                    Scrollable::new(&mut self.message_log),
-                    |scrollable, message| scrollable.push(Text::new(message)),
+            scrollable(
+                Column::with_children(
+                    self.messages
+                        .iter()
+                        .cloned()
+                        .map(text)
+                        .map(Element::from)
+                        .collect(),
                 )
                 .width(Length::Fill)
-                .height(Length::Fill)
-                .spacing(10)
-                .into()
+                .spacing(10),
+            )
+            .id(MESSAGE_LOG.clone())
+            .height(Length::Fill)
+            .into()
         };
 
         let new_message_input = {
-            let mut input = TextInput::new(
-                &mut self.new_message_state,
+            let mut input = text_input(
                 "Type a message...",
                 &self.new_message,
                 Message::NewMessageChanged,
             )
             .padding(10);
 
-            let mut button = Button::new(
-                &mut self.new_message_button,
-                Text::new("Send")
+            let mut button = button(
+                text("Send")
                     .height(Length::Fill)
                     .vertical_alignment(alignment::Vertical::Center),
             )
@@ -136,12 +142,10 @@ impl Application for WebSocket {
                 }
             }
 
-            Row::with_children(vec![input.into(), button.into()])
-                .spacing(10)
-                .align_items(Alignment::Fill)
+            row![input, button].spacing(10).align_items(Alignment::Fill)
         };
 
-        Column::with_children(vec![message_log, new_message_input.into()])
+        column![message_log, new_message_input]
             .width(Length::Fill)
             .height(Length::Fill)
             .padding(20)
@@ -160,3 +164,7 @@ impl Default for State {
         Self::Disconnected
     }
 }
+
+lazy_static::lazy_static! {
+    static ref MESSAGE_LOG: scrollable::Id = scrollable::Id::unique();
+}