From c8b7f04c2df42271310aa59ea6e80364742df72b Mon Sep 17 00:00:00 2001 From: rjain90 Date: Thu, 9 May 2019 15:50:54 +0530 Subject: [PATCH 1/3] event rounded corners --- app/build.gradle | 24 +++++++++---------- .../calendar/pro/activities/SimpleActivity.kt | 2 ++ .../calendar/pro/views/MonthView.kt | 2 +- 3 files changed, 15 insertions(+), 13 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index be9695a22..2f583f86b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -4,9 +4,9 @@ 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)) +//def keystorePropertiesFile = rootProject.file("keystore.properties") +//def keystoreProperties = new Properties() +//keystoreProperties.load(new FileInputStream(keystorePropertiesFile)) android { compileSdkVersion 28 @@ -22,14 +22,14 @@ android { setProperty("archivesBaseName", "calendar") } - signingConfigs { - release { - keyAlias keystoreProperties['keyAlias'] - keyPassword keystoreProperties['keyPassword'] - storeFile file(keystoreProperties['storeFile']) - storePassword keystoreProperties['storePassword'] - } - } +// signingConfigs { +// release { +// keyAlias keystoreProperties['keyAlias'] +// keyPassword keystoreProperties['keyPassword'] +// storeFile file(keystoreProperties['storeFile']) +// storePassword keystoreProperties['storePassword'] +// } +// } buildTypes { debug { @@ -38,7 +38,7 @@ android { release { minifyEnabled true proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' - signingConfig signingConfigs.release +// signingConfig signingConfigs.release } } diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/SimpleActivity.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/SimpleActivity.kt index 4db43dbb9..8fb05d47b 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/SimpleActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/SimpleActivity.kt @@ -68,4 +68,6 @@ open class SimpleActivity : BaseSimpleActivity() { private fun unregisterObserver() { contentResolver.unregisterContentObserver(calDAVSyncObserver) } + + } diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/pro/views/MonthView.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/views/MonthView.kt index b0fc96252..d5fdbf045 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/pro/views/MonthView.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/views/MonthView.kt @@ -27,7 +27,7 @@ import org.joda.time.Days // used in the Monthly view fragment, 1 view per screen class MonthView(context: Context, attrs: AttributeSet, defStyle: Int) : View(context, attrs, defStyle) { - private val BG_CORNER_RADIUS = 4f + private val BG_CORNER_RADIUS = 8f private val ROW_COUNT = 6 private var paint: Paint From 286c340bf22afef39c4c3891046aa34695a18a14 Mon Sep 17 00:00:00 2001 From: rjain90 Date: Fri, 10 May 2019 15:39:40 +0530 Subject: [PATCH 2/3] event rounded corners --- app/build.gradle | 6 +++--- .../calendar/pro/activities/SimpleActivity.kt | 2 -- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 2f583f86b..07d94fffb 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -4,9 +4,9 @@ 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)) +def keystorePropertiesFile = rootProject.file("keystore.properties") +def keystoreProperties = new Properties() +keystoreProperties.load(new FileInputStream(keystorePropertiesFile)) android { compileSdkVersion 28 diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/SimpleActivity.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/SimpleActivity.kt index 8fb05d47b..4db43dbb9 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/SimpleActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/SimpleActivity.kt @@ -68,6 +68,4 @@ open class SimpleActivity : BaseSimpleActivity() { private fun unregisterObserver() { contentResolver.unregisterContentObserver(calDAVSyncObserver) } - - } From 5f7328646fa9ea9766d4758f2ce5bec35b591828 Mon Sep 17 00:00:00 2001 From: rjain90 Date: Fri, 10 May 2019 15:41:28 +0530 Subject: [PATCH 3/3] signing config --- app/build.gradle | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 07d94fffb..be9695a22 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -22,14 +22,14 @@ android { setProperty("archivesBaseName", "calendar") } -// signingConfigs { -// release { -// keyAlias keystoreProperties['keyAlias'] -// keyPassword keystoreProperties['keyPassword'] -// storeFile file(keystoreProperties['storeFile']) -// storePassword keystoreProperties['storePassword'] -// } -// } + signingConfigs { + release { + keyAlias keystoreProperties['keyAlias'] + keyPassword keystoreProperties['keyPassword'] + storeFile file(keystoreProperties['storeFile']) + storePassword keystoreProperties['storePassword'] + } + } buildTypes { debug { @@ -38,7 +38,7 @@ android { release { minifyEnabled true proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' -// signingConfig signingConfigs.release + signingConfig signingConfigs.release } }