Theme (#375)
* Fix sources colors * Fix issues with sources * Simplify card view theme * Simplify list item theming * Simplify article viewer theming * Fix issues with the color selection. * Correct the color of sources text in article reader
This commit is contained in:
parent
cedb207eca
commit
69aaa323e2
@ -29,16 +29,16 @@ class SourcesActivity : AppCompatActivity() {
|
||||
override fun onCreate(savedInstanceState: Bundle?) {
|
||||
appColors = AppColors(this@SourcesActivity)
|
||||
|
||||
val scoop = Scoop.getInstance()
|
||||
scoop.bind(this, Toppings.PRIMARY.value, binding.toolbar)
|
||||
scoop.bindStatusBar(this, Toppings.PRIMARY_DARK.value)
|
||||
|
||||
super.onCreate(savedInstanceState)
|
||||
binding = ActivitySourcesBinding.inflate(layoutInflater)
|
||||
val view = binding.root
|
||||
|
||||
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)
|
||||
|
@ -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()
|
||||
}
|
||||
|
@ -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()) {
|
||||
|
@ -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)
|
||||
|
@ -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)
|
||||
|
@ -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
|
||||
}
|
||||
}
|
||||
|
@ -7,7 +7,7 @@
|
||||
tools:context="apps.amine.bou.readerforselfoss.AddSourceActivity">
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="vertical">
|
||||
|
||||
<com.google.android.material.appbar.AppBarLayout
|
||||
@ -55,7 +55,8 @@
|
||||
android:layout_marginRight="16dp"
|
||||
android:layout_marginStart="16dp"
|
||||
app:layout_constraintLeft_toLeftOf="parent"
|
||||
android:layout_marginLeft="16dp"/>
|
||||
android:layout_marginLeft="16dp"
|
||||
android:gravity="center_horizontal" />
|
||||
|
||||
<EditText
|
||||
android:layout_width="match_parent"
|
||||
@ -67,7 +68,9 @@
|
||||
app:layout_constraintLeft_toLeftOf="parent"
|
||||
app:layout_constraintRight_toRightOf="parent"
|
||||
android:inputType="text"
|
||||
android:hint="@string/add_source_hint_name"/>
|
||||
android:hint="@string/add_source_hint_name"
|
||||
android:textColorHint="?android:textColorPrimary"
|
||||
android:autofillHints="false" />
|
||||
|
||||
<EditText
|
||||
android:layout_width="match_parent"
|
||||
@ -76,10 +79,12 @@
|
||||
android:ems="10"
|
||||
android:id="@+id/sourceUri"
|
||||
android:hint="@string/add_source_hint_url"
|
||||
android:textColorHint="?android:textColorPrimary"
|
||||
android:layout_marginTop="16dp"
|
||||
app:layout_constraintTop_toBottomOf="@+id/nameInput"
|
||||
app:layout_constraintRight_toRightOf="parent"
|
||||
app:layout_constraintLeft_toLeftOf="parent"/>
|
||||
app:layout_constraintLeft_toLeftOf="parent"
|
||||
android:autofillHints="false" />
|
||||
|
||||
<EditText
|
||||
android:layout_width="match_parent"
|
||||
@ -91,7 +96,9 @@
|
||||
android:layout_marginTop="16dp"
|
||||
app:layout_constraintTop_toBottomOf="@+id/sourceUri"
|
||||
android:hint="@string/add_source_hint_tags"
|
||||
android:inputType="text"/>
|
||||
android:textColorHint="?android:textColorPrimary"
|
||||
android:inputType="text"
|
||||
android:autofillHints="false" />
|
||||
|
||||
<Spinner
|
||||
android:layout_width="match_parent"
|
||||
@ -100,7 +107,8 @@
|
||||
app:layout_constraintTop_toBottomOf="@+id/tags"
|
||||
app:layout_constraintRight_toRightOf="parent"
|
||||
app:layout_constraintLeft_toLeftOf="parent"
|
||||
android:layout_height="40dp"/>
|
||||
android:layout_height="40dp"
|
||||
android:theme="@style/App.Spinner"/>
|
||||
|
||||
<Button
|
||||
android:text="@string/add_source_save"
|
||||
|
@ -32,7 +32,7 @@
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="end|bottom|end"
|
||||
android:src="@drawable/ic_add_white_24dp"
|
||||
app:srcCompat="@drawable/ic_add_white_24dp"
|
||||
android:paddingBottom="@dimen/activity_vertical_margin"
|
||||
android:paddingTop="@dimen/activity_vertical_margin"
|
||||
android:layout_alignParentBottom="true"
|
||||
|
@ -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" />
|
||||
|
@ -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"
|
||||
|
@ -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>
|
@ -26,6 +26,7 @@
|
||||
android:maxLines="1"
|
||||
android:textAlignment="textStart"
|
||||
android:textSize="13sp"
|
||||
android:textColor="?android:textColorPrimary"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toStartOf="@+id/deleteBtn"
|
||||
app:layout_constraintStart_toEndOf="@+id/itemImage"
|
||||
|
@ -58,4 +58,9 @@
|
||||
<item name="android:tint">?android:textColorPrimary</item>
|
||||
</style>
|
||||
|
||||
<!-- Spinner Theme -->
|
||||
<style name="App.Spinner" parent="Widget.AppCompat.Light.DropDownItem.Spinner">
|
||||
<item name="android:textColor">?android:textColorPrimary</item>
|
||||
</style>
|
||||
|
||||
</resources>
|
||||
|
Loading…
Reference in New Issue
Block a user