Update samples and templates

.config/dotnet-tools.json

@@ -3,13 +3,13 @@
   "isRoot": true,
   "tools": {
     "paket": {
-      "version": "5.245.1",
+      "version": "5.257.0",
       "commands": [
         "paket"
       ]
     },
     "fake-cli": {
-      "version": "5.20.0",
+      "version": "5.20.3",
       "commands": [
         "fake"
       ]

Directory.Build.props

@@ -3,8 +3,10 @@
   <PropertyGroup>
     <Version>0.60.0</Version>
     <Authors>Fabulous Contributors</Authors>
-    <PackageVersion>0.60.0-preview1</PackageVersion>
-    <PackageReleaseNotes>[Fabulous.XamarinForms] Disabled StructMemoization to check if it's the source of some issues</PackageReleaseNotes>
+    <PackageVersion>0.60.0-preview4</PackageVersion>
+    <PackageReleaseNotes>[Fabulous.XamarinForms] [Templates] Updated templates to target Android 11 by default
+[Fabulous.XamarinForms] [Templates] Fixed fabulous-cli version referenced in templates
+[Fabulous.XamarinForms] [Samples] Updated samples to target Android 11</PackageReleaseNotes>
     <PackageRequireLicenseAcceptance>False</PackageRequireLicenseAcceptance>
     <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
     <PackageProjectUrl>https://github.com/fsprojects/Fabulous</PackageProjectUrl>

Fabulous.StaticView/samples/StaticViewCounterApp/Droid/Properties/AssemblyInfo.fs → Fabulous.StaticView/samples/StaticViewCounterApp/Droid/AssemblyInfo.fs

@@ -2,6 +2,10 @@
 open System.Reflection
 open System.Runtime.CompilerServices
 
+// the name of the type here needs to match the name inside the ResourceDesigner attribute
+type Resources = Droid.Resource
+[<assembly: Android.Runtime.ResourceDesigner("Droid.Resources", IsApplication=true)>]
+
 [<assembly: AssemblyTitle("Droid")>]
 [<assembly: AssemblyDescription("")>]
 [<assembly: AssemblyConfiguration("")>]

Fabulous.StaticView/samples/StaticViewCounterApp/Droid/MainActivity.fs

@@ -1,23 +1,20 @@
-// Copyright 2018 Fabulous contributors. See LICENSE.md for license.
+// Copyright Fabulous contributors. See LICENSE.md for license.
 namespace Droid
 
-open System
-
 open Android.App
-open Android.Content
 open Android.Content.PM
-open Android.Runtime
-open Android.Views
-open Android.Widget
 open Android.OS
+open Xamarin.Forms.Platform.Android
+open StaticViewCounterApp
 
-[<Activity (Label = "StaticViewCounterApp", Icon = "@drawable/icon", MainLauncher = true, ConfigurationChanges = (ConfigChanges.ScreenSize ||| ConfigChanges.Orientation))>]
+[<Activity (Label = "StaticViewCounterApp", Icon = "@drawable/icon", Theme = "@style/MyTheme", MainLauncher = true, ConfigurationChanges = (ConfigChanges.ScreenSize ||| ConfigChanges.Orientation))>]
 type MainActivity() =
     inherit Xamarin.Forms.Platform.Android.FormsApplicationActivity()
-    override this.OnCreate (bundle: Bundle) =
-        base.OnCreate (bundle)
-
-        Xamarin.Forms.Forms.Init (this, bundle)
+    override this.OnCreate(bundle: Bundle) =
+        FormsAppCompatActivity.TabLayoutResource <- Resources.Layout.Tabbar
+        FormsAppCompatActivity.ToolbarResource <- Resources.Layout.Toolbar
 
-        this.LoadApplication (new StaticViewCounterApp.StaticViewCounterApp ())
+        base.OnCreate(bundle)
+        Xamarin.Forms.Forms.Init(this, bundle)
+        this.LoadApplication(StaticViewCounterApp())
 

Fabulous.StaticView/samples/StaticViewCounterApp/Droid/Properties/AndroidManifest.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" android:versionName="1.0" package="org.fabulous.StaticViewCounterApp">
-	<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="28" />
+	<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="30" />
 	<application android:label="StaticViewCounterApp"></application>
 </manifest>

Fabulous.StaticView/samples/StaticViewCounterApp/Droid/Resources/layout/Tabbar.axml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.design.widget.TabLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/sliding_tabs" android:layout_width="match_parent" android:layout_height="wrap_content" android:background="?attr/colorPrimary" android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" app:tabIndicatorColor="@android:color/white" app:tabGravity="fill" app:tabMode="fixed" />

Fabulous.StaticView/samples/StaticViewCounterApp/Droid/Resources/layout/Toolbar.axml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.design.widget.TabLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/sliding_tabs" android:layout_width="match_parent" android:layout_height="wrap_content" android:background="?attr/colorPrimary" android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" app:tabIndicatorColor="@android:color/white" app:tabGravity="fill" app:tabMode="fixed" />

Fabulous.StaticView/samples/StaticViewCounterApp/Droid/Resources/values/styles.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources>
+    <style name="MyTheme" parent="MyTheme.Base">
+    </style>
+    <!-- Base theme applied no matter what API -->
+    <style name="MyTheme.Base" parent="Theme.AppCompat.Light.DarkActionBar">
+        <!--If you are using revision 22.1 please use just windowNoTitle. Without android:-->
+        <item name="windowNoTitle">true</item>
+        <!--We will be using the toolbar so no need to show ActionBar-->
+        <item name="windowActionBar">false</item>
+        <!-- Set theme colors from http://www.google.com/design/spec/style/color.html#color-color-palette-->
+        <!-- colorPrimary is used for the default action bar background -->
+        <item name="colorPrimary">#2196F3</item>
+        <!-- colorPrimaryDark is used for the status bar -->
+        <item name="colorPrimaryDark">#1976D2</item>
+        <!-- colorAccent is used as the default value for colorControlActivated
+         which is used to tint widgets -->
+        <item name="colorAccent">#FF4081</item>
+        <!-- You can also set colorControlNormal, colorControlActivated
+         colorControlHighlight and colorSwitchThumbNormal. -->
+        <item name="windowActionModeOverlay">true</item>
+        <item name="android:datePickerDialogTheme">@style/AppCompatDialogStyle</item>
+    </style>
+    <style name="AppCompatDialogStyle" parent="Theme.AppCompat.Light.Dialog">
+        <item name="colorAccent">#FF4081</item>
+    </style>
+</resources>