Commit: 69b55ccea7f8941e14a85f5f47a06f432bae9ff9 - TestNarou3 (git)

なろうブックマーク分析用ツールのPrism+WinUI3サンプル実装

Commit MetaInfo

• Revision: 69b55ccea7f8941e14a85f5f47a06f432bae9ff9 (tree)
• Time: 2022-08-16 21:32:07
• Author: yoshy <yoshy.org.bitbucket@gz.j...>
• Commiter: yoshy

Log Message

[ADD] 列ソートを除くデータグリッドの残機能を実装（全データ列、ツールチップ、ダブルタップイベント）

Change Summary

• modified: TestNarou3.Adaptor/Boundary/Gateway/ViewModel/Child/IBookmarkDetailListRowViewModel.cs
• modified: TestNarou3.Adaptor/Gateway/ViewModel/BookmarkDetailListViewModel.cs
• modified: TestNarou3.Adaptor/Gateway/ViewModel/Child/BookmarkDetailListRowViewModel.AfterMap.cs
• modified: TestNarou3.Adaptor/Gateway/ViewModel/Child/BookmarkDetailListRowViewModel.cs
• modified: TestNarou3.OuterEdge/TestNarou3.40OuterEdge.csproj
• modified: TestNarou3.OuterEdge/UI/View/BookmarkCategoryView.xaml
• modified: TestNarou3.OuterEdge/UI/View/BookmarkDetailListView.xaml

Incremental Difference

--- a/TestNarou3.Adaptor/Boundary/Gateway/ViewModel/Child/IBookmarkDetailListRowViewModel.cs
+++ b/TestNarou3.Adaptor/Boundary/Gateway/ViewModel/Child/IBookmarkDetailListRowViewModel.cs
@@ -27,6 +27,7 @@ namespace TestNarou3.Adaptor.Boundary.Gateway.ViewModel.Child
         ReadOnlyReactiveProperty<string> GeneralFirstUp { get; }
         ReadOnlyReactiveProperty<string> GeneralLastUp { get; }
         ReadOnlyReactiveProperty<string> NovelUpdatedAt { get; }
+
         IBookmarkDetailListViewModel Parent { get; }
         BookmarkDetailListRow Source { get; }
     }

--- a/TestNarou3.Adaptor/Gateway/ViewModel/BookmarkDetailListViewModel.cs
+++ b/TestNarou3.Adaptor/Gateway/ViewModel/BookmarkDetailListViewModel.cs
@@ -60,13 +60,13 @@ namespace TestNarou3.Adaptor.Gateway.ViewModel
 
         private void OpenBookmark()
         {
+            logger.Trace("OpenBookmark: {0}", this.selectedRow?.NCode ?? "item not selected");
+
             if (this.selectedRow == null)
             {
                 return;
             }
 
-            logger.Trace("OpenBookmark: {0}", this.selectedRow.NCode);
-
             // TODO Service
 
             string url = "https://ncode.syosetu.com/" + this.selectedRow.NCode.ToLower();
@@ -112,52 +112,5 @@ namespace TestNarou3.Adaptor.Gateway.ViewModel
             this.disposables.Dispose();
         }
 
-        #region INavigationAware
-
-#if false
-        public bool IsNavigationTarget(NavigationContext ctx)
-        {
-            int categoryNo = GetCategoryNoFromNavigationContext(ctx);
-
-            //logger.Trace("IsNavigationTarget: to:{0} <> this:{1}", categoryNo, this.CategoryNo);
-
-            if (this.CategoryNo == -1 && !WindowController.ContainsCategoryNo(categoryNo))
-            {
-                //logger.Trace("IsNavigationTarget: new Category");
-                return true;
-            }
-
-            bool isTarget = categoryNo == this.CategoryNo;
-
-            //logger.Trace("IsNavigationTarget: isTarget {0}", isTarget);
-
-            return isTarget;
-        }
-
-        public void OnNavigatedTo(NavigationContext ctx)
-        {
-            int categoryNo = GetCategoryNoFromNavigationContext(ctx);
-
-            //logger.Trace("OnNavigatedTo: to:{0} -> this:{1}", categoryNo, this.CategoryNo);
-
-            if (this.CategoryNo == -1)
-            {
-                this.CategoryNo = categoryNo;
-                this.WindowController.RegisterDetailList(this.CategoryNo, this);
-            }
-        }
-
-        public void OnNavigatedFrom(NavigationContext ctx)
-        {
-            // NOP
-        }
-
-        private static int GetCategoryNoFromNavigationContext(NavigationContext ctx)
-        {
-            return ctx.Parameters.GetValue<int>(IBookmarkDetailListViewModel.CATEGORY_NO_KEY);
-        }
-#endif
-
-#endregion
     }
 }

