Skip to content

Commit

Permalink
Released 1.2.3
Browse files Browse the repository at this point in the history
  • Loading branch information
@maltaisn
maltaisn committed Mar 3, 2018
1 parent 145ae13 commit bb1dcc5
Show file tree
Hide file tree
Showing 5 changed files with 88 additions and 68 deletions.
7 changes: 3 additions & 4 deletions app/build.gradle
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
apply plugin: 'com.android.application'

android {
compileSdkVersion 26
compileSdkVersion 27
defaultConfig {
applicationId "com.maltaisn.recurpickerdemo"
minSdkVersion 21
targetSdkVersion 26
targetSdkVersion 27
versionCode 1
versionName "1.0"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
Expand All @@ -20,8 +20,7 @@ android {

dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation 'com.android.support:appcompat-v7:26.1.0'
implementation 'com.android.support:design:26.1.0'
implementation 'com.android.support:appcompat-v7:27.1.0'

implementation project(":recurpicker")
}
1 change: 0 additions & 1 deletion app/src/main/java/com/maltaisn/recurpickerdemo/MainActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
import com.maltaisn.recurpicker.RecurrencePickerDialog;
import com.maltaisn.recurpicker.RecurrencePickerView;

import java.nio.charset.Charset;
import java.text.DateFormat;
import java.text.MessageFormat;
import java.text.SimpleDateFormat;
Expand Down
10 changes: 5 additions & 5 deletions recurpicker/build.gradle
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
apply plugin: 'com.android.library'

android {
compileSdkVersion 26
compileSdkVersion 27

defaultConfig {
minSdkVersion 21
targetSdkVersion 26
versionCode 5
versionName "1.2.2"
targetSdkVersion 27
versionCode 6
versionName "1.2.3"
}

buildTypes {
Expand All @@ -25,7 +25,7 @@ android {

dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation 'com.android.support:appcompat-v7:26.1.0'
implementation 'com.android.support:appcompat-v7:27.1.0'
}

apply from: rootProject.file('release-bintray.gradle')
130 changes: 76 additions & 54 deletions recurpicker/src/main/java/com/maltaisn/recurpicker/Recurrence.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,11 @@
import android.content.Context;
import android.os.Parcel;
import android.os.Parcelable;
import android.support.annotation.IntDef;
import android.support.annotation.NonNull;

import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.nio.ByteBuffer;
import java.text.DateFormat;
import java.text.MessageFormat;
Expand All @@ -16,28 +19,44 @@
import java.util.Locale;
import java.util.Objects;

@SuppressWarnings({"WeakerAccess", "UnusedReturnValue", "unused"})
public class Recurrence implements Parcelable {

private static final String TAG = Recurrence.class.getSimpleName();

public static final int BYTE_ARRAY_LENGTH = 41;
private static final int BYTE_ARRAY_KEY = 100;

private static final int VERSION_1 = 100;
private static final int VERSION = VERSION_1;

public static final int NONE = -1;
public static final int DAILY = 0;
public static final int WEEKLY = 1;
public static final int MONTHLY = 2;
public static final int YEARLY = 3;

public static final int SAME_DAY_OF_MONTH = 0;
public static final int SAME_DAY_OF_WEEK = 1;
public static final int LAST_DAY_OF_MONTH = 2;
@IntDef(value={NONE, DAILY, WEEKLY, MONTHLY, YEARLY})
@Retention(RetentionPolicy.SOURCE)
public @interface RecurrencePeriod {}

public static final int END_NEVER = 0;
public static final int END_BY_DATE = 1;
public static final int END_BY_COUNT = 2;
public static final int END_BY_DATE_OR_COUNT = 3;

@IntDef(value={END_NEVER, END_BY_DATE, END_BY_COUNT, END_BY_DATE_OR_COUNT})
@Retention(RetentionPolicy.SOURCE)
public @interface RecurrenceEndType {}

public static final int SAME_DAY_OF_MONTH = 0;
public static final int SAME_DAY_OF_WEEK = 1;
public static final int LAST_DAY_OF_MONTH = 2;

@IntDef(value={SAME_DAY_OF_MONTH, SAME_DAY_OF_WEEK, LAST_DAY_OF_MONTH})
@Retention(RetentionPolicy.SOURCE)
public @interface RecurrenceMonthlySetting {}


public static final int EVERY_DAY_OF_WEEK = 0b11111110;

// If recurrence is default, it will have a simpler text format
Expand Down Expand Up @@ -66,7 +85,7 @@ public class Recurrence implements Parcelable {
* If setting weekly period, recurrence will happen on same day of week as start date
* If setting monthly period, recurrence will happen on same day of month as start date
*/
public Recurrence(long start, int period) {
public Recurrence(long start, @RecurrencePeriod int period) {
startDate = Calendar.getInstance();
startDate.setTimeInMillis(start);
setPeriod(period, true);
Expand Down Expand Up @@ -94,40 +113,6 @@ public Recurrence(@NonNull Recurrence r) {
endCount = r.endCount;
}

/**
* Create a recurrence from a byte array
* @param array byte array containing recurrence
* @param index recurrence object position in byte array
*/
public Recurrence(byte[] array, int index) {
if (array.length < BYTE_ARRAY_LENGTH) {
throw new IllegalArgumentException("Byte array does not represent a Recurrence object");
} else if (index < 0 || index > array.length - BYTE_ARRAY_LENGTH) {
throw new IllegalArgumentException("Byte array index is invalid");
}

ByteBuffer bb = ByteBuffer.allocate(BYTE_ARRAY_LENGTH);
bb.put(array, index, BYTE_ARRAY_LENGTH);
bb.position(0);
if (bb.getInt() != BYTE_ARRAY_KEY) {
throw new IllegalArgumentException("Byte array does not represent a Recurrence object");
}

isDefault = bb.get() == 1;
startDate = Calendar.getInstance();
startDate.setTimeInMillis(bb.getLong());
period = bb.getInt();
frequency = bb.getInt();
daySetting = bb.getInt();
endType = bb.getInt();
endCount = bb.getInt();
long end = bb.getLong();
if (end != 0) {
endDate = Calendar.getInstance();
endDate.setTimeInMillis(end);
}
}

/**
* Change the start date of the recurrence
* If recurrence is default and repeating weekly, the day of week on which it is repeating will also change
Expand Down Expand Up @@ -158,11 +143,11 @@ public Recurrence setStartDate(long date) {
* If setting MONTHLY, recurrence will happen on same day of month as start date
* @return the recurrence
*/
public Recurrence setPeriod(int period) {
public Recurrence setPeriod(@RecurrencePeriod int period) {
return setPeriod(period, false);
}

private Recurrence setPeriod(int period, boolean force) {
private Recurrence setPeriod(@RecurrencePeriod int period, boolean force) {
if (period < NONE || period > YEARLY) {
throw new IllegalArgumentException("Period must be one of Recurrence.NONE, DAILY, WEEKLY, MONTHLY or YEARLY");
}
Expand Down Expand Up @@ -243,7 +228,7 @@ public Recurrence setWeeklySetting(int days) {
* @param option either SAME_DAY_OF_MONTH, SAME_DAY_OF_WEEK or LAST_DAY_OF_MONTH
* @return the recurrence
*/
public Recurrence setMonthlySetting(int option) {
public Recurrence setMonthlySetting(@RecurrenceMonthlySetting int option) {
if (option < SAME_DAY_OF_MONTH || option > LAST_DAY_OF_MONTH) {
throw new IllegalArgumentException("Monthly setting isn't one of Recurrence.SAME_DAY_OF_MONTH, SAME_DAY_OF_WEEK or LAST_DAY_OF_MONTH");
}
Expand Down Expand Up @@ -275,6 +260,7 @@ public Recurrence setEndNever() {
*/
public Recurrence setEndByDate(long date) {
if (period == NONE) return this;

endType = END_BY_DATE;
if (endDate == null) endDate = Calendar.getInstance();
endDate.setTimeInMillis(date);
Expand All @@ -290,11 +276,9 @@ public Recurrence setEndByDate(long date) {
* @return the recurrence
*/
public Recurrence setEndByCount(int count) {
if (count < 1) {
throw new IllegalArgumentException("End count must be 1 or greater");
}

if (period == NONE) return this;
if (count < 1) setEndNever();

endType = END_BY_COUNT;
endCount = count;

Expand All @@ -310,11 +294,9 @@ public Recurrence setEndByCount(int count) {
* @return the recurrence
*/
public Recurrence setEndByDateOrCount(long date, int count) {
if (count < 1) {
throw new IllegalArgumentException("End count must be 1 or greater");
}

if (period == NONE) return this;
if (count < 1) setEndByDate(date);

endType = END_BY_DATE_OR_COUNT;
if (endDate == null) endDate = Calendar.getInstance();
endDate.setTimeInMillis(date);
Expand Down Expand Up @@ -363,7 +345,8 @@ public long getStartDate() {
* Gets the period of the recurrence
* @return either NONE, DAILY, WEEKLY, MONTHLY or YEARLY
*/
public int getPeriod() {

public @RecurrencePeriod int getPeriod() {
return period;
}

Expand Down Expand Up @@ -391,7 +374,7 @@ public int getDaySetting() {
* Gets the end type of the recurrence
* @return either END_NEVER, END_BY_DATE, END_BY_COUNT or END_BY_DATE_OR_COUNT
*/
public int getEndType() {
public @RecurrenceEndType int getEndType() {
return endType;
}

Expand Down Expand Up @@ -621,9 +604,48 @@ public String format(@NonNull Context context, @NonNull DateFormat dateFormat) {
return result;
}

/**
* Create a recurrence from a byte array
* @param array byte array containing recurrence
* @param index recurrence object position in byte array
*/
public Recurrence(byte[] array, int index) {
if (array.length < BYTE_ARRAY_LENGTH) {
throw new IllegalArgumentException("Byte array does not represent a valid Recurrence object");
} else if (index < 0 || index > array.length - BYTE_ARRAY_LENGTH) {
throw new IllegalArgumentException("Byte array index is invalid");
}

ByteBuffer bb = ByteBuffer.allocate(BYTE_ARRAY_LENGTH);
bb.put(array, index, BYTE_ARRAY_LENGTH);
bb.position(0);

if (bb.getInt() != VERSION) {
throw new IllegalArgumentException("Byte array does not represent a valid Recurrence object");
}

isDefault = bb.get() == 1;
startDate = Calendar.getInstance();
startDate.setTimeInMillis(bb.getLong());
period = bb.getInt();
frequency = bb.getInt();
daySetting = bb.getInt();
endType = bb.getInt();
endCount = bb.getInt();
long end = bb.getLong();
if (end != 0) {
endDate = Calendar.getInstance();
endDate.setTimeInMillis(end);
}
}

/**
* Serialize recurrence into a byte array with length BYTE_ARRAY_LENGTH
* @return the byte array containing the serialized recurrence
*/
public byte[] toByteArray() {
ByteBuffer bb = ByteBuffer.allocate(BYTE_ARRAY_LENGTH);
bb.putInt(BYTE_ARRAY_KEY);
bb.putInt(VERSION);
bb.put(isDefault ? (byte) 1 : 0);
bb.putLong(startDate.getTimeInMillis());
bb.putInt(period);
Expand Down Expand Up @@ -728,7 +750,7 @@ String getSameDayOfSameWeekString(Context context) {
*/
public static boolean isOnSameDay(@NonNull Calendar c1, @NonNull Calendar c2) {
return c1.get(Calendar.YEAR) == c2.get(Calendar.YEAR) &&
c1.get(Calendar.DAY_OF_YEAR) >= c2.get(Calendar.DAY_OF_YEAR);
c1.get(Calendar.DAY_OF_YEAR) == c2.get(Calendar.DAY_OF_YEAR);
}

private static int getDaysInCalendar(@NonNull Calendar cal) {
Expand Down
8 changes: 4 additions & 4 deletions release-bintray.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@ ext {
siteUrl = 'https://github.com/maltaisn/recurpickerlib'
gitUrl = 'https://github.com/maltaisn/recurpickerlib.git'

libraryVersion = '1.2.2'
libraryVersion = '1.2.3'

developerId = 'maltaisn'

licenseName = 'MIT'
licenseUrl = 'https://github.com/maltaisn/recurpickerlib/blob/master/LICENSE'
allLicenses = ["MIT"]
licenseName = 'The Apache Software License, Version 2.0'
licenseUrl = 'http://www.apache.org/licenses/LICENSE-2.0.txt'
allLicenses = ["Apache-2.0"]
}

apply from: rootProject.file('jcenter/maven-install.gradle')
Expand Down

0 comments on commit bb1dcc5

Please sign in to comment.