diff --git a/.idea/flutter_custom_calendar.iml b/.idea/flutter_custom_calendar.iml
index 8a90060..c1cf317 100644
--- a/.idea/flutter_custom_calendar.iml
+++ b/.idea/flutter_custom_calendar.iml
@@ -3,6 +3,7 @@
   <component name="FacetManager">
     <facet type="android" name="Android">
       <configuration>
+        <option name="ALLOW_USER_CONFIGURATION" value="false" />
         <option name="GEN_FOLDER_RELATIVE_PATH_APT" value="/../../flutter_custom_calendar/gen" />
         <option name="GEN_FOLDER_RELATIVE_PATH_AIDL" value="/../../flutter_custom_calendar/gen" />
         <option name="MANIFEST_FILE_RELATIVE_PATH" value="/../../flutter_custom_calendar/AndroidManifest.xml" />
@@ -20,6 +21,8 @@
       <excludeFolder url="file://$MODULE_DIR$/.dart_tool" />
       <excludeFolder url="file://$MODULE_DIR$/.pub" />
       <excludeFolder url="file://$MODULE_DIR$/build" />
+      <excludeFolder url="file://$MODULE_DIR$/example/.android/Flutter/build/intermediates/flutter/debug/flutter_assets/packages" />
+      <excludeFolder url="file://$MODULE_DIR$/example/.android/Flutter/build/intermediates/library_assets/debug/packageDebugAssets/out/flutter_assets/packages" />
       <excludeFolder url="file://$MODULE_DIR$/example/.dart_tool" />
       <excludeFolder url="file://$MODULE_DIR$/example/.pub" />
       <excludeFolder url="file://$MODULE_DIR$/example/build" />