--- a/TestNarou3.Adaptor/Gateway/ViewModel/Child/BookmarkDetailListRowViewModel.AfterMap.cs
+++ b/TestNarou3.Adaptor/Gateway/ViewModel/Child/BookmarkDetailListRowViewModel.AfterMap.cs
@@ -29,9 +29,6 @@ namespace TestNarou3.Adaptor.Gateway.ViewModel.Child
                 d.AllPoint.AddTo(d.disposables);
                 d.AllHyokaCnt.AddTo(d.disposables);
                 d.NovelUpdatedAt.AddTo(d.disposables);
-
-                //d.IsSelected.AddTo(d.disposables);
-                //d.IsSelected.Subscribe(d.OnSelectedItemChanged).AddTo(d.disposables);
             }
         }
     }

--- a/TestNarou3.Adaptor/Gateway/ViewModel/Child/BookmarkDetailListRowViewModel.cs
+++ b/TestNarou3.Adaptor/Gateway/ViewModel/Child/BookmarkDetailListRowViewModel.cs
@@ -1,5 +1,5 @@
-using Reactive.Bindings;
-using System;
+using NLog;
+using Reactive.Bindings;
 using System.Reactive.Disposables;
 using TestNarou3.Adaptor.Boundary.Gateway.ViewModel;
 using TestNarou3.Adaptor.Boundary.Gateway.ViewModel.Child;
@@ -10,6 +10,8 @@ namespace TestNarou3.Adaptor.Gateway.ViewModel.Child
     internal partial record class BookmarkDetailListRowViewModel
             : IBookmarkDetailListRowViewModel, IDisposable
     {
+        private static readonly ILogger logger = LogManager.GetCurrentClassLogger();
+
         public string NCode { get; private set; }
         public ReadOnlyReactiveProperty<string> Summary { get; private set; }
         public ReadOnlyReactiveProperty<string> Title { get; private set; }
@@ -33,7 +35,7 @@ namespace TestNarou3.Adaptor.Gateway.ViewModel.Child
         public ReadOnlyReactiveProperty<string> GeneralFirstUp { get; private set; }
         public ReadOnlyReactiveProperty<string> GeneralLastUp { get; private set; }
         public ReadOnlyReactiveProperty<string> NovelUpdatedAt { get; private set; }
-        //public ReactiveProperty<bool> IsSelected { get; private set; }
+
         public IBookmarkDetailListViewModel Parent { get; private set; }
         public BookmarkDetailListRow Source { get; private set; }
 
@@ -47,18 +49,6 @@ namespace TestNarou3.Adaptor.Gateway.ViewModel.Child
             this.Parent = parent;
         }
 
