Skip to content

Commit d50e2fd

Browse files
author
Vladimir Enchev
committed
stylers removed
1 parent 22af9e8 commit d50e2fd

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+2531
-2457
lines changed

‎CrossPlatformModules.csproj‎

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -690,6 +690,9 @@
690690
<TypeScriptCompile Include="ui\styling\background.android.d.ts" />
691691
<TypeScriptCompile Include="ui\styling\style-scope.d.ts" />
692692
<TypeScriptCompile Include="ui\styling\style.d.ts" />
693+
<TypeScriptCompile Include="ui\text-base\text-base-styler.android.ts" />
694+
<TypeScriptCompile Include="ui\text-base\text-base-styler.d.ts" />
695+
<TypeScriptCompile Include="ui\text-base\text-base-styler.ios.ts" />
693696
<TypeScriptCompile Include="ui\ui.d.ts" />
694697
<TypeScriptCompile Include="ui\html-view\html-view-common.ts" />
695698
<TypeScriptCompile Include="ui\html-view\html-view.android.ts" />
@@ -1519,16 +1522,6 @@
15191522
<TypeScriptCompile Include="apps\perf-tests\NavigationTest\master-page.ts" />
15201523
<TypeScriptCompile Include="apps\perf-tests\NavigationTest\page1.ts" />
15211524
<TypeScriptCompile Include="apps\perf-tests\NavigationTest\page2.ts" />
1522-
<TypeScriptCompile Include="ui\styling\stylers.d.ts" />
1523-
<TypeScriptCompile Include="ui\styling\stylers-common.ts">
1524-
<DependentUpon>stylers.d.ts</DependentUpon>
1525-
</TypeScriptCompile>
1526-
<TypeScriptCompile Include="ui\styling\stylers.android.ts">
1527-
<DependentUpon>stylers.d.ts</DependentUpon>
1528-
</TypeScriptCompile>
1529-
<TypeScriptCompile Include="ui\styling\stylers.ios.ts">
1530-
<DependentUpon>stylers.d.ts</DependentUpon>
1531-
</TypeScriptCompile>
15321525
<TypeScriptCompile Include="ui\styling\style-scope.ts" />
15331526
<TypeScriptCompile Include="utils\utils-common.ts">
15341527
<DependentUpon>utils.d.ts</DependentUpon>

‎apps/tests/app/style_props.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import styles = require("ui/styling");
1+
import style = require("ui/styling/style");
22
import observable = require("ui/core/dependency-observable");
33
import styleProperty = require("ui/styling/style-property");
44
import view = require("ui/core/view");
@@ -9,7 +9,7 @@ import stackLayoutDef = require("ui/layouts/stack-layout");
99
export var fontFamilyProperty = new styleProperty.Property("fontFamily", "font-family",
1010
new observable.PropertyMetadata(undefined, observable.PropertyMetadataSettings.AffectsLayout));
1111

