Make use of Adw.Toast

4 files changed, 515 insertions, 491 deletions

diff --git a/data/ui/main-window.ui b/data/ui/main-window.ui
index 2cd3a09b..881a3608 100644
--- a/data/ui/main-window.ui
+++ b/data/ui/main-window.ui
@@ -42,28 +42,39 @@
       </object>
     </child>
     <child>
-      <object class="GtkGrid" id="grid">
-        <child>
-          <object class="GtkBox" id="placeBarContainer">
-            <layout>
-              <property name="column">0</property>
-              <property name="row">1</property>
-            </layout>
+      <object class="AdwToastOverlay" id="overlay">
+        <property name="child">
+          <object class="GtkBox">
+            <property name="orientation">vertical</property>
+            <property name="hexpand">true</property>
+            <property name="vexpand">true</property>
+            <child>
+              <object class="GtkGrid" id="grid">
+                <child>
+                  <object class="GtkBox" id="placeBarContainer">
+                    <layout>
+                      <property name="column">0</property>
+                      <property name="row">1</property>
+                    </layout>
+                  </object>
+                </child>
+                <child>
+                  <object class="GtkRevealer" id="actionBarRevealer">
+                    <property name="transition-type">slide-up</property>
+                    <property name="child">
+                      <object class="GtkActionBar" id="actionBar"/>
+                    </property>
+                    <layout>
+                      <property name="column">0</property>
+                      <property name="row">2</property>
+                      <property name="column-span">2</property>
+                    </layout>
+                  </object>
+                </child>
+              </object>
+            </child>
           </object>
-        </child>
-        <child>
-          <object class="GtkRevealer" id="actionBarRevealer">
-            <property name="transition-type">slide-up</property>
-            <property name="child">
-              <object class="GtkActionBar" id="actionBar"/>
-            </property>
-            <layout>
-              <property name="column">0</property>
-              <property name="row">2</property>
-              <property name="column-span">2</property>
-            </layout>
-          </object>
-        </child>
+        </property>
       </object>
     </child>
   </template>
diff --git a/data/ui/osm-account-dialog.ui b/data/ui/osm-account-dialog.ui
index 46ee8787..019f4409 100644
--- a/data/ui/osm-account-dialog.ui
+++ b/data/ui/osm-account-dialog.ui
@@ -5,222 +5,226 @@
     <property name="width_request">500</property>
     <property name="title" translatable="1">OpenStreetMap Account</property>
     <child>
-      <object class="GtkBox" id="contentArea">
+      <object class="AdwToastOverlay" id="overlay">
         <child>
-          <object class="GtkStack" id="stack">
-            <property name="transition-type">slide-right</property>
+          <object class="GtkBox" id="contentArea">
             <child>
