Merge pull request #68 from aschuhardt/develop

Fix the navbar and bookmarks/home URLs

Controls/TabCollection.xaml.cs

@@ -191,7 +191,6 @@ private void SetupTab(Tab tab)
     {
         tab.ParentPage = ParentPage;
         tab.OpeningUrlInNewTab += (_, arg) => AddTab(arg.Uri);
-        tab.BookmarkChanged += BookmarkChanged;
         tab.InitializedByTabCollection = true;
     }
 

Controls/Tabs/BrowserTab.xaml.cs

@@ -153,7 +153,7 @@ private void BuildContextMenu(IContextMenu menu)
                     new ActionMenuClickHandler(async () =>
                     {
                         _browsingDatabase.Bookmarks.Remove(bookmark);
-                        tab.OnBookmarkChanged();
+                        tab.OnLocationChanged();
                         await Toast.Make(Text.MainPage_TryToggleBookmarked_Bookmark_removed).Show();
                     }));
             }
@@ -164,7 +164,7 @@ private void BuildContextMenu(IContextMenu menu)
                     {
                         bookmark = new Bookmark { Url = tab.Location.ToString(), Title = tab.Title };
                         _browsingDatabase.Bookmarks.Add(bookmark);
-                        tab.OnBookmarkChanged();
+                        tab.OnLocationChanged();
                         await Toast.Make(Text.MainPage_TryToggleBookmarked_Bookmark_added).Show();
                     }));
             }

Models/Tab.cs

@@ -247,7 +247,6 @@ public bool Selected
 
     public event PropertyChangedEventHandler PropertyChanged;
     public event EventHandler<UrlEventArgs> OpeningUrlInNewTab;
-    public event EventHandler BookmarkChanged;
 
     protected virtual void OnPropertyChanged([CallerMemberName] string propertyName = null)
     {
@@ -264,11 +263,6 @@ protected bool SetField<T>(ref T field, T value, [CallerMemberName] string prope
         return true;
     }
 
-    public void SetLocationWithoutLoading(Uri location)
-    {
-        _location = location;
-    }
-
     public override int GetHashCode()
     {
         // ReSharper disable once NonReadonlyMemberInGetHashCode
@@ -290,8 +284,8 @@ public virtual void OnOpeningUrlInNewTab(UrlEventArgs e)
         OpeningUrlInNewTab?.Invoke(this, e);
     }
 
-    public virtual void OnBookmarkChanged()
+    public virtual void OnLocationChanged()
     {
-        BookmarkChanged?.Invoke(this, EventArgs.Empty);
+        OnPropertyChanged(nameof(Location));
     }
 }

Resources/Localization/Text.resx

@@ -689,4 +689,7 @@ Try again after you've granted the app permission to do so.</value>
   <data name="SettingsPage_ExportErrorLogArchive_OK" xml:space="preserve">
     <value>OK</value>
   </data>
+  <data name="MainPage_TrySetHomeUrl_Home_URL_cleared" xml:space="preserve">
+    <value>Home URL cleared</value>
+  </data>
 </root>

Views/MainPage.xaml

@@ -62,22 +62,20 @@
                 <SwipeGestureRecognizer x:Name="SwipeDownRecognizer" Direction="Down" Command="{Binding ExpandMenu}" />
                 <SwipeGestureRecognizer x:Name="SwipeUpRecognizer" Direction="Up" Command="{Binding HideMenu}" />
             </VerticalStackLayout.GestureRecognizers>
-            <FlexLayout Padding="0,2,0,0" Wrap="NoWrap" x:Name="NavigationGrid">
+            <Grid Padding="0,2,0,0" x:Name="NavigationGrid" ColumnDefinitions="Auto,*,Auto,Auto,Auto">
                 <ImageButton
                     FlexLayout.AlignSelf="Start"
-                    FlexLayout.Order="0"
-                    FlexLayout.Shrink="0"
                     x:Name="PageInfoButton"
+                    Grid.Column="0"
                     Scale="0.75" IsEnabled="{Binding CurrentTab.CanShowHostCertificate}"
                     Command="{Binding ShowPageCertificate}"
                     Source="{AppThemeBinding Light=info_dark.png, Dark=info_light.png}"
                     SemanticProperties.Description="{x:Static localization:Text.MainPage_PageInformation}"
                     SemanticProperties.Hint="{x:Static localization:Text.MainPage_PageInformationHint}" />
                 <Border
                     FlexLayout.AlignSelf="Stretch"
-                    FlexLayout.Order="1"
-                    FlexLayout.Grow="1"
                     Margin="0"
+                    Grid.Column="1"
                     HeightRequest="48" x:Name="UrlEntryBorder">
                     <Entry
                         Text="{Binding CurrentTab.RenderUrl}"
@@ -92,33 +90,32 @@
                 </Border>
                 <ImageButton
                     FlexLayout.AlignSelf="End"
