Version code update, 1.9

serhat-ozturk · serhat-ozturk · commit efd7b2c96735 · 2024-11-25T10:08:45.000+03:00
can select same day development done
diff --git a/cosmocalendar/build.gradle b/cosmocalendar/build.gradle
@@ -32,8 +32,8 @@ android {
     defaultConfig {
         minSdkVersion 16
         targetSdkVersion 28
-        versionCode 6
-        versionName "1.7"
+        versionCode 9
+        versionName "1.9"
     }
     buildTypes {
         release {
diff --git a/cosmocalendar/src/main/java/com/applikeysolutions/cosmocalendar/adapter/viewholder/DayHolder.java b/cosmocalendar/src/main/java/com/applikeysolutions/cosmocalendar/adapter/viewholder/DayHolder.java
@@ -40,8 +40,10 @@ public void bind(Day day, BaseSelectionManager selectionManager) {
             unselect(day);
         }
 
-        if (day.getIsHoliday()){
+        if (day.getIsHoliday()) {
             ivConnectedDay.setImageDrawable(calendarView.getContext().getResources().getDrawable(calendarView.getConnectedDayIconRes()));
+        } else {
+            ivConnectedDay.setImageDrawable(null);
         }
 
         if (day.isCurrent()) {
@@ -106,6 +108,8 @@ private void select(Day day) {
                         ctvDay.setTextColor(calendarView.getDayTextColor());
                     }
                 }
+            }else if(state == SelectionState.SINGLE_RANGE_DAY){
+                ctvDay.setTextColor(calendarView.getSelectedDayTextColor());
             }
 
         } else {
@@ -205,6 +209,13 @@ private void animateDay(SelectionState state, Day day) {
                         ctvDay.setSelectionStateAndAnimate(state, calendarView, day, selectionManager);
                     }
                     break;
+                case SINGLE_RANGE_DAY:
+                    if (day.isSelectionCircleDrawed()) {
+                        ctvDay.showAsDoubleCircle(calendarView, false);
+                    } else {
+                        ctvDay.setSelectionStateAndAnimate(state, calendarView, day, selectionManager);
+                    }
+                    break;
             }
         }
     }
diff --git a/cosmocalendar/src/main/java/com/applikeysolutions/cosmocalendar/dialog/CalendarDialog.java b/cosmocalendar/src/main/java/com/applikeysolutions/cosmocalendar/dialog/CalendarDialog.java
@@ -236,6 +236,16 @@ public int getSelectedRangeTextColor() {
         return calendarView.getSelectedRangeTextColor();
     }
 