-              <object class="GtkStackPage">
-                <property name="name">sign-in</property>
-                <property name="child">
-                  <object class="GtkGrid">
-                    <property name="row-spacing">10</property>
-                    <property name="margin-start">20</property>
-                    <property name="margin-end">20</property>
-                    <property name="margin-top">20</property>
-                    <property name="margin-bottom">20</property>
-                    <child>
-                      <object class="GtkLabel">
-                        <property name="label" translatable="1">&lt;span weight=&quot;bold&quot; size=&quot;x-large&quot;&gt;Sign in to edit maps&lt;/span&gt;</property>
-                        <property name="use_markup">1</property>
-                        <property name="hexpand">1</property>
-                        <property name="halign">center</property>
-                        <property name="justify">center</property>
-                        <layout>
-                          <property name="column">0</property>
-                          <property name="row">0</property>
-                          <property name="column-span">3</property>
-                        </layout>
+              <object class="GtkStack" id="stack">
+                <property name="transition-type">slide-right</property>
+                <child>
+                  <object class="GtkStackPage">
+                    <property name="name">sign-in</property>
+                    <property name="child">
+                      <object class="GtkGrid">
+                        <property name="row-spacing">10</property>
+                        <property name="margin-start">20</property>
+                        <property name="margin-end">20</property>
+                        <property name="margin-top">20</property>
+                        <property name="margin-bottom">20</property>
+                        <child>
+                          <object class="GtkLabel">
+                            <property name="label" translatable="1">&lt;span weight=&quot;bold&quot; size=&quot;x-large&quot;&gt;Sign in to edit maps&lt;/span&gt;</property>
+                            <property name="use_markup">1</property>
+                            <property name="hexpand">1</property>
+                            <property name="halign">center</property>
+                            <property name="justify">center</property>
+                            <layout>
+                              <property name="column">0</property>
+                              <property name="row">0</property>
+                              <property name="column-span">3</property>
+                            </layout>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkLabel">
+                            <property name="label" translatable="1">Help to improve the map, using an
+    OpenStreetMap account.</property>
+                            <property name="hexpand">1</property>
+                            <property name="halign">center</property>
+                            <property name="justify">center</property>
+                            <layout>
+                              <property name="column">0</property>
+                              <property name="row">1</property>
+                              <property name="column-span">3</property>
+                            </layout>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkLabel">
+                            <property name="label" translatable="1">Sign in to authorize access in a web browser.
+    Then fill in the obtained verification code here in the next step.</property>
+                            <property name="hexpand">1</property>
+                            <property name="wrap">1</property>
+                            <property name="halign">center</property>
+                            <property name="justify">center</property>
+                            <layout>
+                              <property name="column">0</property>
+                              <property name="row">2</property>
+                              <property name="column-span">3</property>
+                            </layout>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkLinkButton">
+                            <property name="focusable">1</property>
+                            <property name="label" translatable="1">Sign up</property>
+                            <property name="uri">https://www.openstreetmap.org/user/new</property>
+                            <property name="halign">end</property>
+                            <property name="hexpand">1</property>
+                            <layout>
+                              <property name="column">0</property>
+                              <property name="row">3</property>
+                            </layout>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkButton" id="signInButton">
+                            <property name="halign">end</property>
+                            <property name="label" translatable="1">Sign In</property>
+                            <style>
+                              <class name="suggested-action"/>
+                            </style>
+                            <layout>
+                              <property name="column">1</property>
+                              <property name="row">3</property>
+                            </layout>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkLabel" id="errorLabel">
+                            <property name="visible">0</property>
+                            <property name="focusable">1</property>
+                            <property name="use-markup">1</property>
+                            <style>
+                              <class name="warning"/>
+                            </style>
+                            <layout>
+                              <property name="column">0</property>
+                              <property name="row">4</property>
+                            </layout>
+                          </object>
+                        </child>
                       </object>
-                    </child>
-                    <child>
-                      <object class="GtkLabel">
-                        <property name="label" translatable="1">Help to improve the map, using an
-OpenStreetMap account.</property>
-                        <property name="hexpand">1</property>
-                        <property name="halign">center</property>
-                        <property name="justify">center</property>
-                        <layout>
-                          <property name="column">0</property>
-                          <property name="row">1</property>
-                          <property name="column-span">3</property>
-                        </layout>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkLabel">
-                        <property name="label" translatable="1">Sign in to authorize access in a web browser.
-Then fill in the obtained verification code here in the next step.</property>
-                        <property name="hexpand">1</property>
-                        <property name="wrap">1</property>
-                        <property name="halign">center</property>
-                        <property name="justify">center</property>
-                        <layout>
-                          <property name="column">0</property>
-                          <property name="row">2</property>
-                          <property name="column-span">3</property>
-                        </layout>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkLinkButton">
-                        <property name="focusable">1</property>
-                        <property name="label" translatable="1">Sign up</property>
-                        <property name="uri">https://www.openstreetmap.org/user/new</property>
-                        <property name="halign">end</property>
-                        <property name="hexpand">1</property>
-                        <layout>
-                          <property name="column">0</property>
-                          <property name="row">3</property>
-                        </layout>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkButton" id="signInButton">
-                        <property name="halign">end</property>
-                        <property name="label" translatable="1">Sign In</property>
-                        <style>
-                          <class name="suggested-action"/>
-                        </style>
-                        <layout>
-                          <property name="column">1</property>
-                          <property name="row">3</property>
-                        </layout>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkLabel" id="errorLabel">
-                        <property name="visible">0</property>
-                        <property name="focusable">1</property>
-                        <property name="use-markup">1</property>
-                        <style>
-                          <class name="warning"/>
-                        </style>
-                        <layout>
-                          <property name="column">0</property>
-                          <property name="row">4</property>
-                        </layout>
-                      </object>
-                    </child>
+                    </property>
                   </object>
