Skip to content

Commit fd1e830

Browse files
ItsusinnItsusinn
committed
change padding
1 parent 67aabd9 commit fd1e830

5 files changed

Lines changed: 119 additions & 217 deletions

File tree

‎app/src/main/java/rs/clash/android/ui/ConnectionsScreen.kt‎

Lines changed: 69 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -95,68 +95,68 @@ fun ConnectionsContent(
9595
modifier: Modifier = Modifier,
9696
) {
9797
LazyColumn(
98-
modifier = modifier.fillMaxSize(),
98+
modifier = modifier
99+
.fillMaxSize()
100+
.padding(horizontal = 16.dp),
99101
verticalArrangement = Arrangement.spacedBy(12.dp),
100102
) {
101103
// Summary Card
102104
item(key = "summary") {
103-
Box(modifier = Modifier.padding(horizontal = 16.dp)) {
104-
Card(
105-
modifier = Modifier.fillMaxWidth(),
106-
elevation = CardDefaults.cardElevation(defaultElevation = 2.dp),
105+
Card(
106+
modifier = Modifier.fillMaxWidth(),
107+
elevation = CardDefaults.cardElevation(defaultElevation = 2.dp),
108+
) {
109+
Column(
110+
modifier = Modifier.padding(16.dp),
111+
verticalArrangement = Arrangement.spacedBy(8.dp),
107112
) {
108-
Column(
109-
modifier = Modifier.padding(16.dp),
110-
verticalArrangement = Arrangement.spacedBy(8.dp),
113+
Text(
114+
text = stringResource(R.string.connections_summary),
115+
style = MaterialTheme.typography.titleMedium,
116+
fontWeight = FontWeight.Bold,
117+
)
118+
Row(
119+
modifier = Modifier.fillMaxWidth(),
120+
horizontalArrangement = Arrangement.SpaceBetween,
111121
) {
112-
Text(
113-
text = stringResource(R.string.connections_summary),
114-
style = MaterialTheme.typography.titleMedium,
115-
fontWeight = FontWeight.Bold,
116-
)
117-
Row(
118-
modifier = Modifier.fillMaxWidth(),
119-
horizontalArrangement = Arrangement.SpaceBetween,
120-
) {
121-
Column {
122-
Text(
123-
text = stringResource(R.string.connections_count),
124-
style = MaterialTheme.typography.bodyMedium,
125-
color = MaterialTheme.colorScheme.secondary,
126-
)
127-
Text(
128-
text = "${connections.size}",
129-
style = MaterialTheme.typography.titleLarge,
130-
fontWeight = FontWeight.Bold,
131-
color = MaterialTheme.colorScheme.primary,
132-
)
133-
}
134-
Column(horizontalAlignment = Alignment.End) {
135-
Text(
136-
text = stringResource(R.string.stat_download),
137-
style = MaterialTheme.typography.bodyMedium,
138-
color = MaterialTheme.colorScheme.secondary,
139-
)
140-
Text(
141-
text = formatSize(downloadTotal),
142-
style = MaterialTheme.typography.titleLarge,
143-
fontWeight = FontWeight.Bold,
144-
color = MaterialTheme.colorScheme.primary,
145-
)
146-
}
147-
Column(horizontalAlignment = Alignment.End) {
148-
Text(
149-
text = stringResource(R.string.stat_upload),
150-
style = MaterialTheme.typography.bodyMedium,
151-
color = MaterialTheme.colorScheme.secondary,
152-
)
153-
Text(
154-
text = formatSize(uploadTotal),
155-
style = MaterialTheme.typography.titleLarge,
156-
fontWeight = FontWeight.Bold,
157-
color = MaterialTheme.colorScheme.primary,
158-
)
159-
}
122+
Column {
123+
Text(
124+
text = stringResource(R.string.connections_count),
125+
style = MaterialTheme.typography.bodyMedium,
126+
color = MaterialTheme.colorScheme.secondary,
127+
)
128+
Text(
129+
text = "${connections.size}",
130+
style = MaterialTheme.typography.titleLarge,
131+
fontWeight = FontWeight.Bold,
132+
color = MaterialTheme.colorScheme.primary,
133+
)
134+
}
135+
Column(horizontalAlignment = Alignment.End) {
136+
Text(
137+
text = stringResource(R.string.stat_download),
138+
style = MaterialTheme.typography.bodyMedium,
139+
color = MaterialTheme.colorScheme.secondary,
140+
)
141+
Text(
142+
text = formatSize(downloadTotal),
143+
style = MaterialTheme.typography.titleLarge,
144+
fontWeight = FontWeight.Bold,
145+
color = MaterialTheme.colorScheme.primary,
146+
)
147+
}
148+
Column(horizontalAlignment = Alignment.End) {
149+
Text(
150+
text = stringResource(R.string.stat_upload),
151+
style = MaterialTheme.typography.bodyMedium,
152+
color = MaterialTheme.colorScheme.secondary,
153+
)
154+
Text(
155+
text = formatSize(uploadTotal),
156+
style = MaterialTheme.typography.titleLarge,
157+
fontWeight = FontWeight.Bold,
158+
color = MaterialTheme.colorScheme.primary,
159+
)
160160
}
161161
}
162162
}
@@ -166,20 +166,18 @@ fun ConnectionsContent(
166166
// Error message
167167
if (errorMessage != null) {
168168
item(key = "error") {
169-
Box(modifier = Modifier.padding(horizontal = 16.dp)) {
170-
Card(
171-
modifier = Modifier.fillMaxWidth(),
172-
colors =
173-
CardDefaults.cardColors(
174-
containerColor = MaterialTheme.colorScheme.errorContainer,
175-
),
176-
) {
177-
Text(
178-
text = errorMessage,
179-
modifier = Modifier.padding(16.dp),
180-
color = MaterialTheme.colorScheme.onErrorContainer,
181-
)
182-
}
169+
Card(
170+
modifier = Modifier.fillMaxWidth(),
171+
colors =
172+
CardDefaults.cardColors(
173+
containerColor = MaterialTheme.colorScheme.errorContainer,
174+
),
175+
) {
176+
Text(
177+
text = errorMessage,
178+
modifier = Modifier.padding(16.dp),
179+
color = MaterialTheme.colorScheme.onErrorContainer,
180+
)
183181
}
184182
}
185183
}
@@ -228,9 +226,7 @@ fun ConnectionsContent(
228226
),
229227
exit = fadeOut(animationSpec = tween(durationMillis = 200)),
230228
) {
231-
Box(modifier = Modifier.padding(horizontal = 16.dp)) {
232-
ConnectionItem(connection = connection)
233-
}
229+
ConnectionItem(connection = connection)
234230
}
235231
}
236232
}

‎app/src/main/java/rs/clash/android/ui/HomeScreen.kt‎

Lines changed: 43 additions & 141 deletions
Original file line numberDiff line numberDiff line change
@@ -121,162 +121,64 @@ fun OverviewTab(
121121
onConnectionsClick: () -> Unit = {},
122122
) {
123123
LazyColumn(
124-
modifier = modifier.fillMaxSize(),
124+
modifier = modifier
125+
.padding(horizontal = 16.dp)
126+
.fillMaxSize(),
125127
verticalArrangement = Arrangement.spacedBy(12.dp),
126128
) {
127129
item { Spacer(modifier = Modifier.height(16.dp)) }
128130

129131
item(key = "vpn") {
130-
var visible by remember { mutableStateOf(false) }
131-
132-
LaunchedEffect(Unit) {
133-
delay(50L)
134-
visible = true
135-
}
136-
137-
AnimatedVisibility(
138-
visible = visible,
139-
enter =
140-
slideInVertically(
141-
initialOffsetY = { it / 3 },
142-
animationSpec =
143-
spring(
144-
dampingRatio = Spring.DampingRatioMediumBouncy,
145-
stiffness = Spring.StiffnessMediumLow,
146-
),
147-
) +
148-
fadeIn(
149-
animationSpec = tween(durationMillis = 400),
150-
),
151-
) {
152-
Box(modifier = Modifier.padding(horizontal = 16.dp)) {
153-
StatsCard(
154-
title = stringResource(R.string.stat_vpn),
155-
value = if (isVpnRunning) stringResource(R.string.stat_vpn_running) else stringResource(R.string.stat_vpn_stopped),
156-
subtitle = if (isVpnRunning) stringResource(R.string.stat_vpn_hint_stop) else stringResource(R.string.stat_vpn_hint_start),
157-
containerColor = if (isVpnRunning) MaterialTheme.colorScheme.primaryContainer else MaterialTheme.colorScheme.errorContainer,
158-
onClick = onVpnToggle,
159-
)
160-
}
161-
}
132+
StatsCard(
133+
title = stringResource(R.string.stat_vpn),
134+
value = if (isVpnRunning) stringResource(R.string.stat_vpn_running) else stringResource(R.string.stat_vpn_stopped),
135+
subtitle = if (isVpnRunning) stringResource(R.string.stat_vpn_hint_stop) else stringResource(R.string.stat_vpn_hint_start),
136+
containerColor = if (isVpnRunning) MaterialTheme.colorScheme.primaryContainer else MaterialTheme.colorScheme.errorContainer,
137+
onClick = onVpnToggle,
138+
)
162139
}
163140

164141
item(key = "memory") {
165-
var visible by remember { mutableStateOf(false) }
166-
167-
LaunchedEffect(Unit) {
168-
delay(100L)
169-
visible = true
170-
}
171-
172-
AnimatedVisibility(
173-
visible = visible,
174-
enter =
175-
slideInVertically(
176-
initialOffsetY = { it / 3 },
177-
animationSpec =
178-
spring(
179-
dampingRatio = Spring.DampingRatioMediumBouncy,
180-
stiffness = Spring.StiffnessMediumLow,
181-
),
182-
) +
183-
fadeIn(
184-
animationSpec = tween(durationMillis = 400),
185-
),
186-
) {
187-
Box(modifier = Modifier.padding(horizontal = 16.dp)) {
188-
StatsCard(
189-
title = stringResource(R.string.stat_memory),
190-
value = memory?.let { formatSize(it.inuse) } ?: stringResource(R.string.not_available),
191-
subtitle =
192-
memory?.let { stringResource(R.string.stat_memory_limit, formatSize(it.oslimit)) }
193-
?: stringResource(R.string.refreshing),
194-
)
195-
}
196-
}
142+
StatsCard(
143+
title = stringResource(R.string.stat_memory),
144+
value = memory?.let { formatSize(it.inuse) } ?: stringResource(R.string.not_available),
145+
subtitle =
146+
memory?.let { stringResource(R.string.stat_memory_limit, formatSize(it.oslimit)) }
147+
?: stringResource(R.string.refreshing),
148+
)
197149
}
198150

199151
item(key = "connections") {
200-
var visible by remember { mutableStateOf(false) }
201-
202-
LaunchedEffect(Unit) {
203-
delay(150L)
204-
visible = true
205-
}
206-
207-
AnimatedVisibility(
208-
visible = visible,
209-
enter =
210-
slideInVertically(
211-
initialOffsetY = { it / 3 },
212-
animationSpec =
213-
spring(
214-
dampingRatio = Spring.DampingRatioMediumBouncy,
215-
stiffness = Spring.StiffnessMediumLow,
216-
),
217-
) +
218-
fadeIn(
219-
animationSpec = tween(durationMillis = 400),
220-
),
221-
) {
222-
Box(modifier = Modifier.padding(horizontal = 16.dp)) {
223-
StatsCard(
224-
title = stringResource(R.string.stat_connections),
225-
value = connections.toString(),
226-
subtitle =
227-
if (connections >
228-
0
229-
) {
230-
stringResource(R.string.stat_connections_ongoing)
231-
} else {
232-
stringResource(R.string.stat_connections_none)
233-
},
234-
onClick = onConnectionsClick,
235-
)
236-
}
237-
}
152+
StatsCard(
153+
title = stringResource(R.string.stat_connections),
154+
value = connections.toString(),
155+
subtitle =
156+
if (connections >
157+
0
158+
) {
159+
stringResource(R.string.stat_connections_ongoing)
160+
} else {
161+
stringResource(R.string.stat_connections_none)
162+
},
163+
onClick = onConnectionsClick,
164+
)
238165
}
239166

240167
item(key = "bandwidth") {
241-
var visible by remember { mutableStateOf(false) }
242-
243-
LaunchedEffect(Unit) {
244-
delay(200L)
245-
visible = true
246-
}
247-
248-
AnimatedVisibility(
249-
visible = visible,
250-
enter =
251-
slideInVertically(
252-
initialOffsetY = { it / 3 },
253-
animationSpec =
254-
spring(
255-
dampingRatio = Spring.DampingRatioMediumBouncy,
256-
stiffness = Spring.StiffnessMediumLow,
257-
),
258-
) +
259-
fadeIn(
260-
animationSpec = tween(durationMillis = 400),
261-
),
168+
Row(
169+
modifier = Modifier.fillMaxWidth(),
170+
horizontalArrangement = Arrangement.spacedBy(12.dp),
262171
) {
263-
Box(modifier = Modifier.padding(horizontal = 16.dp)) {
264-
Row(
265-
modifier = Modifier.fillMaxWidth(),
266-
horizontalArrangement = Arrangement.spacedBy(12.dp),
267-
) {
268-
StatsCard(
269-
title = stringResource(R.string.stat_download),
270-
value = formatSize(download),
271-
modifier = Modifier.weight(1f),
272-
)
273-
StatsCard(
274-
title = stringResource(R.string.stat_upload),
275-
value = formatSize(upload),
276-
modifier = Modifier.weight(1f),
277-
)
278-
}
279-
}
172+
StatsCard(
173+
title = stringResource(R.string.stat_download),
174+
value = formatSize(download),
175+
modifier = Modifier.weight(1f),
176+
)
177+
StatsCard(
178+
title = stringResource(R.string.stat_upload),
179+
value = formatSize(upload),
180+
modifier = Modifier.weight(1f),
181+
)
280182
}
281183
}
282184

‎app/src/main/java/rs/clash/android/ui/SettingsScreen.kt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,7 @@ fun SettingsScreen(
101101
modifier =
102102
Modifier
103103
.padding(padding)
104+
.padding(horizontal = 16.dp)
104105
.fillMaxSize(),
105106
verticalArrangement = Arrangement.spacedBy(12.dp),
106107
) {

0 commit comments

Comments
 (0)