Minecon724/vastapp
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity Actions

Compare commits

base: Minecon724:5f1787d6ff6e9609a4570f60267b4709eab5676a
Branches Tags
Minecon724:master
...
compare: Minecon724:8d95c3271cd62213171c29e4085787f2093c2234
Branches Tags
Minecon724:master

3 commits
5f1787d6ff ... 8d95c3271c

Author SHA1 Message Date
Minecon724
8d95c3271c
remove unused imports 2024-07-27 15:55:25 +02:00
Minecon724
2ba20d415f
add instances to dashboard and change arrangement 2024-07-27 15:55:06 +02:00
Minecon724
2a868aaa00
gitignore releases 2024-07-27 15:54:28 +02:00
2 changed files with 46 additions and 33 deletions
Show stats Expand all files Collapse all files

3
app/.gitignore vendored
View file

@ -1 +1,2 @@
/build
/build
/release

76
app/src/main/java/eu/m724/vastapp/activity/dashboard/screen/Dashboard.kt
View file

@ -2,11 +2,14 @@ package eu.m724.vastapp.activity.dashboard.screen
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.ExperimentalLayoutApi
import androidx.compose.foundation.layout.FlowRow
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.width
import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.verticalScroll
@ -33,9 +36,8 @@ import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
import eu.m724.vastapp.R
import eu.m724.vastapp.activity.dashboard.DashboardViewModel
import org.json.JSONObject
@OptIn(ExperimentalMaterial3Api::class) // for pullRefresh
@OptIn(ExperimentalMaterial3Api::class, ExperimentalLayoutApi::class) // for pullRefresh
@Composable
fun DashboardScreen(dashboardViewModel: DashboardViewModel) {
val uiState by dashboardViewModel.uiState.collectAsState()
@ -63,29 +65,29 @@ fun DashboardScreen(dashboardViewModel: DashboardViewModel) {
Text("Hello ${user.username}!", fontSize = 28.sp)
}
Row(
modifier = Modifier.width(340.dp)
) {
FlowRow {
// balance card
Card(
modifier = Modifier
.fillMaxWidth()
.padding(16.dp)
.weight(1f),
.width(160.dp)
.padding(16.dp),
colors = CardDefaults.cardColors(
containerColor = balanceCardColor(user.credit)
)
) {
Row(
modifier = Modifier.padding(horizontal = 16.dp, vertical = 8.dp),
modifier = Modifier.padding(16.dp, 8.dp),
verticalAlignment = Alignment.CenterVertically
) {
Icon(
modifier = Modifier.size(24.dp),
painter = painterResource(id = R.drawable.baseline_monetization_on_24),
contentDescription = "Balance"
)
Spacer(modifier = Modifier
.fillMaxWidth()
.weight(1f)
Spacer(
modifier = Modifier
.fillMaxWidth()
.weight(1f)
)
Text(
text = "$%.2f".format(user.credit),
@ -94,17 +96,19 @@ fun DashboardScreen(dashboardViewModel: DashboardViewModel) {
)
}
}
// time card
Card(
modifier = Modifier
.fillMaxWidth()
.width(160.dp)
.padding(16.dp)
.weight(1f),
) {
Row(
modifier = Modifier.padding(horizontal = 16.dp, vertical = 8.dp),
modifier = Modifier.padding(16.dp, 8.dp),
verticalAlignment = Alignment.CenterVertically
) {
Icon(
modifier = Modifier.size(24.dp),
painter = painterResource(id = R.drawable.baseline_access_time_filled_24),
contentDescription = "Remaining time"
)
@ -119,24 +123,32 @@ fun DashboardScreen(dashboardViewModel: DashboardViewModel) {
)
}
}
}
// TODO maybe reuse that from Instances?
val instance = JSONObject()
instance.put("id", 234523)
instance.put("machine_id", 1121323)
instance.put("host_id", 5924)
instance.put("gpu_name", "RTX 4090")
instance.put("num_gpus", 2)
instance.put("gpu_util", 70)
instance.put("gpu_ram", 24564)
instance.put("vmem_usage", 0.339843)
Column(
modifier = Modifier.width(340.dp)
) {
InstanceCard(instance = instance, modifier = Modifier.padding(16.dp))
// instances
Card(
modifier = Modifier
.width(160.dp)
.padding(16.dp)
) {
Row(
modifier = Modifier.padding(16.dp, 8.dp),
verticalAlignment = Alignment.CenterVertically
) {
Icon(
modifier = Modifier.size(24.dp),
painter = painterResource(id = R.drawable.server_solid),
contentDescription = "Rented"
)
Spacer(modifier = Modifier
.fillMaxWidth()
.weight(1f)
)
Text(
text = "4",
fontSize = 22.sp
)
}
}
}
}
}