lun_admin/NeoLaunch_From_Kvaesitso
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix app grid displaying apps for different profile

Browse Source
This commit is contained in:
MM20 2024-08-11 22:03:36 +02:00
parent fce264b4ae
commit 585b2b2955
No known key found for this signature in database
GPG Key ID: 0B61A8F2DEAFA389
2 changed files with 30 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/SearchColumn.kt
View File

@ -27,6 +27,7 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.unit.dp
import androidx.lifecycle.viewmodel.compose.viewModel
import de.mm20.launcher2.profiles.Profile
import de.mm20.launcher2.search.AppShortcut
import de.mm20.launcher2.search.Application
import de.mm20.launcher2.search.Article
@ -177,9 +178,9 @@ fun SearchColumn(
if (isSearchEmpty && profiles.size > 1) {
AppResults(
apps = when(selectedAppProfileIndex) {
1 -> privateApps
2 -> workApps
apps = when(profiles.getOrNull(selectedAppProfileIndex)?.type) {
Profile.Type.Private -> privateApps
Profile.Type.Work -> workApps
else -> apps
},
highlightedItem = bestMatch as? Application,

51
app/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/apps/AppResults.kt
View File

@ -105,7 +105,7 @@ fun LazyListScope.AppResults(
HorizontalDivider()
val profileType = profiles[selectedProfileIndex].type
if (showProfileLockControls && profileType != Profile.Type.Personal) {
if (profileType != Profile.Type.Personal) {
if (isProfileLocked) {
Column(
modifier = Modifier
@ -128,37 +128,38 @@ fun LazyListScope.AppResults(
if (profileType == Profile.Type.Work) R.string.profile_work_profile_state_locked
else R.string.profile_private_profile_state_locked
),
modifier = Modifier.padding(top = 8.dp, bottom = 32.dp),
modifier = Modifier.padding(top = 8.dp),
color = MaterialTheme.colorScheme.secondary,
style = MaterialTheme.typography.titleSmall,
)
Button(
modifier = Modifier,
onClick = {
onProfileLockChange?.invoke(
profiles[selectedProfileIndex],
false
if (showProfileLockControls) {
Button(
modifier = Modifier.padding(top = 32.dp),
onClick = {
onProfileLockChange?.invoke(
profiles[selectedProfileIndex],
false
)
},
contentPadding = ButtonDefaults.TextButtonWithIconContentPadding,
) {
Icon(
if (profileType == Profile.Type.Work) Icons.Rounded.Work else Icons.Rounded.LockOpen,
contentDescription = null,
modifier = Modifier
.padding(end = ButtonDefaults.IconSpacing)
.size(ButtonDefaults.IconSize)
)
},
contentPadding = ButtonDefaults.TextButtonWithIconContentPadding,
) {
Icon(
if (profileType == Profile.Type.Work) Icons.Rounded.Work else Icons.Rounded.LockOpen,
contentDescription = null,
modifier = Modifier
.padding(end = ButtonDefaults.IconSpacing)
.size(ButtonDefaults.IconSize)
)
Text(
stringResource(
if (profileType == Profile.Type.Work) R.string.profile_work_profile_action_unlock
else R.string.profile_private_profile_action_unlock
Text(
stringResource(
if (profileType == Profile.Type.Work) R.string.profile_work_profile_action_unlock
else R.string.profile_private_profile_action_unlock
)
)
)
}
}
}
} else {
} else if (showProfileLockControls) {
FilledTonalButton(
modifier = Modifier
.padding(12.dp)