Merge pull request #12 from Asdamp/master

Change event dots color

Author: Shrikanth Ravi

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

@@ -1,12 +1,17 @@
 package com.shrikanthravi.collapsiblecalendarview;
 
+import android.graphics.Color;
 import android.support.v7.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;
+
 
 public class MainActivity extends AppCompatActivity {
 
@@ -18,6 +23,10 @@ protected void onCreate(Bundle savedInstanceState) {
         getWindow().setStatusBarColor(getResources().getColor(R.color.google_red));
 
         CollapsibleCalendar collapsibleCalendar = findViewById(R.id.collapsibleCalendarView);
+        Calendar today=new GregorianCalendar();
+        collapsibleCalendar.addEventTag(today.get(Calendar.YEAR),today.get(Calendar.MONTH),today.get(Calendar.DAY_OF_MONTH));
+        today.add(Calendar.DATE,1);
+        collapsibleCalendar.addEventTag(today.get(Calendar.YEAR),today.get(Calendar.MONTH),today.get(Calendar.DAY_OF_MONTH),Color.BLUE);
 
         System.out.println("Testing date "+collapsibleCalendar.getSelectedDay().getDay()+"/"+collapsibleCalendar.getSelectedDay().getMonth()+"/"+collapsibleCalendar.getSelectedDay().getYear());
         collapsibleCalendar.setCalendarListener(new CollapsibleCalendar.CalendarListener() {

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

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

collapsiblecalendarview2/src/main/java/com/shrikanthravi/collapsiblecalendarview/data/CalendarAdapter.java

@@ -1,6 +1,8 @@
 package com.shrikanthravi.collapsiblecalendarview.data;
 
 import android.content.Context;
+import android.graphics.Color;
+import android.graphics.PorterDuff;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.ImageView;
@@ -125,6 +127,7 @@ public void refresh() {
                         && day.getMonth() == event.getMonth()
                         && day.getDay() == event.getDay()) {
                     imgEventTag.setVisibility(View.VISIBLE);
+                    imgEventTag.setColorFilter(event.getColor(),PorterDuff.Mode.SRC_ATOP);
                 }
             }
 

collapsiblecalendarview2/src/main/java/com/shrikanthravi/collapsiblecalendarview/data/Event.java

@@ -8,13 +8,21 @@ public class Event {
     private int mYear;
     private int mMonth;
     private int mDay;
+    private int mColor;
 
     public Event(int year, int month, int day){
         this.mYear = year;
         this.mMonth = month;
         this.mDay = day;
     }
 
+    public Event(int year, int month, int day, int color){
+        this.mYear = year;
+        this.mMonth = month;
+        this.mDay = day;
+        this.mColor=color;
+    }
+
     public int getMonth(){
         return mMonth;
     }
@@ -27,4 +35,7 @@ public int getDay(){
         return mDay;
     }
 
+    public int getColor() {
+        return mColor;
+    }
 }

collapsiblecalendarview2/src/main/java/com/shrikanthravi/collapsiblecalendarview/widget/CollapsibleCalendar.java

@@ -306,7 +306,13 @@ public void setAdapter(CalendarAdapter adapter) {
     }
 
     public void addEventTag(int numYear, int numMonth, int numDay) {
-        mAdapter.addEvent(new Event(numYear, numMonth, numDay));
+        mAdapter.addEvent(new Event(numYear, numMonth, numDay,getEventColor()));
+
+        reload();
+    }
+
+    public void addEventTag(int numYear, int numMonth, int numDay,int color) {
+        mAdapter.addEvent(new Event(numYear, numMonth, numDay,color));
 
         reload();
     }

collapsiblecalendarview2/src/main/java/com/shrikanthravi/collapsiblecalendarview/widget/UICalendar.java

@@ -82,6 +82,7 @@ public abstract class UICalendar extends LinearLayout {
     private int mButtonRightDrawableTintColor=Color.BLACK;
 
     private int mExpandIconColor = Color.BLACK;
+    private int mEventColor=Color.BLACK;
 
     public UICalendar(Context context) {
         this(context, null);
@@ -141,6 +142,9 @@ protected void setAttributes(TypedArray attrs) {
         setTextColor(attrs.getColor(R.styleable.UICalendar_textColor, mTextColor));
         setPrimaryColor(attrs.getColor(R.styleable.UICalendar_primaryColor, mPrimaryColor));
 
+        setEventColor(attrs.getColor(R.styleable.UICalendar_eventColor, mEventColor));
+
+
         setTodayItemTextColor(attrs.getColor(
                 R.styleable.UICalendar_todayItem_textColor, mTodayItemTextColor));
         Drawable todayItemBackgroundDrawable =
@@ -265,6 +269,15 @@ public void setPrimaryColor(int primaryColor) {
         mLayoutRoot.setBackgroundColor(mPrimaryColor);
     }
 
+    private void setEventColor(int eventColor) {
+        this.mEventColor = eventColor;
+        redraw();
+
+    }
+    public int getEventColor() {
+        return mEventColor;
+    }
+
     public int getTodayItemTextColor() {
         return mTodayItemTextColor;
     }

collapsiblecalendarview2/src/main/res/values/attrs.xml

@@ -34,6 +34,9 @@
         <attr name="textColor" format="color" />
         <attr name="primaryColor" format="color" />
 
+        <attr name="eventColor" format="color" />
+
+
         <attr name="todayItem_textColor" format="color" />
         <attr name="todayItem_background" format="integer" />