From 1bd52efddbcd778a7119e9d96f064c5dea3a47a4 Mon Sep 17 00:00:00 2001
From: Rossen Hristov <rossen.hristov@telerik.com>
Date: Wed, 16 Dec 2015 16:37:35 +0200
Subject: [PATCH] Fixed Issue #518:  Allow ActionItems to be directly specified
 between the ActionBar opening and closing tags.

---
 CrossPlatformModules.csproj                   |  9 +++++++-
 apps/action-bar-demo/main-page.xml            |  1 +
 .../action-bar-demo/pages/all-between-tags.ts |  5 +++++
 .../pages/all-between-tags.xml                | 15 +++++++++++++
 .../pages/navigation-button.ts                |  2 +-
 .../ui/action-bar/ActionBar_BetweenTags.xml   | 15 +++++++++++++
 .../ui/action-bar/action-bar-tests-common.ts  | 22 +++++++++++++++++++
 tsconfig.json                                 |  1 +
 ui/action-bar/action-bar-common.ts            |  6 +++--
 9 files changed, 72 insertions(+), 4 deletions(-)
 create mode 100644 apps/action-bar-demo/pages/all-between-tags.ts
 create mode 100644 apps/action-bar-demo/pages/all-between-tags.xml
 create mode 100644 apps/tests/ui/action-bar/ActionBar_BetweenTags.xml

diff --git a/CrossPlatformModules.csproj b/CrossPlatformModules.csproj
index 72a63583b..0295f958e 100644
--- a/CrossPlatformModules.csproj
+++ b/CrossPlatformModules.csproj
@@ -67,6 +67,9 @@
     <TypeScriptCompile Include="apps\action-bar-demo\pages\action-items-text.ts">
       <DependentUpon>action-items-text.xml</DependentUpon>
     </TypeScriptCompile>
+    <TypeScriptCompile Include="apps\action-bar-demo\pages\all-between-tags.ts">
+      <DependentUpon>all-between-tags.xml</DependentUpon>
+    </TypeScriptCompile>
     <TypeScriptCompile Include="apps\action-bar-demo\pages\center-view-stack.ts">
       <DependentUpon>center-view-stack.xml</DependentUpon>
     </TypeScriptCompile>
@@ -118,12 +121,14 @@
     <Content Include="apps\action-bar-demo\pages\center-view-segmented.xml" />
     <Content Include="apps\action-bar-demo\pages\center-view.xml" />
     <Content Include="apps\action-bar-demo\pages\data-binding.xml" />
+    <Content Include="apps\action-bar-demo\pages\all-between-tags.xml" />
     <Content Include="apps\animations\opacity.css" />
     <Content Include="apps\animations\opacity.xml">
       <SubType>Designer</SubType>
     </Content>
     <Content Include="apps\animations\bkg.png" />
     <Content Include="apps\animations\test-icon.png" />
+    <Content Include="apps\tests\ui\action-bar\ActionBar_BetweenTags.xml" />
     <Content Include="apps\tests\ui\action-bar\ActionBar_NumberAsText.xml" />
     <Content Include="apps\tests\ui\page\modal-page.xml">
       <SubType>Designer</SubType>
@@ -988,7 +993,9 @@
     <Content Include="apps\cuteness.unoptimized\res\reddit-logo.png" />
     <Content Include="apps\cuteness.unoptimized\res\telerik-logo.png" />
     <Content Include="apps\action-bar-demo\app.css" />
-    <Content Include="apps\action-bar-demo\main-page.xml" />
+    <Content Include="apps\action-bar-demo\main-page.xml">
+      <SubType>Designer</SubType>
+    </Content>
     <Content Include="apps\action-bar-demo\pages\action-items-text.xml">
       <SubType>Designer</SubType>
     </Content>
diff --git a/apps/action-bar-demo/main-page.xml b/apps/action-bar-demo/main-page.xml
index 45d4c3a88..82daa903c 100644
--- a/apps/action-bar-demo/main-page.xml
+++ b/apps/action-bar-demo/main-page.xml
@@ -19,6 +19,7 @@
       <Button tap="itemTap" text="center view" tag="center-view" />
       <Button tap="itemTap" text="center segmented" tag="center-view-segmented" />
       <Button tap="itemTap" text="center stack" tag="center-view-stack" />
+      <Button tap="itemTap" text="all between tags" tag="all-between-tags" />
     </StackLayout>
   </ScrollView>
 </Page>
