From 89fccb546eaf20a1d4ebe1fa4c6978c3dcacba12 Mon Sep 17 00:00:00 2001
From: Kevin Boos <kevinaboos@gmail.com>
Date: Tue, 8 Oct 2024 01:05:12 -0700
Subject: [PATCH 01/12] Initial implementation of fetching location and
 rendering a location preview

Not yet working; can't fetch current location.
---
 Cargo.lock                       | 146 ++++++++++++++++++++++++++++---
 Cargo.toml                       |   1 +
 resources/icons/location-poi.svg |   2 +
 src/home/room_screen.rs          | 135 ++++++++++++++++++++++++----
 src/lib.rs                       |   1 +
 src/location.rs                  | 123 ++++++++++++++++++++++++++
 6 files changed, 379 insertions(+), 29 deletions(-)
 create mode 100644 resources/icons/location-poi.svg
 create mode 100644 src/location.rs

diff --git a/Cargo.lock b/Cargo.lock
index 18306a9d..1509ba66 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -77,6 +77,15 @@ dependencies = [
  "memchr",
 ]
 
+[[package]]
+name = "android-build"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a133d38cebf328adaea4bc1891d9568e14a394b50e4f4ba5f63dc14e8beaaee9"
+dependencies = [
+ "windows-sys 0.52.0",
+]
+
 [[package]]
 name = "android-tzdata"
 version = "0.1.1"
@@ -328,9 +337,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "bitflags"
-version = "2.4.1"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07"
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
 dependencies = [
  "serde",
 ]
@@ -391,6 +400,15 @@ dependencies = [
  "objc2",
 ]
 
+[[package]]
+name = "block2"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2c132eebf10f5cad5289222520a4a058514204aed6d791f1cf4fe8088b82d15f"
+dependencies = [
+ "objc2",
+]
+
 [[package]]
 name = "bs58"
 version = "0.5.0"
@@ -1360,7 +1378,7 @@ version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3fb69199826926eb864697bddd27f73d9fddcffc004f5733131e15b465e30642"
 dependencies = [
- "block2",
+ "block2 0.4.0",
  "objc2",
 ]
 
@@ -1612,7 +1630,7 @@ version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d"
 dependencies = [
- "bitflags 2.4.1",
+ "bitflags 2.6.0",
  "libc",
 ]
 
@@ -1959,7 +1977,7 @@ name = "makepad-zune-core"
 version = "0.2.14"
 source = "git+https://github.com/kevinaboos/makepad?branch=modal_sends_dismissed_action_to_inner_modal_content#dd319e6e74d9d70f8c90fef639109ae32caee863"
 dependencies = [
- "bitflags 2.4.1",
+ "bitflags 2.6.0",
 ]
 
 [[package]]
