Test compose base color styles

app/src/main/java/org/wikipedia/feed/FeedFragment.kt

@@ -7,6 +7,10 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.activity.result.contract.ActivityResultContracts
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.ComposeView
+import androidx.compose.ui.platform.ViewCompositionStrategy
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.RecyclerView
@@ -17,7 +21,6 @@ import org.wikipedia.R
 import org.wikipedia.WikipediaApp
 import org.wikipedia.activity.FragmentUtil.getCallback
 import org.wikipedia.databinding.FragmentFeedBinding
-import org.wikipedia.feed.FeedCoordinatorBase.FeedUpdateListener
 import org.wikipedia.feed.configure.ConfigureActivity
 import org.wikipedia.feed.configure.ConfigureItemLanguageDialogView
 import org.wikipedia.feed.configure.LanguageItemAdapter
@@ -35,10 +38,9 @@ import org.wikipedia.feed.view.RegionalLanguageVariantSelectionDialog
 import org.wikipedia.history.HistoryEntry
 import org.wikipedia.language.AppLanguageLookUpTable
 import org.wikipedia.random.RandomActivity
-import org.wikipedia.readinglist.sync.ReadingListSyncAdapter
-import org.wikipedia.settings.Prefs
 import org.wikipedia.settings.SettingsActivity
 import org.wikipedia.settings.languages.WikipediaLanguagesActivity
+import org.wikipedia.theme.ThemeTest
 import org.wikipedia.util.FeedbackUtil
 import org.wikipedia.util.UriUtil
 
@@ -85,50 +87,58 @@ class FeedFragment : Fragment(), BackPressedHandler {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        coordinator.more(app.wikiSite)
+        // coordinator.more(app.wikiSite)
     }
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
         super.onCreateView(inflater, container, savedInstanceState)
