Visitar URL original
Merge pull request #3522 from NativeScript/status-bar-pick · NativeScript/NativeScript@30aca89 · GitHub
Skip to content

Commit 30aca89

Browse files
PanayotCankovPanayotCankov
authored
Merge pull request #3522 from NativeScript/status-bar-pick
Status bar pick
2 parents 93ba30c + bfc9cf1 commit 30aca89

5 files changed

Lines changed: 84 additions & 46 deletions

File tree

‎.travis.yml‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -37,16 +37,17 @@ before_script:
3737
- adb shell input keyevent 82 &
3838
script:
3939
- jdk_switcher use oraclejdk8
40-
- grunt default --verbose &&
41-
FULL_PACKAGE_VERSION=`node -e 'console.log(require("./bin/dist/tns-core-modules/package.json").version);'` &&
42-
(cd tns-platform-declarations && npm pack) &&
43-
wget -O ./nativescript.tgz "https://s3.amazonaws.com/nativescript-ci/build_result/nativescript.tgz" &&
44-
echo no | npm install -g nativescript.tgz --ignore-scripts > /dev/null && tns usage-reporting disable && tns error-reporting disable &&
45-
grunt buildOnlyTestsApp --verbose --platform=Android --modulesPath=./bin/dist/$PACKAGE_NAME-$FULL_PACKAGE_VERSION.tgz --runtimeVersion=$RUNTIMEVERSION --emuPId=.*emulator.* --avd=$AVD_NAME --showEmu=false > /dev/null &&
46-
grunt runOnlyTestsApp --verbose --platform=Android --modulesPath=./bin/dist/$PACKAGE_NAME-$FULL_PACKAGE_VERSION.tgz --emuPId=.*emulator.* --avd=$AVD_NAME --showEmu=false
40+
- grunt default --verbose
41+
- FULL_PACKAGE_VERSION=$(node build/version.js)
42+
- (cd tns-platform-declarations && npm pack)
43+
- wget -O ./nativescript.tgz "https://s3.amazonaws.com/nativescript-ci/build_result/nativescript.tgz"
44+
- echo no | npm install -g nativescript.tgz --ignore-scripts
45+
- tns usage-reporting disable && tns error-reporting disable
46+
- grunt buildOnlyTestsApp --platform=Android --modulesPath=./bin/dist/$PACKAGE_NAME-$FULL_PACKAGE_VERSION.tgz --runtimeVersion=$RUNTIMEVERSION --emuPId=.*emulator.* --avd=$AVD_NAME --showEmu=false
47+
- grunt runOnlyTestsApp --verbose --platform=Android --modulesPath=./bin/dist/$PACKAGE_NAME-$FULL_PACKAGE_VERSION.tgz --emuPId=.*emulator.* --avd=$AVD_NAME --showEmu=false
4748
- node ./build/travis-scripts/check-testrun-broken.js
48-
- adb pull /storage/sdcard/Documents/test-results.xml &&
49-
mv test-results.xml ~/test-run-results$PACKAGE_VERSION.xml
49+
- adb pull /storage/sdcard/Documents/test-results.xml
50+
- mv test-results.xml ~/test-run-results$PACKAGE_VERSION.xml
5051
before_deploy:
5152
- mv bin/dist/$PACKAGE_NAME-$FULL_PACKAGE_VERSION.tgz ../.deploymentpackage
5253
- mv build ../

‎apps/app/ui-tests-app/page/page-status-bar-css.xml‎

Lines changed: 38 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -4,35 +4,42 @@
44
<ActionBar title="Sample title" />
55
</Page.actionBar>
66