-                </property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkStackPage">
-                <property name="name">verify</property>
-                <property name="child">
-                  <object class="GtkGrid">
-                    <property name="row-spacing">10</property>
-                    <property name="column-spacing">10</property>
-                    <property name="margin-start">20</property>
-                    <property name="margin-end">20</property>
-                    <property name="margin-top">20</property>
-                    <property name="margin-bottom">20</property>
-                    <child>
-                      <object class="GtkLabel">
-                        <property name="wrap">1</property>
-                        <property name="label" translatable="1">Copy verification code shown when authorizing access in the browser</property>
-                        <layout>
-                          <property name="column">0</property>
-                          <property name="row">0</property>
-                          <property name="column-span">2</property>
-                        </layout>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkEntry" id="verificationEntry">
-                        <property name="placeholder-text" translatable="1">Verification code</property>
-                        <property name="hexpand">1</property>
-                        <layout>
-                          <property name="column">0</property>
-                          <property name="row">1</property>
-                        </layout>
+                </child>
+                <child>
+                  <object class="GtkStackPage">
+                    <property name="name">verify</property>
+                    <property name="child">
+                      <object class="GtkGrid">
+                        <property name="row-spacing">10</property>
+                        <property name="column-spacing">10</property>
+                        <property name="margin-start">20</property>
+                        <property name="margin-end">20</property>
+                        <property name="margin-top">20</property>
+                        <property name="margin-bottom">20</property>
+                        <child>
+                          <object class="GtkLabel">
+                            <property name="wrap">1</property>
+                            <property name="label" translatable="1">Copy verification code shown when authorizing access in the browser</property>
+                            <layout>
+                              <property name="column">0</property>
+                              <property name="row">0</property>
+                              <property name="column-span">2</property>
+                            </layout>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkEntry" id="verificationEntry">
+                            <property name="placeholder-text" translatable="1">Verification code</property>
+                            <property name="hexpand">1</property>
+                            <layout>
+                              <property name="column">0</property>
+                              <property name="row">1</property>
+                            </layout>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkButton" id="verifyButton">
+                            <property name="sensitive">0</property>
+                            <property name="label" translatable="1">Verify</property>
+                            <property name="hexpand">0</property>
+                            <property name="halign">end</property>
+                            <style>
+                              <class name="suggested-action"/>
+                            </style>
+                            <layout>
+                              <property name="column">1</property>
+                              <property name="row">1</property>
+                            </layout>
+                          </object>
+                        </child>
                       </object>
-                    </child>
-                    <child>
-                      <object class="GtkButton" id="verifyButton">
-                        <property name="sensitive">0</property>
-                        <property name="label" translatable="1">Verify</property>
-                        <property name="hexpand">0</property>
-                        <property name="halign">end</property>
-                        <style>
-                          <class name="suggested-action"/>
-                        </style>
-                        <layout>
-                          <property name="column">1</property>
-                          <property name="row">1</property>
-                        </layout>
-                      </object>
-                    </child>
+                    </property>
                   </object>
