diff --git a/.github/workflows/Release.yaml b/.github/workflows/Release.yaml index 7938695..ec15bfa 100644 --- 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 index b131afa..d5b39c9 100644 --- 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 index f53c8be..3e153da 100644 Binary files a/.release/TablepediaNotifier.apk and b/.release/TablepediaNotifier.apk differ diff --git a/.release/UniNotifier.apk b/.release/UniNotifier.apk index 38c0cdb..6c6cc9f 100644 Binary files a/.release/UniNotifier.apk and b/.release/UniNotifier.apk differ diff --git a/.release/UniNotifier.exe b/.release/UniNotifier.exe new file mode 100644 index 0000000..951d6e6 Binary files /dev/null and b/.release/UniNotifier.exe differ diff --git a/.release/UniNotifier_en_us.html b/.release/UniNotifier_en_us.html new file mode 100644 index 0000000..78ff8e5 --- /dev/null +++ b/.release/UniNotifier_en_us.html @@ -0,0 +1,27 @@ + + +uNot: the home page | UniNotifier + + + + +

uNot: the home page

+

ƒ  RD AAOW FDL; 30.01.2024; 2:48

+ +

uNot (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.

+

What does it offer?

+ +
+

More info you can find in this video guide.

+

The description for the data processing concept used in Grammar must joy project you can also find +on its own page.

+ + + diff --git a/.release/UniNotifier_ru_ru.html b/.release/UniNotifier_ru_ru.html new file mode 100644 index 0000000..799eeac --- /dev/null +++ b/.release/UniNotifier_ru_ru.html @@ -0,0 +1,27 @@ + + +uNot: the home page | UniNotifier + + + + +

uNot: the home page

+

ƒ  RD AAOW FDL; 30.01.2024; 2:46

+ +

uNot (ранее известный как UniNotifier) – служба наблюдения за состоянием веб-ресурсов. +Это приложение предоставляет возможность получать уведомления об изменении состояния указанных пользователем +веб-сайтов. Другими словами, об обновлениях, происходящих на них, которые представляются в виде текстового журнала. +Загружается только то, что указал пользователь – все остальные объекты (включая рекламу) игнорируются.

+

Что оно предлагает?

+ +
+

Больше информации Вы сможете найти в этом видеоруководстве.

+

Информация о дополнении Grammar must joy теперь также доступна на отдельной странице.

+

Информация о проекте Tablepedia notifier располагается на здесь

+ + + diff --git a/Changes.log b/Changes.log index f11921b..5f96926 100644 --- 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 index 49badd5..72347a0 100644 --- 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; + } + + /// + /// Возвращает флаг полного опроса оповещений + /// + 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 index bce4f79..b818594 100644 --- a/src/UniNotifierForm.cs +++ b/src/UniNotifierForm.cs @@ -16,7 +16,7 @@ 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", @@ -24,7 +24,7 @@ public partial class UniNotifierForm: Form "Read", "CallOnUrgents", "FontSize", - }; + };*/ private NotificationsSet ns = new NotificationsSet (true); private List texts = new List (); @@ -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 index a71044e..e01ca0c 100644 --- a/src/android/AboutPage.xaml +++ b/src/android/AboutPage.xaml @@ -1,53 +1,49 @@  - - + + +