-#if false
-        private void OnSelectedItemChanged(bool isSelected)
-        {
-            if (!isSelected)
-            {
-                return;
-            }
-
-            this.Parent.NotifySelectedItemChanged(this);
-        }
-#endif
-
         protected virtual void Dispose(bool disposing)
         {
             if (!disposedValue)

--- a/TestNarou3.OuterEdge/TestNarou3.40OuterEdge.csproj
+++ b/TestNarou3.OuterEdge/TestNarou3.40OuterEdge.csproj
@@ -18,6 +18,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="CommunityToolkit.WinUI.UI.Controls" Version="7.1.2" />
+    <PackageReference Include="Microsoft.Xaml.Behaviors.WinUI.Managed" Version="2.0.8" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\TestNarou3.Adaptor\TestNarou3.30Adaptor.csproj" />

--- a/TestNarou3.OuterEdge/UI/View/BookmarkCategoryView.xaml
+++ b/TestNarou3.OuterEdge/UI/View/BookmarkCategoryView.xaml
@@ -9,7 +9,7 @@
     mc:Ignorable="d">
 
     <ListView ItemsSource="{x:Bind ViewModel.Rows, Mode=OneWay}"
-            SelectedItem="{x:Bind ViewModel.SelectedItem.Value, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+            SelectedItem="{x:Bind ViewModel.SelectedItem.Value, Mode=TwoWay}"
             SelectionMode="Single">
 
         <!--
@@ -20,6 +20,12 @@
         </ListView.Resources>
         -->
 
+        <ListView.HeaderTemplate>
+            <DataTemplate>
+                <TextBlock Text="ブックマークカテゴリ" FontSize="24" FontWeight="Bold" />
+            </DataTemplate>
+        </ListView.HeaderTemplate>
+        
         <ListView.ItemTemplate>
             <DataTemplate>
                 <Grid Padding="10">

--- a/TestNarou3.OuterEdge/UI/View/BookmarkDetailListView.xaml
+++ b/TestNarou3.OuterEdge/UI/View/BookmarkDetailListView.xaml
@@ -7,292 +7,267 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:ctc="using:CommunityToolkit.WinUI.UI.Controls"
     xmlns:ctPrim="using:CommunityToolkit.WinUI.UI.Controls.Primitives"
+    xmlns:i="using:Microsoft.Xaml.Interactivity"
+    xmlns:ia="using:Microsoft.Xaml.Interactions.Core"
+    xmlns:conv="using:CleanAuLait.Prism.WinUI3.OuterEdge.UI.Xaml.Converter"
+    xmlns:vm="using:TestNarou3.Adaptor.Boundary.Gateway.ViewModel.Child"
     mc:Ignorable="d">
 
-    <!--
-    <ListView ItemsSource="{x:Bind ViewModel.Rows, Mode=OneWay}"
-            SelectedItem="{x:Bind ViewModel.SelectedItem.Value, Mode=TwoWay}"
-            SelectionMode="Single">
-
-        <ListView.ItemTemplate>
-            <DataTemplate>
-                <Grid Padding="10">
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="auto"/>
-                        <RowDefinition Height="auto"/>
-                    </Grid.RowDefinitions>
-                    <TextBlock Grid.Row="0" FontSize="24" FontWeight="Bold"
-                            Text="{Binding Title.Value}" TextWrapping="Wrap" />
-                    <StackPanel Grid.Row="1" Orientation="Horizontal">
-                        <TextBlock Text="作："/>
-                        <TextBlock Text="{Binding Writer.Value}"/>
-                        <TextBlock Text="総合評価：" Padding="10,0,0,0"/>
-                        <TextBlock Text="{Binding GlobalPoint.Value}"/>
-                    </StackPanel>
-                </Grid>
-
-            </DataTemplate>
-        </ListView.ItemTemplate>
-
-    </ListView>
-    -->
+    <UserControl.Resources>
+        <conv:StringFormatConverter x:Key="StringFormat" />
+    </UserControl.Resources>
 
     <ctc:DataGrid ItemsSource="{x:Bind ViewModel.Rows, Mode=OneWay}"
             AutoGenerateColumns="False"
+            CanUserReorderColumns="False"
+            CanUserSortColumns="True"
             SelectionMode="Single"
+            SelectedItem="{x:Bind ViewModel.SelectedItem.Value, Mode=TwoWay}"
             IsReadOnly="True"
+            RowBackground="{ThemeResource SystemControlBackgroundAltMediumLowBrush}"
+            AlternatingRowBackground="{ThemeResource SystemControlBackgroundAltMediumHighBrush}"
             GridLinesVisibility="None">
 
+        <i:Interaction.Behaviors>
+            <ia:EventTriggerBehavior EventName="DoubleTapped">
+                <ia:EventTriggerBehavior.Actions>
+                    <ia:InvokeCommandAction Command="{x:Bind ViewModel.CommandOpenBookmark}" />
+                </ia:EventTriggerBehavior.Actions>
+            </ia:EventTriggerBehavior>
+        </i:Interaction.Behaviors>
+        
+        <!--
         <ctc:DataGrid.ColumnHeaderStyle>
             <Style TargetType="ctPrim:DataGridColumnHeader">
                 <Setter Property="HorizontalAlignment" Value="Stretch"/>
-                <Setter Property="HorizontalContentAlignment" Value="Center"/>
-                <Setter Property="Background" Value="{x:Null}"/>
+                <Setter Property="HorizontalContentAlignment" Value="Left"/>
             </Style>
         </ctc:DataGrid.ColumnHeaderStyle>
+        -->
 
         <ctc:DataGrid.Columns>
 
-            <ctc:DataGridTextColumn Header="タイトル" Width="300"
-                    Binding="{Binding Title.Value}">
-            </ctc:DataGridTextColumn>
-            <ctc:DataGridTextColumn Header="作者" Width="100"
-                    Binding="{Binding Writer.Value}">
-            </ctc:DataGridTextColumn>
-            <ctc:DataGridTextColumn Header="完結" Width="40"
-                    Binding="{Binding End.Value}">
+            <ctc:DataGridTemplateColumn Header="概" Width="10">
+                <ctc:DataGridTemplateColumn.CellTemplate>
+                    <DataTemplate x:DataType="vm:IBookmarkDetailListRowViewModel">
+                        <Grid VerticalAlignment="Center">
+                            <TextBlock Text="●" ToolTipService.ToolTip="{x:Bind Summary.Value}"
+                                    HorizontalAlignment="Center" FontSize="20"/>
+                        </Grid>
+                    </DataTemplate>
+                </ctc:DataGridTemplateColumn.CellTemplate>
+            </ctc:DataGridTemplateColumn>
+            <ctc:DataGridTemplateColumn Header="タイトル" Width="300">
+                <ctc:DataGridTemplateColumn.CellTemplate>
+                    <DataTemplate x:DataType="vm:IBookmarkDetailListRowViewModel">
+                        <Grid VerticalAlignment="Center">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="*"/>
+                                <ColumnDefinition Width="12"/>
+                            </Grid.ColumnDefinitions>
+                            <TextBlock Text="{x:Bind Title.Value}" ToolTipService.ToolTip="{x:Bind Title.Value}" />
+                        </Grid>
+                    </DataTemplate>
+                </ctc:DataGridTemplateColumn.CellTemplate>
+            </ctc:DataGridTemplateColumn>
+            <ctc:DataGridTemplateColumn Header="作者" Width="100">
+                <ctc:DataGridTemplateColumn.CellTemplate>
+                    <DataTemplate x:DataType="vm:IBookmarkDetailListRowViewModel">
+                        <Grid VerticalAlignment="Center">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="*"/>
+                                <ColumnDefinition Width="12"/>
+                            </Grid.ColumnDefinitions>
+                            <TextBlock Text="{x:Bind Writer.Value}" ToolTipService.ToolTip="{x:Bind Writer.Value}" />
+                        </Grid>
+                    </DataTemplate>
+                </ctc:DataGridTemplateColumn.CellTemplate>
+            </ctc:DataGridTemplateColumn>
+            <ctc:DataGridTemplateColumn Header="完結" Width="40">
+                <ctc:DataGridTemplateColumn.CellTemplate>
+                    <DataTemplate x:DataType="vm:IBookmarkDetailListRowViewModel">
+                        <Grid VerticalAlignment="Center">
+                            <TextBlock Text="{x:Bind End.Value}" HorizontalAlignment="Center"/>
+                        </Grid>
+                    </DataTemplate>
+                </ctc:DataGridTemplateColumn.CellTemplate>
+            </ctc:DataGridTemplateColumn>
+            <ctc:DataGridTextColumn Header="話数" Width="60"
+                    Binding="{Binding GeneralAllNo.Value, Converter={StaticResource StringFormat},ConverterParameter=\{0:N0\}}" >
                 <ctc:DataGridTextColumn.ElementStyle>
-                    <Style TargetType="ctPrim:DataGridCellsPresenter">
-                        <Setter Property="HorizontalAlignment" Value="Center" />
+                    <Style TargetType="TextBlock">
+                        <Setter Property="HorizontalAlignment" Value="Right" />
                     </Style>
                 </ctc:DataGridTextColumn.ElementStyle>
             </ctc:DataGridTextColumn>
-            <ctc:DataGridTextColumn Header="話数" Width="60"
-                    Binding="{Binding GeneralAllNo.Value}">
-            </ctc:DataGridTextColumn>
             <ctc:DataGridTextColumn Header="長さ[h]" Width="70"
-                    Binding="{Binding Time.Value}">
-            </ctc:DataGridTextColumn>
-
-        </ctc:DataGrid.Columns>
-        
-    </ctc:DataGrid>
-    
-    <!--
-    <DataGrid ItemsSource="{Binding Rows}"
-            AutoGenerateColumns="False"
-            CanUserAddRows="False"
-            CanUserDeleteRows="False"
-            CanUserResizeRows="False"
-            SelectionUnit="FullRow"
-            SelectionMode="Single"
-            IsReadOnly="True"
-            Padding="0,0,0,0"
-            RowHeaderWidth="0"
-            VirtualizingPanel.ScrollUnit="Pixel"
-            VerticalScrollBarVisibility="Visible"
-            GridLinesVisibility="None"
-            AlternatingRowBackground="AliceBlue"
-            Background="{x:Null}"
-            RowBackground="{x:Null}">
-
-        <DataGrid.InputBindings>
-            <MouseBinding MouseAction="LeftDoubleClick" Command="{Binding CommandOpenBookmark}" />
-        </DataGrid.InputBindings>
-
-        <DataGrid.RowStyle>
-            <Style TargetType="{x:Type DataGridRow}" BasedOn="{StaticResource {x:Type DataGridRow}}">
-                <Setter Property="IsSelected" Value="{Binding IsSelected.Value,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"/>
-            </Style>
-        </DataGrid.RowStyle>
-
-        <DataGrid.CellStyle>
-            <Style TargetType="DataGridCell">
-                <Setter Property="BorderThickness" Value="0"/>
-                <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
-                <Setter Property="IsTabStop" Value="false"/>
-            </Style>
-        </DataGrid.CellStyle>
-
-        <DataGrid.Columns>
-            <DataGridTextColumn Header="概" Width="10"
-                    Binding="{Binding Source={x:Static vm:IBookmarkDetailListViewModel.SUMMARY_LABEL}, Mode=OneWay}">
-                <DataGridTextColumn.CellStyle>
-                    <Style TargetType="DataGridCell">
-                        <Setter Property="ToolTip" Value="{Binding Summary.Value}" />
-                    </Style>
-                </DataGridTextColumn.CellStyle>
-            </DataGridTextColumn>
-            <DataGridTextColumn Header="タイトル" Width="300"
-                    Binding="{Binding Title.Value}">
-                <DataGridTextColumn.CellStyle>
-                    <Style TargetType="DataGridCell">
-                        <Setter Property="ToolTip" Value="{Binding Title.Value}" />
-                    </Style>
-                </DataGridTextColumn.CellStyle>
-            </DataGridTextColumn>
-            <DataGridTextColumn Header="作者" Width="100"
-                    Binding="{Binding Writer.Value}">
-                <DataGridTextColumn.CellStyle>
-                    <Style TargetType="DataGridCell">
-                        <Setter Property="ToolTip" Value="{Binding Writer.Value}" />
-                    </Style>
-                </DataGridTextColumn.CellStyle>
-            </DataGridTextColumn>
-            <DataGridTextColumn Header="完結" Width="20"
-                    Binding="{Binding End.Value}">
-                <DataGridTextColumn.ElementStyle>
-                    <Style TargetType="{x:Type TextBlock}">
-                        <Setter Property="HorizontalAlignment" Value="Center" />
-                    </Style>
-                </DataGridTextColumn.ElementStyle>
-            </DataGridTextColumn>
-            <DataGridTextColumn Header="話数" Width="40"
-                    Binding="{Binding GeneralAllNo.Value, StringFormat=\{0:N0\}}">
-                <DataGridTextColumn.ElementStyle>
-                    <Style TargetType="{x:Type TextBlock}">
-                        <Setter Property="HorizontalAlignment" Value="Right" />
-                    </Style>
-                </DataGridTextColumn.ElementStyle>
-            </DataGridTextColumn>
-            <DataGridTextColumn Header="長さ[h]" Width="50"
-                    Binding="{Binding Time.Value, StringFormat=\{0:N0\}}">
-                <DataGridTextColumn.ElementStyle>
-                    <Style TargetType="{x:Type TextBlock}">
+                    Binding="{Binding Time.Value, Converter={StaticResource StringFormat},ConverterParameter=\{0:N0\}}">
+                <ctc:DataGridTextColumn.ElementStyle>
+                    <Style TargetType="TextBlock">
                         <Setter Property="HorizontalAlignment" Value="Right" />
                     </Style>
-                </DataGridTextColumn.ElementStyle>
-            </DataGridTextColumn>
-            <DataGridTextColumn Header="ｴﾀ" Width="25"
-                    Binding="{Binding IsStop.Value}">
-                <DataGridTextColumn.ElementStyle>
-                    <Style TargetType="{x:Type TextBlock}">
-                        <Setter Property="HorizontalAlignment" Value="Center" />
-                    </Style>
-                </DataGridTextColumn.ElementStyle>
-            </DataGridTextColumn>
-            <DataGridTextColumn Header="総合評価pt." Width="60"
-                    Binding="{Binding GlobalPoint.Value, StringFormat=\{0:N0\}}">
-                <DataGridTextColumn.ElementStyle>
-                    <Style TargetType="{x:Type TextBlock}">
+                </ctc:DataGridTextColumn.ElementStyle>
+            </ctc:DataGridTextColumn>
+            <ctc:DataGridTemplateColumn Header="ｴﾀ" Width="25">
+                <ctc:DataGridTemplateColumn.CellTemplate>
+                    <DataTemplate x:DataType="vm:IBookmarkDetailListRowViewModel">
+                        <Grid VerticalAlignment="Center">
+                            <TextBlock Text="{x:Bind IsStop.Value}" HorizontalAlignment="Center"/>
+                        </Grid>
+                    </DataTemplate>
+                </ctc:DataGridTemplateColumn.CellTemplate>
+            </ctc:DataGridTemplateColumn>
+            <ctc:DataGridTextColumn Header="総合評価pt." Width="100"
+                    Binding="{Binding GlobalPoint.Value, Converter={StaticResource StringFormat},ConverterParameter=\{0:N0\}}" >
+                <ctc:DataGridTextColumn.ElementStyle>
+                    <Style TargetType="TextBlock">
                         <Setter Property="HorizontalAlignment" Value="Right" />
                     </Style>
-                </DataGridTextColumn.ElementStyle>
-            </DataGridTextColumn>
-            <DataGridTextColumn Header="評価/分" Width="50"
-                    Binding="{Binding PointPerMin.Value, StringFormat=\{0:N0\}}">
-                <DataGridTextColumn.ElementStyle>
-                    <Style TargetType="{x:Type TextBlock}">
+                </ctc:DataGridTextColumn.ElementStyle>
+            </ctc:DataGridTextColumn>
+            <ctc:DataGridTextColumn Header="評価/分" Width="80"
+                    Binding="{Binding PointPerMin.Value, Converter={StaticResource StringFormat},ConverterParameter=\{0:N0\}}" >
+                <ctc:DataGridTextColumn.ElementStyle>
+                    <Style TargetType="TextBlock">
                         <Setter Property="HorizontalAlignment" Value="Right" />
                     </Style>
-                </DataGridTextColumn.ElementStyle>
-            </DataGridTextColumn>
-            <DataGridTextColumn Header="日間pt." Width="50"
-                    Binding="{Binding DailyPoint.Value, StringFormat=\{0:N0\}}">
-                <DataGridTextColumn.ElementStyle>
-                    <Style TargetType="{x:Type TextBlock}">
+                </ctc:DataGridTextColumn.ElementStyle>
+            </ctc:DataGridTextColumn>
+            <ctc:DataGridTextColumn Header="日間pt." Width="80"
+                    Binding="{Binding DailyPoint.Value, Converter={StaticResource StringFormat},ConverterParameter=\{0:N0\}}" >
+                <ctc:DataGridTextColumn.ElementStyle>
+                    <Style TargetType="TextBlock">
                         <Setter Property="HorizontalAlignment" Value="Right" />
                     </Style>
-                </DataGridTextColumn.ElementStyle>
-            </DataGridTextColumn>
-            <DataGridTextColumn Header="週間pt." Width="50"
-                    Binding="{Binding WeeklyPoint.Value, StringFormat=\{0:N0\}}">
-                <DataGridTextColumn.ElementStyle>
-                    <Style TargetType="{x:Type TextBlock}">
+                </ctc:DataGridTextColumn.ElementStyle>
+            </ctc:DataGridTextColumn>
+            <ctc:DataGridTextColumn Header="週間pt." Width="80"
+                    Binding="{Binding WeeklyPoint.Value, Converter={StaticResource StringFormat},ConverterParameter=\{0:N0\}}" >
+                <ctc:DataGridTextColumn.ElementStyle>
+                    <Style TargetType="TextBlock">
                         <Setter Property="HorizontalAlignment" Value="Right" />
                     </Style>
-                </DataGridTextColumn.ElementStyle>
-            </DataGridTextColumn>
-            <DataGridTextColumn Header="月間pt." Width="50"
-                    Binding="{Binding MonthlyPoint.Value, StringFormat=\{0:N0\}}">
-                <DataGridTextColumn.ElementStyle>
-                    <Style TargetType="{x:Type TextBlock}">
+                </ctc:DataGridTextColumn.ElementStyle>
+            </ctc:DataGridTextColumn>
+            <ctc:DataGridTextColumn Header="月間pt." Width="80"
+                    Binding="{Binding MonthlyPoint.Value, Converter={StaticResource StringFormat},ConverterParameter=\{0:N0\}}" >
+                <ctc:DataGridTextColumn.ElementStyle>
+                    <Style TargetType="TextBlock">
                         <Setter Property="HorizontalAlignment" Value="Right" />
                     </Style>
-                </DataGridTextColumn.ElementStyle>
-            </DataGridTextColumn>
-            <DataGridTextColumn Header="四半期pt." Width="50"
-                    Binding="{Binding QuarterPoint.Value, StringFormat=\{0:N0\}}">
-                <DataGridTextColumn.ElementStyle>
-                    <Style TargetType="{x:Type TextBlock}">
+                </ctc:DataGridTextColumn.ElementStyle>
+            </ctc:DataGridTextColumn>
+            <ctc:DataGridTextColumn Header="四半期pt." Width="80"
+                    Binding="{Binding QuarterPoint.Value, Converter={StaticResource StringFormat},ConverterParameter=\{0:N0\}}" >
+                <ctc:DataGridTextColumn.ElementStyle>
+                    <Style TargetType="TextBlock">
                         <Setter Property="HorizontalAlignment" Value="Right" />
                     </Style>
-                </DataGridTextColumn.ElementStyle>
-            </DataGridTextColumn>
-            <DataGridTextColumn Header="年間pt." Width="50"
-                    Binding="{Binding YearlyPoint.Value, StringFormat=\{0:N0\}}">
-                <DataGridTextColumn.ElementStyle>
-                    <Style TargetType="{x:Type TextBlock}">
+                </ctc:DataGridTextColumn.ElementStyle>
+            </ctc:DataGridTextColumn>
+            <ctc:DataGridTextColumn Header="年間pt." Width="80"
+                    Binding="{Binding YearlyPoint.Value, Converter={StaticResource StringFormat},ConverterParameter=\{0:N0\}}" >
+                <ctc:DataGridTextColumn.ElementStyle>
+                    <Style TargetType="TextBlock">
                         <Setter Property="HorizontalAlignment" Value="Right" />
                     </Style>
-                </DataGridTextColumn.ElementStyle>
-            </DataGridTextColumn>
-            <DataGridTextColumn Header="ﾌﾞｸﾏ数" Width="50"
-                    Binding="{Binding FavNovelCnt.Value, StringFormat=\{0:N0\}}">
-                <DataGridTextColumn.ElementStyle>
-                    <Style TargetType="{x:Type TextBlock}">
+                </ctc:DataGridTextColumn.ElementStyle>
+            </ctc:DataGridTextColumn>
+            <ctc:DataGridTextColumn Header="ﾌﾞｸﾏ数" Width="80"
+                    Binding="{Binding FavNovelCnt.Value, Converter={StaticResource StringFormat},ConverterParameter=\{0:N0\}}" >
+                <ctc:DataGridTextColumn.ElementStyle>
+                    <Style TargetType="TextBlock">
                         <Setter Property="HorizontalAlignment" Value="Right" />
                     </Style>
-                </DataGridTextColumn.ElementStyle>
-            </DataGridTextColumn>
-            <DataGridTextColumn Header="感想数" Width="50"
-                    Binding="{Binding ImpressionCnt.Value, StringFormat=\{0:N0\}}">
-                <DataGridTextColumn.ElementStyle>
-                    <Style TargetType="{x:Type TextBlock}">
+                </ctc:DataGridTextColumn.ElementStyle>
+            </ctc:DataGridTextColumn>
+            <ctc:DataGridTextColumn Header="感想数" Width="80"
+                    Binding="{Binding ImpressionCnt.Value, Converter={StaticResource StringFormat},ConverterParameter=\{0:N0\}}" >
+                <ctc:DataGridTextColumn.ElementStyle>
+                    <Style TargetType="TextBlock">
                         <Setter Property="HorizontalAlignment" Value="Right" />
                     </Style>
-                </DataGridTextColumn.ElementStyle>
-            </DataGridTextColumn>
-            <DataGridTextColumn Header="ﾚﾋﾞｭｰ数" Width="40"
-                    Binding="{Binding ReviewCnt.Value, StringFormat=\{0:N0\}}">
-                <DataGridTextColumn.ElementStyle>
-                    <Style TargetType="{x:Type TextBlock}">
+                </ctc:DataGridTextColumn.ElementStyle>
+            </ctc:DataGridTextColumn>
+            <ctc:DataGridTextColumn Header="ﾚﾋﾞｭｰ数" Width="60"
+                    Binding="{Binding ReviewCnt.Value, Converter={StaticResource StringFormat},ConverterParameter=\{0:N0\}}" >
+                <ctc:DataGridTextColumn.ElementStyle>
+                    <Style TargetType="TextBlock">
                         <Setter Property="HorizontalAlignment" Value="Right" />
                     </Style>
-                </DataGridTextColumn.ElementStyle>
-            </DataGridTextColumn>
-            <DataGridTextColumn Header="評価pt." Width="60"
-                    Binding="{Binding AllPoint.Value, StringFormat=\{0:N0\}}">
-                <DataGridTextColumn.ElementStyle>
-                    <Style TargetType="{x:Type TextBlock}">
+                </ctc:DataGridTextColumn.ElementStyle>
+            </ctc:DataGridTextColumn>
+            <ctc:DataGridTextColumn Header="評価pt." Width="80"
+                    Binding="{Binding AllPoint.Value, Converter={StaticResource StringFormat},ConverterParameter=\{0:N0\}}" >
+                <ctc:DataGridTextColumn.ElementStyle>
+                    <Style TargetType="TextBlock">
                         <Setter Property="HorizontalAlignment" Value="Right" />
                     </Style>
-                </DataGridTextColumn.ElementStyle>
-            </DataGridTextColumn>
-            <DataGridTextColumn Header="評価者数" Width="50"
-                    Binding="{Binding AllHyokaCnt.Value, StringFormat=\{0:N0\}}">
-                <DataGridTextColumn.ElementStyle>
-                    <Style TargetType="{x:Type TextBlock}">
+                </ctc:DataGridTextColumn.ElementStyle>
+            </ctc:DataGridTextColumn>
+            <ctc:DataGridTextColumn Header="評価者数" Width="70"
+                    Binding="{Binding AllHyokaCnt.Value, Converter={StaticResource StringFormat},ConverterParameter=\{0:N0\}}" >
+                <ctc:DataGridTextColumn.ElementStyle>
+                    <Style TargetType="TextBlock">
                         <Setter Property="HorizontalAlignment" Value="Right" />
                     </Style>
-                </DataGridTextColumn.ElementStyle>
-            </DataGridTextColumn>
-            <DataGridTextColumn Header="最終掲載日" Width="80"
+                </ctc:DataGridTextColumn.ElementStyle>
+            </ctc:DataGridTextColumn>
+            <ctc:DataGridTextColumn Header="最終掲載日" Width="100"
                     Binding="{Binding GeneralLastUp.Value}">
-                <DataGridTextColumn.ElementStyle>
-                    <Style TargetType="{x:Type TextBlock}">
+                <ctc:DataGridTextColumn.ElementStyle>
+                    <Style TargetType="TextBlock">
                         <Setter Property="HorizontalAlignment" Value="Right" />
                     </Style>
-                </DataGridTextColumn.ElementStyle>
-            </DataGridTextColumn>
-            <DataGridTextColumn Header="初回掲載日" Width="80"
+                </ctc:DataGridTextColumn.ElementStyle>
+            </ctc:DataGridTextColumn>
+            <ctc:DataGridTextColumn Header="初回掲載日" Width="100"
                     Binding="{Binding GeneralFirstUp.Value}">
-                <DataGridTextColumn.ElementStyle>
-                    <Style TargetType="{x:Type TextBlock}">
+                <ctc:DataGridTextColumn.ElementStyle>
+                    <Style TargetType="TextBlock">
                         <Setter Property="HorizontalAlignment" Value="Right" />
                     </Style>
-                </DataGridTextColumn.ElementStyle>
-            </DataGridTextColumn>
-            <DataGridTextColumn Header="小説更新日" Width="80"
+                </ctc:DataGridTextColumn.ElementStyle>
+            </ctc:DataGridTextColumn>
+            <ctc:DataGridTextColumn Header="小説更新日" Width="100"
                     Binding="{Binding NovelUpdatedAt.Value}">
-                <DataGridTextColumn.ElementStyle>
-                    <Style TargetType="{x:Type TextBlock}">
+                <ctc:DataGridTextColumn.ElementStyle>
+                    <Style TargetType="TextBlock">
                         <Setter Property="HorizontalAlignment" Value="Right" />
                     </Style>
-                </DataGridTextColumn.ElementStyle>
-            </DataGridTextColumn>
-        </DataGrid.Columns>
-    </DataGrid>
+                </ctc:DataGridTextColumn.ElementStyle>
+            </ctc:DataGridTextColumn>
+
+        </ctc:DataGrid.Columns>
+        
+    </ctc:DataGrid>
+
+    <!--
+    <ListView ItemsSource="{x:Bind ViewModel.Rows, Mode=OneWay}"
+            SelectedItem="{x:Bind ViewModel.SelectedItem.Value, Mode=TwoWay}"
+            SelectionMode="Single">
+
+        <ListView.ItemTemplate>
+            <DataTemplate>
+                <Grid Padding="10">
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="auto"/>
+                        <RowDefinition Height="auto"/>
+                    </Grid.RowDefinitions>
+                    <TextBlock Grid.Row="0" FontSize="24" FontWeight="Bold"
+                            Text="{Binding Title.Value}" TextWrapping="Wrap" />
+                    <StackPanel Grid.Row="1" Orientation="Horizontal">
+                        <TextBlock Text="作："/>
+                        <TextBlock Text="{Binding Writer.Value}"/>
+                        <TextBlock Text="総合評価：" Padding="10,0,0,0"/>
+                        <TextBlock Text="{Binding GlobalPoint.Value}"/>
+                    </StackPanel>
+                </Grid>
+
+            </DataTemplate>
+        </ListView.ItemTemplate>
+
+    </ListView>
     -->
 
 </UserControl>