forked from microg/GmsCore
-
Notifications
You must be signed in to change notification settings - Fork 4
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
11 changed files
with
366 additions
and
116 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
96 changes: 0 additions & 96 deletions
96
vending-app/src/main/java/org/microg/vending/PlayDebugActivity.kt
This file was deleted.
Oops, something went wrong.
24 changes: 24 additions & 0 deletions
24
vending-app/src/main/java/org/microg/vending/enterprise/App.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| package org.microg.vending.enterprise | ||
|
|
||
| open class App( | ||
| val packageName: String, | ||
| val displayName: String, | ||
| val state: State, | ||
| val iconUrl: String | ||
| ) { | ||
| enum class State { | ||
| /** | ||
| * App is available, but not installed on the user's device. | ||
| */ | ||
| NOT_INSTALLED, | ||
| /** | ||
| * App is already installed on the device, but an update is available. | ||
| */ | ||
| UPDATE_AVAILABLE, | ||
|
|
||
| /** | ||
| * App is installed on device and up to date. | ||
| */ | ||
| INSTALLED | ||
| } | ||
| } |
11 changes: 11 additions & 0 deletions
11
vending-app/src/main/java/org/microg/vending/enterprise/EnterpriseApp.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| package org.microg.vending.enterprise | ||
|
|
||
| import com.google.android.finsky.AppInstallPolicy | ||
|
|
||
| class EnterpriseApp( | ||
| packageName: String, | ||
| displayName: String, | ||
| state: State, | ||
| iconUrl: String, | ||
| val policy: AppInstallPolicy, | ||
| ) : App(packageName, displayName, state, iconUrl) |
119 changes: 119 additions & 0 deletions
119
vending-app/src/main/java/org/microg/vending/ui/EnterpriseListComponent.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,119 @@ | ||
| package org.microg.vending.ui | ||
|
|
||
| import androidx.annotation.StringRes | ||
| import androidx.compose.foundation.background | ||
| import androidx.compose.foundation.layout.Box | ||
| import androidx.compose.foundation.layout.Column | ||
| import androidx.compose.foundation.layout.Row | ||
| 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.Warning | ||
| import androidx.compose.material3.Icon | ||
| import androidx.compose.material3.MaterialTheme | ||
| import androidx.compose.material3.Text | ||
| import androidx.compose.runtime.Composable | ||
| import androidx.compose.ui.Alignment | ||
| import androidx.compose.ui.Modifier | ||
| import androidx.compose.ui.draw.clip | ||
| import androidx.compose.ui.res.stringResource | ||
| import androidx.compose.ui.text.style.TextAlign | ||
| import androidx.compose.ui.tooling.preview.Preview | ||
| import androidx.compose.ui.unit.dp | ||
| import com.android.vending.R | ||
| import com.google.android.finsky.AppInstallPolicy | ||
| import org.microg.vending.enterprise.App | ||
| import org.microg.vending.enterprise.EnterpriseApp | ||
|
|
||
|
|
||
|
|
||
| @Composable | ||
| fun EnterpriseListComponent(apps: List<EnterpriseApp>) { | ||
| if (apps.isNotEmpty()) LazyColumn(Modifier.padding(16.dp)) { | ||
|
|
||
| val requiredApps = apps.filter { it.policy == AppInstallPolicy.MANDATORY } | ||
| if (requiredApps.isNotEmpty()) { | ||
| item { InListHeading(R.string.vending_overview_enterprise_row_mandatory) } | ||
| item { InListWarning(R.string.vending_overview_enterprise_row_mandatory_hint) } | ||
| items(requiredApps) { AppRow(it) } | ||
| } | ||
|
|
||
| val optionalApps = apps.filter { it.policy == AppInstallPolicy.OPTIONAL } | ||
| if (optionalApps.isNotEmpty()) { | ||
| item { InListHeading(R.string.vending_overview_enterprise_row_offered) } | ||
| items(optionalApps) { AppRow(it) } | ||
| } | ||
| } else Box( | ||
| Modifier | ||
| .fillMaxSize() | ||
| .padding(24.dp)) { | ||
| Column(Modifier.align(Alignment.Center)) { | ||
| Text( | ||
| stringResource(R.string.vending_overview_enterprise_no_apps_available), | ||
| textAlign = TextAlign.Center | ||
| ) | ||
| } | ||
| } | ||
|
|
||
| } | ||
|
|
||
| @Composable | ||
| fun InListHeading(@StringRes text: Int) { | ||
| Text( | ||
| stringResource(text), | ||
| modifier = Modifier.padding(vertical = 8.dp), | ||
| style = MaterialTheme.typography.headlineSmall | ||
| ) | ||
| } | ||
|
|
||
| @Composable | ||
| fun InListWarning(@StringRes text: Int) { | ||
| Row( | ||
| Modifier | ||
| .clip(shape = RoundedCornerShape(16.dp)) | ||
| .background(MaterialTheme.colorScheme.errorContainer) | ||
| ) { | ||
| Icon( | ||
| Icons.Default.Warning, | ||
| contentDescription = null, | ||
| Modifier | ||
| .align(Alignment.CenterVertically) | ||
| .padding(start = 16.dp, top = 8.dp, bottom = 8.dp, end = 8.dp), | ||
| MaterialTheme.colorScheme.onErrorContainer | ||
| ) | ||
| Text( | ||
| stringResource(text), | ||
| Modifier.align(Alignment.CenterVertically) | ||
| .padding(top = 8.dp, bottom = 8.dp, end = 16.dp), | ||
| MaterialTheme.colorScheme.onErrorContainer | ||
| ) | ||
| } | ||
|
|
||
| } | ||
|
|
||
| @Composable | ||
| fun AppRow(app: App) { | ||
| Row(Modifier.padding(16.dp)) { | ||
| Text(app.displayName) | ||
| } | ||
| } | ||
|
|
||
| @Preview | ||
| @Composable | ||
| fun EnterpriseListComponentPreview() { | ||
| EnterpriseListComponent( | ||
| listOf( | ||
| EnterpriseApp("com.android.vending", "Market", App.State.INSTALLED, "", AppInstallPolicy.MANDATORY), | ||
| EnterpriseApp("org.mozilla.firefox", "Firefox", App.State.NOT_INSTALLED, "", AppInstallPolicy.OPTIONAL) | ||
| ) | ||
| ) | ||
| } | ||
|
|
||
| @Preview | ||
| @Composable | ||
| fun EnterpriseListComponentEmptyPreview() { | ||
| EnterpriseListComponent(emptyList()) | ||
| } |
7 changes: 7 additions & 0 deletions
7
vending-app/src/main/java/org/microg/vending/ui/NetworkState.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| package org.microg.vending.ui | ||
|
|
||
| enum class NetworkState { | ||
| ACTIVE, | ||
| PASSIVE, | ||
| ERROR | ||
| } |
Oops, something went wrong.