diff --git a/.idea/markdown-navigator.xml b/.idea/markdown-navigator.xml
new file mode 100644
index 0000000..808794e
--- /dev/null
+++ b/.idea/markdown-navigator.xml
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="MarkdownProjectSettings" wasCopied="false">
+    <PreviewSettings splitEditorLayout="SPLIT" splitEditorPreview="PREVIEW" useGrayscaleRendering="false" zoomFactor="1.0" maxImageWidth="0" showGitHubPageIfSynced="false" allowBrowsingInPreview="false" synchronizePreviewPosition="true" highlightPreviewType="NONE" highlightFadeOut="5" highlightOnTyping="true" synchronizeSourcePosition="true" verticallyAlignSourceAndPreviewSyncPosition="true" showSearchHighlightsInPreview="false" showSelectionInPreview="true" openRemoteLinks="true" replaceUnicodeEmoji="false" lastLayoutSetsDefault="false">
+      <PanelProvider>
+        <provider providerId="com.vladsch.idea.multimarkdown.editor.swing.html.panel" providerName="Default - Swing" />
+      </PanelProvider>
+    </PreviewSettings>
+    <ParserSettings gitHubSyntaxChange="false" emojiShortcuts="1" emojiImages="0">
+      <PegdownExtensions>
+        <option name="ABBREVIATIONS" value="false" />
+        <option name="ANCHORLINKS" value="true" />
+        <option name="ASIDE" value="false" />
+        <option name="ATXHEADERSPACE" value="true" />
+        <option name="AUTOLINKS" value="true" />
+        <option name="DEFINITIONS" value="false" />
+        <option name="DEFINITION_BREAK_DOUBLE_BLANK_LINE" value="false" />
+        <option name="FENCED_CODE_BLOCKS" value="true" />
+        <option name="FOOTNOTES" value="false" />
+        <option name="HARDWRAPS" value="false" />
+        <option name="HTML_DEEP_PARSER" value="false" />
+        <option name="INSERTED" value="false" />
+        <option name="QUOTES" value="false" />
+        <option name="RELAXEDHRULES" value="true" />
+        <option name="SMARTS" value="false" />
+        <option name="STRIKETHROUGH" value="true" />
+        <option name="SUBSCRIPT" value="false" />
+        <option name="SUPERSCRIPT" value="false" />
+        <option name="SUPPRESS_HTML_BLOCKS" value="false" />
+        <option name="SUPPRESS_INLINE_HTML" value="false" />
+        <option name="TABLES" value="true" />
+        <option name="TASKLISTITEMS" value="true" />
+        <option name="TOC" value="false" />
+        <option name="WIKILINKS" value="false" />
+      </PegdownExtensions>
+      <ParserOptions>
+        <option name="ADMONITION_EXT" value="false" />
+        <option name="ATTRIBUTES_EXT" value="false" />
+        <option name="COMMONMARK_LISTS" value="true" />
+        <option name="DUMMY" value="false" />
+        <option name="EMOJI_SHORTCUTS" value="true" />
+        <option name="ENUMERATED_REFERENCES_EXT" value="false" />
+        <option name="FLEXMARK_FRONT_MATTER" value="false" />
+        <option name="GFM_LOOSE_BLANK_LINE_AFTER_ITEM_PARA" value="false" />
+        <option name="GFM_TABLE_RENDERING" value="true" />
+        <option name="GITBOOK_URL_ENCODING" value="false" />
+        <option name="GITHUB_LISTS" value="false" />
+        <option name="GITHUB_WIKI_LINKS" value="false" />
+        <option name="GITLAB_EXT" value="false" />
+        <option name="GITLAB_MATH_EXT" value="false" />
+        <option name="GITLAB_MERMAID_EXT" value="false" />
+        <option name="HEADER_ID_NON_ASCII_TO_LOWERCASE" value="false" />
+        <option name="HEADER_ID_NO_DUPED_DASHES" value="false" />
+        <option name="JEKYLL_FRONT_MATTER" value="false" />
+        <option name="MACROS_EXT" value="false" />
+        <option name="NO_TEXT_ATTRIBUTES" value="false" />
+        <option name="PARSE_HTML_ANCHOR_ID" value="false" />
+        <option name="SIM_TOC_BLANK_LINE_SPACER" value="true" />
+      </ParserOptions>
+    </ParserSettings>
+    <HtmlSettings headerTopEnabled="false" headerBottomEnabled="false" bodyTopEnabled="false" bodyBottomEnabled="false" embedUrlContent="false" addPageHeader="true" embedImages="false" embedHttpImages="false" imageUriSerials="false" addDocTypeHtml="true" noParaTags="false">
+      <GeneratorProvider>
+        <provider providerId="com.vladsch.idea.multimarkdown.editor.swing.html.generator" providerName="Default Swing HTML Generator" />
+      </GeneratorProvider>
+      <headerTop />
+      <headerBottom />
+      <bodyTop />
+      <bodyBottom />
+    </HtmlSettings>
+    <CssSettings previewScheme="UI_SCHEME" cssUri="" isCssUriEnabled="false" isCssUriSerial="true" isCssTextEnabled="false" isDynamicPageWidth="true">
+      <StylesheetProvider>
+        <provider providerId="com.vladsch.idea.multimarkdown.editor.swing.html.css" providerName="Default Swing Stylesheet" />
+      </StylesheetProvider>
+      <ScriptProviders />
+      <cssText />
+      <cssUriHistory />
+    </CssSettings>
+    <HtmlExportSettings updateOnSave="false" parentDir="" targetDir="" cssDir="" scriptDir="" plainHtml="false" imageDir="" copyLinkedImages="false" imageUniquifyType="0" targetPathType="2" targetExt="" useTargetExt="false" noCssNoScripts="false" useElementStyleAttribute="false" linkToExportedHtml="true" exportOnSettingsChange="true" regenerateOnProjectOpen="false" linkFormatType="HTTP_ABSOLUTE" />
+    <LinkMapSettings>
+      <textMaps />
+    </LinkMapSettings>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/markdown-navigator/profiles_settings.xml b/.idea/markdown-navigator/profiles_settings.xml
new file mode 100644
index 0000000..57927c5
--- /dev/null
+++ b/.idea/markdown-navigator/profiles_settings.xml
@@ -0,0 +1,3 @@
+<component name="MarkdownNavigator.ProfileManager">
+  <settings default="" pdf-export="" />
+</component>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index d87fd07..c6379b4 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,16 +2,22 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="18463f0e-cf10-4ee2-975b-376476396e12" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Dart_Packages.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/android/app/src/main/java/io/flutter/plugins/GeneratedPluginRegistrant.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/android/local.properties" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/demo_page/custom_style_page.dart" beforeDir="false" afterPath="$PROJECT_DIR$/example/lib/custom_style_page.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/demo_page/default_style_page.dart" beforeDir="false" afterPath="$PROJECT_DIR$/example/lib/default_style_page.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/demo_page/main.dart" beforeDir="false" afterPath="$PROJECT_DIR$/example/lib/main.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/demo_page/multi_select_style_page.dart" beforeDir="false" afterPath="$PROJECT_DIR$/example/lib/multi_select_style_page.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/demo_page/progress_style_page.dart" beforeDir="false" afterPath="$PROJECT_DIR$/example/lib/progress_style_page.dart" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/.idea/markdown-navigator.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/.idea/markdown-navigator/profiles_settings.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/flutter_custom_calendar.iml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/flutter_custom_calendar.iml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/README.md" beforeDir="false" afterPath="$PROJECT_DIR$/README.md" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/base_day_view.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/widget/base_day_view.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/base_week_bar.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/widget/base_week_bar.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/calendar_view.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/widget/calendar_view.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/default_combine_day_view.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/widget/default_combine_day_view.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/default_custom_day_view.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/widget/default_custom_day_view.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/default_week_bar.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/widget/default_week_bar.dart" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/lib/flutter_custom_calendar.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/flutter_custom_calendar.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test/flutter_custom_calendar_test.dart" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/month_view.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/widget/month_view.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/month_view_pager.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/widget/month_view_pager.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/week_view.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/widget/week_view.dart" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
@@ -22,22 +28,27 @@
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/pubspec.yaml">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="153">
-              <caret line="9" column="11" selection-start-line="9" selection-start-column="11" selection-end-line="9" selection-end-column="11" />
+        <entry file="file://$PROJECT_DIR$/README.md">
+          <provider selected="true" editor-type-id="split-provider[text-editor;MarkdownPreviewEditor]">
+            <state split_layout="SPLIT">
+              <first_editor relative-caret-position="1123">
+                <caret line="78" column="6" selection-start-line="78" selection-start-column="6" selection-end-line="78" selection-end-column="6" />
+              </first_editor>
+              <second_editor>
+                <markdownNavigatorState />
+              </second_editor>
             </state>
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/example/lib/custom_style_page.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="17">
-              <caret line="1" column="70" selection-start-line="1" selection-end-line="2" />
-              <folding>
-                <element signature="e#0#39#0" expanded="true" />
-              </folding>
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
+          <provider selected="true" editor-type-id="split-provider[text-editor;MarkdownPreviewEditor]">
+            <state split_layout="SPLIT">
+              <first_editor />
+              <second_editor>
+                <markdownNavigatorState />
+              </second_editor>
             </state>
           </provider>
         </entry>
