Merge remote-tracking branch 'jtj9817/master'

This commit is contained in:
Josh J 2019-01-24 21:46:51 -05:00
commit 95a68f180a
6 changed files with 9 additions and 7 deletions

View File

@ -53,7 +53,7 @@ android {
}
dependencies {
implementation 'com.simplemobiletools:commons:5.6.6'
implementation 'com.simplemobiletools:commons:5.6.16'
implementation 'joda-time:joda-time:2.10.1'
implementation 'androidx.multidex:multidex:2.0.1'

View File

@ -5,6 +5,8 @@ import com.simplemobiletools.calendar.pro.helpers.*
import com.simplemobiletools.commons.activities.BaseSplashActivity
class SplashActivity : BaseSplashActivity() {
override fun getAppPackageName() = packageName
override fun initActivity() {
when {
intent.extras?.containsKey(DAY_CODE) == true -> Intent(this, MainActivity::class.java).apply {

View File

@ -244,7 +244,7 @@ class CalDAVHelper(val context: Context) {
// some calendars add repeatable event exceptions with using the "exdate" field, not by creating a child event that is an exception
val exdate = cursor.getStringValue(CalendarContract.Events.EXDATE) ?: ""
if (exdate.isNotEmpty() && exdate.length > 8) {
if (exdate.length > 8) {
val dates = exdate.split(",")
dates.forEach {
event.repetitionExceptions.add(it.substring(0, 8))

View File

@ -218,7 +218,7 @@
<!-- Strings displayed only on Google Playstore. Optional, but good to have -->
<!-- Short description has to have less than 80 chars -->
<string name="app_short_description">An offline calendar for your events without ads, respecting your privacy.</string>
<string name="app_short_description">Ένα offline calendar χωρίς διαφημίσεις, σεβόμενοι τα προσωπικά σας δεδομένα.</string>
<string name="app_long_description">
Ένα απλό ημερολόγιο με προαιρετικό συγχρονισμό CalDAV. Μπορείτε εύκολα να δημιουργήσετε επαναλαμβανόμενες εκδηλώσεις με ρυθμίσεις υπενθυμίσεων, μπορεί επίσης να εμφανίσει αριθμούς εβδομάδων.

View File

@ -1,7 +1,7 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript {
ext.kotlin_version = '1.3.10'
ext.kotlin_version = '1.3.11'
repositories {
google()
@ -9,7 +9,7 @@ buildscript {
}
dependencies {
classpath 'com.android.tools.build:gradle:3.2.1'
classpath 'com.android.tools.build:gradle:3.3.0'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
// NOTE: Do not place your application dependencies here; they belong

View File

@ -1,6 +1,6 @@
#Fri Oct 05 20:16:57 CEST 2018
#Thu Jan 24 23:19:46 CET 2019
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip