Last update

wedotstudio · Mar 30, 2018 · 04a4d49 · 04a4d49
1 parent fa5d505
commit 04a4d49
Show file tree

Hide file tree

Showing 7 changed files with 442 additions and 15 deletions.
diff --git a/WeCode-Next/Core/Base.cs b/WeCode-Next/Core/Base.cs
@@ -7,8 +7,6 @@ namespace WeCode_Next.Core
 {
     public class Base
     {
-        public const String VERSION = "0506";
-
         public async static Task<bool> IsFilePresent(string fileName)
         {
             var item = await ApplicationData.Current.LocalFolder.TryGetItemAsync(fileName);

diff --git a/WeCode-Next/MainPage.xaml.cs b/WeCode-Next/MainPage.xaml.cs
@@ -28,7 +28,7 @@ public MainPage()
 
             InitializeUI();
             InitializeList();
-            CheckUpdateAsync();
+            //CheckUpdateAsync();
 
             Loaded += MainPage_Loaded;
         }
@@ -104,7 +104,7 @@ private void InitializeList()
 
             List<Nav> BottomNavList = new List<Nav>
             {
-                new Nav { Icon = "", Name = "Donation", PageType = typeof(Donation) },
+                //new Nav { Icon = "", Name = "Donation", PageType = typeof(Donation) },
                 new Nav { Icon = "", Name = "Settings & About", PageType = typeof(Settings) }
             };
            bottom_view.ItemsSource = BottomNavList;
@@ -137,7 +137,7 @@ private void InitializeFrostedGlass(UIElement glassHost)
             bindSizeAnimation.SetReferenceParameter("hostVisual", hostVisual);
             glassVisual.StartAnimation("Size", bindSizeAnimation);
         }
-        private async Task CheckUpdateAsync()
+        /*private async Task CheckUpdateAsync()
         {
             try
             {
@@ -161,7 +161,7 @@ private async Task CheckUpdateAsync()
             {
 
             }
-        }
+        }*/
         private void ItemClick(object sender, ItemClickEventArgs e)
         {
             if (bottom_view.SelectedIndex >= 0) bottom_view.SelectedIndex = -1;

diff --git a/WeCode-Next/Package.appxmanifest b/WeCode-Next/Package.appxmanifest
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Package xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10" xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest" xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" IgnorableNamespaces="uap mp">
-  <Identity Name="56367PatrickWu.DeveloperToolsForUWP" Publisher="CN=C71A2322-7B67-48A9-A85E-8DDCE68FA3A7" Version="5.5.0.0" />
+  <Identity Name="56367PatrickWu.DeveloperToolsForUWP" Publisher="CN=C71A2322-7B67-48A9-A85E-8DDCE68FA3A7" Version="5.6.0.0" />
   <mp:PhoneIdentity PhoneProductId="94d738ad-a91a-49e4-a981-6725bba3b597" PhonePublisherId="00000000-0000-0000-0000-000000000000" />
   <Properties>
     <DisplayName>UWP DevKit</DisplayName>

diff --git a/WeCode-Next/Package.xml b/WeCode-Next/Package.xml
diff --git a/WeCode-Next/Pages/Settings.xaml b/WeCode-Next/Pages/Settings.xaml
@@ -60,6 +60,27 @@
                             </DataTemplate>
                         </HyperlinkButton.ContentTemplate>
                     </HyperlinkButton>
+                    <TextBlock Text="Donation" Style="{StaticResource TitleTextBlockStyle}" Margin="10" />
+                    <TextBlock Margin="10,5" IsTextSelectionEnabled="True" TextWrapping="WrapWholeWords">
+                        <Run Text="This app is completely free, but you can support my work via WeChat Pay(微信支付), Alipay(支付宝) or Paypal. Your support will keep motivating me to improve the product."/>
+                    </TextBlock>
+                    <StackPanel Orientation="Horizontal"  Margin="10,5">
+                        <HyperlinkButton NavigateUri="https://www.paypal.me/callmepk" Margin="0,0,10,0">Paypal</HyperlinkButton>
+                        <HyperlinkButton Click="HyperlinkButton_Click"  Margin="0,0,10,0">WeChat Pay(微信支付)
+                            <FlyoutBase.AttachedFlyout>
+                                <Flyout>
+                                    <Image Width="300" Source="../Assets/wechatpay.jpg"/>
+                                </Flyout>
+                            </FlyoutBase.AttachedFlyout>
+                        </HyperlinkButton>
+                        <HyperlinkButton Click="HyperlinkButton_Click_1">Alipay(支付宝)
+                            <FlyoutBase.AttachedFlyout>
+                                <Flyout>
+                                    <Image Width="300" Source="../Assets/alipay.jpg"/>
+                                </Flyout>
+                            </FlyoutBase.AttachedFlyout>
+                        </HyperlinkButton>
+                    </StackPanel>
                     <TextBlock Text="About" Style="{StaticResource TitleTextBlockStyle}" Margin="10" />
                     <controls:MarkdownTextBlock x:Name="MarkdownText" Margin="10" LinkForeground="{ThemeResource SystemControlBackgroundAccentBrush}" LinkClicked="MarkdownText_LinkClicked"/>
                 </StackPanel>

diff --git a/WeCode-Next/Pages/Settings.xaml.cs b/WeCode-Next/Pages/Settings.xaml.cs
@@ -144,5 +144,14 @@ private async void CommandInvokedHandler(IUICommand command)
                 await messageDialog.ShowAsync();
             }
         }
+        private void HyperlinkButton_Click(object sender, RoutedEventArgs e)
+        {
+            FlyoutBase.ShowAttachedFlyout((FrameworkElement)sender);
+        }
+
+        private void HyperlinkButton_Click_1(object sender, RoutedEventArgs e)
+        {
+            FlyoutBase.ShowAttachedFlyout((FrameworkElement)sender);
+        }
     }
 }
diff --git a/WeCode-Next/WeCode-Next.csproj b/WeCode-Next/WeCode-Next.csproj
@@ -188,14 +188,30 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="Package.StoreAssociation.xml" />
-    <Content Include="Assets\Icons\ag.png" />
-    <Content Include="Assets\Icons\bf.png" />
-    <Content Include="Assets\Icons\ds.png" />
-    <Content Include="Assets\Icons\fb.png" />
-    <Content Include="Assets\Icons\re.png" />
-    <Content Include="Assets\Icons\rgg.png" />
-    <Content Include="Assets\Icons\ul.png" />
-    <Content Include="Assets\Icons\wb.png" />
+    <Content Include="Assets\Icons\ag.png">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Assets\Icons\bf.png">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Assets\Icons\ds.png">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Assets\Icons\fb.png">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Assets\Icons\re.png">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Assets\Icons\rgg.png">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Assets\Icons\ul.png">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Assets\Icons\wb.png">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
     <Content Include="Assets\LargeTile.scale-100.png" />
     <Content Include="Assets\LargeTile.scale-125.png" />
     <Content Include="Assets\LargeTile.scale-150.png" />
@@ -244,6 +260,7 @@
     <Content Include="Assets\Wide310x150Logo.scale-150.png" />
     <Content Include="Assets\Wide310x150Logo.scale-200.png" />
     <Content Include="Assets\Wide310x150Logo.scale-400.png" />
+    <None Include="Package.xml" />
     <Content Include="Properties\Default.rd.xml" />
   </ItemGroup>
   <ItemGroup>