diff --git a/app/src/main/java/apps/amine/bou/readerforselfoss/adapters/ItemCardAdapter.kt b/app/src/main/java/apps/amine/bou/readerforselfoss/adapters/ItemCardAdapter.kt index 2397d57..a3abce0 100644 --- a/app/src/main/java/apps/amine/bou/readerforselfoss/adapters/ItemCardAdapter.kt +++ b/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() } diff --git a/app/src/main/java/apps/amine/bou/readerforselfoss/themes/AppColors.kt b/app/src/main/java/apps/amine/bou/readerforselfoss/themes/AppColors.kt index 7eaf998..95d0c13 100644 --- a/app/src/main/java/apps/amine/bou/readerforselfoss/themes/AppColors.kt +++ b/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 } } diff --git a/app/src/main/res/layout/card_item.xml b/app/src/main/res/layout/card_item.xml index aff415b..7b6863d 100644 --- a/app/src/main/res/layout/card_item.xml +++ b/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">