Skip to content

Commit 3776474

Browse files
committed
feat: (mobile)设置界面添加主界面按钮
1 parent 2b7e017 commit 3776474

2 files changed

Lines changed: 22 additions & 3 deletions

File tree

SecRandom/Views/SettingsView.axaml

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
x:Class="SecRandom.Views.SettingsView"
1313
x:DataType="views:SettingsView"
1414
Header="{x:Static ml:Resources.P_Settings}"
15-
NavigationPage.HasBackButton="False"
15+
NavigationPage.HasNavigationBar="False"
1616
Loaded="OnLoaded"
1717
Unloaded="OnUnloaded">
1818
<Grid RowDefinitions="Auto *">
@@ -36,20 +36,32 @@
3636
Classes="nav-back"
3737
IsHitTestVisible="True" />
3838

39+
<Button HorizontalAlignment="Center" VerticalAlignment="Center"
40+
Width="48" Height="40" IsHitTestVisible="True"
41+
IsVisible="{Binding IsMobile}"
42+
Theme="{DynamicResource TransparentButton}"
43+
Click="MobileHomeButton_OnClick">
44+
<sr:FluentIcon Glyph="{sr:Fi HomeFilled}" FontSize="20"
45+
HorizontalAlignment="Center" VerticalAlignment="Center" />
46+
</Button>
47+
3948
<Image Source="/Assets/AppLogo.png"
4049
Width="18" Height="18"
4150
VerticalAlignment="Center"
4251
Margin="8 0 0 0"
43-
IsHitTestVisible="False" />
52+
IsHitTestVisible="False"
53+
IsVisible="{Binding !IsMobile}" />
4454

4555
<TextBlock Text="SecRandom"
4656
FontSize="12"
4757
VerticalAlignment="Center"
48-
IsHitTestVisible="False" />
58+
IsHitTestVisible="False"
59+
IsVisible="{Binding !IsMobile}" />
4960
</StackPanel>
5061

5162
<AutoCompleteBox Grid.Column="2"
5263
VerticalAlignment="Center" MaxWidth="420"
64+
IsVisible="{Binding !IsMobile}"
5365
FilterMode="Custom"
5466
MaxDropDownHeight="480"
5567
ItemsSource="{Binding ViewModel.SettingsMetadata}"

SecRandom/Views/SettingsView.axaml.cs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@ public SettingsView(
8989

9090
public bool IsPreviewMode => _isPreviewMode;
9191
public SettingsViewModel ViewModel { get; }
92+
public bool IsMobile => _isMobile;
9293
private IImportExportService ImportExportService => IAppHost.GetService<IImportExportService>();
9394
private IExternalLauncher ExternalLauncher => IAppHost.GetService<IExternalLauncher>();
9495

@@ -777,4 +778,10 @@ private void NavigationView_OnItemInvoked(object? sender, FANavigationViewItemIn
777778
}
778779

779780
#endregion
781+
782+
private void MobileHomeButton_OnClick(object? sender, RoutedEventArgs e)
783+
{
784+
var viewEngine = IAppHost.GetService<IViewEngine>();
785+
_ = viewEngine.CloseAsync(MobilePageIds.Settings, ViewCloseReason.Back);
786+
}
780787
}

0 commit comments

Comments
 (0)