From c5592a003d5e27a2c0e0e85589e6d241613b4425 Mon Sep 17 00:00:00 2001 From: Kevin Schildhorn Date: Thu, 24 Oct 2024 14:07:34 -0400 Subject: [PATCH] running formatting --- .../NotificationLocalizedStringFactory.kt | 23 ++++++++++++++++--- .../ios/util/formatter/IOSDateFormatter.kt | 3 ++- .../co/touchlab/droidcon/ui/util/Dialog.kt | 2 +- .../ui/session/SessionListView.kt | 5 +++- .../touchlab/droidcon/ui/util/ToSkiaImage.kt | 3 ++- .../util/formatter/AndroidDateFormatter.kt | 6 ++--- .../domain/service/impl/DefaultSyncService.kt | 10 ++++++-- .../kotlin/co/touchlab/droidcon/MainScope.kt | 2 +- .../droidcon/util/BundleResourceReader.kt | 6 ++++- 9 files changed, 46 insertions(+), 14 deletions(-) diff --git a/ios/src/iosMain/kotlin/co/touchlab/droidcon/ios/util/NotificationLocalizedStringFactory.kt b/ios/src/iosMain/kotlin/co/touchlab/droidcon/ios/util/NotificationLocalizedStringFactory.kt index 783791d1..8ff23978 100644 --- a/ios/src/iosMain/kotlin/co/touchlab/droidcon/ios/util/NotificationLocalizedStringFactory.kt +++ b/ios/src/iosMain/kotlin/co/touchlab/droidcon/ios/util/NotificationLocalizedStringFactory.kt @@ -12,12 +12,29 @@ class NotificationLocalizedStringFactory( ) : NotificationSchedulingService.LocalizedStringFactory { override fun reminderTitle(roomName: String?): String { - val ending = roomName?.let { NSString.stringWithFormat(bundle.localizedStringForKey("Notification.Reminder.Title.InRoom", null, null).convertParametersForPrintf(), it.cstr) } ?: "" - return NSString.stringWithFormat(bundle.localizedStringForKey("Notification.Reminder.Title.Base", null, null).convertParametersForPrintf(), ending.cstr) + val ending = roomName?.let { + NSString + .stringWithFormat( + bundle.localizedStringForKey("Notification.Reminder.Title.InRoom", null, null) + .convertParametersForPrintf(), + it.cstr + ) + } ?: "" + return NSString + .stringWithFormat( + bundle.localizedStringForKey("Notification.Reminder.Title.Base", null, null) + .convertParametersForPrintf(), + ending.cstr + ) } override fun reminderBody(sessionTitle: String): String { - return NSString.stringWithFormat(bundle.localizedStringForKey("Notification.Reminder.Body", null, null).convertParametersForPrintf(), sessionTitle.cstr) + return NSString + .stringWithFormat( + bundle.localizedStringForKey("Notification.Reminder.Body", null, null) + .convertParametersForPrintf(), + sessionTitle.cstr + ) } override fun feedbackTitle(): String { diff --git a/ios/src/iosMain/kotlin/co/touchlab/droidcon/ios/util/formatter/IOSDateFormatter.kt b/ios/src/iosMain/kotlin/co/touchlab/droidcon/ios/util/formatter/IOSDateFormatter.kt index 0e1385c7..a2140f47 100644 --- a/ios/src/iosMain/kotlin/co/touchlab/droidcon/ios/util/formatter/IOSDateFormatter.kt +++ b/ios/src/iosMain/kotlin/co/touchlab/droidcon/ios/util/formatter/IOSDateFormatter.kt @@ -48,7 +48,8 @@ class IOSDateFormatter : DateFormatter { private fun LocalDate.date() = NSCalendar.currentCalendar.dateFromComponents(toNSDateComponents()) private fun LocalDateTime.date() = - NSCalendar.currentCalendar.dateFromComponents(toNSDateComponents()) // TODOKPG - Pretty sure this is device time zone, might be OK. Just for local formating + // TODOKPG - Pretty sure this is device time zone, might be OK. Just for local formating + NSCalendar.currentCalendar.dateFromComponents(toNSDateComponents()) private fun interval(from: String?, to: String?) = listOfNotNull(from, to).joinToString(" – ") } diff --git a/shared-ui/src/androidMain/kotlin/co/touchlab/droidcon/ui/util/Dialog.kt b/shared-ui/src/androidMain/kotlin/co/touchlab/droidcon/ui/util/Dialog.kt index 1a040985..82eb170e 100644 --- a/shared-ui/src/androidMain/kotlin/co/touchlab/droidcon/ui/util/Dialog.kt +++ b/shared-ui/src/androidMain/kotlin/co/touchlab/droidcon/ui/util/Dialog.kt @@ -2,8 +2,8 @@ package co.touchlab.droidcon.ui.util import androidx.compose.runtime.Composable import androidx.compose.ui.ExperimentalComposeUiApi -import androidx.compose.ui.window.DialogProperties import androidx.compose.ui.window.Dialog as AndroidXComposeDialog +import androidx.compose.ui.window.DialogProperties @OptIn(ExperimentalComposeUiApi::class) @Composable diff --git a/shared-ui/src/commonMain/kotlin/co.touchlab.droidcon/ui/session/SessionListView.kt b/shared-ui/src/commonMain/kotlin/co.touchlab.droidcon/ui/session/SessionListView.kt index d3b42cf5..e593e5d5 100644 --- a/shared-ui/src/commonMain/kotlin/co.touchlab.droidcon/ui/session/SessionListView.kt +++ b/shared-ui/src/commonMain/kotlin/co.touchlab.droidcon/ui/session/SessionListView.kt @@ -112,7 +112,10 @@ internal fun SessionListView( Modifier.tabIndicatorOffset(tabPositions[pagerState.currentPage]) ) } else { - Logger.w("SessionList TabRow requested an indicator for selectedTabIndex: ${pagerState.currentPage}, but only got ${tabPositions.count()} tabs.") + Logger.w( + "SessionList TabRow requested an indicator for selectedTabIndex: " + + "${pagerState.currentPage}, but only got ${tabPositions.count()} tabs." + ) TabRowDefaults.SecondaryIndicator() } } diff --git a/shared-ui/src/iosMain/kotlin/co/touchlab/droidcon/ui/util/ToSkiaImage.kt b/shared-ui/src/iosMain/kotlin/co/touchlab/droidcon/ui/util/ToSkiaImage.kt index 8aa2044f..3173b42e 100644 --- a/shared-ui/src/iosMain/kotlin/co/touchlab/droidcon/ui/util/ToSkiaImage.kt +++ b/shared-ui/src/iosMain/kotlin/co/touchlab/droidcon/ui/util/ToSkiaImage.kt @@ -37,7 +37,8 @@ internal fun UIImage.toSkiaImage(): Image? { val alphaType = when (alphaInfo) { CGImageAlphaInfo.kCGImageAlphaPremultipliedFirst, CGImageAlphaInfo.kCGImageAlphaPremultipliedLast -> ColorAlphaType.PREMUL CGImageAlphaInfo.kCGImageAlphaFirst, CGImageAlphaInfo.kCGImageAlphaLast -> ColorAlphaType.UNPREMUL - CGImageAlphaInfo.kCGImageAlphaNone, CGImageAlphaInfo.kCGImageAlphaNoneSkipFirst, CGImageAlphaInfo.kCGImageAlphaNoneSkipLast -> ColorAlphaType.OPAQUE + CGImageAlphaInfo.kCGImageAlphaNone, CGImageAlphaInfo.kCGImageAlphaNoneSkipFirst, CGImageAlphaInfo.kCGImageAlphaNoneSkipLast + -> ColorAlphaType.OPAQUE else -> ColorAlphaType.UNKNOWN } diff --git a/shared/src/androidMain/kotlin/co/touchlab/droidcon/util/formatter/AndroidDateFormatter.kt b/shared/src/androidMain/kotlin/co/touchlab/droidcon/util/formatter/AndroidDateFormatter.kt index 2c095524..28cb36ca 100644 --- a/shared/src/androidMain/kotlin/co/touchlab/droidcon/util/formatter/AndroidDateFormatter.kt +++ b/shared/src/androidMain/kotlin/co/touchlab/droidcon/util/formatter/AndroidDateFormatter.kt @@ -2,13 +2,13 @@ package co.touchlab.droidcon.util.formatter import co.touchlab.droidcon.Constants.conferenceTimeZone import co.touchlab.droidcon.domain.service.DateTimeService -import kotlinx.datetime.LocalDate -import kotlinx.datetime.LocalDateTime -import kotlinx.datetime.atTime import java.text.DateFormat import java.text.SimpleDateFormat import java.util.Date import java.util.Locale +import kotlinx.datetime.LocalDate +import kotlinx.datetime.LocalDateTime +import kotlinx.datetime.atTime class AndroidDateFormatter(private val dateTimeService: DateTimeService) : DateFormatter { diff --git a/shared/src/commonMain/kotlin/co/touchlab/droidcon/domain/service/impl/DefaultSyncService.kt b/shared/src/commonMain/kotlin/co/touchlab/droidcon/domain/service/impl/DefaultSyncService.kt index 4e72b7f3..c8abbc62 100644 --- a/shared/src/commonMain/kotlin/co/touchlab/droidcon/domain/service/impl/DefaultSyncService.kt +++ b/shared/src/commonMain/kotlin/co/touchlab/droidcon/domain/service/impl/DefaultSyncService.kt @@ -86,7 +86,10 @@ class DefaultSyncService( while (isActive) { val lastSessionizeSync = lastSessionizeSync // If this is the first Sessionize sync or if the last sync occurred more than 2 hours ago. - if (lastSessionizeSync == null || lastSessionizeSync <= dateTimeService.now().minus(SESSIONIZE_SYNC_SINCE_LAST_MINUTES, DateTimeUnit.MINUTE)) { + if ( + lastSessionizeSync == null || + lastSessionizeSync <= dateTimeService.now().minus(SESSIONIZE_SYNC_SINCE_LAST_MINUTES, DateTimeUnit.MINUTE) + ) { try { runApiDataSourcesSynchronization() } catch (e: Exception) { @@ -280,7 +283,10 @@ class DefaultSyncService( } } - private fun updateSponsorsFromDataSource(sponsorSessionsGroups: List, sponsors: SponsorsDto.SponsorCollectionDto) { + private fun updateSponsorsFromDataSource( + sponsorSessionsGroups: List, + sponsors: SponsorsDto.SponsorCollectionDto + ) { val sponsorSessions = sponsorSessionsGroups.flatMap { it.sessions }.associateBy { it.id } val sponsorGroupsToSponsorDtos = sponsors.groups.map { group -> val groupName = (group.name.split('/').lastOrNull() ?: group.name) diff --git a/shared/src/iosMain/kotlin/co/touchlab/droidcon/MainScope.kt b/shared/src/iosMain/kotlin/co/touchlab/droidcon/MainScope.kt index e36ec876..782d5ef1 100644 --- a/shared/src/iosMain/kotlin/co/touchlab/droidcon/MainScope.kt +++ b/shared/src/iosMain/kotlin/co/touchlab/droidcon/MainScope.kt @@ -2,10 +2,10 @@ package co.touchlab.droidcon import co.touchlab.droidcon.util.printThrowable import co.touchlab.kermit.Logger +import kotlin.coroutines.CoroutineContext import kotlinx.coroutines.CoroutineExceptionHandler import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.SupervisorJob -import kotlin.coroutines.CoroutineContext class MainScope(private val mainContext: CoroutineContext, private val log: Logger) : CoroutineScope { diff --git a/shared/src/iosMain/kotlin/co/touchlab/droidcon/util/BundleResourceReader.kt b/shared/src/iosMain/kotlin/co/touchlab/droidcon/util/BundleResourceReader.kt index bbff7c72..13e1d3e5 100644 --- a/shared/src/iosMain/kotlin/co/touchlab/droidcon/util/BundleResourceReader.kt +++ b/shared/src/iosMain/kotlin/co/touchlab/droidcon/util/BundleResourceReader.kt @@ -33,7 +33,11 @@ class BundleResourceReader( name to null } } - val path = bundle.pathForResource(filename, type) ?: error("Couldn't get path of $name (parsed as: ${listOfNotNull(filename, type).joinToString(".")})") + val path = bundle + .pathForResource(filename, type) ?: error( + "Couldn't get path of $name (parsed as: ${listOfNotNull(filename, type) + .joinToString(".")})" + ) return memScoped { val errorPtr = alloc>()