Skip to content

Commit 4723516

Browse files
committed
Fix all code style violations
1 parent d195b8c commit 4723516

File tree

40 files changed

+179
-147
lines changed

40 files changed

+179
-147
lines changed

kanalytics-viewer/src/androidMain/kotlin/com/addhen/kanalytics/viewer/app/NotificationManager.android.kt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,9 @@ internal class NotificationManagerImpl : NotificationManager {
3737

3838
override fun showNotification(eventName: String, trackerName: String) {
3939
val context = ContextInitializer.applicationContext
40-
addNotificationToBuffer(context.getString(R.string.notification_message, eventName, trackerName))
40+
addNotificationToBuffer(
41+
context.getString(R.string.notification_message, eventName, trackerName),
42+
)
4143
if (MainActivity.isInForeground) {
4244
return
4345
}
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
// Copyright 2025, Addhen Ltd and the kanalytics project contributors
2+
// SPDX-License-Identifier: Apache-2.0
3+
14
package com.addhen.kanalytics.viewer.app
25

36
internal actual fun randomUuidHash(): Int = java.util.UUID.randomUUID().hashCode()

kanalytics-viewer/src/androidMain/kotlin/com/addhen/kanalytics/viewer/app/shared/ui/LaunchViewerApp.android.kt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
// Copyright 2025, Addhen Ltd and the kanalytics project contributors
2+
// SPDX-License-Identifier: Apache-2.0
3+
14
package com.addhen.kanalytics.viewer.app.shared.ui
25

36
import android.content.Intent

kanalytics-viewer/src/androidMain/kotlin/com/addhen/kanalytics/viewer/app/shared/ui/theme/Type.android.kt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,14 @@
1+
// Copyright 2025, Addhen Ltd and the kanalytics project contributors
2+
// SPDX-License-Identifier: Apache-2.0
3+
14
package com.addhen.kanalytics.viewer.app.shared.ui.theme
25

36
import androidx.compose.runtime.Composable
4-
import org.jetbrains.compose.resources.Font
57
import androidx.compose.ui.text.font.FontFamily
68
import com.addhen.kanalytics.kanalytics_viewer.generated.resources.JetBrainsMono_Italic_VariableFont_wght
79
import com.addhen.kanalytics.kanalytics_viewer.generated.resources.JetBrainsMono_VariableFont_wght
810
import com.addhen.kanalytics.kanalytics_viewer.generated.resources.Res
11+
import org.jetbrains.compose.resources.Font
912

1013
@Composable
1114
internal actual fun jetbrainsMonoFontFamily(): FontFamily = FontFamily(
Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
// Copyright 2025, Addhen Ltd and the kanalytics project contributors
2+
// SPDX-License-Identifier: Apache-2.0
3+
14
package com.addhen.kanalytics
25

36
import com.addhen.kanalytics.viewer.app.shared.ui.component.UiMessage
@@ -13,7 +16,7 @@ import kotlinx.coroutines.flow.stateIn
1316

1417
internal fun <T> Flow<T>.stateInWhileSubscribed(
1518
scope: CoroutineScope,
16-
initialValue: T
19+
initialValue: T,
1720
): StateFlow<T> {
1821
return stateIn(
1922
scope = scope,
@@ -22,11 +25,10 @@ internal fun <T> Flow<T>.stateInWhileSubscribed(
2225
)
2326
}
2427

25-
internal fun <T> Flow<T>.handleErrorWithRetry(
26-
uiMessageStateHolder: UiMessageStateHolder
27-
): Flow<T> = retry { throwable ->
28-
throwable.printStackTrace()
29-
val action = uiMessageStateHolder
30-
.showMessage(UiMessage(message = throwable.message ?: "An error occurred"))
31-
action == UiMessageAction.ActionPerformed
32-
}.catch { /* Do nothing if the user dose not retry. */ }
28+
internal fun <T> Flow<T>.handleErrorWithRetry(uiMessageStateHolder: UiMessageStateHolder): Flow<T> =
29+
retry { throwable ->
30+
throwable.printStackTrace()
31+
val action = uiMessageStateHolder
32+
.showMessage(UiMessage(message = throwable.message ?: "An error occurred"))
33+
action == UiMessageAction.ActionPerformed
34+
}.catch { /* Do nothing if the user dose not retry. */ }
Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
package com.addhen.kanalytics.viewer.app
1+
// Copyright 2025, Addhen Ltd and the kanalytics project contributors
2+
// SPDX-License-Identifier: Apache-2.0
23

4+
package com.addhen.kanalytics.viewer.app
35

46
internal expect fun randomUuidHash(): Int

kanalytics-viewer/src/commonMain/kotlin/com/addhen/kanalytics/viewer/app/shared/data/repository/EventDataRepository.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ internal class EventDataRepository(
7171
trackerName = eventDataEntity.trackerName,
7272
description = eventDataEntity.description,
7373
createdAt = eventDataEntity.createdAt,
74-
properties = eventDataEntity.properties
74+
properties = eventDataEntity.properties,
7575
)
7676
}
7777
}

kanalytics-viewer/src/commonMain/kotlin/com/addhen/kanalytics/viewer/app/shared/ui/AnnotatedStringBuilder.kt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
// Copyright 2025, Addhen Ltd and the kanalytics project contributors
2+
// SPDX-License-Identifier: Apache-2.0
3+
14
package com.addhen.kanalytics.viewer.app.shared.ui
25

36
import androidx.compose.ui.text.AnnotatedString

kanalytics-viewer/src/commonMain/kotlin/com/addhen/kanalytics/viewer/app/shared/ui/Instant.kt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
1+
// Copyright 2025, Addhen Ltd and the kanalytics project contributors
2+
// SPDX-License-Identifier: Apache-2.0
3+
14
import kotlinx.datetime.Instant
25
import kotlinx.datetime.TimeZone
36
import kotlinx.datetime.toLocalDateTime
47

58
internal fun Instant.toFormattedString(
6-
timezone: TimeZone = TimeZone.currentSystemDefault()
9+
timezone: TimeZone = TimeZone.currentSystemDefault(),
710
): String {
811
val localDateTime = this.toLocalDateTime(timezone)
912
return buildString {

kanalytics-viewer/src/commonMain/kotlin/com/addhen/kanalytics/viewer/app/shared/ui/LaunchViewerApp.kt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
// Copyright 2025, Addhen Ltd and the kanalytics project contributors
2+
// SPDX-License-Identifier: Apache-2.0
3+
14
package com.addhen.kanalytics.viewer.app.shared.ui
25

36
public expect fun launchViewerApp()

kanalytics-viewer/src/commonMain/kotlin/com/addhen/kanalytics/viewer/app/shared/ui/ViewerApp.kt

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,7 @@ import com.addhen.kanalytics.viewer.app.shared.ui.navigation.EventViewerRoute
1313
import com.addhen.kanalytics.viewer.app.shared.ui.theme.AppTheme
1414

1515
@Composable
16-
public fun ViewerApp(
17-
navController: NavHostController = rememberNavController()
18-
) {
19-
16+
public fun ViewerApp(navController: NavHostController = rememberNavController()) {
2017
DisposableEffect(Unit) {
2118
onDispose {
2219
disposeViewerAppWindow()
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
// Copyright 2025, Addhen Ltd and the kanalytics project contributors
2+
// SPDX-License-Identifier: Apache-2.0
3+
14
package com.addhen.kanalytics.viewer.app.shared.ui.component
25

36
import androidx.compose.foundation.layout.systemBarsPadding
@@ -14,17 +17,17 @@ import androidx.compose.ui.unit.dp
1417

1518
@Composable
1619
public fun AppSnackbarHost(
17-
hostState: SnackbarHostState,
18-
modifier: Modifier = Modifier,
19-
snackbar: @Composable (SnackbarData) -> Unit = { Snackbar(it) }
20+
hostState: SnackbarHostState,
21+
modifier: Modifier = Modifier,
22+
snackbar: @Composable (SnackbarData) -> Unit = { Snackbar(it) },
2023
) {
21-
SnackbarHost(
22-
hostState = hostState,
23-
modifier = modifier
24-
.systemBarsPadding()
25-
// Limit the Snackbar width for large screens
26-
.wrapContentWidth(align = Alignment.Start)
27-
.widthIn(max = 550.dp),
28-
snackbar = snackbar
29-
)
24+
SnackbarHost(
25+
hostState = hostState,
26+
modifier = modifier
27+
.systemBarsPadding()
28+
// Limit the Snackbar width for large screens
29+
.wrapContentWidth(align = Alignment.Start)
30+
.widthIn(max = 550.dp),
31+
snackbar = snackbar,
32+
)
3033
}

kanalytics-viewer/src/commonMain/kotlin/com/addhen/kanalytics/viewer/app/shared/ui/component/ConfirmationDialog.kt

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
// Copyright 2025, Addhen Ltd and the kanalytics project contributors
2+
// SPDX-License-Identifier: Apache-2.0
3+
14
package com.addhen.kanalytics.viewer.app.shared.ui.component
25

36
import androidx.compose.material3.AlertDialog
@@ -18,7 +21,7 @@ internal fun ConfirmationDialog(
1821
confirmButtonText: String = stringResource(Res.string.confirm),
1922
dismissButtonText: String = stringResource(Res.string.cancel),
2023
onConfirm: () -> Unit,
21-
onDismiss: () -> Unit
24+
onDismiss: () -> Unit,
2225
) {
2326
AlertDialog(
2427
onDismissRequest = onDismiss,
@@ -27,7 +30,7 @@ internal fun ConfirmationDialog(
2730
text = title,
2831
style = MaterialTheme.typography.headlineSmall,
2932
color = MaterialTheme.colorScheme.onSurface,
30-
textAlign = TextAlign.Center
33+
textAlign = TextAlign.Center,
3134
)
3235
},
3336
text = {
@@ -46,6 +49,6 @@ internal fun ConfirmationDialog(
4649
TextButton(onClick = onDismiss) {
4750
Text(text = dismissButtonText)
4851
}
49-
}
52+
},
5053
)
5154
}

kanalytics-viewer/src/commonMain/kotlin/com/addhen/kanalytics/viewer/app/shared/ui/component/Empty.kt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,9 @@ import androidx.compose.ui.unit.dp
1616

1717
@Composable
1818
public fun EmptyContent(modifier: Modifier = Modifier, title: @Composable () -> Unit) {
19-
Box(modifier = modifier.fillMaxSize(),
20-
contentAlignment = Alignment.Center
19+
Box(
20+
modifier = modifier.fillMaxSize(),
21+
contentAlignment = Alignment.Center,
2122
) {
2223
Column(
2324
modifier = modifier,

kanalytics-viewer/src/commonMain/kotlin/com/addhen/kanalytics/viewer/app/shared/ui/component/LoadingText.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright 2023, Addhen Limited and the FOSDEM Event app project contributors
1+
// Copyright 2023, Addhen Ltd and the kanalytics project contributors
22
// SPDX-License-Identifier: Apache-2.0
33

44
package com.addhen.kanalytics.viewer.app.shared.ui.component

kanalytics-viewer/src/commonMain/kotlin/com/addhen/kanalytics/viewer/app/shared/ui/component/UiMessage.kt

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
// Copyright 2025, Addhen Ltd and the kanalytics project contributors
2+
// SPDX-License-Identifier: Apache-2.0
3+
14
package com.addhen.kanalytics.viewer.app.shared.ui.component
25

36
import androidx.compose.material3.SnackbarDuration
@@ -52,24 +55,24 @@ internal fun SnackbarMessageEffect(
5255
}
5356

5457
internal class UiMessageManager : UiMessageStateHolder {
55-
private var _uiMessagesState by mutableStateOf(UiMessageState())
58+
private var _uiMessageState by mutableStateOf(UiMessageState())
5659

57-
override val uiMessageState: UiMessageState get() = _uiMessagesState
60+
override val uiMessageState: UiMessageState get() = _uiMessageState
5861

5962
override fun messageShown(messageId: Long, uiMessageAction: UiMessageAction) {
60-
val messages = _uiMessagesState.uiMessages.toMutableList()
63+
val messages = _uiMessageState.uiMessages.toMutableList()
6164
messages.indexOfFirst { it.id == messageId }.let { uiMessageIndex ->
6265
if (uiMessageIndex == -1) return@let
6366
messages[uiMessageIndex] = messages[uiMessageIndex].copy(action = uiMessageAction)
6467
}
65-
_uiMessagesState = _uiMessagesState.copy(uiMessages = messages)
68+
_uiMessageState = _uiMessageState.copy(uiMessages = messages)
6669
}
6770

6871
override suspend fun showMessage(message: UiMessage): UiMessageAction {
6972
val messages = uiMessageState.uiMessages.toMutableList()
7073
messages.add(message)
71-
_uiMessagesState = _uiMessagesState.copy(uiMessages = messages)
72-
val action = snapshotFlow { _uiMessagesState }.filter { messageState ->
74+
_uiMessageState = _uiMessageState.copy(uiMessages = messages)
75+
val action = snapshotFlow { _uiMessageState }.filter { messageState ->
7376
messageState.uiMessages.find { it.id == message.id }?.let { uiMessage ->
7477
val action = uiMessage.action
7578
action != null
@@ -79,11 +82,11 @@ internal class UiMessageManager : UiMessageStateHolder {
7982
checkNotNull(uiMessage.action)
8083
}.first()
8184

82-
val newMessages = _uiMessagesState.uiMessages.toMutableList()
85+
val newMessages = _uiMessageState.uiMessages.toMutableList()
8386
newMessages.find { it.id == message.id }?.let { uiMessage ->
8487
newMessages.remove(uiMessage)
8588
}
86-
_uiMessagesState = _uiMessagesState.copy(uiMessages = newMessages)
89+
_uiMessageState = _uiMessageState.copy(uiMessages = newMessages)
8790
return action
8891
}
8992

0 commit comments

Comments
 (0)