diff --git a/vending-app/src/main/java/org/microg/vending/ui/WorkVendingTopAppBar.kt b/vending-app/src/main/java/org/microg/vending/ui/WorkVendingTopAppBar.kt index 5a07b984f..362546c79 100644 --- a/vending-app/src/main/java/org/microg/vending/ui/WorkVendingTopAppBar.kt +++ b/vending-app/src/main/java/org/microg/vending/ui/WorkVendingTopAppBar.kt @@ -39,7 +39,7 @@ fun WorkVendingTopAppBar() = TopAppBar( }, colors = TopAppBarDefaults.smallTopAppBarColors( containerColor = MaterialTheme.colorScheme.primaryContainer, - titleContentColor = MaterialTheme.colorScheme.primary + titleContentColor = MaterialTheme.colorScheme.onPrimaryContainer ) ) diff --git a/vending-app/src/main/java/org/microg/vending/ui/components/EnterpriseList.kt b/vending-app/src/main/java/org/microg/vending/ui/components/EnterpriseList.kt index 84e217bf8..1f33b42d4 100644 --- a/vending-app/src/main/java/org/microg/vending/ui/components/EnterpriseList.kt +++ b/vending-app/src/main/java/org/microg/vending/ui/components/EnterpriseList.kt @@ -2,15 +2,18 @@ package org.microg.vending.ui.components import androidx.annotation.StringRes import androidx.compose.foundation.background +import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.padding import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.items import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.Info import androidx.compose.material.icons.filled.Warning import androidx.compose.material3.Icon import androidx.compose.material3.MaterialTheme @@ -59,11 +62,30 @@ internal fun EnterpriseList(appStates: Map, install: (a .fillMaxSize() .padding(24.dp) ) { - Column(Modifier.align(Alignment.Center)) { + Column(Modifier.align(Alignment.Center), verticalArrangement = Arrangement.spacedBy(32.dp)) { Text( stringResource(R.string.vending_overview_enterprise_no_apps_available), textAlign = TextAlign.Center ) + + Row( + Modifier + .clip(shape = RoundedCornerShape(16.dp)) + .background(MaterialTheme.colorScheme.primaryContainer), + verticalAlignment = Alignment.CenterVertically + ) { + Icon( + Icons.Default.Info, + contentDescription = null, + Modifier.padding(start = 16.dp, top = 16.dp, bottom = 16.dp, end = 16.dp), + MaterialTheme.colorScheme.onPrimaryContainer + ) + Text( + stringResource(R.string.vending_overview_enterprise_no_apps_available_wait), + Modifier.padding(top = 16.dp, bottom = 16.dp, end = 16.dp), + MaterialTheme.colorScheme.onPrimaryContainer + ) + } } } diff --git a/vending-app/src/main/res/values/strings.xml b/vending-app/src/main/res/values/strings.xml index a255639d2..1743b4301 100644 --- a/vending-app/src/main/res/values/strings.xml +++ b/vending-app/src/main/res/values/strings.xml @@ -23,7 +23,8 @@ Your device is missing mandatory apps chosen by your administrator. Available apps These are all the apps made available by your enterprise. - No apps have been made available by your administrator + No apps have been made available by your administrator. + It may take a few hours after setting up your work profile before apps are ready to download. Update available Installed apps Install