Correct the color of sources text in article reader

app/src/main/java/apps/amine/bou/readerforselfoss/SourcesActivity.kt

@@ -31,9 +31,7 @@ class SourcesActivity : AppCompatActivity() {
 
         val scoop = Scoop.getInstance()
         scoop.bind(this, Toppings.PRIMARY.value, binding.toolbar)
-        if  (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
         scoop.bindStatusBar(this, Toppings.PRIMARY_DARK.value)
-        }
 
         super.onCreate(savedInstanceState)
         binding = ActivitySourcesBinding.inflate(layoutInflater)
@@ -41,10 +39,6 @@ class SourcesActivity : AppCompatActivity() {
 
         setContentView(view)
 
-        val scoop = Scoop.getInstance()
-        scoop.bind(this, Toppings.PRIMARY.value, binding.toolbar)
-        scoop.bindStatusBar(this, Toppings.PRIMARY_DARK.value)
-
         setSupportActionBar(binding.toolbar)
         supportActionBar?.setDisplayHomeAsUpEnabled(true)
         supportActionBar?.setDisplayShowHomeEnabled(true)

app/src/main/java/apps/amine/bou/readerforselfoss/adapters/ItemCardAdapter.kt

@@ -7,7 +7,6 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.ImageView.ScaleType
-import androidx.core.content.ContextCompat
 import apps.amine.bou.readerforselfoss.R
 import apps.amine.bou.readerforselfoss.api.selfoss.Item
 import apps.amine.bou.readerforselfoss.api.selfoss.SelfossApi
@@ -61,10 +60,6 @@ class ItemCardAdapter(
 
             binding.favButton.isSelected = itm.starred
             binding.title.text = itm.getTitleDecoded()
-            binding.title.setTextColor(ContextCompat.getColor(
-                    c,
-                    appColors.textColor
-            ))
 
             binding.title.setOnTouchListener(LinkOnTouchListener())
 
@@ -72,11 +67,6 @@ class ItemCardAdapter(
 
             binding.sourceTitleAndDate.text = itm.sourceAndDateText()
 
-            binding.sourceTitleAndDate.setTextColor(ContextCompat.getColor(
-                    c,
-                    appColors.textColor
-            ))
-
             if (!fullHeightCards) {
                 binding.itemImage.maxHeight = imageMaxHeight
                 binding.itemImage.scaleType = ScaleType.CENTER_CROP
@@ -112,7 +102,6 @@ class ItemCardAdapter(
 
     inner class ViewHolder(val binding: CardItemBinding) : RecyclerView.ViewHolder(binding.root) {
         init {
-            binding.root.setCardBackgroundColor(appColors.cardBackgroundColor)
             handleClickListeners()
             handleCustomTabActions()
         }

app/src/main/java/apps/amine/bou/readerforselfoss/adapters/ItemListAdapter.kt

@@ -5,7 +5,6 @@ import android.content.Context
 import androidx.recyclerview.widget.RecyclerView
 import android.view.LayoutInflater
 import android.view.ViewGroup
-import androidx.core.content.ContextCompat
 import apps.amine.bou.readerforselfoss.api.selfoss.Item
 import apps.amine.bou.readerforselfoss.api.selfoss.SelfossApi
 import apps.amine.bou.readerforselfoss.databinding.ListItemBinding
@@ -49,25 +48,14 @@ class ItemListAdapter(
         with(holder) {
             val itm = items[position]
 
-
             binding.title.text = itm.getTitleDecoded()
 
-            binding.title.setTextColor(ContextCompat.getColor(
-                    c,
-                    appColors.textColor
-            ))
-
             binding.title.setOnTouchListener(LinkOnTouchListener())
 
             binding.title.setLinkTextColor(appColors.colorAccent)
 
             binding.sourceTitleAndDate.text = itm.sourceAndDateText()
 
-            binding.sourceTitleAndDate.setTextColor(ContextCompat.getColor(
-                    c,
-                    appColors.textColor
-            ))
-
             if (itm.getThumbnail(c).isEmpty()) {
 
                 if (itm.getIcon(c).isEmpty()) {

app/src/main/java/apps/amine/bou/readerforselfoss/fragments/ArticleFragment.kt

@@ -392,24 +392,12 @@ class ArticleFragment : Fragment() {
         binding.webcontent.visibility = View.VISIBLE
         val (textColor, backgroundColor) = if (appColors.isDarkTheme) {
             if (context != null) {
-                binding.webcontent.setBackgroundColor(
-                    ContextCompat.getColor(
-                        requireContext(),
-                        R.color.dark_webview
-                    )
-                )
                 Pair(ContextCompat.getColor(requireContext(), R.color.dark_webview_text), ContextCompat.getColor(requireContext(), R.color.dark_webview))
             } else {
                 Pair(null, null)
             }
         } else {
             if (context != null) {
-                binding.webcontent.setBackgroundColor(
-                    ContextCompat.getColor(
-                        requireContext(),
-                        R.color.light_webview
-                    )
-                )
                 Pair(ContextCompat.getColor(requireContext(), R.color.light_webview_text), ContextCompat.getColor(requireContext(), R.color.light_webview))
             } else {
                 Pair(null, null)

app/src/main/java/apps/amine/bou/readerforselfoss/settings/SettingsActivity.kt

@@ -13,7 +13,10 @@ import androidx.core.widget.addTextChangedListener
 import androidx.preference.Preference
 import androidx.preference.PreferenceFragmentCompat
 import apps.amine.bou.readerforselfoss.R
+import apps.amine.bou.readerforselfoss.databinding.ActivitySettingsBinding
+import apps.amine.bou.readerforselfoss.themes.Toppings
 import apps.amine.bou.readerforselfoss.utils.Config
+import com.ftinc.scoop.Scoop
 import java.lang.NumberFormatException
 
 private const val TITLE_TAG = "settingsActivityTitle"
@@ -26,7 +29,13 @@ class SettingsActivity : AppCompatActivity(),
         if (PreferenceManager.getDefaultSharedPreferences(this).getBoolean("dark_theme", false)) {
             setTheme(R.style.NoBarDark)
         }
-        setContentView(R.layout.activity_settings)
+        val binding = ActivitySettingsBinding.inflate(layoutInflater)
+
+        val scoop = Scoop.getInstance()
+        scoop.bind(this, Toppings.PRIMARY.value, binding.toolbar)
+        scoop.bindStatusBar(this, Toppings.PRIMARY_DARK.value)
+
+        setContentView(binding.root)
         if (savedInstanceState == null) {
             supportFragmentManager
                     .beginTransaction()
@@ -41,7 +50,7 @@ class SettingsActivity : AppCompatActivity(),
             }
         }
 
-        setSupportActionBar(findViewById(R.id.toolbar))
+        setSupportActionBar(binding.toolbar)
 
         supportActionBar?.setDisplayHomeAsUpEnabled(true)
         supportActionBar?.setDisplayShowHomeEnabled(true)

app/src/main/java/apps/amine/bou/readerforselfoss/themes/AppColors.kt

@@ -1,14 +1,9 @@
 package apps.amine.bou.readerforselfoss.themes
 
 import android.app.Activity
-import android.content.Context
-import androidx.preference.PreferenceManager
 import androidx.annotation.ColorInt
-import androidx.appcompat.view.ContextThemeWrapper
-import android.util.TypedValue
+import androidx.preference.PreferenceManager
 import apps.amine.bou.readerforselfoss.R
-import android.view.LayoutInflater
-import android.view.ViewGroup
 
 class AppColors(a: Activity) {
 
@@ -16,7 +11,6 @@ class AppColors(a: Activity) {
     @ColorInt val colorPrimaryDark: Int
     @ColorInt val colorAccent: Int
     @ColorInt val colorAccentDark: Int
-    @ColorInt val cardBackgroundColor: Int
     @ColorInt val colorBackground: Int
     @ColorInt val textColor: Int
     val isDarkTheme: Boolean
@@ -63,14 +57,5 @@ class AppColors(a: Activity) {
         } else {
             R.color.grey_900
         }
-
-        val wrapper = Context::class.java
-        val method = wrapper!!.getMethod("getThemeResId")
-        method.isAccessible = true
-
-        val typedCardBackground = TypedValue()
-        a.theme.resolveAttribute(R.attr.cardBackgroundColor, typedCardBackground, true)
-
-        cardBackgroundColor = typedCardBackground.data
     }
 }

app/src/main/res/layout/card_item.xml

@@ -16,7 +16,8 @@
     app:layout_constraintTop_toTopOf="parent"
     card_view:cardElevation="2dp"
     card_view:cardUseCompatPadding="true"
-    card_view:layout_constraintBottom_toBottomOf="parent">
+    card_view:layout_constraintBottom_toBottomOf="parent"
+    app:cardBackgroundColor="?cardBackgroundColor">
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
@@ -65,6 +66,7 @@
                 android:gravity="start"
                 android:textAlignment="viewStart"
                 android:textStyle="bold"
+                android:textColor="?android:textColorPrimary"
                 app:layout_constraintHorizontal_bias="0.0"
                 app:layout_constraintLeft_toRightOf="@+id/sourceImage"
                 app:layout_constraintRight_toRightOf="parent"
@@ -79,6 +81,7 @@
                 android:gravity="start"
                 android:textAlignment="viewStart"
                 android:textSize="14sp"
+                android:textColor="?android:textColorPrimary"
                 app:layout_constraintLeft_toLeftOf="@+id/title"
                 app:layout_constraintTop_toBottomOf="@+id/title"
                 tools:text="Google Actualité Il y a 5h" />

app/src/main/res/layout/fragment_article.xml

@@ -33,7 +33,7 @@
                 android:layout_marginLeft="16dp"
                 android:layout_marginTop="8dp"
                 android:layout_marginRight="16dp"
-                android:textAppearance="@style/TextAppearance.AppCompat.Small"
+                android:textColor="?android:textColorSecondary"
                 android:textSize="12sp"
                 app:layout_constraintHorizontal_bias="0.0"
                 app:layout_constraintLeft_toLeftOf="parent"
@@ -65,6 +65,7 @@
                 android:layout_marginRight="16dp"
                 android:layout_marginTop="24dp"
                 android:paddingBottom="48dp"
+                android:background="?android:colorBackground"
                 app:layout_constraintHorizontal_bias="0.0"
                 app:layout_constraintLeft_toLeftOf="parent"
                 app:layout_constraintRight_toRightOf="parent"

app/src/main/res/layout/list_item.xml

@@ -12,7 +12,8 @@
         android:layout_marginStart="8dp"
         android:layout_marginTop="21dp"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toTopOf="parent"
+        android:layout_marginLeft="8dp" />
 
     <TextView
         android:id="@+id/title"
@@ -29,11 +30,14 @@
         android:textAllCaps="false"
         android:textSize="16sp"
         android:textStyle="bold"
+        android:textColor="?android:textColorPrimary"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintStart_toEndOf="@+id/itemImage"
         app:layout_constraintTop_toTopOf="parent"
-        tools:text="Titre" />
+        tools:text="Titre"
+        android:layout_marginLeft="8dp"
+        android:layout_marginRight="16dp" />
 
     <TextView
         android:id="@+id/sourceTitleAndDate"
@@ -46,10 +50,13 @@
         android:maxLines="1"
         android:textAlignment="viewStart"
         android:textSize="14sp"
+        android:textColor="?android:textColorPrimary"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintStart_toEndOf="@+id/itemImage"
         app:layout_constraintTop_toTopOf="parent"
-        tools:text="Google Actualité Il y a 5h" />
+        tools:text="Google Actualité Il y a 5h"
+        android:layout_marginLeft="8dp"
+        android:layout_marginRight="16dp" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>