Skip to content

Commit db84d77

Browse files
authored
refactor: rename "EventType" symbols to "Calendar" (#942)
Zero behavioral change.
1 parent 8e97b2c commit db84d77

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+3279
-2100
lines changed

app/detekt-baseline.xml

Lines changed: 41 additions & 214 deletions
Large diffs are not rendered by default.

app/lint-baseline.xml

Lines changed: 167 additions & 211 deletions
Large diffs are not rendered by default.

app/src/main/AndroidManifest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@
200200
</activity>
201201

202202
<activity
203-
android:name=".activities.ManageEventTypesActivity"
203+
android:name=".activities.ManageCalendarsActivity"
204204
android:configChanges="orientation"
205205
android:exported="false"
206206
android:label="@string/event_types"
@@ -214,7 +214,7 @@
214214
android:theme="@style/Theme.Transparent" />
215215

216216
<activity
217-
android:name=".activities.EventTypePickerActivity"
217+
android:name=".activities.CalendarPickerActivity"
218218
android:configChanges="orientation"
219219
android:excludeFromRecents="true"
220220
android:exported="false"

app/src/main/kotlin/org/fossify/calendar/activities/EventTypePickerActivity.kt renamed to app/src/main/kotlin/org/fossify/calendar/activities/CalendarPickerActivity.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import org.fossify.calendar.extensions.launchNewTaskIntent
88
import org.fossify.commons.dialogs.RadioGroupDialog
99
import org.fossify.commons.models.RadioItem
1010

11-
class EventTypePickerActivity : AppCompatActivity() {
11+
class CalendarPickerActivity : AppCompatActivity() {
1212
private val TYPE_EVENT = 0
1313
private val TYPE_TASK = 1
1414

app/src/main/kotlin/org/fossify/calendar/activities/EventActivity.kt

Lines changed: 79 additions & 76 deletions
Large diffs are not rendered by default.

app/src/main/kotlin/org/fossify/calendar/activities/MainActivity.kt

Lines changed: 279 additions & 104 deletions
Large diffs are not rendered by default.
Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
1+
package org.fossify.calendar.activities
2+
3+
import android.os.Bundle
4+
import org.fossify.calendar.R
5+
import org.fossify.calendar.adapters.ManageCalendarsAdapter
6+
import org.fossify.calendar.databinding.ActivityManageCalendarsBinding
7+
import org.fossify.calendar.dialogs.EditCalendarDialog
8+
import org.fossify.calendar.extensions.eventsHelper
9+
import org.fossify.calendar.interfaces.DeleteCalendarsListener
10+
import org.fossify.calendar.models.CalendarEntity
11+
import org.fossify.commons.extensions.toast
12+
import org.fossify.commons.extensions.updateTextColors
13+
import org.fossify.commons.extensions.viewBinding
14+
import org.fossify.commons.helpers.NavigationIcon
15+
import org.fossify.commons.helpers.ensureBackgroundThread
16+
17+
class ManageCalendarsActivity : SimpleActivity(), DeleteCalendarsListener {
18+
19+
private val binding by viewBinding(ActivityManageCalendarsBinding::inflate)
20+
21+
override fun onCreate(savedInstanceState: Bundle?) {
22+
super.onCreate(savedInstanceState)
23+
setContentView(binding.root)
24+
setupOptionsMenu()
25+
26+
setupEdgeToEdge(padBottomSystem = listOf(binding.manageCalendarsList))
27+
setupMaterialScrollListener(binding.manageCalendarsList, binding.manageCalendarsAppbar)
28+
29+
getCalendars()
30+
updateTextColors(binding.manageCalendarsList)
31+
}
32+
33+
override fun onResume() {
34+
super.onResume()
35+
setupTopAppBar(binding.manageCalendarsAppbar, NavigationIcon.Arrow)
36+
}
37+
38+
private fun showEditCalendarDialog(calendar: CalendarEntity? = null) {
39+
EditCalendarDialog(this, calendar?.copy()) {
40+
getCalendars()
41+
}
42+
}
43+
44+
private fun getCalendars() {
45+
eventsHelper.getCalendars(this, false) {
46+
val adapter = ManageCalendarsAdapter(this, it, this, binding.manageCalendarsList) {
47+
showEditCalendarDialog(it as CalendarEntity)
48+
}
49+
binding.manageCalendarsList.adapter = adapter
50+
}
51+
}
52+
53+
private fun setupOptionsMenu() {
54+
binding.manageCalendarsToolbar.setOnMenuItemClickListener { menuItem ->
55+
when (menuItem.itemId) {
56+
R.id.add_calendar -> showEditCalendarDialog()
57+
else -> return@setOnMenuItemClickListener false
58+
}
59+
return@setOnMenuItemClickListener true
60+
}
61+
}
62+
63+
override fun deleteCalendars(
64+
calendars: ArrayList<CalendarEntity>,
65+
deleteEvents: Boolean
66+
): Boolean {
67+
if (calendars.any { it.caldavCalendarId != 0 }) {
68+
toast(R.string.unsync_caldav_calendar)
69+
if (calendars.size == 1) {
70+
return false
71+
}
72+
}
73+
74+
ensureBackgroundThread {
75+
eventsHelper.deleteCalendars(calendars, deleteEvents)
76+
}
77+
78+
return true
79+
}
80+
}

app/src/main/kotlin/org/fossify/calendar/activities/ManageEventTypesActivity.kt

Lines changed: 0 additions & 77 deletions
This file was deleted.

0 commit comments

Comments
 (0)