Skip to content

Commit 82a34bc

Browse files
committed
added base
1 parent d7368a4 commit 82a34bc

File tree

2 files changed

+18
-6
lines changed

2 files changed

+18
-6
lines changed

app/src/main/java/com/pira/gnetp/ui/home/HomeScreen.kt

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ import androidx.compose.material.icons.automirrored.filled.List
3030
import androidx.compose.material.icons.filled.Info
3131
import androidx.compose.material.icons.filled.Settings
3232
import androidx.compose.material3.Button
33+
import androidx.compose.material3.ButtonDefaults
3334
import androidx.compose.material3.Card
3435
import androidx.compose.material3.CardDefaults
3536
import androidx.compose.material3.Icon
@@ -261,12 +262,15 @@ fun HomeScreen(
261262
},
262263
modifier = Modifier
263264
.fillMaxWidth()
264-
.height(48.dp)
265+
.height(48.dp),
266+
colors = ButtonDefaults.buttonColors(
267+
contentColor = Color.White
268+
)
265269
) {
266270
Text(
267271
text = if (uiState.isProxyActive) "Stop Proxy" else "Start Proxy",
268272
style = MaterialTheme.typography.titleMedium,
269-
color = MaterialTheme.colorScheme.onPrimary
273+
color = Color.White
270274
)
271275
}
272276

@@ -356,13 +360,17 @@ fun HomeScreen(
356360

357361
Button(
358362
onClick = { showIpSelector = false },
359-
modifier = Modifier
363+
modifier = Modifier,
364+
colors = ButtonDefaults.buttonColors(
365+
contentColor = Color.White
366+
)
360367
) {
361368
Text(
362369
text = "Close",
363-
color = MaterialTheme.colorScheme.onPrimary
370+
color = Color.White
364371
)
365372
}
373+
366374
}
367375

368376
Spacer(modifier = Modifier.height(16.dp))

app/src/main/java/com/pira/gnetp/ui/settings/SettingsScreen.kt

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ import androidx.compose.material.icons.filled.ArrowDropUp
2525
import androidx.compose.material.icons.filled.Check
2626
import androidx.compose.material.icons.filled.FormatColorFill
2727
import androidx.compose.material3.Button
28+
import androidx.compose.material3.ButtonDefaults
2829
import androidx.compose.material3.Card
2930
import androidx.compose.material3.CardDefaults
3031
import androidx.compose.material3.Icon
@@ -330,12 +331,15 @@ fun SettingsScreen(
330331
},
331332
modifier = Modifier
332333
.fillMaxWidth()
333-
.height(48.dp)
334+
.height(48.dp),
335+
colors = ButtonDefaults.buttonColors(
336+
contentColor = Color.White
337+
)
334338
) {
335339
Text(
336340
text = "Save Settings",
337341
style = MaterialTheme.typography.titleMedium,
338-
color = MaterialTheme.colorScheme.onPrimary
342+
color = Color.White
339343
)
340344
}
341345
}

0 commit comments

Comments
 (0)