fenix
/
Simple-Calendar
mirror of https://github.com/SimpleMobileTools/Simple-Calendar.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

always show a dialog about uninstalling the old free app

This commit is contained in:
tibbi 2023-03-07 09:27:28 +01:00
parent 981aecea00
commit ace9f03c27
3 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/build.gradle
View File

@ -70,13 +70,13 @@ android {
} }
dependencies { dependencies {
implementation 'com.github.SimpleMobileTools:Simple-Commons:271f2cf2dd' implementation 'com.github.SimpleMobileTools:Simple-Commons:2794ea914a'
implementation 'androidx.multidex:multidex:2.0.1' implementation 'androidx.multidex:multidex:2.0.1'
implementation 'androidx.constraintlayout:constraintlayout:2.1.4' implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
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"
kapt 'androidx.room:room-compiler:2.4.3' kapt 'androidx.room:room-compiler:2.5.0'
implementation 'androidx.room:room-runtime:2.4.3' implementation 'androidx.room:room-runtime:2.5.0'
annotationProcessor 'androidx.room:room-compiler:2.4.3' annotationProcessor 'androidx.room:room-compiler:2.5.0'
} }

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

@ -155,9 +155,8 @@ class MainActivity : SimpleActivity(), RefreshRecyclerViewListener {
addBirthdaysAnniversariesAtStart() addBirthdaysAnniversariesAtStart()
if (!config.wasUpgradedFromFreeShown && isPackageInstalled("com.simplemobiletools.calendar")) { if (isPackageInstalled("com.simplemobiletools.calendar")) {
ConfirmationDialog(this, "", R.string.upgraded_to_pro_calendar, R.string.ok, 0, false) {} ConfirmationDialog(this, "", R.string.upgraded_to_pro_calendar, R.string.ok, 0, false) {}
config.wasUpgradedFromFreeShown = true
} }
addImportIdsToTasks { addImportIdsToTasks {

4
app/src/main/kotlin/com/simplemobiletools/calendar/pro/helpers/Config.kt
View File

@ -219,10 +219,6 @@ class Config(context: Context) : BaseConfig(context) {
get() = prefs.getString(ANNIVERSARY_REMINDERS, REMINDER_DEFAULT_VALUE)!!.split(",").map { it.toInt() }.toMutableList() as ArrayList<Int> get() = prefs.getString(ANNIVERSARY_REMINDERS, REMINDER_DEFAULT_VALUE)!!.split(",").map { it.toInt() }.toMutableList() as ArrayList<Int>
set(anniversaryReminders) = prefs.edit().putString(ANNIVERSARY_REMINDERS, anniversaryReminders.joinToString(",")).apply() set(anniversaryReminders) = prefs.edit().putString(ANNIVERSARY_REMINDERS, anniversaryReminders.joinToString(",")).apply()
var lastExportPath: String
get() = prefs.getString(LAST_EXPORT_PATH, "")!!
set(lastExportPath) = prefs.edit().putString(LAST_EXPORT_PATH, lastExportPath).apply()
var exportEvents: Boolean var exportEvents: Boolean
get() = prefs.getBoolean(EXPORT_EVENTS, true) get() = prefs.getBoolean(EXPORT_EVENTS, true)
set(exportEvents) = prefs.edit().putBoolean(EXPORT_EVENTS, exportEvents).apply() set(exportEvents) = prefs.edit().putBoolean(EXPORT_EVENTS, exportEvents).apply()