Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
255 changes: 41 additions & 214 deletions app/detekt-baseline.xml

Large diffs are not rendered by default.

378 changes: 167 additions & 211 deletions app/lint-baseline.xml

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@
</activity>

<activity
android:name=".activities.ManageEventTypesActivity"
android:name=".activities.ManageCalendarsActivity"
android:configChanges="orientation"
android:exported="false"
android:label="@string/event_types"
Expand All @@ -214,7 +214,7 @@
android:theme="@style/Theme.Transparent" />

<activity
android:name=".activities.EventTypePickerActivity"
android:name=".activities.CalendarPickerActivity"
android:configChanges="orientation"
android:excludeFromRecents="true"
android:exported="false"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import org.fossify.calendar.extensions.launchNewTaskIntent
import org.fossify.commons.dialogs.RadioGroupDialog
import org.fossify.commons.models.RadioItem

class EventTypePickerActivity : AppCompatActivity() {
class CalendarPickerActivity : AppCompatActivity() {
private val TYPE_EVENT = 0
private val TYPE_TASK = 1

Expand Down
155 changes: 79 additions & 76 deletions app/src/main/kotlin/org/fossify/calendar/activities/EventActivity.kt

Large diffs are not rendered by default.

383 changes: 279 additions & 104 deletions app/src/main/kotlin/org/fossify/calendar/activities/MainActivity.kt

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
package org.fossify.calendar.activities

import android.os.Bundle
import org.fossify.calendar.R
import org.fossify.calendar.adapters.ManageCalendarsAdapter
import org.fossify.calendar.databinding.ActivityManageCalendarsBinding
import org.fossify.calendar.dialogs.EditCalendarDialog
import org.fossify.calendar.extensions.eventsHelper
import org.fossify.calendar.interfaces.DeleteCalendarsListener
import org.fossify.calendar.models.CalendarEntity
import org.fossify.commons.extensions.toast
import org.fossify.commons.extensions.updateTextColors
import org.fossify.commons.extensions.viewBinding
import org.fossify.commons.helpers.NavigationIcon
import org.fossify.commons.helpers.ensureBackgroundThread

class ManageCalendarsActivity : SimpleActivity(), DeleteCalendarsListener {

private val binding by viewBinding(ActivityManageCalendarsBinding::inflate)

override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setContentView(binding.root)
setupOptionsMenu()

setupEdgeToEdge(padBottomSystem = listOf(binding.manageCalendarsList))
setupMaterialScrollListener(binding.manageCalendarsList, binding.manageCalendarsAppbar)

getCalendars()
updateTextColors(binding.manageCalendarsList)
}

override fun onResume() {
super.onResume()
setupTopAppBar(binding.manageCalendarsAppbar, NavigationIcon.Arrow)
}

private fun showEditCalendarDialog(calendar: CalendarEntity? = null) {
EditCalendarDialog(this, calendar?.copy()) {
getCalendars()
}
}

private fun getCalendars() {
eventsHelper.getCalendars(this, false) {
val adapter = ManageCalendarsAdapter(this, it, this, binding.manageCalendarsList) {
showEditCalendarDialog(it as CalendarEntity)
}
binding.manageCalendarsList.adapter = adapter
}
}

private fun setupOptionsMenu() {
binding.manageCalendarsToolbar.setOnMenuItemClickListener { menuItem ->
when (menuItem.itemId) {
R.id.add_calendar -> showEditCalendarDialog()
else -> return@setOnMenuItemClickListener false
}
return@setOnMenuItemClickListener true
}
}

override fun deleteCalendars(
calendars: ArrayList<CalendarEntity>,
deleteEvents: Boolean
): Boolean {
if (calendars.any { it.caldavCalendarId != 0 }) {
toast(R.string.unsync_caldav_calendar)
if (calendars.size == 1) {
return false
}
}

ensureBackgroundThread {
eventsHelper.deleteCalendars(calendars, deleteEvents)
}

return true
}
}

This file was deleted.

Loading
Loading