Working on themes editor

WhiteLionATX · Nov 30, 2018 · 0fb7e0d · 0fb7e0d
1 parent d0f846c
commit 0fb7e0d
Show file tree

Hide file tree

Showing 13 changed files with 3,101 additions and 18 deletions.
diff --git a/.gitignore b/.gitignore
@@ -266,3 +266,4 @@ _Pvt_Extensions
 /Unigram/Libraries/Template10-version_1.1.12_vs2017
 /Unigram/Unigram/Constants.Secret.cs
 /Unigram/Unigram.Infrastructure
+/Unigram/Libraries/fluent-xaml-theme-editor/FluentEditorShared
diff --git a/Unigram/Unigram.sln b/Unigram/Unigram.sln
@@ -36,7 +36,9 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libtgvoip", "Libraries\libt
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Telegram.Intro", "Telegram.Intro\Telegram.Intro.vcxproj", "{1CFA1BFA-98D3-4316-8E3B-AC3EA8B3510E}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unigram.Infrastructure", "Unigram.Infrastructure\Unigram.Infrastructure.csproj", "{AC3E4F10-6615-4E16-BB0F-104760C92B95}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unigram.Infrastructure", "Unigram.Infrastructure\Unigram.Infrastructure.csproj", "{BFACAA89-8EF0-4989-BB32-B8EB271799CF}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FluentEditorShared", "Libraries\fluent-xaml-theme-editor\FluentEditorShared\FluentEditorShared.csproj", "{42A312EF-7C4A-4661-A684-DB14E40A2A90}"
 EndProject
 Global
 	GlobalSection(SharedMSBuildProjectFiles) = preSolution
@@ -186,22 +188,38 @@ Global
 		{1CFA1BFA-98D3-4316-8E3B-AC3EA8B3510E}.Release|x64.Build.0 = Release|x64
 		{1CFA1BFA-98D3-4316-8E3B-AC3EA8B3510E}.Release|x86.ActiveCfg = Release|Win32
 		{1CFA1BFA-98D3-4316-8E3B-AC3EA8B3510E}.Release|x86.Build.0 = Release|Win32