-                    FlexLayout.Order="2"
-                    FlexLayout.Shrink="0"
-                    Scale="0.75" Grid.Column="2" x:Name="BookmarkButton"
+                    Grid.Column="2"
+                    Scale="0.75"
+                    x:Name="BookmarkButton"
                     Command="{Binding ToggleBookmarked}"
                     Source="{Binding CurrentTab.Location, Converter={StaticResource BookmarkButtonImageConverter}}"
                     SemanticProperties.Description="{x:Static localization:Text.MainPage_Bookmark}"
                     SemanticProperties.Hint="{x:Static localization:Text.MainPage_BookmarkHint}" />
                 <controls:BiModalImageButton
                     FlexLayout.AlignSelf="End"
-                    FlexLayout.Order="3"
-                    FlexLayout.Shrink="0"
-                    Scale="0.75" Grid.Column="3" x:Name="HomeButton"
+                    Grid.Column="3"
+                    Scale="0.75"
+                    x:Name="HomeButton"
                     Command="{Binding LoadHomeUrl}" LongCommand="{Binding SetHomeUrl}"
                     Source="{Binding CurrentTab.Location, Converter={StaticResource HomeButtonImageConverter}}"
                     SemanticProperties.Description="{x:Static localization:Text.MainPage_Home}"
                     SemanticProperties.Hint="{x:Static localization:Text.MainPage_HomeHint}" />
                 <ImageButton
                     FlexLayout.AlignSelf="End"
                     FlexLayout.Order="4"
-                    FlexLayout.Shrink="0"
                     Scale="0.75" Grid.Column="4" x:Name="FindNextButton"
                     Command="{Binding FindNextInPage}"
                     IsVisible="{Binding CurrentTab.HasFindNextQuery}"
                     Source="{AppThemeBinding Light=next_dark.png, Dark=next_light.png}"
                     SemanticProperties.Description="{x:Static localization:Text.MainPage_Next}"
                     SemanticProperties.Hint="{x:Static localization:Text.MainPage_NextHint}" />
-            </FlexLayout>
+            </Grid>
             <VerticalStackLayout x:Name="ExpandableMenu" HeightRequest="0" IsClippedToBounds="True">
                 <Button Text="{x:Static localization:Text.MainPage_FindInPage}" HorizontalOptions="Fill"
                         Command="{Binding FindInPage}"

Views/MainPage.xaml.cs

@@ -638,13 +638,22 @@ private void TrySetHomeUrl()
 
         try
         {
-            _settingsDatabase.HomeUrl = CurrentTab.Location.ToString();
+            var currentHomeUrl = _settingsDatabase.HomeUrl;
 
-            _logger.LogInformation(@"Home URI set to {URI}", _settingsDatabase.HomeUrl);
-
-            CurrentTab.OnBookmarkChanged(); // force buttons to update
+            if (!string.IsNullOrWhiteSpace(currentHomeUrl) && CurrentTab.Location.AreGeminiUrlsEqual(currentHomeUrl))
+            {
+                _settingsDatabase.HomeUrl = null;
+                _logger.LogInformation(@"Home URI cleared");
+                this.ShowToast(Text.MainPage_TrySetHomeUrl_Home_URL_cleared, ToastDuration.Short);
+            }
+            else
+            {
+                _settingsDatabase.HomeUrl = CurrentTab.Location.ToString();
+                _logger.LogInformation(@"Home URI set to {URI}", _settingsDatabase.HomeUrl);
+                this.ShowToast(Text.MainPage_TrySetHomeUrl_Home_set, ToastDuration.Short);
+            }
 
-            this.ShowToast(Text.MainPage_TrySetHomeUrl_Home_set, ToastDuration.Short);
+            CurrentTab.OnLocationChanged(); // force buttons to update
         }
         catch (Exception e)
         {
@@ -698,23 +707,23 @@ private void TryToggleBookmarked()
             if (_browsingDatabase.TryGetBookmark(CurrentTab.Location, out var bookmark))
             {
                 _browsingDatabase.Bookmarks.Remove(bookmark);
-                CurrentTab.OnBookmarkChanged(); // force buttons to update
+                CurrentTab.OnLocationChanged(); // force buttons to update
 
                 _logger.LogInformation(@"Removing bookmarked location {URI}", bookmark.Url);
 
                 this.ShowToast(Text.MainPage_TryToggleBookmarked_Bookmark_removed, ToastDuration.Short);
             }
             else
             {
-                _browsingDatabase.Bookmarks.Add(new Bookmark
+                bookmark = new Bookmark
                 {
                     Title = CurrentTab.Title ?? CurrentTab.Location.Segments.LastOrDefault() ?? CurrentTab.Location.Host,
                     Url = CurrentTab.Location.ToString()
-                });
-
-                CurrentTab.OnBookmarkChanged(); // force buttons to update
+                };
 
+                _browsingDatabase.Bookmarks.Add(bookmark);
                 _logger.LogInformation(@"Set bookmarked location {URI}", bookmark.Url);
+                CurrentTab.OnLocationChanged(); // force buttons to update
 
                 this.ShowToast(Text.MainPage_TryToggleBookmarked_Bookmark_added, ToastDuration.Short);
             }