From 23400f78c03bcea769d43d3191689ea179c71bdc Mon Sep 17 00:00:00 2001
From: OneGate Dev <dev@onegate.app>
Date: Sat, 8 Aug 2026 08:57:37 +0800
Subject: [PATCH 1/3] Add switchable gallery layout to Games tab

---
 OneGateApp/Data/DApp.cs                    |   1 +
 OneGateApp/Pages/GamingPage.xaml           | 359 +++++++++++++++++----
 OneGateApp/Pages/GamingPage.xaml.cs        |  88 ++++-
 OneGateApp/Properties/Strings.Designer.cs  |  45 +++
 OneGateApp/Properties/Strings.resx         |  15 +
 OneGateApp/Properties/Strings.zh-Hans.resx |  15 +
 6 files changed, 454 insertions(+), 69 deletions(-)

diff --git a/OneGateApp/Data/DApp.cs b/OneGateApp/Data/DApp.cs
index bcd9f9f..fd04a7b 100644
--- a/OneGateApp/Data/DApp.cs
+++ b/OneGateApp/Data/DApp.cs
@@ -34,6 +34,7 @@ public class DApp : IComparable<DApp>, IShareable, IVersioned
 
     public bool IsGamingApp => !string.IsNullOrWhiteSpace(GameType);
     public bool IsRegularApp => !IsGamingApp;
+    public string? PreviewUrl => Previews?.FirstOrDefault(p => !string.IsNullOrWhiteSpace(p)) ?? IconUrl;
     public string? GameTypeDisplayName => LocalizeGameType(GameType);
     public Dictionary<string, string> NameLocalizer => field ??= JsonSerializer.Deserialize<Dictionary<string, string>>(Name)!;
     public Dictionary<string, string>? DescriptionLocalizer => Description is null ? null : field ??= JsonSerializer.Deserialize<Dictionary<string, string>>(Description);
diff --git a/OneGateApp/Pages/GamingPage.xaml b/OneGateApp/Pages/GamingPage.xaml
index 3b23f36..bede410 100644
--- a/OneGateApp/Pages/GamingPage.xaml
+++ b/OneGateApp/Pages/GamingPage.xaml
@@ -9,6 +9,7 @@
     <ContentPage.Resources>
         <toolkit:InvertedBoolConverter x:Key="InvertedBoolConverter" />
         <og:LocalizerConverter x:Key="LocalizerConverter" />
+        <og:StringSelectConverter x:Key="StringSelectConverter" />
     </ContentPage.Resources>
     <ContentPage.ToolbarItems>
         <ToolbarItem Order="Primary" IconImageSource="{FontImageSource &#xe69a;, FontFamily=Icons, Color={toolkit:AppThemeResource Primary}}" Command="{x:Static og:Commands.ScanQRCode}" />
@@ -30,42 +31,291 @@
         </og:DAppSearchHandler>
     </Shell.SearchHandler>
     <RefreshView Margin="20,0" IsRefreshing="{Binding LoadingService.IsReloading}" Command="{Binding LoadingService}">
-        <CollectionView ItemsSource="{Binding GamesFiltered}" MinimumHeightRequest="20">
-            <CollectionView.Header>
-                <VerticalStackLayout Spacing="16">
-                    <Border StrokeShape="RoundRectangle 10" StrokeThickness="0" HeightRequest="132">
-                        <Image Source="gaming_banner.webp" Aspect="AspectFill" />
-                    </Border>
-                    <VerticalStackLayout Spacing="8" IsVisible="{Binding HasRecentGames}">
-                        <Label Text="{x:Static og:Strings.GamingRecentPlayed}" FontAttributes="Bold" />
-                        <CollectionView ItemsSource="{Binding GamesRecent}" HeightRequest="104">
-                            <CollectionView.ItemsLayout>
-                                <LinearItemsLayout Orientation="Horizontal" ItemSpacing="8" />
-                            </CollectionView.ItemsLayout>
-                            <CollectionView.ItemTemplate>
-                                <DataTemplate x:DataType="og:DApp">
-                                    <Border StyleClass="Card" WidthRequest="96" HeightRequest="96" Padding="8,10">
-                                        <Grid RowDefinitions="48,*" RowSpacing="4">
-                                            <Image WidthRequest="44" HeightRequest="44" Aspect="AspectFit" HorizontalOptions="Center" VerticalOptions="Center">
-                                                <Image.Source>
-                                                    <UriImageSource Uri="{Binding IconUrl}" CacheValidity="30:00:00:00" />
-                                                </Image.Source>
-                                            </Image>
-                                            <Label Grid.Row="1" Text="{Binding Name, Converter={StaticResource LocalizerConverter}}" FontAttributes="Bold" FontSize="12" MaxLines="1" LineBreakMode="TailTruncation" HorizontalTextAlignment="Center" VerticalTextAlignment="Center" />
+        <Grid RowDefinitions="auto,*" RowSpacing="12">
+            <Grid ColumnDefinitions="*,auto" ColumnSpacing="10">
+                <og:TabBar x:Name="gameTypeTabBar"
+                           Tabs="{Binding GameTypes}"
+                           IsVisible="{Binding HasGameTypeFilters}"
+                           Spacing="12"
+                           FontSize="12"
+                           HorizontalOptions="Fill"
+                           SelectedTabChanged="OnGameTypeChanged" />
+                <Button Grid.Column="1"
+                        StyleClass="Icon"
+                        Text="{Binding IsGalleryLayout, Converter={StaticResource StringSelectConverter}, ConverterParameter=&#xe792;&#xe7f4;}"
+                        FontSize="22"
+                        WidthRequest="40"
+                        HeightRequest="40"
+                        CornerRadius="10"
+                        BackgroundColor="{toolkit:AppThemeResource TextBox}"
+                        HorizontalOptions="End"
+                        SemanticProperties.Description="{Binding LayoutToggleDescription}"
+                        Clicked="OnLayoutToggleClicked" />
+            </Grid>
+
+            <Grid Grid.Row="1">
+                <CollectionView ItemsSource="{Binding GamesFiltered}"
+                                IsVisible="{Binding ShowGalleryLayout}"
+                                MinimumHeightRequest="20">
+                    <CollectionView.Header>
+                        <VerticalStackLayout Spacing="18" Padding="0,0,0,14">
+                            <Border StrokeShape="RoundRectangle 8" StrokeThickness="0" HeightRequest="132">
+                                <Image Source="gaming_banner.webp" Aspect="AspectFill" />
+                            </Border>
+
+                            <VerticalStackLayout Spacing="8" IsVisible="{Binding HasRecentGames}">
+                                <Label Text="{x:Static og:Strings.GamingRecentPlayed}" FontAttributes="Bold" FontSize="18" />
+                                <CollectionView ItemsSource="{Binding GamesRecent}" HeightRequest="126">
+                                    <CollectionView.ItemsLayout>
+                                        <LinearItemsLayout Orientation="Horizontal" ItemSpacing="10" />
+                                    </CollectionView.ItemsLayout>
+                                    <CollectionView.ItemTemplate>
+                                        <DataTemplate x:DataType="og:DApp">
+                                            <Border StyleClass="Card" WidthRequest="112" HeightRequest="120" Padding="0">
+                                                <Grid RowDefinitions="76,44">
+                                                    <Image Margin="14" Aspect="AspectFit">
+                                                        <Image.Source>
+                                                            <UriImageSource Uri="{Binding IconUrl}" CacheValidity="30:00:00:00" />
+                                                        </Image.Source>
+                                                    </Image>
+                                                    <Image Aspect="AspectFill">
+                                                        <Image.Source>
+                                                            <UriImageSource Uri="{Binding PreviewUrl}" CacheValidity="30:00:00:00" />
+                                                        </Image.Source>
+                                                    </Image>
+                                                    <Label Grid.Row="1"
+                                                           Margin="8,0"
+                                                           Text="{Binding Name, Converter={StaticResource LocalizerConverter}}"
+                                                           FontAttributes="Bold"
+                                                           FontSize="12"
+                                                           MaxLines="1"
+                                                           LineBreakMode="TailTruncation"
+                                                           HorizontalTextAlignment="Center"
+                                                           VerticalTextAlignment="Center" />
+                                                </Grid>
+                                                <Border.GestureRecognizers>
+                                                    <TapGestureRecognizer Command="{x:Static og:Commands.LaunchDApp}" CommandParameter="{Binding .}" />
+                                                </Border.GestureRecognizers>
+                                            </Border>
+                                        </DataTemplate>
+                                    </CollectionView.ItemTemplate>
+                                </CollectionView>
+                            </VerticalStackLayout>
+
+                            <VerticalStackLayout Spacing="8" IsVisible="{Binding HasSpotlightGame}">
+                                <Label Text="{x:Static og:Strings.GamingSpotlight}" FontAttributes="Bold" FontSize="18" />
+                                <Border StyleClass="Card" HeightRequest="208" Padding="0">
+                                    <Grid>
+                                        <Image Source="gaming_banner.webp" Aspect="AspectFill" />
+                                        <Image Margin="52" Aspect="AspectFit">
+                                            <Image.Source>
+                                                <UriImageSource Uri="{Binding SpotlightGame.IconUrl}" CacheValidity="30:00:00:00" />
+                                            </Image.Source>
+                                        </Image>
+                                        <Image Aspect="AspectFill">
+                                            <Image.Source>
+                                                <UriImageSource Uri="{Binding SpotlightGame.PreviewUrl}" CacheValidity="30:00:00:00" />
+                                            </Image.Source>
+                                        </Image>
+                                        <Grid Padding="16"
+                                              ColumnDefinitions="*,auto"
+                                              ColumnSpacing="12"
+                                              BackgroundColor="#99000000"
+                                              VerticalOptions="End">
+                                            <VerticalStackLayout Spacing="2" VerticalOptions="Center">
+                                                <Label Text="{Binding SpotlightGame.Name, Converter={StaticResource LocalizerConverter}}"
+                                                       TextColor="White"
+                                                       FontAttributes="Bold"
+                                                       FontSize="20"
+                                                       MaxLines="1"
+                                                       LineBreakMode="TailTruncation" />
+                                                <Label Text="{Binding SpotlightGame.GameTypeDisplayName}"
+                                                       TextColor="#DDE4EE"
+                                                       FontSize="12"
+                                                       MaxLines="1"
+                                                       LineBreakMode="TailTruncation" />
+                                            </VerticalStackLayout>
+                                            <Button Grid.Column="1"
+                                                    Text="{x:Static og:Strings.Open}"
+                                                    TextColor="White"
+                                                    Command="{x:Static og:Commands.LaunchDApp}"
+                                                    CommandParameter="{Binding SpotlightGame}"
+                                                    Padding="18,10"
+                                                    MinimumHeightRequest="44"
+                                                    VerticalOptions="Center" />
                                         </Grid>
