Assembly v 7.4 (16.06.24)

adslbarxatov · Jun 16, 2024 · 0d10814 · 0d10814
1 parent 93d9885
commit 0d10814
Show file tree

Hide file tree

Showing 27 changed files with 438 additions and 417 deletions.
diff --git a/.github/workflows/Release.yaml b/.github/workflows/Release.yaml
@@ -16,7 +16,7 @@ jobs:
 # Константы, используемые далее по тексту
     env:
       PROJ: ${{ github.event.repository.name }}
-      TAG: '7.3.6'
+      TAG: '7.4'
 
     steps:
 # Проверка состава репозитория (без анализа, как может показаться)

diff --git a/.release/Release.md b/.release/Release.md
@@ -1,10 +1,10 @@
-_Changes for v 7.3.6_:
-- `Windows`: implemented the new App about interface';
-- Settings storage has been updated (may require some adjustments);
-- Updated the help and support links;
-- `Android`: probably fixed the bug with freezing touchscreen;
-- `Android`: adjusted the appearance of the main log;
+_Changes for v 7.4_:
+- `Android`: fixed some minor interface bugs;
+- `Windows`: fixed some minor interface bugs;
 - `GMJ`: the skip list has been updated;
-- `Android`: added the extra tips for the first app start;
-- `Android`: added the reset button for the set of help tips;
-- `Windows`: application retargeted to `.NET Framework 4.8.1`
+- `Android`: app has been translated to `NET80 / MAUI` platform:
+    - App now has unified Android navigation shell;
+- `Android`: app has been adapted to `Android 14` (API 34);
+- `Windows`: implemented the new App about interface;
+- Settings storage has been updated (may require some adjustments);
+- Updated the help and support links
diff --git a/.release/TablepediaNotifier.apk b/.release/TablepediaNotifier.apk
diff --git a/.release/UniNotifier.apk b/.release/UniNotifier.apk
diff --git a/.release/UniNotifier.exe b/.release/UniNotifier.exe
diff --git a/.release/UniNotifier_en_us.html b/.release/UniNotifier_en_us.html
@@ -0,0 +1,27 @@
+<html charset='utf-8'>
+<head>
+<title>uNot: the home page | UniNotifier</title>
+</head>
+
+<body>
+
+<h1 id="unot-the-home-page">uNot: the home page</h1>
+<p><strong>ƒ</strong>  RD AAOW FDL; 30.01.2024; 2:48</p>
+
+<p><em><strong>uNot</strong></em> (formerly know as UniNotifier) is the web resources supervisor service.
+This app provides the ability to be notified when the content of user-specified websites changes.
+In other words, about updates on them, which will be presented in the form of a text log. Only what the user
+has specified is loaded – all other objects (including ads) are ignored.</p>
+<p>What does it offer?</p>
+<ul>
+<li>The <em>settings section</em> allows you to manage and design notifications.</li>
+<li>The <em>main log</em> provides a view of changes, access to source webpages from which they were received, and the ability to share them.</li>
+<li>A <em>static service notification</em> will inform you about the presence of new changes received in the background.</li>
+</ul>
+<hr />
+<p>More info you can find in <a href="https://youtu.be/nOb4MbL-jlI">this video guide</a>.</p>
+<p>The description for the data processing concept used in <em><strong>Grammar must joy</strong></em> project you can also find
+<a href="https://adslbarxatov.github.io/UniNotifier/GMJ_en">on its own page</a>.</p>
+
+</body>
+</html>
diff --git a/.release/UniNotifier_ru_ru.html b/.release/UniNotifier_ru_ru.html
@@ -0,0 +1,27 @@
+<html charset='utf-8'>
+<head>
+<title>uNot: the home page | UniNotifier</title>
+</head>
+
+<body>
+
+<h1 id="unot-the-home-page">uNot: the home page</h1>
+<p><strong>ƒ</strong>  RD AAOW FDL; 30.01.2024; 2:46</p>
+
+<p><em><strong>uNot</strong></em> (ранее известный как UniNotifier) – служба наблюдения за состоянием веб-ресурсов.
+Это приложение предоставляет возможность получать уведомления об изменении состояния указанных пользователем
+веб-сайтов. Другими словами, об обновлениях, происходящих на них, которые представляются в виде текстового журнала.
+Загружается только то, что указал пользователь – все остальные объекты (включая рекламу) игнорируются.</p>
+<p>Что оно предлагает?</p>
+<ul>
+<li><em>Раздел настроек</em> позволяет управлять уведомлениями и конструировать их.</li>
+<li><em>Главный журнал</em> обеспечивает просмотр изменений, переход на исходные веб-страницы, с которых они были получены, и возможность ими поделиться.</li>
+<li><em>Закреплённое служебное оповещение</em> будет сообщать о наличии непрочитанных изменений, полученных в фоновом режиме</li>
+</ul>
+<hr />
+<p>Больше информации Вы сможете найти в <a href="https://youtu.be/gjs9K1EsFG8">этом видеоруководстве</a>.</p>
+<p>Информация о дополнении <em><strong>Grammar must joy</strong></em> теперь также доступна на <a href="https://adslbarxatov.github.io/UniNotifier/GMJ">отдельной странице</a>.</p>
+<p>Информация о проекте <em><strong>Tablepedia notifier</strong></em> располагается на <a href="https://adslbarxatov.github.io/UniNotifier/TPNot">здесь</a></p>
+
+</body>
+</html>
diff --git a/Changes.log b/Changes.log
@@ -1,5 +1,13 @@
 uNot: changes log
 
+Version 7.4:
+• Android: fixed some minor interface bugs;
+• Windows: fixed some minor interface bugs;
+• GMJ: the skip list has been updated;
+• Android: app has been translated to NET80 / MAUI platform:
+  - App now has unified Android navigation shell;
+• Android: app has been adapted to Android 14 (API 34)
+
 Version 7.3.6:
 • Windows: implemented the new App about interface
 

diff --git a/src/SettingsForm.cs b/src/SettingsForm.cs
@@ -117,7 +117,23 @@ private void SettingsForm_FormClosing (object sender, FormClosingEventArgs e)
 
 			// Закрытие окна
 			ProgramDescription.ShowTip (NSTipTypes.ServiceLaunchTip);
+
+			completeUpdate = RDGenerics.LocalizedMessageBox (RDMessageTypes.Question_Center, "RecallAllNews",
+				RDLDefaultTexts.Button_YesNoFocus, RDLDefaultTexts.Button_No) ==
+				RDMessageButtons.ButtonOne;
+			}
+
+		/// <summary>
+		/// Возвращает флаг полного опроса оповещений
+		/// </summary>
+		public bool CompleteUpdate
+			{
+			get
+				{
+				return completeUpdate;
+				}
 			}
+		private bool completeUpdate = false;
 
 		// Загрузка значений в поля
 		private void NotificationsList_Select (object sender, EventArgs e)

diff --git a/src/UniNotifierForm.cs b/src/UniNotifierForm.cs
@@ -16,15 +16,15 @@ public partial class UniNotifierForm: Form
 		private NotifyIcon ni = new NotifyIcon ();
 		private bool callWindowOnUrgents = false;
 		private bool allowExit = false;
-		private string[] regParameters = new string[] {
+		/*private string[] regParameters = new string[] {
 			"Left",
 			"Top",
 			"Width",
 			"Height",
 			"Read",
 			"CallOnUrgents",
 			"FontSize",
-			};
+			};*/
 
 		private NotificationsSet ns = new NotificationsSet (true);
 		private List<string> texts = new List<string> ();
@@ -59,13 +59,6 @@ public UniNotifierForm (bool HideWindow)
 
 			// Получение настроек
 			RDGenerics.LoadWindowDimensions (this);
-			/*try
-				{
-				this.ReadMode.Checked = bool.Parse (RDGenerics.GetAppSettingsValue (regParameters[4]));
-				callWindowOnUrgents = bool.Parse (RDGenerics.GetAppSettingsValue (regParameters[5]));
-				this.FontSizeField.Value = decimal.Parse (RDGenerics.GetAppSettingsValue (regParameters[6]));
-				}
-			catch { }*/
 			ReadMode.Checked = RDGenerics.GetSettings (readPar, false);
 			callWindowOnUrgents = RDGenerics.GetSettings (callWindowOnUrgentsPar, false);
 			try
@@ -299,8 +292,9 @@ private void ShowSettings (object sender, EventArgs e)
 
 			// Запоминание настроек
 			callWindowOnUrgents = sf.CallWindowOnUrgents;
-			/*RDGenerics.SetAppSettingsValue (regParameters[5], callWindowOnUrgents.ToString ());*/
 			RDGenerics.SetSettings (callWindowOnUrgentsPar, callWindowOnUrgents);
+
+			bool complete = sf.CompleteUpdate;
 			sf.Dispose ();
 
 			// Обработка случая закрытия основного окна из трея
@@ -320,10 +314,6 @@ private void ShowSettings (object sender, EventArgs e)
 				ni.ContextMenu.MenuItems[3].Text = RDLocale.GetText ("MainMenuOption05");
 
 			// Перезапуск
-			bool complete = (RDGenerics.LocalizedMessageBox (RDMessageTypes.Question_Center, "RecallAllNews",
-				RDLDefaultTexts.Button_YesNoFocus, RDLDefaultTexts.Button_No) ==
-				RDMessageButtons.ButtonOne);
-
 			ns.ResetTimer (complete);   // Раньше имел смысл обязательный полный сброс. Теперь это уже неактуально
 			MainTimer.Enabled = true;
 			}
@@ -362,7 +352,6 @@ private void ReadMode_CheckedChanged (object sender, EventArgs e)
 				}
 
 			// Запоминание
-			/*RDGenerics.SetAppSettingsValue (regParameters[4], ReadMode.Checked.ToString ());*/
 			RDGenerics.SetSettings (readPar, ReadMode.Checked);
 			}
 		private const string readPar = "Read";
@@ -419,8 +408,7 @@ private void GetGMJ_Click (object sender, EventArgs e)
 		private void FontSizeField_ValueChanged (object sender, EventArgs e)
 			{
 			MainText.Font = new Font (MainText.Font.FontFamily, (float)FontSizeField.Value);
-			/*RDGenerics.SetAppSettingsValue (regParameters[6], this.FontSizeField.Value.ToString ());**/
-			RDGenerics.SetSettings (fontSizePar, (uint)(FontSizeField.Value*10.0m));
+			RDGenerics.SetSettings (fontSizePar, (uint)(FontSizeField.Value * 10.0m));
 			}
 		private const string fontSizePar = "FontSize";
 		}

diff --git a/src/android/AboutPage.xaml b/src/android/AboutPage.xaml
@@ -1,53 +1,49 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<ContentPage xmlns="http://xamarin.com/schemas/2014/forms"
+<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="RD_AAOW.AboutPage">
 
-	<StackLayout>
+	<ScrollView>
+		<StackLayout>
+			<Label x:Name="AboutLabel" />
 
-		<Label x:Name="HeaderLabel" />
+			<BoxView VerticalOptions="Center" HorizontalOptions="Center" HeightRequest="1" 
+					WidthRequest="200" Color="#505050" Margin="6" />
 
-		<ScrollView>
-			<StackLayout >
+			<Button x:Name="ManualsButton" HorizontalOptions="Center" />
+			<Button x:Name="HelpButton" HorizontalOptions="Center" />
+			<Button x:Name="RepeatTips" HorizontalOptions="Center" />
 
-				<Label x:Name="AboutLabel" />
+			<BoxView VerticalOptions="Center" HorizontalOptions="Center" HeightRequest="1" 
+					WidthRequest="200" Color="#606060" Margin="9" />
 
-				<BoxView VerticalOptions="Center" HorizontalOptions="Center" HeightRequest="1" 
-					WidthRequest="200" Color="#505050" Margin="9" />
-
-				<Button x:Name="ManualsButton" HorizontalOptions="Center" />
-				<Button x:Name="HelpButton" HorizontalOptions="Center" />
-				<Button x:Name="RepeatTips" HorizontalOptions="Center" />
-
-				<BoxView VerticalOptions="Center" HorizontalOptions="Center" HeightRequest="1" 
-					WidthRequest="200" Color="#505050" Margin="9" />
-
-				<Label x:Name="GenericSettingsLabel" />
-				<Label x:Name="RestartTipLabel" />
+			<Label />
+			<Label x:Name="GenericSettingsLabel" />
+			<Label x:Name="RestartTipLabel" />
 