+    @Override
+    public boolean getCanSelectSameDay() {
+        return calendarView.getCanSelectSameDay();
+    }
+
+    @Override
+    public void setCanSelectSameDay(boolean canSelectSameDay) {
+        calendarView.setCanSelectSameDay(canSelectSameDay);
+    }
+
     @Override
     public Map<String, List<String>> getHolidays() {
         return calendarView.getHolidays();
@@ -428,12 +438,12 @@ public void setDeterminators(Map<String, Integer> determinators) {
 
     @Override
     public void setHolidaysPins(HashMap<String, String> pinsHash) {
-
+        calendarView.setHolidaysPins(pinsHash);
     }
 
     @Override
     public HashMap<String, String> getHolidaysPins() {
-        return null;
+        return calendarView.getHolidaysPins();
     }
 
     @Override
diff --git a/cosmocalendar/src/main/java/com/applikeysolutions/cosmocalendar/selection/RangeSelectionManager.java b/cosmocalendar/src/main/java/com/applikeysolutions/cosmocalendar/selection/RangeSelectionManager.java
@@ -10,11 +10,17 @@ public class RangeSelectionManager extends BaseSelectionManager {
 
     private Pair<Day, Day> days;
     private Day tempDay;
+    private boolean canSelectSameDay = false;
 
     public RangeSelectionManager(OnDaySelectedListener onDaySelectedListener) {
         this.onDaySelectedListener = onDaySelectedListener;
     }
 
+    public RangeSelectionManager(OnDaySelectedListener onDaySelectedListener, boolean canSelectSameDay) {
+        this.onDaySelectedListener = onDaySelectedListener;
+        this.canSelectSameDay = canSelectSameDay;
+    }
+
     public Pair<Day, Day> getDays() {
         return days;
     }
@@ -25,7 +31,7 @@ public void toggleDay(@NonNull Day day) {
             tempDay = day;
             days = null;
         } else {
-            if (tempDay == day) {
+            if (tempDay == day  && !canSelectSameDay) {
                 return;
             }
             if (tempDay.getCalendar().getTime().before(day.getCalendar().getTime())) {
@@ -67,6 +73,9 @@ public SelectionState getSelectedState(Day day) {
         if (days == null) {
             return SelectionState.START_RANGE_DAY_WITHOUT_END;
         } else if (days.first.equals(day)) {
+            if (days.first.equals(days.second)) {
+                return SelectionState.SINGLE_RANGE_DAY;
+            }
             return SelectionState.START_RANGE_DAY;
         } else if (days.second.equals(day)) {
             return SelectionState.END_RANGE_DAY;
diff --git a/cosmocalendar/src/main/java/com/applikeysolutions/cosmocalendar/selection/SelectionState.java b/cosmocalendar/src/main/java/com/applikeysolutions/cosmocalendar/selection/SelectionState.java
@@ -6,5 +6,6 @@ public enum SelectionState {
     END_RANGE_DAY,
     RANGE_DAY,
     SINGLE_DAY,
-    SINGLE_DAY_DETERMINATE
+    SINGLE_DAY_DETERMINATE,
+    SINGLE_RANGE_DAY
 }
diff --git a/cosmocalendar/src/main/java/com/applikeysolutions/cosmocalendar/settings/SettingsManager.java b/cosmocalendar/src/main/java/com/applikeysolutions/cosmocalendar/settings/SettingsManager.java
@@ -181,6 +181,16 @@ public int getSelectedRangeTextColor() {
         return appearanceModel.getSelectedRangeTextColor();
     }
 
+    @Override
+    public boolean getCanSelectSameDay() {
+        return appearanceModel.getCanSelectSameDay();
+    }
+
+    @Override
+    public void setCanSelectSameDay(boolean canSelectSameDay) {
+        appearanceModel.setCanSelectSameDay(canSelectSameDay);
+    }
+
     @Override
     public Map<String, List<String>> getHolidays() {
         return appearanceModel.getHolidays();
diff --git a/cosmocalendar/src/main/java/com/applikeysolutions/cosmocalendar/settings/appearance/AppearanceInterface.java b/cosmocalendar/src/main/java/com/applikeysolutions/cosmocalendar/settings/appearance/AppearanceInterface.java
@@ -57,6 +57,10 @@ public interface AppearanceInterface {
 
     int getSelectedRangeTextColor();
 
+    boolean getCanSelectSameDay();
+
+    void setCanSelectSameDay(boolean canSelectSameDay);
+
     Map<String, List<String>> getHolidays();
 
     Map<String, Integer> getDeterminators();
diff --git a/cosmocalendar/src/main/java/com/applikeysolutions/cosmocalendar/settings/appearance/AppearanceModel.java b/cosmocalendar/src/main/java/com/applikeysolutions/cosmocalendar/settings/appearance/AppearanceModel.java
@@ -83,6 +83,7 @@ public class AppearanceModel implements AppearanceInterface {
 
     private Map<String, List<String>> holidays;
     HashMap<String, String> pinsHash;
+    boolean canSelectSameDay = false;
 
     /**
      * Orientation of calendar
@@ -221,6 +222,16 @@ public int getSelectedRangeTextColor() {
         return selectedRangeTextColor;
     }
 
+    @Override
+    public boolean getCanSelectSameDay() {
+        return canSelectSameDay;
+    }
+
+    @Override
+    public void setCanSelectSameDay(boolean canSelectSameDay) {
+        this.canSelectSameDay = canSelectSameDay;
+    }
+
     @Override
     public Map<String, List<String>> getHolidays() {
         return holidays;
diff --git a/cosmocalendar/src/main/java/com/applikeysolutions/cosmocalendar/view/CalendarView.java b/cosmocalendar/src/main/java/com/applikeysolutions/cosmocalendar/view/CalendarView.java
@@ -365,7 +365,7 @@ private void setSelectionManager() {
                 break;
 
             case SelectionType.RANGE:
-                selectionManager = new RangeSelectionManager(this);
+                selectionManager = new RangeSelectionManager(this, settingsManager.getCanSelectSameDay());
                 break;
 
             case SelectionType.NONE:
@@ -961,6 +961,16 @@ public int getSelectedRangeTextColor() {
         return settingsManager.getSelectedRangeTextColor();
     }
 
+    @Override
+    public boolean getCanSelectSameDay() {
+        return settingsManager.getCanSelectSameDay();
+    }
+
+    @Override
+    public void setCanSelectSameDay(boolean canSelectSameDay) {
+        settingsManager.setCanSelectSameDay(canSelectSameDay);
+    }
+
     @Override
     public Map<String, List<String>> getHolidays() {
         return settingsManager.getHolidays();
diff --git a/cosmocalendar/src/main/java/com/applikeysolutions/cosmocalendar/view/customviews/CircleAnimationTextView.java b/cosmocalendar/src/main/java/com/applikeysolutions/cosmocalendar/view/customviews/CircleAnimationTextView.java
@@ -96,6 +96,12 @@ public void draw(Canvas canvas) {
                     drawCircle(canvas);
                     break;
 
+                case SINGLE_RANGE_DAY:
+                    drawCircleOutlined(canvas);
+                    drawInnerOutlinedCircle(canvas);
+                    drawCircle(canvas);
+                    break;
+
                 case SINGLE_DAY:
                 case SINGLE_DAY_DETERMINATE:
                     //Animation not started yet
@@ -151,6 +157,21 @@ private void drawCircleUnder(Canvas canvas) {
         canvas.drawCircle(getWidth() / 2, getHeight() / 2, diameter / 2, circleUnderPaint);
     }
 
+    private void drawCircleOutlined(Canvas canvas) {
+        if (circleUnderPaint == null || stateChanged) {
+            createCircleUnderPaint();
+        }
+        final int diameter = (int)(getWidth() - DEFAULT_PADDING * 2.1);
+        canvas.drawCircle(getWidth() / 2, getHeight() / 2, diameter / 1.6f, circleUnderPaint);
+    }
+    private void drawInnerOutlinedCircle(Canvas canvas) {
+        if (circleUnderPaint == null || stateChanged) {
+            createCircleUnderPaintSingleRange();
+        }
+        final int diameter = (int)(getWidth() - DEFAULT_PADDING * 2.1);
+        canvas.drawCircle(getWidth() / 2, getHeight() / 2, diameter / 1.8f, circleUnderPaint);
+    }
+
     private void createCirclePaint() {
         circlePaint = new Paint();
         circlePaint.setColor(circleColor);
@@ -163,6 +184,12 @@ private void createCircleUnderPaint() {
         circleUnderPaint.setFlags(Paint.ANTI_ALIAS_FLAG);
     }
 
+    private void createCircleUnderPaintSingleRange() {
+        circleUnderPaint = new Paint();
+        circleUnderPaint.setColor(calendarView.getSelectedDayTextColor());
+        circleUnderPaint.setFlags(Paint.ANTI_ALIAS_FLAG);
+    }
+
     private void drawRectangle(Canvas canvas) {
         if (rectanglePaint == null) {
             createRectanglePaint();
@@ -216,6 +243,10 @@ public void setSelectionStateAndAnimate(SelectionState state, CalendarView calen
                     circleColor = calendarView.getSelectedDayBackgroundEndColor();
                     break;
 
+                case SINGLE_RANGE_DAY:
+                    circleColor = calendarView.getSelectedDayBackgroundStartColor();
+                    break;
+
                 case START_RANGE_DAY_WITHOUT_END:
                     setBackgroundColor(Color.TRANSPARENT);
                     circleColor = calendarView.getSelectedDayBackgroundStartColor();
@@ -231,6 +262,7 @@ public void setSelectionStateAndAnimate(SelectionState state, CalendarView calen
                     circleColor = day.getDeterminatorColor();
                     setBackgroundColor(Color.TRANSPARENT);
                     break;
+
                 default:
                     circleColor = calendarView.getSelectedDayBackgroundColor();
                     setBackgroundColor(Color.TRANSPARENT);
@@ -341,6 +373,15 @@ public void showAsStartCircle(CalendarView calendarView, boolean animate) {
         showAsCircle(calendarView.getSelectedDayBackgroundStartColor());
     }
 
+    public void showAsDoubleCircle(CalendarView calendarView, boolean animate) {
+        if (animate) {
+            clearVariables();
+        }
+        this.calendarView = calendarView;
+        selectionState = SelectionState.SINGLE_RANGE_DAY;
+        showAsCircle(calendarView.getSelectedRangeBackgroundColor());
+    }
+
     public void showAsStartCircleWithouEnd(CalendarView calendarView, boolean animate) {
         if (animate) {
             clearVariables();

Original file line number	Diff line number	Diff line change
`@@ -40,8 +40,10 @@ public void bind(Day day, BaseSelectionManager selectionManager) {`
`40`	`40`	`unselect(day);`
`41`	`41`	`}`
`42`	`42`
`43`		`- if (day.getIsHoliday()){`
	`43`	`+ if (day.getIsHoliday()) {`
`44`	`44`	`ivConnectedDay.setImageDrawable(calendarView.getContext().getResources().getDrawable(calendarView.getConnectedDayIconRes()));`
	`45`	`+ } else {`
	`46`	`+ ivConnectedDay.setImageDrawable(null);`
`45`	`47`	`}`
`46`	`48`
`47`	`49`	`if (day.isCurrent()) {`
`@@ -106,6 +108,8 @@ private void select(Day day) {`
`106`	`108`	`ctvDay.setTextColor(calendarView.getDayTextColor());`
`107`	`109`	`}`
`108`	`110`	`}`
	`111`	`+ }else if(state == SelectionState.SINGLE_RANGE_DAY){`
	`112`	`+ ctvDay.setTextColor(calendarView.getSelectedDayTextColor());`
`109`	`113`	`}`
`110`	`114`
`111`	`115`	`} else {`
`@@ -205,6 +209,13 @@ private void animateDay(SelectionState state, Day day) {`
`205`	`209`	`ctvDay.setSelectionStateAndAnimate(state, calendarView, day, selectionManager);`
`206`	`210`	`}`
`207`	`211`	`break;`
	`212`	`+ case SINGLE_RANGE_DAY:`
	`213`	`+ if (day.isSelectionCircleDrawed()) {`
	`214`	`+ ctvDay.showAsDoubleCircle(calendarView, false);`
	`215`	`+ } else {`
	`216`	`+ ctvDay.setSelectionStateAndAnimate(state, calendarView, day, selectionManager);`
	`217`	`+ }`
	`218`	`+ break;`
`208`	`219`	`}`
`209`	`220`	`}`
`210`	`221`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,5 +6,6 @@ public enum SelectionState {`
`6`	`6`	`END_RANGE_DAY,`
`7`	`7`	`RANGE_DAY,`
`8`	`8`	`SINGLE_DAY,`
`9`		`- SINGLE_DAY_DETERMINATE`
	`9`	`+ SINGLE_DAY_DETERMINATE,`
	`10`	`+ SINGLE_RANGE_DAY`
`10`	`11`	`}`