.drone.yml

@@ -35,7 +35,6 @@ steps:
 trigger:
   event:
     - push
-    - pull_request
 
 ---
 kind: pipeline
@@ -48,14 +47,13 @@ steps:
     commands:
       - apt-get update && apt-get install -y git
       - git fetch --tags -p
-      - PREV=$(git describe --tags --abbrev=0)
-      - ./build.sh --publish --from-ci
-      - git remote add pushing https://$GITEA_USR:$GITEA_PASS@gitea.amine-louveau.fr/Louvorg/ReaderForSelfoss-multiplatform.git
       - VER=$(git describe --tags --abbrev=0)
-      - CHANGELOG=$(git log $PREV..HEAD --pretty="- %s")
+      - CHANGELOG=$(git log $VER..HEAD --pretty="- %s")
       - echo "**$VER**\n\n$CHANGELOG\n\n--------------------------------------------------------------------\n\n$(cat CHANGELOG.md)" > CHANGELOG.md
       - git add CHANGELOG.md
       - git commit -m "Changelog for $VER [CI SKIP]"
+      - ./build.sh --publish --from-ci
+      - git remote add pushing https://$GITEA_USR:$GITEA_PASS@gitea.amine-louveau.fr/Louvorg/ReaderForSelfoss-multiplatform.git
       - git push pushing master
       - git push pushing --tags
     environment:

CHANGELOG.md