-                                        <Border.GestureRecognizers>
-                                            <TapGestureRecognizer Command="{x:Static og:Commands.LaunchDApp}" CommandParameter="{Binding .}" />
-                                        </Border.GestureRecognizers>
-                                    </Border>
-                                </DataTemplate>
-                            </CollectionView.ItemTemplate>
-                        </CollectionView>
-                    </VerticalStackLayout>
-                    <og:TabBar x:Name="gameTypeTabBar" Tabs="{Binding GameTypes}" IsVisible="{Binding HasGameTypeFilters}" Spacing="18" Margin="0,10" SelectedTabChanged="OnGameTypeChanged" />
-                </VerticalStackLayout>
-            </CollectionView.Header>
-            <CollectionView.EmptyView>
-                <Border StyleClass="Card" HeightRequest="120">
+                                        <Grid.GestureRecognizers>
+                                            <TapGestureRecognizer Command="{x:Static og:Commands.LaunchDApp}" CommandParameter="{Binding SpotlightGame}" />
+                                        </Grid.GestureRecognizers>
+                                    </Grid>
+                                </Border>
+                            </VerticalStackLayout>
+
+                            <VerticalStackLayout Spacing="8" IsVisible="{Binding HasQuickPicks}">
+                                <Label Text="{x:Static og:Strings.GamingQuickPicks}" FontAttributes="Bold" FontSize="18" />
+                                <CollectionView ItemsSource="{Binding GamesQuickPicks}" HeightRequest="138">
+                                    <CollectionView.ItemsLayout>
+                                        <LinearItemsLayout Orientation="Horizontal" ItemSpacing="10" />
+                                    </CollectionView.ItemsLayout>
+                                    <CollectionView.ItemTemplate>
+                                        <DataTemplate x:DataType="og:DApp">
+                                            <Border StyleClass="Card" WidthRequest="154" HeightRequest="132" Padding="0">
+                                                <Grid RowDefinitions="88,44">
+                                                    <Image Margin="16" Aspect="AspectFit">
+                                                        <Image.Source>
+                                                            <UriImageSource Uri="{Binding IconUrl}" CacheValidity="30:00:00:00" />
+                                                        </Image.Source>
+                                                    </Image>
+                                                    <Image Aspect="AspectFill">
+                                                        <Image.Source>
+                                                            <UriImageSource Uri="{Binding PreviewUrl}" CacheValidity="30:00:00:00" />
+                                                        </Image.Source>
+                                                    </Image>
+                                                    <Label Grid.Row="1"
+                                                           Margin="10,0"
+                                                           Text="{Binding Name, Converter={StaticResource LocalizerConverter}}"
+                                                           FontAttributes="Bold"
+                                                           FontSize="12"
+                                                           MaxLines="1"
+                                                           LineBreakMode="TailTruncation"
+                                                           VerticalTextAlignment="Center" />
+                                                </Grid>
+                                                <Border.GestureRecognizers>
+                                                    <TapGestureRecognizer Command="{x:Static og:Commands.LaunchDApp}" CommandParameter="{Binding .}" />
+                                                </Border.GestureRecognizers>
+                                            </Border>
+                                        </DataTemplate>
+                                    </CollectionView.ItemTemplate>
+                                </CollectionView>
+                            </VerticalStackLayout>
+
+                            <Label Text="{x:Static og:Strings.GamingAllGames}" FontAttributes="Bold" FontSize="18" />
+                        </VerticalStackLayout>
+                    </CollectionView.Header>
+                    <CollectionView.ItemsLayout>
+                        <GridItemsLayout x:Name="GalleryItemsLayout" Orientation="Vertical" Span="3" HorizontalItemSpacing="10" VerticalItemSpacing="14" />
+                    </CollectionView.ItemsLayout>
+                    <CollectionView.ItemTemplate>
+                        <DataTemplate x:DataType="og:DApp">
+                            <Border StyleClass="Card" HeightRequest="164" Padding="0">
+                                <Grid RowDefinitions="112,52">
+                                    <Grid>
+                                        <Image Margin="18" Aspect="AspectFit">
+                                            <Image.Source>
+                                                <UriImageSource Uri="{Binding IconUrl}" CacheValidity="30:00:00:00" />
+                                            </Image.Source>
+                                        </Image>
+                                        <Image Aspect="AspectFill">
+                                            <Image.Source>
+                                                <UriImageSource Uri="{Binding PreviewUrl}" CacheValidity="30:00:00:00" />
+                                            </Image.Source>
+                                        </Image>
+                                        <Button StyleClass="Icon"
+                                                Text="&#xe605;"
+                                                FontSize="16"
+                                                WidthRequest="32"
+                                                HeightRequest="32"
+                                                CornerRadius="16"
+                                                Margin="6"
+                                                Padding="0"
+                                                BackgroundColor="{toolkit:AppThemeResource Panel}"
+                                                HorizontalOptions="End"
+                                                VerticalOptions="Start"
+                                                Clicked="OnDetailsClicked"
+                                                CommandParameter="{Binding .}" />
+                                    </Grid>
+                                    <VerticalStackLayout Grid.Row="1" Margin="9,6" Spacing="1">
+                                        <Label Text="{Binding Name, Converter={StaticResource LocalizerConverter}}"
+                                               FontAttributes="Bold"
+                                               FontSize="12"
+                                               MaxLines="1"
+                                               LineBreakMode="TailTruncation" />
+                                        <Label StyleClass="Secondary"
+                                               Text="{Binding GameTypeDisplayName}"
+                                               FontSize="10"
+                                               MaxLines="1"
+                                               LineBreakMode="TailTruncation" />
+                                    </VerticalStackLayout>
+                                    <Grid.GestureRecognizers>
+                                        <TapGestureRecognizer Command="{x:Static og:Commands.LaunchDApp}" CommandParameter="{Binding .}" />
+                                    </Grid.GestureRecognizers>
+                                </Grid>
+                            </Border>
+                        </DataTemplate>
+                    </CollectionView.ItemTemplate>
+                </CollectionView>
+
+                <CollectionView ItemsSource="{Binding GamesFiltered}"
+                                IsVisible="{Binding ShowListLayout}"
+                                MinimumHeightRequest="20">
+                    <CollectionView.Header>
+                        <VerticalStackLayout Spacing="16" Padding="0,0,0,8">
+                            <Border StrokeShape="RoundRectangle 8" StrokeThickness="0" HeightRequest="132">
+                                <Image Source="gaming_banner.webp" Aspect="AspectFill" />
+                            </Border>
+                            <VerticalStackLayout Spacing="8" IsVisible="{Binding HasRecentGames}">
+                                <Label Text="{x:Static og:Strings.GamingRecentPlayed}" FontAttributes="Bold" />
+                                <CollectionView ItemsSource="{Binding GamesRecent}" HeightRequest="104">
+                                    <CollectionView.ItemsLayout>
+                                        <LinearItemsLayout Orientation="Horizontal" ItemSpacing="8" />
+                                    </CollectionView.ItemsLayout>
+                                    <CollectionView.ItemTemplate>
+                                        <DataTemplate x:DataType="og:DApp">
+                                            <Border StyleClass="Card" WidthRequest="96" HeightRequest="96" Padding="8,10">
+                                                <Grid RowDefinitions="48,*" RowSpacing="4">
+                                                    <Image WidthRequest="44" HeightRequest="44" Aspect="AspectFit" HorizontalOptions="Center" VerticalOptions="Center">
+                                                        <Image.Source>
+                                                            <UriImageSource Uri="{Binding IconUrl}" CacheValidity="30:00:00:00" />
+                                                        </Image.Source>
+                                                    </Image>
+                                                    <Label Grid.Row="1" Text="{Binding Name, Converter={StaticResource LocalizerConverter}}" FontAttributes="Bold" FontSize="12" MaxLines="1" LineBreakMode="TailTruncation" HorizontalTextAlignment="Center" VerticalTextAlignment="Center" />
+                                                </Grid>
+                                                <Border.GestureRecognizers>
+                                                    <TapGestureRecognizer Command="{x:Static og:Commands.LaunchDApp}" CommandParameter="{Binding .}" />
+                                                </Border.GestureRecognizers>
+                                            </Border>
+                                        </DataTemplate>
+                                    </CollectionView.ItemTemplate>
+                                </CollectionView>
+                            </VerticalStackLayout>
+                        </VerticalStackLayout>
+                    </CollectionView.Header>
+                    <CollectionView.ItemsLayout>
+                        <GridItemsLayout x:Name="GamesItemsLayout" Orientation="Vertical" Span="1" HorizontalItemSpacing="28" />
+                    </CollectionView.ItemsLayout>
+                    <CollectionView.ItemTemplate>
+                        <DataTemplate x:DataType="og:DApp">
+                            <Grid RowDefinitions="*,1" HeightRequest="96">
+                                <Grid ColumnDefinitions="60,*,40" ColumnSpacing="12" Padding="0,8" MinimumHeightRequest="88">
+                                    <Image WidthRequest="56" HeightRequest="56" Aspect="AspectFit" HorizontalOptions="Center" VerticalOptions="Center">
+                                        <Image.Source>
+                                            <UriImageSource Uri="{Binding IconUrl}" CacheValidity="30:00:00:00" />
+                                        </Image.Source>
+                                    </Image>
+                                    <VerticalStackLayout Grid.Column="1" Spacing="3" VerticalOptions="Center">
+                                        <Label Text="{Binding Name, Converter={StaticResource LocalizerConverter}}" FontAttributes="Bold" FontSize="14" LineBreakMode="TailTruncation" MaxLines="1" />
+                                        <HorizontalStackLayout Spacing="6">
+                                            <Label StyleClass="Link" Text="{Binding Developer}" FontSize="11" LineBreakMode="TailTruncation" MaxLines="1" />
+                                            <Label StyleClass="Secondary" Text="·" FontSize="11" />
+                                            <Label StyleClass="Secondary" Text="{Binding GameTypeDisplayName}" FontSize="11" LineBreakMode="TailTruncation" MaxLines="1" />
+                                        </HorizontalStackLayout>
+                                        <Label StyleClass="Secondary" Text="{Binding Description, Converter={StaticResource LocalizerConverter}}" FontSize="11" MaxLines="2" LineBreakMode="TailTruncation" />
+                                    </VerticalStackLayout>
+                                    <Button Grid.Column="2" StyleClass="Icon, IconSecondary" Text="&#xe605;" FontSize="18" Margin="-12" Padding="12" VerticalOptions="Center" Clicked="OnDetailsClicked" CommandParameter="{Binding .}" />
+                                </Grid>
+                                <BoxView Grid.Row="1" Margin="72,0,0,0" HeightRequest="1" Color="{AppThemeBinding Light={StaticResource Gray100}, Dark={StaticResource Gray600}}" />
+                                <Grid.GestureRecognizers>
+                                    <TapGestureRecognizer Command="{x:Static og:Commands.LaunchDApp}" CommandParameter="{Binding .}" />
+                                </Grid.GestureRecognizers>
+                            </Grid>
+                        </DataTemplate>
+                    </CollectionView.ItemTemplate>
+                </CollectionView>
+
+                <Border StyleClass="Card"
+                        IsVisible="{Binding ShowEmptyState}"
+                        HeightRequest="120"
+                        VerticalOptions="Start">
                     <Grid>
                         <Label IsVisible="{Binding LoadingService.IsLoading}" HorizontalOptions="Center" VerticalOptions="Center">
                             <Label.FormattedText>
