Android NuGet package working

VincentH-Net · Jan 13, 2014 · b7abede · b7abede
1 parent 7333077
commit b7abede
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 10 deletions.
diff --git a/NuGet/QuickCross.nuspec b/NuGet/QuickCross.nuspec
@@ -41,8 +41,8 @@
     <!-- iOS application project files -->
     <file src="..\SampleApp.ios\QuickCross\**\*.*"     target="tools\app.ios\QuickCross\" />
 
-    <!-- Android application project files TODO
-    <file src="..\SampleApp.android\QuickCross\**\*.*" target="tools\app.android\QuickCross\" /> -->
+    <!-- Android application project files -->
+    <file src="..\SampleApp.android\QuickCross\**\*.*" target="tools\app.android\QuickCross\" />
 
     <!-- Windows Phone application project files TODO
     <file src="..\SampleApp.wp\QuickCross\**\*.*"      target="tools\app.wp\QuickCross\" />  -->

diff --git a/QuickCross.android.sln b/QuickCross.android.sln
@@ -1,6 +1,8 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2012
+# Visual Studio 2013
+VisualStudioVersion = 12.0.21005.1
+MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SampleApp.Shared.android", "SampleApp.Shared\SampleApp.Shared.android.csproj", "{C579819D-5EF6-4AC4-8D2A-A5F1DB742090}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SampleApp", "SampleApp.android\SampleApp.csproj", "{6A0F0E75-05A1-4247-BF29-C961DCAB4365}"
@@ -12,12 +14,12 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "GitHub", "GitHub", "{DDAD6F
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "NuGet", "NuGet", "{EE6DBFB8-A27E-4396-861C-091D7F4AA857}"
 	ProjectSection(SolutionItems) = preProject
+		NuGet\about_QuickCross.help.txt = NuGet\about_QuickCross.help.txt
 		NuGet\CreatePackage.cmd = NuGet\CreatePackage.cmd
 		NuGet\Init.ps1 = NuGet\Init.ps1
-		NuGet\MvvmQuickCross.nuspec = NuGet\MvvmQuickCross.nuspec
-		NuGet\MvvmQuickCross.psm1 = NuGet\MvvmQuickCross.psm1
-		NuGet\NuGet.exe = NuGet\NuGet.exe
 		NuGet\PublishToPublicNuGet.cmd = NuGet\PublishToPublicNuGet.cmd
+		NuGet\QuickCross.nuspec = NuGet\QuickCross.nuspec
+		NuGet\QuickCross.psm1 = NuGet\QuickCross.psm1
 		NuGet\readme.txt = NuGet\readme.txt
 	EndProjectSection
 EndProject

diff --git a/SampleApp.android/QuickCross/Templates/_APPNAME_Navigator.cs b/SampleApp.android/QuickCross/Templates/_APPNAME_Navigator.cs
@@ -26,9 +26,9 @@ private void Navigate(Type type)
 
         /* TODO: For each view, add a method to navigate to that view like this:
 
-        public void NavigateTo_VIEWNAME_View(object navigationContext)
+        public void NavigateTo_VIEWNAME_View()
         {
-            Navigate(navigationContext, typeof(_VIEWNAME_View));
+            Navigate(typeof(_VIEWNAME_View));
         }
          * Note that the New-View command adds the above code automatically (see http://github.com/MacawNL/QuickCross#new-view). */
     }

diff --git a/SampleApp.android/QuickCross/Templates/_VIEWNAME_ActivityView.cs b/SampleApp.android/QuickCross/Templates/_VIEWNAME_ActivityView.cs
@@ -15,6 +15,7 @@ protected override void OnCreate(Bundle bundle)
         {
             base.OnCreate(bundle);
             SetContentView(Resource.Layout._VIEWNAME_View);
+            _APPNAME_Navigator.Instance.NavigationContext = this;
             Initialize(FindViewById(Resource.Id._VIEWNAME_View), _APPNAME_Application.Instance._VIEWNAME_ViewModel);
         }
     }

diff --git a/SampleApp.android/QuickCross/Templates/_VIEWNAME_MainLauncherView.cs b/SampleApp.android/QuickCross/Templates/_VIEWNAME_MainLauncherView.cs
@@ -13,7 +13,7 @@ public class _VIEWNAME_View : ActivityViewBase<_VIEWNAME_ViewModel>
     {
         private _APPNAME_Application EnsureApplication()
         {
-            return _APPNAME_Application.Instance ?? new _APPNAME_Application(new _APPNAME_Navigator());
+            return _APPNAME_Application.Instance ?? new _APPNAME_Application(_APPNAME_Navigator.Instance);
         }
 
         protected override void OnCreate(Bundle bundle)
@@ -22,7 +22,8 @@ protected override void OnCreate(Bundle bundle)
             SetContentView(Resource.Layout._VIEWNAME_View);
             AndroidHelpers.Initialize(typeof(Resource));
             EnsureApplication();
-            _APPNAME_Application.Instance.ContinueTo_VIEWNAME_(skipNavigation: true);
+            _APPNAME_Navigator.Instance.NavigationContext = this;
+            _APPNAME_Application.Instance.ContinueTo_VIEWNAME_();
             Initialize(FindViewById(Resource.Id._VIEWNAME_View), _APPNAME_Application.Instance._VIEWNAME_ViewModel);
         }
     }