feat: display selected app icon in select app card

This commit is contained in:
Ushie 2022-11-14 16:00:25 +03:00
parent b28d967aa7
commit 6cb69b42cd
No known key found for this signature in database
GPG Key ID: 0EF73F1CA38B2D5F

View File

@ -1,20 +1,20 @@
package app.revanced.manager.ui.screen package app.revanced.manager.ui.screen
import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.*
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding
import androidx.compose.material.icons.Icons import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.Build import androidx.compose.material.icons.filled.Build
import androidx.compose.material3.* import androidx.compose.material3.*
import androidx.compose.runtime.* import androidx.compose.runtime.*
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.stringResource import androidx.compose.ui.res.stringResource
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import app.revanced.manager.R import app.revanced.manager.R
import app.revanced.manager.network.api.ManagerAPI import app.revanced.manager.network.api.ManagerAPI
import app.revanced.manager.patcher.PatcherUtils import app.revanced.manager.patcher.PatcherUtils
import app.revanced.manager.ui.Resource import app.revanced.manager.ui.Resource
import app.revanced.manager.ui.component.AppIcon
import app.revanced.manager.ui.component.FloatingActionButton import app.revanced.manager.ui.component.FloatingActionButton
import app.revanced.manager.ui.component.SplitAPKDialog import app.revanced.manager.ui.component.SplitAPKDialog
import app.revanced.manager.ui.viewmodel.PatchesSelectorViewModel import app.revanced.manager.ui.viewmodel.PatchesSelectorViewModel
@ -85,19 +85,32 @@ fun PatcherScreen(
text = stringResource(id = R.string.card_application_header), text = stringResource(id = R.string.card_application_header),
style = MaterialTheme.typography.titleMedium style = MaterialTheme.typography.titleMedium
) )
Text( Row(
text = if (patchesLoaded) { modifier = Modifier.fillMaxWidth(),
if (selectedAppPackage.isPresent) { verticalAlignment = Alignment.CenterVertically
selectedAppPackage.get().packageName ) {
if (selectedAppPackage.isPresent) {
AppIcon(
LocalContext.current.packageManager.getApplicationIcon(
selectedAppPackage.get().packageName
), contentDescription = null, size = 18
)
Spacer(Modifier.width(5.dp))
}
Text(
text = if (patchesLoaded) {
if (selectedAppPackage.isPresent) {
selectedAppPackage.get().packageName
} else {
stringResource(R.string.card_application_not_selected)
}
} else { } else {
stringResource(R.string.card_application_not_selected) stringResource(R.string.card_application_not_loaded)
} },
} else { style = MaterialTheme.typography.bodyMedium,
stringResource(R.string.card_application_not_loaded) modifier = Modifier.padding(vertical = 8.dp)
}, )
style = MaterialTheme.typography.bodyMedium, }
modifier = Modifier.padding(vertical = 8.dp)
)
} }
} }
ElevatedCard( ElevatedCard(