Fix login activity layout

2021-11-22 00:32:39 +01:00
45 changed files with 331 additions and 267 deletions
--- a/app/build.gradle
+++ b/app/build.gradle
@ -155,7 +155,6 @@ dependencies {

    // Pager
    implementation 'me.relex:circleindicator:2.1.6'
-    implementation "androidx.viewpager2:viewpager2:1.1.0-beta01"

    //PhotoView
    implementation 'com.github.chrisbanes:PhotoView:2.3.0'
--- a/app/src/androidTest/java/apps/amine/bou/readerforselfoss/DateUtilsTest.kt
+++ b/app/src/androidTest/java/apps/amine/bou/readerforselfoss/DateUtilsTest.kt
@ -1,31 +0,0 @@
-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/AddSourceActivity.kt
+++ b/app/src/main/java/apps/amine/bou/readerforselfoss/AddSourceActivity.kt
@ -52,19 +52,19 @@ class AddSourceActivity : AppCompatActivity() {
        scoop.bindStatusBar(this, Toppings.PRIMARY_DARK.value)

        val drawable = binding.nameInput.background
-        drawable.setTint(appColors.colorAccent)
+        drawable.setColorFilter(appColors.colorAccent, PorterDuff.Mode.SRC_ATOP)


        // TODO: clean
        binding.nameInput.background = drawable

        val drawable1 = binding.sourceUri.background
-        drawable1.setTint(appColors.colorAccent)
+        drawable1.setColorFilter(appColors.colorAccent, PorterDuff.Mode.SRC_ATOP)

        binding.sourceUri.background = drawable1

        val drawable2 = binding.tags.background
-        drawable2.setTint(appColors.colorAccent)
+        drawable2.setColorFilter(appColors.colorAccent, PorterDuff.Mode.SRC_ATOP)

        binding.tags.background = drawable2

--- a/app/src/main/java/apps/amine/bou/readerforselfoss/HomeActivity.kt
+++ b/app/src/main/java/apps/amine/bou/readerforselfoss/HomeActivity.kt
@ -100,7 +100,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
    private var displayAllCount = false
    private var fullHeightCards: Boolean = false
    private var itemsNumber: Int = 200
-    private var elementsShown: Int = 1
+    private var elementsShown: Int = 0
    private var maybeTagFilter: Tag? = null
    private var maybeSourceFilter: Source? = null
    private var maybeSearchFilter: String? = null
--- a/app/src/main/java/apps/amine/bou/readerforselfoss/ImageActivity.kt
+++ b/app/src/main/java/apps/amine/bou/readerforselfoss/ImageActivity.kt
@ -3,9 +3,8 @@ package apps.amine.bou.readerforselfoss
 import android.os.Bundle
 import android.view.MenuItem
 import androidx.appcompat.app.AppCompatActivity
-import androidx.fragment.app.Fragment
-import androidx.fragment.app.FragmentActivity
-import androidx.viewpager2.adapter.FragmentStateAdapter
+import androidx.fragment.app.FragmentManager
+import androidx.fragment.app.FragmentStatePagerAdapter
 import apps.amine.bou.readerforselfoss.databinding.ActivityImageBinding
 import apps.amine.bou.readerforselfoss.fragments.ImageFragment

@ -29,8 +28,8 @@ class ImageActivity : AppCompatActivity() {
        allImages = intent.getStringArrayListExtra("allImages") as ArrayList<String>
        position = intent.getIntExtra("position", 0)

-        binding.pager.adapter = ScreenSlidePagerAdapter(this)
-        binding.pager.setCurrentItem(position, false)
+        binding.pager.adapter = ScreenSlidePagerAdapter(supportFragmentManager)
+        binding.pager.currentItem = position
    }

    override fun onOptionsItemSelected(item: MenuItem): Boolean {
@ -44,10 +43,14 @@ class ImageActivity : AppCompatActivity() {
        return super.onOptionsItemSelected(item)
    }

-    private inner class ScreenSlidePagerAdapter(fa: FragmentActivity) : FragmentStateAdapter(fa) {
+    private inner class ScreenSlidePagerAdapter(fm: FragmentManager) : FragmentStatePagerAdapter(fm, FragmentStatePagerAdapter.BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT) {

-        override fun getItemCount(): Int = allImages.size
+        override fun getCount(): Int {
+            return allImages.size
+        }

-        override fun createFragment(position: Int): Fragment = ImageFragment.newInstance(allImages[position])
+        override fun getItem(position: Int): ImageFragment {
+            return ImageFragment.newInstance(allImages[position])
+        }
    }
 }
--- a/app/src/main/java/apps/amine/bou/readerforselfoss/MyApp.kt
+++ b/app/src/main/java/apps/amine/bou/readerforselfoss/MyApp.kt
@ -61,14 +61,14 @@ class MyApp : MultiDexApplication() {
    private fun initDrawerImageLoader() {
        DrawerImageLoader.init(object : AbstractDrawerImageLoader() {
            override fun set(imageView: ImageView, uri: Uri, placeholder: Drawable, tag: String?) {
-                Glide.with(imageView.context)
+                Glide.with(imageView?.context)
                    .loadMaybeBasicAuth(config, uri.toString())
                    .apply(RequestOptions.fitCenterTransform().placeholder(placeholder))
                    .into(imageView)
            }

            override fun cancel(imageView: ImageView) {
-                Glide.with(imageView.context).clear(imageView)
+                Glide.with(imageView?.context).clear(imageView)
            }

            override fun placeholder(ctx: Context, tag: String?): Drawable {
--- a/app/src/main/java/apps/amine/bou/readerforselfoss/ReaderActivity.kt
+++ b/app/src/main/java/apps/amine/bou/readerforselfoss/ReaderActivity.kt
@ -3,16 +3,21 @@ package apps.amine.bou.readerforselfoss
 import android.content.Context
 import android.content.SharedPreferences
 import android.graphics.Color
+import android.graphics.PorterDuff
+import android.graphics.PorterDuffColorFilter
+import android.graphics.drawable.ColorDrawable
+import android.os.Build
 import android.os.Bundle
 import androidx.preference.PreferenceManager
+import androidx.fragment.app.FragmentManager
+import androidx.fragment.app.FragmentStatePagerAdapter
+import androidx.core.content.ContextCompat
+import androidx.viewpager.widget.ViewPager
 import androidx.appcompat.app.AppCompatActivity
 import android.view.Menu
 import android.view.MenuItem
-import androidx.fragment.app.Fragment
-import androidx.fragment.app.FragmentActivity
+import android.view.ViewGroup
 import androidx.room.Room
-import androidx.viewpager2.adapter.FragmentStateAdapter
-import androidx.viewpager2.widget.ViewPager2
 import apps.amine.bou.readerforselfoss.api.selfoss.Item
 import apps.amine.bou.readerforselfoss.api.selfoss.SelfossApi
 import apps.amine.bou.readerforselfoss.databinding.ActivityReaderBinding
@ -23,17 +28,18 @@ import apps.amine.bou.readerforselfoss.persistence.migrations.MIGRATION_2_3
 import apps.amine.bou.readerforselfoss.persistence.migrations.MIGRATION_3_4
 import apps.amine.bou.readerforselfoss.themes.AppColors
 import apps.amine.bou.readerforselfoss.themes.Toppings
+import apps.amine.bou.readerforselfoss.transformers.DepthPageTransformer
 import apps.amine.bou.readerforselfoss.utils.Config
 import apps.amine.bou.readerforselfoss.utils.SharedItems
 import apps.amine.bou.readerforselfoss.utils.toggleStar
 import com.ftinc.scoop.Scoop
+import me.relex.circleindicator.CircleIndicator

 class ReaderActivity : AppCompatActivity() {

    private var markOnScroll: Boolean = false
    private var currentItem: Int = 0
    private lateinit var userIdentifier: String
-    private lateinit var appColors: AppColors

    private lateinit var api: SelfossApi

@ -44,14 +50,14 @@ class ReaderActivity : AppCompatActivity() {
    private lateinit var binding: ActivityReaderBinding

    private var activeAlignment: Int = 1
-    private val JUSTIFY = 1
-    private val ALIGN_LEFT = 2
+    val JUSTIFY = 1
+    val ALIGN_LEFT = 2

    private fun showMenuItem(willAddToFavorite: Boolean) {
        if (willAddToFavorite) {
-            toolbarMenu.findItem(R.id.star).icon.setTint(Color.WHITE)
+            toolbarMenu.findItem(R.id.star).icon.colorFilter = PorterDuffColorFilter(Color.WHITE, PorterDuff.Mode.SRC_ATOP)
        } else {
-            toolbarMenu.findItem(R.id.star).icon.setTint(Color.RED)
+            toolbarMenu.findItem(R.id.star).icon.colorFilter = PorterDuffColorFilter(Color.RED, PorterDuff.Mode.SRC_ATOP)
        }
    }

@ -67,7 +73,6 @@ class ReaderActivity : AppCompatActivity() {

    override fun onCreate(savedInstanceState: Bundle?) {
        super.onCreate(savedInstanceState)
-        appColors = AppColors(this)
        binding = ActivityReaderBinding.inflate(layoutInflater)
        val view = binding.root

@ -111,14 +116,33 @@ class ReaderActivity : AppCompatActivity() {

        readItem(allItems[currentItem])

-        binding.pager.adapter = ScreenSlidePagerAdapter(this)
-        binding.pager.setCurrentItem(currentItem, false)
+        binding.pager.adapter =
+                ScreenSlidePagerAdapter(supportFragmentManager, AppColors(this@ReaderActivity))
+        binding.pager.currentItem = currentItem
    }

    override fun onResume() {
        super.onResume()

-        binding.indicator.setViewPager(binding.pager)
+        notifyAdapter()
+
+        binding.pager.setPageTransformer(true, DepthPageTransformer())
+        (binding.indicator as CircleIndicator).setViewPager(binding.pager)
+
+        binding.pager.addOnPageChangeListener(
+            object : ViewPager.SimpleOnPageChangeListener() {
+
+                override fun onPageSelected(position: Int) {
+
+                    if (allItems[position].starred) {
+                        canRemoveFromFavorite()
+                    } else {
+                        canFavorite()
+                    }
+                    readItem(allItems[position])
+                }
+            }
+        )
    }

    private fun readItem(item: Item) {
@ -127,22 +151,46 @@ class ReaderActivity : AppCompatActivity() {
            }
    }

+    private fun notifyAdapter() {
+        (binding.pager.adapter as ScreenSlidePagerAdapter).notifyDataSetChanged()
+    }
+
+    override fun onPause() {
+        super.onPause()
+        if (markOnScroll) {
+            binding.pager.clearOnPageChangeListeners()
+        }
+    }
+
    override fun onSaveInstanceState(oldInstanceState: Bundle) {
        super.onSaveInstanceState(oldInstanceState)
        oldInstanceState.clear()
    }

-    private inner class ScreenSlidePagerAdapter(fa: FragmentActivity) :
-        FragmentStateAdapter(fa) {
+    private inner class ScreenSlidePagerAdapter(fm: FragmentManager, val appColors: AppColors) :
+        FragmentStatePagerAdapter(fm) {

+        override fun getCount(): Int {
+            return allItems.size
+        }

-        override fun getItemCount(): Int = allItems.size
+        override fun getItem(position: Int): ArticleFragment {
+            return ArticleFragment.newInstance(position, allItems)
+        }

-        override fun createFragment(position: Int): Fragment = ArticleFragment.newInstance(allItems[position])
+        override fun startUpdate(container: ViewGroup) {
+            super.startUpdate(container)

+            container.background = ColorDrawable(
+                ContextCompat.getColor(
+                    this@ReaderActivity,
+                    appColors.colorBackground
+                )
+            )
+        }
    }

-    private fun alignmentMenu(showJustify: Boolean) {
+    fun alignmentMenu(showJustify: Boolean) {
        toolbarMenu.findItem(R.id.align_left).isVisible = !showJustify
        toolbarMenu.findItem(R.id.align_justify).isVisible = showJustify
    }
@ -152,7 +200,7 @@ class ReaderActivity : AppCompatActivity() {
        inflater.inflate(R.menu.reader_menu, menu)
        toolbarMenu = menu

-        if (allItems.isNotEmpty() && allItems[currentItem].starred) {
+        if (!allItems.isEmpty() && allItems[currentItem].starred) {
            canRemoveFromFavorite()
        } else {
            canFavorite()
@ -163,22 +211,6 @@ class ReaderActivity : AppCompatActivity() {
            alignmentMenu(true)
        }

-        binding.pager.registerOnPageChangeCallback(
-                object : ViewPager2.OnPageChangeCallback() {
-
-                    override fun onPageSelected(position: Int) {
-                        super.onPageSelected(position)
-
-                        if (allItems[position].starred) {
-                            canRemoveFromFavorite()
-                        } else {
-                            canFavorite()
-                        }
-                        readItem(allItems[position])
-                    }
-                }
-        )
-
        return true
    }

@ -186,11 +218,13 @@ class ReaderActivity : AppCompatActivity() {
        fun afterSave() {
            allItems[binding.pager.currentItem] =
                    allItems[binding.pager.currentItem].toggleStar()
+            notifyAdapter()
            canRemoveFromFavorite()
        }

        fun afterUnsave() {
            allItems[binding.pager.currentItem] = allItems[binding.pager.currentItem].toggleStar()
+            notifyAdapter()
            canFavorite()
        }

--- a/app/src/main/java/apps/amine/bou/readerforselfoss/SourcesActivity.kt
+++ b/app/src/main/java/apps/amine/bou/readerforselfoss/SourcesActivity.kt
@ -28,17 +28,17 @@ class SourcesActivity : AppCompatActivity() {

    override fun onCreate(savedInstanceState: Bundle?) {
        appColors = AppColors(this@SourcesActivity)
+
+        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)

-        super.onCreate(savedInstanceState)
-
-        setContentView(view)
-
        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(binding.recyclerView)) {
+        if (this@SourcesActivity.isNetworkAccessible(this@SourcesActivity.findViewById(R.id.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,6 +7,7 @@ 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
@ -60,6 +61,10 @@ class ItemCardAdapter(

            binding.favButton.isSelected = itm.starred
            binding.title.text = itm.getTitleDecoded()
+            binding.title.setTextColor(ContextCompat.getColor(
+                    c,
+                    appColors.textColor
+            ))

            binding.title.setOnTouchListener(LinkOnTouchListener())

@ -67,6 +72,11 @@ 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
@ -102,6 +112,7 @@ 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,6 +5,7 @@ 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
@ -48,14 +49,25 @@ 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/api/selfoss/SelfossModels.kt
+++ b/app/src/main/java/apps/amine/bou/readerforselfoss/api/selfoss/SelfossModels.kt
@ -14,8 +14,6 @@ import com.bumptech.glide.Glide
 import com.bumptech.glide.load.engine.DiskCacheStrategy
 import com.bumptech.glide.request.RequestOptions
 import com.google.gson.annotations.SerializedName
-import java.util.*
-import kotlin.collections.ArrayList

 private fun constructUrl(config: Config?, path: String, file: String?): String {
    return if (file.isEmptyOrNullOrNullString()) {
@ -157,14 +155,14 @@ data class Item(
    }

    fun getImages() : ArrayList<String> {
-        val allImages = ArrayList<String>()
+        var allImages = ArrayList<String>()

        for ( image in Jsoup.parse(content).getElementsByTag("img")) {
            val url = image.attr("src")
-            if (url.lowercase(Locale.US).contains(".jpg") ||
-                    url.lowercase(Locale.US).contains(".jpeg") ||
-                    url.lowercase(Locale.US).contains(".png") ||
-                    url.lowercase(Locale.US).contains(".webp"))
+            if (url.toLowerCase().contains(".jpg") ||
+                    url.toLowerCase().contains(".jpeg") ||
+                    url.toLowerCase().contains(".png") ||
+                    url.toLowerCase().contains(".webp"))
            {
                allImages.add(url)
            }
--- a/app/src/main/java/apps/amine/bou/readerforselfoss/fragments/ArticleFragment.kt
+++ b/app/src/main/java/apps/amine/bou/readerforselfoss/fragments/ArticleFragment.kt
@ -14,11 +14,12 @@ import androidx.preference.PreferenceManager
 import android.view.*
 import android.webkit.*
 import android.widget.Toast
+import androidx.browser.customtabs.CustomTabsIntent
 import com.google.android.material.floatingactionbutton.FloatingActionButton
 import androidx.fragment.app.Fragment
+import androidx.core.content.ContextCompat
 import androidx.core.widget.NestedScrollView
 import androidx.appcompat.app.AlertDialog
-import androidx.browser.customtabs.CustomTabsIntent
 import androidx.core.content.res.ResourcesCompat
 import androidx.room.Room
 import apps.amine.bou.readerforselfoss.ImageActivity
@ -47,14 +48,14 @@ import retrofit2.Callback
 import retrofit2.Response
 import java.net.MalformedURLException
 import java.net.URL
-import java.util.*
 import java.util.concurrent.ExecutionException
 import kotlin.collections.ArrayList

 class ArticleFragment : Fragment() {
+    private lateinit var pageNumber: Number
    private var fontSize: Int = 16
-    private lateinit var item: Item
-    private var mCustomTabActivityHelper: CustomTabActivityHelper? = null
+    private lateinit var allItems: ArrayList<Item>
+    private var mCustomTabActivityHelper: CustomTabActivityHelper? = null;
    private lateinit var url: String
    private lateinit var contentText: String
    private lateinit var contentSource: String
@ -90,7 +91,8 @@ class ArticleFragment : Fragment() {

        super.onCreate(savedInstanceState)

-        item = requireArguments().getParcelable(ARG_ITEMS)!!
+        pageNumber = requireArguments().getInt(ARG_POSITION)
+        allItems = requireArguments().getParcelableArrayList<Item>(ARG_ITEMS) as ArrayList<Item>

        db = Room.databaseBuilder(
            requireContext(),
@ -102,16 +104,16 @@ class ArticleFragment : Fragment() {
        inflater: LayoutInflater,
        container: ViewGroup?,
        savedInstanceState: Bundle?
-    ): View {
+    ): View? {
        try {
            _binding = FragmentArticleBinding.inflate(inflater, container, false)

-            url = item.getLinkDecoded()
-            contentText = item.content
-            contentTitle = item.getTitleDecoded()
-            contentImage = item.getThumbnail(requireActivity())
-            contentSource = item.sourceAndDateText()
-            allImages = item.getImages()
+            url = allItems[pageNumber.toInt()].getLinkDecoded()
+            contentText = allItems[pageNumber.toInt()].content
+            contentTitle = allItems[pageNumber.toInt()].getTitleDecoded()
+            contentImage = allItems[pageNumber.toInt()].getThumbnail(requireActivity())
+            contentSource = allItems[pageNumber.toInt()].sourceAndDateText()
+            allImages = allItems[pageNumber.toInt()].getImages()

            prefs = PreferenceManager.getDefaultSharedPreferences(activity)
            editor = prefs.edit()
@ -161,18 +163,26 @@ class ArticleFragment : Fragment() {
                object : FloatingToolbar.ItemClickListener {
                    override fun onItemClick(item: MenuItem) {
                        when (item.itemId) {
-                            R.id.more_action -> getContentFromMercury(customTabsIntent)
+                            R.id.more_action -> getContentFromMercury(customTabsIntent, prefs)
                            R.id.share_action -> requireActivity().shareLink(url, contentTitle)
-                            R.id.open_action -> requireActivity().openInBrowserAsNewTask(this@ArticleFragment.item)
+                            R.id.open_action -> requireActivity().openItemUrl(
+                                allItems,
+                                pageNumber.toInt(),
+                                url,
+                                customTabsIntent,
+                                false,
+                                false,
+                                requireActivity()
+                            )
                            R.id.unread_action -> if (context != null) {
-                                if (this@ArticleFragment.item.unread) {
+                                if (allItems[pageNumber.toInt()].unread) {
                                    SharedItems.readItem(
                                        context!!,
                                        api,
                                        db,
-                                            this@ArticleFragment.item
+                                        allItems[pageNumber.toInt()]
                                    )
-                                    this@ArticleFragment.item.unread = false
+                                    allItems[pageNumber.toInt()].unread = false
                                    Toast.makeText(
                                        context,
                                        R.string.marked_as_read,
@ -183,9 +193,9 @@ class ArticleFragment : Fragment() {
                                        context!!,
                                        api,
                                        db,
-                                            this@ArticleFragment.item
+                                        allItems[pageNumber.toInt()]
                                    )
-                                    this@ArticleFragment.item.unread = true
+                                    allItems[pageNumber.toInt()].unread = true
                                    Toast.makeText(
                                        context,
                                        R.string.marked_as_unread,
@ -213,7 +223,7 @@ class ArticleFragment : Fragment() {
            }

            if (contentText.isEmptyOrNullOrNullString()) {
-                getContentFromMercury(customTabsIntent)
+                getContentFromMercury(customTabsIntent, prefs)
            } else {
                binding.titleView.text = contentTitle
                if (typeface != null) {
@ -255,11 +265,11 @@ class ArticleFragment : Fragment() {
                .setMessage(requireContext().getString(R.string.webview_dialog_issue_message))
                .setTitle(requireContext().getString(R.string.webview_dialog_issue_title))
                .setPositiveButton(android.R.string.ok
-                ) { _, _ ->
+                ) { dialog, which ->
                    val sharedPref = PreferenceManager.getDefaultSharedPreferences(requireContext())
                    val editor = sharedPref.edit()
                    editor.putBoolean("prefer_article_viewer", false)
-                    editor.apply()
+                    editor.commit()
                    requireActivity().finish()
                }
                .create()
@ -282,7 +292,10 @@ class ArticleFragment : Fragment() {
        }
    }

-    private fun getContentFromMercury(customTabsIntent: CustomTabsIntent) {
+    private fun getContentFromMercury(
+        customTabsIntent: CustomTabsIntent,
+        prefs: SharedPreferences
+    ) {
        if ((context != null && requireContext().isNetworkAccessible(null)) || context == null) {
            binding.progressBar.visibility = View.VISIBLE
            val parser = MercuryApi()
@ -377,12 +390,42 @@ class ArticleFragment : Fragment() {

        binding.webcontent.settings.standardFontFamily = a.getString(0)
        binding.webcontent.visibility = View.VISIBLE
-
-        // TODO: Set the color strings programmatically
-        val (stringTextColor, stringBackgroundColor) = if (appColors.isDarkTheme) {
-            Pair("#FFFFFF", "#303030")
+        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 {
-            Pair("#212121", "#FAFAFA")
+            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)
+            }
+        }
+
+        val stringTextColor: String = if (textColor != null) {
+            String.format("#%06X", 0xFFFFFF and textColor)
+        } else {
+            "#000000"
+        }
+
+        val stringBackgroundColor = if (backgroundColor != null) {
+            String.format("#%06X", 0xFFFFFF and backgroundColor)
+        } else {
+            "#FFFFFF"
        }

        binding.webcontent.settings.useWideViewPort = true
@ -399,19 +442,19 @@ class ArticleFragment : Fragment() {

            override fun shouldInterceptRequest(view: WebView?, url: String): WebResourceResponse? {
                val glideOptions = RequestOptions.diskCacheStrategyOf(DiskCacheStrategy.ALL)
-                if (url.lowercase(Locale.US).contains(".jpg") || url.lowercase(Locale.US).contains(".jpeg")) {
+                if (url.toLowerCase().contains(".jpg") || url.toLowerCase().contains(".jpeg")) {
                    try {
                        val image = Glide.with(view).asBitmap().apply(glideOptions).load(url).submit().get()
                        return WebResourceResponse("image/jpg", "UTF-8", getBitmapInputStream(image, Bitmap.CompressFormat.JPEG))
                    }catch ( e : ExecutionException) {}
                }
-                else if (url.lowercase(Locale.US).contains(".png")) {
+                else if (url.toLowerCase().contains(".png")) {
                    try {
                        val image = Glide.with(view).asBitmap().apply(glideOptions).load(url).submit().get()
                        return WebResourceResponse("image/jpg", "UTF-8", getBitmapInputStream(image, Bitmap.CompressFormat.PNG))
                    }catch ( e : ExecutionException) {}
                }
-                else if (url.lowercase(Locale.US).contains(".webp")) {
+                else if (url.toLowerCase().contains(".webp")) {
                    try {
                        val image = Glide.with(view).asBitmap().apply(glideOptions).load(url).submit().get()
                        return WebResourceResponse("image/jpg", "UTF-8", getBitmapInputStream(image, Bitmap.CompressFormat.WEBP))
@ -513,22 +556,29 @@ class ArticleFragment : Fragment() {

    private fun openInBrowserAfterFailing(customTabsIntent: CustomTabsIntent) {
        binding.progressBar.visibility = View.GONE
-        requireActivity().openItemUrlInternalBrowser(
-                url,
-                customTabsIntent,
-                requireActivity()
+        requireActivity().openItemUrl(
+            allItems,
+            pageNumber.toInt(),
+            url,
+            customTabsIntent,
+            true,
+            false,
+            requireActivity()
        )
    }

    companion object {
+        private const val ARG_POSITION = "position"
        private const val ARG_ITEMS = "items"

        fun newInstance(
-                item: Item
+            position: Int,
+            allItems: ArrayList<Item>
        ): ArticleFragment {
            val fragment = ArticleFragment()
            val args = Bundle()
-            args.putParcelable(ARG_ITEMS, item)
+            args.putInt(ARG_POSITION, position)
+            args.putParcelableArrayList(ARG_ITEMS, allItems)
            fragment.arguments = args
            return fragment
        }
--- 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,10 +13,7 @@ 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"
@ -29,13 +26,7 @@ class SettingsActivity : AppCompatActivity(),
        if (PreferenceManager.getDefaultSharedPreferences(this).getBoolean("dark_theme", false)) {
            setTheme(R.style.NoBarDark)
        }
-        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)
+        setContentView(R.layout.activity_settings)
        if (savedInstanceState == null) {
            supportFragmentManager
                    .beginTransaction()
@ -50,7 +41,7 @@ class SettingsActivity : AppCompatActivity(),
            }
        }

-        setSupportActionBar(binding.toolbar)
+        setSupportActionBar(findViewById(R.id.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,9 +1,14 @@
 package apps.amine.bou.readerforselfoss.themes

 import android.app.Activity
-import androidx.annotation.ColorInt
+import android.content.Context
 import androidx.preference.PreferenceManager
+import androidx.annotation.ColorInt
+import androidx.appcompat.view.ContextThemeWrapper
+import android.util.TypedValue
 import apps.amine.bou.readerforselfoss.R
+import android.view.LayoutInflater
+import android.view.ViewGroup

 class AppColors(a: Activity) {

@ -11,6 +16,7 @@ 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
@ -49,7 +55,7 @@ class AppColors(a: Activity) {
            R.color.darkBackground
        } else {
            a.setTheme(R.style.NoBar)
-            R.color.grey_50
+            android.R.color.background_light
        }

        textColor = if (isDarkTheme) {
@ -57,5 +63,14 @@ 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/transformers/DepthPageTransformer.kt
+++ b/app/src/main/java/apps/amine/bou/readerforselfoss/transformers/DepthPageTransformer.kt
@ -0,0 +1,43 @@
+package apps.amine.bou.readerforselfoss.transformers
+
+import androidx.viewpager.widget.ViewPager
+import android.view.View
+
+class DepthPageTransformer : ViewPager.PageTransformer {
+
+    override fun transformPage(view: View, position: Float) {
+        val pageWidth = view.width
+
+        when {
+            position < -1 -> // [-Infinity,-1)
+                // This page is way off-screen to the left.
+                view.alpha = 0F
+            position <= 0 -> { // [-1,0]
+                // Use the default slide transition when moving to the left page
+                view.alpha = 1F
+                view.translationX = 0F
+                view.scaleX = 1F
+                view.scaleY = 1F
+            }
+            position <= 1 -> { // (0,1]
+                // Fade the page out.
+                view.alpha = 1 - position
+
+                // Counteract the default slide transition
+                view.translationX = pageWidth * -position
+
+                // Scale the page down (between MIN_SCALE and 1)
+                val scaleFactor = MIN_SCALE + (1 - MIN_SCALE) * (1 - Math.abs(position))
+                view.scaleX = scaleFactor
+                view.scaleY = scaleFactor
+            }
+            else -> // (1,+Infinity]
+                // This page is way off-screen to the right.
+                view.alpha = 0F
+        }
+    }
+
+    companion object {
+        private val MIN_SCALE = 0.75f
+    }
+}
--- a/app/src/main/java/apps/amine/bou/readerforselfoss/utils/AppUtils.kt
+++ b/app/src/main/java/apps/amine/bou/readerforselfoss/utils/AppUtils.kt
@ -13,7 +13,7 @@ fun String.longHash(): Long {
    val chars = this.toCharArray()

    for (i in 0 until l) {
-        h = 31 * h + chars[i].code.toLong()
+        h = 31 * h + chars[i].toLong()
    }
    return h
 }
--- 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,7 +51,6 @@ 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/java/apps/amine/bou/readerforselfoss/utils/LinksUtils.kt
+++ b/app/src/main/java/apps/amine/bou/readerforselfoss/utils/LinksUtils.kt
@ -86,30 +86,19 @@ fun Context.openItemUrlInternally(
        intent.putExtra("currentItem", currentItem)
        app.startActivity(intent)
    } else {
-        this.openItemUrlInternalBrowser(
-                linkDecoded,
-                customTabsIntent,
-                app)
-    }
-}
-
-fun Context.openItemUrlInternalBrowser(
-        linkDecoded: String,
-        customTabsIntent: CustomTabsIntent,
-        app: Activity
-) {
-    try {
-        CustomTabActivityHelper.openCustomTab(
+        try {
+            CustomTabActivityHelper.openCustomTab(
                app,
                customTabsIntent,
                Uri.parse(linkDecoded)
-        ) { _, uri ->
-            val intent = Intent(Intent.ACTION_VIEW, uri)
-            intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK
-            startActivity(intent)
+            ) { _, uri ->
+                val intent = Intent(Intent.ACTION_VIEW, uri)
+                intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK
+                startActivity(intent)
+            }
+        } catch (e: Exception) {
+            openInBrowser(linkDecoded, app)
        }
-    } catch (e: Exception) {
-        openInBrowser(linkDecoded, app)
    }
 }

@ -132,7 +121,7 @@ fun Context.openItemUrl(
    } else {
        if (!internalBrowser) {
            openInBrowser(linkDecoded, app)
-        } else if (articleViewer) {
+        } else {
            this.openItemUrlInternally(
                allItems,
                currentItem,
@ -141,12 +130,6 @@ fun Context.openItemUrl(
                articleViewer,
                app
            )
-        } else {
-            this.openItemUrlInternalBrowser(
-                    linkDecoded,
-                    customTabsIntent,
-                    app
-            )
        }
    }
 }
--- 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="wrap_content"
+        android:layout_height="match_parent"
        android:orientation="vertical">

        <com.google.android.material.appbar.AppBarLayout
@ -55,8 +55,7 @@
                android:layout_marginRight="16dp"
                android:layout_marginStart="16dp"
                app:layout_constraintLeft_toLeftOf="parent"
-                android:layout_marginLeft="16dp"
-                android:gravity="center_horizontal" />
+                android:layout_marginLeft="16dp"/>

            <EditText
                android:layout_width="match_parent"
@ -68,9 +67,7 @@
                app:layout_constraintLeft_toLeftOf="parent"
                app:layout_constraintRight_toRightOf="parent"
                android:inputType="text"
-                android:hint="@string/add_source_hint_name"
-                android:textColorHint="?android:textColorPrimary"
-                android:autofillHints="false" />
+                android:hint="@string/add_source_hint_name"/>

            <EditText
                android:layout_width="match_parent"
@ -79,12 +76,10 @@
                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"
-                android:autofillHints="false" />
+                app:layout_constraintLeft_toLeftOf="parent"/>

            <EditText
                android:layout_width="match_parent"
@ -96,9 +91,7 @@
                android:layout_marginTop="16dp"
                app:layout_constraintTop_toBottomOf="@+id/sourceUri"
                android:hint="@string/add_source_hint_tags"
-                android:textColorHint="?android:textColorPrimary"
-                android:inputType="text"
-                android:autofillHints="false" />
+                android:inputType="text"/>

            <Spinner
                android:layout_width="match_parent"
@ -107,8 +100,7 @@
                app:layout_constraintTop_toBottomOf="@+id/tags"
                app:layout_constraintRight_toRightOf="parent"
                app:layout_constraintLeft_toLeftOf="parent"
-                android:layout_height="40dp"
-                android:theme="@style/App.Spinner"/>
+                android:layout_height="40dp"/>

            <Button
                android:text="@string/add_source_save"
--- a/app/src/main/res/layout/activity_image.xml
+++ b/app/src/main/res/layout/activity_image.xml
@ -21,7 +21,7 @@

    </com.google.android.material.appbar.AppBarLayout>

-    <androidx.viewpager2.widget.ViewPager2
+    <androidx.viewpager.widget.ViewPager
        android:id="@+id/pager"
        android:layout_width="match_parent"
        android:layout_height="0dp"
--- a/app/src/main/res/layout/activity_reader.xml
+++ b/app/src/main/res/layout/activity_reader.xml
@ -22,7 +22,7 @@

    </com.google.android.material.appbar.AppBarLayout>

-    <androidx.viewpager2.widget.ViewPager2
+    <androidx.viewpager.widget.ViewPager
        android:id="@+id/pager"
        android:layout_width="match_parent"
        android:layout_height="0dp"
@ -33,7 +33,7 @@
        app:layout_constraintTop_toBottomOf="@+id/appBarLayout" />


-    <me.relex.circleindicator.CircleIndicator3
+    <me.relex.circleindicator.CircleIndicator
        android:id="@+id/indicator"
        android:layout_width="match_parent"
        android:layout_height="20dp"
--- a/app/src/main/res/layout/activity_sources.xml
+++ b/app/src/main/res/layout/activity_sources.xml
@ -31,13 +31,14 @@
        android:id="@+id/fab"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
-        android:layout_gravity="end|bottom|end"
-        app:srcCompat="@drawable/ic_add_white_24dp"
+        android:layout_gravity="end|bottom|right"
+        android:src="@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:contentDescription="@string/add_source" />
+        android:layout_marginRight="16dp"/>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
--- a/app/src/main/res/layout/card_item.xml
+++ b/app/src/main/res/layout/card_item.xml
@ -16,8 +16,7 @@
    app:layout_constraintTop_toTopOf="parent"
    card_view:cardElevation="2dp"
    card_view:cardUseCompatPadding="true"
-    card_view:layout_constraintBottom_toBottomOf="parent"
-    app:cardBackgroundColor="?cardBackgroundColor">
+    card_view:layout_constraintBottom_toBottomOf="parent">

    <androidx.constraintlayout.widget.ConstraintLayout
        android:layout_width="match_parent"
@ -66,7 +65,6 @@
                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"
@ -81,7 +79,6 @@
                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
@ -4,7 +4,6 @@
    xmlns:tools="http://schemas.android.com/tools"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
-    android:background="?android:colorBackground"
    android:descendantFocusability="blocksDescendants">

    <androidx.core.widget.NestedScrollView
@ -34,7 +33,7 @@
                android:layout_marginLeft="16dp"
                android:layout_marginTop="8dp"
                android:layout_marginRight="16dp"
-                android:textColor="?android:textColorSecondary"
+                android:textAppearance="@style/TextAppearance.AppCompat.Small"
                android:textSize="12sp"
                app:layout_constraintHorizontal_bias="0.0"
                app:layout_constraintLeft_toLeftOf="parent"
@ -66,7 +65,6 @@
                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,8 +12,7 @@
        android:layout_marginStart="8dp"
        android:layout_marginTop="21dp"
        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        android:layout_marginLeft="8dp" />
+        app:layout_constraintTop_toTopOf="parent" />

    <TextView
        android:id="@+id/title"
@ -30,14 +29,11 @@
        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"
-        android:layout_marginLeft="8dp"
-        android:layout_marginRight="16dp" />
+        tools:text="Titre" />

    <TextView
        android:id="@+id/sourceTitleAndDate"
@ -50,13 +46,10 @@
        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"
-        android:layout_marginLeft="8dp"
-        android:layout_marginRight="16dp" />
+        tools:text="Google Actualité Il y a 5h" />

 </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,50 +1,55 @@
 <?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:orientation="vertical">
+    android:layout_height="48dp">


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

    <TextView
-        android:id="@+id/sourceTitle"
-        android:layout_width="0dp"
+        android:layout_width="wrap_content"
        android:layout_height="17dp"
-        android:layout_marginStart="8dp"
-        android:ellipsize="end"
-        android:gravity="start"
-        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"
+        android:id="@+id/sourceTitle"
        app:layout_constraintTop_toTopOf="parent"
-        tools:text="source title" />
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintLeft_toRightOf="@+id/itemImage"
+        android:layout_marginStart="16dp"
+        android:layout_marginLeft="16dp"
+        android:textSize="13sp"
+        android:textAlignment="viewStart"
+        tools:text="source title "
+        android:gravity="start" />

    <Button
        android:id="@+id/deleteBtn"
-        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"
+        style="@style/Widget.AppCompat.Button.Borderless"
        android:backgroundTint="?android:textColorSecondary"
        android:elevation="4dp"
-        android:contentDescription="@string/remove_source"
+        android:layout_marginTop="16dp"
+        app:layout_constraintTop_toTopOf="parent"
        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="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"/>

 </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,5 +165,4 @@
    <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,5 +165,4 @@
    <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,5 +165,4 @@
    <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,5 +165,4 @@
    <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,5 +165,4 @@
    <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,5 +165,4 @@
    <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,5 +165,4 @@
    <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,5 +165,4 @@
    <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,5 +165,4 @@
    <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,5 +165,4 @@
    <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,5 +165,4 @@
    <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,5 +165,4 @@
    <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,5 +165,4 @@
    <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,5 +165,4 @@
    <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,5 +165,4 @@
    <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,5 +165,4 @@
    <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/colors.xml
+++ b/app/src/main/res/values/colors.xml
@ -5,7 +5,7 @@
    <color name="colorAccent">#FFff5722</color>
    <color name="colorAccentDark">#FFbf360c</color>
    <color name="pink">#FFe91e63</color>
-    <color name="white">#FFFFFF</color>
+    <color name="white">#FFFFFFFF</color>
    <color name="black">#FF000000</color>
    <color name="red">#FF0000</color>
    <color name="refresh_progress_1">@color/colorAccentDark</color>
@ -20,5 +20,5 @@

    <color name="cardBackgroundColor">#FFFFFFFF</color>
    <color name="materialDrawerHeaderSelectionText">#212121</color>
-    <color name="darkBackground">#303030</color>
+    <color name="darkBackground">#FF303030</color>
 </resources>
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@ -168,5 +168,4 @@
    <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
@ -28,7 +28,6 @@
        <item name="cardBackgroundColor">@color/grey_800</item>
        <item name="android:colorBackground">@color/darkBackground</item>
        <item name="colorSurface">@color/darkBackground</item>
-        <item name="alertDialogTheme">@style/AlertDialogDark</item>
        <item name="bnbBackgroundColor">@color/grey_900</item>
        <item name="android:textColorPrimary">@color/white</item>
        <item name="android:textColorSecondary">@color/grey_600</item>
@ -59,15 +58,4 @@
        <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>
-
-    <!-- Alert dialog Theme -->
-
-    <style name="AlertDialogDark" parent="Theme.MaterialComponents.Dialog">
-        <item name="android:background">@color/darkBackground</item>
-    </style>
-
 </resources>