final
This commit is contained in:
@@ -16,7 +16,7 @@ android {
|
|||||||
targetSdk = 34
|
targetSdk = 34
|
||||||
versionCode = 4
|
versionCode = 4
|
||||||
|
|
||||||
versionName = "3.0.8"
|
versionName = "3.0.9"
|
||||||
|
|
||||||
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
|
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
|
||||||
vectorDrawables {
|
vectorDrawables {
|
||||||
|
|||||||
@@ -17,7 +17,6 @@ import `in`.sminnovations.attendanceapp.screens.settings.ui.components.subSettin
|
|||||||
fun NetworkErrorDialog(
|
fun NetworkErrorDialog(
|
||||||
showDialog: Boolean,
|
showDialog: Boolean,
|
||||||
onRetry: () -> Unit,
|
onRetry: () -> Unit,
|
||||||
onSettings: () -> Unit,
|
|
||||||
) {
|
) {
|
||||||
if (showDialog) {
|
if (showDialog) {
|
||||||
val showSettingDialog = remember { mutableStateOf(false) }
|
val showSettingDialog = remember { mutableStateOf(false) }
|
||||||
@@ -48,15 +47,15 @@ fun NetworkErrorDialog(
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
dismissButton = {
|
dismissButton = {
|
||||||
if (!showSettingDialog.value) {
|
// if (!showSettingDialog.value) {
|
||||||
Button(onClick = { showSettingDialog.value = true }) {
|
// Button(onClick = { showSettingDialog.value = true }) {
|
||||||
Text("Settings")
|
// Text("Settings")
|
||||||
}
|
// }
|
||||||
} else {
|
// } else {
|
||||||
Button(onClick = { showSettingDialog.value = false }) {
|
Button(onClick = { showSettingDialog.value = false }) {
|
||||||
Text("Network")
|
Text("Network")
|
||||||
}
|
}
|
||||||
}
|
// }
|
||||||
},
|
},
|
||||||
modifier = Modifier.padding(16.dp)
|
modifier = Modifier.padding(16.dp)
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
package `in`.sminnovations.attendanceapp.screens.home.ui
|
package `in`.sminnovations.attendanceapp.screens.home.ui
|
||||||
|
|
||||||
import android.Manifest
|
import android.Manifest
|
||||||
import androidx.compose.foundation.layout.Arrangement
|
|
||||||
import androidx.compose.foundation.layout.Box
|
import androidx.compose.foundation.layout.Box
|
||||||
import androidx.compose.foundation.layout.fillMaxSize
|
import androidx.compose.foundation.layout.fillMaxSize
|
||||||
import androidx.compose.runtime.Composable
|
import androidx.compose.runtime.Composable
|
||||||
@@ -62,7 +61,6 @@ fun HomeScreen(
|
|||||||
NetworkErrorDialog(showDialog = true, onRetry = {
|
NetworkErrorDialog(showDialog = true, onRetry = {
|
||||||
viewModel.reStartMonitoring()
|
viewModel.reStartMonitoring()
|
||||||
},
|
},
|
||||||
onSettings = { showSettingDialog.value = true }
|
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user