Skip to content

Commit 40dc4a7

Browse files
pimterrypimterry
committed
Extract some constants
1 parent cc78c19 commit 40dc4a7

File tree

7 files changed

+142
-79
lines changed

7 files changed

+142
-79
lines changed

‎app/src/main/java/tech/httptoolkit/android/appselection/AppListScreen.kt‎

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ import com.google.accompanist.drawablepainter.rememberDrawablePainter
2323
import kotlinx.coroutines.Dispatchers
2424
import kotlinx.coroutines.withContext
2525
import tech.httptoolkit.android.R
26+
import tech.httptoolkit.android.ui.AppConstants
2627

2728
@Composable
2829
fun AppListScreen(
@@ -72,21 +73,21 @@ fun AppListScreen(
7273
modifier = modifier
7374
.fillMaxSize()
7475
.windowInsetsPadding(WindowInsets.statusBars.only(WindowInsetsSides.Top))
75-
.padding(horizontal = 16.dp)
76+
.padding(horizontal = AppConstants.spacingLarge)
7677
) {
7778
// Search and menu card
7879
Card(
7980
modifier = Modifier
8081
.fillMaxWidth()
81-
.padding(top = 8.dp)
82+
.padding(top = AppConstants.spacingSmall)
8283
.zIndex(1f),
83-
elevation = CardDefaults.cardElevation(defaultElevation = 4.dp),
84+
elevation = CardDefaults.cardElevation(defaultElevation = AppConstants.elevationDefault),
8485
colors = CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.surface)
8586
) {
8687
Row(
8788
modifier = Modifier
8889
.fillMaxWidth()
89-
.padding(horizontal = 16.dp),
90+
.padding(horizontal = AppConstants.spacingLarge),
9091
verticalAlignment = Alignment.CenterVertically
9192
) {
9293
TextField(
@@ -95,7 +96,7 @@ fun AppListScreen(
9596
placeholder = { Text(stringResource(R.string.all_applications)) },
9697
modifier = Modifier
9798
.weight(1f)
98-
.padding(vertical = 8.dp),
99+
.padding(vertical = AppConstants.spacingSmall),
99100
singleLine = true,
100101
colors = TextFieldDefaults.colors(
101102
focusedContainerColor = MaterialTheme.colorScheme.surface,
@@ -145,7 +146,7 @@ fun AppListScreen(
145146
checked = showEnabledOnly,
146147
onCheckedChange = null
147148
)
148-
Spacer(modifier = Modifier.width(8.dp))
149+
Spacer(modifier = Modifier.width(AppConstants.spacingSmall))
149150
Text(stringResource(R.string.show_enabled))
150151
}
151152
},
@@ -161,7 +162,7 @@ fun AppListScreen(
161162
checked = showSystem,
162163
onCheckedChange = null
163164
)
164-
Spacer(modifier = Modifier.width(8.dp))
165+
Spacer(modifier = Modifier.width(AppConstants.spacingSmall))
165166
Text(stringResource(R.string.show_system))
166167
}
167168
},
@@ -185,7 +186,7 @@ fun AppListScreen(
185186
} else {
186187
LazyColumn(
187188
modifier = Modifier.fillMaxSize(),
188-
contentPadding = PaddingValues(vertical = 8.dp)
189+
contentPadding = PaddingValues(vertical = AppConstants.spacingSmall)
189190
) {
190191
items(
191192
items = filteredApps,
@@ -228,13 +229,13 @@ fun AppListItem(
228229
Card(
229230
modifier = modifier
230231
.fillMaxWidth()
231-
.padding(vertical = 4.dp, horizontal = 8.dp),
232+
.padding(vertical = AppConstants.spacingTiny, horizontal = AppConstants.spacingSmall),
232233
colors = CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.surface)
233234
) {
234235
Row(
235236
modifier = Modifier
236237
.fillMaxWidth()
237-
.padding(vertical = 8.dp, horizontal = 16.dp),
238+
.padding(vertical = AppConstants.spacingSmall, horizontal = AppConstants.spacingLarge),
238239
verticalAlignment = Alignment.CenterVertically
239240
) {
240241
// App icon
@@ -243,14 +244,14 @@ fun AppListItem(
243244
contentDescription = stringResource(R.string.cd_app_icon, appLabel),
244245
modifier = Modifier
245246
.size(72.dp)
246-
.padding(vertical = 8.dp)
247+
.padding(vertical = AppConstants.spacingSmall)
247248
)
248249

249250
// App name and package
250251
Column(
251252
modifier = Modifier
252253
.weight(1f)
253-
.padding(horizontal = 8.dp)
254+
.padding(horizontal = AppConstants.spacingSmall)
254255
) {
255256
Text(
256257
text = appLabel,
@@ -271,7 +272,7 @@ fun AppListItem(
271272
checked = isEnabled,
272273
onCheckedChange = onEnabledChange,
273274
modifier = Modifier
274-
.padding(end = 8.dp)
275+
.padding(end = AppConstants.spacingSmall)
275276
)
276277
}
277278
}

‎app/src/main/java/tech/httptoolkit/android/connection/ConnectionStatusScreen.kt‎

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,9 @@ import tech.httptoolkit.android.ProxyConfig
2121
import tech.httptoolkit.android.R
2222
import tech.httptoolkit.android.portfilter.DEFAULT_PORTS
2323
import tech.httptoolkit.android.whereIsCertTrusted
24+
import tech.httptoolkit.android.ui.AppConstants
2425
import tech.httptoolkit.android.ui.DmSansFontFamily
26+
import tech.httptoolkit.android.ui.success
2527

2628
@Composable
2729
fun ConnectionStatusScreen(
@@ -38,7 +40,7 @@ fun ConnectionStatusScreen(
3840
Column(
3941
modifier = modifier
4042
.fillMaxWidth()
41-
.padding(horizontal = 16.dp, vertical = 4.dp)
43+
.padding(horizontal = AppConstants.spacingLarge, vertical = AppConstants.spacingTiny)
4244
) {
4345
// Connected to text
4446
Text(
@@ -57,7 +59,7 @@ fun ConnectionStatusScreen(
5759
.padding(bottom = 24.dp)
5860
)
5961

60-
val successColor = Color(0xFF4CAF7D)
62+
val successColor = MaterialTheme.colorScheme.success
6163
when (certTrustStatus) {
6264
"user" -> {
6365
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N) {
@@ -113,7 +115,7 @@ fun ConnectionStatusScreen(
113115
// App and Port interception buttons
114116
Row(
115117
modifier = Modifier.fillMaxWidth(),
116-
horizontalArrangement = Arrangement.spacedBy(10.dp)
118+
horizontalArrangement = Arrangement.spacedBy(AppConstants.spacingNormal)
117119
) {
118120
InterceptionButton(
119121
icon = R.drawable.ic_apps_24,
@@ -144,15 +146,15 @@ private fun CertificateStatusCard(
144146
Card(
145147
modifier = modifier
146148
.fillMaxWidth()
147-
.padding(bottom = 10.dp),
149+
.padding(bottom = AppConstants.spacingNormal),
148150
colors = CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.surface),
149-
elevation = CardDefaults.cardElevation(defaultElevation = 0.dp)
151+
elevation = CardDefaults.cardElevation(defaultElevation = AppConstants.elevationNone)
150152
) {
151153
Column(
152-
modifier = Modifier.padding(10.dp)
154+
modifier = Modifier.padding(AppConstants.spacingNormal)
153155
) {
154156
Row(
155-
horizontalArrangement = Arrangement.spacedBy(10.dp),
157+
horizontalArrangement = Arrangement.spacedBy(AppConstants.spacingNormal),
156158
verticalAlignment = Alignment.CenterVertically
157159
) {
158160
Icon(
@@ -162,18 +164,18 @@ private fun CertificateStatusCard(
162164
)
163165
Text(
164166
text = heading.uppercase(),
165-
fontSize = 14.sp,
167+
fontSize = AppConstants.textSizeCaption,
166168
fontFamily = DmSansFontFamily,
167169
fontWeight = FontWeight.Bold,
168170
color = MaterialTheme.colorScheme.outline
169171
)
170172
}
171173

172174
if (details != null) {
173-
Spacer(modifier = Modifier.height(4.dp))
175+
Spacer(modifier = Modifier.height(AppConstants.spacingTiny))
174176
Text(
175177
text = details,
176-
fontSize = 14.sp,
178+
fontSize = AppConstants.textSizeCaption,
177179
lineHeight = 18.sp,
178180
fontFamily = DmSansFontFamily,
179181
fontWeight = FontWeight.Normal,
@@ -202,7 +204,7 @@ private fun InterceptionButton(
202204
modifier = Modifier
203205
.fillMaxWidth()
204206
.padding(6.dp),
205-
horizontalArrangement = Arrangement.spacedBy(8.dp)
207+
horizontalArrangement = Arrangement.spacedBy(AppConstants.spacingSmall)
206208
) {
207209
Icon(
208210
painter = painterResource(id = icon),
@@ -211,7 +213,7 @@ private fun InterceptionButton(
211213
)
212214
Text(
213215
text = text,
214-
fontSize = 14.sp,
216+
fontSize = AppConstants.textSizeCaption,
215217
fontFamily = DmSansFontFamily,
216218
color = MaterialTheme.colorScheme.onSurface
217219
)

0 commit comments

Comments
 (0)