-                </property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkStackPage">
-                <property name="name">logged-in</property>
-                <property name="child">
-                  <object class="GtkGrid">
-                    <property name="row-spacing">10</property>
-                    <property name="margin-start">20</property>
-                    <property name="margin-end">20</property>
-                    <property name="margin-top">20</property>
-                    <property name="margin-bottom">20</property>
-                    <child>
-                      <object class="GtkLabel">
-                        <property name="label" translatable="1">&lt;span weight=&quot;bold&quot; size=&quot;x-large&quot;&gt;Signed In&lt;/span&gt;</property>
-                        <property name="use_markup">1</property>
-                        <property name="hexpand">1</property>
-                        <property name="halign">center</property>
-                        <layout>
-                          <property name="column">0</property>
-                          <property name="row">0</property>
-                        </layout>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkLabel">
-                        <property name="label" translatable="1">Your OpenStreetMap account is active.</property>
-                        <property name="hexpand">1</property>
-                        <property name="halign">center</property>
-                        <layout>
-                          <property name="column">0</property>
-                          <property name="row">1</property>
-                        </layout>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkImage">
-                        <property name="icon-name">avatar-default-symbolic</property>
-                        <property name="pixel-size">64</property>
-                        <property name="opacity">0.33</property>
-                        <layout>
-                          <property name="column">0</property>
-                          <property name="row">2</property>
-                        </layout>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkLabel" id="signedInUserLabel">
-                        <layout>
-                          <property name="column">0</property>
-                          <property name="row">3</property>
-                        </layout>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkButton" id="signOutButton">
-                        <property name="label" translatable="1">Sign Out</property>
-                        <property name="halign">center</property>
-                        <layout>
-                          <property name="column">0</property>
-                          <property name="row">4</property>
-                        </layout>
+                </child>
+                <child>
+                  <object class="GtkStackPage">
+                    <property name="name">logged-in</property>
+                    <property name="child">
+                      <object class="GtkGrid">
+                        <property name="row-spacing">10</property>
+                        <property name="margin-start">20</property>
+                        <property name="margin-end">20</property>
+                        <property name="margin-top">20</property>
+                        <property name="margin-bottom">20</property>
+                        <child>
+                          <object class="GtkLabel">
+                            <property name="label" translatable="1">&lt;span weight=&quot;bold&quot; size=&quot;x-large&quot;&gt;Signed In&lt;/span&gt;</property>
+                            <property name="use_markup">1</property>
+                            <property name="hexpand">1</property>
+                            <property name="halign">center</property>
+                            <layout>
+                              <property name="column">0</property>
+                              <property name="row">0</property>
+                            </layout>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkLabel">
+                            <property name="label" translatable="1">Your OpenStreetMap account is active.</property>
+                            <property name="hexpand">1</property>
+                            <property name="halign">center</property>
+                            <layout>
+                              <property name="column">0</property>
+                              <property name="row">1</property>
+                            </layout>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkImage">
+                            <property name="icon-name">avatar-default-symbolic</property>
+                            <property name="pixel-size">64</property>
+                            <property name="opacity">0.33</property>
+                            <layout>
+                              <property name="column">0</property>
+                              <property name="row">2</property>
+                            </layout>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkLabel" id="signedInUserLabel">
+                            <layout>
+                              <property name="column">0</property>
+                              <property name="row">3</property>
+                            </layout>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkButton" id="signOutButton">
+                            <property name="label" translatable="1">Sign Out</property>
+                            <property name="halign">center</property>
+                            <layout>
+                              <property name="column">0</property>
+                              <property name="row">4</property>
+                            </layout>
+                          </object>
+                        </child>
                       </object>
-                    </child>
+                    </property>
                   </object>
-                </property>
+                </child>
               </object>
             </child>
           </object>
diff --git a/data/ui/osm-edit-dialog.ui b/data/ui/osm-edit-dialog.ui
index db1d0cbd..2de35e10 100644
--- a/data/ui/osm-edit-dialog.ui
+++ b/data/ui/osm-edit-dialog.ui
@@ -6,206 +6,211 @@
     <property name="height_request">500</property>
     <property name="use-header-bar">True</property>
     <property name="title" translatable="True" context="dialog title">Edit on OpenStreetMap</property>
+
     <child>
-      <object class="GtkBox" id="contentArea">
+      <object class="AdwToastOverlay" id="overlay">
         <child>
-          <object class="GtkStack" id="stack">
-            <property name="transition_type">crossfade</property>
+          <object class="GtkBox" id="contentArea">
             <child>
-              <object class="GtkStackPage">
-                <property name="name">loading</property>
-                <property name="child">
-                  <object class="GtkGrid" id="loadingGrid">
-                    <child>
-                      <object class="GtkSpinner" id="loadingSpinner">
-                        <property name="height_request">32</property>
-                        <property name="hexpand">1</property>
-                        <property name="vexpand">1</property>
-                        <property name="valign">GTK_ALIGN_CENTER</property>
-                        <property name="spinning">True</property>
-                        <layout>
-                          <property name="column">0</property>
-                          <property name="row">0</property>
-                        </layout>
-                      </object>
-                    </child>
-                  </object>
-                </property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkStackPage">
-                <property name="name">editor</property>
-                <property name="child">
-                  <object class="GtkGrid">
-                    <property name="orientation">vertical</property>
-                    <property name="margin-start">20</property>
-                    <property name="margin-end">20</property>
-                    <property name="margin-top">20</property>
-                    <property name="margin-bottom">20</property>
-                    <child>
-                      <object class="GtkGrid" id="editorGrid">
-                        <property name="row-spacing">12</property>
-                        <property name="column-spacing">6</property>
-                        <property name="margin-bottom">12</property>
+              <object class="GtkStack" id="stack">
+                <property name="transition_type">crossfade</property>
+                <child>
+                  <object class="GtkStackPage">
+                    <property name="name">loading</property>
+                    <property name="child">
+                      <object class="GtkGrid" id="loadingGrid">
                         <child>
-                          <object class="GtkLabel" id="typeLabel">
-                            <property name="visible">0</property>
-                            <property name="label" translatable="1">Type</property>
-                            <property name="halign">end</property>
-                            <style>
-                              <class name="dim-label"/>
-                            </style>
+                          <object class="GtkSpinner" id="loadingSpinner">
+                            <property name="height_request">32</property>
+                            <property name="hexpand">1</property>
+                            <property name="vexpand">1</property>
+                            <property name="valign">GTK_ALIGN_CENTER</property>
+                            <property name="spinning">True</property>
                             <layout>
                               <property name="column">0</property>
                               <property name="row">0</property>
                             </layout>
                           </object>
                         </child>
+                      </object>
+                    </property>
+                  </object>
+                </child>
+                <child>
+                  <object class="GtkStackPage">
+                    <property name="name">editor</property>
+                    <property name="child">
+                      <object class="GtkGrid">
+                        <property name="orientation">vertical</property>
+                        <property name="margin-start">20</property>
+                        <property name="margin-end">20</property>
+                        <property name="margin-top">20</property>
+                        <property name="margin-bottom">20</property>
                         <child>
-                          <object class="GtkButton" id="typeButton">
-                            <property name="visible">0</property>
-                            <property name="focusable">1</property>
-                            <property name="hexpand">1</property>
+                          <object class="GtkGrid" id="editorGrid">
+                            <property name="row-spacing">12</property>
+                            <property name="column-spacing">6</property>
+                            <property name="margin-bottom">12</property>
                             <child>
-                              <object class="GtkGrid">
-                                <property name="row-spacing">5</property>
-                                <property name="column-spacing">5</property>
-                                <child>
-                                  <object class="GtkLabel" id="typeValueLabel">
-                                    <property name="label" translatable="1">None</property>
-                                  </object>
-                                </child>
+                              <object class="GtkLabel" id="typeLabel">
+                                <property name="visible">0</property>
+                                <property name="label" translatable="1">Type</property>
+                                <property name="halign">end</property>
+                                <style>
+                                  <class name="dim-label"/>
+                                </style>
+                                <layout>
+                                  <property name="column">0</property>
+                                  <property name="row">0</property>
+                                </layout>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkButton" id="typeButton">
+                                <property name="visible">0</property>
+                                <property name="focusable">1</property>
+                                <property name="hexpand">1</property>
                                 <child>
-                                  <object class="GtkImage">
-                                    <property name="halign">end</property>
-                                    <property name="hexpand">1</property>
-                                    <property name="icon-name">go-next-symbolic</property>
+                                  <object class="GtkGrid">
+                                    <property name="row-spacing">5</property>
+                                    <property name="column-spacing">5</property>
+                                    <child>
+                                      <object class="GtkLabel" id="typeValueLabel">
+                                        <property name="label" translatable="1">None</property>
+                                      </object>
+                                    </child>
+                                    <child>
+                                      <object class="GtkImage">
+                                        <property name="halign">end</property>
+                                        <property name="hexpand">1</property>
+                                        <property name="icon-name">go-next-symbolic</property>
+                                      </object>
+                                    </child>
                                   </object>
                                 </child>
+                                <layout>
+                                  <property name="column">1</property>
+                                  <property name="row">0</property>
+                                </layout>
                               </object>
                             </child>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkGrid">
