From a3db55c1152ffebd6aa2519a62179cb2292a429e Mon Sep 17 00:00:00 2001 From: antran Date: Fri, 9 Jun 2023 16:39:53 +0700 Subject: [PATCH 1/2] - hide material's DatePickerTheme --- example/lib/main.dart | 2 +- lib/flutter_datetime_picker.dart | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/example/lib/main.dart b/example/lib/main.dart index 1ab0e793..74cba2bb 100644 --- a/example/lib/main.dart +++ b/example/lib/main.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:flutter/material.dart' hide DatePickerTheme; import 'package:flutter_datetime_picker/flutter_datetime_picker.dart'; void main() => runApp(new MyApp()); diff --git a/lib/flutter_datetime_picker.dart b/lib/flutter_datetime_picker.dart index dba6b566..a4305031 100644 --- a/lib/flutter_datetime_picker.dart +++ b/lib/flutter_datetime_picker.dart @@ -2,7 +2,7 @@ library flutter_datetime_picker; import 'dart:async'; import 'package:flutter/cupertino.dart'; -import 'package:flutter/material.dart'; +import 'package:flutter/material.dart' hide DatePickerTheme; import 'package:flutter/painting.dart'; import 'package:flutter_datetime_picker/src/datetime_picker_theme.dart'; import 'package:flutter_datetime_picker/src/date_model.dart'; From e4388e7aad7a78f6694323fd04f7303a7cef8219 Mon Sep 17 00:00:00 2001 From: anvuive456 <72957688+anvuive456@users.noreply.github.com> Date: Tue, 21 Nov 2023 10:14:27 +0700 Subject: [PATCH 2/2] Update datetime_picker_theme.dart Hide material's default DatePickerTheme as conflict --- lib/src/datetime_picker_theme.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/src/datetime_picker_theme.dart b/lib/src/datetime_picker_theme.dart index e3f616f4..f79a770b 100644 --- a/lib/src/datetime_picker_theme.dart +++ b/lib/src/datetime_picker_theme.dart @@ -1,5 +1,5 @@ import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; +import 'package:flutter/material.dart' hide DatePickerTheme; // Migrate DiagnosticableMixin to Diagnosticable until // https://github.com/flutter/flutter/pull/51495 makes it into stable (v1.15.21)