jonas/Kvaesitso
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases 10 Wiki Activity

open calendar app and weather app in new task

Browse Source 
fix #1963
This commit is contained in:
MM20
2026-08-30 16:14:23 +02:00
parent 5bd8b832f4
commit 9b8b083515
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/calendar/CalendarWidgetVM.kt
View File

@@ -9,12 +9,12 @@ import androidx.compose.runtime.mutableStateOf
import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
import de.mm20.launcher2.calendar.CalendarRepository
import de.mm20.launcher2.searchable.SavableSearchableRepository
import de.mm20.launcher2.ktx.tryStartActivity
import de.mm20.launcher2.permissions.PermissionGroup
import de.mm20.launcher2.permissions.PermissionsManager
import de.mm20.launcher2.search.CalendarEvent
import de.mm20.launcher2.searchable.PinnedLevel
import de.mm20.launcher2.searchable.SavableSearchableRepository
import de.mm20.launcher2.searchable.VisibilityLevel
import de.mm20.launcher2.services.favorites.FavoritesService
import de.mm20.launcher2.widgets.CalendarWidget
@@ -69,7 +69,9 @@ class CalendarWidgetVM : ViewModel(), KoinComponent {
field = value
val dates = value.flatMap {
val startDate =
it.startTime?.let { Instant.ofEpochMilli(it).atZone(ZoneId.systemDefault()).toLocalDate() }
it.startTime?.let {
Instant.ofEpochMilli(it).atZone(ZoneId.systemDefault()).toLocalDate()
}
val endDate =
Instant.ofEpochMilli(it.endTime).atZone(ZoneId.systemDefault()).toLocalDate()
return@flatMap listOfNotNull(
@@ -129,6 +131,7 @@ class CalendarWidgetVM : ViewModel(), KoinComponent {
val endTime = selectedDate.value.atTime(13, 0).toInstant(zoneOffset).toEpochMilli()
intent.putExtra(CalendarContract.EXTRA_EVENT_BEGIN_TIME, beginTime)
intent.putExtra(CalendarContract.EXTRA_EVENT_END_TIME, endTime)
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
context.tryStartActivity(intent)
}
@@ -139,6 +142,7 @@ class CalendarWidgetVM : ViewModel(), KoinComponent {
builder.appendPath("time")
ContentUris.appendId(builder, startMillis)
val intent = Intent(Intent.ACTION_VIEW)
.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
.setData(builder.build())
context.tryStartActivity(intent)
}
@@ -207,7 +211,8 @@ class CalendarWidgetVM : ViewModel(), KoinComponent {
from = System.currentTimeMillis(),
to = System.currentTimeMillis() + 14 * 24 * 60 * 60 * 1000L,
excludeAllDayEvents = !config.allDayEvents,
excludeCalendars = config.excludedCalendarIds ?: config.legacyExcludedCalendarIds?.map { "local:$it" } ?: emptyList(),
excludeCalendars = config.excludedCalendarIds
?: config.legacyExcludedCalendarIds?.map { "local:$it" } ?: emptyList(),
).collectLatest { events ->
searchableRepository.getKeys(
includeTypes = listOf("calendar", "tasks.org", "plugin.calendar"),

1
app/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/weather/WeatherWidget.kt
View File

@@ -252,6 +252,7 @@ fun CurrentWeather(
context.packageManager.resolveActivity(
Intent(Intent.ACTION_MAIN).also {
it.addCategory(Intent.CATEGORY_APP_WEATHER)
it.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
}, 0
)
}