Merge branch 'release/0.17.0'

tor4kichi · Dec 29, 2018 · 3ec342b · 3ec342b
2 parents 7d9bf31 + ae60d26
commit 3ec342b
Show file tree

Hide file tree

Showing 531 changed files with 17,557 additions and 23,021 deletions.
diff --git a/NicoPlayerHohoema.sln b/NicoPlayerHohoema.sln
@@ -5,9 +5,17 @@ VisualStudioVersion = 15.0.27130.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NicoPlayerHohoema", "NicoPlayerHohoema\NicoPlayerHohoema.csproj", "{9E535220-1265-4F11-B548-9FD4FADAA25D}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NicoAlert", "NicoAlert\NicoAlert.csproj", "{973A1E65-A9F3-4144-A521-647DDFE06F2A}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mntone.Nico2.UWP", "OpenNiconico2\Mntone.Nico2.UWP\Mntone.Nico2.UWP.csproj", "{BBF8857D-550A-4228-B9FC-52C38D5346F1}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "OpenNiconico2", "OpenNiconico2", "{68B6C4F7-F969-451D-895C-EB44E94EB089}"
+EndProject
+Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Mntone.Nico2.Shared", "OpenNiconico2\Mntone.Nico2\Mntone.Nico2.Shared\Mntone.Nico2.Shared.shproj", "{F1F0B094-2632-4141-88C1-05B082EBAC91}"
 EndProject
 Global
+	GlobalSection(SharedMSBuildProjectFiles) = preSolution
+		OpenNiconico2\Mntone.Nico2\Mntone.Nico2.Shared\Mntone.Nico2.Shared.projitems*{bbf8857d-550a-4228-b9fc-52c38d5346f1}*SharedItemsImports = 4
+		OpenNiconico2\Mntone.Nico2\Mntone.Nico2.Shared\Mntone.Nico2.Shared.projitems*{f1f0b094-2632-4141-88c1-05b082ebac91}*SharedItemsImports = 13
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Debug|ARM = Debug|ARM
@@ -39,26 +47,30 @@ Global
 		{9E535220-1265-4F11-B548-9FD4FADAA25D}.Release|x86.ActiveCfg = Release|x86
 		{9E535220-1265-4F11-B548-9FD4FADAA25D}.Release|x86.Build.0 = Release|x86
 		{9E535220-1265-4F11-B548-9FD4FADAA25D}.Release|x86.Deploy.0 = Release|x86
