avior/Neo-Store
1
0
Fork 0
mirror of https://github.com/Aviortheking/Neo-Store.git synced 2025-04-25 12:22:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add: AppInfo Chips to AppSheet

Browse Source
This commit is contained in:
machiav3lli 2022-09-19 00:43:10 +02:00
parent 8e954246cc
commit d50a446fc4
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/main/kotlin/com/machiav3lli/fdroid/ui/fragments/AppSheetX.kt
View File

@ -14,6 +14,7 @@ import android.view.ViewGroup
import androidx.compose.animation.AnimatedVisibility import androidx.compose.animation.AnimatedVisibility
import androidx.compose.foundation.isSystemInDarkTheme import androidx.compose.foundation.isSystemInDarkTheme
import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.layout.PaddingValues
import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.fillMaxWidth
@ -66,6 +67,7 @@ import com.machiav3lli.fdroid.ui.compose.components.ExpandableBlock
import com.machiav3lli.fdroid.ui.compose.components.ScreenshotItem import com.machiav3lli.fdroid.ui.compose.components.ScreenshotItem
import com.machiav3lli.fdroid.ui.compose.components.ScreenshotList import com.machiav3lli.fdroid.ui.compose.components.ScreenshotList
import com.machiav3lli.fdroid.ui.compose.components.SwitchPreference import com.machiav3lli.fdroid.ui.compose.components.SwitchPreference
import com.machiav3lli.fdroid.ui.compose.components.appsheet.AppInfoChips
import com.machiav3lli.fdroid.ui.compose.components.appsheet.AppInfoHeader import com.machiav3lli.fdroid.ui.compose.components.appsheet.AppInfoHeader
import com.machiav3lli.fdroid.ui.compose.components.appsheet.HtmlTextBlock import com.machiav3lli.fdroid.ui.compose.components.appsheet.HtmlTextBlock
import com.machiav3lli.fdroid.ui.compose.components.appsheet.LinkItem import com.machiav3lli.fdroid.ui.compose.components.appsheet.LinkItem
@ -78,7 +80,6 @@ import com.machiav3lli.fdroid.ui.viewmodels.AppViewModelX
import com.machiav3lli.fdroid.utility.Utils.rootInstallerEnabled import com.machiav3lli.fdroid.utility.Utils.rootInstallerEnabled
import com.machiav3lli.fdroid.utility.Utils.startUpdate import com.machiav3lli.fdroid.utility.Utils.startUpdate
import com.machiav3lli.fdroid.utility.extension.android.Android import com.machiav3lli.fdroid.utility.extension.android.Android
import com.machiav3lli.fdroid.utility.extension.text.formatSize
import com.machiav3lli.fdroid.utility.findSuggestedProduct import com.machiav3lli.fdroid.utility.findSuggestedProduct
import com.machiav3lli.fdroid.utility.generateLinks import com.machiav3lli.fdroid.utility.generateLinks
import com.machiav3lli.fdroid.utility.generatePermissionGroups import com.machiav3lli.fdroid.utility.generatePermissionGroups
@ -410,12 +411,18 @@ class AppSheetX() : FullscreenBottomSheetDialogFragment(), Callbacks {
Scaffold( Scaffold(
// TODO add the topBar to the activity instead of the fragments // TODO add the topBar to the activity instead of the fragments
topBar = { topBar = {
TopBarHeader( Column() {
appName = product.label, TopBarHeader(
packageName = product.packageName, appName = product.label,
icon = imageData, packageName = product.packageName,
state = downloadState icon = imageData,
) state = downloadState
)
AppInfoChips(
product = product,
latestRelease = product.displayRelease
)
}
}, },
snackbarHost = { SnackbarHost(snackbarHostState) }, snackbarHost = { SnackbarHost(snackbarHostState) },
) { paddingValues -> ) { paddingValues ->
@ -428,8 +435,6 @@ class AppSheetX() : FullscreenBottomSheetDialogFragment(), Callbacks {
) { ) {
item { item {
AppInfoHeader( AppInfoHeader(
versionCode = product.versionCode.toString(),
appSize = product.displayRelease?.size?.formatSize().orEmpty(),
repoHost = "@${ repoHost = "@${
(URI(product.source)?.host ?: stringResource(id = R.string.unknown)) (URI(product.source)?.host ?: stringResource(id = R.string.unknown))
.removePrefix("www.") .removePrefix("www.")