+                            <property name="vexpand">1</property>
+                            <property name="valign">end</property>
+                            <child>
+                              <object class="GtkMenuButton" id="addFieldButton">
+                                <property name="focusable">1</property>
+                                <property name="popover">addFieldPopover</property>
+                                <property name="direction">up</property>
+                                <property name="label" translatable="1">Add Field</property>
+                                <property name="always-show-arrow">True</property>
+                              </object>
+                            </child>
+                          </object>
+                        </child>
+                      </object>
+                    </property>
+                  </object>
+                </child>
+                <child>
+                  <object class="GtkStackPage">
+                    <property name="name">upload</property>
+                    <property name="child">
+                      <object class="GtkGrid" id="uploadGrid">
+                        <property name="margin_start">15</property>
+                        <property name="margin_end">15</property>
+                        <property name="margin_top">15</property>
+                        <property name="margin_bottom">15</property>
+                        <property name="row-spacing">5</property>
+                        <child>
+                          <object class="GtkLabel" id="commentLabel">
+                            <property name="label" translatable="1">Comment</property>
+                            <property name="halign">start</property>
+                            <style>
+                              <class name="dim-label"/>
+                            </style>
                             <layout>
-                              <property name="column">1</property>
-                              <property name="row">0</property>
+                              <property name="column">0</property>
+                              <property name="row">1</property>
                             </layout>
                           </object>
                         </child>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkGrid">
-                        <property name="vexpand">1</property>
-                        <property name="valign">end</property>
                         <child>
-                          <object class="GtkMenuButton" id="addFieldButton">
-                            <property name="focusable">1</property>
-                            <property name="popover">addFieldPopover</property>
-                            <property name="direction">up</property>
-                            <property name="label" translatable="1">Add Field</property>
-                            <property name="always-show-arrow">True</property>
+                          <object class="GtkFrame">
+                            <property name="child">
+                              <object class="GtkTextView" id="commentTextView">
+                                <property name="focusable">1</property>
+                                <property name="hexpand">1</property>
+                                <property name="vexpand">1</property>
+                              </object>
+                            </property>
+                            <layout>
+                              <property name="column">0</property>
+                              <property name="row">2</property>
+                            </layout>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkLabel" id="uploadInfoLabel">
+                            <property name="label" translatable="1">Map changes will be visible on all maps that use
+    OpenStreetMap data.</property>
+                            <property name="halign">start</property>
+                            <style>
+                              <class name="dim-label"/>
+                            </style>
+                            <layout>
+                              <property name="column">0</property>
+                              <property name="row">3</property>
+                            </layout>
                           </object>
                         </child>
                       </object>
-                    </child>
+                    </property>
                   </object>
-                </property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkStackPage">
-                <property name="name">upload</property>
-                <property name="child">
-                  <object class="GtkGrid" id="uploadGrid">
-                    <property name="margin_start">15</property>
-                    <property name="margin_end">15</property>
-                    <property name="margin_top">15</property>
-                    <property name="margin_bottom">15</property>
-                    <property name="row-spacing">5</property>
-                    <child>
-                      <object class="GtkLabel" id="commentLabel">
-                        <property name="label" translatable="1">Comment</property>
-                        <property name="halign">start</property>
-                        <style>
-                          <class name="dim-label"/>
-                        </style>
-                        <layout>
-                          <property name="column">0</property>
-                          <property name="row">1</property>
-                        </layout>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkFrame">
-                        <property name="child">
-                          <object class="GtkTextView" id="commentTextView">
+                </child>
+                <child>
+                  <object class="GtkStackPage">
+                    <property name="name">select-type</property>
+                    <property name="child">
+                      <object class="GtkGrid" id="typeSearchGrid">
+                        <property name="margin_start">60</property>
+                        <property name="margin_end">60</property>
+                        <property name="margin_top">15</property>
+                        <property name="margin_bottom">30</property>
+                        <property name="row-spacing">5</property>
+                        <child>
+                          <object class="GtkLabel" id="recentTypesLabel">
+                            <property name="label" translatable="1">Recently Used</property>
+                            <property name="halign">start</property>
+                            <style>
+                              <class name="dim-label"/>
+                            </style>
+                            <layout>
+                              <property name="column">0</property>
+                              <property name="row">1</property>
+                            </layout>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="GtkListBox" id="recentTypesListBox">
                             <property name="focusable">1</property>
-                            <property name="hexpand">1</property>
-                            <property name="vexpand">1</property>
+                            <property name="selection-mode">none</property>
+                            <style>
+                              <class name="frame"/>
+                            </style>
+                            <layout>
+                              <property name="column">0</property>
+                              <property name="row">2</property>
+                            </layout>
                           </object>
