fix some api and lunar

cqs207 · Jun 21, 2019 · 59e5b6e · 59e5b6e
1 parent da27d68
commit 59e5b6e
Show file tree

Hide file tree

Showing 23 changed files with 341 additions and 83 deletions.
diff --git a/README.md b/README.md
@@ -12,14 +12,14 @@ You can't think of the calendar can be so elegant!
 
 ### Gradle
 ```
-compile 'com.haibin:calendarview:3.6.2'
+compile 'com.haibin:calendarview:3.6.3'
 ```
 
 ```
 <dependency>
   <groupId>com.haibin</groupId>
   <artifactId>calendarview</artifactId>
-  <version>3.6.2</version>
+  <version>3.6.3</version>
   <type>pom</type>
 </dependency>
 ```

diff --git a/README_ZH.md b/README_ZH.md
@@ -12,13 +12,13 @@ Android上一个优雅、高度自定义、性能高效的日历控件，完美
 
 ### Gradle
 ```
-compile 'com.haibin:calendarview:3.6.2'
+compile 'com.haibin:calendarview:3.6.3
 ```
 ```
 <dependency>
   <groupId>com.haibin</groupId>
   <artifactId>calendarview</artifactId>
-  <version>3.6.2</version>
+  <version>3.6.3</version>
   <type>pom</type>
 </dependency>
 ```

