Skip to content

Commit 8c6e766

Browse files
authored
Merge pull request #15 from NativeScript/tgpetrov/androidx-support
feat: androidx support
2 parents de34db9 + 094cfdb commit 8c6e766

File tree

1 file changed

+15
-1
lines changed

1 file changed

+15
-1
lines changed

src/datetimepicker.android.ts

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,19 @@ interface DialogDismissListener {
1515

1616
let DialogClickListener: DialogClickListener;
1717
let DialogDismissListener: DialogDismissListener;
18+
let AppCompatNamespace: any;
19+
declare let androidx: any;
20+
21+
function initializeAppCompatNamespace(): void {
22+
if (AppCompatNamespace) {
23+
return;
24+
}
25+
if (androidx && androidx.appcompat) {
26+
AppCompatNamespace = androidx.appcompat;
27+
} else {
28+
AppCompatNamespace = (<any>android.support).v7;
29+
}
30+
}
1831

1932
function initializeDialogClickListener(): void {
2033
if (DialogClickListener) {
@@ -155,6 +168,7 @@ export class DateTimePicker extends DateTimePickerBase {
155168
static _createNativeDialog(nativePicker: android.view.View, options: PickerOptions, value: Date, callback: Function): android.app.AlertDialog.Builder {
156169
initializeDialogClickListener();
157170
initializeDialogDismissListener();
171+
initializeAppCompatNamespace();
158172
DateTimePicker._initializeTextResources(options.context);
159173
const context = options.context;
160174
let dateTime: Date;
@@ -271,7 +285,7 @@ export class DateTimePicker extends DateTimePickerBase {
271285
child.setTextColor(color.android);
272286
}
273287
}
274-
const filter = android.support.v7.widget.AppCompatDrawableManager.getPorterDuffColorFilter(
288+
const filter = AppCompatNamespace.widget.AppCompatDrawableManager.getPorterDuffColorFilter(
275289
color.android, android.graphics.PorterDuff.Mode.SRC_IN);
276290
selectionDividerDrawable.setColorFilter(filter);
277291
numberPicker.invalidate();

0 commit comments

Comments
 (0)