Skip to content
This repository has been archived by the owner on Jul 26, 2024. It is now read-only.

Commit

Permalink
Assembly v 3.5 (16.05.24)
Browse files Browse the repository at this point in the history
  • Loading branch information
adslbarxatov committed May 15, 2024
1 parent 45a8534 commit 79f2436
Show file tree
Hide file tree
Showing 7 changed files with 60 additions and 14 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/Release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
# Константы, используемые далее по тексту
env:
PROJ: ${{ github.event.repository.name }}
TAG: '3.4.2'
TAG: '3.5'

steps:
# Проверка состава репозитория (без анализа, как может показаться)
Expand Down
Binary file modified .release/EnchantIt.apk
Binary file not shown.
5 changes: 4 additions & 1 deletion .release/Release.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
_Changes for v 3.4.2_:
_Changes for v 3.5_:
- Background service code has been reworked, a number of compatibility issues with Android 13 have been fixed;
- App permissions checker has been rewritten;
- Tips storage has been rewritten (may cause their repeating once more);
- Update for XPUN has been applied;
- Video guides have been updated
5 changes: 5 additions & 0 deletions Changes.log
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
PA detector: changes log

Version 3.5:
• Background service code has been reworked, a number of compatibility issues with Android 13 have been fixed;
• App permissions checker has been rewritten;
• Tips storage has been rewritten (may cause their repeating once more)

Version 3.4.2:
• Update for XPUN has been applied

Expand Down
3 changes: 3 additions & 0 deletions src/AboutPage.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@
<Button x:Name="ManualsButton" HorizontalOptions="Center" />
<Button x:Name="HelpButton" HorizontalOptions="Center" />

<Label x:Name="AllowWritingTip" HorizontalOptions="Center" />
<Button x:Name="AllowWritingButton" HorizontalOptions="Center" />

<BoxView VerticalOptions="Center" HorizontalOptions="Center" HeightRequest="1"
WidthRequest="200" Color="#606060" Margin="9" />

Expand Down
42 changes: 37 additions & 5 deletions src/App.xaml.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
using Android.Net;
using Android.Util;
using Java.Security;
using System;
using System.Collections.Generic;
Expand Down Expand Up @@ -69,6 +68,8 @@ private enum GenerationMethods
private bool stopGeneration = false;
private double oldScale = 0, newScale = 0;

private RDAppStartupFlags flags;

// Множитель шкалы для регистратора отклонений ГПСЧ
private const double scaleSizeFactor = 8.0;

Expand Down Expand Up @@ -157,10 +158,11 @@ private readonly Color
/// <summary>
/// Конструктор. Точка входа приложения
/// </summary>
public App (bool Huawei)
public App (RDAppStartupFlags Flags)
{
// Инициализация
InitializeComponent ();
flags = Flags;

// Общая конструкция страниц приложения
MainPage = new MasterPage ();
Expand Down Expand Up @@ -247,6 +249,29 @@ public App (bool Huawei)
RDLocale.GetDefaultText (RDLDefaultTexts.Control_GenericSettings),
RDLabelTypes.HeaderLeft);

// Управление правами
Label allowServiceTip;
Button allowServiceButton;
if (!Flags.HasFlag (RDAppStartupFlags.CanWriteFiles))
{
allowServiceTip = AndroidSupport.ApplyLabelSettings (aboutPage, "AllowWritingTip",
RDLocale.GetDefaultText (RDLDefaultTexts.Message_ReadWritePermission), RDLabelTypes.ErrorTip);

allowServiceButton = AndroidSupport.ApplyButtonSettings (aboutPage, "AllowWritingButton",
RDLocale.GetDefaultText (RDLDefaultTexts.Button_Open), aboutFieldBackColor, CallAppSettings, false);
allowServiceButton.HorizontalOptions = LayoutOptions.Center;
}
else
{
allowServiceTip = AndroidSupport.ApplyLabelSettings (aboutPage, "AllowWritingTip",
" ", RDLabelTypes.Tip);
allowServiceTip.IsVisible = false;

allowServiceButton = AndroidSupport.ApplyButtonSettings (aboutPage, "AllowWritingButton",
" ", aboutFieldBackColor, null, false);
allowServiceButton.IsVisible = false;
}

// Кнопки управления
AndroidSupport.ApplyLabelSettings (aboutPage, "RestartTipLabel",
RDLocale.GetDefaultText (RDLDefaultTexts.Message_RestartRequired),
Expand Down Expand Up @@ -361,14 +386,15 @@ public App (bool Huawei)
countOfMatches = 0; // Признак отмены обновления при отсутствии результатов

// Отображение подсказок первого старта
ShowTips (Huawei);
ShowTips ();
}

// Метод отображает подсказки при первом запуске
private async void ShowTips (bool Huawei)
private async void ShowTips ()
{
// Контроль XPUN
await AndroidSupport.XPUNLoop (Huawei);
if (!flags.HasFlag (RDAppStartupFlags.Huawei))
await AndroidSupport.XPUNLoop ();

// Защита
if (firstStart)
Expand Down Expand Up @@ -411,6 +437,12 @@ protected override void OnSleep ()
catch { }
}

// Вызов настроек приложения (для Android 12 и выше)
private void CallAppSettings (object sender, EventArgs e)
{
AndroidSupport.CallAppSettings ();
}

#endregion

#region О приложении
Expand Down
17 changes: 10 additions & 7 deletions src/MainActivity.cs
Original file line number Diff line number Diff line change
Expand Up @@ -65,14 +65,17 @@ protected override void OnCreate (Bundle savedInstanceState)
// Запрет на переход в ждущий режим
this.Window.AddFlags (WindowManagerFlags.KeepScreenOn);

#if HUAWEI
LoadApplication (new App (true));
#else
LoadApplication (new App (false));
#endif
/*#if HUAWEI
LoadApplication (new App (true));
#else
LoadApplication (new App (false));
#endif*/
RDAppStartupFlags flags = AndroidSupportX.GetAppStartupFlags (RDAppStartupFlags.Huawei |
RDAppStartupFlags.CanWriteFiles, this);
LoadApplication (new App (flags));
}

/// <summary>
/*/// <summary>
/// Запрос разрешений для приложения
/// </summary>
public override void OnRequestPermissionsResult (int requestCode, string[] permissions,
Expand All @@ -81,6 +84,6 @@ public override void OnRequestPermissionsResult (int requestCode, string[] permi
Xamarin.Essentials.Platform.OnRequestPermissionsResult (requestCode, permissions, grantResults);
base.OnRequestPermissionsResult (requestCode, permissions, grantResults);
}
}*/
}
}

0 comments on commit 79f2436

Please sign in to comment.