-                        </property>
-                        <layout>
-                          <property name="column">0</property>
-                          <property name="row">2</property>
-                        </layout>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkLabel" id="uploadInfoLabel">
-                        <property name="label" translatable="1">Map changes will be visible on all maps that use
-OpenStreetMap data.</property>
-                        <property name="halign">start</property>
-                        <style>
-                          <class name="dim-label"/>
-                        </style>
-                        <layout>
-                          <property name="column">0</property>
-                          <property name="row">3</property>
-                        </layout>
-                      </object>
-                    </child>
-                  </object>
-                </property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkStackPage">
-                <property name="name">select-type</property>
-                <property name="child">
-                  <object class="GtkGrid" id="typeSearchGrid">
-                    <property name="margin_start">60</property>
-                    <property name="margin_end">60</property>
-                    <property name="margin_top">15</property>
-                    <property name="margin_bottom">30</property>
-                    <property name="row-spacing">5</property>
-                    <child>
-                      <object class="GtkLabel" id="recentTypesLabel">
-                        <property name="label" translatable="1">Recently Used</property>
-                        <property name="halign">start</property>
-                        <style>
-                          <class name="dim-label"/>
-                        </style>
-                        <layout>
-                          <property name="column">0</property>
-                          <property name="row">1</property>
-                        </layout>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkListBox" id="recentTypesListBox">
-                        <property name="focusable">1</property>
-                        <property name="selection-mode">none</property>
-                        <style>
-                          <class name="frame"/>
-                        </style>
-                        <layout>
-                          <property name="column">0</property>
-                          <property name="row">2</property>
-                        </layout>
+                        </child>
                       </object>
-                    </child>
+                    </property>
                   </object>
-                </property>
+                </child>
               </object>
             </child>
           </object>
diff --git a/data/ui/send-to-dialog.ui b/data/ui/send-to-dialog.ui
index 0c474d26..ff65f692 100644
--- a/data/ui/send-to-dialog.ui
+++ b/data/ui/send-to-dialog.ui
@@ -19,120 +19,124 @@
       <action-widget response="cancel">cancelButton</action-widget>
     </action-widgets>
     <child>
-      <object class="GtkBox" id="contentArea">
-        <property name="orientation">vertical</property>
-        <property name="margin-start">18</property>
-        <property name="margin-end">18</property>
-        <property name="margin-top">18</property>
-        <property name="margin-bottom">18</property>
-        <property name="spacing">12</property>
+      <object class="AdwToastOverlay" id="overlay">
         <child>
-          <object class="GtkBox">
+          <object class="GtkBox" id="contentArea">
             <property name="orientation">vertical</property>
+            <property name="margin-start">18</property>
+            <property name="margin-end">18</property>
+            <property name="margin-top">18</property>
+            <property name="margin-bottom">18</property>
             <property name="spacing">12</property>
             <child>
               <object class="GtkBox">
                 <property name="orientation">vertical</property>
+                <property name="spacing">12</property>
                 <child>
-                  <object class="GtkLabel" id="summaryLabel">
-                    <property name="selectable">1</property>
-                    <property name="label">…</property>
-                    <property name="halign">start</property>
-                    <property name="wrap">1</property>
-                    <property name="xalign">0</property>
+                  <object class="GtkBox">
+                    <property name="orientation">vertical</property>
+                    <child>
+                      <object class="GtkLabel" id="summaryLabel">
+                        <property name="selectable">1</property>
+                        <property name="label">…</property>
+                        <property name="halign">start</property>
+                        <property name="wrap">1</property>
+                        <property name="xalign">0</property>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkLabel" id="summaryUrl">
+                        <property name="selectable">1</property>
+                        <property name="use-markup">1</property>
+                        <property name="label">…</property>
+                        <property name="xalign">0</property>
+                        <property name="width-request">0</property>
+                        <property name="ellipsize">end</property>
+                      </object>
+                    </child>
                   </object>
                 </child>
                 <child>
-                  <object class="GtkLabel" id="summaryUrl">
-                    <property name="selectable">1</property>
-                    <property name="use-markup">1</property>
-                    <property name="label">…</property>
-                    <property name="xalign">0</property>
-                    <property name="width-request">0</property>
-                    <property name="ellipsize">end</property>
+                  <object class="GtkBox">
+                    <property name="spacing">6</property>
+                    <child>
+                      <object class="GtkButton" id="copyButton">
+                        <property name="label" translatable="1">Copy</property>
+                        <property name="hexpand">1</property>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkButton" id="emailButton">
+                        <property name="label" translatable="1">Send To…</property>
+                        <property name="hexpand">1</property>
+                      </object>
+                    </child>
                   </object>
                 </child>
               </object>
             </child>
             <child>
-              <object class="GtkBox">
-                <property name="spacing">6</property>
-                <child>
-                  <object class="GtkButton" id="copyButton">
-                    <property name="label" translatable="1">Copy</property>
-                    <property name="hexpand">1</property>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkButton" id="emailButton">
-                    <property name="label" translatable="1">Send To…</property>
-                    <property name="hexpand">1</property>
-                  </object>
-                </child>
-              </object>
-            </child>
-          </object>
-        </child>
-        <child>
-          <object class="GtkScrolledWindow" id="scrolledWindow">
-            <property name="hscrollbar_policy">never</property>
-            <property name="vexpand">1</property>
-            <property name="child">
-              <object class="GtkListBox" id="list">
-                <child>
-                  <object class="GtkListBoxRow" id="weatherRow">
-                    <property name="focusable">1</property>
-                    <property name="child">
-                      <object class="GtkGrid" id="weatherGrid">
-                        <property name="column_spacing">12</property>
-                        <property name="margin-start">6</property>
-                        <property name="margin-end">6</property>
-                        <property name="margin-top">6</property>
-                        <property name="margin-bottom">6</property>
-                        <child>
-                          <object class="GtkImage" id="weatherIcon">
-                            <property name="pixel_size">32</property>
-                            <property name="halign">start</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkLabel" id="weatherLabel">
-                            <property name="margin-end">10</property>
+              <object class="GtkScrolledWindow" id="scrolledWindow">
+                <property name="hscrollbar_policy">never</property>
+                <property name="vexpand">1</property>
+                <property name="child">
+                  <object class="GtkListBox" id="list">
+                    <child>
+                      <object class="GtkListBoxRow" id="weatherRow">
+                        <property name="focusable">1</property>
+                        <property name="child">
+                          <object class="GtkGrid" id="weatherGrid">
+                            <property name="column_spacing">12</property>
+                            <property name="margin-start">6</property>
+                            <property name="margin-end">6</property>
+                            <property name="margin-top">6</property>
+                            <property name="margin-bottom">6</property>
+                            <child>
+                              <object class="GtkImage" id="weatherIcon">
+                                <property name="pixel_size">32</property>
+                                <property name="halign">start</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkLabel" id="weatherLabel">
+                                <property name="margin-end">10</property>
+                              </object>
+                            </child>
                           </object>
-                        </child>
+                        </property>
                       </object>
-                    </property>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkListBoxRow" id="clocksRow">
-                    <property name="focusable">1</property>
-                    <property name="child">
-                      <object class="GtkGrid" id="clocksGrid">
-                        <property name="column_spacing">12</property>
-                        <property name="margin-start">6</property>
-                        <property name="margin-end">6</property>
-                        <property name="margin-top">6</property>
-                        <property name="margin-bottom">6</property>
-                        <child>
-                          <object class="GtkImage" id="clocksIcon">
-                            <property name="pixel_size">32</property>
-                            <property name="halign">start</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkLabel" id="clocksLabel">
-                            <property name="margin-end">10</property>
+                    </child>
+                    <child>
+                      <object class="GtkListBoxRow" id="clocksRow">
+                        <property name="focusable">1</property>
+                        <property name="child">
+                          <object class="GtkGrid" id="clocksGrid">
+                            <property name="column_spacing">12</property>
+                            <property name="margin-start">6</property>
+                            <property name="margin-end">6</property>
+                            <property name="margin-top">6</property>
+                            <property name="margin-bottom">6</property>
+                            <child>
+                              <object class="GtkImage" id="clocksIcon">
+                                <property name="pixel_size">32</property>
+                                <property name="halign">start</property>
+                              </object>
+                            </child>
+                            <child>
+                              <object class="GtkLabel" id="clocksLabel">
+                                <property name="margin-end">10</property>
+                              </object>
+                            </child>
                           </object>
-                        </child>
+                        </property>
                       </object>
-                    </property>
+                    </child>
                   </object>
-                </child>
+                </property>
               </object>
-            </property>
+            </child>
           </object>
-        </child>
+        </child>"
       </object>
     </child>
   </template>