-				<StackLayout Orientation="Horizontal">
-					<Label x:Name="LanguageLabel" VerticalOptions="Center" />
-					<Button x:Name="LanguageSelector" VerticalOptions="Center" />
-				</StackLayout>
+			<StackLayout Orientation="Horizontal">
+				<Label x:Name="LanguageLabel" VerticalOptions="Center" />
+				<Button x:Name="LanguageSelector" VerticalOptions="Center" />
+			</StackLayout>
 
-				<StackLayout Orientation="Horizontal">
-					<Label x:Name="FontSizeLabel" VerticalOptions="Center" />
+			<StackLayout Orientation="Horizontal">
+				<Label x:Name="FontSizeLabel" VerticalOptions="Center" />
 
-					<Button x:Name="FontSizeInc" VerticalOptions="Center" />
-					<Label x:Name="FontSizeField" VerticalOptions="Center" />
-					<Button x:Name="FontSizeDec" VerticalOptions="Center" />
-				</StackLayout>
+				<Button x:Name="FontSizeInc" VerticalOptions="Center" />
+				<Label x:Name="FontSizeField" VerticalOptions="Center" />
+				<Button x:Name="FontSizeDec" VerticalOptions="Center" />
+			</StackLayout>
 
-				<BoxView VerticalOptions="Center" HorizontalOptions="Center" HeightRequest="1" 
+			<BoxView VerticalOptions="Center" HorizontalOptions="Center" HeightRequest="1" 
 					WidthRequest="200" Color="#505050" Margin="9" />
 
-				<Label x:Name="HelpTextLabel" />
+			<Label />
+			<Label x:Name="HelpHeaderLabel" />
+			<Label x:Name="HelpTextLabel" />
 
-				<Label />
-
-			</StackLayout>
-		</ScrollView>
+			<Label />
 
-	</StackLayout>
+		</StackLayout>
+	</ScrollView>
 </ContentPage>
-
+    
diff --git a/src/android/AboutPage.xaml.cs b/src/android/AboutPage.xaml.cs
@@ -1,13 +1,10 @@
-using Xamarin.Forms;
-using Xamarin.Forms.Xaml;
-
-namespace RD_AAOW
+namespace RD_AAOW
 	{
 	/// <summary>
 	/// Класс описывает страницу сведений о программе
 	/// </summary>
 	[XamlCompilation (XamlCompilationOptions.Compile)]
-	public partial class AboutPage:ContentPage
+	public partial class AboutPage: ContentPage
 		{
 		/// <summary>
 		/// Конструктор. Запускает страницу
@@ -16,16 +13,5 @@ public AboutPage ()
 			{
 			InitializeComponent ();
 			}
-
-		/// <summary>
-		/// Переопределение для кнопки возврата
-		/// </summary>
-		protected override bool OnBackButtonPressed ()
-			{
-			App app = (App)App.Current;
-			app.CallHeadersPage ();
-
-			return true;
-			}
 		}
 	}
diff --git a/src/android/AndroidManifest.G.xml → src/android/AndroidManifest.xml b/src/android/AndroidManifest.G.xml → src/android/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.RD_AAOW.UniNotifier"
-	android:installLocation="internalOnly" android:versionCode="600713" android:versionName="7.3.6">
+	android:installLocation="internalOnly" android:versionCode="600714" android:versionName="7.4">
 
-	<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="33" />
+	<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="34" />
 
 	<uses-permission android:name="android.permission.INTERNET" />
 	<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />

diff --git a/src/android/App.xaml b/src/android/App.xaml
@@ -1,7 +1,15 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Application xmlns="http://xamarin.com/schemas/2014/forms"
+<?xml version = "1.0" encoding = "UTF-8" ?>
+<Application xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             xmlns:local="clr-namespace:RD_AAOW"
              x:Class="RD_AAOW.App">
 
-	<Application.Resources />
+	<Application.Resources>
+		<ResourceDictionary>
+			<ResourceDictionary.MergedDictionaries>
+				<ResourceDictionary Source="Resources/Styles/Colors.xaml" />
+				<ResourceDictionary Source="Resources/Styles/Styles.xaml" />
+			</ResourceDictionary.MergedDictionaries>
+		</ResourceDictionary>
+	</Application.Resources>
 </Application>