avior/Neo-Store
1
0
Fork 0
mirror of https://github.com/Aviortheking/Neo-Store.git synced 2025-04-24 03:42:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update: Migrate Installed to use Compose solely

Browse Source
This commit is contained in:
machiav3lli 2022-05-03 03:26:07 +02:00
parent e61572ed8c
commit 467ee02cde
1 changed files with 149 additions and 152 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/main/kotlin/com/looker/droidify/ui/fragments/InstalledFragment.kt
View File

@ -30,12 +30,15 @@ import androidx.compose.material3.Icon
import androidx.compose.material3.MaterialTheme import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Scaffold import androidx.compose.material3.Scaffold
import androidx.compose.material3.Text import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue import androidx.compose.runtime.getValue
import androidx.compose.runtime.livedata.observeAsState
import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember import androidx.compose.runtime.remember
import androidx.compose.runtime.setValue import androidx.compose.runtime.setValue
import androidx.compose.ui.Alignment import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.platform.ComposeView
import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.stringResource import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.text.style.TextAlign
@ -44,7 +47,6 @@ import com.looker.droidify.R
import com.looker.droidify.content.Preferences import com.looker.droidify.content.Preferences
import com.looker.droidify.database.entity.Product import com.looker.droidify.database.entity.Product
import com.looker.droidify.database.entity.Repository import com.looker.droidify.database.entity.Repository
import com.looker.droidify.databinding.FragmentComposeBinding
import com.looker.droidify.service.SyncService import com.looker.droidify.service.SyncService
import com.looker.droidify.ui.activities.PrefsActivityX import com.looker.droidify.ui.activities.PrefsActivityX
import com.looker.droidify.ui.compose.ProductsHorizontalRecycler import com.looker.droidify.ui.compose.ProductsHorizontalRecycler
@ -57,8 +59,6 @@ import com.looker.droidify.utility.isDarkTheme
class InstalledFragment : MainNavFragmentX() { class InstalledFragment : MainNavFragmentX() {
private lateinit var binding: FragmentComposeBinding
override val primarySource = Source.INSTALLED override val primarySource = Source.INSTALLED
override val secondarySource = Source.UPDATES override val secondarySource = Source.UPDATES
@ -70,9 +70,9 @@ class InstalledFragment : MainNavFragmentX() {
savedInstanceState: Bundle?, savedInstanceState: Bundle?,
): View { ): View {
super.onCreate(savedInstanceState) super.onCreate(savedInstanceState)
binding = FragmentComposeBinding.inflate(inflater, container, false) return ComposeView(requireContext()).apply {
binding.lifecycleOwner = this setContent { InstalledPage() }
return binding.root }
} }
override fun setupLayout() { override fun setupLayout() {
@ -83,17 +83,15 @@ class InstalledFragment : MainNavFragmentX() {
// Avoid the compiler using the same class as observer // Avoid the compiler using the same class as observer
Log.d(this::class.java.canonicalName, this.toString()) Log.d(this::class.java.canonicalName, this.toString())
} }
viewModel.primaryProducts.observe(viewLifecycleOwner) {
redrawPage(it, viewModel.secondaryProducts.value)
}
viewModel.secondaryProducts.observe(viewLifecycleOwner) {
redrawPage(viewModel.primaryProducts.value, it)
}
} }
@OptIn(ExperimentalMaterial3Api::class, ExperimentalMaterialApi::class) @OptIn(ExperimentalMaterial3Api::class, ExperimentalMaterialApi::class)
private fun redrawPage(primaryList: List<Product>?, secondaryList: List<Product>?) { @Composable
binding.composeView.setContent { private fun InstalledPage() {
val primaryList by viewModel.primaryProducts.observeAsState(null)
val secondaryList by viewModel.secondaryProducts.observeAsState(null)
val searchQuery by viewModel.searchQuery.observeAsState("")
AppTheme( AppTheme(
darkTheme = when (Preferences[Preferences.Key.Theme]) { darkTheme = when (Preferences[Preferences.Key.Theme]) {
is Preferences.Theme.System -> isSystemInDarkTheme() is Preferences.Theme.System -> isSystemInDarkTheme()
@ -106,12 +104,12 @@ class InstalledFragment : MainNavFragmentX() {
topBar = { topBar = {
TopBar(title = stringResource(id = R.string.application_name)) { TopBar(title = stringResource(id = R.string.application_name)) {
ExpandableSearchAction( ExpandableSearchAction(
query = viewModel.searchQuery.value.orEmpty(), query = searchQuery.orEmpty(),
onClose = { onClose = {
viewModel.searchQuery.value = "" viewModel.setSearchQuery("")
}, },
onQueryChanged = { query -> onQueryChanged = { query ->
if (isResumed && query != viewModel.searchQuery.value) if (isResumed && query != searchQuery)
viewModel.setSearchQuery(query) viewModel.setSearchQuery(query)
} }
) )
@ -165,7 +163,7 @@ class InstalledFragment : MainNavFragmentX() {
contentColor = MaterialTheme.colorScheme.onSurface, contentColor = MaterialTheme.colorScheme.onSurface,
), ),
onClick = { onClick = {
viewModel.secondaryProducts.value?.let { secondaryList?.let {
mainActivityX.syncConnection.binder?.updateApps( mainActivityX.syncConnection.binder?.updateApps(
it.map( it.map(
Product::toItem Product::toItem
@ -241,4 +239,3 @@ class InstalledFragment : MainNavFragmentX() {
} }
} }
} }
}