-		{973A1E65-A9F3-4144-A521-647DDFE06F2A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{973A1E65-A9F3-4144-A521-647DDFE06F2A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{973A1E65-A9F3-4144-A521-647DDFE06F2A}.Debug|ARM.ActiveCfg = Debug|ARM
-		{973A1E65-A9F3-4144-A521-647DDFE06F2A}.Debug|ARM.Build.0 = Debug|ARM
-		{973A1E65-A9F3-4144-A521-647DDFE06F2A}.Debug|x64.ActiveCfg = Debug|x64
-		{973A1E65-A9F3-4144-A521-647DDFE06F2A}.Debug|x64.Build.0 = Debug|x64
-		{973A1E65-A9F3-4144-A521-647DDFE06F2A}.Debug|x86.ActiveCfg = Debug|x86
-		{973A1E65-A9F3-4144-A521-647DDFE06F2A}.Debug|x86.Build.0 = Debug|x86
-		{973A1E65-A9F3-4144-A521-647DDFE06F2A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{973A1E65-A9F3-4144-A521-647DDFE06F2A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{973A1E65-A9F3-4144-A521-647DDFE06F2A}.Release|ARM.ActiveCfg = Release|ARM
-		{973A1E65-A9F3-4144-A521-647DDFE06F2A}.Release|ARM.Build.0 = Release|ARM
-		{973A1E65-A9F3-4144-A521-647DDFE06F2A}.Release|x64.ActiveCfg = Release|x64
-		{973A1E65-A9F3-4144-A521-647DDFE06F2A}.Release|x64.Build.0 = Release|x64
-		{973A1E65-A9F3-4144-A521-647DDFE06F2A}.Release|x86.ActiveCfg = Release|x86
-		{973A1E65-A9F3-4144-A521-647DDFE06F2A}.Release|x86.Build.0 = Release|x86
+		{BBF8857D-550A-4228-B9FC-52C38D5346F1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BBF8857D-550A-4228-B9FC-52C38D5346F1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BBF8857D-550A-4228-B9FC-52C38D5346F1}.Debug|ARM.ActiveCfg = Debug|ARM
+		{BBF8857D-550A-4228-B9FC-52C38D5346F1}.Debug|ARM.Build.0 = Debug|ARM
+		{BBF8857D-550A-4228-B9FC-52C38D5346F1}.Debug|x64.ActiveCfg = Debug|x64
+		{BBF8857D-550A-4228-B9FC-52C38D5346F1}.Debug|x64.Build.0 = Debug|x64
+		{BBF8857D-550A-4228-B9FC-52C38D5346F1}.Debug|x86.ActiveCfg = Debug|x86
+		{BBF8857D-550A-4228-B9FC-52C38D5346F1}.Debug|x86.Build.0 = Debug|x86
+		{BBF8857D-550A-4228-B9FC-52C38D5346F1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BBF8857D-550A-4228-B9FC-52C38D5346F1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BBF8857D-550A-4228-B9FC-52C38D5346F1}.Release|ARM.ActiveCfg = Release|ARM
+		{BBF8857D-550A-4228-B9FC-52C38D5346F1}.Release|ARM.Build.0 = Release|ARM
+		{BBF8857D-550A-4228-B9FC-52C38D5346F1}.Release|x64.ActiveCfg = Release|x64
+		{BBF8857D-550A-4228-B9FC-52C38D5346F1}.Release|x64.Build.0 = Release|x64
+		{BBF8857D-550A-4228-B9FC-52C38D5346F1}.Release|x86.ActiveCfg = Release|x86
+		{BBF8857D-550A-4228-B9FC-52C38D5346F1}.Release|x86.Build.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{BBF8857D-550A-4228-B9FC-52C38D5346F1} = {68B6C4F7-F969-451D-895C-EB44E94EB089}
+		{F1F0B094-2632-4141-88C1-05B082EBAC91} = {68B6C4F7-F969-451D-895C-EB44E94EB089}
+	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {4DA0CB04-8BD3-4EB9-8E42-BC3073024D4E}
 	EndGlobalSection

diff --git a/NicoPlayerHohoema/App.xaml b/NicoPlayerHohoema/App.xaml
@@ -7,13 +7,15 @@
     xmlns:model="using:NicoPlayerHohoema.Models"
     xmlns:conv="using:WinRTXamlToolkit.Converters"
     xmlns:myconv="using:NicoPlayerHohoema.Views.Converters"
+    xmlns:templateSelector="using:NicoPlayerHohoema.Views.TemplateSelector"
     xmlns:view="using:NicoPlayerHohoema.Views"
     xmlns:controls="using:NicoPlayerHohoema.Views.Controls"
     xmlns:uwpconv="using:Microsoft.Toolkit.Uwp.UI.Converters"
     xmlns:logicalModifier="using:AdaptiveTriggerLibrary.ConditionModifiers.LogicalModifiers"
     xmlns:compareModifier="using:AdaptiveTriggerLibrary.ConditionModifiers.ComparableModifiers"
     xmlns:system="using:System"
-    xmlns:subscriptionConverters="using:NicoPlayerHohoema.Views.Subscriptions">
+    xmlns:subscriptionConverters="using:NicoPlayerHohoema.Views.Subscriptions"
+    xmlns:flyouts="using:NicoPlayerHohoema.Views.Flyouts">
 
     <prism:PrismUnityApplication.Resources>
 
@@ -30,18 +32,43 @@
                 <ResourceDictionary Source="Views/Controls/MasterDetailsView/MasterDetailsView.xaml"/>
                 <ResourceDictionary Source="Views/Controls/TransientContainer/TransientContainer.xaml"/>
 
-
-                <ResourceDictionary Source="Commands/Commands.xaml" />
             </ResourceDictionary.MergedDictionaries>
 
+            <Color x:Key="HohoemaThemeColor" >#F8B400</Color>
+            <SolidColorBrush x:Key="HohoemaThemeBackgroundBrush"
+                             Color="{StaticResource HohoemaThemeColor}"
+                             >
+            </SolidColorBrush>
+            <SolidColorBrush x:Key="HohoemaPlayerBackgroundBrush"
+                    Color="{ThemeResource SystemAltMediumColor}" 
+                         />
+
             <x:Double x:Key="DesktopWindowWidthBreakPoint">800</x:Double>
+
 
+            <uwpconv:BoolNegationConverter x:Key="BoolNegation" />
             <conv:BooleanToVisibilityConverter x:Key="BooleanToVisibility" />
-            <conv:BooleanToVisibilityConverter x:Key="BooleanToVisibilityInverted"
-                                           IsInversed="True"
-                                           />
+            <conv:BooleanToVisibilityConverter x:Key="BooleanToVisibilityInverted" IsInversed="True" />
             <myconv:InvertVisibilityConverter x:Key="InvertVisibility" />
 
+            <uwpconv:EmptyObjectToObjectConverter x:Key="NotNullToBoolean">
+                <uwpconv:EmptyObjectToObjectConverter.NotEmptyValue>
+                    <x:Boolean>True</x:Boolean>
+                </uwpconv:EmptyObjectToObjectConverter.NotEmptyValue>
+                <uwpconv:EmptyObjectToObjectConverter.EmptyValue>
+                    <x:Boolean>False</x:Boolean>
+                </uwpconv:EmptyObjectToObjectConverter.EmptyValue>
+            </uwpconv:EmptyObjectToObjectConverter>
+
+            <uwpconv:EmptyObjectToObjectConverter x:Key="NullToBoolean">
+                <uwpconv:EmptyObjectToObjectConverter.NotEmptyValue>
+                    <x:Boolean>False</x:Boolean>
+                </uwpconv:EmptyObjectToObjectConverter.NotEmptyValue>
+                <uwpconv:EmptyObjectToObjectConverter.EmptyValue>
+                    <x:Boolean>True</x:Boolean>
+                </uwpconv:EmptyObjectToObjectConverter.EmptyValue>
+            </uwpconv:EmptyObjectToObjectConverter>
+
             <uwpconv:EmptyObjectToObjectConverter x:Key="NotNullToVisibility">
                 <uwpconv:EmptyObjectToObjectConverter.NotEmptyValue>
                     <Visibility>Visible</Visibility>
@@ -50,7 +77,6 @@
                     <Visibility>Collapsed</Visibility>
                 </uwpconv:EmptyObjectToObjectConverter.EmptyValue>
             </uwpconv:EmptyObjectToObjectConverter>
-
             <uwpconv:EmptyObjectToObjectConverter x:Key="NullToVisibility">
                 <uwpconv:EmptyObjectToObjectConverter.NotEmptyValue>
                     <Visibility>Collapsed</Visibility>
@@ -59,8 +85,6 @@
                     <Visibility>Visible</Visibility>
                 </uwpconv:EmptyObjectToObjectConverter.EmptyValue>
             </uwpconv:EmptyObjectToObjectConverter>
-
-
             <uwpconv:CollectionVisibilityConverter x:Key="CollectionVisibilityConverter" />
             <uwpconv:EmptyCollectionToObjectConverter x:Key="EmptyCollectionVisibilityConverter">
                 <uwpconv:EmptyCollectionToObjectConverter.EmptyValue>
@@ -70,7 +94,6 @@
                     <Visibility>Collapsed</Visibility>
                 </uwpconv:EmptyCollectionToObjectConverter.NotEmptyValue>
             </uwpconv:EmptyCollectionToObjectConverter>
-
             <uwpconv:EmptyCollectionToObjectConverter x:Key="EmptyCollectionToBooleanConverter"
 
                                                       >
@@ -81,79 +104,20 @@
                     <x:Boolean>False</x:Boolean>
                 </uwpconv:EmptyCollectionToObjectConverter.NotEmptyValue>
             </uwpconv:EmptyCollectionToObjectConverter>
+            <myconv:TimeSpanToMovieLengthStringValueConverter x:Key="TimeToMovieLengthConverter" />
 
             <conv:ColorToBrushConverter x:Key="ColorToBrush" />
-            <myconv:TimeSpanToMovieLengthStringValueConverter x:Key="TimeToMovieLengthConverter" />
 
-            <uwpconv:BoolToObjectConverter x:Key="BooleanInverted" >
-                <uwpconv:BoolToObjectConverter.TrueValue>
-                    <x:Boolean>False</x:Boolean>
-                </uwpconv:BoolToObjectConverter.TrueValue>
-                <uwpconv:BoolToObjectConverter.FalseValue>
-                    <x:Boolean>True</x:Boolean>
-                </uwpconv:BoolToObjectConverter.FalseValue>
-            </uwpconv:BoolToObjectConverter>
-
             <myconv:SoundVolumeConveter x:Key="ToUserFriendlySoubleVolume" />
-
-            <myconv:CacheStateToColorBrushConverter x:Key="CacheStateToColorBrush" />
-
             <myconv:VideoPositionToTimeConverter x:Key="VPosToTime" />
             <myconv:ToUserFriendlyNumber x:Key="ToUserFriendlyNumber" />
             <myconv:RelationalDateTimeConverter x:Key="ToRelationalTime" />
-
             <myconv:TransparentColorConverter x:Key="ToTransparentColor" />
             <myconv:SwipeSeekValueToTimeSpan x:Key="SwipeSeekValueToTimeSpan" />
 
             <myconv:DateTimeToStringConverter x:Key="DateTimeToString" />
             <myconv:ExpiredDateTimeToStringConverter x:Key="ExpiredDateTimeToString" />
-
-            <myconv:NGCommentScoreTypeTemplateSelector x:Key="NGCommentScoreTypeTemplateSelector">
-                <myconv:NGCommentScoreTypeTemplateSelector.NoneTemplate>
-                    <DataTemplate>
-                        <TextBlock Text="なし" />
-                    </DataTemplate>
-                </myconv:NGCommentScoreTypeTemplateSelector.NoneTemplate>
-
-                <myconv:NGCommentScoreTypeTemplateSelector.LowTemplate>
-                    <DataTemplate>
-                        <TextBlock Text="弱" />
-                    </DataTemplate>
-                </myconv:NGCommentScoreTypeTemplateSelector.LowTemplate>
-
-                <myconv:NGCommentScoreTypeTemplateSelector.MiddleTemplate>
-                    <DataTemplate>
-                        <TextBlock Text="中" />
-                    </DataTemplate>
-                </myconv:NGCommentScoreTypeTemplateSelector.MiddleTemplate>
-
-                <myconv:NGCommentScoreTypeTemplateSelector.HighTemplate>
-                    <DataTemplate>
-                        <TextBlock Text="強" />
-                    </DataTemplate>
-                </myconv:NGCommentScoreTypeTemplateSelector.HighTemplate>
-
-                <myconv:NGCommentScoreTypeTemplateSelector.VeryHighTemplate>
-                    <DataTemplate>
-                        <TextBlock Text="さらに強" />
-                    </DataTemplate>
-                </myconv:NGCommentScoreTypeTemplateSelector.VeryHighTemplate>
-
-                <myconv:NGCommentScoreTypeTemplateSelector.SuperVeryHighTemplate>
-                    <DataTemplate>
-                        <TextBlock Text="極めて強" />
-                    </DataTemplate>
-                </myconv:NGCommentScoreTypeTemplateSelector.SuperVeryHighTemplate>
-
-                <myconv:NGCommentScoreTypeTemplateSelector.UltraSuperVeryHighTemplate>
-                    <DataTemplate>
-                        <TextBlock Text="最大" />
-                    </DataTemplate>
-                </myconv:NGCommentScoreTypeTemplateSelector.UltraSuperVeryHighTemplate>
-
-            </myconv:NGCommentScoreTypeTemplateSelector>
-
-
+            <myconv:ToKMGTPEZYConverter x:Key="ToKMGTPEZY" />
 
             <uwpconv:BoolToObjectConverter x:Name="BoolToAvairableOpacityConverter">
                 <uwpconv:BoolToObjectConverter.TrueValue>
@@ -165,10 +129,10 @@
             </uwpconv:BoolToObjectConverter>
 
             <uwpconv:ResourceNameToResourceStringConverter x:Key="ToLocalText" />
+
+            <myconv:CacheStateToColorBrushConverter x:Key="CacheStateToColorBrush" />
 
-            <myconv:PageTypeToMaterialIconKind x:Key="PageTypeToMaterialIconKind" />
 
-            <myconv:ToKMGTPEZYConverter x:Key="ToKMGTPEZY" />
 
             <!-- Logical Modifier-->
             <logicalModifier:AndModifier x:Key="AndModifier" />
@@ -181,12 +145,7 @@
             <compareModifier:GreaterThanModifier x:Key="GreaterThanModifier" />
             <compareModifier:LessThanEqualToModifier x:Key="LessThanEqualToModifier" />
             <compareModifier:LessThanModifier x:Key="LessThanModifier" />
-
-
 
-            <controls:VideoListItemFlyout x:Key="VideoListItemFlyout" />
-            <controls:LiveListItemFlyout x:Key="LiveListItemFlyout" />
-
 
             <!-- Subscriptions -->
             <subscriptionConverters:SubscriptionSourceConverter x:Key="SubscriptionSourceConverter" />
@@ -240,17 +199,6 @@
             </DataTemplate>
 
 
-            <Color x:Key="HohoemaThemeColor" >#F8B400</Color>
-
-            <SolidColorBrush x:Key="HohoemaThemeBackgroundBrush"
-                             Color="{StaticResource HohoemaThemeColor}"
-                             >
-            </SolidColorBrush>
-
-            <SolidColorBrush x:Key="HohoemaPlayerBackgroundBrush"
-                    Color="{ThemeResource SystemAltMediumColor}" 
-                         />
-
             <Style TargetType="ListViewItem" x:Key="VideoListViewItemStyle">
                 <Setter Property="HorizontalContentAlignment"
                                 Value="Stretch" 
@@ -266,7 +214,7 @@
 
 
             <DataTemplate x:Key="VideoListItemFlyoutTemplate">
-                <controls:VideoListItemFlyout />
+                <flyouts:VideoItemFlyout />
             </DataTemplate>
 
             <ResourceDictionary.ThemeDictionaries>