\ No newline at end of file
diff --git a/apps/action-bar-demo/pages/all-between-tags.ts b/apps/action-bar-demo/pages/all-between-tags.ts
new file mode 100644
index 000000000..6063b059f
--- /dev/null
+++ b/apps/action-bar-demo/pages/all-between-tags.ts
@@ -0,0 +1,5 @@
+import observable = require("data/observable");
+
+export function onTapped(args: observable.EventData) {
+    console.log(`Tapped ${(<any>args.object).text}`);
+}
diff --git a/apps/action-bar-demo/pages/all-between-tags.xml b/apps/action-bar-demo/pages/all-between-tags.xml
new file mode 100644
index 000000000..240d97c21
--- /dev/null
+++ b/apps/action-bar-demo/pages/all-between-tags.xml
@@ -0,0 +1,15 @@
+<Page>
+  <Page.actionBar>
+    <ActionBar>
+      <ActionItem text="i1" tap="onTapped"/>
+      <Label text="tv" tap="onTapped"/>
+      <ActionItem text="i2" tap="onTapped"/>
+      <NavigationButton text="nb" android.systemIcon="ic_menu_back" tap="onTapped"/>
+      <ActionItem text="i3" tap="onTapped"/>
+    </ActionBar>
+  </Page.actionBar>
+  
+  <StackLayout>
+    <Label text="page content"/>
+  </StackLayout>
+</Page>
\ No newline at end of file
diff --git a/apps/action-bar-demo/pages/navigation-button.ts b/apps/action-bar-demo/pages/navigation-button.ts
index 37a544a68..9890c7a17 100644
--- a/apps/action-bar-demo/pages/navigation-button.ts
+++ b/apps/action-bar-demo/pages/navigation-button.ts
@@ -44,5 +44,5 @@ export function visibilityTap(args: observable.EventData) {
 }
 
 export function navTap(args: observable.EventData) {
-    console.log("navigation button tapped");
+    console.log("(Android only) Navigation button tapped");
 }
diff --git a/apps/tests/ui/action-bar/ActionBar_BetweenTags.xml b/apps/tests/ui/action-bar/ActionBar_BetweenTags.xml
new file mode 100644
index 000000000..d50c1a78e
--- /dev/null
+++ b/apps/tests/ui/action-bar/ActionBar_BetweenTags.xml
@@ -0,0 +1,15 @@
+<Page>
+  <Page.actionBar>
+    <ActionBar>
+      <ActionItem text="i1" tap="onTapped"/>
+      <Label text="tv" tap="onTapped"/>
+      <ActionItem text="i2" tap="onTapped"/>
+      <NavigationButton text="nb" tap="onTapped"/>
+      <ActionItem text="i3" tap="onTapped"/>
+    </ActionBar>
+  </Page.actionBar>
+
+  <StackLayout>
+    <Label text="page content"/>
+  </StackLayout>
+</Page>
\ No newline at end of file
diff --git a/apps/tests/ui/action-bar/action-bar-tests-common.ts b/apps/tests/ui/action-bar/action-bar-tests-common.ts
index 81d5eac6d..3bf251183 100644
--- a/apps/tests/ui/action-bar/action-bar-tests-common.ts
+++ b/apps/tests/ui/action-bar/action-bar-tests-common.ts
@@ -324,6 +324,28 @@ export function test_Setting_ActionItemsWithNumberAsText_doesnt_thrown() {
     }
 }
 
+export function test_CanDefineEverythingAsContentBetweenTheTwoTags() {
+    var moduleName = __dirname.substr(fs.knownFolders.currentApp().path.length);
+    helper.navigateToModuleAndRunTest(moduleName + "/ActionBar_BetweenTags", undefined, (page: PageModule.Page) => {
+
+        TKUnit.assertNotNull(page.actionBar.navigationButton);
+        TKUnit.assertEqual(page.actionBar.navigationButton.text, "nb");
+
+        TKUnit.assertNull(page.actionBar.title);
+        TKUnit.assertNotNull(page.actionBar.titleView);
+        TKUnit.assertTrue(page.actionBar.titleView instanceof LabelModule.Label);
+        TKUnit.assertEqual((<LabelModule.Label>page.actionBar.titleView).text, "tv");
+
+        TKUnit.assertNotNull(page.actionBar.actionItems);
+        var items = page.actionBar.actionItems.getItems();
+        TKUnit.assertEqual(items.length, 3);
+
+        TKUnit.assertEqual(items[0].text, "i1");
+        TKUnit.assertEqual(items[1].text, "i2");
+        TKUnit.assertEqual(items[2].text, "i3");
+    });
+}
+
 export function createPageAndNavigate() {
     var page: PageModule.Page;
     var pageFactory = function (): PageModule.Page {
diff --git a/tsconfig.json b/tsconfig.json
index 97427c6cf..548efda07 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -39,6 +39,7 @@
         "apps/action-bar-demo/pages/action-bar-hidden.ts",
         "apps/action-bar-demo/pages/action-items-icon.ts",
         "apps/action-bar-demo/pages/action-items-text.ts",
+        "apps/action-bar-demo/pages/all-between-tags.ts",
         "apps/action-bar-demo/pages/center-view-segmented.ts",
         "apps/action-bar-demo/pages/center-view-stack.ts",
         "apps/action-bar-demo/pages/center-view.ts",
diff --git a/ui/action-bar/action-bar-common.ts b/ui/action-bar/action-bar-common.ts
index 38d12be7c..dd680fdb6 100644
--- a/ui/action-bar/action-bar-common.ts
+++ b/ui/action-bar/action-bar-common.ts
@@ -129,8 +129,10 @@ export class ActionBar extends view.View implements dts.ActionBar {
         if (value instanceof dts.NavigationButton) {
             this.navigationButton = value;
         }
-
-        if (value instanceof view.View) {
+        else if (value instanceof dts.ActionItem) {
+            this.actionItems.addItem(value);
+        }
+        else if (value instanceof view.View) {
             this.titleView = value;
         }
     }