Skip to content

Commit

Permalink
Merge pull request #66 from aliab/dev
Browse files Browse the repository at this point in the history
Fix jitpack build issue
  • Loading branch information
aliab authored Apr 25, 2021
2 parents e0cf4eb + c3867fa commit 756cb0a
Show file tree
Hide file tree
Showing 12 changed files with 162 additions and 139 deletions.
5 changes: 1 addition & 4 deletions app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
apply plugin: 'com.android.application'
apply plugin: 'kotlin-android'

android {
compileSdkVersion libraryCompileSdkVersion
Expand All @@ -13,7 +12,7 @@ android {
}
buildTypes {
release {
minifyEnabled true
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
}
Expand All @@ -23,8 +22,6 @@ dependencies {
implementation project(":persiandatepicker")
implementation "androidx.appcompat:appcompat:$appCompat"
implementation "com.google.android.material:material:$material"
implementation "androidx.core:core-ktx:$coreKtx"
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
}
repositories {
mavenCentral()
Expand Down
13 changes: 10 additions & 3 deletions app/src/main/java/ir/hamsaa/MainActivity.java
Original file line number Diff line number Diff line change
Expand Up @@ -4,24 +4,27 @@
import android.graphics.Color;
import android.graphics.Typeface;
import android.os.Bundle;
import android.util.Log;
import android.view.View;
import android.widget.Toast;

import androidx.appcompat.app.AppCompatActivity;

import org.jetbrains.annotations.NotNull;

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.util.PersianCalendar;
import ir.hamsaa.persiandatepicker.util.PersianCalendarUtils;


public class MainActivity extends AppCompatActivity {

private PersianDatePickerDialog picker;

private static final String TAG = "MainActivity";

@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
Expand All @@ -48,9 +51,13 @@ public void showCalendar(View v) {
.setShowInBottomSheet(true)
.setListener(new PersianPickerListener() {
@Override
public void onDateSelected(@NotNull PersianPickerDate persianPickerDate) {
public void onDateSelected(PersianPickerDate persianPickerDate) {
Log.d(TAG, "onDateSelected: " + persianPickerDate.getTimestamp());//675930448000
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
Toast.makeText(MainActivity.this, persianPickerDate.getPersianYear() + "/" + persianPickerDate.getPersianMonth() + "/" + persianPickerDate.getPersianDay(), Toast.LENGTH_SHORT).show();

}

@Override
Expand Down
5 changes: 2 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,10 @@

buildscript {
ext {
kotlin_version = '1.4.32'
coreKtx = '1.3.2'
appCompat = '1.2.0'
material = '1.3.0'
persianDate = '0.8'

libraryMinSdk = 14
libraryTargetSdk = 30
libraryCompileSdkVersion = 30
Expand All @@ -18,7 +17,6 @@ buildscript {
}
dependencies {
classpath 'com.android.tools.build:gradle:4.1.3'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
}
Expand All @@ -29,6 +27,7 @@ allprojects {
jcenter()
google()
mavenCentral()
maven { url 'https://jitpack.io' }
}
}

Expand Down
11 changes: 7 additions & 4 deletions persiandatepicker/build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
apply plugin: 'com.android.library'
apply plugin: 'kotlin-android'

android {
compileSdkVersion libraryCompileSdkVersion
Expand All @@ -8,9 +7,15 @@ android {
minSdkVersion libraryMinSdk
targetSdkVersion libraryTargetSdk
}

compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}

buildTypes {
release {
minifyEnabled true
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
}
Expand All @@ -19,7 +24,5 @@ android {
dependencies {
implementation "androidx.appcompat:appcompat:$appCompat"
implementation "com.google.android.material:material:$material"
implementation "androidx.core:core-ktx:$coreKtx"
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
implementation "com.github.samanzamani.persiandate:PersianDate:$persianDate"
}
1 change: 1 addition & 0 deletions persiandatepicker/proguard-rules.pro
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,4 @@
#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
# public *;
#}
-keep ir.hamsaa.**
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
package ir.hamsaa.persiandatepicker.api;

import java.util.Date;

public interface PersianPickerDate {

void setDate(Long timestamp);

void setDate(Date date);

void setDate(int persianYear, int persianMonth, int persianDay);

int getPersianYear();

int getPersianMonth();

int getPersianDay();

int getGregorianYear();

int getGregorianMonth();

int getGregorianDay();

int getDayOfWeek();

String getPersianMonthName();

String getPersianDayOfWeekName();

/**
* @return String of Persian Date ex: دوشنبه ۱۳ خرداد ۱۳۷۰
*/
String getPersianLongDate();

Date getGregorianDate();

long getTimestamp();

}

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
package ir.hamsaa.persiandatepicker.api;

public interface PersianPickerListener {

void onDateSelected(PersianPickerDate persianPickerDate);

void onDismissed();
}

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,92 @@
package ir.hamsaa.persiandatepicker.date;

import java.util.Date;

import ir.hamsaa.persiandatepicker.api.PersianPickerDate;
import saman.zamani.persiandate.PersianDate;

public class PersianDateImpl implements PersianPickerDate {

private PersianDate persianDate;

public PersianDateImpl() {
persianDate = new PersianDate();
}

@Override
public void setDate(Long timestamp) {
persianDate = new PersianDate(timestamp);
}

@Override
public void setDate(Date date) {
persianDate = new PersianDate(date);
}

@Override
public void setDate(int persianYear, int persianMonth, int persianDay) {
persianDate.setShYear(persianYear);
persianDate.setShMonth(persianMonth);
persianDate.setShDay(persianDay);
}

@Override
public int getPersianYear() {
return persianDate.getShYear();
}

@Override
public int getPersianMonth() {
return persianDate.getShMonth();
}

@Override
public int getPersianDay() {
return persianDate.getShDay();
}

@Override
public int getGregorianYear() {
return persianDate.getGrgYear();
}

@Override
public int getGregorianMonth() {
return persianDate.getGrgMonth();
}

@Override
public int getGregorianDay() {
return persianDate.getGrgDay();
}

@Override
public int getDayOfWeek() {
return persianDate.dayOfWeek();
}

@Override
public String getPersianMonthName() {
return persianDate.monthName();
}

@Override
public String getPersianDayOfWeekName() {
return persianDate.dayName();
}

@Override
public String getPersianLongDate() {
return getPersianDayOfWeekName() + " " + getPersianDay() + " " + getPersianMonthName() + " " + getPersianYear();
}

@Override
public Date getGregorianDate() {
return persianDate.toDate();
}

@Override
public long getTimestamp() {
return persianDate.getTime();
}
}
Loading

0 comments on commit 756cb0a

Please sign in to comment.