Skip to content

Commit

Permalink
Merge pull request #210 from Mrxx99/feature/avaloniav11rc2.1
Browse files Browse the repository at this point in the history 
Updated to rc2.2
  • Loading branch information
@maxkatz6
maxkatz6 authored Jul 2, 2023
2 parents f291c60 + 3bf1e62 commit b005dcc
Show file tree
Hide file tree
Showing 24 changed files with 449 additions and 80 deletions.
4 changes: 2 additions & 2 deletions readme.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ Available parameters:

*Description*: The target version of Avalonia NuGet packages.

*Options*: **0.10.21**, **11.0.0-rc1.1**
*Options*: **0.10.21**, **11.0.0-rc2.2**

*By default*: 0.10.21

Expand Down Expand Up @@ -99,7 +99,7 @@ Available parameters:

*Description*: The target version of Avalonia NuGet packages.

*Options*: **0.10.21**, **11.0.0-rc1.1**
*Options*: **0.10.21**, **11.0.0-rc2.2**

*By default*: 0.10.21

Expand Down
4 changes: 2 additions & 2 deletions templates/csharp/app-mvvm/.template.config/template.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,8 @@
"description": "Target 0.10.21 (Latest stable)."
},
{
"choice": "11.0.0-rc1.1",
"description": "Target 11.0.0-rc1.1"
"choice": "11.0.0-rc2.2",
"description": "Target 11.0.0-rc2.2"
}
],
"replaces": "AvaloniaVersionTemplateParameter",
Expand Down
4 changes: 2 additions & 2 deletions templates/csharp/app/.template.config/template.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@
"description": "Target 0.10.21 (Latest stable)."
},
{
"choice": "11.0.0-rc1.1",
"description": "Target 11.0.0-rc1.1"
"choice": "11.0.0-rc2.2",
"description": "Target 11.0.0-rc2.2"
}
],
"replaces": "AvaloniaVersionTemplateParameter",
Expand Down
1 change: 1 addition & 0 deletions templates/csharp/xplat/AvaloniaTest.Android/AvaloniaTest.Android.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@

<ItemGroup>
<PackageReference Include="Avalonia.Android" Version="$(AvaloniaVersion)" />
<PackageReference Include="Xamarin.AndroidX.Core.SplashScreen" Version="1.0.1.1" />
</ItemGroup>

<ItemGroup>
Expand Down
17 changes: 15 additions & 2 deletions templates/csharp/xplat/AvaloniaTest.Android/MainActivity.cs
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,23 @@
using Android.App;
using Android.Content.PM;
using Avalonia;
using Avalonia.Android;
using Avalonia.ReactiveUI;

namespace AvaloniaTest.Android;

[Activity(Label = "AvaloniaTest.Android", Theme = "@style/MyTheme.NoActionBar", Icon = "@drawable/icon", LaunchMode = LaunchMode.SingleTop, ConfigurationChanges = ConfigChanges.Orientation | ConfigChanges.ScreenSize | ConfigChanges.UiMode)]
public class MainActivity : AvaloniaMainActivity
[Activity(
Label = "AvaloniaTest.Android",
Theme = "@style/MyTheme.NoActionBar",
Icon = "@drawable/icon",
MainLauncher = true,
ConfigurationChanges = ConfigChanges.Orientation | ConfigChanges.ScreenSize | ConfigChanges.UiMode)]
public class MainActivity : AvaloniaMainActivity<App>
{
protected override AppBuilder CustomizeAppBuilder(AppBuilder builder)
{
return base.CustomizeAppBuilder(builder)
.WithInterFont()
.UseReactiveUI();
}
}
44 changes: 44 additions & 0 deletions templates/csharp/xplat/AvaloniaTest.Android/Resources/AboutResources.txt
View file
Original file line number Diff line number Diff line change
@@ -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.
66 changes: 66 additions & 0 deletions templates/csharp/xplat/AvaloniaTest.Android/Resources/drawable-night-v31/avalonia_anim.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +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"/>
</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>
71 changes: 71 additions & 0 deletions templates/csharp/xplat/AvaloniaTest.Android/Resources/drawable-v31/avalonia_anim.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
<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:fillColor="#00ffffff"
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:fillColor="#00ffffff"
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:fillColor="#00ffffff"
android:strokeWidth="1"/>
</group>
</group>
</vector>
</aapt:attr>
<target android:name="path_2">
<aapt:attr name="android:animation">
<objectAnimator
android:propertyName="fillColor"
android:startOffset="100"
android:duration="900"
android:valueFrom="#00ffffff"
android:valueTo="#161c2d"
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="500"
android:valueFrom="#00ffffff"
android:valueTo="#f9f9fb"
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:startOffset="100"
android:duration="900"
android:valueFrom="#00ffffff"
android:valueTo="#161c2d"
android:valueType="colorType"
android:interpolator="@android:interpolator/fast_out_slow_in"/>
</aapt:attr>
</target>
</animated-vector>
21 changes: 21 additions & 0 deletions templates/csharp/xplat/AvaloniaTest.Android/Resources/values-v31/styles.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
<?xml version="1.0" encoding="utf-8" ?>
<resources>

<style name="MyTheme">
</style>

<style name="MyTheme.NoActionBar" parent="@style/Theme.AppCompat.NoActionBar">
<item name="android:windowActionBar">false</item>
<item name="android:windowBackground">@null</item>
<item name="android:windowNoTitle">true</item>
<item name="android:windowSplashScreenBackground">@color/splash_background</item>
<item name="android:windowSplashScreenAnimatedIcon">@drawable/avalonia_anim</item>
<item name="android:windowSplashScreenAnimationDuration">1000</item>
<item name="postSplashScreenTheme">@style/MyTheme.Main</item>

</style>
<style name="MyTheme.Main"
parent ="MyTheme.NoActionBar">
<item name="android:windowIsTranslucent">true</item>
</style>
</resources>
9 changes: 2 additions & 7 deletions templates/csharp/xplat/AvaloniaTest.Android/Resources/values/styles.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,9 @@
<style name="MyTheme">
</style>

<style name="MyTheme.NoActionBar" parent="@style/Theme.AppCompat.NoActionBar">
<style name="MyTheme.NoActionBar" parent="@style/Theme.AppCompat.DayNight.NoActionBar">
<item name="android:windowActionBar">false</item>
<item name="android:windowNoTitle">true</item>
</style>

<style name="MyTheme.Splash" parent ="MyTheme.NoActionBar">
<item name="android:windowBackground">@drawable/splash_screen</item>
<item name="android:windowContentOverlay">@null</item>
<item name="android:windowNoTitle">true</item>
</style>

</resources>
32 changes: 0 additions & 32 deletions templates/csharp/xplat/AvaloniaTest.Android/SplashActivity.cs
View file

This file was deleted.

2 changes: 1 addition & 1 deletion templates/csharp/xplat/Directory.Build.props
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project>
<PropertyGroup>
<Nullable>enable</Nullable>
<AvaloniaVersion>11.0.0-rc1.1</AvaloniaVersion>
<AvaloniaVersion>11.0.0-rc2.2</AvaloniaVersion>
</PropertyGroup>
</Project>
4 changes: 2 additions & 2 deletions templates/fsharp/app-mvvm/.template.config/template.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,8 @@
"description": "Target 0.10.21 (Latest stable)."
},
{
"choice": "11.0.0-rc1.1",
"description": "Target 11.0.0-rc1.1"
"choice": "11.0.0-rc2.2",
"description": "Target 11.0.0-rc2.2"
}
],
"replaces": "AvaloniaVersionTemplateParameter",
Expand Down
4 changes: 2 additions & 2 deletions templates/fsharp/app/.template.config/template.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@
"description": "Target 0.10.21 (Latest stable)."
},
{
"choice": "11.0.0-rc1.1",
"description": "Target 11.0.0-rc1.1"
"choice": "11.0.0-rc2.2",
"description": "Target 11.0.0-rc2.2"
}
],
"replaces": "AvaloniaVersionTemplateParameter",
Expand Down
20 changes: 4 additions & 16 deletions templates/fsharp/xplat/AvaloniaTest.Android/Activities.fs
View file
Original file line number Diff line number Diff line change
@@ -1,34 +1,22 @@
namespace AvaloniaTest.Android

open Android.App
open Android.Content
open Android.Content.PM
open Avalonia
open Avalonia.ReactiveUI
open Android.OS
type Application = Android.App.Application

open Avalonia.Android
open AvaloniaTest

[<Activity(
Label = "AvaloniaTest.Android",
Theme = "@style/MyTheme.NoActionBar",
Icon = "@drawable/icon",
LaunchMode = LaunchMode.SingleTop,
ConfigurationChanges = (ConfigChanges.Orientation ||| ConfigChanges.ScreenSize))>]
MainLauncher = true,
ConfigurationChanges = (ConfigChanges.Orientation ||| ConfigChanges.ScreenSize ||| ConfigChanges.UiMode))>]
type MainActivity() =
inherit AvaloniaMainActivity()


[<Activity(Theme = "@style/MyTheme.Splash", MainLauncher = true, NoHistory = true)>]
type SplashActivity() =
inherit AvaloniaSplashActivity<App>()
inherit AvaloniaMainActivity<App>()

override _.CustomizeAppBuilder(builder) =
base.CustomizeAppBuilder(builder)
.WithInterFont()
.UseReactiveUI()

override x.OnResume() =
base.OnResume()
x.StartActivity(new Intent(Application.Context, typeof<MainActivity>))
Loading

0 comments on commit b005dcc

Please sign in to comment.