1281228557
/
flutter_custom_calendar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix bug 2020.7.21

Browse Source
master 1.0.4+5
ifgyong 4 years ago
parent fe5c7e4480
commit 0b98d4dda4
13 changed files with 224 additions and 100 deletions
Show Stats Download Patch File Download Diff File

8
.idea/libraries/Dart_Packages.xml
Unescape View File

@ -72,13 +72,6 @@
</list>
</value>
</entry>
<entry key="flutter_custom_calendar">
<value>
<list>
<option value="$USER_HOME$/flutterSDK/flutter1.17-stable/.pub-cache/hosted/pub.flutter-io.cn/flutter_custom_calendar-1.0.4+0.2/lib" />
</list>
</value>
</entry>
<entry key="flutter_test">
<value>
<list>
@ -224,7 +217,6 @@
<root url="file://$USER_HOME$/flutterSDK/flutter1.17-stable/.pub-cache/hosted/pub.flutter-io.cn/convert-2.1.1/lib" />
<root url="file://$USER_HOME$/flutterSDK/flutter1.17-stable/.pub-cache/hosted/pub.flutter-io.cn/crypto-2.1.4/lib" />
<root url="file://$USER_HOME$/flutterSDK/flutter1.17-stable/.pub-cache/hosted/pub.flutter-io.cn/cupertino_icons-0.1.3/lib" />
<root url="file://$USER_HOME$/flutterSDK/flutter1.17-stable/.pub-cache/hosted/pub.flutter-io.cn/flutter_custom_calendar-1.0.4+0.2/lib" />
<root url="file://$USER_HOME$/flutterSDK/flutter1.17-stable/.pub-cache/hosted/pub.flutter-io.cn/image-2.1.12/lib" />
<root url="file://$USER_HOME$/flutterSDK/flutter1.17-stable/.pub-cache/hosted/pub.flutter-io.cn/matcher-0.12.6/lib" />
<root url="file://$USER_HOME$/flutterSDK/flutter1.17-stable/.pub-cache/hosted/pub.flutter-io.cn/meta-1.1.8/lib" />

43
.idea/workspace.xml
Unescape View File

@ -9,26 +9,31 @@
<list default="true" id="18463f0e-cf10-4ee2-975b-376476396e12" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/.idea/libraries/Dart_Packages.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Dart_Packages.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/CHANGELOG.md" beforeDir="false" afterPath="$PROJECT_DIR$/CHANGELOG.md" afterDir="false" />
<change beforePath="$PROJECT_DIR$/README.md" beforeDir="false" afterPath="$PROJECT_DIR$/README.md" afterDir="false" />
<change beforePath="$PROJECT_DIR$/example/lib/main.dart" beforeDir="false" afterPath="$PROJECT_DIR$/example/lib/main.dart" afterDir="false" />
<change beforePath="$PROJECT_DIR$/example/pubspec.lock" beforeDir="false" afterPath="$PROJECT_DIR$/example/pubspec.lock" afterDir="false" />
<change beforePath="$PROJECT_DIR$/example/pubspec.yaml" beforeDir="false" afterPath="$PROJECT_DIR$/example/pubspec.yaml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/lib/utils/lunar_util.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/utils/lunar_util.dart" afterDir="false" />
<change beforePath="$PROJECT_DIR$/lib/utils/solar_term_util.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/utils/solar_term_util.dart" afterDir="false" />
<change beforePath="$PROJECT_DIR$/lib/calendar_provider.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/calendar_provider.dart" afterDir="false" />
<change beforePath="$PROJECT_DIR$/lib/controller.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/controller.dart" afterDir="false" />
<change beforePath="$PROJECT_DIR$/lib/widget/month_view.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/widget/month_view.dart" afterDir="false" />
<change beforePath="$PROJECT_DIR$/lib/widget/week_view.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/widget/week_view.dart" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pubspec.yaml" beforeDir="false" afterPath="$PROJECT_DIR$/pubspec.yaml" afterDir="false" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
<option name="LAST_RESOLUTION" value="IGNORE" />
</component>
<component name="ExecutionTargetManager" SELECTED_TARGET="HMK7N17712003306" />
<component name="ExecutionTargetManager" SELECTED_TARGET="Pixel_2_XL_API_28" />
<component name="Git.Settings">
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
</component>
<component name="ProjectId" id="1dLYXgUqXFRhtM2vVF7WEPgjPS2" />
<component name="ProjectViewState">
<option name="hideEmptyMiddlePackages" value="true" />
<option name="showLibraryContents" value="true" />
</component>
<component name="PropertiesComponent">
<property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
<property name="android.sdk.path" value="$USER_HOME$/Library/Android/sdk" />
@ -46,18 +51,6 @@
<recent name="$PROJECT_DIR$/example/lib" />
</key>
</component>
<component name="RunDashboard">
<option name="ruleStates">
<list>
<RuleState>
<option name="name" value="ConfigurationTypeDashboardGroupingRule" />
</RuleState>
<RuleState>
<option name="name" value="StatusDashboardGroupingRule" />
</RuleState>
</list>
</option>
</component>
<component name="RunManager" selected="Flutter.main.dart">
<configuration name="main.dart (1)" type="FlutterRunConfigurationType" factoryName="Flutter" singleton="false" temporary="true" nameIsGenerated="true">
<option name="filePath" value="$PROJECT_DIR$/lib/demo_page/main.dart" />
@ -99,4 +92,22 @@
</map>
</option>
</component>
<component name="WindowStateProjectService">
<state width="1858" height="156" key="GridCell.Tab.0.bottom" timestamp="1595297133366">
<screen x="-310" y="-1417" width="2560" height="1417" />
</state>
<state width="1858" height="156" key="GridCell.Tab.0.bottom/47.23.1393.877/-310.-1417.2560.1417@-310.-1417.2560.1417" timestamp="1595297133366" />
<state width="1858" height="156" key="GridCell.Tab.0.center" timestamp="1595297133366">
<screen x="-310" y="-1417" width="2560" height="1417" />
</state>
<state width="1858" height="156" key="GridCell.Tab.0.center/47.23.1393.877/-310.-1417.2560.1417@-310.-1417.2560.1417" timestamp="1595297133366" />
<state width="1858" height="156" key="GridCell.Tab.0.left" timestamp="1595297133365">
<screen x="-310" y="-1417" width="2560" height="1417" />
</state>
<state width="1858" height="156" key="GridCell.Tab.0.left/47.23.1393.877/-310.-1417.2560.1417@-310.-1417.2560.1417" timestamp="1595297133365" />
<state width="1858" height="156" key="GridCell.Tab.0.right" timestamp="1595297133366">
<screen x="-310" y="-1417" width="2560" height="1417" />
</state>
<state width="1858" height="156" key="GridCell.Tab.0.right/47.23.1393.877/-310.-1417.2560.1417@-310.-1417.2560.1417" timestamp="1595297133366" />
</component>
</project>

3
CHANGELOG.md
Unescape View File

@ -1,2 +1,5 @@
## [1.0.4+0.4]
- 新增三个模式相互且含数据不影响
## [1.0.1]
- 新增多选范围功能

28
README.md
Unescape View File

