mirror of
https://github.com/Aviortheking/Neo-Store.git
synced 2025-04-23 19:32:16 +00:00
Update: Migrate Repos to use Compose solely
This commit is contained in:
parent
123adea168
commit
96a133dbec
@ -16,7 +16,11 @@ import androidx.compose.material3.MaterialTheme
|
|||||||
import androidx.compose.material3.OutlinedButton
|
import androidx.compose.material3.OutlinedButton
|
||||||
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.livedata.observeAsState
|
||||||
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
|
||||||
@ -24,8 +28,6 @@ import androidx.compose.ui.unit.dp
|
|||||||
import androidx.fragment.app.viewModels
|
import androidx.fragment.app.viewModels
|
||||||
import com.looker.droidify.R
|
import com.looker.droidify.R
|
||||||
import com.looker.droidify.content.Preferences
|
import com.looker.droidify.content.Preferences
|
||||||
import com.looker.droidify.database.entity.Repository
|
|
||||||
import com.looker.droidify.databinding.FragmentComposeBinding
|
|
||||||
import com.looker.droidify.service.Connection
|
import com.looker.droidify.service.Connection
|
||||||
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
|
||||||
@ -38,7 +40,7 @@ import kotlinx.coroutines.GlobalScope
|
|||||||
import kotlinx.coroutines.launch
|
import kotlinx.coroutines.launch
|
||||||
|
|
||||||
class PrefsRepositoriesFragment : BaseNavFragment() {
|
class PrefsRepositoriesFragment : BaseNavFragment() {
|
||||||
private lateinit var binding: FragmentComposeBinding
|
|
||||||
val viewModel: RepositoriesViewModelX by viewModels {
|
val viewModel: RepositoriesViewModelX by viewModels {
|
||||||
RepositoriesViewModelX.Factory(prefsActivityX.db)
|
RepositoriesViewModelX.Factory(prefsActivityX.db)
|
||||||
}
|
}
|
||||||
@ -54,17 +56,13 @@ class PrefsRepositoriesFragment : BaseNavFragment() {
|
|||||||
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 { ReposPage() }
|
||||||
|
}
|
||||||
return binding.root
|
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun setupLayout() {
|
override fun setupLayout() {
|
||||||
syncConnection.bind(requireContext())
|
syncConnection.bind(requireContext())
|
||||||
viewModel.repositories.observe(requireActivity()) {
|
|
||||||
redrawPage(it)
|
|
||||||
}
|
|
||||||
viewModel.toLaunch.observe(viewLifecycleOwner) {
|
viewModel.toLaunch.observe(viewLifecycleOwner) {
|
||||||
if (it?.first == true) {
|
if (it?.first == true) {
|
||||||
EditRepositorySheetX(it.second)
|
EditRepositorySheetX(it.second)
|
||||||
@ -80,8 +78,10 @@ class PrefsRepositoriesFragment : BaseNavFragment() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@OptIn(ExperimentalMaterial3Api::class)
|
@OptIn(ExperimentalMaterial3Api::class)
|
||||||
fun redrawPage(repos: List<Repository>) {
|
@Composable
|
||||||
binding.composeView.setContent {
|
fun ReposPage() {
|
||||||
|
val repos by viewModel.repositories.observeAsState(null)
|
||||||
|
|
||||||
AppTheme(
|
AppTheme(
|
||||||
darkTheme = when (Preferences[Preferences.Key.Theme]) {
|
darkTheme = when (Preferences[Preferences.Key.Theme]) {
|
||||||
is Preferences.Theme.System -> isSystemInDarkTheme()
|
is Preferences.Theme.System -> isSystemInDarkTheme()
|
||||||
@ -117,7 +117,7 @@ class PrefsRepositoriesFragment : BaseNavFragment() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
RepositoriesRecycler(
|
RepositoriesRecycler(
|
||||||
repositoriesList = repos.sortedBy { repo -> !repo.enabled },
|
repositoriesList = repos?.sortedBy { repo -> !repo.enabled },
|
||||||
onClick = { repo ->
|
onClick = { repo ->
|
||||||
repo.enabled = !repo.enabled
|
repo.enabled = !repo.enabled
|
||||||
GlobalScope.launch(Dispatchers.IO) {
|
GlobalScope.launch(Dispatchers.IO) {
|
||||||
@ -132,5 +132,4 @@ class PrefsRepositoriesFragment : BaseNavFragment() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user