-		{AC3E4F10-6615-4E16-BB0F-104760C92B95}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AC3E4F10-6615-4E16-BB0F-104760C92B95}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AC3E4F10-6615-4E16-BB0F-104760C92B95}.Debug|ARM.ActiveCfg = Debug|ARM
-		{AC3E4F10-6615-4E16-BB0F-104760C92B95}.Debug|ARM.Build.0 = Debug|ARM
-		{AC3E4F10-6615-4E16-BB0F-104760C92B95}.Debug|x64.ActiveCfg = Debug|x64
-		{AC3E4F10-6615-4E16-BB0F-104760C92B95}.Debug|x64.Build.0 = Debug|x64
-		{AC3E4F10-6615-4E16-BB0F-104760C92B95}.Debug|x86.ActiveCfg = Debug|x86
-		{AC3E4F10-6615-4E16-BB0F-104760C92B95}.Debug|x86.Build.0 = Debug|x86
-		{AC3E4F10-6615-4E16-BB0F-104760C92B95}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{AC3E4F10-6615-4E16-BB0F-104760C92B95}.Release|Any CPU.Build.0 = Release|Any CPU
-		{AC3E4F10-6615-4E16-BB0F-104760C92B95}.Release|ARM.ActiveCfg = Release|ARM
-		{AC3E4F10-6615-4E16-BB0F-104760C92B95}.Release|ARM.Build.0 = Release|ARM
-		{AC3E4F10-6615-4E16-BB0F-104760C92B95}.Release|x64.ActiveCfg = Release|x64
-		{AC3E4F10-6615-4E16-BB0F-104760C92B95}.Release|x64.Build.0 = Release|x64
-		{AC3E4F10-6615-4E16-BB0F-104760C92B95}.Release|x86.ActiveCfg = Release|x86
-		{AC3E4F10-6615-4E16-BB0F-104760C92B95}.Release|x86.Build.0 = Release|x86
+		{BFACAA89-8EF0-4989-BB32-B8EB271799CF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BFACAA89-8EF0-4989-BB32-B8EB271799CF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BFACAA89-8EF0-4989-BB32-B8EB271799CF}.Debug|ARM.ActiveCfg = Debug|ARM
+		{BFACAA89-8EF0-4989-BB32-B8EB271799CF}.Debug|ARM.Build.0 = Debug|ARM
+		{BFACAA89-8EF0-4989-BB32-B8EB271799CF}.Debug|x64.ActiveCfg = Debug|x64
+		{BFACAA89-8EF0-4989-BB32-B8EB271799CF}.Debug|x64.Build.0 = Debug|x64
+		{BFACAA89-8EF0-4989-BB32-B8EB271799CF}.Debug|x86.ActiveCfg = Debug|x86
+		{BFACAA89-8EF0-4989-BB32-B8EB271799CF}.Debug|x86.Build.0 = Debug|x86
+		{BFACAA89-8EF0-4989-BB32-B8EB271799CF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BFACAA89-8EF0-4989-BB32-B8EB271799CF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BFACAA89-8EF0-4989-BB32-B8EB271799CF}.Release|ARM.ActiveCfg = Release|ARM
+		{BFACAA89-8EF0-4989-BB32-B8EB271799CF}.Release|ARM.Build.0 = Release|ARM
+		{BFACAA89-8EF0-4989-BB32-B8EB271799CF}.Release|x64.ActiveCfg = Release|x64
+		{BFACAA89-8EF0-4989-BB32-B8EB271799CF}.Release|x64.Build.0 = Release|x64
+		{BFACAA89-8EF0-4989-BB32-B8EB271799CF}.Release|x86.ActiveCfg = Release|x86
+		{BFACAA89-8EF0-4989-BB32-B8EB271799CF}.Release|x86.Build.0 = Release|x86
+		{42A312EF-7C4A-4661-A684-DB14E40A2A90}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{42A312EF-7C4A-4661-A684-DB14E40A2A90}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{42A312EF-7C4A-4661-A684-DB14E40A2A90}.Debug|ARM.ActiveCfg = Debug|ARM
+		{42A312EF-7C4A-4661-A684-DB14E40A2A90}.Debug|ARM.Build.0 = Debug|ARM
+		{42A312EF-7C4A-4661-A684-DB14E40A2A90}.Debug|x64.ActiveCfg = Debug|x64
+		{42A312EF-7C4A-4661-A684-DB14E40A2A90}.Debug|x64.Build.0 = Debug|x64
+		{42A312EF-7C4A-4661-A684-DB14E40A2A90}.Debug|x86.ActiveCfg = Debug|x86
+		{42A312EF-7C4A-4661-A684-DB14E40A2A90}.Debug|x86.Build.0 = Debug|x86
+		{42A312EF-7C4A-4661-A684-DB14E40A2A90}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{42A312EF-7C4A-4661-A684-DB14E40A2A90}.Release|Any CPU.Build.0 = Release|Any CPU
+		{42A312EF-7C4A-4661-A684-DB14E40A2A90}.Release|ARM.ActiveCfg = Release|ARM
+		{42A312EF-7C4A-4661-A684-DB14E40A2A90}.Release|ARM.Build.0 = Release|ARM
+		{42A312EF-7C4A-4661-A684-DB14E40A2A90}.Release|x64.ActiveCfg = Release|x64
+		{42A312EF-7C4A-4661-A684-DB14E40A2A90}.Release|x64.Build.0 = Release|x64
+		{42A312EF-7C4A-4661-A684-DB14E40A2A90}.Release|x86.ActiveCfg = Release|x86
+		{42A312EF-7C4A-4661-A684-DB14E40A2A90}.Release|x86.Build.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -212,7 +230,8 @@ Global
 		{3520C5E6-F0C2-468F-8970-372414C233DC} = {C385BB20-B82D-496E-A38D-835D017AC0EA}
 		{6766A2C0-AB30-43CC-9EF3-7DDC13736A38} = {C385BB20-B82D-496E-A38D-835D017AC0EA}
 		{88803693-7606-484B-9D2F-4BB789D57C29} = {C385BB20-B82D-496E-A38D-835D017AC0EA}
-		{AC3E4F10-6615-4E16-BB0F-104760C92B95} = {C385BB20-B82D-496E-A38D-835D017AC0EA}
+		{BFACAA89-8EF0-4989-BB32-B8EB271799CF} = {C385BB20-B82D-496E-A38D-835D017AC0EA}
+		{42A312EF-7C4A-4661-A684-DB14E40A2A90} = {C385BB20-B82D-496E-A38D-835D017AC0EA}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {8D9C79FF-7079-448D-8DA7-7E83CDBCA9AC}

diff --git a/Unigram/Unigram/App.xaml b/Unigram/Unigram/App.xaml
@@ -57,6 +57,23 @@
                     <StaticResource x:Key="NavigationViewItemBorderBrushSelectedPressed" ResourceKey="SystemControlTransparentBrush" />
                     <StaticResource x:Key="NavigationViewItemBorderBrushSelectedDisabled" ResourceKey="SystemControlTransparentBrush" />
                     <StaticResource x:Key="NavigationViewSelectionIndicatorForeground" ResourceKey="SystemControlForegroundAccentBrush" />