@ -37,7 +37,7 @@ Add this to your package's pubspec.yaml file:
```
dependencies:
flutter_custom_calendar: ^1.0.3
flutter_custom_calendar: ^1.0.4+0.5
```
2. Install it
@ -57,10 +57,34 @@ Now in your Dart code, you can use:
```
import 'package:flutter_custom_calendar/flutter_custom_calendar.dart';
```
### 监听月视图和周视图状态
```dart WidgetsBinding.instance.addPostFrameCallback((timeStamp) {
controller.addExpandChangeListener((value) {
/// 添加改变 月视图和 周视图的监听
_isMonthSelected = value;
setState(() {});
});
});
```
### 变更月视图和周视图
> 前提条件是`showModel`是`CalendarConstants.MODE_SHOW_MONTH_AND_WEEK`或者`CalendarConstants.MODE_SHOW_WEEK_AND_MONTH`.
#### 变更到周视图
```dart
setState(() {
controller.weekAndMonthViewChange(CalendarConstants.MODE_SHOW_ONLY_WEEK);
});
```
#### 变更到月视图
```dart
setState(() {controller.weekAndMonthViewChange(CalendarConstants.MODE_SHOW_ONLY_MONTH);
});
```
### 动画演示
![](https://github.com/ifgyong/flutter_custom_calendar/blob/master/img.gif)
![](img.gif)
### [查看API](https://github.com/ifgyong/flutter_custom_calendar/blob/master/API.md)
### [查看一个例子 如何使用](https://github.com/ifgyong/flutter_custom_calendar/blob/master/example/lib/main.dart)

158
example/lib/main.dart
Unescape View File

@ -39,6 +39,8 @@ class _MyHomePageState extends State<MyHomePage> {
CalendarViewWidget calendar;
HashSet<DateTime> _selectedDate = new HashSet();
HashSet<DateModel> _selectedModels = new HashSet();
GlobalKey<CalendarContainerState> _globalKey = new GlobalKey();
@override
void initState() {
_selectedDate.add(DateTime.now());
@ -47,7 +49,7 @@ class _MyHomePageState extends State<MyHomePage> {
minYearMonth: 1,
maxYear: 2021,
maxYearMonth: 12,
showMode: CalendarConstants.MODE_SHOW_MONTH_AND_WEEK,
showMode: CalendarConstants.MODE_SHOW_WEEK_AND_MONTH,
selectedDateTimeList: _selectedDate,
selectMode: CalendarSelectedMode.singleSelect)
..addOnCalendarSelectListener((dateModel) {
@ -65,6 +67,7 @@ class _MyHomePageState extends State<MyHomePage> {
});
});
calendar = new CalendarViewWidget(
key: _globalKey,
calendarController: controller,
dayWidgetBuilder: (DateModel model) {
double wd = (MediaQuery.of(context).size.width - 20) / 7;
@ -101,9 +104,19 @@ class _MyHomePageState extends State<MyHomePage> {
);
},
);
WidgetsBinding.instance.addPostFrameCallback((timeStamp) {
controller.addExpandChangeListener((value) {
/// 添加改变 月视图和 周视图的监听
_isMonthSelected = value;
setState(() {});
});
});
super.initState();
}
bool _isMonthSelected = false;
String _selectDate = '';
@override
Widget build(BuildContext context) {
@ -115,6 +128,7 @@ class _MyHomePageState extends State<MyHomePage> {
child: CustomScrollView(
slivers: <Widget>[
_topButtons(),
_topMonths(),
SliverToBoxAdapter(
child: calendar,
),
@ -139,54 +153,104 @@ class _MyHomePageState extends State<MyHomePage> {
crossAxisAlignment: WrapCrossAlignment.start,
children: <Widget>[
Text('请选择mode'),
FlatButton(
child: Text(
'singleSelect',
style: TextStyle(color: Colors.white),
),
onPressed: () {
setState(() {
controller.calendarConfiguration.selectMode =
CalendarSelectedMode.singleSelect;
});
},
color: controller.calendarConfiguration.selectMode ==
CalendarSelectedMode.singleSelect
? Colors.teal
: Colors.black38,
Wrap(
spacing: 10,
runSpacing: 10,
children: <Widget>[
FlatButton(
child: Text(
'单选',
style: TextStyle(color: Colors.white),
),
onPressed: () {
setState(() {
controller.calendarConfiguration.selectMode =
CalendarSelectedMode.singleSelect;
});
},
color: controller.calendarConfiguration.selectMode ==
CalendarSelectedMode.singleSelect
? Colors.teal
: Colors.black38,
),
FlatButton(
child: Text(
'多选',
style: TextStyle(color: Colors.white),
),
onPressed: () {
setState(() {
controller.calendarConfiguration.selectMode =
CalendarSelectedMode.multiSelect;
});
},
color: controller.calendarConfiguration.selectMode ==
CalendarSelectedMode.multiSelect
? Colors.teal
: Colors.black38,
),
FlatButton(
child: Text(
'多选 选择开始和结束',
style: TextStyle(color: Colors.white),
),
onPressed: () {
setState(() {
controller.calendarConfiguration.selectMode =
CalendarSelectedMode.mutltiStartToEndSelect;
});
},
color: controller.calendarConfiguration.selectMode ==
CalendarSelectedMode.mutltiStartToEndSelect
? Colors.teal
: Colors.black38,
),
],
),
FlatButton(
child: Text(
'multiSelect',
style: TextStyle(color: Colors.white),
),
onPressed: () {
setState(() {
controller.calendarConfiguration.selectMode =
CalendarSelectedMode.multiSelect;
});
},
color: controller.calendarConfiguration.selectMode ==
CalendarSelectedMode.multiSelect
? Colors.teal
: Colors.black38,
],
),
);
}
Widget _topMonths() {
return SliverToBoxAdapter(
child: Wrap(
direction: Axis.vertical,
crossAxisAlignment: WrapCrossAlignment.start,
children: <Widget>[
Text('月视图和周视图'),
Wrap(
spacing: 10,
runSpacing: 10,
children: <Widget>[
FlatButton(
child: Text(
'月视图',
style: TextStyle(color: Colors.white),
),
onPressed: () {
setState(() {
controller.weekAndMonthViewChange(
CalendarConstants.MODE_SHOW_ONLY_WEEK);
});
},
color: _isMonthSelected ? Colors.teal : Colors.black38,
),
FlatButton(
child: Text(
'周视图',
style: TextStyle(color: Colors.white),
),
onPressed: () {
setState(() {
controller.weekAndMonthViewChange(
CalendarConstants.MODE_SHOW_ONLY_MONTH);
});
},
color: _isMonthSelected == false ? Colors.teal : Colors.black38,
),
],
),
FlatButton(
child: Text(
'mutltiStartToEndSelect',
style: TextStyle(color: Colors.white),
),
onPressed: () {
setState(() {
controller.calendarConfiguration.selectMode =
CalendarSelectedMode.mutltiStartToEndSelect;
});
},
color: controller.calendarConfiguration.selectMode ==
CalendarSelectedMode.mutltiStartToEndSelect
? Colors.teal
: Colors.black38,
)
],
),
);

8
example/pubspec.lock
Unescape View File

@ -72,10 +72,10 @@ packages:
flutter_custom_calendar:
dependency: "direct main"
description:
name: flutter_custom_calendar
url: "https://pub.flutter-io.cn"
source: hosted
version: "1.0.4+0.2"
path: ".."
relative: true
source: path
version: "1.0.4+0.3"
flutter_test:
dependency: "direct dev"
description: flutter

3
example/pubspec.yaml
Unescape View File

@ -29,7 +29,8 @@ dependencies:
# The following adds the Cupertino Icons font to your application.
# Use with the CupertinoIcons class for iOS style icons.
cupertino_icons: ^0.1.3
flutter_custom_calendar: ^1.0.4+0.3
flutter_custom_calendar:
path: ../
dev_dependencies:
flutter_test:

BIN
img.gif
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 809 KiB

After

Width:  |  Height:  |  Size: 736 KiB

1
lib/calendar_provider.dart
Unescape View File

@ -106,6 +106,7 @@ class CalendarProvider extends ChangeNotifier {
//配置类也放这里吧，这样的话，所有子树，都可以拿到配置的信息
CalendarConfiguration calendarConfiguration;
void weekAndMonthViewChange(int mode) {}
void initData({
Set<DateModel> selectedDateList,

20
lib/controller.dart
Unescape View File

@ -111,6 +111,17 @@ class CalendarController {
maxYear,
maxYearMonth,
))}");
_weekAndMonthViewChange(showMode);
}
void _weekAndMonthViewChange(
int showMode,
) {
int minYear = calendarConfiguration.minYear;
int maxYear = calendarConfiguration.maxYear;
int minYearMonth = calendarConfiguration.minYearMonth;
int maxYearMonth = calendarConfiguration.maxYearMonth;
int nowYear = calendarConfiguration.nowYear;
int nowMonth = calendarConfiguration.nowMonth;
if (showMode != CalendarConstants.MODE_SHOW_ONLY_WEEK) {
//初始化pageController,initialPage默认是当前时间对于的页面
@ -183,11 +194,18 @@ class CalendarController {
"初始化星期视图的信息:一共有${weekList.length}个星期，initialPage为$initialWeekPage");
this.weekController = new PageController(initialPage: initialWeekPage);
}
calendarConfiguration.monthList = monthList;
calendarConfiguration.weekList = weekList;
calendarConfiguration.monthController = monthController;
calendarConfiguration.weekController = weekController;
calendarProvider.weekAndMonthViewChange(showMode);
}
void weekAndMonthViewChange(
int showMode,
) {
calendarProvider.expandStatus.value =
showMode == CalendarConstants.MODE_SHOW_ONLY_WEEK ? true : false;
}
//周视图切换

8
lib/widget/month_view.dart
Unescape View File

@ -200,10 +200,10 @@ class ItemContainerState extends State<ItemContainer> {
setState(() {
dateModel.isSelected = v;
});
}
if (widget.clickCall != null) {
widget.clickCall();
if (widget.clickCall != null) {
widget.clickCall();
}
}
}
@ -261,7 +261,6 @@ class ItemContainerState extends State<ItemContainer> {
}
dateModel.isSelected = !dateModel.isSelected;
calendarProvider.selectedDateList.add(dateModel);
// _notifiCationCalendarSelect(dateModel);
}
//多选也可以弄这些单选的代码
@ -277,6 +276,7 @@ class ItemContainerState extends State<ItemContainer> {
element.isSelected = false;
_notifiCationUnCalendarSelect(element);
});
calendarProvider.selectedDateList.clear();
//单选需要刷新上一个item
if (calendarProvider.lastClickItemState != this) {

42
lib/widget/week_view.dart
Unescape View File

@ -76,25 +76,35 @@ class _WeekViewState extends State<WeekView> {
itemBuilder: (context, index) {
DateModel dateModel = items[index];
//判断是否被选择
if (configuration.selectMode == CalendarConstants.MODE_MULTI_SELECT) {
if (calendarProvider.selectedDateList.contains(dateModel)) {
dateModel.isSelected = true;
} else {
dateModel.isSelected = false;
}
} else {
if (calendarProvider.selectDateModel == dateModel) {
dateModel.isSelected = true;
} else {
dateModel.isSelected = false;
}
switch (configuration.selectMode) {
case CalendarSelectedMode.multiSelect:
if (calendarProvider.selectedDateList.contains(dateModel)) {
dateModel.isSelected = true;
} else {
dateModel.isSelected = false;
}
break;
case CalendarSelectedMode.singleSelect:
if (calendarProvider.selectDateModel == dateModel) {
dateModel.isSelected = true;
} else {
dateModel.isSelected = false;
}
break;
case CalendarSelectedMode.mutltiStartToEndSelect:
if (calendarProvider.selectedDateList.contains(dateModel)) {
dateModel.isSelected = true;
} else {
dateModel.isSelected = false;
}
break;
}
return ItemContainer(
dateModel: dateModel,
// configuration: configuration,
// calendarProvider: calendarProvider,
);
dateModel: dateModel,
clickCall: () {
setState(() {});
});
});
}
}

2
pubspec.yaml
Unescape View File

@ -1,6 +1,6 @@
name: flutter_custom_calendar
description: A calendar control of flutter that supports three selection modes。
version: 1.0.4+0.3
version: 1.0.4+0.5
homepage: http://www.fgyong.cn
author: fgyong
repository: https://github.com/ifgyong/flutter_custom_calendar

Write Preview
Loading…
Cancel
Save