From 5404a8a0459238b109b2b101a371fe542721ca1f Mon Sep 17 00:00:00 2001 From: t-regbs Date: Tue, 31 Dec 2019 15:33:36 +0100 Subject: [PATCH 1/4] remove release --- app/build.gradle | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 16d3eaedd..c98fd6392 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -4,9 +4,6 @@ apply plugin: 'kotlin-android-extensions' apply plugin: 'kotlin-kapt' apply plugin: 'de.timfreiheit.resourceplaceholders' -def keystorePropertiesFile = rootProject.file("keystore.properties") -def keystoreProperties = new Properties() -keystoreProperties.load(new FileInputStream(keystorePropertiesFile)) android { compileSdkVersion 28 @@ -23,15 +20,6 @@ android { vectorDrawables.useSupportLibrary = true } - signingConfigs { - release { - keyAlias keystoreProperties['keyAlias'] - keyPassword keystoreProperties['keyPassword'] - storeFile file(keystoreProperties['storeFile']) - storePassword keystoreProperties['storePassword'] - } - } - buildTypes { debug { applicationIdSuffix ".debug" @@ -39,7 +27,6 @@ android { release { minifyEnabled true proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' - signingConfig signingConfigs.release } } @@ -66,4 +53,9 @@ dependencies { kapt 'androidx.room:room-compiler:2.2.2' implementation 'androidx.room:room-runtime:2.2.2' annotationProcessor 'androidx.room:room-compiler:2.2.2' + implementation "androidx.core:core-ktx:+" + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" +} +repositories { + mavenCentral() } From bec8dc36b7ef664303b44568ddc6906e1f180995 Mon Sep 17 00:00:00 2001 From: Timilehin Date: Sun, 5 Jan 2020 18:30:11 -0800 Subject: [PATCH 2/4] Added Nigeria Holidays --- app/src/main/assets/nigeria.ics | 70 +++++++++++++++++++ .../calendar/pro/activities/MainActivity.kt | 1 + 2 files changed, 71 insertions(+) create mode 100644 app/src/main/assets/nigeria.ics diff --git a/app/src/main/assets/nigeria.ics b/app/src/main/assets/nigeria.ics new file mode 100644 index 000000000..95d6da2ea --- /dev/null +++ b/app/src/main/assets/nigeria.ics @@ -0,0 +1,70 @@ +BEGIN:VCALENDER +BEGIN:VEVENT +SUMMARY:New Year's Day +UID:nig-20200101 +DTSTART;VALUE=DATE:20200101 +DTEND;VALUE=DATE:20200102 +STATUS:CONFIRMED +RRULE:FREQ=YEARLY;INTERVAL=1 +END:VEVENT +BEGIN:VEVENT +DTEND;VALUE=DATE:20200414 +DTSTART;VALUE=DATE:20200413 +SUMMARY:Easter Monday +UID:nig-20200413 +STATUS:CONFIRMED +END:VEVENT +BEGIN:VEVENT +DTEND;VALUE=DATE:20200411 +DTSTART;VALUE=DATE:20200410 +SUMMARY:Good Friday +UID:nig-20200410 +STATUS:CONFIRMED +END:VEVENT +BEGIN:VEVENT +SUMMARY:Christmas Day +UID:nig-20201225 +DTSTART;VALUE=DATE:20201225 +DTEND;VALUE=DATE:20201226 +STATUS:CONFIRMED +RRULE:FREQ=YEARLY;INTERVAL=1 +END:VEVENT +BEGIN:VEVENT +SUMMARY:Democracy Day +UID:nig-20200612 +DTEND;VALUE=DATE:20200613 +DTSTART;VALUE=DATE:20200612 +STATUS:CONFIRMED +RRULE:FREQ=YEARLY;INTERVAL=1 +END:VEVENT +BEGIN:VEVENT +SUMMARY:Sallah +UID:nig-20200525 +DTEND;VALUE=DATE:20200526 +DTSTART;VALUE=DATE:20200525 +END:VEVENT +BEGIN:VEVENT +SUMMARY: Worker's Day +UID:nig-20200501 +DTEND;VALUE=DATE:20200502 +DTSTART;VALUE=DATE:20200501 +STATUS:CONFIRMED +RRULE:FREQ=YEARLY;INTERVAL=1 +END:VEVENT +BEGIN:VEVENT +SUMMARY:Independence Day +UID:nig-20201001 +DTEND;VALUE=DATE:20201002 +DTSTART;VALUE=DATE:20201001 +STATUS:CONFIRMED +RRULE:FREQ=YEARLY;INTERVAL=1 +END:VEVENT +BEGIN:VEVENT +SUMMARY:Boxing Day +UID:nig-20201226 +DTSTART;VALUE=DATE:20201226 +DTEND;VALUE=DATE:20201227 +STATUS:CONFIRMED +RRULE:FREQ=YEARLY;INTERVAL=1 +END:VEVENT +END:VCALENDER diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/MainActivity.kt index 76a102c49..ec71371be 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/MainActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/MainActivity.kt @@ -913,6 +913,7 @@ class MainActivity : SimpleActivity(), RefreshRecyclerViewListener { put("México", "mexico.ics") put("Nederland", "netherlands.ics") put("日本", "japan.ics") + put("Nigeria", "nigeria.ics") put("Norge", "norway.ics") put("Österreich", "austria.ics") put("Pākistān", "pakistan.ics") From ef1d20b586c71945aed596107e074eb01a584e9b Mon Sep 17 00:00:00 2001 From: Timilehin Date: Sun, 5 Jan 2020 18:45:17 -0800 Subject: [PATCH 3/4] Revert "Added Nigeria Holidays" This reverts commit bec8dc36 --- app/src/main/assets/nigeria.ics | 70 ------------------- .../calendar/pro/activities/MainActivity.kt | 1 - 2 files changed, 71 deletions(-) delete mode 100644 app/src/main/assets/nigeria.ics diff --git a/app/src/main/assets/nigeria.ics b/app/src/main/assets/nigeria.ics deleted file mode 100644 index 95d6da2ea..000000000 --- a/app/src/main/assets/nigeria.ics +++ /dev/null @@ -1,70 +0,0 @@ -BEGIN:VCALENDER -BEGIN:VEVENT -SUMMARY:New Year's Day -UID:nig-20200101 -DTSTART;VALUE=DATE:20200101 -DTEND;VALUE=DATE:20200102 -STATUS:CONFIRMED -RRULE:FREQ=YEARLY;INTERVAL=1 -END:VEVENT -BEGIN:VEVENT -DTEND;VALUE=DATE:20200414 -DTSTART;VALUE=DATE:20200413 -SUMMARY:Easter Monday -UID:nig-20200413 -STATUS:CONFIRMED -END:VEVENT -BEGIN:VEVENT -DTEND;VALUE=DATE:20200411 -DTSTART;VALUE=DATE:20200410 -SUMMARY:Good Friday -UID:nig-20200410 -STATUS:CONFIRMED -END:VEVENT -BEGIN:VEVENT -SUMMARY:Christmas Day -UID:nig-20201225 -DTSTART;VALUE=DATE:20201225 -DTEND;VALUE=DATE:20201226 -STATUS:CONFIRMED -RRULE:FREQ=YEARLY;INTERVAL=1 -END:VEVENT -BEGIN:VEVENT -SUMMARY:Democracy Day -UID:nig-20200612 -DTEND;VALUE=DATE:20200613 -DTSTART;VALUE=DATE:20200612 -STATUS:CONFIRMED -RRULE:FREQ=YEARLY;INTERVAL=1 -END:VEVENT -BEGIN:VEVENT -SUMMARY:Sallah -UID:nig-20200525 -DTEND;VALUE=DATE:20200526 -DTSTART;VALUE=DATE:20200525 -END:VEVENT -BEGIN:VEVENT -SUMMARY: Worker's Day -UID:nig-20200501 -DTEND;VALUE=DATE:20200502 -DTSTART;VALUE=DATE:20200501 -STATUS:CONFIRMED -RRULE:FREQ=YEARLY;INTERVAL=1 -END:VEVENT -BEGIN:VEVENT -SUMMARY:Independence Day -UID:nig-20201001 -DTEND;VALUE=DATE:20201002 -DTSTART;VALUE=DATE:20201001 -STATUS:CONFIRMED -RRULE:FREQ=YEARLY;INTERVAL=1 -END:VEVENT -BEGIN:VEVENT -SUMMARY:Boxing Day -UID:nig-20201226 -DTSTART;VALUE=DATE:20201226 -DTEND;VALUE=DATE:20201227 -STATUS:CONFIRMED -RRULE:FREQ=YEARLY;INTERVAL=1 -END:VEVENT -END:VCALENDER diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/MainActivity.kt index ec71371be..76a102c49 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/MainActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/MainActivity.kt @@ -913,7 +913,6 @@ class MainActivity : SimpleActivity(), RefreshRecyclerViewListener { put("México", "mexico.ics") put("Nederland", "netherlands.ics") put("日本", "japan.ics") - put("Nigeria", "nigeria.ics") put("Norge", "norway.ics") put("Österreich", "austria.ics") put("Pākistān", "pakistan.ics") From 4142c637d5fd2b1e27b859cf10db90553480f504 Mon Sep 17 00:00:00 2001 From: Timilehin Date: Sun, 5 Jan 2020 18:53:39 -0800 Subject: [PATCH 4/4] Added Nigeria Holidays --- app/src/main/assets/nigeria.ics | 70 +++++++++++++++++++ .../calendar/pro/activities/MainActivity.kt | 1 + 2 files changed, 71 insertions(+) create mode 100644 app/src/main/assets/nigeria.ics diff --git a/app/src/main/assets/nigeria.ics b/app/src/main/assets/nigeria.ics new file mode 100644 index 000000000..95d6da2ea --- /dev/null +++ b/app/src/main/assets/nigeria.ics @@ -0,0 +1,70 @@ +BEGIN:VCALENDER +BEGIN:VEVENT +SUMMARY:New Year's Day +UID:nig-20200101 +DTSTART;VALUE=DATE:20200101 +DTEND;VALUE=DATE:20200102 +STATUS:CONFIRMED +RRULE:FREQ=YEARLY;INTERVAL=1 +END:VEVENT +BEGIN:VEVENT +DTEND;VALUE=DATE:20200414 +DTSTART;VALUE=DATE:20200413 +SUMMARY:Easter Monday +UID:nig-20200413 +STATUS:CONFIRMED +END:VEVENT +BEGIN:VEVENT +DTEND;VALUE=DATE:20200411 +DTSTART;VALUE=DATE:20200410 +SUMMARY:Good Friday +UID:nig-20200410 +STATUS:CONFIRMED +END:VEVENT +BEGIN:VEVENT +SUMMARY:Christmas Day +UID:nig-20201225 +DTSTART;VALUE=DATE:20201225 +DTEND;VALUE=DATE:20201226 +STATUS:CONFIRMED +RRULE:FREQ=YEARLY;INTERVAL=1 +END:VEVENT +BEGIN:VEVENT +SUMMARY:Democracy Day +UID:nig-20200612 +DTEND;VALUE=DATE:20200613 +DTSTART;VALUE=DATE:20200612 +STATUS:CONFIRMED +RRULE:FREQ=YEARLY;INTERVAL=1 +END:VEVENT +BEGIN:VEVENT +SUMMARY:Sallah +UID:nig-20200525 +DTEND;VALUE=DATE:20200526 +DTSTART;VALUE=DATE:20200525 +END:VEVENT +BEGIN:VEVENT +SUMMARY: Worker's Day +UID:nig-20200501 +DTEND;VALUE=DATE:20200502 +DTSTART;VALUE=DATE:20200501 +STATUS:CONFIRMED +RRULE:FREQ=YEARLY;INTERVAL=1 +END:VEVENT +BEGIN:VEVENT +SUMMARY:Independence Day +UID:nig-20201001 +DTEND;VALUE=DATE:20201002 +DTSTART;VALUE=DATE:20201001 +STATUS:CONFIRMED +RRULE:FREQ=YEARLY;INTERVAL=1 +END:VEVENT +BEGIN:VEVENT +SUMMARY:Boxing Day +UID:nig-20201226 +DTSTART;VALUE=DATE:20201226 +DTEND;VALUE=DATE:20201227 +STATUS:CONFIRMED +RRULE:FREQ=YEARLY;INTERVAL=1 +END:VEVENT +END:VCALENDER diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/MainActivity.kt index 76a102c49..ec71371be 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/MainActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/MainActivity.kt @@ -913,6 +913,7 @@ class MainActivity : SimpleActivity(), RefreshRecyclerViewListener { put("México", "mexico.ics") put("Nederland", "netherlands.ics") put("日本", "japan.ics") + put("Nigeria", "nigeria.ics") put("Norge", "norway.ics") put("Österreich", "austria.ics") put("Pākistān", "pakistan.ics")