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

Commit

Permalink
Workflow maintenance
Browse files Browse the repository at this point in the history
  • Loading branch information
adslbarxatov committed Jul 22, 2024
1 parent 9ef4aed commit 58e1fc0
Show file tree
Hide file tree
Showing 7 changed files with 39 additions and 31 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.6'
TAG: '3.6.1'

steps:
# Проверка состава репозитория (без анализа, как может показаться)
Expand Down
Binary file modified .release/EnchantIt.apk
Binary file not shown.
12 changes: 5 additions & 7 deletions .release/Release.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
_Changes for v 3.6_:
- Fixed some minor interface bugs;
- App has been translated to `NET80 / MAUI platform`:
- App now has unified Android navigation shell;
- App has been adapted to `Android 14` (API 34);
- Background service code has been reworked, a number of compatibility issues with `Android 13` have been fixed;
- App permissions checker has been rewritten
_Changes for v 3.6.1_:
- Fixed some troubles with calling the reference materials;
- Fixed the generic problem with calling the E-mail client on Android 11 and newer;
- Updated the MAUI support packages;
- App has been translated to `NET80 / MAUI platform`
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.6.1:
• Fixed some troubles with calling the reference materials;
• Fixed the generic problem with calling the E-mail client on Android 11 and newer;
• Updated the MAUI support packages

Version 3.6:
• Fixed some minor interface bugs;
• App has been translated to NET80 / MAUI platform:
Expand Down
9 changes: 8 additions & 1 deletion src/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.RD_AAOW.EnchantIt"
android:installLocation="internalOnly" android:versionCode="600323" android:versionName="3.6">
android:installLocation="internalOnly" android:versionCode="600324" android:versionName="3.6.1">

<uses-sdk android:minSdkVersion="23" android:targetSdkVersion="34" />

Expand All @@ -9,4 +9,11 @@
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />

<application android:label="Paranormal activity detector" android:icon="@drawable/launcher_foreground" />

<queries>
<intent>
<action android:name="android.intent.action.SENDTO" />
<data android:scheme="mailto" />
</intent>
</queries>
</manifest>
36 changes: 15 additions & 21 deletions src/App.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -261,16 +261,16 @@ public App ()

startButton = AndroidSupport.ApplyButtonSettings (solutionPage, "Start",
RDDefaultButtons.Start, solutionFieldBackColor, StartGeneration);
startButton.Margin = new Thickness (3);
/*startButton.Margin = new Thickness (3);*/

stopButton = AndroidSupport.ApplyButtonSettings (solutionPage, "Stop",
RDDefaultButtons.Stop, solutionFieldBackColor, StopGeneration);
stopButton.IsVisible = false;
stopButton.Margin = new Thickness (3);
/*stopButton.Margin = new Thickness (3);*/

methodButton = AndroidSupport.ApplyButtonSettings (solutionPage, "Method",
RDDefaultButtons.Select, solutionFieldBackColor, SelectMethod);
methodButton.Margin = new Thickness (3);
/*methodButton.Margin = new Thickness (3);*/

measureLabel = AndroidSupport.ApplyLabelSettings (solutionPage, "Measure", "",
RDLabelTypes.HeaderCenter);
Expand All @@ -295,19 +295,19 @@ public App ()

shareButton = AndroidSupport.ApplyButtonSettings (solutionPage, "ShareResults",
RDDefaultButtons.Share, solutionFieldBackColor, ShareResults);
shareButton.Margin = new Thickness (3);
/*shareButton.Margin = new Thickness (3);*/

certButton = AndroidSupport.ApplyButtonSettings (solutionPage, "Certificate",
RDDefaultButtons.SpecialFour, solutionFieldBackColor, CreateCertificate);
certButton.Margin = new Thickness (3);
/*certButton.Margin = new Thickness (3);*/

Button nmButton = AndroidSupport.ApplyButtonSettings (solutionPage, "NightMode",
/*Button nmButton =*/ AndroidSupport.ApplyButtonSettings (solutionPage, "NightMode",
RDDefaultButtons.NightMode, solutionFieldBackColor, SwitchNightMode);
nmButton.Margin = new Thickness (3);
/*nmButton.Margin = new Thickness (3);*/

Button mnButton = AndroidSupport.ApplyButtonSettings (solutionPage, "Menu",
AndroidSupport.ApplyButtonSettings (solutionPage, "Menu",
RDDefaultButtons.Menu, solutionFieldBackColor, SelectPage);
mnButton.Margin = new Thickness (3);
/*mnButton.Margin = new Thickness (3);*/

space01 = AndroidSupport.ApplyLabelSettings (solutionPage, "Space01", RDLocale.RN,
RDLabelTypes.DefaultCenter);
Expand All @@ -319,12 +319,6 @@ public App ()

#region Страница «О программе»

/*try
{
firstStart = RDGenerics.GetAppSettingsValue (firstStartRegKey) == "";
}
catch { }*/

// Описание приложения
aboutLabel = AndroidSupport.ApplyLabelSettings (aboutPage, "AboutLabel",
RDGenerics.AppAboutLabelText, RDLabelTypes.AppAbout);
Expand Down Expand Up @@ -400,15 +394,15 @@ public App ()

startTTM1Button = AndroidSupport.ApplyButtonSettings (ttm1Page, "Start",
RDDefaultButtons.Up, solutionFieldBackColor, StartTalking);
startTTM1Button.Margin = new Thickness (3);
/*startTTM1Button.Margin = new Thickness (3);*/

methodTTM1Button = AndroidSupport.ApplyButtonSettings (ttm1Page, "Method",
RDDefaultButtons.Select, solutionFieldBackColor, SelectMethod);
methodTTM1Button.Margin = new Thickness (3);
/*methodTTM1Button.Margin = new Thickness (3);*/

resetTTM1Button = AndroidSupport.ApplyButtonSettings (ttm1Page, "Reset",
RDDefaultButtons.Delete, solutionFieldBackColor, ResetTheChat);
resetTTM1Button.Margin = new Thickness (3);
/*resetTTM1Button.Margin = new Thickness (3);*/

AndroidSupport.ApplyButtonSettings (ttm1Page, "NightMode", RDDefaultButtons.NightMode,
solutionFieldBackColor, SwitchNightMode);
Expand All @@ -424,18 +418,18 @@ public App ()

startTTM2Button = AndroidSupport.ApplyButtonSettings (ttm2Page, "Start",
RDDefaultButtons.Start, solutionFieldBackColor, StartTTM);
startTTM2Button.Margin = new Thickness (3);
/*startTTM2Button.Margin = new Thickness (3);*/

stopTTM2Button = AndroidSupport.ApplyButtonSettings (ttm2Page, "Stop",
RDDefaultButtons.Stop, solutionFieldBackColor, StopTTM);
stopTTM2Button.IsVisible = false;
stopTTM2Button.Margin = new Thickness (3);
/*stopTTM2Button.Margin = new Thickness (3);*/

methodTTM2Button = AndroidSupport.ApplyButtonSettings (ttm2Page, "Method",
RDDefaultButtons.Select, solutionFieldBackColor, SelectMethod);
AndroidSupport.ApplyButtonSettings (ttm2Page, "NightMode", RDDefaultButtons.NightMode,
solutionFieldBackColor, SwitchNightMode);
methodTTM2Button.Margin = new Thickness (3);
/*methodTTM2Button.Margin = new Thickness (3);*/

for (int i = 0; i < pixels.Length; i++)
{
Expand Down
6 changes: 5 additions & 1 deletion src/MainApplication.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,11 @@

namespace RD_AAOW
{
[Application]
#if DEBUG
[Application (Debuggable = true)]
#else
[Application (Debuggable = false)]
#endif
public class MainApplication: MauiApplication
{
public MainApplication (IntPtr handle, JniHandleOwnership ownership)
Expand Down

0 comments on commit 58e1fc0

Please sign in to comment.