@@ -45,35 +56,17 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/lib/flutter_custom_calendar.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="119">
-              <caret line="7" column="34" selection-start-line="7" selection-start-column="34" selection-end-line="7" selection-end-column="34" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/example/pubspec.yaml">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="235">
-              <caret line="31" column="13" selection-start-line="31" selection-start-column="13" selection-end-line="31" selection-end-column="13" />
+            <state relative-caret-position="34">
+              <caret line="2" column="50" selection-start-line="2" selection-start-column="50" selection-end-line="2" selection-end-column="50" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/example/lib/progress_style_page.dart">
+        <entry file="file://$PROJECT_DIR$/lib/controller.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="17">
-              <caret line="1" column="39" selection-start-line="1" selection-start-column="16" selection-end-line="1" selection-end-column="39" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/example/lib/default_style_page.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="255">
-              <caret line="15" column="16" lean-forward="true" selection-start-line="15" selection-start-column="16" selection-end-line="15" selection-end-column="16" />
+            <state relative-caret-position="147">
+              <caret line="60" selection-start-line="60" selection-end-line="79" selection-end-column="55" />
               <folding>
                 <element signature="e#0#39#0" expanded="true" />
               </folding>
@@ -82,10 +75,9 @@
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/example/lib/main.dart">
+        <entry file="file://$PROJECT_DIR$/lib/widget/base_day_view.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="204">
-              <caret line="12" column="14" selection-start-line="12" selection-start-column="14" selection-end-line="12" selection-end-column="14" />
+            <state>
               <folding>
                 <element signature="e#0#39#0" expanded="true" />
               </folding>
