Skip to content

Commit

Permalink
修正demo
Browse files Browse the repository at this point in the history
  • Loading branch information
@huanghaibin-dev
huanghaibin-dev committed Nov 17, 2017
1 parent 1a0e642 commit 02cdb28
Show file tree
Hide file tree
Showing 7 changed files with 91 additions and 75 deletions.
2 changes: 1 addition & 1 deletion .idea/misc.xml
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ compile 'com.haibin:calendarview:3.0.0'

### 效果预览
### 收缩展开的魅族风格效果
<img src="https://github.com/huanghaibin-dev/CalendarView/blob/master/app/src/main/assets/meizu.jpeg" height="650"/><img src="https://github.com/huanghaibin-dev/CalendarView/blob/master/app/src/main/assets/shrink.jpeg" height="650"/>
<img src="https://github.com/huanghaibin-dev/CalendarView/blob/master/app/src/main/assets/meizu.jpeg" style="margin-right:20px;" height="650"/><img src="https://github.com/huanghaibin-dev/CalendarView/blob/master/app/src/main/assets/shrink.jpeg" height="650"/>
### 下标和多彩风格
<img src="https://github.com/huanghaibin-dev/CalendarView/blob/master/app/src/main/assets/index.jpeg" height="650"/><img src="https://github.com/huanghaibin-dev/CalendarView/blob/master/app/src/main/assets/colorful.jpeg" height="650"/>
### 快速年份月份切换
Expand Down
36 changes: 20 additions & 16 deletions app/src/main/res/layout/activity_colorful.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -118,29 +118,30 @@

<LinearLayout
android:id="@+id/linearView"
android:clickable="true"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/content_background"
android:clickable="true"
android:orientation="vertical"
tools:ignore="KeyboardInaccessibleWidget">

<LinearLayout
android:id="@+id/ll_flyme"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/bg_material"
android:orientation="horizontal">

<ImageView
android:layout_width="50dp"
android:layout_height="50dp"
android:layout_width="36dp"
android:layout_height="39dp"
android:layout_margin="16dp"
android:contentDescription="flyme"
android:src="@mipmap/ic_flyme_logo" />

<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="16dp"
android:layout_marginTop="16dp"
android:orientation="vertical">
Expand All @@ -154,7 +155,7 @@
android:textStyle="bold" />

<TextView
android:layout_width="match_parent"
android:layout_width="301dp"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:text="点击查看魅族flyme风格的日历控件"
Expand All @@ -166,24 +167,25 @@
<View
android:layout_width="match_parent"
android:layout_height="1px"
android:background="@color/line_color" />
android:background="@color/line_color" />

<LinearLayout
android:id="@+id/ll_simple"
android:background="@drawable/bg_material"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">

<ImageView
android:layout_width="50dp"
android:layout_height="50dp"
android:layout_width="39dp"
android:layout_height="39dp"
android:layout_margin="16dp"
android:contentDescription="flyme"
android:src="@mipmap/ic_simple_logo" />

<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="16dp"
android:layout_marginTop="16dp"
android:orientation="vertical">
Expand Down Expand Up @@ -214,20 +216,21 @@

<LinearLayout
android:id="@+id/ll_index"
android:background="@drawable/bg_material"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">

<ImageView
android:layout_width="50dp"
android:layout_height="50dp"
android:layout_width="39dp"
android:layout_height="39dp"
android:layout_margin="16dp"
android:contentDescription="flyme"
android:src="@mipmap/ic_index_logo" />

<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="16dp"
android:layout_marginTop="16dp"
android:orientation="vertical">
Expand All @@ -253,24 +256,25 @@
<View
android:layout_width="match_parent"
android:layout_height="1px"
android:background="@color/line_color" />
android:background="@color/line_color" />

<LinearLayout
android:id="@+id/ll_colorful"
android:background="@drawable/bg_material"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">

<ImageView
android:layout_width="50dp"
android:layout_height="50dp"
android:layout_width="39dp"
android:layout_height="39dp"
android:layout_margin="16dp"
android:contentDescription="flyme"
android:src="@mipmap/ic_colorful_logo" />

<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="16dp"
android:layout_marginTop="16dp"
android:orientation="vertical">
Expand Down
36 changes: 20 additions & 16 deletions app/src/main/res/layout/activity_index.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -119,29 +119,30 @@

