Merge branch 'master' into myankov/android-icons · NativeScript/NativeScript@89c96c8 · GitHub

NativeScript / NativeScript Public

• Notifications You must be signed in to change notification settings
• Fork 1.7k
• Star 25.7k

• Code
• Issues 774
• Pull requests 69
• Discussions
• Actions
• Projects
• Wiki
• Security and quality
• Insights

Additional navigation options

Commit 89c96c8

Browse filesBrowse the repository at this point in the historyBrowse files

SvetoslavTsenov

authored and

MartoYankov

committed

Merge branch 'master' into myankov/android-icons

2 parents 4206704 + d28ba02 commit 89c96c8
Copy full SHA for 89c96c8

7 files changed

+194-161Lines changed: 194 additions & 161 deletions

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• apps/app/ui-tests-app/action-bar
  • icons.ts
  • icons.xml
  • local-icons.ts
  • local-icons.xml
• tests/app
  • app
    • mainPage.ts
  • testRunner.ts
• tns-core-modules/ui/action-bar
  • action-bar.ios.ts

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎apps/app/ui-tests-app/action-bar/icons.ts‎

Copy file name to clipboard

+12Lines changed: 12 additions & 0 deletions

Original file line number	Diff line number	Diff line change
@@ -1,5 +1,17 @@
1	1	import * as frame from "tns-core-modules/ui/frame";
	2	+ import { EventData } from "tns-core-modules/ui/frame";
	3	+ import { Button } from "tns-core-modules/ui/button";
	4	+ import { ActionBar } from "tns-core-modules/ui/action-bar";
	5	+
	6	+ const iconModes = ["automatic", "alwaysOriginal", "alwaysTemplate", undefined];
2	7
3	8	export function navigate(args) {
4	9	frame.topmost().navigate("ui-tests-app/action-bar/clean");
5	10	}
	11	+
	12	+ export function onChangeRenderingMode(args: EventData) {
	13	+ const button = <Button>args.object;
	14	+ const actionBar = <ActionBar>button.page.actionBar
	15	+ actionBar.iosIconRenderingMode = <"automatic" | "alwaysOriginal" | "alwaysTemplate">iconModes[(iconModes.indexOf(actionBar.iosIconRenderingMode) + 1) % iconModes.length];
	16	+ button.text = "" + actionBar.iosIconRenderingMode;
	17	+ }

Collapse file

‎apps/app/ui-tests-app/action-bar/icons.xml‎

Copy file name to clipboardExpand all lines: apps/app/ui-tests-app/action-bar/icons.xml

+1Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
@@ -9,5 +9,6 @@
9	9	</Page.actionBar>
10	10	<StackLayout>
11	11	<Button text="go to cleared page" tap="navigate"/>
	12	+ <Button text="undefined" tap="onChangeRenderingMode"/>
12	13	</StackLayout>
13	14	</Page>

Collapse file

‎apps/app/ui-tests-app/action-bar/local-icons.ts‎

Copy file name to clipboard

+12Lines changed: 12 additions & 0 deletions

Original file line number	Diff line number	Diff line change
@@ -1,5 +1,17 @@
1	1	import * as frame from "tns-core-modules/ui/frame";
	2	+ import { EventData } from "tns-core-modules/ui/frame";
	3	+ import { Button } from "tns-core-modules/ui/button";
	4	+ import { ActionBar } from "tns-core-modules/ui/action-bar";
	5	+
	6	+ const iconModes = ["automatic", "alwaysOriginal", "alwaysTemplate", undefined];
2	7
3	8	export function navigate(args) {
4	9	frame.topmost().navigate("ui-tests-app/action-bar/clean");
5	10	}
	11	+
	12	+ export function onChangeRenderingMode(args: EventData) {
	13	+ const button = <Button>args.object;
	14	+ const actionBar = <ActionBar>button.page.actionBar
	15	+ actionBar.iosIconRenderingMode = <"automatic" | "alwaysOriginal" | "alwaysTemplate">iconModes[(iconModes.indexOf(actionBar.iosIconRenderingMode) + 1) % iconModes.length];
	16	+ button.text = "" + actionBar.iosIconRenderingMode;
	17	+ }

Collapse file

‎apps/app/ui-tests-app/action-bar/local-icons.xml‎

Copy file name to clipboardExpand all lines: apps/app/ui-tests-app/action-bar/local-icons.xml

+1Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
@@ -9,5 +9,6 @@
9	9	</Page.actionBar>
10	10	<StackLayout>
11	11	<Button text="go to cleared page" tap="navigate"/>
	12	+ <Button text="undefined" tap="onChangeRenderingMode"/>
12	13	</StackLayout>
13	14	</Page>

Collapse file

‎tests/app/app/mainPage.ts‎

Copy file name to clipboardExpand all lines: tests/app/app/mainPage.ts

+1-1Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -7,7 +7,7 @@ let executeTests = true;
7	7	trace.enable();
8	8	trace.addCategories(trace.categories.Test + "," + trace.categories.Error);
9	9
10		- // // When debugging
	10	+ // When debugging
11	11	// trace.setCategories(trace.categories.concat(
12	12	// trace.categories.Test,
13	13	// trace.categories.Navigation,

0 commit comments

Comments

0 (0)