Skip to content

Commit

Permalink
feat(nativescript): upgrade version of nativescript project dependencies
Browse files Browse the repository at this point in the history
fix(quotes-list): patch for *ngIf not working in list-view item template in nativescript-angular 1.2.0.
  • Loading branch information
shripalsoni04 committed Dec 19, 2016
1 parent 23792f1 commit c4f3949
Show file tree
Hide file tree
Showing 6 changed files with 33 additions and 24 deletions.
2 changes: 1 addition & 1 deletion nativescript/app/app.android.scss
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 5,7 @@
@import "nativescript-theme-core/scss/index";

// Style adjustments for Android
@import "nativescript-theme-core/scss/themes/core/platforms/index.android";
@import "nativescript-theme-core/scss/platforms/index.android";

// App styles common to Android and iOS platforms.
@import "scss/app-common";
Expand Down
2 changes: 1 addition & 1 deletion nativescript/app/app.ios.scss
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 5,7 @@
@import "nativescript-theme-core/scss/index";

// Style adjustments for iOS
@import "nativescript-theme-core/scss/themes/core/platforms/index.ios";
@import "nativescript-theme-core/scss/platforms/index.ios";

// App styles common to Android and iOS platforms.
@import "scss/app-common";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 20,7 @@
textWrap="true"></Label>
<Label
class="quote-author text-light"
*ngIf="quotesBy !== 'author'"
[visibility]="quotesBy !== 'author' ? 'visible' : 'collapsed'"
[text]="'- ' item.authorName">
</Label>
<StackLayout class="hr-light"></StackLayout>
Expand All @@ -43,7 43,7 @@
<ActivityIndicator
#activityIndicator
class="activity-indicator"
*ngIf="i === cvm.lstQuotes.length -1 && i !== cvm.pagination.count -1 && quotesBy === 'all'"
[visibility]="i === cvm.lstQuotes.length -1 && i !== cvm.pagination.count -1 && quotesBy === 'all' ? 'visible' : 'collapsed'"
[busy]="i === cvm.lstQuotes.length -1">
</ActivityIndicator>
</StackLayout>
Expand Down
3 changes: 1 addition & 2 deletions nativescript/app/scss/_variables.scss
Original file line number Diff line number Diff line change
@@ -1,6 1,5 @@
// Core variables
@import 'nativescript-theme-core/scss/variables';
@import 'nativescript-theme-core/scss/themes/core/variables_dark';
@import "nativescript-theme-core/scss/dark";

// Cross platform shared variables. Basically contains brand colors.
@import "x-shared/scss/variables";
Expand Down
9 changes: 9 additions & 0 deletions nativescript/firebase.nativescript.json
Original file line number Diff line number Diff line change
@@ -0,0 1,9 @@
{
"using_ios": true,
"using_android": true,
"remote_config": false,
"messaging": false,
"storage": false,
"facebook_auth": false,
"google_auth": false
}
37 changes: 19 additions & 18 deletions nativescript/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,40 9,41 @@
"version": "2.4.0"
},
"tns-android": {
"version": "2.4.0"
"version": "2.4.1"
}
},
"dependencies": {
"@angular/common": "2.1.2",
"@angular/compiler": "2.1.2",
"@angular/core": "2.1.2",
"@angular/forms": "2.1.2",
"@angular/http": "2.1.2",
"@angular/platform-browser": "2.1.2",
"@angular/platform-browser-dynamic": "2.1.2",
"@angular/router": "3.1.2",
"nativescript-angular": "1.1.2",
"@angular/common": "~2.2.4",
"@angular/compiler": "~2.2.4",
"@angular/core": "~2.2.4",
"@angular/forms": "~2.2.4",
"@angular/http": "~2.2.4",
"@angular/platform-browser": "~2.2.4",
"@angular/platform-browser-dynamic": "~2.2.4",
"@angular/router": "~3.2.1",
"nativescript-angular": "1.2.0",
"nativescript-cardview": "~1.2.0",
"nativescript-floatingactionbutton": "~2.2.5",
"nativescript-iqkeyboardmanager": "~1.0.1",
"nativescript-material-icons": "~1.0.1",
"nativescript-ng2-fonticon": "~1.3.3",
"nativescript-plugin-firebase": "~3.7.2",
"nativescript-plugin-firebase": "^3.8.4",
"nativescript-social-share": "~1.3.1",
"nativescript-swiss-army-knife": "~1.0.71",
"nativescript-telerik-ui": "~1.4.1",
"nativescript-theme-core": "^0.2.3",
"nativescript-theme-core": "^1.0.2",
"reflect-metadata": "~0.1.8",
"rxjs": "5.0.0-beta.12",
"tns-core-modules": "~2.4.0"
},
"devDependencies": {
"babel-traverse": "6.15.0",
"babel-types": "6.15.0",
"babylon": "6.11.2",
"babel-traverse": "6.18.0",
"babel-types": "6.18.0",
"babylon": "6.13.1",
"lazy": "1.0.11",
"nativescript-dev-sass": "^0.4.0",
"nativescript-dev-sass": "^0.4.1",
"nativescript-dev-typescript": "^0.3.2",
"typescript": "^2.0.3",
"zone.js": "^0.6.21"
"typescript": "^2.0.9",
"zone.js": "~0.6.21"
}
}

0 comments on commit c4f3949

Please sign in to comment.