Add ko-fi button to settings view

G-Stas · Sep 13, 2021 · 9b10d8f · 9b10d8f
1 parent c8591af
commit 9b10d8f
Show file tree

Hide file tree

Showing 25 changed files with 226 additions and 19 deletions.
diff --git a/Volumey/App.xaml b/Volumey/App.xaml
@@ -51,6 +51,13 @@
             <BitmapImage x:Key="TrayMuteDark" UriSource="/Resources/Icons/TrayDark/mute.ico" />
             <BitmapImage x:Key="TrayNoDeviceDark" UriSource="Resources/Icons/TrayDark/no-device.ico" />
 
+            <BitmapImage x:Key="Mug" UriSource="Resources/Icons/ButtonIcon/mug.png" />
+            <BitmapImage x:Key="MugEmpty" UriSource="Resources/Icons/ButtonIcon/mugEmpty.png" />
+            <BitmapImage x:Key="MugDark" UriSource="Resources/Icons/ButtonIcon/mug-dark.png" />
+            <BitmapImage x:Key="MugEmptyDark" UriSource="Resources/Icons/ButtonIcon/mugEmpty-dark.png" />
+            <BitmapImage x:Key="GitHub" UriSource="Resources/Icons/ButtonIcon/github.png" />
+            <BitmapImage x:Key="GitHubDark" UriSource="Resources/Icons/ButtonIcon/github-dark.png" />
+
             <!--override default style properties-->
             <CornerRadius x:Key="SliderThumbCornerRadius">4</CornerRadius>
             <system:Double x:Key="SliderHorizontalThumbWidth">8</system:Double>

diff --git a/Volumey/Resources/Icons/ButtonIcon/github-dark.png b/Volumey/Resources/Icons/ButtonIcon/github-dark.png
diff --git a/Volumey/Resources/Icons/ButtonIcon/github.png b/Volumey/Resources/Icons/ButtonIcon/github.png
diff --git a/Volumey/Resources/Icons/ButtonIcon/mug-dark.png b/Volumey/Resources/Icons/ButtonIcon/mug-dark.png
diff --git a/Volumey/Resources/Icons/ButtonIcon/mug.png b/Volumey/Resources/Icons/ButtonIcon/mug.png
diff --git a/Volumey/Resources/Icons/ButtonIcon/mugEmpty-dark.png b/Volumey/Resources/Icons/ButtonIcon/mugEmpty-dark.png
diff --git a/Volumey/Resources/Icons/ButtonIcon/mugEmpty.png b/Volumey/Resources/Icons/ButtonIcon/mugEmpty.png
diff --git a/Volumey/Resources/Resources.de.resx b/Volumey/Resources/Resources.de.resx
@@ -154,4 +154,7 @@
   <data name="Settings_VolumeLimit" xml:space="preserve">
     <value>Begrenzen Sie das Volumen der gestarteten App auf 100%</value>
   </data>
+  <data name="Settings_Tip" xml:space="preserve">
+    <value>Kauf mir einen Kaffee :)</value>
+  </data>
 </root>
diff --git a/Volumey/Resources/Resources.en.resx b/Volumey/Resources/Resources.en.resx
@@ -154,4 +154,7 @@
   <data name="Settings_AppsHotkeys" xml:space="preserve">
     <value>Hotkeys for apps</value>
   </data>
+  <data name="Settings_Tip" xml:space="preserve">
+    <value>Buy me a coffee :)</value>
+  </data>
 </root>
diff --git a/Volumey/Resources/Resources.es.resx b/Volumey/Resources/Resources.es.resx
@@ -154,4 +154,7 @@
   <data name="Settings_VolumeLimit" xml:space="preserve">
     <value>Limite el volumen de la aplicación iniciada si es del 100%</value>
   </data>
+  <data name="Settings_Tip" xml:space="preserve">
+    <value>Cómprame un café :)</value>
+  </data>
 </root>