@@ -75,43 +325,16 @@
                                 </FormattedString>
                             </Label.FormattedText>
                         </Label>
-                        <VerticalStackLayout Spacing="4" IsVisible="{Binding LoadingService.IsLoading, Converter={StaticResource InvertedBoolConverter}}" HorizontalOptions="Center" VerticalOptions="Center">
+                        <VerticalStackLayout Spacing="4"
+                                             IsVisible="{Binding LoadingService.IsLoading, Converter={StaticResource InvertedBoolConverter}}"
+                                             HorizontalOptions="Center"
+                                             VerticalOptions="Center">
                             <Label Text="{x:Static og:Strings.DefaultEmptyViewMessage}" HorizontalTextAlignment="Center" />
                             <Label StyleClass="Secondary" Text="{x:Static og:Strings.GamingEmptyState}" FontSize="12" HorizontalTextAlignment="Center" />
                         </VerticalStackLayout>
                     </Grid>
                 </Border>
-            </CollectionView.EmptyView>
-            <CollectionView.ItemsLayout>
-                <GridItemsLayout x:Name="GamesItemsLayout" Orientation="Vertical" Span="1" HorizontalItemSpacing="28" />
-            </CollectionView.ItemsLayout>
-            <CollectionView.ItemTemplate>
-                <DataTemplate x:DataType="og:DApp">
-                    <Grid RowDefinitions="*,1" HeightRequest="96">
-                        <Grid ColumnDefinitions="60,*,40" ColumnSpacing="12" Padding="0,8" MinimumHeightRequest="88">
-                            <Image WidthRequest="56" HeightRequest="56" Aspect="AspectFit" HorizontalOptions="Center" VerticalOptions="Center">
-                                <Image.Source>
-                                    <UriImageSource Uri="{Binding IconUrl}" CacheValidity="30:00:00:00" />
-                                </Image.Source>
-                            </Image>
-                            <VerticalStackLayout Grid.Column="1" Spacing="3" VerticalOptions="Center">
-                                <Label Text="{Binding Name, Converter={StaticResource LocalizerConverter}}" FontAttributes="Bold" FontSize="14" LineBreakMode="TailTruncation" MaxLines="1" />
-                                <HorizontalStackLayout Spacing="6">
-                                    <Label StyleClass="Link" Text="{Binding Developer}" FontSize="11" LineBreakMode="TailTruncation" MaxLines="1" />
-                                    <Label StyleClass="Secondary" Text="·" FontSize="11" />
-                                    <Label StyleClass="Secondary" Text="{Binding GameTypeDisplayName}" FontSize="11" LineBreakMode="TailTruncation" MaxLines="1" />
-                                </HorizontalStackLayout>
-                                <Label StyleClass="Secondary" Text="{Binding Description, Converter={StaticResource LocalizerConverter}}" FontSize="11" MaxLines="2" LineBreakMode="TailTruncation" />
-                            </VerticalStackLayout>
-                            <Button Grid.Column="2" StyleClass="Icon, IconSecondary" Text="&#xe605;" FontSize="18" Margin="-12" Padding="12" VerticalOptions="Center" Clicked="OnDetailsClicked" CommandParameter="{Binding .}" />
-                        </Grid>
-                        <BoxView Grid.Row="1" Margin="72,0,0,0" HeightRequest="1" Color="{AppThemeBinding Light={StaticResource Gray100}, Dark={StaticResource Gray600}}" />
-                        <Grid.GestureRecognizers>
-                            <TapGestureRecognizer Command="{x:Static og:Commands.LaunchDApp}" CommandParameter="{Binding .}" />
-                        </Grid.GestureRecognizers>
-                    </Grid>
-                </DataTemplate>
-            </CollectionView.ItemTemplate>
-        </CollectionView>
+            </Grid>
+        </Grid>
     </RefreshView>
 </ContentPage>