diff --git a/app/build.gradle b/app/build.gradle
@@ -34,6 +34,6 @@ dependencies {
     //noinspection GradleDependency
     compile 'com.github.bumptech.glide:glide:3.7.0'
     testCompile 'junit:junit:4.12'
-    //compile 'com.haibin:calendarview:1.6.2'
-    compile project(':calendarview')
+    compile 'com.haibin:calendarview:3.6.3'
+    //compile project(':calendarview')
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -33,6 +33,7 @@
         <activity android:name=".pager.ViewPagerActivity" />
         <activity android:name=".full.FullActivity" />
         <activity android:name=".TestActivity" />
+        <activity android:name=".CalendarActivity" />
     </application>
 
 </manifest>
diff --git a/app/src/main/java/com/haibin/calendarviewproject/CalendarActivity.java b/app/src/main/java/com/haibin/calendarviewproject/CalendarActivity.java
@@ -0,0 +1,33 @@
+package com.haibin.calendarviewproject;
+
+import android.content.Context;
+import android.content.Intent;
+
+import com.haibin.calendarviewproject.base.activity.BaseActivity;
+
+/**
+ * Only calendar
+ * Created by haibin on 2019/6/12.
+ */
+
+public class CalendarActivity extends BaseActivity {
+
+    public static void show(Context context) {
+        context.startActivity(new Intent(context, CalendarActivity.class));
+    }
+
+    @Override
+    protected int getLayoutId() {
+        return R.layout.activity_calendar;
+    }
+
+    @Override
+    protected void initView() {
+        setStatusBarDarkMode();
+    }
+
+    @Override
+    protected void initData() {
+
+    }
+}
diff --git a/app/src/main/java/com/haibin/calendarviewproject/MainActivity.java b/app/src/main/java/com/haibin/calendarviewproject/MainActivity.java
@@ -312,7 +312,8 @@ public void onClick(View v) {
         switch (v.getId()) {
             case R.id.ll_flyme:
                 MeiZuActivity.show(this);
-                //TestActivity.show(this);
+                //CalendarActivity.show(this);
+
                 break;
             case R.id.ll_custom:
                 CustomActivity.show(this);

diff --git a/app/src/main/java/com/haibin/calendarviewproject/meizu/MeiZuActivity.java b/app/src/main/java/com/haibin/calendarviewproject/meizu/MeiZuActivity.java
@@ -3,6 +3,7 @@
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.Intent;
+import android.graphics.Color;
 import android.support.v7.widget.LinearLayoutManager;
 import android.view.View;
 import android.widget.RelativeLayout;

diff --git a/app/src/main/res/layout/activity_calendar.xml b/app/src/main/res/layout/activity_calendar.xml
@@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="#ffffff"
+    android:fitsSystemWindows="true"
+    android:orientation="vertical"
+    tools:ignore="RtlHardcoded,RtlSymmetry">
+
+    <RelativeLayout
+        android:id="@+id/rl_tool"
+        android:layout_width="match_parent"
+        android:layout_height="52dp"
+        android:background="@color/colorPrimary">
+
+        <TextView
+            android:id="@+id/tv_month_day"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:gravity="center_vertical"
+            android:paddingLeft="16dp"
+            android:textColor="#000000"
+            android:textSize="26sp"
+            android:textStyle="bold" />
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_toRightOf="@+id/tv_month_day"
+            android:orientation="vertical"
+            android:paddingBottom="12dp"
+            android:paddingLeft="6dp"
+            android:paddingRight="6dp"
+            android:paddingTop="12dp"
+            tools:ignore="RelativeOverlap">
+
+            <TextView
+                android:id="@+id/tv_year"
+                android:layout_width="wrap_content"
+                android:layout_height="0dp"
+                android:layout_weight="1"
+                android:gravity="center"
+                android:textColor="#000000"
+                android:textSize="10sp"
+                tools:ignore="SmallSp" />
+
+            <TextView
+                android:id="@+id/tv_lunar"
+                android:layout_width="wrap_content"
+                android:layout_height="0dp"
+                android:layout_weight="1"
+                android:gravity="center"
+                android:textColor="#000000"
+                android:textSize="10sp"
+                tools:ignore="SmallSp" />
+        </LinearLayout>
+
+        <FrameLayout
+            android:id="@+id/fl_current"
+            android:layout_width="32dp"
+            android:layout_height="32dp"
+            android:layout_alignParentRight="true"
+            android:layout_centerVertical="true"
+            android:layout_marginRight="12dp"
+            android:background="@drawable/bg_ripple">
+
+            <ImageView
+                android:id="@+id/ib_calendar"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:contentDescription="@string/app_name"
+                android:scaleType="centerInside"
+                android:src="@mipmap/ic_calendar"
+                android:tint="#000000" />
+
+            <TextView
+                android:id="@+id/tv_current_day"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:layout_marginTop="2dp"
+                android:gravity="center"
+                android:text="13"
+                android:textColor="#000000"
+                android:textSize="12sp"
+                tools:ignore="HardcodedText" />
+        </FrameLayout>
+    </RelativeLayout>
+
+
+    <com.haibin.calendarview.CalendarView
+        android:id="@+id/calendarView"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="#fff"
+        app:calendar_padding="10dp"
+        app:current_month_lunar_text_color="#CFCFCF"
+        app:current_month_text_color="#333333"
+        app:max_year="2020"
+        app:min_year="2004"
+        app:month_view="com.haibin.calendarviewproject.custom.CustomMonthView"
+        app:month_view_show_mode="mode_fix"
+        app:other_month_lunar_text_color="#e1e1e1"
+        app:other_month_text_color="#e1e1e1"
+        app:scheme_text="假"
+        app:scheme_text_color="#333"
+        app:scheme_theme_color="#128c4b"
+        app:selected_lunar_text_color="#fff"
+        app:selected_text_color="#fff"
+        app:selected_theme_color="#046cea"
+        app:week_background="#fff"
+        app:week_start_with="sun"
+        app:week_text_color="#e1e1e1"
+        app:week_view="com.haibin.calendarviewproject.custom.CustomWeekView"
+        app:year_view="com.haibin.calendarviewproject.custom.CustomYearView"
+        app:year_view_day_text_color="#333333"
+        app:year_view_day_text_size="7sp"
+        app:year_view_month_text_color="#ff0000"
+        app:year_view_month_text_size="20sp"
+        app:year_view_scheme_color="#f17706"
+        app:year_view_select_text_color="#fff"
+        app:year_view_week_height="12dp"
+        app:year_view_week_text_color="#e1e1e1"
+        app:year_view_week_text_size="6sp" />
+</LinearLayout>
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -126,8 +126,7 @@
         android:background="#fff"
         android:orientation="vertical"
         app:calendar_content_view_id="@+id/nestedScrollView"
-        app:calendar_show_mode="both_month_week_view"
-        app:default_status="shrink">
+        app:calendar_show_mode="both_month_week_view">
 
         <com.haibin.calendarview.CalendarView
             android:id="@+id/calendarView"

diff --git a/build.gradle b/build.gradle
@@ -9,6 +9,7 @@ buildscript {
         classpath 'com.android.tools.build:gradle:2.2.0'
         //noinspection GradleDependency
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7'
+        //noinspection GradleDependency
         classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

diff --git a/calendarview/build.gradle b/calendarview/build.gradle
@@ -8,8 +8,8 @@ android {
         minSdkVersion 14
         //noinspection OldTargetApi
         targetSdkVersion 23
-        versionCode 362
-        versionName "3.6.2"
+        versionCode 363
+        versionName "3.6.3"
 
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
 

diff --git a/calendarview/src/androidTest/java/com/haibin/calendarview/LunarCalendarTest.java b/calendarview/src/androidTest/java/com/haibin/calendarview/LunarCalendarTest.java
@@ -34,6 +34,18 @@ public void getTermsOffset() throws Exception {
 
     }
 
+
+    /**
+     * 测试每个月农历有多少天，也可适用于除夕算法
+     *
+     * @throws Exception Exception
+     */
+    @Test
+    public void daysInLunarMonth() throws Exception {
+        int d = LunarCalendar.daysInLunarMonth(2019,12);
+        assertEquals(30,d);
+    }
+
     /**
      * 测试每年冬至是具体几日
      *

diff --git a/calendarview/src/main/java/com/haibin/calendarview/BaseView.java b/calendarview/src/main/java/com/haibin/calendarview/BaseView.java
@@ -225,41 +225,44 @@ private void initPaint(Context context) {
      *
      * @param delegate delegate
      */
-    void setup(CalendarViewDelegate delegate) {
+   final void setup(CalendarViewDelegate delegate) {
         this.mDelegate = delegate;
+        updateStyle();
+        updateItemHeight();
 
-        this.mCurDayTextPaint.setColor(delegate.getCurDayTextColor());
-        this.mCurDayLunarTextPaint.setColor(delegate.getCurDayLunarTextColor());
-        this.mCurMonthTextPaint.setColor(delegate.getCurrentMonthTextColor());
-        this.mOtherMonthTextPaint.setColor(delegate.getOtherMonthTextColor());
-        this.mCurMonthLunarTextPaint.setColor(delegate.getCurrentMonthLunarTextColor());
-        this.mSelectedLunarTextPaint.setColor(delegate.getSelectedLunarTextColor());
-        this.mSelectTextPaint.setColor(delegate.getSelectedTextColor());
-        this.mOtherMonthLunarTextPaint.setColor(delegate.getOtherMonthLunarTextColor());
-        this.mSchemeLunarTextPaint.setColor(delegate.getSchemeLunarTextColor());
-
-        this.mSchemePaint.setColor(delegate.getSchemeThemeColor());
-        this.mSchemeTextPaint.setColor(delegate.getSchemeTextColor());
-
+        initPaint();
+    }
 
-        this.mCurMonthTextPaint.setTextSize(delegate.getDayTextSize());
-        this.mOtherMonthTextPaint.setTextSize(delegate.getDayTextSize());
-        this.mCurDayTextPaint.setTextSize(delegate.getDayTextSize());
-        this.mSchemeTextPaint.setTextSize(delegate.getDayTextSize());
-        this.mSelectTextPaint.setTextSize(delegate.getDayTextSize());
 
-        this.mCurMonthLunarTextPaint.setTextSize(delegate.getLunarTextSize());
-        this.mSelectedLunarTextPaint.setTextSize(delegate.getLunarTextSize());
-        this.mCurDayLunarTextPaint.setTextSize(delegate.getLunarTextSize());
-        this.mOtherMonthLunarTextPaint.setTextSize(delegate.getLunarTextSize());
-        this.mSchemeLunarTextPaint.setTextSize(delegate.getLunarTextSize());
+    final void updateStyle(){
+        if(mDelegate == null){
+            return;
+        }
+        this.mCurDayTextPaint.setColor(mDelegate.getCurDayTextColor());
+        this.mCurDayLunarTextPaint.setColor(mDelegate.getCurDayLunarTextColor());
+        this.mCurMonthTextPaint.setColor(mDelegate.getCurrentMonthTextColor());
+        this.mOtherMonthTextPaint.setColor(mDelegate.getOtherMonthTextColor());
+        this.mCurMonthLunarTextPaint.setColor(mDelegate.getCurrentMonthLunarTextColor());
+        this.mSelectedLunarTextPaint.setColor(mDelegate.getSelectedLunarTextColor());
+        this.mSelectTextPaint.setColor(mDelegate.getSelectedTextColor());
+        this.mOtherMonthLunarTextPaint.setColor(mDelegate.getOtherMonthLunarTextColor());
+        this.mSchemeLunarTextPaint.setColor(mDelegate.getSchemeLunarTextColor());
+        this.mSchemePaint.setColor(mDelegate.getSchemeThemeColor());
+        this.mSchemeTextPaint.setColor(mDelegate.getSchemeTextColor());
+        this.mCurMonthTextPaint.setTextSize(mDelegate.getDayTextSize());
+        this.mOtherMonthTextPaint.setTextSize(mDelegate.getDayTextSize());
+        this.mCurDayTextPaint.setTextSize(mDelegate.getDayTextSize());
+        this.mSchemeTextPaint.setTextSize(mDelegate.getDayTextSize());
+        this.mSelectTextPaint.setTextSize(mDelegate.getDayTextSize());
+
+        this.mCurMonthLunarTextPaint.setTextSize(mDelegate.getLunarTextSize());
+        this.mSelectedLunarTextPaint.setTextSize(mDelegate.getLunarTextSize());
+        this.mCurDayLunarTextPaint.setTextSize(mDelegate.getLunarTextSize());
+        this.mOtherMonthLunarTextPaint.setTextSize(mDelegate.getLunarTextSize());
+        this.mSchemeLunarTextPaint.setTextSize(mDelegate.getLunarTextSize());
 
         this.mSelectedPaint.setStyle(Paint.Style.FILL);
-        this.mSelectedPaint.setColor(delegate.getSelectedThemeColor());
-
-        updateItemHeight();
-
-        initPaint();
+        this.mSelectedPaint.setColor(mDelegate.getSelectedThemeColor());
     }
 
     void updateItemHeight() {

diff --git a/calendarview/src/main/java/com/haibin/calendarview/CalendarLayout.java b/calendarview/src/main/java/com/haibin/calendarview/CalendarLayout.java
@@ -344,7 +344,6 @@ public boolean onTouchEvent(MotionEvent event) {
                         mDelegate.mViewChangeListener.onViewChange(false);
                     }
                     isWeekView = true;
-                    //shrink(0);
                     return false;
                 }
                 hideWeek(false);