7-
<WrapLayout>
8-
<!-- status-bar-style -->
9-
<Button text="11" tap="applyTap" tag="status-bar-style: light;" style.fontSize="8" width="40" height="40" automationText="light;" />
10-
<Button text="12" tap="applyTap" tag="status-bar-style: dark;" style.fontSize="8" width="40" height="40" automationText="dark;" />
11-
12-
<!-- status-bar-style - action-bar - background -->
13-
<Button text="21" tap="applyTapOnStyledActionBar" tag="status-bar-style: light;" style.fontSize="8" width="40" height="40" automationText="light-abb-ruby" />
14-
<Button text="22" tap="applyTapOnStyledActionBar" tag="status-bar-style: dark;" style.fontSize="8" width="40" height="40" automationText="dark-abb-ruby" />
15-
16-
<!-- status-bar-style - action-bar - hidden -->
17-
<Button text="31" tap="applyTapWithHiddenActionBar" tag="status-bar-style: light;" style.fontSize="8" width="40" height="40" automationText="light-ab-hidden" />
18-
<Button text="32" tap="applyTapWithHiddenActionBar" tag="status-bar-style: dark;" style.fontSize="8" width="40" height="40" automationText="ark-ab-hidden" />
19-
20-
<!-- android-status-bar-background -->
21-
<Button text="41" tap="applyTap" tag="android-status-bar-background: #E0115F;" style.fontSize="8" width="40" height="40" automationText="asbb-blue" />
22-
23-
<!-- status-bar-style - page - background -->
24-
<Button text="51" tap="applyTap" tag="status-bar-style: light;background-color: #E0115F;" style.fontSize="8" width="40" height="40" automationText="light-bckg-ruby" />
25-
<Button text="52" tap="applyTap" tag="status-bar-style: dark; background-color: #E0115F;" style.fontSize="8" width="40" height="40" automationText="dark-bckg-ruby" />
26-
27-
<!-- status-bar-style - page - and - action-bar - background -->
28-
<Button text="61" tap="applyTapOnStyledActionBar" tag="status-bar-style: light;background-color: #E0115F;" style.fontSize="8" width="40" height="40" automationText="light-bckg-yellow-abbckg-ruby" />
29-
<Button text="62" tap="applyTapOnStyledActionBar" tag="status-bar-style: dark; ;background-color: #E0115F;" style.fontSize="8" width="40" height="40" automationText="dark-bckg-yellow-abbckg-ruby" />
30-
31-
<!-- status-bar-style - action-bar - hidden - and - backgroundSpanUnderStatusBar -->
32-
<Button text="71" tap="applyTapWithSpan" tag="status-bar-style: light;background-color: yellow" style.fontSize="8" width="40" height="40" automationText="dark-bckg-yellow-bckgsusb-true" />
33-
<Button text="72" tap="applyTapOnStyledActionBarAndSpan" tag="status-bar-style: light;background-color: yellow;" style.fontSize="8" width="40" height="40" automationText="light-bckg-yellow-abbck-ruby-bckgsusb-true" />
34-
35-
<Button text="73" tap="applyTapWithSpan" tag="status-bar-style: dark;background-color: yellow;" style.fontSize="8" width="40" height="40" automationText="light-ab-hidden-bckgsusb-true" />
36-
<Button text="74" tap="applyTapWithActionBarHiddenAndSpan" tag="status-bar-style: dark;background-color: yellow;" style.fontSize="8" width="40" height="40" automationText="dark-ab-hidden-bckgsusb-true" />
37-
</WrapLayout>
7+
<StackLayout padding="10">
8+
<Label text="IOS and Android" fontSize="14"/>
9+
<WrapLayout>
10+
<!-- status-bar-style -->
11+
<Button text="11" tap="applyTap" tag="status-bar-style: light;" style.fontSize="8" width="40" height="40" automationText="light;" />
12+
<Button text="12" tap="applyTap" tag="status-bar-style: dark;" style.fontSize="8" width="40" height="40" automationText="dark;" />
13+
14+
<!-- status-bar-style - action-bar - background -->
15+
<Button text="21" tap="applyTapOnStyledActionBar" tag="status-bar-style: light;" style.fontSize="8" width="40" height="40" automationText="light-abb-ruby" />
16+
<Button text="22" tap="applyTapOnStyledActionBar" tag="status-bar-style: dark;" style.fontSize="8" width="40" height="40" automationText="dark-abb-ruby" />
17+
18+
<!-- status-bar-style - page - background -->
19+
<Button text="51" tap="applyTap" tag="status-bar-style: light;background-color: #E0115F;" style.fontSize="8" width="40" height="40" automationText="light-bckg-ruby" />
20+
<Button text="52" tap="applyTap" tag="status-bar-style: dark; background-color: #E0115F;" style.fontSize="8" width="40" height="40" automationText="dark-bckg-ruby" />
21+
22+
<!-- status-bar-style - page - and - action-bar - background -->
23+
<Button text="61" tap="applyTapOnStyledActionBar" tag="status-bar-style: light;background-color: #E0115F;" style.fontSize="8" width="40" height="40" automationText="light-bckg-yellow-abbckg-ruby" />
24+
<Button text="62" tap="applyTapOnStyledActionBar" tag="status-bar-style: dark; ;background-color: #E0115F;" style.fontSize="8" width="40" height="40" automationText="dark-bckg-yellow-abbckg-ruby" />
25+
26+
<!-- status-bar-style - action-bar - hidden - and - backgroundSpanUnderStatusBar -->
27+
<Button text="71" tap="applyTapWithSpan" tag="status-bar-style: light;background-color: yellow" style.fontSize="8" width="40" height="40" automationText="dark-bckg-yellow-bckgsusb-true" />
28+
<Button text="72" tap="applyTapOnStyledActionBarAndSpan" tag="status-bar-style: light;background-color: yellow;" style.fontSize="8" width="40" height="40" automationText="light-bckg-yellow-abbck-ruby-bckgsusb-true" />
29+
30+
<Button text="73" tap="applyTapWithSpan" tag="status-bar-style: dark;background-color: yellow;" style.fontSize="8" width="40" height="40" automationText="light-ab-hidden-bckgsusb-true" />
31+
<Button text="74" tap="applyTapWithActionBarHiddenAndSpan" tag="status-bar-style: dark;background-color: yellow;" style.fontSize="8" width="40" height="40" automationText="dark-ab-hidden-bckgsusb-true" />
32+
33+
</WrapLayout>
34+
35+
<Label text="Android" fontSize="14" marginTop="10"/>
36+
<WrapLayout>
37+
<!-- status-bar-style - action-bar - hidden -->
38+
<Button text="31" tap="applyTapWithHiddenActionBar" tag="status-bar-style: light;" style.fontSize="8" width="40" height="40" automationText="light-ab-hidden" />
39+
<Button text="32" tap="applyTapWithHiddenActionBar" tag="status-bar-style: dark;" style.fontSize="8" width="40" height="40" automationText="ark-ab-hidden" />
40+
41+
<!-- android-status-bar-background -->
42+
<Button text="41" tap="applyTap" tag="android-status-bar-background: #E0115F;" style.fontSize="8" width="40" height="40" automationText="asbb-ruby" />
43+
</WrapLayout>
44+
</StackLayout>
3845
</Page>