diff --git a/OneGateApp/Pages/GamingPage.xaml.cs b/OneGateApp/Pages/GamingPage.xaml.cs
index ff3e559..01b68f6 100644
--- a/OneGateApp/Pages/GamingPage.xaml.cs
+++ b/OneGateApp/Pages/GamingPage.xaml.cs
@@ -1,3 +1,5 @@
+using CommunityToolkit.Maui.Alerts;
+using NeoOrder.OneGate.Controls;
 using NeoOrder.OneGate.Data;
 using NeoOrder.OneGate.Models;
 using NeoOrder.OneGate.Properties;
@@ -9,9 +11,14 @@ namespace NeoOrder.OneGate.Pages;
 
 public partial class GamingPage : ContentPage
 {
+    const string LayoutPreferenceKey = "gaming/layout";
+    const string GalleryLayout = "gallery";
+    const string ListLayout = "list";
     const double GameItemMinWidth = 520;
+    const double GalleryItemMinWidth = 112;
     const double HorizontalPageMargin = 40;
     const int MaxGameColumns = 3;
+    const int MaxGalleryColumns = 4;
 
     readonly ApplicationDbContext dbContext;
     bool allowRestrictedContent;
@@ -23,9 +30,44 @@ public partial class GamingPage : ContentPage
     public ObservableCollection<DApp> GamesRecent { get; private set { field = value; OnPropertyChanged(); } } = [];
     public bool HasRecentGames { get; private set { field = value; OnPropertyChanged(); } }
     public DApp[] Games { get; private set { field = value; OnPropertyChanged(); } } = [];
-    public DApp[] GamesFiltered { get; private set { field = value; OnPropertyChanged(); } } = [];
+    public DApp[] GamesFiltered
+    {
+        get;
+        private set
+        {
+            field = value;
+            OnPropertyChanged();
+            OnPropertyChanged(nameof(ShowGalleryLayout));
+            OnPropertyChanged(nameof(ShowListLayout));
+            OnPropertyChanged(nameof(ShowEmptyState));
+        }
+    } = [];
+    public DApp[] GamesQuickPicks { get; private set { field = value; OnPropertyChanged(); OnPropertyChanged(nameof(HasQuickPicks)); } } = [];
+    public bool HasQuickPicks => GamesQuickPicks.Length > 0;
+    public DApp? SpotlightGame { get; private set { field = value; OnPropertyChanged(); OnPropertyChanged(nameof(HasSpotlightGame)); } }
+    public bool HasSpotlightGame => SpotlightGame is not null;
     public string[] GameTypes { get; private set { field = value; OnPropertyChanged(); } } = [Strings.All];
     public bool HasGameTypeFilters { get; private set { field = value; OnPropertyChanged(); } }
+    public bool IsGalleryLayout
+    {
+        get;
+        private set
+        {
+            field = value;
+            OnPropertyChanged();
+            OnPropertyChanged(nameof(IsListLayout));
+            OnPropertyChanged(nameof(LayoutToggleDescription));
+            OnPropertyChanged(nameof(ShowGalleryLayout));
+            OnPropertyChanged(nameof(ShowListLayout));
+        }
+    } = true;
+    public bool IsListLayout => !IsGalleryLayout;
+    public string LayoutToggleDescription => IsGalleryLayout ? Strings.GamingList : Strings.GamingGallery;
+    public bool ShowGalleryLayout => IsGalleryLayout && GamesFiltered.Length > 0;
+    public bool ShowListLayout => IsListLayout && GamesFiltered.Length > 0;
+    public bool ShowEmptyState => GamesFiltered.Length == 0;
+
+    bool layoutPreferenceLoaded;
 
     public GamingPage(IServiceProvider serviceProvider, ApplicationDbContext dbContext)
     {
@@ -54,6 +96,7 @@ protected override void OnSizeAllocated(double width, double height)
     {
         base.OnSizeAllocated(width, height);
         UpdateGamesItemsLayout(width);
+        UpdateGalleryItemsLayout(width);
     }
 
     async Task LoadSettingsAsync()
@@ -61,6 +104,8 @@ async Task LoadSettingsAsync()
         allowRestrictedContent = await DAppCatalogPolicy.GetAllowRestrictedContentAsync(dbContext);
         developerModeEnabled = await DAppCatalogPolicy.GetDeveloperModeEnabledAsync(dbContext);
         GamesIdRecent = await dbContext.Settings.GetAsync<List<int>>("dapps/recent") ?? [];
+        IsGalleryLayout = !string.Equals(await dbContext.Settings.GetAsync(LayoutPreferenceKey), ListLayout, StringComparison.OrdinalIgnoreCase);
+        layoutPreferenceLoaded = true;
     }
 
     async Task LoadDAppsAsync()
@@ -82,6 +127,15 @@ void UpdateGamesItemsLayout(double pageWidth)
             GamesItemsLayout.Span = span;
     }
 
+    void UpdateGalleryItemsLayout(double pageWidth)
+    {
+        if (pageWidth <= 0) return;
+        var contentWidth = Math.Max(0, pageWidth - HorizontalPageMargin);
+        var span = Math.Clamp((int)(contentWidth / GalleryItemMinWidth), 2, MaxGalleryColumns);
+        if (GalleryItemsLayout.Span != span)
+            GalleryItemsLayout.Span = span;
+    }
+
     void OnDataLoaded(object? sender, EventArgs e)
     {
         Games = DApps
@@ -110,11 +164,23 @@ void LoadRecentGames()
         HasRecentGames = GamesRecent.Count > 0;
     }
 
+    void UpdateGallerySections()
+    {
+        SpotlightGame = GamesFiltered
+            .FirstOrDefault(p => p.Previews?.Any(url => !string.IsNullOrWhiteSpace(url)) == true)
+            ?? GamesFiltered.FirstOrDefault();
+        GamesQuickPicks = GamesFiltered
+            .Where(p => !ReferenceEquals(p, SpotlightGame))
+            .Take(6)
+            .ToArray();
+    }
+
     void ApplyGameTypeFilter(TabBar tabBar)
     {
         if (tabBar.Tabs is not { Count: > 0 } tabs)
         {
             GamesFiltered = Games;
+            UpdateGallerySections();
             return;
         }
 
@@ -127,12 +193,32 @@ void ApplyGameTypeFilter(TabBar tabBar)
         if (tabBar.SelectedTab == tabs[0])
         {
             GamesFiltered = Games;
+            UpdateGallerySections();
             return;
         }
 
         GamesFiltered = Games
             .Where(p => string.Equals(p.GameTypeDisplayName, tabBar.SelectedTab, StringComparison.CurrentCulture))
             .ToArray();
+        UpdateGallerySections();
+    }
+
+    async void OnLayoutToggleClicked(object sender, EventArgs e)
+    {
+        if (!layoutPreferenceLoaded)
+            return;
+
+        bool previousLayout = IsGalleryLayout;
+        IsGalleryLayout = !previousLayout;
+        try
+        {
+            await dbContext.Settings.PutAsync(LayoutPreferenceKey, IsGalleryLayout ? GalleryLayout : ListLayout);
+        }
+        catch (Exception ex)
+        {
+            IsGalleryLayout = previousLayout;
+            await Toast.Show(ex.Message);
+        }
     }
 
     async void OnDetailsClicked(object sender, EventArgs e)
diff --git a/OneGateApp/Properties/Strings.Designer.cs b/OneGateApp/Properties/Strings.Designer.cs
index 7a727b2..8b0a922 100644
--- a/OneGateApp/Properties/Strings.Designer.cs
+++ b/OneGateApp/Properties/Strings.Designer.cs
@@ -1462,6 +1462,51 @@ internal static string GamingRecentPlayed {
             }
         }
 
+        /// <summary>
+        ///   查找类似 Gallery 的本地化字符串。
+        /// </summary>
+        internal static string GamingGallery {
+            get {
+                return ResourceManager.GetString("GamingGallery", resourceCulture);
+            }
+        }
+
+        /// <summary>
+        ///   查找类似 List 的本地化字符串。
+        /// </summary>
+        internal static string GamingList {
+            get {
+                return ResourceManager.GetString("GamingList", resourceCulture);
+            }
+        }
+
+        /// <summary>
+        ///   查找类似 Quick picks 的本地化字符串。
+        /// </summary>
+        internal static string GamingQuickPicks {
+            get {
+                return ResourceManager.GetString("GamingQuickPicks", resourceCulture);
+            }
+        }
+
+        /// <summary>
+        ///   查找类似 All games 的本地化字符串。
+        /// </summary>
+        internal static string GamingAllGames {
+            get {
+                return ResourceManager.GetString("GamingAllGames", resourceCulture);
+            }
+        }
+
+        /// <summary>
+        ///   查找类似 Game spotlight 的本地化字符串。
+        /// </summary>
+        internal static string GamingSpotlight {
+            get {
+                return ResourceManager.GetString("GamingSpotlight", resourceCulture);
+            }
+        }
+
         /// <summary>
         ///   查找类似 General 的本地化字符串。
         /// </summary>
diff --git a/OneGateApp/Properties/Strings.resx b/OneGateApp/Properties/Strings.resx
index 61a49e5..b1dee4c 100644
--- a/OneGateApp/Properties/Strings.resx
+++ b/OneGateApp/Properties/Strings.resx
@@ -846,6 +846,21 @@ By continuing, you acknowledge that you fully understand and accept all associat
   <data name="GamingRecentPlayed" xml:space="preserve">
     <value>Recently played</value>
   </data>
+  <data name="GamingGallery" xml:space="preserve">
+    <value>Gallery</value>
+  </data>
+  <data name="GamingList" xml:space="preserve">
+    <value>List</value>
+  </data>
+  <data name="GamingQuickPicks" xml:space="preserve">
+    <value>Quick picks</value>
+  </data>
+  <data name="GamingAllGames" xml:space="preserve">
+    <value>All games</value>
+  </data>
+  <data name="GamingSpotlight" xml:space="preserve">
+    <value>Game spotlight</value>
+  </data>
   <data name="GameType" xml:space="preserve">
     <value>Game type</value>
   </data>
diff --git a/OneGateApp/Properties/Strings.zh-Hans.resx b/OneGateApp/Properties/Strings.zh-Hans.resx
index adc591e..c8ce59e 100644
--- a/OneGateApp/Properties/Strings.zh-Hans.resx
+++ b/OneGateApp/Properties/Strings.zh-Hans.resx
@@ -846,6 +846,21 @@
   <data name="GamingRecentPlayed" xml:space="preserve">
     <value>最近玩过</value>
   </data>
+  <data name="GamingGallery" xml:space="preserve">
+    <value>画廊</value>
+  </data>
+  <data name="GamingList" xml:space="preserve">
+    <value>列表</value>
+  </data>
+  <data name="GamingQuickPicks" xml:space="preserve">
+    <value>精选速览</value>
+  </data>
+  <data name="GamingAllGames" xml:space="preserve">
+    <value>全部游戏</value>
+  </data>
+  <data name="GamingSpotlight" xml:space="preserve">
+    <value>游戏推荐</value>
+  </data>
   <data name="GameType" xml:space="preserve">
     <value>游戏类型</value>
   </data>

From f608d97ac656a70ebecb93071f6a510465ce6b41 Mon Sep 17 00:00:00 2001
From: OneGate Dev <dev@onegate.app>
Date: Sun, 9 Aug 2026 00:02:52 +0800
Subject: [PATCH 2/3] Address gallery layout review feedback

---
 OneGateApp/Pages/GamingPage.xaml           |  8 ++++----
 OneGateApp/Pages/GamingPage.xaml.cs        |  4 +++-
 OneGateApp/Properties/Strings.Designer.cs  | 18 ++++++++++++++++++
 OneGateApp/Properties/Strings.de.resx      |  2 ++
 OneGateApp/Properties/Strings.es.resx      |  2 ++
 OneGateApp/Properties/Strings.fr.resx      |  2 ++
 OneGateApp/Properties/Strings.id.resx      |  2 ++
 OneGateApp/Properties/Strings.it.resx      |  2 ++
 OneGateApp/Properties/Strings.ja.resx      |  2 ++
 OneGateApp/Properties/Strings.ko.resx      |  2 ++
 OneGateApp/Properties/Strings.nl.resx      |  2 ++
 OneGateApp/Properties/Strings.pt-BR.resx   |  2 ++
 OneGateApp/Properties/Strings.resx         |  2 ++
 OneGateApp/Properties/Strings.ru.resx      |  2 ++
 OneGateApp/Properties/Strings.tr.resx      |  2 ++
 OneGateApp/Properties/Strings.vi.resx      |  2 ++
 OneGateApp/Properties/Strings.zh-Hans.resx |  2 ++
 OneGateApp/Properties/Strings.zh-Hant.resx |  2 ++
 18 files changed, 55 insertions(+), 5 deletions(-)

