fix leap year issue

Author: aliab

app/src/main/java/ir/hamsaa/MainActivity.java

@@ -10,13 +10,12 @@
 
 import androidx.appcompat.app.AppCompatActivity;
 
-
 import ir.hamsaa.persiandatepicker.Listener;
 import ir.hamsaa.persiandatepicker.PersianDatePickerDialog;
 import ir.hamsaa.persiandatepicker.api.PersianPickerDate;
 import ir.hamsaa.persiandatepicker.api.PersianPickerListener;
+import ir.hamsaa.persiandatepicker.date.PersianDateImpl;
 import ir.hamsaa.persiandatepicker.util.PersianCalendar;
-import ir.hamsaa.persiandatepicker.util.PersianCalendarUtils;
 
 
 public class MainActivity extends AppCompatActivity {
@@ -43,13 +42,12 @@ public void showCalendar(View v) {
                 .setTodayButtonVisible(true)
                 .setMinYear(1300)
                 .setAllButtonsTextSize(12)
-                .setMaxYear(PersianDatePickerDialog.THIS_YEAR)
+                .setMaxYear(1500)
                 .setInitDate(1370, 3, 13)
                 .setActionTextColor(Color.GRAY)
                 .setTypeFace(typeface)
-                .setShowDayPicker(false)
-
-                .setTitleType(PersianDatePickerDialog.MONTH_YEAR)
+//                .setShowDayPicker(false)
+                .setTitleType(PersianDatePickerDialog.DAY_MONTH_YEAR)
                 .setShowInBottomSheet(true)
                 .setListener(new PersianPickerListener() {
                     @Override
@@ -58,7 +56,7 @@ public void onDateSelected(PersianPickerDate persianPickerDate) {
                         Log.d(TAG, "onDateSelected: " + persianPickerDate.getGregorianDate());//Mon Jun 03 10:57:28 GMT+04:30 1991
                         Log.d(TAG, "onDateSelected: " + persianPickerDate.getPersianLongDate());// دوشنبه  13  خرداد  1370
                         Log.d(TAG, "onDateSelected: " + persianPickerDate.getPersianMonthName());//خرداد
-                        Log.d(TAG, "onDateSelected: " + PersianCalendarUtils.isPersianLeapYear(persianPickerDate.getPersianYear()));//true
+                        Log.d(TAG, "onDateSelected: " + PersianDateImpl.isLeapYear(persianPickerDate.getPersianYear()));//true
                         Toast.makeText(MainActivity.this, persianPickerDate.getPersianYear() + "/" + persianPickerDate.getPersianMonth() + "/" + persianPickerDate.getPersianDay(), Toast.LENGTH_SHORT).show();
                     }
 

persiandatepicker/src/main/java/ir/hamsaa/persiandatepicker/PersianDatePicker.java

@@ -286,7 +286,7 @@ private void updateViewData() {
         @Override
         public void onValueChange(NumberPicker picker, int oldVal, int newVal) {
             int year = yearNumberPicker.getValue();
-            boolean isLeapYear = PersianCalendarUtils.isPersianLeapYear(year);
+            boolean isLeapYear = PersianDateImpl.isLeapYear(year);
 
             int month = monthNumberPicker.getValue();
             int day = dayNumberPicker.getValue();

persiandatepicker/src/main/java/ir/hamsaa/persiandatepicker/api/PersianPickerDate.java

@@ -37,4 +37,6 @@ public interface PersianPickerDate {
 
     long getTimestamp();
 
+    boolean isLeapYear();
+
 }

persiandatepicker/src/main/java/ir/hamsaa/persiandatepicker/date/PersianDateFixedLeapYear.java

@@ -0,0 +1,40 @@
+package ir.hamsaa.persiandatepicker.date;
+
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
+
+import saman.zamani.persiandate.PersianDate;
+
+public class PersianDateFixedLeapYear extends PersianDate {
+
+    private final List<Integer> leapYears = Arrays.asList(
+            1210, 1214, 1218, 1222, 1226, 1230, 1234, 1238, 1243, 1247, 1251, 1255, 1259, 1263,
+            1267, 1271, 1276, 1280, 1284, 1288, 1292, 1296, 1300, 1304, 1309, 1313, 1317, 1321,
+            1325, 1329, 1333, 1337, 1342, 1346, 1350, 1354, 1358, 1362, 1366, 1370, 1375, 1379,
+            1383, 1387, 1391, 1395, 1399, 1403, 1408, 1412, 1416, 1420, 1424, 1428, 1432, 1436,
+            1441, 1445, 1449, 1453, 1457, 1461, 1465, 1469, 1474, 1478, 1482, 1486, 1490, 1494,
+            1498);
+
+
+    public PersianDateFixedLeapYear() {
+    }
+
+    public PersianDateFixedLeapYear(Long timeInMilliSecond) {
+        super(timeInMilliSecond);
+    }
+
+    public PersianDateFixedLeapYear(Date date) {
+        super(date);
+    }
+
+    @Override
+    public boolean isLeap(int year) {
+        if (year > 1500) {
+            return super.isLeap(year);
+        }
+        return leapYears.contains(year);
+    }
+
+
+}

persiandatepicker/src/main/java/ir/hamsaa/persiandatepicker/date/PersianDateImpl.java

@@ -3,33 +3,32 @@
 import java.util.Date;
 
 import ir.hamsaa.persiandatepicker.api.PersianPickerDate;
-import saman.zamani.persiandate.PersianDate;
 
 public class PersianDateImpl implements PersianPickerDate {
 
-    private PersianDate persianDate;
+    private PersianDateFixedLeapYear persianDate;
 
     public PersianDateImpl() {
-        persianDate = new PersianDate();
+        persianDate = new PersianDateFixedLeapYear();
     }
 
     @Override
     public void setDate(Long timestamp) {
-        persianDate = new PersianDate(timestamp);
+        persianDate = new PersianDateFixedLeapYear(timestamp);
     }
 
     @Override
     public void setDate(Date date) {
-        persianDate = new PersianDate(date);
+        persianDate = new PersianDateFixedLeapYear(date);
     }
 
     @Override
     public void setDate(int persianYear, int persianMonth, int persianDay) {
-        try{
+        try {
             persianDate.setShYear(persianYear);
             persianDate.setShMonth(persianMonth);
             persianDate.setShDay(persianDay);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
         }
     }
@@ -93,4 +92,13 @@ public Date getGregorianDate() {
     public long getTimestamp() {
         return persianDate.getTime();
     }
+
+    @Override
+    public boolean isLeapYear() {
+        return persianDate.isLeap();
+    }
+
+    public static boolean isLeapYear(int year) {
+        return new PersianDateFixedLeapYear().isLeap(year);
+    }
 }

persiandatepicker/src/main/java/ir/hamsaa/persiandatepicker/util/PersianCalendar.java

@@ -22,6 +22,8 @@
 import java.util.Locale;
 import java.util.TimeZone;
 
+import ir.hamsaa.persiandatepicker.date.PersianDateImpl;
+
 /**
  *
  * <strong> Persian(Shamsi) calendar </strong>
@@ -175,7 +177,7 @@ protected void calculatePersianDate() {
 	 */
 	public boolean isPersianLeapYear() {
 		// calculatePersianDate();
-		return PersianCalendarUtils.isPersianLeapYear(this.persianYear);
+		return PersianDateImpl.isLeapYear(this.persianYear);
 	}
 
 	/**