@@ -93,16 +85,9 @@
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/example/lib/multi_select_style_page.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="170">
-              <caret line="10" column="1" selection-start-line="10" selection-start-column="1" selection-end-line="10" selection-end-column="1" />
-              <folding>
-                <element signature="e#0#39#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/lib/widget/base_week_bar.dart">
+          <provider selected="true" editor-type-id="text-editor" />
         </entry>
       </file>
     </leaf>
@@ -120,6 +105,11 @@
         <option value="$PROJECT_DIR$/lib/flutter_custom_calendar.dart" />
         <option value="$PROJECT_DIR$/example/lib/default_style_page.dart" />
         <option value="$PROJECT_DIR$/example/lib/multi_select_style_page.dart" />
+        <option value="$PROJECT_DIR$/lib/widget/calendar_view.dart" />
+        <option value="$PROJECT_DIR$/lib/widget/default_week_bar.dart" />
+        <option value="$PROJECT_DIR$/lib/widget/month_view.dart" />
+        <option value="$PROJECT_DIR$/lib/widget/month_view_pager.dart" />
+        <option value="$PROJECT_DIR$/README.md" />
       </list>
     </option>
   </component>
@@ -133,6 +123,8 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="Scope" />
+      <pane id="AndroidView" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -156,13 +148,17 @@
               <item name="flutter_custom_calendar" type="462c0819:PsiDirectoryNode" />
               <item name="lib" type="462c0819:PsiDirectoryNode" />
             </path>
+            <path>
+              <item name="flutter_custom_calendar" type="b2602c69:ProjectViewProjectNode" />
+              <item name="flutter_custom_calendar" type="462c0819:PsiDirectoryNode" />
+              <item name="lib" type="462c0819:PsiDirectoryNode" />
+              <item name="widget" type="462c0819:PsiDirectoryNode" />
+            </path>
           </expand>
           <select />
         </subPane>
       </pane>
       <pane id="PackagesPane" />
-      <pane id="Scope" />
-      <pane id="AndroidView" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -170,10 +166,13 @@
     <property name="dart.analysis.tool.window.force.activate" value="false" />
     <property name="io.flutter.reload.alreadyRun" value="true" />
     <property name="last_opened_file_path" value="$PROJECT_DIR$" />
-    <property name="settings.editor.selected.configurable" value="android.sdk-updates" />
+    <property name="settings.editor.selected.configurable" value="preferences.pluginManager" />
     <property name="show.migrate.to.gradle.popup" value="false" />
   </component>
   <component name="RecentsManager">
+    <key name="MoveFile.RECENT_KEYS">
+      <recent name="$PROJECT_DIR$/lib/widget" />
+    </key>
     <key name="CopyFile.RECENT_KEYS">
       <recent name="$PROJECT_DIR$/example/lib" />
     </key>
@@ -222,7 +221,6 @@
     <frame x="0" y="23" width="1440" height="806" extended-state="0" />
     <editor active="true" />
     <layout>
-      <window_info id="Build Variants" side_tool="true" />
       <window_info id="Captures" order="0" side_tool="true" weight="0.25" />
       <window_info active="true" content_ui="combo" id="Project" order="1" visible="true" weight="0.3040057" />
       <window_info id="Structure" order="2" side_tool="true" />
@@ -231,9 +229,8 @@
       <window_info id="Resources Explorer" order="5" />
       <window_info id="Capture Tool" order="6" />
       <window_info id="Favorites" order="7" side_tool="true" />
-      <window_info anchor="bottom" id="Logcat" />
-      <window_info anchor="bottom" id="Android Profiler" show_stripe_button="false" />
-      <window_info anchor="bottom" id="Run" order="0" sideWeight="0.49928468" visible="true" weight="0.32913166" />
+      <window_info id="Build Variants" order="8" side_tool="true" />
+      <window_info anchor="bottom" id="Run" order="0" sideWeight="0.49928468" weight="0.32913166" />
       <window_info anchor="bottom" id="TODO" order="1" />
       <window_info anchor="bottom" id="Debug" order="2" />
       <window_info anchor="bottom" id="Terminal" order="3" weight="0.32913166" />
