Skip to content

Commit 25cbf99

Browse files
DevLabStudyCopilot
andcommitted
Fix Supabase local properties and add support access
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
1 parent 5b19510 commit 25cbf99

3 files changed

Lines changed: 38 additions & 8 deletions

File tree

‎app/build.gradle.kts‎

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,15 @@ plugins {
33
alias(libs.plugins.kotlin.compose)
44
}
55

6+
import java.util.Properties
7+
8+
val localProperties = Properties().apply {
9+
val localPropertiesFile = rootProject.file("local.properties")
10+
if (localPropertiesFile.exists()) {
11+
localPropertiesFile.inputStream().use(::load)
12+
}
13+
}
14+
615
android {
716
namespace = "ovh.devlabstudy.devlabnetworktoolkit"
817
buildFeatures {
@@ -24,12 +33,11 @@ android {
2433
versionName = "1.1.1"
2534

2635
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
27-
val supabaseUrl = project.providers.gradleProperty("supabaseUrl")
28-
.orElse("https://clizjpihxmtoaywvosom.supabase.co")
29-
.get()
30-
val supabaseAnonKey = project.providers.gradleProperty("supabaseAnonKey")
31-
.orElse("")
32-
.get()
36+
val supabaseUrl = localProperties.getProperty(
37+
"supabaseUrl",
38+
"https://clizjpihxmtoaywvosom.supabase.co"
39+
)
40+
val supabaseAnonKey = localProperties.getProperty("supabaseAnonKey", "")
3341
buildConfigField("String", "SUPABASE_URL", "\"$supabaseUrl\"")
3442
buildConfigField("String", "SUPABASE_ANON_KEY", "\"$supabaseAnonKey\"")
3543
}

‎app/src/main/java/ovh/devlabstudy/devlabnetworktoolkit/MainActivity.kt‎

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,7 @@ fun MainAppScreen() {
105105
var isEditMode by remember { mutableStateOf(false) }
106106
var showProDialog by remember { mutableStateOf(false) }
107107
var showProThankYouDialog by remember { mutableStateOf(false) }
108+
var showSupportDialog by remember { mutableStateOf(false) }
108109
var selectedForSwapIndex by remember { mutableStateOf<Int?>(null) }
109110

110111
val sheetState = rememberStandardBottomSheetState(
@@ -141,6 +142,10 @@ fun MainAppScreen() {
141142
ProThankYouDialog(onDismiss = { showProThankYouDialog = false })
142143
}
143144

145+
if (showSupportDialog) {
146+
SupportDialog(onDismiss = { showSupportDialog = false })
147+
}
148+
144149
Scaffold(
145150
topBar = {
146151
TopAppBar(
@@ -151,6 +156,13 @@ fun MainAppScreen() {
151156
)
152157
},
153158
actions = {
159+
IconButton(onClick = { showSupportDialog = true }) {
160+
Icon(
161+
Icons.Default.HelpOutline,
162+
contentDescription = "Wsparcie i kontakt"
163+
)
164+
}
165+
154166
IconButton(onClick = {
155167
NetworkBackgroundService.startPingMonitor(context, "8.8.8.8")
156168
}) {
@@ -844,9 +856,19 @@ fun ProPaywallDialog(
844856
) {
845857
OutlinedTextField(
846858
value = keyInput,
847-
onValueChange = { keyInput = it.uppercase() },
859+
onValueChange = { keyInput = it.uppercase().filter { char -> !char.isWhitespace() } },
848860
label = { Text("Masz kod promocyjny?", fontSize = 12.sp) },
849861
singleLine = true,
862+
trailingIcon = {
863+
if (keyInput.isNotEmpty()) {
864+
IconButton(onClick = { keyInput = "" }) {
865+
Icon(
866+
Icons.Default.Clear,
867+
contentDescription = "Wyczyść kod"
868+
)
869+
}
870+
}
871+
},
850872
colors = OutlinedTextFieldDefaults.colors(
851873
focusedBorderColor = Color(0xFFFFD700),
852874
unfocusedBorderColor = Color.DarkGray,

‎app/src/main/java/ovh/devlabstudy/devlabnetworktoolkit/ui/SupportDialog.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ fun SupportDialog(onDismiss: () -> Unit) {
3838
modifier = Modifier.fillMaxWidth()
3939
) {
4040
Column(modifier = Modifier.padding(12.dp)) {
41-
Text("DevLab Network Toolkit v1.1", style = MaterialTheme.typography.titleSmall)
41+
Text("DevLab Network Toolkit v1.1.1", style = MaterialTheme.typography.titleSmall)
4242
Spacer(modifier = Modifier.height(4.dp))
4343
Text(
4444
"Wszechstronny pakiet narzędzi diagnostycznych i analitycznych zaprojektowany z myślą o administratorach sieci, studentach IT oraz entuzjastach home-labów. Aplikacja umożliwia natychmiastowe analizowanie lokalnych podsieci, obliczenia CIDR/VLSM, skanowanie portów oraz zarządzanie urządzeniami w sieci LAN.",

0 commit comments

Comments
 (0)