Merge pull request #16 from Panda-Sharp/develop

Develop
Yugen-Apps · Aug 31, 2021 · 4b7b55d · 4b7b55d
2 parents a48be48 + b1ce905
commit 4b7b55d
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 12 deletions.
diff --git a/Yugen.DJ.Uwp/Strings/en-US/Resources.resw b/Yugen.DJ.Uwp/Strings/en-US/Resources.resw
@@ -117,6 +117,21 @@
 	<resheader name="writer">
 		<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
 	</resheader>
+	<data name="AboutHeaderTextBlock.Text" xml:space="preserve">
+		<value>Getting Started</value>
+	</data>
+	<data name="AboutSubHeaderTextBlock.Text" xml:space="preserve">
+		<value>Click the Eject button to load an mp3, if you have a second sound card you can hear a song clicking the headphones button, enjoy!</value>
+	</data>
+	<data name="AboutStatusTextBlock.Text" xml:space="preserve">
+		<value>The app is still not complete, for example it miss the scratch effect when you rotate the vinyl.</value>
+	</data>
+	<data name="AboutGitHubHyperlink.Content" xml:space="preserve">
+		<value>Feel free to help and collaborate, the project is open source on GH</value>
+	</data>
+	<data name="AboutGitHubHyperlink.NavigateUri" xml:space="preserve">
+		<value>https://github.com/Panda-Sharp/Yugen.DJ</value>
+	</data>
 	<data name="AboutLaunch2021TextBlock.Text" xml:space="preserve">
 		<value>Proudly part of Launch 2021</value>
 	</data>
@@ -127,7 +142,7 @@
 		<value>https://uwpcommunity.com/</value>
 	</data>
 	<data name="AboutDevelopedByHyperlink.Content" xml:space="preserve">
-		<value>Developed by PandaSharp</value>
+		<value>Developed By PandaSharp</value>
 	</data>
 	<data name="AboutDevelopedByHyperlink.NavigateUri" xml:space="preserve">
 		<value>http://www.yugenapps.com</value>
@@ -138,12 +153,6 @@
 	<data name="AboutDesignHyperlink.NavigateUri" xml:space="preserve">
 		<value>https://twitter.com/zeealeid</value>
 	</data>
-	<data name="AboutGitHubHyperlink.Content" xml:space="preserve">
-		<value>Feel free to help and collaborate, the project is open source on GH</value>
-	</data>
-	<data name="AboutGitHubHyperlink.NavigateUri" xml:space="preserve">
-		<value>https://github.com/Panda-Sharp/Yugen.DJ</value>
-	</data>
 	<data name="SettingsHeaderTextBlock.Text" xml:space="preserve">
 		<value>The app already support 2 audio cards, but the option to change them will come soon!</value>
 	</data>

diff --git a/Yugen.DJ.Uwp/Views/AboutDialog.xaml b/Yugen.DJ.Uwp/Views/AboutDialog.xaml
@@ -8,14 +8,35 @@
                SecondaryButtonText="Close">
 
     <StackPanel Spacing="4">
+
+        <TextBlock x:Uid="AboutHeaderTextBlock"
+                   FontWeight="Bold"
+                   HorizontalAlignment="Center"
+                   Margin="0,8,0,0"
+                   TextWrapping="WrapWholeWords"/>
+
+        <TextBlock x:Uid="AboutSubHeaderTextBlock"
+                   HorizontalAlignment="Center"
+                   Margin="0,4,0,0"
+                   TextWrapping="WrapWholeWords"/>
+
+        <TextBlock x:Uid="AboutStatusTextBlock"
+                   HorizontalAlignment="Center"
+                   Margin="0,8,0,0"
+                   TextWrapping="WrapWholeWords"/>
+
+        <HyperlinkButton x:Uid="AboutGitHubHyperlink"
+                         FontStyle="Italic"
+                         Margin="0,-4,0,0" />
+
         <Image Margin="0,16,0,0"
                Source="ms-appx:///Assets/Images/UWPCommunity.gif"
                Stretch="Uniform"
                Width="60" />
 
         <TextBlock x:Uid="AboutLaunch2021TextBlock"
-                   HorizontalAlignment="Center"
                    FontWeight="Bold"
+                   HorizontalAlignment="Center"
                    Margin="0,8,0,0"/>
 
         <HyperlinkButton x:Uid="AboutUwpCommunityHyperlink"
@@ -27,9 +48,5 @@
         <HyperlinkButton x:Uid="AboutDesignHyperlink"
                          FontStyle="Italic"
                          Margin="0,-4,0,0" />
-
-        <HyperlinkButton x:Uid="AboutGitHubHyperlink"
-                         FontStyle="Italic"
-                         Margin="0,-4,0,0" />
     </StackPanel>
 </ContentDialog>
diff --git a/Yugen.Toolkit.Uwp.Audio.Controls/Vinyl.xaml.cs b/Yugen.Toolkit.Uwp.Audio.Controls/Vinyl.xaml.cs
@@ -22,7 +22,12 @@ public sealed partial class Vinyl : UserControl
 
         private VinylRenderer _vinylRenderer;
         private TouchPointsRenderer _touchPointsRenderer = new TouchPointsRenderer();
+
+#if DEBUG
         private bool _debug = true;
+#else
+        private bool _debug = false;
+#endif
 
         public Vinyl()
         {