diff --git a/src/Functions/SantaTalk.Functions/SantaTalk.Functions.sln b/src/Functions/SantaTalk.Functions/SantaTalk.Functions.sln new file mode 100644 index 0000000..c5d6d67 --- /dev/null +++ b/src/Functions/SantaTalk.Functions/SantaTalk.Functions.sln @@ -0,0 +1,17 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 15 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SantaTalk.Functions", "SantaTalk.Functions.csproj", "{F98A568D-8F95-48FE-B1DC-7F8EF9F3431F}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {F98A568D-8F95-48FE-B1DC-7F8EF9F3431F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {F98A568D-8F95-48FE-B1DC-7F8EF9F3431F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {F98A568D-8F95-48FE-B1DC-7F8EF9F3431F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {F98A568D-8F95-48FE-B1DC-7F8EF9F3431F}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection +EndGlobal diff --git a/src/SantaTalk.Android/MainActivity.cs b/src/SantaTalk.Android/MainActivity.cs index 15fa73e..5ac0eb2 100644 --- a/src/SantaTalk.Android/MainActivity.cs +++ b/src/SantaTalk.Android/MainActivity.cs @@ -6,6 +6,7 @@ using Android.Views; using Android.Widget; using Android.OS; +using Plugin.CurrentActivity; namespace SantaTalk.Droid { @@ -19,6 +20,8 @@ protected override void OnCreate(Bundle savedInstanceState) base.OnCreate(savedInstanceState); + CrossCurrentActivity.Current.Init(this, savedInstanceState); + Xamarin.Essentials.Platform.Init(this, savedInstanceState); global::Xamarin.Forms.Forms.Init(this, savedInstanceState); FFImageLoading.Forms.Platform.CachedImageRenderer.Init(true); @@ -27,8 +30,10 @@ protected override void OnCreate(Bundle savedInstanceState) public override void OnRequestPermissionsResult(int requestCode, string[] permissions, [GeneratedEnum] Android.Content.PM.Permission[] grantResults) { Xamarin.Essentials.Platform.OnRequestPermissionsResult(requestCode, permissions, grantResults); + Plugin.Permissions.PermissionsImplementation.Current.OnRequestPermissionsResult(requestCode, permissions, grantResults); base.OnRequestPermissionsResult(requestCode, permissions, grantResults); } + } } \ No newline at end of file diff --git a/src/SantaTalk.Android/MainApplication.cs b/src/SantaTalk.Android/MainApplication.cs new file mode 100644 index 0000000..9334ef5 --- /dev/null +++ b/src/SantaTalk.Android/MainApplication.cs @@ -0,0 +1,23 @@ +using System; +using Android.App; +using Android.Runtime; +using Plugin.CurrentActivity; + +#if DEBUG +[Application(Debuggable = true)] +#else + [Application(Debuggable = false)] +#endif +public class MainApplication : Application +{ + public MainApplication(IntPtr handle, JniHandleOwnership transer) + : base(handle, transer) + { + } + + public override void OnCreate() + { + base.OnCreate(); + CrossCurrentActivity.Current.Init(this); + } +} \ No newline at end of file diff --git a/src/SantaTalk.Android/Properties/AndroidManifest.xml b/src/SantaTalk.Android/Properties/AndroidManifest.xml index ba3f8c2..657a8cb 100644 --- a/src/SantaTalk.Android/Properties/AndroidManifest.xml +++ b/src/SantaTalk.Android/Properties/AndroidManifest.xml @@ -1,6 +1,12 @@  - + + + + + + + \ No newline at end of file diff --git a/src/SantaTalk.Android/Properties/AssemblyInfo.cs b/src/SantaTalk.Android/Properties/AssemblyInfo.cs index 82620f6..57c29c0 100644 --- a/src/SantaTalk.Android/Properties/AssemblyInfo.cs +++ b/src/SantaTalk.Android/Properties/AssemblyInfo.cs @@ -32,3 +32,6 @@ // Add some common permissions, these can be removed if not needed [assembly: UsesPermission(Android.Manifest.Permission.Internet)] [assembly: UsesPermission(Android.Manifest.Permission.WriteExternalStorage)] + +[assembly: UsesFeature("android.hardware.camera", Required = true)] +[assembly: UsesFeature("android.hardware.camera.autofocus", Required = true)] diff --git a/src/SantaTalk.Android/Resources/Resource.designer.cs b/src/SantaTalk.Android/Resources/Resource.designer.cs index 1d944e7..0d3d6e9 100644 --- a/src/SantaTalk.Android/Resources/Resource.designer.cs +++ b/src/SantaTalk.Android/Resources/Resource.designer.cs @@ -11424,10 +11424,13 @@ public partial class Xml { // aapt resource value: 0x7F100000 - public const int network_security_config = 2131755008; + public const int file_paths = 2131755008; // aapt resource value: 0x7F100001 - public const int xamarin_essentials_fileprovider_file_paths = 2131755009; + public const int network_security_config = 2131755009; + + // aapt resource value: 0x7F100002 + public const int xamarin_essentials_fileprovider_file_paths = 2131755010; static Xml() { diff --git a/src/SantaTalk.Android/Resources/xml/file_paths.xml b/src/SantaTalk.Android/Resources/xml/file_paths.xml new file mode 100644 index 0000000..7d5b0f1 --- /dev/null +++ b/src/SantaTalk.Android/Resources/xml/file_paths.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/src/SantaTalk.Android/SantaTalk.Android.csproj b/src/SantaTalk.Android/SantaTalk.Android.csproj index ffcd81d..f9d20a4 100644 --- a/src/SantaTalk.Android/SantaTalk.Android.csproj +++ b/src/SantaTalk.Android/SantaTalk.Android.csproj @@ -69,11 +69,18 @@ 12.0.3 + + 4.0.1.5 + + + 2.1.0.4 + + @@ -125,6 +132,10 @@ + + + + diff --git a/src/SantaTalk.iOS/Info.plist b/src/SantaTalk.iOS/Info.plist index bdf5fdd..940ff2a 100644 --- a/src/SantaTalk.iOS/Info.plist +++ b/src/SantaTalk.iOS/Info.plist @@ -39,6 +39,14 @@ NSAllowLocalNetworking + NSCameraUsageDescription +This app needs access to the camera to take photos. +NSPhotoLibraryUsageDescription +This app needs access to photos. +NSMicrophoneUsageDescription +This app needs access to microphone. +NSPhotoLibraryAddUsageDescription +This app needs access to the photo gallery. UIAppFonts futura_book.ttf diff --git a/src/SantaTalk.iOS/SantaTalk.iOS.csproj b/src/SantaTalk.iOS/SantaTalk.iOS.csproj index 19ef860..3a7fede 100644 --- a/src/SantaTalk.iOS/SantaTalk.iOS.csproj +++ b/src/SantaTalk.iOS/SantaTalk.iOS.csproj @@ -139,6 +139,9 @@ 12.0.3 + + 4.0.1.5 + diff --git a/src/SantaTalk/MainPage.xaml b/src/SantaTalk/MainPage.xaml index 7263026..0fc3449 100644 --- a/src/SantaTalk/MainPage.xaml +++ b/src/SantaTalk/MainPage.xaml @@ -1,49 +1,59 @@ - - + + - + - + - - - + +