+
+                    <SolidColorBrush x:Key="AppBackgroundBrush" Color="#FF232323" />
+                    <SolidColorBrush x:Key="AppContentBackgroundBrush" Color="#FF282828" />
+                    <SolidColorBrush x:Key="ContentSpacerBrush" Color="#FF1F1F1F" />
+
+                    <SolidColorBrush x:Key="ExpanderButtonStyleNormalForegroundBrush" Color="{StaticResource SystemBaseHighColor}" />
+                    <SolidColorBrush x:Key="ExpanderButtonStylePointerOverForegroundBrush" Color="{StaticResource SystemBaseHighColor}" />
+                    <SolidColorBrush x:Key="ExpanderButtonStylePressedForegroundBrush" Color="{StaticResource SystemBaseHighColor}" />
+                    <SolidColorBrush x:Key="ExpanderButtonStyleDisabledForegroundBrush" Color="{StaticResource SystemBaseHighColor}" />
+                    <SolidColorBrush x:Key="ExpanderButtonStyleCheckedForegroundBrush" Color="{StaticResource SystemBaseHighColor}" />
+                    <SolidColorBrush x:Key="ExpanderButtonStyleCheckedPointerOverForegroundBrush" Color="{StaticResource SystemBaseHighColor}" />
+                    <SolidColorBrush x:Key="ExpanderButtonStyleCheckedPressedForegroundBrush" Color="{StaticResource SystemBaseHighColor}" />
+                    <SolidColorBrush x:Key="ExpanderButtonStyleCheckedDisabledForegroundBrush" Color="{StaticResource SystemBaseHighColor}" />
+                    <SolidColorBrush x:Key="ExpanderButtonStyleIndeterminateForegroundBrush" Color="{StaticResource SystemBaseHighColor}" />
+                    <SolidColorBrush x:Key="ExpanderButtonStyleIndeterminatePointerOverForegroundBrush" Color="{StaticResource SystemBaseHighColor}" />
+                    <SolidColorBrush x:Key="ExpanderButtonStyleIndeterminatePressedForegroundBrush" Color="{StaticResource SystemBaseHighColor}" />
+                    <SolidColorBrush x:Key="ExpanderButtonStyleIndeterminateDisabledForegroundBrush" Color="{StaticResource SystemBaseHighColor}" />
                 </ResourceDictionary>
                 <ResourceDictionary x:Key="Light">
                     <Color x:Key="SystemChromeMediumHighColor">#FFE6E6E6</Color>
@@ -103,6 +120,23 @@
                     <StaticResource x:Key="NavigationViewItemBorderBrushSelectedPressed" ResourceKey="SystemControlTransparentBrush" />
                     <StaticResource x:Key="NavigationViewItemBorderBrushSelectedDisabled" ResourceKey="SystemControlTransparentBrush" />
                     <StaticResource x:Key="NavigationViewSelectionIndicatorForeground" ResourceKey="SystemControlForegroundAccentBrush" />
+
+                    <SolidColorBrush x:Key="AppBackgroundBrush" Color="#FFF1F1F1" />
+                    <SolidColorBrush x:Key="AppContentBackgroundBrush" Color="#FFFFFFFF" />
+                    <SolidColorBrush x:Key="ContentSpacerBrush" Color="#FFD4D4D4" />
+
+                    <SolidColorBrush x:Key="ExpanderButtonStyleNormalForegroundBrush" Color="{StaticResource SystemBaseHighColor}" />
+                    <SolidColorBrush x:Key="ExpanderButtonStylePointerOverForegroundBrush" Color="{StaticResource SystemBaseHighColor}" />
+                    <SolidColorBrush x:Key="ExpanderButtonStylePressedForegroundBrush" Color="{StaticResource SystemBaseHighColor}" />
+                    <SolidColorBrush x:Key="ExpanderButtonStyleDisabledForegroundBrush" Color="{StaticResource SystemBaseHighColor}" />
+                    <SolidColorBrush x:Key="ExpanderButtonStyleCheckedForegroundBrush" Color="{StaticResource SystemBaseHighColor}" />
+                    <SolidColorBrush x:Key="ExpanderButtonStyleCheckedPointerOverForegroundBrush" Color="{StaticResource SystemBaseHighColor}" />
+                    <SolidColorBrush x:Key="ExpanderButtonStyleCheckedPressedForegroundBrush" Color="{StaticResource SystemBaseHighColor}" />
+                    <SolidColorBrush x:Key="ExpanderButtonStyleCheckedDisabledForegroundBrush" Color="{StaticResource SystemBaseHighColor}" />
+                    <SolidColorBrush x:Key="ExpanderButtonStyleIndeterminateForegroundBrush" Color="{StaticResource SystemBaseHighColor}" />
+                    <SolidColorBrush x:Key="ExpanderButtonStyleIndeterminatePointerOverForegroundBrush" Color="{StaticResource SystemBaseHighColor}" />
+                    <SolidColorBrush x:Key="ExpanderButtonStyleIndeterminatePressedForegroundBrush" Color="{StaticResource SystemBaseHighColor}" />
+                    <SolidColorBrush x:Key="ExpanderButtonStyleIndeterminateDisabledForegroundBrush" Color="{StaticResource SystemBaseHighColor}" />
                 </ResourceDictionary>
             </ResourceDictionary.ThemeDictionaries>
 
@@ -207,6 +241,7 @@
                 <common:Theme/>
                 <ResourceDictionary Source="ms-appx:///Themes/Accent.xaml"/>
                 <themes:Messages/>
+                <ResourceDictionary Source="ms-appx:///FluentEditorShared/FluentEditorSharedResources.xaml" />
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </Application.Resources>