Feature/redesign UI

.github/workflows/build-release-android.yml

@@ -18,6 +18,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
+        os: [ubuntu-latest]
         arch: [x64, arm64]
 
     steps:

.github/workflows/build_and_release_all.yml

@@ -10,7 +10,7 @@ on:
       branch:
         description: 'Branch to build'
         required: false
-        default: 'master'  # Fallback to a default branch if not specified
+        default: ''
   push:
     tags:
       - 'release-v*'       # Trigger for tags that start with 'v', e.g., v1.0.0, v2.1.3
@@ -37,16 +37,12 @@ jobs:
         id: get_version
         run: |
           if [[ "${{ github.event_name }}" == "workflow_dispatch" ]]; then
-            if [[ "${{ inputs.branch }}" == refs/heads/* ]]; then
-              VERSION="0.0.1"
-            else
-              VERSION="${{ inputs.branch }}"
-            fi
+            echo "** workflow_dispatch"
+            VERSION="0.0.1"
           elif [[ "${{ github.ref_type }}" == "tag" ]]; then
+            echo "** tag"
             VERSION=${GITHUB_REF#refs/tags/}
             VERSION=${VERSION#release-v}
-          else
-            VERSION="0.0.1"
           fi
           echo "VERSION=$VERSION" >> $GITHUB_ENV
           echo "v$VERSION" > OpenIPC_Config/VERSION

Directory.Build.props

@@ -1,6 +1,6 @@
 <Project>
     <PropertyGroup>
         <Nullable>enable</Nullable>
-        <AvaloniaVersion>11.1.3</AvaloniaVersion>
+        <AvaloniaVersion>11.2.3</AvaloniaVersion>
     </PropertyGroup>
 </Project>

OpenIPC_Config.Android/Helpers/AndroidFileHelper.cs

@@ -1,5 +1,6 @@
 using System;
 using System.IO;
+using Android.App;
 using Android.Content;
 using Android.Content.Res;
 using Android.Util;
@@ -11,8 +12,8 @@ public class AndroidFileHelper
     public static string ReadAssetFile(string relativePath)
     {
         // var assets = Android.App.Application.Context.Assets;
-        var assets = global::Android.App.Application.Context.Assets;
-        
+        var assets = Application.Context.Assets;
+
         using (var stream = assets.Open(relativePath))
         using (var reader = new StreamReader(stream))
         {
@@ -22,14 +23,14 @@ public static string ReadAssetFile(string relativePath)
 
     public static string[] ListAssetFiles(string folderPath)
     {
-        var assets = global::Android.App.Application.Context.Assets;
+        var assets = Application.Context.Assets;
         return assets.List(folderPath); // Lists all files in the folder
     }
-    
+
     public static void CopyAssetsToInternalStorage(Context context)
     {
-        AssetManager assets = context.Assets;
-        string internalStoragePath = context.FilesDir.AbsolutePath; // Internal storage path
+        var assets = context.Assets;
+        var internalStoragePath = context.FilesDir.AbsolutePath; // Internal storage path
 
         // Start recursive copy from the root "binaries" folder
         CopyFolder(assets, "binaries", internalStoragePath);
@@ -45,10 +46,10 @@ private static void CopyFolder(AssetManager assets, string sourceFolder, string
             // List all items (files and folders) in the source folder
             string[] items = assets.List(sourceFolder);
 
-            foreach (string item in items)
+            foreach (var item in items)
             {
-                string sourcePath = string.IsNullOrEmpty(sourceFolder) ? item : $"{sourceFolder}/{item}";
-                string destinationPath = Path.Combine(destinationFolder, item);
+                var sourcePath = string.IsNullOrEmpty(sourceFolder) ? item : $"{sourceFolder}/{item}";
+                var destinationPath = Path.Combine(destinationFolder, item);
 
                 // Check if the item is a directory or file
                 if (assets.List(sourcePath).Length > 0)
@@ -59,8 +60,8 @@ private static void CopyFolder(AssetManager assets, string sourceFolder, string
                 else
                 {
                     // If it's a file, copy it
-                    using (Stream input = assets.Open(sourcePath))
-                    using (FileStream output = new FileStream(destinationPath, FileMode.Create))
+                    using (var input = assets.Open(sourcePath))
+                    using (var output = new FileStream(destinationPath, FileMode.Create))
                     {
                         input.CopyTo(output);
                     }

OpenIPC_Config.Android/MainActivity.cs

@@ -1,12 +1,11 @@
-using System;
-using Android.App;
+using Android.App;
 using Android.Content.PM;
 using Android.OS;
 using Android.Views;
 using Avalonia;
 using Avalonia.Android;
-using Java.Lang;
 using OpenIPC_Config.Android.Helpers;
+using Application = Android.App.Application;
 
 namespace OpenIPC_Config.Android;
 
@@ -18,24 +17,22 @@ namespace OpenIPC_Config.Android;
     ConfigurationChanges = ConfigChanges.Orientation | ConfigChanges.ScreenSize | ConfigChanges.UiMode)]
 public class MainActivity : AvaloniaMainActivity<App>
 {
-
     // Adjust the layout when the keyboard is shown
     protected override void OnCreate(Bundle? savedInstanceState)
     {
         base.OnCreate(savedInstanceState);
-    
+
         // Hide the soft keyboard initially
         Window.SetSoftInputMode(SoftInput.StateHidden);
-    
+
         // Optionally, adjust the layout when the keyboard is shown
         Window.SetSoftInputMode(SoftInput.AdjustResize);
     }
-    
+
     protected override AppBuilder CustomizeAppBuilder(AppBuilder builder)
     {
-
-        AndroidFileHelper.CopyAssetsToInternalStorage(global::Android.App.Application.Context);      
-
+        AndroidFileHelper.CopyAssetsToInternalStorage(Application.Context);
+
         return base.CustomizeAppBuilder(builder)
             .WithInterFont();
     }

OpenIPC_Config.Android/OpenIPC_Config.Android.csproj

@@ -29,30 +29,32 @@
         </AndroidAsset>
     </ItemGroup>
 
-    
+
     <ItemGroup>
         <PackageReference Include="Avalonia.Android" Version="$(AvaloniaVersion)"/>
-        <PackageReference Include="MessageBox.Avalonia" Version="3.2.0" />
-        <PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.0-rc.2.24473.5" />
-        <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="9.0.0-rc.2.24473.5" />
-        <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.0" />
-        <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-        <PackageReference Include="Prism.Core" Version="9.0.537" />
-        <PackageReference Include="ReactiveUI" Version="20.1.63" />
-        <PackageReference Include="Serilog" Version="4.1.1-dev-02318" />
-        <PackageReference Include="Serilog.Settings.AppSettings" Version="3.0.0" />
-        <PackageReference Include="Serilog.Settings.Configuration" Version="8.0.4" />
-        <PackageReference Include="Serilog.Sinks.Console" Version="6.0.0" />
-        <PackageReference Include="Serilog.Sinks.Debug" Version="3.0.0" />
-        <PackageReference Include="Serilog.Sinks.File" Version="6.0.0" />
-        <PackageReference Include="Serilog.Sinks.RollingFile" Version="3.3.1-dev-00771" />
-        <PackageReference Include="Serilog.Sinks.TextWriter" Version="3.0.0" />
-        <PackageReference Include="SSH.NET" Version="2024.1.0" />
+        <PackageReference Include="Avalonia.Svg.Skia" Version="11.2.0.2"/>
+        <PackageReference Include="MessageBox.Avalonia" Version="3.2.0"/>
+        <PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.0-rc.2.24473.5"/>
+        <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="9.0.0-rc.2.24473.5"/>
+        <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.0"/>
+        <PackageReference Include="Newtonsoft.Json" Version="13.0.3"/>
+        <PackageReference Include="Prism.Core" Version="9.0.537"/>
+        <PackageReference Include="ReactiveUI" Version="20.1.63"/>
+        <PackageReference Include="Serilog" Version="4.1.1-dev-02318"/>
+        <PackageReference Include="Serilog.Settings.AppSettings" Version="3.0.0"/>
+        <PackageReference Include="Serilog.Settings.Configuration" Version="8.0.4"/>
+        <PackageReference Include="Serilog.Sinks.Console" Version="6.0.0"/>
+        <PackageReference Include="Serilog.Sinks.Debug" Version="3.0.0"/>
+        <PackageReference Include="Serilog.Sinks.File" Version="6.0.0"/>
+        <PackageReference Include="Serilog.Sinks.RollingFile" Version="3.3.1-dev-00771"/>
+        <PackageReference Include="Serilog.Sinks.TextWriter" Version="3.0.0"/>
+        <PackageReference Include="SharpCompress" Version="0.39.0" />
+        <PackageReference Include="SSH.NET" Version="2024.1.0"/>
         <PackageReference Include="Xamarin.AndroidX.Core.SplashScreen" Version="1.0.1.1"/>
-        <PackageReference Include="YamlDotNet" Version="16.1.3" />
+        <PackageReference Include="YamlDotNet" Version="16.1.3"/>
     </ItemGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\OpenIPC_Config\OpenIPC_Config.csproj" />
+        <ProjectReference Include="..\OpenIPC_Config\OpenIPC_Config.csproj"/>
     </ItemGroup>
 </Project>

OpenIPC_Config.Android/Properties/AndroidManifest.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" android:installLocation="auto">
-	<uses-permission android:name="android.permission.INTERNET" />
-	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-	<application android:label="OpenIPC_Config" android:icon="@drawable/Icon" />
+    <uses-permission android:name="android.permission.INTERNET"/>
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+    <application android:label="OpenIPC_Config" android:icon="@drawable/Icon"/>
 </manifest>

OpenIPC_Config.Android/Resources/drawable-night-v31/avalonia_anim.xml

@@ -1,66 +1,66 @@
 <animated-vector
-  xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:aapt="http://schemas.android.com/aapt">
-  <aapt:attr name="android:drawable">
-    <vector
-      android:name="vector"
-      android:width="128dp"
-      android:height="128dp"
-      android:viewportWidth="128"
-      android:viewportHeight="128">
-      <group
-        android:name="wrapper"
-        android:translateX="21"
-        android:translateY="21">
-        <group android:name="group">
-          <path
-            android:name="path"
-            android:pathData="M 74.853 85.823 L 75.368 85.823 C 80.735 85.823 85.144 81.803 85.761 76.602 L 85.836 41.76 C 85.225 18.593 66.254 0 42.939 0 C 19.24 0 0.028 19.212 0.028 42.912 C 0.028 66.357 18.831 85.418 42.18 85.823 L 74.853 85.823 Z"
-            android:strokeWidth="1"/>
-          <path
-            android:name="path_1"
-            android:pathData="M 43.059 14.614 C 29.551 14.614 18.256 24.082 15.445 36.743 C 18.136 37.498 20.109 39.968 20.109 42.899 C 20.109 45.831 18.136 48.301 15.445 49.055 C 18.256 61.716 29.551 71.184 43.059 71.184 C 47.975 71.184 52.599 69.93 56.628 67.723 L 56.628 70.993 L 71.344 70.993 L 71.344 44.072 C 71.357 43.714 71.344 43.26 71.344 42.899 C 71.344 27.278 58.68 14.614 43.059 14.614 Z M 29.51 42.899 C 29.51 35.416 35.576 29.35 43.059 29.35 C 50.541 29.35 56.607 35.416 56.607 42.899 C 56.607 50.382 50.541 56.448 43.059 56.448 C 35.576 56.448 29.51 50.382 29.51 42.899 Z"
-            android:strokeWidth="1"
-            android:fillType="evenOdd"/>
-          <path
-            android:name="path_2"
-            android:pathData="M 18.105 42.88 C 18.105 45.38 16.078 47.407 13.579 47.407 C 11.079 47.407 9.052 45.38 9.052 42.88 C 9.052 40.381 11.079 38.354 13.579 38.354 C 16.078 38.354 18.105 40.381 18.105 42.88 Z"
-            android:strokeWidth="1"/>
-        </group>
-      </group>
-    </vector>
-  </aapt:attr>
-  <target android:name="path">
-    <aapt:attr name="android:animation">
-      <objectAnimator
-        android:propertyName="fillColor"
-        android:duration="1000"
-        android:valueFrom="#00ffffff"
-        android:valueTo="#161c2d"
-        android:valueType="colorType"
-        android:interpolator="@android:interpolator/fast_out_slow_in"/>
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:aapt="http://schemas.android.com/aapt">
+    <aapt:attr name="android:drawable">
+        <vector
+                android:name="vector"
+                android:width="128dp"
+                android:height="128dp"
+                android:viewportWidth="128"
+                android:viewportHeight="128">
+            <group
+                    android:name="wrapper"
+                    android:translateX="21"
+                    android:translateY="21">
+                <group android:name="group">
+                    <path
+                            android:name="path"
+                            android:pathData="M 74.853 85.823 L 75.368 85.823 C 80.735 85.823 85.144 81.803 85.761 76.602 L 85.836 41.76 C 85.225 18.593 66.254 0 42.939 0 C 19.24 0 0.028 19.212 0.028 42.912 C 0.028 66.357 18.831 85.418 42.18 85.823 L 74.853 85.823 Z"
+                            android:strokeWidth="1"/>
+                    <path
+                            android:name="path_1"
+                            android:pathData="M 43.059 14.614 C 29.551 14.614 18.256 24.082 15.445 36.743 C 18.136 37.498 20.109 39.968 20.109 42.899 C 20.109 45.831 18.136 48.301 15.445 49.055 C 18.256 61.716 29.551 71.184 43.059 71.184 C 47.975 71.184 52.599 69.93 56.628 67.723 L 56.628 70.993 L 71.344 70.993 L 71.344 44.072 C 71.357 43.714 71.344 43.26 71.344 42.899 C 71.344 27.278 58.68 14.614 43.059 14.614 Z M 29.51 42.899 C 29.51 35.416 35.576 29.35 43.059 29.35 C 50.541 29.35 56.607 35.416 56.607 42.899 C 56.607 50.382 50.541 56.448 43.059 56.448 C 35.576 56.448 29.51 50.382 29.51 42.899 Z"
+                            android:strokeWidth="1"
+                            android:fillType="evenOdd"/>
+                    <path
+                            android:name="path_2"
+                            android:pathData="M 18.105 42.88 C 18.105 45.38 16.078 47.407 13.579 47.407 C 11.079 47.407 9.052 45.38 9.052 42.88 C 9.052 40.381 11.079 38.354 13.579 38.354 C 16.078 38.354 18.105 40.381 18.105 42.88 Z"
+                            android:strokeWidth="1"/>
+                </group>
+            </group>
+        </vector>
     </aapt:attr>
-  </target>
-  <target android:name="path_1">
-    <aapt:attr name="android:animation">
-      <objectAnimator
-        android:propertyName="fillColor"
-        android:duration="1000"
-        android:valueFrom="#00ffffff"
-        android:valueTo="#f9f9fb"
-        android:valueType="colorType"
-        android:interpolator="@android:interpolator/fast_out_slow_in"/>
-    </aapt:attr>
-  </target>
-  <target android:name="path_2">
-    <aapt:attr name="android:animation">
-      <objectAnimator
-        android:propertyName="fillColor"
-        android:duration="1000"
-        android:valueFrom="#00ffffff"
-        android:valueTo="#f9f9fb"
-        android:valueType="colorType"
-        android:interpolator="@android:interpolator/fast_out_slow_in"/>
-    </aapt:attr>
-  </target>
+    <target android:name="path">
+        <aapt:attr name="android:animation">
+            <objectAnimator
+                    android:propertyName="fillColor"
+                    android:duration="1000"
+                    android:valueFrom="#00ffffff"
+                    android:valueTo="#161c2d"
+                    android:valueType="colorType"
+                    android:interpolator="@android:interpolator/fast_out_slow_in"/>
+        </aapt:attr>
+    </target>
+    <target android:name="path_1">
+        <aapt:attr name="android:animation">
+            <objectAnimator
+                    android:propertyName="fillColor"
+                    android:duration="1000"
+                    android:valueFrom="#00ffffff"
+                    android:valueTo="#f9f9fb"
+                    android:valueType="colorType"
+                    android:interpolator="@android:interpolator/fast_out_slow_in"/>
+        </aapt:attr>
+    </target>
+    <target android:name="path_2">
+        <aapt:attr name="android:animation">
+            <objectAnimator
+                    android:propertyName="fillColor"
+                    android:duration="1000"
+                    android:valueFrom="#00ffffff"
+                    android:valueTo="#f9f9fb"
+                    android:valueType="colorType"
+                    android:interpolator="@android:interpolator/fast_out_slow_in"/>
+        </aapt:attr>
+    </target>
 </animated-vector>