diff --git a/Volumey/Resources/Resources.fr.resx b/Volumey/Resources/Resources.fr.resx
@@ -154,4 +154,7 @@
   <data name="Settings_VolumeLimit" xml:space="preserve">
     <value>Limiter le volume de l'application lancée s'il est de 100%</value>
   </data>
+  <data name="Settings_Tip" xml:space="preserve">
+    <value>Achetez-moi un café :)</value>
+  </data>
 </root>
diff --git a/Volumey/Resources/Resources.hi.resx b/Volumey/Resources/Resources.hi.resx
@@ -154,4 +154,7 @@
   <data name="Settings_VolumeLimit" xml:space="preserve">
     <value>100% होने पर लॉन्च किए गए ऐप की मात्रा को सीमित करें</value>
   </data>
+  <data name="Settings_Tip" xml:space="preserve">
+    <value>मुझे एक कॉफी खरीदो :)</value>
+  </data>
 </root>
diff --git a/Volumey/Resources/Resources.it.resx b/Volumey/Resources/Resources.it.resx
@@ -154,4 +154,7 @@
   <data name="Settings_VolumeLimit" xml:space="preserve">
     <value>Limita il volume dell'app avviata se è del 100%</value>
   </data>
+  <data name="Settings_Tip" xml:space="preserve">
+    <value>Offrimi un caffè :)</value>
+  </data>
 </root>
diff --git a/Volumey/Resources/Resources.ja.resx b/Volumey/Resources/Resources.ja.resx
@@ -154,4 +154,7 @@
   <data name="Settings_VolumeLimit" xml:space="preserve">
     <value>100％の場合、起動するアプリのボリュームを制限します</value>
   </data>
+  <data name="Settings_Tip" xml:space="preserve">
+    <value>私にコーヒーを買ってください:)</value>
+  </data>
 </root>
diff --git a/Volumey/Resources/Resources.pt.resx b/Volumey/Resources/Resources.pt.resx
@@ -154,4 +154,7 @@
   <data name="Settings_VolumeLimit" xml:space="preserve">
     <value>Limite o volume do aplicativo iniciado se for 100%</value>
   </data>
+  <data name="Settings_Tip" xml:space="preserve">
+    <value>Compre-me um café :)</value>
+  </data>
 </root>
diff --git a/Volumey/Resources/Resources.resx b/Volumey/Resources/Resources.resx
@@ -111,4 +111,7 @@
   <data name="Settings_AppsHotkeys" xml:space="preserve">
     <value />
   </data>
+  <data name="Settings_Tip" xml:space="preserve">
+    <value></value>
+  </data>
 </root>
diff --git a/Volumey/Resources/Resources.ru.resx b/Volumey/Resources/Resources.ru.resx
@@ -154,4 +154,7 @@
   <data name="Settings_AppsHotkeys" xml:space="preserve">
     <value>Хоткеи для приложений</value>
   </data>
+  <data name="Settings_Tip" xml:space="preserve">
+    <value>Купите мне кофе :)</value>
+  </data>
 </root>
diff --git a/Volumey/Resources/Resources.tr.resx b/Volumey/Resources/Resources.tr.resx
@@ -151,4 +151,7 @@
   <data name="TrayMenu_SoundSettings" xml:space="preserve">
     <value>Ses ayarları</value>
   </data>
+  <data name="Settings_Tip" xml:space="preserve">
+    <value>Bana bir kahve ısmarla :)</value>
+  </data>
 </root>
diff --git a/Volumey/Resources/Resources.zh.resx b/Volumey/Resources/Resources.zh.resx
@@ -154,4 +154,7 @@
   <data name="Settings_VolumeLimit" xml:space="preserve">
     <value>限制启动的应用程序量（如果为100％）</value>
   </data>
+  <data name="Settings_Tip" xml:space="preserve">
+    <value>给我买杯咖啡:)</value>
+  </data>
 </root>