-        _binding = FragmentFeedBinding.inflate(inflater, container, false)
-        feedAdapter = FeedAdapter(coordinator, feedCallback)
-        binding.feedView.adapter = feedAdapter
-        binding.feedView.addOnScrollListener(feedScrollListener)
-        binding.swipeRefreshLayout.setOnRefreshListener { refresh() }
-        binding.customizeButton.setOnClickListener { showConfigureActivity(-1) }
-        coordinator.setFeedUpdateListener(object : FeedUpdateListener {
-            override fun insert(card: Card, pos: Int) {
-                if (isAdded) {
-                    binding.swipeRefreshLayout.isRefreshing = false
-                    feedAdapter.notifyItemInserted(pos)
-                }
-            }
-
-            override fun remove(card: Card, pos: Int) {
-                if (isAdded) {
-                    binding.swipeRefreshLayout.isRefreshing = false
-                    feedAdapter.notifyItemRemoved(pos)
-                }
+//        _binding = FragmentFeedBinding.inflate(inflater, container, false)
+//        feedAdapter = FeedAdapter(coordinator, feedCallback)
+//        binding.feedView.adapter = feedAdapter
+//        binding.feedView.addOnScrollListener(feedScrollListener)
+//        binding.swipeRefreshLayout.setOnRefreshListener { refresh() }
+//        binding.customizeButton.setOnClickListener { showConfigureActivity(-1) }
+//        coordinator.setFeedUpdateListener(object : FeedUpdateListener {
+//            override fun insert(card: Card, pos: Int) {
+//                if (isAdded) {
+//                    binding.swipeRefreshLayout.isRefreshing = false
+//                    feedAdapter.notifyItemInserted(pos)
+//                }
+//            }
+//
+//            override fun remove(card: Card, pos: Int) {
+//                if (isAdded) {
+//                    binding.swipeRefreshLayout.isRefreshing = false
+//                    feedAdapter.notifyItemRemoved(pos)
+//                }
+//            }
+//
+//            override fun finished(shouldUpdatePreviousCard: Boolean) {
+//                if (!isAdded) {
+//                    return
+//                }
+//                if (feedAdapter.itemCount < 2) {
+//                    binding.emptyContainer.visibility = View.VISIBLE
+//                } else {
+//                    binding.emptyContainer.visibility = View.GONE
+//                    if (shouldUpdatePreviousCard) {
+//                        feedAdapter.notifyItemChanged(feedAdapter.itemCount - 1)
+//                    }
+//                }
+//            }
+//        })
+//        callback?.updateToolbarElevation(shouldElevateToolbar())
+//        ReadingListSyncAdapter.manualSync()
+//        Prefs.incrementExploreFeedVisitCount()
+        return ComposeView(requireContext()).apply {
+            setViewCompositionStrategy(ViewCompositionStrategy.DisposeOnViewTreeLifecycleDestroyed)
+            setContent {
+                ThemeTest(
+                    modifier = Modifier
+                        .fillMaxSize()
+                )
             }
-
-            override fun finished(shouldUpdatePreviousCard: Boolean) {
-                if (!isAdded) {
-                    return
-                }
-                if (feedAdapter.itemCount < 2) {
-                    binding.emptyContainer.visibility = View.VISIBLE
-                } else {
-                    binding.emptyContainer.visibility = View.GONE
-                    if (shouldUpdatePreviousCard) {
-                        feedAdapter.notifyItemChanged(feedAdapter.itemCount - 1)
-                    }
-                }
-            }
-        })
-        callback?.updateToolbarElevation(shouldElevateToolbar())
-        ReadingListSyncAdapter.manualSync()
-        Prefs.incrementExploreFeedVisitCount()
-        return binding.root
+        }
     }
 
     override fun onResume() {
@@ -138,15 +148,15 @@ class FeedFragment : Fragment(), BackPressedHandler {
         // Explicitly invalidate the feed adapter, since it occasionally crashes the StaggeredGridLayout
         // on certain devices.
         // https://issuetracker.google.com/issues/188096921
-        feedAdapter.notifyDataSetChanged()
+        // feedAdapter.notifyDataSetChanged()
     }
 
     override fun onDestroyView() {
-        coordinator.setFeedUpdateListener(null)
-        binding.swipeRefreshLayout.setOnRefreshListener(null)
-        binding.feedView.removeOnScrollListener(feedScrollListener)
-        binding.feedView.adapter = null
-        _binding = null
+//        coordinator.setFeedUpdateListener(null)
+//        binding.swipeRefreshLayout.setOnRefreshListener(null)
+//        binding.feedView.removeOnScrollListener(feedScrollListener)
+//        binding.feedView.adapter = null
+//        _binding = null
         super.onDestroyView()
     }
 

app/src/main/java/org/wikipedia/theme/ComposeTest.kt

@@ -0,0 +1,139 @@
+package org.wikipedia.theme
+
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.verticalScroll
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.layout.ContentScale
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import org.wikipedia.R
+import org.wikipedia.compose.MainTheme
+import org.wikipedia.compose.WikipediaTheme
+import org.wikipedia.compose.WikipediaThemeType
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun ThemeTest(modifier: Modifier = Modifier) {
+    var currentTheme by remember { mutableStateOf(WikipediaThemeType.SYSTEM) }
+    var showDatePicker by remember { mutableStateOf(false) }
+    val scrollableState = rememberScrollState()
+    MainTheme(
+        wikipediaThemeType = currentTheme
+    ) {
+        Scaffold(
+            content = { paddingValues ->
+                Column(
+                    modifier = modifier
+                        .verticalScroll(scrollableState)
+                        .padding(paddingValues)
+                        .padding(12.dp),
+                    verticalArrangement = Arrangement.spacedBy(12.dp)
+                ) {
+                    ThemeButtons(
+                        modifier = Modifier
+                            .fillMaxWidth(),
+                        onLightThemeClick = {
+                            currentTheme = WikipediaThemeType.LIGHT
+                        },
+                        onDarkThemeClick = {
+                            currentTheme = WikipediaThemeType.DARK
+                        },
+                        onBlackThemeClick = {
+                            currentTheme = WikipediaThemeType.BLACK
+                        },
+                        onSepiaThemeClick = {
+                            currentTheme = WikipediaThemeType.SEPIA
+                        }
+                    )
+
+                    NewWikiCardView(
+                        modifier = Modifier
+                            .fillMaxWidth(),
+                        content = {
+                            Column(
+                                modifier = Modifier
+                                    .padding(8.dp),
+                                verticalArrangement = Arrangement.spacedBy(12.dp)
+                            ) {
+                                ThemedText(
+                                    text = "Jan 6, 2025"
+                                )
+                                ThemedText(
+                                    text = "Featured Article",
+                                    fontWeight = FontWeight.Bold,
+                                    fontSize = 16.sp,
+                                    color = WikipediaTheme.colors.successColor
+                                )
+                                Image(
+                                    modifier = Modifier
+                                        .height(192.dp)
+                                        .fillMaxWidth(),
+                                    painter = painterResource(R.drawable.ic_image_tags_onboarding_dark),
+                                    contentScale = ContentScale.Crop,
+                                    contentDescription = null
+                                )
+                                ThemedText(
+                                    text = "Test",
+                                    fontWeight = FontWeight.Bold,
+                                    fontSize = 16.sp,
+                                    color = WikipediaTheme.colors.highlightColor
+                                )
+                                ThemedText(
+                                    text = "What is Lorem Ipsum?\n" +
+                                            "Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries, but also the leap into electronic typesetting, remaining essentially unchanged. It was popularised in the 1960s with the release of Letraset sheets containing Lorem Ipsum passages, and more recently with desktop publishing software like Aldus PageMaker including versions of Lorem Ipsum.",
+                                    color = WikipediaTheme.colors.destructiveColor
+                                )
+                            }
+                        }
+                    )
+
+                    ThemedButton(
+                        onClick = {
+                            showDatePicker = true
+                        },
+                        content = {
+                            Text("Date Picker")
+                        }
+                    )
+
+                    if (showDatePicker) {
+                        ThemedDatePicker(
+                            onDismissRequest = {
+                                showDatePicker = false
+                            },
+
+                            confirmButton = {},
+                        )
+                    }
+                }
+            }
+        )
+    }
+}
+
+@Preview(showSystemUi = true)
+@Composable
+private fun ThemeTestPreview() {
+    ThemeTest(
+        modifier = Modifier
+            .fillMaxSize()
+    )
+}