diff --git a/OneGateApp/Pages/GamingPage.xaml b/OneGateApp/Pages/GamingPage.xaml
index bede410..b30c2f9 100644
--- a/OneGateApp/Pages/GamingPage.xaml
+++ b/OneGateApp/Pages/GamingPage.xaml
@@ -73,7 +73,7 @@
                                         <DataTemplate x:DataType="og:DApp">
                                             <Border StyleClass="Card" WidthRequest="112" HeightRequest="120" Padding="0">
                                                 <Grid RowDefinitions="76,44">
-                                                    <Image Margin="14" Aspect="AspectFit">
+                                                    <Image Margin="14" Aspect="AspectFit" ZIndex="1">
                                                         <Image.Source>
                                                             <UriImageSource Uri="{Binding IconUrl}" CacheValidity="30:00:00:00" />
                                                         </Image.Source>
@@ -107,7 +107,7 @@
                                 <Border StyleClass="Card" HeightRequest="208" Padding="0">
                                     <Grid>
                                         <Image Source="gaming_banner.webp" Aspect="AspectFill" />
-                                        <Image Margin="52" Aspect="AspectFit">
+                                        <Image Margin="52" Aspect="AspectFit" ZIndex="1">
                                             <Image.Source>
                                                 <UriImageSource Uri="{Binding SpotlightGame.IconUrl}" CacheValidity="30:00:00:00" />
                                             </Image.Source>
@@ -161,7 +161,7 @@
                                         <DataTemplate x:DataType="og:DApp">
                                             <Border StyleClass="Card" WidthRequest="154" HeightRequest="132" Padding="0">
                                                 <Grid RowDefinitions="88,44">
-                                                    <Image Margin="16" Aspect="AspectFit">
+                                                    <Image Margin="16" Aspect="AspectFit" ZIndex="1">
                                                         <Image.Source>
                                                             <UriImageSource Uri="{Binding IconUrl}" CacheValidity="30:00:00:00" />
                                                         </Image.Source>
@@ -200,7 +200,7 @@
                             <Border StyleClass="Card" HeightRequest="164" Padding="0">
                                 <Grid RowDefinitions="112,52">
                                     <Grid>
-                                        <Image Margin="18" Aspect="AspectFit">
+                                        <Image Margin="18" Aspect="AspectFit" ZIndex="1">
                                             <Image.Source>
                                                 <UriImageSource Uri="{Binding IconUrl}" CacheValidity="30:00:00:00" />
                                             </Image.Source>
diff --git a/OneGateApp/Pages/GamingPage.xaml.cs b/OneGateApp/Pages/GamingPage.xaml.cs
index 01b68f6..4a01f58 100644
--- a/OneGateApp/Pages/GamingPage.xaml.cs
+++ b/OneGateApp/Pages/GamingPage.xaml.cs
@@ -62,7 +62,9 @@ private set
         }
     } = true;
     public bool IsListLayout => !IsGalleryLayout;
-    public string LayoutToggleDescription => IsGalleryLayout ? Strings.GamingList : Strings.GamingGallery;
+    public string LayoutToggleDescription => IsGalleryLayout
+        ? Strings.GamingSwitchToListLayout
+        : Strings.GamingSwitchToGalleryLayout;
     public bool ShowGalleryLayout => IsGalleryLayout && GamesFiltered.Length > 0;
     public bool ShowListLayout => IsListLayout && GamesFiltered.Length > 0;
     public bool ShowEmptyState => GamesFiltered.Length == 0;
diff --git a/OneGateApp/Properties/Strings.Designer.cs b/OneGateApp/Properties/Strings.Designer.cs
index a24e63c..a710012 100644
--- a/OneGateApp/Properties/Strings.Designer.cs
+++ b/OneGateApp/Properties/Strings.Designer.cs
@@ -1489,6 +1489,24 @@ internal static string GamingList {
             }
         }
 
+        /// <summary>
+        ///   查找类似 Switch to gallery layout 的本地化字符串。
+        /// </summary>
+        internal static string GamingSwitchToGalleryLayout {
+            get {
+                return ResourceManager.GetString("GamingSwitchToGalleryLayout", resourceCulture);
+            }
+        }
+
+        /// <summary>
+        ///   查找类似 Switch to list layout 的本地化字符串。
+        /// </summary>
+        internal static string GamingSwitchToListLayout {
+            get {
+                return ResourceManager.GetString("GamingSwitchToListLayout", resourceCulture);
+            }
+        }
+
         /// <summary>
         ///   查找类似 Quick picks 的本地化字符串。
         /// </summary>
diff --git a/OneGateApp/Properties/Strings.de.resx b/OneGateApp/Properties/Strings.de.resx
index 3702b82..f9e7935 100644
--- a/OneGateApp/Properties/Strings.de.resx
+++ b/OneGateApp/Properties/Strings.de.resx
@@ -1255,4 +1255,6 @@ Es wird empfohlen, den NEP-2-Schlüssel und das Passwort getrennt aufzubewahren
   <data name="RemoteDebugWaiting" xml:space="preserve"><value>Warten auf einen vertrauenswürdigen Remote-Debugger</value></data>
   <data name="RemoteDebugPairingTitle" xml:space="preserve"><value>Remote-Debugger koppeln</value></data>
   <data name="RemoteDebugPairingPrompt" xml:space="preserve"><value>Remote-Debugger „{0}“ fordert Zugriff an. Fingerabdruck: {1}. Nur autorisieren, wenn du diesem Remote-Debugger vertraust.</value></data>
+  <data name="GamingSwitchToGalleryLayout" xml:space="preserve"><value>Zum Galerie-Layout wechseln</value></data>
+  <data name="GamingSwitchToListLayout" xml:space="preserve"><value>Zum Listen-Layout wechseln</value></data>
 </root>
diff --git a/OneGateApp/Properties/Strings.es.resx b/OneGateApp/Properties/Strings.es.resx
index de6b8c0..6bc6aa8 100644
--- a/OneGateApp/Properties/Strings.es.resx
+++ b/OneGateApp/Properties/Strings.es.resx
@@ -1255,4 +1255,6 @@ Se recomienda almacenar la clave NEP-2 y la contraseña por separado y realizar
   <data name="RemoteDebugWaiting" xml:space="preserve"><value>Esperando un depurador remoto de confianza</value></data>
   <data name="RemoteDebugPairingTitle" xml:space="preserve"><value>Emparejar depurador remoto</value></data>
   <data name="RemoteDebugPairingPrompt" xml:space="preserve"><value>El depurador remoto «{0}» solicita acceso. Huella: {1}. Autoriza solo si confías en este depurador remoto.</value></data>
+  <data name="GamingSwitchToGalleryLayout" xml:space="preserve"><value>Cambiar al diseño de galería</value></data>
+  <data name="GamingSwitchToListLayout" xml:space="preserve"><value>Cambiar al diseño de lista</value></data>
 </root>
diff --git a/OneGateApp/Properties/Strings.fr.resx b/OneGateApp/Properties/Strings.fr.resx
index 48e1a46..91789ac 100644
--- a/OneGateApp/Properties/Strings.fr.resx
+++ b/OneGateApp/Properties/Strings.fr.resx
@@ -1255,4 +1255,6 @@ Il est recommandé de conserver séparément la clé NEP-2 et le mot de passe, e
   <data name="RemoteDebugWaiting" xml:space="preserve"><value>En attente d’un débogueur distant approuvé</value></data>
   <data name="RemoteDebugPairingTitle" xml:space="preserve"><value>Associer le débogueur distant</value></data>
   <data name="RemoteDebugPairingPrompt" xml:space="preserve"><value>Le débogueur distant « {0} » demande l’accès. Empreinte : {1}. Autorisez uniquement si vous faites confiance à ce débogueur distant.</value></data>
