diff --git a/.github/workflows/ApiReleaseDeployAction.yml b/.github/workflows/ApiReleaseDeployAction.yml
new file mode 100644
index 00000000..8a706188
--- /dev/null
+++ b/.github/workflows/ApiReleaseDeployAction.yml
@@ -0,0 +1,68 @@
+name: Build and Publish Api NuGet
+
+on:
+ push:
+ tags:
+ - "api-v*"
+
+jobs:
+ build:
+ runs-on: ubuntu-latest
+ if: startsWith(github.ref, 'refs/tags/api-v')
+ steps:
+ - name: Checkout repository
+ uses: actions/checkout@v3
+
+ - name: Setup .NET
+ uses: actions/setup-dotnet@v1
+ with:
+ dotnet-version: '8.0.x'
+
+ - name: Setup NuGet config
+ env:
+ NUGET_USERNAME: ${{ secrets.USER_NAME }}
+ NUGET_PASSWORD: ${{ secrets.GIHUB_NUGET_AUTH_TOKEN }}
+ run: |
+ echo "" > nuget.config
+ echo "" >> nuget.config
+ echo "" >> nuget.config
+ echo "" >> nuget.config
+ echo "" >> nuget.config
+ echo "" >> nuget.config
+ echo "" >> nuget.config
+ echo "" >> nuget.config
+ echo "" >> nuget.config
+ echo "" >> nuget.config
+ echo "" >> nuget.config
+ echo "" >> nuget.config
+
+ - name: Install dependencies
+ run: dotnet restore ./src/Asv.Drones.Gui.Api/Asv.Drones.Gui.Api.csproj
+
+ - name: Build
+ run: dotnet build ./src/Asv.Drones.Gui.Api/Asv.Drones.Gui.Api.csproj --configuration Release --no-restore
+
+ - name: Set version variable
+ env:
+ TAG: ${{ github.ref_name }}
+ run: echo "VERSION=${TAG#api-v}" >> $GITHUB_ENV
+
+ - name: Read version from Directory.Build.props
+ id: read-version
+ run: echo "::set-output name=version::$(grep -oP '\K[^<]+' ./src/Directory.Build.props)"
+
+ - name: Compare tag with NuGet package version
+ run: |
+ if [ "${{ steps.read-version.outputs.version }}" != "${{ env.VERSION }}" ]; then
+ echo "Error: Tag does not match NuGet package version"
+ exit 1
+ fi
+
+ - name: Pack package
+ run: dotnet pack ./src/Asv.Drones.Gui.Api/Asv.Drones.Gui.Api.csproj -c Release /p:Version=${VERSION} --no-build -o .
+
+ - name: List output files
+ run: ls -la
+
+ - name: Push package to GitHub
+ run: dotnet nuget push Asv.Drones.Gui.Api.${VERSION}.nupkg --api-key ${{ secrets.GIHUB_NUGET_AUTH_TOKEN }} --skip-duplicate --source "https://nuget.pkg.github.com/asv-soft/index.json"
\ No newline at end of file
diff --git a/api_build.bat b/api_build.bat
new file mode 100644
index 00000000..a0b21e49
--- /dev/null
+++ b/api_build.bat
@@ -0,0 +1,32 @@
+@echo off
+setlocal enabledelayedexpansion
+rem ====== projects ======
+
+set project=Asv.Drones.Gui.Api
+
+
+set "file=.\src\Directory.Build.props"
+
+
+:: Èùåì ñòðîêó ñ ApiVersion è èçâëåêàåì çíà÷åíèå
+for /f "tokens=2 delims=> " %%a in ('findstr /i /c:"" "%file%"') do (
+ set "line=%%a"
+ for /f "tokens=1 delims=<" %%b in ("!line!") do (
+ set "ApiVersion=%%b"
+ )
+)
+
+:: Ïðîâåðÿåì è âûâîäèì ðåçóëüòàò
+if defined ApiVersion (
+ echo ApiVersion: %ApiVersion%
+ dotnet restore ./src/%project%/%project%.csproj
+ dotnet build /p:SolutionDir=../;ProductVersion=%ApiVersion% ./src/%project%/%project%.csproj -c Release
+ dotnet pack ./src/%project%/%project%.csproj -c Release
+
+
+) else (
+ echo ApiVersion not found
+)
+
+endlocal
+pause
\ No newline at end of file
diff --git a/api_publish_github.bat b/api_publish_github.bat
new file mode 100644
index 00000000..639afff2
--- /dev/null
+++ b/api_publish_github.bat
@@ -0,0 +1,35 @@
+@echo off
+setlocal enabledelayedexpansion
+rem ====== projects ======
+
+set project=Asv.Drones.Gui.Api
+
+
+set "file=.\src\Directory.Build.props"
+
+
+:: Èùåì ñòðîêó ñ ApiVersion è èçâëåêàåì çíà÷åíèå
+for /f "tokens=2 delims=> " %%a in ('findstr /i /c:"" "%file%"') do (
+ set "line=%%a"
+ for /f "tokens=1 delims=<" %%b in ("!line!") do (
+ set "ApiVersion=%%b"
+ )
+)
+
+:: Ïðîâåðÿåì è âûâîäèì ðåçóëüòàò
+if defined ApiVersion (
+ echo ApiVersion: %ApiVersion%
+ cd src\%project%\bin\Release\
+rem dotnet nuget push %project%.%ApiVersion%.nupkg --skip-duplicate --source https://api.nuget.org/v3/index.json
+ dotnet nuget push %project%.%ApiVersion%.nupkg --skip-duplicate --source https://nuget.pkg.github.com/asv-soft/index.json
+
+
+) else (
+ echo ApiVersion not found
+)
+
+endlocal
+pause
+
+
+
diff --git a/publish.bat b/publish.bat
new file mode 100644
index 00000000..d73d3fb6
--- /dev/null
+++ b/publish.bat
@@ -0,0 +1,144 @@
+cd publish
+
+for /d %%i in (".\*") do (
+ rmdir /s /q "%%i"
+)
+
+cd ../src/Asv.Drones.Gui.Desktop
+
+dotnet publish -c Release -r win-arm --self-contained true -p:PublishSingleFile=true -p:IncludeNativeLibrariesForSelfExtract=true -o ~/../../../publish/win-arm/app
+dotnet publish -c Release -r win-arm64 --self-contained true -p:PublishSingleFile=true -p:IncludeNativeLibrariesForSelfExtract=true -o ~/../../../publish/win-arm64/app
+dotnet publish -c Release -r win-x64 --self-contained true -p:PublishSingleFile=true -p:IncludeNativeLibrariesForSelfExtract=true -o ~/../../../publish/win-x64/app
+dotnet publish -c Release -r win-x86 --self-contained true -p:PublishSingleFile=true -p:IncludeNativeLibrariesForSelfExtract=true -o ~/../../../publish/win-x86/app
+
+dotnet publish -c Release -r linux-arm --self-contained true -p:PublishSingleFile=true -p:IncludeNativeLibrariesForSelfExtract=true -o ~/../../../publish/linux-arm/app
+dotnet publish -c Release -r linux-arm64 --self-contained true -p:PublishSingleFile=true -p:IncludeNativeLibrariesForSelfExtract=true -o ~/../../../publish/linux-arm64/app
+dotnet publish -c Release -r linux-musl-x64 --self-contained true -p:PublishSingleFile=true -p:IncludeNativeLibrariesForSelfExtract=true -o ~/../../../publish/linux-musl-x64/app
+dotnet publish -c Release -r linux-x64 --self-contained true -p:PublishSingleFile=true -p:IncludeNativeLibrariesForSelfExtract=true -o ~/../../../publish/linux-x64/app
+
+dotnet publish -c Release -r osx-arm64 --self-contained true -p:PublishSingleFile=true -p:IncludeNativeLibrariesForSelfExtract=true -o ~/../../../publish/osx-arm64/app
+dotnet publish -c Release -r osx-x64 --self-contained true -p:PublishSingleFile=true -p:IncludeNativeLibrariesForSelfExtract=true -o ~/../../../publish/osx-x64/app
+
+cd ../../publish
+del /S *.pdb
+
+cd win-arm/app
+move Asv.Drones.Gui.Desktop.exe asv-drones-win-arm.exe
+cd ../../win-arm64/app
+move Asv.Drones.Gui.Desktop.exe asv-drones-win-arm64.exe
+cd ../../win-x64/app
+move Asv.Drones.Gui.Desktop.exe asv-drones-win-x64.exe
+cd ../../win-x86/app
+move Asv.Drones.Gui.Desktop.exe asv-drones-win-x86.exe
+
+cd ../../linux-arm/app
+move Asv.Drones.Gui.Desktop asv-drones-linux-arm
+cd ../../linux-arm64/app
+move Asv.Drones.Gui.Desktop asv-drones-linux-arm64
+cd ../../linux-musl-x64/app
+move Asv.Drones.Gui.Desktop asv-drones-linux-musl-x64
+cd ../../linux-x64/app
+move Asv.Drones.Gui.Desktop asv-drones-linux-x64
+
+cd ../../osx-arm64/app
+move Asv.Drones.Gui.Desktop asv-drones-osx-arm64
+cd ../../osx-x64/app
+move Asv.Drones.Gui.Desktop asv-drones-osx-x64
+cd ../../..
+
+setlocal enabledelayedexpansion
+
+set "xmlFile=src\Directory.Build.props"
+
+for /f "tokens=2 delims=<> " %%a in ('findstr /i "" "%xmlFile%"') do (
+ set "productVersion=%%a"
+)
+
+set "issFile=win-arm-install.iss"
+
+set "tempFile=%temp%\temp.iss"
+
+for /f "tokens=*" %%a in ('type "%issFile%"') do (
+ set "line=%%a"
+
+ echo !line! | findstr /C:"#define MyAppVersion" > nul
+
+ if !errorlevel! == 0 (
+ echo #define MyAppVersion "%productVersion%" >> "%tempFile%"
+ ) else (
+ echo !line! >> "%tempFile%"
+ )
+)
+
+move /y "%tempFile%" "%issFile%" > nul
+
+set "issFile=win-arm64-install.iss"
+
+set "tempFile=%temp%\temp.iss"
+
+for /f "tokens=*" %%a in ('type "%issFile%"') do (
+ set "line=%%a"
+
+ echo !line! | findstr /C:"#define MyAppVersion" > nul
+
+ if !errorlevel! == 0 (
+ echo #define MyAppVersion "%productVersion%" >> "%tempFile%"
+ ) else (
+ echo !line! >> "%tempFile%"
+ )
+)
+
+move /y "%tempFile%" "%issFile%" > nul
+
+set "issFile=win-x64-install.iss"
+
+set "tempFile=%temp%\temp.iss"
+
+for /f "tokens=*" %%a in ('type "%issFile%"') do (
+ set "line=%%a"
+
+ echo !line! | findstr /C:"#define MyAppVersion" > nul
+
+ if !errorlevel! == 0 (
+ echo #define MyAppVersion "%productVersion%" >> "%tempFile%"
+ ) else (
+ echo !line! >> "%tempFile%"
+ )
+)
+
+move /y "%tempFile%" "%issFile%" > nul
+
+set "issFile=win-x86-install.iss"
+
+set "tempFile=%temp%\temp.iss"
+
+for /f "tokens=*" %%a in ('type "%issFile%"') do (
+ set "line=%%a"
+
+ echo !line! | findstr /C:"#define MyAppVersion" > nul
+
+ if !errorlevel! == 0 (
+ echo #define MyAppVersion "%productVersion%" >> "%tempFile%"
+ ) else (
+ echo !line! >> "%tempFile%"
+ )
+)
+
+move /y "%tempFile%" "%issFile%" > nul
+
+endlocal
+
+cd publish
+
+iscc ../win-arm-install.iss
+iscc ../win-arm64-install.iss
+iscc ../win-x86-install.iss
+iscc ../win-x64-install.iss
+
+
+wsl sed -i 's/\r//' linux_packages.sh
+wsl sed -i 's/\r//' osx_packages.sh
+
+wsl ../linux_packages.sh
+
+wsl ../osx_packages.sh
\ No newline at end of file
diff --git a/src/Asv.Drones.Gui.Android/Asv.Drones.Gui.Android.csproj b/src/Asv.Drones.Gui.Android/Asv.Drones.Gui.Android.csproj
index ff2f4c25..9bf0a4ca 100644
--- a/src/Asv.Drones.Gui.Android/Asv.Drones.Gui.Android.csproj
+++ b/src/Asv.Drones.Gui.Android/Asv.Drones.Gui.Android.csproj
@@ -1,27 +1,15 @@
-
- ../Asv.Drones.Gui.Custom.props
- $(SolutionDir)Asv.Drones.Gui.Custom.props
-
-
Exe
- net7.0-android
+ net8.0-android
21
enable
me.asv.drones.gui
1
1.0
apk
- false
- false
- None
- false
- Debug;Release
- AnyCPU
+ False
-
-
@@ -31,6 +19,7 @@
+
diff --git a/src/Asv.Drones.Gui.Android/MainActivity.cs b/src/Asv.Drones.Gui.Android/MainActivity.cs
index 037bba7d..28e82d98 100644
--- a/src/Asv.Drones.Gui.Android/MainActivity.cs
+++ b/src/Asv.Drones.Gui.Android/MainActivity.cs
@@ -1,18 +1,28 @@
using Android.App;
using Android.Content.PM;
+using Android.OS;
using Avalonia;
using Avalonia.Android;
using Avalonia.ReactiveUI;
+using Environment = System.Environment;
namespace Asv.Drones.Gui.Android;
-[Activity(Label = "Asv.Drones.Gui.Android", Theme = "@style/MyTheme.NoActionBar", Icon = "@drawable/icon",
- LaunchMode = LaunchMode.SingleTop, MainLauncher = true,
+[Activity(
+ Label = "Asv.Drones.Gui.Android",
+ Theme = "@style/MyTheme.NoActionBar",
+ Icon = "@drawable/icon",
+ MainLauncher = true,
ConfigurationChanges = ConfigChanges.Orientation | ConfigChanges.ScreenSize | ConfigChanges.UiMode)]
public class MainActivity : AvaloniaMainActivity
{
protected override AppBuilder CustomizeAppBuilder(AppBuilder builder)
{
+ AppArgs.Instance.TryParse(Environment.GetCommandLineArgs());
+ AppArgs.Instance.TryParseFile();
+ // this is required to use the AndroidHttpClientHandler in main thread
+ StrictMode.SetThreadPolicy(new StrictMode.ThreadPolicy.Builder().PermitAll().Build());
+
return base.CustomizeAppBuilder(builder)
.WithInterFont()
.UseReactiveUI();
diff --git a/src/Asv.Drones.Gui.Android/Resources/AboutResources.txt b/src/Asv.Drones.Gui.Android/Resources/AboutResources.txt
new file mode 100644
index 00000000..c2bca974
--- /dev/null
+++ b/src/Asv.Drones.Gui.Android/Resources/AboutResources.txt
@@ -0,0 +1,44 @@
+Images, layout descriptions, binary blobs and string dictionaries can be included
+in your application as resource files. Various Android APIs are designed to
+operate on the resource IDs instead of dealing with images, strings or binary blobs
+directly.
+
+For example, a sample Android app that contains a user interface layout (main.axml),
+an internationalization string table (strings.xml) and some icons (drawable-XXX/icon.png)
+would keep its resources in the "Resources" directory of the application:
+
+Resources/
+ drawable/
+ icon.png
+
+ layout/
+ main.axml
+
+ values/
+ strings.xml
+
+In order to get the build system to recognize Android resources, set the build action to
+"AndroidResource". The native Android APIs do not operate directly with filenames, but
+instead operate on resource IDs. When you compile an Android application that uses resources,
+the build system will package the resources for distribution and generate a class called "R"
+(this is an Android convention) that contains the tokens for each one of the resources
+included. For example, for the above Resources layout, this is what the R class would expose:
+
+public class R {
+ public class drawable {
+ public const int icon = 0x123;
+ }
+
+ public class layout {
+ public const int main = 0x456;
+ }
+
+ public class strings {
+ public const int first_string = 0xabc;
+ public const int second_string = 0xbcd;
+ }
+}
+
+You would then use R.drawable.icon to reference the drawable/icon.png file, or R.layout.main
+to reference the layout/main.axml file, or R.strings.first_string to reference the first
+string in the dictionary file values/strings.xml.
\ No newline at end of file
diff --git a/src/Asv.Drones.Gui.Android/Resources/drawable-night-v31/avalonia_anim.xml b/src/Asv.Drones.Gui.Android/Resources/drawable-night-v31/avalonia_anim.xml
new file mode 100644
index 00000000..fb8ed421
--- /dev/null
+++ b/src/Asv.Drones.Gui.Android/Resources/drawable-night-v31/avalonia_anim.xml
@@ -0,0 +1,66 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/Asv.Drones.Gui.Android/Resources/drawable-v31/avalonia_anim.xml b/src/Asv.Drones.Gui.Android/Resources/drawable-v31/avalonia_anim.xml
new file mode 100644
index 00000000..149badfc
--- /dev/null
+++ b/src/Asv.Drones.Gui.Android/Resources/drawable-v31/avalonia_anim.xml
@@ -0,0 +1,71 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/Asv.Drones.Gui.Android/Resources/drawable/splash_screen.xml b/src/Asv.Drones.Gui.Android/Resources/drawable/splash_screen.xml
index 2e920b4b..fcceec62 100644
--- a/src/Asv.Drones.Gui.Android/Resources/drawable/splash_screen.xml
+++ b/src/Asv.Drones.Gui.Android/Resources/drawable/splash_screen.xml
@@ -1,13 +1,13 @@

- -
-
-
+ -
+
+
-