Skip to content

Commit

Permalink
Add dark mode for windows & also prep release
Browse files Browse the repository at this point in the history
  • Loading branch information
jamesmontemagno committed Feb 16, 2021
1 parent d25cbb3 commit 7f042cf
Show file tree
Hide file tree
Showing 68 changed files with 31 additions and 1,061 deletions.
56 changes: 1 addition & 55 deletions MyStreamTimer.All.sln
Expand Up @@ -3,8 +3,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.28705.295
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MyStreamTimer.WPF", "MyStreamTimer.WPF\MyStreamTimer.WPF.csproj", "{EB4D1979-A162-444E-B575-B9806ED2BF0A}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MyStreamTimer.Shared", "MyStreamTimer.Shared\MyStreamTimer.Shared.csproj", "{D10CFCD1-4629-4C58-AF00-47145BE0D8E4}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{F71BF0B2-E965-4E53-9E52-6C052E57354E}"
Expand All @@ -13,8 +11,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
nuget.config = nuget.config
EndProjectSection
EndProject
Project("{C7167F0D-BC9F-4E6E-AFE1-012C56B48DB5}") = "MyStreamTimer.Packaging", "MyStreamTimer.Packaging\MyStreamTimer.Packaging.wapproj", "{AF0FBC75-F1C1-4F30-AF63-400579DCA371}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MyStreamTimer.UI", "MyStreamTimer.UI\MyStreamTimer.UI.csproj", "{AD504815-E24E-4215-AB35-EF8DA7353C1D}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MyStreamTimer.Mac", "MyStreamTimer.Mac\MyStreamTimer.Mac.csproj", "{A9D15055-C57A-4CC1-891A-A0F326790A63}"
Expand All @@ -25,7 +21,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Cross-platform", "Cross-pla
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "StreamDeck", "StreamDeck", "{8A94E50A-3D99-4AD0-9A10-11CE6A80610D}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MyStreamTimer.StreamDeck", "MyStreamTimer.StreamDeck\MyStreamTimer.StreamDeck.csproj", "{929CC523-7C5A-4C64-AE17-34858FF35556}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MyStreamTimer.StreamDeck", "MyStreamTimer.StreamDeck\MyStreamTimer.StreamDeck.csproj", "{929CC523-7C5A-4C64-AE17-34858FF35556}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand All @@ -41,26 +37,6 @@ Global
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{EB4D1979-A162-444E-B575-B9806ED2BF0A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{EB4D1979-A162-444E-B575-B9806ED2BF0A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{EB4D1979-A162-444E-B575-B9806ED2BF0A}.Debug|ARM.ActiveCfg = Debug|Any CPU
{EB4D1979-A162-444E-B575-B9806ED2BF0A}.Debug|ARM.Build.0 = Debug|Any CPU
{EB4D1979-A162-444E-B575-B9806ED2BF0A}.Debug|ARM64.ActiveCfg = Debug|Any CPU
{EB4D1979-A162-444E-B575-B9806ED2BF0A}.Debug|ARM64.Build.0 = Debug|Any CPU
{EB4D1979-A162-444E-B575-B9806ED2BF0A}.Debug|x64.ActiveCfg = Debug|Any CPU
{EB4D1979-A162-444E-B575-B9806ED2BF0A}.Debug|x64.Build.0 = Debug|Any CPU
{EB4D1979-A162-444E-B575-B9806ED2BF0A}.Debug|x86.ActiveCfg = Debug|Any CPU
{EB4D1979-A162-444E-B575-B9806ED2BF0A}.Debug|x86.Build.0 = Debug|Any CPU
{EB4D1979-A162-444E-B575-B9806ED2BF0A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{EB4D1979-A162-444E-B575-B9806ED2BF0A}.Release|Any CPU.Build.0 = Release|Any CPU
{EB4D1979-A162-444E-B575-B9806ED2BF0A}.Release|ARM.ActiveCfg = Release|Any CPU
{EB4D1979-A162-444E-B575-B9806ED2BF0A}.Release|ARM.Build.0 = Release|Any CPU
{EB4D1979-A162-444E-B575-B9806ED2BF0A}.Release|ARM64.ActiveCfg = Release|Any CPU
{EB4D1979-A162-444E-B575-B9806ED2BF0A}.Release|ARM64.Build.0 = Release|Any CPU
{EB4D1979-A162-444E-B575-B9806ED2BF0A}.Release|x64.ActiveCfg = Release|x64
{EB4D1979-A162-444E-B575-B9806ED2BF0A}.Release|x64.Build.0 = Release|x64
{EB4D1979-A162-444E-B575-B9806ED2BF0A}.Release|x86.ActiveCfg = Release|x86
{EB4D1979-A162-444E-B575-B9806ED2BF0A}.Release|x86.Build.0 = Release|x86
{D10CFCD1-4629-4C58-AF00-47145BE0D8E4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D10CFCD1-4629-4C58-AF00-47145BE0D8E4}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D10CFCD1-4629-4C58-AF00-47145BE0D8E4}.Debug|ARM.ActiveCfg = Debug|Any CPU
Expand All @@ -81,36 +57,6 @@ Global
{D10CFCD1-4629-4C58-AF00-47145BE0D8E4}.Release|x64.Build.0 = Release|Any CPU
{D10CFCD1-4629-4C58-AF00-47145BE0D8E4}.Release|x86.ActiveCfg = Release|Any CPU
{D10CFCD1-4629-4C58-AF00-47145BE0D8E4}.Release|x86.Build.0 = Release|Any CPU
{AF0FBC75-F1C1-4F30-AF63-400579DCA371}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{AF0FBC75-F1C1-4F30-AF63-400579DCA371}.Debug|Any CPU.Build.0 = Debug|Any CPU
{AF0FBC75-F1C1-4F30-AF63-400579DCA371}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
{AF0FBC75-F1C1-4F30-AF63-400579DCA371}.Debug|ARM.ActiveCfg = Debug|ARM
{AF0FBC75-F1C1-4F30-AF63-400579DCA371}.Debug|ARM.Build.0 = Debug|ARM
{AF0FBC75-F1C1-4F30-AF63-400579DCA371}.Debug|ARM.Deploy.0 = Debug|ARM
{AF0FBC75-F1C1-4F30-AF63-400579DCA371}.Debug|ARM64.ActiveCfg = Debug|ARM64
{AF0FBC75-F1C1-4F30-AF63-400579DCA371}.Debug|ARM64.Build.0 = Debug|ARM64
{AF0FBC75-F1C1-4F30-AF63-400579DCA371}.Debug|ARM64.Deploy.0 = Debug|ARM64
{AF0FBC75-F1C1-4F30-AF63-400579DCA371}.Debug|x64.ActiveCfg = Debug|x64
{AF0FBC75-F1C1-4F30-AF63-400579DCA371}.Debug|x64.Build.0 = Debug|x64
{AF0FBC75-F1C1-4F30-AF63-400579DCA371}.Debug|x64.Deploy.0 = Debug|x64
{AF0FBC75-F1C1-4F30-AF63-400579DCA371}.Debug|x86.ActiveCfg = Debug|x86
{AF0FBC75-F1C1-4F30-AF63-400579DCA371}.Debug|x86.Build.0 = Debug|x86
{AF0FBC75-F1C1-4F30-AF63-400579DCA371}.Debug|x86.Deploy.0 = Debug|x86
{AF0FBC75-F1C1-4F30-AF63-400579DCA371}.Release|Any CPU.ActiveCfg = Release|Any CPU
{AF0FBC75-F1C1-4F30-AF63-400579DCA371}.Release|Any CPU.Build.0 = Release|Any CPU
{AF0FBC75-F1C1-4F30-AF63-400579DCA371}.Release|Any CPU.Deploy.0 = Release|Any CPU
{AF0FBC75-F1C1-4F30-AF63-400579DCA371}.Release|ARM.ActiveCfg = Release|ARM
{AF0FBC75-F1C1-4F30-AF63-400579DCA371}.Release|ARM.Build.0 = Release|ARM
{AF0FBC75-F1C1-4F30-AF63-400579DCA371}.Release|ARM.Deploy.0 = Release|ARM
{AF0FBC75-F1C1-4F30-AF63-400579DCA371}.Release|ARM64.ActiveCfg = Release|ARM64
{AF0FBC75-F1C1-4F30-AF63-400579DCA371}.Release|ARM64.Build.0 = Release|ARM64
{AF0FBC75-F1C1-4F30-AF63-400579DCA371}.Release|ARM64.Deploy.0 = Release|ARM64
{AF0FBC75-F1C1-4F30-AF63-400579DCA371}.Release|x64.ActiveCfg = Release|x64
{AF0FBC75-F1C1-4F30-AF63-400579DCA371}.Release|x64.Build.0 = Release|x64
{AF0FBC75-F1C1-4F30-AF63-400579DCA371}.Release|x64.Deploy.0 = Release|x64
{AF0FBC75-F1C1-4F30-AF63-400579DCA371}.Release|x86.ActiveCfg = Release|x86
{AF0FBC75-F1C1-4F30-AF63-400579DCA371}.Release|x86.Build.0 = Release|x86
{AF0FBC75-F1C1-4F30-AF63-400579DCA371}.Release|x86.Deploy.0 = Release|x86
{AD504815-E24E-4215-AB35-EF8DA7353C1D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{AD504815-E24E-4215-AB35-EF8DA7353C1D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{AD504815-E24E-4215-AB35-EF8DA7353C1D}.Debug|ARM.ActiveCfg = Debug|Any CPU
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Binary file removed MyStreamTimer.Packaging/Images/StoreLogo.backup.png
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
163 changes: 0 additions & 163 deletions MyStreamTimer.Packaging/MyStreamTimer.Packaging.wapproj

This file was deleted.

60 changes: 0 additions & 60 deletions MyStreamTimer.Packaging/Package.appxmanifest

This file was deleted.

1 change: 1 addition & 0 deletions MyStreamTimer.Shared/Helpers/Settings.cs
Expand Up @@ -68,6 +68,7 @@ public static bool StayOnTop
{
get => AppSettings.GetValueOrDefault(nameof(StayOnTop), true);
set => AppSettings.AddOrUpdateValue(nameof(StayOnTop), value);
}

public static bool FirstRun
{
Expand Down
10 changes: 7 additions & 3 deletions MyStreamTimer.Shared/ViewModel/ProViewModel.cs
Expand Up @@ -21,6 +21,10 @@ public ProViewModel()
platformHelpers = ServiceContainer.Resolve<IPlatformHelpers>();
BuyCommand = new AsyncCommand<string>(PurchasePro);
RestoreCommand = new AsyncCommand(RestorePurchases);

#if DEBUG
CrossInAppBilling.Current.InTestingMode = true;
#endif
}

public string ProPrice
Expand Down Expand Up @@ -89,9 +93,9 @@ async Task PurchasePro(string productId)
}
else if (productId == "mstsilver")
{
GlobalSettings.IsBronze = true;
OnPropertyChanged(nameof(IsBronze));
OnPropertyChanged(nameof(IsNotBronze));
GlobalSettings.IsSilver = true;
OnPropertyChanged(nameof(IsSilver));
OnPropertyChanged(nameof(IsNotSilver));
}
else if (productId == "mstgold")
{
Expand Down
2 changes: 1 addition & 1 deletion MyStreamTimer.UI/App.xaml
Expand Up @@ -8,7 +8,7 @@
<Color x:Key="WindowBackground">#f5f5f5</Color>
<Style TargetType="Button">
<Setter Property="TextColor" Value="{AppThemeBinding Dark=White, Default=Black,Light=Black}"/>
<Setter Property="FontSize" Value="Small"/>
<Setter Property="FontSize" Value="{OnPlatform macOS=Small, UWP=14}"/>
<Setter Property="Padding" Value="2"/>
<!--<Setter Property="TextColor" Value="Black" />
<Setter Property="BackgroundColor" Value="#f6f6f6"/>
Expand Down
3 changes: 1 addition & 2 deletions MyStreamTimer.UI/MainPage.xaml
Expand Up @@ -3,8 +3,7 @@
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
x:Class="MyStreamTimer.UI.MainPage"
xmlns:local="clr-namespace:MyStreamTimer.UI"
xmlns:viewmodels="clr-namespace:MyStreamTimer.Shared.ViewModel;assembly=MyStreamTimer.Shared"
BackgroundColor="{StaticResource WindowBackground}">
xmlns:viewmodels="clr-namespace:MyStreamTimer.Shared.ViewModel;assembly=MyStreamTimer.Shared">
<local:TabDownPage x:Name="TabItemDown" Title="Down"/>
<local:TabDownPage x:Name="TabItemDown2" Title="Down 2"/>
<local:TabDownPage x:Name="TabItemDown3" Title="Down 3"/>
Expand Down

0 comments on commit 7f042cf

Please sign in to comment.