<LinearLayout
android:id="@+id/linearView"
android:clickable="true"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/content_background"
android:clickable="true"
android:orientation="vertical"
tools:ignore="KeyboardInaccessibleWidget">

<LinearLayout
android:id="@+id/ll_flyme"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/bg_material"
android:orientation="horizontal">

<ImageView
android:layout_width="50dp"
android:layout_height="50dp"
android:layout_width="36dp"
android:layout_height="39dp"
android:layout_margin="16dp"
android:contentDescription="flyme"
android:src="@mipmap/ic_flyme_logo" />

<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="16dp"
android:layout_marginTop="16dp"
android:orientation="vertical">
Expand All @@ -155,7 +156,7 @@
android:textStyle="bold" />

<TextView
android:layout_width="match_parent"
android:layout_width="301dp"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:text="点击查看魅族flyme风格的日历控件"
Expand All @@ -167,24 +168,25 @@
<View
android:layout_width="match_parent"
android:layout_height="1px"
android:background="@color/line_color" />
android:background="@color/line_color" />

<LinearLayout
android:id="@+id/ll_simple"
android:background="@drawable/bg_material"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">

<ImageView
android:layout_width="50dp"
android:layout_height="50dp"
android:layout_width="39dp"
android:layout_height="39dp"
android:layout_margin="16dp"
android:contentDescription="flyme"
android:src="@mipmap/ic_simple_logo" />

<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="16dp"
android:layout_marginTop="16dp"
android:orientation="vertical">
Expand Down Expand Up @@ -215,20 +217,21 @@

<LinearLayout
android:id="@+id/ll_index"
android:background="@drawable/bg_material"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">

<ImageView
android:layout_width="50dp"
android:layout_height="50dp"
android:layout_width="39dp"
android:layout_height="39dp"
android:layout_margin="16dp"
android:contentDescription="flyme"
android:src="@mipmap/ic_index_logo" />

<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="16dp"
android:layout_marginTop="16dp"
android:orientation="vertical">
Expand All @@ -254,24 +257,25 @@
<View
android:layout_width="match_parent"
android:layout_height="1px"
android:background="@color/line_color" />
android:background="@color/line_color" />

<LinearLayout
android:id="@+id/ll_colorful"
android:background="@drawable/bg_material"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">

<ImageView
android:layout_width="50dp"
android:layout_height="50dp"
android:layout_width="39dp"
android:layout_height="39dp"
android:layout_margin="16dp"
android:contentDescription="flyme"
android:src="@mipmap/ic_colorful_logo" />

<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="16dp"
android:layout_marginTop="16dp"
android:orientation="vertical">
Expand Down
24 changes: 12 additions & 12 deletions app/src/main/res/layout/activity_main.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -135,15 +135,15 @@
android:orientation="horizontal">

<ImageView
android:layout_width="50dp"
android:layout_height="50dp"
android:layout_width="36dp"
android:layout_height="39dp"
android:layout_margin="16dp"
android:contentDescription="flyme"
android:src="@mipmap/ic_flyme_logo" />

<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="16dp"
android:layout_marginTop="16dp"
android:orientation="vertical">
Expand Down Expand Up @@ -179,15 +179,15 @@
android:orientation="horizontal">

<ImageView
android:layout_width="50dp"
android:layout_height="50dp"
android:layout_width="39dp"
android:layout_height="39dp"
android:layout_margin="16dp"
android:contentDescription="flyme"
android:src="@mipmap/ic_simple_logo" />

<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="16dp"
android:layout_marginTop="16dp"
android:orientation="vertical">
Expand Down Expand Up @@ -224,15 +224,15 @@
android:orientation="horizontal">

<ImageView
android:layout_width="50dp"
android:layout_height="50dp"
android:layout_width="39dp"
android:layout_height="39dp"
android:layout_margin="16dp"
android:contentDescription="flyme"
android:src="@mipmap/ic_index_logo" />

<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="16dp"
android:layout_marginTop="16dp"
android:orientation="vertical">
Expand Down Expand Up @@ -268,15 +268,15 @@
android:orientation="horizontal">

<ImageView
android:layout_width="50dp"
android:layout_height="50dp"
android:layout_width="39dp"
android:layout_height="39dp"
android:layout_margin="16dp"
android:contentDescription="flyme"
android:src="@mipmap/ic_colorful_logo" />

<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="16dp"
android:layout_marginTop="16dp"
android:orientation="vertical">
Expand Down
Loading

0 comments on commit 02cdb28

Please sign in to comment.