@@ -242,12 +239,14 @@
       <window_info anchor="bottom" id="Version Control" order="6" />
       <window_info anchor="bottom" id="Dart Analysis" order="7" weight="0.32913166" />
       <window_info anchor="bottom" id="Messages" order="8" sideWeight="0.49928468" weight="0.32913166" />
-      <window_info anchor="right" id="Device File Explorer" side_tool="true" />
+      <window_info anchor="bottom" id="Logcat" order="9" />
+      <window_info anchor="bottom" id="Android Profiler" order="10" show_stripe_button="false" />
       <window_info anchor="right" id="Capture Analysis" order="0" />
       <window_info anchor="right" id="Theme Preview" order="1" />
       <window_info anchor="right" id="Flutter Inspector" order="2" />
       <window_info anchor="right" id="Flutter Outline" order="3" />
       <window_info anchor="right" id="Palette&#9;" order="4" />
+      <window_info anchor="right" id="Device File Explorer" order="5" side_tool="true" />
     </layout>
   </component>
   <component name="editorHistoryManager">
@@ -265,26 +264,37 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/flutter_custom_calendar.dart">
+    <entry file="file://$PROJECT_DIR$/example/lib/custom_style_page.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="119">
-          <caret line="7" column="34" selection-start-line="7" selection-start-column="34" selection-end-line="7" selection-end-column="34" />
+        <state relative-caret-position="17">
+          <caret line="1" column="70" selection-start-line="1" selection-end-line="2" />
+          <folding>
+            <element signature="e#0#39#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/calendar_view.dart">
+    <entry file="file://$PROJECT_DIR$/example/lib/multi_select_style_page.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state>
+        <state relative-caret-position="170">
+          <caret line="10" column="1" selection-start-line="10" selection-start-column="1" selection-end-line="10" selection-end-column="1" />
           <folding>
             <element signature="e#0#39#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/example/lib/custom_style_page.dart">
+    <entry file="file://$PROJECT_DIR$/example/lib/progress_style_page.dart">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="17">
-          <caret line="1" column="70" selection-start-line="1" selection-end-line="2" />
+          <caret line="1" column="39" selection-start-line="1" selection-start-column="16" selection-end-line="1" selection-end-column="39" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/example/lib/main.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="204">
+          <caret line="12" column="14" selection-start-line="12" selection-start-column="14" selection-end-line="12" selection-end-column="14" />
           <folding>
             <element signature="e#0#39#0" expanded="true" />
           </folding>
@@ -293,40 +303,123 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/example/lib/default_style_page.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="255">
-          <caret line="15" column="16" lean-forward="true" selection-start-line="15" selection-start-column="16" selection-end-line="15" selection-end-column="16" />
+        <state relative-caret-position="17">
+          <caret line="1" column="44" selection-start-line="1" selection-end-line="2" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/widget/calendar_view.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="238">
+          <caret line="15" column="13" lean-forward="true" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
           <folding>
             <element signature="e#0#39#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/example/lib/main.dart">
+    <entry file="file://$PROJECT_DIR$/lib/widget/default_combine_day_view.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="204">
-          <caret line="12" column="14" selection-start-line="12" selection-start-column="14" selection-end-line="12" selection-end-column="14" />
+        <state>
           <folding>
             <element signature="e#0#39#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/example/lib/progress_style_page.dart">
