fenix/Simple-Calendar
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Calendar.git synced 2025-06-05 21:59:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

updating commons and kotlin

Browse Source
This commit is contained in:
tibbi
2022-02-09 11:07:58 +01:00
parent 127c62a9c9
commit 757718ca2f
4 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/build.gradle
View File

@ -50,7 +50,7 @@ android {
flavorDimensions "variants" flavorDimensions "variants"
productFlavors { productFlavors {
basic {} core {}
fdroid {} fdroid {}
} }
@ -69,9 +69,9 @@ android {
} }
dependencies { dependencies {
implementation 'com.github.SimpleMobileTools:Simple-Commons:14033f9b50' implementation 'com.github.SimpleMobileTools:Simple-Commons:fb636d1297'
implementation 'androidx.multidex:multidex:2.0.1' implementation 'androidx.multidex:multidex:2.0.1'
implementation 'androidx.constraintlayout:constraintlayout:2.1.2' implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0' implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
implementation "androidx.print:print:1.0.0" implementation "androidx.print:print:1.0.0"

4
app/src/fdroid/res/values/bools.xml Normal file
View File

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<bool name="show_donate_in_about">true</bool>
</resources>

6
app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/MainActivity.kt
View File

@ -540,7 +540,7 @@ class MainActivity : SimpleActivity(), RefreshRecyclerViewListener {
if (it) { if (it) {
SetRemindersDialog(this, BIRTHDAY_EVENT) { SetRemindersDialog(this, BIRTHDAY_EVENT) {
val reminders = it val reminders = it
val privateCursor = getMyContactsCursor(false, false)?.loadInBackground() val privateCursor = getMyContactsCursor(false, false)
ensureBackgroundThread { ensureBackgroundThread {
val privateContacts = MyContactsContentProvider.getSimpleContacts(this, privateCursor) val privateContacts = MyContactsContentProvider.getSimpleContacts(this, privateCursor)
@ -570,7 +570,7 @@ class MainActivity : SimpleActivity(), RefreshRecyclerViewListener {
if (it) { if (it) {
SetRemindersDialog(this, ANNIVERSARY_EVENT) { SetRemindersDialog(this, ANNIVERSARY_EVENT) {
val reminders = it val reminders = it
val privateCursor = getMyContactsCursor(false, false)?.loadInBackground() val privateCursor = getMyContactsCursor(false, false)
ensureBackgroundThread { ensureBackgroundThread {
val privateContacts = MyContactsContentProvider.getSimpleContacts(this, privateCursor) val privateContacts = MyContactsContentProvider.getSimpleContacts(this, privateCursor)
@ -600,7 +600,7 @@ class MainActivity : SimpleActivity(), RefreshRecyclerViewListener {
return return
} }
val privateCursor = getMyContactsCursor(false, false)?.loadInBackground() val privateCursor = getMyContactsCursor(false, false)
ensureBackgroundThread { ensureBackgroundThread {
val privateContacts = MyContactsContentProvider.getSimpleContacts(this, privateCursor) val privateContacts = MyContactsContentProvider.getSimpleContacts(this, privateCursor)

2
build.gradle
View File

@ -1,7 +1,7 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules. // Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript { buildscript {
ext.kotlin_version = '1.5.31' ext.kotlin_version = '1.6.10'
repositories { repositories {
google() google()