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

Browse Source
This commit is contained in:
tibbi
2023-07-16 23:25:01 +02:00
parent 11657e8849
commit 4591780367
6 changed files with 18 additions and 12 deletions
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:7176c52fd8' implementation 'com.github.SimpleMobileTools:Simple-Commons:71d66584bd'
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.5.1' kapt 'androidx.room:room-compiler:2.5.2'
implementation 'androidx.room:room-runtime:2.5.1' implementation 'androidx.room:room-runtime:2.5.2'
annotationProcessor 'androidx.room:room-compiler:2.5.1' annotationProcessor 'androidx.room:room-compiler:2.5.2'
} }

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

@@ -31,7 +31,6 @@ import com.simplemobiletools.calendar.pro.adapters.AutoCompleteTextViewAdapter
import com.simplemobiletools.calendar.pro.dialogs.* import com.simplemobiletools.calendar.pro.dialogs.*
import com.simplemobiletools.calendar.pro.extensions.* import com.simplemobiletools.calendar.pro.extensions.*
import com.simplemobiletools.calendar.pro.helpers.* import com.simplemobiletools.calendar.pro.helpers.*
import com.simplemobiletools.calendar.pro.helpers.Formatter
import com.simplemobiletools.calendar.pro.models.* import com.simplemobiletools.calendar.pro.models.*
import com.simplemobiletools.commons.dialogs.ColorPickerDialog import com.simplemobiletools.commons.dialogs.ColorPickerDialog
import com.simplemobiletools.commons.dialogs.ConfirmationAdvancedDialog import com.simplemobiletools.commons.dialogs.ConfirmationAdvancedDialog
@@ -42,11 +41,13 @@ import com.simplemobiletools.commons.helpers.*
import com.simplemobiletools.commons.models.RadioItem import com.simplemobiletools.commons.models.RadioItem
import com.simplemobiletools.commons.views.MyAutoCompleteTextView import com.simplemobiletools.commons.views.MyAutoCompleteTextView
import kotlinx.android.synthetic.main.activity_event.* import kotlinx.android.synthetic.main.activity_event.*
import kotlinx.android.synthetic.main.activity_event.view.* 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.item_attendee.view.* import kotlinx.android.synthetic.main.item_attendee.view.*
import org.joda.time.DateTime import org.joda.time.DateTime
import org.joda.time.DateTimeZone import org.joda.time.DateTimeZone
import java.util.* import java.util.Calendar
import java.util.TimeZone
import java.util.regex.Pattern import java.util.regex.Pattern
class EventActivity : SimpleActivity() { class EventActivity : SimpleActivity() {
@@ -1320,7 +1321,7 @@ class EventActivity : SimpleActivity() {
storeEvent(wasRepeatable) storeEvent(wasRepeatable)
} }
} else { } else {
PermissionRequiredDialog(this, R.string.allow_notifications_reminders) PermissionRequiredDialog(this, R.string.allow_notifications_reminders, { openNotificationSettings() })
} }
} }
} else { } else {
@@ -1367,11 +1368,13 @@ class EventActivity : SimpleActivity() {
finish() finish()
} }
} }
EDIT_FUTURE_OCCURRENCES -> { EDIT_FUTURE_OCCURRENCES -> {
eventsHelper.editFutureOccurrences(mEvent, mEventOccurrenceTS, true) { eventsHelper.editFutureOccurrences(mEvent, mEventOccurrenceTS, true) {
finish() finish()
} }
} }
EDIT_ALL_OCCURRENCES -> { EDIT_ALL_OCCURRENCES -> {
eventsHelper.editAllOccurrences(mEvent, mOriginalStartTS, mOriginalEndTS, true) { eventsHelper.editAllOccurrences(mEvent, mOriginalStartTS, mOriginalEndTS, true) {
finish() finish()

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

@@ -618,6 +618,7 @@ class MainActivity : SimpleActivity(), RefreshRecyclerViewListener {
updateViewPager() updateViewPager()
setupQuickFilter() setupQuickFilter()
} }
it == -1 -> toast(R.string.no_new_birthdays) it == -1 -> toast(R.string.no_new_birthdays)
else -> toast(R.string.no_birthdays) else -> toast(R.string.no_birthdays)
} }
@@ -648,6 +649,7 @@ class MainActivity : SimpleActivity(), RefreshRecyclerViewListener {
updateViewPager() updateViewPager()
setupQuickFilter() setupQuickFilter()
} }
it == -1 -> toast(R.string.no_new_anniversaries) it == -1 -> toast(R.string.no_new_anniversaries)
else -> toast(R.string.no_anniversaries) else -> toast(R.string.no_anniversaries)
} }
@@ -1067,7 +1069,7 @@ class MainActivity : SimpleActivity(), RefreshRecyclerViewListener {
} }
} }
} else { } else {
PermissionRequiredDialog(this, R.string.allow_notifications_reminders) PermissionRequiredDialog(this, R.string.allow_notifications_reminders, { openNotificationSettings() })
} }
} }
} else { } else {
@@ -1104,6 +1106,7 @@ class MainActivity : SimpleActivity(), RefreshRecyclerViewListener {
showErrorToast(e) showErrorToast(e)
} }
} }
else -> toast(R.string.invalid_file_format) else -> toast(R.string.invalid_file_format)
} }
} }

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

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

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

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

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

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