Fonts are a pain in the a$$.

Cleaning, and fixing socket timeout log.
More details for silent reports.
2022-12-05 21:04:32 +01:00 · 2022-12-04 20:46:43 +01:00 · 2022-12-03 21:39:46 +01:00 · 2022-12-01 21:01:18 +00:00 · 2022-12-01 21:30:20 +01:00 · 2022-11-30 20:53:11 +01:00
107 changed files with 3400 additions and 2232 deletions
@@ -5,17 +5,20 @@ name: test
 steps:
  - name: AnylyseBuildTest
    image: mingc/android-build-box:latest
-    failure: ignore
    commands:
+      - echo "---------------------------------------------------------"
+      - echo "Configure gradle..."
+      - mkdir -p ~/.gradle && echo "org.gradle.daemon=false\nignoreGitVersion=true\npushCache=false\nsystemProp.org.gradle.internal.http.connectionTimeout=180000\nsystemProp.org.gradle.internal.http.socketTimeout=180000" >> ~/.gradle/gradle.properties
      - echo "---------------------------------------------------------"
      - echo "Analysing..."
-      - ./gradlew sonarqube -Dsonar.projectKey=RFS2 -Dsonar.host.url=$SONAR_HOST_URL -Dsonar.login=$SONAR_LOGIN -PignoreGitVersion=true -P appLoginUrl="\"URL\"" -P appLoginUsername="\"LOGIN\"" -P appLoginPassword="\"PASS\""
+      - ./gradlew sonarqube -Dsonar.projectKey=RFS2 -Dsonar.host.url=$SONAR_HOST_URL -Dsonar.login=$SONAR_LOGIN
      - echo "---------------------------------------------------------"
      - echo "Building..."
-      - ./gradlew :androidApp:build -PignoreGitVersion=true -P appLoginUrl="\"URL\"" -P appLoginUsername="\"LOGIN\"" -P appLoginPassword="\"PASS\"" -P pushCache=false
+      - ./gradlew build
      - echo "---------------------------------------------------------"
      - echo "Testing..."
      - echo "---------------------------------------------------------"
+      - ./gradlew test
    environment:
      SONAR_HOST_URL:
        from_secret: sonarScannerHostUrl
@@ -85,8 +88,12 @@ steps:
  - name: build
    image: mingc/android-build-box:latest
    commands:
+      - echo "---------------------------------------------------------"
+      - echo "Configure gradle..."
+      - mkdir -p ~/.gradle && echo "org.gradle.daemon=false\nignoreGitVersion=true\npushCache=false\nsystemProp.org.gradle.internal.http.connectionTimeout=180000\nsystemProp.org.gradle.internal.http.socketTimeout=180000" >> ~/.gradle/gradle.properties
+      - echo "---------------------------------------------------------"
      - echo "Generate APK"
-      - ./gradlew :androidApp:assembleGithubConfigRelease -PignoreGitVersion=true -P appLoginUrl="\"URL\"" -P appLoginUsername="\"LOGIN\"" -P appLoginPassword="\"PASS\"" -P pushCache=false
+      - ./gradlew :androidApp:assembleGithubConfigRelease  -P pushCache=false
      - echo "---------------------------------------------------------"
      - echo "Get Key"
      - wget https://amine-louveau.fr/key
