From 74e5d8c28197bbf28cf7ef94f125b4f1c1278778 Mon Sep 17 00:00:00 2001
From: Tsanie Lily <tsorgy@gmail.com>
Date: Thu, 14 May 2020 14:05:34 +0800
Subject: [PATCH] ranking UI adjustment

---
 Pixiview/Illust/RankingPage.xaml    | 29 +++++++++++++++--------------
 Pixiview/Illust/RankingPage.xaml.cs |  3 ++-
 Pixiview/Illust/ViewIllustPage.xaml |  2 +-
 3 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/Pixiview/Illust/RankingPage.xaml b/Pixiview/Illust/RankingPage.xaml
index b13a8a1..3018bcf 100644
--- a/Pixiview/Illust/RankingPage.xaml
+++ b/Pixiview/Illust/RankingPage.xaml
@@ -14,23 +14,24 @@
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="{OnPlatform Android=Auto}"/>
                 <ColumnDefinition Width="Auto"/>
-                <ColumnDefinition Width="Auto"/>
                 <ColumnDefinition/>
             </Grid.ColumnDefinitions>
-            <Label Grid.Column="1" Text="{Binding Title}"
-                   TextColor="{DynamicResource TextColor}"
-                   FontSize="{OnPlatform Android=18}"
-                   VerticalTextAlignment="Center" FontAttributes="Bold">
-                <Label.GestureRecognizers>
+            <StackLayout Grid.Column="1" Orientation="Horizontal" Spacing="6">
+                <StackLayout.GestureRecognizers>
                     <TapGestureRecognizer Tapped="TapGestureRecognizer_Tapped"/>
-                </Label.GestureRecognizers>
-            </Label>
-            <Label Grid.Column="2" x:Name="labelCaret"
-                   Text="{DynamicResource IconCaretDown}"
-                   TextColor="{DynamicResource TextColor}"
-                   FontFamily="{DynamicResource IconSolidFontFamily}"
-                   FontSize="Small"
-                   VerticalTextAlignment="Center"/>
+                </StackLayout.GestureRecognizers>
+                <Label Text="{Binding Title}"
+                       TextColor="{DynamicResource TextColor}"
+                       FontSize="{OnPlatform Android=18}"
+                       LineBreakMode="HeadTruncation"
+                       VerticalTextAlignment="Center" FontAttributes="Bold"/>
+                <Label x:Name="labelCaret"
+                       Text="{DynamicResource IconCaretDown}"
+                       TextColor="{DynamicResource TextColor}"
+                       FontFamily="{DynamicResource IconSolidFontFamily}"
+                       FontSize="Small"
+                       VerticalTextAlignment="Center"/>
+            </StackLayout>
         </Grid>
     </Shell.TitleView>
     <ContentPage.ToolbarItems>
diff --git a/Pixiview/Illust/RankingPage.xaml.cs b/Pixiview/Illust/RankingPage.xaml.cs
index a30eda0..5d5539f 100644
--- a/Pixiview/Illust/RankingPage.xaml.cs
+++ b/Pixiview/Illust/RankingPage.xaml.cs
@@ -151,7 +151,8 @@ namespace Pixiview.Illust
                         int.Parse(date.Substring(4, 2)),
                         int.Parse(date.Substring(6, 2)));
                     SelectedDate = now;
-                    date = now.ToShortDateString();
+                    //date = now.ToShortDateString();
+                    date = now.ToString("yyyy-MM-dd");
                 }
                 else
                 {
diff --git a/Pixiview/Illust/ViewIllustPage.xaml b/Pixiview/Illust/ViewIllustPage.xaml
index 2849fba..ba327c9 100644
--- a/Pixiview/Illust/ViewIllustPage.xaml
+++ b/Pixiview/Illust/ViewIllustPage.xaml
@@ -14,7 +14,7 @@
         <ToolbarItem Order="Primary" Clicked="More_Clicked"
                      IconImageSource="{DynamicResource FontIconMore}"/>
     </ContentPage.ToolbarItems>
-    <Grid Padding="{Binding PageTopMargin}">
+    <Grid Padding="{Binding PageTopMargin}" RowSpacing="0">
         <Grid.RowDefinitions>
             <RowDefinition/>
             <RowDefinition Height="Auto"/>