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

updating commons

This commit is contained in:
tibbi 2023-05-07 18:23:49 +02:00
parent c18a39ea17
commit e844db71d5
6 changed files with 12 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/build.gradle
View File

@ -70,7 +70,7 @@ android {
}
dependencies {
implementation 'com.github.SimpleMobileTools:Simple-Commons:5a860f5e21'
implementation 'com.github.SimpleMobileTools:Simple-Commons:6ed2cb04b7'
implementation 'androidx.multidex:multidex:2.0.1'
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'

11
app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/EventActivity.kt
View File

@ -31,6 +31,7 @@ import com.simplemobiletools.calendar.pro.adapters.AutoCompleteTextViewAdapter
import com.simplemobiletools.calendar.pro.dialogs.*
import com.simplemobiletools.calendar.pro.extensions.*
import com.simplemobiletools.calendar.pro.helpers.*
import com.simplemobiletools.calendar.pro.helpers.Formatter
import com.simplemobiletools.calendar.pro.models.*
import com.simplemobiletools.commons.dialogs.ColorPickerDialog
import com.simplemobiletools.commons.dialogs.ConfirmationAdvancedDialog
@ -41,13 +42,11 @@ import com.simplemobiletools.commons.helpers.*
import com.simplemobiletools.commons.models.RadioItem
import com.simplemobiletools.commons.views.MyAutoCompleteTextView
import kotlinx.android.synthetic.main.activity_event.*
import kotlinx.android.synthetic.main.activity_event.view.event_reminder_2
import kotlinx.android.synthetic.main.activity_event.view.event_reminder_3
import kotlinx.android.synthetic.main.activity_event.view.*
import kotlinx.android.synthetic.main.item_attendee.view.*
import org.joda.time.DateTime
import org.joda.time.DateTimeZone
import java.util.Calendar
import java.util.TimeZone
import java.util.*
import java.util.regex.Pattern
class EventActivity : SimpleActivity() {
@ -1317,9 +1316,7 @@ class EventActivity : SimpleActivity() {
storeEvent(wasRepeatable)
}
} else {
PermissionRequiredDialog(this, messageId = R.string.no_post_notifications_permissions) {
openNotificationSettings()
}
PermissionRequiredDialog(this, R.string.allow_notifications_reminders)
}
}
} else {

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

@ -157,12 +157,14 @@ class MainActivity : SimpleActivity(), RefreshRecyclerViewListener {
addBirthdaysAnniversariesAtStart()
if (isPackageInstalled("com.simplemobiletools.calendar")) {
ConfirmationDialog(this, "", R.string.upgraded_to_pro_calendar, R.string.ok, 0, false) {}
ConfirmationDialog(this, "", R.string.upgraded_from_free_calendar, R.string.ok, 0, false) {}
}
addImportIdsToTasks {
refreshViewPager()
}
PermissionRequiredDialog(this, R.string.allow_notifications_reminders)
}
override fun onResume() {
@ -1067,9 +1069,7 @@ class MainActivity : SimpleActivity(), RefreshRecyclerViewListener {
}
}
} else {
PermissionRequiredDialog(this, messageId = R.string.no_post_notifications_permissions) {
openNotificationSettings()
}
PermissionRequiredDialog(this, R.string.allow_notifications_reminders)
}
}
} else {

4
app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/SimpleActivity.kt
View File

@ -85,9 +85,7 @@ open class SimpleActivity : BaseSimpleActivity() {
}
}
} else {
PermissionRequiredDialog(this, messageId = R.string.no_post_notifications_permissions) {
openNotificationSettings()
}
PermissionRequiredDialog(this, R.string.allow_notifications_reminders)
}
}
}

4
app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/TaskActivity.kt
View File

@ -433,9 +433,7 @@ class TaskActivity : SimpleActivity() {
storeTask(wasRepeatable)
}
} else {
PermissionRequiredDialog(this, messageId = R.string.no_post_notifications_permissions) {
openNotificationSettings()
}
PermissionRequiredDialog(this, R.string.allow_notifications_reminders)
}
}
} else {

4
app/src/main/kotlin/com/simplemobiletools/calendar/pro/dialogs/SetRemindersDialog.kt
View File

@ -36,9 +36,7 @@ class SetRemindersDialog(val activity: SimpleActivity, val eventType: Int, val c
}
}
} else {
PermissionRequiredDialog(activity, messageId = R.string.no_post_notifications_permissions) {
activity.openNotificationSettings()
}
PermissionRequiredDialog(activity, R.string.allow_notifications_reminders)
}
}
}