diff --git a/.github/workflows/build_release.yml b/.github/workflows/build_release.yml
index 33dec7af..162b9791 100644
--- a/.github/workflows/build_release.yml
+++ b/.github/workflows/build_release.yml
@@ -20,7 +20,7 @@ jobs:
runs-on: windows-latest
steps:
- name: Checkout code
- uses: actions/checkout@v4
+ uses: actions/checkout@v5
with:
fetch-depth: 0
ref: '${{ github.ref }}'
@@ -32,7 +32,7 @@ jobs:
echo "GITHUB_SHA_SHORT=$(echo $GITHUB_SHA | cut -c 1-6)" >> $GITHUB_ENV
- name: Setup .NET
- uses: actions/setup-dotnet@v4
+ uses: actions/setup-dotnet@v5
with:
dotnet-version: '6.0.x'
@@ -53,7 +53,7 @@ jobs:
tar -czvf win-builds.tgz --exclude='*.pdb' *
- name: Upload build archive
- uses: actions/upload-artifact@v4
+ uses: actions/upload-artifact@v6
with:
name: win-builds
path: ${{ env.PUBLISH_DIR }}/win-builds.tgz
@@ -64,7 +64,7 @@ jobs:
runs-on: macos-latest
steps:
- name: Checkout code
- uses: actions/checkout@v4
+ uses: actions/checkout@v5
with:
fetch-depth: 0
ref: '${{ github.ref }}'
@@ -76,7 +76,7 @@ jobs:
echo "GITHUB_SHA_SHORT=$(echo $GITHUB_SHA | cut -c 1-6)" >> $GITHUB_ENV
- name: Setup .NET
- uses: actions/setup-dotnet@v4
+ uses: actions/setup-dotnet@v5
with:
dotnet-version: '6.0.x'
@@ -97,19 +97,19 @@ jobs:
tar -czvf mac-builds.tgz --exclude='*.pdb' *
- name: Upload build archive
- uses: actions/upload-artifact@v4
+ uses: actions/upload-artifact@v6
with:
name: mac-builds
path: ${{ env.PUBLISH_DIR }}/mac-builds.tgz
retention-days: 5
package_release:
- name: Linux builds, package and release
+ name: Linux/Android builds, package and release
needs: [build-win, build-mac]
runs-on: ubuntu-latest
steps:
- name: Checkout code
- uses: actions/checkout@v4
+ uses: actions/checkout@v5
with:
fetch-depth: 0
ref: '${{ github.ref }}'
@@ -131,23 +131,35 @@ jobs:
# nsis for windows installer
run: sudo apt-get update && sudo apt-get install zip nsis
- - name: Setup .NET
- uses: actions/setup-dotnet@v4
+ - name: Setup .NET 10
+ uses: actions/setup-dotnet@v5
with:
- dotnet-version: '6.0.x'
+ dotnet-version: '10.0.x'
+
+ - name: Setup Java
+ uses: actions/setup-java@v5
+ with:
+ distribution: temurin
+ java-version: '17'
+
+ - name: Install Android workload
+ shell: bash
+ run: |
+ dotnet workload install android
+ dotnet workload list
- - name: Publish Linux RIDs
+ - name: Publish Linux/Android RIDs
shell: bash
run: ./ci/publish_all_host.sh
- name: Download Windows build artifact
- uses: actions/download-artifact@v4
+ uses: actions/download-artifact@v8
with:
name: win-builds
path: ${{ env.PUBLISH_DIR }}
- name: Download macOS build artifact
- uses: actions/download-artifact@v4
+ uses: actions/download-artifact@v8
with:
name: mac-builds
path: ${{ env.PUBLISH_DIR }}
@@ -175,7 +187,10 @@ jobs:
run: ${{ github.workspace }}/ci/create_appimage.sh
- name: Generate Release
- uses: softprops/action-gh-release@v2
- with:
- draft: true
- files: ${{ env.OUTPUT_DIR }}/*
\ No newline at end of file
+ env:
+ GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+ run: |
+ gh release create ${{ github.ref_name }} \
+ --title "${{ github.ref_name }}" \
+ --draft \
+ ${{ env.OUTPUT_DIR }}/*
diff --git a/.gitignore b/.gitignore
index 2ad1ba86..0cd8a7b2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,7 +22,6 @@ mono_crash.*
[Rr]elease/
[Rr]eleases/
x64/
-x86/
[Ww][Ii][Nn]32/
[Aa][Rr][Mm]/
[Aa][Rr][Mm]64/
diff --git a/Directory.Build.props b/Directory.Build.props
new file mode 100644
index 00000000..9bc9e99c
--- /dev/null
+++ b/Directory.Build.props
@@ -0,0 +1,10 @@
+
+
+ 1.3.8
+ 4
+
+ $(AppVersion)
+ $(AppVersion)
+ $(AppVersion)
+
+
\ No newline at end of file
diff --git a/Directory.Packages.props b/Directory.Packages.props
new file mode 100644
index 00000000..bb225235
--- /dev/null
+++ b/Directory.Packages.props
@@ -0,0 +1,29 @@
+
+
+
+ true
+ true
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/IonKiwi.lz4/IonKiwi.lz4.csproj b/IonKiwi.lz4/IonKiwi.lz4.csproj
index 312984fb..d1006f0d 100644
--- a/IonKiwi.lz4/IonKiwi.lz4.csproj
+++ b/IonKiwi.lz4/IonKiwi.lz4.csproj
@@ -1,7 +1,13 @@
-
+
+ net10.0-android
+
+
+ net6.0
+
+
- net60
+ true
true
IonKiwi.lz4.managed
1.0.7
diff --git a/IonKiwi.lz4/LZ4RawUtility.cs b/IonKiwi.lz4/LZ4RawUtility.cs
index 95da0172..95e35f03 100644
--- a/IonKiwi.lz4/LZ4RawUtility.cs
+++ b/IonKiwi.lz4/LZ4RawUtility.cs
@@ -355,7 +355,9 @@ public static unsafe int LZ41_Stream_Decompress(Stream inputStream, Stream outpu
if (cmpBytes < 0 || cmpBytes > lz4.LZ4_compressBound(blockSize))
throw new Exception($"LZ41: block {currentBlock} compressed size out of range: {cmpBytes}");
byte[] cmpBuf = new byte[lz4.LZ4_compressBound(blockSize)];
- inputStream.Read(cmpBuf,0, cmpBytes);
+ var readBytes = inputStream.Read(cmpBuf,0, cmpBytes);
+ if (readBytes != cmpBytes)
+ throw new Exception("Incomplete read from stream");
fixed (byte* cmpPtr = cmpBuf)
{
fixed (byte* decBuf = new byte[blockSize])
diff --git a/Knossos.NET.Android/Icon.png b/Knossos.NET.Android/Icon.png
new file mode 100644
index 00000000..e0313cfc
Binary files /dev/null and b/Knossos.NET.Android/Icon.png differ
diff --git a/Knossos.NET.Android/Knossos.NET.Android.csproj b/Knossos.NET.Android/Knossos.NET.Android.csproj
new file mode 100644
index 00000000..0ed0d75f
--- /dev/null
+++ b/Knossos.NET.Android/Knossos.NET.Android.csproj
@@ -0,0 +1,49 @@
+
+
+ $(AppVersion)
+ $(AndroidVersionCode)
+ $(AndroidVersionCode)
+ com.knossosnet.knossosnet
+ android-arm64;android-x64;android-arm;android-x86
+ net10.0-android
+ 28
+ Exe
+ enable
+ apk
+ false
+ enable
+ true
+ true
+ false
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Resources\drawable\Icon.png
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Knossos.NET.Android/MainActivity.cs b/Knossos.NET.Android/MainActivity.cs
new file mode 100644
index 00000000..32f85482
--- /dev/null
+++ b/Knossos.NET.Android/MainActivity.cs
@@ -0,0 +1,154 @@
+using Android.Content;
+using Android.Content.PM;
+using Android.Views;
+using AndroidX.Core.Content;
+using AndroidX.Core.View;
+using Avalonia;
+using Avalonia.Android;
+using Avalonia.Threading;
+using Knossos.NET.Classes;
+using AndroidNet = global::Android.Net;
+
+namespace Knossos.NET.Android;
+
+[Activity(
+ Label = "Knossos.NET",
+ Theme = "@style/MyTheme.NoActionBar",
+ Icon = "@drawable/icon",
+ MainLauncher = true,
+ ConfigurationChanges = ConfigChanges.Orientation
+ | ConfigChanges.ScreenSize
+ | ConfigChanges.UiMode,
+ ScreenOrientation = ScreenOrientation.SensorLandscape)]
+public class MainActivity : AvaloniaMainActivity
+{
+ public static MainActivity? Instance { get; private set; }
+
+ protected override AppBuilder CustomizeAppBuilder(AppBuilder builder)
+ {
+ return base.CustomizeAppBuilder(builder)
+ .WithInterFont();
+ }
+
+ private void hideSystemUI()
+ {
+ WindowCompat.SetDecorFitsSystemWindows(Window, false);
+
+ var windowInsetsController = WindowCompat.GetInsetsController(Window, Window?.DecorView);
+
+ if (windowInsetsController != null)
+ {
+ // Hide both navigation and status bars
+ windowInsetsController.Hide(WindowInsetsCompat.Type.SystemBars());
+
+ // Or only navigation bars:
+ //windowInsetsController.Hide(WindowInsetsCompat.Type.NavigationBars());
+
+ // Set behavior to show bars temporarily on swipe
+ windowInsetsController.SystemBarsBehavior = WindowInsetsControllerCompat.BehaviorShowTransientBarsBySwipe;
+ }
+ }
+
+ public override void OnWindowFocusChanged(bool hasFocus)
+ {
+ base.OnWindowFocusChanged(hasFocus);
+ if(hasFocus)
+ hideSystemUI();
+ }
+
+ protected override void OnCreate(Bundle? savedInstanceState)
+ {
+ Window?.AddFlags(WindowManagerFlags.KeepScreenOn);
+ //Window?.AddFlags(WindowManagerFlags.Fullscreen);
+
+ base.OnCreate(savedInstanceState);
+ Instance = this;
+ AndroidHelper.ShareTextAsyncFunc = ShareTextFileAndroidAsync;
+ AndroidHelper.ShareFileAsyncFunc = OpenFileExternalApp;
+ AndroidHelper.OpenUrlAsyncFunc = OpenExternalURLAsync;
+ hideSystemUI();
+ }
+
+ protected override void OnResume()
+ {
+ base.OnResume();
+ hideSystemUI();
+ }
+
+ private static async Task ShareTextFileAndroidAsync(string texto)
+ {
+ await Dispatcher.UIThread.InvokeAsync(() =>
+ {
+ if (Instance == null) return;
+
+ var intent = new Intent(Intent.ActionSend);
+ intent.SetType("text/plain");
+ intent.PutExtra(Intent.ExtraText, texto);
+ intent.AddFlags(ActivityFlags.NewTask);
+
+ try
+ {
+ var chooser = Intent.CreateChooser(intent, "Open text with...");
+ Instance.StartActivity(chooser);
+ }
+ catch (Exception ex)
+ {
+ Log.Add(Log.LogSeverity.Error, "MainActivity.ShareTextFileAndroidAsync", ex);
+ }
+ });
+ }
+
+ private static async Task OpenFileExternalApp(string fullPath, string mimetype)
+ {
+ await Dispatcher.UIThread.InvokeAsync(() =>
+ {
+ if (!System.IO.File.Exists(fullPath) || Instance == null)
+ return;
+
+ try
+ {
+ var javaFile = new Java.IO.File(fullPath);
+ string authority = $"{Instance.PackageName}.fileprovider";
+
+ var uri = FileProvider.GetUriForFile(Instance, authority, javaFile);
+
+ var intent = new Intent(Intent.ActionView);
+ intent.SetDataAndType(uri, mimetype);
+ intent.AddFlags(ActivityFlags.GrantReadUriPermission);
+ intent.AddFlags(ActivityFlags.NewTask);
+
+ Instance.StartActivity(Intent.CreateChooser(intent, "Open file with..."));
+ }
+ catch (Exception ex)
+ {
+ Log.Add(Log.LogSeverity.Error, "MainActivity.OpenFileExternalApp", ex);
+ }
+ });
+ }
+
+ private static async Task OpenExternalURLAsync(string url)
+ {
+ if (string.IsNullOrWhiteSpace(url)) return;
+
+ await Dispatcher.UIThread.InvokeAsync(() =>
+ {
+ if (Instance == null) return;
+
+ try
+ {
+ if (!url.StartsWith("http", StringComparison.OrdinalIgnoreCase))
+ url = "https://" + url.Trim();
+
+ var uri = AndroidNet.Uri.Parse(url);
+ var intent = new Intent(Intent.ActionView, uri);
+ intent.AddFlags(ActivityFlags.NewTask);
+
+ Instance.StartActivity(intent);
+ }
+ catch (Exception ex)
+ {
+ Log.Add(Log.LogSeverity.Error, "MainActivity.OpenExternalURLAsync", ex);
+ }
+ });
+ }
+}
diff --git a/Knossos.NET.Android/Properties/AndroidManifest.xml b/Knossos.NET.Android/Properties/AndroidManifest.xml
new file mode 100644
index 00000000..a4306270
--- /dev/null
+++ b/Knossos.NET.Android/Properties/AndroidManifest.xml
@@ -0,0 +1,50 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Knossos.NET.Android/Resources/AboutResources.txt b/Knossos.NET.Android/Resources/AboutResources.txt
new file mode 100644
index 00000000..c2bca974
--- /dev/null
+++ b/Knossos.NET.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/Knossos.NET.Android/Resources/drawable-night-v31/avalonia_anim.xml b/Knossos.NET.Android/Resources/drawable-night-v31/avalonia_anim.xml
new file mode 100644
index 00000000..dde4b5a7
--- /dev/null
+++ b/Knossos.NET.Android/Resources/drawable-night-v31/avalonia_anim.xml
@@ -0,0 +1,66 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Knossos.NET.Android/Resources/drawable-v31/avalonia_anim.xml b/Knossos.NET.Android/Resources/drawable-v31/avalonia_anim.xml
new file mode 100644
index 00000000..94f27d9e
--- /dev/null
+++ b/Knossos.NET.Android/Resources/drawable-v31/avalonia_anim.xml
@@ -0,0 +1,71 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Knossos.NET.Android/Resources/drawable/splash_screen.xml b/Knossos.NET.Android/Resources/drawable/splash_screen.xml
new file mode 100644
index 00000000..2e920b4b
--- /dev/null
+++ b/Knossos.NET.Android/Resources/drawable/splash_screen.xml
@@ -0,0 +1,13 @@
+
+
+
+ -
+
+
+
+