#184 ユーザーマイリストページをマイリスト検索ページに寄せてデザイン修正

tor4kichi · Aug 8, 2016 · aad6642 · aad6642
1 parent e877bbb
commit aad6642
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 20 deletions.
diff --git a/NicoPlayerHohoema/ViewModels/UserMylistPageViewModel.cs b/NicoPlayerHohoema/ViewModels/UserMylistPageViewModel.cs
@@ -313,7 +313,6 @@ public void Update(MylistGroupInfo info)
 			ItemCount = info.VideoItems.Count;
 			ThemeColor = info.IconType.ToColor();
 
-
 			OnPropertyChanged(nameof(Title));
 			OnPropertyChanged(nameof(Description));
 			OnPropertyChanged(nameof(IsPublic));
@@ -333,7 +332,6 @@ public void Update(MylistGroupInfo info)
 
 		public Color ThemeColor { get; private set; }
 
-
 		PageManager _PageManager;
 	}
 }
diff --git a/NicoPlayerHohoema/Views/UserMylistPage.xaml b/NicoPlayerHohoema/Views/UserMylistPage.xaml
@@ -42,6 +42,7 @@
             <toolkit:DockPanel toolkit:DockPanel.Dock="Bottom" 
                                    Height="72"
                                    Margin="8 0"
+                            Visibility="{Binding IsSelectionModeEnable.Value, Converter={StaticResource BooleanToVisibility}}"                            
                                >
                 <StackPanel Orientation="Horizontal"
                                 VerticalAlignment="Center"
@@ -52,7 +53,6 @@
                 <StackPanel Orientation="Horizontal"
                             VerticalAlignment="Center"
                             toolkit:DockPanel.Dock="Right"
-                            Visibility="{Binding IsSelectionModeEnable.Value, Converter={StaticResource BooleanToVisibility}}"                            
                             >
                     <AppBarButton Icon="Edit" 
                                   Label="マイリスト編集" 
@@ -111,7 +111,7 @@
 
                     <DataTemplate>
 
-                        <Grid Height="48" Background="Transparent" IsHitTestVisible="True">
+                        <Grid Height="48" Background="Transparent" IsHitTestVisible="True" Margin="0 8">
 
                             <i:Interaction.Behaviors>
                                 <core:EventTriggerBehavior EventName="Tapped">
@@ -121,31 +121,37 @@
                                 </core:EventTriggerBehavior>
                             </i:Interaction.Behaviors>
 
-                            <toolkit:DockPanel MaxWidth="480">
+                            <toolkit:DockPanel>
 
 
-                                <Border BorderBrush="Gray" BorderThickness="0 0 2 2"
-                                        Background="{Binding ThemeColor, Converter={StaticResource ColorToBrush}}"
-                                        CornerRadius="8"
-                                        Width="32"
-                                        Height="32"
-                                        Margin="8"
-                                        VerticalAlignment="Center"
+                                <Border Background="{Binding ThemeColor, Converter={StaticResource ColorToBrush}}"
+                                        Width="8"
+                                        Margin="8 0 16 0"
+                                        VerticalAlignment="Stretch"
                                         toolkit:DockPanel.Dock="Left"
                                         >
 
                                 </Border>
 
 
                                 <Border toolkit:DockPanel.Dock="Right" Margin="0 0 8 0">
-                                    <Border Background="LightGray" CornerRadius="16" Height="32" Width="32">
-                                        <TextBlock Text="{Binding ItemCount}" 
-                                                   VerticalAlignment="Center"
-                                                   HorizontalAlignment="Center"
-                                                   Foreground="Black"
-                                                   />
-
-                                    </Border>
+                                    <TextBlock VerticalAlignment="Center"
+                                                HorizontalAlignment="Center"
+                                                Foreground="Black"
+                                                >
+                                        <Run Text="{Binding ItemCount}" />
+                                        <Run Text="件" />
+                                    </TextBlock>
+                                </Border>
+
+                                <Border toolkit:DockPanel.Dock="Bottom" Margin="16 0 0 0" 
+                                    >
+                                    <TextBlock Foreground="Gray" FontSize="12"
+                                           Text="{Binding Description}"
+                                           MaxLines="2"
+                                           >
+
+                                    </TextBlock>
                                 </Border>