12-
export class MyTextViewStyler implements styles.stylers.Styler {
12+
export class MyTextViewStyler implements style.Styler {
1313
public static setFontFamilyProperty(view: view.View, newValue: any) {
1414
if (view.android) {
1515
(<android.widget.TextView>view.android).setTypeface(android.graphics.Typeface.create(newValue, android.graphics.Typeface.NORMAL));
@@ -41,7 +41,7 @@ export class MyTextViewStyler implements styles.stylers.Styler {
4141
}
4242

4343
public static registerHandlers() {
44-
styles.stylers.registerHandler(fontFamilyProperty, new styles.stylers.StylePropertyChangedHandler(
44+
style.registerHandler(fontFamilyProperty, new style.StylePropertyChangedHandler(
4545
MyTextViewStyler.setFontFamilyProperty,
4646
MyTextViewStyler.resetFontFamilyProperty,
4747
MyTextViewStyler.getNativeFontFamilyValue), "MyButton");

‎apps/tests/ui/style/style-tests.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -724,8 +724,8 @@ export function test_styling_visualStates_are_defined() {
724724
}
725725

726726
export function test_styling_stylers_are_defined() {
727-
TKUnit.assert(types.isFunction(styling.stylers.registerHandler), "registerHandler function is not defined");
728-
TKUnit.assert(types.isFunction(styling.stylers.StylePropertyChangedHandler), "StylePropertyChangedHandler class is not defined");
727+
TKUnit.assert(types.isFunction(styleModule.registerHandler), "registerHandler function is not defined");
728+
TKUnit.assert(types.isFunction(styleModule.StylePropertyChangedHandler), "StylePropertyChangedHandler class is not defined");
729729
}
730730

731731
export function test_styling_classes_are_defined() {

‎tsconfig.json‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -622,10 +622,6 @@
622622
"ui/styling/style-scope.ts",
623623
"ui/styling/style.d.ts",
624624
"ui/styling/style.ts",
625-
"ui/styling/stylers-common.ts",
626-
"ui/styling/stylers.android.ts",
627-
"ui/styling/stylers.d.ts",
628-
"ui/styling/stylers.ios.ts",
629625
"ui/styling/styling.d.ts",
630626
"ui/styling/styling.ts",
631627
"ui/styling/visual-state-constants.d.ts",
@@ -639,6 +635,9 @@
639635
"ui/tab-view/tab-view.android.ts",
640636
"ui/tab-view/tab-view.d.ts",
641637
"ui/tab-view/tab-view.ios.ts",
638+
"ui/text-base/text-base-styler.android.ts",
639+
"ui/text-base/text-base-styler.d.ts",
640+
"ui/text-base/text-base-styler.ios.ts",
642641
"ui/text-base/text-base.d.ts",
643642
"ui/text-base/text-base.ts",
644643
"ui/text-field/text-field-common.ts",

‎ui/action-bar/action-bar.android.ts‎

Lines changed: 29 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ import view = require("ui/core/view");
88
import * as traceModule from "trace";
99
import * as utilsModule from "utils/utils";
1010
import * as imageSourceModule from "image-source";
11+
import style = require("ui/styling/style");
12+
import font = require("ui/styling/font");
13+
import styling = require("ui/styling");
1114

1215
const R_ID_HOME = 0x0102002c;
1316
const ACTION_ITEM_ID_OFFSET = 1000;
@@ -366,4 +369,29 @@ function getIconVisibility(iconVisibility: string): boolean {
366369

367370
function getSystemResourceId(systemIcon: string): number {
368371
return android.content.res.Resources.getSystem().getIdentifier(systemIcon, "drawable", "android");
369-
}
372+
}
373+
374+
export class ActionBarStyler implements style.Styler {
375+
// color
376+
private static setColorProperty(v: view.View, newValue: any) {
377+
var toolbar = (<android.support.v7.widget.Toolbar>v._nativeView);
378+
toolbar.setTitleTextColor(newValue);
379+
380+
}
381+
382+
private static resetColorProperty(v: view.View, nativeValue: any) {
383+
// there is no toolbar.getTitleTextColor - so default to black
384+
if (types.isNullOrUndefined(nativeValue)) {
385+
nativeValue = android.graphics.Color.BLACK;
386+
}
387+
(<android.support.v7.widget.Toolbar>v._nativeView).setTitleTextColor(nativeValue);
388+
}
389+
390+
public static registerHandlers() {
391+
style.registerHandler(style.colorProperty, new style.StylePropertyChangedHandler(
392+
ActionBarStyler.setColorProperty,
393+
ActionBarStyler.resetColorProperty), "ActionBar");
394+
}
395+
}
396+
397+
ActionBarStyler.registerHandlers();

‎ui/action-bar/action-bar.ios.ts‎

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ import enums = require("ui/enums");
66
import view = require("ui/core/view");
77
import utils = require("utils/utils");
88
import types = require("utils/types");
9+
import style = require("ui/styling/style");
10+
import font = require("ui/styling/font");
11+
import styling = require("ui/styling");
12+
import frame = require("ui/frame");
913

1014
global.moduleMerge(common, exports);
1115

@@ -243,3 +247,55 @@ class TapBarItemHandlerImpl extends NSObject {
243247
"tap": { returns: interop.types.void, params: [interop.types.id] }
244248
};
245249
}
250+
251+
export class ActionBarStyler implements style.Styler {
252+
// color
253+
private static setColorProperty(v: view.View, newValue: any) {
254+
var topFrame = frame.topmost();
255+
if (topFrame) {
256+
var navBar = topFrame.ios.controller.navigationBar;
257+
navBar.titleTextAttributes = <any>{ [NSForegroundColorAttributeName]: newValue };
258+
navBar.tintColor = newValue;
259+
}
260+
}
261+
262+
private static resetColorProperty(v: view.View, nativeValue: any) {
263+
var topFrame = frame.topmost();
264+
if (topFrame) {
265+
var navBar = topFrame.ios.controller.navigationBar;
266+
navBar.titleTextAttributes = null;
267+
navBar.tintColor = null;
268+
}
269+
}
270+
271+
// background-color
272+
private static setBackgroundColorProperty(v: view.View, newValue: any) {
273+
var topFrame = frame.topmost();
274+
if (topFrame) {
275+
var navBar = topFrame.ios.controller.navigationBar;
276+
navBar.barTintColor = newValue;
277+
}
278+
}
279+
280+
private static resetBackgroundColorProperty(v: view.View, nativeValue: any) {
281+
var topFrame = frame.topmost();
282+
if (topFrame) {
283+
var navBar = topFrame.ios.controller.navigationBar;
284+
navBar.barTintColor = null;
285+
}
286+
}
287+
288+
public static registerHandlers() {
289+
style.registerHandler(style.colorProperty, new style.StylePropertyChangedHandler(
290+
ActionBarStyler.setColorProperty,
291+
ActionBarStyler.resetColorProperty), "ActionBar");
292+
293+
style.registerHandler(style.backgroundColorProperty, new style.StylePropertyChangedHandler(
294+
ActionBarStyler.setBackgroundColorProperty,
295+
ActionBarStyler.resetBackgroundColorProperty), "ActionBar");
296+
297+
style.registerHandler(style.backgroundInternalProperty, style.ignorePropertyHandler, "ActionBar");
298+
}
299+
}
300+
301+
ActionBarStyler.registerHandlers();

‎ui/activity-indicator/activity-indicator.android.ts‎

Lines changed: 46 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
11
import aiCommon = require("./activity-indicator-common");
22
import dependencyObservable = require("ui/core/dependency-observable");
33
import proxy = require("ui/core/proxy");
4-
import * as enumsModule from "ui/enums";
4+
import enums = require("ui/enums");
5+
import styling = require("ui/styling");
6+
import style = require("ui/styling/style");
7+
import view = require("ui/core/view");
58

69
function onBusyPropertyChanged(data: dependencyObservable.PropertyChangeData) {
710
var indicator = <ActivityIndicator>data.object;
811
if (!indicator.android) {
912
return;
1013
}
1114

12-
var enums: typeof enumsModule = require("ui/enums");
13-
1415
if (indicator.visibility === enums.Visibility.visible) {
1516
indicator.android.setVisibility(data.newValue ? android.view.View.VISIBLE : android.view.View.INVISIBLE);
1617
}
@@ -34,3 +35,45 @@ export class ActivityIndicator extends aiCommon.ActivityIndicator {
3435
return this._android;
3536
}
3637
}
38+
39+
export class ActivityIndicatorStyler implements style.Styler {
40+
private static setColorProperty(view: view.View, newValue: any) {
41+
var bar = <android.widget.ProgressBar>view._nativeView;
42+
bar.getIndeterminateDrawable().setColorFilter(newValue, android.graphics.PorterDuff.Mode.SRC_IN);
43+
}
44+
45+
private static resetColorProperty(view: view.View, nativeValue: number) {
46+
var bar = <android.widget.ProgressBar>view._nativeView;
47+
bar.getIndeterminateDrawable().clearColorFilter();
48+
}
49+
50+
//Visibility methods
51+
public static setActivityIndicatorVisibilityProperty(view: view.View, newValue: any) {
52+
ActivityIndicatorStyler.setIndicatorVisibility((<any>view).busy, newValue, view._nativeView);
53+
}
54+
55+
public static resetActivityIndicatorVisibilityProperty(view: view.View, nativeValue: any) {
56+
ActivityIndicatorStyler.setIndicatorVisibility((<any>view).busy, enums.Visibility.visible, view._nativeView);
57+
}
58+
59+
public static setIndicatorVisibility(isBusy: boolean, visibility: string, nativeView: android.view.View) {
60+
if (visibility === enums.Visibility.collapsed || visibility === enums.Visibility.collapse) {
61+
nativeView.setVisibility(android.view.View.GONE);
62+
}
63+
else {
64+
nativeView.setVisibility(isBusy ? android.view.View.VISIBLE : android.view.View.INVISIBLE);
65+
}
66+
}
67+
68+
public static registerHandlers() {
69+
style.registerHandler(style.colorProperty, new style.StylePropertyChangedHandler(
70+
ActivityIndicatorStyler.setColorProperty,
71+
ActivityIndicatorStyler.resetColorProperty), "ActivityIndicator");
72+
73+
style.registerHandler(style.visibilityProperty, new style.StylePropertyChangedHandler(
74+
ActivityIndicatorStyler.setActivityIndicatorVisibilityProperty,
75+
ActivityIndicatorStyler.resetActivityIndicatorVisibilityProperty), "ActivityIndicator");
76+
}
77+
}
78+
79+
ActivityIndicatorStyler.registerHandlers();

‎ui/activity-indicator/activity-indicator.ios.ts‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
import aiCommon = require("./activity-indicator-common");
22
import dependencyObservable = require("ui/core/dependency-observable");
33
import proxy = require("ui/core/proxy");
4+
import styling = require("ui/styling");
5+
import style = require("ui/styling/style");
6+
import view = require("ui/core/view");
47

58
function onBusyPropertyChanged(data: dependencyObservable.PropertyChangeData) {
69
var indicator = <ActivityIndicator>data.object;
@@ -32,3 +35,29 @@ export class ActivityIndicator extends aiCommon.ActivityIndicator {
3235
return this._ios;
3336
}
3437
}
38+
39+
export class ActivityIndicatorStyler implements style.Styler {
40+
private static setColorProperty(view: view.View, newValue: any) {
41+
var bar = <UIActivityIndicatorView>view.ios;
42+
bar.color = newValue;
43+
}
44+
45+
private static resetColorProperty(view: view.View, nativeValue: any) {
46+
var bar = <UIActivityIndicatorView>view.ios;
47+
bar.color = nativeValue;
48+
}
49+
50+
private static getNativeColorValue(view: view.View): any {
51+
var bar = <UIActivityIndicatorView>view.ios;
52+
return bar.color;
53+
}
54+
55+
public static registerHandlers() {
56+
style.registerHandler(style.colorProperty, new style.StylePropertyChangedHandler(
57+
ActivityIndicatorStyler.setColorProperty,
58+
ActivityIndicatorStyler.resetColorProperty,
59+
ActivityIndicatorStyler.getNativeColorValue), "ActivityIndicator");
60+
}
61+
}
62+
63+
ActivityIndicatorStyler.registerHandlers();

0 commit comments

Comments
 (0)