Assembly v 3.6 (15.06.24)

.github/workflows/Release.yaml

@@ -16,7 +16,7 @@ jobs:
 # Константы, используемые далее по тексту
     env:
       PROJ: ${{ github.event.repository.name }}
-      TAG: '3.5.1'
+      TAG: '3.6'
 
     steps:
 # Проверка состава репозитория (без анализа, как может показаться)

.release/Release.md

@@ -1,6 +1,7 @@
-_Changes for v 3.5.1_:
-- 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
+_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.log

@@ -1,5 +1,11 @@
 PA detector: changes log
 
+Version 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)
+
 Version 3.5.1:
 • Background service code has been reworked, a number of compatibility issues with Android 13 have been fixed;
 • App permissions checker has been rewritten;

src/AboutPage.xaml

@@ -1,54 +1,51 @@
 <?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>
-		<Label x:Name="HeaderLabel" />
+	<ScrollView>
+		<StackLayout>
+			<Label x:Name="AboutLabel" />
 
-		<ScrollView>
-			<StackLayout>
+			<BoxView VerticalOptions="Center" HorizontalOptions="Center" HeightRequest="1" 
+					WidthRequest="200" Color="#505050" Margin="6" />
 
-				<Label x:Name="AboutLabel" HorizontalOptions="Fill" />
+			<Button x:Name="ManualsButton" HorizontalOptions="Center" />
+			<Button x:Name="HelpButton" HorizontalOptions="Center" />
 
-				<BoxView VerticalOptions="Center" HorizontalOptions="Center" HeightRequest="1" 
-					WidthRequest="200" Color="#606060" Margin="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" />
 
-				<Label x:Name="AllowWritingTip" HorizontalOptions="Center" />
-				<Button x:Name="AllowWritingButton" HorizontalOptions="Center" />
-
-				<BoxView VerticalOptions="Center" HorizontalOptions="Center" HeightRequest="1" 
+			<BoxView VerticalOptions="Center" HorizontalOptions="Center" HeightRequest="1" 
 					WidthRequest="200" Color="#606060" 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 />
+			<Label x:Name="HelpHeaderLabel" />
+			<Label x:Name="HelpTextLabel" />
 
-			</StackLayout>
-		</ScrollView>
+			<Label />
 
-	</StackLayout>
+		</StackLayout>
+	</ScrollView>
 </ContentPage>
 

src/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>
 		/// Конструктор. Запускает страницу

src/AndroidManifest.xml

@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- enchantit.huawei -->
-<!-- enchantit.rdaaowfdl -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.RD_AAOW.EnchantIt"
-	android:installLocation="internalOnly" android:versionCode="600305" android:versionName="3.1">
+	android:installLocation="internalOnly" android:versionCode="600323" android:versionName="3.6">
 
-	<uses-sdk android:minSdkVersion="23" android:targetSdkVersion="33" />
+	<uses-sdk android:minSdkVersion="23" android:targetSdkVersion="34" />
 
 	<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
 	<uses-permission android:name="android.permission.WAKE_LOCK" />

src/App.xaml

@@ -1,8 +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>
+	<Application.Resources>
+		<ResourceDictionary>
+			<ResourceDictionary.MergedDictionaries>
+				<ResourceDictionary Source="Resources/Styles/Colors.xaml" />
+				<ResourceDictionary Source="Resources/Styles/Styles.xaml" />
+			</ResourceDictionary.MergedDictionaries>
+		</ResourceDictionary>
+	</Application.Resources>
 </Application>