+  <data name="GamingSwitchToGalleryLayout" xml:space="preserve"><value>Passer à l’affichage en galerie</value></data>
+  <data name="GamingSwitchToListLayout" xml:space="preserve"><value>Passer à l’affichage en liste</value></data>
 </root>
diff --git a/OneGateApp/Properties/Strings.id.resx b/OneGateApp/Properties/Strings.id.resx
index 487ee23..249a827 100644
--- a/OneGateApp/Properties/Strings.id.resx
+++ b/OneGateApp/Properties/Strings.id.resx
@@ -1255,4 +1255,6 @@ Disarankan untuk menyimpan kunci NEP-2 dan kata sandinya secara terpisah serta m
   <data name="RemoteDebugWaiting" xml:space="preserve"><value>Menunggu debugger jarak jauh tepercaya</value></data>
   <data name="RemoteDebugPairingTitle" xml:space="preserve"><value>Pasangkan debugger jarak jauh</value></data>
   <data name="RemoteDebugPairingPrompt" xml:space="preserve"><value>Debugger jarak jauh “{0}” meminta akses. Sidik jari: {1}. Izinkan hanya jika Anda memercayai debugger jarak jauh ini.</value></data>
+  <data name="GamingSwitchToGalleryLayout" xml:space="preserve"><value>Beralih ke tata letak galeri</value></data>
+  <data name="GamingSwitchToListLayout" xml:space="preserve"><value>Beralih ke tata letak daftar</value></data>
 </root>
diff --git a/OneGateApp/Properties/Strings.it.resx b/OneGateApp/Properties/Strings.it.resx
index d0c9264..dcb5c5f 100644
--- a/OneGateApp/Properties/Strings.it.resx
+++ b/OneGateApp/Properties/Strings.it.resx
@@ -1255,4 +1255,6 @@ Si consiglia di conservare separatamente la chiave NEP-2 e la password e di eseg
   <data name="RemoteDebugWaiting" xml:space="preserve"><value>In attesa di un debugger remoto attendibile</value></data>
   <data name="RemoteDebugPairingTitle" xml:space="preserve"><value>Associa debugger remoto</value></data>
   <data name="RemoteDebugPairingPrompt" xml:space="preserve"><value>Il debugger remoto “{0}” richiede l’accesso. Impronta: {1}. Autorizza solo se ritieni attendibile questo debugger remoto.</value></data>
+  <data name="GamingSwitchToGalleryLayout" xml:space="preserve"><value>Passa al layout galleria</value></data>
+  <data name="GamingSwitchToListLayout" xml:space="preserve"><value>Passa al layout elenco</value></data>
 </root>
diff --git a/OneGateApp/Properties/Strings.ja.resx b/OneGateApp/Properties/Strings.ja.resx
index 94e9f9f..5cd43ce 100644
--- a/OneGateApp/Properties/Strings.ja.resx
+++ b/OneGateApp/Properties/Strings.ja.resx
@@ -1255,4 +1255,6 @@ NEP-2 とパスワードは別々に保管し、それぞれを安全にバッ
   <data name="RemoteDebugWaiting" xml:space="preserve"><value>信頼済みリモートデバッガーを待機中</value></data>
   <data name="RemoteDebugPairingTitle" xml:space="preserve"><value>リモートデバッガーをペアリング</value></data>
   <data name="RemoteDebugPairingPrompt" xml:space="preserve"><value>リモートデバッガー「{0}」がアクセスを要求しています。フィンガープリント: {1}。このリモートデバッガーを信頼する場合のみ許可してください。</value></data>
+  <data name="GamingSwitchToGalleryLayout" xml:space="preserve"><value>ギャラリーレイアウトに切り替え</value></data>
+  <data name="GamingSwitchToListLayout" xml:space="preserve"><value>リストレイアウトに切り替え</value></data>
 </root>
diff --git a/OneGateApp/Properties/Strings.ko.resx b/OneGateApp/Properties/Strings.ko.resx
index 2cfa2f5..04aebe4 100644
--- a/OneGateApp/Properties/Strings.ko.resx
+++ b/OneGateApp/Properties/Strings.ko.resx
@@ -1255,4 +1255,6 @@ NEP-2와 비밀번호는 별도로 보관하고 각각 안전하게 백업하는
   <data name="RemoteDebugWaiting" xml:space="preserve"><value>신뢰할 수 있는 원격 디버거 대기 중</value></data>
   <data name="RemoteDebugPairingTitle" xml:space="preserve"><value>원격 디버거 페어링</value></data>
   <data name="RemoteDebugPairingPrompt" xml:space="preserve"><value>원격 디버거 “{0}”이(가) 액세스를 요청합니다. 지문: {1}. 이 원격 디버거를 신뢰하는 경우에만 허용하세요.</value></data>
+  <data name="GamingSwitchToGalleryLayout" xml:space="preserve"><value>갤러리 레이아웃으로 전환</value></data>
+  <data name="GamingSwitchToListLayout" xml:space="preserve"><value>목록 레이아웃으로 전환</value></data>
 </root>
diff --git a/OneGateApp/Properties/Strings.nl.resx b/OneGateApp/Properties/Strings.nl.resx
index e334d10..7276089 100644
--- a/OneGateApp/Properties/Strings.nl.resx
+++ b/OneGateApp/Properties/Strings.nl.resx
@@ -1255,4 +1255,6 @@ Het wordt aanbevolen om de NEP-2-sleutel en het wachtwoord apart op te slaan en
   <data name="RemoteDebugWaiting" xml:space="preserve"><value>Wachten op een vertrouwde externe debugger</value></data>
   <data name="RemoteDebugPairingTitle" xml:space="preserve"><value>Externe debugger koppelen</value></data>
   <data name="RemoteDebugPairingPrompt" xml:space="preserve"><value>Externe debugger ‘{0}’ vraagt toegang. Vingerafdruk: {1}. Autoriseer alleen als je deze externe debugger vertrouwt.</value></data>
+  <data name="GamingSwitchToGalleryLayout" xml:space="preserve"><value>Overschakelen naar galerijweergave</value></data>
+  <data name="GamingSwitchToListLayout" xml:space="preserve"><value>Overschakelen naar lijstweergave</value></data>
 </root>
diff --git a/OneGateApp/Properties/Strings.pt-BR.resx b/OneGateApp/Properties/Strings.pt-BR.resx
index a412ace..9c0a72d 100644
--- a/OneGateApp/Properties/Strings.pt-BR.resx
+++ b/OneGateApp/Properties/Strings.pt-BR.resx
@@ -1255,4 +1255,6 @@ Recomenda-se armazenar a chave NEP-2 e a senha separadamente e fazer backups seg
   <data name="RemoteDebugWaiting" xml:space="preserve"><value>Aguardando um depurador remoto confiável</value></data>
   <data name="RemoteDebugPairingTitle" xml:space="preserve"><value>Parear depurador remoto</value></data>
   <data name="RemoteDebugPairingPrompt" xml:space="preserve"><value>O depurador remoto “{0}” está solicitando acesso. Impressão digital: {1}. Autorize apenas se confiar neste depurador remoto.</value></data>
+  <data name="GamingSwitchToGalleryLayout" xml:space="preserve"><value>Mudar para o layout de galeria</value></data>
+  <data name="GamingSwitchToListLayout" xml:space="preserve"><value>Mudar para o layout de lista</value></data>
 </root>
diff --git a/OneGateApp/Properties/Strings.resx b/OneGateApp/Properties/Strings.resx
index ba05d86..174e4ad 100644
--- a/OneGateApp/Properties/Strings.resx
+++ b/OneGateApp/Properties/Strings.resx
@@ -1270,4 +1270,6 @@ It is recommended to store the NEP-2 key and password separately and back them u
   <data name="RemoteDebugWaiting" xml:space="preserve"><value>Waiting for a trusted remote debugger</value></data>
   <data name="RemoteDebugPairingTitle" xml:space="preserve"><value>Pair remote debugger</value></data>
   <data name="RemoteDebugPairingPrompt" xml:space="preserve"><value>Remote debugger “{0}” is requesting access. Fingerprint: {1}. Authorize only if you trust this remote debugger.</value></data>