diff --git a/Volumey/View/Converters/ButtonIconThemeConverter.cs b/Volumey/View/Converters/ButtonIconThemeConverter.cs
@@ -0,0 +1,63 @@
+using System;
+using System.Globalization;
+using System.Windows.Data;
+using System.Windows.Media.Imaging;
+using Volumey.DataProvider;
+
+namespace Volumey.View.Converters
+{
+	public class ButtonIconThemeConverter : IMultiValueConverter
+	{
+		private BitmapImage mug;
+		private BitmapImage MugIcon => mug ??= App.Current.FindResource("Mug") as BitmapImage;
+
+		private BitmapImage mugEmpty;
+		private BitmapImage MugEmptyIcon => mugEmpty ??= App.Current.FindResource("MugEmpty") as BitmapImage;
+
+		private BitmapImage mugDark;
+		private BitmapImage MugIconDark => mugDark ??= App.Current.FindResource("MugDark") as BitmapImage;
+
+		private BitmapImage mugEmptyDark;
+		private BitmapImage MugEmptyIconDark => mugEmptyDark ??= App.Current.FindResource("MugEmptyDark") as BitmapImage;
+
+		private BitmapImage lightGit;
+		private BitmapImage LightGitIcon => lightGit ??= App.Current.FindResource("GitHub") as BitmapImage;
+
+		private BitmapImage darkGit;
+		private BitmapImage DarkGitIcon => darkGit ??= App.Current.FindResource("GitHubDark") as BitmapImage;
+
+		public object Convert(object[] values, Type targetType, object parameter, CultureInfo culture)
+		{
+			try
+			{
+				var theme = AppTheme.Light;
+				if(values[0] is AppTheme selectedTheme)
+				{
+					if(selectedTheme == AppTheme.System && values[1] is AppTheme windowsTheme)
+						theme = windowsTheme;
+					else
+						theme = selectedTheme;
+				}
+
+				if(parameter.Equals("Mug") && values[2] is bool isMouseOver)
+					return GetMugIcon(theme, isMouseOver);
+				if(parameter.Equals("Git"))
+					return theme == AppTheme.Dark ? LightGitIcon : DarkGitIcon;
+			}
+			catch { }
+			return Binding.DoNothing;
+		}
+
+		private BitmapImage GetMugIcon(AppTheme theme, bool isMouseOver)
+			=> theme == AppTheme.Dark ? GetLightMugIcon(isMouseOver) : GetDarkMugIcon(isMouseOver);
+
+		private BitmapImage GetDarkMugIcon(bool isMouseOver)
+			=> isMouseOver ? MugIconDark : MugEmptyIconDark;
+
+		private BitmapImage GetLightMugIcon(bool isMouseOver)
+			=> isMouseOver ? MugIcon : MugEmptyIcon;
+
+		public object[] ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture)
+			=> new object[] { };
+	}
+}
diff --git a/Volumey/View/MainView.xaml b/Volumey/View/MainView.xaml
@@ -202,10 +202,11 @@
             </ui:NavigationView.MenuItems>
 
             <ui:Frame
-                x:Name="ContentFrame"/>
+                x:Name="ContentFrame"
+                Margin="0 0 0 7"/>
 
             <ui:NavigationView.Resources>
-                <!-- override defualt NavigationView resource -->
+                <!-- override default NavigationView resource -->
                 <SolidColorBrush x:Key="NavigationViewTopPaneBackground" Color="Transparent" />
             </ui:NavigationView.Resources>
         </ui:NavigationView>

diff --git a/Volumey/View/SessionsListView.xaml b/Volumey/View/SessionsListView.xaml
@@ -11,8 +11,7 @@
     <ItemsControl
         x:Name="ItemsControl"
         ItemsSource="{Binding SelectedDevice.Sessions}"
-        Width="Auto"
-        Margin="0 0 0 10">
+        Width="Auto">
         <ItemsControl.ItemTemplate>
             <DataTemplate>
                 <Grid