Correct the color of sources text in article reader

Fix issues with the color selection.
Simplify article viewer theming
2021-11-23 19:35:39 +01:00 · 2021-11-23 19:35:39 +01:00 · 2021-11-23 19:35:38 +01:00 · 2021-11-23 19:35:38 +01:00 · 2021-11-23 19:35:37 +01:00 · 2021-11-23 19:35:34 +01:00
34 changed files with 179 additions and 186 deletions
--- a/app/src/androidTest/java/apps/amine/bou/readerforselfoss/DateUtilsTest.kt
+++ b/app/src/androidTest/java/apps/amine/bou/readerforselfoss/DateUtilsTest.kt
@ -0,0 +1,31 @@
+package apps.amine.bou.readerforselfoss
+
+import apps.amine.bou.readerforselfoss.utils.Config
+import apps.amine.bou.readerforselfoss.utils.parseDate
+import org.junit.Test
+
+class DateUtilsTest {
+
+    @Test
+    fun parseDateV4() {
+
+        Config.apiVersion = 4
+        val dateString = "2013-04-07T13:43:00+01:00"
+
+        val milliseconds = parseDate(dateString).toEpochMilli()
+        val correctMilliseconds : Long = 1365338580000
+
+        assert(milliseconds == correctMilliseconds)
+    }
+
+    @Test
+    fun parseDateV1() {
+        Config.apiVersion = 0
+        val dateString = "2013-04-07 13:43:00"
+
+        val milliseconds = parseDate(dateString).toEpochMilli()
+        val correctMilliseconds = 1365342180000
+
+        assert(milliseconds == correctMilliseconds)
+    }
+}
--- a/app/src/main/java/apps/amine/bou/readerforselfoss/LoginActivity.kt
+++ b/app/src/main/java/apps/amine/bou/readerforselfoss/LoginActivity.kt
@ -14,7 +14,6 @@ import android.view.MenuItem
 import android.view.View
 import android.view.inputmethod.EditorInfo
 import android.widget.TextView
-import android.widget.Toast
 import apps.amine.bou.readerforselfoss.api.selfoss.SelfossApi
 import apps.amine.bou.readerforselfoss.api.selfoss.SuccessResponse
 import apps.amine.bou.readerforselfoss.databinding.ActivityLoginBinding
@ -22,7 +21,6 @@ import apps.amine.bou.readerforselfoss.themes.AppColors
 import apps.amine.bou.readerforselfoss.utils.Config
 import apps.amine.bou.readerforselfoss.utils.isBaseUrlValid
 import apps.amine.bou.readerforselfoss.utils.network.isNetworkAccessible
-import com.mikepenz.aboutlibraries.Libs
 import com.mikepenz.aboutlibraries.LibsBuilder
 import retrofit2.Call
 import retrofit2.Callback
@ -91,16 +89,16 @@ class LoginActivity : AppCompatActivity() {
            isWithLogin = !isWithLogin
            val visi: Int = if (b) View.VISIBLE else View.GONE

-            binding.loginLayout.visibility = visi
-            binding.passwordLayout.visibility = visi
+            binding.loginView.visibility = visi
+            binding.passwordView.visibility = visi
        }

        binding.withHttpLogin.setOnCheckedChangeListener { _, b ->
            isWithHTTPLogin = !isWithHTTPLogin
            val visi: Int = if (b) View.VISIBLE else View.GONE

-            binding.httpLoginInput.visibility = visi
-            binding.httpPasswordInput.visibility = visi
+            binding.httpLoginView.visibility = visi
+            binding.httpPasswordView.visibility = visi
        }
    }

@ -111,9 +109,8 @@ class LoginActivity : AppCompatActivity() {
            alertDialog.setMessage(getString(R.string.base_url_error))
            alertDialog.setButton(
                AlertDialog.BUTTON_NEUTRAL,
-                "OK",
-                { dialog, _ -> dialog.dismiss() }
-            )
+                "OK"
+            ) { dialog, _ -> dialog.dismiss() }
            alertDialog.show()
        }
    }
@ -154,9 +151,8 @@ class LoginActivity : AppCompatActivity() {
                alertDialog.setMessage(getString(R.string.text_wrong_url))
                alertDialog.setButton(
                    AlertDialog.BUTTON_NEUTRAL,
-                    "OK",
-                    { dialog, _ -> dialog.dismiss() }
-                )
+                    "OK"
+                ) { dialog, _ -> dialog.dismiss() }
                alertDialog.show()
                inValidCount = 0
            }
