Merge pull request #23 from Asdamp/master

Set the event dot size

Author: Shrikanth Ravi

.idea/caches/build_file_checksums.ser

@@ -2,14 +2,14 @@ apply plugin: 'com.android.application'
 
 
 android {
-    compileSdkVersion 27
+    compileSdkVersion 28
     defaultConfig {
         applicationId "com.shrikanthravi.collapsiblecalendarview"
         minSdkVersion 21
-        targetSdkVersion 27
+        targetSdkVersion 28
         versionCode 1
         versionName "1.0"
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     dexOptions {
         preDexLibraries = false
@@ -20,14 +20,19 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+    compileOptions {
+        sourceCompatibility = '1.8'
+        targetCompatibility = '1.8'
+    }
+    buildToolsVersion = '28.0.2'
 }
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation 'com.android.support:appcompat-v7:27.0.2'
-    implementation 'com.android.support.constraint:constraint-layout:1.0.2'
+    implementation 'androidx.appcompat:appcompat:1.0.0-rc01'
+    implementation 'androidx.constraintlayout:constraintlayout:1.1.2'
     testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'com.android.support.test:runner:1.0.1'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1'
+    androidTestImplementation 'androidx.test:runner:1.1.0-alpha4'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0-alpha4'
     implementation project(':collapsiblecalendarview2')
 }

.idea/misc.xml

@@ -1,8 +1,8 @@
 package com.shrikanthravi.collapsiblecalendarview;
 
 import android.content.Context;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

.idea/modules.xml

@@ -1,15 +1,13 @@
 package com.shrikanthravi.collapsiblecalendarview;
 
 import android.graphics.Color;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.os.Bundle;
 import android.view.View;
 
 import com.shrikanthravi.collapsiblecalendarview.widget.CollapsibleCalendar;
-import com.shrikanthravi.collapsiblecalendarview.widget.UICalendar;
 
 import java.util.Calendar;
-import java.util.Date;
 import java.util.GregorianCalendar;
 
 

app/build.gradle

@@ -19,5 +19,6 @@
         app:buttonRight_drawableTintColor="@android:color/white"
         app:expandIconColor="@android:color/white"
         app:eventColor="@android:color/white"
+        app:eventDotSize="small"
         ></com.shrikanthravi.collapsiblecalendarview.widget.CollapsibleCalendar>
 </RelativeLayout>

app/src/androidTest/java/com/shrikanthravi/collapsiblecalendarview/ExampleInstrumentedTest.java

@@ -3,17 +3,17 @@ apply plugin: 'com.github.dcendents.android-maven'
 group = 'com.github.shrikanth7698'
 
 android {
-    compileSdkVersion 27
+    compileSdkVersion 28
 
 
 
     defaultConfig {
         minSdkVersion 21
-        targetSdkVersion 27
+        targetSdkVersion 28
         versionCode 1
         versionName "1.0"
 
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
     }
     dexOptions {
@@ -26,14 +26,20 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+    compileOptions {
+        sourceCompatibility = '1.8'
+        targetCompatibility = '1.8'
+    }
+    buildToolsVersion = '28.0.2'
 
 }
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
 
-    implementation 'com.android.support:appcompat-v7:27.0.2'
+    implementation 'androidx.appcompat:appcompat:1.0.0-beta01'
     testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'com.android.support.test:runner:1.0.1'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1'
+    androidTestImplementation 'androidx.test:runner:1.1.0-alpha4'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0-alpha4'
+    implementation 'androidx.constraintlayout:constraintlayout:1.1.2'
 }

app/src/main/java/com/shrikanthravi/collapsiblecalendarview/MainActivity.java

@@ -1,8 +1,8 @@
 package com.shrikanthravi.collapsiblecalendarview;
 
 import android.content.Context;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

app/src/main/res/layout/activity_main.xml

@@ -9,6 +9,7 @@
 import android.widget.TextView;
 
 import com.shrikanthravi.collapsiblecalendarview.R;
+import com.shrikanthravi.collapsiblecalendarview.widget.UICalendar;
 
 import java.util.ArrayList;
 import java.util.Calendar;
@@ -22,6 +23,7 @@ public class CalendarAdapter {
     private int mFirstDayOfWeek = 0;
     private Calendar mCal;
     private LayoutInflater mInflater;
+    private int mEventDotSize= UICalendar.EVENT_DOT_BIG;
 
     List<Day> mItemList = new ArrayList<>();
     List<View> mViewList = new ArrayList<>();
@@ -30,7 +32,6 @@ public class CalendarAdapter {
     public CalendarAdapter(Context context, Calendar cal) {
         this.mCal = (Calendar) cal.clone();
         this.mCal.set(Calendar.DAY_OF_MONTH, 1);
-
         mInflater = LayoutInflater.from(context);
 
         refresh();
@@ -52,6 +53,9 @@ public View getView(final int position) {
     public void setFirstDayOfWeek(int firstDayOfWeek) {
         mFirstDayOfWeek = firstDayOfWeek;
     }
+    public void setEventDotSize(int eventDotSize) {
+        mEventDotSize = eventDotSize;
+    }
 
     public Calendar getCalendar() {
         return mCal;
@@ -111,8 +115,12 @@ public void refresh() {
             }
 
             Day day = new Day(numYear, numMonth, numDay);
+            View view;
+            if(mEventDotSize==UICalendar.EVENT_DOT_SMALL)
+                 view = mInflater.inflate(R.layout.day_layout_small, null);
+            else
+                view = mInflater.inflate(R.layout.day_layout, null);
 
-            View view = mInflater.inflate(R.layout.day_layout, null);
             TextView txtDay = (TextView) view.findViewById(R.id.txt_day);
             ImageView imgEventTag = (ImageView) view.findViewById(R.id.img_event_tag);