Skip to content

feat: unify calendar picker in event/task editor #943

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
naveensingh merged 4 commits into from
Dec 29, 2025
Merged

feat: unify calendar picker in event/task editor #943

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
dde9bb0
feat: unify calendar picker in event/task editor
naveensingh Dec 15, 2025
fb8635a
docs: update changelog
naveensingh Dec 17, 2025
509d664
fix: update calendar picker icon in task activity
naveensingh Dec 17, 2025
0c98880
fix: show offline label in task editor
naveensingh Dec 29, 2025
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
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [Unreleased]
### Changed
- Unified the local and synchronized calendar pickers in event editor ([#629])

## [1.9.0] - 2025-12-16
### Changed
Expand Down
356 changes: 124 additions & 232 deletions app/src/main/kotlin/org/fossify/calendar/activities/EventActivity.kt
View file
Open in desktop

Large diffs are not rendered by default.

9 changes: 5 additions & 4 deletions app/src/main/kotlin/org/fossify/calendar/activities/TaskActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -368,7 +368,7 @@ class TaskActivity : SimpleActivity() {

taskDate.setOnClickListener { setupDate() }
taskTime.setOnClickListener { setupTime() }
taskTypeHolder.setOnClickListener { showCalendarDialog() }
calendarHolder.setOnClickListener { showCalendarDialog() }
taskRepetition.setOnClickListener { showRepeatIntervalDialog() }
taskRepetitionRuleHolder.setOnClickListener { showRepetitionRuleDialog() }
taskRepetitionLimitHolder.setOnClickListener { showRepetitionTypePicker() }
Expand Down Expand Up @@ -898,7 +898,7 @@ class TaskActivity : SimpleActivity() {
activity = this,
currCalendar = mCalendarId,
showCalDAVCalendars = false,
showNewCalendarOption = true,
showNewCalendarOption = false,
addLastUsedOneAsFirstOption = false,
showOnlyWritable = true,
showManageCalendars = true
Expand All @@ -913,7 +913,8 @@ class TaskActivity : SimpleActivity() {
val calendar = calendarsDB.getCalendarWithId(mCalendarId)
if (calendar != null) {
runOnUiThread {
binding.taskType.text = calendar.title
binding.calendarTitle.text = calendar.title
binding.calendarSubtitle.text = getString(R.string.offline_never_synced)
updateTaskColorInfo(calendar.color)
}
}
Expand Down Expand Up @@ -965,7 +966,7 @@ class TaskActivity : SimpleActivity() {
updateTextColors(taskNestedScrollview)
val textColor = getProperTextColor()
arrayOf(
taskTimeImage, taskReminderImage, taskTypeImage, taskRepetitionImage, taskColorImage
taskTimeImage, taskReminderImage, calendarImage, taskRepetitionImage, taskColorImage
).forEach {
it.applyColorFilter(textColor)
}
Expand Down
97 changes: 0 additions & 97 deletions app/src/main/kotlin/org/fossify/calendar/dialogs/SelectEventCalendarDialog.kt
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion app/src/main/kotlin/org/fossify/calendar/helpers/Config.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ class Config(context: Context) : BaseConfig(context) {
var lastUsedCaldavCalendarId: Int
get() = prefs.getInt(
LAST_USED_CALDAV_CALENDAR,
getSyncedCalendarIdsAsList().first().toInt()
getSyncedCalendarIdsAsList().first()
)
set(calendarId) = prefs.edit().putInt(LAST_USED_CALDAV_CALENDAR, calendarId).apply()

Expand Down
72 changes: 15 additions & 57 deletions app/src/main/res/layout/activity_event.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -581,102 +581,60 @@
android:importantForAccessibility="no" />

<ImageView
android:id="@+id/event_caldav_calendar_image"
android:id="@+id/event_calendar_image"
android:layout_width="@dimen/smaller_icon_size"
android:layout_height="@dimen/smaller_icon_size"
android:layout_below="@+id/event_availability_divider"
android:layout_alignTop="@+id/event_caldav_calendar_holder"
android:layout_alignTop="@+id/event_calendar_holder"
android:layout_alignEnd="@+id/event_time_image"
android:layout_alignBottom="@+id/event_caldav_calendar_holder"
android:layout_alignBottom="@+id/event_calendar_holder"
android:layout_marginStart="@dimen/normal_margin"
android:padding="@dimen/medium_margin"
android:src="@drawable/ic_calendar_vector"
android:visibility="gone" />
android:src="@drawable/ic_calendar_vector" />

<RelativeLayout
android:id="@+id/event_caldav_calendar_holder"
android:id="@+id/event_calendar_holder"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/event_availability_divider"
android:layout_toEndOf="@+id/event_caldav_calendar_image"
android:background="?attr/selectableItemBackground"
android:visibility="gone">
android:layout_toEndOf="@+id/event_calendar_image"
android:background="?attr/selectableItemBackground">

<org.fossify.commons.views.MyTextView
android:id="@+id/event_caldav_calendar_name"
android:id="@+id/event_calendar_title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/small_margin"
android:ellipsize="end"
android:maxLines="1"
android:paddingStart="0dp"
android:paddingTop="@dimen/medium_margin"
android:paddingEnd="@dimen/activity_margin"
android:paddingBottom="@dimen/tiny_margin"
android:textSize="@dimen/day_text_size"
tools:text="My calendar" />
tools:text="@string/regular_event" />

<org.fossify.commons.views.MyTextView
android:id="@+id/event_caldav_calendar_email"
android:id="@+id/event_calendar_subtitle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/event_caldav_calendar_name"
android:layout_below="@+id/event_calendar_title"
android:layout_marginStart="@dimen/small_margin"
android:ellipsize="end"
android:maxLines="1"
android:paddingStart="0dp"
android:paddingEnd="@dimen/medium_margin"
android:paddingBottom="@dimen/medium_margin"
android:textSize="@dimen/meta_text_size"
tools:text="hello@fossify.org" />

</RelativeLayout>

<ImageView
android:id="@+id/event_caldav_calendar_divider"
android:layout_width="match_parent"
android:layout_height="@dimen/divider_height"
android:layout_below="@+id/event_caldav_calendar_holder"
android:background="@color/divider_grey"
android:importantForAccessibility="no"
android:visibility="gone" />

<ImageView
android:id="@+id/calendar_image"
android:layout_width="@dimen/smaller_icon_size"
android:layout_height="@dimen/smaller_icon_size"
android:layout_below="@+id/event_caldav_calendar_divider"
android:layout_alignTop="@+id/calendar_holder"
android:layout_alignBottom="@+id/calendar_holder"
android:layout_marginStart="@dimen/normal_margin"
android:padding="@dimen/medium_margin"
android:src="@drawable/ic_category_outline_vector" />

<RelativeLayout
android:id="@+id/calendar_holder"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/event_caldav_calendar_divider"
android:layout_marginTop="@dimen/medium_margin"
android:layout_marginBottom="@dimen/medium_margin"
android:layout_toEndOf="@+id/calendar_image"
android:background="?attr/selectableItemBackground">

<org.fossify.commons.views.MyTextView
android:id="@+id/calendar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/small_margin"
android:layout_marginEnd="@dimen/medium_margin"
android:paddingTop="@dimen/normal_margin"
android:paddingBottom="@dimen/normal_margin"
android:textSize="@dimen/day_text_size" />
tools:text="@string/offline_never_synced" />

</RelativeLayout>

<ImageView
android:id="@+id/calendar_divider"
android:layout_width="match_parent"
android:layout_height="@dimen/divider_height"
android:layout_below="@+id/calendar_holder"
android:layout_below="@+id/event_calendar_holder"
android:background="@color/divider_grey"
android:importantForAccessibility="no" />

Expand Down
50 changes: 33 additions & 17 deletions app/src/main/res/layout/activity_task.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,51 +322,67 @@
android:importantForAccessibility="no" />

<ImageView
android:id="@+id/task_type_image"
android:id="@+id/calendar_image"
android:layout_width="@dimen/smaller_icon_size"
android:layout_height="@dimen/smaller_icon_size"
android:layout_below="@+id/task_repetition_divider"
android:layout_alignTop="@+id/task_type_holder"
android:layout_alignBottom="@+id/task_type_holder"
android:layout_alignTop="@+id/calendar_holder"
android:layout_alignBottom="@+id/calendar_holder"
android:layout_marginStart="@dimen/normal_margin"
android:padding="@dimen/medium_margin"
android:src="@drawable/ic_category_outline_vector" />
android:src="@drawable/ic_calendar_vector" />

<RelativeLayout
android:id="@+id/task_type_holder"
android:id="@+id/calendar_holder"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/task_repetition_divider"
android:layout_marginTop="@dimen/medium_margin"
android:layout_marginBottom="@dimen/medium_margin"
android:layout_toEndOf="@+id/task_type_image"
android:layout_toEndOf="@+id/calendar_image"
android:background="?attr/selectableItemBackground">

<org.fossify.commons.views.MyTextView
android:id="@+id/task_type"
android:id="@+id/calendar_title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/small_margin"
android:layout_marginEnd="@dimen/medium_margin"
android:paddingTop="@dimen/normal_margin"
android:paddingBottom="@dimen/normal_margin"
android:textSize="@dimen/day_text_size" />
android:ellipsize="end"
android:maxLines="1"
android:paddingStart="0dp"
android:paddingTop="@dimen/medium_margin"
android:paddingEnd="@dimen/activity_margin"
android:paddingBottom="@dimen/tiny_margin"
android:textSize="@dimen/day_text_size"
tools:text="@string/regular_event" />

<org.fossify.commons.views.MyTextView
android:id="@+id/calendar_subtitle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/calendar_title"
android:layout_marginStart="@dimen/small_margin"
android:ellipsize="end"
android:maxLines="1"
android:paddingStart="0dp"
android:paddingEnd="@dimen/medium_margin"
android:paddingBottom="@dimen/medium_margin"
android:textSize="@dimen/meta_text_size"
tools:text="@string/offline_never_synced" />

</RelativeLayout>

<ImageView
android:id="@+id/task_type_divider"
android:id="@+id/calendar_divider"
android:layout_width="match_parent"
android:layout_height="@dimen/divider_height"
android:layout_below="@+id/task_type_holder"
android:layout_below="@+id/calendar_holder"
android:background="@color/divider_grey"
android:importantForAccessibility="no" />

<ImageView
android:id="@+id/task_color_image"
android:layout_width="@dimen/smaller_icon_size"
android:layout_height="@dimen/smaller_icon_size"
android:layout_below="@+id/task_type_divider"
android:layout_below="@+id/calendar_divider"
android:layout_alignTop="@+id/task_color_holder"
android:layout_alignBottom="@+id/task_color_holder"
android:layout_marginStart="@dimen/normal_margin"
Expand All @@ -377,7 +393,7 @@
android:id="@+id/task_color_holder"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/task_type_divider"
android:layout_below="@+id/calendar_divider"
android:layout_marginTop="@dimen/medium_margin"
android:layout_marginBottom="@dimen/medium_margin"
android:layout_toEndOf="@+id/task_color_image"
Expand Down
16 changes: 0 additions & 16 deletions app/src/main/res/layout/dialog_select_radio_group.xml
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion app/src/main/res/layout/item_calendar.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
android:layout_toStartOf="@+id/calendar_color"
android:paddingStart="@dimen/medium_margin"
android:paddingEnd="@dimen/medium_margin"
tools:text="Event type" />
tools:text="Calendar" />

<ImageView
android:id="@+id/calendar_color"
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,7 @@
<string name="type_already_exists">Calendar with this title already exists</string>
<string name="color">Color</string>
<string name="regular_event">Local calendar</string>
<string name="offline_never_synced">Offline (never synced)</string>
<string name="cannot_delete_default_type">Built-in calendar cannot be deleted</string>
<string name="select_event_type">Select a calendar</string>
<string name="move_events_into_default">Move affected events into the default calendar</string>
Expand Down
Loading