Address some formatting things and update Packages

This commit is contained in:
2021-08-06 22:35:21 -05:00
parent e08ba30d91
commit 67741eccee
26 changed files with 8042 additions and 9159 deletions
+7649 -8710
View File
File diff suppressed because it is too large Load Diff
+58 -55
View File
@@ -2,17 +2,17 @@
<packages>
<package id="Acr.Settings" version="9.0.1" targetFramework="monoandroid10.0" />
<package id="Acr.Support" version="2.1.0" targetFramework="monoandroid90" />
<package id="Acr.UserDialogs" version="7.1.0.483" targetFramework="monoandroid10.0" />
<package id="AndHUD" version="1.4.2" targetFramework="monoandroid90" />
<package id="Acr.UserDialogs" version="7.1.0.514" targetFramework="monoandroid10.0" />
<package id="AndHUD" version="1.4.3" targetFramework="monoandroid10.0" />
<package id="Microsoft.CSharp" version="4.7.0" targetFramework="monoandroid90" />
<package id="Microsoft.NETCore.Platforms" version="5.0.1" targetFramework="monoandroid10.0" />
<package id="Microsoft.NETCore.Platforms" version="5.0.2" targetFramework="monoandroid10.0" />
<package id="Microsoft.Win32.Primitives" version="4.3.0" targetFramework="monoandroid90" />
<package id="NETStandard.Library" version="2.0.3" targetFramework="monoandroid90" />
<package id="Newtonsoft.Json" version="13.0.1" targetFramework="monoandroid10.0" />
<package id="QControlKit" version="0.0.17" targetFramework="monoandroid10.0" />
<package id="QControlKit" version="0.0.19" targetFramework="monoandroid10.0" />
<package id="Serilog" version="2.10.0" targetFramework="monoandroid90" />
<package id="Serilog.Sinks.Xamarin" version="0.2.0.64" targetFramework="monoandroid90" />
<package id="Splat" version="10.0.1" targetFramework="monoandroid90" />
<package id="Splat" version="12.1.1" targetFramework="monoandroid10.0" />
<package id="System.AppContext" version="4.3.0" targetFramework="monoandroid90" />
<package id="System.Collections" version="4.3.0" targetFramework="monoandroid90" />
<package id="System.Collections.Concurrent" version="4.3.0" targetFramework="monoandroid90" />
@@ -119,58 +119,61 @@
<package id="Xamarin.Android.Support.Vector.Drawable" version="28.0.0.3" targetFramework="monoandroid90" />
<package id="Xamarin.Android.Support.VersionedParcelable" version="28.0.0.3" targetFramework="monoandroid90" />
<package id="Xamarin.Android.Support.ViewPager" version="28.0.0.3" targetFramework="monoandroid90" />
<package id="Xamarin.AndroidX.Activity" version="1.2.1" targetFramework="monoandroid10.0" />
<package id="Xamarin.AndroidX.Annotation" version="1.1.0.9" targetFramework="monoandroid10.0" />
<package id="Xamarin.AndroidX.Annotation.Experimental" version="1.0.0.9" targetFramework="monoandroid10.0" />
<package id="Xamarin.AndroidX.AppCompat" version="1.2.0.7" targetFramework="monoandroid10.0" />
<package id="Xamarin.AndroidX.AppCompat.AppCompatResources" version="1.2.0.7" targetFramework="monoandroid10.0" />
<package id="Xamarin.AndroidX.Arch.Core.Common" version="2.1.0.8" targetFramework="monoandroid10.0" />
<package id="Xamarin.AndroidX.Arch.Core.Runtime" version="2.1.0.8" targetFramework="monoandroid10.0" />
<package id="Xamarin.AndroidX.AsyncLayoutInflater" version="1.0.0.7" targetFramework="monoandroid10.0" />
<package id="Xamarin.AndroidX.Browser" version="1.3.0.5" targetFramework="monoandroid10.0" />
<package id="Xamarin.AndroidX.CardView" version="1.0.0.8" targetFramework="monoandroid10.0" />
<package id="Xamarin.AndroidX.Collection" version="1.1.0.7" targetFramework="monoandroid10.0" />
<package id="Xamarin.AndroidX.ConstraintLayout" version="2.0.4.2" targetFramework="monoandroid10.0" />
<package id="Xamarin.AndroidX.ConstraintLayout.Solver" version="2.0.4.2" targetFramework="monoandroid10.0" />
<package id="Xamarin.AndroidX.CoordinatorLayout" version="1.1.0.7" targetFramework="monoandroid10.0" />
<package id="Xamarin.AndroidX.Core" version="1.3.2.3" targetFramework="monoandroid10.0" />
<package id="Xamarin.AndroidX.CursorAdapter" version="1.0.0.7" targetFramework="monoandroid10.0" />
<package id="Xamarin.AndroidX.CustomView" version="1.1.0.6" targetFramework="monoandroid10.0" />
<package id="Xamarin.AndroidX.DocumentFile" version="1.0.1.7" targetFramework="monoandroid10.0" />
<package id="Xamarin.AndroidX.DrawerLayout" version="1.1.1.2" targetFramework="monoandroid10.0" />
<package id="Xamarin.AndroidX.DynamicAnimation" version="1.0.0.7" targetFramework="monoandroid10.0" />
<package id="Xamarin.AndroidX.Fragment" version="1.3.1" targetFramework="monoandroid10.0" />
<package id="Xamarin.AndroidX.Interpolator" version="1.0.0.7" targetFramework="monoandroid10.0" />
<package id="Xamarin.AndroidX.Legacy.Support.Core.UI" version="1.0.0.8" targetFramework="monoandroid10.0" />
<package id="Xamarin.AndroidX.Legacy.Support.Core.Utils" version="1.0.0.7" targetFramework="monoandroid10.0" />
<package id="Xamarin.AndroidX.Legacy.Support.V4" version="1.0.0.7" targetFramework="monoandroid10.0" />
<package id="Xamarin.AndroidX.Lifecycle.Common" version="2.3.0.1" targetFramework="monoandroid10.0" />
<package id="Xamarin.AndroidX.Lifecycle.LiveData" version="2.3.0.1" targetFramework="monoandroid10.0" />
<package id="Xamarin.AndroidX.Lifecycle.LiveData.Core" version="2.3.0.1" targetFramework="monoandroid10.0" />
<package id="Xamarin.AndroidX.Lifecycle.Runtime" version="2.3.0.1" targetFramework="monoandroid10.0" />
<package id="Xamarin.AndroidX.Lifecycle.ViewModel" version="2.3.0.1" targetFramework="monoandroid10.0" />
<package id="Xamarin.AndroidX.Lifecycle.ViewModelSavedState" version="2.3.0.1" targetFramework="monoandroid10.0" />
<package id="Xamarin.AndroidX.Loader" version="1.1.0.7" targetFramework="monoandroid10.0" />
<package id="Xamarin.AndroidX.LocalBroadcastManager" version="1.0.0.7" targetFramework="monoandroid10.0" />
<package id="Xamarin.AndroidX.Media" version="1.2.1.2" targetFramework="monoandroid10.0" />
<package id="Xamarin.AndroidX.MediaRouter" version="1.2.2.1" targetFramework="monoandroid10.0" />
<package id="Xamarin.AndroidX.Activity" version="1.3.0" targetFramework="monoandroid10.0" />
<package id="Xamarin.AndroidX.Annotation" version="1.2.0.1" targetFramework="monoandroid10.0" />
<package id="Xamarin.AndroidX.Annotation.Experimental" version="1.1.0.1" targetFramework="monoandroid10.0" />
<package id="Xamarin.AndroidX.AppCompat" version="1.3.1.1" targetFramework="monoandroid10.0" />
<package id="Xamarin.AndroidX.AppCompat.AppCompatResources" version="1.3.1.1" targetFramework="monoandroid10.0" />
<package id="Xamarin.AndroidX.Arch.Core.Common" version="2.1.0.9" targetFramework="monoandroid10.0" />
<package id="Xamarin.AndroidX.Arch.Core.Runtime" version="2.1.0.9" targetFramework="monoandroid10.0" />
<package id="Xamarin.AndroidX.AsyncLayoutInflater" version="1.0.0.8" targetFramework="monoandroid10.0" />
<package id="Xamarin.AndroidX.Browser" version="1.3.0.6" targetFramework="monoandroid10.0" />
<package id="Xamarin.AndroidX.CardView" version="1.0.0.9" targetFramework="monoandroid10.0" />
<package id="Xamarin.AndroidX.Collection" version="1.1.0.8" targetFramework="monoandroid10.0" />
<package id="Xamarin.AndroidX.Concurrent.Futures" version="1.1.0.3" targetFramework="monoandroid10.0" />
<package id="Xamarin.AndroidX.ConstraintLayout" version="2.1.0" targetFramework="monoandroid10.0" />
<package id="Xamarin.AndroidX.ConstraintLayout.Core" version="1.0.0" targetFramework="monoandroid10.0" />
<package id="Xamarin.AndroidX.ConstraintLayout.Solver" version="2.0.4.3" targetFramework="monoandroid10.0" />
<package id="Xamarin.AndroidX.CoordinatorLayout" version="1.1.0.8" targetFramework="monoandroid10.0" />
<package id="Xamarin.AndroidX.Core" version="1.6.0.1" targetFramework="monoandroid10.0" />
<package id="Xamarin.AndroidX.CursorAdapter" version="1.0.0.8" targetFramework="monoandroid10.0" />
<package id="Xamarin.AndroidX.CustomView" version="1.1.0.7" targetFramework="monoandroid10.0" />
<package id="Xamarin.AndroidX.DocumentFile" version="1.0.1.8" targetFramework="monoandroid10.0" />
<package id="Xamarin.AndroidX.DrawerLayout" version="1.1.1.3" targetFramework="monoandroid10.0" />
<package id="Xamarin.AndroidX.DynamicAnimation" version="1.0.0.8" targetFramework="monoandroid10.0" />
<package id="Xamarin.AndroidX.Fragment" version="1.3.6.1" targetFramework="monoandroid10.0" />
<package id="Xamarin.AndroidX.Interpolator" version="1.0.0.8" targetFramework="monoandroid10.0" />
<package id="Xamarin.AndroidX.Legacy.Support.Core.UI" version="1.0.0.9" targetFramework="monoandroid10.0" />
<package id="Xamarin.AndroidX.Legacy.Support.Core.Utils" version="1.0.0.8" targetFramework="monoandroid10.0" />
<package id="Xamarin.AndroidX.Legacy.Support.V4" version="1.0.0.8" targetFramework="monoandroid10.0" />
<package id="Xamarin.AndroidX.Lifecycle.Common" version="2.3.1.1" targetFramework="monoandroid10.0" />
<package id="Xamarin.AndroidX.Lifecycle.LiveData" version="2.3.1.1" targetFramework="monoandroid10.0" />
<package id="Xamarin.AndroidX.Lifecycle.LiveData.Core" version="2.3.1.1" targetFramework="monoandroid10.0" />
<package id="Xamarin.AndroidX.Lifecycle.Runtime" version="2.3.1.2" targetFramework="monoandroid10.0" />
<package id="Xamarin.AndroidX.Lifecycle.ViewModel" version="2.3.1.1" targetFramework="monoandroid10.0" />
<package id="Xamarin.AndroidX.Lifecycle.ViewModelSavedState" version="2.3.1.1" targetFramework="monoandroid10.0" />
<package id="Xamarin.AndroidX.Loader" version="1.1.0.8" targetFramework="monoandroid10.0" />
<package id="Xamarin.AndroidX.LocalBroadcastManager" version="1.0.0.8" targetFramework="monoandroid10.0" />
<package id="Xamarin.AndroidX.Media" version="1.4.0.1" targetFramework="monoandroid10.0" />
<package id="Xamarin.AndroidX.MediaRouter" version="1.2.4.1" targetFramework="monoandroid10.0" />
<package id="Xamarin.AndroidX.Migration" version="1.0.8" targetFramework="monoandroid10.0" />
<package id="Xamarin.AndroidX.MultiDex" version="2.0.1.7" targetFramework="monoandroid10.0" />
<package id="Xamarin.AndroidX.Palette" version="1.0.0.7" targetFramework="monoandroid10.0" />
<package id="Xamarin.AndroidX.Print" version="1.0.0.7" targetFramework="monoandroid10.0" />
<package id="Xamarin.AndroidX.RecyclerView" version="1.1.0.8" targetFramework="monoandroid10.0" />
<package id="Xamarin.AndroidX.MultiDex" version="2.0.1.8" targetFramework="monoandroid10.0" />
<package id="Xamarin.AndroidX.Palette" version="1.0.0.8" targetFramework="monoandroid10.0" />
<package id="Xamarin.AndroidX.Print" version="1.0.0.8" targetFramework="monoandroid10.0" />
<package id="Xamarin.AndroidX.RecyclerView" version="1.2.1.1" targetFramework="monoandroid10.0" />
<package id="Xamarin.AndroidX.SavedState" version="1.1.0.4-alpha01" targetFramework="monoandroid10.0" />
<package id="Xamarin.AndroidX.SlidingPaneLayout" version="1.1.0.2" targetFramework="monoandroid10.0" />
<package id="Xamarin.AndroidX.SwipeRefreshLayout" version="1.1.0.2" targetFramework="monoandroid10.0" />
<package id="Xamarin.AndroidX.Transition" version="1.4.0.1" targetFramework="monoandroid10.0" />
<package id="Xamarin.AndroidX.VectorDrawable" version="1.1.0.7" targetFramework="monoandroid10.0" />
<package id="Xamarin.AndroidX.VectorDrawable.Animated" version="1.1.0.7" targetFramework="monoandroid10.0" />
<package id="Xamarin.AndroidX.VersionedParcelable" version="1.1.1.7" targetFramework="monoandroid10.0" />
<package id="Xamarin.AndroidX.ViewPager" version="1.0.0.7" targetFramework="monoandroid10.0" />
<package id="Xamarin.AndroidX.ViewPager2" version="1.0.0.9" targetFramework="monoandroid10.0" />
<package id="Xamarin.Essentials" version="1.6.1" targetFramework="monoandroid10.0" />
<package id="Xamarin.AndroidX.SlidingPaneLayout" version="1.1.0.3" targetFramework="monoandroid10.0" />
<package id="Xamarin.AndroidX.SwipeRefreshLayout" version="1.1.0.3" targetFramework="monoandroid10.0" />
<package id="Xamarin.AndroidX.Tracing.Tracing" version="1.0.0.1" targetFramework="monoandroid10.0" />
<package id="Xamarin.AndroidX.Transition" version="1.4.1.1" targetFramework="monoandroid10.0" />
<package id="Xamarin.AndroidX.VectorDrawable" version="1.1.0.8" targetFramework="monoandroid10.0" />
<package id="Xamarin.AndroidX.VectorDrawable.Animated" version="1.1.0.8" targetFramework="monoandroid10.0" />
<package id="Xamarin.AndroidX.VersionedParcelable" version="1.1.1.8" targetFramework="monoandroid10.0" />
<package id="Xamarin.AndroidX.ViewPager" version="1.0.0.8" targetFramework="monoandroid10.0" />
<package id="Xamarin.AndroidX.ViewPager2" version="1.0.0.10" targetFramework="monoandroid10.0" />
<package id="Xamarin.Essentials" version="1.7.0" targetFramework="monoandroid10.0" />
<package id="Xamarin.Forms" version="5.0.0.2012" targetFramework="monoandroid10.0" />
<package id="Xamarin.Google.Android.Material" version="1.3.0.1" targetFramework="monoandroid10.0" />
<package id="Xamarin.Google.Guava.ListenableFuture" version="1.0.0.2" targetFramework="monoandroid10.0" />
<package id="Xamarin.Google.Android.Material" version="1.4.0.1" targetFramework="monoandroid10.0" />
<package id="Xamarin.Google.Guava.ListenableFuture" version="1.0.0.3" targetFramework="monoandroid10.0" />
<package id="Zeroconf" version="3.4.2" targetFramework="monoandroid90" />
</packages>
+112 -82
View File
@@ -93,7 +93,7 @@
<HintPath>..\packages\Serilog.Sinks.Xamarin.0.2.0.64\lib\MonoAndroid403\Serilog.Sinks.Xamarin.dll</HintPath>
</Reference>
<Reference Include="Splat">
<HintPath>..\packages\Splat.10.0.1\lib\netstandard2.0\Splat.dll</HintPath>
<HintPath>..\packages\Splat.12.1.1\lib\netstandard2.0\Splat.dll</HintPath>
</Reference>
<Reference Include="System.Reactive">
<HintPath>..\packages\System.Reactive.5.0.0\lib\netstandard2.0\System.Reactive.dll</HintPath>
@@ -231,139 +231,139 @@
<HintPath>..\packages\Zeroconf.3.4.2\lib\netstandard2.0\Zeroconf.dll</HintPath>
</Reference>
<Reference Include="QControlKit">
<HintPath>..\packages\QControlKit.0.0.17\lib\netstandard2.0\QControlKit.dll</HintPath>
<HintPath>..\packages\QControlKit.0.0.19\lib\netstandard2.0\QControlKit.dll</HintPath>
</Reference>
<Reference Include="Xamarin.AndroidX.MultiDex">
<HintPath>..\packages\Xamarin.AndroidX.MultiDex.2.0.1.7\lib\monoandroid90\Xamarin.AndroidX.MultiDex.dll</HintPath>
<HintPath>..\packages\Xamarin.AndroidX.MultiDex.2.0.1.8\lib\monoandroid90\Xamarin.AndroidX.MultiDex.dll</HintPath>
</Reference>
<Reference Include="Xamarin.AndroidX.Annotation">
<HintPath>..\packages\Xamarin.AndroidX.Annotation.1.1.0.9\lib\monoandroid90\Xamarin.AndroidX.Annotation.dll</HintPath>
<HintPath>..\packages\Xamarin.AndroidX.Annotation.1.2.0.1\lib\monoandroid90\Xamarin.AndroidX.Annotation.dll</HintPath>
</Reference>
<Reference Include="Xamarin.AndroidX.Arch.Core.Common">
<HintPath>..\packages\Xamarin.AndroidX.Arch.Core.Common.2.1.0.8\lib\monoandroid90\Xamarin.AndroidX.Arch.Core.Common.dll</HintPath>
<HintPath>..\packages\Xamarin.AndroidX.Arch.Core.Common.2.1.0.9\lib\monoandroid90\Xamarin.AndroidX.Arch.Core.Common.dll</HintPath>
</Reference>
<Reference Include="Xamarin.AndroidX.Arch.Core.Runtime">
<HintPath>..\packages\Xamarin.AndroidX.Arch.Core.Runtime.2.1.0.8\lib\monoandroid90\Xamarin.AndroidX.Arch.Core.Runtime.dll</HintPath>
<HintPath>..\packages\Xamarin.AndroidX.Arch.Core.Runtime.2.1.0.9\lib\monoandroid90\Xamarin.AndroidX.Arch.Core.Runtime.dll</HintPath>
</Reference>
<Reference Include="Xamarin.AndroidX.CardView">
<HintPath>..\packages\Xamarin.AndroidX.CardView.1.0.0.8\lib\monoandroid90\Xamarin.AndroidX.CardView.dll</HintPath>
<HintPath>..\packages\Xamarin.AndroidX.CardView.1.0.0.9\lib\monoandroid90\Xamarin.AndroidX.CardView.dll</HintPath>
</Reference>
<Reference Include="Xamarin.AndroidX.Collection">
<HintPath>..\packages\Xamarin.AndroidX.Collection.1.1.0.7\lib\monoandroid90\Xamarin.AndroidX.Collection.dll</HintPath>
<HintPath>..\packages\Xamarin.AndroidX.Collection.1.1.0.8\lib\monoandroid90\Xamarin.AndroidX.Collection.dll</HintPath>
</Reference>
<Reference Include="Xamarin.AndroidX.CursorAdapter">
<HintPath>..\packages\Xamarin.AndroidX.CursorAdapter.1.0.0.7\lib\monoandroid90\Xamarin.AndroidX.CursorAdapter.dll</HintPath>
<HintPath>..\packages\Xamarin.AndroidX.CursorAdapter.1.0.0.8\lib\monoandroid90\Xamarin.AndroidX.CursorAdapter.dll</HintPath>
</Reference>
<Reference Include="Xamarin.AndroidX.DocumentFile">
<HintPath>..\packages\Xamarin.AndroidX.DocumentFile.1.0.1.7\lib\monoandroid90\Xamarin.AndroidX.DocumentFile.dll</HintPath>
<HintPath>..\packages\Xamarin.AndroidX.DocumentFile.1.0.1.8\lib\monoandroid90\Xamarin.AndroidX.DocumentFile.dll</HintPath>
</Reference>
<Reference Include="Xamarin.AndroidX.Interpolator">
<HintPath>..\packages\Xamarin.AndroidX.Interpolator.1.0.0.7\lib\monoandroid90\Xamarin.AndroidX.Interpolator.dll</HintPath>
<HintPath>..\packages\Xamarin.AndroidX.Interpolator.1.0.0.8\lib\monoandroid90\Xamarin.AndroidX.Interpolator.dll</HintPath>
</Reference>
<Reference Include="Xamarin.AndroidX.Lifecycle.Common">
<HintPath>..\packages\Xamarin.AndroidX.Lifecycle.Common.2.3.0.1\lib\monoandroid90\Xamarin.AndroidX.Lifecycle.Common.dll</HintPath>
<HintPath>..\packages\Xamarin.AndroidX.Lifecycle.Common.2.3.1.1\lib\monoandroid90\Xamarin.AndroidX.Lifecycle.Common.dll</HintPath>
</Reference>
<Reference Include="Xamarin.AndroidX.Lifecycle.LiveData.Core">
<HintPath>..\packages\Xamarin.AndroidX.Lifecycle.LiveData.Core.2.3.0.1\lib\monoandroid90\Xamarin.AndroidX.Lifecycle.LiveData.Core.dll</HintPath>
<HintPath>..\packages\Xamarin.AndroidX.Lifecycle.LiveData.Core.2.3.1.1\lib\monoandroid90\Xamarin.AndroidX.Lifecycle.LiveData.Core.dll</HintPath>
</Reference>
<Reference Include="Xamarin.AndroidX.Lifecycle.LiveData">
<HintPath>..\packages\Xamarin.AndroidX.Lifecycle.LiveData.2.3.0.1\lib\monoandroid90\Xamarin.AndroidX.Lifecycle.LiveData.dll</HintPath>
<HintPath>..\packages\Xamarin.AndroidX.Lifecycle.LiveData.2.3.1.1\lib\monoandroid90\Xamarin.AndroidX.Lifecycle.LiveData.dll</HintPath>
</Reference>
<Reference Include="Xamarin.AndroidX.Lifecycle.Runtime">
<HintPath>..\packages\Xamarin.AndroidX.Lifecycle.Runtime.2.3.0.1\lib\monoandroid90\Xamarin.AndroidX.Lifecycle.Runtime.dll</HintPath>
<HintPath>..\packages\Xamarin.AndroidX.Lifecycle.Runtime.2.3.1.2\lib\monoandroid90\Xamarin.AndroidX.Lifecycle.Runtime.dll</HintPath>
</Reference>
<Reference Include="Xamarin.AndroidX.Lifecycle.ViewModel">
<HintPath>..\packages\Xamarin.AndroidX.Lifecycle.ViewModel.2.3.0.1\lib\monoandroid90\Xamarin.AndroidX.Lifecycle.ViewModel.dll</HintPath>
<HintPath>..\packages\Xamarin.AndroidX.Lifecycle.ViewModel.2.3.1.1\lib\monoandroid90\Xamarin.AndroidX.Lifecycle.ViewModel.dll</HintPath>
</Reference>
<Reference Include="Xamarin.AndroidX.LocalBroadcastManager">
<HintPath>..\packages\Xamarin.AndroidX.LocalBroadcastManager.1.0.0.7\lib\monoandroid90\Xamarin.AndroidX.LocalBroadcastManager.dll</HintPath>
<HintPath>..\packages\Xamarin.AndroidX.LocalBroadcastManager.1.0.0.8\lib\monoandroid90\Xamarin.AndroidX.LocalBroadcastManager.dll</HintPath>
</Reference>
<Reference Include="Xamarin.AndroidX.Print">
<HintPath>..\packages\Xamarin.AndroidX.Print.1.0.0.7\lib\monoandroid90\Xamarin.AndroidX.Print.dll</HintPath>
<HintPath>..\packages\Xamarin.AndroidX.Print.1.0.0.8\lib\monoandroid90\Xamarin.AndroidX.Print.dll</HintPath>
</Reference>
<Reference Include="Xamarin.AndroidX.SavedState">
<HintPath>..\packages\Xamarin.AndroidX.SavedState.1.1.0.4-alpha01\lib\monoandroid90\Xamarin.AndroidX.SavedState.dll</HintPath>
</Reference>
<Reference Include="Xamarin.AndroidX.Lifecycle.ViewModelSavedState">
<HintPath>..\packages\Xamarin.AndroidX.Lifecycle.ViewModelSavedState.2.3.0.1\lib\monoandroid90\Xamarin.AndroidX.Lifecycle.ViewModelSavedState.dll</HintPath>
<HintPath>..\packages\Xamarin.AndroidX.Lifecycle.ViewModelSavedState.2.3.1.1\lib\monoandroid90\Xamarin.AndroidX.Lifecycle.ViewModelSavedState.dll</HintPath>
</Reference>
<Reference Include="Xamarin.AndroidX.VersionedParcelable">
<HintPath>..\packages\Xamarin.AndroidX.VersionedParcelable.1.1.1.7\lib\monoandroid90\Xamarin.AndroidX.VersionedParcelable.dll</HintPath>
<HintPath>..\packages\Xamarin.AndroidX.VersionedParcelable.1.1.1.8\lib\monoandroid90\Xamarin.AndroidX.VersionedParcelable.dll</HintPath>
</Reference>
<Reference Include="Xamarin.AndroidX.Core">
<HintPath>..\packages\Xamarin.AndroidX.Core.1.3.2.3\lib\monoandroid90\Xamarin.AndroidX.Core.dll</HintPath>
<HintPath>..\packages\Xamarin.AndroidX.Core.1.6.0.1\lib\monoandroid90\Xamarin.AndroidX.Core.dll</HintPath>
</Reference>
<Reference Include="Xamarin.AndroidX.Activity">
<HintPath>..\packages\Xamarin.AndroidX.Activity.1.2.1\lib\monoandroid90\Xamarin.AndroidX.Activity.dll</HintPath>
<HintPath>..\packages\Xamarin.AndroidX.Activity.1.3.0\lib\monoandroid90\Xamarin.AndroidX.Activity.dll</HintPath>
</Reference>
<Reference Include="Xamarin.AndroidX.AsyncLayoutInflater">
<HintPath>..\packages\Xamarin.AndroidX.AsyncLayoutInflater.1.0.0.7\lib\monoandroid90\Xamarin.AndroidX.AsyncLayoutInflater.dll</HintPath>
<HintPath>..\packages\Xamarin.AndroidX.AsyncLayoutInflater.1.0.0.8\lib\monoandroid90\Xamarin.AndroidX.AsyncLayoutInflater.dll</HintPath>
</Reference>
<Reference Include="Xamarin.AndroidX.CustomView">
<HintPath>..\packages\Xamarin.AndroidX.CustomView.1.1.0.6\lib\monoandroid90\Xamarin.AndroidX.CustomView.dll</HintPath>
<HintPath>..\packages\Xamarin.AndroidX.CustomView.1.1.0.7\lib\monoandroid90\Xamarin.AndroidX.CustomView.dll</HintPath>
</Reference>
<Reference Include="Xamarin.AndroidX.CoordinatorLayout">
<HintPath>..\packages\Xamarin.AndroidX.CoordinatorLayout.1.1.0.7\lib\monoandroid90\Xamarin.AndroidX.CoordinatorLayout.dll</HintPath>
<HintPath>..\packages\Xamarin.AndroidX.CoordinatorLayout.1.1.0.8\lib\monoandroid90\Xamarin.AndroidX.CoordinatorLayout.dll</HintPath>
</Reference>
<Reference Include="Xamarin.AndroidX.DrawerLayout">
<HintPath>..\packages\Xamarin.AndroidX.DrawerLayout.1.1.1.2\lib\monoandroid90\Xamarin.AndroidX.DrawerLayout.dll</HintPath>
<HintPath>..\packages\Xamarin.AndroidX.DrawerLayout.1.1.1.3\lib\monoandroid90\Xamarin.AndroidX.DrawerLayout.dll</HintPath>
</Reference>
<Reference Include="Xamarin.AndroidX.Loader">
<HintPath>..\packages\Xamarin.AndroidX.Loader.1.1.0.7\lib\monoandroid90\Xamarin.AndroidX.Loader.dll</HintPath>
<HintPath>..\packages\Xamarin.AndroidX.Loader.1.1.0.8\lib\monoandroid90\Xamarin.AndroidX.Loader.dll</HintPath>
</Reference>
<Reference Include="Xamarin.AndroidX.Legacy.Support.Core.Utils">
<HintPath>..\packages\Xamarin.AndroidX.Legacy.Support.Core.Utils.1.0.0.7\lib\monoandroid90\Xamarin.AndroidX.Legacy.Support.Core.Utils.dll</HintPath>
<HintPath>..\packages\Xamarin.AndroidX.Legacy.Support.Core.Utils.1.0.0.8\lib\monoandroid90\Xamarin.AndroidX.Legacy.Support.Core.Utils.dll</HintPath>
</Reference>
<Reference Include="Xamarin.AndroidX.Media">
<HintPath>..\packages\Xamarin.AndroidX.Media.1.2.1.2\lib\monoandroid90\Xamarin.AndroidX.Media.dll</HintPath>
<HintPath>..\packages\Xamarin.AndroidX.Media.1.4.0.1\lib\monoandroid90\Xamarin.AndroidX.Media.dll</HintPath>
</Reference>
<Reference Include="Xamarin.AndroidX.RecyclerView">
<HintPath>..\packages\Xamarin.AndroidX.RecyclerView.1.1.0.8\lib\monoandroid90\Xamarin.AndroidX.RecyclerView.dll</HintPath>
<HintPath>..\packages\Xamarin.AndroidX.RecyclerView.1.2.1.1\lib\monoandroid90\Xamarin.AndroidX.RecyclerView.dll</HintPath>
</Reference>
<Reference Include="Xamarin.AndroidX.SlidingPaneLayout">
<HintPath>..\packages\Xamarin.AndroidX.SlidingPaneLayout.1.1.0.2\lib\monoandroid90\Xamarin.AndroidX.SlidingPaneLayout.dll</HintPath>
<HintPath>..\packages\Xamarin.AndroidX.SlidingPaneLayout.1.1.0.3\lib\monoandroid90\Xamarin.AndroidX.SlidingPaneLayout.dll</HintPath>
</Reference>
<Reference Include="Xamarin.AndroidX.SwipeRefreshLayout">
<HintPath>..\packages\Xamarin.AndroidX.SwipeRefreshLayout.1.1.0.2\lib\monoandroid90\Xamarin.AndroidX.SwipeRefreshLayout.dll</HintPath>
<HintPath>..\packages\Xamarin.AndroidX.SwipeRefreshLayout.1.1.0.3\lib\monoandroid90\Xamarin.AndroidX.SwipeRefreshLayout.dll</HintPath>
</Reference>
<Reference Include="Xamarin.AndroidX.VectorDrawable">
<HintPath>..\packages\Xamarin.AndroidX.VectorDrawable.1.1.0.7\lib\monoandroid90\Xamarin.AndroidX.VectorDrawable.dll</HintPath>
<HintPath>..\packages\Xamarin.AndroidX.VectorDrawable.1.1.0.8\lib\monoandroid90\Xamarin.AndroidX.VectorDrawable.dll</HintPath>
</Reference>
<Reference Include="Xamarin.AndroidX.VectorDrawable.Animated">
<HintPath>..\packages\Xamarin.AndroidX.VectorDrawable.Animated.1.1.0.7\lib\monoandroid90\Xamarin.AndroidX.VectorDrawable.Animated.dll</HintPath>
<HintPath>..\packages\Xamarin.AndroidX.VectorDrawable.Animated.1.1.0.8\lib\monoandroid90\Xamarin.AndroidX.VectorDrawable.Animated.dll</HintPath>
</Reference>
<Reference Include="Xamarin.AndroidX.AppCompat.AppCompatResources">
<HintPath>..\packages\Xamarin.AndroidX.AppCompat.AppCompatResources.1.2.0.7\lib\monoandroid90\Xamarin.AndroidX.AppCompat.AppCompatResources.dll</HintPath>
<HintPath>..\packages\Xamarin.AndroidX.AppCompat.AppCompatResources.1.3.1.1\lib\monoandroid90\Xamarin.AndroidX.AppCompat.AppCompatResources.dll</HintPath>
</Reference>
<Reference Include="Xamarin.AndroidX.ViewPager">
<HintPath>..\packages\Xamarin.AndroidX.ViewPager.1.0.0.7\lib\monoandroid90\Xamarin.AndroidX.ViewPager.dll</HintPath>
<HintPath>..\packages\Xamarin.AndroidX.ViewPager.1.0.0.8\lib\monoandroid90\Xamarin.AndroidX.ViewPager.dll</HintPath>
</Reference>
<Reference Include="Xamarin.AndroidX.Fragment">
<HintPath>..\packages\Xamarin.AndroidX.Fragment.1.3.1\lib\monoandroid90\Xamarin.AndroidX.Fragment.dll</HintPath>
<HintPath>..\packages\Xamarin.AndroidX.Fragment.1.3.6.1\lib\monoandroid90\Xamarin.AndroidX.Fragment.dll</HintPath>
</Reference>
<Reference Include="Xamarin.AndroidX.AppCompat">
<HintPath>..\packages\Xamarin.AndroidX.AppCompat.1.2.0.7\lib\monoandroid90\Xamarin.AndroidX.AppCompat.dll</HintPath>
<HintPath>..\packages\Xamarin.AndroidX.AppCompat.1.3.1.1\lib\monoandroid90\Xamarin.AndroidX.AppCompat.dll</HintPath>
</Reference>
<Reference Include="Xamarin.AndroidX.Legacy.Support.Core.UI">
<HintPath>..\packages\Xamarin.AndroidX.Legacy.Support.Core.UI.1.0.0.8\lib\monoandroid90\Xamarin.AndroidX.Legacy.Support.Core.UI.dll</HintPath>
<HintPath>..\packages\Xamarin.AndroidX.Legacy.Support.Core.UI.1.0.0.9\lib\monoandroid90\Xamarin.AndroidX.Legacy.Support.Core.UI.dll</HintPath>
</Reference>
<Reference Include="Xamarin.AndroidX.Legacy.Support.V4">
<HintPath>..\packages\Xamarin.AndroidX.Legacy.Support.V4.1.0.0.7\lib\monoandroid90\Xamarin.AndroidX.Legacy.Support.V4.dll</HintPath>
<HintPath>..\packages\Xamarin.AndroidX.Legacy.Support.V4.1.0.0.8\lib\monoandroid90\Xamarin.AndroidX.Legacy.Support.V4.dll</HintPath>
</Reference>
<Reference Include="Xamarin.AndroidX.Transition">
<HintPath>..\packages\Xamarin.AndroidX.Transition.1.4.0.1\lib\monoandroid90\Xamarin.AndroidX.Transition.dll</HintPath>
<HintPath>..\packages\Xamarin.AndroidX.Transition.1.4.1.1\lib\monoandroid90\Xamarin.AndroidX.Transition.dll</HintPath>
</Reference>
<Reference Include="Xamarin.AndroidX.ViewPager2">
<HintPath>..\packages\Xamarin.AndroidX.ViewPager2.1.0.0.9\lib\monoandroid90\Xamarin.AndroidX.ViewPager2.dll</HintPath>
<HintPath>..\packages\Xamarin.AndroidX.ViewPager2.1.0.0.10\lib\monoandroid90\Xamarin.AndroidX.ViewPager2.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Google.Android.Material">
<HintPath>..\packages\Xamarin.Google.Android.Material.1.3.0.1\lib\monoandroid90\Xamarin.Google.Android.Material.dll</HintPath>
<HintPath>..\packages\Xamarin.Google.Android.Material.1.4.0.1\lib\monoandroid90\Xamarin.Google.Android.Material.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Google.Guava.ListenableFuture">
<HintPath>..\packages\Xamarin.Google.Guava.ListenableFuture.1.0.0.2\lib\monoandroid50\Xamarin.Google.Guava.ListenableFuture.dll</HintPath>
</Reference>
<Reference Include="Xamarin.AndroidX.Browser">
<HintPath>..\packages\Xamarin.AndroidX.Browser.1.3.0.5\lib\monoandroid90\Xamarin.AndroidX.Browser.dll</HintPath>
<HintPath>..\packages\Xamarin.AndroidX.Browser.1.3.0.6\lib\monoandroid90\Xamarin.AndroidX.Browser.dll</HintPath>
</Reference>
<Reference Include="FormsViewGroup">
<HintPath>..\packages\Xamarin.Forms.5.0.0.2012\lib\MonoAndroid10.0\FormsViewGroup.dll</HintPath>
@@ -381,7 +381,7 @@
<HintPath>..\packages\Xamarin.Forms.5.0.0.2012\lib\MonoAndroid10.0\Xamarin.Forms.Xaml.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Essentials">
<HintPath>..\packages\Xamarin.Essentials.1.6.1\lib\monoandroid10.0\Xamarin.Essentials.dll</HintPath>
<HintPath>..\packages\Xamarin.Essentials.1.7.0\lib\monoandroid10.0\Xamarin.Essentials.dll</HintPath>
</Reference>
<Reference Include="Acr.UserDialogs">
<HintPath>..\packages\Acr.UserDialogs.7.1.0.483\lib\monoandroid10.0\Acr.UserDialogs.dll</HintPath>
@@ -390,22 +390,32 @@
<HintPath>..\packages\Acr.Settings.9.0.1\lib\monoandroid80\Acr.Settings.dll</HintPath>
</Reference>
<Reference Include="Xamarin.AndroidX.MediaRouter">
<HintPath>..\packages\Xamarin.AndroidX.MediaRouter.1.2.2.1\lib\monoandroid90\Xamarin.AndroidX.MediaRouter.dll</HintPath>
<HintPath>..\packages\Xamarin.AndroidX.MediaRouter.1.2.4.1\lib\monoandroid90\Xamarin.AndroidX.MediaRouter.dll</HintPath>
</Reference>
<Reference Include="Xamarin.AndroidX.Palette">
<HintPath>..\packages\Xamarin.AndroidX.Palette.1.0.0.7\lib\monoandroid90\Xamarin.AndroidX.Palette.dll</HintPath>
<HintPath>..\packages\Xamarin.AndroidX.Palette.1.0.0.8\lib\monoandroid90\Xamarin.AndroidX.Palette.dll</HintPath>
</Reference>
<Reference Include="Xamarin.AndroidX.Annotation.Experimental">
<HintPath>..\packages\Xamarin.AndroidX.Annotation.Experimental.1.0.0.9\lib\monoandroid90\Xamarin.AndroidX.Annotation.Experimental.dll</HintPath>
<HintPath>..\packages\Xamarin.AndroidX.Annotation.Experimental.1.1.0.1\lib\monoandroid90\Xamarin.AndroidX.Annotation.Experimental.dll</HintPath>
</Reference>
<Reference Include="Xamarin.AndroidX.ConstraintLayout.Solver">
<HintPath>..\packages\Xamarin.AndroidX.ConstraintLayout.Solver.2.0.4.2\lib\monoandroid90\Xamarin.AndroidX.ConstraintLayout.Solver.dll</HintPath>
<HintPath>..\packages\Xamarin.AndroidX.ConstraintLayout.Solver.2.0.4.3\lib\monoandroid90\Xamarin.AndroidX.ConstraintLayout.Solver.dll</HintPath>
</Reference>
<Reference Include="Xamarin.AndroidX.DynamicAnimation">
<HintPath>..\packages\Xamarin.AndroidX.DynamicAnimation.1.0.0.7\lib\monoandroid90\Xamarin.AndroidX.DynamicAnimation.dll</HintPath>
<HintPath>..\packages\Xamarin.AndroidX.DynamicAnimation.1.0.0.8\lib\monoandroid90\Xamarin.AndroidX.DynamicAnimation.dll</HintPath>
</Reference>
<Reference Include="Xamarin.AndroidX.ConstraintLayout">
<HintPath>..\packages\Xamarin.AndroidX.ConstraintLayout.2.0.4.2\lib\monoandroid90\Xamarin.AndroidX.ConstraintLayout.dll</HintPath>
<HintPath>..\packages\Xamarin.AndroidX.ConstraintLayout.2.1.0\lib\monoandroid90\Xamarin.AndroidX.ConstraintLayout.dll</HintPath>
</Reference>
<Reference Include="mscorlib" />
<Reference Include="Xamarin.AndroidX.Tracing.Tracing">
<HintPath>..\packages\Xamarin.AndroidX.Tracing.Tracing.1.0.0.1\lib\monoandroid90\Xamarin.AndroidX.Tracing.Tracing.dll</HintPath>
</Reference>
<Reference Include="Xamarin.AndroidX.Concurrent.Futures">
<HintPath>..\packages\Xamarin.AndroidX.Concurrent.Futures.1.1.0.3\lib\monoandroid90\Xamarin.AndroidX.Concurrent.Futures.dll</HintPath>
</Reference>
<Reference Include="Xamarin.AndroidX.ConstraintLayout.Core">
<HintPath>..\packages\Xamarin.AndroidX.ConstraintLayout.Core.1.0.0\lib\monoandroid90\Xamarin.AndroidX.ConstraintLayout.Core.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
@@ -485,51 +495,71 @@
<Import Project="..\packages\Xamarin.Google.Guava.ListenableFuture.1.0.0.2\build\monoandroid50\Xamarin.Google.Guava.ListenableFuture.targets" Condition="Exists('..\packages\Xamarin.Google.Guava.ListenableFuture.1.0.0.2\build\monoandroid50\Xamarin.Google.Guava.ListenableFuture.targets')" />
<Import Project="..\packages\Xamarin.Forms.5.0.0.2012\build\Xamarin.Forms.targets" Condition="Exists('..\packages\Xamarin.Forms.5.0.0.2012\build\Xamarin.Forms.targets')" />
<Import Project="..\packages\Xamarin.AndroidX.Annotation.Experimental.1.0.0.9\build\monoandroid9.0\Xamarin.AndroidX.Annotation.Experimental.targets" Condition="Exists('..\packages\Xamarin.AndroidX.Annotation.Experimental.1.0.0.9\build\monoandroid9.0\Xamarin.AndroidX.Annotation.Experimental.targets')" />
<Import Project="..\packages\Xamarin.AndroidX.ConstraintLayout.Solver.2.0.4.2\build\monoandroid9.0\Xamarin.AndroidX.ConstraintLayout.Solver.targets" Condition="Exists('..\packages\Xamarin.AndroidX.ConstraintLayout.Solver.2.0.4.2\build\monoandroid9.0\Xamarin.AndroidX.ConstraintLayout.Solver.targets')" />
<Import Project="..\packages\Xamarin.AndroidX.MultiDex.2.0.1.7\build\monoandroid9.0\Xamarin.AndroidX.MultiDex.targets" Condition="Exists('..\packages\Xamarin.AndroidX.MultiDex.2.0.1.7\build\monoandroid9.0\Xamarin.AndroidX.MultiDex.targets')" />
<Import Project="..\packages\Xamarin.AndroidX.Annotation.1.1.0.9\build\monoandroid9.0\Xamarin.AndroidX.Annotation.targets" Condition="Exists('..\packages\Xamarin.AndroidX.Annotation.1.1.0.9\build\monoandroid9.0\Xamarin.AndroidX.Annotation.targets')" />
<Import Project="..\packages\Xamarin.AndroidX.Arch.Core.Common.2.1.0.8\build\monoandroid9.0\Xamarin.AndroidX.Arch.Core.Common.targets" Condition="Exists('..\packages\Xamarin.AndroidX.Arch.Core.Common.2.1.0.8\build\monoandroid9.0\Xamarin.AndroidX.Arch.Core.Common.targets')" />
<Import Project="..\packages\Xamarin.AndroidX.Arch.Core.Runtime.2.1.0.8\build\monoandroid9.0\Xamarin.AndroidX.Arch.Core.Runtime.targets" Condition="Exists('..\packages\Xamarin.AndroidX.Arch.Core.Runtime.2.1.0.8\build\monoandroid9.0\Xamarin.AndroidX.Arch.Core.Runtime.targets')" />
<Import Project="..\packages\Xamarin.AndroidX.CardView.1.0.0.8\build\monoandroid9.0\Xamarin.AndroidX.CardView.targets" Condition="Exists('..\packages\Xamarin.AndroidX.CardView.1.0.0.8\build\monoandroid9.0\Xamarin.AndroidX.CardView.targets')" />
<Import Project="..\packages\Xamarin.AndroidX.Collection.1.1.0.7\build\monoandroid9.0\Xamarin.AndroidX.Collection.targets" Condition="Exists('..\packages\Xamarin.AndroidX.Collection.1.1.0.7\build\monoandroid9.0\Xamarin.AndroidX.Collection.targets')" />
<Import Project="..\packages\Xamarin.AndroidX.CursorAdapter.1.0.0.7\build\monoandroid9.0\Xamarin.AndroidX.CursorAdapter.targets" Condition="Exists('..\packages\Xamarin.AndroidX.CursorAdapter.1.0.0.7\build\monoandroid9.0\Xamarin.AndroidX.CursorAdapter.targets')" />
<Import Project="..\packages\Xamarin.AndroidX.DocumentFile.1.0.1.7\build\monoandroid9.0\Xamarin.AndroidX.DocumentFile.targets" Condition="Exists('..\packages\Xamarin.AndroidX.DocumentFile.1.0.1.7\build\monoandroid9.0\Xamarin.AndroidX.DocumentFile.targets')" />
<Import Project="..\packages\Xamarin.AndroidX.Interpolator.1.0.0.7\build\monoandroid9.0\Xamarin.AndroidX.Interpolator.targets" Condition="Exists('..\packages\Xamarin.AndroidX.Interpolator.1.0.0.7\build\monoandroid9.0\Xamarin.AndroidX.Interpolator.targets')" />
<Import Project="..\packages\Xamarin.AndroidX.Lifecycle.Common.2.3.0.1\build\monoandroid9.0\Xamarin.AndroidX.Lifecycle.Common.targets" Condition="Exists('..\packages\Xamarin.AndroidX.Lifecycle.Common.2.3.0.1\build\monoandroid9.0\Xamarin.AndroidX.Lifecycle.Common.targets')" />
<Import Project="..\packages\Xamarin.AndroidX.Lifecycle.LiveData.Core.2.3.0.1\build\monoandroid9.0\Xamarin.AndroidX.Lifecycle.LiveData.Core.targets" Condition="Exists('..\packages\Xamarin.AndroidX.Lifecycle.LiveData.Core.2.3.0.1\build\monoandroid9.0\Xamarin.AndroidX.Lifecycle.LiveData.Core.targets')" />
<Import Project="..\packages\Xamarin.AndroidX.Lifecycle.LiveData.2.3.0.1\build\monoandroid9.0\Xamarin.AndroidX.Lifecycle.LiveData.targets" Condition="Exists('..\packages\Xamarin.AndroidX.Lifecycle.LiveData.2.3.0.1\build\monoandroid9.0\Xamarin.AndroidX.Lifecycle.LiveData.targets')" />
<Import Project="..\packages\Xamarin.AndroidX.Lifecycle.Runtime.2.3.0.1\build\monoandroid9.0\Xamarin.AndroidX.Lifecycle.Runtime.targets" Condition="Exists('..\packages\Xamarin.AndroidX.Lifecycle.Runtime.2.3.0.1\build\monoandroid9.0\Xamarin.AndroidX.Lifecycle.Runtime.targets')" />
<Import Project="..\packages\Xamarin.AndroidX.Lifecycle.ViewModel.2.3.0.1\build\monoandroid9.0\Xamarin.AndroidX.Lifecycle.ViewModel.targets" Condition="Exists('..\packages\Xamarin.AndroidX.Lifecycle.ViewModel.2.3.0.1\build\monoandroid9.0\Xamarin.AndroidX.Lifecycle.ViewModel.targets')" />
<Import Project="..\packages\Xamarin.AndroidX.LocalBroadcastManager.1.0.0.7\build\monoandroid9.0\Xamarin.AndroidX.LocalBroadcastManager.targets" Condition="Exists('..\packages\Xamarin.AndroidX.LocalBroadcastManager.1.0.0.7\build\monoandroid9.0\Xamarin.AndroidX.LocalBroadcastManager.targets')" />
<Import Project="..\packages\Xamarin.AndroidX.Print.1.0.0.7\build\monoandroid9.0\Xamarin.AndroidX.Print.targets" Condition="Exists('..\packages\Xamarin.AndroidX.Print.1.0.0.7\build\monoandroid9.0\Xamarin.AndroidX.Print.targets')" />
<Import Project="..\packages\Xamarin.AndroidX.Lifecycle.ViewModelSavedState.2.3.0.1\build\monoandroid9.0\Xamarin.AndroidX.Lifecycle.ViewModelSavedState.targets" Condition="Exists('..\packages\Xamarin.AndroidX.Lifecycle.ViewModelSavedState.2.3.0.1\build\monoandroid9.0\Xamarin.AndroidX.Lifecycle.ViewModelSavedState.targets')" />
<Import Project="..\packages\Xamarin.AndroidX.VersionedParcelable.1.1.1.7\build\monoandroid9.0\Xamarin.AndroidX.VersionedParcelable.targets" Condition="Exists('..\packages\Xamarin.AndroidX.VersionedParcelable.1.1.1.7\build\monoandroid9.0\Xamarin.AndroidX.VersionedParcelable.targets')" />
<Import Project="..\packages\Xamarin.AndroidX.Core.1.3.2.3\build\monoandroid9.0\Xamarin.AndroidX.Core.targets" Condition="Exists('..\packages\Xamarin.AndroidX.Core.1.3.2.3\build\monoandroid9.0\Xamarin.AndroidX.Core.targets')" />
<Import Project="..\packages\Xamarin.AndroidX.Activity.1.2.1\build\monoandroid9.0\Xamarin.AndroidX.Activity.targets" Condition="Exists('..\packages\Xamarin.AndroidX.Activity.1.2.1\build\monoandroid9.0\Xamarin.AndroidX.Activity.targets')" />
<Import Project="..\packages\Xamarin.AndroidX.AsyncLayoutInflater.1.0.0.7\build\monoandroid9.0\Xamarin.AndroidX.AsyncLayoutInflater.targets" Condition="Exists('..\packages\Xamarin.AndroidX.AsyncLayoutInflater.1.0.0.7\build\monoandroid9.0\Xamarin.AndroidX.AsyncLayoutInflater.targets')" />
<Import Project="..\packages\Xamarin.AndroidX.CustomView.1.1.0.6\build\monoandroid9.0\Xamarin.AndroidX.CustomView.targets" Condition="Exists('..\packages\Xamarin.AndroidX.CustomView.1.1.0.6\build\monoandroid9.0\Xamarin.AndroidX.CustomView.targets')" />
<Import Project="..\packages\Xamarin.AndroidX.CoordinatorLayout.1.1.0.7\build\monoandroid9.0\Xamarin.AndroidX.CoordinatorLayout.targets" Condition="Exists('..\packages\Xamarin.AndroidX.CoordinatorLayout.1.1.0.7\build\monoandroid9.0\Xamarin.AndroidX.CoordinatorLayout.targets')" />
<Import Project="..\packages\Xamarin.AndroidX.DrawerLayout.1.1.1.2\build\monoandroid9.0\Xamarin.AndroidX.DrawerLayout.targets" Condition="Exists('..\packages\Xamarin.AndroidX.DrawerLayout.1.1.1.2\build\monoandroid9.0\Xamarin.AndroidX.DrawerLayout.targets')" />
<Import Project="..\packages\Xamarin.AndroidX.Loader.1.1.0.7\build\monoandroid9.0\Xamarin.AndroidX.Loader.targets" Condition="Exists('..\packages\Xamarin.AndroidX.Loader.1.1.0.7\build\monoandroid9.0\Xamarin.AndroidX.Loader.targets')" />
<Import Project="..\packages\Xamarin.AndroidX.Legacy.Support.Core.Utils.1.0.0.7\build\monoandroid9.0\Xamarin.AndroidX.Legacy.Support.Core.Utils.targets" Condition="Exists('..\packages\Xamarin.AndroidX.Legacy.Support.Core.Utils.1.0.0.7\build\monoandroid9.0\Xamarin.AndroidX.Legacy.Support.Core.Utils.targets')" />
<Import Project="..\packages\Xamarin.AndroidX.DynamicAnimation.1.0.0.7\build\monoandroid9.0\Xamarin.AndroidX.DynamicAnimation.targets" Condition="Exists('..\packages\Xamarin.AndroidX.DynamicAnimation.1.0.0.7\build\monoandroid9.0\Xamarin.AndroidX.DynamicAnimation.targets')" />
<Import Project="..\packages\Xamarin.AndroidX.Media.1.2.1.2\build\monoandroid9.0\Xamarin.AndroidX.Media.targets" Condition="Exists('..\packages\Xamarin.AndroidX.Media.1.2.1.2\build\monoandroid9.0\Xamarin.AndroidX.Media.targets')" />
<Import Project="..\packages\Xamarin.AndroidX.Palette.1.0.0.7\build\monoandroid9.0\Xamarin.AndroidX.Palette.targets" Condition="Exists('..\packages\Xamarin.AndroidX.Palette.1.0.0.7\build\monoandroid9.0\Xamarin.AndroidX.Palette.targets')" />
<Import Project="..\packages\Xamarin.AndroidX.RecyclerView.1.1.0.8\build\monoandroid9.0\Xamarin.AndroidX.RecyclerView.targets" Condition="Exists('..\packages\Xamarin.AndroidX.RecyclerView.1.1.0.8\build\monoandroid9.0\Xamarin.AndroidX.RecyclerView.targets')" />
<Import Project="..\packages\Xamarin.AndroidX.SlidingPaneLayout.1.1.0.2\build\monoandroid9.0\Xamarin.AndroidX.SlidingPaneLayout.targets" Condition="Exists('..\packages\Xamarin.AndroidX.SlidingPaneLayout.1.1.0.2\build\monoandroid9.0\Xamarin.AndroidX.SlidingPaneLayout.targets')" />
<Import Project="..\packages\Xamarin.AndroidX.SwipeRefreshLayout.1.1.0.2\build\monoandroid9.0\Xamarin.AndroidX.SwipeRefreshLayout.targets" Condition="Exists('..\packages\Xamarin.AndroidX.SwipeRefreshLayout.1.1.0.2\build\monoandroid9.0\Xamarin.AndroidX.SwipeRefreshLayout.targets')" />
<Import Project="..\packages\Xamarin.AndroidX.VectorDrawable.1.1.0.7\build\monoandroid9.0\Xamarin.AndroidX.VectorDrawable.targets" Condition="Exists('..\packages\Xamarin.AndroidX.VectorDrawable.1.1.0.7\build\monoandroid9.0\Xamarin.AndroidX.VectorDrawable.targets')" />
<Import Project="..\packages\Xamarin.AndroidX.VectorDrawable.Animated.1.1.0.7\build\monoandroid9.0\Xamarin.AndroidX.VectorDrawable.Animated.targets" Condition="Exists('..\packages\Xamarin.AndroidX.VectorDrawable.Animated.1.1.0.7\build\monoandroid9.0\Xamarin.AndroidX.VectorDrawable.Animated.targets')" />
<Import Project="..\packages\Xamarin.AndroidX.AppCompat.AppCompatResources.1.2.0.7\build\monoandroid9.0\Xamarin.AndroidX.AppCompat.AppCompatResources.targets" Condition="Exists('..\packages\Xamarin.AndroidX.AppCompat.AppCompatResources.1.2.0.7\build\monoandroid9.0\Xamarin.AndroidX.AppCompat.AppCompatResources.targets')" />
<Import Project="..\packages\Xamarin.AndroidX.ViewPager.1.0.0.7\build\monoandroid9.0\Xamarin.AndroidX.ViewPager.targets" Condition="Exists('..\packages\Xamarin.AndroidX.ViewPager.1.0.0.7\build\monoandroid9.0\Xamarin.AndroidX.ViewPager.targets')" />
<Import Project="..\packages\Xamarin.AndroidX.Fragment.1.3.1\build\monoandroid9.0\Xamarin.AndroidX.Fragment.targets" Condition="Exists('..\packages\Xamarin.AndroidX.Fragment.1.3.1\build\monoandroid9.0\Xamarin.AndroidX.Fragment.targets')" />
<Import Project="..\packages\Xamarin.AndroidX.AppCompat.1.2.0.7\build\monoandroid9.0\Xamarin.AndroidX.AppCompat.targets" Condition="Exists('..\packages\Xamarin.AndroidX.AppCompat.1.2.0.7\build\monoandroid9.0\Xamarin.AndroidX.AppCompat.targets')" />
<Import Project="..\packages\Xamarin.AndroidX.ConstraintLayout.2.0.4.2\build\monoandroid9.0\Xamarin.AndroidX.ConstraintLayout.targets" Condition="Exists('..\packages\Xamarin.AndroidX.ConstraintLayout.2.0.4.2\build\monoandroid9.0\Xamarin.AndroidX.ConstraintLayout.targets')" />
<Import Project="..\packages\Xamarin.AndroidX.Legacy.Support.Core.UI.1.0.0.8\build\monoandroid9.0\Xamarin.AndroidX.Legacy.Support.Core.UI.targets" Condition="Exists('..\packages\Xamarin.AndroidX.Legacy.Support.Core.UI.1.0.0.8\build\monoandroid9.0\Xamarin.AndroidX.Legacy.Support.Core.UI.targets')" />
<Import Project="..\packages\Xamarin.AndroidX.Legacy.Support.V4.1.0.0.7\build\monoandroid9.0\Xamarin.AndroidX.Legacy.Support.V4.targets" Condition="Exists('..\packages\Xamarin.AndroidX.Legacy.Support.V4.1.0.0.7\build\monoandroid9.0\Xamarin.AndroidX.Legacy.Support.V4.targets')" />
<Import Project="..\packages\Xamarin.AndroidX.Transition.1.4.0.1\build\monoandroid9.0\Xamarin.AndroidX.Transition.targets" Condition="Exists('..\packages\Xamarin.AndroidX.Transition.1.4.0.1\build\monoandroid9.0\Xamarin.AndroidX.Transition.targets')" />
<Import Project="..\packages\Xamarin.AndroidX.ViewPager2.1.0.0.9\build\monoandroid9.0\Xamarin.AndroidX.ViewPager2.targets" Condition="Exists('..\packages\Xamarin.AndroidX.ViewPager2.1.0.0.9\build\monoandroid9.0\Xamarin.AndroidX.ViewPager2.targets')" />
<Import Project="..\packages\Xamarin.Google.Android.Material.1.3.0.1\build\monoandroid9.0\Xamarin.Google.Android.Material.targets" Condition="Exists('..\packages\Xamarin.Google.Android.Material.1.3.0.1\build\monoandroid9.0\Xamarin.Google.Android.Material.targets')" />
<Import Project="..\packages\Xamarin.AndroidX.Browser.1.3.0.5\build\monoandroid9.0\Xamarin.AndroidX.Browser.targets" Condition="Exists('..\packages\Xamarin.AndroidX.Browser.1.3.0.5\build\monoandroid9.0\Xamarin.AndroidX.Browser.targets')" />
<Import Project="..\packages\Xamarin.AndroidX.MediaRouter.1.2.2.1\build\monoandroid9.0\Xamarin.AndroidX.MediaRouter.targets" Condition="Exists('..\packages\Xamarin.AndroidX.MediaRouter.1.2.2.1\build\monoandroid9.0\Xamarin.AndroidX.MediaRouter.targets')" />
<Import Project="..\packages\Xamarin.AndroidX.Annotation.Experimental.1.1.0.1\build\monoandroid90\Xamarin.AndroidX.Annotation.Experimental.targets" Condition="Exists('..\packages\Xamarin.AndroidX.Annotation.Experimental.1.1.0.1\build\monoandroid90\Xamarin.AndroidX.Annotation.Experimental.targets')" />
<Import Project="..\packages\Xamarin.AndroidX.Annotation.1.2.0.1\build\monoandroid90\Xamarin.AndroidX.Annotation.targets" Condition="Exists('..\packages\Xamarin.AndroidX.Annotation.1.2.0.1\build\monoandroid90\Xamarin.AndroidX.Annotation.targets')" />
<Import Project="..\packages\Xamarin.AndroidX.Arch.Core.Common.2.1.0.9\build\monoandroid90\Xamarin.AndroidX.Arch.Core.Common.targets" Condition="Exists('..\packages\Xamarin.AndroidX.Arch.Core.Common.2.1.0.9\build\monoandroid90\Xamarin.AndroidX.Arch.Core.Common.targets')" />
<Import Project="..\packages\Xamarin.AndroidX.Arch.Core.Runtime.2.1.0.9\build\monoandroid90\Xamarin.AndroidX.Arch.Core.Runtime.targets" Condition="Exists('..\packages\Xamarin.AndroidX.Arch.Core.Runtime.2.1.0.9\build\monoandroid90\Xamarin.AndroidX.Arch.Core.Runtime.targets')" />
<Import Project="..\packages\Xamarin.AndroidX.Collection.1.1.0.8\build\monoandroid90\Xamarin.AndroidX.Collection.targets" Condition="Exists('..\packages\Xamarin.AndroidX.Collection.1.1.0.8\build\monoandroid90\Xamarin.AndroidX.Collection.targets')" />
<Import Project="..\packages\Xamarin.AndroidX.Lifecycle.Common.2.3.1.1\build\monoandroid90\Xamarin.AndroidX.Lifecycle.Common.targets" Condition="Exists('..\packages\Xamarin.AndroidX.Lifecycle.Common.2.3.1.1\build\monoandroid90\Xamarin.AndroidX.Lifecycle.Common.targets')" />
<Import Project="..\packages\Xamarin.AndroidX.Lifecycle.LiveData.Core.2.3.1.1\build\monoandroid90\Xamarin.AndroidX.Lifecycle.LiveData.Core.targets" Condition="Exists('..\packages\Xamarin.AndroidX.Lifecycle.LiveData.Core.2.3.1.1\build\monoandroid90\Xamarin.AndroidX.Lifecycle.LiveData.Core.targets')" />
<Import Project="..\packages\Xamarin.AndroidX.Lifecycle.Runtime.2.3.1.2\build\monoandroid90\Xamarin.AndroidX.Lifecycle.Runtime.targets" Condition="Exists('..\packages\Xamarin.AndroidX.Lifecycle.Runtime.2.3.1.2\build\monoandroid90\Xamarin.AndroidX.Lifecycle.Runtime.targets')" />
<Import Project="..\packages\Xamarin.AndroidX.Lifecycle.ViewModel.2.3.1.1\build\monoandroid90\Xamarin.AndroidX.Lifecycle.ViewModel.targets" Condition="Exists('..\packages\Xamarin.AndroidX.Lifecycle.ViewModel.2.3.1.1\build\monoandroid90\Xamarin.AndroidX.Lifecycle.ViewModel.targets')" />
<Import Project="..\packages\Xamarin.AndroidX.VersionedParcelable.1.1.1.8\build\monoandroid90\Xamarin.AndroidX.VersionedParcelable.targets" Condition="Exists('..\packages\Xamarin.AndroidX.VersionedParcelable.1.1.1.8\build\monoandroid90\Xamarin.AndroidX.VersionedParcelable.targets')" />
<Import Project="..\packages\Xamarin.AndroidX.Core.1.6.0.1\build\monoandroid90\Xamarin.AndroidX.Core.targets" Condition="Exists('..\packages\Xamarin.AndroidX.Core.1.6.0.1\build\monoandroid90\Xamarin.AndroidX.Core.targets')" />
<Import Project="..\packages\Xamarin.AndroidX.Loader.1.1.0.8\build\monoandroid90\Xamarin.AndroidX.Loader.targets" Condition="Exists('..\packages\Xamarin.AndroidX.Loader.1.1.0.8\build\monoandroid90\Xamarin.AndroidX.Loader.targets')" />
<Import Project="..\packages\Xamarin.AndroidX.Media.1.4.0.1\build\monoandroid90\Xamarin.AndroidX.Media.targets" Condition="Exists('..\packages\Xamarin.AndroidX.Media.1.4.0.1\build\monoandroid90\Xamarin.AndroidX.Media.targets')" />
<Import Project="..\packages\Xamarin.AndroidX.MultiDex.2.0.1.8\build\monoandroid90\Xamarin.AndroidX.MultiDex.targets" Condition="Exists('..\packages\Xamarin.AndroidX.MultiDex.2.0.1.8\build\monoandroid90\Xamarin.AndroidX.MultiDex.targets')" />
<Import Project="..\packages\Xamarin.AndroidX.DocumentFile.1.0.1.8\build\monoandroid90\Xamarin.AndroidX.DocumentFile.targets" Condition="Exists('..\packages\Xamarin.AndroidX.DocumentFile.1.0.1.8\build\monoandroid90\Xamarin.AndroidX.DocumentFile.targets')" />
<Import Project="..\packages\Xamarin.AndroidX.LocalBroadcastManager.1.0.0.8\build\monoandroid90\Xamarin.AndroidX.LocalBroadcastManager.targets" Condition="Exists('..\packages\Xamarin.AndroidX.LocalBroadcastManager.1.0.0.8\build\monoandroid90\Xamarin.AndroidX.LocalBroadcastManager.targets')" />
<Import Project="..\packages\Xamarin.AndroidX.Print.1.0.0.8\build\monoandroid90\Xamarin.AndroidX.Print.targets" Condition="Exists('..\packages\Xamarin.AndroidX.Print.1.0.0.8\build\monoandroid90\Xamarin.AndroidX.Print.targets')" />
<Import Project="..\packages\Xamarin.AndroidX.Legacy.Support.Core.Utils.1.0.0.8\build\monoandroid90\Xamarin.AndroidX.Legacy.Support.Core.Utils.targets" Condition="Exists('..\packages\Xamarin.AndroidX.Legacy.Support.Core.Utils.1.0.0.8\build\monoandroid90\Xamarin.AndroidX.Legacy.Support.Core.Utils.targets')" />
<Import Project="..\packages\Xamarin.AndroidX.Palette.1.0.0.8\build\monoandroid90\Xamarin.AndroidX.Palette.targets" Condition="Exists('..\packages\Xamarin.AndroidX.Palette.1.0.0.8\build\monoandroid90\Xamarin.AndroidX.Palette.targets')" />
<Import Project="..\packages\Xamarin.AndroidX.Lifecycle.ViewModelSavedState.2.3.1.1\build\monoandroid90\Xamarin.AndroidX.Lifecycle.ViewModelSavedState.targets" Condition="Exists('..\packages\Xamarin.AndroidX.Lifecycle.ViewModelSavedState.2.3.1.1\build\monoandroid90\Xamarin.AndroidX.Lifecycle.ViewModelSavedState.targets')" />
<Import Project="..\packages\Xamarin.AndroidX.Tracing.Tracing.1.0.0.1\build\monoandroid90\Xamarin.AndroidX.Tracing.Tracing.targets" Condition="Exists('..\packages\Xamarin.AndroidX.Tracing.Tracing.1.0.0.1\build\monoandroid90\Xamarin.AndroidX.Tracing.Tracing.targets')" />
<Import Project="..\packages\Xamarin.AndroidX.CustomView.1.1.0.7\build\monoandroid90\Xamarin.AndroidX.CustomView.targets" Condition="Exists('..\packages\Xamarin.AndroidX.CustomView.1.1.0.7\build\monoandroid90\Xamarin.AndroidX.CustomView.targets')" />
<Import Project="..\packages\Xamarin.AndroidX.ViewPager.1.0.0.8\build\monoandroid90\Xamarin.AndroidX.ViewPager.targets" Condition="Exists('..\packages\Xamarin.AndroidX.ViewPager.1.0.0.8\build\monoandroid90\Xamarin.AndroidX.ViewPager.targets')" />
<Import Project="..\packages\Xamarin.AndroidX.Fragment.1.3.6.1\build\monoandroid90\Xamarin.AndroidX.Fragment.targets" Condition="Exists('..\packages\Xamarin.AndroidX.Fragment.1.3.6.1\build\monoandroid90\Xamarin.AndroidX.Fragment.targets')" />
<Import Project="..\packages\Xamarin.AndroidX.Transition.1.4.1.1\build\monoandroid90\Xamarin.AndroidX.Transition.targets" Condition="Exists('..\packages\Xamarin.AndroidX.Transition.1.4.1.1\build\monoandroid90\Xamarin.AndroidX.Transition.targets')" />
<Import Project="..\packages\Xamarin.AndroidX.CursorAdapter.1.0.0.8\build\monoandroid90\Xamarin.AndroidX.CursorAdapter.targets" Condition="Exists('..\packages\Xamarin.AndroidX.CursorAdapter.1.0.0.8\build\monoandroid90\Xamarin.AndroidX.CursorAdapter.targets')" />
<Import Project="..\packages\Xamarin.AndroidX.Interpolator.1.0.0.8\build\monoandroid90\Xamarin.AndroidX.Interpolator.targets" Condition="Exists('..\packages\Xamarin.AndroidX.Interpolator.1.0.0.8\build\monoandroid90\Xamarin.AndroidX.Interpolator.targets')" />
<Import Project="..\packages\Xamarin.AndroidX.DrawerLayout.1.1.1.3\build\monoandroid90\Xamarin.AndroidX.DrawerLayout.targets" Condition="Exists('..\packages\Xamarin.AndroidX.DrawerLayout.1.1.1.3\build\monoandroid90\Xamarin.AndroidX.DrawerLayout.targets')" />
<Import Project="..\packages\Xamarin.AndroidX.VectorDrawable.1.1.0.8\build\monoandroid90\Xamarin.AndroidX.VectorDrawable.targets" Condition="Exists('..\packages\Xamarin.AndroidX.VectorDrawable.1.1.0.8\build\monoandroid90\Xamarin.AndroidX.VectorDrawable.targets')" />
<Import Project="..\packages\Xamarin.AndroidX.VectorDrawable.Animated.1.1.0.8\build\monoandroid90\Xamarin.AndroidX.VectorDrawable.Animated.targets" Condition="Exists('..\packages\Xamarin.AndroidX.VectorDrawable.Animated.1.1.0.8\build\monoandroid90\Xamarin.AndroidX.VectorDrawable.Animated.targets')" />
<Import Project="..\packages\Xamarin.AndroidX.AppCompat.AppCompatResources.1.3.1.1\build\monoandroid90\Xamarin.AndroidX.AppCompat.AppCompatResources.targets" Condition="Exists('..\packages\Xamarin.AndroidX.AppCompat.AppCompatResources.1.3.1.1\build\monoandroid90\Xamarin.AndroidX.AppCompat.AppCompatResources.targets')" />
<Import Project="..\packages\Xamarin.AndroidX.AppCompat.1.3.1.1\build\monoandroid90\Xamarin.AndroidX.AppCompat.targets" Condition="Exists('..\packages\Xamarin.AndroidX.AppCompat.1.3.1.1\build\monoandroid90\Xamarin.AndroidX.AppCompat.targets')" />
<Import Project="..\packages\Xamarin.AndroidX.CardView.1.0.0.9\build\monoandroid90\Xamarin.AndroidX.CardView.targets" Condition="Exists('..\packages\Xamarin.AndroidX.CardView.1.0.0.9\build\monoandroid90\Xamarin.AndroidX.CardView.targets')" />
<Import Project="..\packages\Xamarin.AndroidX.Lifecycle.LiveData.2.3.1.1\build\monoandroid90\Xamarin.AndroidX.Lifecycle.LiveData.targets" Condition="Exists('..\packages\Xamarin.AndroidX.Lifecycle.LiveData.2.3.1.1\build\monoandroid90\Xamarin.AndroidX.Lifecycle.LiveData.targets')" />
<Import Project="..\packages\Xamarin.AndroidX.RecyclerView.1.2.1.1\build\monoandroid90\Xamarin.AndroidX.RecyclerView.targets" Condition="Exists('..\packages\Xamarin.AndroidX.RecyclerView.1.2.1.1\build\monoandroid90\Xamarin.AndroidX.RecyclerView.targets')" />
<Import Project="..\packages\Xamarin.AndroidX.MediaRouter.1.2.4.1\build\monoandroid90\Xamarin.AndroidX.MediaRouter.targets" Condition="Exists('..\packages\Xamarin.AndroidX.MediaRouter.1.2.4.1\build\monoandroid90\Xamarin.AndroidX.MediaRouter.targets')" />
<Import Project="..\packages\Xamarin.AndroidX.ConstraintLayout.Solver.2.0.4.3\build\monoandroid90\Xamarin.AndroidX.ConstraintLayout.Solver.targets" Condition="Exists('..\packages\Xamarin.AndroidX.ConstraintLayout.Solver.2.0.4.3\build\monoandroid90\Xamarin.AndroidX.ConstraintLayout.Solver.targets')" />
<Import Project="..\packages\Xamarin.AndroidX.CoordinatorLayout.1.1.0.8\build\monoandroid90\Xamarin.AndroidX.CoordinatorLayout.targets" Condition="Exists('..\packages\Xamarin.AndroidX.CoordinatorLayout.1.1.0.8\build\monoandroid90\Xamarin.AndroidX.CoordinatorLayout.targets')" />
<Import Project="..\packages\Xamarin.AndroidX.DynamicAnimation.1.0.0.8\build\monoandroid90\Xamarin.AndroidX.DynamicAnimation.targets" Condition="Exists('..\packages\Xamarin.AndroidX.DynamicAnimation.1.0.0.8\build\monoandroid90\Xamarin.AndroidX.DynamicAnimation.targets')" />
<Import Project="..\packages\Xamarin.AndroidX.ViewPager2.1.0.0.10\build\monoandroid90\Xamarin.AndroidX.ViewPager2.targets" Condition="Exists('..\packages\Xamarin.AndroidX.ViewPager2.1.0.0.10\build\monoandroid90\Xamarin.AndroidX.ViewPager2.targets')" />
<Import Project="..\packages\Xamarin.Google.Android.Material.1.4.0.1\build\monoandroid90\Xamarin.Google.Android.Material.targets" Condition="Exists('..\packages\Xamarin.Google.Android.Material.1.4.0.1\build\monoandroid90\Xamarin.Google.Android.Material.targets')" />
<Import Project="..\packages\Xamarin.AndroidX.SwipeRefreshLayout.1.1.0.3\build\monoandroid90\Xamarin.AndroidX.SwipeRefreshLayout.targets" Condition="Exists('..\packages\Xamarin.AndroidX.SwipeRefreshLayout.1.1.0.3\build\monoandroid90\Xamarin.AndroidX.SwipeRefreshLayout.targets')" />
<Import Project="..\packages\Xamarin.AndroidX.SlidingPaneLayout.1.1.0.3\build\monoandroid90\Xamarin.AndroidX.SlidingPaneLayout.targets" Condition="Exists('..\packages\Xamarin.AndroidX.SlidingPaneLayout.1.1.0.3\build\monoandroid90\Xamarin.AndroidX.SlidingPaneLayout.targets')" />
<Import Project="..\packages\Xamarin.AndroidX.AsyncLayoutInflater.1.0.0.8\build\monoandroid90\Xamarin.AndroidX.AsyncLayoutInflater.targets" Condition="Exists('..\packages\Xamarin.AndroidX.AsyncLayoutInflater.1.0.0.8\build\monoandroid90\Xamarin.AndroidX.AsyncLayoutInflater.targets')" />
<Import Project="..\packages\Xamarin.AndroidX.Legacy.Support.Core.UI.1.0.0.9\build\monoandroid90\Xamarin.AndroidX.Legacy.Support.Core.UI.targets" Condition="Exists('..\packages\Xamarin.AndroidX.Legacy.Support.Core.UI.1.0.0.9\build\monoandroid90\Xamarin.AndroidX.Legacy.Support.Core.UI.targets')" />
<Import Project="..\packages\Xamarin.AndroidX.Legacy.Support.V4.1.0.0.8\build\monoandroid90\Xamarin.AndroidX.Legacy.Support.V4.targets" Condition="Exists('..\packages\Xamarin.AndroidX.Legacy.Support.V4.1.0.0.8\build\monoandroid90\Xamarin.AndroidX.Legacy.Support.V4.targets')" />
<Import Project="..\packages\Xamarin.AndroidX.Concurrent.Futures.1.1.0.3\build\monoandroid90\Xamarin.AndroidX.Concurrent.Futures.targets" Condition="Exists('..\packages\Xamarin.AndroidX.Concurrent.Futures.1.1.0.3\build\monoandroid90\Xamarin.AndroidX.Concurrent.Futures.targets')" />
<Import Project="..\packages\Xamarin.AndroidX.Browser.1.3.0.6\build\monoandroid90\Xamarin.AndroidX.Browser.targets" Condition="Exists('..\packages\Xamarin.AndroidX.Browser.1.3.0.6\build\monoandroid90\Xamarin.AndroidX.Browser.targets')" />
<Import Project="..\packages\Xamarin.AndroidX.Activity.1.3.0\build\monoandroid90\Xamarin.AndroidX.Activity.targets" Condition="Exists('..\packages\Xamarin.AndroidX.Activity.1.3.0\build\monoandroid90\Xamarin.AndroidX.Activity.targets')" />
<Import Project="..\packages\Xamarin.AndroidX.ConstraintLayout.Core.1.0.0\build\monoandroid90\Xamarin.AndroidX.ConstraintLayout.Core.targets" Condition="Exists('..\packages\Xamarin.AndroidX.ConstraintLayout.Core.1.0.0\build\monoandroid90\Xamarin.AndroidX.ConstraintLayout.Core.targets')" />
<Import Project="..\packages\Xamarin.AndroidX.ConstraintLayout.2.1.0\build\monoandroid90\Xamarin.AndroidX.ConstraintLayout.targets" Condition="Exists('..\packages\Xamarin.AndroidX.ConstraintLayout.2.1.0\build\monoandroid90\Xamarin.AndroidX.ConstraintLayout.targets')" />
</Project>
+6 -6
View File
@@ -1,14 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Acr.Settings" version="9.0.1" targetFramework="xamarinios10" />
<package id="Acr.UserDialogs" version="7.1.0.483" targetFramework="xamarinios10" />
<package id="BTProgressHUD" version="1.3.2" targetFramework="xamarinios10" />
<package id="Acr.UserDialogs" version="7.1.0.514" targetFramework="xamarinios10" />
<package id="BTProgressHUD" version="1.3.3" targetFramework="xamarinios10" />
<package id="Microsoft.CSharp" version="4.7.0" targetFramework="xamarinios10" />
<package id="Microsoft.NETCore.Platforms" version="5.0.1" targetFramework="xamarinios10" />
<package id="Microsoft.NETCore.Platforms" version="5.0.2" targetFramework="xamarinios10" />
<package id="Microsoft.Win32.Primitives" version="4.3.0" targetFramework="xamarinios10" />
<package id="NETStandard.Library" version="2.0.3" targetFramework="xamarinios10" />
<package id="Newtonsoft.Json" version="13.0.1" targetFramework="xamarinios10" />
<package id="QControlKit" version="0.0.17" targetFramework="xamarinios10" />
<package id="QControlKit" version="0.0.19" targetFramework="xamarinios10" />
<package id="Serilog" version="2.10.0" targetFramework="xamarinios10" />
<package id="Serilog.Sinks.Xamarin" version="0.2.0.64" targetFramework="xamarinios10" />
<package id="System.AppContext" version="4.3.0" targetFramework="xamarinios10" />
@@ -76,8 +76,8 @@
<package id="System.Xml.ReaderWriter" version="4.3.1" targetFramework="xamarinios10" />
<package id="System.Xml.XDocument" version="4.3.0" targetFramework="xamarinios10" />
<package id="System.Xml.XmlDocument" version="4.3.0" targetFramework="xamarinios10" />
<package id="Xamarin.Essentials" version="1.6.1" targetFramework="xamarinios10" />
<package id="Xamarin.Forms" version="5.0.0.2012" targetFramework="xamarinios10" />
<package id="Xamarin.Essentials" version="1.7.0" targetFramework="xamarinios10" />
<package id="Xamarin.Forms" version="5.0.0.2083" targetFramework="xamarinios10" />
<package id="Xamarin.iOS.MaterialComponents" version="92.0.0" targetFramework="xamarinios10" />
<package id="Zeroconf" version="3.4.2" targetFramework="xamarinios10" />
</packages>
+8 -8
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\packages\Xamarin.Forms.5.0.0.2012\build\Xamarin.Forms.props" Condition="Exists('..\packages\Xamarin.Forms.5.0.0.2012\build\Xamarin.Forms.props')" />
<Import Project="..\packages\Xamarin.Forms.5.0.0.2083\build\Xamarin.Forms.props" Condition="Exists('..\packages\Xamarin.Forms.5.0.0.2083\build\Xamarin.Forms.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">iPhoneSimulator</Platform>
@@ -124,16 +124,16 @@
<HintPath>..\packages\System.Reactive.PlatformServices.5.0.0\lib\netstandard2.0\System.Reactive.PlatformServices.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Forms.Core">
<HintPath>..\packages\Xamarin.Forms.5.0.0.2012\lib\Xamarin.iOS10\Xamarin.Forms.Core.dll</HintPath>
<HintPath>..\packages\Xamarin.Forms.5.0.0.2083\lib\Xamarin.iOS10\Xamarin.Forms.Core.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Forms.Platform">
<HintPath>..\packages\Xamarin.Forms.5.0.0.2012\lib\Xamarin.iOS10\Xamarin.Forms.Platform.dll</HintPath>
<HintPath>..\packages\Xamarin.Forms.5.0.0.2083\lib\Xamarin.iOS10\Xamarin.Forms.Platform.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Forms.Xaml">
<HintPath>..\packages\Xamarin.Forms.5.0.0.2012\lib\Xamarin.iOS10\Xamarin.Forms.Xaml.dll</HintPath>
<HintPath>..\packages\Xamarin.Forms.5.0.0.2083\lib\Xamarin.iOS10\Xamarin.Forms.Xaml.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Essentials">
<HintPath>..\packages\Xamarin.Essentials.1.6.1\lib\xamarinios10\Xamarin.Essentials.dll</HintPath>
<HintPath>..\packages\Xamarin.Essentials.1.7.0\lib\xamarinios10\Xamarin.Essentials.dll</HintPath>
</Reference>
<Reference Include="Serilog">
<HintPath>..\packages\Serilog.2.10.0\lib\netstandard2.1\Serilog.dll</HintPath>
@@ -146,11 +146,11 @@
<HintPath>..\packages\Xamarin.iOS.MaterialComponents.92.0.0\lib\Xamarin.iOS\MaterialComponents.dll</HintPath>
</Reference>
<Reference Include="QControlKit">
<HintPath>..\packages\QControlKit.0.0.17\lib\netstandard2.0\QControlKit.dll</HintPath>
<HintPath>..\packages\QControlKit.0.0.19\lib\netstandard2.0\QControlKit.dll</HintPath>
</Reference>
<Reference Include="System.Numerics" />
<Reference Include="Xamarin.Forms.Platform.iOS">
<HintPath>..\packages\Xamarin.Forms.5.0.0.2012\lib\Xamarin.iOS10\Xamarin.Forms.Platform.iOS.dll</HintPath>
<HintPath>..\packages\Xamarin.Forms.5.0.0.2083\lib\Xamarin.iOS10\Xamarin.Forms.Platform.iOS.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
@@ -234,5 +234,5 @@
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
<Import Project="..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets" Condition="Exists('..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets')" />
<Import Project="..\packages\BTProgressHUD.1.3.2\build\xamarin.ios10\BTProgressHud.targets" Condition="Exists('..\packages\BTProgressHUD.1.3.2\build\xamarin.ios10\BTProgressHud.targets')" />
<Import Project="..\packages\Xamarin.Forms.5.0.0.2012\build\Xamarin.Forms.targets" Condition="Exists('..\packages\Xamarin.Forms.5.0.0.2012\build\Xamarin.Forms.targets')" />
<Import Project="..\packages\Xamarin.Forms.5.0.0.2083\build\Xamarin.Forms.targets" Condition="Exists('..\packages\Xamarin.Forms.5.0.0.2083\build\Xamarin.Forms.targets')" />
</Project>
+9 -12
View File
@@ -20,20 +20,14 @@ namespace qController
public static double WidthUnit;
public static bool MenuIsPresented
{
get
{
return rootPage.IsPresented;
}
set
{
rootPage.IsPresented = value;
}
get => rootPage.IsPresented;
set => rootPage.IsPresented = value;
}
public App()
{
InitializeComponent();
App.Current.RequestedThemeChanged += Current_RequestedThemeChanged;
Current.RequestedThemeChanged += Current_RequestedThemeChanged;
SetAppResources();
mainDisplayInfo = DeviceDisplay.MainDisplayInfo;
@@ -83,7 +77,7 @@ namespace qController
private void SetAppResources()
{
switch (App.Current.RequestedTheme)
switch (Current.RequestedTheme)
{
case OSAppTheme.Light:
SetLightResources();
@@ -95,6 +89,9 @@ namespace qController
//Default to Light
SetLightResources();
break;
default:
SetLightResources();
break;
}
}
@@ -171,7 +168,7 @@ namespace qController
public static void showToast(string message)
{
var toastConfig = new ToastConfig(message);
ToastConfig toastConfig = new ToastConfig(message);
toastConfig.SetDuration(3000);
toastConfig.SetPosition(ToastPosition.Bottom);
UserDialogs.Instance.Toast(toastConfig);
@@ -179,7 +176,7 @@ namespace qController
public static void ShowMenu(object sender, EventArgs e)
{
App.MenuIsPresented = true;
MenuIsPresented = true;
}
}
}
@@ -1,5 +1,4 @@
using System;
namespace qController.Events
namespace qController.Events
{
public delegate void SelectedCueEditedHandler(object source, CueEditArgs args);
@@ -11,9 +11,7 @@ namespace qController.Helpers
}
public static bool IsValidAddress(string ipString){
if ((ipString.Split('.').Length - 1) != 3) return false;
IPAddress address;
return IPAddress.TryParse(ipString, out address);
return (ipString.Split('.').Length - 1) == 3 && IPAddress.TryParse(ipString, out _);
}
public static bool IsReachable(string ipString)
@@ -16,7 +16,7 @@ namespace qController.QItems
}
public bool IsReachable()
{
return qController.Helpers.IPHelper.IsReachable(address);
return Helpers.IPHelper.IsReachable(address);
}
}
}
@@ -69,7 +69,7 @@ namespace qController
}
public static void RemoveInstance(string name, string address){
foreach (var item in qInstances)
foreach (QInstance item in qInstances)
{
if(item.address == address && item.name == name){
RemoveInstance(item);
@@ -85,9 +85,11 @@ namespace qController
public static bool AddServer(string host, int port)
{
QServerInfo serverInfo = new QServerInfo();
serverInfo.host = host;
serverInfo.port = port;
QServerInfo serverInfo = new QServerInfo
{
host = host,
port = port
};
return AddServer(serverInfo);
}
@@ -109,7 +111,7 @@ namespace qController
public static void RemoveServer(string host)
{
foreach (var item in qStoredServers)
foreach (QServerInfo item in qStoredServers)
{
if (item.host == host)
{
@@ -131,7 +133,7 @@ namespace qController
}
public static bool Contains(string address){
foreach (var item in qInstances)
foreach (QInstance item in qInstances)
{
//Log.Debug("Item name: " + item.name + " Found Name: " + name);
if (item.address == address)
@@ -140,7 +142,7 @@ namespace qController
}
}
foreach (var item in qStoredServers)
foreach (QServerInfo item in qStoredServers)
{
//Log.Debug("Item name: " + item.name + " Found Name: " + name);
if (item.host == address)
@@ -59,20 +59,20 @@ namespace qController.UI.Cells
for(int i = 0; i< numberOfChannelsVisible; i++)
{
var sliderToAdd = new Slider
Slider sliderToAdd = new Slider
{
Minimum = -60,
Maximum = 12
};
var labelToAdd = new Label
Label labelToAdd = new Label
{
Text = $"{i+1}:",
VerticalTextAlignment = TextAlignment.Center,
HorizontalTextAlignment = TextAlignment.Center
};
var valueLabelToAdd = new Label
Label valueLabelToAdd = new Label
{
Text = "",
VerticalTextAlignment = TextAlignment.Center,
@@ -11,15 +11,15 @@ namespace qController.UI.Dialogs
Title = "Enter IP of QLab Computer";
Message = "Enter an IP Address to save";
OkText = "Next";
OnTextChanged = args =>
{
OnTextChanged = args => {
//IPAddress ugh
args.IsValid = IPHelper.IsValidAddress(args.Value);
};
OnAction = (qAddress) =>
{
if (!qAddress.Ok)
if (!qAddress.Ok) {
return;
}
UserDialogs.Instance.Prompt(new PromptConfig
{
@@ -27,13 +27,13 @@ namespace qController.UI.Dialogs
Message = "Enter OSC port for " + qAddress.Text,
OkText = "Save",
InputType = InputType.Number,
OnTextChanged = args =>
{
OnTextChanged = args => {
args.IsValid = args.Value.Length > 0;
},
OnAction = (qPort) => {
if (!qPort.Ok)
if (!qPort.Ok) {
return;
}
QStorage.AddServer(qAddress.Text, int.Parse(qPort.Text));
App.showToast("Manual QLab Instance Added!");
@@ -14,8 +14,9 @@ namespace qController.UI.Dialogs
OkText = "Donate";
OnAction = (response) =>
{
if (response)
if (response) {
Launcher.OpenAsync(new Uri("https://linktr.ee/JoelWetzell"));
}
};
}
}
+26 -24
View File
@@ -1,8 +1,8 @@
using Xamarin.Forms;
using qController.ViewModels;
using QControlKit;
using Serilog;
using System.Linq;
using System.Collections.Generic;
namespace qController.UI
{
@@ -38,18 +38,18 @@ namespace qController.UI
//Group List "Frame" added early so other children or "on top"
if (cue.cues.Count > 0)
{
var cueFrame = new Frame
Frame cueFrame = new Frame
{
BackgroundColor = Color.Transparent,
BorderColor = Color.Black,
Margin = qCueViewModel.nestPadding
};
Children.Add(cueFrame, 1, 0);
Grid.SetRowSpan(cueFrame, cue.cues.Count + 1);
Grid.SetColumnSpan(cueFrame, ColumnDefinitions.Count - 1);
SetRowSpan(cueFrame, cue.cues.Count + 1);
SetColumnSpan(cueFrame, ColumnDefinitions.Count - 1);
}
var cueLabel = new Label
Label cueLabel = new Label
{
BindingContext = qCueViewModel,
HorizontalOptions = LayoutOptions.FillAndExpand,
@@ -61,7 +61,7 @@ namespace qController.UI
cueLabel.SetDynamicResource(Label.TextColorProperty, "PrimaryTextColor");
cueLabel.SetBinding(Label.MarginProperty, "nestPadding", BindingMode.OneWay);
var cueTypeLabel = new Label
Label cueTypeLabel = new Label
{
FontFamily = (OnPlatform<string>)Application.Current.Resources["QFontFamily"],
BindingContext = qCueViewModel,
@@ -91,7 +91,7 @@ namespace qController.UI
if (!cue.IsCueList)
{
//Section for selecting a cue by tapping the name Label
var selectCueGesture = new TapGestureRecognizer();
TapGestureRecognizer selectCueGesture = new TapGestureRecognizer();
selectCueGesture.Tapped += (sender, e) =>
{
//TODO: need to make this work regardless of the cue list a cue is in
@@ -103,13 +103,13 @@ namespace qController.UI
//Add collapse gesture to the cue type icon if it is a group cue
if (cue.IsGroup)
{
var CollapseGroupCueGesture = new TapGestureRecognizer();
TapGestureRecognizer CollapseGroupCueGesture = new TapGestureRecognizer();
CollapseGroupCueGesture.Tapped += (sender, e) =>
{
if (cue.IsGroup)
{
qCueViewModel.IsCollapsed = !qCueViewModel.IsCollapsed;
for (var i = 1; i < RowDefinitions.Count; i++)
for (int i = 1; i < RowDefinitions.Count; i++)
{
RowDefinitions[i].Height = qCueViewModel.IsCollapsed ? 0 : GridLength.Auto;
@@ -117,9 +117,9 @@ namespace qController.UI
if (Device.RuntimePlatform.Equals(Device.Android))
{
foreach (var child in Children)
foreach (View child in Children)
{
if (Grid.GetRow(child) > 0)
if (GetRow(child) > 0)
{
child.IsVisible = !qCueViewModel.IsCollapsed;
}
@@ -130,7 +130,7 @@ namespace qController.UI
cueTypeLabel.GestureRecognizers.Add(CollapseGroupCueGesture);
}
var cueBackground = new Frame
Frame cueBackground = new Frame
{
BindingContext = qCueViewModel,
Opacity = 0.50,
@@ -142,7 +142,7 @@ namespace qController.UI
cueBackground.SetBinding(BackgroundColorProperty, "color", BindingMode.OneWay);
//TODO: find a solution so the selected cue indicator is under the frame
var cueSelectedIndicator = new Frame
Frame cueSelectedIndicator = new Frame
{
BindingContext = qCueViewModel,
BackgroundColor = Color.Blue,
@@ -152,30 +152,32 @@ namespace qController.UI
cueSelectedIndicator.SetBinding(IsVisibleProperty, "IsSelected");
Children.Add(cueSelectedIndicator, 0, 0);
Grid.SetColumnSpan(cueSelectedIndicator, ColumnDefinitions.Count);
SetColumnSpan(cueSelectedIndicator, ColumnDefinitions.Count);
Children.Add(cueBackground, 0, 0);
Grid.SetColumnSpan(cueBackground, ColumnDefinitions.Count);
SetColumnSpan(cueBackground, ColumnDefinitions.Count);
Children.Add(cueTypeLabel, 0, 0);
Children.Add(cueLabel, 1, 0);
if (cue.cues.Count > 0)
{
foreach (var aCue in cue.cues)
foreach (QCue aCue in cue.cues)
{
this.RowDefinitions.Add(
RowDefinitions.Add(
new RowDefinition
{
Height = GridLength.Auto,
BindingContext = new QCueViewModel(aCue, false)
}
);
var aCueGrid = new QCueGrid(aCue);
//cueGridDict.Add(aCue.uid, aCueGrid);
aCueGrid.Margin = new Thickness(0, 0, 0, 0);
QCueGrid aCueGrid = new QCueGrid(aCue)
{
//cueGridDict.Add(aCue.uid, aCueGrid);
Margin = new Thickness(0, 0, 0, 0)
};
QCueGridListHelper.insert(aCue.uid, aCueGrid);
Children.Add(aCueGrid, 0, aCue.sortIndex + 1);
Grid.SetColumnSpan(aCueGrid, this.ColumnDefinitions.Count);
SetColumnSpan(aCueGrid, ColumnDefinitions.Count);
}
}
}
@@ -185,10 +187,10 @@ namespace qController.UI
Device.BeginInvokeOnMainThread(() =>
{
//Nuke current grid
var children = this.Children.ToList();
foreach (var child in children)
List<View> children = Children.ToList();
foreach (View child in children)
{
this.Children.Remove(child);
Children.Remove(child);
}
RowDefinitions = new RowDefinitionCollection();
@@ -33,13 +33,7 @@ namespace qController.UI
public static QCueGrid get(string cueID)
{
if (cueGridDict.ContainsKey(cueID))
{
return cueGridDict[cueID];
}
else {
return null;
}
return cueGridDict.ContainsKey(cueID) ? cueGridDict[cueID] : null;
}
}
}
+21 -15
View File
@@ -10,26 +10,28 @@ namespace qController.UI
public QNavBar()
{
this.SetDynamicResource(Grid.BackgroundColorProperty, "NavigationBarColor");
SetDynamicResource(BackgroundColorProperty, "NavigationBarColor");
CornerRadius = 0;
HasShadow = false;
Padding = 0;
Margin = 0;
Grid grid = new Grid();
grid.RowSpacing = 0;
grid.ColumnSpacing = 0;
grid.Margin = 0;
grid.Padding = 0;
grid.RowDefinitions = new RowDefinitionCollection {
new RowDefinition { Height = 50 }
};
grid.ColumnDefinitions = new ColumnDefinitionCollection
Grid grid = new Grid
{
new ColumnDefinition {Width = GridLength.Star},
new ColumnDefinition {Width = new GridLength(4,GridUnitType.Star)},
RowSpacing = 0,
ColumnSpacing = 0,
Margin = 0,
Padding = 0,
RowDefinitions = new RowDefinitionCollection {
new RowDefinition { Height = 50 }
},
ColumnDefinitions = new ColumnDefinitionCollection
{
new ColumnDefinition {Width = GridLength.Star},
new ColumnDefinition {Width = new GridLength(4,GridUnitType.Star)},
}
};
menuButton = new Label
@@ -63,7 +65,7 @@ namespace qController.UI
instanceName.SetDynamicResource(Label.TextColorProperty, "PrimaryTextColor");
var menuButtonGesture = new TapGestureRecognizer();
TapGestureRecognizer menuButtonGesture = new TapGestureRecognizer();
menuButtonGesture.Tapped += App.ShowMenu;
menuButton.GestureRecognizers.Add(menuButtonGesture);
@@ -77,6 +79,10 @@ namespace qController.UI
HeightRequest = App.HeightUnit * 6;
menuButton.FontSize = App.Height * .04;
break;
default:
HeightRequest = App.HeightUnit * 6;
menuButton.FontSize = App.Height * .04;
break;
}
grid.Children.Add(menuButton, 0, 0);
@@ -12,15 +12,15 @@ namespace qController.UI
Padding = 8;
HeightRequest = 175;
CornerRadius = 0;
this.SetBinding(Frame.BackgroundColorProperty, "color", BindingMode.OneWay);
this.SetBinding(Frame.BorderColorProperty, "color", BindingMode.OneWay);
this.SetBinding(BackgroundColorProperty, "color", BindingMode.OneWay);
this.SetBinding(BorderColorProperty, "color", BindingMode.OneWay);
Frame frameInt = new Frame
{
Padding = 0
};
frameInt.SetDynamicResource(Frame.BackgroundColorProperty, "SelectedCueCellBackgroundColor");
frameInt.SetDynamicResource(BackgroundColorProperty, "SelectedCueCellBackgroundColor");
Grid selectedCueGrid = new Grid
@@ -106,8 +106,10 @@ namespace qController.UI
//Double tap to edit name/number
var nameDoubleTap = new TapGestureRecognizer();
nameDoubleTap.NumberOfTapsRequired = 2;
TapGestureRecognizer nameDoubleTap = new TapGestureRecognizer
{
NumberOfTapsRequired = 2
};
nameDoubleTap.Tapped += (s, e) =>
{
@@ -119,30 +121,31 @@ namespace qController.UI
Text = name.Text,
OnAction = (qName) =>
{
if (!qName.Ok)
if (!qName.Ok) {
return;
((QCueViewModel)this.BindingContext).name = qName.Text;
}
((QCueViewModel)BindingContext).name = qName.Text;
}
});
};
name.GestureRecognizers.Add(nameDoubleTap);
var numberDoubleTap = new TapGestureRecognizer();
numberDoubleTap.NumberOfTapsRequired = 2;
numberDoubleTap.Tapped += (s, e) =>
TapGestureRecognizer numberDoubleTap = new TapGestureRecognizer
{
UserDialogs.Instance.Prompt(new PromptConfig
{
NumberOfTapsRequired = 2
};
numberDoubleTap.Tapped += (s, e) => {
UserDialogs.Instance.Prompt(new PromptConfig {
Title = "Update Number",
Message = "Change number to update",
OkText = "Update",
Text = number.Text,
OnAction = (qNumber) =>
{
if (!qNumber.Ok)
OnAction = (qNumber) => {
if (!qNumber.Ok) {
return;
}
//This bypasses the label .Text property because the number might not be valid (no duplicates)
((QCueViewModel)BindingContext).number = qNumber.Text;
}
@@ -152,21 +155,21 @@ namespace qController.UI
number.GestureRecognizers.Add(numberDoubleTap);
var notesDoubleTap = new TapGestureRecognizer();
notesDoubleTap.NumberOfTapsRequired = 2;
notesDoubleTap.Tapped += (s, e) =>
TapGestureRecognizer notesDoubleTap = new TapGestureRecognizer
{
UserDialogs.Instance.Prompt(new PromptConfig
{
NumberOfTapsRequired = 2
};
notesDoubleTap.Tapped += (s, e) => {
UserDialogs.Instance.Prompt(new PromptConfig {
Title = "Update Notes",
Message = "Change notes to update",
OkText = "Update",
Text = notes.Text,
OnAction = (qNotes) =>
{
if (!qNotes.Ok)
OnAction = (qNotes) => {
if (!qNotes.Ok) {
return;
}
((QCueViewModel)BindingContext).notes = qNotes.Text;
}
});
@@ -57,7 +57,7 @@ namespace qController.ViewModels
{
QServerViewModel serverToRemove = null;
foreach(var serverGroup in ServersGrouped)
foreach(QServerViewModel serverGroup in ServersGrouped)
{
if (serverGroup.host.Equals(args.server.host))
{
@@ -86,7 +86,7 @@ namespace qController.ViewModels
if (!autoUpdate)
{
Log.Debug("[QBrowserViewModel] Manual Scan Initiated");
this.browser.ProbeForQLabInstances();
browser.ProbeForQLabInstances();
}
}
}
@@ -19,14 +19,15 @@ namespace qController.ViewModels
public QCueViewModel(QCue cue, bool checkPlayback)
{
this.cue = cue;
if (checkPlayback)
if (checkPlayback) {
this.cue.workspace.CueListChangedPlaybackPosition += Workspace_CueListChangedPlaybackPosition;
}
this.cue.CuePropertiesUpdated += OnCuePropertiesUpdated;
}
private void OnCuePropertiesUpdated(object source, QCuePropertiesUpdatedArgs args)
{
foreach (var property in args.properties)
foreach (string property in args.properties)
{
if (property.Equals(QOSCKey.Name) || property.Equals(QOSCKey.ListName))
{
@@ -64,95 +65,44 @@ namespace qController.ViewModels
IsSelected = args.cueID == cue.uid;
}
public Thickness nestPadding
{
get
{
return new Thickness((cue.nestLevel - 1) * 10,0,0,0);
}
}
public Thickness nestPadding => new Thickness((cue.nestLevel - 1) * 10, 0, 0, 0);
public string name
{
get
{
return cue.listName;
}
get => cue.listName;
set
{
cue.name = value;
}
set => cue.name = value;
}
public string type
{
get
{
return QIcon.GetIconFromType(cue.type);
}
}
public string type => QIcon.GetIconFromType(cue.type);
public string uid
{
get
{
return cue.uid;
}
}
public string uid => cue.uid;
public string number
{
get
{
return cue.number;
}
get => cue.number;
set
{
cue.number = value;
}
set => cue.number = value;
}
public string notes
{
get
{
return cue.notes;
}
get => cue.notes;
set
{
cue.notes = value;
}
set => cue.notes = value;
}
public Color color
{
get
{
return Color.FromHex(cue.color.Hex);
}
set
{
cue.color = new QColor("none");
}
get => Color.FromHex(cue.color.Hex);
set => cue.color = new QColor("none");
}
public List<QCue> cues
{
get
{
return cue.cues;
}
}
public List<QCue> cues => cue.cues;
public bool IsSelected
{
get
{
return isSelected;
}
get => isSelected;
set
{
isSelected = value;
@@ -162,10 +112,7 @@ namespace qController.ViewModels
public bool IsCollapsed
{
get
{
return isCollapsed;
}
get => isCollapsed;
set
{
isCollapsed = value;
@@ -14,57 +14,25 @@ namespace qController.ViewModels
public new event PropertyChangedEventHandler PropertyChanged;
public string name
{
get
{
return server.name;
}
set
{
server.name = value;
}
get => server.name;
set => server.name = value;
}
public string host
{
get
{
return server.host;
}
}
public string host => server.host;
public string version
{
get
{
if (server.version == null)
{
return "";
}
else
{
return $"v{server.version}";
public string version => server.version == null ? "" : $"v{server.version}";
}
}
}
public string GroupName
{
get
{
return $"{name} ({host})";
}
}
public string GroupName => $"{name} ({host})";
public QServerViewModel(QServer server)
{
this.server = server;
name = this.server.name;
foreach (var workspace in this.server.workspaces)
foreach (QWorkspace workspace in this.server.workspaces)
{
Device.BeginInvokeOnMainThread(() =>
{
this.Add(new QWorkspaceViewModel(workspace));
Add(new QWorkspaceViewModel(workspace));
});
}
this.server.WorkspaceAdded += Server_WorkspaceAdded;
@@ -76,7 +44,7 @@ namespace qController.ViewModels
{
QWorkspaceViewModel workspaceToRemove = null;
foreach(var workspaceViewModel in this)
foreach(QWorkspaceViewModel workspaceViewModel in this)
{
if(workspaceViewModel.workspace.uniqueID == args.workspace.uniqueID)
{
@@ -10,28 +10,8 @@ namespace qController.ViewModels
this.workspace = workspace;
}
public string Name
{
get
{
return workspace.name;
}
set
{
public string Name => workspace.name;
}
}
public bool HasPasscode
{
get
{
return workspace.hasPasscode;
}
set
{
}
}
public bool HasPasscode => workspace.hasPasscode;
}
}
+3 -4
View File
@@ -1,6 +1,5 @@
using System.Collections.ObjectModel;
using Xamarin.Forms;
using qController.QItems;
using System;
using qController.Helpers;
@@ -20,7 +19,7 @@ namespace qController
listView.ItemsSource = items;
listView.ItemTemplate = new DataTemplate(() =>
{
var grid = new Grid {
Grid grid = new Grid {
Padding = 0,
ColumnSpacing = 0,
ColumnDefinitions =
@@ -30,7 +29,7 @@ namespace qController
}
};
var icon = new Label {
Label icon = new Label {
FontFamily = (OnPlatform<string>)Application.Current.Resources["MaterialFontFamily"],
HorizontalTextAlignment = TextAlignment.Center,
VerticalTextAlignment = TextAlignment.Center,
@@ -43,7 +42,7 @@ namespace qController
icon.SetBinding(Label.TextProperty, "Icon");
icon.SetDynamicResource(Label.TextColorProperty, "IconTextColor");
var label = new Label {
Label label = new Label {
VerticalOptions = LayoutOptions.FillAndExpand,
VerticalTextAlignment = TextAlignment.Center,
FontSize = App.HeightUnit * 2.75
@@ -1,7 +1,6 @@
using QControlKit;
using Xamarin.Forms;
using Serilog;
using qController.UI.Cells;
using Acr.UserDialogs;
using qController.UI.Dialogs;
using Xamarin.Essentials;
@@ -32,10 +31,11 @@ namespace qController.Pages
async void QWorkspaceSelected(object sender, SelectedItemChangedEventArgs e)
{
if (e.SelectedItem == null)
if (e.SelectedItem == null) {
return;
}
this.qBrowserViewModel.autoUpdate = false;
qBrowserViewModel.autoUpdate = false;
QWorkspace selectedWorkspace = (e.SelectedItem as QWorkspaceViewModel).workspace;
Log.Debug($"[demo] workspace: {selectedWorkspace.nameWithoutPathExtension} has been selected");
((ListView)sender).SelectedItem = null;
@@ -98,7 +98,7 @@ namespace qController.Pages
protected override void OnAppearing()
{
base.OnAppearing();
this.qBrowserViewModel.autoUpdate = true;
qBrowserViewModel.autoUpdate = true;
}
}
@@ -36,7 +36,6 @@ namespace qController
connectedWorkspace.defaultSendUpdatesOSC = true;
connectedWorkspace.CueListChangedPlaybackPosition += ConnectedWorkspace_CueListChangedPlaybackPosition;
}
protected override void OnAppearing()
@@ -60,27 +59,42 @@ namespace qController
private void ConnectedWorkspace_WorkspaceConnectionError(object source, QWorkspaceConnectionErrorArgs connectionErrorArgs)
{
if (connectionErrorArgs.status.Equals(QConnectionStatus.BadPass))
switch (connectionErrorArgs.status)
{
UserDialogs.Instance.Prompt(new PromptConfig
{
InputType = InputType.Number,
MaxLength = 4,
Title = "Incorrect Passcode!",
OkText = "Connect",
IsCancellable = true,
OnTextChanged = args =>
case QConnectionStatus.BadPass:
UserDialogs.Instance.Prompt(new PromptConfig
{
args.IsValid = args.Value != null && !args.Value.Equals("") && args.Value.Length == 4;
},
OnAction = (resp) =>
{
if (resp.Ok)
InputType = InputType.Number,
MaxLength = 4,
Title = "Incorrect Passcode!",
OkText = "Connect",
IsCancellable = true,
OnTextChanged = args =>
{
connectedWorkspace.connect(resp.Value);
}
}
});
args.IsValid = args.Value != null && !args.Value.Equals("") && args.Value.Length == 4;
},
OnAction = (resp) =>
{
if (resp.Ok)
{
connectedWorkspace.connect(resp.Value);
}
}
});
break;
case QConnectionStatus.Error:
UserDialogs.Instance.Alert(new AlertConfig
{
Title = $"Error connecting to <{connectedWorkspace.nameWithoutPathExtension}>!",
OkText = "Ok",
OnAction = () =>
{
Back();
}
});
break;
default:
break;
}
}
@@ -106,11 +120,13 @@ namespace qController
else
{
//Setup an "empty" cue for when no cue is selected
QCue emptyCue = new QCue();
emptyCue.workspace = connectedWorkspace;
emptyCue.type = QCueType.Memo;
emptyCue.listName = "No Cue Selected";
QCue emptyCue = new QCue
{
workspace = connectedWorkspace,
type = QCueType.Memo,
listName = "No Cue Selected"
};
selectedCueFrame.BindingContext = new QCueViewModel(emptyCue, false);
}
});
@@ -128,7 +144,7 @@ namespace qController
List<Task> cueAddTasks = new List<Task>();
foreach (var aCue in connectedWorkspace.cueLists)
foreach (QCue aCue in connectedWorkspace.cueLists)
{
if(aCue.cues.Count > 0)
@@ -166,8 +182,9 @@ namespace qController
void Back()
{
if (connectedWorkspace.connected)
if (connectedWorkspace.connected) {
connectedWorkspace.disconnect(); //TODO: This might not be implemented?
}
//purge QCueGridListHelper
QCueGridListHelper.reset();
@@ -201,48 +218,48 @@ namespace qController
actionToExecute();
}
void GoButtonClicked(System.Object sender, System.EventArgs e)
void GoButtonClicked(object sender, EventArgs e)
{
if(this.connectedWorkspace != null)
if(connectedWorkspace != null)
{
if (this.connectedWorkspace.connected)
if (connectedWorkspace.connected)
{
this.connectedWorkspace.go();
connectedWorkspace.go();
}
}
}
void PauseButtonClicked(System.Object sender, System.EventArgs e)
void PauseButtonClicked(object sender, EventArgs e)
{
if (this.connectedWorkspace != null)
if (connectedWorkspace != null)
{
if (this.connectedWorkspace.connected)
if (connectedWorkspace.connected)
{
QCue selectedCue = ((QCueViewModel)this.selectedCueFrame.BindingContext).cue;
QCue selectedCue = ((QCueViewModel)selectedCueFrame.BindingContext).cue;
selectedCue.pause();
}
}
}
void ResumeButtonClicked(System.Object sender, System.EventArgs e)
void ResumeButtonClicked(object sender, EventArgs e)
{
if (this.connectedWorkspace != null)
if (connectedWorkspace != null)
{
if (this.connectedWorkspace.connected)
if (connectedWorkspace.connected)
{
QCue selectedCue = ((QCueViewModel)this.selectedCueFrame.BindingContext).cue;
QCue selectedCue = ((QCueViewModel)selectedCueFrame.BindingContext).cue;
selectedCue.resume();
}
}
}
void PanicButtonClicked(System.Object sender, System.EventArgs e)
void PanicButtonClicked(object sender, EventArgs e)
{
if (this.connectedWorkspace != null)
if (connectedWorkspace != null)
{
if (this.connectedWorkspace.connected)
if (connectedWorkspace.connected)
{
this.connectedWorkspace.panicAll();
connectedWorkspace.panicAll();
}
}
}
+2 -4
View File
@@ -33,13 +33,11 @@ namespace qController
void OnItemSelected(object sender, SelectedItemChangedEventArgs e)
{
var item = e.SelectedItem as MenuPageItem;
if (item != null)
if (e.SelectedItem is MenuPageItem item)
{
MenuPage.clearSelectedItem();
IsPresented = false;
if (MenuItemSelected != null)
MenuItemSelected(this, new MenuEventArgs { Command = item.Command });
MenuItemSelected?.Invoke(this, new MenuEventArgs { Command = item.Command });
}
}
}
+4 -4
View File
@@ -57,14 +57,14 @@
</Compile>
</ItemGroup>
<ItemGroup>
<PackageReference Include="Acr.UserDialogs" Version="7.1.0.483" />
<PackageReference Include="Acr.UserDialogs" Version="7.1.0.514" />
<PackageReference Include="Zeroconf" Version="3.4.2" />
<PackageReference Include="Xamarin.Forms" Version="5.0.0.2012" />
<PackageReference Include="Xamarin.Forms" Version="5.0.0.2083" />
<PackageReference Include="Acr.Settings" Version="9.0.1" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="Xamarin.Essentials" Version="1.6.1" />
<PackageReference Include="Xamarin.Essentials" Version="1.7.0" />
<PackageReference Include="Serilog" Version="2.10.0" />
<PackageReference Include="QControlKit" Version="0.0.17" />
<PackageReference Include="QControlKit" Version="0.0.19" />
</ItemGroup>
<ItemGroup>
<None Remove="App.xaml" />