From de3376d6cec3f687e4b5a0888d6624896a4de366 Mon Sep 17 00:00:00 2001 From: machiav3lli Date: Tue, 12 Apr 2022 18:21:51 +0200 Subject: [PATCH] Update: Unify Explore, Installed, Latest & PrefRepo layouts --- .../droidify/ui/fragments/ExploreFragment.kt | 8 ++--- .../ui/fragments/InstalledFragment.kt | 8 ++--- .../droidify/ui/fragments/LatestFragment.kt | 8 ++--- .../ui/fragments/PrefsRepositoriesFragment.kt | 8 ++--- ...epositories_x.xml => fragment_compose.xml} | 2 +- src/main/res/layout/fragment_explore_x.xml | 34 ------------------ src/main/res/layout/fragment_installed_x.xml | 35 ------------------- src/main/res/layout/fragment_latest_x.xml | 35 ------------------- 8 files changed, 17 insertions(+), 121 deletions(-) rename src/main/res/layout/{fragment_repositories_x.xml => fragment_compose.xml} (96%) delete mode 100644 src/main/res/layout/fragment_explore_x.xml delete mode 100644 src/main/res/layout/fragment_installed_x.xml delete mode 100644 src/main/res/layout/fragment_latest_x.xml diff --git a/src/main/kotlin/com/looker/droidify/ui/fragments/ExploreFragment.kt b/src/main/kotlin/com/looker/droidify/ui/fragments/ExploreFragment.kt index 5122aafd..92b4150f 100644 --- a/src/main/kotlin/com/looker/droidify/ui/fragments/ExploreFragment.kt +++ b/src/main/kotlin/com/looker/droidify/ui/fragments/ExploreFragment.kt @@ -20,7 +20,7 @@ import com.looker.droidify.R import com.looker.droidify.content.Preferences import com.looker.droidify.database.entity.Product import com.looker.droidify.database.entity.Repository -import com.looker.droidify.databinding.FragmentExploreXBinding +import com.looker.droidify.databinding.FragmentComposeBinding import com.looker.droidify.entity.Section import com.looker.droidify.ui.compose.ProductsVerticalRecycler import com.looker.droidify.ui.compose.theme.AppTheme @@ -30,7 +30,7 @@ import com.looker.droidify.widget.FocusSearchView class ExploreFragment : MainNavFragmentX() { - private lateinit var binding: FragmentExploreXBinding + private lateinit var binding: FragmentComposeBinding override val primarySource = Source.AVAILABLE override val secondarySource = Source.AVAILABLE @@ -43,7 +43,7 @@ class ExploreFragment : MainNavFragmentX() { savedInstanceState: Bundle?, ): View { super.onCreate(savedInstanceState) - binding = FragmentExploreXBinding.inflate(inflater, container, false) + binding = FragmentComposeBinding.inflate(inflater, container, false) binding.lifecycleOwner = this return binding.root } @@ -82,7 +82,7 @@ class ExploreFragment : MainNavFragmentX() { @OptIn(ExperimentalMaterialApi::class, ExperimentalMaterial3Api::class) private fun redrawPage(products: List?, categories: List = emptyList()) { - binding.primaryComposeRecycler.setContent { + binding.composeView.setContent { AppTheme( darkTheme = when (Preferences[Preferences.Key.Theme]) { is Preferences.Theme.System -> isSystemInDarkTheme() diff --git a/src/main/kotlin/com/looker/droidify/ui/fragments/InstalledFragment.kt b/src/main/kotlin/com/looker/droidify/ui/fragments/InstalledFragment.kt index 809585ce..58a82c91 100644 --- a/src/main/kotlin/com/looker/droidify/ui/fragments/InstalledFragment.kt +++ b/src/main/kotlin/com/looker/droidify/ui/fragments/InstalledFragment.kt @@ -27,7 +27,7 @@ import com.looker.droidify.R import com.looker.droidify.content.Preferences import com.looker.droidify.database.entity.Product import com.looker.droidify.database.entity.Repository -import com.looker.droidify.databinding.FragmentInstalledXBinding +import com.looker.droidify.databinding.FragmentComposeBinding import com.looker.droidify.ui.compose.ProductsHorizontalRecycler import com.looker.droidify.ui.compose.ProductsVerticalRecycler import com.looker.droidify.ui.compose.theme.AppTheme @@ -36,7 +36,7 @@ import com.looker.droidify.widget.FocusSearchView class InstalledFragment : MainNavFragmentX() { - private lateinit var binding: FragmentInstalledXBinding + private lateinit var binding: FragmentComposeBinding override val primarySource = Source.INSTALLED override val secondarySource = Source.UPDATES @@ -49,7 +49,7 @@ class InstalledFragment : MainNavFragmentX() { savedInstanceState: Bundle?, ): View { super.onCreate(savedInstanceState) - binding = FragmentInstalledXBinding.inflate(inflater, container, false) + binding = FragmentComposeBinding.inflate(inflater, container, false) binding.lifecycleOwner = this return binding.root } @@ -88,7 +88,7 @@ class InstalledFragment : MainNavFragmentX() { @OptIn(ExperimentalMaterial3Api::class, ExperimentalMaterialApi::class) private fun redrawPage(primaryList: List?, secondaryList: List?) { - binding.primaryComposeRecycler.setContent { + binding.composeView.setContent { AppTheme( darkTheme = when (Preferences[Preferences.Key.Theme]) { is Preferences.Theme.System -> isSystemInDarkTheme() diff --git a/src/main/kotlin/com/looker/droidify/ui/fragments/LatestFragment.kt b/src/main/kotlin/com/looker/droidify/ui/fragments/LatestFragment.kt index 6f90790f..f25b5865 100644 --- a/src/main/kotlin/com/looker/droidify/ui/fragments/LatestFragment.kt +++ b/src/main/kotlin/com/looker/droidify/ui/fragments/LatestFragment.kt @@ -21,7 +21,7 @@ import com.looker.droidify.R import com.looker.droidify.content.Preferences import com.looker.droidify.database.entity.Product import com.looker.droidify.database.entity.Repository -import com.looker.droidify.databinding.FragmentLatestXBinding +import com.looker.droidify.databinding.FragmentComposeBinding import com.looker.droidify.ui.compose.ProductsHorizontalRecycler import com.looker.droidify.ui.compose.ProductsVerticalRecycler import com.looker.droidify.ui.compose.theme.AppTheme @@ -30,7 +30,7 @@ import com.looker.droidify.widget.FocusSearchView class LatestFragment : MainNavFragmentX() { - private lateinit var binding: FragmentLatestXBinding + private lateinit var binding: FragmentComposeBinding // TODO replace the source with one that get a certain amount of updated apps override val primarySource = Source.UPDATED @@ -44,7 +44,7 @@ class LatestFragment : MainNavFragmentX() { savedInstanceState: Bundle?, ): View { super.onCreate(savedInstanceState) - binding = FragmentLatestXBinding.inflate(inflater, container, false) + binding = FragmentComposeBinding.inflate(inflater, container, false) binding.lifecycleOwner = this return binding.root } @@ -83,7 +83,7 @@ class LatestFragment : MainNavFragmentX() { @OptIn(ExperimentalMaterialApi::class, ExperimentalMaterial3Api::class) private fun redrawPage(primaryList: List?, secondaryList: List?) { - binding.primaryComposeRecycler.setContent { + binding.composeView.setContent { AppTheme( darkTheme = when (Preferences[Preferences.Key.Theme]) { is Preferences.Theme.System -> isSystemInDarkTheme() diff --git a/src/main/kotlin/com/looker/droidify/ui/fragments/PrefsRepositoriesFragment.kt b/src/main/kotlin/com/looker/droidify/ui/fragments/PrefsRepositoriesFragment.kt index 860ad66d..29ae20d0 100644 --- a/src/main/kotlin/com/looker/droidify/ui/fragments/PrefsRepositoriesFragment.kt +++ b/src/main/kotlin/com/looker/droidify/ui/fragments/PrefsRepositoriesFragment.kt @@ -16,7 +16,7 @@ import androidx.fragment.app.viewModels import com.looker.droidify.R import com.looker.droidify.content.Preferences import com.looker.droidify.database.entity.Repository -import com.looker.droidify.databinding.FragmentRepositoriesXBinding +import com.looker.droidify.databinding.FragmentComposeBinding import com.looker.droidify.service.Connection import com.looker.droidify.service.SyncService import com.looker.droidify.ui.activities.PrefsActivityX @@ -29,7 +29,7 @@ import kotlinx.coroutines.GlobalScope import kotlinx.coroutines.launch class PrefsRepositoriesFragment : BaseNavFragment() { - private lateinit var binding: FragmentRepositoriesXBinding + private lateinit var binding: FragmentComposeBinding val viewModel: RepositoriesViewModelX by viewModels { RepositoriesViewModelX.Factory(prefsActivityX.db) } @@ -45,7 +45,7 @@ class PrefsRepositoriesFragment : BaseNavFragment() { savedInstanceState: Bundle?, ): View { super.onCreate(savedInstanceState) - binding = FragmentRepositoriesXBinding.inflate(inflater, container, false) + binding = FragmentComposeBinding.inflate(inflater, container, false) binding.lifecycleOwner = this return binding.root @@ -65,7 +65,7 @@ class PrefsRepositoriesFragment : BaseNavFragment() { @OptIn(ExperimentalMaterial3Api::class) fun redrawPage(repos: List) { - binding.reposRecycler.setContent { + binding.composeView.setContent { AppTheme( darkTheme = when (Preferences[Preferences.Key.Theme]) { is Preferences.Theme.System -> isSystemInDarkTheme() diff --git a/src/main/res/layout/fragment_repositories_x.xml b/src/main/res/layout/fragment_compose.xml similarity index 96% rename from src/main/res/layout/fragment_repositories_x.xml rename to src/main/res/layout/fragment_compose.xml index 7010967d..2550aee8 100644 --- a/src/main/res/layout/fragment_repositories_x.xml +++ b/src/main/res/layout/fragment_compose.xml @@ -27,7 +27,7 @@ android:orientation="vertical"> diff --git a/src/main/res/layout/fragment_explore_x.xml b/src/main/res/layout/fragment_explore_x.xml deleted file mode 100644 index 476406bb..00000000 --- a/src/main/res/layout/fragment_explore_x.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - - - diff --git a/src/main/res/layout/fragment_installed_x.xml b/src/main/res/layout/fragment_installed_x.xml deleted file mode 100644 index 9ca6818b..00000000 --- a/src/main/res/layout/fragment_installed_x.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - - - - - - diff --git a/src/main/res/layout/fragment_latest_x.xml b/src/main/res/layout/fragment_latest_x.xml deleted file mode 100644 index 9ca6818b..00000000 --- a/src/main/res/layout/fragment_latest_x.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - - - - - -