v1.6.9.0

Guerra24 · Aug 23, 2021 · 06dec4e · 06dec4e
1 parent fc10abb
commit 06dec4e
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 13 deletions.
diff --git a/LRReader.UWP/Package.appxmanifest b/LRReader.UWP/Package.appxmanifest
@@ -10,7 +10,7 @@
   <Identity
     Name="63705Guerra24.LRReader"
     Publisher="CN=690E488B-1B49-4006-8D8D-14F81EFE17C5"
-    Version="1.6.8.0" />
+    Version="1.6.9.0" />
 
   <mp:PhoneIdentity PhoneProductId="eccfefd4-5961-4ad1-894e-3000dc4fe01a" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
 

diff --git a/LRReader.UWP/Strings/en/Settings.resw b/LRReader.UWP/Strings/en/Settings.resw
@@ -483,4 +483,7 @@
   <data name="Reader.CustomBackground.Title" xml:space="preserve">
     <value>Background color</value>
   </data>
+  <data name="FeedbackPage.Description" xml:space="preserve">
+    <value>Changes and feature requests</value>
+  </data>
 </root>
diff --git a/LRReader.UWP/Strings/es/Settings.resw b/LRReader.UWP/Strings/es/Settings.resw
@@ -483,4 +483,7 @@
   <data name="Reader.CustomBackground.Title" xml:space="preserve">
     <value>Color de fondo</value>
   </data>
+  <data name="FeedbackPage.Description" xml:space="preserve">
+    <value>Cambios y solicitudes de características</value>
+  </data>
 </root>
diff --git a/LRReader.UWP/Views/Content/Settings/Main.xaml b/LRReader.UWP/Views/Content/Settings/Main.xaml
@@ -33,24 +33,24 @@
 					</controls:ModernInput.Tag>
 				</controls:ModernInput>
 				<controls:ModernInput
-					x:Uid="/Settings/UpdatesPage" Click="PageButton_Click" Glyph="&#xE895;"
+					x:Uid="/Settings/FeedbackPage" Click="PageButton_Click" Glyph="&#xED15;"
 					IsButton="True" RightGlyph="&#xE76C;">
 					<controls:ModernInput.Tag>
-						<controls:ModernPageTabItem x:Uid="/Settings/UpdatesPage" Page="local:Updates" />
+						<controls:ModernPageTabItem x:Uid="/Settings/FeedbackPage" Page="local:Feedback" />
 					</controls:ModernInput.Tag>
 				</controls:ModernInput>
 				<controls:ModernInput
-					x:Uid="/Settings/AboutPage" Click="PageButton_Click" Glyph="&#xE946;"
-					IsButton="True" RightGlyph="&#xE76C;">
+					x:Name="Updates" x:Uid="/Settings/UpdatesPage" Click="PageButton_Click"
+					Glyph="&#xE895;" IsButton="True" RightGlyph="&#xE76C;">
 					<controls:ModernInput.Tag>
-						<controls:ModernPageTabItem x:Uid="/Settings/AboutPage" Page="local:About" />
+						<controls:ModernPageTabItem x:Uid="/Settings/UpdatesPage" Page="local:Updates" />
 					</controls:ModernInput.Tag>
 				</controls:ModernInput>
 				<controls:ModernInput
-					x:Uid="/Settings/FeedbackPage" Click="PageButton_Click" Glyph="&#xED15;"
+					x:Uid="/Settings/AboutPage" Click="PageButton_Click" Glyph="&#xE946;"
 					IsButton="True" RightGlyph="&#xE76C;">
 					<controls:ModernInput.Tag>
-						<controls:ModernPageTabItem x:Uid="/Settings/FeedbackPage" Page="local:Feedback" />
+						<controls:ModernPageTabItem x:Uid="/Settings/AboutPage" Page="local:About" />
 					</controls:ModernInput.Tag>
 				</controls:ModernInput>
 			</controls:ModernGroup>

diff --git a/LRReader.UWP/Views/Content/Settings/Main.xaml.cs b/LRReader.UWP/Views/Content/Settings/Main.xaml.cs
@@ -8,6 +8,9 @@ public sealed partial class Main : ModernBasePage
 		public Main()
 		{
 			this.InitializeComponent();
+#if !SIDELOAD
+			Updates.IsEnabled = false;
+#endif
 		}
 
 	}

diff --git a/LRReader.UWP/Views/Content/Settings/Updates.xaml b/LRReader.UWP/Views/Content/Settings/Updates.xaml
@@ -17,7 +17,7 @@
 
 	<ScrollViewer x:Name="ScrollViewer" Padding="10,0" VerticalScrollBarVisibility="Auto">
 		<StackPanel Width="{x:Bind ScrollViewer.ViewportWidth, Mode=OneWay}" MaxWidth="1000" HorizontalAlignment="Center">
-			<controls:ModernGroup x:Name="UpdateInfo" Visibility="Collapsed">
+			<controls:ModernGroup>
 				<controls:ModernInput x:Uid="/Settings/Updates/NotFound" Glyph="&#xE895;" Visibility="{x:Bind Data.ShowReleaseInfo, Mode=OneWay, Converter={StaticResource NegateBoolToVisibilityConverter}}">
 					<Button x:Uid="/Settings/Updates/Check" Click="CheckUpdatesButton_Click" />
 				</controls:ModernInput>

diff --git a/LRReader.UWP/Views/Content/Settings/Updates.xaml.cs b/LRReader.UWP/Views/Content/Settings/Updates.xaml.cs
@@ -16,9 +16,6 @@ public Updates()
 		{
 			this.InitializeComponent();
 			Data = DataContext as SettingsPageViewModel;
-#if SIDELOAD
-			UpdateInfo.Visibility = Visibility.Visible;
-#endif
 		}
 
 		private void CheckUpdatesButton_Click(object sender, RoutedEventArgs e)

diff --git a/Util/Package.appxmanifest b/Util/Package.appxmanifest
@@ -10,7 +10,7 @@
   <Identity
     Name="Guerra24.LRReader"
     Publisher="CN=Guerra24, O=Guerra24, C=GT"
-    Version="1.6.8.0" />
+    Version="1.6.9.0" />
 
   <mp:PhoneIdentity PhoneProductId="97639259-a9d5-4784-8ec1-a88609560ca7" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>