javascript/NativeScript
1
0
Fork 0
mirror of https://github.com/NativeScript/NativeScript.git synced 2025-08-17 21:01:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3670 from NativeScript/gestures-circ-ref

Browse Source 
Gestures/view circ-dep and examples cleanup
This commit is contained in:
Alexander Vakrilov
2017-02-21 10:41:52 +02:00
committed by GitHub
parent dc25c85e97 8945529188
commit 4bfc8a90c2
4 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/app/ui-tests-app/layouts/main-page.ts
View File

@ -14,14 +14,12 @@ export function pageLoaded(args: EventData) {
examples.set("absolute", "layouts/absolute"); examples.set("absolute", "layouts/absolute");
examples.set("dock", "layouts/dock"); examples.set("dock", "layouts/dock");
examples.set("grid", "layouts/grid"); examples.set("grid", "layouts/grid");
examples.set("myview", "layouts/myview");
examples.set("stack", "layouts/stack"); examples.set("stack", "layouts/stack");
examples.set("wrap", "layouts/wrap"); examples.set("wrap", "layouts/wrap");
examples.set("pabsolute", "layouts-percent/absolute"); examples.set("pabsolute", "layouts-percent/absolute");
examples.set("pdock", "layouts-percent/dock"); examples.set("pdock", "layouts-percent/dock");
examples.set("pgrid", "layouts-percent/grid"); examples.set("pgrid", "layouts-percent/grid");
examples.set("pmyview", "layouts-percent/myview");
examples.set("pstack", "layouts-percent/stack"); examples.set("pstack", "layouts-percent/stack");
examples.set("pwrap", "layouts-percent/wrap"); examples.set("pwrap", "layouts-percent/wrap");

2
apps/app/ui-tests-app/tab-view/all.xml
View File

@ -1,5 +1,5 @@
<Page> <Page>
<TabView selectedIndex="1" style="tab-text-color: yellow; color:yellow; selected-tab-text-color: red; background-color: green; tab-background-color: blue;"> <TabView selectedIndex="1" style="tab-text-color: yellow; color:yellow; selected-tab-text-color: red; android-selected-tab-highlight-color:red; background-color: green; tab-background-color: blue;">
<TabView.items> <TabView.items>
<TabViewItem title="First"> <TabViewItem title="First">
<TabViewItem.view> <TabViewItem.view>

5
tns-core-modules/ui/gestures/gestures-common.ts
View File

@ -1,7 +1,8 @@
import { GestureEventData as GestureEventData, GesturesObserver as GesturesObserverDefinition } from "ui/gestures"; import { GestureEventData as GestureEventData, GesturesObserver as GesturesObserverDefinition } from "ui/gestures";
import { View } from "ui/core/view"; import { View } from "ui/core/view";
export { View, EventData, layout } from "ui/core/view"; // Only types:
export { View, EventData } from "ui/core/view";
export enum GestureTypes { export enum GestureTypes {
tap = 1 << 0, tap = 1 << 0,
@ -74,7 +75,7 @@ export function toString(type: GestureTypes, separator?: string): string {
} }
// NOTE: toString could return the text of multiple GestureTypes. // NOTE: toString could return the text of multiple GestureTypes.
// Souldn't fromString do split on separator? and return multiple GestureTypes? // Souldn't fromString do split on separator and return multiple GestureTypes?
export function fromString(type: string): GestureTypes { export function fromString(type: string): GestureTypes {
let t = type.trim().toLowerCase(); let t = type.trim().toLowerCase();

5
tns-core-modules/ui/gestures/gestures.android.ts
View File

@ -1,6 +1,9 @@
import { GestureEventData, SwipeGestureEventData, PanGestureEventData, RotationGestureEventData } from "ui/gestures"; import { GestureEventData, SwipeGestureEventData, PanGestureEventData, RotationGestureEventData } from "ui/gestures";
import { GesturesObserverBase, toString, TouchAction, GestureStateTypes, GestureTypes, SwipeDirection, import { GesturesObserverBase, toString, TouchAction, GestureStateTypes, GestureTypes, SwipeDirection,
View, layout, EventData } from "./gestures-common"; View, EventData } from "./gestures-common";
// Import layout from utils directly to avoid circular references
import { layout } from "utils/utils";
export * from "./gestures-common"; export * from "./gestures-common";