Skip to content

Commit 72be97d

Browse files
giusepeChrisPulman
giusepe
and
ChrisPulman
authored
Reorganize samples (#782)
* Created the xamarin project and fixed most of android issues, not all * Fixed the last issues on Xamarin/Cinephile * create separated solutions for each sample and removed old/broken/useless samples --------- Co-authored-by: Chris Pulman <[email protected]>
1 parent d59724c commit 72be97d

File tree

118 files changed

+19465
-17626
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

118 files changed

+19465
-17626
lines changed

‎Uno/ReactiveUI.UnoRouting/ReactiveUI.UnoRouting.sln

Lines changed: 139 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,139 @@
1+
2+
Microsoft Visual Studio Solution File, Format Version 12.00
3+
# Visual Studio Version 17
4+
VisualStudioVersion = 17.8.34309.116
5+
MinimumVisualStudioVersion = 10.0.40219.1
6+
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "ReactiveUI.UnoRouting.Shared", "ReactiveUI.UnoRouting.Shared\ReactiveUI.UnoRouting.Shared.shproj", "{6279C845-92F8-4333-AB99-3D213163593C}"
7+
EndProject
8+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ReactiveUI.UnoRouting.Mobile", "ReactiveUI.UnoRouting.Mobile\ReactiveUI.UnoRouting.Mobile.csproj", "{9C331E84-B5DB-4EE5-A7B2-B547D98923F6}"
9+
EndProject
10+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ReactiveUI.UnoRouting.Skia.Gtk", "ReactiveUI.UnoRouting.Skia.Gtk\ReactiveUI.UnoRouting.Skia.Gtk.csproj", "{D1EB091B-F4AD-427D-9765-738E4A04EE9C}"
11+
EndProject
12+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ReactiveUI.UnoRouting.Skia.Wpf", "ReactiveUI.UnoRouting.Skia.Wpf\ReactiveUI.UnoRouting.Skia.Wpf.csproj", "{93928725-E603-4432-A322-DCF28FED7EF3}"
13+
EndProject
14+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ReactiveUI.UnoRouting.Wasm", "ReactiveUI.UnoRouting.Wasm\ReactiveUI.UnoRouting.Wasm.csproj", "{306D1EB0-C618-454A-BCB1-FE1285169A25}"
15+
EndProject
16+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ReactiveUI.UnoRouting.Windows", "ReactiveUI.UnoRouting.Windows\ReactiveUI.UnoRouting.Windows.csproj", "{4608D3F4-DC92-4358-9BBB-5C484EED667C}"
17+
EndProject
18+
Global
19+
GlobalSection(SolutionConfigurationPlatforms) = preSolution
20+
Debug|Any CPU = Debug|Any CPU
21+
Debug|arm64 = Debug|arm64
22+
Debug|x64 = Debug|x64
23+
Debug|x86 = Debug|x86
24+
Release|Any CPU = Release|Any CPU
25+
Release|arm64 = Release|arm64
26+
Release|x64 = Release|x64
27+
Release|x86 = Release|x86
28+
EndGlobalSection
29+
GlobalSection(ProjectConfigurationPlatforms) = postSolution
30+
{9C331E84-B5DB-4EE5-A7B2-B547D98923F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
31+
{9C331E84-B5DB-4EE5-A7B2-B547D98923F6}.Debug|Any CPU.Build.0 = Debug|Any CPU
32+
{9C331E84-B5DB-4EE5-A7B2-B547D98923F6}.Debug|arm64.ActiveCfg = Debug|Any CPU
33+
{9C331E84-B5DB-4EE5-A7B2-B547D98923F6}.Debug|arm64.Build.0 = Debug|Any CPU
34+
{9C331E84-B5DB-4EE5-A7B2-B547D98923F6}.Debug|arm64.Deploy.0 = Debug|Any CPU
35+
{9C331E84-B5DB-4EE5-A7B2-B547D98923F6}.Debug|x64.ActiveCfg = Debug|Any CPU
36+
{9C331E84-B5DB-4EE5-A7B2-B547D98923F6}.Debug|x64.Build.0 = Debug|Any CPU
37+
{9C331E84-B5DB-4EE5-A7B2-B547D98923F6}.Debug|x64.Deploy.0 = Debug|Any CPU
38+
{9C331E84-B5DB-4EE5-A7B2-B547D98923F6}.Debug|x86.ActiveCfg = Debug|Any CPU
39+
{9C331E84-B5DB-4EE5-A7B2-B547D98923F6}.Debug|x86.Build.0 = Debug|Any CPU
40+
{9C331E84-B5DB-4EE5-A7B2-B547D98923F6}.Debug|x86.Deploy.0 = Debug|Any CPU
41+
{9C331E84-B5DB-4EE5-A7B2-B547D98923F6}.Release|Any CPU.ActiveCfg = Release|Any CPU
42+
{9C331E84-B5DB-4EE5-A7B2-B547D98923F6}.Release|Any CPU.Build.0 = Release|Any CPU
43+
{9C331E84-B5DB-4EE5-A7B2-B547D98923F6}.Release|arm64.ActiveCfg = Release|Any CPU
44+
{9C331E84-B5DB-4EE5-A7B2-B547D98923F6}.Release|arm64.Build.0 = Release|Any CPU
45+
{9C331E84-B5DB-4EE5-A7B2-B547D98923F6}.Release|arm64.Deploy.0 = Release|Any CPU
46+
{9C331E84-B5DB-4EE5-A7B2-B547D98923F6}.Release|x64.ActiveCfg = Release|Any CPU
47+
{9C331E84-B5DB-4EE5-A7B2-B547D98923F6}.Release|x64.Build.0 = Release|Any CPU
48+
{9C331E84-B5DB-4EE5-A7B2-B547D98923F6}.Release|x64.Deploy.0 = Release|Any CPU
49+
{9C331E84-B5DB-4EE5-A7B2-B547D98923F6}.Release|x86.ActiveCfg = Release|Any CPU
50+
{9C331E84-B5DB-4EE5-A7B2-B547D98923F6}.Release|x86.Build.0 = Release|Any CPU
51+
{9C331E84-B5DB-4EE5-A7B2-B547D98923F6}.Release|x86.Deploy.0 = Release|Any CPU
52+
{D1EB091B-F4AD-427D-9765-738E4A04EE9C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
53+
{D1EB091B-F4AD-427D-9765-738E4A04EE9C}.Debug|Any CPU.Build.0 = Debug|Any CPU
54+
{D1EB091B-F4AD-427D-9765-738E4A04EE9C}.Debug|arm64.ActiveCfg = Debug|Any CPU
55+
{D1EB091B-F4AD-427D-9765-738E4A04EE9C}.Debug|arm64.Build.0 = Debug|Any CPU
56+
{D1EB091B-F4AD-427D-9765-738E4A04EE9C}.Debug|x64.ActiveCfg = Debug|Any CPU
57+
{D1EB091B-F4AD-427D-9765-738E4A04EE9C}.Debug|x64.Build.0 = Debug|Any CPU
58+
{D1EB091B-F4AD-427D-9765-738E4A04EE9C}.Debug|x86.ActiveCfg = Debug|Any CPU
59+
{D1EB091B-F4AD-427D-9765-738E4A04EE9C}.Debug|x86.Build.0 = Debug|Any CPU
60+
{D1EB091B-F4AD-427D-9765-738E4A04EE9C}.Release|Any CPU.ActiveCfg = Release|Any CPU
61+
{D1EB091B-F4AD-427D-9765-738E4A04EE9C}.Release|Any CPU.Build.0 = Release|Any CPU
62+
{D1EB091B-F4AD-427D-9765-738E4A04EE9C}.Release|arm64.ActiveCfg = Release|Any CPU
63+
{D1EB091B-F4AD-427D-9765-738E4A04EE9C}.Release|arm64.Build.0 = Release|Any CPU
64+
{D1EB091B-F4AD-427D-9765-738E4A04EE9C}.Release|x64.ActiveCfg = Release|Any CPU
65+
{D1EB091B-F4AD-427D-9765-738E4A04EE9C}.Release|x64.Build.0 = Release|Any CPU
66+
{D1EB091B-F4AD-427D-9765-738E4A04EE9C}.Release|x86.ActiveCfg = Release|Any CPU
67+
{D1EB091B-F4AD-427D-9765-738E4A04EE9C}.Release|x86.Build.0 = Release|Any CPU
68+
{93928725-E603-4432-A322-DCF28FED7EF3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
69+
{93928725-E603-4432-A322-DCF28FED7EF3}.Debug|Any CPU.Build.0 = Debug|Any CPU
70+
{93928725-E603-4432-A322-DCF28FED7EF3}.Debug|arm64.ActiveCfg = Debug|Any CPU
71+
{93928725-E603-4432-A322-DCF28FED7EF3}.Debug|arm64.Build.0 = Debug|Any CPU
72+
{93928725-E603-4432-A322-DCF28FED7EF3}.Debug|x64.ActiveCfg = Debug|Any CPU
73+
{93928725-E603-4432-A322-DCF28FED7EF3}.Debug|x64.Build.0 = Debug|Any CPU
74+
{93928725-E603-4432-A322-DCF28FED7EF3}.Debug|x86.ActiveCfg = Debug|Any CPU
75+
{93928725-E603-4432-A322-DCF28FED7EF3}.Debug|x86.Build.0 = Debug|Any CPU
76+
{93928725-E603-4432-A322-DCF28FED7EF3}.Release|Any CPU.ActiveCfg = Release|Any CPU
77+
{93928725-E603-4432-A322-DCF28FED7EF3}.Release|Any CPU.Build.0 = Release|Any CPU
78+
{93928725-E603-4432-A322-DCF28FED7EF3}.Release|arm64.ActiveCfg = Release|Any CPU
79+
{93928725-E603-4432-A322-DCF28FED7EF3}.Release|arm64.Build.0 = Release|Any CPU
80+
{93928725-E603-4432-A322-DCF28FED7EF3}.Release|x64.ActiveCfg = Release|Any CPU
81+
{93928725-E603-4432-A322-DCF28FED7EF3}.Release|x64.Build.0 = Release|Any CPU
82+
{93928725-E603-4432-A322-DCF28FED7EF3}.Release|x86.ActiveCfg = Release|Any CPU
83+
{93928725-E603-4432-A322-DCF28FED7EF3}.Release|x86.Build.0 = Release|Any CPU
84+
{306D1EB0-C618-454A-BCB1-FE1285169A25}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
85+
{306D1EB0-C618-454A-BCB1-FE1285169A25}.Debug|Any CPU.Build.0 = Debug|Any CPU
86+
{306D1EB0-C618-454A-BCB1-FE1285169A25}.Debug|arm64.ActiveCfg = Debug|Any CPU
87+
{306D1EB0-C618-454A-BCB1-FE1285169A25}.Debug|arm64.Build.0 = Debug|Any CPU
88+
{306D1EB0-C618-454A-BCB1-FE1285169A25}.Debug|x64.ActiveCfg = Debug|Any CPU
89+
{306D1EB0-C618-454A-BCB1-FE1285169A25}.Debug|x64.Build.0 = Debug|Any CPU
90+
{306D1EB0-C618-454A-BCB1-FE1285169A25}.Debug|x86.ActiveCfg = Debug|Any CPU
91+
{306D1EB0-C618-454A-BCB1-FE1285169A25}.Debug|x86.Build.0 = Debug|Any CPU
92+
{306D1EB0-C618-454A-BCB1-FE1285169A25}.Release|Any CPU.ActiveCfg = Release|Any CPU
93+
{306D1EB0-C618-454A-BCB1-FE1285169A25}.Release|Any CPU.Build.0 = Release|Any CPU
94+
{306D1EB0-C618-454A-BCB1-FE1285169A25}.Release|arm64.ActiveCfg = Release|Any CPU
95+
{306D1EB0-C618-454A-BCB1-FE1285169A25}.Release|arm64.Build.0 = Release|Any CPU
96+
{306D1EB0-C618-454A-BCB1-FE1285169A25}.Release|x64.ActiveCfg = Release|Any CPU
97+
{306D1EB0-C618-454A-BCB1-FE1285169A25}.Release|x64.Build.0 = Release|Any CPU
98+
{306D1EB0-C618-454A-BCB1-FE1285169A25}.Release|x86.ActiveCfg = Release|Any CPU
99+
{306D1EB0-C618-454A-BCB1-FE1285169A25}.Release|x86.Build.0 = Release|Any CPU
100+
{4608D3F4-DC92-4358-9BBB-5C484EED667C}.Debug|Any CPU.ActiveCfg = Debug|x64
101+
{4608D3F4-DC92-4358-9BBB-5C484EED667C}.Debug|Any CPU.Build.0 = Debug|x64
102+
{4608D3F4-DC92-4358-9BBB-5C484EED667C}.Debug|Any CPU.Deploy.0 = Debug|x64
103+
{4608D3F4-DC92-4358-9BBB-5C484EED667C}.Debug|arm64.ActiveCfg = Debug|arm64
104+
{4608D3F4-DC92-4358-9BBB-5C484EED667C}.Debug|arm64.Build.0 = Debug|arm64
105+
{4608D3F4-DC92-4358-9BBB-5C484EED667C}.Debug|arm64.Deploy.0 = Debug|arm64
106+
{4608D3F4-DC92-4358-9BBB-5C484EED667C}.Debug|x64.ActiveCfg = Debug|x64
107+
{4608D3F4-DC92-4358-9BBB-5C484EED667C}.Debug|x64.Build.0 = Debug|x64
108+
{4608D3F4-DC92-4358-9BBB-5C484EED667C}.Debug|x64.Deploy.0 = Debug|x64
109+
{4608D3F4-DC92-4358-9BBB-5C484EED667C}.Debug|x86.ActiveCfg = Debug|x86
110+
{4608D3F4-DC92-4358-9BBB-5C484EED667C}.Debug|x86.Build.0 = Debug|x86
111+
{4608D3F4-DC92-4358-9BBB-5C484EED667C}.Debug|x86.Deploy.0 = Debug|x86
112+
{4608D3F4-DC92-4358-9BBB-5C484EED667C}.Release|Any CPU.ActiveCfg = Release|x64
113+
{4608D3F4-DC92-4358-9BBB-5C484EED667C}.Release|Any CPU.Build.0 = Release|x64
114+
{4608D3F4-DC92-4358-9BBB-5C484EED667C}.Release|Any CPU.Deploy.0 = Release|x64
115+
{4608D3F4-DC92-4358-9BBB-5C484EED667C}.Release|arm64.ActiveCfg = Release|arm64
116+
{4608D3F4-DC92-4358-9BBB-5C484EED667C}.Release|arm64.Build.0 = Release|arm64
117+
{4608D3F4-DC92-4358-9BBB-5C484EED667C}.Release|arm64.Deploy.0 = Release|arm64
118+
{4608D3F4-DC92-4358-9BBB-5C484EED667C}.Release|x64.ActiveCfg = Release|x64
119+
{4608D3F4-DC92-4358-9BBB-5C484EED667C}.Release|x64.Build.0 = Release|x64
120+
{4608D3F4-DC92-4358-9BBB-5C484EED667C}.Release|x64.Deploy.0 = Release|x64
121+
{4608D3F4-DC92-4358-9BBB-5C484EED667C}.Release|x86.ActiveCfg = Release|x86
122+
{4608D3F4-DC92-4358-9BBB-5C484EED667C}.Release|x86.Build.0 = Release|x86
123+
{4608D3F4-DC92-4358-9BBB-5C484EED667C}.Release|x86.Deploy.0 = Release|x86
124+
EndGlobalSection
125+
GlobalSection(SolutionProperties) = preSolution
126+
HideSolutionNode = FALSE
127+
EndGlobalSection
128+
GlobalSection(ExtensibilityGlobals) = postSolution
129+
SolutionGuid = {AA61B1D2-CA88-48AA-BFC4-1911D881516B}
130+
EndGlobalSection
131+
GlobalSection(SharedMSBuildProjectFiles) = preSolution
132+
ReactiveUI.UnoRouting.Shared\ReactiveUI.UnoRouting.Shared.projitems*{306d1eb0-c618-454a-bcb1-fe1285169a25}*SharedItemsImports = 5
133+
ReactiveUI.UnoRouting.Shared\ReactiveUI.UnoRouting.Shared.projitems*{4608d3f4-dc92-4358-9bbb-5c484eed667c}*SharedItemsImports = 5
134+
ReactiveUI.UnoRouting.Shared\ReactiveUI.UnoRouting.Shared.projitems*{6279c845-92f8-4333-ab99-3d213163593c}*SharedItemsImports = 13
135+
ReactiveUI.UnoRouting.Shared\ReactiveUI.UnoRouting.Shared.projitems*{93928725-e603-4432-a322-dcf28fed7ef3}*SharedItemsImports = 5
136+
ReactiveUI.UnoRouting.Shared\ReactiveUI.UnoRouting.Shared.projitems*{9c331e84-b5db-4ee5-a7b2-b547d98923f6}*SharedItemsImports = 5
137+
ReactiveUI.UnoRouting.Shared\ReactiveUI.UnoRouting.Shared.projitems*{d1eb091b-f4ad-427d-9765-738e4a04ee9c}*SharedItemsImports = 5
138+
EndGlobalSection
139+
EndGlobal

‎Xamarin/Cinephile/Cinephile.Android/Cinephile.Android.csproj

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
1818
<MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
1919
<AndroidUseLatestPlatformSdk>false</AndroidUseLatestPlatformSdk>
20-
<TargetFrameworkVersion>v12.1</TargetFrameworkVersion>
20+
<TargetFrameworkVersion>v13.0</TargetFrameworkVersion>
2121
<AndroidEnableSGenConcurrent>true</AndroidEnableSGenConcurrent>
2222
<AndroidUseAapt2>true</AndroidUseAapt2>
2323
<AndroidHttpClientHandlerType>Xamarin.Android.Net.AndroidClientHandler</AndroidHttpClientHandlerType>
@@ -53,13 +53,15 @@
5353
<Reference Include="System.Numerics" />
5454
</ItemGroup>
5555
<ItemGroup>
56-
<PackageReference Include="ReactiveUI.AndroidX" Version="$(ReactiveUIVersion)" />
57-
<PackageReference Include="Xamarin.AndroidX.Palette" Version="[1.0.0.11]" />
58-
<PackageReference Include="Xamarin.AndroidX.MediaRouter" Version="[1.2.5.3]" />
59-
<PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="[2.3.1.1]" />
60-
<PackageReference Include="Xamarin.Google.Android.Material" Version="[1.5.0]" />
61-
<PackageReference Include="Xamarin.AndroidX.Core" Version="[1.8.0]" />
62-
<PackageReference Include="Xamarin.AndroidX.Preference" Version="[1.2.0]" />
56+
<PackageReference Include="Xamarin.Essentials">
57+
<Version>1.8.0</Version>
58+
</PackageReference>
59+
<PackageReference Include="Xamarin.FFImageLoading">
60+
<Version>2.4.11.982</Version>
61+
</PackageReference>
62+
<PackageReference Include="Xamarin.Forms">
63+
<Version>5.0.0.2622</Version>
64+
</PackageReference>
6365
</ItemGroup>
6466
<ItemGroup>
6567
<Compile Include="LinkerPreserve.cs" />
@@ -123,4 +125,4 @@
123125
<AndroidResource Include="Resources\drawable\Splashscreen.xml" />
124126
</ItemGroup>
125127
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
126-
</Project>
128+
</Project>

‎Xamarin/Cinephile/Cinephile.Android/MainActivity.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,11 @@
55
using Android.Runtime;
66
using Android.OS;
77
using Akavache;
8+
using FFImageLoading.Forms.Platform;
89

910
namespace Cinephile.Droid
1011
{
11-
[Activity(Label = "Cinephile", Icon = "@mipmap/icon", Theme = "@style/MyTheme", MainLauncher = true, ConfigurationChanges = ConfigChanges.ScreenSize | ConfigChanges.Orientation | ConfigChanges.UiMode | ConfigChanges.ScreenLayout | ConfigChanges.SmallestScreenSize)]
12+
[Activity(Label = "Cinephile", Icon = "@mipmap/icon", Theme = "@style/MainTheme", MainLauncher = true, ConfigurationChanges = ConfigChanges.ScreenSize | ConfigChanges.Orientation | ConfigChanges.UiMode | ConfigChanges.ScreenLayout | ConfigChanges.SmallestScreenSize)]
1213
public class MainActivity : global::Xamarin.Forms.Platform.Android.FormsAppCompatActivity
1314
{
1415
protected override void OnCreate(Bundle savedInstanceState)
@@ -18,6 +19,7 @@ protected override void OnCreate(Bundle savedInstanceState)
1819
Xamarin.Essentials.Platform.Init(this, savedInstanceState);
1920
global::Xamarin.Forms.Forms.Init(this, savedInstanceState);
2021
BlobCache.ApplicationName = "Cinephile";
22+
CachedImageRenderer.Init(true);
2123
LoadApplication(new App());
2224
}
2325

‎Xamarin/Cinephile/Cinephile.Android/Properties/AndroidManifest.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" android:versionName="1.0" package="com.giusepe.cinephile.cinephile" android:installLocation="auto">
3-
<uses-sdk android:minSdkVersion="30" android:targetSdkVersion="32" />
4-
<application android:label="Cinephile.Android" android:theme="@style/MyTheme"></application>
5-
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
6-
</manifest>
2+
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" android:versionName="1.0" package="com.giusepe.cinephile.cinephile">
3+
<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="33" />
4+
<application android:label="Cinephile.Android" android:theme="@style/MainTheme"></application>
5+
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
6+
</manifest>

0 commit comments

Comments
 (0)