diff --git a/.gitignore b/.gitignore
index dfcfd56..5561df1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -348,3 +348,5 @@ MigrationBackup/
# Ionide (cross platform F# VS Code tools) working folder
.ionide/
+.idea
+src/.idea
diff --git a/src/.idea/.idea.AvaloniaInside.Shell/.idea/.gitignore b/src/.idea/.idea.AvaloniaInside.Shell/.idea/.gitignore
deleted file mode 100644
index 4bcd106..0000000
--- a/src/.idea/.idea.AvaloniaInside.Shell/.idea/.gitignore
+++ /dev/null
@@ -1,13 +0,0 @@
-# Default ignored files
-/shelf/
-/workspace.xml
-# Rider ignored files
-/projectSettingsUpdater.xml
-/modules.xml
-/.idea.AvaloniaInside.Shell.iml
-/contentModel.xml
-# Editor-based HTTP Client requests
-/httpRequests/
-# Datasource local storage ignored files
-/dataSources/
-/dataSources.local.xml
diff --git a/src/.idea/.idea.AvaloniaInside.Shell/.idea/.name b/src/.idea/.idea.AvaloniaInside.Shell/.idea/.name
deleted file mode 100644
index 5af6551..0000000
--- a/src/.idea/.idea.AvaloniaInside.Shell/.idea/.name
+++ /dev/null
@@ -1 +0,0 @@
-AvaloniaInside.Shell
\ No newline at end of file
diff --git a/src/.idea/.idea.AvaloniaInside.Shell/.idea/avalonia.xml b/src/.idea/.idea.AvaloniaInside.Shell/.idea/avalonia.xml
deleted file mode 100644
index c7ac0c0..0000000
--- a/src/.idea/.idea.AvaloniaInside.Shell/.idea/avalonia.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/.idea/.idea.AvaloniaInside.Shell/.idea/indexLayout.xml b/src/.idea/.idea.AvaloniaInside.Shell/.idea/indexLayout.xml
deleted file mode 100644
index 7b08163..0000000
--- a/src/.idea/.idea.AvaloniaInside.Shell/.idea/indexLayout.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/.idea/.idea.AvaloniaInside.Shell/.idea/libraries/android_support_multidex.xml b/src/.idea/.idea.AvaloniaInside.Shell/.idea/libraries/android_support_multidex.xml
deleted file mode 100644
index a695de2..0000000
--- a/src/.idea/.idea.AvaloniaInside.Shell/.idea/libraries/android_support_multidex.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/.idea/.idea.AvaloniaInside.Shell/.idea/libraries/androidx_activity_activity.xml b/src/.idea/.idea.AvaloniaInside.Shell/.idea/libraries/androidx_activity_activity.xml
deleted file mode 100644
index f9c4041..0000000
--- a/src/.idea/.idea.AvaloniaInside.Shell/.idea/libraries/androidx_activity_activity.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/.idea/.idea.AvaloniaInside.Shell/.idea/libraries/androidx_annotation_annotation.xml b/src/.idea/.idea.AvaloniaInside.Shell/.idea/libraries/androidx_annotation_annotation.xml
deleted file mode 100644
index 7fd1a19..0000000
--- a/src/.idea/.idea.AvaloniaInside.Shell/.idea/libraries/androidx_annotation_annotation.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/.idea/.idea.AvaloniaInside.Shell/.idea/libraries/androidx_annotation_annotation_experimental.xml b/src/.idea/.idea.AvaloniaInside.Shell/.idea/libraries/androidx_annotation_annotation_experimental.xml
deleted file mode 100644
index 9c3fbbd..0000000
--- a/src/.idea/.idea.AvaloniaInside.Shell/.idea/libraries/androidx_annotation_annotation_experimental.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/.idea/.idea.AvaloniaInside.Shell/.idea/libraries/androidx_annotation_annotation_jvm.xml b/src/.idea/.idea.AvaloniaInside.Shell/.idea/libraries/androidx_annotation_annotation_jvm.xml
deleted file mode 100644
index bf38a7f..0000000
--- a/src/.idea/.idea.AvaloniaInside.Shell/.idea/libraries/androidx_annotation_annotation_jvm.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/.idea/.idea.AvaloniaInside.Shell/.idea/libraries/androidx_appcompat_appcompat.xml b/src/.idea/.idea.AvaloniaInside.Shell/.idea/libraries/androidx_appcompat_appcompat.xml
deleted file mode 100644
index 72460ec..0000000
--- a/src/.idea/.idea.AvaloniaInside.Shell/.idea/libraries/androidx_appcompat_appcompat.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/.idea/.idea.AvaloniaInside.Shell/.idea/libraries/androidx_appcompat_appcompat_resources.xml b/src/.idea/.idea.AvaloniaInside.Shell/.idea/libraries/androidx_appcompat_appcompat_resources.xml
deleted file mode 100644
index aaa23cf..0000000
--- a/src/.idea/.idea.AvaloniaInside.Shell/.idea/libraries/androidx_appcompat_appcompat_resources.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/.idea/.idea.AvaloniaInside.Shell/.idea/libraries/androidx_arch_core_core_common.xml b/src/.idea/.idea.AvaloniaInside.Shell/.idea/libraries/androidx_arch_core_core_common.xml
deleted file mode 100644
index affac6b..0000000
--- a/src/.idea/.idea.AvaloniaInside.Shell/.idea/libraries/androidx_arch_core_core_common.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/.idea/.idea.AvaloniaInside.Shell/.idea/libraries/androidx_arch_core_core_runtime.xml b/src/.idea/.idea.AvaloniaInside.Shell/.idea/libraries/androidx_arch_core_core_runtime.xml
deleted file mode 100644
index 9bcac3c..0000000
--- a/src/.idea/.idea.AvaloniaInside.Shell/.idea/libraries/androidx_arch_core_core_runtime.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/.idea/.idea.AvaloniaInside.Shell/.idea/libraries/androidx_collection_collection.xml b/src/.idea/.idea.AvaloniaInside.Shell/.idea/libraries/androidx_collection_collection.xml
deleted file mode 100644
index 1a451c4..0000000
--- a/src/.idea/.idea.AvaloniaInside.Shell/.idea/libraries/androidx_collection_collection.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/.idea/.idea.AvaloniaInside.Shell/.idea/libraries/androidx_collection_collection_jvm.xml b/src/.idea/.idea.AvaloniaInside.Shell/.idea/libraries/androidx_collection_collection_jvm.xml
deleted file mode 100644
index 91a5ff7..0000000
--- a/src/.idea/.idea.AvaloniaInside.Shell/.idea/libraries/androidx_collection_collection_jvm.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/.idea/.idea.AvaloniaInside.Shell/.idea/libraries/androidx_concurrent_concurrent_futures.xml b/src/.idea/.idea.AvaloniaInside.Shell/.idea/libraries/androidx_concurrent_concurrent_futures.xml
deleted file mode 100644
index d484047..0000000
--- a/src/.idea/.idea.AvaloniaInside.Shell/.idea/libraries/androidx_concurrent_concurrent_futures.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/.idea/.idea.AvaloniaInside.Shell/.idea/libraries/androidx_core_core.xml b/src/.idea/.idea.AvaloniaInside.Shell/.idea/libraries/androidx_core_core.xml
deleted file mode 100644
index d937f68..0000000
--- a/src/.idea/.idea.AvaloniaInside.Shell/.idea/libraries/androidx_core_core.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/.idea/.idea.AvaloniaInside.Shell/.idea/libraries/androidx_core_core_ktx.xml b/src/.idea/.idea.AvaloniaInside.Shell/.idea/libraries/androidx_core_core_ktx.xml
deleted file mode 100644
index 3203bb9..0000000
--- a/src/.idea/.idea.AvaloniaInside.Shell/.idea/libraries/androidx_core_core_ktx.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/.idea/.idea.AvaloniaInside.Shell/.idea/libraries/androidx_core_core_splashscreen.xml b/src/.idea/.idea.AvaloniaInside.Shell/.idea/libraries/androidx_core_core_splashscreen.xml
deleted file mode 100644
index 241ff29..0000000
--- a/src/.idea/.idea.AvaloniaInside.Shell/.idea/libraries/androidx_core_core_splashscreen.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/.idea/.idea.AvaloniaInside.Shell/.idea/libraries/androidx_cursoradapter_cursoradapter.xml b/src/.idea/.idea.AvaloniaInside.Shell/.idea/libraries/androidx_cursoradapter_cursoradapter.xml
deleted file mode 100644
index 2e5715c..0000000
--- a/src/.idea/.idea.AvaloniaInside.Shell/.idea/libraries/androidx_cursoradapter_cursoradapter.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/.idea/.idea.AvaloniaInside.Shell/.idea/libraries/androidx_customview_customview.xml b/src/.idea/.idea.AvaloniaInside.Shell/.idea/libraries/androidx_customview_customview.xml
deleted file mode 100644
index 5d66dac..0000000
--- a/src/.idea/.idea.AvaloniaInside.Shell/.idea/libraries/androidx_customview_customview.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/.idea/.idea.AvaloniaInside.Shell/.idea/libraries/androidx_documentfile_documentfile.xml b/src/.idea/.idea.AvaloniaInside.Shell/.idea/libraries/androidx_documentfile_documentfile.xml
deleted file mode 100644
index dfcc871..0000000
--- a/src/.idea/.idea.AvaloniaInside.Shell/.idea/libraries/androidx_documentfile_documentfile.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/.idea/.idea.AvaloniaInside.Shell/.idea/libraries/androidx_drawerlayout_drawerlayout.xml b/src/.idea/.idea.AvaloniaInside.Shell/.idea/libraries/androidx_drawerlayout_drawerlayout.xml
deleted file mode 100644
index cfb80eb..0000000
--- a/src/.idea/.idea.AvaloniaInside.Shell/.idea/libraries/androidx_drawerlayout_drawerlayout.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/.idea/.idea.AvaloniaInside.Shell/.idea/libraries/androidx_emoji2_emoji2.xml b/src/.idea/.idea.AvaloniaInside.Shell/.idea/libraries/androidx_emoji2_emoji2.xml
deleted file mode 100644
index 868b903..0000000
--- a/src/.idea/.idea.AvaloniaInside.Shell/.idea/libraries/androidx_emoji2_emoji2.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/.idea/.idea.AvaloniaInside.Shell/.idea/libraries/androidx_emoji2_emoji2_views_helper.xml b/src/.idea/.idea.AvaloniaInside.Shell/.idea/libraries/androidx_emoji2_emoji2_views_helper.xml
deleted file mode 100644
index 4e0be82..0000000
--- a/src/.idea/.idea.AvaloniaInside.Shell/.idea/libraries/androidx_emoji2_emoji2_views_helper.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/.idea/.idea.AvaloniaInside.Shell/.idea/libraries/androidx_fragment_fragment.xml b/src/.idea/.idea.AvaloniaInside.Shell/.idea/libraries/androidx_fragment_fragment.xml
deleted file mode 100644
index 0084d5f..0000000
--- a/src/.idea/.idea.AvaloniaInside.Shell/.idea/libraries/androidx_fragment_fragment.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/.idea/.idea.AvaloniaInside.Shell/.idea/libraries/androidx_interpolator_interpolator.xml b/src/.idea/.idea.AvaloniaInside.Shell/.idea/libraries/androidx_interpolator_interpolator.xml
deleted file mode 100644
index c36b6fb..0000000
--- a/src/.idea/.idea.AvaloniaInside.Shell/.idea/libraries/androidx_interpolator_interpolator.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/.idea/.idea.AvaloniaInside.Shell/.idea/libraries/androidx_lifecycle_lifecycle_common.xml b/src/.idea/.idea.AvaloniaInside.Shell/.idea/libraries/androidx_lifecycle_lifecycle_common.xml
deleted file mode 100644
index ce36d1b..0000000
--- a/src/.idea/.idea.AvaloniaInside.Shell/.idea/libraries/androidx_lifecycle_lifecycle_common.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/.idea/.idea.AvaloniaInside.Shell/.idea/libraries/androidx_lifecycle_lifecycle_livedata_core.xml b/src/.idea/.idea.AvaloniaInside.Shell/.idea/libraries/androidx_lifecycle_lifecycle_livedata_core.xml
deleted file mode 100644
index 78c1a81..0000000
--- a/src/.idea/.idea.AvaloniaInside.Shell/.idea/libraries/androidx_lifecycle_lifecycle_livedata_core.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/.idea/.idea.AvaloniaInside.Shell/.idea/libraries/androidx_lifecycle_lifecycle_process.xml b/src/.idea/.idea.AvaloniaInside.Shell/.idea/libraries/androidx_lifecycle_lifecycle_process.xml
deleted file mode 100644
index 6d3d921..0000000
--- a/src/.idea/.idea.AvaloniaInside.Shell/.idea/libraries/androidx_lifecycle_lifecycle_process.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/.idea/.idea.AvaloniaInside.Shell/.idea/libraries/androidx_lifecycle_lifecycle_runtime.xml b/src/.idea/.idea.AvaloniaInside.Shell/.idea/libraries/androidx_lifecycle_lifecycle_runtime.xml
deleted file mode 100644
index 0e0047b..0000000
--- a/src/.idea/.idea.AvaloniaInside.Shell/.idea/libraries/androidx_lifecycle_lifecycle_runtime.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/.idea/.idea.AvaloniaInside.Shell/.idea/libraries/androidx_lifecycle_lifecycle_viewmodel.xml b/src/.idea/.idea.AvaloniaInside.Shell/.idea/libraries/androidx_lifecycle_lifecycle_viewmodel.xml
deleted file mode 100644
index 5df892f..0000000
--- a/src/.idea/.idea.AvaloniaInside.Shell/.idea/libraries/androidx_lifecycle_lifecycle_viewmodel.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/.idea/.idea.AvaloniaInside.Shell/.idea/libraries/androidx_lifecycle_lifecycle_viewmodel_savedstate.xml b/src/.idea/.idea.AvaloniaInside.Shell/.idea/libraries/androidx_lifecycle_lifecycle_viewmodel_savedstate.xml
deleted file mode 100644
index c3b9579..0000000
--- a/src/.idea/.idea.AvaloniaInside.Shell/.idea/libraries/androidx_lifecycle_lifecycle_viewmodel_savedstate.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/.idea/.idea.AvaloniaInside.Shell/.idea/libraries/androidx_loader_loader.xml b/src/.idea/.idea.AvaloniaInside.Shell/.idea/libraries/androidx_loader_loader.xml
deleted file mode 100644
index 0a78fd0..0000000
--- a/src/.idea/.idea.AvaloniaInside.Shell/.idea/libraries/androidx_loader_loader.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/.idea/.idea.AvaloniaInside.Shell/.idea/libraries/androidx_profileinstaller_profileinstaller.xml b/src/.idea/.idea.AvaloniaInside.Shell/.idea/libraries/androidx_profileinstaller_profileinstaller.xml
deleted file mode 100644
index d708c14..0000000
--- a/src/.idea/.idea.AvaloniaInside.Shell/.idea/libraries/androidx_profileinstaller_profileinstaller.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/.idea/.idea.AvaloniaInside.Shell/.idea/libraries/androidx_resourceinspection_resourceinspection_annotation.xml b/src/.idea/.idea.AvaloniaInside.Shell/.idea/libraries/androidx_resourceinspection_resourceinspection_annotation.xml
deleted file mode 100644
index b4b5b32..0000000
--- a/src/.idea/.idea.AvaloniaInside.Shell/.idea/libraries/androidx_resourceinspection_resourceinspection_annotation.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/.idea/.idea.AvaloniaInside.Shell/.idea/libraries/androidx_savedstate_savedstate.xml b/src/.idea/.idea.AvaloniaInside.Shell/.idea/libraries/androidx_savedstate_savedstate.xml
deleted file mode 100644
index 8643e82..0000000
--- a/src/.idea/.idea.AvaloniaInside.Shell/.idea/libraries/androidx_savedstate_savedstate.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/.idea/.idea.AvaloniaInside.Shell/.idea/libraries/androidx_startup_startup_runtime.xml b/src/.idea/.idea.AvaloniaInside.Shell/.idea/libraries/androidx_startup_startup_runtime.xml
deleted file mode 100644
index 820ea4a..0000000
--- a/src/.idea/.idea.AvaloniaInside.Shell/.idea/libraries/androidx_startup_startup_runtime.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/.idea/.idea.AvaloniaInside.Shell/.idea/libraries/androidx_tracing_tracing.xml b/src/.idea/.idea.AvaloniaInside.Shell/.idea/libraries/androidx_tracing_tracing.xml
deleted file mode 100644
index 89165ca..0000000
--- a/src/.idea/.idea.AvaloniaInside.Shell/.idea/libraries/androidx_tracing_tracing.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/.idea/.idea.AvaloniaInside.Shell/.idea/libraries/androidx_vectordrawable_vectordrawable.xml b/src/.idea/.idea.AvaloniaInside.Shell/.idea/libraries/androidx_vectordrawable_vectordrawable.xml
deleted file mode 100644
index cefc0db..0000000
--- a/src/.idea/.idea.AvaloniaInside.Shell/.idea/libraries/androidx_vectordrawable_vectordrawable.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/.idea/.idea.AvaloniaInside.Shell/.idea/libraries/androidx_vectordrawable_vectordrawable_animated.xml b/src/.idea/.idea.AvaloniaInside.Shell/.idea/libraries/androidx_vectordrawable_vectordrawable_animated.xml
deleted file mode 100644
index 8b4cfd3..0000000
--- a/src/.idea/.idea.AvaloniaInside.Shell/.idea/libraries/androidx_vectordrawable_vectordrawable_animated.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/.idea/.idea.AvaloniaInside.Shell/.idea/libraries/androidx_versionedparcelable_versionedparcelable.xml b/src/.idea/.idea.AvaloniaInside.Shell/.idea/libraries/androidx_versionedparcelable_versionedparcelable.xml
deleted file mode 100644
index e6779dd..0000000
--- a/src/.idea/.idea.AvaloniaInside.Shell/.idea/libraries/androidx_versionedparcelable_versionedparcelable.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/.idea/.idea.AvaloniaInside.Shell/.idea/libraries/androidx_viewpager_viewpager.xml b/src/.idea/.idea.AvaloniaInside.Shell/.idea/libraries/androidx_viewpager_viewpager.xml
deleted file mode 100644
index c7a9bc3..0000000
--- a/src/.idea/.idea.AvaloniaInside.Shell/.idea/libraries/androidx_viewpager_viewpager.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/.idea/.idea.AvaloniaInside.Shell/.idea/libraries/guava_listenablefuture.xml b/src/.idea/.idea.AvaloniaInside.Shell/.idea/libraries/guava_listenablefuture.xml
deleted file mode 100644
index 3807ee6..0000000
--- a/src/.idea/.idea.AvaloniaInside.Shell/.idea/libraries/guava_listenablefuture.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/.idea/.idea.AvaloniaInside.Shell/.idea/libraries/org_jetbrains_annotations_24_0_0.xml b/src/.idea/.idea.AvaloniaInside.Shell/.idea/libraries/org_jetbrains_annotations_24_0_0.xml
deleted file mode 100644
index 01b9077..0000000
--- a/src/.idea/.idea.AvaloniaInside.Shell/.idea/libraries/org_jetbrains_annotations_24_0_0.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/.idea/.idea.AvaloniaInside.Shell/.idea/libraries/org_jetbrains_annotations_24_0_1.xml b/src/.idea/.idea.AvaloniaInside.Shell/.idea/libraries/org_jetbrains_annotations_24_0_1.xml
deleted file mode 100644
index 8af7bcc..0000000
--- a/src/.idea/.idea.AvaloniaInside.Shell/.idea/libraries/org_jetbrains_annotations_24_0_1.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/.idea/.idea.AvaloniaInside.Shell/.idea/libraries/org_jetbrains_kotlin_kotlin_stdlib_1_8_0.xml b/src/.idea/.idea.AvaloniaInside.Shell/.idea/libraries/org_jetbrains_kotlin_kotlin_stdlib_1_8_0.xml
deleted file mode 100644
index d61cadb..0000000
--- a/src/.idea/.idea.AvaloniaInside.Shell/.idea/libraries/org_jetbrains_kotlin_kotlin_stdlib_1_8_0.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/.idea/.idea.AvaloniaInside.Shell/.idea/libraries/org_jetbrains_kotlin_kotlin_stdlib_1_9_10.xml b/src/.idea/.idea.AvaloniaInside.Shell/.idea/libraries/org_jetbrains_kotlin_kotlin_stdlib_1_9_10.xml
deleted file mode 100644
index c93b751..0000000
--- a/src/.idea/.idea.AvaloniaInside.Shell/.idea/libraries/org_jetbrains_kotlin_kotlin_stdlib_1_9_10.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/.idea/.idea.AvaloniaInside.Shell/.idea/libraries/org_jetbrains_kotlin_kotlin_stdlib_common_1_8_0.xml b/src/.idea/.idea.AvaloniaInside.Shell/.idea/libraries/org_jetbrains_kotlin_kotlin_stdlib_common_1_8_0.xml
deleted file mode 100644
index 3f01560..0000000
--- a/src/.idea/.idea.AvaloniaInside.Shell/.idea/libraries/org_jetbrains_kotlin_kotlin_stdlib_common_1_8_0.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/.idea/.idea.AvaloniaInside.Shell/.idea/libraries/org_jetbrains_kotlin_kotlin_stdlib_common_1_9_10.xml b/src/.idea/.idea.AvaloniaInside.Shell/.idea/libraries/org_jetbrains_kotlin_kotlin_stdlib_common_1_9_10.xml
deleted file mode 100644
index 238e12b..0000000
--- a/src/.idea/.idea.AvaloniaInside.Shell/.idea/libraries/org_jetbrains_kotlin_kotlin_stdlib_common_1_9_10.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/.idea/.idea.AvaloniaInside.Shell/.idea/libraries/org_jetbrains_kotlin_kotlin_stdlib_jdk7_1_9_10.xml b/src/.idea/.idea.AvaloniaInside.Shell/.idea/libraries/org_jetbrains_kotlin_kotlin_stdlib_jdk7_1_9_10.xml
deleted file mode 100644
index 6706051..0000000
--- a/src/.idea/.idea.AvaloniaInside.Shell/.idea/libraries/org_jetbrains_kotlin_kotlin_stdlib_jdk7_1_9_10.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/.idea/.idea.AvaloniaInside.Shell/.idea/libraries/org_jetbrains_kotlin_kotlin_stdlib_jdk8_1_9_10.xml b/src/.idea/.idea.AvaloniaInside.Shell/.idea/libraries/org_jetbrains_kotlin_kotlin_stdlib_jdk8_1_9_10.xml
deleted file mode 100644
index 59ee76c..0000000
--- a/src/.idea/.idea.AvaloniaInside.Shell/.idea/libraries/org_jetbrains_kotlin_kotlin_stdlib_jdk8_1_9_10.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/.idea/.idea.AvaloniaInside.Shell/.idea/libraries/org_jetbrains_kotlinx_kotlinx_coroutines_android_1_7_3.xml b/src/.idea/.idea.AvaloniaInside.Shell/.idea/libraries/org_jetbrains_kotlinx_kotlinx_coroutines_android_1_7_3.xml
deleted file mode 100644
index a27f6b0..0000000
--- a/src/.idea/.idea.AvaloniaInside.Shell/.idea/libraries/org_jetbrains_kotlinx_kotlinx_coroutines_android_1_7_3.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/.idea/.idea.AvaloniaInside.Shell/.idea/libraries/org_jetbrains_kotlinx_kotlinx_coroutines_core_jvm_1_7_3.xml b/src/.idea/.idea.AvaloniaInside.Shell/.idea/libraries/org_jetbrains_kotlinx_kotlinx_coroutines_core_jvm_1_7_3.xml
deleted file mode 100644
index 8d5c42e..0000000
--- a/src/.idea/.idea.AvaloniaInside.Shell/.idea/libraries/org_jetbrains_kotlinx_kotlinx_coroutines_core_jvm_1_7_3.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/.idea/.idea.AvaloniaInside.Shell/.idea/vcs.xml b/src/.idea/.idea.AvaloniaInside.Shell/.idea/vcs.xml
deleted file mode 100644
index 6c0b863..0000000
--- a/src/.idea/.idea.AvaloniaInside.Shell/.idea/vcs.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/Example/ShellBottomCustomNavigator/ShellBottomCustomNavigator.Browser/ShellBottomCustomNavigator.Browser.csproj b/src/Example/ShellBottomCustomNavigator/ShellBottomCustomNavigator.Browser/ShellBottomCustomNavigator.Browser.csproj
index 3c3aa50..e6fbe96 100644
--- a/src/Example/ShellBottomCustomNavigator/ShellBottomCustomNavigator.Browser/ShellBottomCustomNavigator.Browser.csproj
+++ b/src/Example/ShellBottomCustomNavigator/ShellBottomCustomNavigator.Browser/ShellBottomCustomNavigator.Browser.csproj
@@ -1,9 +1,10 @@
- net8.0
- browser-wasm
+ net8.0-browser
+ browser-wasm
+ Exe
+ true
AppBundle\main.js
- Exe
diff --git a/src/Example/ShellBottomCustomNavigator/ShellBottomCustomNavigator/Views/MainTabControl.axaml.cs b/src/Example/ShellBottomCustomNavigator/ShellBottomCustomNavigator/Views/MainTabControl.axaml.cs
index e03f2cc..17f8681 100644
--- a/src/Example/ShellBottomCustomNavigator/ShellBottomCustomNavigator/Views/MainTabControl.axaml.cs
+++ b/src/Example/ShellBottomCustomNavigator/ShellBottomCustomNavigator/Views/MainTabControl.axaml.cs
@@ -6,16 +6,17 @@
namespace ShellBottomCustomNavigator.Views;
-public partial class MainTabControl : TabControl, IStyleable
+public partial class MainTabControl : TabControl
{
- public Type StyleKey => typeof(TabControl);
+ protected override Type StyleKeyOverride => typeof(TabControl);
+
private Grid _circle;
public MainTabControl()
{
InitializeComponent();
var aaa = Styles;
-
+
this.SelectionChanged += (sender, args) =>
{
if (_circle == null) return;
@@ -32,7 +33,7 @@ private void InitializeComponent()
protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
{
base.OnApplyTemplate(e);
-
+
_circle = e.NameScope.Get("PART_Circle");
this.SelectedIndex = 0;
}
diff --git a/src/Example/ShellBottomCustomNavigator/ShellBottomCustomNavigator/Views/PetsTabControlView.axaml.cs b/src/Example/ShellBottomCustomNavigator/ShellBottomCustomNavigator/Views/PetsTabControlView.axaml.cs
index eb68301..115c845 100644
--- a/src/Example/ShellBottomCustomNavigator/ShellBottomCustomNavigator/Views/PetsTabControlView.axaml.cs
+++ b/src/Example/ShellBottomCustomNavigator/ShellBottomCustomNavigator/Views/PetsTabControlView.axaml.cs
@@ -5,9 +5,9 @@
namespace ShellBottomCustomNavigator.Views;
-public partial class PetsTabControlView : TabControl, IStyleable
+public partial class PetsTabControlView : TabControl
{
- public Type StyleKey => typeof(TabControl);
+ protected override Type StyleKeyOverride => typeof(TabControl);
public PetsTabControlView()
{
diff --git a/src/Example/ShellExample/ShellExample.Android/ShellExample.Android.csproj b/src/Example/ShellExample/ShellExample.Android/ShellExample.Android.csproj
index b2a1c32..c6c8e65 100644
--- a/src/Example/ShellExample/ShellExample.Android/ShellExample.Android.csproj
+++ b/src/Example/ShellExample/ShellExample.Android/ShellExample.Android.csproj
@@ -2,13 +2,14 @@
Exe
net8.0-android
- 33
+ 34
enable
com.CompanyName.ShellExample
1
1.0
apk
- v12.0
+ v15.0
+ true
True
diff --git a/src/Example/ShellExample/ShellExample.Web/ShellExample.Web.csproj b/src/Example/ShellExample/ShellExample.Web/ShellExample.Web.csproj
index 7d9acc7..1d23028 100644
--- a/src/Example/ShellExample/ShellExample.Web/ShellExample.Web.csproj
+++ b/src/Example/ShellExample/ShellExample.Web/ShellExample.Web.csproj
@@ -1,9 +1,10 @@
- net8.0
+ net8.0-browser
browser-wasm
+ Exe
+ true
AppBundle\main.js
- Exe
diff --git a/src/Example/ShellExample/ShellExample.iOS/AppDelegate.cs b/src/Example/ShellExample/ShellExample.iOS/AppDelegate.cs
index 980ae0c..4b9cbc0 100644
--- a/src/Example/ShellExample/ShellExample.iOS/AppDelegate.cs
+++ b/src/Example/ShellExample/ShellExample.iOS/AppDelegate.cs
@@ -1,8 +1,12 @@
using Foundation;
+using UIKit;
using Avalonia;
+using Avalonia.Controls;
using Avalonia.iOS;
+using Avalonia.Media;
using Avalonia.ReactiveUI;
using AvaloniaInside.Shell;
+
namespace ShellExample.iOS;
// The UIApplicationDelegate for the application. This class is responsible for launching the
@@ -13,7 +17,8 @@ public partial class AppDelegate : AvaloniaAppDelegate
{
protected override AppBuilder CustomizeAppBuilder(AppBuilder builder)
{
- return builder.UseReactiveUI()
+ return builder
+ .UseReactiveUI()
.UseShell();
}
}
diff --git a/src/Example/ShellExample/ShellExample.iOS/Info.plist b/src/Example/ShellExample/ShellExample.iOS/Info.plist
index fb75643..408af90 100644
--- a/src/Example/ShellExample/ShellExample.iOS/Info.plist
+++ b/src/Example/ShellExample/ShellExample.iOS/Info.plist
@@ -43,7 +43,5 @@
UIViewControllerBasedStatusBarAppearance
- UIUserInterfaceStyle
- Dark
diff --git a/src/Example/ShellExample/ShellExample/Styles.axaml b/src/Example/ShellExample/ShellExample/Styles.axaml
index c1360e2..64bc65b 100644
--- a/src/Example/ShellExample/ShellExample/Styles.axaml
+++ b/src/Example/ShellExample/ShellExample/Styles.axaml
@@ -76,7 +76,6 @@
DockPanel.Dock="{TemplateBinding TabStripPlacement}" />
-
diff --git a/src/Example/ShellExample/ShellExample/Views/MainTabControl.axaml.cs b/src/Example/ShellExample/ShellExample/Views/MainTabControl.axaml.cs
index 6c5b574..e8ea2ea 100644
--- a/src/Example/ShellExample/ShellExample/Views/MainTabControl.axaml.cs
+++ b/src/Example/ShellExample/ShellExample/Views/MainTabControl.axaml.cs
@@ -5,9 +5,9 @@
namespace ShellExample.Views;
-public partial class MainTabControl : TabControl, IStyleable
+public partial class MainTabControl : TabControl
{
- public Type StyleKey => typeof(TabControl);
+ protected override Type StyleKeyOverride => typeof(TabControl);
public MainTabControl()
{
diff --git a/src/Example/ShellExample/ShellExample/Views/MainView.axaml b/src/Example/ShellExample/ShellExample/Views/MainView.axaml
index 1a68646..4f68fc7 100644
--- a/src/Example/ShellExample/ShellExample/Views/MainView.axaml
+++ b/src/Example/ShellExample/ShellExample/Views/MainView.axaml
@@ -7,7 +7,8 @@
xmlns:views="clr-namespace:ShellExample.Views"
xmlns:shopViews="clr-namespace:ShellExample.Views.ShopViews"
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
- x:Class="ShellExample.Views.MainView">
+ x:Class="ShellExample.Views.MainView"
+ TopLevel.AutoSafeAreaPadding="False">
diff --git a/src/Example/ShellExample/ShellExample/Views/PetsTabControlView.axaml.cs b/src/Example/ShellExample/ShellExample/Views/PetsTabControlView.axaml.cs
index bae571c..9876058 100644
--- a/src/Example/ShellExample/ShellExample/Views/PetsTabControlView.axaml.cs
+++ b/src/Example/ShellExample/ShellExample/Views/PetsTabControlView.axaml.cs
@@ -5,9 +5,9 @@
namespace ShellExample.Views;
-public partial class PetsTabControlView : TabControl, IStyleable
+public partial class PetsTabControlView : TabControl
{
- public Type StyleKey => typeof(TabControl);
+ protected override Type StyleKeyOverride => typeof(TabControl);
public PetsTabControlView()
{
diff --git a/src/Example/ShellExample/ShellExample/Views/ShopViews/ConfirmationCloseView.axaml b/src/Example/ShellExample/ShellExample/Views/ShopViews/ConfirmationCloseView.axaml
index 891472f..ba19352 100644
--- a/src/Example/ShellExample/ShellExample/Views/ShopViews/ConfirmationCloseView.axaml
+++ b/src/Example/ShellExample/ShellExample/Views/ShopViews/ConfirmationCloseView.axaml
@@ -3,20 +3,27 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
- x:Class="ShellExample.Views.ShopViews.ConfirmationCloseView">
+ x:Class="ShellExample.Views.ShopViews.ConfirmationCloseView"
+ VerticalAlignment="Center"
+ HorizontalAlignment="Center">
-
-
-
-
-
-
-
-
+
+
+
+ Are you sure you want to close it?
+
+
+
+
+
+