@@ -2084,7 +2102,7 @@ source = "git+https://github.com/matrix-org/matrix-rust-sdk#dc055c632c106c6392ee
 dependencies = [
  "as_variant",
  "async-trait",
- "bitflags 2.4.1",
+ "bitflags 2.6.0",
  "eyeball",
  "eyeball-im",
  "futures-util",
@@ -2341,7 +2359,7 @@ version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ad5a3bbb2ae61f345b8c11776f2e79fc2bb71d1901af9a5f81f03c9238a05d86"
 dependencies = [
- "bitflags 2.4.1",
+ "bitflags 2.6.0",
  "ctor",
  "napi-sys-ohos",
  "once_cell",
@@ -2413,12 +2431,47 @@ dependencies = [
  "objc2-encode",
 ]
 
+[[package]]
+name = "objc2-contacts"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a5ff520e9c33812fd374d8deecef01d4a840e7b41862d849513de77e44aa4889"
+dependencies = [
+ "block2 0.5.1",
+ "objc2",
+ "objc2-foundation",
+]
+
+[[package]]
+name = "objc2-core-location"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "000cfee34e683244f284252ee206a27953279d370e309649dc3ee317b37e5781"
+dependencies = [
+ "block2 0.5.1",
+ "objc2",
+ "objc2-contacts",
+ "objc2-foundation",
+]
+
 [[package]]
 name = "objc2-encode"
 version = "4.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7891e71393cd1f227313c9379a26a584ff3d7e6e7159e988851f0934c993f0f8"
 
+[[package]]
+name = "objc2-foundation"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0ee638a5da3799329310ad4cfa62fbf045d5f56e3ef5ba4149e7452dcf89d5a8"
+dependencies = [
+ "bitflags 2.6.0",
+ "block2 0.5.1",
+ "libc",
+ "objc2",
+]
+
 [[package]]
 name = "object"
 version = "0.32.1"
@@ -2747,7 +2800,7 @@ version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "666f0f59e259aea2d72e6012290c09877a780935cc3c18b1ceded41f3890d59c"
 dependencies = [
- "bitflags 2.4.1",
+ "bitflags 2.6.0",
  "memchr",
  "pulldown-cmark-escape",
  "unicase",
@@ -3040,6 +3093,21 @@ dependencies = [
  "robius-android-env",
 ]
 
+[[package]]
+name = "robius-location"
+version = "0.1.0"
+source = "git+https://github.com/project-robius/robius-location#544c57e3d4f4ee6257a5c290e3e76104acae6046"
+dependencies = [
+ "android-build",
+ "cfg-if",
+ "jni",
+ "objc2",
+ "objc2-core-location",
+ "objc2-foundation",
+ "robius-android-env",
+ "windows",
+]
+
 [[package]]
 name = "robius-open"
 version = "0.1.0"
@@ -3084,6 +3152,7 @@ dependencies = [
  "rand",
  "rangemap",
  "robius-directories",
+ "robius-location",
  "robius-open",
  "robius-use-makepad",
  "serde",
@@ -3253,7 +3322,7 @@ version = "0.31.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b838eba278d213a8beaf485bd313fd580ca4505a00d5871caeb1457c55322cae"
 dependencies = [
- "bitflags 2.4.1",
+ "bitflags 2.6.0",
  "fallible-iterator",
  "fallible-streaming-iterator",
  "hashlink",
@@ -3288,7 +3357,7 @@ version = "0.38.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2b426b0506e5d50a7d8dafcf2e81471400deb602392c7dd110815afb4eaf02a3"
 dependencies = [
- "bitflags 2.4.1",
+ "bitflags 2.6.0",
  "errno",
  "libc",
  "linux-raw-sys",
@@ -4361,6 +4430,16 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
+[[package]]
+name = "windows"
+version = "0.57.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "12342cb4d8e3b046f3d80effd474a7a02447231330ef77d71daa6fbc40681143"
+dependencies = [
+ "windows-core 0.57.0",
+ "windows-targets 0.52.6",
+]
+
 [[package]]
 name = "windows-core"
 version = "0.51.1"
@@ -4378,17 +4457,60 @@ dependencies = [
  "windows-targets 0.48.5",
 ]
 
+[[package]]
+name = "windows-core"
+version = "0.57.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d2ed2439a290666cd67ecce2b0ffaad89c2a56b976b736e6ece670297897832d"
+dependencies = [
+ "windows-implement",
+ "windows-interface",
+ "windows-result 0.1.2",
+ "windows-targets 0.52.6",
+]
+
+[[package]]
+name = "windows-implement"
+version = "0.57.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9107ddc059d5b6fbfbffdfa7a7fe3e22a226def0b2608f72e9d552763d3e1ad7"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.75",
+]
+
+[[package]]
+name = "windows-interface"
+version = "0.57.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "29bee4b38ea3cde66011baa44dba677c432a78593e202392d1e9070cf2a7fca7"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.75",
+]
+
 [[package]]
 name = "windows-registry"
 version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e400001bb720a623c1c69032f8e3e4cf09984deec740f007dd2b03ec864804b0"
 dependencies = [
- "windows-result",
+ "windows-result 0.2.0",
  "windows-strings",
  "windows-targets 0.52.6",
 ]
 
+[[package]]
+name = "windows-result"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5e383302e8ec8515204254685643de10811af0ed97ea37210dc26fb0032647f8"
+dependencies = [
+ "windows-targets 0.52.6",
+]
+
 [[package]]
 name = "windows-result"
 version = "0.2.0"
@@ -4404,7 +4526,7 @@ version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10"
 dependencies = [
- "windows-result",
+ "windows-result 0.2.0",
  "windows-targets 0.52.6",
 ]
 
diff --git a/Cargo.toml b/Cargo.toml
index 9deb4084..1168f8dc 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -24,6 +24,7 @@ robius-use-makepad = "0.1.0"
 robius-open = "0.1.0"
 ## A fork of the `directories` crate that adds support for Android by using our `robius-android-env` crate.
 robius-directories = { git = "https://github.com/project-robius/robius-directories", branch = "robius"}
+robius-location = { git = "https://github.com/project-robius/robius-location" }
 
 anyhow = "1.0"
 chrono = "0.4"
diff --git a/resources/icons/location-poi.svg b/resources/icons/location-poi.svg
new file mode 100644
index 00000000..1c7515d5
--- /dev/null
+++ b/resources/icons/location-poi.svg
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?><!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
+<svg width="800px" height="800px" viewBox="0 0 100 100" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" class="iconify iconify--gis" preserveAspectRatio="xMidYMid meet"><path d="M68.913 48.908l-.048.126c.015-.038.027-.077.042-.115l.006-.011z" fill="#000000"></path><path d="M50.002 0C33.524 0 20 13.48 20 29.922c0 6.372 2.04 12.31 5.48 17.174l-.123-.192l19.206 33.198l.097.127c.774 1.01 1.54 1.824 2.467 2.437c.927.613 2.114 1 3.28.883c2.33-.234 3.684-1.844 4.935-3.54l.078-.105L76.594 43.87l.017-.03c.507-.915.874-1.838 1.188-2.732A29.578 29.578 0 0 0 80 29.922C80 13.48 66.48 0 50.002 0zm0 5C63.756 5 75 16.218 75 29.922a24.55 24.55 0 0 1-1.84 9.332l-.025.062l-.022.065c-.263.757-.549 1.444-.879 2.04L51.275 77.087c-.927 1.221-1.575 1.51-1.367 1.488c.107-.01.206.074-.023-.078c-.219-.145-.666-.57-1.196-1.246L29.63 44.3l-.067-.093C26.69 40.147 25 35.23 25 29.922C25 16.219 36.248 5 50.002 5zm0 7.85c-9.462 0-17.115 7.626-17.115 17.072c0 9.446 7.654 17.072 17.115 17.072c9.461 0 17.111-7.627 17.111-17.072c0-9.446-7.65-17.072-17.111-17.072zm0 5c6.817 0 12.111 5.285 12.111 12.072c0 6.787-5.293 12.072-12.111 12.072c-6.818 0-12.115-5.286-12.115-12.072c0-6.787 5.298-12.072 12.115-12.072z" fill="#000000"></path><path d="M34.006 69.057C19.88 71.053 10 75.828 10 82.857C10 92.325 26.508 100 50 100s40-7.675 40-17.143c0-7.029-9.879-11.804-24.004-13.8l-1.957 3.332C74.685 73.866 82 76.97 82 80.572c0 5.05-14.327 9.143-32 9.143c-17.673 0-32-4.093-32-9.143c-.001-3.59 7.266-6.691 17.945-8.174c-.645-1.114-1.294-2.226-1.94-3.341z" fill="#000000"></path></svg>
\ No newline at end of file
diff --git a/src/home/room_screen.rs b/src/home/room_screen.rs
index 37aaa5fd..5aab0c61 100644
--- a/src/home/room_screen.rs
+++ b/src/home/room_screen.rs
@@ -24,7 +24,7 @@ use matrix_sdk_ui::timeline::{
 };
 
 use crate::{
-    avatar_cache::{self, AvatarCacheEntry}, event_preview::{text_preview_of_member_profile_change, text_preview_of_other_state, text_preview_of_redacted_message, text_preview_of_room_membership_change, text_preview_of_timeline_item}, media_cache::{MediaCache, MediaCacheEntry}, profile::{
+    avatar_cache::{self, AvatarCacheEntry}, event_preview::{text_preview_of_member_profile_change, text_preview_of_other_state, text_preview_of_redacted_message, text_preview_of_room_membership_change, text_preview_of_timeline_item}, location::{get_latest_location, init_location_subscriber, request_location_update, LocationRequest, LocationUpdate}, media_cache::{MediaCache, MediaCacheEntry}, profile::{
         user_profile::{AvatarState, ShowUserProfileAction, UserProfile, UserProfileAndRoomId, UserProfilePaneInfo, UserProfileSlidingPaneRef, UserProfileSlidingPaneWidgetExt},
         user_profile_cache,
     }, shared::{
@@ -32,8 +32,7 @@ use crate::{
         html_or_plaintext::{HtmlOrPlaintextRef, HtmlOrPlaintextWidgetRefExt},
         text_or_image::{TextOrImageRef, TextOrImageWidgetRefExt},
         typing_animation::TypingAnimationWidgetExt,
-    },
-    sliding_sync::{get_client, submit_async_request, take_timeline_update_receiver, MatrixRequest}, utils::{self, unix_time_millis_to_datetime, MediaFormatConst}
+    }, sliding_sync::{get_client, submit_async_request, take_timeline_update_receiver, MatrixRequest}, utils::{self, unix_time_millis_to_datetime, MediaFormatConst}
 };
 use rangemap::RangeSet;
 
@@ -60,6 +59,7 @@ live_design! {
     ICO_USER = dep("crate://self/resources/icon_user.svg")
     ICO_ADD = dep("crate://self/resources/icon_add.svg")
     ICO_CLOSE = dep("crate://self/resources/icons/close.svg")
+    ICO_LOCATION_POI = dep("crate://self/resources/icons/location_poi.svg")
     ICO_JUMP_TO_BOTTOM = dep("crate://self/resources/icon_jump_to_bottom.svg")
 
     TEXT_SUB = {
@@ -728,9 +728,6 @@ live_design! {
                 // First, display the timeline of all messages/events.
                 timeline = <Timeline> {}
 
-
-
-
                 // Below that, display an optional preview of the message that the user
                 // is currently drafting a replied to.
                 replying_preview = <View> {
@@ -777,7 +774,7 @@ live_design! {
                     reply_preview_content = <ReplyPreviewContent> { }
                 }
 
-                // Below that, display user typing notice
+                // Below that, display a typing notice when other users in the room are typing.
                 typing_notice = <View> {
                     visible: false
                     width: Fill
@@ -802,6 +799,70 @@ live_design! {
                     typing_animation = <TypingAnimation> {}
                 }
 
+                // Below that, display a preview of the current location that a user is about to share.
+                location_preview = <View> {
+                    visible: false
+                    width: Fill
+                    height: Fit
+                    flow: Down
+                    padding: 0.0
+
+                    show_bg: true,
+                    draw_bg: {
+                        color: #EEEEEE,
+                    }
+
+                    <View> {
+                        width: Fill
+                        height: Fit
+                        flow: Right
+                        padding: {left: 12.0, top: 8.0, bottom: 8.0, right: 10.0}
+                        align: {y: 0.5}
+
+                        <Label> {
+                            draw_text: {
+                                wrap: Ellipsis,
+                                color: (MESSAGE_TEXT_COLOR),
+                                text_style: <MESSAGE_TEXT_STYLE>{ font_size: 10.0 },
+                            }
+                            text: "Share location to this room:"
+                        }
+
+                        filler = <View> {width: Fill, height: Fill}
+
+                        // TODO: Fix style
+                        cancel_location_button = <IconButton> {
+                            width: Fit,
+                            height: Fit,
+
+                            draw_icon: {
+                                svg_file: (ICO_CLOSE),
+                                fn get_color(self) -> vec4 {
+                                   return (COLOR_META)
+                                }
+                            }
+                            icon_walk: {width: 12, height: 12}
+                        }
+                    }
+
+                    <View> {
+                        width: Fill
+                        height: Fit
+                        flow: Down
+
+                        location_label = <Label> {
+                            align: {x: 0.0, y: 0.5},
+                            padding: {left: 5.0}
+                            draw_text: {
+                                wrap: Word,
+                                color: (MESSAGE_TEXT_COLOR),
+                                text_style: <MESSAGE_TEXT_STYLE>{},
+                            }
+                            text: "Fetching current location..."
+                        }
+                    }
+                }
+
                 // Below that, display a view that holds the message input bar and send button.
                 <View> {
                     width: Fill, height: Fit
@@ -811,6 +872,12 @@ live_design! {
                         color: (COLOR_PRIMARY)
                     }
 
+                    location_button = <IconButton> {
+                        draw_icon: {svg_file: (ICO_LOCATION_POI)},
+                        icon_walk: {width: 18.0, height: Fit},
+                        text: "LOC",
+                    }
+
                     message_input = <TextInput> {
                         width: Fill, height: Fit, margin: 0
                         align: {y: 0.5}
@@ -897,16 +964,6 @@ live_design! {
                         }
                     }
 
-                    // <Image> {
-                    //     source: (IMG_SMILEY_FACE_BW),
-                    //     width: 36., height: 36.
-                    // }
-
-                    // <Image> {
-                    //     source: (IMG_PLUS),
-                    //     width: 36., height: 36.
-                    // }
-
                     send_message_button = <IconButton> {
                         draw_icon: {svg_file: (ICO_SEND)},
                         icon_walk: {width: 18.0, height: Fit},
@@ -1199,6 +1256,21 @@ impl Widget for RoomScreen {
                 self.redraw(cx);
             }
 
+            // Handle the add location button being clicked.
+            if self.button(id!(location_button)).clicked(&actions) {
+                log!("Add location button clicked; requesting current location...");
+                if let Err(_e) = init_location_subscriber() {
+                    error!("Failed to initialize location subscriber");
+                }
+                self.show_location_preview(cx);
+            }
+
+            // Handle the cancel location button being clicked.
+            if self.button(id!(cancel_location_button)).clicked(&actions) {
+                self.clear_location_preview();
+                self.redraw(cx);
+            }
+
             // Handle the send message button being clicked.
             if self.button(id!(send_message_button)).clicked(&actions) {
                 let msg_input_widget = self.text_input(id!(message_input));
@@ -1630,6 +1702,31 @@ impl RoomScreen {
         }
     }
 
+    fn show_location_preview(&mut self, cx: &mut Cx) {
+        request_location_update(LocationRequest::UpdateOnce);
+        let text = if let Some(loc) = get_latest_location() {
+            format!("Current location: {},{}, time: {:?}",
+                loc.coordinates.latitude, loc.coordinates.longitude, loc.time,
+            )
+        } else {
+            format!("Current location is not yet available.")
+        };
+        self.label(id!(location_label)).set_text(&text);
+        self.view(id!(location_preview)).set_visible(true);
+        
+        // TODO: gray out / disable the message input box while the location preview is shown.
+        // TODO: gray out / disable the send message button while the current location isn't known.
+        self.redraw(cx);
+    }
+
+    /// Clears (and makes invisible) the location preview.
+    fn clear_location_preview(&mut self) {
+        self.view(id!(location_preview)).set_visible(false);
+        if let Some(tl) = self.tl_state.as_mut() {
+            tl.sharing_location = None;
+        }
+    }
+
     /// Invoke this when this timeline is being shown,
     /// e.g., when the user navigates to this timeline.
     fn show_timeline(&mut self, cx: &mut Cx) {
@@ -1657,6 +1754,7 @@ impl RoomScreen {
                 update_receiver,
                 media_cache: MediaCache::new(MediaFormatConst::File, Some(update_sender)),
                 replying_to: None,
+                sharing_location: None,
                 saved_state: SavedState::default(),
                 message_highlight_animation_state: MessageHighlightAnimationState::default(),
                 prev_first_index: None,
@@ -1900,6 +1998,9 @@ struct TimelineUiState {
     /// Info about the event currently being replied to, if any.
     replying_to: Option<(EventTimelineItem, RepliedToInfo)>,
 
+    /// Info about the user's current location sharing status in this room.
+    sharing_location: Option<LocationUpdate>,
+
     /// The states relevant to the UI display of this timeline that are saved upon
     /// a `Hide` action and restored upon a `Show` action.
     saved_state: SavedState,
diff --git a/src/lib.rs b/src/lib.rs
index 1b4ecf74..837c5153 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -26,6 +26,7 @@ pub mod verification;
 
 pub mod utils;
 pub mod temp_storage;
+pub mod location;
 
 
 pub const APP_QUALIFIER: &str = "org";
diff --git a/src/location.rs b/src/location.rs
new file mode 100644
index 00000000..715f460a
--- /dev/null
+++ b/src/location.rs
@@ -0,0 +1,123 @@
+//! Functions for querying the device's current location.
+
+use std::{sync::{mpsc::{self, Receiver, Sender}, Mutex}, time::SystemTime};
+
+use makepad_widgets::{Cx, error, log};
+use robius_location::{Access, Accuracy, Coordinates, Location, Manager};
+
+/// The action emitted upon every location update.
+#[derive(Copy, Clone, Debug)]
+pub enum LocationAction {
+    Update(LocationUpdate),
+    None
+}
+
+/// An updated location sample, including coordinates and a system timestamp.
+#[derive(Copy, Clone, Debug)]
+pub struct LocationUpdate {
+    pub coordinates: Coordinates,
+    pub time: Option<SystemTime>,
+}
+
+static LATEST_LOCATION: Mutex<Option<LocationUpdate>> = Mutex::new(None);
+
+/// Returns the latest location update's coordinates, if available.
+///
+/// Note that this function is guaranteed to return `None` if
+/// [`init_location_subscriber`] has not been called yet.
+pub fn get_latest_location() -> Option<LocationUpdate> {
+    LATEST_LOCATION.lock().unwrap().clone()
+}
+
+
+struct LocationHandler;
+
+impl robius_location::Handler for LocationHandler {
+    fn handle(&self, location: Location<'_>) {
+        let coords = location.coordinates();
+        log!("Received location update: {coords:?}");
+        match coords {
+            Ok(coords) => {
+                let update = LocationUpdate {
+                    coordinates: coords,
+                    time: location.time().ok(),
+                };
+                Cx::post_action(LocationAction::Update(update));
+                *LATEST_LOCATION.lock().unwrap() = Some(update);
+            }
+            Err(e) => {
+                error!("Error getting coordinates from location update: {e:?}");
+            }
+        }
+    }
+
+    fn error(&self, e: robius_location::Error) {
+        error!("Got error in location handler: {e:?}");
+    }
+}
+
+
+fn location_request_loop(
+    request_receiver: Receiver<LocationRequest>,
+) -> Result<(), robius_location::Error> {
+    let mut manager = Manager::new(LocationHandler)?;
+    manager.request_authorization(Access::Foreground, Accuracy::Precise)?;
+    manager.update_once()?;
+
+    while let Ok(request) = request_receiver.recv() {
+        match request {
+            LocationRequest::UpdateOnce => {
+                manager.update_once()?;
+            }
+            LocationRequest::StartUpdates => {
+                manager.start_updates()?;
+            }
+            LocationRequest::StopUpdates => {
+                manager.stop_updates()?;
+            }
+        }
+    }
+
+    error!("Location request loop exited unexpectedly (the senders all died).");
+    Err(robius_location::Error::Unknown)
+}
+
+
+pub enum LocationRequest {
+    UpdateOnce,
+    StartUpdates,
+    StopUpdates,
+}
+
+static LOCATION_REQUEST_SENDER: Mutex<Option<Sender<LocationRequest>>> = Mutex::new(None);
+
+/// Submits a request to start, stop, or get a single new location update(s).
+pub fn request_location_update(request: LocationRequest) {
+    if let Some(sender) = LOCATION_REQUEST_SENDER.lock().unwrap().as_ref() {
+        if let Err(err) = sender.send(request) {
+            error!("Error sending location request: {err:?}");
+        }
+    } else {
+        error!("No location request sender available.");
+    }
+}
+
+/// Spawns a thread to listen for location requests and updates to the latest location.
+///
+/// This will request a single location update immediately upon starting.
+/// To request additional updates, use [`request_location_update`].
+///
+/// It is okay to call this function multiple times, as it will only re-initialize
+/// the location subscriber thread if it has not been initialized yet
+/// or if it has died and needs to be restarted.
+pub fn init_location_subscriber() -> Result<(), robius_location::Error> {
+    let mut lrs = LOCATION_REQUEST_SENDER.lock().unwrap();
+    if lrs.is_some() {
+        log!("Location subscriber already initialized.");
+        return Ok(());
+    }
+    let (request_sender, request_receiver) = mpsc::channel::<LocationRequest>();
+    *lrs = Some(request_sender);
+    std::thread::spawn(|| location_request_loop(request_receiver));
+    Ok(())
+}

From 05961a93dd4a8bcffdb1be0ccd1f1e994452e2d9 Mon Sep 17 00:00:00 2001
From: Kevin Boos <kevinaboos@gmail.com>
Date: Tue, 8 Oct 2024 13:07:22 -0700
Subject: [PATCH 02/12] Ensure that the location manager is initialized on the
 main UI thread.

Apparently, apple platforms (and likely others) require that the location manager
run (or at least be initialized)  on a thread that has  "run loop",
which the main thread is guaranteed to have.
See: <https://stackoverflow.com/questions/25916841/cllocationmanager-startupdatinglocation-not-calling-locationmanagerdidupdateloc>

We could technically init the location manager on a background thread
as long as we execute a run loop for that thread,
but that may not work on other platforms, and is a needless complication
when we already have a dedicated thread that has a run loop.

Unfortunately, we're still getting an `AuthorizationDenied` error when attempting
to receive a location update, so we need to move over to packaging Robrix
into a proper app bundle such that we can specify both the
`entitlements.plist` and `Info.plist` files that get bundled into the .app/.dmg.
---
 src/home/room_screen.rs |  2 +-
 src/location.rs         | 29 +++++++++++++++++++++++++----
 2 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/src/home/room_screen.rs b/src/home/room_screen.rs
index 5aab0c61..651aa105 100644
--- a/src/home/room_screen.rs
+++ b/src/home/room_screen.rs
@@ -1259,7 +1259,7 @@ impl Widget for RoomScreen {
             // Handle the add location button being clicked.
             if self.button(id!(location_button)).clicked(&actions) {
                 log!("Add location button clicked; requesting current location...");
-                if let Err(_e) = init_location_subscriber() {
+                if let Err(_e) = init_location_subscriber(cx) {
                     error!("Failed to initialize location subscriber");
                 }
                 self.show_location_preview(cx);
diff --git a/src/location.rs b/src/location.rs
index 715f460a..f6c16fea 100644
--- a/src/location.rs
+++ b/src/location.rs
@@ -59,9 +59,9 @@ impl robius_location::Handler for LocationHandler {
 
 fn location_request_loop(
     request_receiver: Receiver<LocationRequest>,
+    mut manager: ManagerWrapper,
 ) -> Result<(), robius_location::Error> {
-    let mut manager = Manager::new(LocationHandler)?;
-    manager.request_authorization(Access::Foreground, Accuracy::Precise)?;
+    
     manager.update_once()?;
 
     while let Ok(request) = request_receiver.recv() {
@@ -110,14 +110,35 @@ pub fn request_location_update(request: LocationRequest) {
 /// It is okay to call this function multiple times, as it will only re-initialize
 /// the location subscriber thread if it has not been initialized yet
 /// or if it has died and needs to be restarted.
-pub fn init_location_subscriber() -> Result<(), robius_location::Error> {
+///
+/// This function requires passing in a reference to `Cx`,
+/// which isn't used, but acts as a guarantee that this function
+/// must only be called by the main UI thread.
+pub fn init_location_subscriber(_cx: &mut Cx) -> Result<(), robius_location::Error> {
     let mut lrs = LOCATION_REQUEST_SENDER.lock().unwrap();
     if lrs.is_some() {
         log!("Location subscriber already initialized.");
         return Ok(());
     }
+    let mut manager = ManagerWrapper(Manager::new(LocationHandler)?);
+    manager.request_authorization(Access::Foreground, Accuracy::Precise)?;
     let (request_sender, request_receiver) = mpsc::channel::<LocationRequest>();
     *lrs = Some(request_sender);
-    std::thread::spawn(|| location_request_loop(request_receiver));
+    std::thread::spawn(|| location_request_loop(request_receiver, manager));
     Ok(())
 }
+
+struct ManagerWrapper(Manager);
+unsafe impl Send for ManagerWrapper {}
+unsafe impl Sync for ManagerWrapper {}
+impl std::ops::Deref for ManagerWrapper {
+    type Target = Manager;
+    fn deref(&self) -> &Self::Target {
+        &self.0
+    }
+}
+impl std::ops::DerefMut for ManagerWrapper {
+    fn deref_mut(&mut self) -> &mut Self::Target {
+        &mut self.0
+    }
+}

From b1780ab6eda33fcc86c7f0ede80074adb0409756 Mon Sep 17 00:00:00 2001
From: Julian Montes de Oca <julian@wyeworks.com>
Date: Thu, 10 Oct 2024 22:56:25 +0800
Subject: [PATCH 03/12] Introduce Dock for desktop UI

---
 src/app.rs                                    |  17 +-
 src/home/home_screen.rs                       |  26 +-
 src/home/light_themed_dock.rs                 | 298 ++++++++++++++++++
 src/home/main_desktop_ui.rs                   | 260 +++++++++++++++
 .../{main_content.rs => main_mobile_ui.rs}    |  13 +-
 src/home/mod.rs                               |   8 +-
 src/home/room_preview.rs                      |  86 ++---
 src/home/room_screen.rs                       |  54 ++--
 src/home/rooms_list.rs                        |  15 +-
 src/home/rooms_sidebar.rs                     |   2 +-
 10 files changed, 683 insertions(+), 96 deletions(-)
 create mode 100644 src/home/light_themed_dock.rs
 create mode 100644 src/home/main_desktop_ui.rs
 rename src/home/{main_content.rs => main_mobile_ui.rs} (86%)

diff --git a/src/app.rs b/src/app.rs
index 04fae7b9..d062ea93 100644
--- a/src/app.rs
+++ b/src/app.rs
@@ -2,7 +2,7 @@ use makepad_widgets::*;
 use matrix_sdk::ruma::OwnedRoomId;
 
 use crate::{
-    home::rooms_list::RoomListAction,
+    home::{main_desktop_ui::RoomsPanelAction, rooms_list::RoomListAction},
     verification::VerificationAction,
     verification_modal::{VerificationModalAction, VerificationModalWidgetRefExt},
 };
@@ -13,9 +13,7 @@ live_design! {
     import makepad_draw::shader::std::*;
 
     import crate::shared::styles::*;
-    import crate::shared::clickable_view::ClickableView;
     import crate::home::home_screen::HomeScreen;
-    import crate::home::room_screen::RoomScreen;
     import crate::profile::my_profile_screen::MyProfileScreen;
     import crate::verification_modal::VerificationModal;
 
@@ -189,6 +187,19 @@ impl MatchEvent for App {
                 RoomListAction::None => { }
             }
 
+            match action.as_widget_action().cast() {
+                RoomsPanelAction::RoomFocused(room_id) => {
+                    self.app_state.rooms_panel.selected_room = Some(SelectedRoom {
+                        id: room_id.clone(),
+                        name: None
+                    });
+                }
+                RoomsPanelAction::FocusNone => {
+                    self.app_state.rooms_panel.selected_room = None;
+                }
+                _ => { }
+            }
+
             // `VerificationAction`s come from a background thread, so they are NOT widget actions.
             // Therefore, we cannot use `as_widget_action().cast()` to match them.
             match action.downcast_ref() {
diff --git a/src/home/home_screen.rs b/src/home/home_screen.rs
index e72c3ad3..dc935da8 100644
--- a/src/home/home_screen.rs
+++ b/src/home/home_screen.rs
@@ -5,11 +5,13 @@ live_design! {
     import makepad_widgets::theme_desktop_dark::*;
     import makepad_draw::shader::std::*;
 
-    import crate::home::main_content::MainContent;
+    import crate::home::main_mobile_ui::MainMobileUI;
     import crate::home::rooms_sidebar::RoomsSideBar;
     import crate::home::spaces_dock::SpacesDock;
     import crate::shared::styles::*;
     import crate::shared::adaptive_view::AdaptiveView;
+    import crate::shared::search_bar::SearchBar;
+    import crate::home::main_desktop_ui::MainDesktopUI;
 
     NavigationWrapper = {{NavigationWrapper}} {
         view_stack = <StackNavigation> {}
@@ -24,10 +26,15 @@ live_design! {
             width: Fill, height: Fill
             padding: 0, margin: 0, align: {x: 0.0, y: 0.0}
             flow: Right
-            
+
             spaces = <SpacesDock> {}
-            rooms_sidebar = <RoomsSideBar> {}
-            main_content = <MainContent> {}
+
+            <View> {
+                flow: Down
+                width: Fill, height: Fill
+                <SearchBar> {}
+                <MainDesktopUI> {}
+            }
         }
 
         Mobile = {
@@ -47,11 +54,11 @@ live_design! {
                         sidebar = <RoomsSideBar> {}
                         spaces = <SpacesDock> {}
                     }
-    
+
                     main_content_view = <StackNavigationView> {
                         width: Fill, height: Fill
                         body = {
-                            main_content = <MainContent> {}
+                            main_content = <MainMobileUI> {}
                         }
                     }
                 }
@@ -63,7 +70,7 @@ live_design! {
 #[derive(Live, LiveHook, Widget)]
 pub struct NavigationWrapper {
     #[deref]
-    view: View
+    view: View,
 }
 
 impl Widget for NavigationWrapper {
@@ -77,7 +84,8 @@ impl Widget for NavigationWrapper {
 }
 
 impl MatchEvent for NavigationWrapper {
-    fn handle_actions(&mut self, cx: &mut Cx, actions:&Actions) {
-        self.stack_navigation(id!(view_stack)).handle_stack_view_actions(cx, actions);
+    fn handle_actions(&mut self, cx: &mut Cx, actions: &Actions) {
+        self.stack_navigation(id!(view_stack))
+            .handle_stack_view_actions(cx, actions);
     }
 }
diff --git a/src/home/light_themed_dock.rs b/src/home/light_themed_dock.rs
new file mode 100644
index 00000000..2dd60a49
--- /dev/null
+++ b/src/home/light_themed_dock.rs
@@ -0,0 +1,298 @@
+use makepad_widgets::*;
+
+live_design! {
+    import makepad_widgets::base::*;
+    import makepad_widgets::theme_desktop_dark::*;
+    import makepad_draw::shader::std::*;
+
+    import crate::shared::styles::*;    
+
+    Splitter = <SplitterBase> {
+        draw_splitter: {
+            uniform border_radius: 1.0
+            uniform splitter_pad: 1.0
+            uniform splitter_grabber: 110.0
+
+            instance pressed: 0.0
+            instance hover: 0.0
+
+            fn pixel(self) -> vec4 {
+                let sdf = Sdf2d::viewport(self.pos * self.rect_size);
+                sdf.clear(#ef);
+
+                if self.is_vertical > 0.5 {
+                    sdf.box(
+                        self.splitter_pad,
+                        self.rect_size.y * 0.5 - self.splitter_grabber * 0.5,
+                        self.rect_size.x - 2.0 * self.splitter_pad,
+                        self.splitter_grabber,
+                        self.border_radius
+                    );
+                }
+                else {
+                    sdf.box(
+                        self.rect_size.x * 0.5 - self.splitter_grabber * 0.5,
+                        self.splitter_pad,
+                        self.splitter_grabber,
+                        self.rect_size.y - 2.0 * self.splitter_pad,
+                        self.border_radius
+                    );
+                }
+                return sdf.fill_keep(mix(
+                    THEME_COLOR_D_HIDDEN,
+                    mix(
+                        THEME_COLOR_CTRL_SCROLLBAR_HOVER,
+                        THEME_COLOR_CTRL_SCROLLBAR_HOVER * 1.2,
+                        self.pressed
+                    ),
+                    self.hover
+                ));
+            }
+        }
+        split_bar_size: (THEME_SPLITTER_SIZE)
+        min_horizontal: (THEME_SPLITTER_MIN_HORIZONTAL)
+        max_horizontal: (THEME_SPLITTER_MAX_HORIZONTAL)
+        min_vertical: (THEME_SPLITTER_MIN_VERTICAL)
+        max_vertical: (THEME_SPLITTER_MAX_VERTICAL)
+
+        animator: {
+            hover = {
+                default: off
+                off = {
+                    from: {all: Forward {duration: 0.1}}
+                    apply: {
+                        draw_splitter: {pressed: 0.0, hover: 0.0}
+                    }
+                }
+
+                on = {
+                    from: {
+                        all: Forward {duration: 0.1}
+                        state_down: Forward {duration: 0.01}
+                    }
+                    apply: {
+                        draw_splitter: {
+                            pressed: 0.0,
+                            hover: [{time: 0.0, value: 1.0}],
+                        }
+                    }
+                }
+
+                pressed = {
+                    from: { all: Forward { duration: 0.1 }}
+                    apply: {
+                        draw_splitter: {
+                            pressed: [{time: 0.0, value: 1.0}],
+                            hover: 1.0,
+                        }
+                    }
+                }
+            }
+        }
+    }
+    
+    TabCloseButton = <TabCloseButtonBase> {
+            // TODO: NEEDS FOCUS STATE
+        height: 10.0, width: 10.0,
+        margin: { right: (THEME_SPACE_2), left: -3.5 },
+        draw_button: {
+
+            instance hover: float;
+            instance selected: float;
+
+            fn pixel(self) -> vec4 {
+                let sdf = Sdf2d::viewport(self.pos * self.rect_size);
+                let mid = self.rect_size / 2.0;
+                let size = (self.hover * 0.25 + 0.5) * 0.25 * length(self.rect_size);
+                let min = mid - vec2(size);
+                let max = mid + vec2(size);
+                sdf.move_to(min.x, min.y);
+                sdf.line_to(max.x, max.y);
+                sdf.move_to(min.x, max.y);
+                sdf.line_to(max.x, min.y);
+                return sdf.stroke(mix(
+                    #f,
+                    #4,
+                    self.hover
+                ), 1.0);
+            }
+        }
+
+        animator: {
+            hover = {
+                default: off
+                off = {
+                    from: {all: Forward {duration: 0.1}}
+                    apply: {
+                        draw_button: {hover: 0.0}
+                    }
+                }
+
+                on = {
+                    cursor: Hand,
+                    from: {all: Snap}
+                    apply: {
+                        draw_button: {hover: 1.0}
+                    }
+                }
+            }
+        }
+    }
+
+    Tab = <TabBase> {
+        width: Fit, height: Fill, //Fixed((THEME_TAB_HEIGHT)),
+
+        align: {x: 0.0, y: 0.5}
+        padding: <THEME_MSPACE_3> { }
+
+        close_button: <TabCloseButton> {}
+        draw_name: {
+            text_style: <THEME_FONT_REGULAR> {}
+            instance hover: 0.0
+            instance selected: 0.0
+            fn get_color(self) -> vec4 {
+                return mix(
+                    mix(
+                        #x0, // THEME_COLOR_TEXT_INACTIVE,
+                        #xf, // THEME_COLOR_TEXT_SELECTED,
+                        self.selected
+                    ),
+                    THEME_COLOR_TEXT_HOVER,
+                    self.hover
+                )
+            }
+        }
+
+        draw_bg: {
+            instance hover: float
+            instance selected: float
+
+            fn pixel(self) -> vec4 {
+                let sdf = Sdf2d::viewport(self.pos * self.rect_size);
+                sdf.box(
+                    -1.,
+                    -1.,
+                    self.rect_size.x + 2,
+                    self.rect_size.y + 2,
+                    1.
+                )
+                sdf.fill_keep(
+                    mix(
+                        (COLOR_SECONDARY) * 0.95,
+                        (COLOR_SELECTED_PRIMARY),
+                        self.selected
+                    )
+                )
+                return sdf.result
+            }
+        }
+
+        animator: {
+            hover = {
+                default: off
+                off = {
+                    from: {all: Forward {duration: 0.2}}
+                    apply: {
+                        draw_bg: {hover: 0.0}
+                        draw_name: {hover: 0.0}
+                    }
+                }
+
+                on = {
+                    cursor: Hand,
+                    from: {all: Forward {duration: 0.1}}
+                    apply: {
+                        draw_bg: {hover: [{time: 0.0, value: 1.0}]}
+                        draw_name: {hover: [{time: 0.0, value: 1.0}]}
+                    }
+                }
+            }
+
+            selected = {
+                default: off
+                off = {
+                    from: {all: Forward {duration: 0.3}}
+                    apply: {
+                        close_button: {draw_button: {selected: 0.0}}
+                        draw_bg: {selected: 0.0}
+                        draw_name: {selected: 0.0}
+                    }
+                }
+
+                on = {
+                    from: {all: Snap}
+                    apply: {
+                        close_button: {draw_button: {selected: 1.0}}
+                        draw_bg: {selected: 1.0}
+                        draw_name: {selected: 1.0}
+                    }
+                }
+            }
+        }
+    }
+
+    TabBar = <TabBarBase> {
+        CloseableTab = <Tab> {closeable:true}
+        PermanentTab = <Tab> {closeable:false}
+
+        draw_drag: {
+            draw_depth: 10
+            color: #x0
+        }
+        draw_fill: {
+            color: (COLOR_SECONDARY)
+        }
+
+        width: Fill, height: (THEME_TAB_HEIGHT)
+
+        scroll_bars: <ScrollBarsTabs> {
+            show_scroll_x: true
+            show_scroll_y: false
+            scroll_bar_x: {
+                draw_bar: {bar_width: 3.0}
+                bar_size: 4
+                use_vertical_finger_scroll: true
+            }
+        }
+    }
+
+    Dock = <DockBase> {
+        flow: Down,
+
+        round_corner: {
+            draw_depth: 20.0
+            border_radius: 20.
+            fn pixel(self) -> vec4 {
+                let pos = vec2(
+                    mix(self.pos.x, 1.0 - self.pos.x, self.flip.x),
+                    mix(self.pos.y, 1.0 - self.pos.y, self.flip.y)
+                )
+
+                let sdf = Sdf2d::viewport(pos * self.rect_size);
+                sdf.rect(-10., -10., self.rect_size.x * 2.0, self.rect_size.y * 2.0);
+                sdf.box(
+                    0.25,
+                    0.25,
+                    self.rect_size.x * 2.0,
+                    self.rect_size.y * 2.0,
+                    4.0
+                );
+
+                sdf.subtract()
+                // sdf.fill(THEME_COLOR_BG_APP)
+                sdf.fill(COLOR_SECONDARY)
+                return sdf.result
+            }
+        }
+        border_size: (THEME_DOCK_BORDER_SIZE)
+
+        padding: {left: (THEME_DOCK_BORDER_SIZE), top: 0, right: (THEME_DOCK_BORDER_SIZE), bottom: (THEME_DOCK_BORDER_SIZE)}
+        padding_fill: {color: (THEME_COLOR_BG_APP)} // TODO: unclear what this does
+        drag_quad: {
+            draw_depth: 10.0
+            color: (mix((COLOR_SECONDARY), #FFFFFF00, pow(0.25, THEME_COLOR_CONTRAST)))
+        }
+        tab_bar: <TabBar> {}
+        splitter: <Splitter> {}
+    }
+}
\ No newline at end of file
diff --git a/src/home/main_desktop_ui.rs b/src/home/main_desktop_ui.rs
new file mode 100644
index 00000000..bae31bf0
--- /dev/null
+++ b/src/home/main_desktop_ui.rs
@@ -0,0 +1,260 @@
+use makepad_widgets::*;
+use matrix_sdk::ruma::OwnedRoomId;
+use std::collections::HashMap;
+
+use crate::app::{AppState, SelectedRoom};
+
+use super::room_screen::RoomScreenWidgetRefExt;
+live_design! {
+    import makepad_widgets::base::*;
+    import makepad_widgets::theme_desktop_dark::*;
+    import makepad_draw::shader::std::*;
+
+    import crate::shared::styles::*;
+    import crate::home::light_themed_dock::*;
+    import crate::home::welcome_screen::WelcomeScreen;
+    import crate::home::rooms_sidebar::RoomsSideBar;
+    import crate::home::room_screen::RoomScreen;
+
+    MainDesktopUI = {{MainDesktopUI}} {
+        dock = <Dock> {
+            width: Fill,
+            height: Fill,
+            padding: 0,
+            spacing: 0,
+
+            root = Splitter {
+                axis: Horizontal,
+                align: FromA(300.0),
+                a: rooms_sidebar_tab,
+                b: main
+            }
+
+            // Not really a tab, but it needs to be one to be used in the dock
+            rooms_sidebar_tab = Tab {
+                name: "" // show no tab header
+                kind: rooms_sidebar
+            }
+
+            main = Tabs{tabs:[home_tab], selected:0}
+
+            home_tab = Tab {
+                name: "Home"
+                kind: welcome_screen
+                template: PermanentTab
+            }
+
+            rooms_sidebar = <RoomsSideBar> {}
+            welcome_screen = <WelcomeScreen> {}
+            room_screen = <RoomScreen> {}
+        }
+    }
+}
+
+#[derive(Live, LiveHook, Widget)]
+pub struct MainDesktopUI {
+    #[deref]
+    view: View,
+
+    /// The rooms that are currently open
+    #[rust]
+    open_rooms: HashMap<LiveId, OwnedRoomId>,
+
+    /// The tab that should be closed in the next draw event
+    #[rust]
+    tab_to_close: Option<LiveId>,
+
+    /// The order in which the rooms were opened
+    #[rust]
+    room_order: Vec<OwnedRoomId>,
+}
+
+impl Widget for MainDesktopUI {
+    fn handle_event(&mut self, cx: &mut Cx, event: &Event, scope: &mut Scope) {
+        self.match_event(cx, event);
+        self.view.handle_event(cx, event, scope);
+    }
+
+    fn draw_walk(&mut self, cx: &mut Cx2d, scope: &mut Scope, walk: Walk) -> DrawStep {
+        let dock = self.view.dock(id!(dock));
+        let app_state = scope.data.get_mut::<AppState>().unwrap();
+
+        // In case a room is closed, this will be the newly selected room if there is one
+        let mut new_selected_room: Option<SelectedRoom> = None;
+        let mut focus_reset = false;
+
+        if let Some(tab_id) = self.tab_to_close {
+            if let Some(room_id) = self.open_rooms.get(&tab_id) {
+                self.room_order.remove(
+                    self.room_order.iter().position(|id| id == room_id).unwrap()
+                );
+
+                if self.open_rooms.len() > 1 {
+                    // if the closing tab is the active one, then focus the next room
+                    let active_room = app_state.rooms_panel.selected_room.as_ref();
+                    if let Some(active_room) = active_room {
+                        if active_room.id == *room_id {
+                            if let Some(new_focused_room_id) = self.room_order.last() {
+                                // notify the app state about the new focused room
+                                cx.widget_action(
+                                    self.widget_uid(),  
+                                    &scope.path,
+                                    RoomsPanelAction::RoomFocused(new_focused_room_id.clone()),
+                                );
+
+                                // set the new selected room to be used in the current draw
+                                new_selected_room = Some(SelectedRoom {
+                                    id: new_focused_room_id.clone(),
+                                    name: None
+                                });
+                            }
+                        }
+                    }
+                } else {
+                    // if there is no room to focus, reset the selected room in the app state
+                    // app_state.rooms_panel.selected_room = None;
+                    cx.widget_action(
+                        self.widget_uid(),
+                        &scope.path,
+                        RoomsPanelAction::FocusNone,
+                    );
+
+                    focus_reset = true;
+                    dock.select_tab(cx, live_id!(home_tab));
+                } 
+            } 
+            dock.close_tab(cx, tab_id);
+            self.tab_to_close = None;
+            self.open_rooms.remove(&tab_id);
+        }
+
+        // if the focus was not reset, then focus the new selected room or the previously selected one
+        if !focus_reset {           
+            if let Some(room) = new_selected_room {
+                self.focus_or_create_tab(cx, &room);
+            } else if let Some(room) = app_state.rooms_panel.selected_room.as_ref() {
+                self.focus_or_create_tab(cx, room);
+            }
+        }
+        self.view.draw_walk(cx, scope, walk)
+    }
+}
+
+impl MainDesktopUI {
+    /// Focuses on a room if it is already open, otherwise creates a new tab for the room
+    fn focus_or_create_tab(&mut self, cx: &mut Cx2d, room: &SelectedRoom) {
+        let dock = self.view.dock(id!(dock));
+
+        // if the room is already open, select its tab
+        let room_id_as_live_id = LiveId::from_str(&room.id.to_string());
+        if self.open_rooms.contains_key(&room_id_as_live_id) {
+            dock.select_tab(cx, room_id_as_live_id);
+            return;
+        }
+
+        self.open_rooms.insert(room_id_as_live_id, room.id.clone());
+
+        let displayed_room_name = room
+            .name
+            .clone()
+            .unwrap_or_else(|| format!("Room ID {}", &room.id));
+
+        // create a new tab for the room
+        let (tab_bar, _pos) = dock.find_tab_bar_of_tab(live_id!(home_tab)).unwrap();
+        let kind = live_id!(room_screen);
+
+        let result = dock.create_and_select_tab(
+            cx,
+            tab_bar,
+            room_id_as_live_id,
+            kind,
+            displayed_room_name.clone(),
+            live_id!(CloseableTab),
+            // `None` will insert the tab at the end
+            None,
+        );
+
+        // if the tab was created, set the room screen and add the room to the room order
+        if let Some(widget) = result {
+            self.room_order.push(room.id.clone());
+            widget.as_room_screen().set_displayed_room(
+                cx,
+                displayed_room_name,
+                room.id.clone(),
+            );
+        }
+    }
+}
+
+impl MatchEvent for MainDesktopUI {
+    fn handle_action(&mut self, cx: &mut Cx, action: &Action) {
+        let dock = self.view.dock(id!(dock));
+
+        if let Some(action) = action.as_widget_action() {
+            match action.cast() {
+                // Whenever a tab is pressed notify the app state about it, except for the home tab
+                DockAction::TabWasPressed(tab_id) => {
+                    if tab_id == live_id!(home_tab) {
+                        cx.widget_action(
+                            self.widget_uid(),
+                            &HeapLiveIdPath::default(),
+                            RoomsPanelAction::FocusNone,
+                        );
+                    } else if let Some(room_id) = self.open_rooms.get(&tab_id) {
+                        cx.widget_action(
+                            self.widget_uid(),
+                            &HeapLiveIdPath::default(),
+                            RoomsPanelAction::RoomFocused(room_id.clone()),
+                        );
+                    }   
+                }
+                // Whenever a tab is closed, defer the close to the next event loop to prevent closing the tab while the app state
+                // still has the room as selected
+                DockAction::TabCloseWasPressed(tab_id) => {
+                    self.tab_to_close = Some(tab_id);
+                    self.redraw(cx);
+                }
+                // When dragging a tab, allow it to be dragged
+                DockAction::ShouldTabStartDrag(tab_id) => {
+                    dock.tab_start_drag(
+                        cx,
+                        tab_id,
+                        DragItem::FilePath {
+                            path: "".to_string(),
+                            internal_id: Some(tab_id),
+                        },
+                    );
+                }
+                // When dragging a tab, allow it to be dragged
+                DockAction::Drag(drag_event) => {
+                    if drag_event.items.len() == 1 {
+                        dock.accept_drag(cx, drag_event, DragResponse::Move);
+                    }
+                }
+                // When dropping a tab, move it to the new position
+                DockAction::Drop(drop_event) => {
+                    if let DragItem::FilePath {
+                        path: _,
+                        internal_id,
+                    } = &drop_event.items[0]
+                    {
+                        // from inside the dock, otherwise it's an external file
+                        if let Some(internal_id) = internal_id {
+                            dock.drop_move(cx, drop_event.abs, *internal_id);
+                        }
+                    }
+                }
+                _ => (),
+            }
+        }
+    }
+}
+
+#[derive(Clone, DefaultNone, Debug)]
+pub enum RoomsPanelAction {
+    None,
+    /// Notifies that a room was focused
+    RoomFocused(OwnedRoomId),
+    /// Resets the focus on the rooms panel
+    FocusNone,
+}
diff --git a/src/home/main_content.rs b/src/home/main_mobile_ui.rs
similarity index 86%
rename from src/home/main_content.rs
rename to src/home/main_mobile_ui.rs
index faf7356d..d515dc63 100644
--- a/src/home/main_content.rs
+++ b/src/home/main_mobile_ui.rs
@@ -10,13 +10,12 @@ live_design! {
     import makepad_draw::shader::std::*;
 
     import crate::shared::styles::*;
-    import crate::shared::search_bar::SearchBar;
     import crate::shared::cached_widget::CachedWidget;
 
     import crate::home::room_screen::RoomScreen;
     import crate::home::welcome_screen::WelcomeScreen;
 
-    MainContent = {{MainContent}} {
+    MainMobileUI = {{MainMobileUI}} {
         width: Fill, height: Fill
         flow: Down,
         show_bg: true
@@ -25,32 +24,28 @@ live_design! {
         }
         align: {x: 0.0, y: 0.5}
 
-        <SearchBar> {}
 
         welcome = <WelcomeScreen> {}
         rooms = <View> {
             align: {x: 0.5, y: 0.5}
             width: Fill, height: Fill
-            <CachedWidget> {
-                room_screen = <RoomScreen> {}
-            }
+            room_screen = <RoomScreen> {}
         }
     }
 }
 
 #[derive(Live, LiveHook, Widget)]
-pub struct MainContent {
+pub struct MainMobileUI {
     #[deref]
     view: View,
 }
 
-impl Widget for MainContent {
+impl Widget for MainMobileUI {
     fn handle_event(&mut self, cx: &mut Cx, event: &Event, scope: &mut Scope) {
         self.view.handle_event(cx, event, scope);
     }
 
     fn draw_walk(&mut self, cx: &mut Cx2d, scope: &mut Scope, walk: Walk) -> DrawStep {
-        // log!("Redrawing MainContent");
         let app_state = scope.data.get::<AppState>().unwrap();
 
         if let Some(room) = app_state.rooms_panel.selected_room.as_ref() {
diff --git a/src/home/mod.rs b/src/home/mod.rs
index f4e0a250..6e03136d 100644
--- a/src/home/mod.rs
+++ b/src/home/mod.rs
@@ -1,13 +1,15 @@
 use makepad_widgets::Cx;
 
 pub mod home_screen;
-pub mod main_content;
+pub mod main_mobile_ui;
+pub mod main_desktop_ui;
 pub mod room_preview;
 pub mod room_screen;
 pub mod rooms_list;
 pub mod rooms_sidebar;
 pub mod spaces_dock;
 pub mod welcome_screen;
+pub mod light_themed_dock;  
 
 pub fn live_design(cx: &mut Cx) {
     home_screen::live_design(cx);
@@ -15,7 +17,9 @@ pub fn live_design(cx: &mut Cx) {
     room_preview::live_design(cx);
     room_screen::live_design(cx);
     rooms_sidebar::live_design(cx);
-    main_content::live_design(cx);
+    main_mobile_ui::live_design(cx);
+    main_desktop_ui::live_design(cx);
     spaces_dock::live_design(cx);
     welcome_screen::live_design(cx);
+    light_themed_dock::live_design(cx);
 }
diff --git a/src/home/room_preview.rs b/src/home/room_preview.rs
index cb559e39..4d0f6d2a 100644
--- a/src/home/room_preview.rs
+++ b/src/home/room_preview.rs
@@ -2,7 +2,8 @@ use makepad_widgets::*;
 
 use crate::{
     shared::{
-        adaptive_view::{AdaptiveViewWidgetExt, DisplayContext}, avatar::AvatarWidgetExt,
+        adaptive_view::{AdaptiveViewWidgetExt, DisplayContext},
+        avatar::AvatarWidgetExt,
         html_or_plaintext::HtmlOrPlaintextWidgetExt,
     },
     utils::{self, relative_format},
@@ -101,7 +102,7 @@ live_design! {
             }
         }
     }
-    
+
     RoomPreview = {{RoomPreview}} {
         // Wraps the RoomPreviewContent in an AdaptiveView
         // to change the displayed content (and its layout) based on the available space in the sidebar.
@@ -155,12 +156,10 @@ impl LiveHook for RoomPreview {
         // Adapt the preview based on the available space.
         self.view
             .adaptive_view(id!(adaptive_preview))
-            .set_variant_selector(cx, |_cx, parent_size| {
-                match parent_size.x {
-                    x if x <= 100. => live_id!(OnlyIcon),
-                    x if x <= 250. => live_id!(IconAndName),
-                    _ => live_id!(FullPreview),
-                }
+            .set_variant_selector(cx, |_cx, parent_size| match parent_size.x {
+                x if x <= 100. => live_id!(OnlyIcon),
+                x if x <= 250. => live_id!(IconAndName),
+                _ => live_id!(FullPreview),
             });
     }
 }
@@ -242,7 +241,7 @@ impl Widget for RoomPreviewContent {
                 // Mobile doesn't have a selected state. Always use the default colors.
                 // We call the update in case the app was resized from desktop to mobile while the room was selected.
                 // This can be optimized by only calling this when the app is resized.
-                self.update_preview_colors(cx, false); 
+                self.update_preview_colors(cx, false);
             }
         }
         self.view.draw_walk(cx, scope, walk)
@@ -279,44 +278,51 @@ impl RoomPreviewContent {
             ),
         );
 
-        self.view.label(id!(room_name)).apply_over(
-            cx,
-            live!(
+        // We check that the UI elements exist to avoid unnecessary updates, and prevent error logs.
+        if !self.view.label(id!(room_name)).is_empty() {
+            self.view.label(id!(room_name)).apply_over(
+                cx,
+                live!(
                 draw_text: {
                     color: (room_name_color)
                 }
-            ),
-        );
+                ),
+            );
+        }
 
-        self.view.label(id!(timestamp)).apply_over(
-            cx,
-            live!(
-                    draw_text: {
-                        color: (timestamp_color)
-                    }
-            ),
-        );
+        if !self.view.label(id!(timestamp)).is_empty() {
+            self.view.label(id!(timestamp)).apply_over(
+                cx,
+                live!(
+                draw_text: {
+                    color: (timestamp_color)
+                }
+                ),
+            );
+        }
 
-        self.html_or_plaintext(id!(latest_message)).apply_over(
-            cx,
-            live!(
-                    html_view = {
-                        html = {
-                            font_color: (message_text_color),
-                            draw_normal:      { color: (message_text_color) },
-                            draw_italic:      { color: (message_text_color) },
-                            draw_bold:        { color: (message_text_color) },
-                            draw_bold_italic: { color: (message_text_color) },
-                        }
+        if !self.view.html_or_plaintext(id!(latest_message)).is_empty() {
+            self.view.html_or_plaintext(id!(latest_message)).apply_over(
+                cx,
+                live!(
+                html_view = {
+                    html = {
+                        font_color: (message_text_color),
+                        draw_normal:      { color: (message_text_color) },
+                        draw_italic:      { color: (message_text_color) },
+                        draw_bold:        { color: (message_text_color) },
+                        draw_bold_italic: { color: (message_text_color) },
                     }
-                    plaintext_view = {
-                        pt_label = {
-                            draw_text: {
-                                color: (message_text_color)
-                            }
+                }
+                plaintext_view = {
+                    pt_label = {
+                        draw_text: {
+                            color: (message_text_color)
                         }
                     }
-            ),
-        );
+                }
+                ),
+            );
+        }
     }
 }
diff --git a/src/home/room_screen.rs b/src/home/room_screen.rs
index 37aaa5fd..a0023a64 100644
--- a/src/home/room_screen.rs
+++ b/src/home/room_screen.rs
@@ -690,27 +690,6 @@ live_design! {
         }
         flow: Down, spacing: 0.0
 
-
-        tab_title = <View> {
-            width: Fit, height: Fit,
-            align: {x: 0.0, y: 0.5},
-            margin: {top: 10.0}
-            padding: 10.
-            show_bg: true
-            draw_bg: {
-                color: (COLOR_PRIMARY)
-            }
-            room_name = <Label> {
-                draw_text: {
-                    color: #4
-                    text_style: {
-                        font_size: 10.
-                    }
-                }
-            }
-        }
-
-
         <View> {
             width: Fill, height: Fill,
             flow: Overlay,
@@ -928,7 +907,7 @@ live_design! {
 
 /// A simple deref wrapper around the `RoomScreen` widget that enables us to handle its events.
 #[derive(Live, LiveHook, Widget)]
-struct RoomScreen {
+pub struct RoomScreen {
     #[deref] view: View,
 
     /// The room ID of the currently-shown room.
@@ -941,6 +920,14 @@ struct RoomScreen {
     #[rust] fully_read_timer: Timer,
 }
 
+impl Drop for RoomScreen {
+    fn drop(&mut self) {
+        // Make sure to return the room state back to TIMELINE_STATES, so that other RoomScreen instances can access it.
+        // RoomScreen is dropped whenever a tab is closed or the app is resized to a different AdaptiveView layout.
+        self.save_state();
+    }
+}
+
 impl RoomScreen{
     fn send_user_read_receipts_based_on_scroll_pos(
         &mut self,
@@ -1100,15 +1087,20 @@ impl Widget for RoomScreen {
 
                 // Handle the action that requests to show the user profile sliding pane.
                 if let ShowUserProfileAction::ShowUserProfile(profile_and_room_id) = action.as_widget_action().cast() {
-                    self.show_user_profile(
-                        cx,
-                        &pane,
-                        UserProfilePaneInfo {
-                            profile_and_room_id,
-                            room_name: self.room_name.clone(),
-                            room_member: None,
-                        },
-                    );
+                    // Only show the user profile in room that this avatar belongs to
+                    if let Some(room_id) = self.room_id.as_ref() {
+                        if profile_and_room_id.room_id == *room_id {
+                            self.show_user_profile(
+                                cx,
+                                &pane,
+                                UserProfilePaneInfo {
+                                    profile_and_room_id,
+                                    room_name: self.room_name.clone(),
+                                    room_member: None,
+                                },
+                            );
+                        }
+                    }
                 }
 
                 // Handle a link being clicked.
diff --git a/src/home/rooms_list.rs b/src/home/rooms_list.rs
index e29e5113..54797d0c 100644
--- a/src/home/rooms_list.rs
+++ b/src/home/rooms_list.rs
@@ -3,7 +3,7 @@ use crossbeam_queue::SegQueue;
 use makepad_widgets::*;
 use matrix_sdk::ruma::{MilliSecondsSinceUnixEpoch, OwnedRoomId};
 
-use crate::sliding_sync::{submit_async_request, MatrixRequest};
+use crate::{app::AppState, sliding_sync::{submit_async_request, MatrixRequest}};
 
 use super::room_preview::RoomPreviewAction;
 
@@ -167,6 +167,8 @@ pub struct RoomsList {
     #[rust] all_rooms: Vec<RoomPreviewEntry>,
     /// Maps the WidgetUid of a `RoomPreview` to that room's index in the `all_rooms` vector.
     #[rust] rooms_list_map: HashMap<u64, usize>,
+    /// Maps the OwnedRoomId to the index of the room in the `all_rooms` vector.
+    #[rust] rooms_list_owned_room_id_map: HashMap<OwnedRoomId, usize>,
     /// The latest status message that should be displayed in the bottom status label.
     #[rust] status: String,
     /// The index of the currently selected room
@@ -194,6 +196,8 @@ impl Widget for RoomsList {
                 num_updates += 1;
                 match update {
                     RoomsListUpdate::AddRoom(room) => {
+                        let room_index = self.all_rooms.len();
+                        self.rooms_list_owned_room_id_map.insert(room.room_id.clone(), room_index);
                         self.all_rooms.push(room);
                     }
                     RoomsListUpdate::UpdateRoomAvatar { room_id, avatar } => {
@@ -277,6 +281,15 @@ impl Widget for RoomsList {
     fn draw_walk(&mut self, cx: &mut Cx2d, scope: &mut Scope, walk: Walk) -> DrawStep {
 
         // TODO: sort list of `all_rooms` by alphabetic, most recent message, grouped by spaces, etc
+        let app_state = scope.data.get_mut::<AppState>().unwrap();
+        // Override the current active room index if the app state has a different selected room
+        if let Some(room) = app_state.rooms_panel.selected_room.as_ref() {
+            if let Some(room_index) = self.rooms_list_owned_room_id_map.get(&room.id) {
+                self.current_active_room_index = Some(*room_index);
+            }
+        } else {
+            self.current_active_room_index = None;
+        }
 
         let count = self.all_rooms.len();
         let status_label_id = count;
diff --git a/src/home/rooms_sidebar.rs b/src/home/rooms_sidebar.rs
index 357c8a82..f7213eb1 100644
--- a/src/home/rooms_sidebar.rs
+++ b/src/home/rooms_sidebar.rs
@@ -157,7 +157,7 @@ live_design! {
         Desktop = <RoomsView> {
             padding: {top: 20., left: 10., right: 10.}
             flow: Down, spacing: 10
-            width: 280, height: Fill
+            width: Fill, height: Fill
         },
         Mobile = <RoomsView> {
             padding: {top: 17., left: 17., right: 17.}

From 49bc86988d68611d3d36dbbcb86d8d2d06272d44 Mon Sep 17 00:00:00 2001
From: Kevin Boos <kevinaboos@gmail.com>
Date: Thu, 10 Oct 2024 11:37:46 -0700
Subject: [PATCH 04/12] Location sharing to a Matrix room now works!

Currently only tested on macOS, and the application must be fully
packaged and codesigned into a valid app bundle, and then installed
to the `/Applications` folder on macOS in order to work.
You also have to manually allow Robrix to access location in:
System Preferences -> Privacy & Security -> Location Services.

Location messages are not yet actually displayed correctly in
the timeline room screen view, but that's an easy fix.
---
 Cargo.lock                          |   4 +-
 Cargo.toml                          |   2 +
 packaging/Entitlements.plist        |   8 +
 packaging/Info.plist                |  61 ++++++
 resources/icons/location-person.svg |  21 ++
 resources/icons/location-poi.svg    |   2 -
 src/home/room_screen.rs             | 319 +++++++++++++++++++---------
 src/location.rs                     |   9 +-
 8 files changed, 321 insertions(+), 105 deletions(-)
 create mode 100644 packaging/Entitlements.plist
 create mode 100644 packaging/Info.plist
 create mode 100644 resources/icons/location-person.svg
 delete mode 100644 resources/icons/location-poi.svg

diff --git a/Cargo.lock b/Cargo.lock
index dd46386b..00aa9dc8 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1621,7 +1621,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4"
 dependencies = [
  "cfg-if",
- "windows-targets 0.52.6",
+ "windows-targets 0.48.5",
 ]
 
 [[package]]
@@ -3096,7 +3096,7 @@ dependencies = [
 [[package]]
 name = "robius-location"
 version = "0.1.0"
-source = "git+https://github.com/project-robius/robius-location#544c57e3d4f4ee6257a5c290e3e76104acae6046"
+source = "git+https://github.com/project-robius/robius-location#d47bd115f50247b98787efc72236dc65ab9c53bc"
 dependencies = [
  "android-build",
  "cfg-if",
diff --git a/Cargo.toml b/Cargo.toml
index 5e8cbf24..ed016d84 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -176,6 +176,8 @@ section = "utils"
 [package.metadata.packager.macos]
 minimum_system_version = "11.0"
 frameworks = [ ]
+info_plist_path = "./packaging/Info.plist"
+entitlements = "./packaging/Entitlements.plist"
 signing_identity = "Developer ID Application: AppChef Inc. (SFVQ5V48GD)"
 
 
diff --git a/packaging/Entitlements.plist b/packaging/Entitlements.plist
new file mode 100644
index 00000000..09fb4c40
--- /dev/null
+++ b/packaging/Entitlements.plist
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+    <key>com.apple.security.personal-information.location</key>
+    <true/>
+</dict>
+</plist>
diff --git a/packaging/Info.plist b/packaging/Info.plist
new file mode 100644
index 00000000..48031619
--- /dev/null
+++ b/packaging/Info.plist
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>English</string>
+	<key>CFBundleDisplayName</key>
+	<string>Robrix</string>
+	<key>CFBundleExecutable</key>
+	<string>robrix</string>
+	<key>CFBundleIconFile</key>
+	<string>Robrix.icns</string>
+	<key>CFBundleIdentifier</key>
+	<string>org.robius.robrix</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>Robrix</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>0.0.1-pre-alpha</string>
+	<key>CFBundleVersion</key>
+	<string>20241009.225157</string>
+	<key>CSResourcesFileMapped</key>
+	<true/>
+	<key>LSApplicationCategoryType</key>
+	<string>public.app-category.social-networking</string>
+	<key>LSMinimumSystemVersion</key>
+	<string>11.0</string>
+	<key>CFBundleURLTypes</key>
+	<array>
+		<dict>
+			<key>CFBundleURLSchemes</key>
+			<array>
+				<string>robrix</string>
+				<string>matrix</string>
+			</array>
+			<key>CFBundleURLName</key>
+			<string>org.robius.robrix robrix</string>
+			<key>CFBundleTypeRole</key>
+			<string>Viewer</string>
+		</dict>
+	</array>
+	<key>LSRequiresCarbon</key>
+	<true/>
+	<key>NSHighResolutionCapable</key>
+	<true/>
+	<key>NSHumanReadableCopyright</key>
+	<string>Copyright 2023-2024, Project Robius</string>
+	<key>NSLocationAlwaysAndWhenInUseUsageDescription</key>
+	<string>Robrix needs permission to share your current location to a Matrix room.</string>
+	<key>NSLocationWhenInUseUsageDescription</key>
+	<string>Robrix needs permission to share your current location to a Matrix room.</string>
+	<key>NSLocationUsageDescription</key>
+	<string>Robrix needs permission to share your current location to a Matrix room.</string>
+	<key>NSLocationDefaultAccuracyReduced</key>
+	<false/>
+	
+</dict>
+</plist>
\ No newline at end of file
diff --git a/resources/icons/location-person.svg b/resources/icons/location-person.svg
new file mode 100644
index 00000000..981447a4
--- /dev/null
+++ b/resources/icons/location-person.svg
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
+<svg height="800px" width="800px" version="1.1" id="_x32_" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" 
+	 viewBox="0 0 512 512"  xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#000000;}
+</style>
+<g>
+	<path class="st0" d="M405.974,62.12C364.561,20.707,310.275,0,255.997,0C201.72,0,147.443,20.707,106.029,62.12
+		c-82.814,82.81-82.814,217.11,0,299.929L255.997,512l149.976-149.951C488.784,279.23,488.784,144.93,405.974,62.12z
+		 M382.328,338.394L255.997,464.708L129.68,338.403c-69.653-69.657-69.653-182.988,0-252.637
+		c33.738-33.738,78.601-52.322,126.318-52.322c47.717,0,92.584,18.584,126.322,52.322
+		C451.977,155.414,451.977,268.746,382.328,338.394z"/>
+	<path class="st0" d="M255.997,213.207c30.513,0,55.249-24.724,55.249-55.253c0-30.513-24.736-55.245-55.249-55.245
+		c-30.521,0-55.257,24.732-55.257,55.245C200.74,188.483,225.477,213.207,255.997,213.207z"/>
+	<path class="st0" d="M255.997,233.979c-43.785,0-79.274,35.502-79.274,79.274h158.546
+		C335.268,269.481,299.775,233.979,255.997,233.979z"/>
+</g>
+</svg>
\ No newline at end of file
diff --git a/resources/icons/location-poi.svg b/resources/icons/location-poi.svg
deleted file mode 100644
index 1c7515d5..00000000
--- a/resources/icons/location-poi.svg
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
-<svg width="800px" height="800px" viewBox="0 0 100 100" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" class="iconify iconify--gis" preserveAspectRatio="xMidYMid meet"><path d="M68.913 48.908l-.048.126c.015-.038.027-.077.042-.115l.006-.011z" fill="#000000"></path><path d="M50.002 0C33.524 0 20 13.48 20 29.922c0 6.372 2.04 12.31 5.48 17.174l-.123-.192l19.206 33.198l.097.127c.774 1.01 1.54 1.824 2.467 2.437c.927.613 2.114 1 3.28.883c2.33-.234 3.684-1.844 4.935-3.54l.078-.105L76.594 43.87l.017-.03c.507-.915.874-1.838 1.188-2.732A29.578 29.578 0 0 0 80 29.922C80 13.48 66.48 0 50.002 0zm0 5C63.756 5 75 16.218 75 29.922a24.55 24.55 0 0 1-1.84 9.332l-.025.062l-.022.065c-.263.757-.549 1.444-.879 2.04L51.275 77.087c-.927 1.221-1.575 1.51-1.367 1.488c.107-.01.206.074-.023-.078c-.219-.145-.666-.57-1.196-1.246L29.63 44.3l-.067-.093C26.69 40.147 25 35.23 25 29.922C25 16.219 36.248 5 50.002 5zm0 7.85c-9.462 0-17.115 7.626-17.115 17.072c0 9.446 7.654 17.072 17.115 17.072c9.461 0 17.111-7.627 17.111-17.072c0-9.446-7.65-17.072-17.111-17.072zm0 5c6.817 0 12.111 5.285 12.111 12.072c0 6.787-5.293 12.072-12.111 12.072c-6.818 0-12.115-5.286-12.115-12.072c0-6.787 5.298-12.072 12.115-12.072z" fill="#000000"></path><path d="M34.006 69.057C19.88 71.053 10 75.828 10 82.857C10 92.325 26.508 100 50 100s40-7.675 40-17.143c0-7.029-9.879-11.804-24.004-13.8l-1.957 3.332C74.685 73.866 82 76.97 82 80.572c0 5.05-14.327 9.143-32 9.143c-17.673 0-32-4.093-32-9.143c-.001-3.59 7.266-6.691 17.945-8.174c-.645-1.114-1.294-2.226-1.94-3.341z" fill="#000000"></path></svg>
\ No newline at end of file
diff --git a/src/home/room_screen.rs b/src/home/room_screen.rs
index 651aa105..aac97f00 100644
--- a/src/home/room_screen.rs
+++ b/src/home/room_screen.rs
@@ -1,7 +1,7 @@
 //! A room screen is the UI page that displays a single Room's timeline of events/messages
 //! along with a message input bar at the bottom.
 
-use std::{borrow::Cow, collections::{BTreeMap, HashMap}, ops::{DerefMut, Range}, sync::{Arc, Mutex}, time::Instant};
+use std::{borrow::Cow, collections::{BTreeMap, HashMap}, ops::{DerefMut, Range}, sync::{Arc, Mutex}, time::{Instant, SystemTime}};
 
 use imbl::Vector;
 use makepad_widgets::*;
@@ -9,7 +9,7 @@ use matrix_sdk::{
     ruma::{
         events::room::{
             message::{
-                FormattedBody, ImageMessageEventContent, MessageFormat, MessageType, NoticeMessageEventContent, RoomMessageEventContent, TextMessageEventContent
+                FormattedBody, ImageMessageEventContent, LocationMessageEventContent, MessageFormat, MessageType, NoticeMessageEventContent, RoomMessageEventContent, TextMessageEventContent
             },
             MediaSource,
         },
@@ -22,9 +22,10 @@ use matrix_sdk_ui::timeline::{
     RoomMembershipChange, TimelineDetails, TimelineItem, TimelineItemContent, TimelineItemKind,
     VirtualTimelineItem,
 };
+use robius_location::Coordinates;
 
 use crate::{
-    avatar_cache::{self, AvatarCacheEntry}, event_preview::{text_preview_of_member_profile_change, text_preview_of_other_state, text_preview_of_redacted_message, text_preview_of_room_membership_change, text_preview_of_timeline_item}, location::{get_latest_location, init_location_subscriber, request_location_update, LocationRequest, LocationUpdate}, media_cache::{MediaCache, MediaCacheEntry}, profile::{
+    avatar_cache::{self, AvatarCacheEntry}, event_preview::{text_preview_of_member_profile_change, text_preview_of_other_state, text_preview_of_redacted_message, text_preview_of_room_membership_change, text_preview_of_timeline_item}, location::{get_latest_location, init_location_subscriber, request_location_update, LocationAction, LocationRequest, LocationUpdate}, media_cache::{MediaCache, MediaCacheEntry}, profile::{
         user_profile::{AvatarState, ShowUserProfileAction, UserProfile, UserProfileAndRoomId, UserProfilePaneInfo, UserProfileSlidingPaneRef, UserProfileSlidingPaneWidgetExt},
         user_profile_cache,
     }, shared::{
@@ -49,6 +50,7 @@ live_design! {
     import crate::shared::html_or_plaintext::*;
     import crate::profile::user_profile::UserProfileSlidingPane;
     import crate::shared::typing_animation::TypingAnimation;
+    import crate::shared::icon_button::RobrixIconButton;
 
     IMG_DEFAULT_AVATAR = dep("crate://self/resources/img/default_avatar.png")
     ICO_FAV = dep("crate://self/resources/icon_favorite.svg")
@@ -59,8 +61,9 @@ live_design! {
     ICO_USER = dep("crate://self/resources/icon_user.svg")
     ICO_ADD = dep("crate://self/resources/icon_add.svg")
     ICO_CLOSE = dep("crate://self/resources/icons/close.svg")
-    ICO_LOCATION_POI = dep("crate://self/resources/icons/location_poi.svg")
     ICO_JUMP_TO_BOTTOM = dep("crate://self/resources/icon_jump_to_bottom.svg")
+    
+    ICO_LOCATION_PERSON = dep("crate://self/resources/icons/location-person.svg")
 
     TEXT_SUB = {
         font_size: (10),
@@ -678,6 +681,84 @@ live_design! {
 
     }
 
+    LocationPreview = {{LocationPreview}} {
+        visible: false
+        width: Fill
+        height: Fit
+        flow: Down
+        padding: {left: 12.0, top: 12.0, bottom: 12.0, right: 10.0}
+        spacing: 15
+
+        show_bg: true,
+        draw_bg: {
+            color: #EEEEEE,
+        }
+
+        <Label> {
+            draw_text: {
+                wrap: Word,
+                color: (MESSAGE_TEXT_COLOR),
+                text_style: <MESSAGE_TEXT_STYLE>{ font_size: 10.0 },
+            }
+            text: "Send your location to this room?"
+        }
+
+        location_label = <Label> {
+            align: {x: 0.0, y: 0.5},
+            padding: {left: 5.0}
+            draw_text: {
+                wrap: Word,
+                color: (MESSAGE_TEXT_COLOR),
+                text_style: <MESSAGE_TEXT_STYLE>{},
+            }
+            text: "Fetching current location..."
+        }
+
+        <View> {
+            width: Fill, height: Fit
+            flow: Right,
+            align: {x: 0.0, y: 0.5}
+            spacing: 15
+
+            cancel_location_button = <RobrixIconButton> {
+                padding: {left: 15, right: 15}
+                draw_icon: {
+                    svg_file: (ICON_BLOCK_USER)
+                    color: (COLOR_DANGER_RED),
+                }
+                icon_walk: {width: 16, height: 16, margin: {left: -2, right: -1, top: -1} }
+
+                draw_bg: {
+                    border_color: (COLOR_DANGER_RED),
+                    color: #fff0f0 // light red
+                }
+                text: "Cancel"
+                draw_text:{
+                    color: (COLOR_DANGER_RED),
+                }
+            }
+
+            send_location_button = <RobrixIconButton> {
+                padding: {left: 15, right: 15}
+                draw_icon: {
+                    svg_file: (ICO_SEND)
+                    color: (COLOR_ACCEPT_GREEN),
+                }
+                icon_walk: {width: 16, height: 16, margin: {left: -2, right: -1} }
+
+                draw_bg: {
+                    border_color: (COLOR_ACCEPT_GREEN),
+                    color: #f0fff0 // light green
+                }
+                text: "Yes"
+                draw_text:{
+                    color: (COLOR_ACCEPT_GREEN),
+                }
+            }
+        }
+    }
+
+
     IMG_SMILEY_FACE_BW = dep("crate://self/resources/img/smiley_face_bw.png")
     IMG_PLUS = dep("crate://self/resources/img/plus.png")
     IMG_KEYBOARD_ICON = dep("crate://self/resources/img/keyboard_icon.png")
@@ -799,69 +880,8 @@ live_design! {
                     typing_animation = <TypingAnimation> {}
                 }
 
-                // Below that, display a preview of the current location that a user is about to share.
-                location_preview = <View> {
-                    visible: false
-                    width: Fill
-                    height: Fit
-                    flow: Down
-                    padding: 0.0
-
-                    show_bg: true,
-                    draw_bg: {
-                        color: #EEEEEE,
-                    }
-
-                    <View> {
-                        width: Fill
-                        height: Fit
-                        flow: Right
-                        padding: {left: 12.0, top: 8.0, bottom: 8.0, right: 10.0}
-                        align: {y: 0.5}
-
-                        <Label> {
-                            draw_text: {
-                                wrap: Ellipsis,
-                                color: (MESSAGE_TEXT_COLOR),
-                                text_style: <MESSAGE_TEXT_STYLE>{ font_size: 10.0 },
-                            }
-                            text: "Share location to this room:"
-                        }
-
-                        filler = <View> {width: Fill, height: Fill}
-
-                        // TODO: Fix style
-                        cancel_location_button = <IconButton> {
-                            width: Fit,
-                            height: Fit,
-
-                            draw_icon: {
-                                svg_file: (ICO_CLOSE),
-                                fn get_color(self) -> vec4 {
-                                   return (COLOR_META)
-                                }
-                            }
-                            icon_walk: {width: 12, height: 12}
-                        }
-                    }
-
-                    <View> {
-                        width: Fill
-                        height: Fit
-                        flow: Down
-
-                        location_label = <Label> {
-                            align: {x: 0.0, y: 0.5},
-                            padding: {left: 5.0}
-                            draw_text: {
-                                wrap: Word,
-                                color: (MESSAGE_TEXT_COLOR),
-                                text_style: <MESSAGE_TEXT_STYLE>{},
-                            }
-                            text: "Fetching current location..."
-                        }
-                    }
-                }
+                // Below that, display a preview of the current location that a user is about to send.
+                location_preview = <LocationPreview> { }
 
                 // Below that, display a view that holds the message input bar and send button.
                 <View> {
@@ -873,9 +893,9 @@ live_design! {
                     }
 
                     location_button = <IconButton> {
-                        draw_icon: {svg_file: (ICO_LOCATION_POI)},
-                        icon_walk: {width: 18.0, height: Fit},
-                        text: "LOC",
+                        draw_icon: {svg_file: (ICO_LOCATION_PERSON)},
+                        icon_walk: {width: 22.0, height: Fit, margin: {left: 0, right: 5, bottom: -5}},
+                        text: "",
                     }
 
                     message_input = <TextInput> {
@@ -990,7 +1010,7 @@ struct RoomScreen {
 
     /// The room ID of the currently-shown room.
     #[rust] room_id: Option<OwnedRoomId>,
-    /// The display name of the currently-shown room .
+    /// The display name of the currently-shown room.
     #[rust] room_name: String,
     /// The UI-relevant states for the room that this widget is currently displaying.
     #[rust] tl_state: Option<TimelineUiState>,
@@ -1265,10 +1285,29 @@ impl Widget for RoomScreen {
                 self.show_location_preview(cx);
             }
 
-            // Handle the cancel location button being clicked.
-            if self.button(id!(cancel_location_button)).clicked(&actions) {
-                self.clear_location_preview();
-                self.redraw(cx);
+            // Handle the send location button being clicked.
+            if self.button(id!(location_preview.send_location_button)).clicked(&actions) {
+                let location_preview = self.location_preview(id!(location_preview));
+                if let Some((coords, _system_time_opt)) = location_preview.get_current_data() {
+                    let geo_uri = format!("geo:{},{}", coords.latitude, coords.longitude);
+                    let message = RoomMessageEventContent::new(
+                        MessageType::Location(
+                            LocationMessageEventContent::new(geo_uri.clone(), geo_uri)
+                        )
+                    );
+                    submit_async_request(MatrixRequest::SendMessage {
+                        room_id: self.room_id.clone().unwrap(),
+                        message,
+                        replied_to: self.tl_state.as_mut().and_then(
+                            |tl| tl.replying_to.take().map(|(_, rep)| rep)
+                        ),
+                        // TODO: support attaching mentions, etc.
+                    });
+
+                    self.clear_replying_to();
+                    location_preview.clear();
+                    location_preview.redraw(cx);
+                }
             }
 
             // Handle the send message button being clicked.
@@ -1703,30 +1742,10 @@ impl RoomScreen {
     }
 
     fn show_location_preview(&mut self, cx: &mut Cx) {
-        request_location_update(LocationRequest::UpdateOnce);
-        let text = if let Some(loc) = get_latest_location() {
-            format!("Current location: {},{}, time: {:?}",
-                loc.coordinates.latitude, loc.coordinates.longitude, loc.time,
-            )
-        } else {
-            format!("Current location is not yet available.")
-        };
-        self.label(id!(location_label)).set_text(&text);
-        self.view(id!(location_preview)).set_visible(true);
-        
-        // TODO: gray out / disable the message input box while the location preview is shown.
-        // TODO: gray out / disable the send message button while the current location isn't known.
+        self.location_preview(id!(location_preview)).show();
         self.redraw(cx);
     }
 
-    /// Clears (and makes invisible) the location preview.
-    fn clear_location_preview(&mut self) {
-        self.view(id!(location_preview)).set_visible(false);
-        if let Some(tl) = self.tl_state.as_mut() {
-            tl.sharing_location = None;
-        }
-    }
-
     /// Invoke this when this timeline is being shown,
     /// e.g., when the user navigates to this timeline.
     fn show_timeline(&mut self, cx: &mut Cx) {
@@ -1754,7 +1773,6 @@ impl RoomScreen {
                 update_receiver,
                 media_cache: MediaCache::new(MediaFormatConst::File, Some(update_sender)),
                 replying_to: None,
-                sharing_location: None,
                 saved_state: SavedState::default(),
                 message_highlight_animation_state: MessageHighlightAnimationState::default(),
                 prev_first_index: None,
@@ -1813,6 +1831,7 @@ impl RoomScreen {
     fn hide_timeline(&mut self) {
         if let Some(room_id) = self.room_id.clone() {
             self.save_state();
+            self.location_preview(id!(location_preview)).clear();
             submit_async_request(MatrixRequest::SubscribeToTypingNotices {
                 room_id,
                 subscribe: false,
@@ -1998,9 +2017,6 @@ struct TimelineUiState {
     /// Info about the event currently being replied to, if any.
     replying_to: Option<(EventTimelineItem, RepliedToInfo)>,
 
-    /// Info about the user's current location sharing status in this room.
-    sharing_location: Option<LocationUpdate>,
-
     /// The states relevant to the UI display of this timeline that are saved upon
     /// a `Hide` action and restored upon a `Show` action.
     saved_state: SavedState,
@@ -2852,6 +2868,109 @@ fn get_profile_display_name(event_tl_item: &EventTimelineItem) -> Option<String>
     }
 }
 
+/// A simple deref wrapper around the `LocationPreview` widget that enables us to handle actions on it.
+#[derive(Live, LiveHook, Widget)]
+struct LocationPreview {
+    #[deref] view: View,
+    #[rust] coords: Option<Result<Coordinates, robius_location::Error>>,
+    #[rust] timestamp: Option<SystemTime>,
+}
+impl Widget for LocationPreview {
+    fn handle_event(&mut self, cx: &mut Cx, event: &Event, scope: &mut Scope) {
+        let mut needs_redraw = false;
+        if let Event::Actions(actions) = event {
+            for action in actions {
+                match action.downcast_ref() {
+                    Some(LocationAction::Update(LocationUpdate { coordinates, time })) => {
+                        self.coords = Some(Ok(coordinates.clone()));
+                        self.timestamp = time.clone();
+                        self.button(id!(send_location_button)).set_enabled(true);
+                        needs_redraw = true;
+                    }
+                    Some(LocationAction::Error(e)) => {
+                        self.coords = Some(Err(e.clone()));
+                        self.timestamp = None;
+                        self.button(id!(send_location_button)).set_enabled(false);
+                        needs_redraw = true;
+                    }
+                    _ => { }
+                }
+            }
+
+            // NOTE: the send location button click event is handled
+            //       in the RoomScreen handle_event function.
+
+            // Handle the cancel location button being clicked.
+            if self.button(id!(cancel_location_button)).clicked(&actions) {
+                self.clear();
+                needs_redraw = true;
+            }
+        }
+
+        if needs_redraw {
+            self.redraw(cx);
+        }
+
+        self.view.handle_event(cx, event, scope);
+    }
+
+    fn draw_walk(&mut self, cx: &mut Cx2d, scope: &mut Scope, walk: Walk) -> DrawStep {
+        let text = match self.coords {
+            Some(Ok(c)) => format!("Current location: {},{}\n   Timestamp: {:?}",
+                c.latitude, c.longitude, self.timestamp,
+            ),
+            Some(Err(e)) => format!("Error getting location: {e:?}"),
+            None => format!("Current location is not yet available."),
+        };
+        self.label(id!(location_label)).set_text(&text);
+        self.view.draw_walk(cx, scope, walk)
+    }
+}
+
+
+impl LocationPreview {
+    fn show(&mut self) {
+        request_location_update(LocationRequest::UpdateOnce);
+        if let Some(loc) = get_latest_location() {
+            self.coords = Some(Ok(loc.coordinates));
+            self.timestamp = loc.time;
+        }
+        self.visible = true;
+    }
+
+    fn clear(&mut self) {
+        self.coords = None;
+        self.timestamp = None;
+        self.visible = false;
+    }
+
+    pub fn get_current_data(&self) -> Option<(Coordinates, Option<SystemTime>)> {
+        self.coords
+            .as_ref()
+            .and_then(|res| res.ok().clone())
+            .map(|c| (c, self.timestamp.clone()))
+    }
+}
+
+impl LocationPreviewRef {
+    pub fn show(&self) {
+        if let Some(mut inner) = self.borrow_mut() {
+            inner.show();
+        }
+    }
+
+    pub fn clear(&self) {
+        if let Some(mut inner) = self.borrow_mut() {
+            inner.clear();
+        }
+    }
+
+    pub fn get_current_data(&self) -> Option<(Coordinates, Option<SystemTime>)> {
+        self.borrow().and_then(|inner| inner.get_current_data())
+    }
+}
+
+
 /// Actions that can be performed on a message.
 #[derive(Clone, DefaultNone, Debug)]
 pub enum MessageAction {
diff --git a/src/location.rs b/src/location.rs
index f6c16fea..515e32c2 100644
--- a/src/location.rs
+++ b/src/location.rs
@@ -8,7 +8,10 @@ use robius_location::{Access, Accuracy, Coordinates, Location, Manager};
 /// The action emitted upon every location update.
 #[derive(Copy, Clone, Debug)]
 pub enum LocationAction {
+    /// The location handler received a new location update.
     Update(LocationUpdate),
+    /// The location handler encountered an error.
+    Error(robius_location::Error),
     None
 }
 
@@ -47,12 +50,14 @@ impl robius_location::Handler for LocationHandler {
             }
             Err(e) => {
                 error!("Error getting coordinates from location update: {e:?}");
+                Cx::post_action(LocationAction::Error(e));
             }
         }
     }
 
     fn error(&self, e: robius_location::Error) {
         error!("Got error in location handler: {e:?}");
+        Cx::post_action(LocationAction::Error(e));
     }
 }
 
@@ -120,8 +125,10 @@ pub fn init_location_subscriber(_cx: &mut Cx) -> Result<(), robius_location::Err
         log!("Location subscriber already initialized.");
         return Ok(());
     }
-    let mut manager = ManagerWrapper(Manager::new(LocationHandler)?);
+    let manager = ManagerWrapper(Manager::new(LocationHandler)?);
     manager.request_authorization(Access::Foreground, Accuracy::Precise)?;
+    let _ = manager.update_once();
+
     let (request_sender, request_receiver) = mpsc::channel::<LocationRequest>();
     *lrs = Some(request_sender);
     std::thread::spawn(|| location_request_loop(request_receiver, manager));

From 3f01d11ced250cd6e6813800354fa8f9dbd24819 Mon Sep 17 00:00:00 2001
From: Kevin Boos <kevinaboos@gmail.com>
Date: Thu, 10 Oct 2024 11:52:44 -0700
Subject: [PATCH 05/12] use a light blue background for the location preview

---
 src/home/room_screen.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/home/room_screen.rs b/src/home/room_screen.rs
index aac97f00..ac815365 100644
--- a/src/home/room_screen.rs
+++ b/src/home/room_screen.rs
@@ -691,7 +691,7 @@ live_design! {
 
         show_bg: true,
         draw_bg: {
-            color: #EEEEEE,
+            color: #xF0F5FF,
         }
 
         <Label> {

From af467541616f79d6ba9f642b12f491667ac46f77 Mon Sep 17 00:00:00 2001
From: Kevin Boos <kevinaboos@gmail.com>
Date: Thu, 10 Oct 2024 15:36:35 -0700
Subject: [PATCH 06/12] Support displaying location messages in a room's
 timeline

---
 Cargo.lock              |  2 +-
 src/home/room_screen.rs | 76 +++++++++++++++++++++++++++++++++++++----
 2 files changed, 71 insertions(+), 7 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 00aa9dc8..775a1ced 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1621,7 +1621,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4"
 dependencies = [
  "cfg-if",
- "windows-targets 0.48.5",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
diff --git a/src/home/room_screen.rs b/src/home/room_screen.rs
index ac815365..1ac0fd60 100644
--- a/src/home/room_screen.rs
+++ b/src/home/room_screen.rs
@@ -37,6 +37,8 @@ use crate::{
 };
 use rangemap::RangeSet;
 
+const GEO_URI_SCHEME: &str = "geo:";
+
 live_design! {
     import makepad_draw::shader::std::*;
     import makepad_widgets::base::*;
@@ -886,7 +888,9 @@ live_design! {
                 // Below that, display a view that holds the message input bar and send button.
                 <View> {
                     width: Fill, height: Fit
-                    flow: Right, align: {y: 1.0}, padding: 10.
+                    flow: Right,
+                    align: {y: 0.5},
+                    padding: 10.
                     show_bg: true,
                     draw_bg: {
                         color: (COLOR_PRIMARY)
@@ -894,7 +898,7 @@ live_design! {
 
                     location_button = <IconButton> {
                         draw_icon: {svg_file: (ICO_LOCATION_PERSON)},
-                        icon_walk: {width: 22.0, height: Fit, margin: {left: 0, right: 5, bottom: -5}},
+                        icon_walk: {width: 22.0, height: Fit, margin: {left: 0, right: 5}},
                         text: "",
                     }
 
@@ -1289,7 +1293,7 @@ impl Widget for RoomScreen {
             if self.button(id!(location_preview.send_location_button)).clicked(&actions) {
                 let location_preview = self.location_preview(id!(location_preview));
                 if let Some((coords, _system_time_opt)) = location_preview.get_current_data() {
-                    let geo_uri = format!("geo:{},{}", coords.latitude, coords.longitude);
+                    let geo_uri = format!("{}{},{}", GEO_URI_SCHEME, coords.latitude, coords.longitude);
                     let message = RoomMessageEventContent::new(
                         MessageType::Location(
                             LocationMessageEventContent::new(geo_uri.clone(), geo_uri)
@@ -2243,6 +2247,24 @@ fn populate_message_view(
                 (item, false)
             }
         }
+        MessageType::Location(location) => {
+            let template = if use_compact_view {
+                live_id!(CondensedMessage)
+            } else {
+                live_id!(Message)
+            };
+            let (item, existed) = list.item_with_existed(cx, item_id, template);
+            if existed && item_drawn_status.content_drawn {
+                (item, true)
+            } else {
+                let is_location_fully_drawn = populate_location_message_content(
+                    &item.html_or_plaintext(id!(content.message)),
+                    location,
+                );
+                new_drawn_status.content_drawn = is_location_fully_drawn;
+                (item, false)
+            }
+        }
         other => {
             let (item, existed) = list.item_with_existed(cx, item_id, live_id!(Message));
             if existed && item_drawn_status.content_drawn {
@@ -2407,6 +2429,45 @@ fn populate_image_message_content(
     }
 }
 
+/// Draws the given location message's content into the `message_content_widget`.
+///
+/// Returns whether the location message content was fully drawn.
+fn populate_location_message_content(
+    message_content_widget: &HtmlOrPlaintextRef,
+    location: &LocationMessageEventContent,
+) -> bool {
+    let coords = location.geo_uri
+        .get(GEO_URI_SCHEME.len() ..)
+        .and_then(|s| {
+            let mut iter = s.split(',');
+            if let (Some(lat), Some(long)) = (iter.next(), iter.next()) {
+                Some((lat, long))
+            } else {
+                None
+            }
+        });
+    if let Some((lat, long)) = coords {
+        let short_lat = lat.find('.').and_then(|dot| lat.get(..dot + 7)).unwrap_or(lat);
+        let short_long = long.find('.').and_then(|dot| long.get(..dot + 7)).unwrap_or(long);
+        let html_body = format!(
+            "Location: {short_lat},{short_long}\
+            <p><a href=\"https://www.openstreetmap.org/?mlat={lat}&amp;mlon={long}#map=15/{lat}/{long}\">Open in OpenStreetMap</a></p>\
+            <p><a href=\"https://www.google.com/maps/search/?api=1&amp;query={lat},{long}\">Open in Google Maps</a></p>\
+            <p><a href=\"https://maps.apple.com/?ll={lat},{long}&amp;q={lat},{long}\">Open in Apple Maps</a></p>",
+        );
+        message_content_widget.show_html(html_body);
+    } else {
+        message_content_widget.show_html(
+            format!("<i>[Location invalid]</i> {}", location.body)
+        );
+    }
+
+    // Currently we do not fetch location thumbnail previews, so we consider this as fully drawn.
+    // In the future, when we do support this, we'll return false until the thumbnail is fetched,
+    // at which point we can return true.
+    true
+}
+
 /// Draws a ReplyPreview above the given `message` if it was in-reply to another message.
 ///
 /// If the given `message` was *not* in-reply to another message,
@@ -2916,9 +2977,12 @@ impl Widget for LocationPreview {
 
     fn draw_walk(&mut self, cx: &mut Cx2d, scope: &mut Scope, walk: Walk) -> DrawStep {
         let text = match self.coords {
-            Some(Ok(c)) => format!("Current location: {},{}\n   Timestamp: {:?}",
-                c.latitude, c.longitude, self.timestamp,
-            ),
+            Some(Ok(c)) => {
+                // format!("Current location: {},{}\n   Timestamp: {:?}",
+                //     c.latitude, c.longitude, self.timestamp,
+                // )
+                format!("Current location: {},{}", c.latitude, c.longitude)
+            }
             Some(Err(e)) => format!("Error getting location: {e:?}"),
             None => format!("Current location is not yet available."),
         };

From 44542dbe8130ab1039362e9e4a5e89998f998a7e Mon Sep 17 00:00:00 2001
From: Kevin Boos <kevinaboos@gmail.com>
Date: Thu, 10 Oct 2024 16:10:50 -0700
Subject: [PATCH 07/12] Fix location preview label to be `width: Fill` such
 that wrapping works

---
 Cargo.lock              |  2 +-
 src/home/room_screen.rs | 13 +++++++++----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 775a1ced..00aa9dc8 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1621,7 +1621,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4"
 dependencies = [
  "cfg-if",
- "windows-targets 0.52.6",
+ "windows-targets 0.48.5",
 ]
 
 [[package]]
diff --git a/src/home/room_screen.rs b/src/home/room_screen.rs
index 1ac0fd60..5cbabc77 100644
--- a/src/home/room_screen.rs
+++ b/src/home/room_screen.rs
@@ -697,6 +697,8 @@ live_design! {
         }
 
         <Label> {
+            width: Fill,
+            height: Fit,
             draw_text: {
                 wrap: Word,
                 color: (MESSAGE_TEXT_COLOR),
@@ -706,6 +708,8 @@ live_design! {
         }
 
         location_label = <Label> {
+            width: Fill,
+            height: Fit,
             align: {x: 0.0, y: 0.5},
             padding: {left: 5.0}
             draw_text: {
@@ -2978,10 +2982,11 @@ impl Widget for LocationPreview {
     fn draw_walk(&mut self, cx: &mut Cx2d, scope: &mut Scope, walk: Walk) -> DrawStep {
         let text = match self.coords {
             Some(Ok(c)) => {
-                // format!("Current location: {},{}\n   Timestamp: {:?}",
-                //     c.latitude, c.longitude, self.timestamp,
-                // )
-                format!("Current location: {},{}", c.latitude, c.longitude)
+                // if let Some(st) = self.timestamp {
+                //     format!("Current location: {:.6},{:.6}\n   Timestamp: {:?}", c.latitude, c.longitude, st)
+                // } else {
+                    format!("Current location: {:.6},{:.6}", c.latitude, c.longitude)
+                // }
             }
             Some(Err(e)) => format!("Error getting location: {e:?}"),
             None => format!("Current location is not yet available."),

From 36a111601b606fb799568a952182634fa2efab7e Mon Sep 17 00:00:00 2001
From: Kevin Boos <kevinaboos@gmail.com>
Date: Thu, 10 Oct 2024 17:14:24 -0700
Subject: [PATCH 08/12] reduce `if` nesting

---
 src/home/room_screen.rs | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/src/home/room_screen.rs b/src/home/room_screen.rs
index 96f24341..ebf48e24 100644
--- a/src/home/room_screen.rs
+++ b/src/home/room_screen.rs
@@ -1169,18 +1169,16 @@ impl Widget for RoomScreen {
                 // Handle the action that requests to show the user profile sliding pane.
                 if let ShowUserProfileAction::ShowUserProfile(profile_and_room_id) = action.as_widget_action().cast() {
                     // Only show the user profile in room that this avatar belongs to
-                    if let Some(room_id) = self.room_id.as_ref() {
-                        if profile_and_room_id.room_id == *room_id {
-                            self.show_user_profile(
-                                cx,
-                                &pane,
-                                UserProfilePaneInfo {
-                                    profile_and_room_id,
-                                    room_name: self.room_name.clone(),
-                                    room_member: None,
-                                },
-                            );
-                        }
+                    if self.room_id.as_ref().is_some_and(|r| r == &profile_and_room_id.room_id) {
+                        self.show_user_profile(
+                            cx,
+                            &pane,
+                            UserProfilePaneInfo {
+                                profile_and_room_id,
+                                room_name: self.room_name.clone(),
+                                room_member: None,
+                            },
+                        );
                     }
                 }
 

From 46c99a6535fc96589b0df946c78b4489e0d32e49 Mon Sep 17 00:00:00 2001
From: Kevin Boos <kevinaboos@gmail.com>
Date: Thu, 10 Oct 2024 17:18:57 -0700
Subject: [PATCH 09/12] Call `hide_timeline()` upon a `RoomScreen` widget
 instance being dropped

---
 src/home/room_screen.rs | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/home/room_screen.rs b/src/home/room_screen.rs
index ebf48e24..bf1ada84 100644
--- a/src/home/room_screen.rs
+++ b/src/home/room_screen.rs
@@ -1003,9 +1003,12 @@ pub struct RoomScreen {
 
 impl Drop for RoomScreen {
     fn drop(&mut self) {
-        // Make sure to return the room state back to TIMELINE_STATES, so that other RoomScreen instances can access it.
-        // RoomScreen is dropped whenever a tab is closed or the app is resized to a different AdaptiveView layout.
-        self.save_state();
+        // This ensures that the `TimelineUiState` instance owned by this room is *always* returned
+        // back to to `TIMELINE_STATES`, which ensures that its UI state(s) are not lost
+        // and that other RoomScreen instances can show this room in the future.
+        // RoomScreen will be dropped whenever its widget instance is destroyed, e.g.,
+        // when a Tab is closed or the app is resized to a different AdaptiveView layout.
+        self.hide_timeline();
     }
 }
 
@@ -1820,8 +1823,7 @@ impl RoomScreen {
         self.redraw(cx);
     }
 
-    /// Invoke this when this timeline is being hidden or no longer being shown,
-    /// e.g., when the user navigates away from this timeline.
+    /// Invoke this when this RoomScreen/timeline is being hidden or no longer being shown.
     fn hide_timeline(&mut self) {
         if let Some(room_id) = self.room_id.clone() {
             self.save_state();

From c871da7d72379b9039d4d609efcbf3dad63a3dec Mon Sep 17 00:00:00 2001
From: Demolemon11 <demolemon@outlook.at>
Date: Fri, 11 Oct 2024 17:24:14 +0800
Subject: [PATCH 10/12] Fix dependencies for apt

---
 README.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index a30550b3..f0b4ac9a 100644
--- a/README.md
+++ b/README.md
@@ -37,11 +37,11 @@ The following table shows which host systems can currently be used to build Robr
 
 2. If you're building on **Linux** or **WSL** on Windows, install the required dependencies. Otherwise, proceed to step 3.
    * `openssl`, `clang`/`libclang`, `binfmt`, `Xcursor`/`X11`, `asound`/`pulse`.
-   
+
    On a Debian-like Linux distro (e.g., Ubuntu), run the following:
    ```sh
    sudo apt-get update
-   sudo apt-get install libssl-dev libsqlite3-dev pkg-config llvm clang libclang-dev binfmt-support libxcursor-dev libx11-dev libasound2-dev libpulse-dev
+   sudo apt-get install libssl-dev libsqlite3-dev pkg-config binfmt-support libxcursor-dev libx11-dev libasound2-dev libpulse-dev
    ```
 
 3. Then, build and run Robrix (you can optionally add `--release` after `run`):
@@ -78,7 +78,7 @@ cargo run -- 'USERNAME' 'PASSWORD' ['HOMESERVER_URL']
         * API version 33 or higher is required, which is Android 13 and up.
 
 
-## Feature status tracker 
+## Feature status tracker
 
 These are generally sorted in order of priority. If you're interested in helping out with anything here, please reach out via a GitHub issue or on our Robius matrix channel.
 
@@ -93,7 +93,7 @@ These are generally sorted in order of priority. If you're interested in helping
 - [ ] Loading animation while waiting for pagination request: https://github.com/project-robius/robrix/issues/109
 - [x] Stable positioning of events during simple timeline update
 - [x] Stable positioning of events during complex/multi-part timeline update
-- [ ] Re-spawn timeline as focused on an old event after a full timeline clear: https://github.com/project-robius/robrix/issues/103 
+- [ ] Re-spawn timeline as focused on an old event after a full timeline clear: https://github.com/project-robius/robrix/issues/103
 - [x] Display simple text-only messages
 - [x] Display image messages (PNG, JPEG)
 - [x] Rich text formatting for message bodies

From f7b3de4626fb080f0ac9ccfe2e882a2a1b1fa648 Mon Sep 17 00:00:00 2001
From: ZhangHanDong <blackanger.z@gmail.com>
Date: Fri, 11 Oct 2024 20:35:24 +0800
Subject: [PATCH 11/12] the fontfallthrough needs to be specified

---
 src/home/room_screen.rs | 19 ++++++-------------
 src/shared/styles.rs    | 31 +++++++++++++++++--------------
 2 files changed, 23 insertions(+), 27 deletions(-)

diff --git a/src/home/room_screen.rs b/src/home/room_screen.rs
index 904f86c9..1bcad0e0 100644
--- a/src/home/room_screen.rs
+++ b/src/home/room_screen.rs
@@ -64,18 +64,11 @@ live_design! {
     ICO_ADD = dep("crate://self/resources/icon_add.svg")
     ICO_CLOSE = dep("crate://self/resources/icons/close.svg")
     ICO_JUMP_TO_BOTTOM = dep("crate://self/resources/icon_jump_to_bottom.svg")
-    
+
     ICO_LOCATION_PERSON = dep("crate://self/resources/icons/location-person.svg")
 
-    TEXT_SUB = {
+    TEXT_SUB = <THEME_FONT_REGULAR>{
         font_size: (10),
-        font: {path: dep("crate://makepad-widgets/resources/IBMPlexSans-Text.ttf")}
-    }
-
-    TEXT_P = {
-        font_size: (12),
-        height_factor: 1.65,
-        font: {path: dep("crate://makepad-widgets/resources/IBMPlexSans-Text.ttf")}
     }
 
     COLOR_BG = #xfff8ee
@@ -1028,13 +1021,13 @@ impl RoomScreen{
             return;
         }
         let first_index = portal_list.first_id();
-        
+
         let Some(tl_state) = self.tl_state.as_mut() else { return };
         let Some(room_id) = self.room_id.as_ref() else { return };
         if let Some(ref mut index) = tl_state.prev_first_index {
             // to detect change of scroll when scroll ends
-            if *index != first_index {  
-                // scroll changed         
+            if *index != first_index {
+                // scroll changed
                 self.fully_read_timer = cx.start_interval(5.0);
                 let time_now = std::time::Instant::now();
                 if first_index > *index {
@@ -1823,7 +1816,7 @@ impl RoomScreen {
         if first_time_showing_room {
             self.process_timeline_updates(cx);
         }
-    
+
         self.redraw(cx);
     }
 
diff --git a/src/shared/styles.rs b/src/shared/styles.rs
index 43686f40..8546ec7f 100644
--- a/src/shared/styles.rs
+++ b/src/shared/styles.rs
@@ -2,35 +2,39 @@ use makepad_widgets::*;
 
 live_design! {
 
+    import makepad_widgets::theme_desktop_dark::*;
     ICON_BLOCK_USER  = dep("crate://self/resources/icons/forbidden.svg")
     ICON_CHECKMARK   = dep("crate://self/resources/icons/checkmark.svg")
     ICON_CLOSE       = dep("crate://self/resources/icons/close.svg")
 
 
-    TITLE_TEXT = {
+
+    TITLE_TEXT = <THEME_FONT_REGULAR>{
         font_size: (13),
-        font: {path: dep("crate://makepad-widgets/resources/IBMPlexSans-Text.ttf")}
     }
 
-    REGULAR_TEXT = {
+    REGULAR_TEXT = <THEME_FONT_REGULAR>{
         font_size: (10),
-        font: {path: dep("crate://makepad-widgets/resources/IBMPlexSans-Text.ttf")}
     }
 
-    TEXT_SUB = {
+    TEXT_SUB = <THEME_FONT_REGULAR>{
         font_size: (8),
         height_factor: 1.5,
-        font: {path: dep("crate://makepad-widgets/resources/IBMPlexSans-Text.ttf")}
     }
 
+    TEXT_P = <THEME_FONT_REGULAR>{
+        font_size: (12),
+        height_factor: 1.65,
+    }
+
+
     USERNAME_FONT_SIZE = 11
     USERNAME_TEXT_COLOR = #x2
-    USERNAME_TEXT_STYLE = {
-        font: {path: dep("crate://makepad-widgets/resources/IBMPlexSans-SemiBold.ttf")}
+    USERNAME_TEXT_STYLE = <THEME_FONT_BOLD>{
         font_size: (USERNAME_FONT_SIZE),
-        // height_factor: 1.5,
     }
 
+
     TYPING_NOTICE_TEXT_COLOR = #121570
 
     MESSAGE_FONT_SIZE = 11
@@ -39,8 +43,7 @@ live_design! {
     MESSAGE_TEXT_HEIGHT_FACTOR = 1.55
     // This font should only be used for plaintext labels. Don't use this for Html content,
     // as the Html widget sets different fonts for different text styles (e.g., bold, italic).
-    MESSAGE_TEXT_STYLE = {
-        font: {path: dep("crate://makepad-widgets/resources/IBMPlexSans-Text.ttf")}
+    MESSAGE_TEXT_STYLE = <THEME_FONT_REGULAR>{
         font_size: (MESSAGE_FONT_SIZE),
         height_factor: (MESSAGE_TEXT_HEIGHT_FACTOR),
         line_spacing: (MESSAGE_TEXT_LINE_SPACING),
@@ -51,15 +54,15 @@ live_design! {
     SMALL_STATE_FONT_SIZE = 9.0
     SMALL_STATE_TEXT_COLOR = #x888
     SMALL_STATE_TEXT_STYLE = {
-        font: {path: dep("crate://makepad-widgets/resources/IBMPlexSans-Text.ttf")}
+        font: {path: dep("crate://makepad-widgets/resources/IBMPlexSans-Text.ttf")},
+        font2: { path: dep("crate://makepad-widgets/resources/LXGWWenKaiRegular.ttf") },
         font_size: (SMALL_STATE_FONT_SIZE),
         height_factor: 1.3,
     }
 
     TIMESTAMP_FONT_SIZE = 8.5
     TIMESTAMP_TEXT_COLOR = #x999
-    TIMESTAMP_TEXT_STYLE = {
-        font: {path: dep("crate://makepad-widgets/resources/IBMPlexSans-Text.ttf")}
+    TIMESTAMP_TEXT_STYLE = <THEME_FONT_REGULAR>{
         font_size: (TIMESTAMP_FONT_SIZE),
     }
 

From afa94b83439a9cbd7cd1191003f74721fda67480 Mon Sep 17 00:00:00 2001
From: Kevin Boos <kevinaboos@gmail.com>
Date: Fri, 11 Oct 2024 10:36:33 -0700
Subject: [PATCH 12/12] Ensure we always use Makepad's default font fallback

---
 src/home/room_screen.rs |  4 ----
 src/shared/styles.rs    | 13 ++-----------
 2 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/src/home/room_screen.rs b/src/home/room_screen.rs
index 1bcad0e0..fb0faa56 100644
--- a/src/home/room_screen.rs
+++ b/src/home/room_screen.rs
@@ -67,10 +67,6 @@ live_design! {
 
     ICO_LOCATION_PERSON = dep("crate://self/resources/icons/location-person.svg")
 
-    TEXT_SUB = <THEME_FONT_REGULAR>{
-        font_size: (10),
-    }
-
     COLOR_BG = #xfff8ee
     COLOR_BRAND = #x5
     COLOR_BRAND_HOVER = #x3
diff --git a/src/shared/styles.rs b/src/shared/styles.rs
index 8546ec7f..32dd470f 100644
--- a/src/shared/styles.rs
+++ b/src/shared/styles.rs
@@ -18,16 +18,9 @@ live_design! {
     }
 
     TEXT_SUB = <THEME_FONT_REGULAR>{
-        font_size: (8),
-        height_factor: 1.5,
-    }
-
-    TEXT_P = <THEME_FONT_REGULAR>{
-        font_size: (12),
-        height_factor: 1.65,
+        font_size: (10),
     }
 
-
     USERNAME_FONT_SIZE = 11
     USERNAME_TEXT_COLOR = #x2
     USERNAME_TEXT_STYLE = <THEME_FONT_BOLD>{
@@ -53,9 +46,7 @@ live_design! {
 
     SMALL_STATE_FONT_SIZE = 9.0
     SMALL_STATE_TEXT_COLOR = #x888
-    SMALL_STATE_TEXT_STYLE = {
-        font: {path: dep("crate://makepad-widgets/resources/IBMPlexSans-Text.ttf")},
-        font2: { path: dep("crate://makepad-widgets/resources/LXGWWenKaiRegular.ttf") },
+    SMALL_STATE_TEXT_STYLE = <THEME_FONT_REGULAR>{
         font_size: (SMALL_STATE_FONT_SIZE),
         height_factor: 1.3,
     }