Merge pull request #143 from edgiardina/feature/appshell-navigation-d…

…eep-linking Feature/appshell navigation deep linking
edgiardina · May 12, 2022 · aba19d5 · aba19d5
2 parents b4f22d3 + 9f21f72
commit aba19d5
Show file tree

Hide file tree

Showing 67 changed files with 5,153 additions and 3,921 deletions.
diff --git a/Ifpa.sln b/Ifpa.sln
@@ -1,14 +1,25 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.28010.2048
+# Visual Studio Version 17
+VisualStudioVersion = 17.1.32210.238
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ifpa.Android", "Ifpa\Ifpa.Android\Ifpa.Android.csproj", "{93A4FD23-766C-4815-85D2-C26CFD02EDA0}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ifpa.iOS", "Ifpa\Ifpa.iOS\Ifpa.iOS.csproj", "{AC6C8F6D-8F45-457A-A3E1-0998EAFBF1E5}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ifpa", "Ifpa\Ifpa\Ifpa.csproj", "{924ED4A9-0C09-4CD9-B460-7656504673DA}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "web-items", "web-items", "{9FCFB313-B95B-4868-8C58-246A2D97B08B}"
+	ProjectSection(SolutionItems) = preProject
+		web-items\smart-app-banner.html = web-items\smart-app-banner.html
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".well-known", ".well-known", "{FE6DDF69-9CDF-41D5-9C1C-381EA5B78938}"
+	ProjectSection(SolutionItems) = preProject
+		web-items\.well-known\apple-app-site-association = web-items\.well-known\apple-app-site-association
+		web-items\.well-known\assetlinks.json = web-items\.well-known\assetlinks.json
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -77,6 +88,9 @@ Global
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{FE6DDF69-9CDF-41D5-9C1C-381EA5B78938} = {9FCFB313-B95B-4868-8C58-246A2D97B08B}
+	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {9C51CD80-922F-428F-B7E7-4177DB4423F3}
 	EndGlobalSection

diff --git a/Ifpa/Ifpa.Android/Ifpa.Android.csproj b/Ifpa/Ifpa.Android/Ifpa.Android.csproj
@@ -71,17 +71,20 @@
     <PackageReference Include="Syncfusion.Xamarin.SfChart">
       <Version>19.4.0.47</Version>
     </PackageReference>
-    <PackageReference Include="Xamarin.Forms" Version="5.0.0.2337" />
+    <PackageReference Include="Xamarin.Forms" Version="5.0.0.2401" />
+    <PackageReference Include="Xamarin.Forms.AppLinks">
+      <Version>5.0.0.2401</Version>
+    </PackageReference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Renderers\HomeTabbedPageRenderer.cs" />
     <Compile Include="Renderers\TintImageEffect.cs" />
+    <Compile Include="Resources\Resource.designer.cs" />
     <Compile Include="Services\AndroidReminderService.cs" />
     <Compile Include="BackgroundReceiver.cs" />
     <Compile Include="BadgeDrawable.cs" />
     <Compile Include="MainActivity.cs" />
     <Compile Include="Services\AndroidNotificationService.cs" />
-    <Compile Include="Resources\Resource.Designer.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Services\ToolbarItemBadgeService.cs" />
     <Compile Include="SplashActivity.cs" />
@@ -95,8 +98,6 @@
   </ItemGroup>
   <ItemGroup>
     <AndroidResource Include="Resources\drawable\calendar_add.png" />
-    <AndroidResource Include="Resources\layout\Tabbar.axml" />
-    <AndroidResource Include="Resources\layout\Toolbar.axml" />
     <AndroidResource Include="Resources\mipmap-hdpi\Icon.png">
       <SubType>Designer</SubType>
       <Generator>MSBuild:UpdateGeneratedFiles</Generator>

diff --git a/Ifpa/Ifpa.Android/MainActivity.cs b/Ifpa/Ifpa.Android/MainActivity.cs
@@ -4,6 +4,10 @@
 using Android.Content;
 using Android.Runtime;
 using Plugin.CurrentActivity;
+using Xamarin.Forms.Platform.Android.AppLinks;
+using Microsoft.Extensions.DependencyInjection;
+using Ifpa.Interfaces;
+using Ifpa.Droid.Services;
 
 namespace Ifpa.Droid
 {
@@ -13,18 +17,27 @@ namespace Ifpa.Droid
           DataScheme = "ifpa",
           DataHost = "ifpacompanion",
           AutoVerify = true)]
+    [IntentFilter(new[] { Intent.ActionView },
+          Categories = new[] {
+              Android.Content.Intent.CategoryDefault,
+              Android.Content.Intent.CategoryBrowsable 
+          },
+          DataSchemes = new string[] { "http", "https" },
+          DataHost = "www.ifpapinball.com",
+          DataPaths = new string[] { "/player.php", "/tournaments/view.php" },
+          AutoVerify = true)]
     public class MainActivity : global::Xamarin.Forms.Platform.Android.FormsAppCompatActivity
     {
         protected override void OnCreate(Bundle savedInstanceState)
         {
-            TabLayoutResource = Resource.Layout.Tabbar;
-            ToolbarResource = Resource.Layout.Toolbar;
 
             base.OnCreate(savedInstanceState);
             global::Xamarin.Forms.Forms.Init(this, savedInstanceState);
             Xamarin.Essentials.Platform.Init(this, savedInstanceState);
 
-            LoadApplication(new App());
+            AndroidAppLinks.Init(this);
+
+            LoadApplication(new App(PlatformSpecificServices));
 
             CrossCurrentActivity.Current.Init(this, savedInstanceState);
 
@@ -34,5 +47,10 @@ protected override void OnCreate(Bundle savedInstanceState)
             var alarmManager = GetSystemService(AlarmService).JavaCast<AlarmManager>();
             alarmManager.SetInexactRepeating(AlarmType.ElapsedRealtime, SystemClock.ElapsedRealtime() + 3 * 1000, AlarmManager.IntervalFifteenMinutes, pending);
         }
+
+        static void PlatformSpecificServices(IServiceCollection services)
+        {
+            services.AddSingleton<IReminderService, AndroidReminderService>();
+        }
     }
 }
diff --git a/Ifpa/Ifpa.Android/Properties/AndroidManifest.xml b/Ifpa/Ifpa.Android/Properties/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="2.3.1" package="com.edgiardina.ifpa" android:installLocation="auto" android:versionCode="43">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="2.4.0" package="com.edgiardina.ifpa" android:installLocation="auto" android:versionCode="44">
 	<uses-sdk android:minSdkVersion="20" android:targetSdkVersion="30" />
 	<application android:label="IFPA Companion" android:icon="@drawable/Icon">
 		<meta-data android:name="com.google.android.geo.API_KEY" android:value="AIzaSyCrcEI1rj5-z9SjpyJqHde-PAtS2dnaAjM" />