Commit 0bf6bcab authored by laurent l's avatar laurent l

NS6 fix on iOS

parent 5cceb76e
......@@ -54,7 +54,7 @@ Label.link {
}
TextField {
TextField, RadAutoCompleteTextView {
background-color: $zone-background-color;
border-color: $first-color;
border-width: 1dip;
......
// Import the theme’s variables. If you’re using a color scheme
// other than “light”, switch the path to the alternative scheme,
// for example '~nativescript-theme-core/scss/dark'.
@import '~nativescript-theme-core/scss/light';
// Custom colors
$background-dark: #F8F8F8 !default;
$background-light: #FFFFFF !default;
$blue-dark: #022734 !default;
$blue-light: #02556E !default;
$blue-50: rgba($blue-dark, 0.5) !default;
$blue-20: rgba($blue-dark, 0.2) !default;
$blue-10: rgba($blue-dark, 0.1) !default;
$accent-dark: #3A53FF !default;
$accent-light: #4781FE !default;
$success-dark: #06CE6A !default;
$success-light: #00E676 !default;
$warning-dark: #f39c11 !default;
$warning-light: #F2C112 !default;
$error-dark: #D84039 !default;
$error-light: #ED473F !default;
$midnight-dark: #0F336D !default;
$midnight-light: #14418B !default;
$night-dark: #023141 !default;
$night-light: #01526C !default;
$page-icon-color: #D7D7D7 !default;
// Sizes
$page-content-placeholder-font-size: 20;
/**
* Theme variables overrides
**/
// Colors
$background: #fff;
$primary: lighten(#000, 13%);
$secondary: lighten(#000, 46%);
$disabled: lighten(#000, 62%);
$accent: $accent-dark;
$error: $error-light;
// SideDrawer
$item-color-android : #737373;
$item-active-background: #F8F8F8;
$item-active-color: $accent;
$item-active-icon-color: $item-active-color;
$item-color-ios: $blue-dark;
$item-color-android: $blue-dark;
$side-drawer-header-background: #fafafa;
$side-drawer-header-brand: #737373;
$side-drawer-background: #FFFFFF;
// ActionBar
$ab-background: $accent;
$ab-color: $white;
// Buttons
$btn-color-inverse: $white;
$btn-color: $accent;
$btn-color-secondary: darken($btn-color, 10%);
$btn-color-outline-highlighted: lighten($btn-color, 10%);
//Text colors
$headings-color: $blue-dark;
$secondary: $blue-dark;
$text-color: $blue-dark;
// Import app variables
@import 'app-variables';
// Import the theme’s main ruleset - both index and platform specific.
@import '~nativescript-theme-core/scss/index';
@import '~nativescript-theme-core/scss/platforms/index.ios';
......
......@@ -23,7 +23,7 @@ function myReloadPage() {
frame.navigate(newEntry);
}
}
global.__onLiveSyncCore = myReloadPage;
//global.__onLiveSyncCore = myReloadPage;
app.run({ moduleName: 'views/root-page' })
......
......@@ -301,9 +301,11 @@ export class LibraryController extends Controller {
.refresh(this._account)
.then(() => {
this
._loadLoansAndHolds()
._turnBusyIndicator('off')
this._loadLoansAndHolds()
})
.then(() => {
this._turnBusyIndicator('off')
})
.then(() => {
......@@ -596,13 +598,13 @@ export class LibraryController extends Controller {
let loans: RadListView = this._view.getViewById("loans")
if (loans != undefined) {
loans.notifyPullToRefreshFinished()
loans.refresh()
// loans.refresh()
}
let holds: RadListView = this._view.getViewById("holds")
if (holds != undefined) {
holds.notifyPullToRefreshFinished()
holds.refresh()
// holds.refresh()
}
return this;
......
......@@ -9,7 +9,7 @@
<ac:RadAutoCompleteTextView.suggestionView>
<ac:SuggestionView suggestionViewHeight="300">
<ac:SuggestionView.suggestionItemTemplate>
<GridLayout columns="30, *" rows="auto">
<GridLayout columns="30, *" rows="40">
<Image src="{{ image ? image : undefined }}" class="certified" width="15"/>
<Label text="{{ text }}" col="1" row="0" />
</GridLayout>
......
......@@ -5612,9 +5612,9 @@
"integrity": "sha512-l9/xJwbs2wUekGcUV0HXQHfDNmIdXWcHocSqa7nXUQlHChzlYIacra4Sr4DUHN+tuFwofk0vG4hG5gtm4c6RGw=="
},
"nativescript-theme-core": {
"version": "1.0.6",
"resolved": "https://registry.npmjs.org/nativescript-theme-core/-/nativescript-theme-core-1.0.6.tgz",
"integrity": "sha512-p9v8w0xC/WJDJat/HwxJ/u7Xf50i3JiZR0zx0M7445Gi4HaBClFcjfVc+TLOZEARU4RKauBTopYlLN4xke6tYw=="
"version": "2.0.21",
"resolved": "https://registry.npmjs.org/nativescript-theme-core/-/nativescript-theme-core-2.0.21.tgz",
"integrity": "sha512-nnElMlyLJtKpjgl+cWvTIw/0IOZzKuC1fZ/yw91fA9DyJRyZxfbGkOnmr0uwHKP1Tc0+8RMMRiRzP4Zb6tZZcg=="
},
"nativescript-tslib": {
"version": "1.9.1-r1",
......@@ -5625,9 +5625,9 @@
}
},
"nativescript-ui-autocomplete": {
"version": "5.0.0",
"resolved": "https://registry.npmjs.org/nativescript-ui-autocomplete/-/nativescript-ui-autocomplete-5.0.0.tgz",
"integrity": "sha512-Ok48av1Qr34UsaZMhYBqLW03wr2oZGHcZqSJTnoel92rDCo4tYOR/AN6RqMjMVc0tnvCpop8roVfngdkxAI0Wg==",
"version": "5.1.1",
"resolved": "https://registry.npmjs.org/nativescript-ui-autocomplete/-/nativescript-ui-autocomplete-5.1.1.tgz",
"integrity": "sha512-o7Xuy2j3SnjbS8jrTdf4EVRtPD2oHrHvDoiaEIkxyDcSInA0/tO3XdKyvdJTRKQr+irxIfuY9n6D2Fxj0ipKfQ==",
"requires": {
"nativescript-ui-core": "~3.0.0"
}
......@@ -5638,17 +5638,17 @@
"integrity": "sha512-gEaooNnuLiAHSPlh2zfEkdc4sq7Z/0UtubiQbLjW3KvG8iyF6/jFQNmNEIr/RvcoZ9jVtEVmbdnaeA2MfpJQ+w=="
},
"nativescript-ui-listview": {
"version": "7.0.0",
"resolved": "https://registry.npmjs.org/nativescript-ui-listview/-/nativescript-ui-listview-7.0.0.tgz",
"integrity": "sha512-4Q2zBLZ6QWiA2rQZhwg8+CcFHiWrOqcCbEaIo2DrvIKgVvRxloCZekYmmu0sc4J+5WfL0yJhbMVfp6/9KH7cIA==",
"version": "7.0.5",
"resolved": "https://registry.npmjs.org/nativescript-ui-listview/-/nativescript-ui-listview-7.0.5.tgz",
"integrity": "sha512-lH3D2Ggl5d0gIveT/a1Lr2ZXLFVHCao6esXISwErPkddsBsXsIYGAmgjUSixvnUVyBOGn0bm8Ve9Vnskrv72VQ==",
"requires": {
"nativescript-ui-core": "~3.0.0"
}
},
"nativescript-ui-sidedrawer": {
"version": "7.0.0",
"resolved": "https://registry.npmjs.org/nativescript-ui-sidedrawer/-/nativescript-ui-sidedrawer-7.0.0.tgz",
"integrity": "sha512-FPFJfN7g8tW8h7fciCoh89Zj66F8it7UpzZALmkkA7qHq+QlhuIoxHwx4l+tgIoVy6BoM4xPII5+Kh9n+OYSBA==",
"version": "7.0.2",
"resolved": "https://registry.npmjs.org/nativescript-ui-sidedrawer/-/nativescript-ui-sidedrawer-7.0.2.tgz",
"integrity": "sha512-FS73k3HzVHWpLHEruEbTibrpHTwQlcckALAMjJ3G/DARsJqKHBVJNplc6n+4CNrCsq96EQQv7ua3KjXCZbqEgQ==",
"requires": {
"nativescript-ui-core": "~3.0.0"
}
......
......@@ -24,11 +24,11 @@
"nativescript-i18n": "^0.4.0",
"nativescript-intl": "^3.0.0",
"nativescript-swiss-army-knife": "^3.1.1",
"nativescript-theme-core": "^1.0.6",
"nativescript-ui-autocomplete": "5.0.0",
"nativescript-theme-core": "^2.0.21",
"nativescript-ui-autocomplete": "^5.1.1",
"nativescript-ui-core": "^3.0.0",
"nativescript-ui-listview": "7.0.0",
"nativescript-ui-sidedrawer": "7.0.0",
"nativescript-ui-listview": "^7.0.5",
"nativescript-ui-sidedrawer": "^7.0.2",
"nativescript-unit-test-runner": "0.7.0",
"nativescript-webview-utils": "^3.0.1",
"nativescript-zxing": "git+https://github.com/Afibre/nativescript-zxing.git",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment