Skip to content

Commit 82c9107

Browse files
Add LogHelper with centralized log tags
1 parent bf7b8c0 commit 82c9107

File tree

7 files changed

+34
-7
lines changed

7 files changed

+34
-7
lines changed

app/src/main/kotlin/com/d4rk/cleaner/app/clean/analyze/ui/AnalyzeScreen.kt

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,10 @@ import com.d4rk.cleaner.app.clean.scanner.domain.data.model.ui.FileEntry
3636
import com.d4rk.cleaner.app.clean.scanner.domain.data.model.ui.UiScannerModel
3737
import com.d4rk.cleaner.app.clean.scanner.ui.ScannerViewModel
3838
import com.d4rk.cleaner.app.clean.scanner.ui.components.TwoRowButtons
39+
import com.d4rk.cleaner.core.utils.helpers.LogHelper
3940
import kotlinx.coroutines.CoroutineScope
4041

41-
private const val TAG = "AnalyzeScreen"
42+
private const val TAG = LogHelper.ANALYZE_SCREEN
4243

4344
@OptIn(ExperimentalAnimationApi::class)
4445
@Composable
@@ -69,17 +70,23 @@ fun AnalyzeScreen(
6970
when (data.analyzeState.state) {
7071

7172
CleaningState.Analyzing -> {
73+
Log.d(TAG, "Analyzing files")
7274
LoadingScreen()
7375
}
7476

7577
CleaningState.Cleaning -> {
78+
Log.d(
79+
TAG,
80+
"Cleaning: cleaned=${data.analyzeState.cleanedFilesCount} total=${data.analyzeState.totalFilesToClean}"
81+
)
7682
CleaningAnimationScreen(
7783
cleaned = data.analyzeState.cleanedFilesCount,
7884
total = data.analyzeState.totalFilesToClean,
7985
)
8086
}
8187

8288
CleaningState.ReadyToClean -> {
89+
Log.d(TAG, "ReadyToClean: groups=${groupedFiles.size}")
8390
if (groupedFiles.isNotEmpty()) {
8491
TabsContent(
8592
groupedFiles = groupedFiles,
@@ -89,22 +96,27 @@ fun AnalyzeScreen(
8996
data = data,
9097
)
9198
} else {
99+
Log.d(TAG, "No files found")
92100
NoFilesFoundScreen(viewModel = viewModel)
93101
}
94102
}
95103

96104
CleaningState.Result -> {
105+
Log.d(TAG, "Showing results")
97106
NoFilesFoundScreen(viewModel = viewModel)
98107
}
99108

100109
CleaningState.Error -> {
110+
Log.e(TAG, "Error state encountered")
101111
ErrorScreen(onRetry = {
102112
viewModel.resetAfterError()
103113
viewModel.onEvent(ScannerEvent.AnalyzeFiles)
104114
})
105115
}
106116

107-
CleaningState.Idle -> {}
117+
CleaningState.Idle -> {
118+
Log.d(TAG, "Idle state")
119+
}
108120
}
109121
}
110122
if (groupedFiles.isNotEmpty() && data.analyzeState.state == CleaningState.ReadyToClean) {

app/src/main/kotlin/com/d4rk/cleaner/app/clean/contacts/domain/usecases/GetDuplicateContactsUseCase.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,11 @@ import com.d4rk.cleaner.app.clean.contacts.data.ContactsRepository
66
import com.d4rk.cleaner.app.clean.contacts.domain.data.model.RawContactInfo
77
import com.d4rk.cleaner.core.domain.model.network.Errors
88
import com.d4rk.cleaner.core.utils.extensions.toError
9+
import com.d4rk.cleaner.core.utils.helpers.LogHelper
910
import kotlinx.coroutines.flow.Flow
1011
import kotlinx.coroutines.flow.flow
1112

12-
private const val TAG = "GetDuplicateContactsUseCase"
13+
private const val TAG = LogHelper.GET_DUPLICATE_CONTACTS_USE_CASE
1314

1415
class GetDuplicateContactsUseCase(private val repository: ContactsRepository) {
1516
operator fun invoke(): Flow<DataState<List<List<RawContactInfo>>, Errors>> = flow {

app/src/main/kotlin/com/d4rk/cleaner/app/clean/contacts/ui/ContactsCleanerViewModel.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ import com.d4rk.cleaner.app.clean.contacts.domain.usecases.DeleteOlderContactsUs
1717
import com.d4rk.cleaner.app.clean.contacts.domain.usecases.GetDuplicateContactsUseCase
1818
import com.d4rk.cleaner.app.clean.contacts.domain.usecases.MergeContactsUseCase
1919
import com.d4rk.cleaner.core.utils.extensions.asUiText
20+
import com.d4rk.cleaner.core.utils.helpers.LogHelper
2021
import kotlinx.coroutines.flow.collectLatest
2122
import kotlinx.coroutines.flow.update
2223

@@ -31,7 +32,7 @@ class ContactsCleanerViewModel(
3132
) {
3233

3334
companion object {
34-
private const val TAG = "ContactsCleanerViewModel"
35+
private const val TAG = LogHelper.CONTACTS_CLEANER_VIEW_MODEL
3536
}
3637

3738
init {

app/src/main/kotlin/com/d4rk/cleaner/app/clean/dashboard/ui/ScannerDashboardScreen.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ import com.d4rk.cleaner.app.clean.dashboard.ui.components.DashboardActionCard
5454
import com.d4rk.cleaner.app.clean.whatsapp.summary.ui.WhatsAppCleanerActivity
5555
import com.d4rk.cleaner.app.images.picker.ui.ImagePickerActivity
5656
import com.d4rk.cleaner.core.data.datastore.DataStore
57+
import com.d4rk.cleaner.core.utils.helpers.LogHelper
5758
import com.google.android.gms.common.ConnectionResult
5859
import com.google.android.gms.common.GoogleApiAvailability
5960
import org.koin.compose.koinInject
@@ -81,7 +82,7 @@ private sealed interface HomeItem {
8182
data class Ad(val slot: AdSlot) : HomeItem
8283
}
8384

84-
private const val TAG = "ScannerDashboardScreen"
85+
private const val TAG = LogHelper.SCANNER_DASHBOARD_SCREEN
8586

8687
@Composable
8788
fun ScannerDashboardScreen(

app/src/main/kotlin/com/d4rk/cleaner/app/clean/largefiles/ui/LargeFilesScreen.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,11 @@ import com.d4rk.cleaner.app.clean.analyze.ui.components.FilesByDateSection
2828
import com.d4rk.cleaner.app.clean.largefiles.domain.actions.LargeFilesEvent
2929
import com.d4rk.cleaner.app.clean.largefiles.domain.data.model.ui.UiLargeFilesModel
3030
import com.d4rk.cleaner.app.clean.scanner.domain.data.model.ui.CleaningState
31+
import com.d4rk.cleaner.core.utils.helpers.LogHelper
3132
import org.koin.compose.viewmodel.koinViewModel
3233
import java.io.File
3334

34-
private const val TAG = "LargeFilesScreen"
35+
private const val TAG = LogHelper.LARGE_FILES_SCREEN
3536
@OptIn(ExperimentalMaterial3Api::class)
3637
@Composable
3738
fun LargeFilesScreen(activity: LargeFilesActivity) {

app/src/main/kotlin/com/d4rk/cleaner/app/clean/scanner/work/FileCleanupWorker.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ import com.d4rk.cleaner.app.clean.scanner.domain.usecases.DeleteFilesUseCase
2020
import com.d4rk.cleaner.core.domain.model.network.Errors
2121
import com.d4rk.cleaner.core.utils.helpers.CleaningEventBus
2222
import com.d4rk.cleaner.core.utils.helpers.isProtectedAndroidDir
23+
import com.d4rk.cleaner.core.utils.helpers.LogHelper
2324
import com.google.android.material.color.MaterialColors
2425
import org.koin.core.component.KoinComponent
2526
import org.koin.core.component.inject
@@ -286,6 +287,6 @@ class FileCleanupWorker(
286287
const val MAX_PATHS_PER_WORKER = 100
287288
private const val NOTIFICATION_ID = 2001
288289
private const val NOTIFICATION_CHANNEL = "file_cleanup"
289-
private const val TAG = "FileCleanupWorker"
290+
private const val TAG = LogHelper.FILE_CLEANUP_WORKER
290291
}
291292
}
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
package com.d4rk.cleaner.core.utils.helpers
2+
3+
object LogHelper {
4+
const val CONTACTS_CLEANER_VIEW_MODEL = "ContactsCleanerViewModel"
5+
const val GET_DUPLICATE_CONTACTS_USE_CASE = "GetDuplicateContactsUseCase"
6+
const val ANALYZE_SCREEN = "AnalyzeScreen"
7+
const val SCANNER_DASHBOARD_SCREEN = "ScannerDashboardScreen"
8+
const val LARGE_FILES_SCREEN = "LargeFilesScreen"
9+
const val FILE_CLEANUP_WORKER = "FileCleanupWorker"
10+
}

0 commit comments

Comments
 (0)