From 65efef29a61039f65c0bdbf607c1cd771646dacc Mon Sep 17 00:00:00 2001 From: tgpetrov Date: Fri, 1 Nov 2019 10:10:23 +0200 Subject: [PATCH 1/7] fix: issue happening on 31st --- src/datetimepicker.android.ts | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/src/datetimepicker.android.ts b/src/datetimepicker.android.ts index 3f88c1b..7163c31 100644 --- a/src/datetimepicker.android.ts +++ b/src/datetimepicker.android.ts @@ -155,6 +155,11 @@ export class DateTimePicker extends DateTimePickerBase { const context = options.context; let dateTime: Date; if (value) { + if (nativePicker instanceof android.widget.DatePicker) { + const minDate = (options).minDate; + const maxDate = (options).maxDate; + value = DateTimePicker._trimDate(value, minDate, maxDate); + } dateTime = new Date(value.getTime()); } else { dateTime = (nativePicker instanceof android.widget.DatePicker) ? getDateToday() : getDateNow(); @@ -188,6 +193,17 @@ export class DateTimePicker extends DateTimePickerBase { } } + private static _trimDate(originalDate: Date, minDate: Date, maxDate: Date) { + let finalDate = originalDate; + if (minDate !== undefined && minDate > finalDate) { + finalDate = minDate; + } + if (maxDate !== undefined && maxDate < finalDate) { + finalDate = maxDate; + } + return finalDate; + } + private static _applyDialogColors(nativeDialog: android.app.AlertDialog, color: Color, backgroundColor: Color) { if (backgroundColor) { nativeDialog.getWindow().setBackgroundDrawable(new android.graphics.drawable.ColorDrawable(backgroundColor.android)); From 58c76b8508c336b614fe630eafdb43fda286b683 Mon Sep 17 00:00:00 2001 From: Elena Hristova Date: Wed, 6 Nov 2019 15:57:51 +0200 Subject: [PATCH 2/7] chore: update to 6.2 --- demo-angular/package.json | 10 +++++----- demo-vue/package.json | 8 ++++---- demo/package.json | 8 ++++---- src/package.json | 6 +++--- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/demo-angular/package.json b/demo-angular/package.json index 767d1ed..821ee23 100644 --- a/demo-angular/package.json +++ b/demo-angular/package.json @@ -2,10 +2,10 @@ "nativescript": { "id": "org.nativescript.datetimepicker.demong", "tns-android": { - "version": "6.1.0" + "version": "6.2.0" }, "tns-ios": { - "version": "6.1.0" + "version": "6.2.0" } }, "description": "NativeScript DateTimePicker Demo NG", @@ -26,7 +26,7 @@ "@angular/platform-browser": "~8.2.0", "@angular/platform-browser-dynamic": "~8.2.0", "@angular/router": "~8.2.0", - "nativescript-angular": "~8.2.0", + "nativescript-angular": "~8.20.0", "nativescript-datetimepicker": "file:../src", "nativescript-theme-core": "~1.0.4", "reflect-metadata": "~0.1.10", @@ -38,9 +38,9 @@ "@angular/compiler-cli": "~8.2.0", "@ngtools/webpack": "~8.2.0", "@types/node": "~10.12.18", - "nativescript-dev-webpack": "^1.0.0", + "nativescript-dev-webpack": "^1.3.0", "tslint": "~5.11.0", "typescript": "~3.5.3" }, "readme": "NativeScript DateTimePicker Demo NG" -} \ No newline at end of file +} diff --git a/demo-vue/package.json b/demo-vue/package.json index f954c43..3a0fe44 100644 --- a/demo-vue/package.json +++ b/demo-vue/package.json @@ -2,10 +2,10 @@ "nativescript": { "id": "org.nativescript.datetimepicker.demovue", "tns-android": { - "version": "6.1.0" + "version": "6.2.0" }, "tns-ios": { - "version": "6.1.0" + "version": "6.2.0" } }, "description": "NativeScript DateTimePicker Demo Vue", @@ -21,11 +21,11 @@ "@babel/core": "~7.2.0", "@babel/preset-env": "~7.2.0", "babel-loader": "~8.0.0", - "nativescript-dev-webpack": "^1.0.0", + "nativescript-dev-webpack": "^1.3.0", "nativescript-vue-template-compiler": "~2.4.0", "node-sass": "~4.12.0", "vue-loader": "~15.4.0", - "typescript": "~3.4.5" + "typescript": "~3.5.3" }, "readme": "NativeScript DateTimePicker Demo Vue" } diff --git a/demo/package.json b/demo/package.json index 78148dc..f5800a7 100644 --- a/demo/package.json +++ b/demo/package.json @@ -2,10 +2,10 @@ "nativescript": { "id": "org.nativescript.datetimepicker.demo", "tns-android": { - "version": "6.1.0" + "version": "6.2.0" }, "tns-ios": { - "version": "6.1.0" + "version": "6.2.0" } }, "description": "NativeScript DateTimePicker Demo Core", @@ -21,9 +21,9 @@ "tns-core-modules": "^6.0.0" }, "devDependencies": { - "nativescript-dev-webpack": "^1.0.0", + "nativescript-dev-webpack": "^1.3.0", "tslint": "~5.11.0", - "typescript": "~3.4.5" + "typescript": "~3.5.3" }, "readme": "NativeScript DateTimePicker Demo Core" } diff --git a/src/package.json b/src/package.json index 7e56f93..8dffccd 100644 --- a/src/package.json +++ b/src/package.json @@ -69,10 +69,10 @@ "rimraf": "^2.6.2", "rxjs": "^6.3.3", "semver": "^5.6.0", - "tns-core-modules": "^5.0.0", - "tns-platform-declarations": "^5.0.0", + "tns-core-modules": "^6.0.0", + "tns-platform-declarations": "^6.0.0", "tslint": "^5.11.0", - "typescript": "~3.4.5", + "typescript": "~3.5.3", "zone.js": "^0.8.4" }, "dependencies": {}, From 79cca18293dab4052190905bfbe8d4255fe96367 Mon Sep 17 00:00:00 2001 From: Elena Hristova Date: Thu, 7 Nov 2019 11:04:49 +0200 Subject: [PATCH 3/7] chore: update angular references in plugin --- src/package.json | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/package.json b/src/package.json index 8dffccd..bf6e983 100644 --- a/src/package.json +++ b/src/package.json @@ -55,16 +55,16 @@ "homepage": "https://github.com/NativeScript/nativescript-datetimepicker", "readmeFilename": "README.md", "devDependencies": { - "@angular/common": "~8.0.0", - "@angular/compiler": "~8.0.0", - "@angular/compiler-cli": "~8.0.0", - "@angular/core": "~8.0.0", - "@angular/forms": "~8.0.0", - "@angular/platform-browser": "~8.0.0", - "@angular/platform-browser-dynamic": "~8.0.0", - "@angular/router": "~8.0.0", - "nativescript-angular": "~8.0.0", - "nativescript-vue": "~2.2.0", + "@angular/common": "~8.2.0", + "@angular/compiler": "~8.2.0", + "@angular/compiler-cli": "~8.2.0", + "@angular/core": "~8.2.0", + "@angular/forms": "~8.2.0", + "@angular/platform-browser": "~8.2.0", + "@angular/platform-browser-dynamic": "~8.2.0", + "@angular/router": "~8.2.0", + "nativescript-angular": "~8.20.0", + "nativescript-vue": "~2.4.0", "prompt": "^1.0.0", "rimraf": "^2.6.2", "rxjs": "^6.3.3", From f5aabf55709e99d9c2d66260fb0ed9ee47c6a710 Mon Sep 17 00:00:00 2001 From: Nathan Walker Date: Mon, 7 Sep 2020 11:32:34 -0700 Subject: [PATCH 4/7] chore: readme --- README.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/README.md b/README.md index 956fe3b..ccf1ecc 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,10 @@ +## NativeScript 7 + +* Use `@nativescript/datetimepicker`: `~2.0.0` +* [Source managed here](https://github.com/NativeScript/plugins) + +## If using 6 and below, see the following: + # NativeScript DateTimePicker [![npm](https://img.shields.io/npm/v/nativescript-datetimepicker.svg)](https://www.npmjs.com/package/nativescript-datetimepicker) From 1edd8f0b3858f8a75b4000e2b6551e5c56efb3d2 Mon Sep 17 00:00:00 2001 From: Alexander Mai <50353733+alexander-mai@users.noreply.github.com> Date: Fri, 2 Oct 2020 05:17:35 +0200 Subject: [PATCH 5/7] fix(ios) Fixed iOS 14 display error (#76) --- src/datetimepicker.ios.ts | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/src/datetimepicker.ios.ts b/src/datetimepicker.ios.ts index bceac1f..f56b1ec 100644 --- a/src/datetimepicker.ios.ts +++ b/src/datetimepicker.ios.ts @@ -1,5 +1,6 @@ import { Color } from "tns-core-modules/color"; import { View, ios as iosView } from "tns-core-modules/ui/core/view"; +import { device } from "tns-core-modules/platform"; import { DateTimePickerBase, DateTimePickerStyleBase, getCurrentPage, DatePickerOptions, TimePickerOptions, PickerOptions @@ -11,6 +12,10 @@ export class DateTimePickerStyle extends DateTimePickerStyleBase { } export class DateTimePicker extends DateTimePickerBase { + private static readonly SUPPORT_DATE_PICKER_STYLE = parseFloat(device.osVersion) >= 14.0; + private static readonly SUPPORT_TEXT_COLOR = parseFloat(device.osVersion) < 14.0; + private static readonly DEFAULT_DATE_PICKER_STYLE = 1; + public static PICKER_DEFAULT_MESSAGE_HEIGHT = 192; public static PICKER_WIDTH_INSETS = 16; public static PICKER_WIDTH_PAD = 304; @@ -43,6 +48,9 @@ export class DateTimePicker extends DateTimePickerBase { static _createNativeDatePicker(options: DatePickerOptions): UIDatePicker { const pickerView = UIDatePicker.alloc().initWithFrame(CGRectZero); pickerView.datePickerMode = UIDatePickerMode.Date; + if (this.SUPPORT_DATE_PICKER_STYLE) { + (pickerView as any).preferredDatePickerStyle = this.DEFAULT_DATE_PICKER_STYLE; + } const date = options.date ? options.date : getDateToday(); pickerView.date = date; if (options.maxDate) { @@ -60,6 +68,9 @@ export class DateTimePicker extends DateTimePickerBase { static _createNativeTimePicker(options: TimePickerOptions): UIDatePicker { const pickerView = UIDatePicker.alloc().initWithFrame(CGRectZero); pickerView.datePickerMode = UIDatePickerMode.Time; + if (this.SUPPORT_DATE_PICKER_STYLE) { + (pickerView as any).preferredDatePickerStyle = this.DEFAULT_DATE_PICKER_STYLE; + } const time = options.time ? options.time : getDateNow(); pickerView.date = time; if (options.locale) { @@ -177,7 +188,9 @@ export class DateTimePicker extends DateTimePickerBase { nativeContainer.backgroundColor = backgroundColor.ios; } if (color) { - nativePicker.setValueForKey(color.ios, "textColor"); + if (this.SUPPORT_TEXT_COLOR) { + nativePicker.setValueForKey(color, 'textColor'); + } nativePicker.setValueForKey(false, "highlightsToday"); } } @@ -243,4 +256,4 @@ export class DateTimePicker extends DateTimePickerBase { } return null; } -} \ No newline at end of file +} From e35391ee31b1907bd6fd595c9e45cd48d80f3965 Mon Sep 17 00:00:00 2001 From: Nathan Walker Date: Thu, 1 Oct 2020 20:26:32 -0700 Subject: [PATCH 6/7] chore: bump 1.2.3 --- src/package.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/package.json b/src/package.json index bf6e983..287eca0 100644 --- a/src/package.json +++ b/src/package.json @@ -1,6 +1,6 @@ { "name": "nativescript-datetimepicker", - "version": "1.2.2", + "version": "1.2.3", "description": "A NativeScript plugin for picking date and time.", "typings": "index.d.ts", "nativescript": { @@ -11,7 +11,7 @@ }, "scripts": { "tsc": "npm i && tsc", - "build": "npm run tsc", + "build": "npm run tsc && npm run ngc", "tslint": "cd .. && tslint \"**/*.ts\" --config tslint.json --exclude \"**/node_modules/**\" --exclude \"**/platforms/**\"", "plugin.tscwatch": "npm run tsc -- -w", "demo.ios": "npm run build && cd ../demo && tns run ios --emulator", @@ -69,8 +69,8 @@ "rimraf": "^2.6.2", "rxjs": "^6.3.3", "semver": "^5.6.0", - "tns-core-modules": "^6.0.0", - "tns-platform-declarations": "^6.0.0", + "tns-core-modules": "~6.5.0", + "tns-platform-declarations": "~6.0.0", "tslint": "^5.11.0", "typescript": "~3.5.3", "zone.js": "^0.8.4" From a9604fad6dec5dc25ed1a7165c1c86bfffe9985b Mon Sep 17 00:00:00 2001 From: Nathanael Anderson Date: Tue, 8 Dec 2020 10:38:02 -0600 Subject: [PATCH 7/7] Update README.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index ccf1ecc..b88d36a 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,5 @@ +# ALL NativeScript 7 Issues should be posted here: https://github.com/NativeScript/plugins/ + ## NativeScript 7 * Use `@nativescript/datetimepicker`: `~2.0.0`