+    <entry file="file://$PROJECT_DIR$/lib/widget/default_custom_day_view.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="17">
-          <caret line="1" column="39" selection-start-line="1" selection-start-column="16" selection-end-line="1" selection-end-column="39" />
+        <state>
+          <folding>
+            <element signature="e#0#39#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/example/lib/multi_select_style_page.dart">
+    <entry file="file://$PROJECT_DIR$/lib/widget/default_week_bar.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="170">
-          <caret line="10" column="1" selection-start-line="10" selection-start-column="1" selection-end-line="10" selection-end-column="1" />
+        <state relative-caret-position="485">
+          <caret line="49" column="12" selection-start-line="49" selection-start-column="12" selection-end-line="49" selection-end-column="12" />
+          <folding>
+            <element signature="e#0#39#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/widget/base_day_view.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state>
+          <folding>
+            <element signature="e#0#39#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/widget/base_week_bar.dart">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/widget/month_view.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="51">
+          <caret line="3" selection-start-line="3" selection-end-line="3" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/widget/month_view_pager.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="34">
+          <caret line="2" selection-start-line="2" selection-end-line="2" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/widget/week_view.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state>
+          <folding>
+            <element signature="e#0#39#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/flutter_custom_calendar.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="34">
+          <caret line="2" column="50" selection-start-line="2" selection-start-column="50" selection-end-line="2" selection-end-column="50" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/controller.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="147">
+          <caret line="60" selection-start-line="60" selection-end-line="79" selection-end-column="55" />
           <folding>
             <element signature="e#0#39#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/README.md">
+      <provider selected="true" editor-type-id="split-provider[text-editor;MarkdownPreviewEditor]">
+        <state split_layout="SPLIT">
+          <first_editor relative-caret-position="1123">
+            <caret line="78" column="6" selection-start-line="78" selection-start-column="6" selection-end-line="78" selection-end-column="6" />
+          </first_editor>
+          <second_editor>
+            <markdownNavigatorState />
+          </second_editor>
+        </state>
+      </provider>
+      <provider editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/CHANGELOG.md">
+      <provider selected="true" editor-type-id="split-provider[text-editor;MarkdownPreviewEditor]">
+        <state split_layout="SPLIT">
+          <first_editor />
+          <second_editor>
+            <markdownNavigatorState />
+          </second_editor>
+        </state>
+      </provider>
+    </entry>
   </component>
 </project>
\ No newline at end of file
diff --git a/README.md b/README.md
index b028a2c..04fee74 100644
--- a/README.md
+++ b/README.md
@@ -1,10 +1,11 @@
 FlutterCalendarWidget
 
 Flutter上的一个日历控件，可以定制成自己想要的样子。
-<img src="https://user-gold-cdn.xitu.io/2019/5/18/16acb76a959b93b3?w=828&h=1792&f=jpeg&s=92910">
-<img src="https://user-gold-cdn.xitu.io/2019/5/18/16acb793e4dbd2f2?w=828&h=1792&f=jpeg&s=102231">
-<img src="https://user-gold-cdn.xitu.io/2019/5/18/16acb79f153ab321?w=828&h=1792&f=jpeg&s=1288910">
-<img src="https://user-gold-cdn.xitu.io/2019/5/18/16acb7a35d41361c?w=828&h=1792&f=jpeg&s=10674210">
+
+<img src="https://user-gold-cdn.xitu.io/2019/5/18/16acb76a959b93b3?w=828&h=1792&f=jpeg&s=92910" width="300" height="620">
+<img src="https://user-gold-cdn.xitu.io/2019/5/18/16acb793e4dbd2f2?w=828&h=1792&f=jpeg&s=102231" width="300" height="620">
+<img src="https://user-gold-cdn.xitu.io/2019/5/18/16acb79f153ab321?w=828&h=1792&f=jpeg&s=1288910" width="300" height="620">
+<img src="https://user-gold-cdn.xitu.io/2019/5/18/16acb7a35d41361c?w=828&h=1792&f=jpeg&s=10674210" width="300" height="620">
 
 
 ## 主要功能
@@ -18,8 +19,17 @@ Flutter上的一个日历控件，可以定制成自己想要的样子。
 * 可以给Item添加自定义的额外数据，实现各种额外的功能。比如实现进度条风格的日历
 
 ## 使用
+
+在pubspec.yaml添加依赖:
+```
+flutter_custom_calendar:
+    git:
+      url: https://github.com/LXD312569496/flutter_custom_calendar.git
+```
 引入flutter_custom_calendar,就可以使用CalendarViewWidget，配置CalendarController就可以了。
 ```
+import 'package:flutter_custom_calendar/flutter_custom_calendar.dart';
+
 CalendarViewWidget({@required this.calendarController, this.boxDecoration});
 ```
 * boxDecoration用来配置整体的背景