+  <data name="GamingSwitchToGalleryLayout" xml:space="preserve"><value>Switch to gallery layout</value></data>
+  <data name="GamingSwitchToListLayout" xml:space="preserve"><value>Switch to list layout</value></data>
 </root>
diff --git a/OneGateApp/Properties/Strings.ru.resx b/OneGateApp/Properties/Strings.ru.resx
index 02227cb..42a244d 100644
--- a/OneGateApp/Properties/Strings.ru.resx
+++ b/OneGateApp/Properties/Strings.ru.resx
@@ -1255,4 +1255,6 @@
   <data name="RemoteDebugWaiting" xml:space="preserve"><value>Ожидание доверенного удалённого отладчика</value></data>
   <data name="RemoteDebugPairingTitle" xml:space="preserve"><value>Сопряжение удалённого отладчика</value></data>
   <data name="RemoteDebugPairingPrompt" xml:space="preserve"><value>Удалённый отладчик «{0}» запрашивает доступ. Отпечаток: {1}. Разрешайте только если доверяете этому удалённому отладчику.</value></data>
+  <data name="GamingSwitchToGalleryLayout" xml:space="preserve"><value>Переключиться на вид галереи</value></data>
+  <data name="GamingSwitchToListLayout" xml:space="preserve"><value>Переключиться на вид списка</value></data>
 </root>
diff --git a/OneGateApp/Properties/Strings.tr.resx b/OneGateApp/Properties/Strings.tr.resx
index 16c6291..04210b2 100644
--- a/OneGateApp/Properties/Strings.tr.resx
+++ b/OneGateApp/Properties/Strings.tr.resx
@@ -1255,4 +1255,6 @@ NEP-2 anahtarı ile şifreyi ayrı ayrı saklamanız ve güvenli şekilde yedekl
   <data name="RemoteDebugWaiting" xml:space="preserve"><value>Güvenilir bir uzaktan hata ayıklayıcı bekleniyor</value></data>
   <data name="RemoteDebugPairingTitle" xml:space="preserve"><value>Uzaktan hata ayıklayıcıyı eşleştir</value></data>
   <data name="RemoteDebugPairingPrompt" xml:space="preserve"><value>“{0}” uzaktan hata ayıklayıcısı erişim istiyor. Parmak izi: {1}. Yalnızca bu uzaktan hata ayıklayıcıya güveniyorsanız izin verin.</value></data>
+  <data name="GamingSwitchToGalleryLayout" xml:space="preserve"><value>Galeri düzenine geç</value></data>
+  <data name="GamingSwitchToListLayout" xml:space="preserve"><value>Liste düzenine geç</value></data>
 </root>
diff --git a/OneGateApp/Properties/Strings.vi.resx b/OneGateApp/Properties/Strings.vi.resx
index 61feadc..c11ba80 100644
--- a/OneGateApp/Properties/Strings.vi.resx
+++ b/OneGateApp/Properties/Strings.vi.resx
@@ -1255,4 +1255,6 @@ Nên lưu trữ riêng khóa NEP-2 và mật khẩu, đồng thời sao lưu ch
   <data name="RemoteDebugWaiting" xml:space="preserve"><value>Đang chờ trình gỡ lỗi từ xa đáng tin cậy</value></data>
   <data name="RemoteDebugPairingTitle" xml:space="preserve"><value>Ghép nối trình gỡ lỗi từ xa</value></data>
   <data name="RemoteDebugPairingPrompt" xml:space="preserve"><value>Trình gỡ lỗi từ xa “{0}” đang yêu cầu quyền truy cập. Dấu vân tay: {1}. Chỉ cho phép nếu bạn tin cậy trình gỡ lỗi từ xa này.</value></data>
+  <data name="GamingSwitchToGalleryLayout" xml:space="preserve"><value>Chuyển sang bố cục thư viện</value></data>
+  <data name="GamingSwitchToListLayout" xml:space="preserve"><value>Chuyển sang bố cục danh sách</value></data>
 </root>
diff --git a/OneGateApp/Properties/Strings.zh-Hans.resx b/OneGateApp/Properties/Strings.zh-Hans.resx
index f08f8a6..d7120b7 100644
--- a/OneGateApp/Properties/Strings.zh-Hans.resx
+++ b/OneGateApp/Properties/Strings.zh-Hans.resx
@@ -1270,4 +1270,6 @@
   <data name="RemoteDebugWaiting" xml:space="preserve"><value>正在等待已信任的远程调试器</value></data>
   <data name="RemoteDebugPairingTitle" xml:space="preserve"><value>配对远程调试器</value></data>
   <data name="RemoteDebugPairingPrompt" xml:space="preserve"><value>远程调试器“{0}”正在请求访问。指纹：{1}。仅在你信任此远程调试器时授权。</value></data>
+  <data name="GamingSwitchToGalleryLayout" xml:space="preserve"><value>切换到画廊布局</value></data>
+  <data name="GamingSwitchToListLayout" xml:space="preserve"><value>切换到列表布局</value></data>
 </root>
diff --git a/OneGateApp/Properties/Strings.zh-Hant.resx b/OneGateApp/Properties/Strings.zh-Hant.resx
index 59b9633..0427d60 100644
--- a/OneGateApp/Properties/Strings.zh-Hant.resx
+++ b/OneGateApp/Properties/Strings.zh-Hant.resx
@@ -1255,4 +1255,6 @@
   <data name="RemoteDebugWaiting" xml:space="preserve"><value>正在等待已信任的遠端偵錯器</value></data>
   <data name="RemoteDebugPairingTitle" xml:space="preserve"><value>配對遠端偵錯器</value></data>
   <data name="RemoteDebugPairingPrompt" xml:space="preserve"><value>遠端偵錯器「{0}」正在要求存取。指紋：{1}。僅在你信任此遠端偵錯器時授權。</value></data>
+  <data name="GamingSwitchToGalleryLayout" xml:space="preserve"><value>切換至圖庫版面</value></data>
+  <data name="GamingSwitchToListLayout" xml:space="preserve"><value>切換至列表版面</value></data>
 </root>

From 966e75910eb2229456d70f4368f5ed214c814312 Mon Sep 17 00:00:00 2001
From: OneGate Dev <dev@onegate.app>
Date: Thu, 13 Aug 2026 14:23:14 +0800
Subject: [PATCH 3/3] Keep game previews distinct from icons

---
 OneGateApp/Data/DApp.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OneGateApp/Data/DApp.cs b/OneGateApp/Data/DApp.cs
index 26540ac..0f20bf0 100644
--- a/OneGateApp/Data/DApp.cs
+++ b/OneGateApp/Data/DApp.cs
@@ -35,7 +35,7 @@ public class DApp : IComparable<DApp>, IShareable, IVersioned
 
     public bool IsGamingApp => !string.IsNullOrWhiteSpace(GameType);
     public bool IsRegularApp => !IsGamingApp;
-    public string? PreviewUrl => Previews?.FirstOrDefault(p => !string.IsNullOrWhiteSpace(p)) ?? IconUrl;
+    public string? PreviewUrl => Previews?.FirstOrDefault(p => !string.IsNullOrWhiteSpace(p));
     public string? GameTypeDisplayName => LocalizeGameType(GameType);
     public Dictionary<string, string> NameLocalizer => field ??= JsonSerializer.Deserialize<Dictionary<string, string>>(Name)!;
     public Dictionary<string, string>? DescriptionLocalizer => Description is null ? null : field ??= JsonSerializer.Deserialize<Dictionary<string, string>>(Description);