Merge pull request 'fix: show stopped services in list + loading bar on action' (#32) from feat/android-v1.6.0 into master
Reviewed-on: #32
This commit was merged in pull request #32.
This commit is contained in:
@@ -12,8 +12,8 @@ android {
|
|||||||
applicationId = "com.devlab.app"
|
applicationId = "com.devlab.app"
|
||||||
minSdk = 26
|
minSdk = 26
|
||||||
targetSdk = 37
|
targetSdk = 37
|
||||||
versionCode = 7
|
versionCode = 8
|
||||||
versionName = "1.6.0"
|
versionName = "1.6.1"
|
||||||
}
|
}
|
||||||
|
|
||||||
buildTypes {
|
buildTypes {
|
||||||
|
|||||||
@@ -372,6 +372,13 @@ private fun ServicesTab(state: ServerDetailUiState, viewModel: ServerDetailViewM
|
|||||||
)
|
)
|
||||||
Spacer(modifier = Modifier.height(8.dp))
|
Spacer(modifier = Modifier.height(8.dp))
|
||||||
|
|
||||||
|
if (state.serviceActionRunning != null) {
|
||||||
|
LinearProgressIndicator(
|
||||||
|
modifier = Modifier.fillMaxWidth().padding(bottom = 8.dp),
|
||||||
|
color = MaterialTheme.colorScheme.primary
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
if (state.serviceActionResult != null) {
|
if (state.serviceActionResult != null) {
|
||||||
Card(
|
Card(
|
||||||
colors = CardDefaults.cardColors(
|
colors = CardDefaults.cardColors(
|
||||||
|
|||||||
Binary file not shown.
@@ -573,7 +573,7 @@ class ApiController
|
|||||||
throw new \RuntimeException('SSH connection failed');
|
throw new \RuntimeException('SSH connection failed');
|
||||||
}
|
}
|
||||||
|
|
||||||
$output = $ssh->exec('systemctl list-units --type=service --no-pager --no-legend 2>/dev/null | head -50');
|
$output = $ssh->exec('systemctl list-units --type=service --all --no-pager --no-legend 2>/dev/null');
|
||||||
$ssh->disconnect();
|
$ssh->disconnect();
|
||||||
|
|
||||||
$services = [];
|
$services = [];
|
||||||
|
|||||||
Reference in New Issue
Block a user