@@ -65,6 +75,29 @@ OnMultiSelectOutOfSize multiSelectOutOfSize; //多选超出限制个数
 //支持自定义绘制
 DayWidgetBuilder dayWidgetBuilder; //创建日历item
 WeekBarItemWidgetBuilder weekBarItemWidgetBuilder; //创建顶部的weekbar
+
+//构造函数
+    CalendarController(
+      {int selectMode = Constants.MODE_SINGLE_SELECT,
+      DayWidgetBuilder dayWidgetBuilder = defaultCustomDayWidget,
+      WeekBarItemWidgetBuilder weekBarItemWidgetBuilder = defaultWeekBarWidget,
+      int minYear = 1971,
+      int maxYear = 2055,
+      int minYearMonth = 1,
+      int maxYearMonth = 12,
+      int nowYear = -1,
+      int nowMonth = -1,
+      int minSelectYear = 1971,
+      int minSelectMonth = 1,
+      int minSelectDay = 1,
+      int maxSelectYear = 2055,
+      int maxSelectMonth = 12,
+      int maxSelectDay = 30,
+      Set<DateTime> selectedDateTimeList = EMPTY_SET,
+      DateModel selectDateModel,
+      int maxMultiSelectCount = 9999,
+      Map<DateTime, Object> extraDataMap = EMPTY_MAP})
+
 ```
 
 ### 利用controller添加监听事件
diff --git a/lib/controller.dart b/lib/controller.dart
index c18c37a..a6abfb0 100644
--- a/lib/controller.dart
+++ b/lib/controller.dart
@@ -1,8 +1,8 @@
 import 'package:flutter/material.dart';
-import 'package:flutter_custom_calendar/default_combine_day_view.dart';
-import 'package:flutter_custom_calendar/default_custom_day_view.dart';
+import 'package:flutter_custom_calendar/widget/default_combine_day_view.dart';
+import 'package:flutter_custom_calendar/widget/default_custom_day_view.dart';
 import 'package:flutter_custom_calendar/model/date_model.dart';
-import 'package:flutter_custom_calendar/default_week_bar.dart';
+import 'package:flutter_custom_calendar/widget/default_week_bar.dart';
 import 'package:flutter_custom_calendar/constants/constants.dart';
 
 /**
diff --git a/lib/flutter_custom_calendar.dart b/lib/flutter_custom_calendar.dart
index a873b41..4a31e33 100644
--- a/lib/flutter_custom_calendar.dart
+++ b/lib/flutter_custom_calendar.dart
@@ -1,11 +1,11 @@
 library flutter_custom_calendar;
 
 export 'package:flutter_custom_calendar/controller.dart';
-export 'package:flutter_custom_calendar/calendar_view.dart';
-export 'package:flutter_custom_calendar/base_day_view.dart';
-export 'package:flutter_custom_calendar/base_week_bar.dart';
+export 'package:flutter_custom_calendar/widget/calendar_view.dart';
+export 'package:flutter_custom_calendar/widget/base_day_view.dart';
+export 'package:flutter_custom_calendar/widget/base_week_bar.dart';
 export 'package:flutter_custom_calendar/constants/constants.dart';
 export 'package:flutter_custom_calendar/model/date_model.dart';
-export 'package:flutter_custom_calendar/default_combine_day_view.dart';
-export 'package:flutter_custom_calendar/default_custom_day_view.dart';
-export 'package:flutter_custom_calendar/default_week_bar.dart';
+export 'package:flutter_custom_calendar/widget/default_combine_day_view.dart';
+export 'package:flutter_custom_calendar/widget/default_custom_day_view.dart';
+export 'package:flutter_custom_calendar/widget/default_week_bar.dart';
diff --git a/lib/base_day_view.dart b/lib/widget/base_day_view.dart
similarity index 100%
rename from lib/base_day_view.dart
rename to lib/widget/base_day_view.dart
diff --git a/lib/base_week_bar.dart b/lib/widget/base_week_bar.dart
similarity index 100%
rename from lib/base_week_bar.dart
rename to lib/widget/base_week_bar.dart
diff --git a/lib/calendar_view.dart b/lib/widget/calendar_view.dart
similarity index 96%
rename from lib/calendar_view.dart
rename to lib/widget/calendar_view.dart
index 87ae2f4..afbbe55 100644
--- a/lib/calendar_view.dart
+++ b/lib/widget/calendar_view.dart
@@ -1,9 +1,9 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_custom_calendar/constants/constants.dart';
+import 'package:flutter_custom_calendar/controller.dart';
 import 'package:flutter_custom_calendar/model/date_model.dart';
-import 'package:flutter_custom_calendar/month_view_pager.dart';
+import 'package:flutter_custom_calendar/widget/month_view_pager.dart';
 
-import 'controller.dart';
 
 /**
  * 暂时默认是周一开始的
diff --git a/lib/default_combine_day_view.dart b/lib/widget/default_combine_day_view.dart
similarity index 98%
rename from lib/default_combine_day_view.dart
rename to lib/widget/default_combine_day_view.dart
index f1c19b7..f68c696 100644
--- a/lib/default_combine_day_view.dart
+++ b/lib/widget/default_combine_day_view.dart
@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:flutter_custom_calendar/base_day_view.dart';
+import 'package:flutter_custom_calendar/widget/base_day_view.dart';
 import 'package:flutter_custom_calendar/model/date_model.dart';
 import 'package:flutter_custom_calendar/style/style.dart';
 
diff --git a/lib/default_custom_day_view.dart b/lib/widget/default_custom_day_view.dart
similarity index 98%
rename from lib/default_custom_day_view.dart
rename to lib/widget/default_custom_day_view.dart
index 43a553b..da62052 100644
--- a/lib/default_custom_day_view.dart
+++ b/lib/widget/default_custom_day_view.dart
@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:flutter_custom_calendar/base_day_view.dart';
+import 'package:flutter_custom_calendar/widget/base_day_view.dart';
 import 'package:flutter_custom_calendar/model/date_model.dart';
 import 'package:flutter_custom_calendar/style/style.dart';
 
diff --git a/lib/default_week_bar.dart b/lib/widget/default_week_bar.dart
similarity index 89%
rename from lib/default_week_bar.dart
rename to lib/widget/default_week_bar.dart
index 6c34ee8..1961586 100644
--- a/lib/default_week_bar.dart
+++ b/lib/widget/default_week_bar.dart
@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
-import 'package:flutter_custom_calendar/base_week_bar.dart';
+import 'package:flutter_custom_calendar/constants/constants.dart';
+import 'package:flutter_custom_calendar/widget/base_week_bar.dart';
 import 'package:flutter_custom_calendar/style/style.dart';
-import 'constants/constants.dart';
 
 ///**
 // * 顶部的固定的周显示
diff --git a/lib/month_view.dart b/lib/widget/month_view.dart
similarity index 97%
rename from lib/month_view.dart
rename to lib/widget/month_view.dart
index 76f015d..f329512 100644
--- a/lib/month_view.dart
+++ b/lib/widget/month_view.dart
@@ -1,8 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_custom_calendar/constants/constants.dart';
 import 'package:flutter_custom_calendar/controller.dart';
-import 'package:flutter_custom_calendar/default_custom_day_view.dart';
-import 'package:flutter_custom_calendar/default_combine_day_view.dart';
 import 'package:flutter_custom_calendar/model/date_model.dart';
 import 'package:flutter_custom_calendar/utils/date_util.dart';
 
diff --git a/lib/month_view_pager.dart b/lib/widget/month_view_pager.dart
similarity index 94%
rename from lib/month_view_pager.dart
rename to lib/widget/month_view_pager.dart
index 75bea5d..e1f8787 100644
--- a/lib/month_view_pager.dart
+++ b/lib/widget/month_view_pager.dart
@@ -1,9 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_custom_calendar/controller.dart';
-import 'package:flutter_custom_calendar/default_custom_day_view.dart';
-import 'package:flutter_custom_calendar/default_combine_day_view.dart';
 import 'package:flutter_custom_calendar/model/date_model.dart';
-import 'package:flutter_custom_calendar/month_view.dart';
+import 'package:flutter_custom_calendar/widget/month_view.dart';
 
 class MonthViewPager extends StatefulWidget {
   final OnMonthChange monthChange;
diff --git a/lib/week_view.dart b/lib/widget/week_view.dart
similarity index 100%
rename from lib/week_view.dart
rename to lib/widget/week_view.dart