@@ -1,62 +1,3 @@
-**v123020523**
-
-- fix: Git changelog.
-
---------------------------------------------------------------------
-
-**v123020491**
-
-- fix: Fixed acra bug reporting.
-
---------------------------------------------------------------------
-
-**v123010301**
-
-- Chore: acra config.
-
---------------------------------------------------------------------
-
-**v123010281**
-
-- improvement: Improve right to left support (#130) Co-authored-by: davidoskky <davidoskky@hidden.hidden> Co-committed-by: davidoskky <davidoskky@hidden.hidden>
-
---------------------------------------------------------------------
-
-**v123010261**
-
-- feat: Handle public instances (#126) Co-authored-by: davidoskky <davidoskky@hidden.hidden> Co-committed-by: davidoskky <davidoskky@hidden.hidden>
-- ci: Pull request should trigger ci.
-- fix: Complete the disconnection before redirecting to the login screen
-- Complete the disconnection before redirecting to the login screen
-
---------------------------------------------------------------------
-
-**v123010241**
-
-- Merge pull request 'feat: swipe down to close images' (#122) from davidoskky/ReaderForSelfoss-multiplatform:swipe_down into master
-- Remove unnecessary definition
-- Remove unused import
-- Adjust the image closing animation
-- Add a dark hue to the underlying article when swiping to close images
-- Rename activity style to avoid interferences
-- Adapt the style of the image activity to the rest of the application
-- Resolve issues when swiping down to close images
-- Close the image fragment only if the image has been dragged down
-- Animate swipe down to close images
-- Swipe down to close images
-
---------------------------------------------------------------------
-
-**v123010041**
-
-- Merge pull request 'scroll-tag-filters' (#124) from scroll-tag-filters into master
-- fix: added POST_NOTIFICATIONS to fix notifications issues.
-- fix: scrollable filter sheet.
-- enhancement: Ellipsize chips text.
-- Cleaning.
-
---------------------------------------------------------------------
-
 **v122123641**
 
 - feat: Disable the failing source in the filter sheet.

androidApp/build.gradle.kts

@@ -66,7 +66,7 @@ android {
         jvmTarget = "11"
     }
     compileSdk = 33
-    buildToolsVersion = "33.0.0"
+    buildToolsVersion = "31.0.0"
     buildFeatures {
         viewBinding = true
     }
@@ -115,6 +115,7 @@ dependencies {
     implementation(project(":shared"))
     implementation("com.google.android.material:material:1.5.0")
     implementation("androidx.appcompat:appcompat:1.4.1")
+    implementation("androidx.constraintlayout:constraintlayout:2.1.3")
     implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.0")
 
     implementation("androidx.preference:preference-ktx:1.1.1")
@@ -130,7 +131,7 @@ dependencies {
     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.4")
+    implementation("androidx.constraintlayout:constraintlayout:2.1.3")
     implementation("org.jsoup:jsoup:1.14.3")
 
     //multidex

androidApp/src/main/AndroidManifest.xml

@@ -2,7 +2,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools">
 
-    <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
 
@@ -70,8 +69,7 @@
             android:name=".ReaderActivity">
         </activity>
         <activity
-            android:name=".ImageActivity"
+            android:name=".ImageActivity">
-            android:theme="@style/Theme.AppCompat.ImageActivity">
         </activity>
 
         <meta-data android:name="android.webkit.WebView.MetricsOptOut"

androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/HomeActivity.kt

@@ -36,7 +36,6 @@ import com.ashokvarma.bottomnavigation.TextBadgeItem
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
-import kotlinx.coroutines.runBlocking
 import org.kodein.di.DIAware
 import org.kodein.di.android.closestDI
 import org.kodein.di.instance
@@ -115,16 +114,10 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
             }
         }
 
-        val swipeDirs = if (appSettingsService.getPublicAccess()) {
-            0
-        } else {
-            ItemTouchHelper.LEFT or ItemTouchHelper.RIGHT
-        }
-
         val simpleItemTouchCallback =
             object : ItemTouchHelper.SimpleCallback(
                 0,
-                swipeDirs
+                ItemTouchHelper.LEFT or ItemTouchHelper.RIGHT
             ) {
                 override fun getSwipeDirs(
                     recyclerView: RecyclerView,
@@ -373,6 +366,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
 
     fun fetchOnEmptyList() {
         binding.recyclerView.doOnNextLayout {
+            // TODO: do if last element (or is empty ?)
             getElementsAccordingToTab(true)
         }
     }
@@ -517,10 +511,6 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
     override fun onCreateOptionsMenu(menu: Menu): Boolean {
         val inflater = menuInflater
         inflater.inflate(R.menu.home_menu, menu)
-        if (appSettingsService.getPublicAccess()) {
-            menu.removeItem(R.id.readAll)
-            menu.removeItem(R.id.action_sources)
-        }
 
         val searchItem = menu.findItem(R.id.action_search)
         val searchView = searchItem.getActionView() as SearchView
@@ -549,9 +539,11 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
             R.id.refresh -> {
                 needsConfirmation(R.string.menu_home_refresh, R.string.refresh_dialog_message) {
                     Toast.makeText(this, R.string.refresh_in_progress, Toast.LENGTH_SHORT).show()
+                    // TODO: Use Dispatchers.IO
                     CoroutineScope(Dispatchers.Main).launch {
                         val updatedRemote = repository.updateRemote()
                         if (updatedRemote) {
+                            // TODO: Send toast messages from the repository
                             Toast.makeText(
                                 this@HomeActivity,
                                 R.string.refresh_success_response, Toast.LENGTH_LONG
@@ -599,12 +591,12 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
                 return true
             }
             R.id.action_disconnect -> {
-                runBlocking {
+                CoroutineScope(Dispatchers.Main).launch {
                     repository.logout()
                 }
+                this@HomeActivity.finish()
                 val intent = Intent(this, LoginActivity::class.java)
                 this.startActivity(intent)
-                finish()
                 return true
             }
             R.id.action_settings -> {

androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/ImageActivity.kt

@@ -3,7 +3,6 @@ package bou.amine.apps.readerforselfossv2.android
 import android.os.Bundle
 import android.view.MenuItem
 import androidx.appcompat.app.AppCompatActivity
-import androidx.constraintlayout.motion.widget.MotionLayout
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentActivity
 import androidx.viewpager2.adapter.FragmentStateAdapter
@@ -24,6 +23,7 @@ class ImageActivity : AppCompatActivity() {
         setContentView(view)
 
         setSupportActionBar(binding.toolBar)
+        supportActionBar?.setDisplayShowTitleEnabled(false)
         supportActionBar?.setDisplayHomeAsUpEnabled(true)
 
         allImages = intent.getStringArrayListExtra("allImages") as ArrayList<String>
@@ -31,35 +31,12 @@ class ImageActivity : AppCompatActivity() {
 
         binding.pager.adapter = ScreenSlidePagerAdapter(this)
         binding.pager.setCurrentItem(position, false)
-
-        val transitionListener = object : MotionLayout.TransitionListener {
-            override fun onTransitionStarted(motionLayout: MotionLayout?, startId: Int, endId: Int) {
-                // Nothing
-            }
-
-            override fun onTransitionChange(motionLayout: MotionLayout?, startId: Int, endId: Int, progress: Float
-            ) {
-                // Nothing
-            }
-
-            override fun onTransitionCompleted(motionLayout: MotionLayout?, currentId: Int) {
-                if (motionLayout?.currentState == binding.root.endState) {
-                    onBackPressedDispatcher.onBackPressed()
-                    overridePendingTransition(0, 0)
-                }
-            }
-
-            override fun onTransitionTrigger(motionLayout: MotionLayout?, triggerId: Int, positive: Boolean, progress: Float) {
-                // Nothing
-            }
-        }
-        binding.root.setTransitionListener(transitionListener)
     }
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
         when (item.itemId) {
             android.R.id.home -> {
-                onBackPressedDispatcher.onBackPressed()
+                onBackPressed()
                 return true
             }
         }

androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/LoginActivity.kt

@@ -27,6 +27,7 @@ import org.acra.ACRA
 import org.kodein.di.DIAware
 import org.kodein.di.android.closestDI
 import org.kodein.di.instance
+import java.security.MessageDigest
 
 
 class LoginActivity : AppCompatActivity(), DIAware {
@@ -128,7 +129,7 @@ class LoginActivity : AppCompatActivity(), DIAware {
 
     private fun goToMain() {
         CoroutineScope(Dispatchers.Main).launch {
-            repository.updateApiInformation()
+            repository.updateApiVersion()
             ACRA.errorReporter.putCustomData("SELFOSS_API_VERSION", appSettingsService.getApiVersion().toString())
         }
         val intent = Intent(this, HomeActivity::class.java)
@@ -156,64 +157,13 @@ class LoginActivity : AppCompatActivity(), DIAware {
         val login = binding.loginView.text.toString().trim()
         val password = binding.passwordView.text.toString().trim()
 
-        failInvalidUrl(url)
-        failLoginDetails(password, login)
-
-        showProgress(true)
-
-        repository.refreshLoginInformation(url, login, password)
-
-        CoroutineScope(Dispatchers.Main).launch {
-            val result = repository.login()
-            if (result) {
-                val (errorFetching, displaySelfossOnly) = repository.shouldBeSelfossInstance()
-                if (!errorFetching && !displaySelfossOnly) {
-                    goToMain()
-                } else {
-                    if (displaySelfossOnly) {
-                        Toast.makeText(
-                            applicationContext,
-                            R.string.application_selfoss_only,
-                            Toast.LENGTH_LONG
-                        ).show()
-                    }
-                    preferenceError()
-                }
-            } else {
-                preferenceError()
-            }
-            showProgress(false)
-        }
-    }
-
-    private fun failLoginDetails(
-        password: String,
-        login: String
-    ) {
-        var lastFocusedView: View? = null
         var cancel = false
-        if (isWithLogin) {
+        var focusView: View? = null
-            if (TextUtils.isEmpty(password)) {
-                binding.passwordView.error = getString(R.string.error_invalid_password)
-                lastFocusedView = binding.passwordView
-                cancel = true
-            }
 
-            if (TextUtils.isEmpty(login)) {
-                binding.loginView.error = getString(R.string.error_field_required)
-                lastFocusedView = binding.loginView
-                cancel = true
-            }
-        }
-        maybeCancelAndFocusView(cancel, lastFocusedView)
-    }
-
-    private fun failInvalidUrl(url: String) {
-        val focusView = binding.urlView
-        var cancel = false
         if (url.isBaseUrlInvalid()) {
-            cancel = true
             binding.urlView.error = getString(R.string.login_url_problem)
+            focusView = binding.urlView
+            cancel = true
             inValidCount++
             if (inValidCount == 3) {
                 val alertDialog = AlertDialog.Builder(this).create()
@@ -227,12 +177,49 @@ class LoginActivity : AppCompatActivity(), DIAware {
                 inValidCount = 0
             }
         }
-        maybeCancelAndFocusView(cancel, focusView)
-    }
 
-    private fun maybeCancelAndFocusView(cancel: Boolean, focusView: View?) {
+        if (isWithLogin) {
+            if (TextUtils.isEmpty(password)) {
+                binding.passwordView.error = getString(R.string.error_invalid_password)
+                focusView = binding.passwordView
+                cancel = true
+            }
+
+            if (TextUtils.isEmpty(login)) {
+                binding.loginView.error = getString(R.string.error_field_required)
+                focusView = binding.loginView
+                cancel = true
+            }
+        }
+
         if (cancel) {
             focusView?.requestFocus()
+        } else {
+            showProgress(true)
+
+            repository.refreshLoginInformation(url, login, password)
+
+            CoroutineScope(Dispatchers.Main).launch {
+                val result = repository.login()
+                if (result) {
+                    val (errorFetching, displaySelfossOnly) = repository.shouldBeSelfossInstance()
+                    if (!errorFetching && !displaySelfossOnly) {
+                        goToMain()
+                    } else {
+                        if (displaySelfossOnly) {
+                            Toast.makeText(
+                                applicationContext,
+                                R.string.application_selfoss_only,
+                                Toast.LENGTH_LONG
+                            ).show()
+                        }
+                        preferenceError()
+                    }
+                } else {
+                    preferenceError()
+                }
+                showProgress(false)
+            }
         }
     }
 

androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/MyApp.kt

@@ -34,18 +34,10 @@ import org.kodein.di.*
 class MyApp : MultiDexApplication(), DIAware {
 
     override val di by DI.lazy {
-        bind<AppSettingsService>() with singleton { AppSettingsService(ACRA.isACRASenderServiceProcess()) }
         import(networkModule)
         bind<DriverFactory>() with singleton { DriverFactory(applicationContext) }
         bind<ReaderForSelfossDB>() with singleton { ReaderForSelfossDB(driverFactory.createDriver()) }
-        bind<Repository>() with singleton {
+        bind<Repository>() with singleton { Repository(instance(), instance(), isConnectionAvailable, instance()) }
-            Repository(
-                instance(),
-                instance(),
-                isConnectionAvailable,
-                instance()
-            )
-        }
         bind<ConnectivityStatus>() with singleton { ConnectivityStatus(applicationContext) }
         bind<AppViewModel>() with singleton { AppViewModel(repository = instance()) }
     }
@@ -67,12 +59,7 @@ class MyApp : MultiDexApplication(), DIAware {
 
             handleNotificationChannels()
 
-            ProcessLifecycleOwner.get().lifecycle.addObserver(
+            ProcessLifecycleOwner.get().lifecycle.addObserver(AppLifeCycleObserver(connectivityStatus, repository))
-                AppLifeCycleObserver(
-                    connectivityStatus,
-                    repository
-                )
-            )
 
             CoroutineScope(Dispatchers.Main).launch {
                 viewModel.networkAvailableProvider.collect { networkAvailable ->
@@ -101,38 +88,22 @@ class MyApp : MultiDexApplication(), DIAware {
         initAcra {
             reportFormat = StringFormat.JSON
             reportContent = listOf(
-                ReportField.REPORT_ID,
+                ReportField.REPORT_ID, ReportField.INSTALLATION_ID,
-                ReportField.INSTALLATION_ID,
+                ReportField.APP_VERSION_CODE, ReportField.APP_VERSION_NAME,
-                ReportField.APP_VERSION_CODE,
+                ReportField.BUILD, ReportField.ANDROID_VERSION, ReportField.BRAND, ReportField.PHONE_MODEL,
-                ReportField.APP_VERSION_NAME,
+                ReportField.AVAILABLE_MEM_SIZE, ReportField.TOTAL_MEM_SIZE,
-                ReportField.BUILD,
+                ReportField.STACK_TRACE, ReportField.APPLICATION_LOG, ReportField.LOGCAT,
-                ReportField.ANDROID_VERSION,
+                ReportField.INITIAL_CONFIGURATION, ReportField.CRASH_CONFIGURATION, ReportField.IS_SILENT,
-                ReportField.BRAND,
+                ReportField.USER_APP_START_DATE, ReportField.USER_COMMENT, ReportField.USER_CRASH_DATE, ReportField.USER_EMAIL, ReportField.CUSTOM_DATA)
-                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 =
+                uri = "https://bugs.amine-louveau.fr/report" /*best guess, you may need to adjust this*/
-                    "https://bugs.amine-louveau.fr/report" /*best guess, you may need to adjust this*/
+                basicAuthLogin = "LMTlLZuazADohTCm"
-                basicAuthLogin = "qMEscjj89Gwt6cPR"
+                basicAuthPassword = "he6ghHp83F0PYPfh"
-                basicAuthPassword = "Yo58QFlGzFaWlBzP"
                 httpMethod = HttpSender.Method.POST
             }
         }
@@ -148,11 +119,7 @@ class MyApp : MultiDexApplication(), DIAware {
 
             val newItemsChannelname = getString(R.string.new_items_channel_sync)
             val newItemsChannelimportance = NotificationManager.IMPORTANCE_DEFAULT
-            val newItemsChannelmChannel = NotificationChannel(
+            val newItemsChannelmChannel = NotificationChannel(AppSettingsService.newItemsChannelId, newItemsChannelname, newItemsChannelimportance)
-                AppSettingsService.newItemsChannelId,
-                newItemsChannelname,
-                newItemsChannelimportance
-            )
 
             notificationManager.createNotificationChannel(mChannel)
             notificationManager.createNotificationChannel(newItemsChannelmChannel)
@@ -166,17 +133,13 @@ class MyApp : MultiDexApplication(), DIAware {
             if (e is NoClassDefFoundError && e.stackTrace.asList().any {
                     it.toString().contains("android.view.ViewDebug")
                 }) {
-                // Nothing
             } else {
                 oldHandler.uncaughtException(thread, e)
             }
         }
     }
 
-    class AppLifeCycleObserver(
+    class AppLifeCycleObserver(val connectivityStatus: ConnectivityStatus, val repository: Repository) : DefaultLifecycleObserver {
-        val connectivityStatus: ConnectivityStatus,
-        val repository: Repository
-    ) : DefaultLifecycleObserver {
 
         override fun onResume(owner: LifecycleOwner) {
             super.onResume(owner)

androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/ReaderActivity.kt

@@ -84,7 +84,7 @@ class ReaderActivity : AppCompatActivity(), DIAware {
     }
 
     private fun readItem(item: SelfossModel.Item) {
-        if (appSettingsService.isMarkOnScrollEnabled() && !appSettingsService.getPublicAccess()) {
+        if (appSettingsService.isMarkOnScrollEnabled()) {
             CoroutineScope(Dispatchers.IO).launch {
                 repository.markAsRead(item)
             }
@@ -137,34 +137,28 @@ class ReaderActivity : AppCompatActivity(), DIAware {
         inflater.inflate(R.menu.reader_menu, menu)
         toolbarMenu = menu
 
+        if (allItems.isNotEmpty() && allItems[currentItem].starred) {
+            canRemoveFromFavorite()
+        } else {
+            canFavorite()
+        }
         alignmentMenu()
 
-        if (appSettingsService.getPublicAccess()) {
+        binding.pager.registerOnPageChangeCallback(
-            menu.removeItem(R.id.star)
+            object : ViewPager2.OnPageChangeCallback() {
-        } else {
-            if (allItems.isNotEmpty() && allItems[currentItem].starred) {
-                canRemoveFromFavorite()
-            } else {
-                canFavorite()
-            }
 
+                override fun onPageSelected(position: Int) {
+                    super.onPageSelected(position)
 
-            binding.pager.registerOnPageChangeCallback(
+                    if (allItems[position].starred) {
-                object : ViewPager2.OnPageChangeCallback() {
+                        canRemoveFromFavorite()
-
+                    } else {
-                    override fun onPageSelected(position: Int) {
+                        canFavorite()
-                        super.onPageSelected(position)
-
-                        if (allItems[position].starred) {
-                            canRemoveFromFavorite()
-                        } else {
-                            canFavorite()
-                        }
-                        readItem(allItems[position])
                     }
+                    readItem(allItems[position])
                 }
-            )
+            }
-        }
+        )
 
         return true
     }
@@ -183,18 +177,20 @@ class ReaderActivity : AppCompatActivity(), DIAware {
 
         when (item.itemId) {
             android.R.id.home -> {
-                onBackPressedDispatcher.onBackPressed()
+                onBackPressed()
                 return true
             }
             R.id.star -> {
                 if (allItems[binding.pager.currentItem].starred) {
                     CoroutineScope(Dispatchers.IO).launch {
                         repository.unstarr(allItems[binding.pager.currentItem])
+                        // TODO: Handle failure
                     }
                     afterUnsave()
                 } else {
                     CoroutineScope(Dispatchers.IO).launch {
                         repository.starr(allItems[binding.pager.currentItem])
+                        // TODO: Handle failure
                     }
                     afterSave()
                 }

androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/adapters/ItemCardAdapter.kt

@@ -56,10 +56,6 @@ class ItemCardAdapter(
             val itm = items[position]
 
             binding.favButton.isSelected = itm.starred
-            if (appSettingsService.getPublicAccess()) {
-                binding.favButton.visibility = View.GONE
-            }
-
             binding.title.text = itm.title.getHtmlDecoded()
 
             binding.title.setOnTouchListener(LinkOnTouchListener())

androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/background/background.kt

@@ -26,89 +26,85 @@ import org.kodein.di.instance
 import java.util.*
 import kotlin.concurrent.schedule
 
-class LoadingWorker(val context: Context, params: WorkerParameters) : Worker(context, params),
+class LoadingWorker(val context: Context, params: WorkerParameters) : Worker(context, params), DIAware {
-    DIAware {
 
     override val di by lazy { (applicationContext as MyApp).di }
-    private val repository: Repository by instance()
+    private val repository : Repository by instance()
-    private val appSettingsService: AppSettingsService by instance()
+    private val appSettingsService : AppSettingsService by instance()
 
-    override fun doWork(): Result {
+override fun doWork(): Result {
-        if (appSettingsService.isPeriodicRefreshEnabled() && isNetworkAccessible(context)) {
+    if (appSettingsService.isPeriodicRefreshEnabled() && isNetworkAccessible(context)) {
 
-            CoroutineScope(Dispatchers.IO).launch {
+        CoroutineScope(Dispatchers.IO).launch {
-                val notificationManager =
+            val notificationManager =
-                    applicationContext.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
+                applicationContext.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
 
-                val notification =
+            val notification =
-                    NotificationCompat.Builder(applicationContext, AppSettingsService.syncChannelId)
+                NotificationCompat.Builder(applicationContext, AppSettingsService.syncChannelId)
-                        .setContentTitle(context.getString(R.string.loading_notification_title))
+                    .setContentTitle(context.getString(R.string.loading_notification_title))
-                        .setContentText(context.getString(R.string.loading_notification_text))
+                    .setContentText(context.getString(R.string.loading_notification_text))
-                        .setOngoing(true)
+                    .setOngoing(true)
-                        .setPriority(PRIORITY_LOW)
+                    .setPriority(PRIORITY_LOW)
-                        .setChannelId(AppSettingsService.syncChannelId)
+                    .setChannelId(AppSettingsService.syncChannelId)
-                        .setSmallIcon(R.drawable.ic_stat_cloud_download_black_24dp)
+                    .setSmallIcon(R.drawable.ic_stat_cloud_download_black_24dp)
 
-                notificationManager.notify(1, notification.build())
+            notificationManager.notify(1, notification.build())
 
-                repository.handleDBActions()
+            repository.handleDBActions()
 
-                val apiItems = repository.tryToCacheItemsAndGetNewOnes()
+            val apiItems = repository.tryToCacheItemsAndGetNewOnes()
-                if (appSettingsService.isNotifyNewItemsEnabled()) {
+            if (appSettingsService.isNotifyNewItemsEnabled()) {
-                    launch {
+                launch {
-                        handleNewItemsNotification(apiItems, notificationManager)
+                    handleNewItemsNotification(apiItems, notificationManager)
-                    }
                 }
-                apiItems.map { it.preloadImages(context) }
             }
+            apiItems.map { it.preloadImages(context) }
         }
-        return Result.success()
     }
+    return Result.success()
+}
 
     private fun handleNewItemsNotification(
         newItems: List<SelfossModel.Item>?,
         notificationManager: NotificationManager
     ) {
+        // TODO: Check if this coroutine is actually required
         CoroutineScope(Dispatchers.IO).launch {
-            val apiItems = newItems.orEmpty()
+                val apiItems = newItems.orEmpty()
 
 
-            val newSize = apiItems.filter { it.unread }.size
+                val newSize = apiItems.filter { it.unread }.size
-            if (newSize > 0) {
+                if (newSize > 0) {
 
-                val intent = Intent(context, MainActivity::class.java).apply {
+                    val intent = Intent(context, MainActivity::class.java).apply {
-                    flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK
+                        flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK
-                }
+                    }
-                val pflags = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                    val pflags = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-                    PendingIntent.FLAG_IMMUTABLE
+                        PendingIntent.FLAG_IMMUTABLE
-                } else {
+                    } else {
-                    0
+                        0
-                }
+                    }
-                val pendingIntent: PendingIntent =
+                    val pendingIntent: PendingIntent = PendingIntent.getActivity(context, 0, intent, pflags)
-                    PendingIntent.getActivity(context, 0, intent, pflags)
 
-                val newItemsNotification =
+                    val newItemsNotification =
-                    NotificationCompat.Builder(
+                        NotificationCompat.Builder(applicationContext, AppSettingsService.newItemsChannelId)
-                        applicationContext,
+                            .setContentTitle(context.getString(R.string.new_items_notification_title))
-                        AppSettingsService.newItemsChannelId
+                            .setContentText(
-                    )
+                                context.getString(
-                        .setContentTitle(context.getString(R.string.new_items_notification_title))
+                                    R.string.new_items_notification_text,
-                        .setContentText(
+                                    newSize
-                            context.getString(
+                                )
-                                R.string.new_items_notification_text,
-                                newSize
                             )
-                        )
+                            .setPriority(PRIORITY_DEFAULT)
-                        .setPriority(PRIORITY_DEFAULT)
+                            .setChannelId(AppSettingsService.newItemsChannelId)
-                        .setChannelId(AppSettingsService.newItemsChannelId)
+                            .setContentIntent(pendingIntent)
-                        .setContentIntent(pendingIntent)
+                            .setAutoCancel(true)
-                        .setAutoCancel(true)
+                            .setSmallIcon(R.drawable.ic_tab_fiber_new_black_24dp)
-                        .setSmallIcon(R.drawable.ic_tab_fiber_new_black_24dp)
 
-                Timer("", false).schedule(4000) {
+                    Timer("", false).schedule(4000) {
-                    notificationManager.notify(2, newItemsNotification.build())
+                        notificationManager.notify(2, newItemsNotification.build())
+                    }
                 }
-            }
             Timer("", false).schedule(4000) {
                 notificationManager.cancel(1)
             }

androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/fragments/ArticleFragment.kt

@@ -28,9 +28,7 @@ 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.shareLink
-import bou.amine.apps.readerforselfossv2.model.MercuryModel
 import bou.amine.apps.readerforselfossv2.model.SelfossModel
-import bou.amine.apps.readerforselfossv2.model.StatusAndData
 import bou.amine.apps.readerforselfossv2.repository.Repository
 import bou.amine.apps.readerforselfossv2.rest.MercuryApi
 import bou.amine.apps.readerforselfossv2.service.AppSettingsService
@@ -57,8 +55,6 @@ import java.util.*
 import java.util.concurrent.ExecutionException
 
 
-private const val IMAGE_JPG = "image/jpg"
-
 class ArticleFragment : Fragment(), DIAware {
     private var fontSize: Int = 16
     private lateinit var item: SelfossModel.Item
@@ -67,12 +63,12 @@ class ArticleFragment : Fragment(), DIAware {
     private lateinit var contentSource: String
     private lateinit var contentImage: String
     private lateinit var contentTitle: String
-    private lateinit var allImages: ArrayList<String>
+    private lateinit var allImages : ArrayList<String>
     private lateinit var fab: FloatingActionButton
     private lateinit var textAlignment: String
     private lateinit var binding: FragmentArticleBinding
 
-    override val di: DI by closestDI()
+    override val di : DI by closestDI()
     private val repository: Repository by instance()
     private val appSettingsService: AppSettingsService by instance()
 
@@ -81,7 +77,7 @@ class ArticleFragment : Fragment(), DIAware {
     private var font = ""
     private var staticBar = false
 
-    private val mercuryApi: MercuryApi by instance()
+    private val mercuryApi : MercuryApi by instance()
 
 
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -119,7 +115,48 @@ class ArticleFragment : Fragment(), DIAware {
 
             fab.rippleColor = resources.getColor(R.color.colorAccentDark)
 
-            val floatingToolbar: FloatingToolbar = handleFloatingToolbar()
+            val floatingToolbar: FloatingToolbar = binding.floatingToolbar
+            floatingToolbar.attachFab(fab)
+
+            floatingToolbar.background = ColorDrawable(resources.getColor(R.color.colorAccent))
+
+            floatingToolbar.setClickListener(
+                object : FloatingToolbar.ItemClickListener {
+                    override fun onItemClick(item: MenuItem) {
+                        when (item.itemId) {
+                            R.id.share_action -> requireActivity().shareLink(url, contentTitle)
+                            R.id.open_action -> requireActivity().openInBrowserAsNewTask(this@ArticleFragment.item)
+                            R.id.unread_action -> if (context != null) {
+                                if (this@ArticleFragment.item.unread) {
+                                    CoroutineScope(Dispatchers.IO).launch {
+                                        repository.markAsRead(this@ArticleFragment.item)
+                                    }
+                                    this@ArticleFragment.item.unread = false
+                                    Toast.makeText(
+                                        context,
+                                        R.string.marked_as_read,
+                                        Toast.LENGTH_LONG
+                                    ).show()
+                                } else {
+                                    CoroutineScope(Dispatchers.IO).launch {
+                                        repository.unmarkAsRead(this@ArticleFragment.item)
+                                    }
+                                    this@ArticleFragment.item.unread = true
+                                    Toast.makeText(
+                                        context,
+                                        R.string.marked_as_unread,
+                                        Toast.LENGTH_LONG
+                                    ).show()
+                                }
+                            }
+                            else -> Unit
+                        }
+                    }
+
+                    override fun onItemLongClick(item: MenuItem?) {
+                    }
+                }
+            )
 
             if (staticBar) {
                 fab.hide()
@@ -131,7 +168,28 @@ class ArticleFragment : Fragment(), DIAware {
                 binding.source.typeface = typeface
             }
 
-            handleContent()
+            if (contentText.isEmptyOrNullOrNullString()) {
+                getContentFromMercury()
+            } else {
+                binding.titleView.text = contentTitle
+                if (typeface != null) {
+                    binding.titleView.typeface = typeface
+                }
+
+                htmlToWebview()
+
+                if (!contentImage.isEmptyOrNullOrNullString() && context != null) {
+                    binding.imageView.visibility = View.VISIBLE
+                    Glide
+                        .with(requireContext())
+                        .asBitmap()
+                        .load(contentImage)
+                        .apply(RequestOptions.fitCenterTransform())
+                        .into(binding.imageView)
+                } else {
+                    binding.imageView.visibility = View.GONE
+                }
+            }
 
             binding.nestedScrollView.setOnScrollChangeListener(
                 NestedScrollView.OnScrollChangeListener { _, _, scrollY, _, oldScrollY ->
@@ -153,8 +211,7 @@ class ArticleFragment : Fragment(), DIAware {
             AlertDialog.Builder(requireContext())
                 .setMessage(requireContext().getString(R.string.webview_dialog_issue_message))
                 .setTitle(requireContext().getString(R.string.webview_dialog_issue_title))
-                .setPositiveButton(
+                .setPositiveButton(android.R.string.ok
-                    android.R.string.ok
                 ) { _, _ ->
                     appSettingsService.disableArticleViewer()
                     requireActivity().finish()
@@ -166,83 +223,6 @@ class ArticleFragment : Fragment(), DIAware {
         return binding.root
     }
 
-    private fun handleContent() {
-        if (contentText.isEmptyOrNullOrNullString()) {
-            if (repository.isNetworkAvailable()) {
-                getContentFromMercury()
-            }
-        } else {
-            binding.titleView.text = contentTitle
-            if (typeface != null) {
-                binding.titleView.typeface = typeface
-            }
-
-            htmlToWebview()
-
-            if (!contentImage.isEmptyOrNullOrNullString() && context != null) {
-                binding.imageView.visibility = View.VISIBLE
-                Glide
-                    .with(requireContext())
-                    .asBitmap()
-                    .load(contentImage)
-                    .apply(RequestOptions.fitCenterTransform())
-                    .into(binding.imageView)
-            } else {
-                binding.imageView.visibility = View.GONE
-            }
-        }
-    }
-
-    private fun handleFloatingToolbar(): FloatingToolbar {
-        val floatingToolbar: FloatingToolbar = binding.floatingToolbar
-        if (appSettingsService.getPublicAccess()) {
-            floatingToolbar.setMenu(R.menu.reader_toolbar_no_read)
-        }
-        floatingToolbar.attachFab(fab)
-
-        floatingToolbar.background = ColorDrawable(resources.getColor(R.color.colorAccent))
-
-        floatingToolbar.setClickListener(
-            object : FloatingToolbar.ItemClickListener {
-                override fun onItemClick(item: MenuItem) {
-                    when (item.itemId) {
-                        R.id.share_action -> requireActivity().shareLink(url, contentTitle)
-                        R.id.open_action -> requireActivity().openInBrowserAsNewTask(this@ArticleFragment.item)
-                        R.id.unread_action -> if (context != null) {
-                            if (this@ArticleFragment.item.unread) {
-                                CoroutineScope(Dispatchers.IO).launch {
-                                    repository.markAsRead(this@ArticleFragment.item)
-                                }
-                                this@ArticleFragment.item.unread = false
-                                Toast.makeText(
-                                    context,
-                                    R.string.marked_as_read,
-                                    Toast.LENGTH_LONG
-                                ).show()
-                            } else {
-                                CoroutineScope(Dispatchers.IO).launch {
-                                    repository.unmarkAsRead(this@ArticleFragment.item)
-                                }
-                                this@ArticleFragment.item.unread = true
-                                Toast.makeText(
-                                    context,
-                                    R.string.marked_as_unread,
-                                    Toast.LENGTH_LONG
-                                ).show()
-                            }
-                        }
-                        else -> Unit
-                    }
-                }
-
-                override fun onItemLongClick(item: MenuItem?) {
-                    // We do nothing
-                }
-            }
-        )
-        return floatingToolbar
-    }
-
     private fun refreshAlignment() {
         textAlignment = when (appSettingsService.getActiveAllignment()) {
             1 -> "justify"
@@ -252,108 +232,75 @@ class ArticleFragment : Fragment(), DIAware {
     }
 
     private fun getContentFromMercury() {
-        binding.progressBar.visibility = View.VISIBLE
+        if (repository.isNetworkAvailable()) {
+            binding.progressBar.visibility = View.VISIBLE
 
-        CoroutineScope(Dispatchers.Main).launch {
+            CoroutineScope(Dispatchers.Main).launch {
-            try {
+                try {
-                val response = mercuryApi.query(url)
+                    val response = mercuryApi.query(url)
-                if (response.success && response.data != null && !response.data?.content.isNullOrEmpty()) {
+                    if (response.success && response.data != null && !response.data?.content.isNullOrEmpty()) {
-                    binding.titleView.text = response.data!!.title.orEmpty()
+                        binding.titleView.text = response.data!!.title.orEmpty()
-                    if (typeface != null) {
+                        try {
-                        binding.titleView.typeface = typeface
+                            if (typeface != null) {
+                                binding.titleView.typeface = typeface
+                            }
+                        } catch (e: Exception) {
+                            e.sendSilentlyWithAcraWithName("getContentFromMercury > typeface")
+                        }
+
+                        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()
                     }
-                    URL(response.data!!.url)
+                } catch (e: SocketTimeoutException) {
-                    url = response.data!!.url
+                    openInBrowserAfterFailing()
-
+                } catch (e: Exception) {
-                    contentText = response.data!!.content.orEmpty()
+                    e.sendSilentlyWithAcraWithName("getContentFromMercury > whole thing")
-                    htmlToWebview()
-
-                    handleLeadImage(response)
-
-                    binding.nestedScrollView.scrollTo(0, 0)
-                    binding.progressBar.visibility = View.GONE
-                } else {
                     openInBrowserAfterFailing()
                 }
-            } catch (e: SocketTimeoutException) {
-                openInBrowserAfterFailing()
-            } catch (e: Exception) {
-                e.sendSilentlyWithAcraWithName("getContentFromMercury > $url")
-                openInBrowserAfterFailing()
-            }
-        }
-    }
-
-    private fun handleLeadImage(response: StatusAndData<MercuryModel.ParsedContent>) {
-        if (!response.data?.lead_image_url.isNullOrEmpty() && context != null) {
-            binding.imageView.visibility = View.VISIBLE
-            Glide
-                .with(requireContext())
-                .asBitmap()
-                .load(
-                    response.data!!.lead_image_url.orEmpty()
-                )
-                .apply(RequestOptions.fitCenterTransform())
-                .into(binding.imageView)
-        } else {
-            binding.imageView.visibility = View.GONE
-        }
-    }
-
-    private fun handleImageLoading() {
-        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)))
-                }
-                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) {
-                        e.sendSilentlyWithAcraWithName("shouldInterceptRequest > jpeg > $url")
-                    }
-                } 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) {
-                        e.sendSilentlyWithAcraWithName("shouldInterceptRequest > png > $url")
-                    }
-                } 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) {
-                        e.sendSilentlyWithAcraWithName("shouldInterceptRequest > webp > $url")
-                    }
-                }
-
-                return super.shouldInterceptRequest(view, url)
             }
         }
     }
@@ -377,19 +324,57 @@ class ArticleFragment : Fragment(), DIAware {
         binding.webcontent.settings.loadWithOverviewMode = true
         binding.webcontent.settings.javaScriptEnabled = false
 
-        handleImageLoading()
+        binding.webcontent.webViewClient = object : WebViewClient() {
-
+            @Deprecated("Deprecated in Java")
-        val gestureDetector =
+            override fun shouldOverrideUrlLoading(view: WebView?, url : String): Boolean {
-            GestureDetector(activity, object : GestureDetector.SimpleOnGestureListener() {
+                if (binding.webcontent.hitTestResult.type != WebView.HitTestResult.SRC_IMAGE_ANCHOR_TYPE) {
-                override fun onSingleTapUp(e: MotionEvent): Boolean {
+                    requireContext().startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(url)))
-                    return performClick()
                 }
-            })
+                return true
+            }
 
-        binding.webcontent.setOnTouchListener { _, event -> gestureDetector.onTouchEvent(event) }
+            @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) {
+                        e.sendSilentlyWithAcraWithName("shouldInterceptRequest > jpeg > $url")
+                    }
+                }
+                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) {
+                        e.sendSilentlyWithAcraWithName("shouldInterceptRequest > png > $url")
+                    }
+                }
+                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) {
+                        e.sendSilentlyWithAcraWithName("shouldInterceptRequest > webp > $url")
+                    }
+                }
+
+                return super.shouldInterceptRequest(view, url)
+            }
+        }
+
+        val gestureDetector = GestureDetector(activity, object : GestureDetector.SimpleOnGestureListener() {
+            override fun onSingleTapUp(e: MotionEvent): Boolean {
+                return performClick()
+            }
+        })
+
+        binding.webcontent.setOnTouchListener { _, event -> gestureDetector.onTouchEvent(event)}
 
         binding.webcontent.settings.layoutAlgorithm =
-            WebSettings.LayoutAlgorithm.TEXT_AUTOSIZING
+                WebSettings.LayoutAlgorithm.TEXT_AUTOSIZING
 
         var baseUrl: String? = null
 
@@ -400,7 +385,7 @@ class ArticleFragment : Fragment(), DIAware {
             e.sendSilentlyWithAcraWithName("htmlToWebview > item url")
         }
 
-        val fontName = when (font) {
+        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"
@@ -408,12 +393,7 @@ class ArticleFragment : Fragment(), DIAware {
         }
 
         val fontLinkAndStyle = if (font.isNotEmpty()) {
-            """<link href="https://fonts.googleapis.com/css?family=${
+            """<link href="https://fonts.googleapis.com/css?family=${fontName.replace(" ", "+")}" rel="stylesheet">
-                fontName.replace(
-                    " ",
-                    "+"
-                )
-            }" rel="stylesheet">
                 |<style>
                 |   * {
                 |       font-family: '$fontName';
@@ -437,12 +417,7 @@ class ArticleFragment : Fragment(), DIAware {
                 |        max-width: 100%;
                 |      }
                 |      a {
-                |        color: ${
+                |        color: ${String.format("#%06X", 0xFFFFFF and resources.getColor(R.color.colorAccent))} !important;
-                String.format(
-                    "#%06X",
-                    0xFFFFFF and resources.getColor(R.color.colorAccent)
-                )
-            } !important;
                 |      }
                 |      *:not(a) {
                 |        color: ${String.format("#%06X", 0xFFFFFF and colorOnSurface.data)};
@@ -453,26 +428,11 @@ class ArticleFragment : Fragment(), DIAware {
                 |        word-break: break-word;
                 |        overflow:hidden;
                 |        line-height: 1.5em;
-                |        background-color: ${
+                |        background-color: ${String.format("#%06X", 0xFFFFFF and colorSurface.data)};
-                String.format(
-                    "#%06X",
-                    0xFFFFFF and colorSurface.data
-                )
-            };
                 |      }
                 |      body, html {
-                |        background-color: ${
+                |        background-color: ${String.format("#%06X", 0xFFFFFF and colorSurface.data)} !important;
-                String.format(
+                |        border-color: ${String.format("#%06X", 0xFFFFFF and colorSurface.data)}  !important;
-                    "#%06X",
-                    0xFFFFFF and colorSurface.data
-                )
-            } !important;
-                |        border-color: ${
-                String.format(
-                    "#%06X",
-                    0xFFFFFF and colorSurface.data
-                )
-            }  !important;
                 |        padding: 0 !important;
                 |        margin: 0 !important;
                 |      }
@@ -482,12 +442,7 @@ class ArticleFragment : Fragment(), DIAware {
                 |      pre, code {
                 |        white-space: pre-wrap;
                 |        width:100%;
-                |        background-color: ${
+                |        background-color: ${String.format("#%06X", 0xFFFFFF and colorSurface.data)};
-                String.format(
-                    "#%06X",
-                    0xFFFFFF and colorSurface.data
-                )
-            };
                 |      }
                 |   </style>
                 |   $fontLinkAndStyle
@@ -503,12 +458,12 @@ class ArticleFragment : Fragment(), DIAware {
 
     fun scrollDown() {
         val height = binding.nestedScrollView.measuredHeight
-        binding.nestedScrollView.smoothScrollBy(0, height / 2)
+        binding.nestedScrollView.smoothScrollBy(0, height/2)
     }
 
     fun scrollUp() {
         val height = binding.nestedScrollView.measuredHeight
-        binding.nestedScrollView.smoothScrollBy(0, -height / 2)
+        binding.nestedScrollView.smoothScrollBy(0, -height/2)
     }
 
     private fun openInBrowserAfterFailing() {
@@ -520,7 +475,7 @@ class ArticleFragment : Fragment(), DIAware {
         private const val ARG_ITEMS = "items"
 
         fun newInstance(
-            item: SelfossModel.Item
+                item: SelfossModel.Item
         ): ArticleFragment {
             val fragment = ArticleFragment()
             val args = Bundle()
@@ -532,10 +487,9 @@ class ArticleFragment : Fragment(), DIAware {
 
     fun performClick(): Boolean {
         if (binding.webcontent.hitTestResult.type == WebView.HitTestResult.IMAGE_TYPE ||
-            binding.webcontent.hitTestResult.type == WebView.HitTestResult.SRC_IMAGE_ANCHOR_TYPE
+                binding.webcontent.hitTestResult.type == WebView.HitTestResult.SRC_IMAGE_ANCHOR_TYPE) {
-        ) {
 
-            val position: Int = allImages.indexOf(binding.webcontent.hitTestResult.extra)
+            val position : Int = allImages.indexOf(binding.webcontent.hitTestResult.extra)
 
             val intent = Intent(activity, ImageActivity::class.java)
             intent.putExtra("allImages", allImages)

androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/fragments/FilterSheetFragment.kt

@@ -6,7 +6,6 @@ import android.graphics.drawable.Drawable
 import android.graphics.drawable.GradientDrawable
 import android.os.Build
 import android.os.Bundle
-import android.text.TextUtils
 import android.view.LayoutInflater
 import android.view.View
 import android.view.View.GONE
@@ -14,7 +13,6 @@ import android.view.View.VISIBLE
 import android.view.ViewGroup
 import bou.amine.apps.readerforselfossv2.android.HomeActivity
 import bou.amine.apps.readerforselfossv2.android.R
-import bou.amine.apps.readerforselfossv2.android.databinding.FilterFragmentBinding
 import bou.amine.apps.readerforselfossv2.android.sendSilentlyWithAcraWithName
 import bou.amine.apps.readerforselfossv2.repository.Repository
 import bou.amine.apps.readerforselfossv2.utils.getHtmlDecoded
@@ -37,7 +35,6 @@ import org.kodein.di.instance
 
 class FilterSheetFragment : BottomSheetDialogFragment(), DIAware {
 
-    private lateinit var binding: FilterFragmentBinding
     override val di: DI by closestDI()
     private val repository: Repository by instance()
 
@@ -48,8 +45,8 @@ class FilterSheetFragment : BottomSheetDialogFragment(), DIAware {
         container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View {
-        binding =
+        val binding =
-            FilterFragmentBinding.inflate(
+            bou.amine.apps.readerforselfossv2.android.databinding.FilterFragmentBinding.inflate(
                 inflater,
                 container,
                 false
@@ -57,14 +54,126 @@ class FilterSheetFragment : BottomSheetDialogFragment(), DIAware {
 
         val context: Context? = context
 
+        val tagGroup = binding.tagsGroup
+        val sourceGroup = binding.sourcesGroup
 
         if (context == null) {
             dismiss()
             Exception("FilterSheetFragment context is null").sendSilentlyWithAcraWithName("FilterSheetFragment > onCreateView")
         } else {
             CoroutineScope(Dispatchers.Main).launch {
-                handleTagChips(context)
+                val tags = repository.getTags()
-                handleSourceChips(context)
+
+                tags.forEach { tag ->
+                    val c = Chip(context)
+                    c.text = tag.tag
+
+                    try {
+                        val gd = GradientDrawable()
+                        val gdColor = try {
+                            Color.parseColor(tag.color)
+                        } catch (e: IllegalArgumentException) {
+                            e.sendSilentlyWithAcraWithName("color issue " + tag.color)
+                            resources.getColor(R.color.colorPrimary)
+                        }
+                        gd.setColor(gdColor)
+                        gd.shape = GradientDrawable.RECTANGLE
+                        gd.setSize(30, 30)
+                        gd.cornerRadius = 30F
+                        c.chipIcon = gd
+                    } catch (e: Exception) {
+                        e.sendSilentlyWithAcraWithName("tags > GradientDrawable")
+                    }
+
+                    c.setOnCloseIconClickListener {
+                        (it as Chip).isCloseIconVisible = false
+                        selectedChip = null
+                        repository.setTagFilter(null)
+                    }
+
+                    c.setOnClickListener {
+                        if (selectedChip != null) {
+                            selectedChip!!.isCloseIconVisible = false
+                        }
+                        (it as Chip).isCloseIconVisible = true
+                        selectedChip = it
+                        repository.setTagFilter(tag)
+
+                        repository.setSourceFilter(null)
+                    }
+
+                    if (repository.tagFilter.value?.equals(tag) == true) {
+                        c.isCloseIconVisible = true
+                        selectedChip = c
+                    }
+
+                    tagGroup.addView(c)
+                }
+
+                repository.getSources().forEach { source ->
+                    val c = Chip(context)
+
+                    Glide.with(context)
+                        .load(source.getIcon(repository.baseUrl))
+                        .listener(object : RequestListener<Drawable?> {
+                            override fun onLoadFailed(
+                                e: GlideException?,
+                                model: Any?,
+                                target: Target<Drawable?>?,
+                                isFirstResource: Boolean
+                            ): Boolean {
+                                return false
+                            }
+
+                            override fun onResourceReady(
+                                resource: Drawable?,
+                                model: Any?,
+                                target: Target<Drawable?>?,
+                                dataSource: DataSource?,
+                                isFirstResource: Boolean
+                            ): Boolean {
+                                try {
+                                    c.chipIcon = resource
+                                } catch (e: Exception) {
+                                    e.sendSilentlyWithAcraWithName("sources > onResourceReady")
+                                }
+                                return false
+                            }
+                        }).preload()
+
+                    c.text = source.title.getHtmlDecoded()
+
+                    c.setOnCloseIconClickListener {
+                        (it as Chip).isCloseIconVisible = false
+                        selectedChip = null
+                        repository.setSourceFilter(null)
+                    }
+
+                    c.setOnClickListener {
+                        if (selectedChip != null) {
+                            selectedChip!!.isCloseIconVisible = false
+                        }
+                        (it as Chip).isCloseIconVisible = true
+                        selectedChip = it
+                        repository.setSourceFilter(source)
+
+                        repository.setTagFilter(null)
+                    }
+
+
+                    if (repository.sourceFilter.value?.equals(source) == true) {
+                        c.isCloseIconVisible = true
+                        selectedChip = c
+                    }
+
+                    c.isEnabled = source.error.isBlank()
+
+                    if (source.error.isNotBlank() && Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                        c.tooltipText = source.error
+                    }
+
+                    sourceGroup.addView(c)
+                }
 
                 binding.progressBar2.visibility = GONE
                 binding.filterView.visibility = VISIBLE
@@ -79,133 +188,6 @@ class FilterSheetFragment : BottomSheetDialogFragment(), DIAware {
         return binding.root
     }
 
-    private suspend fun handleSourceChips(
-        context: Context
-    ) {
-        val sourceGroup = binding.sourcesGroup
-
-        repository.getSources().forEach { source ->
-            val c = Chip(context)
-            c.ellipsize = TextUtils.TruncateAt.END
-
-            Glide.with(context)
-                .load(source.getIcon(repository.baseUrl))
-                .listener(object : RequestListener<Drawable?> {
-                    override fun onLoadFailed(
-                        e: GlideException?,
-                        model: Any?,
-                        target: Target<Drawable?>?,
-                        isFirstResource: Boolean
-                    ): Boolean {
-                        return false
-                    }
-
-                    override fun onResourceReady(
-                        resource: Drawable?,
-                        model: Any?,
-                        target: Target<Drawable?>?,
-                        dataSource: DataSource?,
-                        isFirstResource: Boolean
-                    ): Boolean {
-                        try {
-                            c.chipIcon = resource
-                        } catch (e: Exception) {
-                            e.sendSilentlyWithAcraWithName("sources > onResourceReady")
-                        }
-                        return false
-                    }
-                }).preload()
-
-            c.text = source.title.getHtmlDecoded()
-
-            c.setOnCloseIconClickListener {
-                (it as Chip).isCloseIconVisible = false
-                selectedChip = null
-                repository.setSourceFilter(null)
-            }
-
-            c.setOnClickListener {
-                if (selectedChip != null) {
-                    selectedChip!!.isCloseIconVisible = false
-                }
-                (it as Chip).isCloseIconVisible = true
-                selectedChip = it
-                repository.setSourceFilter(source)
-
-                repository.setTagFilter(null)
-            }
-
-
-            if (repository.sourceFilter.value?.equals(source) == true) {
-                c.isCloseIconVisible = true
-                selectedChip = c
-            }
-
-            c.isEnabled = source.error.isBlank()
-
-            if (source.error.isNotBlank() && Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-                c.tooltipText = source.error
-            }
-
-            sourceGroup.addView(c)
-        }
-    }
-
-    private suspend fun handleTagChips(
-        context: Context,
-    ) {
-        val tagGroup = binding.tagsGroup
-
-        val tags = repository.getTags()
-
-        tags.forEach { tag ->
-            val c = Chip(context)
-            c.ellipsize = TextUtils.TruncateAt.END
-            c.text = tag.tag
-
-            try {
-                val gd = GradientDrawable()
-                val gdColor = try {
-                    Color.parseColor(tag.color)
-                } catch (e: IllegalArgumentException) {
-                    e.sendSilentlyWithAcraWithName("color issue " + tag.color)
-                    resources.getColor(R.color.colorPrimary)
-                }
-                gd.setColor(gdColor)
-                gd.shape = GradientDrawable.RECTANGLE
-                gd.setSize(30, 30)
-                gd.cornerRadius = 30F
-                c.chipIcon = gd
-            } catch (e: Exception) {
-                e.sendSilentlyWithAcraWithName("tags > GradientDrawable")
-            }
-
-            c.setOnCloseIconClickListener {
-                (it as Chip).isCloseIconVisible = false
-                selectedChip = null
-                repository.setTagFilter(null)
-            }
-
-            c.setOnClickListener {
-                if (selectedChip != null) {
-                    selectedChip!!.isCloseIconVisible = false
-                }
-                (it as Chip).isCloseIconVisible = true
-                selectedChip = it
-                repository.setTagFilter(tag)
-
-                repository.setSourceFilter(null)
-            }
-
-            if (repository.tagFilter.value?.equals(tag) == true) {
-                c.isCloseIconVisible = true
-                selectedChip = c
-            }
-
-            tagGroup.addView(c)
-        }
-    }
-
     companion object {
         const val TAG = "FilterModalBottomSheet"
     }

androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/model/AndroidIModelUtils.kt

@@ -8,6 +8,7 @@ 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()

androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/settings/SettingsActivity.kt

@@ -21,6 +21,7 @@ import bou.amine.apps.readerforselfossv2.service.AppSettingsService
 import com.mikepenz.aboutlibraries.LibsBuilder
 import org.kodein.di.DIAware
 import org.kodein.di.android.closestDI
+import org.kodein.di.instance
 
 private const val TITLE_TAG = "settingsActivityTitle"
 
@@ -145,12 +146,8 @@ class SettingsActivity : AppCompatActivity(),
             fontSize?.setOnBindEditTextListener { editText ->
                 editText.inputType = InputType.TYPE_CLASS_NUMBER
                 editText.addTextChangedListener { object : TextWatcher {
-                    override fun beforeTextChanged(charSequence: CharSequence, i: Int, i1: Int, i2: Int) {
+                    override fun beforeTextChanged(charSequence: CharSequence, i: Int, i1: Int, i2: Int) {}
-                        // We do nothing
+                    override fun onTextChanged(charSequence: CharSequence, i: Int, i1: Int, i2: Int) {}
-                    }
-                    override fun onTextChanged(charSequence: CharSequence, i: Int, i1: Int, i2: Int) {
-                        // We do nothing
-                    }
                     override fun afterTextChanged(editable: Editable) {
                         try {
                             editText.textSize = editable.toString().toInt().toFloat()

androidApp/src/main/res/layout/activity_home.xml

@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.drawerlayout.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.drawerlayout.widget.DrawerLayout
-    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/drawerContainer"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    tools:context="bou.amine.apps.readerforselfossv2.android.HomeActivity"
     android:fitsSystemWindows="true"
-    tools:context="bou.amine.apps.readerforselfossv2.android.HomeActivity">
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <androidx.coordinatorlayout.widget.CoordinatorLayout
         android:id="@+id/coordLayout"
@@ -27,14 +28,12 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content">
 
-                    <androidx.appcompat.widget.Toolbar
+                    <androidx.appcompat.widget.Toolbar app:popupTheme="?attr/toolbarPopupTheme" android:theme="@style/ToolBarStyle"
                         android:id="@+id/toolBar"
                         android:layout_width="match_parent"
                         android:layout_height="?attr/actionBarSize"
-                        android:theme="@style/ToolBarStyle"
-                        app:popupTheme="?attr/toolbarPopupTheme"
 
-                        />
+                         />
 
                 </com.google.android.material.appbar.AppBarLayout>
 
@@ -46,19 +45,19 @@
                     <LinearLayout
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
-                        android:background="?android:attr/windowBackground"
+                        android:orientation="vertical"
-                        android:orientation="vertical">
+                        android:background="?android:attr/windowBackground">
 
                         <TextView
                             android:id="@+id/emptyText"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-                            android:background="@android:color/transparent"
                             android:gravity="center_horizontal"
                             android:paddingTop="100dp"
                             android:text="@string/nothing_here"
                             android:textAlignment="center"
                             android:textAppearance="@style/TextAppearance.AppCompat.Headline"
+                            android:background="@android:color/transparent"
                             android:visibility="gone" />
 
                         <androidx.recyclerview.widget.RecyclerView
@@ -70,7 +69,7 @@
                             android:paddingBottom="60dp"
                             android:scrollbars="vertical"
                             app:layout_behavior="@string/appbar_scrolling_view_behavior"
-                            tools:listitem="@layout/list_item" />
+                            tools:listitem="@layout/list_item"/>
                     </LinearLayout>
 
                 </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
@@ -78,7 +77,6 @@
             </LinearLayout>
 
         </androidx.coordinatorlayout.widget.CoordinatorLayout>
-
         <com.ashokvarma.bottomnavigation.BottomNavigationBar
             android:id="@+id/bottomBar"
             android:layout_width="match_parent"

androidApp/src/main/res/layout/activity_image.xml

@@ -1,40 +1,33 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.motion.widget.MotionLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/container"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
+    android:layout_height="match_parent">
-    app:layoutDescription="@xml/image_close_scene">
 
     <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/appBarLayout"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
 
-        <androidx.appcompat.widget.Toolbar android:theme="@style/ToolBarStyle"
+        <androidx.appcompat.widget.Toolbar
             android:id="@+id/toolBar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
 
-            />
+             />
 
     </com.google.android.material.appbar.AppBarLayout>
 
-    <androidx.core.widget.NestedScrollView
+    <androidx.viewpager2.widget.ViewPager2
-        android:id="@+id/scrollView"
+        android:id="@+id/pager"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_height="0dp"
-        android:fillViewport="true"
+        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/appBarLayout">
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/appBarLayout" />
 
-        <androidx.viewpager2.widget.ViewPager2
+</androidx.constraintlayout.widget.ConstraintLayout>
-            android:id="@+id/pager"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent" />
-    </androidx.core.widget.NestedScrollView>
-
-
-</androidx.constraintlayout.motion.widget.MotionLayout>

androidApp/src/main/res/layout/activity_login.xml

@@ -1,30 +1,31 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:gravity="center_horizontal"
     android:orientation="vertical"
     tools:context="bou.amine.apps.readerforselfossv2.android.LoginActivity">
-
     <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
-        <androidx.appcompat.widget.Toolbar
+        <androidx.appcompat.widget.Toolbar app:popupTheme="?attr/toolbarPopupTheme" android:theme="@style/ToolBarStyle"
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
-            android:theme="@style/ToolBarStyle"
+
-            app:popupTheme="?attr/toolbarPopupTheme" />
+             />
 
     </com.google.android.material.appbar.AppBarLayout>
-
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:orientation="vertical"
-        android:padding="@dimen/activity_horizontal_margin">
+        android:paddingBottom="@dimen/activity_vertical_margin"
+        android:paddingLeft="@dimen/activity_horizontal_margin"
+        android:paddingRight="@dimen/activity_horizontal_margin"
+        android:paddingTop="@dimen/activity_vertical_margin">
         <!-- Login progress -->
         <ProgressBar
             android:id="@+id/loginProgress"
@@ -32,65 +33,67 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginBottom="8dp"
-            android:visibility="gone" />
+            android:visibility="gone"/>
 
-        <LinearLayout
+        <ScrollView
             android:id="@+id/loginForm"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
+            android:layout_height="match_parent">
-            android:orientation="vertical">
 
-            <EditText
+            <LinearLayout
-                android:id="@+id/urlView"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:hint="@string/prompt_url"
+                android:orientation="vertical">
-                android:imeOptions="actionUnspecified"
-                android:importantForAutofill="no"
-                android:inputType="textUri"
-                android:maxLines="1"
-                android:minHeight="48dp" />
 
-            <com.google.android.material.switchmaterial.SwitchMaterial
+                <EditText
-                android:id="@+id/withLogin"
+                    android:id="@+id/urlView"
-                android:layout_width="match_parent"
+                    android:layout_width="match_parent"
-                android:layout_height="wrap_content"
+                    android:layout_height="wrap_content"
-                android:text="@string/withLoginSwitch"
+                    android:hint="@string/prompt_url"
-                android:textAlignment="viewStart" />
+                    android:imeOptions="actionUnspecified"
+                    android:importantForAutofill="no"
+                    android:inputType="textUri"
+                    android:maxLines="1" />
 
-            <EditText
+                <com.google.android.material.switchmaterial.SwitchMaterial
-                android:id="@+id/loginView"
+                    android:text="@string/withLoginSwitch"
-                android:layout_width="match_parent"
+                    android:layout_width="match_parent"
-                android:layout_height="wrap_content"
+                    android:layout_height="0dp"
-                android:autofillHints="username"
+                    android:id="@+id/withLogin"
-                android:hint="@string/prompt_login"
+                    android:layout_weight="1"/>
-                android:inputType="text"
-                android:maxLines="1"
-                android:minHeight="48dp"
-                android:visibility="gone" />
 
-            <EditText
+                <EditText
-                android:id="@+id/passwordView"
+                    android:id="@+id/loginView"
-                android:layout_width="match_parent"
+                    android:layout_width="match_parent"
-                android:layout_height="wrap_content"
+                    android:layout_height="wrap_content"
-                android:autofillHints="password"
+                    android:autofillHints="username"
-                android:hint="@string/prompt_password"
+                    android:hint="@string/prompt_login"
-                android:inputType="textPassword"
+                    android:inputType="text"
-                android:maxLines="1"
+                    android:maxLines="1"
-                android:minHeight="48dp"
+                    android:visibility="gone" />
-                android:visibility="gone" />
 
-            <Button
+                <EditText
-                android:id="@+id/signInButton"
+                    android:id="@+id/passwordView"
-                style="?android:textAppearanceSmall"
+                    android:layout_width="match_parent"
-                android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
-                android:layout_height="wrap_content"
+                    android:autofillHints="password"
-                android:layout_marginTop="16dp"
+                    android:hint="@string/prompt_password"
-                android:layout_marginBottom="16dp"
+                    android:inputType="textPassword"
-                android:text="@string/action_sign_in"
+                    android:maxLines="1"
-                android:textStyle="bold" />
+                    android:visibility="gone" />
 
-        </LinearLayout>
+                <Button
+                    android:id="@+id/signInButton"
+                    style="?android:textAppearanceSmall"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="16dp"
+                    android:layout_marginBottom="16dp"
+                    android:text="@string/action_sign_in"
+                    android:textStyle="bold" />
+
+            </LinearLayout>
+        </ScrollView>
     </LinearLayout>
 
 </LinearLayout>

androidApp/src/main/res/layout/activity_sources.xml

@@ -24,8 +24,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:scrollbars="vertical"
-        app:layout_behavior="@string/appbar_scrolling_view_behavior"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior">
-        tools:listitem="@layout/source_list_item">
     </androidx.recyclerview.widget.RecyclerView>
 
     <com.google.android.material.floatingactionbutton.FloatingActionButton

androidApp/src/main/res/layout/activity_upsert_source.xml

@@ -17,83 +17,100 @@
             <androidx.appcompat.widget.Toolbar app:popupTheme="?attr/toolbarPopupTheme" android:theme="@style/ToolBarStyle"
                 android:id="@+id/toolbar"
                 android:layout_width="match_parent"
-                android:layout_height="?attr/actionBarSize" />
+                android:layout_height="?attr/actionBarSize"
+
+                 />
 
         </com.google.android.material.appbar.AppBarLayout>
 
 
 
         <androidx.constraintlayout.widget.ConstraintLayout
-            android:id="@+id/formContainer"
+            android:paddingBottom="@dimen/activity_vertical_margin"
-            android:layout_width="match_parent"
+            android:paddingLeft="@dimen/activity_horizontal_margin"
+            android:paddingRight="@dimen/activity_horizontal_margin"
+            android:paddingTop="@dimen/activity_vertical_margin"
             android:layout_height="match_parent"
-            android:padding="16dp"
+            android:layout_width="match_parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent"
+            android:id="@+id/formContainer"
             android:visibility="gone"
             app:layout_constraintHorizontal_bias="1.0"
-            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintVertical_bias="0.0">
-            app:layout_constraintTop_toTopOf="parent">
 
 
             <EditText
                 android:id="@+id/nameInput"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:minHeight="48dp"
                 android:layout_marginTop="16dp"
                 android:autofillHints="false"
+                android:ems="10"
                 android:hint="@string/add_source_hint_name"
                 android:inputType="text"
                 android:textColorHint="?android:textColorPrimary"
                 app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintRight_toRightOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
 
             <EditText
-                android:id="@+id/sourceUri"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:minHeight="48dp"
-                android:layout_marginTop="16dp"
-                android:autofillHints="false"
-                android:hint="@string/add_source_hint_url"
                 android:inputType="textUri"
+                android:ems="10"
+                android:id="@+id/sourceUri"
+                android:hint="@string/add_source_hint_url"
                 android:textColorHint="?android:textColorPrimary"
+                android:layout_marginTop="16dp"
+                app:layout_constraintTop_toBottomOf="@+id/nameInput"
+                app:layout_constraintRight_toRightOf="parent"
                 app:layout_constraintLeft_toLeftOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/nameInput" />
+                android:autofillHints="false" />
 
             <EditText
-                android:id="@+id/tags"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:minHeight="48dp"
+                android:ems="10"
-                android:layout_marginTop="16dp"
+                android:id="@+id/tags"
-                android:autofillHints="false"
+                app:layout_constraintRight_toRightOf="parent"
-                android:hint="@string/add_source_hint_tags"
-                android:inputType="text"
-                android:textColorHint="?android:textColorPrimary"
                 app:layout_constraintLeft_toLeftOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/sourceUri" />
+                android:layout_marginTop="16dp"
+                app:layout_constraintTop_toBottomOf="@+id/sourceUri"
+                android:hint="@string/add_source_hint_tags"
+                android:textColorHint="?android:textColorPrimary"
+                android:inputType="text"
+                android:autofillHints="false" />
 
             <Spinner
-                android:id="@+id/spoutsSpinner"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
+                android:id="@+id/spoutsSpinner"
-                android:minHeight="48dp"
                 android:layout_marginTop="16dp"
+                app:layout_constraintTop_toBottomOf="@+id/tags"
+                app:layout_constraintRight_toRightOf="parent"
                 app:layout_constraintLeft_toLeftOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/tags" />
+                android:layout_height="40dp"/>
 
             <Button
-                android:id="@+id/saveBtn"
+                android:text="@string/add_source_save"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="16dp"
+                android:id="@+id/saveBtn"
                 android:elevation="5dp"
-                android:text="@string/add_source_save"
                 android:textColor="?android:textColorPrimary"
-                app:layout_constraintBottom_toBottomOf="parent"
+                android:layout_marginEnd="16dp"
-                app:layout_constraintLeft_toLeftOf="parent"
                 app:layout_constraintRight_toRightOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/spoutsSpinner" />
+                android:layout_marginRight="16dp"
+                android:layout_marginStart="16dp"
+                app:layout_constraintLeft_toLeftOf="parent"
+                android:layout_marginLeft="16dp"
+                android:layout_marginTop="16dp"
+                app:layout_constraintTop_toBottomOf="@+id/spoutsSpinner"
+                app:layout_constraintBottom_toBottomOf="parent"
+                android:layout_marginBottom="16dp"
+                app:layout_constraintVertical_bias="0.0"/>
 
         </androidx.constraintlayout.widget.ConstraintLayout>
 
@@ -102,6 +119,8 @@
             style="?android:attr/progressBarStyleLarge"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:visibility="visible"
+            app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintLeft_toLeftOf="parent"
             app:layout_constraintRight_toRightOf="parent"
             app:layout_constraintTop_toTopOf="parent"

androidApp/src/main/res/layout/card_item.xml

@@ -1,14 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.cardview.widget.CardView
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:card_view="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/card"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_margin="8dp"
+    android:layout_marginLeft="8dp"
-    app:layout_constraintEnd_toEndOf="parent"
+    android:layout_marginRight="8dp"
-    app:layout_constraintStart_toStartOf="parent"
+    android:layout_marginTop="8dp"
+    app:layout_constraintHorizontal_bias="0.62"
+    app:layout_constraintLeft_toLeftOf="parent"
+    app:layout_constraintRight_toRightOf="parent"
     app:layout_constraintTop_toTopOf="parent"
     card_view:cardElevation="2dp"
     card_view:cardUseCompatPadding="true"
@@ -24,8 +28,8 @@
             android:layout_height="wrap_content"
             android:adjustViewBounds="true"
             android:cropToPadding="true"
-            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintLeft_toLeftOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
             app:layout_constraintTop_toTopOf="parent"
             app:srcCompat="@drawable/background_splash"
             card_view:layout_constraintBottom_toTopOf="@+id/constraintLayout" />
@@ -35,17 +39,18 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintLeft_toLeftOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/itemImage">
 
             <ImageView
                 android:id="@+id/sourceImage"
                 android:layout_width="40dp"
                 android:layout_height="40dp"
+                android:layout_marginLeft="8dp"
                 android:layout_marginStart="8dp"
                 android:layout_marginTop="8dp"
-                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintLeft_toLeftOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
                 app:srcCompat="@drawable/background_splash" />
 
@@ -53,58 +58,70 @@
                 android:id="@+id/title"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_margin="8dp"
+                android:layout_marginEnd="8dp"
+                android:layout_marginLeft="8dp"
+                android:layout_marginRight="8dp"
+                android:layout_marginStart="8dp"
+                android:gravity="start"
                 android:textAlignment="viewStart"
-                android:textColor="?android:textColorPrimary"
                 android:textStyle="bold"
-                app:layout_constraintEnd_toEndOf="parent"
+                android:textColor="?android:textColorPrimary"
-                app:layout_constraintStart_toEndOf="@+id/sourceImage"
+                app:layout_constraintHorizontal_bias="0.0"
+                app:layout_constraintLeft_toRightOf="@+id/sourceImage"
+                app:layout_constraintRight_toRightOf="parent"
                 app:layout_constraintTop_toTopOf="@+id/sourceImage"
                 tools:text="Titre" />
 
             <TextView
                 android:id="@+id/sourceTitleAndDate"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="8dp"
-                android:textAlignment="viewStart"
-                android:textColor="?android:textColorPrimary"
-                android:textSize="14sp"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="@+id/title"
-                app:layout_constraintTop_toBottomOf="@+id/title"
-                tools:text="Google Actualité Il y a 5h" />
-
-            <LinearLayout
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="8dp"
-                android:layout_marginEnd="8dp"
+                android:gravity="start"
+                android:textAlignment="viewStart"
+                android:textSize="14sp"
+                android:textColor="?android:textColorPrimary"
+                app:layout_constraintLeft_toLeftOf="@+id/title"
+                app:layout_constraintTop_toBottomOf="@+id/title"
+                tools:text="Google Actualité Il y a 5h" />
+
+            <RelativeLayout
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="16dp"
                 app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintRight_toRightOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/sourceTitleAndDate">
 
                 <ImageButton
-                    android:id="@+id/browserBtn"
+                    android:id="@+id/favButton"
                     android:layout_width="35dp"
                     android:layout_height="35dp"
+                    android:layout_alignParentEnd="true"
+                    android:layout_alignParentRight="true"
+                    android:layout_centerVertical="true"
+                    android:layout_marginEnd="8dp"
+                    android:layout_marginRight="8dp"
                     android:adjustViewBounds="true"
                     android:background="@android:color/transparent"
-                    android:contentDescription="@string/reader_action_open"
                     android:elevation="5dp"
                     android:padding="4dp"
                     android:scaleType="centerCrop"
-                    app:srcCompat="@drawable/ic_open_in_browser_black_24dp"
+                    app:srcCompat="@drawable/ic_menu_heart_60dp"
-                    app:tint="?android:attr/textColorPrimary" />
+                    app:tint="@color/ic_menu_heart_color" />
 
                 <ImageButton
                     android:id="@+id/shareBtn"
                     android:layout_width="35dp"
                     android:layout_height="35dp"
-                    android:layout_marginStart="16dp"
+                    android:layout_centerVertical="true"
+                    android:layout_marginEnd="16dp"
+                    android:layout_marginRight="16dp"
+                    android:layout_toLeftOf="@+id/favButton"
+                    android:layout_toStartOf="@+id/favButton"
                     android:adjustViewBounds="true"
                     android:background="@android:color/transparent"
-                    android:contentDescription="@string/share"
                     android:elevation="5dp"
                     android:padding="4dp"
                     android:scaleType="centerCrop"
@@ -112,21 +129,23 @@
                     app:tint="?android:attr/textColorPrimary" />
 
                 <ImageButton
-                    android:id="@+id/favButton"
+                    android:id="@+id/browserBtn"
                     android:layout_width="35dp"
                     android:layout_height="35dp"
-                    android:layout_marginStart="16dp"
+                    android:layout_centerVertical="true"
+                    android:layout_marginEnd="16dp"
+                    android:layout_marginRight="16dp"
+                    android:layout_toLeftOf="@+id/shareBtn"
+                    android:layout_toStartOf="@+id/shareBtn"
                     android:adjustViewBounds="true"
                     android:background="@android:color/transparent"
-                    android:contentDescription="@string/add_to_favs_reader"
                     android:elevation="5dp"
                     android:padding="4dp"
                     android:scaleType="centerCrop"
-                    app:srcCompat="@drawable/ic_menu_heart_60dp"
+                    app:srcCompat="@drawable/ic_open_in_browser_black_24dp"
-                    app:tint="@color/ic_menu_heart_color" />
+                    app:tint="?android:attr/textColorPrimary" />
 
-
+            </RelativeLayout>
-            </LinearLayout>
 
         </androidx.constraintlayout.widget.ConstraintLayout>
     </androidx.constraintlayout.widget.ConstraintLayout>

androidApp/src/main/res/layout/filter_fragment.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
@@ -16,81 +17,73 @@
         app:layout_constraintTop_toTopOf="parent"
         tools:visibility="gone" />
 
-    <androidx.core.widget.NestedScrollView
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/filterView"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:fillViewport="true">
+        android:visibility="gone"
+        tools:visibility="visible">
 
-        <androidx.constraintlayout.widget.ConstraintLayout
+        <com.google.android.material.floatingactionbutton.FloatingActionButton
-            android:id="@+id/filterView"
+            android:id="@+id/floatingActionButton2"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="16dp"
+
+            android:layout_marginTop="8dp"
+            android:clickable="true"
+            app:backgroundTint="@color/colorAccent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:rippleColor="@color/colorAccentDark"
+            app:srcCompat="@drawable/ic_menu_search_white_24dp" />
+
+        <TextView
+            android:id="@+id/filterTagsTitle"
+            style="@style/MaterialAlertDialog.MaterialComponents.Title.Text"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="24dp"
+            android:layout_marginTop="16dp"
+            android:text="@string/filter_item_tags"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+
+        <com.google.android.material.chip.ChipGroup
+            android:id="@+id/tagsGroup"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:visibility="gone"
+            android:layout_marginStart="16dp"
-            tools:visibility="visible">
+            android:layout_marginTop="24dp"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/filterTagsTitle"
+            app:singleSelection="true">
 
-            <TextView
+        </com.google.android.material.chip.ChipGroup>
-                android:id="@+id/filterTagsTitle"
-                style="@style/MaterialAlertDialog.MaterialComponents.Title.Text"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="24dp"
-                android:layout_marginTop="16dp"
-                android:text="@string/filter_item_tags"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
 
-            <TextView
+        <TextView
-                android:id="@+id/filterSourcesTitle"
+            android:id="@+id/filterSourcesTitle"
-                style="@style/MaterialAlertDialog.MaterialComponents.Title.Text"
+            style="@style/MaterialAlertDialog.MaterialComponents.Title.Text"
-                android:layout_width="wrap_content"
+            android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+            android:layout_height="wrap_content"
-                android:layout_marginStart="24dp"
+            android:layout_marginStart="24dp"
-                android:layout_marginTop="24dp"
+            android:layout_marginTop="24dp"
-                android:text="@string/filter_item_sources"
+            android:text="@string/filter_item_sources"
-                app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/tagsGroup" />
+            app:layout_constraintTop_toBottomOf="@+id/tagsGroup" />
 
 
-            <com.google.android.material.chip.ChipGroup
+        <com.google.android.material.chip.ChipGroup
-                android:id="@+id/tagsGroup"
+            android:id="@+id/sourcesGroup"
-                android:layout_width="match_parent"
+            android:layout_width="match_parent"
-                android:layout_height="wrap_content"
+            android:layout_height="wrap_content"
-                android:layout_marginStart="16dp"
+            android:layout_marginStart="16dp"
-                android:layout_marginTop="24dp"
+            android:layout_marginTop="24dp"
-                app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/filterTagsTitle"
+            app:layout_constraintTop_toBottomOf="@+id/filterSourcesTitle">
-                app:singleSelection="true">
 
-            </com.google.android.material.chip.ChipGroup>
+        </com.google.android.material.chip.ChipGroup>
-
-            <com.google.android.material.chip.ChipGroup
-                android:id="@+id/sourcesGroup"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="16dp"
-                android:layout_marginTop="24dp"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/filterSourcesTitle">
-
-            </com.google.android.material.chip.ChipGroup>
-
-
-            <com.google.android.material.floatingactionbutton.FloatingActionButton
-                android:id="@+id/floatingActionButton2"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="8dp"
-                android:layout_marginEnd="16dp"
-                android:clickable="true"
-                android:contentDescription="@string/menu_home_search"
-                android:focusable="true"
-                app:backgroundTint="@color/colorAccent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
-                app:rippleColor="@color/colorAccentDark"
-                app:srcCompat="@drawable/ic_menu_search_white_24dp" />
-
-        </androidx.constraintlayout.widget.ConstraintLayout>
-    </androidx.core.widget.NestedScrollView>
 
+    </androidx.constraintlayout.widget.ConstraintLayout>
 </androidx.constraintlayout.widget.ConstraintLayout>

androidApp/src/main/res/layout/fragment_article.xml

@@ -1,4 +1,5 @@
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
@@ -21,22 +22,10 @@
                 android:layout_width="0dp"
                 android:layout_height="200dp"
                 android:scaleType="centerCrop"
-                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintLeft_toLeftOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintRight_toRightOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
+                app:layout_constraintTop_toTopOf="parent"
-
+                />
-            <TextView
-                android:id="@+id/titleView"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="16dp"
-                android:layout_marginTop="8dp"
-                android:layout_marginRight="16dp"
-                android:textAppearance="@style/TextAppearance.AppCompat.Headline"
-                android:textStyle="bold"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/imageView" />
 
             <TextView
                 android:id="@+id/source"
@@ -47,23 +36,40 @@
                 android:layout_marginRight="16dp"
                 android:textColor="?android:textColorSecondary"
                 android:textSize="12sp"
+                app:layout_constraintHorizontal_bias="0.0"
                 app:layout_constraintLeft_toLeftOf="parent"
                 app:layout_constraintRight_toRightOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/titleView" />
 
+            <TextView
+                android:id="@+id/titleView"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="16dp"
+                android:layout_marginRight="16dp"
+                android:layout_marginTop="8dp"
+                android:textAppearance="@style/TextAppearance.AppCompat.Headline"
+                android:textStyle="bold"
+                app:layout_constraintHorizontal_bias="0.0"
+                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintRight_toRightOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/imageView" />
+
+
             <WebView
                 android:id="@+id/webcontent"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="16dp"
-                android:layout_marginTop="24dp"
-                android:layout_marginRight="16dp"
-                android:background="?attr/webviewBackground"
-                android:paddingBottom="48dp"
                 android:textColorLink="?attr/colorAccent"
                 android:visibility="gone"
-                app:layout_constraintEnd_toEndOf="parent"
+                android:layout_marginLeft="16dp"
-                app:layout_constraintStart_toStartOf="parent"
+                android:layout_marginRight="16dp"
+                android:layout_marginTop="24dp"
+                android:paddingBottom="48dp"
+                android:background="?attr/webviewBackground"
+                app:layout_constraintHorizontal_bias="0.0"
+                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintRight_toRightOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/source"
                 tools:visibility="visible" />
 
@@ -74,10 +80,10 @@
     <FrameLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_gravity="start|bottom|end"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent">
+        app:layout_constraintLeft_toLeftOf="parent"
+        android:layout_gravity="end|bottom|right">
 
         <com.github.rubensousa.floatingtoolbar.FloatingToolbar
             android:id="@+id/floatingToolbar"
@@ -90,11 +96,12 @@
             android:id="@+id/fab"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_gravity="end|bottom"
+            android:layout_gravity="end|bottom|right"
-            android:layout_marginEnd="16dp"
             android:layout_marginBottom="16dp"
-            android:paddingTop="@dimen/activity_vertical_margin"
+            android:layout_marginEnd="16dp"
+            android:layout_marginRight="16dp"
             android:paddingBottom="@dimen/activity_vertical_margin"
+            android:paddingTop="@dimen/activity_vertical_margin"
             android:src="@drawable/ic_add_white_24dp"
             app:backgroundTint="?attr/colorAccent"
             app:fabSize="mini"
@@ -105,11 +112,11 @@
         android:id="@+id/progressBar"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:alpha="0.8"
+        android:visibility="gone"
         android:animateLayoutChanges="true"
+        android:alpha="0.8"
         android:background="@color/black"
-        android:clickable="false"
+        android:clickable="false">
-        android:visibility="gone">
 
         <ProgressBar
             style="?android:attr/progressBarStyleLarge"

androidApp/src/main/res/layout/fragment_image.xml

@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-        <com.github.chrisbanes.photoview.PhotoView
+    <com.github.chrisbanes.photoview.PhotoView
-            android:id="@+id/photoView"
+        android:id="@+id/photoView"
-            android:layout_width="match_parent"
+        android:layout_width="match_parent"
-            android:layout_height="match_parent"
+        android:layout_height="match_parent"
-            android:layout_centerVertical="true"
+        android:layout_centerVertical="true"
-            android:adjustViewBounds="true"
+        android:adjustViewBounds="true"
-            android:background="@drawable/checkerboard"
+        android:background="@drawable/checkerboard"
-            app:srcCompat="@android:drawable/screen_background_dark" />
+        app:srcCompat="@android:drawable/screen_background_dark" />
 
-</androidx.constraintlayout.widget.ConstraintLayout>
+</RelativeLayout>

androidApp/src/main/res/layout/list_item.xml

@@ -3,16 +3,17 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content">
+    android:layout_height="88dp">
 
     <ImageView
         android:id="@+id/itemImage"
         android:layout_width="46dp"
         android:layout_height="46dp"
         android:layout_marginStart="8dp"
-        app:layout_constraintBottom_toBottomOf="parent"
+        android:layout_marginTop="21dp"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toTopOf="parent"
+        android:layout_marginLeft="8dp" />
 
     <TextView
         android:id="@+id/title"
@@ -23,30 +24,39 @@
         android:layout_marginEnd="16dp"
         android:ellipsize="end"
         android:fontFamily="sans-serif"
+        android:gravity="start"
         android:maxLines="3"
         android:textAlignment="viewStart"
-        android:textColor="?android:textColorPrimary"
+        android:textAllCaps="false"
         android:textSize="16sp"
         android:textStyle="bold"
+        android:textColor="?android:textColorPrimary"
         app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintStart_toEndOf="@+id/itemImage"
         app:layout_constraintTop_toTopOf="parent"
-        tools:text="Titre" />
+        tools:text="Titre"
+        android:layout_marginLeft="8dp"
+        android:layout_marginRight="16dp" />
 
     <TextView
         android:id="@+id/sourceTitleAndDate"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="8dp"
+        android:layout_marginTop="66dp"
         android:layout_marginEnd="16dp"
         android:gravity="start"
         android:maxLines="1"
         android:textAlignment="viewStart"
-        android:textColor="?android:textColorPrimary"
         android:textSize="14sp"
+        android:textColor="?android:textColorPrimary"
         app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintStart_toEndOf="@+id/itemImage"
-        app:layout_constraintTop_toBottomOf="@+id/itemImage"
+        app:layout_constraintTop_toTopOf="parent"
-        tools:text="Google Actualité Il y a 5h" />
+        tools:text="Google Actualité Il y a 5h"
+        android:layout_marginLeft="8dp"
+        android:layout_marginRight="16dp" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>

androidApp/src/main/res/layout/source_list_item.xml

@@ -12,9 +12,9 @@
         style="@style/Widget.AppCompat.Button.Borderless"
         android:layout_width="48dp"
         android:layout_height="wrap_content"
-        android:layout_marginTop="8dp"
-        android:layout_marginEnd="8dp"
         android:layout_marginBottom="8dp"
+        android:layout_marginEnd="8dp"
+        android:layout_marginTop="8dp"
         android:background="@drawable/ic_remove_circle_outline_black_24dp"
         android:backgroundTint="?android:textColorSecondary"
         android:contentDescription="@string/remove_source"
@@ -29,48 +29,48 @@
         android:id="@+id/itemImage"
         android:layout_width="36dp"
         android:layout_height="36dp"
-        android:layout_marginStart="8dp"
-        android:layout_marginTop="8dp"
         android:layout_marginBottom="8dp"
+        android:layout_marginLeft="8dp"
+        android:layout_marginTop="8dp"
         android:importantForAccessibility="no"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintVertical_bias="0.0" />
 
     <TextView
         android:id="@+id/sourceTitle"
         android:layout_width="0dp"
-        android:layout_height="wrap_content"
+        android:layout_height="17dp"
         android:layout_marginStart="8dp"
         android:ellipsize="end"
+        android:gravity="start"
         android:maxLines="1"
-        android:textAlignment="viewStart"
+        android:textAlignment="textStart"
         android:textColor="?android:textColorPrimary"
-        android:textSize="20sp"
+        android:textSize="13sp"
-        android:textStyle="bold"
         app:layout_constraintBottom_toTopOf="@+id/errorText"
         app:layout_constraintEnd_toStartOf="@+id/deleteBtn"
         app:layout_constraintStart_toEndOf="@+id/itemImage"
         app:layout_constraintTop_toTopOf="parent"
-        tools:text="Source title" />
+        tools:text="source title" />
 
     <TextView
         android:id="@+id/errorText"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginStart="10sp"
-        android:layout_marginTop="8dp"
         android:layout_marginBottom="8dp"
+        android:layout_marginEnd="16dp"
+        android:layout_marginStart="16dp"
+        android:layout_marginTop="8dp"
         android:textAppearance="@style/TextAppearance.AppCompat.Small"
         android:textColor="@color/red"
-        android:textStyle="italic"
         android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@+id/deleteBtn"
+        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/itemImage"
-        tools:text="Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua."
+        tools:text="Test"
         tools:visibility="visible" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>

androidApp/src/main/res/menu/reader_toolbar_no_read.xml

@@ -1,16 +0,0 @@
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <item
-        android:id="@+id/open_action"
-        android:icon="@drawable/ic_open_in_browser_white_24dp"
-        android:title="@string/reader_action_open"
-        app:showAsAction="ifRoom" />
-
-    <item
-        android:id="@+id/share_action"
-        android:icon="@drawable/ic_share_white_24dp"
-        android:title="@string/reader_action_share"
-        app:showAsAction="ifRoom" />
-
-</menu>

androidApp/src/main/res/values/colors.xml

@@ -12,5 +12,4 @@
     <color name="refresh_progress_2">@color/colorAccent</color>
     <color name="refresh_progress_3">@color/pink</color>
     <color name="dark">#FF282828</color>
-    <color name="transparent_dark_background">#33000000</color>
 </resources>

androidApp/src/main/res/values/styles.xml

@@ -26,10 +26,4 @@
         <item name="android:textColorSecondary">@color/white</item>
         <item name="actionMenuTextColor">@color/white</item>
     </style>
-
-    <style name="Theme.AppCompat.ImageActivity" parent="NoBar">
-        <item name="android:windowBackground">@color/transparent_dark_background</item>
-        <item name="android:colorBackgroundCacheHint">@null</item>
-        <item name="android:windowIsTranslucent">true</item>
-    </style>
 </resources>

androidApp/src/main/res/xml/image_close_scene.xml

@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<MotionScene xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:motion="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/motionLayout">
-
-    <Transition
-        motion:constraintSetStart="@+id/start"
-        motion:constraintSetEnd="@+id/end"
-        motion:duration="500"
-        motion:motionInterpolator="linear">
-
-        <OnSwipe
-            motion:touchAnchorId="@+id/scrollView"
-            motion:touchAnchorSide="top"
-            motion:onTouchUp="autoCompleteToStart" />
-    </Transition>
-
-    <ConstraintSet android:id="@+id/start">
-
-        <Constraint
-            android:id="@id/scrollView"
-            motion:layout_constraintBottom_toBottomOf="parent"
-            motion:layout_constraintTop_toBottomOf="@+id/appBarLayout"
-            motion:layout_constraintEnd_toEndOf="parent"
-            motion:layout_constraintStart_toStartOf="parent">
-        </Constraint>
-    </ConstraintSet>
-
-    <ConstraintSet android:id="@+id/end">
-
-        <Constraint
-            android:id="@+id/scrollView"
-            android:layout_width="100dp"
-            android:layout_height="100dp"
-            android:layout_marginBottom="0dp"
-            motion:layout_constraintStart_toStartOf="parent"
-            motion:layout_constraintBottom_toBottomOf="parent"
-            motion:layout_constraintEnd_toEndOf="parent">
-        </Constraint>
-    </ConstraintSet>
-</MotionScene>

androidApp/src/test/kotlin/RepositoryTest.kt

@@ -18,20 +18,6 @@ import org.junit.Assert.assertNotEquals
 import org.junit.Before
 import org.junit.Test
 
-private const val BASE_URL = "https://test.com/selfoss/"
-
-private const val USERNAME = "username"
-
-private const val SPOUT = "spouts\\rss\\fulltextrss"
-
-private const val IMAGE_URL = "b3aa8a664d08eb15d6ff1db2fa83e0d9.png"
-
-private const val IMAGE_URL_2 = "d8c92cdb1ef119ea85c4b9205c879ca7.png"
-
-private const val FEED_URL = "https://test.com/feed"
-
-private const val TAGS = "Test, New"
-
 class RepositoryTest {
     private val db = mockk<ReaderForSelfossDB>(relaxed = true)
     private val appSettingsService = mockk<AppSettingsService>()
@@ -51,7 +37,7 @@ class RepositoryTest {
         repository = Repository(api, appSettingsService, isConnectionAvailable, db)
 
         runBlocking {
-            repository.updateApiInformation()
+            repository.updateApiVersion()
         }
     }
 
@@ -59,14 +45,13 @@ class RepositoryTest {
     fun setup() {
         clearAllMocks()
         every { appSettingsService.getApiVersion() } returns 4
-        every { appSettingsService.getBaseUrl() } returns BASE_URL
+        every { appSettingsService.getBaseUrl() } returns "https://test.com/selfoss/"
-        every { appSettingsService.getUserName() } returns USERNAME
         every { appSettingsService.isItemCachingEnabled() } returns false
         every { appSettingsService.isUpdateSourcesEnabled() } returns false
 
-        coEvery { api.apiInformation() } returns StatusAndData(
+        coEvery { api.version() } returns StatusAndData(
             success = true,
-            data = SelfossModel.ApiInformation("2.19-ba1e8e3", "4.0.0", SelfossModel.ApiConfiguration(false, true))
+            data = SelfossModel.ApiVersion("2.19-ba1e8e3", "4.0.0")
         )
         coEvery { api.stats() } returns StatusAndData(
             success = true,
@@ -84,7 +69,7 @@ class RepositoryTest {
     fun instantiate_repository() {
         initializeRepository()
 
-        coVerify(exactly = 1) { api.apiInformation() }
+        coVerify(exactly = 1) { api.version() }
     }
 
     @Test
@@ -93,7 +78,7 @@ class RepositoryTest {
 
         initializeRepository(MutableStateFlow(false))
 
-        coVerify(exactly = 0) { api.apiInformation() }
+        coVerify(exactly = 0) { api.version() }
         coVerify(exactly = 0) { api.stats() }
     }
 
@@ -113,70 +98,10 @@ class RepositoryTest {
         verify(exactly = 1) { appSettingsService.updateApiVersion(4) }
     }
 
-    @Test
-    fun get_public_access() {
-        every { appSettingsService.updatePublicAccess(any()) } returns Unit
-        coEvery { api.apiInformation() } returns StatusAndData(
-            success = true,
-            data = SelfossModel.ApiInformation("2.19-ba1e8e3", "4.0.0", SelfossModel.ApiConfiguration(true, true))
-        )
-        every { appSettingsService.getUserName() } returns ""
-
-        initializeRepository()
-
-        coVerify(exactly = 1) { api.apiInformation() }
-        coVerify(exactly = 1) { appSettingsService.updatePublicAccess(true) }
-    }
-
-    @Test
-    fun get_public_access_username_not_empty() {
-        every { appSettingsService.updatePublicAccess(any()) } returns Unit
-        coEvery { api.apiInformation() } returns StatusAndData(
-            success = true,
-            data = SelfossModel.ApiInformation("2.19-ba1e8e3", "4.0.0", SelfossModel.ApiConfiguration(true, true))
-        )
-        every { appSettingsService.getUserName() } returns "username"
-
-        initializeRepository()
-
-        coVerify(exactly = 1) { api.apiInformation() }
-        coVerify(exactly = 0) { appSettingsService.updatePublicAccess(true) }
-    }
-
-    @Test
-    fun get_public_access_no_auth() {
-        every { appSettingsService.updatePublicAccess(any()) } returns Unit
-        coEvery { api.apiInformation() } returns StatusAndData(
-            success = true,
-            data = SelfossModel.ApiInformation("2.19-ba1e8e3", "4.0.0", SelfossModel.ApiConfiguration(true, false))
-        )
-        every { appSettingsService.getUserName() } returns ""
-
-        initializeRepository()
-
-        coVerify(exactly = 1) { api.apiInformation() }
-        coVerify(exactly = 0) { appSettingsService.updatePublicAccess(true) }
-    }
-
-    @Test
-    fun get_public_access_disabled() {
-        every { appSettingsService.updatePublicAccess(any()) } returns Unit
-        coEvery { api.apiInformation() } returns StatusAndData(
-            success = true,
-            data = SelfossModel.ApiInformation("2.19-ba1e8e3", "4.0.0", SelfossModel.ApiConfiguration(false, true))
-        )
-        every { appSettingsService.getUserName() } returns ""
-
-        initializeRepository()
-
-        coVerify(exactly = 1) { api.apiInformation() }
-        coVerify(exactly = 0) { appSettingsService.updatePublicAccess(true) }
-    }
-
     @Test
     fun get_api_1_date_with_api_4_version_stored() {
         every { appSettingsService.getApiVersion() } returns 4
-        coEvery { api.apiInformation() } returns StatusAndData(success = false, null)
+        coEvery { api.version() } returns StatusAndData(success = false, null)
         val itemParameters = FakeItemParameters()
         itemParameters.datetime = "2021-04-23 11:45:32"
         coEvery { api.getItems(any(), any(), any(), any(), any(), any(), any()) } returns
@@ -304,9 +229,9 @@ class RepositoryTest {
             1,
             "Test",
             listOf("tags"),
-            SPOUT,
+            "spouts\\rss\\fulltextrss",
             "",
-            IMAGE_URL,
+            "b3aa8a664d08eb15d6ff1db2fa83e0d9.png",
             SelfossModel.SourceParams("url")
         ))
         runBlocking {
@@ -625,18 +550,18 @@ class RepositoryTest {
                 1,
                 "First source",
                 listOf("Test", "second"),
-                SPOUT,
+                "spouts\\rss\\fulltextrss",
                 "",
-                IMAGE_URL_2,
+                "d8c92cdb1ef119ea85c4b9205c879ca7.png",
                 SelfossModel.SourceParams("url")
             ),
             SelfossModel.Source(
                 2,
                 "Second source",
                 listOf("second"),
-                SPOUT,
+                "spouts\\rss\\fulltextrss",
                 "",
-                IMAGE_URL,
+                "b3aa8a664d08eb15d6ff1db2fa83e0d9.png",
                 SelfossModel.SourceParams("url")
             )
         )
@@ -645,18 +570,18 @@ class RepositoryTest {
                 "1",
                 "First DB source",
                 "Test,second",
-                SPOUT,
+                "spouts\\rss\\fulltextrss",
                 "",
-                IMAGE_URL_2,
+                "d8c92cdb1ef119ea85c4b9205c879ca7.png",
                 "url"
             ),
             SOURCE(
                 "2",
                 "Second source",
                 "second",
-                SPOUT,
+                "spouts\\rss\\fulltextrss",
                 "",
-                IMAGE_URL,
+                "b3aa8a664d08eb15d6ff1db2fa83e0d9.png",
                 "url"
             )
         )
@@ -795,9 +720,9 @@ class RepositoryTest {
         runBlocking {
             response = repository.createSource(
                 "test",
-                FEED_URL,
+                "https://test.com/feed",
-                SPOUT,
+                "spouts\\rss\\fulltextrss",
-                TAGS,
+                "Test, New",
             )
         }
 
@@ -822,9 +747,9 @@ class RepositoryTest {
         runBlocking {
             response = repository.createSource(
                 "test",
-                FEED_URL,
+                "https://test.com/feed",
-                SPOUT,
+                "spouts\\rss\\fulltextrss",
-                TAGS
+                "Test, New"
             )
         }
 
@@ -849,9 +774,9 @@ class RepositoryTest {
         runBlocking {
             response = repository.createSource(
                 "test",
-                FEED_URL,
+                "https://test.com/feed",
-                SPOUT,
+                "spouts\\rss\\fulltextrss",
-                TAGS
+                "Test, New"
             )
         }
 
@@ -1027,12 +952,12 @@ class RepositoryTest {
         coEvery { appSettingsService.refreshLoginInformation(any(), any(), any()) } returns Unit
 
         initializeRepository()
-        repository.refreshLoginInformation(BASE_URL, "login", "password")
+        repository.refreshLoginInformation("https://test.com/selfoss/", "login", "password")
 
         coVerify(exactly = 1) { api.refreshLoginInformation() }
         coVerify(exactly = 1) {
             appSettingsService.refreshLoginInformation(
-                BASE_URL,
+                "https://test.com/selfoss/",
                 "login",
                 "password"
             )
@@ -1106,9 +1031,9 @@ class RepositoryTest {
                 1,
                 "First source",
                 listOf("Test", "second"),
-                SPOUT,
+                "spouts\\rss\\fulltextrss",
                 "",
-                IMAGE_URL_2,
+                "d8c92cdb1ef119ea85c4b9205c879ca7.png",
                 SelfossModel.SourceParams("url")
             )
         )

build.gradle.kts

@@ -7,8 +7,8 @@ buildscript {
 
 plugins {
     //trick: for the same plugin versions in all sub-modules
-    id("com.android.application").version("7.4.0").apply(false)
+    id("com.android.application").version("7.3.1").apply(false)
-    id("com.android.library").version("7.4.0").apply(false)
+    id("com.android.library").version("7.3.1").apply(false)
     kotlin("android").version("1.7.20").apply(false)
     kotlin("multiplatform").version("1.7.20").apply(false)
     id("com.mikepenz.aboutlibraries.plugin").version("10.5.1").apply(false)

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Mon Jan 23 20:47:46 CET 2023
+#Wed Feb 09 17:05:19 CET 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME

shared/src/commonMain/kotlin/bou/amine/apps/readerforselfossv2/DI/modules.kt

@@ -9,6 +9,7 @@ import org.kodein.di.instance
 import org.kodein.di.singleton
 
 val networkModule by DI.Module {
+    bind<AppSettingsService>() with singleton { AppSettingsService() }
     bind<SelfossApi>() with singleton { SelfossApi(instance()) }
     bind<MercuryApi>() with singleton { MercuryApi() }
 }

shared/src/commonMain/kotlin/bou/amine/apps/readerforselfossv2/model/MercuryModel.kt

@@ -8,7 +8,7 @@ class MercuryModel {
     class ParsedContent(
         val title: String?,
         val content: String?,
-        val lead_image_url: String?, // NOSONAR
+        val lead_image_url: String?,
         val url: String
     )
 }

shared/src/commonMain/kotlin/bou/amine/apps/readerforselfossv2/model/SelfossModel.kt

@@ -35,32 +35,17 @@ class SelfossModel {
     )
 
     @Serializable
-    data class ApiInformation(
+    data class ApiVersion(
         val version: String?,
-        val apiversion: String?,
+        val apiversion: String?
-        val configuration: ApiConfiguration?
     ) {
-        fun getApiMajorVersion(): Int {
+        fun getApiMajorVersion() : Int {
             var versionNumber = 0
             if (apiversion != null) {
                 versionNumber = apiversion.substringBefore(".").toInt()
             }
             return versionNumber
         }
-
-        fun getApiConfiguration() = configuration ?: ApiConfiguration(null, null)
-    }
-
-    @Serializable
-    data class ApiConfiguration(
-        @Serializable(with = BooleanSerializer::class)
-        val publicMode: Boolean?,
-        @Serializable(with = BooleanSerializer::class)
-        val authEnabled: Boolean?
-    ) {
-        fun isAuthEnabled() = authEnabled ?: true
-
-        fun isPublicModeEnabled() = publicMode ?: false
     }
 
     @Serializable
@@ -96,13 +81,19 @@ class SelfossModel {
         val tags: List<String>,
         val author: String?
     ) {
+        // TODO: maybe find a better way to handle these kind of urls
         fun getLinkDecoded(): String {
             var stringUrl: String
-            stringUrl = if (link.contains("//news.google.com/news/") && link.contains("&amp;url=")) {
+            stringUrl =
-                link.substringAfter("&amp;url=")
+                if (link.startsWith("http://news.google.com/news/") || link.startsWith("https://news.google.com/news/")) {
-            } else {
+                    if (link.contains("&amp;url=")) {
-                this.link.replace("&amp;", "&")
+                        link.substringAfter("&amp;url=")
-            }
+                    } else {
+                        this.link.replace("&amp;", "&")
+                    }
+                } else {
+                    this.link.replace("&amp;", "&")
+                }
 
             // handle :443 => https
             if (stringUrl.contains(":443")) {

shared/src/commonMain/kotlin/bou/amine/apps/readerforselfossv2/repository/RepositoryImpl.kt

@@ -51,7 +51,9 @@ class Repository(
     private var _selectedSource: SelfossModel.Source? = null
 
     suspend fun getNewerItems(): ArrayList<SelfossModel.Item> {
+        // TODO: Use the updatedSince parameter
         var fetchedItems: StatusAndData<List<SelfossModel.Item>> = StatusAndData.error()
+        var fromDB = false
         if (isNetworkAvailable()) {
             fetchedItems = api.getItems(
                 displayedItems.type,
@@ -61,27 +63,31 @@ class Repository(
                 searchFilter,
                 null
             )
-        } else if (appSettingsService.isItemCachingEnabled()) {
+        } else {
-            var dbItems = getDBItems().filter {
+            if (appSettingsService.isItemCachingEnabled()) {
-                displayedItems == ItemType.ALL ||
+                fromDB = true
-                        (it.unread && displayedItems == ItemType.UNREAD) ||
+                var dbItems = getDBItems().filter {
-                        (it.starred && displayedItems == ItemType.STARRED)
+                    displayedItems == ItemType.ALL ||
+                            (it.unread && displayedItems == ItemType.UNREAD) ||
+                            (it.starred && displayedItems == ItemType.STARRED)
+                }
+                if (tagFilter.value != null) {
+                    dbItems = dbItems.filter { it.tags.split(',').contains(tagFilter.value!!.tag) }
+                }
+                if (sourceFilter.value != null) {
+                    dbItems = dbItems.filter { it.sourcetitle == sourceFilter.value!!.title }
+                }
+                fetchedItems = StatusAndData.succes(
+                    dbItems.map { it.toView() }
+                )
             }
-            if (tagFilter.value != null) {
-                dbItems = dbItems.filter { it.tags.split(',').contains(tagFilter.value!!.tag) }
-            }
-            if (sourceFilter.value != null) {
-                dbItems = dbItems.filter { it.sourcetitle == sourceFilter.value!!.title }
-            }
-            val itemsList = ArrayList(dbItems.map { it.toView() })
-            itemsList.sortByDescending { DateUtils.parseDate(it.datetime) }
-            fetchedItems = StatusAndData.succes(
-                itemsList
-            )
         }
 
         if (fetchedItems.success && fetchedItems.data != null) {
             items = ArrayList(fetchedItems.data!!)
+            if (fromDB) {
+                items.sortByDescending { DateUtils.parseDate(it.datetime) }
+            }
         }
         return items
     }
@@ -167,13 +173,14 @@ class Repository(
         }
     }
 
+    // TODO: Add tests
     suspend fun getSpouts(): Map<String, SelfossModel.Spout> {
         return if (isNetworkAvailable()) {
             val spouts = api.spouts()
             if (spouts.success && spouts.data != null) {
                 spouts.data
             } else {
-                emptyMap()
+                emptyMap() // TODO: do something here
             }
         } else {
             throw NetworkUnavailableException()
@@ -199,6 +206,7 @@ class Repository(
         }
     }
 
+    // TODO: Add tests
     suspend fun markAsRead(item: SelfossModel.Item): Boolean {
         val success = markAsReadById(item.id)
 
@@ -217,6 +225,7 @@ class Repository(
         }
     }
 
+    // TODO: Add tests
     suspend fun unmarkAsRead(item: SelfossModel.Item): Boolean {
         val success = unmarkAsReadById(item.id)
 
@@ -235,6 +244,7 @@ class Repository(
         }
     }
 
+    // TODO: Add tests
     suspend fun starr(item: SelfossModel.Item): Boolean {
         val success = starrById(item.id)
 
@@ -253,6 +263,7 @@ class Repository(
         }
     }
 
+    // TODO: Add tests
     suspend fun unstarr(item: SelfossModel.Item): Boolean {
         val success = unstarrById(item.id)
 
@@ -271,6 +282,7 @@ class Repository(
         }
     }
 
+    // TODO: Add tests
     suspend fun markAllAsRead(items: ArrayList<SelfossModel.Item>): Boolean {
         var success = false
 
@@ -439,23 +451,13 @@ class Repository(
         api.refreshLoginInformation()
     }
 
-    suspend fun updateApiInformation() {
+    suspend fun updateApiVersion() {
         val apiMajorVersion = appSettingsService.getApiVersion()
 
         if (isNetworkAvailable()) {
-            val fetchedInformation = api.apiInformation()
+            val fetchedVersion = api.version()
-            if (fetchedInformation.success && fetchedInformation.data != null) {
+            if (fetchedVersion.success && fetchedVersion.data != null && fetchedVersion.data.getApiMajorVersion() != apiMajorVersion) {
-                if (fetchedInformation.data.getApiMajorVersion() != apiMajorVersion) {
+                appSettingsService.updateApiVersion(fetchedVersion.data.getApiMajorVersion())
-                    appSettingsService.updateApiVersion(fetchedInformation.data.getApiMajorVersion())
-                }
-                // Check if we're accessing the instance in public mode
-                // This happens when auth and public mode are enabled but
-                // no credentials are provided to login
-                if (appSettingsService.getUserName().isEmpty()
-                    && fetchedInformation.data.getApiConfiguration().isAuthEnabled()
-                    && fetchedInformation.data.getApiConfiguration().isPublicModeEnabled()) {
-                    appSettingsService.updatePublicAccess(true)
-                }
             }
         }
     }
@@ -540,6 +542,7 @@ class Repository(
         return emptyList()
     }
 
+    // TODO: Add tests
     suspend fun handleDBActions() {
 
         val actions: List<ACTION> = getDBActions()

shared/src/commonMain/kotlin/bou/amine/apps/readerforselfossv2/rest/SelfossApi.kt

@@ -191,7 +191,7 @@ class SelfossApi(private val appSettingsService: AppSettingsService) {
             }
         })
 
-    suspend fun apiInformation(): StatusAndData<SelfossModel.ApiInformation> =
+    suspend fun version(): StatusAndData<SelfossModel.ApiVersion> =
         bodyOrFailure(client.tryToGet(url("/api/about")))
 
     suspend fun markAsRead(id: String): SuccessResponse =

shared/src/commonMain/kotlin/bou/amine/apps/readerforselfossv2/service/ACRASettings.kt

@@ -1,70 +0,0 @@
-package bou.amine.apps.readerforselfossv2.service
-
-import com.russhwolf.settings.Settings
-
-// This will be used in ACRA process. For now, it does nothing.
-// This is to fix ACRA not sending reports anymore.
-// See https://www.acra.ch/docs/Troubleshooting-Guide#applicationoncreate
-class ACRASettings : Settings {
-    override val keys: Set<String> = emptySet()
-    override val size: Int = 0
-
-    override fun clear() {
-        // Nothing
-    }
-
-    override fun getBoolean(key: String, defaultValue: Boolean): Boolean = false
-
-    override fun getBooleanOrNull(key: String): Boolean? = null
-
-    override fun getDouble(key: String, defaultValue: Double): Double = 0.0
-
-    override fun getDoubleOrNull(key: String): Double? = null
-
-    override fun getFloat(key: String, defaultValue: Float): Float = 0.0F
-
-    override fun getFloatOrNull(key: String): Float? = null
-
-    override fun getInt(key: String, defaultValue: Int): Int = 0
-
-    override fun getIntOrNull(key: String): Int? = null
-
-    override fun getLong(key: String, defaultValue: Long): Long = 0
-
-    override fun getLongOrNull(key: String): Long? = null
-
-    override fun getString(key: String, defaultValue: String): String = "0"
-
-    override fun getStringOrNull(key: String): String? = null
-
-    override fun hasKey(key: String): Boolean = false
-
-    override fun putBoolean(key: String, value: Boolean) {
-        // Nothing
-    }
-
-    override fun putDouble(key: String, value: Double) {
-        // Nothing
-    }
-
-    override fun putFloat(key: String, value: Float) {
-        // Nothing
-    }
-
-    override fun putInt(key: String, value: Int) {
-        // Nothing
-    }
-
-    override fun putLong(key: String, value: Long) {
-        // Nothing
-    }
-
-    override fun putString(key: String, value: String) {
-        // Nothing
-    }
-
-    override fun remove(key: String) {
-        // Nothing
-    }
-
-}

shared/src/commonMain/kotlin/bou/amine/apps/readerforselfossv2/service/AppSettingsService.kt

@@ -1,13 +1,14 @@
 package bou.amine.apps.readerforselfossv2.service
 
 import com.russhwolf.settings.Settings
+import io.github.aakira.napier.Napier
+import io.ktor.client.plugins.*
 
-class AppSettingsService(acraSenderServiceProcess: Boolean = false) {
+class AppSettingsService {
-    val settings: Settings = if (acraSenderServiceProcess) { ACRASettings() } else { Settings() }
+    val settings: Settings = Settings()
 
     // Api related
     private var _apiVersion: Int = -1
-    private var _publicAccess: Boolean? = null
     private var _baseUrl: String = ""
     private var _userName: String = ""
     private var _password: String = ""
@@ -49,32 +50,10 @@ class AppSettingsService(acraSenderServiceProcess: Boolean = false) {
         return _apiVersion
     }
 
-
-    fun updateApiVersion(apiMajorVersion: Int) {
-        settings.putInt(API_VERSION_MAJOR, apiMajorVersion)
-        refreshApiVersion()
-    }
-
     private fun refreshApiVersion() {
         _apiVersion = settings.getInt(API_VERSION_MAJOR, -1)
     }
 
-    fun getPublicAccess(): Boolean {
-        if (_publicAccess == null) {
-            refreshPublicAccess()
-        }
-        return _publicAccess!!
-    }
-
-    fun updatePublicAccess(publicAccess: Boolean) {
-        settings.putBoolean(API_PUBLIC_ACCESS, publicAccess)
-        refreshPublicAccess()
-    }
-
-    private fun refreshPublicAccess() {
-        _publicAccess = settings.getBoolean(API_PUBLIC_ACCESS, false)
-    }
-
     fun getBaseUrl(): String {
         if (_baseUrl.isEmpty()) {
             refreshBaseUrl()
@@ -356,7 +335,6 @@ class AppSettingsService(acraSenderServiceProcess: Boolean = false) {
         refreshUsername()
         refreshBaseUrl()
         refreshApiVersion()
-        refreshPublicAccess()
     }
 
     fun refreshUserSettings() {
@@ -400,6 +378,11 @@ class AppSettingsService(acraSenderServiceProcess: Boolean = false) {
         refreshApiSettings()
     }
 
+    fun updateApiVersion(apiMajorVersion: Int) {
+        settings.putInt(API_VERSION_MAJOR, apiMajorVersion)
+        refreshApiVersion()
+    }
+
     fun clearAll() {
         settings.clear()
         refreshApiSettings()
@@ -428,8 +411,6 @@ class AppSettingsService(acraSenderServiceProcess: Boolean = false) {
 
         const val API_VERSION_MAJOR = "apiVersionMajor"
 
-        const val API_PUBLIC_ACCESS = "apiPublicAccess"
-
         const val API_ITEMS_NUMBER = "prefer_api_items_number"
 
         const val API_TIMEOUT = "api_timeout"