WeCode 2.2 RC3

Merge pull request #10 from patrick330602/test
wedotstudio · Jul 22, 2016 · bebf556 · bebf556
2 parents 1003678 + ea336dd
commit bebf556
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 11 deletions.
diff --git a/Developer Hub For UWP/App.xaml.cs b/Developer Hub For UWP/App.xaml.cs
@@ -44,7 +44,7 @@ protected override void OnActivated(IActivatedEventArgs args)
                 switch(arg[1])
                 {
                     case "disableNoti":
-                        _localSettings.Containers["Settings"].Values["IsUpdatePopupIgnored"] = true;
+                        _localSettings.Containers["Settings"].Values["IsUpdatePopupDisabled"] = true;
                         break;
                 }
                 // Navigate accordingly

diff --git a/Developer Hub For UWP/Pages/Browser.xaml b/Developer Hub For UWP/Pages/Browser.xaml
@@ -24,9 +24,9 @@
             </Grid>
             <Grid Margin="20,20,0,20">
                 <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="Auto"/>
-                    <ColumnDefinition Width="Auto"/>
-                    <ColumnDefinition Width="Auto"/>
+                    <ColumnDefinition Width="150"/>
+                    <ColumnDefinition Width="*"/>
+                    <ColumnDefinition Width="40"/>
 
                 </Grid.ColumnDefinitions>
                 <Grid.RowDefinitions>

diff --git a/Developer Hub For UWP/Pages/SettingsPage.xaml.cs b/Developer Hub For UWP/Pages/SettingsPage.xaml.cs
@@ -17,6 +17,7 @@ public SettingsPage()
 
             bool PopupDisabled = Convert.ToBoolean(_localSettings.Containers["Settings"].Values["IsUpdatePopupDisabled"]);
             txt.IsOn = PopupDisabled;
+            txt.Header = loader.GetString("IsUpdatePopupDisabled");
             txt.OnContent = loader.GetString("on");
             txt.OffContent = loader.GetString("off");
         }

diff --git a/Developer Hub For UWP/Shell.xaml.cs b/Developer Hub For UWP/Shell.xaml.cs
@@ -58,32 +58,30 @@ public Shell()
             // select the first top item
             vm.SelectedItem = vm.TopItems.First();
             this.ViewModel = vm;
-
+            //if new download
             if (!_localSettings.Containers.ContainsKey("Settings"))
             {
                 ApplicationDataContainer container = _localSettings.CreateContainer("Settings", ApplicationDataCreateDisposition.Always);
-                _localSettings.Containers["Settings"].Values["IsUpdatePopupIgnored"] = false;
                 _localSettings.Containers["Settings"].Values["IsUpdatePopupDisabled"] = false;
                 _localSettings.Containers["Settings"].Values["IsFonticonExtraFileDownloaded"] = false;
                 _localSettings.Containers["Settings"].Values["Version"] = "020200";
 
                 DelLegacyHistory();
                 TransferToStorage();
             }
+            //if update
             else if(_localSettings.Containers["Settings"].Values["Version"] != "020200")
             {
                 _localSettings.Containers["Settings"].Values["Version"] = "020200";
-                _localSettings.Containers["Settings"].Values["IsUpdatePopupIgnored"] = false;
+                _localSettings.Containers["Settings"].Values["IsUpdatePopupDisabled"] = false;
             }
+            // whether the internet is connected.
             var conetvty = NetworkInformation.GetInternetConnectionProfile().GetNetworkConnectivityLevel();
             bool PopIgnored = Convert.ToBoolean(_localSettings.Containers["Settings"].Values["IsUpdatePopupIgnored"]);
             bool PopupDisabled = Convert.ToBoolean(_localSettings.Containers["Settings"].Values["IsUpdatePopupDisabled"]);
             if (conetvty == NetworkConnectivityLevel.InternetAccess)
             {
-                if (!PopupDisabled)
-                {
-                    if(!PopIgnored) CheckUpdate();
-                }
+                if (!PopupDisabled) CheckUpdate();
                 UpdateInsidetenApi();
             }           
 

diff --git a/Developer Hub For UWP/Strings/en-US/Resources.resw b/Developer Hub For UWP/Strings/en-US/Resources.resw
@@ -450,4 +450,7 @@
   <data name="on" xml:space="preserve">
     <value>On</value>
   </data>
+  <data name="IsUpdatePopupDisabled" xml:space="preserve">
+    <value>Do not Prompt Update Notification</value>
+  </data>
 </root>
diff --git a/Developer Hub For UWP/Strings/zh-Hans/Resources.resw b/Developer Hub For UWP/Strings/zh-Hans/Resources.resw
@@ -450,4 +450,7 @@
   <data name="on" xml:space="preserve">
     <value>启用</value>
   </data>
+  <data name="IsUpdatePopupDisabled" xml:space="preserve">
+    <value>不再彈出更新提示</value>
+  </data>
 </root>
diff --git a/Developer Hub For UWP/Strings/zh-Hant/Resources.resw b/Developer Hub For UWP/Strings/zh-Hant/Resources.resw
@@ -451,4 +451,7 @@ Fuzzy</comment>
   <data name="on" xml:space="preserve">
     <value>開啟</value>
   </data>
+  <data name="IsUpdatePopupDisabled" xml:space="preserve">
+    <value>不再弹出更新提示提醒</value>
+  </data>
 </root>