Ability to use different templates for iOS and Android added

Andrew8xx8 · vakrilov · commit 88f5c9a7fd9c · 2015-03-19T18:00:49.000+02:00
diff --git a/apps/editable-text-demo/app.ts b/apps/editable-text-demo/app.ts
@@ -1,3 +1,3 @@
 ﻿import application = require("application");
 application.mainModule = "app/main-page";
-application.start();
+application.start();
diff --git a/apps/platform-specific-template/app.ts b/apps/platform-specific-template/app.ts
@@ -0,0 +1,3 @@
+﻿import application = require("application");
+application.mainModule = "app/main-page";
+application.start();
diff --git a/apps/platform-specific-template/main-page.android.xml b/apps/platform-specific-template/main-page.android.xml
@@ -0,0 +1,5 @@
+<Page loaded="onPageLoaded">
+  <StackLayout id="stack">
+    <Label id="label" text="Hello, Android!" />
+  </StackLayout>
+</Page>
diff --git a/apps/platform-specific-template/main-page.ios.xml b/apps/platform-specific-template/main-page.ios.xml
@@ -0,0 +1,5 @@
+<Page loaded="onPageLoaded">
+  <StackLayout id="stack">
+    <Label id="label" text="Hello, iOS!" />
+  </StackLayout>
+</Page>
diff --git a/apps/platform-specific-template/main-page.ts b/apps/platform-specific-template/main-page.ts
@@ -0,0 +1 @@
+﻿
diff --git a/apps/platform-specific-template/package.json b/apps/platform-specific-template/package.json
@@ -0,0 +1,2 @@
+﻿{ "name" : "platform-specific-template",
+  "main" : "app.js" }
diff --git a/ui/frame/frame-common.ts b/ui/frame/frame-common.ts
@@ -6,6 +6,7 @@ import trace = require("trace");
 import builder = require("ui/builder");
 import fs = require("file-system");
 import utils = require("utils/utils");
+import platform = require("platform");
 
 var frameStack: Array<Frame> = [];
 
@@ -39,7 +40,7 @@ function resolvePageFromEntry(entry: definition.NavigationEntry): pages.Page {
         }
     }
     else if (entry.moduleName) {
-        // Current app full path. 
+        // Current app full path.
         var currentAppPath = fs.knownFolders.currentApp().path;
         //Full path of the module = current app full path + module name.
         var moduleNamePath = fs.path.join(currentAppPath, entry.moduleName);
@@ -67,12 +68,22 @@ function resolvePageFromEntry(entry: definition.NavigationEntry): pages.Page {
     return page;
 }
 
+function resolvePlatformPath(path, ext) {
+  var platformName = platform.device.os.toLowerCase();
+  var platformPath = [path, platformName, ext].join(".");
+  if (fs.File.exists(platformPath)) {
+    return platformPath;
+  }
+
+  return [path, ext].join(".");
+}
+
 function pageFromBuilder(moduleNamePath: string, moduleName: string, moduleExports: any): pages.Page {
     var page: pages.Page;
     var element: view.View;
 
     // Possible XML file path.
-    var fileName = moduleNamePath + ".xml";
+    var fileName = resolvePlatformPath(moduleNamePath, "xml");
 
     if (fs.File.exists(fileName)) {
         trace.write("Loading XML file: " + fileName, trace.categories.Navigation);

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+import application = require("application");`
	`2`	`+application.mainModule = "app/main-page";`
	`3`	`+application.start();`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+{ "name" : "platform-specific-template",`
	`2`	`+ "main" : "app.js" }`