--- a/app/src/main/java/apps/amine/bou/readerforselfoss/SourcesActivity.kt
+++ b/app/src/main/java/apps/amine/bou/readerforselfoss/SourcesActivity.kt
@ -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)
@ -71,7 +71,7 @@ class SourcesActivity : AppCompatActivity() {
        binding.recyclerView.setHasFixedSize(true)
        binding.recyclerView.layoutManager = mLayoutManager

-        if (this@SourcesActivity.isNetworkAccessible(this@SourcesActivity.findViewById(R.id.recyclerView))) {
+        if (this@SourcesActivity.isNetworkAccessible(binding.recyclerView)) {
            api.sources.enqueue(object : Callback<List<Source>> {
                override fun onResponse(
                    call: Call<List<Source>>,
--- 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()
        }
--- a/app/src/main/java/apps/amine/bou/readerforselfoss/adapters/ItemListAdapter.kt
+++ b/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()) {
--- a/app/src/main/java/apps/amine/bou/readerforselfoss/fragments/ArticleFragment.kt
+++ b/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)
--- a/app/src/main/java/apps/amine/bou/readerforselfoss/settings/SettingsActivity.kt
+++ b/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)
--- 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
    }
 }
--- a/app/src/main/java/apps/amine/bou/readerforselfoss/utils/Config.kt
+++ b/app/src/main/java/apps/amine/bou/readerforselfoss/utils/Config.kt
@ -51,6 +51,7 @@ class Config(c: Context) {
            editor.remove("url")
            editor.remove("login")
            editor.remove("password")
+            editor.remove("apiVersionMajor")
            editor.apply()
            val intent = Intent(c, LoginActivity::class.java)
            if (baseUrlFail) {
--- a/app/src/main/res/layout/activity_add_source.xml
+++ b/app/src/main/res/layout/activity_add_source.xml
@ -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"
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@ -45,98 +45,69 @@
                android:layout_height="wrap_content"
                android:orientation="vertical">

-                <com.google.android.material.textfield.TextInputLayout
+                <EditText
+                    android:id="@+id/urlView"
                    android:layout_width="match_parent"
                    android:layout_height="wrap_content"
-                    android:id="@+id/urlLayout"
-                    >
+                    android:hint="@string/prompt_url"
+                    android:imeOptions="actionUnspecified"
+                    android:importantForAutofill="no"
+                    android:inputType="textUri"
+                    android:maxLines="1" />

-                    <EditText
-                        android:id="@+id/urlView"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:hint="@string/prompt_url"
-                        android:imeOptions="actionUnspecified"
-                        android:inputType="textUri"
-                        android:maxLines="1" />
-
-                </com.google.android.material.textfield.TextInputLayout>
-
-                <Switch
+                <com.google.android.material.switchmaterial.SwitchMaterial
                    android:text="@string/withLoginSwitch"
                    android:layout_width="match_parent"
                    android:layout_height="0dp"
                    android:id="@+id/withLogin"
                    android:layout_weight="1"/>

-                <com.google.android.material.textfield.TextInputLayout
-                    android:id="@+id/loginLayout"
+                <EditText
+                    android:id="@+id/loginView"
                    android:layout_width="match_parent"
                    android:layout_height="wrap_content"
-                    android:visibility="gone">
+                    android:autofillHints="username"
+                    android:hint="@string/prompt_login"
+                    android:inputType="text"
+                    android:maxLines="1"
+                    android:visibility="gone" />

-                    <AutoCompleteTextView
-                        android:id="@+id/loginView"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:hint="@string/prompt_login"
-                        android:inputType="text"
-                        android:maxLines="1" />
-
-                </com.google.android.material.textfield.TextInputLayout>
-
-                <com.google.android.material.textfield.TextInputLayout
-                    android:id="@+id/passwordLayout"
+                <EditText
+                    android:id="@+id/passwordView"
                    android:layout_width="match_parent"
                    android:layout_height="wrap_content"
-                    android:visibility="gone">
+                    android:autofillHints="password"
+                    android:hint="@string/prompt_password"
+                    android:inputType="textPassword"
+                    android:maxLines="1"
+                    android:visibility="gone" />

-                    <EditText
-                        android:id="@+id/passwordView"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:hint="@string/prompt_password"
-                        android:inputType="textPassword"
-                        android:maxLines="1" />
-
-                </com.google.android.material.textfield.TextInputLayout>
-
-                <Switch
+                <com.google.android.material.switchmaterial.SwitchMaterial
                    android:id="@+id/withHttpLogin"
                    android:layout_width="match_parent"
                    android:layout_height="wrap_content"
                    android:layout_weight="1"
                    android:text="@string/withHttpLoginSwitch" />

-                <com.google.android.material.textfield.TextInputLayout
-                    android:id="@+id/httpLoginInput"
+                <EditText
+                    android:id="@+id/httpLoginView"
                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:visibility="gone">
+                    android:layout_height="wrap_content"
+                    android:autofillHints="username"
+                    android:hint="@string/prompt_http_login"
+                    android:inputType="text"
+                    android:visibility="gone" />

-                    <EditText
-                        android:inputType="text"
-                        android:id="@+id/httpLoginView"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:hint="@string/prompt_http_login" />
-                </com.google.android.material.textfield.TextInputLayout>
-
-                <com.google.android.material.textfield.TextInputLayout
-                    android:id="@+id/httpPasswordInput"
+                <EditText
+                    android:id="@+id/httpPasswordView"
                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:visibility="gone">
+                    android:layout_height="wrap_content"
+                    android:autofillHints="password"
+                    android:hint="@string/prompt_http_password"
+                    android:inputType="textPassword"
+                    android:visibility="gone" />

-                    <EditText
-                        android:id="@+id/httpPasswordView"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:hint="@string/prompt_http_password"
-                        android:inputType="textPassword" />
-                </com.google.android.material.textfield.TextInputLayout>
-
-                <Switch
+                <com.google.android.material.switchmaterial.SwitchMaterial
                    android:id="@+id/withSelfhostedCert"
                    android:layout_width="match_parent"
                    android:layout_height="wrap_content"
@ -155,8 +126,8 @@
                    style="?android:textAppearanceSmall"
                    android:layout_width="match_parent"
                    android:layout_height="wrap_content"
-                    android:layout_marginBottom="16dp"
                    android:layout_marginTop="16dp"
+                    android:layout_marginBottom="16dp"
                    android:text="@string/action_sign_in"
                    android:textStyle="bold" />

--- a/app/src/main/res/layout/activity_sources.xml
+++ b/app/src/main/res/layout/activity_sources.xml
@ -31,14 +31,13 @@
        android:id="@+id/fab"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
-        android:layout_gravity="end|bottom|right"
-        android:src="@drawable/ic_add_white_24dp"
+        android:layout_gravity="end|bottom|end"
+        app:srcCompat="@drawable/ic_add_white_24dp"
        android:paddingBottom="@dimen/activity_vertical_margin"
        android:paddingTop="@dimen/activity_vertical_margin"
        android:layout_alignParentBottom="true"
-        android:layout_alignParentRight="true"
        android:layout_alignParentEnd="true"
        android:layout_marginBottom="16dp"
        android:layout_marginEnd="16dp"
-        android:layout_marginRight="16dp"/>
+        android:contentDescription="@string/add_source" />
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
--- 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">

    <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" />
--- a/app/src/main/res/layout/fragment_article.xml
+++ b/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"
--- a/app/src/main/res/layout/list_item.xml
+++ b/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>
--- a/app/src/main/res/layout/source_list_item.xml
+++ b/app/src/main/res/layout/source_list_item.xml
@ -1,55 +1,50 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:app="http://schemas.android.com/apk/res-auto"
    xmlns:tools="http://schemas.android.com/tools"
-    android:orientation="vertical"
    android:layout_width="match_parent"
-    android:layout_height="48dp">
+    android:layout_height="48dp"
+    android:orientation="vertical">


    <ImageView
        android:id="@+id/itemImage"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent"
-        android:layout_marginStart="16dp"
-        app:layout_constraintLeft_toLeftOf="parent"
-        android:layout_marginLeft="16dp"
        android:layout_width="36dp"
-        android:layout_height="36dp"/>
+        android:layout_height="36dp"
+        android:importantForAccessibility="no"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />

    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="17dp"
        android:id="@+id/sourceTitle"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintLeft_toRightOf="@+id/itemImage"
-        android:layout_marginStart="16dp"
-        android:layout_marginLeft="16dp"
+        android:layout_width="0dp"
+        android:layout_height="17dp"
+        android:layout_marginStart="8dp"
+        android:ellipsize="end"
+        android:gravity="start"
+        android:maxLines="1"
+        android:textAlignment="textStart"
        android:textSize="13sp"
-        android:textAlignment="viewStart"
-        tools:text="source title "
-        android:gravity="start" />
+        android:textColor="?android:textColorPrimary"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@+id/deleteBtn"
+        app:layout_constraintStart_toEndOf="@+id/itemImage"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:text="source title" />

    <Button
        android:id="@+id/deleteBtn"
-        android:background="@drawable/ic_remove_circle_outline_black_24dp"
        style="@style/Widget.AppCompat.Button.Borderless"
+        android:layout_width="34dp"
+        android:layout_height="34dp"
+        android:layout_marginEnd="8dp"
+        android:background="@drawable/ic_remove_circle_outline_black_24dp"
        android:backgroundTint="?android:textColorSecondary"
        android:elevation="4dp"
-        android:layout_marginTop="16dp"
-        app:layout_constraintTop_toTopOf="parent"
+        android:contentDescription="@string/remove_source"
        app:layout_constraintBottom_toBottomOf="parent"
-        android:layout_marginBottom="16dp"
-        android:layout_marginEnd="16dp"
-        app:layout_constraintRight_toRightOf="parent"
-        android:layout_marginRight="16dp"
-        android:layout_marginStart="8dp"
-        app:layout_constraintLeft_toRightOf="@+id/sourceTitle"
-        android:layout_marginLeft="8dp"
-        app:layout_constraintHorizontal_bias="1.0"
-        android:layout_width="34dp"
-        android:layout_height="34dp"/>
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />

 </androidx.constraintlayout.widget.ConstraintLayout>
--- a/app/src/main/res/values-ca-rES/strings.xml
+++ b/app/src/main/res/values-ca-rES/strings.xml
@ -165,4 +165,5 @@
    <string name="reader_static_bar_title">Static bottom bar in the article viewer</string>
    <string name="reader_static_bar_on">The bottom bar will always be displayed</string>
    <string name="reader_static_bar_off">The bottom bar can be shown through the floating button</string>
+    <string name="remove_source">Remove source</string>
 </resources>
--- a/app/src/main/res/values-de-rDE/strings.xml
+++ b/app/src/main/res/values-de-rDE/strings.xml
@ -165,4 +165,5 @@
    <string name="reader_static_bar_title">Static bottom bar in the article viewer</string>
    <string name="reader_static_bar_on">The bottom bar will always be displayed</string>
    <string name="reader_static_bar_off">The bottom bar can be shown through the floating button</string>
+    <string name="remove_source">Remove source</string>
 </resources>
--- a/app/src/main/res/values-es-rES/strings.xml
+++ b/app/src/main/res/values-es-rES/strings.xml
@ -165,4 +165,5 @@
    <string name="reader_static_bar_title">Static bottom bar in the article viewer</string>
    <string name="reader_static_bar_on">The bottom bar will always be displayed</string>
    <string name="reader_static_bar_off">The bottom bar can be shown through the floating button</string>
+    <string name="remove_source">Remove source</string>
 </resources>
--- a/app/src/main/res/values-fa-rIR/strings.xml
+++ b/app/src/main/res/values-fa-rIR/strings.xml
@ -165,4 +165,5 @@
    <string name="reader_static_bar_title">Static bottom bar in the article viewer</string>
    <string name="reader_static_bar_on">The bottom bar will always be displayed</string>
    <string name="reader_static_bar_off">The bottom bar can be shown through the floating button</string>
+    <string name="remove_source">Remove source</string>
 </resources>
--- a/app/src/main/res/values-fr-rFR/strings.xml
+++ b/app/src/main/res/values-fr-rFR/strings.xml
@ -165,4 +165,5 @@
    <string name="reader_static_bar_title">Barre statique pour le visionneur d\'articles</string>
    <string name="reader_static_bar_on">La barre sera affichée</string>
    <string name="reader_static_bar_off">La barre sera affichée grâce au bouton</string>
+    <string name="remove_source">Remove source</string>
 </resources>
--- a/app/src/main/res/values-gl-rES/strings.xml
+++ b/app/src/main/res/values-gl-rES/strings.xml
@ -165,4 +165,5 @@
    <string name="reader_static_bar_title">Barra inferior estática na vista de artigos</string>
    <string name="reader_static_bar_on">A barra inferior mostrarase sempre</string>
    <string name="reader_static_bar_off">A barra inferior pode mostrarse a través do botón flotante</string>
+    <string name="remove_source">Eliminar fonte</string>
 </resources>
--- a/app/src/main/res/values-in-rID/strings.xml
+++ b/app/src/main/res/values-in-rID/strings.xml
@ -165,4 +165,5 @@
    <string name="reader_static_bar_title">Static bottom bar in the article viewer</string>
    <string name="reader_static_bar_on">The bottom bar will always be displayed</string>
    <string name="reader_static_bar_off">The bottom bar can be shown through the floating button</string>
+    <string name="remove_source">Remove source</string>
 </resources>
--- a/app/src/main/res/values-it-rIT/strings.xml
+++ b/app/src/main/res/values-it-rIT/strings.xml
@ -165,4 +165,5 @@
    <string name="reader_static_bar_title">Static bottom bar in the article viewer</string>
    <string name="reader_static_bar_on">The bottom bar will always be displayed</string>
    <string name="reader_static_bar_off">The bottom bar can be shown through the floating button</string>
+    <string name="remove_source">Remove source</string>
 </resources>
--- a/app/src/main/res/values-ko-rKR/strings.xml
+++ b/app/src/main/res/values-ko-rKR/strings.xml
@ -165,4 +165,5 @@
    <string name="reader_static_bar_title">Static bottom bar in the article viewer</string>
    <string name="reader_static_bar_on">The bottom bar will always be displayed</string>
    <string name="reader_static_bar_off">The bottom bar can be shown through the floating button</string>
+    <string name="remove_source">Remove source</string>
 </resources>
--- a/app/src/main/res/values-nl-rNL/strings.xml
+++ b/app/src/main/res/values-nl-rNL/strings.xml
@ -165,4 +165,5 @@
    <string name="reader_static_bar_title">Static bottom bar in the article viewer</string>
    <string name="reader_static_bar_on">The bottom bar will always be displayed</string>
    <string name="reader_static_bar_off">The bottom bar can be shown through the floating button</string>
+    <string name="remove_source">Remove source</string>
 </resources>
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@ -165,4 +165,5 @@
    <string name="reader_static_bar_title">Static bottom bar in the article viewer</string>
    <string name="reader_static_bar_on">The bottom bar will always be displayed</string>
    <string name="reader_static_bar_off">The bottom bar can be shown through the floating button</string>
+    <string name="remove_source">Remove source</string>
 </resources>
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@ -165,4 +165,5 @@
    <string name="reader_static_bar_title">Static bottom bar in the article viewer</string>
    <string name="reader_static_bar_on">The bottom bar will always be displayed</string>
    <string name="reader_static_bar_off">The bottom bar can be shown through the floating button</string>
+    <string name="remove_source">Remove source</string>
 </resources>
--- a/app/src/main/res/values-si-rLK/strings.xml
+++ b/app/src/main/res/values-si-rLK/strings.xml
@ -165,4 +165,5 @@
    <string name="reader_static_bar_title">Static bottom bar in the article viewer</string>
    <string name="reader_static_bar_on">The bottom bar will always be displayed</string>
    <string name="reader_static_bar_off">The bottom bar can be shown through the floating button</string>
+    <string name="remove_source">Remove source</string>
 </resources>
--- a/app/src/main/res/values-tr-rTR/strings.xml
+++ b/app/src/main/res/values-tr-rTR/strings.xml
@ -165,4 +165,5 @@
    <string name="reader_static_bar_title">Static bottom bar in the article viewer</string>
    <string name="reader_static_bar_on">The bottom bar will always be displayed</string>
    <string name="reader_static_bar_off">The bottom bar can be shown through the floating button</string>
+    <string name="remove_source">Remove source</string>
 </resources>
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@ -165,4 +165,5 @@
    <string name="reader_static_bar_title">文章查看器中的静态底部栏</string>
    <string name="reader_static_bar_on">底部栏将始终显示</string>
    <string name="reader_static_bar_off">底部栏可以通过浮动按钮显示</string>
+    <string name="remove_source">删除源</string>
 </resources>
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@ -165,4 +165,5 @@
    <string name="reader_static_bar_title">Static bottom bar in the article viewer</string>
    <string name="reader_static_bar_on">The bottom bar will always be displayed</string>
    <string name="reader_static_bar_off">The bottom bar can be shown through the floating button</string>
+    <string name="remove_source">Remove source</string>
 </resources>
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@ -168,4 +168,5 @@
    <string name="reader_static_bar_title">Static bottom bar in the article viewer</string>
    <string name="reader_static_bar_on">The bottom bar will always be displayed</string>
    <string name="reader_static_bar_off">The bottom bar can be shown through the floating button</string>
+    <string name="remove_source">Remove source</string>
 </resources>
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@ -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>
Author	SHA1	Message	Date
davidoskky	7d6e24f1fd	Correct the color of sources text in article reader	2021-11-23 19:35:39 +01:00
davidoskky	357fda2090	Fix issues with the color selection.	2021-11-23 19:35:39 +01:00
davidoskky	7cdb057560	Simplify article viewer theming	2021-11-23 19:35:38 +01:00
davidoskky	513e5abcd1	Simplify list item theming	2021-11-23 19:35:38 +01:00
davidoskky	864bb2d4bc	Simplify card view theme	2021-11-23 19:35:37 +01:00
davidoskky	29d99fca17	Fix issues with sources	2021-11-23 19:35:34 +01:00
davidoskky	d7d4eb3974	Fix sources colors	2021-11-23 19:34:42 +01:00
davidoskky	cedb207eca	Fix login activity layout (#381 )	2021-11-22 20:59:36 +01:00
Amine Bou	b9e91f30ef	New Crowdin updates (#384 ) * New translations strings.xml (Sinhala) * New translations strings.xml (Sinhala) * New translations strings.xml (French) * New translations strings.xml (Spanish) * New translations strings.xml (Catalan) * New translations strings.xml (German) * New translations strings.xml (Italian) * New translations strings.xml (Korean) * New translations strings.xml (Dutch) * New translations strings.xml (Portuguese) * New translations strings.xml (Turkish) * New translations strings.xml (Chinese Simplified) * New translations strings.xml (Chinese Traditional) * New translations strings.xml (Galician) * New translations strings.xml (Portuguese, Brazilian) * New translations strings.xml (Indonesian) * New translations strings.xml (Persian) * New translations strings.xml (Sinhala) * New translations strings.xml (Chinese Simplified) * New translations strings.xml (Chinese Simplified) * New translations strings.xml (French) * New translations strings.xml (Spanish) * New translations strings.xml (Catalan) * New translations strings.xml (German) * New translations strings.xml (Italian) * New translations strings.xml (Korean) * New translations strings.xml (Dutch) * New translations strings.xml (Portuguese) * New translations strings.xml (Turkish) * New translations strings.xml (Chinese Simplified) * New translations strings.xml (Chinese Traditional) * New translations strings.xml (Galician) * New translations strings.xml (Portuguese, Brazilian) * New translations strings.xml (Indonesian) * New translations strings.xml (Persian) * New translations strings.xml (Sinhala) * New translations strings.xml (French) * New translations strings.xml (Galician) * New translations strings.xml (Galician) * New translations strings.xml (Chinese Simplified) * New translations strings.xml (French) * New translations strings.xml (Spanish) * New translations strings.xml (Catalan) * New translations strings.xml (German) * New translations strings.xml (Italian) * New translations strings.xml (Korean) * New translations strings.xml (Dutch) * New translations strings.xml (Portuguese) * New translations strings.xml (Turkish) * New translations strings.xml (Chinese Simplified) * New translations strings.xml (Chinese Traditional) * New translations strings.xml (Galician) * New translations strings.xml (Portuguese, Brazilian) * New translations strings.xml (Indonesian) * New translations strings.xml (Persian) * New translations strings.xml (Sinhala) * New translations strings.xml (Chinese Simplified) * New translations strings.xml (Galician) Co-authored-by: Amine Bou <aminecmi@gmail.com>	2021-11-22 20:32:02 +01:00
davidoskky	6a8c2d7fcd	Trim sources title when too long (#383 )	2021-11-22 07:09:12 +01:00
davidoskky	60a908a44a	Clear api version when disconnecting. (#382 ) Closes #354	2021-11-22 07:07:20 +01:00
davidoskky	6b887ff74b	Date utils test (#380 ) * Add test for date parsing * Add test for the older api * Correct milliseconds format	2021-11-16 20:04:24 +01:00