@@ -46,28 +46,3 @@ Always check if the web version of your instance is working.
 I won't provide any selfoss instance url. If you want to help, but to not have one, you'll have to install one, and use it.

 All the details to need are [here](https://selfoss.aditu.de/).
-
-# Build the project
-
-You can directly import this project into IntellIJ/Android Studio.
-
-You'll have to:
-
- Define some parameters either in `~/.gradle/gradle.properties` or as gradle parameters (see the examples)
-
-    - appLoginUrl, appLoginUsername and appLoginPassword: url, username and password of a selfoss instance. **These are only used for tests. They can be empty if you don't test API calls.**
-
-### Examples:
-#### Inside ~/.gradle/gradle.properties
-
-```
-appLoginUrl="URL" # It can be empty.
-appLoginUsername="LOGIN" # It can be empty.
-appLoginPassword="PASS" # It can be empty.
-```
-
-#### As gradle parameters
-
-```
-./gradlew .... -P appLoginUrl="URL" -P appLoginUsername="LOGIN" -P appLoginPassword="PASS"
-```
@@ -1,11 +1,13 @@
 import java.io.ByteArrayOutputStream

 val ignoreGitVersion: String by project
+val acraVersion = "5.9.7"

 plugins {
    id("com.android.application")
    kotlin("android")
    kotlin("kapt")
+    id("com.mikepenz.aboutlibraries.plugin")
 }

 fun Project.execWithOutput(cmd: String, ignore: Boolean = false): String {
@@ -54,11 +56,15 @@ fun versionNameFromGit(): String {
 android {
    compileOptions {
        // Flag to enable support for the new language APIs
-        isCoreLibraryDesugaringEnabled = true
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
    }
-    compileSdk = 31
+
+    // For Kotlin projects
+    kotlinOptions {
+        jvmTarget = "11"
+    }
+    compileSdk = 33
    buildToolsVersion = "31.0.0"
    buildFeatures {
        viewBinding = true
@@ -66,7 +72,7 @@ android {
    defaultConfig {
        applicationId = "bou.amine.apps.readerforselfossv2.android"
        minSdk = 21
-        targetSdk = 31
+        targetSdk = 33
        versionCode = versionCodeFromGit()
        versionName = versionNameFromGit()

@@ -79,6 +85,11 @@ android {
        // tests
        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
    }
+    packagingOptions {
+        resources {
+            excludes += "/META-INF/{AL2.0,LGPL2.1}"
+        }
+    }
    buildTypes {
        getByName("release") {
            isMinifyEnabled = true
@@ -86,9 +97,6 @@ android {
            proguardFiles(getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro")
        }
        getByName("debug") {
-            buildConfigField("String", "LOGIN_URL", properties["appLoginUrl"] as String)
-            buildConfigField("String", "LOGIN_PASSWORD", properties["appLoginPassword"] as String)
-            buildConfigField("String", "LOGIN_USERNAME", properties["appLoginUsername"] as String)
        }
    }
    flavorDimensions.add("build")
@@ -98,9 +106,6 @@ android {
            dimension = "build"
        }
    }
-    kotlinOptions {
-        jvmTarget = "1.8"
-    }
    namespace = "bou.amine.apps.readerforselfossv2.android"

 }
@@ -114,13 +119,6 @@ dependencies {

    implementation("androidx.preference:preference-ktx:1.1.1")

-    // Testing
-    androidTestImplementation("androidx.test.espresso:espresso-core:3.4.0-alpha02")
-    androidTestImplementation("androidx.test:runner:1.3.1-alpha02")
-    // Espresso-contrib for DatePicker, RecyclerView, Drawer actions, Accessibility checks, CountingIdlingResource
-    androidTestImplementation("androidx.test.espresso:espresso-contrib:3.4.0-alpha02")
-    // Espresso-intents for validation and stubbing of Intents
-    androidTestImplementation("androidx.test.espresso:espresso-intents:3.4.0-alpha02")
    implementation(fileTree(mapOf("include" to listOf("*.jar"), "dir" to "libs")))

    // Android Support
@@ -129,31 +127,18 @@ dependencies {
    implementation("androidx.recyclerview:recyclerview:1.3.0-alpha01")
    implementation("androidx.legacy:legacy-support-v4:1.0.0")
    implementation("androidx.vectordrawable:vectordrawable:1.2.0-alpha02")
-    implementation("androidx.browser:browser:1.4.0")
    implementation("androidx.cardview:cardview:1.0.0")
    implementation("androidx.annotation:annotation:1.3.0")
    implementation("androidx.work:work-runtime-ktx:2.7.1")
    implementation("androidx.constraintlayout:constraintlayout:2.1.3")
    implementation("org.jsoup:jsoup:1.14.3")

-    coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:1.1.5")
-
    //multidex
    implementation("androidx.multidex:multidex:2.0.1")

    // About
-    implementation("com.mikepenz:aboutlibraries-core:8.9.4")
-    implementation("com.mikepenz:aboutlibraries:8.9.4")
-    implementation("com.mikepenz:aboutlibraries-definitions:8.9.4")
-
-    // Async
-    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.0")
-
-    // Retrofit + http logging + okhttp
-    implementation("com.squareup.retrofit2:retrofit:2.9.0")
-    implementation("com.squareup.okhttp3:logging-interceptor:5.0.0-alpha.3")
-    implementation("com.squareup.retrofit2:converter-gson:2.9.0")
-    implementation("com.burgstaller:okhttp-digest:2.5")
+    implementation("com.mikepenz:aboutlibraries-core:10.5.1")
+    implementation("com.mikepenz:aboutlibraries:10.5.1")

    // Material-ish things
    implementation("com.ashokvarma.android:bottom-navigation-bar:2.2.0")
@@ -167,8 +152,6 @@ dependencies {
    implementation("com.mikepenz:materialdrawer:8.4.5")

    // Themes
-    implementation("com.52inc:scoops:1.0.0")
-    implementation("com.jaredrummler:colorpicker:1.1.0")
    implementation("com.github.rubensousa:floatingtoolbar:1.5.1")

    // Pager
@@ -191,14 +174,47 @@ dependencies {

    implementation("androidx.core:core-ktx:1.8.0")

-    // implementation("androidx.lifecycle:lifecycle-livedata-ktx:2.5.1")
-    // implementation("androidx.lifecycle:lifecycle-common-java8:2.5.1")
-    // implementation("androidx.lifecycle:lifecycle-runtime:2.5.1")
    implementation("androidx.lifecycle:lifecycle-extensions:2.2.0")

    // Network information
     implementation("com.github.ln-12:multiplatform-connectivity-status:1.3.0")

    // SQLDELIGHT
-    implementation("com.squareup.sqldelight:android-driver:1.5.3")
+    implementation("com.squareup.sqldelight:android-driver:1.5.4")
+
+    //test
+    testImplementation("junit:junit:4.13.2")
+    testImplementation("io.mockk:mockk:1.12.0")
+    testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.0")
+    implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.4.0")
+
+    implementation("ch.acra:acra-http:$acraVersion")
+    implementation("ch.acra:acra-toast:$acraVersion")
+
+    // Matomo
+    implementation("com.github.matomo-org:matomo-sdk-android:4.1.4")
+}
+
+tasks.withType<Test> {
+    outputs.upToDateWhen { false }
+    useJUnit()
+    testLogging {
+        exceptionFormat = org.gradle.api.tasks.testing.logging.TestExceptionFormat.FULL
+        events = setOf(
+            org.gradle.api.tasks.testing.logging.TestLogEvent.PASSED,
+            org.gradle.api.tasks.testing.logging.TestLogEvent.FAILED,
+            org.gradle.api.tasks.testing.logging.TestLogEvent.STANDARD_ERROR
+        )
+        showStandardStreams = true
+    }
+}
+
+aboutLibraries {
+    offlineMode = true
+    fetchRemoteLicense = false
+    fetchRemoteFunding = false
+    includePlatform = false
+    strictMode = com.mikepenz.aboutlibraries.plugin.StrictMode.FAIL
+    duplicationMode = com.mikepenz.aboutlibraries.plugin.DuplicateMode.MERGE
+    duplicationRule = com.mikepenz.aboutlibraries.plugin.DuplicateRule.GROUP
 }
@@ -30,15 +30,8 @@
    <fields>;
 }

-dontwarn okio.**
-dontwarn retrofit2.Platform$Java8
-keep class retrofit.** { *; }
-keepclasseswithmembers class * {
-    @retrofit.http.* <methods>;
-}
 -keepattributes *Annotation*,Signature
 -keepattributes Exceptions
-dontwarn okio.**
 -dontwarn javax.annotation.Nullable
 -dontwarn javax.annotation.ParametersAreNonnullByDefault

@@ -90,3 +83,5 @@
 # @Serializable and @Polymorphic are used at runtime for polymorphic serialization.
 -keepattributes RuntimeVisibleAnnotations,AnnotationDefault

+-dontwarn io.mockk.**
+-keep class io.mockk.** { *; }
@@ -15,7 +15,8 @@
        android:supportsRtl="true"
        android:networkSecurityConfig="@xml/network_security_config"
        android:theme="@style/NoBar"
-        android:dataExtractionRules="@xml/data_extraction_rules">
+        android:dataExtractionRules="@xml/data_extraction_rules"
+        android:configChanges="uiMode">
        <activity
            android:name=".MainActivity"
            android:theme="@style/SplashTheme"
@@ -78,8 +79,5 @@
            android:value="true" />

        <meta-data android:name="android.max_aspect" android:value="2.1" />
-        <meta-data
-            android:name="preloaded_fonts"
-            android:resource="@array/preloaded_fonts" />
    </application>
 </manifest>
@@ -0,0 +1,9 @@
+package bou.amine.apps.readerforselfossv2.android
+
+import org.acra.ACRA
+import org.acra.ktx.sendSilentlyWithAcra
+
+fun Throwable.sendSilentlyWithAcraWithName(name: String) {
+        ACRA.errorReporter.putCustomData("error_source", name)
+    this.sendSilentlyWithAcra()
+}
@@ -7,13 +7,10 @@ import android.widget.*
 import androidx.appcompat.app.AppCompatActivity
 import androidx.constraintlayout.widget.ConstraintLayout
 import bou.amine.apps.readerforselfossv2.android.databinding.ActivityAddSourceBinding
-import bou.amine.apps.readerforselfossv2.android.themes.AppColors
-import bou.amine.apps.readerforselfossv2.android.themes.Toppings
 import bou.amine.apps.readerforselfossv2.android.utils.isBaseUrlInvalid
 import bou.amine.apps.readerforselfossv2.model.NetworkUnavailableException
 import bou.amine.apps.readerforselfossv2.repository.Repository
 import bou.amine.apps.readerforselfossv2.service.AppSettingsService
-import com.ftinc.scoop.Scoop
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
@@ -26,7 +23,6 @@ class AddSourceActivity : AppCompatActivity(), DIAware {

    private var mSpoutsValue: String? = null

-    private lateinit var appColors: AppColors
    private lateinit var binding: ActivityAddSourceBinding

    override val di by closestDI()
@@ -34,43 +30,18 @@ class AddSourceActivity : AppCompatActivity(), DIAware {
    private val appSettingsService : AppSettingsService by instance()

    override fun onCreate(savedInstanceState: Bundle?) {
-        appColors = AppColors(this@AddSourceActivity)
-
        super.onCreate(savedInstanceState)
        binding = ActivityAddSourceBinding.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)
-
-        val drawable = binding.nameInput.background
-        drawable.setTint(appColors.colorAccent)
-
-
-        // TODO: clean
-        binding.nameInput.background = drawable
-
-        val drawable1 = binding.sourceUri.background
-        drawable1.setTint(appColors.colorAccent)
-
-        binding.sourceUri.background = drawable1
-
-        val drawable2 = binding.tags.background
-        drawable2.setTint(appColors.colorAccent)
-
-        binding.tags.background = drawable2
-
        setSupportActionBar(binding.toolbar)
        supportActionBar?.setDisplayHomeAsUpEnabled(true)
        supportActionBar?.setDisplayShowHomeEnabled(true)

        maybeGetDetailsFromIntentSharing(intent, binding.sourceUri, binding.nameInput)

-        binding.saveBtn.setTextColor(appColors.colorAccent)
-
        binding.saveBtn.setOnClickListener {
            handleSaveSource(
                binding.tags,
@@ -123,7 +94,7 @@ class AddSourceActivity : AppCompatActivity(), DIAware {
        CoroutineScope(Dispatchers.Main).launch {
            try {
                val items = repository.getSpouts()
-                if (items != null) {
+                if (items.isNotEmpty()) {
                    val itemsStrings = items.map { it.value.name }
                    for ((key, value) in items) {
                        spoutsKV[value.name] = key
@@ -18,6 +18,7 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.widget.SearchView
 import androidx.core.view.doOnNextLayout
 import androidx.drawerlayout.widget.DrawerLayout
+import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.*
 import androidx.work.Constraints
 import androidx.work.ExistingPeriodicWorkPolicy
@@ -29,21 +30,20 @@ import bou.amine.apps.readerforselfossv2.android.adapters.ItemsAdapter
 import bou.amine.apps.readerforselfossv2.android.background.LoadingWorker
 import bou.amine.apps.readerforselfossv2.android.databinding.ActivityHomeBinding
 import bou.amine.apps.readerforselfossv2.android.settings.SettingsActivity
-import bou.amine.apps.readerforselfossv2.android.themes.AppColors
-import bou.amine.apps.readerforselfossv2.android.themes.Toppings
 import bou.amine.apps.readerforselfossv2.android.utils.bottombar.maybeShow
 import bou.amine.apps.readerforselfossv2.android.utils.bottombar.removeBadge
-import bou.amine.apps.readerforselfossv2.android.utils.customtabs.CustomTabActivityHelper
 import bou.amine.apps.readerforselfossv2.model.SelfossModel
 import bou.amine.apps.readerforselfossv2.repository.Repository
 import bou.amine.apps.readerforselfossv2.service.AppSettingsService
-import bou.amine.apps.readerforselfossv2.utils.*
+import bou.amine.apps.readerforselfossv2.utils.ItemType
+import bou.amine.apps.readerforselfossv2.utils.getHtmlDecoded
+import bou.amine.apps.readerforselfossv2.utils.getIcon
+import bou.amine.apps.readerforselfossv2.utils.longHash
 import com.ashokvarma.bottomnavigation.BottomNavigationBar
 import com.ashokvarma.bottomnavigation.BottomNavigationItem
 import com.ashokvarma.bottomnavigation.TextBadgeItem
 import com.bumptech.glide.Glide
 import com.bumptech.glide.request.RequestOptions
-import com.ftinc.scoop.Scoop
 import com.mikepenz.aboutlibraries.LibsBuilder
 import com.mikepenz.materialdrawer.holder.BadgeStyle
 import com.mikepenz.materialdrawer.holder.ColorHolder
@@ -62,6 +62,9 @@ import kotlinx.coroutines.launch
 import org.kodein.di.DIAware
 import org.kodein.di.android.closestDI
 import org.kodein.di.instance
+import org.matomo.sdk.Tracker
+import org.matomo.sdk.extra.TrackHelper
+import java.security.MessageDigest
 import java.util.concurrent.TimeUnit


@@ -80,8 +83,6 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
    private lateinit var tabNewBadge: TextBadgeItem
    private lateinit var tabArchiveBadge: TextBadgeItem
    private lateinit var tabStarredBadge: TextBadgeItem
-    private lateinit var customTabActivityHelper: CustomTabActivityHelper
-    private lateinit var appColors: AppColors
    private var offset: Int = 0
    private var firstVisible: Int = 0
    private lateinit var recyclerViewScrollListener: RecyclerView.OnScrollListener
@@ -95,29 +96,21 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar

    private val settingsLauncher = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {
        appSettingsService.refreshUserSettings()
-        recreate()
    }

    override val di by closestDI()
    private val repository : Repository by instance()
    private val appSettingsService : AppSettingsService by instance()
+    private val tracker : Tracker by instance()

-    data class DrawerData(val tags: List<SelfossModel.Tag>?, val sources: List<SelfossModel.Source>?)
-
-    override fun onStart() {
-        super.onStart()
-        customTabActivityHelper.bindCustomTabsService(this)
-    }

    override fun onCreate(savedInstanceState: Bundle?) {
-
-        // Add appcolors to DI
-        appColors = AppColors(this@HomeActivity)
-
        super.onCreate(savedInstanceState)
        binding = ActivityHomeBinding.inflate(layoutInflater)
        val view = binding.root

+        TrackHelper.track().screen("/home").with(tracker)
+
        fromTabShortcut =  intent.getIntExtra("shortcutTab", -1) != -1
        repository.offlineOverride =  intent.getBooleanExtra("startOffline", false)

@@ -127,8 +120,6 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar

        setContentView(view)

-        handleThemeBinding()
-
        setSupportActionBar(binding.toolBar)
        supportActionBar?.setDisplayHomeAsUpEnabled(true)
        supportActionBar?.setHomeButtonEnabled(true)
@@ -136,18 +127,16 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
        binding.drawerContainer.addDrawerListener(mDrawerToggle)
        mDrawerToggle.syncState()

-        customTabActivityHelper = CustomTabActivityHelper()
-
        handleBottomBar()
        initDrawer()

        handleSwipeRefreshLayout()

-        getElementsAccordingToTab()

-
-        CoroutineScope(Dispatchers.Main).launch {
-            repository.tryToCacheItemsAndGetNewOnes()
+        if (appSettingsService.isItemCachingEnabled()) {
+            CoroutineScope(Dispatchers.Main).launch {
+                repository.tryToCacheItemsAndGetNewOnes()
+            }
        }
    }

@@ -200,8 +189,6 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar

                        adapter.handleItemAtIndex(position)

-                        reloadBadgeContent()
-
                        val tagHashes = i.tags.map { it.longHash() }
                        tagsBadge = tagsBadge.map {
                            if (tagHashes.contains(it.key)) {
@@ -229,32 +216,61 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
        ItemTouchHelper(simpleItemTouchCallback).attachToRecyclerView(binding.recyclerView)
    }

+    private fun updateBottomBarBadgeCount(badge: TextBadgeItem, count: Int) {
+        if (count > 0) {
+            badge
+                .setText(count.toString())
+                .maybeShow()
+        } else {
+            badge.removeBadge()
+        }
+    }
+
    private fun handleBottomBar() {

        tabNewBadge = TextBadgeItem()
            .setText("")
            .setHideOnSelect(false).hide(false)
-            .setBackgroundColor(appColors.colorPrimary)
        tabArchiveBadge = TextBadgeItem()
            .setText("")
            .setHideOnSelect(false).hide(false)
-            .setBackgroundColor(appColors.colorPrimary)
        tabStarredBadge = TextBadgeItem()
            .setText("")
            .setHideOnSelect(false).hide(false)
-            .setBackgroundColor(appColors.colorPrimary)
+
+        if (appSettingsService.isDisplayUnreadCountEnabled()) {
+            lifecycleScope.launch {
+                repository.badgeUnread.collect {
+                    updateBottomBarBadgeCount(tabNewBadge, it)
+                }
+            }
+        }
+
+        if (appSettingsService.isDisplayAllCountEnabled()) {
+            lifecycleScope.launch {
+                repository.badgeAll.collect {
+                    updateBottomBarBadgeCount(tabArchiveBadge, it)
+                }
+            }
+
+            lifecycleScope.launch {
+                repository.badgeStarred.collect {
+                    updateBottomBarBadgeCount(tabStarredBadge, it)
+                }
+            }
+        }

        val tabNew =
            BottomNavigationItem(
                R.drawable.ic_tab_fiber_new_black_24dp,
                getString(R.string.tab_new)
-            ).setActiveColor(appColors.colorAccent)
+            )
                .setBadgeItem(tabNewBadge)
        val tabArchive =
            BottomNavigationItem(
                R.drawable.ic_tab_archive_black_24dp,
                getString(R.string.tab_read)
-            ).setActiveColor(appColors.colorAccentDark)
+            )
                .setBadgeItem(tabArchiveBadge)
        val tabStarred =
            BottomNavigationItem(
@@ -270,7 +286,6 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
            .setFirstSelectedPosition(0)
            .initialise()
        binding.bottomBar.setMode(BottomNavigationBar.MODE_SHIFTING)
-        binding.bottomBar.setBackgroundStyle(BottomNavigationBar.BACKGROUND_STYLE_STATIC)

        if (fromTabShortcut) {
            binding.bottomBar.selectTab(elementsShown.position - 1)
@@ -280,12 +295,8 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
    override fun onResume() {
        super.onResume()

-        appColors = AppColors(this@HomeActivity)
-
        handleDrawerItems()

-        handleThemeUpdate()
-
        reloadLayoutManager()

        if (appSettingsService.isInfiniteLoadingEnabled()) {
@@ -296,6 +307,8 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar

        handleBottomBarActions()

+        handleGDPRDialog(appSettingsService.settings.getBoolean("GDPR_shown", false))
+
        handleRecurringTask()

        CoroutineScope(Dispatchers.Main).launch {
@@ -305,23 +318,23 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
        getElementsAccordingToTab()
    }

-    override fun onStop() {
-        super.onStop()
-        customTabActivityHelper.unbindCustomTabsService(this)
-    }

-    private fun handleThemeBinding() {
-        val scoop = Scoop.getInstance()
-        scoop.bind(this, Toppings.PRIMARY.value, binding.toolBar)
-        scoop.bindStatusBar(this, Toppings.PRIMARY_DARK.value)
-    }
-
-    private fun handleThemeUpdate() {
-
-        val scoop = Scoop.getInstance()
-        scoop.update(Toppings.PRIMARY.value, appColors.colorPrimary)
-
-        scoop.update(Toppings.PRIMARY_DARK.value, appColors.colorPrimaryDark)
+    private fun handleGDPRDialog(GDPRShown: Boolean) {
+        val messageDigest: MessageDigest = MessageDigest.getInstance("SHA-256")
+        messageDigest.update(appSettingsService.getBaseUrl().toByteArray())
+        if (!GDPRShown) {
+            val alertDialog = AlertDialog.Builder(this).create()
+            alertDialog.setTitle(getString(R.string.gdpr_dialog_title))
+            alertDialog.setMessage(getString(R.string.gdpr_dialog_message))
+            alertDialog.setButton(
+                AlertDialog.BUTTON_NEUTRAL,
+                "OK"
+            ) { dialog, _ ->
+                appSettingsService.settings.putBoolean("GDPR_shown", true)
+                dialog.dismiss()
+            }
+            alertDialog.show()
+        }
    }

    private fun initDrawer() {
@@ -396,27 +409,15 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
        )

        CoroutineScope(Dispatchers.IO).launch {
-            val drawerData = DrawerData(repository.getDBTags().map { it.toView() },
-                                        repository.getDBSources().map { it.toView() })
+            val tags = repository.getTags()
+            val sources = repository.getSources()
            runOnUiThread {
-                // Only refresh if there is no data in the DB, or if the `UpdateSources` setting is enabled
-                if (drawerData.sources?.isEmpty() == true || appSettingsService.isUpdateSourcesEnabled()) {
-                    drawerApiCalls(drawerData)
-                } else {
-                    handleDrawerData(drawerData, loadedFromCache = true)
-                }
+                handleDrawerData(tags, sources)
            }
        }
    }

-    private fun drawerApiCalls(drawerData: DrawerData) {
-        CoroutineScope(Dispatchers.Main).launch {
-            val apiDrawerData = DrawerData(repository.getTags(), repository.getSources())
-            handleDrawerData(if (drawerData != apiDrawerData) apiDrawerData else drawerData)
-        }
-    }
-
-    private fun handleDrawerData(drawerData: DrawerData, loadedFromCache: Boolean = false) {
+    private fun handleDrawerData(tags: List<SelfossModel.Tag>, sources: List<SelfossModel.Source>) {
        binding.mainDrawer.itemAdapter.clear()

        // Filters title with clear action
@@ -430,24 +431,24 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
        }

        // Hidden tags
-        if (drawerData.tags != null && drawerData.tags.isNotEmpty() && appSettingsService.getHiddenTags().isNotEmpty()) {
+        if (tags.isNotEmpty() && appSettingsService.getHiddenTags().isNotEmpty()) {
            secondaryItem(
                withDivider = true,
                R.string.drawer_item_hidden_tags,
                DRAWER_ID_HIDDEN_TAGS
            )
-            handleHiddenTags(drawerData.tags)
+            handleHiddenTags(tags)
        }

        // Tags
        secondaryItem(withDivider = true, R.string.drawer_item_tags, DRAWER_ID_TAGS)
-        if (drawerData.tags == null && !loadedFromCache) {
+        if (tags.isEmpty()) {
            binding.mainDrawer.itemAdapter.add(
                SecondaryDrawerItem()
                    .apply { nameRes = R.string.drawer_error_loading_tags; isSelectable = false }
            )
        } else {
-            handleTags(drawerData.tags!!)
+            handleTags(tags)
        }

        // Sources
@@ -455,15 +456,15 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
            startActivity(Intent(v!!.context, SourcesActivity::class.java))
            false
        }
-        if (drawerData.sources == null && !loadedFromCache) {
+        if (sources.isEmpty()) {
            binding.mainDrawer.itemAdapter.add(
                SecondaryDrawerItem().apply {
-                    nameRes = R.string.drawer_error_loading_tags
+                    nameRes = R.string.drawer_error_loading_sources
                    isSelectable = false
                }
            )
        } else {
-            handleSources(drawerData.sources!!)
+            handleSources(sources)
        }

        // About action
@@ -508,7 +509,8 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
        val gdColor = try {
            Color.parseColor(it.color)
        } catch (e: IllegalArgumentException) {
-            appColors.colorPrimary
+            e.sendSilentlyWithAcraWithName("color issue " + it.color)
+            resources.getColor(R.color.colorPrimary)
        }
        gd.setColor(gdColor)
        gd.shape = GradientDrawable.RECTANGLE
@@ -522,7 +524,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
                iconDrawable = gd
                badgeStyle = BadgeStyle().apply {
                    textColor = ColorHolder.fromColor(Color.WHITE)
-                    color = ColorHolder.fromColor(appColors.colorAccent)
+                    color = ColorHolder.fromColor(resources.getColor(R.color.colorAccent))
                }
                onDrawerItemClickListener = { _, _, _ ->
                    repository.tagFilter = it
@@ -745,8 +747,6 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
                        ItemCardAdapter(
                            this,
                            items,
-                            customTabActivityHelper,
-                            appColors,
                        ) {
                            updateItems(it)
                        }
@@ -755,8 +755,6 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
                        ItemListAdapter(
                            this,
                            items,
-                            customTabActivityHelper,
-                            appColors,
                        ) {
                            updateItems(it)
                        }
@@ -779,29 +777,12 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar

    private fun reloadBadges() {
        if (appSettingsService.isDisplayUnreadCountEnabled() || appSettingsService.isDisplayAllCountEnabled()) {
-            CoroutineScope(Dispatchers.Main).launch {
+            CoroutineScope(Dispatchers.IO).launch {
                repository.reloadBadges()
-                reloadBadgeContent()
            }
        }
    }

-    private fun reloadBadgeContent() {
-        if (appSettingsService.isDisplayUnreadCountEnabled()) {
-            tabNewBadge
-                .setText(repository.badgeUnread.toString())
-                .maybeShow()
-        }
-        if (appSettingsService.isDisplayAllCountEnabled()) {
-            tabArchiveBadge
-                .setText(repository.badgeAll.toString())
-                .maybeShow()
-            tabStarredBadge
-                .setText(repository.badgeStarred.toString())
-                .maybeShow()
-        }
-    }
-
    private fun reloadTagsBadges() {
        tagsBadge.forEach {
            binding.mainDrawer.updateBadge(it.key, StringHolder(it.value.toString()))
@@ -911,7 +892,9 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
                return true
            }
            R.id.action_disconnect -> {
-                appSettingsService.clearAll()
+                CoroutineScope(Dispatchers.Main).launch {
+                    repository.logout()
+                }
                val intent = Intent(this, LoginActivity::class.java)
                this.startActivity(intent)
                this@HomeActivity.finish()
@@ -923,10 +906,10 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar

    private fun maxItemNumber(): Int =
        when (elementsShown) {
-            ItemType.UNREAD -> repository.badgeUnread
-            ItemType.ALL -> repository.badgeAll
-            ItemType.STARRED -> repository.badgeStarred
-            else -> repository.badgeUnread // if !elementsShown then unread are fetched.
+            ItemType.UNREAD -> repository.badgeUnread.value
+            ItemType.ALL -> repository.badgeAll.value
+            ItemType.STARRED -> repository.badgeStarred.value
+            else -> repository.badgeUnread.value // if !elementsShown then unread are fetched.
        }

    private fun updateItems(adapterItems: ArrayList<SelfossModel.Item>) {
@@ -2,6 +2,7 @@ package bou.amine.apps.readerforselfossv2.android

 import android.animation.Animator
 import android.animation.AnimatorListenerAdapter
+import android.annotation.SuppressLint
 import android.content.Intent
 import android.os.Bundle
 import android.text.TextUtils
@@ -12,8 +13,8 @@ import android.view.inputmethod.EditorInfo
 import android.widget.TextView
 import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatActivity
+import androidx.appcompat.app.AppCompatDelegate
 import bou.amine.apps.readerforselfossv2.android.databinding.ActivityLoginBinding
-import bou.amine.apps.readerforselfossv2.android.themes.AppColors
 import bou.amine.apps.readerforselfossv2.android.utils.isBaseUrlInvalid
 import bou.amine.apps.readerforselfossv2.repository.Repository
 import bou.amine.apps.readerforselfossv2.service.AppSettingsService
@@ -24,23 +25,35 @@ import kotlinx.coroutines.launch
 import org.kodein.di.DIAware
 import org.kodein.di.android.closestDI
 import org.kodein.di.instance
+import org.matomo.sdk.Tracker
+import org.matomo.sdk.extra.DimensionQueue
+import org.matomo.sdk.extra.DownloadTracker
+import org.matomo.sdk.extra.TrackHelper
+import java.security.MessageDigest
+

 class LoginActivity : AppCompatActivity(), DIAware {

    private var inValidCount: Int = 0
    private var isWithLogin = false

-    private lateinit var appColors: AppColors
    private lateinit var binding: ActivityLoginBinding

    override val di by closestDI()
    private val repository : Repository by instance()
    private val appSettingsService : AppSettingsService by instance()
+    private val tracker : Tracker by instance()
+

    override fun onCreate(savedInstanceState: Bundle?) {
-        appColors = AppColors(this@LoginActivity)
-
        super.onCreate(savedInstanceState)
+
+        TrackHelper.track().download().identifier(DownloadTracker.Extra.ApkChecksum(applicationContext))
+            .with(tracker)
+        TrackHelper.track().screen("/login").with(tracker)
+
+        handleTheme()
+
        binding = ActivityLoginBinding.inflate(layoutInflater)
        val view = binding.root

@@ -57,6 +70,11 @@ class LoginActivity : AppCompatActivity(), DIAware {
        handleActions()
    }

+    @SuppressLint("WrongConstant") // Constant is fetched from the settings
+    private fun handleTheme() {
+        AppCompatDelegate.setDefaultNightMode(appSettingsService.getCurrentTheme())
+    }
+
    private fun handleActions() {

        binding.passwordView.setOnEditorActionListener(
@@ -94,12 +112,24 @@ class LoginActivity : AppCompatActivity(), DIAware {
    }

    private fun goToMain() {
+        CoroutineScope(Dispatchers.Main).launch {
+            repository.updateApiVersion()
+
+            val messageDigest: MessageDigest = MessageDigest.getInstance("SHA-256")
+            messageDigest.update(appSettingsService.getBaseUrl().toByteArray())
+            tracker.userId = String(messageDigest.digest())
+
+            val mDimensionQueue = DimensionQueue(tracker)
+            mDimensionQueue.add(1, appSettingsService.getApiVersion().toString())
+
+            tracker.isOptOut = !appSettingsService.isAnalyticsEnabled()
+        }
        val intent = Intent(this, HomeActivity::class.java)
        startActivity(intent)
        finish()
    }

-    private fun preferenceError(t: Throwable) {
+    private fun preferenceError() {
        appSettingsService.resetLoginInformation()

        binding.urlView.error = getString(R.string.wrong_infos)
@@ -164,11 +194,10 @@ class LoginActivity : AppCompatActivity(), DIAware {
            CoroutineScope(Dispatchers.IO).launch {
                val result = repository.login()
                if (result) {
-                    repository.updateApiVersion()
                    goToMain()
                } else {
                    CoroutineScope(Dispatchers.Main).launch {
-                        preferenceError(Exception("Not success"))
+                        preferenceError()
                    }
                }
            }
@@ -12,7 +12,6 @@ import androidx.lifecycle.DefaultLifecycleObserver
 import androidx.lifecycle.LifecycleOwner
 import androidx.lifecycle.ProcessLifecycleOwner
 import androidx.multidex.MultiDexApplication
-import androidx.preference.PreferenceManager
 import bou.amine.apps.readerforselfossv2.DI.networkModule
 import bou.amine.apps.readerforselfossv2.android.viewmodel.AppViewModel
 import bou.amine.apps.readerforselfossv2.dao.DriverFactory
@@ -21,7 +20,6 @@ import bou.amine.apps.readerforselfossv2.repository.Repository
 import bou.amine.apps.readerforselfossv2.service.AppSettingsService
 import com.bumptech.glide.Glide
 import com.bumptech.glide.request.RequestOptions
-import com.ftinc.scoop.Scoop
 import com.github.ln_12.library.ConnectivityStatus
 import com.mikepenz.materialdrawer.util.AbstractDrawerImageLoader
 import com.mikepenz.materialdrawer.util.DrawerImageLoader
@@ -29,8 +27,19 @@ import io.github.aakira.napier.DebugAntilog
 import io.github.aakira.napier.Napier
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.launch
+import org.acra.ACRA
+import org.acra.ReportField
+import org.acra.config.httpSender
+import org.acra.config.toast
+import org.acra.data.StringFormat
+import org.acra.ktx.initAcra
+import org.acra.sender.HttpSender
 import org.kodein.di.*
+import org.matomo.sdk.Matomo
+import org.matomo.sdk.Tracker
+import org.matomo.sdk.TrackerBuilder

 class MyApp : MultiDexApplication(), DIAware {

@@ -38,9 +47,11 @@ class MyApp : MultiDexApplication(), DIAware {
        import(networkModule)
        bind<DriverFactory>() with singleton { DriverFactory(applicationContext) }
        bind<ReaderForSelfossDB>() with singleton { ReaderForSelfossDB(driverFactory.createDriver()) }
-        bind<Repository>() with singleton { Repository(instance(), instance(), connectivityStatus, instance()) }
+        bind<Repository>() with singleton { Repository(instance(), instance(), isConnectionAvailable, instance()) }
        bind<ConnectivityStatus>() with singleton { ConnectivityStatus(applicationContext) }
        bind<AppViewModel>() with singleton { AppViewModel(repository = instance()) }
+        bind<Tracker>() with singleton { TrackerBuilder.createDefault("https://matomo.amine-louveau.fr/matomo.php", if (BuildConfig.DEBUG) 4 else 5).build(
+            Matomo.getInstance(applicationContext)) }
    }

    private val repository: Repository by instance()
@@ -48,37 +59,66 @@ class MyApp : MultiDexApplication(), DIAware {
    private val connectivityStatus: ConnectivityStatus by instance()
    private val driverFactory: DriverFactory by instance()

+    // TODO: handle with the "previous" way
+    private val isConnectionAvailable: MutableStateFlow<Boolean> = MutableStateFlow(true)
+
    override fun onCreate() {
        super.onCreate()
        Napier.base(DebugAntilog())

-        initDrawerImageLoader()
+        if (!ACRA.isACRASenderServiceProcess()) {
+            initDrawerImageLoader()

-        initTheme()
+            tryToHandleBug()

-        tryToHandleBug()
+            handleNotificationChannels()

-        handleNotificationChannels()
+            ProcessLifecycleOwner.get().lifecycle.addObserver(AppLifeCycleObserver(connectivityStatus, repository))

-        ProcessLifecycleOwner.get().lifecycle.addObserver(AppLifeCycleObserver(connectivityStatus, repository))
+            CoroutineScope(Dispatchers.Main).launch {
+                viewModel.networkAvailableProvider.collect { networkAvailable ->
+                    val toastMessage = if (networkAvailable) {
+                        repository.handleDBActions()
+                        R.string.network_connectivity_retrieved
+                    } else {
+                        R.string.network_connectivity_lost
+                    }

-        CoroutineScope(Dispatchers.Main).launch {
-            viewModel.networkAvailableProvider.collect { networkAvailable ->
-                val toastMessage = if (networkAvailable) {
-                    repository.handleDBActions()
-                    R.string.network_connectivity_retrieved
-                } else {
-                    R.string.network_connectivity_lost
+                    Toast.makeText(
+                        applicationContext,
+                        toastMessage,
+                        Toast.LENGTH_SHORT
+                    ).show()
                }
-
-                Toast.makeText(
-                    applicationContext,
-                    toastMessage,
-                    Toast.LENGTH_SHORT
-                ).show()
            }
        }
+    }

+    override fun attachBaseContext(base: Context?) {
+        super.attachBaseContext(base)
+
+        initAcra {
+            reportFormat = StringFormat.JSON
+            reportContent = listOf(
+                ReportField.REPORT_ID, ReportField.INSTALLATION_ID,
+                ReportField.APP_VERSION_CODE, ReportField.APP_VERSION_NAME,
+                ReportField.BUILD, ReportField.ANDROID_VERSION, ReportField.BRAND, ReportField.PHONE_MODEL,
+                ReportField.AVAILABLE_MEM_SIZE, ReportField.TOTAL_MEM_SIZE,
+                ReportField.STACK_TRACE, ReportField.APPLICATION_LOG, ReportField.LOGCAT,
+                ReportField.INITIAL_CONFIGURATION, ReportField.CRASH_CONFIGURATION, ReportField.IS_SILENT,
+                ReportField.USER_APP_START_DATE, ReportField.USER_COMMENT, ReportField.USER_CRASH_DATE, ReportField.USER_EMAIL, ReportField.CUSTOM_DATA)
+            toast {
+                //required
+                text = getString(R.string.crash_toast_text)
+                length = Toast.LENGTH_SHORT
+            }
+            httpSender {
+                uri = "https://bugs.amine-louveau.fr/report" /*best guess, you may need to adjust this*/
+                basicAuthLogin = "LMTlLZuazADohTCm"
+                basicAuthPassword = "he6ghHp83F0PYPfh"
+                httpMethod = HttpSender.Method.POST
+            }
+        }
    }

    private fun handleNotificationChannels() {
@@ -117,22 +157,13 @@ class MyApp : MultiDexApplication(), DIAware {
        })
    }

-    private fun initTheme() {
-        Scoop.waffleCone()
-            .addFlavor(getString(R.string.default_theme), R.style.NoBar, true)
-            .addFlavor(getString(R.string.default_dark_theme), R.style.NoBarDark, false)
-            .setSharedPreferences(PreferenceManager.getDefaultSharedPreferences(this))
-            .initialize()
-    }
-
    private fun tryToHandleBug() {
        val oldHandler = Thread.getDefaultUncaughtExceptionHandler()

        Thread.setDefaultUncaughtExceptionHandler { thread, e ->
-            if (e is java.lang.NoClassDefFoundError && e.stackTrace.asList().any {
+            if (e is NoClassDefFoundError && e.stackTrace.asList().any {
                    it.toString().contains("android.view.ViewDebug")
                }) {
-                Unit
            } else {
                oldHandler.uncaughtException(thread, e)
            }
@@ -12,12 +12,9 @@ import androidx.viewpager2.adapter.FragmentStateAdapter
 import androidx.viewpager2.widget.ViewPager2
 import bou.amine.apps.readerforselfossv2.android.databinding.ActivityReaderBinding
 import bou.amine.apps.readerforselfossv2.android.fragments.ArticleFragment
-import bou.amine.apps.readerforselfossv2.android.themes.AppColors
-import bou.amine.apps.readerforselfossv2.android.themes.Toppings
 import bou.amine.apps.readerforselfossv2.model.SelfossModel
 import bou.amine.apps.readerforselfossv2.repository.Repository
 import bou.amine.apps.readerforselfossv2.service.AppSettingsService
-import com.ftinc.scoop.Scoop
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
@@ -28,7 +25,6 @@ import org.kodein.di.instance
 class ReaderActivity : AppCompatActivity(), DIAware {

    private var currentItem: Int = 0
-    private lateinit var appColors: AppColors

    private lateinit var toolbarMenu: Menu

@@ -40,9 +36,9 @@ class ReaderActivity : AppCompatActivity(), DIAware {

    private fun showMenuItem(willAddToFavorite: Boolean) {
        if (willAddToFavorite) {
-            toolbarMenu.findItem(R.id.star).icon.setTint(Color.WHITE)
+            toolbarMenu.findItem(R.id.star).icon?.setTint(Color.WHITE)
        } else {
-            toolbarMenu.findItem(R.id.star).icon.setTint(Color.RED)
+            toolbarMenu.findItem(R.id.star).icon?.setTint(Color.RED)
        }
    }

@@ -56,16 +52,11 @@ class ReaderActivity : AppCompatActivity(), DIAware {

    override fun onCreate(savedInstanceState: Bundle?) {
        super.onCreate(savedInstanceState)
-        appColors = AppColors(this)
        binding = ActivityReaderBinding.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)
@@ -8,11 +8,8 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.recyclerview.widget.LinearLayoutManager
 import bou.amine.apps.readerforselfossv2.android.adapters.SourcesListAdapter
 import bou.amine.apps.readerforselfossv2.android.databinding.ActivitySourcesBinding
-import bou.amine.apps.readerforselfossv2.android.themes.AppColors
-import bou.amine.apps.readerforselfossv2.android.themes.Toppings
 import bou.amine.apps.readerforselfossv2.model.SelfossModel
 import bou.amine.apps.readerforselfossv2.repository.Repository
-import com.ftinc.scoop.Scoop
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
@@ -22,21 +19,15 @@ import org.kodein.di.instance

 class SourcesActivity : AppCompatActivity(), DIAware {

-    private lateinit var appColors: AppColors
    private lateinit var binding: ActivitySourcesBinding

    override val di by closestDI()
    private val repository : Repository by instance()

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

-        val scoop = Scoop.getInstance()
-        scoop.bind(this, Toppings.PRIMARY.value, binding.toolbar)
-        scoop.bindStatusBar(this, Toppings.PRIMARY_DARK.value)
-
        super.onCreate(savedInstanceState)

        setContentView(view)
@@ -45,8 +36,8 @@ class SourcesActivity : AppCompatActivity(), DIAware {
        supportActionBar?.setDisplayHomeAsUpEnabled(true)
        supportActionBar?.setDisplayShowHomeEnabled(true)

-        binding.fab.rippleColor = appColors.colorAccentDark
-        binding.fab.backgroundTintList = ColorStateList.valueOf(appColors.colorAccent)
+        binding.fab.rippleColor = resources.getColor(R.color.colorAccentDark)
+        binding.fab.backgroundTintList = ColorStateList.valueOf(resources.getColor(R.color.colorAccent))
    }

    override fun onStop() {
@@ -65,20 +56,13 @@ class SourcesActivity : AppCompatActivity(), DIAware {

        CoroutineScope(Dispatchers.Main).launch {
            val response = repository.getSources()
-            if (response != null) {
+            if (response.isNotEmpty()) {
                items = response
                val mAdapter = SourcesListAdapter(
                    this@SourcesActivity, items
                )
                binding.recyclerView.adapter = mAdapter
                mAdapter.notifyDataSetChanged()
-                if (items.isEmpty()) {
-                    Toast.makeText(
-                        this@SourcesActivity,
-                        R.string.nothing_here,
-                        Toast.LENGTH_SHORT
-                    ).show()
-                }
            } else {
                Toast.makeText(
                    this@SourcesActivity,
@@ -10,11 +10,12 @@ import androidx.recyclerview.widget.RecyclerView
 import bou.amine.apps.readerforselfossv2.android.R
 import bou.amine.apps.readerforselfossv2.android.databinding.CardItemBinding
 import bou.amine.apps.readerforselfossv2.android.model.toTextDrawableString
-import bou.amine.apps.readerforselfossv2.android.themes.AppColors
-import bou.amine.apps.readerforselfossv2.android.utils.*
-import bou.amine.apps.readerforselfossv2.android.utils.customtabs.CustomTabActivityHelper
+import bou.amine.apps.readerforselfossv2.android.utils.LinkOnTouchListener
 import bou.amine.apps.readerforselfossv2.android.utils.glide.bitmapCenterCrop
 import bou.amine.apps.readerforselfossv2.android.utils.glide.circularBitmapDrawable
+import bou.amine.apps.readerforselfossv2.android.utils.openInBrowserAsNewTask
+import bou.amine.apps.readerforselfossv2.android.utils.openItemUrl
+import bou.amine.apps.readerforselfossv2.android.utils.shareLink
 import bou.amine.apps.readerforselfossv2.model.SelfossModel
 import bou.amine.apps.readerforselfossv2.repository.Repository
 import bou.amine.apps.readerforselfossv2.service.AppSettingsService
@@ -34,8 +35,6 @@ import org.kodein.di.instance
 class ItemCardAdapter(
    override val app: Activity,
    override var items: ArrayList<SelfossModel.Item>,
-    private val helper: CustomTabActivityHelper,
-    override val appColors: AppColors,
    override val updateItems: (ArrayList<SelfossModel.Item>) -> Unit
 ) : ItemsAdapter<ItemCardAdapter.ViewHolder>() {
    private val c: Context = app.baseContext
@@ -44,8 +43,8 @@ class ItemCardAdapter(
        c.resources.getDimension(R.dimen.card_image_max_height).toInt()

    override val di: DI by closestDI(app)
-    override val repository : Repository by instance()
-    override val appSettingsService : AppSettingsService by instance()
+    override val repository: Repository by instance()
+    override val appSettingsService: AppSettingsService by instance()

    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
        val binding = CardItemBinding.inflate(LayoutInflater.from(parent.context), parent, false)
@@ -61,9 +60,9 @@ class ItemCardAdapter(

            binding.title.setOnTouchListener(LinkOnTouchListener())

-            binding.title.setLinkTextColor(appColors.colorAccent)
+            binding.title.setLinkTextColor(c.resources.getColor(R.color.colorAccent))

-            binding.sourceTitleAndDate.text = itm.sourceAndDateText(repository.dateUtils)
+            binding.sourceTitleAndDate.text = itm.sourceAndDateText()

            if (!appSettingsService.isFullHeightCardsEnabled()) {
                binding.itemImage.maxHeight = imageMaxHeight
@@ -83,10 +82,10 @@ class ItemCardAdapter(
                val color = generator.getColor(itm.title.getHtmlDecoded())

                val drawable =
-                        TextDrawable
-                                .builder()
-                                .round()
-                                .build(itm.title.getHtmlDecoded().toTextDrawableString(), color)
+                    TextDrawable
+                        .builder()
+                        .round()
+                        .build(itm.title.getHtmlDecoded().toTextDrawableString(), color)
                binding.sourceImage.setImageDrawable(drawable)
            } else {
                c.circularBitmapDrawable(itm.getIcon(repository.baseUrl), binding.sourceImage)
@@ -101,7 +100,7 @@ class ItemCardAdapter(
    inner class ViewHolder(val binding: CardItemBinding) : RecyclerView.ViewHolder(binding.root) {
        init {
            handleClickListeners()
-            handleCustomTabActions()
+            handleLinkOpening()
        }

        private fun handleClickListeners() {
@@ -111,41 +110,32 @@ class ItemCardAdapter(
                if (item.starred) {
                    CoroutineScope(Dispatchers.IO).launch {
                        repository.unstarr(item)
-                        // TODO: Handle failure
                    }
-                    item.starred = false
                    binding.favButton.isSelected = false
                } else {
                    CoroutineScope(Dispatchers.IO).launch {
                        repository.starr(item)
-                        // TODO: Handle failure
                    }
-                    item.starred = true
                    binding.favButton.isSelected = true
                }
            }

-                binding.shareBtn.setOnClickListener {
-                    val item = items[bindingAdapterPosition]
-                    c.shareLink(item.getLinkDecoded(), item.title.getHtmlDecoded())
-                }
-
-                binding.browserBtn.setOnClickListener {
-                    c.openInBrowserAsNewTask(items[bindingAdapterPosition])
-                }
+            binding.shareBtn.setOnClickListener {
+                val item = items[bindingAdapterPosition]
+                c.shareLink(item.getLinkDecoded(), item.title.getHtmlDecoded())
            }

-        private fun handleCustomTabActions() {
-            val customTabsIntent = c.buildCustomTabsIntent()
-            helper.bindCustomTabsService(app)
+            binding.browserBtn.setOnClickListener {
+                c.openInBrowserAsNewTask(items[bindingAdapterPosition])
+            }
+        }

+        private fun handleLinkOpening() {
            binding.root.setOnClickListener {
                c.openItemUrl(
                    items,
                    bindingAdapterPosition,
                    items[bindingAdapterPosition].getLinkDecoded(),
-                    customTabsIntent,
-                    appSettingsService.isInternalBrowserEnabled(),
                    appSettingsService.isArticleViewerEnabled(),
                    app
                )
@@ -5,12 +5,10 @@ import android.content.Context
 import android.view.LayoutInflater
 import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
+import bou.amine.apps.readerforselfossv2.android.R
 import bou.amine.apps.readerforselfossv2.android.databinding.ListItemBinding
 import bou.amine.apps.readerforselfossv2.android.model.toTextDrawableString
-import bou.amine.apps.readerforselfossv2.android.themes.AppColors
 import bou.amine.apps.readerforselfossv2.android.utils.LinkOnTouchListener
-import bou.amine.apps.readerforselfossv2.android.utils.buildCustomTabsIntent
-import bou.amine.apps.readerforselfossv2.android.utils.customtabs.CustomTabActivityHelper
 import bou.amine.apps.readerforselfossv2.android.utils.glide.bitmapCenterCrop
 import bou.amine.apps.readerforselfossv2.android.utils.glide.circularBitmapDrawable
 import bou.amine.apps.readerforselfossv2.android.utils.openItemUrl
@@ -29,8 +27,6 @@ import org.kodein.di.instance
 class ItemListAdapter(
    override val app: Activity,
    override var items: ArrayList<SelfossModel.Item>,
-    private val helper: CustomTabActivityHelper,
-    override val appColors: AppColors,
    override val updateItems: (ArrayList<SelfossModel.Item>) -> Unit
 ) : ItemsAdapter<ItemListAdapter.ViewHolder>() {
    private val generator: ColorGenerator = ColorGenerator.MATERIAL
@@ -53,9 +49,9 @@ class ItemListAdapter(

            binding.title.setOnTouchListener(LinkOnTouchListener())

-            binding.title.setLinkTextColor(appColors.colorAccent)
+            binding.title.setLinkTextColor(c.resources.getColor(R.color.colorAccent))

-            binding.sourceTitleAndDate.text = itm.sourceAndDateText(repository.dateUtils)
+            binding.sourceTitleAndDate.text = itm.sourceAndDateText()

            if (itm.getThumbnail(repository.baseUrl).isEmpty()) {

@@ -83,20 +79,15 @@ class ItemListAdapter(
    inner class ViewHolder(val binding: ListItemBinding) : RecyclerView.ViewHolder(binding.root) {

        init {
-            handleCustomTabActions()
+            handleLinkOpening()
        }

-        private fun handleCustomTabActions() {
-            val customTabsIntent = c.buildCustomTabsIntent()
-            helper.bindCustomTabsService(app)
-
+        private fun handleLinkOpening() {
            binding.root.setOnClickListener {
                c.openItemUrl(
                    items,
                    bindingAdapterPosition,
                    items[bindingAdapterPosition].getLinkDecoded(),
-                    customTabsIntent,
-                    appSettingsService.isInternalBrowserEnabled(),
                    appSettingsService.isArticleViewerEnabled(),
                    app
                )
@@ -5,7 +5,6 @@ import android.graphics.Color
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
 import bou.amine.apps.readerforselfossv2.android.R
-import bou.amine.apps.readerforselfossv2.android.themes.AppColors
 import bou.amine.apps.readerforselfossv2.model.SelfossModel
 import bou.amine.apps.readerforselfossv2.repository.Repository
 import bou.amine.apps.readerforselfossv2.service.AppSettingsService
@@ -21,7 +20,6 @@ abstract class ItemsAdapter<VH : RecyclerView.ViewHolder?> : RecyclerView.Adapte
    abstract val repository: Repository
    abstract val appSettingsService: AppSettingsService
    abstract val app: Activity
-    abstract val appColors: AppColors
    abstract val updateItems: (ArrayList<SelfossModel.Item>) -> Unit

    fun updateAllItems(items: ArrayList<SelfossModel.Item>) {
@@ -30,7 +28,7 @@ abstract class ItemsAdapter<VH : RecyclerView.ViewHolder?> : RecyclerView.Adapte
        updateItems(this.items)
    }

-    private fun unmarkSnackbar(position: Int) {
+    private fun unmarkSnackbar(item: SelfossModel.Item, position: Int) {
        val s = Snackbar
            .make(
                app.findViewById(R.id.coordLayout),
@@ -39,7 +37,7 @@ abstract class ItemsAdapter<VH : RecyclerView.ViewHolder?> : RecyclerView.Adapte
            )
            .setAction(R.string.undo_string) {
                CoroutineScope(Dispatchers.IO).launch {
-                    unreadItemAtIndex(position, false)
+                    unreadItemAtIndex(item, position, false)
                }
            }

@@ -49,7 +47,7 @@ abstract class ItemsAdapter<VH : RecyclerView.ViewHolder?> : RecyclerView.Adapte
        s.show()
    }

-    private fun markSnackbar(position: Int) {
+    private fun markSnackbar(item: SelfossModel.Item, position: Int) {
        val s = Snackbar
            .make(
                app.findViewById(R.id.coordLayout),
@@ -57,7 +55,7 @@ abstract class ItemsAdapter<VH : RecyclerView.ViewHolder?> : RecyclerView.Adapte
                Snackbar.LENGTH_LONG
            )
            .setAction(R.string.undo_string) {
-                readItemAtIndex(position)
+                readItemAtIndex(item, position, false)
            }

        val view = s.view
@@ -68,37 +66,36 @@ abstract class ItemsAdapter<VH : RecyclerView.ViewHolder?> : RecyclerView.Adapte

    fun handleItemAtIndex(position: Int) {
        if (items[position].unread) {
-            readItemAtIndex(position)
+            readItemAtIndex(items[position], position)
        } else {
-            unreadItemAtIndex(position)
+            unreadItemAtIndex(items[position], position)
        }
    }

-    private fun readItemAtIndex(position: Int, showSnackbar: Boolean = true) {
-        val i = items[position]
+    private fun readItemAtIndex(item: SelfossModel.Item, position: Int, showSnackbar: Boolean = true) {
        CoroutineScope(Dispatchers.IO).launch {
-            repository.markAsRead(i)
+            repository.markAsRead(item)
        }
        if (repository.displayedItems == ItemType.UNREAD) {
-            items.remove(i)
+            items.remove(item)
            notifyItemRemoved(position)
            updateItems(items)
        } else {
            notifyItemChanged(position)
        }
        if (showSnackbar) {
-            unmarkSnackbar(position)
+            unmarkSnackbar(item, position)
        }
    }

-    private fun unreadItemAtIndex(position: Int, showSnackbar: Boolean = true) {
+    private fun unreadItemAtIndex(item: SelfossModel.Item, position: Int, showSnackbar: Boolean = true) {
        CoroutineScope(Dispatchers.IO).launch {
-            repository.unmarkAsRead(items[position])
+            repository.unmarkAsRead(item)

        }
        notifyItemChanged(position)
        if (showSnackbar) {
-            markSnackbar(position)
+            markSnackbar(item, position)
        }
    }

@@ -61,9 +61,13 @@ class SourcesListAdapter(
        binding.sourceTitle.text = itm.title.getHtmlDecoded()
    }

+    override fun getItemId(position: Int) = position.toLong()
+
+    override fun getItemViewType(position: Int) = position
+
    override fun getItemCount(): Int = items.size

-    inner class ViewHolder(internal val mView: ConstraintLayout) : RecyclerView.ViewHolder(mView) {
+    inner class ViewHolder(private val mView: ConstraintLayout) : RecyclerView.ViewHolder(mView) {

        init {
            handleClickListeners()
@@ -74,13 +78,13 @@ class SourcesListAdapter(
            val deleteBtn: Button = mView.findViewById(R.id.deleteBtn)

            deleteBtn.setOnClickListener {
-                val (id) = items[adapterPosition]
+                val (id) = items[bindingAdapterPosition]
                CoroutineScope(Dispatchers.IO).launch {
                    val successfullyDeletedSource = repository.deleteSource(id)
                    if (successfullyDeletedSource) {
-                        items.removeAt(adapterPosition)
-                        notifyItemRemoved(adapterPosition)
-                        notifyItemRangeChanged(adapterPosition, itemCount)
+                        items.removeAt(bindingAdapterPosition)
+                        notifyItemRemoved(bindingAdapterPosition)
+                        notifyItemRangeChanged(bindingAdapterPosition, itemCount)
                    } else {
                        Toast.makeText(
                            app,
@@ -1,35 +0,0 @@
-package bou.amine.apps.readerforselfossv2.android.api.mercury
-
-import com.google.gson.GsonBuilder
-import okhttp3.OkHttpClient
-import okhttp3.logging.HttpLoggingInterceptor
-import retrofit2.Call
-import retrofit2.Retrofit
-import retrofit2.converter.gson.GsonConverterFactory
-
-class MercuryApi() {
-    private val service: MercuryService
-
-    init {
-
-        val interceptor = HttpLoggingInterceptor()
-        interceptor.level = HttpLoggingInterceptor.Level.NONE
-        val client = OkHttpClient.Builder().addInterceptor(interceptor).build()
-
-        val gson = GsonBuilder()
-            .setLenient()
-            .create()
-        val retrofit =
-            Retrofit
-                .Builder()
-                .baseUrl("https://www.amine-louveau.fr")
-                .client(client)
-                .addConverterFactory(GsonConverterFactory.create(gson))
-                .build()
-        service = retrofit.create(MercuryService::class.java)
-    }
-
-    fun parseUrl(url: String): Call<ParsedContent> {
-        return service.parseUrl(url)
-    }
-}
@@ -1,59 +0,0 @@
-package bou.amine.apps.readerforselfossv2.android.api.mercury
-
-import android.os.Parcel
-import android.os.Parcelable
-import com.google.gson.annotations.SerializedName
-
-class ParsedContent(
-    @SerializedName("title") val title: String,
-    @SerializedName("content") val content: String?,
-    @SerializedName("date_published") val date_published: String,
-    @SerializedName("lead_image_url") val lead_image_url: String?,
-    @SerializedName("dek") val dek: String,
-    @SerializedName("url") val url: String,
-    @SerializedName("domain") val domain: String,
-    @SerializedName("excerpt") val excerpt: String,
-    @SerializedName("total_pages") val total_pages: Int,
-    @SerializedName("rendered_pages") val rendered_pages: Int,
-    @SerializedName("next_page_url") val next_page_url: String
-) : Parcelable {
-
-    companion object {
-        @JvmField
-        val CREATOR: Parcelable.Creator<ParsedContent> =
-            object : Parcelable.Creator<ParsedContent> {
-                override fun createFromParcel(source: Parcel): ParsedContent = ParsedContent(source)
-                override fun newArray(size: Int): Array<ParsedContent?> = arrayOfNulls(size)
-            }
-    }
-
-    constructor(source: Parcel) : this(
-        title = source.readString().orEmpty(),
-        content = source.readString(),
-        date_published = source.readString().orEmpty(),
-        lead_image_url = source.readString(),
-        dek = source.readString().orEmpty(),
-        url = source.readString().orEmpty(),
-        domain = source.readString().orEmpty(),
-        excerpt = source.readString().orEmpty(),
-        total_pages = source.readInt(),
-        rendered_pages = source.readInt(),
-        next_page_url = source.readString().orEmpty()
-    )
-
-    override fun describeContents() = 0
-
-    override fun writeToParcel(dest: Parcel, flags: Int) {
-        dest.writeString(title)
-        dest.writeString(content)
-        dest.writeString(date_published)
-        dest.writeString(lead_image_url)
-        dest.writeString(dek)
-        dest.writeString(url)
-        dest.writeString(domain)
-        dest.writeString(excerpt)
-        dest.writeInt(total_pages)
-        dest.writeInt(rendered_pages)
-        dest.writeString(next_page_url)
-    }
-}
@@ -1,10 +0,0 @@
-package bou.amine.apps.readerforselfossv2.android.api.mercury
-
-import retrofit2.Call
-import retrofit2.http.GET
-import retrofit2.http.Query
-
-interface MercuryService {
-    @GET("parser.php")
-    fun parseUrl(@Query("link") link: String): Call<ParsedContent>
-}
@@ -52,11 +52,13 @@ override fun doWork(): Result {

            repository.handleDBActions()

+            val apiItems = repository.tryToCacheItemsAndGetNewOnes()
            if (appSettingsService.isNotifyNewItemsEnabled()) {
                launch {
-                    handleNewItemsNotification(repository.tryToCacheItemsAndGetNewOnes(), notificationManager)
+                    handleNewItemsNotification(apiItems, notificationManager)
                }
            }
+            apiItems.map { it.preloadImages(context) }
        }
    }
    return Result.success()
@@ -66,6 +68,7 @@ override fun doWork(): Result {
        newItems: List<SelfossModel.Item>?,
        notificationManager: NotificationManager
    ) {
+        // TODO: Check if this coroutine is actually required
        CoroutineScope(Dispatchers.IO).launch {
                val apiItems = newItems.orEmpty()

@@ -102,7 +105,6 @@ override fun doWork(): Result {
                        notificationManager.notify(2, newItemsNotification.build())
                    }
                }
-                apiItems.map { it.preloadImages(context) }
            Timer("", false).schedule(4000) {
                notificationManager.cancel(1)
            }
@@ -8,6 +8,7 @@ import android.graphics.Typeface
 import android.graphics.drawable.ColorDrawable
 import android.net.Uri
 import android.os.Bundle
+import android.util.TypedValue
 import android.view.*
 import android.webkit.WebResourceResponse
 import android.webkit.WebSettings
@@ -15,27 +16,22 @@ import android.webkit.WebView
 import android.webkit.WebViewClient
 import android.widget.Toast
 import androidx.appcompat.app.AlertDialog
-import androidx.browser.customtabs.CustomTabsIntent
 import androidx.core.content.res.ResourcesCompat
 import androidx.core.widget.NestedScrollView
 import androidx.fragment.app.Fragment
 import bou.amine.apps.readerforselfossv2.android.ImageActivity
 import bou.amine.apps.readerforselfossv2.android.R
-import bou.amine.apps.readerforselfossv2.android.api.mercury.MercuryApi
-import bou.amine.apps.readerforselfossv2.android.api.mercury.ParsedContent
 import bou.amine.apps.readerforselfossv2.android.databinding.FragmentArticleBinding
 import bou.amine.apps.readerforselfossv2.android.model.ParecelableItem
 import bou.amine.apps.readerforselfossv2.android.model.toModel
 import bou.amine.apps.readerforselfossv2.android.model.toParcelable
-import bou.amine.apps.readerforselfossv2.android.themes.AppColors
-import bou.amine.apps.readerforselfossv2.android.utils.buildCustomTabsIntent
-import bou.amine.apps.readerforselfossv2.android.utils.customtabs.CustomTabActivityHelper
+import bou.amine.apps.readerforselfossv2.android.sendSilentlyWithAcraWithName
 import bou.amine.apps.readerforselfossv2.android.utils.glide.getBitmapInputStream
 import bou.amine.apps.readerforselfossv2.android.utils.openInBrowserAsNewTask
-import bou.amine.apps.readerforselfossv2.android.utils.openItemUrlInternalBrowser
 import bou.amine.apps.readerforselfossv2.android.utils.shareLink
 import bou.amine.apps.readerforselfossv2.model.SelfossModel
 import bou.amine.apps.readerforselfossv2.repository.Repository
+import bou.amine.apps.readerforselfossv2.rest.MercuryApi
 import bou.amine.apps.readerforselfossv2.service.AppSettingsService
 import bou.amine.apps.readerforselfossv2.utils.getHtmlDecoded
 import bou.amine.apps.readerforselfossv2.utils.getImages
@@ -49,22 +45,22 @@ import com.google.android.material.floatingactionbutton.FloatingActionButton
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
+import org.acra.ktx.sendSilentlyWithAcra
+import org.acra.ktx.sendWithAcra
 import org.kodein.di.DI
 import org.kodein.di.DIAware
 import org.kodein.di.android.x.closestDI
 import org.kodein.di.instance
-import retrofit2.Call
-import retrofit2.Callback
-import retrofit2.Response
 import java.net.MalformedURLException
+import java.net.SocketTimeoutException
 import java.net.URL
 import java.util.*
 import java.util.concurrent.ExecutionException

+
 class ArticleFragment : Fragment(), DIAware {
    private var fontSize: Int = 16
    private lateinit var item: SelfossModel.Item
-    private var mCustomTabActivityHelper: CustomTabActivityHelper? = null
    private lateinit var url: String
    private lateinit var contentText: String
    private lateinit var contentSource: String
@@ -72,7 +68,6 @@ class ArticleFragment : Fragment(), DIAware {
    private lateinit var contentTitle: String
    private lateinit var allImages : ArrayList<String>
    private lateinit var fab: FloatingActionButton
-    private lateinit var appColors: AppColors
    private lateinit var textAlignment: String
    private var _binding: FragmentArticleBinding? = null
    private val binding get() = _binding!!
@@ -86,16 +81,10 @@ class ArticleFragment : Fragment(), DIAware {
    private var font = ""
    private var staticBar = false

-    override fun onStop() {
-        super.onStop()
-        if (mCustomTabActivityHelper != null) {
-            mCustomTabActivityHelper!!.unbindCustomTabsService(activity)
-        }
-    }
+    private val mercuryApi : MercuryApi by instance()
+

    override fun onCreate(savedInstanceState: Bundle?) {
-        appColors = AppColors(requireActivity())
-
        super.onCreate(savedInstanceState)

        val pi: ParecelableItem = requireArguments().getParcelable(ARG_ITEMS)!!
@@ -115,46 +104,30 @@ class ArticleFragment : Fragment(), DIAware {
            contentText = item.content
            contentTitle = item.title.getHtmlDecoded()
            contentImage = item.getThumbnail(repository.baseUrl)
-            contentSource = item.sourceAndDateText(repository.dateUtils)
+            contentSource = item.sourceAndDateText()
            allImages = item.getImages()

            fontSize = appSettingsService.getFontSize()
            staticBar = appSettingsService.isStaticBarEnabled()
            font = appSettingsService.getFont()

-            if (font.isNotEmpty()) {
-                resId = requireContext().resources.getIdentifier(font, "font", requireContext().packageName)
-                typeface = try {
-                    ResourcesCompat.getFont(requireContext(), resId)!!
-                } catch (e: java.lang.Exception) {
-                    // Just to be sure
-                    null
-                }
-            }
-
            refreshAlignment()

            fab = binding.fab

-            fab.backgroundTintList = ColorStateList.valueOf(appColors.colorAccent)
+            fab.backgroundTintList = ColorStateList.valueOf(resources.getColor(R.color.colorAccent))

-            fab.rippleColor = appColors.colorAccentDark
+            fab.rippleColor = resources.getColor(R.color.colorAccentDark)

            val floatingToolbar: FloatingToolbar = binding.floatingToolbar
            floatingToolbar.attachFab(fab)

-            floatingToolbar.background = ColorDrawable(appColors.colorAccent)
-
-            val customTabsIntent = requireActivity().buildCustomTabsIntent()
-            mCustomTabActivityHelper = CustomTabActivityHelper()
-            mCustomTabActivityHelper!!.bindCustomTabsService(activity)
-
+            floatingToolbar.background = ColorDrawable(resources.getColor(R.color.colorAccent))

            floatingToolbar.setClickListener(
                object : FloatingToolbar.ItemClickListener {
                    override fun onItemClick(item: MenuItem) {
                        when (item.itemId) {
-                            R.id.more_action -> getContentFromMercury(customTabsIntent)
                            R.id.share_action -> requireActivity().shareLink(url, contentTitle)
                            R.id.open_action -> requireActivity().openInBrowserAsNewTask(this@ArticleFragment.item)
                            R.id.unread_action -> if (context != null) {
@@ -200,7 +173,7 @@ class ArticleFragment : Fragment(), DIAware {
            }

            if (contentText.isEmptyOrNullOrNullString()) {
-                getContentFromMercury(customTabsIntent)
+                getContentFromMercury()
            } else {
                binding.titleView.text = contentTitle
                if (typeface != null) {
@@ -238,6 +211,7 @@ class ArticleFragment : Fragment(), DIAware {
            )

        } catch (e: InflateException) {
+            e.sendSilentlyWithAcraWithName("webview not available")
            AlertDialog.Builder(requireContext())
                .setMessage(requireContext().getString(R.string.webview_dialog_issue_message))
                .setTitle(requireContext().getString(R.string.webview_dialog_issue_title))
@@ -266,96 +240,81 @@ class ArticleFragment : Fragment(), DIAware {
        }
    }

-    private fun getContentFromMercury(customTabsIntent: CustomTabsIntent) {
+    private fun getContentFromMercury() {
        if (repository.isNetworkAvailable()) {
            binding.progressBar.visibility = View.VISIBLE
-            val parser = MercuryApi()

-            parser.parseUrl(url).enqueue(
-                object : Callback<ParsedContent> {
-                    override fun onResponse(
-                        call: Call<ParsedContent>,
-                        response: Response<ParsedContent>
-                    ) {
-                        // TODO: clean all the following after finding the mercury content issue
+            CoroutineScope(Dispatchers.Main).launch {
+                try {
+                    val response = mercuryApi.query(url)
+                    if (response.success && response.data != null && !response.data?.content.isNullOrEmpty()) {
+                        binding.titleView.text = response.data!!.title.orEmpty()
                        try {
-                            if (response.body() != null && response.body()!!.content != null && !response.body()!!.content.isNullOrEmpty()) {
-                                try {
-                                    binding.titleView.text = response.body()!!.title
-                                    if (typeface != null) {
-                                        binding.titleView.typeface = typeface
-                                    }
-                                    try {
-                                        // Note: Mercury may return relative urls... If it does the url val will not be changed.
-                                        URL(response.body()!!.url)
-                                        url = response.body()!!.url
-                                    } catch (e: MalformedURLException) {
-                                        // Mercury returned a relative url. We do nothing.
-                                    }
-                                } catch (e: Exception) {
-                                }
-
-                                try {
-                                    contentText = response.body()!!.content.orEmpty()
-                                    htmlToWebview()
-                                } catch (e: Exception) {
-                                }
-
-                                try {
-                                    if (response.body()!!.lead_image_url != null && !response.body()!!.lead_image_url.isNullOrEmpty() && context != null) {
-                                        binding.imageView.visibility = View.VISIBLE
-                                        try {
-                                            Glide
-                                                .with(requireContext())
-                                                .asBitmap()
-                                                .load(
-                                                    response.body()!!.lead_image_url.orEmpty()
-                                                )
-                                                .apply(RequestOptions.fitCenterTransform())
-                                                .into(binding.imageView)
-                                        } catch (e: Exception) {
-                                        }
-                                    } else {
-                                        binding.imageView.visibility = View.GONE
-                                    }
-                                } catch (e: Exception) {
-                                    if (context != null) {
-                                    }
-                                }
-
-                                try {
-                                    binding.nestedScrollView.scrollTo(0, 0)
-
-                                    binding.progressBar.visibility = View.GONE
-                                } catch (e: Exception) {
-                                    if (context != null) {
-                                    }
-                                }
-                            } else {
-                                try {
-                                    openInBrowserAfterFailing(customTabsIntent)
-                                } catch (e: Exception) {
-                                    if (context != null) {
-                                    }
-                                }
+                            if (typeface != null) {
+                                binding.titleView.typeface = typeface
                            }
                        } catch (e: Exception) {
-                            if (context != null) {
-                            }
+                            e.sendSilentlyWithAcraWithName("getContentFromMercury > typeface")
                        }
-                    }

-                    override fun onFailure(
-                        call: Call<ParsedContent>,
-                        t: Throwable
-                    ) = openInBrowserAfterFailing(customTabsIntent)
+                        try {
+                            // Note: Mercury may return relative urls... If it does the url val will not be changed.
+                            URL(response.data!!.url)
+                            url = response.data!!.url
+                        } catch (e: MalformedURLException) {
+                            // Mercury returned a relative url
+                            e.sendSilentlyWithAcraWithName("getContentFromMercury > malformedurlexception")
+                        }
+
+                        try {
+                            contentText = response.data!!.content.orEmpty()
+                            htmlToWebview()
+                        } catch (e: Exception) {
+                            e.sendSilentlyWithAcraWithName("getContentFromMercury > contenttext or html")
+                        }
+
+                        if (!response.data?.lead_image_url.isNullOrEmpty() && context != null) {
+                            try {
+                                binding.imageView.visibility = View.VISIBLE
+                                try {
+                                    Glide
+                                        .with(requireContext())
+                                        .asBitmap()
+                                        .load(
+                                            response.data!!.lead_image_url.orEmpty()
+                                        )
+                                        .apply(RequestOptions.fitCenterTransform())
+                                        .into(binding.imageView)
+                                } catch (e: Exception) {
+                                    e.sendSilentlyWithAcraWithName("getContentFromMercury > glide lead image")
+                                }
+                            } catch (e: Exception) {
+                                e.sendSilentlyWithAcraWithName("getContentFromMercury > outside glide lead image")
+                            }
+                        } else {
+                            binding.imageView.visibility = View.GONE
+                        }
+
+                        try {
+                            binding.nestedScrollView.scrollTo(0, 0)
+                            binding.progressBar.visibility = View.GONE
+                        } catch (e: Exception) {
+                            e.sendSilentlyWithAcraWithName("getContentFromMercury > scrollview")
+                        }
+                    } else {
+                        openInBrowserAfterFailing()
+                    }
+                } catch (e: SocketTimeoutException) {
+                    openInBrowserAfterFailing()
+                } catch (e: Exception) {
+                    e.sendSilentlyWithAcraWithName("getContentFromMercury > whole thing")
+                    openInBrowserAfterFailing()
                }
-            )
+            }
        }
    }

    private fun htmlToWebview() {
-        val stringColor = String.format("#%06X", 0xFFFFFF and appColors.colorAccent)

        val attrs: IntArray = intArrayOf(android.R.attr.fontFamily)
        val a: TypedArray = requireContext().obtainStyledAttributes(resId, attrs)
@@ -364,18 +323,18 @@ class ArticleFragment : Fragment(), DIAware {
        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")
-        } else {
-            Pair("#212121", "#FAFAFA")
-        }
+        val colorOnSurface = TypedValue()
+        requireContext().theme.resolveAttribute(R.attr.colorOnSurface, colorOnSurface, true)
+
+        val colorSurface = TypedValue()
+        requireContext().theme.resolveAttribute(R.attr.colorSurface, colorSurface, true)

        binding.webcontent.settings.useWideViewPort = true
        binding.webcontent.settings.loadWithOverviewMode = true
        binding.webcontent.settings.javaScriptEnabled = false

        binding.webcontent.webViewClient = object : WebViewClient() {
+            @Deprecated("Deprecated in Java")
            override fun shouldOverrideUrlLoading(view: WebView?, url : String): Boolean {
                if (binding.webcontent.hitTestResult.type != WebView.HitTestResult.SRC_IMAGE_ANCHOR_TYPE) {
                    requireContext().startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(url)))
@@ -383,25 +342,32 @@ class ArticleFragment : Fragment(), DIAware {
                return true
            }

+            @Deprecated("Deprecated in Java")
            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")) {
                    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) {}
+                    } catch ( e : ExecutionException) {
+                        e.sendSilentlyWithAcraWithName("shouldInterceptRequest > jpeg")
+                    }
                }
                else if (url.lowercase(Locale.US).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) {}
+                    } catch ( e : ExecutionException) {
+                        e.sendSilentlyWithAcraWithName("shouldInterceptRequest > png")
+                    }
                }
                else if (url.lowercase(Locale.US).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))
-                    }catch ( e : ExecutionException) {}
+                    } catch ( e : ExecutionException) {
+                        e.sendSilentlyWithAcraWithName("shouldInterceptRequest > webp")
+                    }
                }

                return super.shouldInterceptRequest(view, url)
@@ -409,7 +375,7 @@ class ArticleFragment : Fragment(), DIAware {
        }

        val gestureDetector = GestureDetector(activity, object : GestureDetector.SimpleOnGestureListener() {
-            override fun onSingleTapUp(e: MotionEvent?): Boolean {
+            override fun onSingleTapUp(e: MotionEvent): Boolean {
                return performClick()
            }
        })
@@ -425,11 +391,13 @@ class ArticleFragment : Fragment(), DIAware {
            val itemUrl = URL(url)
            baseUrl = itemUrl.protocol + "://" + itemUrl.host
        } catch (e: MalformedURLException) {
+            e.sendSilentlyWithAcraWithName("htmlToWebview > item url")
        }

        val fontName =  when (font) {
            getString(R.string.open_sans_font_id) -> "Open Sans"
            getString(R.string.roboto_font_id) -> "Roboto"
+            getString(R.string.source_code_pro_font_id) -> "Source Code Pro"
            else -> ""
        }

@@ -458,10 +426,10 @@ class ArticleFragment : Fragment(), DIAware {
                |        max-width: 100%;
                |      }
                |      a {
-                |        color: $stringColor !important;
+                |        color: ${String.format("#%06X", 0xFFFFFF and resources.getColor(R.color.colorAccent))} !important;
                |      }
                |      *:not(a) {
-                |        color: $stringTextColor;
+                |        color: ${String.format("#%06X", 0xFFFFFF and colorOnSurface.data)};
                |      }
                |      * {
                |        font-size: ${fontSize}px;
@@ -469,11 +437,11 @@ class ArticleFragment : Fragment(), DIAware {
                |        word-break: break-word;
                |        overflow:hidden;
                |        line-height: 1.5em;
-                |        background-color: $stringBackgroundColor;
+                |        background-color: ${String.format("#%06X", 0xFFFFFF and colorSurface.data)};
                |      }
                |      body, html {
-                |        background-color: $stringBackgroundColor !important;
-                |        border-color: $stringBackgroundColor  !important;
+                |        background-color: ${String.format("#%06X", 0xFFFFFF and colorSurface.data)} !important;
+                |        border-color: ${String.format("#%06X", 0xFFFFFF and colorSurface.data)}  !important;
                |        padding: 0 !important;
                |        margin: 0 !important;
                |      }
@@ -483,7 +451,7 @@ class ArticleFragment : Fragment(), DIAware {
                |      pre, code {
                |        white-space: pre-wrap;
                |        width:100%;
-                |        background-color: $stringBackgroundColor;
+                |        background-color: ${String.format("#%06X", 0xFFFFFF and colorSurface.data)};
                |      }
                |   </style>
                |   $fontLinkAndStyle
@@ -507,13 +475,9 @@ class ArticleFragment : Fragment(), DIAware {
        binding.nestedScrollView.smoothScrollBy(0, -height/2)
    }

-    private fun openInBrowserAfterFailing(customTabsIntent: CustomTabsIntent) {
+    private fun openInBrowserAfterFailing() {
        binding.progressBar.visibility = View.GONE
-        requireActivity().openItemUrlInternalBrowser(
-                url,
-                customTabsIntent,
-                requireActivity()
-        )
+        requireActivity().openInBrowserAsNewTask(this@ArticleFragment.item)
    }

    companion object {
@@ -2,11 +2,13 @@ package bou.amine.apps.readerforselfossv2.android.model

 import android.content.Context
 import android.webkit.URLUtil
+import bou.amine.apps.readerforselfossv2.android.sendSilentlyWithAcraWithName
 import bou.amine.apps.readerforselfossv2.model.SelfossModel
 import bou.amine.apps.readerforselfossv2.utils.getImages
 import com.bumptech.glide.Glide
 import com.bumptech.glide.load.engine.DiskCacheStrategy
 import com.bumptech.glide.request.RequestOptions
+import org.acra.ktx.sendSilentlyWithAcra

 fun SelfossModel.Item.preloadImages(context: Context) : Boolean {
    val imageUrls = this.getImages()
@@ -23,6 +25,7 @@ fun SelfossModel.Item.preloadImages(context: Context) : Boolean {
            }
        }
    } catch (e : Error) {
+        e.sendSilentlyWithAcraWithName("preloadImages")
        return false
    }

@@ -35,7 +38,7 @@ fun String.toTextDrawableString(): String {
        try {
            textDrawable.append(s[0])
        } catch (e: StringIndexOutOfBoundsException) {
-            // We do nothing
+            e.sendSilentlyWithAcraWithName("toTextDrawableString")
        }
    }
    return textDrawable.toString()
@@ -3,7 +3,6 @@ package bou.amine.apps.readerforselfossv2.android.model
 import android.os.Parcel
 import android.os.Parcelable
 import bou.amine.apps.readerforselfossv2.model.SelfossModel
-import com.google.gson.annotations.SerializedName

 fun SelfossModel.Item.toParcelable() : ParecelableItem =
    ParecelableItem(
@@ -34,17 +33,17 @@ fun ParecelableItem.toModel() : SelfossModel.Item =
        this.tags.split(",")
    )
 data class ParecelableItem(
-    @SerializedName("id") val id: Int,
-    @SerializedName("datetime") val datetime: String,
-    @SerializedName("title") val title: String,
-    @SerializedName("content") val content: String,
-    @SerializedName("unread") var unread: Boolean,
-    @SerializedName("starred") var starred: Boolean,
-    @SerializedName("thumbnail") val thumbnail: String?,
-    @SerializedName("icon") val icon: String?,
-    @SerializedName("link") val link: String,
-    @SerializedName("sourcetitle") val sourcetitle: String,
-    @SerializedName("tags") val tags: String
+    val id: Int,
+    val datetime: String,
+    val title: String,
+    val content: String,
+    var unread: Boolean,
+    var starred: Boolean,
+    val thumbnail: String?,
+    val icon: String?,
+    val link: String,
+    val sourcetitle: String,
+    val tags: String
 ) : Parcelable {

    companion object {
@@ -7,38 +7,38 @@ import android.text.Editable
 import android.text.InputFilter
 import android.text.InputType
 import android.text.TextWatcher
-import android.view.Menu
-import android.view.MenuInflater
-import android.view.MenuItem
 import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
+import androidx.appcompat.app.AppCompatDelegate
 import androidx.core.widget.addTextChangedListener
 import androidx.preference.EditTextPreference
 import androidx.preference.Preference
 import androidx.preference.PreferenceFragmentCompat
-import androidx.preference.PreferenceManager
 import bou.amine.apps.readerforselfossv2.android.R
 import bou.amine.apps.readerforselfossv2.android.databinding.ActivitySettingsBinding
-import bou.amine.apps.readerforselfossv2.android.themes.AppColors
-import bou.amine.apps.readerforselfossv2.android.themes.Toppings
+import bou.amine.apps.readerforselfossv2.android.sendSilentlyWithAcraWithName
 import bou.amine.apps.readerforselfossv2.service.AppSettingsService
-import com.ftinc.scoop.Scoop
+import org.acra.ktx.sendSilentlyWithAcra
+import org.acra.ktx.sendWithAcra
+import org.kodein.di.DIAware
+import org.kodein.di.android.closestDI
+import org.kodein.di.instance
+import org.matomo.sdk.Tracker
+import org.matomo.sdk.extra.TrackHelper

 private const val TITLE_TAG = "settingsActivityTitle"

 class SettingsActivity : AppCompatActivity(),
-        PreferenceFragmentCompat.OnPreferenceStartFragmentCallback {
+        PreferenceFragmentCompat.OnPreferenceStartFragmentCallback, DIAware {
+    override val di by closestDI()
+
+    private val tracker : Tracker by instance()

    override fun onCreate(savedInstanceState: Bundle?) {
        super.onCreate(savedInstanceState)
-        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)
+        TrackHelper.track().screen("/settings").with(tracker)

        setContentView(binding.root)
        if (savedInstanceState == null) {
@@ -104,6 +104,11 @@ class SettingsActivity : AppCompatActivity(),
    class MainPreferenceFragment : PreferenceFragmentCompat() {
        override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
            setPreferencesFromResource(R.xml.pref_main, rootKey)
+
+            preferenceManager.findPreference<Preference>("currentMode")?.onPreferenceChangeListener = Preference.OnPreferenceChangeListener { _, newValue ->
+                AppCompatDelegate.setDefaultNightMode(newValue.toString().toInt()) // ListPreference Only takes string-arrays ¯\_(ツ)_/¯
+                true
+            }
        }
    }

@@ -120,6 +125,7 @@ class SettingsActivity : AppCompatActivity(),
                                val input: Int = (dest.toString() + source.toString()).toInt()
                                if (input in 1..200) return@InputFilter null
                            } catch (nfe: NumberFormatException) {
+                                nfe.sendSilentlyWithAcraWithName("GeneralPreferenceFragment")
                                Toast.makeText(activity, R.string.items_number_should_be_number, Toast.LENGTH_LONG).show()
                            }
                            ""
@@ -143,6 +149,7 @@ class SettingsActivity : AppCompatActivity(),
                        try {
                            editText.textSize = editable.toString().toInt().toFloat()
                        } catch (e: NumberFormatException) {
+                            e.sendSilentlyWithAcraWithName("ArticleViewerPreferenceFragment > afterTextChanged")
                        }
                    }
                } }
@@ -152,6 +159,7 @@ class SettingsActivity : AppCompatActivity(),
                                val input = (dest.toString() + source.toString()).toInt()
                                if (input > 0) return@InputFilter null
                            } catch (nfe: NumberFormatException) {
+                                nfe.sendSilentlyWithAcraWithName("ArticleViewerPreferenceFragment > filters")
                            }
                            ""
                        }
@@ -169,21 +177,11 @@ class SettingsActivity : AppCompatActivity(),
    class ThemePreferenceFragment : PreferenceFragmentCompat() {
        override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
            setPreferencesFromResource(R.xml.pref_theme, rootKey)
-            setHasOptionsMenu(true)
-        }

-        override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
-            super.onCreateOptionsMenu(menu, inflater)
-            inflater.inflate(R.menu.settings_theme, menu)
-        }
-
-        override fun onOptionsItemSelected(item: MenuItem): Boolean {
-            val id = item.itemId
-            if (id == R.id.clear) {
-                AppColors.resetColors()
-                requireActivity().recreate()
+            preferenceManager.findPreference<Preference>("currentMode")?.onPreferenceChangeListener = Preference.OnPreferenceChangeListener { _, newValue ->
+                AppCompatDelegate.setDefaultNightMode(newValue.toString().toInt()) // ListPreference Only takes string-arrays ¯\_(ツ)_/¯
+                true
            }
-            return super.onOptionsItemSelected(item)
        }
    }

@@ -1,72 +0,0 @@
-package bou.amine.apps.readerforselfossv2.android.themes
-
-import android.app.Activity
-import androidx.annotation.ColorInt
-import bou.amine.apps.readerforselfossv2.android.R
-import com.russhwolf.settings.Settings
-
-class AppColors(a: Activity) {
-
-    @ColorInt val colorPrimary: Int
-    @ColorInt val colorPrimaryDark: Int
-    @ColorInt val colorAccent: Int
-    @ColorInt val colorAccentDark: Int
-    @ColorInt val colorBackground: Int
-    @ColorInt val textColor: Int
-    val isDarkTheme: Boolean
-
-    init {
-        val settings = Settings()
-
-        colorPrimary =
-                settings.getInt(
-                    "color_primary",
-                    a.resources.getColor(R.color.colorPrimary)
-                )
-        colorPrimaryDark =
-                settings.getInt(
-                    "color_primary_dark",
-                    a.resources.getColor(R.color.colorPrimaryDark)
-                )
-        colorAccent =
-                settings.getInt(
-                    "color_accent",
-                    a.resources.getColor(R.color.colorAccent)
-                )
-        colorAccentDark =
-                settings.getInt(
-                    "color_accent_dark",
-                    a.resources.getColor(R.color.colorAccentDark)
-                )
-        isDarkTheme =
-                settings.getBoolean(
-                    "dark_theme",
-                    false
-                )
-
-        colorBackground = if (isDarkTheme) {
-            a.setTheme(R.style.NoBarDark)
-            a.resources.getColor(R.color.darkBackground)
-        } else {
-            a.setTheme(R.style.NoBar)
-            a.resources.getColor(R.color.grey_50)
-        }
-
-        textColor = if (isDarkTheme) {
-            a.resources.getColor(R.color.white)
-        } else {
-            a.resources.getColor(R.color.grey_900)
-        }
-    }
-
-    companion object {
-        fun resetColors() {
-            val settings = Settings()
-            settings.remove("color_primary")
-            settings.remove("color_primary_dark")
-            settings.remove("color_accent")
-            settings.remove("color_accent_dark")
-            settings.remove("dark_theme")
-        }
-    }
-}
@@ -1,8 +0,0 @@
-package bou.amine.apps.readerforselfossv2.android.themes
-
-enum class Toppings(val value: Int) {
-    PRIMARY(1),
-    PRIMARY_DARK(2),
-    ACCENT(3),
-    ACCENT_DARK(4)
-}
@@ -1,13 +1,9 @@
 package bou.amine.apps.readerforselfossv2.android.utils

 import android.app.Activity
-import android.app.PendingIntent
-import android.content.ActivityNotFoundException
 import android.content.Context
 import android.content.Intent
-import android.graphics.BitmapFactory
 import android.net.Uri
-import android.os.Build
 import android.text.Spannable
 import android.text.style.ClickableSpan
 import android.util.Patterns
@@ -15,109 +11,16 @@ import android.view.MotionEvent
 import android.view.View
 import android.widget.TextView
 import android.widget.Toast
-import androidx.browser.customtabs.CustomTabsIntent
 import bou.amine.apps.readerforselfossv2.android.R
 import bou.amine.apps.readerforselfossv2.android.ReaderActivity
-import bou.amine.apps.readerforselfossv2.android.utils.customtabs.CustomTabActivityHelper
 import bou.amine.apps.readerforselfossv2.model.SelfossModel
 import bou.amine.apps.readerforselfossv2.utils.toStringUriWithHttp
 import okhttp3.HttpUrl.Companion.toHttpUrlOrNull

-fun Context.buildCustomTabsIntent(): CustomTabsIntent {
-
-    val actionIntent = Intent(Intent.ACTION_SEND)
-    actionIntent.type = "text/plain"
-    val pflags = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-        PendingIntent.FLAG_IMMUTABLE
-    } else {
-        0
-    }
-    val createPendingShareIntent: PendingIntent = PendingIntent.getActivity(
-            this,
-            0,
-            actionIntent,
-            pflags
-        )
-
-    val intentBuilder = CustomTabsIntent.Builder()
-
-    // TODO: change to primary when it's possible to customize custom tabs title color
-    //intentBuilder.setToolbarColor(c.getResources().getColor(R.color.colorPrimary));
-    intentBuilder.setToolbarColor(resources.getColor(R.color.colorAccentDark))
-    intentBuilder.setShowTitle(true)
-
-
-    intentBuilder.setStartAnimations(
-        this,
-        R.anim.slide_in_right,
-        R.anim.slide_out_left
-    )
-    intentBuilder.setExitAnimations(
-        this,
-        android.R.anim.slide_in_left,
-        android.R.anim.slide_out_right
-    )
-
-    val closeicon = BitmapFactory.decodeResource(resources, R.drawable.ic_close_white_24dp)
-    intentBuilder.setCloseButtonIcon(closeicon)
-
-    val shareLabel = this.getString(R.string.label_share)
-    val icon = BitmapFactory.decodeResource(
-        resources,
-        R.drawable.ic_share_white_24dp
-    )
-    intentBuilder.setActionButton(icon, shareLabel, createPendingShareIntent)
-
-    return intentBuilder.build()
-}
-
-fun Context.openItemUrlInternally(
-    allItems: ArrayList<SelfossModel.Item>,
-    currentItem: Int,
-    linkDecoded: String,
-    customTabsIntent: CustomTabsIntent,
-    articleViewer: Boolean,
-    app: Activity
-) {
-    if (articleViewer) {
-        ReaderActivity.allItems = allItems
-        val intent = Intent(this, ReaderActivity::class.java)
-        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(
-                app,
-                customTabsIntent,
-                Uri.parse(linkDecoded)
-        ) { _, uri ->
-            val intent = Intent(Intent.ACTION_VIEW, uri)
-            intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK
-            startActivity(intent)
-        }
-    } catch (e: Exception) {
-        openInBrowser(linkDecoded, app)
-    }
-}
-
 fun Context.openItemUrl(
    allItems: ArrayList<SelfossModel.Item>,
    currentItem: Int,
    linkDecoded: String,
-    customTabsIntent: CustomTabsIntent,
-    internalBrowser: Boolean,
    articleViewer: Boolean,
    app: Activity
 ) {
@@ -129,37 +32,20 @@ fun Context.openItemUrl(
            Toast.LENGTH_LONG
        ).show()
    } else {
-        if (!internalBrowser) {
-            openInBrowser(linkDecoded, app)
-        } else if (articleViewer) {
-            this.openItemUrlInternally(
-                allItems,
-                currentItem,
-                linkDecoded,
-                customTabsIntent,
-                articleViewer,
-                app
-            )
+        if (articleViewer) {
+            ReaderActivity.allItems = allItems
+            val intent = Intent(this, ReaderActivity::class.java)
+            intent.putExtra("currentItem", currentItem)
+            app.startActivity(intent)
        } else {
-            this.openItemUrlInternalBrowser(
-                    linkDecoded,
-                    customTabsIntent,
-                    app
-            )
+            val intent = Intent(Intent.ACTION_VIEW)
+            intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK
+            intent.data = Uri.parse(linkDecoded.toStringUriWithHttp())
+            startActivity(intent)
        }
    }
 }

-private fun openInBrowser(linkDecoded: String, app: Activity) {
-    val intent = Intent(Intent.ACTION_VIEW)
-    intent.data = Uri.parse(linkDecoded)
-    try {
-        app.startActivity(intent)
-    } catch (e: ActivityNotFoundException) {
-        Toast.makeText(app.baseContext, e.message, Toast.LENGTH_LONG).show()
-    }
-}
-
 fun String.isUrlValid(): Boolean =
    this.toHttpUrlOrNull() != null && Patterns.WEB_URL.matcher(this).matches()

@@ -181,7 +67,7 @@ fun Context.openInBrowserAsNewTask(i: SelfossModel.Item) {
    startActivity(intent)
 }

-class LinkOnTouchListener: View.OnTouchListener {
+class LinkOnTouchListener : View.OnTouchListener {
    override fun onTouch(v: View?, event: MotionEvent?): Boolean {
        var ret = false
        val widget: TextView = v as TextView
@@ -191,7 +77,8 @@ class LinkOnTouchListener: View.OnTouchListener {
        val action = event!!.action

        if (action == MotionEvent.ACTION_UP ||
-            action == MotionEvent.ACTION_DOWN) {
+            action == MotionEvent.ACTION_DOWN
+        ) {
            var x: Float = event.x
            var y: Float = event.y

@@ -1,153 +0,0 @@
-package bou.amine.apps.readerforselfossv2.android.utils.customtabs;
-
-
-import android.app.Activity;
-import android.net.Uri;
-import android.os.Bundle;
-import androidx.browser.customtabs.CustomTabsClient;
-import androidx.browser.customtabs.CustomTabsIntent;
-import androidx.browser.customtabs.CustomTabsServiceConnection;
-import androidx.browser.customtabs.CustomTabsSession;
-
-import java.util.List;
-
-/**
- * This is a helper class to manage the connection to the Custom Tabs Service.
- */
-public class CustomTabActivityHelper implements ServiceConnectionCallback {
-    private CustomTabsSession mCustomTabsSession;
-    private CustomTabsClient mClient;
-    private CustomTabsServiceConnection mConnection;
-    private ConnectionCallback mConnectionCallback;
-
-    /**
-     * Opens the URL on a Custom Tab if possible. Otherwise fallsback to opening it on a WebView.
-     *
-     * @param activity         The host activity.
-     * @param customTabsIntent a CustomTabsIntent to be used if Custom Tabs is available.
-     * @param uri              the Uri to be opened.
-     * @param fallback         a CustomTabFallback to be used if Custom Tabs is not available.
-     */
-    public static void openCustomTab(Activity activity,
-                                     CustomTabsIntent customTabsIntent,
-                                     Uri uri,
-                                     CustomTabFallback fallback) {
-        String packageName = CustomTabsHelper.getPackageNameToUse(activity);
-
-        //If we cant find a package name, it means theres no browser that supports
-        //Chrome Custom Tabs installed. So, we fallback to the webview
-        if (packageName == null) {
-            if (fallback != null) {
-                fallback.openUri(activity, uri);
-            }
-        } else {
-            customTabsIntent.intent.setPackage(packageName);
-            customTabsIntent.launchUrl(activity, uri);
-        }
-    }
-
-    /**
-     * Unbinds the Activity from the Custom Tabs Service.
-     *
-     * @param activity the activity that is connected to the service.
-     */
-    public void unbindCustomTabsService(Activity activity) {
-        if (mConnection == null) return;
-        activity.unbindService(mConnection);
-        mClient = null;
-        mCustomTabsSession = null;
-        mConnection = null;
-    }
-
-    /**
-     * Creates or retrieves an exiting CustomTabsSession.
-     *
-     * @return a CustomTabsSession.
-     */
-    public CustomTabsSession getSession() {
-        if (mClient == null) {
-            mCustomTabsSession = null;
-        } else if (mCustomTabsSession == null) {
-            mCustomTabsSession = mClient.newSession(null);
-        }
-        return mCustomTabsSession;
-    }
-
-    /**
-     * Register a Callback to be called when connected or disconnected from the Custom Tabs Service.
-     *
-     * @param connectionCallback
-     */
-    public void setConnectionCallback(ConnectionCallback connectionCallback) {
-        this.mConnectionCallback = connectionCallback;
-    }
-
-    /**
-     * Binds the Activity to the Custom Tabs Service.
-     *
-     * @param activity the activity to be binded to the service.
-     */
-    public void bindCustomTabsService(Activity activity) {
-        if (mClient != null) return;
-
-        String packageName = CustomTabsHelper.getPackageNameToUse(activity);
-        if (packageName == null) return;
-
-        mConnection = new ServiceConnection(this);
-        CustomTabsClient.bindCustomTabsService(activity, packageName, mConnection);
-    }
-
-    /**
-     * @return true if call to mayLaunchUrl was accepted.
-     * @see {@link CustomTabsSession#mayLaunchUrl(Uri, Bundle, List)}.
-     */
-    public boolean mayLaunchUrl(Uri uri, Bundle extras, List<Bundle> otherLikelyBundles) {
-        if (mClient == null) return false;
-
-        CustomTabsSession session = getSession();
-        return session != null && session.mayLaunchUrl(uri, extras, otherLikelyBundles);
-
-    }
-
-    @Override
-    public void onServiceConnected(CustomTabsClient client) {
-        mClient = client;
-        mClient.warmup(0L);
-        if (mConnectionCallback != null) mConnectionCallback.onCustomTabsConnected();
-    }
-
-    @Override
-    public void onServiceDisconnected() {
-        mClient = null;
-        mCustomTabsSession = null;
-        if (mConnectionCallback != null) mConnectionCallback.onCustomTabsDisconnected();
-    }
-
-    /**
-     * A Callback for when the service is connected or disconnected. Use those callbacks to
-     * handle UI changes when the service is connected or disconnected.
-     */
-    public interface ConnectionCallback {
-        /**
-         * Called when the service is connected.
-         */
-        void onCustomTabsConnected();
-
-        /**
-         * Called when the service is disconnected.
-         */
-        void onCustomTabsDisconnected();
-    }
-
-    /**
-     * To be used as a fallback to open the Uri when Custom Tabs is not available.
-     */
-    public interface CustomTabFallback {
-        /**
-         * @param activity The Activity that wants to open the Uri.
-         * @param uri      The uri to be opened by the fallback.
-         */
-        void openUri(Activity activity, Uri uri);
-    }
-
-}
@@ -1,129 +0,0 @@
-package bou.amine.apps.readerforselfossv2.android.utils.customtabs;
-
-
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.content.pm.PackageManager;
-import android.content.pm.ResolveInfo;
-import android.net.Uri;
-import android.text.TextUtils;
-import android.util.Log;
-import androidx.browser.customtabs.CustomTabsService;
-import bou.amine.apps.readerforselfossv2.android.utils.customtabs.helpers.KeepAliveService;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@SuppressWarnings("ALL")
-class CustomTabsHelper {
-    private static final String TAG = "CustomTabsHelper";
-    private static final String STABLE_PACKAGE = "com.android.chrome";
-    private static final String BETA_PACKAGE = "com.chrome.beta";
-    private static final String DEV_PACKAGE = "com.chrome.dev";
-    private static final String LOCAL_PACKAGE = "com.google.android.apps.chrome";
-    private static final String EXTRA_CUSTOM_TABS_KEEP_ALIVE =
-            "android.support.customtabs.extra.KEEP_ALIVE";
-
-    private static String sPackageNameToUse;
-
-    private CustomTabsHelper() {
-    }
-
-    public static void addKeepAliveExtra(Context context, Intent intent) {
-        Intent keepAliveIntent = new Intent().setClassName(
-                context.getPackageName(), KeepAliveService.class.getCanonicalName());
-        intent.putExtra(EXTRA_CUSTOM_TABS_KEEP_ALIVE, keepAliveIntent);
-    }
-
-    /**
-     * Goes through all apps that handle VIEW intents and have a warmup service. Picks
-     * the one chosen by the user if there is one, otherwise makes a best effort to return a
-     * valid package name.
-     * <p>
-     * This is <strong>not</strong> threadsafe.
-     *
-     * @param context {@link Context} to use for accessing {@link PackageManager}.
-     * @return The package name recommended to use for connecting to custom tabs related components.
-     */
-    public static String getPackageNameToUse(Context context) {
-        if (sPackageNameToUse != null) return sPackageNameToUse;
-
-        PackageManager pm = context.getPackageManager();
-        // Get default VIEW intent handler.
-        Intent activityIntent = new Intent(Intent.ACTION_VIEW, Uri.parse("http://www.example.com"));
-        ResolveInfo defaultViewHandlerInfo = pm.resolveActivity(activityIntent, 0);
-        String defaultViewHandlerPackageName = null;
-        if (defaultViewHandlerInfo != null) {
-            defaultViewHandlerPackageName = defaultViewHandlerInfo.activityInfo.packageName;
-        }
-
-        // Get all apps that can handle VIEW intents.
-        List<ResolveInfo> resolvedActivityList = pm.queryIntentActivities(activityIntent, 0);
-        List<String> packagesSupportingCustomTabs = new ArrayList<>();
-        for (ResolveInfo info : resolvedActivityList) {
-            Intent serviceIntent = new Intent();
-            serviceIntent.setAction(CustomTabsService.ACTION_CUSTOM_TABS_CONNECTION);
-            serviceIntent.setPackage(info.activityInfo.packageName);
-            if (pm.resolveService(serviceIntent, 0) != null) {
-                packagesSupportingCustomTabs.add(info.activityInfo.packageName);
-            }
-        }
-
-        // Now packagesSupportingCustomTabs contains all apps that can handle both VIEW intents
-        // and service calls.
-        if (packagesSupportingCustomTabs.isEmpty()) {
-            sPackageNameToUse = null;
-        } else if (packagesSupportingCustomTabs.size() == 1) {
-            sPackageNameToUse = packagesSupportingCustomTabs.get(0);
-        } else if (!TextUtils.isEmpty(defaultViewHandlerPackageName)
-                && !hasSpecializedHandlerIntents(context, activityIntent)
-                && packagesSupportingCustomTabs.contains(defaultViewHandlerPackageName)) {
-            sPackageNameToUse = defaultViewHandlerPackageName;
-        } else if (packagesSupportingCustomTabs.contains(STABLE_PACKAGE)) {
-            sPackageNameToUse = STABLE_PACKAGE;
-        } else if (packagesSupportingCustomTabs.contains(BETA_PACKAGE)) {
-            sPackageNameToUse = BETA_PACKAGE;
-        } else if (packagesSupportingCustomTabs.contains(DEV_PACKAGE)) {
-            sPackageNameToUse = DEV_PACKAGE;
-        } else if (packagesSupportingCustomTabs.contains(LOCAL_PACKAGE)) {
-            sPackageNameToUse = LOCAL_PACKAGE;
-        }
-        return sPackageNameToUse;
-    }
-
-    /**
-     * Used to check whether there is a specialized handler for a given intent.
-     *
-     * @param intent The intent to check with.
-     * @return Whether there is a specialized handler for the given intent.
-     */
-    private static boolean hasSpecializedHandlerIntents(Context context, Intent intent) {
-        try {
-            PackageManager pm = context.getPackageManager();
-            List<ResolveInfo> handlers = pm.queryIntentActivities(
-                    intent,
-                    PackageManager.GET_RESOLVED_FILTER);
-            if (handlers == null || handlers.isEmpty()) {
-                return false;
-            }
-            for (ResolveInfo resolveInfo : handlers) {
-                IntentFilter filter = resolveInfo.filter;
-                if (filter == null) continue;
-                if (filter.countDataAuthorities() == 0 || filter.countDataPaths() == 0) continue;
-                if (resolveInfo.activityInfo == null) continue;
-                return true;
-            }
-        } catch (RuntimeException e) {
-            Log.e(TAG, "Runtime exception while getting specialized handlers");
-        }
-        return false;
-    }
-
-    /**
-     * @return All possible chrome package names that provide custom tabs feature.
-     */
-    public static String[] getPackages() {
-        return new String[]{"", STABLE_PACKAGE, BETA_PACKAGE, DEV_PACKAGE, LOCAL_PACKAGE};
-    }
-}
@@ -1,33 +0,0 @@
-package bou.amine.apps.readerforselfossv2.android.utils.customtabs;
-
-
-import android.content.ComponentName;
-import androidx.browser.customtabs.CustomTabsClient;
-import androidx.browser.customtabs.CustomTabsServiceConnection;
-
-import java.lang.ref.WeakReference;
-
-/**
- * Implementation for the CustomTabsServiceConnection that avoids leaking the
- * ServiceConnectionCallback
- */
-public class ServiceConnection extends CustomTabsServiceConnection {
-    // A weak reference to the ServiceConnectionCallback to avoid leaking it.
-    private WeakReference<ServiceConnectionCallback> mConnectionCallback;
-
-    public ServiceConnection(ServiceConnectionCallback connectionCallback) {
-        mConnectionCallback = new WeakReference<>(connectionCallback);
-    }
-
-    @Override
-    public void onCustomTabsServiceConnected(ComponentName name, CustomTabsClient client) {
-        ServiceConnectionCallback connectionCallback = mConnectionCallback.get();
-        if (connectionCallback != null) connectionCallback.onServiceConnected(client);
-    }
-
-    @Override
-    public void onServiceDisconnected(ComponentName name) {
-        ServiceConnectionCallback connectionCallback = mConnectionCallback.get();
-        if (connectionCallback != null) connectionCallback.onServiceDisconnected();
-    }
-}
@@ -1,19 +0,0 @@
-package bou.amine.apps.readerforselfossv2.android.utils.customtabs;
-
-
-import androidx.browser.customtabs.CustomTabsClient;
-
-
-public interface ServiceConnectionCallback {
-    /**
-     * Called when the service is connected.
-     *
-     * @param client a CustomTabsClient
-     */
-    void onServiceConnected(CustomTabsClient client);
-
-    /**
-     * Called when the service is disconnected.
-     */
-    void onServiceDisconnected();
-}
@@ -1,15 +0,0 @@
-package bou.amine.apps.readerforselfossv2.android.utils.customtabs.helpers;
-
-import android.app.Service;
-import android.content.Intent;
-import android.os.Binder;
-import android.os.IBinder;
-
-public class KeepAliveService extends Service {
-    private static final Binder sBinder = new Binder();
-
-    @Override
-    public IBinder onBind(Intent intent) {
-        return sBinder;
-    }
-}
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">

-    <item
-        android:drawable="@color/ic_launcher_background"/>
+    <item>
+        <shape android:shape="rectangle" >
+            <solid android:color="?attr/colorSurface" />
+        </shape>
+    </item>

    <item>
        <bitmap
@@ -0,0 +1,5 @@
+<bitmap
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:dither="true"
+    android:src="@drawable/checktile"
+    android:tileMode="repeat"/>