Skip to content

Commit 330eb50

Browse files
committed
feat(Matomo): Use same names as iOS
1 parent ba103ae commit 330eb50

File tree

3 files changed

+16
-13
lines changed

3 files changed

+16
-13
lines changed

app/src/main/java/com/infomaniak/swisstransfer/ui/MatomoSwissTransfer.kt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,10 @@ object MatomoSwissTransfer : Matomo {
4848
}
4949
}
5050

51+
fun trackScreen(title: String) {
52+
trackScreen(path = "/$title", title = title)
53+
}
54+
5155
fun trackTransferTypeEvent(name: String) {
5256
trackEvent("transferType", name)
5357
}

app/src/main/java/com/infomaniak/swisstransfer/ui/navigation/NavigationDestination.kt

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ sealed class MainNavigation(override val matomoValue: String) : NavigationDestin
5151

5252
// If it has to be renamed, don't forget to rename `*DestinationName` in the companion object too.
5353
@Serializable
54-
data class SentDestination(val transferUuid: String? = null) : MainNavigation("SentScreen") {
54+
data class SentDestination(val transferUuid: String? = null) : MainNavigation("SentView") {
5555

5656
companion object {
5757
fun NavGraphBuilder.sentDestination(content: @Composable (AnimatedContentScope.(NavBackStackEntry) -> Unit)) {
@@ -62,7 +62,7 @@ sealed class MainNavigation(override val matomoValue: String) : NavigationDestin
6262

6363
// If it has to be renamed, don't forget to rename `*DestinationName` in the companion object too.
6464
@Serializable
65-
data class ReceivedDestination(val transferUuid: String? = null) : MainNavigation("ReceivedScreen") {
65+
data class ReceivedDestination(val transferUuid: String? = null) : MainNavigation("ReceivedView") {
6666

6767
companion object {
6868
fun NavGraphBuilder.receivedDestination(content: @Composable (AnimatedContentScope.(NavBackStackEntry) -> Unit)) {
@@ -72,7 +72,7 @@ sealed class MainNavigation(override val matomoValue: String) : NavigationDestin
7272
}
7373

7474
@Serializable
75-
data object SettingsDestination : MainNavigation("SettingsScreen")
75+
data object SettingsDestination : MainNavigation("SettingsView")
7676

7777
companion object {
7878
private val TAG = MainNavigation::class.java.simpleName
@@ -114,37 +114,37 @@ sealed class MainNavigation(override val matomoValue: String) : NavigationDestin
114114
sealed class NewTransferNavigation(override val matomoValue: String) : NavigationDestination() {
115115

116116
@Serializable
117-
data object ImportFilesDestination : NewTransferNavigation("ImportFileScreen")
117+
data object ImportFilesDestination : NewTransferNavigation("ImportFileView")
118118

119119
@Serializable
120-
data class ValidateUserEmailDestination(val authorEmail: String) : NewTransferNavigation("ValidateUserEmailScreen")
120+
data class ValidateUserEmailDestination(val authorEmail: String) : NewTransferNavigation("ValidateUserEmailView")
121121

122122
@Serializable
123123
data class UploadProgressDestination(
124124
val transferType: TransferTypeUi,
125125
val totalSize: Long,
126126
val authorEmail: String?,
127-
) : NewTransferNavigation("UploadProgressScreen")
127+
) : NewTransferNavigation("UploadProgressView")
128128

129129
@Serializable
130130
data class UploadSuccessDestination(
131131
val transferType: TransferTypeUi,
132132
val transferUuid: String,
133133
val transferUrl: String,
134-
) : NewTransferNavigation("UploadSuccessScreen")
134+
) : NewTransferNavigation("UploadSuccessView")
135135

136136
@Serializable
137137
data class UploadErrorDestination(
138138
val transferType: TransferTypeUi,
139139
val totalSize: Long,
140140
val authorEmail: String?,
141-
) : NewTransferNavigation("UploadErrorScreen")
141+
) : NewTransferNavigation("UploadErrorView")
142142

143143
@Serializable
144-
data object UploadIntegrityErrorDestination : NewTransferNavigation("UploadIntegrityErrorScreen")
144+
data object UploadIntegrityErrorDestination : NewTransferNavigation("UploadIntegrityErrorView")
145145

146146
@Serializable
147-
data object NewTransferFilesDetailsDestination : NewTransferNavigation("NewTransferFilesDetailsScreen")
147+
data object NewTransferFilesDetailsDestination : NewTransferNavigation("NewTransferFilesDetailsView")
148148

149149
companion object {
150150
val startDestination = ImportFilesDestination
@@ -198,6 +198,6 @@ sealed class NavigationDestination {
198198
abstract val matomoValue: String
199199

200200
fun trackScreen() {
201-
MatomoSwissTransfer.trackScreen(path = "/$matomoValue", title = matomoValue)
201+
MatomoSwissTransfer.trackScreen(title = matomoValue)
202202
}
203203
}

app/src/main/java/com/infomaniak/swisstransfer/ui/screen/main/transfers/TransfersScreenWrapper.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,8 +141,7 @@ private fun ThreePaneScaffoldNavigator<DestinationContent>.navigateToDetails(
141141
direction: TransferDirection,
142142
transferUuid: String,
143143
) {
144-
val destinationName = "${direction.name.lowercase()}TransferDetail"
145-
MatomoSwissTransfer.trackScreen(path = destinationName, title = destinationName)
144+
MatomoSwissTransfer.trackScreen("${direction.name.lowercase()}TransferDetailView")
146145
selectItem(context, windowAdaptiveInfo, DestinationContent.RootLevel(direction, transferUuid))
147146
}
148147

0 commit comments

Comments
 (0)