‎build/version.js‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
var fs = require("fs");
2+
console.log(JSON.parse(fs.readFileSync("./bin/dist/tns-core-modules/package.json")).version);

‎tns-core-modules/ui/action-bar/action-bar.android.ts‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -427,10 +427,34 @@ export class ActionBarStyler implements style.Styler {
427427
(<android.support.v7.widget.Toolbar>v._nativeView).setTitleTextColor(nativeValue);
428428
}
429429

430+
// background-color
431+
private static getBackgroundColorProperty(view: view.View): any {
432+
let toolbar = <android.support.v7.widget.Toolbar>view._nativeView;
433+
return toolbar.getBackground();
434+
}
435+
436+
private static setBackgroundColorProperty(v: view.View, newValue: any) {
437+
var toolbar = (<android.support.v7.widget.Toolbar>v._nativeView);
438+
if (toolbar) {
439+
toolbar.setBackgroundColor(newValue);
440+
}
441+
}
442+
443+
private static resetBackgroundColorProperty(v: view.View, nativeValue: any) {
444+
var toolbar = (<android.support.v7.widget.Toolbar>v._nativeView);
445+
if (toolbar) {
446+
toolbar.setBackgroundColor(nativeValue);
447+
}
448+
}
449+
430450
public static registerHandlers() {
431451
style.registerHandler(style.colorProperty, new style.StylePropertyChangedHandler(
432452
ActionBarStyler.setColorProperty,
433453
ActionBarStyler.resetColorProperty), "ActionBar");
454+
style.registerHandler(style.backgroundColorProperty, new style.StylePropertyChangedHandler(
455+
ActionBarStyler.setBackgroundColorProperty,
456+
ActionBarStyler.resetBackgroundColorProperty,
457+
ActionBarStyler.getBackgroundColorProperty), "ActionBar");
434458
}
435459
}
436460

‎tns-core-modules/ui/page/page.android.ts‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -243,15 +243,19 @@ export class PageStyler implements style.Styler {
243243

244244
// android-status-bar-background-property
245245
private static setAndroidStatusBarBackgroundProperty(v: view.View, newValue: any) {
246-
let window = app.android.startActivity.getWindow();
247-
let nativeColor = new colorModule.Color(newValue).android;
248-
window.setStatusBarColor(nativeColor);
246+
if (platform.device.sdkVersion >= "21") {
247+
let window = app.android.startActivity.getWindow();
248+
let nativeColor = new colorModule.Color(newValue).android;
249+
window.setStatusBarColor(nativeColor);
250+
}
249251
}
250252

251253
private static resetAndroidStatusBarBackgroundProperty(v: view.View, nativeValue: any) {
252-
let window = app.android.startActivity.getWindow();
253-
let nativeColor = (nativeValue instanceof colorModule.Color) ? (<colorModule.Color>nativeValue).android : new colorModule.Color(nativeValue).android;
254-
window.setStatusBarColor(nativeColor);
254+
if (platform.device.sdkVersion >= "21") {
255+
let window = app.android.startActivity.getWindow();
256+
let nativeColor = (nativeValue instanceof colorModule.Color) ? (<colorModule.Color>nativeValue).android : new colorModule.Color(nativeValue).android;
257+
window.setStatusBarColor(nativeColor);
258+
}
255259
}
256260

257261
private static getAndroidStatusBarBackgroundProperty(v: view.View): any {

0 commit comments

Comments
 (0)