Skip to content

Commit 8d75f30

Browse files
authored
[refactor] remove unnecessary my app log filter option (#72)
pid filter is unnecessary since can only get logs for own app without extra permissions
1 parent 8a44cde commit 8d75f30

File tree

2 files changed

+5
-45
lines changed

2 files changed

+5
-45
lines changed

debugoverlay-core/src/main/kotlin/com/ms/square/debugoverlay/internal/ui/LogcatTabContent.kt

Lines changed: 5 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package com.ms.square.debugoverlay.internal.ui
22

33
import android.content.ClipData
4-
import android.os.Process
54
import androidx.compose.animation.AnimatedVisibility
65
import androidx.compose.animation.fadeIn
76
import androidx.compose.animation.fadeOut
@@ -36,8 +35,6 @@ import androidx.compose.material3.IconButton
3635
import androidx.compose.material3.MaterialTheme
3736
import androidx.compose.material3.OutlinedTextField
3837
import androidx.compose.material3.Surface
39-
import androidx.compose.material3.Switch
40-
import androidx.compose.material3.SwitchDefaults
4138
import androidx.compose.material3.Text
4239
import androidx.compose.material3.TextFieldDefaults
4340
import androidx.compose.runtime.Composable
@@ -77,7 +74,6 @@ private const val TIMESTAMP_DISPLAY_LENGTH = 12 // HH:MM:SS.mmm
7774
*
7875
* Features:
7976
* - Filter by log level (V, D, I, W, E)
80-
* - Toggle between all logs and current app logs
8177
* - Auto-scroll to bottom for new entries
8278
* - Manual scroll pauses auto-scroll
8379
* - Tap log entry to copy to clipboard
@@ -90,21 +86,17 @@ internal fun LogcatTabContent(modifier: Modifier = Modifier) {
9086
val logcatEntries by DebugOverlay.overlayDataRepository.logs.collectAsStateWithLifecycle(emptyList())
9187

9288
var selectedLevel by remember { mutableStateOf(LogLevel.DEBUG) }
93-
var showOnlyMyApp by remember { mutableStateOf(true) }
9489
var isPaused by remember { mutableStateOf(false) }
9590
var isProgrammaticScroll by remember { mutableStateOf(false) }
9691
var searchQuery by remember { mutableStateOf("") }
9792

98-
val myPid = remember { Process.myPid() }
99-
100-
val filteredEntries = remember(logcatEntries, selectedLevel, showOnlyMyApp, searchQuery) {
93+
val filteredEntries = remember(logcatEntries, selectedLevel, searchQuery) {
10194
logcatEntries.filter { entry ->
10295
val levelMatch = entry.level.ordinal >= selectedLevel.ordinal
103-
val pidMatch = !showOnlyMyApp || entry.pid == myPid
10496
val searchMatch = searchQuery.isBlank() ||
10597
entry.message.contains(searchQuery, ignoreCase = true) ||
10698
entry.tag.contains(searchQuery, ignoreCase = true)
107-
levelMatch && pidMatch && searchMatch
99+
levelMatch && searchMatch
108100
}
109101
}
110102

@@ -128,9 +120,7 @@ internal fun LogcatTabContent(modifier: Modifier = Modifier) {
128120

129121
LogcatFilters(
130122
selectedLevel = selectedLevel,
131-
onLevelSelected = { selectedLevel = it },
132-
showOnlyMyApp = showOnlyMyApp,
133-
onShowOnlyMyAppChanged = { showOnlyMyApp = it }
123+
onLevelSelected = { selectedLevel = it }
134124
)
135125

136126
LogcatContent(
@@ -153,18 +143,13 @@ internal fun LogcatTabContent(modifier: Modifier = Modifier) {
153143
private fun LogcatFilters(
154144
selectedLevel: LogLevel,
155145
onLevelSelected: (LogLevel) -> Unit,
156-
showOnlyMyApp: Boolean,
157-
onShowOnlyMyAppChanged: (Boolean) -> Unit,
158146
modifier: Modifier = Modifier,
159147
) {
160-
val switchContentDescription = stringResource(R.string.debugoverlay_filter_my_app_description)
161-
162148
FlowRow(
163149
modifier = modifier
164150
.fillMaxWidth()
165-
.padding(horizontal = 4.dp, vertical = 4.dp),
166-
horizontalArrangement = Arrangement.spacedBy(4.dp),
167-
verticalArrangement = Arrangement.spacedBy(4.dp)
151+
.padding(horizontal = 8.dp, vertical = 4.dp),
152+
horizontalArrangement = Arrangement.spacedBy(8.dp)
168153
) {
169154
LogLevel.entries.forEach { level ->
170155
FilterChip(
@@ -174,29 +159,6 @@ private fun LogcatFilters(
174159
onClick = { onLevelSelected(level) }
175160
)
176161
}
177-
178-
Row(
179-
horizontalArrangement = Arrangement.spacedBy(4.dp),
180-
verticalAlignment = Alignment.CenterVertically,
181-
modifier = Modifier.padding(start = 4.dp)
182-
) {
183-
Text(
184-
text = stringResource(R.string.debugoverlay_my_app_filter),
185-
style = MaterialTheme.typography.labelSmall,
186-
color = MaterialTheme.colorScheme.onSurface
187-
)
188-
Switch(
189-
checked = showOnlyMyApp,
190-
onCheckedChange = onShowOnlyMyAppChanged,
191-
modifier = Modifier.semantics {
192-
contentDescription = switchContentDescription
193-
},
194-
colors = SwitchDefaults.colors(
195-
checkedThumbColor = Color.White,
196-
checkedTrackColor = MaterialTheme.colorScheme.primary
197-
)
198-
)
199-
}
200162
}
201163
}
202164

debugoverlay-core/src/main/res/values/strings.xml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<resources>
3-
<string name="debugoverlay_my_app_filter">My App</string>
43
<string name="debugoverlay_no_log_entries">No log entries</string>
54
<string name="debugoverlay_clipboard_label">Logcat Line</string>
65
<string name="debugoverlay_copy_to_clipboard">Copy log to clipboard</string>
76
<string name="debugoverlay_copied_to_clipboard">Copied to clipboard</string>
87
<string name="debugoverlay_scroll_to_bottom">Scroll to bottom</string>
9-
<string name="debugoverlay_filter_my_app_description">Filter to show only this app\'s logs</string>
108
<string name="debugoverlay_log_entry_description">Log entry: %1$s, %2$s</string>
119
<string name="debugoverlay_filter_chip_description">Filter by %1$s level logs</string>
1210
<string name="debugoverlay_search_logs">Search logs…</string>

0 commit comments

Comments
 (0)