Changelog.

New Crowdin translations

.github/CONTRIBUTING.md

@@ -10,7 +10,7 @@ Please read the guidelines before contributing, and follow them (or try to) when
 
 There are many ways to contribute to this project, you could report bugs, request missing features, suggest enhancements and changes to existing ones. You also can improve the README with useful tips that could help the other users.
 
-You can fork the repository, and [help me solve some issues](https://github.com/aminecmi/ReaderforSelfoss/labels/help%20wanted) or [develop new things](https://github.com/aminecmi/ReaderforSelfoss/issues)
+You can fork the repository, and [help me solve some issues](https://github.com/aminecmi/ReaderforSelfoss/issues?q=is%3Aissue+is%3Aopen+label%3A%22Up+For+Grabs%22) or [develop new things](https://github.com/aminecmi/ReaderforSelfoss/issues)
 
 ### What I can't help you with.
 
@@ -31,7 +31,7 @@ Always check if the web version of your instance is working.
 * Please ask before starting to work on an issue. I may be working on it, or someone else could be doing so.
 * Each pull request should implement **ONE** feature or bugfix. Keep in mind that you can submit as many PR as you want.
 * Your code must be simple and clear enough to avoid using comments to explain what it does.
-* Follow the used coding style [the official one](https://kotlinlang.org/docs/reference/coding-conventions.html) ([some idoms for reference](http://kotlinlang.org/docs/reference/idioms.html)) with more to come.
+* Follow the used coding style [the android koding style](https://android.github.io/kotlin-guides/style.html) ([some idoms for reference](http://kotlinlang.org/docs/reference/idioms.html)) with more to come.
 * Try as much as possible to write a test for your feature, and if you do so, run it, and make it work.
 * Always check your changes and discard the ones that are irrelevant to your feature or bugfix.
 * Have meaningful commit messages.
@@ -48,12 +48,13 @@ You'll have to:
 
 - Configure fabric and add your `apiKey` and `apiSecret` in the `fabric.properties` file.
 - Create a firebase project and add the `google-services.json` to the `app/` folder.
-- Define the following some parameters either in `~/.gradle/gradle.properties` or as gradle parameters (see the examples)
+- Define some parameters either in `~/.gradle/gradle.properties` or as gradle parameters (see the examples)
 
     - mercuryApiKey: A [Mercury](https://mercury.postlight.com/web-parser/) web parser api key for the internal browser
     - feedbackEmail: An email to receive users  feedback.
     - sourceUrl: an url to the source code, used in the settings. **It can be empty.**
     - trackerUrl: an url to the tracker, used in the settings. **It can be empty.**
+    - githubToken: a github token used to report issues from within the app. [Details  here](https://github.com/heinrichreimer/android-issue-reporter#how-to-create-a-bot-key). **It can be empty.** 
     - appLoginUrl, appLoginUsername and appLoginPassword: url, username and password of a selfoss instance. **These are only used for tests. They can be empty if you don't test API calls.**
 
 ### Examples:
@@ -67,10 +68,11 @@ mercuryApiKey="LONGAPIKEY"
 feedbackEmail="EMAIL"
 sourceUrl="URLSOURCE" # It can be empty.
 trackerUrl="URLTRACKER" # It can be empty.
+githubToken="GITHUBTOKEN" # It can be empty or use https://github.com/heinrichreimer/android-issue-reporter#how-to-create-a-bot-key to generate one
 ```
 
 #### As gradle parameters
 
 ```
-./gradlew .... -P appLoginUrl="URL" -P appLoginUsername="LOGIN" -P appLoginPassword="PASS" -P mercuryApiKey="LONGAPIKEY" -P feedbackEmail="EMAIL" -P sourceUrl="URLSOURCE" -P trackerUrl="URLTRACKER"
+./gradlew .... -P appLoginUrl="URL" -P appLoginUsername="LOGIN" -P appLoginPassword="PASS" -P mercuryApiKey="LONGAPIKEY" -P feedbackEmail="EMAIL" -P sourceUrl="URLSOURCE" -P trackerUrl="URLTRACKER" -P githubToken="GITHUBTOKEN"
 ```

CHANGELOG.md

@@ -1,3 +1,111 @@
+**1.5.4.18**
+
+- Typo fix.
+
+- The real last infinite scroll bug fix.
+
+- Simplified Chinese translation !
+
+**1.5.4.17**
+
+- Fixed the last bug with infinite scroll.
+
+**1.5.4.16**
+
+- Fixing list view displaying issues.
+
+- Endless scroll is not in beta anymore.
+
+**1.5.4.15**
+
+- Fixed an issue with the sources list.
+
+**1.5.4.14**
+
+- Fixing infinite scroll trying to load more items when there are no more.
+
+**1.5.4.13**
+
+- Displaying the right number of items.
+
+- Fixing infinite scroll remaining issues. Should be stable enough.
+
+**1.5.4.12**
+
+- Fixed fab and toolbar issue (#113)
+
+- Fixed links clickable (#114)
+
+- Changed the link colors in the article viewer
+
+**1.5.4.11**
+
+- Hiding FABs on scroll.
+
+- Closing #109 (code cleaning)
+
+- Hiding fabs on scroll (#101)
+
+**1.5.4.10**
+
+- Displaying a loader when "reading more" in the article viewer.
+
+- Displaying the thumbnail instead of icon on the article viewer.
+
+- Scrolling to top when loading content with the "read more" button.
+
+**1.5.4.09**
+
+- Using the kotlin wrapper for the material drawer (see #98 for more details).
+
+- Updated support libraries
+
+- Changed the Floating Action Button to the support library version.
+
+- New reader activity action bar #103.
+
+**1.5.4.08**
+
+- Thanks @jrafaelsantana for translating the whole app in Brazilian Portuguese.
+
+**1.5.4.07**
+
+- Loading more items on swipe too.
+
+- Fixed popup menu style. User may need to reselect the theme.
+
+- Disabled reporting marking items as read if there isn't an issue.
+
+**1.5.4.05/06**
+
+- Translation fix.
+
+**1.5.4.04**
+
+- Fixing an issue with marking items as read (something related to an old version of selfoss).
+
+**1.5.4.03**
+
+- Trying to fix some issue with pre-launch reports. Reverted because it seems to be related to the dev console side.
+
+**1.5.4.02**
+
+- Fixing full height cards issue.
+
+**1.5.4.01**
+
+- Removed the "apk downloaded from outside of playstore" message.
+
+- Versions update.
+
+- HTML viewer version update. It should fix an issue with images.
+
+- Some code cleaning.
+
+**1.5.4.00**
+
+- Added issue reporting from within the app.
+
 **1.5.3.06**
 
 - Fixed infinite scroll not working.

README.md

@@ -4,7 +4,7 @@
 
 [![Build Status](http://jenkins.amine-bou.fr/job/ReaderForSelfoss/badge/icon)](http://jenkins.amine-bou.fr/job/ReaderForSelfoss/)
 
-[![codebeat badge](https://codebeat.co/badges/bce66c0f-fd28-4341-a159-3b6dd22ac854)](https://codebeat.co/projects/github-com-aminecmi-readerforselfoss-master) [![Code Triagers Badge](https://www.codetriage.com/aminecmi/readerforselfoss/badges/users.svg)](https://www.codetriage.com/aminecmi/readerforselfoss)
+[![Code Triagers Badge](https://www.codetriage.com/aminecmi/readerforselfoss/badges/users.svg)](https://www.codetriage.com/aminecmi/readerforselfoss)
 
 This is the repo of [Reader For Selfoss](https://play.google.com/store/apps/details?id=apps.amine.bou.readerforselfoss&hl=en).
 
@@ -22,3 +22,5 @@ Check the [Contribution guide](https://github.com/aminecmi/ReaderforSelfoss/blob
 - [Check what changed](https://github.com/aminecmi/ReaderforSelfoss/blob/master/CHANGELOG.md)
 - [See what I'm doing](https://github.com/aminecmi/ReaderforSelfoss/projects/1)
 - [Create an issue, or request a new feature](https://github.com/aminecmi/ReaderforSelfoss/issues)
+- [Help translation the app](https://crowdin.com/project/readerforselfoss)
+- [Ask for help](https://gitter.im/amine-bou/ReaderForSelfoss)

app/build.gradle

@@ -31,6 +31,8 @@ apply plugin: 'io.fabric'
 
 apply plugin: 'kotlin-android'
 
+apply plugin: 'kotlin-android-extensions'
+
 repositories {
     maven {
         url 'https://maven.fabric.io/public'
@@ -38,12 +40,12 @@ repositories {
 }
 
 android {
-    compileSdkVersion 26
+    compileSdkVersion 27
-    buildToolsVersion '26.0.2'
+    buildToolsVersion '27.0.0'
     defaultConfig {
         applicationId "apps.amine.bou.readerforselfoss"
         minSdkVersion 16
-        targetSdkVersion 26
+        targetSdkVersion 27
         versionCode versionCodeFromGit()
         versionName versionNameFromGit()
 
@@ -63,6 +65,7 @@ android {
         buildConfigField "String", "SOURCE_URL", sourceUrl
         buildConfigField "String", "TRACKER_URL", trackerUrl
         buildConfigField "String", "TRANSLATION_URL", translationUrl
+        buildConfigField "String", "GITHUB_TOKEN", githubToken
     }
     buildTypes {
         release {
@@ -94,31 +97,31 @@ android {
 
 dependencies {
     // Testing
-    androidTestCompile 'com.android.support.test.espresso:espresso-core:3.0.0'
+    androidTestCompile 'com.android.support.test.espresso:espresso-core:3.0.1'
-    androidTestCompile 'com.android.support.test:runner:1.0.0'
+    androidTestCompile 'com.android.support.test:runner:1.0.1'
     // Espresso-contrib for DatePicker, RecyclerView, Drawer actions, Accessibility checks, CountingIdlingResource
-    androidTestCompile 'com.android.support.test.espresso:espresso-contrib:3.0.0'
+    androidTestCompile 'com.android.support.test.espresso:espresso-contrib:3.0.1'
     // Espresso-intents for validation and stubbing of Intents
-    androidTestCompile 'com.android.support.test.espresso:espresso-intents:3.0.0'
+    androidTestCompile 'com.android.support.test.espresso:espresso-intents:3.0.1'
 
 
     compile fileTree(dir: 'libs', include: ['*.jar'])
     compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
 
     // Android Support
-    compile 'com.android.support:appcompat-v7:26.0.1'
+    compile 'com.android.support:appcompat-v7:27.0.0'
-    compile 'com.android.support:design:26.0.1'
+    compile 'com.android.support:design:27.0.0'
-    compile 'com.android.support:recyclerview-v7:26.0.1'
+    compile 'com.android.support:recyclerview-v7:27.0.0'
-    compile 'com.android.support:support-v4:26.0.1'
+    compile 'com.android.support:support-v4:27.0.0'
-    compile 'com.android.support:support-vector-drawable:26.0.1'
+    compile 'com.android.support:support-vector-drawable:27.0.0'
-    compile 'com.android.support:customtabs:26.0.1'
+    compile 'com.android.support:customtabs:27.0.0'
-    compile 'com.android.support:cardview-v7:26.0.1'
+    compile 'com.android.support:cardview-v7:27.0.0'
     compile 'com.android.support.constraint:constraint-layout:1.0.2'
 
     // Firebase + crashlytics
-    compile 'com.google.firebase:firebase-core:11.2.0'
+    compile 'com.google.firebase:firebase-core:11.4.2'
-    compile 'com.google.firebase:firebase-config:11.2.0'
+    compile 'com.google.firebase:firebase-config:11.4.2'
-    compile 'com.google.firebase:firebase-invites:11.2.0'
+    compile 'com.google.firebase:firebase-invites:11.4.2'
     compile('com.crashlytics.sdk.android:crashlytics:2.7.1@aar') {
         transitive = true;
     }
@@ -130,7 +133,7 @@ dependencies {
     compile 'agency.tango.android:material-intro-screen:0.0.5'
 
     // About
-    compile('com.mikepenz:aboutlibraries:5.9.7@aar') {
+    compile('com.mikepenz:aboutlibraries:6.0.0@aar') {
         transitive = true
     }
 
@@ -142,10 +145,9 @@ dependencies {
 
     // Material-ish things
     compile 'com.ashokvarma.android:bottom-navigation-bar:2.0.3'
-    compile 'com.melnykov:floatingactionbutton:1.3.0'
     compile 'com.github.jd-alexander:LikeButton:0.2.1'
     compile 'com.amulyakhare:com.amulyakhare.textdrawable:1.0.1'
-    compile 'org.sufficientlysecure:html-textview:3.3'
+    compile 'org.sufficientlysecure:html-textview:3.5'
 
     // glide
     compile 'com.github.bumptech.glide:glide:4.1.1'
@@ -158,14 +160,16 @@ dependencies {
     compile 'com.klinkerapps:drag-dismiss-activity:1.5.0'
 
     // Drawer
-    compile('com.mikepenz:materialdrawer:5.9.5@aar') {
+    implementation 'co.zsmb:materialdrawer-kt:1.2.1'
-        transitive = true
-    }
     compile 'com.anupcowkur:reservoir:3.1.0'
 
     // Themes
     compile 'com.52inc:scoops:1.0.0'
 
+    // Github issues reporter
+    compile 'com.heinrichreimersoftware:android-issue-reporter:1.3.1'
+
+    compile 'com.github.rubensousa:floatingtoolbar:1.5.1'
 }
 
 apply plugin: 'com.google.gms.google-services'
@@ -210,6 +214,7 @@ def initAppForSecretPropertiesIfNeeded() {
             entry(key: "sourceUrl", value: System.getProperty("sourceUrl"))
             entry(key: "trackerUrl", value: System.getProperty("trackerUrl"))
             entry(key: "translationUrl", value: System.getProperty("translationUrl"))
+            entry(key: "githubToken", value: System.getProperty("githubToken"))
         }
     }
 }

app/src/androidTest/java/apps/amine/bou/readerforselfoss/AddSourceEspressoTest.kt

@@ -1,4 +1,3 @@
 package apps.amine.bou.readerforselfoss
 
-
 // TODO: test source adding

app/src/androidTest/java/apps/amine/bou/readerforselfoss/HomeActivityEspressoTest.kt

@@ -5,29 +5,33 @@ import android.content.Intent
 import android.support.test.InstrumentationRegistry
 import android.support.test.espresso.Espresso.onView
 import android.support.test.espresso.Espresso.openActionBarOverflowOrOptionsMenu
-import android.support.test.espresso.action.ViewActions.*
+import android.support.test.espresso.action.ViewActions.click
+import android.support.test.espresso.action.ViewActions.closeSoftKeyboard
+import android.support.test.espresso.action.ViewActions.pressBack
+import android.support.test.espresso.action.ViewActions.pressKey
+import android.support.test.espresso.action.ViewActions.typeText
 import android.support.test.espresso.assertion.ViewAssertions.matches
 import android.support.test.espresso.contrib.DrawerActions
 import android.support.test.espresso.intent.Intents
 import android.support.test.espresso.intent.Intents.intended
 import android.support.test.espresso.intent.Intents.times
 import android.support.test.espresso.intent.matcher.IntentMatchers.hasComponent
-import android.support.test.espresso.matcher.ViewMatchers.*
+import android.support.test.espresso.matcher.ViewMatchers.isDisplayed
+import android.support.test.espresso.matcher.ViewMatchers.isRoot
+import android.support.test.espresso.matcher.ViewMatchers.withContentDescription
+import android.support.test.espresso.matcher.ViewMatchers.withId
+import android.support.test.espresso.matcher.ViewMatchers.withText
 import android.support.test.rule.ActivityTestRule
 import android.support.test.runner.AndroidJUnit4
 import android.view.KeyEvent
-
+import apps.amine.bou.readerforselfoss.utils.Config
-import com.mikepenz.aboutlibraries.ui.LibsActivity
+import com.heinrichreimersoftware.androidissuereporter.IssueReporterLauncher
+import org.junit.After
 import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
 
-import apps.amine.bou.readerforselfoss.settings.SettingsActivity
-import apps.amine.bou.readerforselfoss.utils.Config
-import org.junit.After
-
-
 @RunWith(AndroidJUnit4::class)
 class HomeActivityEspressoTest {
     lateinit var context: Context
@@ -68,13 +72,14 @@ class HomeActivityEspressoTest {
 
         onView(withId(R.id.search_bar)).check(matches(isDisplayed()))
 
-        onView(withId(R.id.search_src_text)).perform(typeText("android"), pressKey(KeyEvent.KEYCODE_SEARCH), closeSoftKeyboard())
+        onView(withId(R.id.search_src_text)).perform(
+                typeText("android"),
+                pressKey(KeyEvent.KEYCODE_SEARCH),
+                closeSoftKeyboard()
+        )
 
         onView(withContentDescription(R.string.abc_toolbar_collapse_description)).perform(click())
 
-
-        onView(withMenu(id = R.id.readAll, titleId = R.string.readAll)).perform(click())
-
         openActionBarOverflowOrOptionsMenu(context)
 
         onView(withMenu(id = R.id.refresh, titleId = R.string.menu_home_refresh))
@@ -85,10 +90,6 @@ class HomeActivityEspressoTest {
         onView(withText(R.string.action_disconnect)).perform(click())
 
         intended(hasComponent(LoginActivity::class.java.name), times(1))
-
-        //onView(isRoot()).perform(pressBack())
-
-
     }
 
     @Test
@@ -98,8 +99,9 @@ class HomeActivityEspressoTest {
 
         onView(withId(R.id.material_drawer_layout)).perform(DrawerActions.open())
 
-        onView(withText(R.string.action_about)).perform(click())
+        onView(withText(R.string.drawer_report_bug)).perform(click())
-        intended(hasComponent(LibsActivity::class.java.name))
+        intended(hasComponent(IssueReporterLauncher.Activity::class.java.name))
+        onView(isRoot()).perform(pressBack())
         onView(isRoot()).perform(pressBack())
         intended(hasComponent(HomeActivity::class.java.name))
 
@@ -107,11 +109,6 @@ class HomeActivityEspressoTest {
 
         onView(withId(R.id.material_drawer_layout)).perform(DrawerActions.open())
         onView(withText(R.string.drawer_action_clear)).perform(click())
-
-        // bug
-        //onView(withText(R.string.title_activity_settings)).perform(scrollTo(), click())
-        //intended(hasComponent(SettingsActivity::class.java.name))
-
     }
 
     // TODO: test articles opening and actions for cards and lists

app/src/androidTest/java/apps/amine/bou/readerforselfoss/IntroActivityEspressoTest.kt

@@ -1,7 +1,5 @@
 package apps.amine.bou.readerforselfoss
 
-import java.util.*
-
 import android.content.Context
 import android.content.Intent
 import android.support.test.InstrumentationRegistry.getInstrumentation
@@ -11,22 +9,19 @@ import android.support.test.espresso.assertion.ViewAssertions.matches
 import android.support.test.espresso.intent.Intents
 import android.support.test.espresso.intent.Intents.intended
 import android.support.test.espresso.intent.Intents.times
-import android.support.test.espresso.intent.matcher.IntentMatchers.*
+import android.support.test.espresso.intent.matcher.IntentMatchers.hasComponent
-import android.support.test.espresso.intent.matcher.UriMatchers.hasHost
+import android.support.test.espresso.matcher.ViewMatchers.isDisplayed
-import android.support.test.espresso.matcher.ViewMatchers.*
+import android.support.test.espresso.matcher.ViewMatchers.withId
+import android.support.test.espresso.matcher.ViewMatchers.withText
 import android.support.test.rule.ActivityTestRule
 import android.support.test.runner.AndroidJUnit4
-
+import apps.amine.bou.readerforselfoss.utils.Config
-import org.hamcrest.Matchers.allOf
+import org.junit.After
-import org.hamcrest.Matchers.equalTo
 import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
-
+import java.util.*
-import apps.amine.bou.readerforselfoss.utils.Config
-import org.junit.After
-
 
 @RunWith(AndroidJUnit4::class)
 class IntroActivityEspressoTest {
@@ -46,7 +41,7 @@ class IntroActivityEspressoTest {
         Intents.init()
     }
 
-    /*@Test
+    @Test
     fun nextEachTimes() {
 
         rule.launchActivity(Intent())
@@ -60,8 +55,7 @@ class IntroActivityEspressoTest {
 
         intended(hasComponent(IntroActivity::class.java.name), times(1))
         intended(hasComponent(LoginActivity::class.java.name), times(1))
-
+    }
-    }*/
 
     @Test
     fun nextBackRandomTimes() {
@@ -75,7 +69,7 @@ class IntroActivityEspressoTest {
         onView(withText(R.string.intro_hello_title)).check(matches(isDisplayed()))
         onView(withId(R.id.button_next)).perform(click())
 
-        repeat(random) {_ ->
+        repeat(random) { _ ->
             onView(withText(R.string.intro_needs_selfoss_message)).check(matches(isDisplayed()))
             onView(withId(R.id.button_next)).perform(click())
             onView(withText(R.string.intro_all_set_message)).check(matches(isDisplayed()))
@@ -88,30 +82,6 @@ class IntroActivityEspressoTest {
 
         intended(hasComponent(IntroActivity::class.java.name), times(1))
         intended(hasComponent(LoginActivity::class.java.name), times(1))
-
-    }
-
-    @Test
-    fun clickSelfossUrl() {
-        rule.launchActivity(Intent())
-
-        onView(withText(R.string.intro_hello_title)).check(matches(isDisplayed()))
-
-        onView(withId(R.id.button_next)).perform(click())
-
-        onView(withId(R.id.button_message)).perform(click())
-
-        intended(
-            allOf(
-                hasData(
-                    hasHost(
-                        equalTo("selfoss.aditu.de")
-                    )
-                ),
-                hasAction(Intent.ACTION_VIEW)
-            )
-        )
-
     }
 
     @After

app/src/androidTest/java/apps/amine/bou/readerforselfoss/LoginActivityEspressoTest.kt

@@ -5,37 +5,40 @@ import android.content.Intent
 import android.support.test.InstrumentationRegistry
 import android.support.test.espresso.Espresso.onView
 import android.support.test.espresso.Espresso.openActionBarOverflowOrOptionsMenu
-import android.support.test.espresso.action.ViewActions.*
+import android.support.test.espresso.action.ViewActions.click
+import android.support.test.espresso.action.ViewActions.closeSoftKeyboard
+import android.support.test.espresso.action.ViewActions.pressBack
+import android.support.test.espresso.action.ViewActions.typeText
 import android.support.test.espresso.assertion.ViewAssertions.matches
 import android.support.test.espresso.intent.Intents
 import android.support.test.espresso.intent.Intents.intended
 import android.support.test.espresso.intent.Intents.times
 import android.support.test.espresso.intent.matcher.IntentMatchers.hasComponent
 import android.support.test.espresso.matcher.ViewMatchers
-import android.support.test.espresso.matcher.ViewMatchers.*
+import android.support.test.espresso.matcher.ViewMatchers.isRoot
+import android.support.test.espresso.matcher.ViewMatchers.withEffectiveVisibility
+import android.support.test.espresso.matcher.ViewMatchers.withId
+import android.support.test.espresso.matcher.ViewMatchers.withText
 import android.support.test.rule.ActivityTestRule
 import android.support.test.runner.AndroidJUnit4
-
+import apps.amine.bou.readerforselfoss.utils.Config
 import com.mikepenz.aboutlibraries.ui.LibsActivity
+import org.junit.After
 import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
 
-import apps.amine.bou.readerforselfoss.utils.Config
-import org.junit.After
-
-
 @RunWith(AndroidJUnit4::class)
 class LoginActivityEspressoTest {
 
     @Rule @JvmField
     val rule = ActivityTestRule(LoginActivity::class.java, true, false)
 
-    lateinit var context: Context
+    private lateinit var context: Context
-    lateinit var url: String
+    private lateinit var url: String
-    lateinit var username: String
+    private lateinit var username: String
-    lateinit var password: String
+    private lateinit var password: String
 
     @Before
     fun setUp() {
@@ -69,20 +72,18 @@ class LoginActivityEspressoTest {
         onView(isRoot()).perform(pressBack())
 
         intended(hasComponent(LoginActivity::class.java.name))
-
     }
 
-
     @Test
     fun wrongLoginUrl() {
         rule.launchActivity(Intent())
 
-        onView(withId(R.id.login_progress))
+        onView(withId(R.id.loginProgress))
                 .check(matches(withEffectiveVisibility(ViewMatchers.Visibility.GONE)))
 
-        onView(withId(R.id.url)).perform(click()).perform(typeText("WRONGURL"))
+        onView(withId(R.id.urlView)).perform(click()).perform(typeText("WRONGURL"))
 
-        onView(withId(R.id.email_sign_in_button)).perform(click())
+        onView(withId(R.id.signInButton)).perform(click())
 
         onView(withId(R.id.urlLayout)).check(matches(isHintOrErrorEnabled()))
     }
@@ -94,26 +95,29 @@ class LoginActivityEspressoTest {
 
         rule.launchActivity(Intent())
 
-        onView(withId(R.id.url)).perform(click()).perform(typeText(url), closeSoftKeyboard())
+        onView(withId(R.id.urlView)).perform(click()).perform(typeText(url), closeSoftKeyboard())
 
         onView(withId(R.id.withLogin)).perform(click())
 
-        onView(withId(R.id.email_sign_in_button)).perform(click())
+        onView(withId(R.id.signInButton)).perform(click())
 
         onView(withId(R.id.loginLayout)).check(matches(isHintOrErrorEnabled()))
         onView(withId(R.id.passwordLayout)).check(matches(isHintOrErrorEnabled()))
 
-        onView(withId(R.id.login)).perform(click()).perform(typeText(username), closeSoftKeyboard())
+        onView(withId(R.id.loginView)).perform(click()).perform(
+                typeText(username),
+                closeSoftKeyboard()
+        )
 
         onView(withId(R.id.passwordLayout)).check(matches(isHintOrErrorEnabled()))
 
-        onView(withId(R.id.email_sign_in_button)).perform(click())
+        onView(withId(R.id.signInButton)).perform(click())
 
         onView(withId(R.id.passwordLayout)).check(
                 matches(
-                isHintOrErrorEnabled())
+                        isHintOrErrorEnabled()
+                )
         )
-
     }
 
     @Test
@@ -121,20 +125,25 @@ class LoginActivityEspressoTest {
 
         rule.launchActivity(Intent())
 
-        onView(withId(R.id.url)).perform(click()).perform(typeText(url), closeSoftKeyboard())
+        onView(withId(R.id.urlView)).perform(click()).perform(typeText(url), closeSoftKeyboard())
 
         onView(withId(R.id.withLogin)).perform(click())
 
-        onView(withId(R.id.login)).perform(click()).perform(typeText(username), closeSoftKeyboard())
+        onView(withId(R.id.loginView)).perform(click()).perform(
+                typeText(username),
+                closeSoftKeyboard()
+        )
 
-        onView(withId(R.id.password)).perform(click()).perform(typeText("WRONGPASS"), closeSoftKeyboard())
+        onView(withId(R.id.passwordView)).perform(click()).perform(
+                typeText("WRONGPASS"),
+                closeSoftKeyboard()
+        )
 
-        onView(withId(R.id.email_sign_in_button)).perform(click())
+        onView(withId(R.id.signInButton)).perform(click())
 
         onView(withId(R.id.urlLayout)).check(matches(isHintOrErrorEnabled()))
         onView(withId(R.id.loginLayout)).check(matches(isHintOrErrorEnabled()))
         onView(withId(R.id.passwordLayout)).check(matches(isHintOrErrorEnabled()))
-
     }
 
     @Test
@@ -142,23 +151,27 @@ class LoginActivityEspressoTest {
 
         rule.launchActivity(Intent())
 
-        onView(withId(R.id.url)).perform(click()).perform(typeText(url), closeSoftKeyboard())
+        onView(withId(R.id.urlView)).perform(click()).perform(typeText(url), closeSoftKeyboard())
 
         onView(withId(R.id.withLogin)).perform(click())
 
-        onView(withId(R.id.login)).perform(click()).perform(typeText(username), closeSoftKeyboard())
+        onView(withId(R.id.loginView)).perform(click()).perform(
+                typeText(username),
+                closeSoftKeyboard()
+        )
 
-        onView(withId(R.id.password)).perform(click()).perform(typeText(password), closeSoftKeyboard())
+        onView(withId(R.id.passwordView)).perform(click()).perform(
+                typeText(password),
+                closeSoftKeyboard()
+        )
 
-        onView(withId(R.id.email_sign_in_button)).perform(click())
+        onView(withId(R.id.signInButton)).perform(click())
 
         intended(hasComponent(HomeActivity::class.java.name))
-
     }
 
     @After
     fun releaseIntents() {
         Intents.release()
     }
-
 }

app/src/androidTest/java/apps/amine/bou/readerforselfoss/MainActivityEspressoTest.kt

@@ -17,7 +17,6 @@ import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
 
-
 @RunWith(AndroidJUnit4::class)
 class MainActivityEspressoTest {
 
@@ -48,7 +47,6 @@ class MainActivityEspressoTest {
         intended(hasComponent(MainActivity::class.java.name))
         intended(hasComponent(IntroActivity::class.java.name))
         intended(hasComponent(LoginActivity::class.java.name), times(0))
-
     }
 
     @Test
@@ -61,13 +59,10 @@ class MainActivityEspressoTest {
         intended(hasComponent(MainActivity::class.java.name))
         intended(hasComponent(LoginActivity::class.java.name))
         intended(hasComponent(IntroActivity::class.java.name), times(0))
-
     }
 
     @After
     fun releaseIntents() {
         Intents.release()
     }
-
-
 }

app/src/androidTest/java/apps/amine/bou/readerforselfoss/Utils.kt

@@ -1,19 +1,17 @@
 package apps.amine.bou.readerforselfoss
 
-import android.view.View
 import android.support.design.widget.TextInputLayout
 import android.support.test.espresso.matcher.ViewMatchers
-
+import android.view.View
 import org.hamcrest.Description
 import org.hamcrest.Matcher
-import org.hamcrest.TypeSafeMatcher
 import org.hamcrest.Matchers
-
+import org.hamcrest.TypeSafeMatcher
-
 
 fun isHintOrErrorEnabled(): Matcher<View> =
         object : TypeSafeMatcher<View>() {
-        override fun describeTo(description: Description?) {}
+            override fun describeTo(description: Description?) {
+            }
 
             override fun matchesSafely(item: View?): Boolean {
                 if (item !is TextInputLayout) {

app/src/main/AndroidManifest.xml

@@ -65,8 +65,7 @@
             </intent-filter>
         </activity>
         <activity
-            android:name=".ReaderActivity"
+            android:name=".ReaderActivity">
-            android:theme="@style/DragDismissTheme">
         </activity>
 
         <meta-data

app/src/main/java/apps/amine/bou/readerforselfoss/AddSourceActivity.kt

@@ -5,21 +5,24 @@ import android.os.Bundle
 import android.preference.PreferenceManager
 import android.support.constraint.ConstraintLayout
 import android.support.v7.app.AppCompatActivity
-import android.support.v7.widget.Toolbar
 import android.view.View
-import android.widget.*
+import android.widget.AdapterView
-
+import android.widget.ArrayAdapter
-import retrofit2.Call
+import android.widget.EditText
-import retrofit2.Callback
+import android.widget.ProgressBar
-import retrofit2.Response
+import android.widget.Spinner
-
+import android.widget.TextView
+import android.widget.Toast
 import apps.amine.bou.readerforselfoss.api.selfoss.SelfossApi
 import apps.amine.bou.readerforselfoss.api.selfoss.Spout
 import apps.amine.bou.readerforselfoss.api.selfoss.SuccessResponse
 import apps.amine.bou.readerforselfoss.utils.Config
 import apps.amine.bou.readerforselfoss.utils.isBaseUrlValid
 import com.ftinc.scoop.Scoop
-
+import kotlinx.android.synthetic.main.activity_add_source.*
+import retrofit2.Call
+import retrofit2.Callback
+import retrofit2.Response
 
 class AddSourceActivity : AppCompatActivity() {
 
@@ -29,40 +32,48 @@ class AddSourceActivity : AppCompatActivity() {
         super.onCreate(savedInstanceState)
         Scoop.getInstance().apply(this)
         setContentView(R.layout.activity_add_source)
-        val toolbar: Toolbar = findViewById(R.id.toolbar)
+
         setSupportActionBar(toolbar)
         supportActionBar?.setDisplayHomeAsUpEnabled(true)
         supportActionBar?.setDisplayShowHomeEnabled(true)
 
-        val mProgress: ProgressBar = findViewById(R.id.progress)
-        val mForm: ConstraintLayout = findViewById(R.id.formContainer)
-        val mNameInput: EditText = findViewById(R.id.nameInput)
-        val mSourceUri: EditText = findViewById(R.id.sourceUri)
-        val mTags: EditText = findViewById(R.id.tags)
-        val mSpoutsSpinner: Spinner = findViewById(R.id.spoutsSpinner)
-        val mSaveBtn: Button = findViewById(R.id.saveBtn)
         var api: SelfossApi? = null
 
         try {
             val prefs = PreferenceManager.getDefaultSharedPreferences(this)
-            api = SelfossApi(this, this@AddSourceActivity, prefs.getBoolean("isSelfSignedCert", false), prefs.getBoolean("should_log_everything", false))
+            api = SelfossApi(
+                    this,
+                    this@AddSourceActivity,
+                    prefs.getBoolean("isSelfSignedCert", false),
+                    prefs.getBoolean("should_log_everything", false)
+            )
         } catch (e: IllegalArgumentException) {
             mustLoginToAddSource()
         }
 
-        val intent = intent
+        maybeGetDetailsFromIntentSharing(intent, sourceUri, nameInput)
-        if (Intent.ACTION_SEND == intent.action && "text/plain" == intent.type) {
+
-            mSourceUri.setText(intent.getStringExtra(Intent.EXTRA_TEXT))
+        saveBtn.setOnClickListener {
-            mNameInput.setText(intent.getStringExtra(Intent.EXTRA_TITLE))
+            handleSaveSource(tags, nameInput.text.toString(), sourceUri.text.toString(), api!!)
         }
 
-        mSaveBtn.setOnClickListener {
+        val config = Config(this)
-            handleSaveSource(mTags, mNameInput.text.toString(), mSourceUri.text.toString(), api!!)
+
+        if (config.baseUrl.isEmpty() || !config.baseUrl.isBaseUrlValid()) {
+            mustLoginToAddSource()
+        } else {
+            handleSpoutsSpinner(spoutsSpinner, api, progress, formContainer)
+        }
     }
 
-
+    private fun handleSpoutsSpinner(
+            spoutsSpinner: Spinner,
+            api: SelfossApi?,
+            mProgress: ProgressBar,
+            formContainer: ConstraintLayout
+    ) {
         val spoutsKV = HashMap<String, String>()
-        mSpoutsSpinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
+        spoutsSpinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
             override fun onItemSelected(adapterView: AdapterView<*>, view: View, i: Int, l: Long) {
                 val spoutName = (view as TextView).text.toString()
                 mSpoutsValue = spoutsKV[spoutName]
@@ -73,15 +84,12 @@ class AddSourceActivity : AppCompatActivity() {
             }
         }
 
-        val config = Config(this)
-
-        if (config.baseUrl.isEmpty() || !config.baseUrl.isBaseUrlValid()) {
-            mustLoginToAddSource()
-        } else {
-
         var items: Map<String, Spout>
         api!!.spouts().enqueue(object : Callback<Map<String, Spout>> {
-                override fun onResponse(call: Call<Map<String, Spout>>, response: Response<Map<String, Spout>>) {
+            override fun onResponse(
+                    call: Call<Map<String, Spout>>,
+                    response: Response<Map<String, Spout>>
+            ) {
                 if (response.body() != null) {
                     items = response.body()!!
 
@@ -91,16 +99,16 @@ class AddSourceActivity : AppCompatActivity() {
                     }
 
                     mProgress.visibility = View.GONE
-                        mForm.visibility = View.VISIBLE
+                    formContainer.visibility = View.VISIBLE
 
                     val spinnerArrayAdapter =
                             ArrayAdapter(
                                     this@AddSourceActivity,
                                     android.R.layout.simple_spinner_item,
-                                itemsStrings)
+                                    itemsStrings
+                            )
                     spinnerArrayAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
-                        mSpoutsSpinner.adapter = spinnerArrayAdapter
+                    spoutsSpinner.adapter = spinnerArrayAdapter
-
                 } else {
                     handleProblemWithSpouts()
                 }
@@ -111,11 +119,25 @@ class AddSourceActivity : AppCompatActivity() {
             }
 
             private fun handleProblemWithSpouts() {
-                    Toast.makeText(this@AddSourceActivity, R.string.cant_get_spouts, Toast.LENGTH_SHORT).show()
+                Toast.makeText(
+                        this@AddSourceActivity,
+                        R.string.cant_get_spouts,
+                        Toast.LENGTH_SHORT
+                ).show()
                 mProgress.visibility = View.GONE
             }
         })
     }
+
+    private fun maybeGetDetailsFromIntentSharing(
+            intent: Intent,
+            sourceUri: EditText,
+            nameInput: EditText
+    ) {
+        if (Intent.ACTION_SEND == intent.action && "text/plain" == intent.type) {
+            sourceUri.setText(intent.getStringExtra(Intent.EXTRA_TEXT))
+            nameInput.setText(intent.getStringExtra(Intent.EXTRA_TITLE))
+        }
     }
 
     private fun mustLoginToAddSource() {
@@ -125,28 +147,41 @@ class AddSourceActivity : AppCompatActivity() {
         finish()
     }
 
-    private fun handleSaveSource(mTags: EditText, title: String, url: String, api: SelfossApi) {
+    private fun handleSaveSource(tags: EditText, title: String, url: String, api: SelfossApi) {
 
-        if (title.isEmpty() || url.isEmpty() || mSpoutsValue == null || mSpoutsValue!!.isEmpty()) {
+        val sourceDetailsAvailable = title.isEmpty() || url.isEmpty() || mSpoutsValue == null || mSpoutsValue!!.isEmpty()
+
+        if (sourceDetailsAvailable) {
             Toast.makeText(this, R.string.form_not_complete, Toast.LENGTH_SHORT).show()
         } else {
             api.createSource(
                     title,
                     url,
                     mSpoutsValue!!,
-                mTags.text.toString(),
+                    tags.text.toString(),
                     ""
             ).enqueue(object : Callback<SuccessResponse> {
-                override fun onResponse(call: Call<SuccessResponse>, response: Response<SuccessResponse>) {
+                override fun onResponse(
+                        call: Call<SuccessResponse>,
+                        response: Response<SuccessResponse>
+                ) {
                     if (response.body() != null && response.body()!!.isSuccess) {
                         finish()
                     } else {
-                        Toast.makeText(this@AddSourceActivity, R.string.cant_create_source, Toast.LENGTH_SHORT).show()
+                        Toast.makeText(
+                                this@AddSourceActivity,
+                                R.string.cant_create_source,
+                                Toast.LENGTH_SHORT
+                        ).show()
                     }
                 }
 
                 override fun onFailure(call: Call<SuccessResponse>, t: Throwable) {
-                    Toast.makeText(this@AddSourceActivity, R.string.cant_create_source, Toast.LENGTH_SHORT).show()
+                    Toast.makeText(
+                            this@AddSourceActivity,
+                            R.string.cant_create_source,
+                            Toast.LENGTH_SHORT
+                    ).show()
                 }
             })
         }

app/src/main/java/apps/amine/bou/readerforselfoss/IntroActivity.kt

@@ -1,16 +1,14 @@
 package apps.amine.bou.readerforselfoss
 
-import android.content.Intent
-import android.net.Uri
-import android.os.Bundle
-import android.preference.PreferenceManager
-import android.view.View
-
 import agency.tango.materialintroscreen.MaterialIntroActivity
 import agency.tango.materialintroscreen.MessageButtonBehaviour
 import agency.tango.materialintroscreen.SlideFragmentBuilder
+import android.content.Intent
+import android.net.Uri
+import android.os.Bundle
+import android.preference.PreferenceManager
 import android.support.v7.app.AppCompatDelegate
-
+import android.view.View
 
 class IntroActivity : MaterialIntroActivity() {
 
@@ -19,33 +17,44 @@ class IntroActivity : MaterialIntroActivity() {
 
         AppCompatDelegate.setCompatVectorFromResourcesEnabled(true)
 
-        addSlide(SlideFragmentBuilder()
+        addSlide(
+                SlideFragmentBuilder()
                         .backgroundColor(R.color.colorPrimary)
                         .buttonsColor(R.color.colorAccent)
                         .image(R.drawable.web_hi_res_512)
                         .title(getString(R.string.intro_hello_title))
                         .description(getString(R.string.intro_hello_message))
-            .build())
+                        .build()
+        )
 
-        addSlide(SlideFragmentBuilder()
+        addSlide(
+                SlideFragmentBuilder()
                         .backgroundColor(R.color.colorAccent)
                         .buttonsColor(R.color.colorPrimary)
                         .image(R.drawable.ic_info_outline_white_48px)
                         .title(getString(R.string.intro_needs_selfoss_title))
                         .description(getString(R.string.intro_needs_selfoss_message))
                         .build(),
-            MessageButtonBehaviour(View.OnClickListener {
+                MessageButtonBehaviour(
-                val browserIntent = Intent(Intent.ACTION_VIEW, Uri.parse("https://selfoss.aditu.de"))
+                        View.OnClickListener {
+                            val browserIntent = Intent(
+                                    Intent.ACTION_VIEW,
+                                    Uri.parse("https://selfoss.aditu.de")
+                            )
                             startActivity(browserIntent)
-            }, getString(R.string.intro_needs_selfoss_link)))
+                        }, getString(R.string.intro_needs_selfoss_link)
+                )
+        )
 
-        addSlide(SlideFragmentBuilder()
+        addSlide(
+                SlideFragmentBuilder()
                         .backgroundColor(R.color.colorPrimaryDark)
                         .buttonsColor(R.color.colorAccentDark)
                         .image(R.drawable.ic_thumb_up_white_48px)
                         .title(getString(R.string.intro_all_set_title))
                         .description(getString(R.string.intro_all_set_message))
-            .build())
+                        .build()
+        )
     }
 
     override fun onFinish() {

app/src/main/java/apps/amine/bou/readerforselfoss/LoginActivity.kt

@@ -6,31 +6,29 @@ import android.content.Context
 import android.content.Intent
 import android.content.SharedPreferences
 import android.os.Bundle
-import android.support.design.widget.TextInputLayout
 import android.support.v7.app.AlertDialog
 import android.support.v7.app.AppCompatActivity
-import android.support.v7.widget.Toolbar
 import android.text.TextUtils
 import android.view.Menu
 import android.view.MenuItem
 import android.view.View
 import android.view.inputmethod.EditorInfo
-import android.widget.*
+import android.widget.TextView
+import android.widget.Toast
 import apps.amine.bou.readerforselfoss.api.selfoss.SelfossApi
 import apps.amine.bou.readerforselfoss.api.selfoss.SuccessResponse
 import apps.amine.bou.readerforselfoss.utils.Config
-import apps.amine.bou.readerforselfoss.utils.checkAndDisplayStoreApk
 import apps.amine.bou.readerforselfoss.utils.isBaseUrlValid
 import com.crashlytics.android.Crashlytics
 import com.ftinc.scoop.Scoop
 import com.google.firebase.analytics.FirebaseAnalytics
 import com.mikepenz.aboutlibraries.Libs
 import com.mikepenz.aboutlibraries.LibsBuilder
+import kotlinx.android.synthetic.main.activity_login.*
 import retrofit2.Call
 import retrofit2.Callback
 import retrofit2.Response
 
-
 class LoginActivity : AppCompatActivity() {
 
     private var inValidCount: Int = 0
@@ -40,27 +38,74 @@ class LoginActivity : AppCompatActivity() {
 
     private lateinit var settings: SharedPreferences
     private lateinit var editor: SharedPreferences.Editor
-    private lateinit var mFirebaseAnalytics: FirebaseAnalytics
+    private lateinit var firebaseAnalytics: FirebaseAnalytics
-    private lateinit var mUrlView: EditText
-    private lateinit var mLoginView: TextView
-    private lateinit var mHTTPLoginView: TextView
-    private lateinit var mProgressView: View
-    private lateinit var mPasswordView: EditText
-    private lateinit var mHTTPPasswordView: EditText
-    private lateinit var mLoginFormView: View
     private lateinit var userIdentifier: String
     private var logErrors: Boolean = false
 
-
-
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         Scoop.getInstance().apply(this)
         setContentView(R.layout.activity_login)
 
-        val toolbar: Toolbar = findViewById(R.id.toolbar)
         setSupportActionBar(toolbar)
 
+        handleBaseUrlFail()
+
+
+        settings = getSharedPreferences(Config.settingsName, Context.MODE_PRIVATE)
+        userIdentifier = settings.getString("unique_id", "")
+        logErrors = settings.getBoolean("login_debug", false)
+
+        editor = settings.edit()
+
+        if (settings.getString("url", "").isNotEmpty()) {
+            goToMain()
+        }
+
+        firebaseAnalytics = FirebaseAnalytics.getInstance(this)
+
+        handleActions()
+    }
+
+    private fun handleActions() {
+
+        withSelfhostedCert.setOnCheckedChangeListener { _, b ->
+            isWithSelfSignedCert = !isWithSelfSignedCert
+            val visi: Int = if (b) View.VISIBLE else View.GONE
+
+            warningText.visibility = visi
+        }
+
+        passwordView.setOnEditorActionListener(
+                TextView.OnEditorActionListener { _, id, _ ->
+                    if (id == R.id.loginView || id == EditorInfo.IME_NULL) {
+                        attemptLogin()
+                        return@OnEditorActionListener true
+                    }
+                    false
+                }
+        )
+
+        signInButton.setOnClickListener { attemptLogin() }
+
+        withLogin.setOnCheckedChangeListener { _, b ->
+            isWithLogin = !isWithLogin
+            val visi: Int = if (b) View.VISIBLE else View.GONE
+
+            loginLayout.visibility = visi
+            passwordLayout.visibility = visi
+        }
+
+        withHttpLogin.setOnCheckedChangeListener { _, b ->
+            isWithHTTPLogin = !isWithHTTPLogin
+            val visi: Int = if (b) View.VISIBLE else View.GONE
+
+            httpLoginInput.visibility = visi
+            httpPasswordInput.visibility = visi
+        }
+    }
+
+    private fun handleBaseUrlFail() {
         if (intent.getBooleanExtra("baseUrlFail", false)) {
             val alertDialog = AlertDialog.Builder(this).create()
             alertDialog.setTitle(getString(R.string.warning_wrong_url))
@@ -68,74 +113,10 @@ class LoginActivity : AppCompatActivity() {
             alertDialog.setButton(
                     AlertDialog.BUTTON_NEUTRAL,
                     "OK",
-                { dialog, _ -> dialog.dismiss() })
+                    { dialog, _ -> dialog.dismiss() }
+            )
             alertDialog.show()
         }
-
-
-        settings = getSharedPreferences(Config.settingsName, Context.MODE_PRIVATE)
-        userIdentifier = settings.getString("unique_id", "")
-        logErrors = settings.getBoolean("loging_debug", false)
-
-        editor = settings.edit()
-
-        if (settings.getString("url", "").isNotEmpty()) {
-            goToMain()
-        } else {
-            this@LoginActivity.checkAndDisplayStoreApk()
-        }
-
-        mFirebaseAnalytics = FirebaseAnalytics.getInstance(this)
-        mUrlView = findViewById(R.id.url)
-        mLoginView = findViewById(R.id.login)
-        mHTTPLoginView = findViewById(R.id.httpLogin)
-        mPasswordView = findViewById(R.id.password)
-        mHTTPPasswordView = findViewById(R.id.httpPassword)
-        mLoginFormView = findViewById(R.id.login_form)
-        mProgressView = findViewById(R.id.login_progress)
-
-        val mSwitch: Switch = findViewById(R.id.withLogin)
-        val mHTTPSwitch: Switch = findViewById(R.id.withHttpLogin)
-        val mLoginLayout: TextInputLayout = findViewById(R.id.loginLayout)
-        val mHTTPLoginLayout: TextInputLayout = findViewById(R.id.httpLoginInput)
-        val mPasswordLayout: TextInputLayout = findViewById(R.id.passwordLayout)
-        val mHTTPPasswordLayout: TextInputLayout = findViewById(R.id.httpPasswordInput)
-        val mEmailSignInButton: Button = findViewById(R.id.email_sign_in_button)
-        val selfHostedSwitch: Switch = findViewById(R.id.withSelfhostedCert)
-        val warningTextview: TextView = findViewById(R.id.warningText)
-
-        selfHostedSwitch.setOnCheckedChangeListener {_, b ->
-            isWithSelfSignedCert = !isWithSelfSignedCert
-            val visi: Int = if (b) View.VISIBLE else View.GONE
-
-            warningTextview.visibility = visi
-        }
-
-        mPasswordView.setOnEditorActionListener(TextView.OnEditorActionListener { _, id, _ ->
-            if (id == R.id.login || id == EditorInfo.IME_NULL) {
-                attemptLogin()
-                return@OnEditorActionListener true
-            }
-            false
-        })
-
-        mEmailSignInButton.setOnClickListener { attemptLogin() }
-
-        mSwitch.setOnCheckedChangeListener { _, b ->
-            isWithLogin = !isWithLogin
-            val visi: Int = if (b) View.VISIBLE else View.GONE
-
-            mLoginLayout.visibility = visi
-            mPasswordLayout.visibility = visi
-        }
-
-        mHTTPSwitch.setOnCheckedChangeListener { _, b ->
-            isWithHTTPLogin = !isWithHTTPLogin
-            val visi: Int = if (b) View.VISIBLE else View.GONE
-
-            mHTTPLoginLayout.visibility = visi
-            mHTTPPasswordLayout.visibility = visi
-        }
     }
 
     private fun goToMain() {
@@ -147,25 +128,25 @@ class LoginActivity : AppCompatActivity() {
     private fun attemptLogin() {
 
         // Reset errors.
-        mUrlView.error = null
+        urlView.error = null
-        mLoginView.error = null
+        loginView.error = null
-        mHTTPLoginView.error = null
+        httpLoginView.error = null
-        mPasswordView.error = null
+        passwordView.error = null
-        mHTTPPasswordView.error = null
+        httpPasswordView.error = null
 
         // Store values at the time of the login attempt.
-        val url = mUrlView.text.toString()
+        val url = urlView.text.toString()
-        val login = mLoginView.text.toString()
+        val login = loginView.text.toString()
-        val httpLogin = mHTTPLoginView.text.toString()
+        val httpLogin = httpLoginView.text.toString()
-        val password = mPasswordView.text.toString()
+        val password = passwordView.text.toString()
-        val httpPassword = mHTTPPasswordView.text.toString()
+        val httpPassword = httpPasswordView.text.toString()
 
         var cancel = false
         var focusView: View? = null
 
         if (!url.isBaseUrlValid()) {
-            mUrlView.error = getString(R.string.login_url_problem)
+            urlView.error = getString(R.string.login_url_problem)
-            focusView = mUrlView
+            focusView = urlView
             cancel = true
             inValidCount++
             if (inValidCount == 3) {
@@ -175,7 +156,8 @@ class LoginActivity : AppCompatActivity() {
                 alertDialog.setButton(
                         AlertDialog.BUTTON_NEUTRAL,
                         "OK",
-                    { dialog, _ -> dialog.dismiss() })
+                        { dialog, _ -> dialog.dismiss() }
+                )
                 alertDialog.show()
                 inValidCount = 0
             }
@@ -183,14 +165,14 @@ class LoginActivity : AppCompatActivity() {
 
         if (isWithLogin || isWithHTTPLogin) {
             if (TextUtils.isEmpty(password)) {
-                mPasswordView.error = getString(R.string.error_invalid_password)
+                passwordView.error = getString(R.string.error_invalid_password)
-                focusView = mPasswordView
+                focusView = passwordView
                 cancel = true
             }
 
             if (TextUtils.isEmpty(login)) {
-                mLoginView.error = getString(R.string.error_field_required)
+                loginView.error = getString(R.string.error_field_required)
-                focusView = mLoginView
+                focusView = loginView
                 cancel = true
             }
         }
@@ -208,7 +190,12 @@ class LoginActivity : AppCompatActivity() {
             editor.putBoolean("isSelfSignedCert", isWithSelfSignedCert)
             editor.apply()
 
-            val api = SelfossApi(this, this@LoginActivity, isWithSelfSignedCert, isWithSelfSignedCert)
+            val api = SelfossApi(
+                    this,
+                    this@LoginActivity,
+                    isWithSelfSignedCert,
+                    isWithSelfSignedCert
+            )
             api.login().enqueue(object : Callback<SuccessResponse> {
                 private fun preferenceError(t: Throwable) {
                     editor.remove("url")
@@ -217,23 +204,30 @@ class LoginActivity : AppCompatActivity() {
                     editor.remove("password")
                     editor.remove("httpPassword")
                     editor.apply()
-                    mUrlView.error = getString(R.string.wrong_infos)
+                    urlView.error = getString(R.string.wrong_infos)
-                    mLoginView.error = getString(R.string.wrong_infos)
+                    loginView.error = getString(R.string.wrong_infos)
-                    mPasswordView.error = getString(R.string.wrong_infos)
+                    passwordView.error = getString(R.string.wrong_infos)
-                    mHTTPLoginView.error = getString(R.string.wrong_infos)
+                    httpLoginView.error = getString(R.string.wrong_infos)
-                    mHTTPPasswordView.error = getString(R.string.wrong_infos)
+                    httpPasswordView.error = getString(R.string.wrong_infos)
                     if (logErrors) {
                         Crashlytics.setUserIdentifier(userIdentifier)
                         Crashlytics.log(100, "LOGIN_DEBUG_ERRROR", t.message)
                         Crashlytics.logException(t)
-                        Toast.makeText(this@LoginActivity, t.message, Toast.LENGTH_LONG).show()
+                        Toast.makeText(
+                                this@LoginActivity,
+                                t.message,
+                                Toast.LENGTH_LONG
+                        ).show()
                     }
                     showProgress(false)
                 }
 
-                override fun onResponse(call: Call<SuccessResponse>, response: Response<SuccessResponse>) {
+                override fun onResponse(
+                        call: Call<SuccessResponse>,
+                        response: Response<SuccessResponse>
+                ) {
                     if (response.body() != null && response.body()!!.isSuccess) {
-                        mFirebaseAnalytics.logEvent(FirebaseAnalytics.Event.LOGIN, Bundle())
+                        firebaseAnalytics.logEvent(FirebaseAnalytics.Event.LOGIN, Bundle())
                         goToMain()
                     } else {
                         preferenceError(Exception("No response body..."))
@@ -247,40 +241,39 @@ class LoginActivity : AppCompatActivity() {
         }
     }
 
-    /**
-     * Shows the progress UI and hides the login form.
-     */
     private fun showProgress(show: Boolean) {
         val shortAnimTime = resources.getInteger(android.R.integer.config_shortAnimTime)
 
-        mLoginFormView.visibility = if (show) View.GONE else View.VISIBLE
+        loginForm.visibility = if (show) View.GONE else View.VISIBLE
-        mLoginFormView
+        loginForm
                 .animate()
                 .setDuration(shortAnimTime.toLong())
                 .alpha(
                         if (show) 0F else 1F
                 ).setListener(object : AnimatorListenerAdapter() {
                     override fun onAnimationEnd(animation: Animator) {
-                    mLoginFormView.visibility = if (show) View.GONE else View.VISIBLE
+                        loginForm.visibility = if (show) View.GONE else View.VISIBLE
                     }
-            })
+                }
+        )
 
-        mProgressView.visibility = if (show) View.VISIBLE else View.GONE
+        loginProgress.visibility = if (show) View.VISIBLE else View.GONE
-        mProgressView
+        loginProgress
                 .animate()
                 .setDuration(shortAnimTime.toLong())
                 .alpha(
                         if (show) 1F else 0F
                 ).setListener(object : AnimatorListenerAdapter() {
                     override fun onAnimationEnd(animation: Animator) {
-                    mProgressView.visibility = if (show) View.VISIBLE else View.GONE
+                        loginProgress.visibility = if (show) View.VISIBLE else View.GONE
                     }
-            })
+                }
+        )
     }
 
     override fun onCreateOptionsMenu(menu: Menu): Boolean {
         menuInflater.inflate(R.menu.login_menu, menu)
-        menu.findItem(R.id.loging_debug).isChecked = logErrors
+        menu.findItem(R.id.login_debug).isChecked = logErrors
         return true
     }
 
@@ -294,11 +287,11 @@ class LoginActivity : AppCompatActivity() {
                         .start(this)
                 return true
             }
-            R.id.loging_debug -> {
+            R.id.login_debug -> {
                 val newState = !item.isChecked
                 item.isChecked = newState
                 logErrors = newState
-                editor.putBoolean("loging_debug", newState)
+                editor.putBoolean("login_debug", newState)
                 editor.apply()
                 return true
             }

app/src/main/java/apps/amine/bou/readerforselfoss/MainActivity.kt

@@ -5,15 +5,16 @@ import android.os.Bundle
 import android.preference.PreferenceManager
 import android.support.v7.app.AppCompatActivity
 
-
-
 class MainActivity : AppCompatActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main)
 
-        if (PreferenceManager.getDefaultSharedPreferences(baseContext).getBoolean("firstStart", true)) {
+        if (PreferenceManager.getDefaultSharedPreferences(baseContext).getBoolean(
+                "firstStart",
+                true
+        )) {
             val i = Intent(this@MainActivity, IntroActivity::class.java)
             startActivity(i)
         } else {
@@ -22,6 +23,5 @@ class MainActivity : AppCompatActivity() {
         }
 
         finish()
-
     }
 }

app/src/main/java/apps/amine/bou/readerforselfoss/MyApp.kt

@@ -21,9 +21,6 @@ import io.fabric.sdk.android.Fabric
 import java.io.IOException
 import java.util.UUID.randomUUID
 
-
-
-
 class MyApp : MultiDexApplication() {
 
     override fun onCreate() {
@@ -46,7 +43,6 @@ class MyApp : MultiDexApplication() {
         initTheme()
 
         tryToHandleBug()
-
     }
 
     private fun initAmplify() {
@@ -66,11 +62,15 @@ class MyApp : MultiDexApplication() {
 
     private fun initDrawerImageLoader() {
         DrawerImageLoader.init(object : AbstractDrawerImageLoader() {
-            override fun set(imageView: ImageView?, uri: Uri?, placeholder: Drawable?, tag: String?) {
+            override fun set(
+                    imageView: ImageView?,
+                    uri: Uri?,
+                    placeholder: Drawable?,
+                    tag: String?
+            ) {
                 Glide.with(imageView?.context)
                         .load(uri)
-                    .apply(RequestOptions.fitCenterTransform()
+                        .apply(RequestOptions.fitCenterTransform().placeholder(placeholder))
-                        .placeholder(placeholder))
                         .into(imageView)
             }
 
@@ -108,11 +108,13 @@ class MyApp : MultiDexApplication() {
         val oldHandler = Thread.getDefaultUncaughtExceptionHandler()
 
         Thread.setDefaultUncaughtExceptionHandler { thread, e ->
-            if (e is  java.lang.NoClassDefFoundError && e.stackTrace.asList().any { it.toString().contains("android.view.ViewDebug") })
+            if (e is java.lang.NoClassDefFoundError && e.stackTrace.asList().any {
+                it.toString().contains("android.view.ViewDebug")
+            }) {
                 Unit
-            else
+            } else {
                 oldHandler.uncaughtException(thread, e)
             }
-
+        }
     }
 }

app/src/main/java/apps/amine/bou/readerforselfoss/ReaderActivity.kt

@@ -1,106 +1,204 @@
 package apps.amine.bou.readerforselfoss
 
+import android.content.SharedPreferences
 import android.os.Bundle
 import android.preference.PreferenceManager
-import android.view.LayoutInflater
+import android.support.customtabs.CustomTabsIntent
+import android.support.design.widget.FloatingActionButton
+import android.support.v4.widget.NestedScrollView
+import android.support.v7.app.AppCompatActivity
+import android.text.Html
+import android.text.method.LinkMovementMethod
+import android.view.MenuItem
 import android.view.View
-import android.view.ViewGroup
-import android.widget.ImageButton
-import android.widget.ImageView
-import android.widget.TextView
 import apps.amine.bou.readerforselfoss.api.mercury.MercuryApi
 import apps.amine.bou.readerforselfoss.api.mercury.ParsedContent
 import apps.amine.bou.readerforselfoss.utils.buildCustomTabsIntent
 import apps.amine.bou.readerforselfoss.utils.customtabs.CustomTabActivityHelper
+import apps.amine.bou.readerforselfoss.utils.isEmptyOrNullOrNullString
 import apps.amine.bou.readerforselfoss.utils.openItemUrl
 import apps.amine.bou.readerforselfoss.utils.shareLink
 import com.bumptech.glide.Glide
 import com.bumptech.glide.request.RequestOptions
+import com.crashlytics.android.Crashlytics
 import com.ftinc.scoop.Scoop
+import com.github.rubensousa.floatingtoolbar.FloatingToolbar
+import kotlinx.android.synthetic.main.activity_reader.*
 import org.sufficientlysecure.htmltextview.HtmlHttpImageGetter
-import org.sufficientlysecure.htmltextview.HtmlTextView
 import retrofit2.Call
 import retrofit2.Callback
 import retrofit2.Response
-import xyz.klinker.android.drag_dismiss.activity.DragDismissActivity
 
-
+class ReaderActivity : AppCompatActivity() {
-class ReaderActivity : DragDismissActivity() {
     private lateinit var mCustomTabActivityHelper: CustomTabActivityHelper
-
+    //private lateinit var content: HtmlTextView
-    override fun onStart() {
+    private lateinit var url: String
-        super.onStart()
+    private lateinit var contentText: String
-        mCustomTabActivityHelper.bindCustomTabsService(this)
+    private lateinit var contentSource: String
-    }
+    private lateinit var contentImage: String
+    private lateinit var contentTitle: String
+    private lateinit var fab: FloatingActionButton
 
     override fun onStop() {
         super.onStop()
         mCustomTabActivityHelper.unbindCustomTabsService(this)
     }
 
-    override fun onCreateContent(inflater: LayoutInflater, parent: ViewGroup, savedInstanceState: Bundle?): View {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
         Scoop.getInstance().apply(this)
-        val v = inflater.inflate(R.layout.activity_reader, parent, false)
+        setContentView(R.layout.activity_reader)
-        showProgressBar()
-        val prefs = PreferenceManager.getDefaultSharedPreferences(this)
 
-        val image: ImageView = v.findViewById(R.id.imageView)
+        url = intent.getStringExtra("url")
-        val source: TextView = v.findViewById(R.id.source)
+        contentText = intent.getStringExtra("content")
-        val title: TextView = v.findViewById(R.id.title)
+        contentTitle = intent.getStringExtra("title")
-        val content: HtmlTextView = v.findViewById(R.id.content)
+        contentImage = intent.getStringExtra("image")
-        val url = intent.getStringExtra("url")
+        contentSource = intent.getStringExtra("source")
-        val parser = MercuryApi(BuildConfig.MERCURY_KEY, prefs.getBoolean("should_log_everything", false))
-        val browserBtn: ImageButton = v.findViewById(R.id.browserBtn)
-        val shareBtn: ImageButton = v.findViewById(R.id.shareBtn)
 
+        fab = findViewById(R.id.fab)
+        val mFloatingToolbar: FloatingToolbar = findViewById(R.id.floatingToolbar)
+        mFloatingToolbar.attachFab(fab)
 
         val customTabsIntent = this@ReaderActivity.buildCustomTabsIntent()
         mCustomTabActivityHelper = CustomTabActivityHelper()
         mCustomTabActivityHelper.bindCustomTabsService(this)
 
+        val prefs = PreferenceManager.getDefaultSharedPreferences(this)
+
+        mFloatingToolbar.setClickListener(object : FloatingToolbar.ItemClickListener {
+            override fun onItemClick(item: MenuItem) {
+                when (item.itemId) {
+                    R.id.more_action -> getContentFromMercury(customTabsIntent, prefs)
+                    R.id.share_action -> this@ReaderActivity.shareLink(url)
+                    R.id.open_action -> this@ReaderActivity.openItemUrl(
+                            url,
+                            contentText,
+                            contentImage,
+                            contentTitle,
+                            contentSource,
+                            customTabsIntent,
+                            false,
+                            false,
+                            this@ReaderActivity
+                    )
+                    else -> Unit
+                }
+            }
+
+            override fun onItemLongClick(item: MenuItem?) {
+            }
+        })
+
+
+        if (contentText.isEmptyOrNullOrNullString()) {
+            getContentFromMercury(customTabsIntent, prefs)
+        } else {
+            source.text = contentSource
+            titleView.text = contentTitle
+            tryToHandleHtml(contentText, customTabsIntent, prefs)
+
+            if (!contentImage.isEmptyOrNullOrNullString()) {
+                imageView.visibility = View.VISIBLE
+                Glide
+                        .with(baseContext)
+                        .asBitmap()
+                        .load(contentImage)
+                        .apply(RequestOptions.fitCenterTransform())
+                        .into(imageView)
+            } else {
+                imageView.visibility = View.GONE
+            }
+        }
+
+        nestedScrollView.setOnScrollChangeListener(
+                NestedScrollView.OnScrollChangeListener { _, _, scrollY, _, oldScrollY ->
+                    if (scrollY > oldScrollY) {
+                        fab.hide()
+                    } else {
+                        if (mFloatingToolbar.isShowing) mFloatingToolbar.hide() else fab.show()
+                    }
+                }
+        )
+
+        content.movementMethod = LinkMovementMethod.getInstance()
+    }
+
+    private fun getContentFromMercury(
+            customTabsIntent: CustomTabsIntent,
+            prefs: SharedPreferences
+    ) {
+        progressBar.visibility = View.VISIBLE
+        val parser = MercuryApi(
+                BuildConfig.MERCURY_KEY,
+                prefs.getBoolean("should_log_everything", false)
+        )
 
         parser.parseUrl(url).enqueue(object : Callback<ParsedContent> {
-            override fun onResponse(call: Call<ParsedContent>, response: Response<ParsedContent>) {
+            override fun onResponse(
+                    call: Call<ParsedContent>,
+                    response: Response<ParsedContent>
+            ) {
                 if (response.body() != null && response.body()!!.content != null && response.body()!!.content.isNotEmpty()) {
                     source.text = response.body()!!.domain
-                    title.text = response.body()!!.title
+                    titleView.text = response.body()!!.title
+                    this@ReaderActivity.url = response.body()!!.url
+
                     if (response.body()!!.content != null && !response.body()!!.content.isEmpty()) {
-                        try {
+                        tryToHandleHtml(response.body()!!.content, customTabsIntent, prefs)
-                            content.setHtml(response.body()!!.content, HtmlHttpImageGetter(content, null, true))
-                        } catch (e: IndexOutOfBoundsException) {
-                            openInBrowserAfterFailing()
                     }
-                    }
+
-                    if (response.body()!!.lead_image_url != null && !response.body()!!.lead_image_url.isEmpty())
+                    if (response.body()!!.lead_image_url != null && !response.body()!!.lead_image_url.isEmpty()) {
+                        imageView.visibility = View.VISIBLE
                         Glide
                                 .with(baseContext)
                                 .asBitmap()
                                 .load(response.body()!!.lead_image_url)
                                 .apply(RequestOptions.fitCenterTransform())
-                            .into(image)
+                                .into(imageView)
-
+                    } else {
-                    shareBtn.setOnClickListener {
+                        imageView.visibility = View.GONE
-                        this@ReaderActivity.shareLink(response.body()!!.url)
                     }
 
-                    browserBtn.setOnClickListener {
+                    nestedScrollView.scrollTo(0, 0)
-                        this@ReaderActivity.openItemUrl(
+
-                            response.body()!!.url,
+                    progressBar.visibility = View.GONE
-                            customTabsIntent,
+                } else {
-                            false,
+                    openInBrowserAfterFailing(customTabsIntent)
-                            false,
+                }
-                            this@ReaderActivity)
             }
 
-                    hideProgressBar()
+            override fun onFailure(
-                } else openInBrowserAfterFailing()
+                    call: Call<ParsedContent>,
+                    t: Throwable
+            ) = openInBrowserAfterFailing(customTabsIntent)
+        })
     }
 
-            override fun onFailure(call: Call<ParsedContent>, t: Throwable) = openInBrowserAfterFailing()
+    private fun tryToHandleHtml(
+            c: String,
+            customTabsIntent: CustomTabsIntent,
+            prefs: SharedPreferences
+    ) {
+        try {
+            content.text = Html.fromHtml(c, HtmlHttpImageGetter(content, null, true), null)
 
-            private fun openInBrowserAfterFailing() {
+            //content.setHtml(response.body()!!.content, HtmlHttpImageGetter(content, null, true))
+        } catch (e: Exception) {
+            Crashlytics.setUserIdentifier(prefs.getString("unique_id", ""))
+            Crashlytics.log(100, "CANT_TRANSFORM_TO_HTML", e.message)
+            Crashlytics.logException(e)
+            openInBrowserAfterFailing(customTabsIntent)
+        }
+    }
+
+    private fun openInBrowserAfterFailing(customTabsIntent: CustomTabsIntent) {
+        progressBar.visibility = View.GONE
         this@ReaderActivity.openItemUrl(
                 url,
+                contentText,
+                contentImage,
+                contentTitle,
+                contentSource,
                 customTabsIntent,
                 true,
                 false,
@@ -108,7 +206,4 @@ class ReaderActivity : DragDismissActivity() {
         )
         finish()
     }
-        })
-        return v
-    }
 }

app/src/main/java/apps/amine/bou/readerforselfoss/SourcesActivity.kt

@@ -5,20 +5,15 @@ import android.os.Bundle
 import android.preference.PreferenceManager
 import android.support.v7.app.AppCompatActivity
 import android.support.v7.widget.LinearLayoutManager
-import android.support.v7.widget.RecyclerView
-import android.support.v7.widget.Toolbar
 import android.widget.Toast
-
-import com.melnykov.fab.FloatingActionButton
-import retrofit2.Call
-import retrofit2.Callback
-import retrofit2.Response
-
 import apps.amine.bou.readerforselfoss.adapters.SourcesListAdapter
 import apps.amine.bou.readerforselfoss.api.selfoss.SelfossApi
 import apps.amine.bou.readerforselfoss.api.selfoss.Sources
 import com.ftinc.scoop.Scoop
-
+import kotlinx.android.synthetic.main.activity_sources.*
+import retrofit2.Call
+import retrofit2.Callback
+import retrofit2.Response
 
 class SourcesActivity : AppCompatActivity() {
 
@@ -26,44 +21,64 @@ class SourcesActivity : AppCompatActivity() {
         super.onCreate(savedInstanceState)
         Scoop.getInstance().apply(this)
         setContentView(R.layout.activity_sources)
-        val toolbar: Toolbar = findViewById(R.id.toolbar)
+
         setSupportActionBar(toolbar)
         supportActionBar?.setDisplayHomeAsUpEnabled(true)
         supportActionBar?.setDisplayShowHomeEnabled(true)
     }
 
+    override fun onStop() {
+        super.onStop()
+        recyclerView.clearOnScrollListeners()
+    }
+
     override fun onResume() {
         super.onResume()
-        val mFab: FloatingActionButton = findViewById(R.id.fab)
-        val mRecyclerView: RecyclerView = findViewById(R.id.activity_sources)
         val mLayoutManager = LinearLayoutManager(this)
 
         val prefs = PreferenceManager.getDefaultSharedPreferences(this)
 
-        val api = SelfossApi(this, this@SourcesActivity, prefs.getBoolean("isSelfSignedCert", false), prefs.getBoolean("should_log_everything", false))
+        val api = SelfossApi(
+                this,
+                this@SourcesActivity,
+                prefs.getBoolean("isSelfSignedCert", false),
+                prefs.getBoolean("should_log_everything", false)
+        )
         var items: ArrayList<Sources> = ArrayList()
 
-        mFab.attachToRecyclerView(mRecyclerView)
+        recyclerView.setHasFixedSize(true)
-        mRecyclerView.setHasFixedSize(true)
+        recyclerView.layoutManager = mLayoutManager
-        mRecyclerView.layoutManager = mLayoutManager
 
         api.sources.enqueue(object : Callback<List<Sources>> {
-            override fun onResponse(call: Call<List<Sources>>, response: Response<List<Sources>>) {
+            override fun onResponse(
+                    call: Call<List<Sources>>,
+                    response: Response<List<Sources>>
+            ) {
                 if (response.body() != null && response.body()!!.isNotEmpty()) {
                     items = response.body() as ArrayList<Sources>
                 }
                 val mAdapter = SourcesListAdapter(this@SourcesActivity, items, api)
-                mRecyclerView.adapter = mAdapter
+                recyclerView.adapter = mAdapter
                 mAdapter.notifyDataSetChanged()
-                if (items.isEmpty()) Toast.makeText(this@SourcesActivity, R.string.nothing_here, Toast.LENGTH_SHORT).show()
+                if (items.isEmpty()) {
+                    Toast.makeText(
+                            this@SourcesActivity,
+                            R.string.nothing_here,
+                            Toast.LENGTH_SHORT
+                    ).show()
+                }
             }
 
             override fun onFailure(call: Call<List<Sources>>, t: Throwable) {
-                Toast.makeText(this@SourcesActivity, R.string.cant_get_sources, Toast.LENGTH_SHORT).show()
+                Toast.makeText(
+                        this@SourcesActivity,
+                        R.string.cant_get_sources,
+                        Toast.LENGTH_SHORT
+                ).show()
             }
         })
 
-        mFab.setOnClickListener {
+        fab.setOnClickListener {
             startActivity(Intent(this@SourcesActivity, AddSourceActivity::class.java))
         }
     }

app/src/main/java/apps/amine/bou/readerforselfoss/adapters/ItemCardAdapter.kt

@@ -3,42 +3,43 @@ package apps.amine.bou.readerforselfoss.adapters
 import android.app.Activity
 import android.content.Context
 import android.graphics.Color
-import android.support.constraint.ConstraintLayout
 import android.support.design.widget.Snackbar
 import android.support.v7.widget.CardView
 import android.support.v7.widget.RecyclerView
 import android.text.Html
 import android.view.LayoutInflater
 import android.view.ViewGroup
-import android.widget.ImageButton
-import android.widget.ImageView
 import android.widget.ImageView.ScaleType
 import android.widget.TextView
 import android.widget.Toast
-
-import com.amulyakhare.textdrawable.TextDrawable
-import com.amulyakhare.textdrawable.util.ColorGenerator
-import com.bumptech.glide.Glide
-import com.like.LikeButton
-import com.like.OnLikeListener
-import retrofit2.Call
-import retrofit2.Callback
-import retrofit2.Response
-
 import apps.amine.bou.readerforselfoss.R
 import apps.amine.bou.readerforselfoss.api.selfoss.Item
 import apps.amine.bou.readerforselfoss.api.selfoss.SelfossApi
 import apps.amine.bou.readerforselfoss.api.selfoss.SuccessResponse
 import apps.amine.bou.readerforselfoss.themes.AppColors
-import apps.amine.bou.readerforselfoss.utils.*
+import apps.amine.bou.readerforselfoss.utils.buildCustomTabsIntent
 import apps.amine.bou.readerforselfoss.utils.customtabs.CustomTabActivityHelper
 import apps.amine.bou.readerforselfoss.utils.glide.bitmapCenterCrop
-import apps.amine.bou.readerforselfoss.utils.glide.bitmapFitCenter
 import apps.amine.bou.readerforselfoss.utils.glide.circularBitmapDrawable
+import apps.amine.bou.readerforselfoss.utils.openInBrowserAsNewTask
+import apps.amine.bou.readerforselfoss.utils.openItemUrl
+import apps.amine.bou.readerforselfoss.utils.shareLink
+import apps.amine.bou.readerforselfoss.utils.sourceAndDateText
+import apps.amine.bou.readerforselfoss.utils.succeeded
+import apps.amine.bou.readerforselfoss.utils.toTextDrawableString
+import com.amulyakhare.textdrawable.TextDrawable
+import com.amulyakhare.textdrawable.util.ColorGenerator
+import com.bumptech.glide.Glide
 import com.crashlytics.android.Crashlytics
-import kotlin.collections.ArrayList
+import com.like.LikeButton
+import com.like.OnLikeListener
+import kotlinx.android.synthetic.main.card_item.view.*
+import retrofit2.Call
+import retrofit2.Callback
+import retrofit2.Response
 
-class ItemCardAdapter(private val app: Activity,
+class ItemCardAdapter(
+        private val app: Activity,
         private val items: ArrayList<Item>,
         private val api: SelfossApi,
         private val helper: CustomTabActivityHelper,
@@ -47,12 +48,13 @@ class ItemCardAdapter(private val app: Activity,
         private val fullHeightCards: Boolean,
         private val appColors: AppColors,
         val debugReadingItems: Boolean,
-                      val userIdentifier: String) : RecyclerView.Adapter<ItemCardAdapter.ViewHolder>() {
+        val userIdentifier: String
+) : RecyclerView.Adapter<ItemCardAdapter.ViewHolder>() {
     private val c: Context = app.baseContext
     private val generator: ColorGenerator = ColorGenerator.MATERIAL
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
-        val v = LayoutInflater.from(c).inflate(R.layout.card_item, parent, false) as ConstraintLayout
+        val v = LayoutInflater.from(c).inflate(R.layout.card_item, parent, false) as CardView
         return ViewHolder(v)
     }
 
@@ -60,23 +62,18 @@ class ItemCardAdapter(private val app: Activity,
         val itm = items[position]
 
 
-        holder.saveBtn.isLiked = itm.starred
+        holder.mView.favButton.isLiked = itm.starred
-        holder.title.text = Html.fromHtml(itm.title)
+        holder.mView.title.text = Html.fromHtml(itm.title)
 
-        holder.sourceTitleAndDate.text = itm.sourceAndDateText()
+        holder.mView.sourceTitleAndDate.text = itm.sourceAndDateText()
 
         if (itm.getThumbnail(c).isEmpty()) {
-            Glide.with(c).clear(holder.itemImage)
+            Glide.with(c).clear(holder.mView.itemImage)
-            holder.itemImage.setImageDrawable(null)
+            holder.mView.itemImage.setImageDrawable(null)
         } else {
-            if (fullHeightCards) {
+            c.bitmapCenterCrop(itm.getThumbnail(c), holder.mView.itemImage)
-                c.bitmapFitCenter(itm.getThumbnail(c), holder.itemImage)
-            } else {
-                c.bitmapCenterCrop(itm.getThumbnail(c), holder.itemImage)
-            }
         }
 
-        val fHolder = holder
         if (itm.getIcon(c).isEmpty()) {
             val color = generator.getColor(itm.sourcetitle)
 
@@ -85,12 +82,12 @@ class ItemCardAdapter(private val app: Activity,
                             .builder()
                             .round()
                             .build(itm.sourcetitle.toTextDrawableString(), color)
-            holder.sourceImage.setImageDrawable(drawable)
+            holder.mView.sourceImage.setImageDrawable(drawable)
         } else {
-            c.circularBitmapDrawable(itm.getIcon(c), holder.sourceImage)
+            c.circularBitmapDrawable(itm.getIcon(c), holder.mView.sourceImage)
         }
 
-        holder.saveBtn.isLiked = itm.starred
+        holder.mView.favButton.isLiked = itm.starred
     }
 
     override fun getItemCount(): Int {
@@ -99,13 +96,21 @@ class ItemCardAdapter(private val app: Activity,
 
     private fun doUnmark(i: Item, position: Int) {
         val s = Snackbar
-                .make(app.findViewById(R.id.coordLayout), R.string.marked_as_read, Snackbar.LENGTH_LONG)
+                .make(
+                        app.findViewById(R.id.coordLayout),
+                        R.string.marked_as_read,
+                        Snackbar.LENGTH_LONG
+                )
                 .setAction(R.string.undo_string) {
                     items.add(position, i)
                     notifyItemInserted(position)
 
                     api.unmarkItem(i.id).enqueue(object : Callback<SuccessResponse> {
-                        override fun onResponse(call: Call<SuccessResponse>, response: Response<SuccessResponse>) {}
+                        override fun onResponse(
+                                call: Call<SuccessResponse>,
+                                response: Response<SuccessResponse>
+                        ) {
+                        }
 
                         override fun onFailure(call: Call<SuccessResponse>, t: Throwable) {
                             items.remove(i)
@@ -129,8 +134,11 @@ class ItemCardAdapter(private val app: Activity,
         notifyItemRemoved(position)
 
         api.markItem(i.id).enqueue(object : Callback<SuccessResponse> {
-            override fun onResponse(call: Call<SuccessResponse>, response: Response<SuccessResponse>) {
+            override fun onResponse(
-                if (debugReadingItems) {
+                    call: Call<SuccessResponse>,
+                    response: Response<SuccessResponse>
+            ) {
+                if (!response.succeeded() && debugReadingItems) {
                     val message =
                             "message: ${response.message()} " +
                                     "response isSuccess: ${response.isSuccessful} " +
@@ -155,52 +163,51 @@ class ItemCardAdapter(private val app: Activity,
                     Crashlytics.logException(t)
                     Toast.makeText(c, t.message, Toast.LENGTH_LONG).show()
                 }
-                Toast.makeText(app, app.getString(R.string.cant_mark_read), Toast.LENGTH_SHORT).show()
+                Toast.makeText(
+                        app,
+                        app.getString(R.string.cant_mark_read),
+                        Toast.LENGTH_SHORT
+                ).show()
                 items.add(i)
                 notifyItemInserted(position)
             }
         })
-
     }
 
-    inner class ViewHolder(val mView: ConstraintLayout) : RecyclerView.ViewHolder(mView) {
+    inner class ViewHolder(val mView: CardView) : RecyclerView.ViewHolder(mView) {
-        lateinit var saveBtn: LikeButton
-        lateinit var browserBtn: ImageButton
-        lateinit var shareBtn: ImageButton
-        lateinit var itemImage: ImageView
-        lateinit var sourceImage: ImageView
-        lateinit var title: TextView
-        lateinit var sourceTitleAndDate: TextView
-
         init {
-            (mView.findViewById<CardView>(R.id.card)).setCardBackgroundColor(appColors.cardBackground)
+            mView.setCardBackgroundColor(appColors.cardBackground)
             handleClickListeners()
             handleCustomTabActions()
         }
 
         private fun handleClickListeners() {
-            sourceImage = mView.findViewById(R.id.sourceImage)
-            itemImage = mView.findViewById(R.id.itemImage)
-            title = mView.findViewById(R.id.title)
-            sourceTitleAndDate = mView.findViewById(R.id.sourceTitleAndDate)
-            saveBtn = mView.findViewById(R.id.favButton)
-            shareBtn = mView.findViewById(R.id.shareBtn)
-            browserBtn = mView.findViewById(R.id.browserBtn)
 
             if (!fullHeightCards) {
-                itemImage.maxHeight = c.resources.getDimension(R.dimen.card_image_max_height).toInt()
+                mView.itemImage.maxHeight = c.resources.getDimension(R.dimen.card_image_max_height).toInt()
-                itemImage.scaleType = ScaleType.CENTER_CROP
+                mView.itemImage.scaleType = ScaleType.CENTER_CROP
             }
 
-            saveBtn.setOnLikeListener(object : OnLikeListener {
+            mView.favButton.setOnLikeListener(object : OnLikeListener {
                 override fun liked(likeButton: LikeButton) {
                     val (id) = items[adapterPosition]
                     api.starrItem(id).enqueue(object : Callback<SuccessResponse> {
-                        override fun onResponse(call: Call<SuccessResponse>, response: Response<SuccessResponse>) {}
+                        override fun onResponse(
+                                call: Call<SuccessResponse>,
+                                response: Response<SuccessResponse>
+                        ) {
+                        }
 
-                        override fun onFailure(call: Call<SuccessResponse>, t: Throwable) {
+                        override fun onFailure(
-                            saveBtn.isLiked = false
+                                call: Call<SuccessResponse>,
-                            Toast.makeText(c, R.string.cant_mark_favortie, Toast.LENGTH_SHORT).show()
+                                t: Throwable
+                        ) {
+                            mView.favButton.isLiked = false
+                            Toast.makeText(
+                                    c,
+                                    R.string.cant_mark_favortie,
+                                    Toast.LENGTH_SHORT
+                            ).show()
                         }
                     })
                 }
@@ -208,22 +215,33 @@ class ItemCardAdapter(private val app: Activity,
                 override fun unLiked(likeButton: LikeButton) {
                     val (id) = items[adapterPosition]
                     api.unstarrItem(id).enqueue(object : Callback<SuccessResponse> {
-                        override fun onResponse(call: Call<SuccessResponse>, response: Response<SuccessResponse>) {}
+                        override fun onResponse(
+                                call: Call<SuccessResponse>,
+                                response: Response<SuccessResponse>
+                        ) {
+                        }
 
-                        override fun onFailure(call: Call<SuccessResponse>, t: Throwable) {
+                        override fun onFailure(
-                            saveBtn.isLiked = true
+                                call: Call<SuccessResponse>,
-                            Toast.makeText(c, R.string.cant_unmark_favortie, Toast.LENGTH_SHORT).show()
+                                t: Throwable
+                        ) {
+                            mView.favButton.isLiked = true
+                            Toast.makeText(
+                                    c,
+                                    R.string.cant_unmark_favortie,
+                                    Toast.LENGTH_SHORT
+                            ).show()
                         }
                     })
                 }
             })
 
-            shareBtn.setOnClickListener {
+            mView.shareBtn.setOnClickListener {
                 c.shareLink(items[adapterPosition].getLinkDecoded())
             }
 
-            browserBtn.setOnClickListener {
+            mView.browserBtn.setOnClickListener {
-                c.openInBrowser(items[adapterPosition])
+                c.openInBrowserAsNewTask(items[adapterPosition])
             }
         }
 
@@ -232,11 +250,17 @@ class ItemCardAdapter(private val app: Activity,
             helper.bindCustomTabsService(app)
 
             mView.setOnClickListener {
-                c.openItemUrl(items[adapterPosition].getLinkDecoded(),
+                c.openItemUrl(
+                        items[adapterPosition].getLinkDecoded(),
+                        items[adapterPosition].content,
+                        items[adapterPosition].getThumbnail(c),
+                        items[adapterPosition].title,
+                        items[adapterPosition].sourceAndDateText(),
                         customTabsIntent,
                         internalBrowser,
                         articleViewer,
-                    app)
+                        app
+                )
             }
         }
     }

app/src/main/java/apps/amine/bou/readerforselfoss/adapters/ItemListAdapter.kt

@@ -1,6 +1,5 @@
 package apps.amine.bou.readerforselfoss.adapters
 
-
 import android.app.Activity
 import android.content.Context
 import android.graphics.Color
@@ -12,30 +11,35 @@ import android.util.TypedValue
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.widget.*
+import android.widget.TextView
-
+import android.widget.Toast
-import com.amulyakhare.textdrawable.TextDrawable
-import com.amulyakhare.textdrawable.util.ColorGenerator
-import com.like.LikeButton
-import com.like.OnLikeListener
-import retrofit2.Call
-import retrofit2.Callback
-import retrofit2.Response
-import java.util.*
-
 import apps.amine.bou.readerforselfoss.R
 import apps.amine.bou.readerforselfoss.api.selfoss.Item
 import apps.amine.bou.readerforselfoss.api.selfoss.SelfossApi
 import apps.amine.bou.readerforselfoss.api.selfoss.SuccessResponse
-import apps.amine.bou.readerforselfoss.utils.*
+import apps.amine.bou.readerforselfoss.utils.buildCustomTabsIntent
 import apps.amine.bou.readerforselfoss.utils.customtabs.CustomTabActivityHelper
 import apps.amine.bou.readerforselfoss.utils.glide.bitmapCenterCrop
 import apps.amine.bou.readerforselfoss.utils.glide.circularBitmapDrawable
+import apps.amine.bou.readerforselfoss.utils.openInBrowserAsNewTask
+import apps.amine.bou.readerforselfoss.utils.openItemUrl
+import apps.amine.bou.readerforselfoss.utils.shareLink
+import apps.amine.bou.readerforselfoss.utils.sourceAndDateText
+import apps.amine.bou.readerforselfoss.utils.succeeded
+import com.amulyakhare.textdrawable.TextDrawable
+import com.amulyakhare.textdrawable.util.ColorGenerator
 import com.crashlytics.android.Crashlytics
+import com.like.LikeButton
+import com.like.OnLikeListener
+import kotlinx.android.synthetic.main.list_item.view.*
+import retrofit2.Call
+import retrofit2.Callback
+import retrofit2.Response
+import java.util.*
 import kotlin.collections.ArrayList
 
-
+class ItemListAdapter(
-class ItemListAdapter(private val app: Activity,
+        private val app: Activity,
         private val items: ArrayList<Item>,
         private val api: SelfossApi,
         private val helper: CustomTabActivityHelper,
@@ -43,13 +47,18 @@ class ItemListAdapter(private val app: Activity,
         private val internalBrowser: Boolean,
         private val articleViewer: Boolean,
         val debugReadingItems: Boolean,
-                      val userIdentifier: String) : RecyclerView.Adapter<ItemListAdapter.ViewHolder>() {
+        val userIdentifier: String
+) : RecyclerView.Adapter<ItemListAdapter.ViewHolder>() {
     private val generator: ColorGenerator = ColorGenerator.MATERIAL
     private val c: Context = app.baseContext
     private val bars: ArrayList<Boolean> = ArrayList(Collections.nCopies(items.size + 1, false))
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
-        val v = LayoutInflater.from(c).inflate(R.layout.list_item, parent, false) as ConstraintLayout
+        val v = LayoutInflater.from(c).inflate(
+                R.layout.list_item,
+                parent,
+                false
+        ) as ConstraintLayout
         return ViewHolder(v)
     }
 
@@ -57,27 +66,29 @@ class ItemListAdapter(private val app: Activity,
         val itm = items[position]
 
 
-        holder.saveBtn.isLiked = itm.starred
+        holder.mView.favButton.isLiked = itm.starred
-        holder.title.text = Html.fromHtml(itm.title)
+        holder.mView.title.text = Html.fromHtml(itm.title)
 
-        holder.sourceTitleAndDate.text = itm.sourceAndDateText()
+        holder.mView.sourceTitleAndDate.text = itm.sourceAndDateText()
 
         if (itm.getThumbnail(c).isEmpty()) {
             val sizeInInt = 46
             val sizeInDp = TypedValue.applyDimension(
                     TypedValue.COMPLEX_UNIT_DIP, sizeInInt.toFloat(), c.resources
-                .displayMetrics).toInt()
+                    .displayMetrics
+            ).toInt()
 
             val marginInInt = 16
             val marginInDp = TypedValue.applyDimension(
                     TypedValue.COMPLEX_UNIT_DIP, marginInInt.toFloat(), c.resources
-                    .displayMetrics).toInt()
+                    .displayMetrics
+            ).toInt()
 
-            val params = holder.sourceImage.layoutParams as ViewGroup.MarginLayoutParams
+            val params = holder.mView.itemImage.layoutParams as ViewGroup.MarginLayoutParams
             params.height = sizeInDp
             params.width = sizeInDp
             params.setMargins(marginInDp, 0, 0, 0)
-            holder.sourceImage.layoutParams = params
+            holder.mView.itemImage.layoutParams = params
 
             if (itm.getIcon(c).isEmpty()) {
                 val color = generator.getColor(itm.sourcetitle)
@@ -89,31 +100,42 @@ class ItemListAdapter(private val app: Activity,
                 val builder = TextDrawable.builder().round()
 
                 val drawable = builder.build(textDrawable.toString(), color)
-                holder.sourceImage.setImageDrawable(drawable)
+                holder.mView.itemImage.setImageDrawable(drawable)
             } else {
-                c.circularBitmapDrawable(itm.getIcon(c), holder.sourceImage)
+                c.circularBitmapDrawable(itm.getIcon(c), holder.mView.itemImage)
             }
         } else {
-            c.bitmapCenterCrop(itm.getThumbnail(c), holder.sourceImage)
+            c.bitmapCenterCrop(itm.getThumbnail(c), holder.mView.itemImage)
         }
 
-        if (bars[position]) holder.actionBar.visibility = View.VISIBLE else holder.actionBar.visibility = View.GONE
+        if (bars[position]) {
+            holder.mView.actionBar.visibility = View.VISIBLE
+        } else {
+            holder.mView.actionBar.visibility = View.GONE
+        }
 
-        holder.saveBtn.isLiked = itm.starred
+        holder.mView.favButton.isLiked = itm.starred
     }
 
     override fun getItemCount(): Int = items.size
 
-
     private fun doUnmark(i: Item, position: Int) {
         val s = Snackbar
-                .make(app.findViewById(R.id.coordLayout), R.string.marked_as_read, Snackbar.LENGTH_LONG)
+                .make(
+                        app.findViewById(R.id.coordLayout),
+                        R.string.marked_as_read,
+                        Snackbar.LENGTH_LONG
+                )
                 .setAction(R.string.undo_string) {
                     items.add(position, i)
                     notifyItemInserted(position)
 
                     api.unmarkItem(i.id).enqueue(object : Callback<SuccessResponse> {
-                        override fun onResponse(call: Call<SuccessResponse>, response: Response<SuccessResponse>) {}
+                        override fun onResponse(
+                                call: Call<SuccessResponse>,
+                                response: Response<SuccessResponse>
+                        ) {
+                        }
 
                         override fun onFailure(call: Call<SuccessResponse>, t: Throwable) {
                             items.remove(i)
@@ -137,8 +159,11 @@ class ItemListAdapter(private val app: Activity,
         notifyItemRemoved(position)
 
         api.markItem(i.id).enqueue(object : Callback<SuccessResponse> {
-            override fun onResponse(call: Call<SuccessResponse>, response: Response<SuccessResponse>) {
+            override fun onResponse(
-                if (debugReadingItems) {
+                    call: Call<SuccessResponse>,
+                    response: Response<SuccessResponse>
+            ) {
+                if (!response.succeeded() && debugReadingItems) {
                     val message =
                             "message: ${response.message()} " +
                                     "response isSuccess: ${response.isSuccessful} " +
@@ -153,7 +178,6 @@ class ItemListAdapter(private val app: Activity,
                     Toast.makeText(c, message, Toast.LENGTH_LONG).show()
                 }
                 doUnmark(i, position)
-
             }
 
             override fun onFailure(call: Call<SuccessResponse>, t: Throwable) {
@@ -163,22 +187,18 @@ class ItemListAdapter(private val app: Activity,
                     Crashlytics.logException(t)
                     Toast.makeText(c, t.message, Toast.LENGTH_LONG).show()
                 }
-                Toast.makeText(app, app.getString(R.string.cant_mark_read), Toast.LENGTH_SHORT).show()
+                Toast.makeText(
+                        app,
+                        app.getString(R.string.cant_mark_read),
+                        Toast.LENGTH_SHORT
+                ).show()
                 items.add(i)
                 notifyItemInserted(position)
             }
         })
-
     }
 
     inner class ViewHolder(val mView: ConstraintLayout) : RecyclerView.ViewHolder(mView) {
-        lateinit var saveBtn: LikeButton
-        lateinit var browserBtn: ImageButton
-        lateinit var shareBtn: ImageButton
-        lateinit var actionBar: RelativeLayout
-        lateinit var sourceImage: ImageView
-        lateinit var title: TextView
-        lateinit var sourceTitleAndDate: TextView
 
         init {
             handleClickListeners()
@@ -186,24 +206,27 @@ class ItemListAdapter(private val app: Activity,
         }
 
         private fun handleClickListeners() {
-            actionBar = mView.findViewById(R.id.actionBar)
-            sourceImage = mView.findViewById(R.id.itemImage)
-            title = mView.findViewById(R.id.title)
-            sourceTitleAndDate = mView.findViewById(R.id.sourceTitleAndDate)
-            saveBtn = mView.findViewById(R.id.favButton)
-            shareBtn = mView.findViewById(R.id.shareBtn)
-            browserBtn = mView.findViewById(R.id.browserBtn)
 
-
+            mView.favButton.setOnLikeListener(object : OnLikeListener {
-            saveBtn.setOnLikeListener(object : OnLikeListener {
                 override fun liked(likeButton: LikeButton) {
                     val (id) = items[adapterPosition]
                     api.starrItem(id).enqueue(object : Callback<SuccessResponse> {
-                        override fun onResponse(call: Call<SuccessResponse>, response: Response<SuccessResponse>) {}
+                        override fun onResponse(
+                                call: Call<SuccessResponse>,
+                                response: Response<SuccessResponse>
+                        ) {
+                        }
 
-                        override fun onFailure(call: Call<SuccessResponse>, t: Throwable) {
+                        override fun onFailure(
-                            saveBtn.isLiked = false
+                                call: Call<SuccessResponse>,
-                            Toast.makeText(c, R.string.cant_mark_favortie, Toast.LENGTH_SHORT).show()
+                                t: Throwable
+                        ) {
+                            mView.favButton.isLiked = false
+                            Toast.makeText(
+                                    c,
+                                    R.string.cant_mark_favortie,
+                                    Toast.LENGTH_SHORT
+                            ).show()
                         }
                     })
                 }
@@ -211,27 +234,37 @@ class ItemListAdapter(private val app: Activity,
                 override fun unLiked(likeButton: LikeButton) {
                     val (id) = items[adapterPosition]
                     api.unstarrItem(id).enqueue(object : Callback<SuccessResponse> {
-                        override fun onResponse(call: Call<SuccessResponse>, response: Response<SuccessResponse>) {}
+                        override fun onResponse(
+                                call: Call<SuccessResponse>,
+                                response: Response<SuccessResponse>
+                        ) {
+                        }
 
-                        override fun onFailure(call: Call<SuccessResponse>, t: Throwable) {
+                        override fun onFailure(
-                            saveBtn.isLiked = true
+                                call: Call<SuccessResponse>,
-                            Toast.makeText(c, R.string.cant_unmark_favortie, Toast.LENGTH_SHORT).show()
+                                t: Throwable
+                        ) {
+                            mView.favButton.isLiked = true
+                            Toast.makeText(
+                                    c,
+                                    R.string.cant_unmark_favortie,
+                                    Toast.LENGTH_SHORT
+                            ).show()
                         }
                     })
                 }
             })
 
-            shareBtn.setOnClickListener {
+            mView.shareBtn.setOnClickListener {
                 c.shareLink(items[adapterPosition].getLinkDecoded())
             }
 
-            browserBtn.setOnClickListener {
+            mView.browserBtn.setOnClickListener {
-                c.openInBrowser(items[adapterPosition])
+                c.openInBrowserAsNewTask(items[adapterPosition])
 
             }
         }
 
-
         private fun handleCustomTabActions() {
             val customTabsIntent = c.buildCustomTabsIntent()
             helper.bindCustomTabsService(app)
@@ -239,11 +272,17 @@ class ItemListAdapter(private val app: Activity,
 
             if (!clickBehavior) {
                 mView.setOnClickListener {
-                    c.openItemUrl(items[adapterPosition].getLinkDecoded(),
+                    c.openItemUrl(
+                            items[adapterPosition].getLinkDecoded(),
+                            items[adapterPosition].content,
+                            items[adapterPosition].getThumbnail(c),
+                            items[adapterPosition].title,
+                            items[adapterPosition].sourceAndDateText(),
                             customTabsIntent,
                             internalBrowser,
                             articleViewer,
-                        app)
+                            app
+                    )
                 }
                 mView.setOnLongClickListener {
                     actionBarShowHide()
@@ -252,11 +291,17 @@ class ItemListAdapter(private val app: Activity,
             } else {
                 mView.setOnClickListener { actionBarShowHide() }
                 mView.setOnLongClickListener {
-                    c.openItemUrl(items[adapterPosition].getLinkDecoded(),
+                    c.openItemUrl(
+                            items[adapterPosition].getLinkDecoded(),
+                            items[adapterPosition].content,
+                            items[adapterPosition].getThumbnail(c),
+                            items[adapterPosition].title,
+                            items[adapterPosition].sourceAndDateText(),
                             customTabsIntent,
                             internalBrowser,
                             articleViewer,
-                        app)
+                            app
+                    )
                     true
                 }
             }
@@ -264,7 +309,11 @@ class ItemListAdapter(private val app: Activity,
 
         private fun actionBarShowHide() {
             bars[adapterPosition] = true
-            if (actionBar.visibility == View.GONE) actionBar.visibility = View.VISIBLE else actionBar.visibility = View.GONE
+            if (mView.actionBar.visibility == View.GONE) {
+                mView.actionBar.visibility = View.VISIBLE
+            } else {
+                mView.actionBar.visibility = View.GONE
+            }
         }
     }
 }

app/src/main/java/apps/amine/bou/readerforselfoss/adapters/SourcesListAdapter.kt

@@ -7,32 +7,34 @@ import android.support.v7.widget.RecyclerView
 import android.view.LayoutInflater
 import android.view.ViewGroup
 import android.widget.Button
-import android.widget.ImageView
-import android.widget.TextView
 import android.widget.Toast
-
-import com.amulyakhare.textdrawable.TextDrawable
-import com.amulyakhare.textdrawable.util.ColorGenerator
-import retrofit2.Call
-import retrofit2.Callback
-import retrofit2.Response
-
 import apps.amine.bou.readerforselfoss.R
 import apps.amine.bou.readerforselfoss.api.selfoss.SelfossApi
 import apps.amine.bou.readerforselfoss.api.selfoss.Sources
 import apps.amine.bou.readerforselfoss.api.selfoss.SuccessResponse
 import apps.amine.bou.readerforselfoss.utils.glide.circularBitmapDrawable
 import apps.amine.bou.readerforselfoss.utils.toTextDrawableString
+import com.amulyakhare.textdrawable.TextDrawable
+import com.amulyakhare.textdrawable.util.ColorGenerator
+import kotlinx.android.synthetic.main.source_list_item.view.*
+import retrofit2.Call
+import retrofit2.Callback
+import retrofit2.Response
 
-
+class SourcesListAdapter(
-class SourcesListAdapter(private val app: Activity,
+        private val app: Activity,
         private val items: ArrayList<Sources>,
-                         private val api: SelfossApi) : RecyclerView.Adapter<SourcesListAdapter.ViewHolder>() {
+        private val api: SelfossApi
+) : RecyclerView.Adapter<SourcesListAdapter.ViewHolder>() {
     private val c: Context = app.baseContext
     private val generator: ColorGenerator = ColorGenerator.MATERIAL
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
-        val v = LayoutInflater.from(c).inflate(R.layout.source_list_item, parent, false) as ConstraintLayout
+        val v = LayoutInflater.from(c).inflate(
+                R.layout.source_list_item,
+                parent,
+                false
+        ) as ConstraintLayout
         return ViewHolder(v)
     }
 
@@ -47,53 +49,55 @@ class SourcesListAdapter(private val app: Activity,
                             .builder()
                             .round()
                             .build(itm.title.toTextDrawableString(), color)
-            holder.sourceImage.setImageDrawable(drawable)
+            holder.mView.itemImage.setImageDrawable(drawable)
         } else {
-            c.circularBitmapDrawable(itm.getIcon(c), holder.sourceImage)
+            c.circularBitmapDrawable(itm.getIcon(c), holder.mView.itemImage)
         }
 
-        holder.sourceTitle.text = itm.title
+        holder.mView.sourceTitle.text = itm.title
     }
 
-    override fun getItemCount(): Int {
+    override fun getItemCount(): Int = items.size
-        return items.size
-    }
 
     inner class ViewHolder(internal val mView: ConstraintLayout) : RecyclerView.ViewHolder(mView) {
-        lateinit var sourceImage: ImageView
-        lateinit var sourceTitle: TextView
 
         init {
-
             handleClickListeners()
         }
 
         private fun handleClickListeners() {
-            sourceImage = mView.findViewById(R.id.itemImage)
-            sourceTitle = mView.findViewById(R.id.sourceTitle)
 
             val deleteBtn: Button = mView.findViewById(R.id.deleteBtn)
 
             deleteBtn.setOnClickListener {
                 val (id) = items[adapterPosition]
                 api.deleteSource(id).enqueue(object : Callback<SuccessResponse> {
-                    override fun onResponse(call: Call<SuccessResponse>, response: Response<SuccessResponse>) {
+                    override fun onResponse(
+                            call: Call<SuccessResponse>,
+                            response: Response<SuccessResponse>
+                    ) {
                         if (response.body() != null && response.body()!!.isSuccess) {
                             items.removeAt(adapterPosition)
                             notifyItemRemoved(adapterPosition)
                             notifyItemRangeChanged(adapterPosition, itemCount)
                         } else {
-                            Toast.makeText(app, R.string.can_delete_source, Toast.LENGTH_SHORT).show()
+                            Toast.makeText(
+                                    app,
+                                    R.string.can_delete_source,
+                                    Toast.LENGTH_SHORT
+                            ).show()
                         }
                     }
 
                     override fun onFailure(call: Call<SuccessResponse>, t: Throwable) {
-                        Toast.makeText(app, R.string.can_delete_source, Toast.LENGTH_SHORT).show()
+                        Toast.makeText(
+                                app,
+                                R.string.can_delete_source,
+                                Toast.LENGTH_SHORT
+                        ).show()
                     }
                 })
             }
-
-
         }
     }
 }

app/src/main/java/apps/amine/bou/readerforselfoss/api/mercury/MercuryApi.kt

@@ -7,18 +7,17 @@ import retrofit2.Call
 import retrofit2.Retrofit
 import retrofit2.converter.gson.GsonConverterFactory
 
-
-
 class MercuryApi(private val key: String, shouldLog: Boolean) {
     private val service: MercuryService
 
     init {
 
         val interceptor = HttpLoggingInterceptor()
-        interceptor.level = if (shouldLog)
+        interceptor.level = if (shouldLog) {
             HttpLoggingInterceptor.Level.BODY
-        else
+        } else {
             HttpLoggingInterceptor.Level.NONE
+        }
         val client = OkHttpClient.Builder().addInterceptor(interceptor).build()
 
         val gson = GsonBuilder()

app/src/main/java/apps/amine/bou/readerforselfoss/api/mercury/MercuryModels.kt

@@ -4,8 +4,8 @@ import android.os.Parcel
 import android.os.Parcelable
 import com.google.gson.annotations.SerializedName
 
-
+class ParsedContent(
-class ParsedContent(@SerializedName("title") val title: String,
+        @SerializedName("title") val title: String,
         @SerializedName("content") val content: String,
         @SerializedName("date_published") val date_published: String,
         @SerializedName("lead_image_url") val lead_image_url: String,
@@ -15,10 +15,12 @@ class ParsedContent(@SerializedName("title") val title: String,
         @SerializedName("excerpt") val excerpt: String,
         @SerializedName("total_pages") val total_pages: Int,
         @SerializedName("rendered_pages") val rendered_pages: Int,
-                    @SerializedName("next_page_url") val next_page_url: String) : Parcelable {
+        @SerializedName("next_page_url") val next_page_url: String
+) : Parcelable {
 
     companion object {
-        @JvmField val CREATOR: Parcelable.Creator<ParsedContent> = object : Parcelable.Creator<ParsedContent> {
+        @JvmField
+        val CREATOR: Parcelable.Creator<ParsedContent> = object : Parcelable.Creator<ParsedContent> {
             override fun createFromParcel(source: Parcel): ParsedContent = ParsedContent(source)
             override fun newArray(size: Int): Array<ParsedContent?> = arrayOfNulls(size)
         }

app/src/main/java/apps/amine/bou/readerforselfoss/api/mercury/MercuryService.kt

@@ -1,13 +1,10 @@
 package apps.amine.bou.readerforselfoss.api.mercury
 
-
 import retrofit2.Call
 import retrofit2.http.GET
 import retrofit2.http.Header
 import retrofit2.http.Query
 
-
-
 interface MercuryService {
     @GET("parser")
     fun parseUrl(@Query("url") url: String, @Header("x-api-key") key: String): Call<ParsedContent>

app/src/main/java/apps/amine/bou/readerforselfoss/api/selfoss/BooleanTypeAdapter.kt

@@ -1,18 +1,19 @@
 package apps.amine.bou.readerforselfoss.api.selfoss
 
-import java.lang.reflect.Type
-
-import com.google.gson.JsonParseException
 import com.google.gson.JsonDeserializationContext
-import com.google.gson.JsonElement
 import com.google.gson.JsonDeserializer
-
+import com.google.gson.JsonElement
-
+import com.google.gson.JsonParseException
+import java.lang.reflect.Type
 
 internal class BooleanTypeAdapter : JsonDeserializer<Boolean> {
 
     @Throws(JsonParseException::class)
-    override fun deserialize(json: JsonElement, typeOfT: Type, context: JsonDeserializationContext): Boolean? =
+    override fun deserialize(
+            json: JsonElement,
+            typeOfT: Type,
+            context: JsonDeserializationContext
+    ): Boolean? =
             try {
                 json.asInt == 1
             } catch (e: Exception) {

app/src/main/java/apps/amine/bou/readerforselfoss/api/selfoss/SelfossApi.kt

@@ -2,8 +2,8 @@ package apps.amine.bou.readerforselfoss.api.selfoss
 
 import android.app.Activity
 import android.content.Context
-import java.util.concurrent.ConcurrentHashMap
+import apps.amine.bou.readerforselfoss.utils.Config
-
+import apps.amine.bou.readerforselfoss.utils.getUnsafeHttpClient
 import com.burgstaller.okhttp.AuthenticationCacheInterceptor
 import com.burgstaller.okhttp.CachingAuthenticatorDecorator
 import com.burgstaller.okhttp.DispatchingAuthenticator
@@ -13,19 +13,18 @@ import com.burgstaller.okhttp.digest.Credentials
 import com.burgstaller.okhttp.digest.DigestAuthenticator
 import com.google.gson.GsonBuilder
 import okhttp3.OkHttpClient
+import okhttp3.logging.HttpLoggingInterceptor
 import retrofit2.Call
 import retrofit2.Retrofit
 import retrofit2.converter.gson.GsonConverterFactory
+import java.util.concurrent.ConcurrentHashMap
 
-import apps.amine.bou.readerforselfoss.utils.Config
+class SelfossApi(
-import apps.amine.bou.readerforselfoss.utils.getUnsafeHttpClient
+        c: Context,
-import okhttp3.logging.HttpLoggingInterceptor
+        callingActivity: Activity,
-
+        isWithSelfSignedCert: Boolean,
-
+        shouldLog: Boolean
-
+) {
-
-// codebeat:disable[ARITY,TOO_MANY_FUNCTIONS]
-class SelfossApi(c: Context, callingActivity: Activity, isWithSelfSignedCert: Boolean, shouldLog: Boolean) {
 
     private lateinit var service: SelfossService
     private val config: Config = Config(c)
@@ -54,7 +53,6 @@ class SelfossApi(c: Context, callingActivity: Activity, isWithSelfSignedCert: Bo
                 .addInterceptor(AuthenticationCacheInterceptor(authCache))
     }
 
-
     init {
         userName = config.userLogin
         password = config.userPassword
@@ -73,10 +71,11 @@ class SelfossApi(c: Context, callingActivity: Activity, isWithSelfSignedCert: Bo
 
         val logging = HttpLoggingInterceptor()
 
-        logging.level = if (shouldLog)
+        logging.level = if (shouldLog) {
             HttpLoggingInterceptor.Level.BODY
-        else
+        } else {
             HttpLoggingInterceptor.Level.NONE
+        }
 
         val httpClient = authenticator.getHttpClien(isWithSelfSignedCert)
 
@@ -99,16 +98,41 @@ class SelfossApi(c: Context, callingActivity: Activity, isWithSelfSignedCert: Bo
     fun login(): Call<SuccessResponse> =
             service.loginToSelfoss(config.userLogin, config.userPassword)
 
-    fun readItems(tag: String?, sourceId: Long?, search: String?, itemsNumber: Int, offset: Int): Call<List<Item>> =
+    fun readItems(
+            tag: String?,
+            sourceId: Long?,
+            search: String?,
+            itemsNumber: Int,
+            offset: Int
+    ): Call<List<Item>> =
             getItems("read", tag, sourceId, search, itemsNumber, offset)
 
-    fun newItems(tag: String?, sourceId: Long?, search: String?, itemsNumber: Int, offset: Int): Call<List<Item>> =
+    fun newItems(
+            tag: String?,
+            sourceId: Long?,
+            search: String?,
+            itemsNumber: Int,
+            offset: Int
+    ): Call<List<Item>> =
             getItems("unread", tag, sourceId, search, itemsNumber, offset)
 
-    fun starredItems(tag: String?, sourceId: Long?, search: String?, itemsNumber: Int, offset: Int): Call<List<Item>> =
+    fun starredItems(
+            tag: String?,
+            sourceId: Long?,
+            search: String?,
+            itemsNumber: Int,
+            offset: Int
+    ): Call<List<Item>> =
             getItems("starred", tag, sourceId, search, itemsNumber, offset)
 
-    private fun getItems(type: String, tag: String?, sourceId: Long?, search: String?, items: Int, offset: Int): Call<List<Item>> =
+    private fun getItems(
+            type: String,
+            tag: String?,
+            sourceId: Long?,
+            search: String?,
+            items: Int,
+            offset: Int
+    ): Call<List<Item>> =
             service.getItems(type, tag, sourceId, search, userName, password, items, offset)
 
     fun markItem(itemId: String): Call<SuccessResponse> =
@@ -144,9 +168,12 @@ class SelfossApi(c: Context, callingActivity: Activity, isWithSelfSignedCert: Bo
     fun spouts(): Call<Map<String, Spout>> =
             service.spouts(userName, password)
 
-    fun createSource(title: String, url: String, spout: String, tags: String, filter: String): Call<SuccessResponse> =
+    fun createSource(
+            title: String,
+            url: String,
+            spout: String,
+            tags: String,
+            filter: String
+    ): Call<SuccessResponse> =
             service.createSource(title, url, spout, tags, filter, userName, password)
-
 }
-
-// codebeat:enable[ARITY,TOO_MANY_FUNCTIONS]

app/src/main/java/apps/amine/bou/readerforselfoss/api/selfoss/SelfossModels.kt

@@ -9,58 +9,69 @@ import apps.amine.bou.readerforselfoss.utils.Config
 import apps.amine.bou.readerforselfoss.utils.isEmptyOrNullOrNullString
 import com.google.gson.annotations.SerializedName
 
-
 private fun constructUrl(config: Config?, path: String, file: String): String {
     val baseUriBuilder = Uri.parse(config!!.baseUrl).buildUpon()
     baseUriBuilder.appendPath(path).appendPath(file)
 
-    return if (file.isEmptyOrNullOrNullString()) ""
+    return if (file.isEmptyOrNullOrNullString()) {
-    else baseUriBuilder.toString()
+        ""
+    } else {
+        baseUriBuilder.toString()
+    }
 }
 
-
+data class Tag(
-data class Tag(@SerializedName("tag") val tag: String,
+        @SerializedName("tag") val tag: String,
         @SerializedName("color") val color: String,
-               @SerializedName("unread") val unread: Int)
+        @SerializedName("unread") val unread: Int
+)
 
 class SuccessResponse(@SerializedName("success") val success: Boolean) {
     val isSuccess: Boolean
         get() = success
 }
 
-class Stats(@SerializedName("total") val total: Int,
+class Stats(
+        @SerializedName("total") val total: Int,
         @SerializedName("unread") val unread: Int,
-            @SerializedName("starred") val starred: Int)
+        @SerializedName("starred") val starred: Int
+)
 
-data class Spout(@SerializedName("name") val name: String,
+data class Spout(
-                 @SerializedName("description") val description: String)
+        @SerializedName("name") val name: String,
+        @SerializedName("description") val description: String
+)
 
-data class Sources(@SerializedName("id") val id: String,
+data class Sources(
+        @SerializedName("id") val id: String,
         @SerializedName("title") val title: String,
         @SerializedName("tags") val tags: String,
         @SerializedName("spout") val spout: String,
         @SerializedName("error") val error: String,
-                   @SerializedName("icon") val icon: String) {
+        @SerializedName("icon") val icon: String
+) {
     var config: Config? = null
 
     fun getIcon(app: Context): String {
         if (config == null) {
             config = Config(app)
         }
-        return constructUrl(config,"favicons", icon)
+        return constructUrl(config, "favicons", icon)
     }
-
 }
 
-data class Item(@SerializedName("id") val id: String,
+data class Item(
+        @SerializedName("id") val id: String,
         @SerializedName("datetime") val datetime: String,
         @SerializedName("title") val title: String,
+        @SerializedName("content") val content: String,
         @SerializedName("unread") val unread: Boolean,
         @SerializedName("starred") val starred: Boolean,
         @SerializedName("thumbnail") val thumbnail: String,
         @SerializedName("icon") val icon: String,
         @SerializedName("link") val link: String,
-                @SerializedName("sourcetitle") val sourcetitle: String) : Parcelable {
+        @SerializedName("sourcetitle") val sourcetitle: String
+) : Parcelable {
 
     var config: Config? = null
 
@@ -75,6 +86,7 @@ data class Item(@SerializedName("id") val id: String,
             id = source.readString(),
             datetime = source.readString(),
             title = source.readString(),
+            content = source.readString(),
             unread = 0.toByte() != source.readByte(),
             starred = 0.toByte() != source.readByte(),
             thumbnail = source.readString(),
@@ -89,6 +101,7 @@ data class Item(@SerializedName("id") val id: String,
         dest.writeString(id)
         dest.writeString(datetime)
         dest.writeString(title)
+        dest.writeString(content)
         dest.writeByte((if (unread) 1 else 0))
         dest.writeByte((if (starred) 1 else 0))
         dest.writeString(thumbnail)
@@ -136,5 +149,4 @@ data class Item(@SerializedName("id") val id: String,
 
         return stringUrl
     }
-
 }

app/src/main/java/apps/amine/bou/readerforselfoss/api/selfoss/SelfossService.kt

@@ -5,93 +5,114 @@ import retrofit2.http.DELETE
 import retrofit2.http.Field
 import retrofit2.http.FormUrlEncoded
 import retrofit2.http.GET
+import retrofit2.http.Headers
 import retrofit2.http.POST
 import retrofit2.http.Path
 import retrofit2.http.Query
 
-
-
-// codebeat:disable[ARITY]
 internal interface SelfossService {
+
     @GET("login")
     fun loginToSelfoss(@Query("username") username: String, @Query("password") password: String): Call<SuccessResponse>
 
     @GET("items")
-    fun getItems(@Query("type") type: String,
+    fun getItems(
+            @Query("type") type: String,
             @Query("tag") tag: String?,
             @Query("source") source: Long?,
             @Query("search") search: String?,
             @Query("username") username: String,
             @Query("password") password: String,
             @Query("items") items: Int,
-                 @Query("offset") offset: Int): Call<List<Item>>
+            @Query("offset") offset: Int
+    ): Call<List<Item>>
 
+    @Headers("Content-Type: application/x-www-form-urlencoded")
     @POST("mark/{id}")
-    fun markAsRead(@Path("id") id: String,
+    fun markAsRead(
+            @Path("id") id: String,
             @Query("username") username: String,
-                   @Query("password") password: String): Call<SuccessResponse>
+            @Query("password") password: String
-
+    ): Call<SuccessResponse>
 
+    @Headers("Content-Type: application/x-www-form-urlencoded")
     @POST("unmark/{id}")
-    fun unmarkAsRead(@Path("id") id: String,
+    fun unmarkAsRead(
+            @Path("id") id: String,
             @Query("username") username: String,
-                     @Query("password") password: String): Call<SuccessResponse>
+            @Query("password") password: String
+    ): Call<SuccessResponse>
 
     @FormUrlEncoded
     @POST("mark")
-    fun markAllAsRead(@Field("ids[]") ids: List<String>,
+    fun markAllAsRead(
+            @Field("ids[]") ids: List<String>,
             @Query("username") username: String,
-                      @Query("password") password: String): Call<SuccessResponse>
+            @Query("password") password: String
-
+    ): Call<SuccessResponse>
 
+    @Headers("Content-Type: application/x-www-form-urlencoded")
     @POST("starr/{id}")
-    fun starr(@Path("id") id: String,
+    fun starr(
+            @Path("id") id: String,
             @Query("username") username: String,
-              @Query("password") password: String): Call<SuccessResponse>
+            @Query("password") password: String
-
+    ): Call<SuccessResponse>
 
+    @Headers("Content-Type: application/x-www-form-urlencoded")
     @POST("unstarr/{id}")
-    fun unstarr(@Path("id") id: String,
+    fun unstarr(
+            @Path("id") id: String,
             @Query("username") username: String,
-                @Query("password") password: String): Call<SuccessResponse>
+            @Query("password") password: String
-
+    ): Call<SuccessResponse>
 
     @GET("stats")
-    fun stats(@Query("username") username: String,
+    fun stats(
-              @Query("password") password: String): Call<Stats>
+            @Query("username") username: String,
-
+            @Query("password") password: String
+    ): Call<Stats>
 
     @GET("tags")
-    fun tags(@Query("username") username: String,
+    fun tags(
-             @Query("password") password: String): Call<List<Tag>>
+            @Query("username") username: String,
-
+            @Query("password") password: String
+    ): Call<List<Tag>>
 
     @GET("update")
-    fun update(@Query("username") username: String,
+    fun update(
-               @Query("password") password: String): Call<String>
+            @Query("username") username: String,
+            @Query("password") password: String
+    ): Call<String>
 
     @GET("sources/spouts")
-    fun spouts(@Query("username") username: String,
+    fun spouts(
-               @Query("password") password: String): Call<Map<String, Spout>>
+            @Query("username") username: String,
+            @Query("password") password: String
+    ): Call<Map<String, Spout>>
 
     @GET("sources/list")
-    fun sources(@Query("username") username: String,
+    fun sources(
-                @Query("password") password: String): Call<List<Sources>>
+            @Query("username") username: String,
-
+            @Query("password") password: String
+    ): Call<List<Sources>>
 
     @DELETE("source/{id}")
-    fun deleteSource(@Path("id") id: String,
+    fun deleteSource(
+            @Path("id") id: String,
             @Query("username") username: String,
-                     @Query("password") password: String): Call<SuccessResponse>
+            @Query("password") password: String
+    ): Call<SuccessResponse>
 
     @FormUrlEncoded
     @POST("source")
-    fun createSource(@Field("title") title: String,
+    fun createSource(
+            @Field("title") title: String,
             @Field("url") url: String,
             @Field("spout") spout: String,
             @Field("tags") tags: String,
             @Field("filter") filter: String,
             @Query("username") username: String,
-                     @Query("password") password: String): Call<SuccessResponse>
+            @Query("password") password: String
+    ): Call<SuccessResponse>
 }
-// codebeat:disable[ARITY]

app/src/main/java/apps/amine/bou/readerforselfoss/settings/AppCompatPreferenceActivity.java

@@ -24,7 +24,7 @@ import com.ftinc.scoop.Scoop;
  * A {@link PreferenceActivity} which implements and proxies the necessary calls
  * to be used with AppCompat.
  */
-public abstract class AppCompatPreferenceActivity extends PreferenceActivity {
+public abstract class AppCompatPreferenceActivity extends PreferenceActivity { //NOSONAR
 
     private AppCompatDelegate mDelegate;
 
@@ -116,6 +116,7 @@ public abstract class AppCompatPreferenceActivity extends PreferenceActivity {
         getDelegate().onDestroy();
     }
 
+    @Override
     public void invalidateOptionsMenu() {
         getDelegate().invalidateOptionsMenu();
     }

app/src/main/java/apps/amine/bou/readerforselfoss/settings/SettingsActivity.java

@@ -1,6 +1,8 @@
 package apps.amine.bou.readerforselfoss.settings;
 
 
+import java.util.List;
+
 import android.annotation.TargetApi;
 import android.content.ClipData;
 import android.content.ClipboardManager;
@@ -16,17 +18,15 @@ import android.preference.Preference;
 import android.preference.Preference.OnPreferenceChangeListener;
 import android.preference.Preference.OnPreferenceClickListener;
 import android.preference.PreferenceActivity;
-import android.preference.SwitchPreference;
-import android.support.v7.app.ActionBar;
 import android.preference.PreferenceFragment;
 import android.preference.PreferenceManager;
+import android.preference.SwitchPreference;
+import android.support.v7.app.ActionBar;
 import android.text.InputFilter;
 import android.text.Spanned;
 import android.view.MenuItem;
 import android.widget.Toast;
 
-import java.util.List;
-
 import apps.amine.bou.readerforselfoss.BuildConfig;
 import apps.amine.bou.readerforselfoss.R;
 import apps.amine.bou.readerforselfoss.utils.Config;
@@ -44,7 +44,7 @@ import com.ftinc.scoop.ui.ScoopSettingsActivity;
  * href="http://developer.android.com/guide/topics/ui/settings.html">Settings
  * API Guide</a> for more information on developing a Settings UI.
  */
-public class SettingsActivity extends AppCompatPreferenceActivity {
+public class SettingsActivity extends AppCompatPreferenceActivity { //NOSONAR
     /**
      * A preference value change listener that updates the preference's summary
      * to reflect its new value.
@@ -126,6 +126,7 @@ public class SettingsActivity extends AppCompatPreferenceActivity {
      * This method stops fragment injection in malicious applications.
      * Make sure to deny any unknown fragments here.
      */
+    @Override
     protected boolean isValidFragment(String fragmentName) {
         return PreferenceFragment.class.getName().equals(fragmentName)
                 || GeneralPreferenceFragment.class.getName().equals(fragmentName)
@@ -166,7 +167,9 @@ public class SettingsActivity extends AppCompatPreferenceActivity {
                             int input = Integer.parseInt(dest.toString() + source.toString());
                             if (input <= 200 && input >0)
                                 return null;
-                        } catch (NumberFormatException nfe) { }
+                        } catch (NumberFormatException nfe) {
+                            Toast.makeText(getActivity(), R.string.items_number_should_be_number, Toast.LENGTH_LONG).show();
+                        }
                         return "";
                     }
                 }

app/src/main/java/apps/amine/bou/readerforselfoss/themes/AppColors.kt

@@ -6,7 +6,6 @@ import android.support.annotation.ColorInt
 import android.util.TypedValue
 import apps.amine.bou.readerforselfoss.R
 
-
 class AppColors(a: Activity) {
     @ColorInt val accent: Int
     @ColorInt val dark: Int
@@ -20,7 +19,7 @@ class AppColors(a: Activity) {
         val method = wrapper!!.getMethod("getThemeResId")
         method.isAccessible = true
 
-        isDarkTheme = when(method.invoke(a.baseContext)) {
+        isDarkTheme = when (method.invoke(a.baseContext)) {
             R.style.NoBarTealOrangeDark,
             R.style.NoBarDark,
             R.style.NoBarBlueAmberDark,

app/src/main/java/apps/amine/bou/readerforselfoss/utils/ApiUtils.kt

@@ -0,0 +1,7 @@
+package apps.amine.bou.readerforselfoss.utils
+
+import apps.amine.bou.readerforselfoss.api.selfoss.SuccessResponse
+import retrofit2.Response
+
+fun Response<SuccessResponse>.succeeded(): Boolean =
+        this.code() === 200 && this.body() != null && this.body()!!.isSuccess

app/src/main/java/apps/amine/bou/readerforselfoss/utils/AppUtils.kt

@@ -5,41 +5,17 @@ import android.content.Intent
 import android.content.SharedPreferences
 import android.net.Uri
 import android.support.v7.app.AlertDialog
-import android.text.TextUtils
-
-import com.google.firebase.remoteconfig.FirebaseRemoteConfig
-
-import apps.amine.bou.readerforselfoss.BuildConfig
 import apps.amine.bou.readerforselfoss.R
-import apps.amine.bou.readerforselfoss.api.selfoss.Item
+import com.google.firebase.remoteconfig.FirebaseRemoteConfig
-
-
-fun Context.checkAndDisplayStoreApk() = {
-    fun isStoreVersion(): Boolean =
-        try {
-            val installer = this.packageManager
-                .getInstallerPackageName(this.packageName)
-            !TextUtils.isEmpty(installer)
-        } catch (e: Throwable) {
-            false
-        }
-
-    if (!isStoreVersion() && !BuildConfig.GITHUB_VERSION) {
-        val alertDialog = AlertDialog.Builder(this).create()
-        alertDialog.setTitle(getString(R.string.warning_version))
-        alertDialog.setMessage(getString(R.string.text_version))
-        alertDialog.setButton(AlertDialog.BUTTON_NEUTRAL, "OK",
-            { dialog, _ -> dialog.dismiss() })
-        alertDialog.show()
-    } else Unit
-}
 
 fun String?.isEmptyOrNullOrNullString(): Boolean =
         this == null || this == "null" || this.isEmpty()
 
-fun Context.checkApkVersion(settings: SharedPreferences,
+fun Context.checkApkVersion(
+        settings: SharedPreferences,
         editor: SharedPreferences.Editor,
-                    mFirebaseRemoteConfig: FirebaseRemoteConfig) = {
+        mFirebaseRemoteConfig: FirebaseRemoteConfig
+) = {
     fun isThereAnUpdate() {
         val APK_LINK = "github_apk"
 
@@ -49,21 +25,25 @@ fun Context.checkApkVersion(settings: SharedPreferences,
             val alertDialog = AlertDialog.Builder(this).create()
             alertDialog.setTitle(getString(R.string.new_apk_available_title))
             alertDialog.setMessage(getString(R.string.new_apk_available_message))
-            alertDialog.setButton(AlertDialog.BUTTON_POSITIVE, getString(R.string.new_apk_available_get)) { _, _ ->
+            alertDialog.setButton(
+                    AlertDialog.BUTTON_POSITIVE,
+                    getString(R.string.new_apk_available_get)
+            ) { _, _ ->
                 editor.putString(APK_LINK, apkLink)
                 editor.apply()
                 val browserIntent = Intent(Intent.ACTION_VIEW, Uri.parse(apkLink))
                 startActivity(browserIntent)
             }
-            alertDialog.setButton(AlertDialog.BUTTON_NEUTRAL, getString(R.string.new_apk_available_no),
+            alertDialog.setButton(
+                    AlertDialog.BUTTON_NEUTRAL, getString(R.string.new_apk_available_no),
                     { dialog, _ ->
                         editor.putString(APK_LINK, apkLink)
                         editor.apply()
                         dialog.dismiss()
-                })
+                    }
+            )
             alertDialog.show()
         }
-
     }
 
     mFirebaseRemoteConfig.fetch(43200)
@@ -87,11 +67,12 @@ fun String.longHash(): Long {
     return h
 }
 
-fun String.toStringUriWithHttp() =
+fun String.toStringUriWithHttp(): String =
-    if (!this.startsWith("https://") && !this.startsWith("http://"))
+        if (!this.startsWith("https://") && !this.startsWith("http://")) {
             "http://" + this
-    else
+        } else {
             this
+        }
 
 fun Context.shareLink(itemUrl: String) {
     val sendIntent = Intent()
@@ -99,12 +80,10 @@ fun Context.shareLink(itemUrl: String) {
     sendIntent.action = Intent.ACTION_SEND
     sendIntent.putExtra(Intent.EXTRA_TEXT, itemUrl.toStringUriWithHttp())
     sendIntent.type = "text/plain"
-    startActivity(Intent.createChooser(sendIntent, getString(R.string.share)).setFlags(Intent.FLAG_ACTIVITY_NEW_TASK))
+    startActivity(
-}
+            Intent.createChooser(
-
+                    sendIntent,
-fun Context.openInBrowser(i: Item) {
+                    getString(R.string.share)
-    val intent = Intent(Intent.ACTION_VIEW)
+            ).setFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-    intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK
+    )
-    intent.data = Uri.parse(i.getLinkDecoded().toStringUriWithHttp())
-    startActivity(intent)
 }

app/src/main/java/apps/amine/bou/readerforselfoss/utils/Config.kt

@@ -6,7 +6,6 @@ import android.content.Intent
 import android.content.SharedPreferences
 import apps.amine.bou.readerforselfoss.LoginActivity
 
-
 class Config(c: Context) {
 
     val settings: SharedPreferences = c.getSharedPreferences(settingsName, Context.MODE_PRIVATE)
@@ -26,21 +25,23 @@ class Config(c: Context) {
     val httpUserPassword: String
         get() = settings.getString("httpPassword", "")
 
-
     companion object {
         val settingsName = "paramsselfoss"
 
-        fun logoutAndRedirect(c: Context,
+        fun logoutAndRedirect(
+                c: Context,
                 callingActivity: Activity,
                 editor: SharedPreferences.Editor,
-                              baseUrlFail: Boolean = false): Boolean {
+                baseUrlFail: Boolean = false
+        ): Boolean {
             editor.remove("url")
             editor.remove("login")
             editor.remove("password")
             editor.apply()
             val intent = Intent(c, LoginActivity::class.java)
-            if (baseUrlFail)
+            if (baseUrlFail) {
                 intent.putExtra("baseUrlFail", baseUrlFail)
+            }
             c.startActivity(intent)
             callingActivity.finish()
             return true

app/src/main/java/apps/amine/bou/readerforselfoss/utils/HttpUtils.kt

@@ -15,13 +15,18 @@ fun getUnsafeHttpClient() =
                         arrayOf()
 
                 @Throws(CertificateException::class)
-            override fun checkClientTrusted(chain: Array<java.security.cert.X509Certificate>, authType: String) {
+                override fun checkClientTrusted(
+                        chain: Array<java.security.cert.X509Certificate>,
+                        authType: String
+                ) {
                 }
 
                 @Throws(CertificateException::class)
-            override fun checkServerTrusted(chain: Array<java.security.cert.X509Certificate>, authType: String) {
+                override fun checkServerTrusted(
+                        chain: Array<java.security.cert.X509Certificate>,
+                        authType: String
+                ) {
                 }
-
             })
 
             // Install the all-trusting trust manager
@@ -33,7 +38,6 @@ fun getUnsafeHttpClient() =
             OkHttpClient.Builder()
                     .sslSocketFactory(sslSocketFactory, trustAllCerts[0] as X509TrustManager)
                     .hostnameVerifier { _, _ -> true }
-
         } catch (e: Exception) {
             throw RuntimeException(e)
         }

app/src/main/java/apps/amine/bou/readerforselfoss/utils/ItemsUtils.kt

@@ -6,7 +6,6 @@ import java.text.ParseException
 import java.text.SimpleDateFormat
 import java.util.*
 
-
 fun String.toTextDrawableString(): String {
     val textDrawable = StringBuilder()
     for (s in this.split(" ".toRegex()).dropLastWhile { it.isEmpty() }.toTypedArray()) {

app/src/main/java/apps/amine/bou/readerforselfoss/utils/LinksUtils.kt

@@ -11,17 +11,20 @@ import android.util.Patterns
 import android.widget.Toast
 import apps.amine.bou.readerforselfoss.R
 import apps.amine.bou.readerforselfoss.ReaderActivity
+import apps.amine.bou.readerforselfoss.api.selfoss.Item
 import apps.amine.bou.readerforselfoss.utils.customtabs.CustomTabActivityHelper
 import okhttp3.HttpUrl
-import xyz.klinker.android.drag_dismiss.DragDismissIntentBuilder
-
 
 fun Context.buildCustomTabsIntent(): CustomTabsIntent {
 
     val actionIntent = Intent(Intent.ACTION_SEND)
     actionIntent.type = "text/plain"
-    val createPendingShareIntent: PendingIntent = PendingIntent.getActivity(this, 0, actionIntent, 0)
+    val createPendingShareIntent: PendingIntent = PendingIntent.getActivity(
-
+            this,
+            0,
+            actionIntent,
+            0
+    )
 
     val intentBuilder = CustomTabsIntent.Builder()
 
@@ -31,50 +34,62 @@ fun Context.buildCustomTabsIntent(): CustomTabsIntent {
     intentBuilder.setShowTitle(true)
 
 
-    intentBuilder.setStartAnimations(this,
+    intentBuilder.setStartAnimations(
+            this,
             R.anim.slide_in_right,
-            R.anim.slide_out_left)
+            R.anim.slide_out_left
-    intentBuilder.setExitAnimations(this,
+    )
+    intentBuilder.setExitAnimations(
+            this,
             android.R.anim.slide_in_left,
-            android.R.anim.slide_out_right)
+            android.R.anim.slide_out_right
+    )
 
     val closeicon = BitmapFactory.decodeResource(resources, R.drawable.ic_close_white_24dp)
     intentBuilder.setCloseButtonIcon(closeicon)
 
     val shareLabel = this.getString(R.string.label_share)
-    val icon = BitmapFactory.decodeResource(resources,
+    val icon = BitmapFactory.decodeResource(
-            R.drawable.ic_share_white_24dp)
+            resources,
+            R.drawable.ic_share_white_24dp
+    )
     intentBuilder.setActionButton(icon, shareLabel, createPendingShareIntent)
 
     return intentBuilder.build()
 }
 
-fun Context.openItemUrl(linkDecoded: String,
+fun Context.openItemUrlInternally(
+        linkDecoded: String,
+        content: String,
+        image: String,
+        title: String,
+        source: String,
         customTabsIntent: CustomTabsIntent,
-                        internalBrowser: Boolean,
         articleViewer: Boolean,
-                        app: Activity) {
+        app: Activity
-
+) {
-    if (!linkDecoded.isUrlValid()) {
-        Toast.makeText(this, this.getString(R.string.cant_open_invalid_url), Toast.LENGTH_LONG).show()
-    } else {
-        if (!internalBrowser) {
-            openInBrowser(linkDecoded, app)
-        } else {
     if (articleViewer) {
         val intent = Intent(this, ReaderActivity::class.java)
 
-                DragDismissIntentBuilder(this)
+        /*DragDismissIntentBuilder(this)
                 .setFullscreenOnTablets(true)      // defaults to false, tablets will have padding on each side
                 .setDragElasticity(DragDismissIntentBuilder.DragElasticity.NORMAL)  // Larger elasticities will make it easier to dismiss.
                 .setDrawUnderStatusBar(true)
-                    .build(intent)
+                .build(intent)*/
+
 
         intent.putExtra("url", linkDecoded)
+        intent.putExtra("content", content)
+        intent.putExtra("title", title)
+        intent.putExtra("image", image)
+        intent.putExtra("source", source)
         app.startActivity(intent)
     } else {
         try {
-                    CustomTabActivityHelper.openCustomTab(app, customTabsIntent, Uri.parse(linkDecoded)
+            CustomTabActivityHelper.openCustomTab(
+                    app,
+                    customTabsIntent,
+                    Uri.parse(linkDecoded)
             ) { _, uri ->
                 val intent = Intent(Intent.ACTION_VIEW, uri)
                 intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK
@@ -84,6 +99,40 @@ fun Context.openItemUrl(linkDecoded: String,
             openInBrowser(linkDecoded, app)
         }
     }
+}
+
+fun Context.openItemUrl(
+        linkDecoded: String,
+        content: String,
+        image: String,
+        title: String,
+        source: String,
+        customTabsIntent: CustomTabsIntent,
+        internalBrowser: Boolean,
+        articleViewer: Boolean,
+        app: Activity
+) {
+
+    if (!linkDecoded.isUrlValid()) {
+        Toast.makeText(
+                this,
+                this.getString(R.string.cant_open_invalid_url),
+                Toast.LENGTH_LONG
+        ).show()
+    } else {
+        if (!internalBrowser) {
+            openInBrowser(linkDecoded, app)
+        } else {
+            this.openItemUrlInternally(
+                    linkDecoded,
+                    content,
+                    image,
+                    title,
+                    source,
+                    customTabsIntent,
+                    articleViewer,
+                    app
+            )
         }
     }
 }
@@ -107,3 +156,10 @@ fun String.isBaseUrlValid(): Boolean {
 
     return Patterns.WEB_URL.matcher(this).matches() && existsAndEndsWithSlash
 }
+
+fun Context.openInBrowserAsNewTask(i: Item) {
+    val intent = Intent(Intent.ACTION_VIEW)
+    intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK
+    intent.data = Uri.parse(i.getLinkDecoded().toStringUriWithHttp())
+    startActivity(intent)
+}

app/src/main/java/apps/amine/bou/readerforselfoss/utils/ScrollAwareFABBehavior.kt

@@ -0,0 +1,53 @@
+package apps.amine.bou.readerforselfoss.utils
+
+import android.content.Context
+import android.support.design.widget.CoordinatorLayout
+import android.support.design.widget.FloatingActionButton
+import android.util.AttributeSet
+import android.view.View
+
+class ScrollAwareFABBehavior(
+        context: Context,
+        attrs: AttributeSet
+) : CoordinatorLayout.Behavior<FloatingActionButton>() {
+
+    override fun onStartNestedScroll(
+            coordinatorLayout: CoordinatorLayout,
+            child: FloatingActionButton,
+            directTargetChild: View,
+            target: View,
+            nestedScrollAxes: Int
+    ): Boolean {
+        return true
+    }
+
+    override fun onNestedScroll(
+            coordinatorLayout: CoordinatorLayout,
+            child: FloatingActionButton,
+            target: View,
+            dxConsumed: Int,
+            dyConsumed: Int,
+            dxUnconsumed: Int,
+            dyUnconsumed: Int
+    ) {
+        super.onNestedScroll(
+                coordinatorLayout,
+                child,
+                target,
+                dxConsumed,
+                dyConsumed,
+                dxUnconsumed,
+                dyUnconsumed
+        )
+        if (dyConsumed > 0 && child.visibility == View.VISIBLE) {
+            child.hide(object : FloatingActionButton.OnVisibilityChangedListener() {
+                override fun onHidden(fab: FloatingActionButton?) {
+                    super.onHidden(fab)
+                    fab!!.visibility = View.INVISIBLE
+                }
+            })
+        } else if (dyConsumed < 0 && child.visibility != View.VISIBLE) {
+            child.show()
+        }
+    }
+}

app/src/main/java/apps/amine/bou/readerforselfoss/utils/bottombar/BottomBarUtils.kt

@@ -2,7 +2,6 @@ package apps.amine.bou.readerforselfoss.utils.bottombar
 
 import com.ashokvarma.bottomnavigation.TextBadgeItem
 
-
 fun TextBadgeItem.removeBadge(): TextBadgeItem {
     this.setText("")
     this.hide()
@@ -10,7 +9,4 @@ fun TextBadgeItem.removeBadge(): TextBadgeItem {
 }
 
 fun TextBadgeItem.maybeShow(): TextBadgeItem =
-    if (this.isHidden)
+        if (this.isHidden) this.show() else this
-        this.show()
-    else
-        this

app/src/main/java/apps/amine/bou/readerforselfoss/utils/customtabs/CustomTabActivityHelper.java

@@ -1,5 +1,8 @@
 package apps.amine.bou.readerforselfoss.utils.customtabs;
 
+
+import java.util.List;
+
 import android.app.Activity;
 import android.net.Uri;
 import android.os.Bundle;
@@ -8,8 +11,6 @@ import android.support.customtabs.CustomTabsIntent;
 import android.support.customtabs.CustomTabsServiceConnection;
 import android.support.customtabs.CustomTabsSession;
 
-import java.util.List;
-
 /**
  * This is a helper class to manage the connection to the Custom Tabs Service.
  */

app/src/main/java/apps/amine/bou/readerforselfoss/utils/customtabs/CustomTabsHelper.java

@@ -1,5 +1,9 @@
 package apps.amine.bou.readerforselfoss.utils.customtabs;
 
+
+import java.util.ArrayList;
+import java.util.List;
+
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
@@ -9,10 +13,8 @@ import android.net.Uri;
 import android.support.customtabs.CustomTabsService;
 import android.text.TextUtils;
 import android.util.Log;
-import apps.amine.bou.readerforselfoss.utils.customtabs.helpers.KeepAliveService;
 
-import java.util.ArrayList;
+import apps.amine.bou.readerforselfoss.utils.customtabs.helpers.KeepAliveService;
-import java.util.List;
 
 @SuppressWarnings("ALL")
 class CustomTabsHelper {
@@ -101,7 +103,7 @@ class CustomTabsHelper {
             List<ResolveInfo> handlers = pm.queryIntentActivities(
                     intent,
                     PackageManager.GET_RESOLVED_FILTER);
-            if (handlers == null || handlers.size() == 0) {
+            if (handlers == null || handlers.isEmpty()) {
                 return false;
             }
             for (ResolveInfo resolveInfo : handlers) {

app/src/main/java/apps/amine/bou/readerforselfoss/utils/customtabs/ServiceConnection.java

@@ -1,11 +1,12 @@
 package apps.amine.bou.readerforselfoss.utils.customtabs;
 
+
+import java.lang.ref.WeakReference;
+
 import android.content.ComponentName;
 import android.support.customtabs.CustomTabsClient;
 import android.support.customtabs.CustomTabsServiceConnection;
 
-import java.lang.ref.WeakReference;
-
 /**
  * Implementation for the CustomTabsServiceConnection that avoids leaking the
  * ServiceConnectionCallback

app/src/main/java/apps/amine/bou/readerforselfoss/utils/drawer/CustomBaseViewHolder.kt

@@ -8,8 +8,6 @@ import android.widget.TextView
 
 import apps.amine.bou.readerforselfoss.R
 
-
-
 open class CustomBaseViewHolder(var view: View) : RecyclerView.ViewHolder(view) {
     var icon: ImageView = view.findViewById(R.id.material_drawer_icon)
     var name: TextView = view.findViewById(R.id.material_drawer_name)

app/src/main/java/apps/amine/bou/readerforselfoss/utils/drawer/CustomUrlBasePrimaryDrawerItem.kt

@@ -15,8 +15,6 @@ import com.mikepenz.materialdrawer.util.DrawerImageLoader
 import com.mikepenz.materialdrawer.util.DrawerUIUtils
 import com.mikepenz.materialize.util.UIUtils
 
-
-
 abstract class CustomUrlBasePrimaryDrawerItem<T, VH : RecyclerView.ViewHolder> : BaseDrawerItem<T, VH>() {
     fun withIcon(url: String): T {
         this.icon = ImageHolder(url)
@@ -77,7 +75,10 @@ abstract class CustomUrlBasePrimaryDrawerItem<T, VH : RecyclerView.ViewHolder> :
         val selectedIconColor = getSelectedIconColor(ctx)
 
         //set the background for the item
-        UIUtils.setBackground(viewHolder.view, UIUtils.getSelectableBackground(ctx, selectedColor, true))
+        UIUtils.setBackground(
+                viewHolder.view,
+                UIUtils.getSelectableBackground(ctx, selectedColor, true)
+        )
         //set the text for the name
         StringHolder.applyTo(this.getName(), viewHolder.name)
         //set the text for the description or hide
@@ -86,8 +87,11 @@ abstract class CustomUrlBasePrimaryDrawerItem<T, VH : RecyclerView.ViewHolder> :
         //set the colors for textViews
         viewHolder.name.setTextColor(getTextColorStateList(color, selectedTextColor))
         //set the description text color
-        ColorHolder.applyToOr(descriptionTextColor,
+        ColorHolder.applyToOr(
-                viewHolder.description, getTextColorStateList(color, selectedTextColor))
+                descriptionTextColor,
+                viewHolder.description,
+                getTextColorStateList(color, selectedTextColor)
+        )
 
         //define the typeface for our textViews
         if (getTypeface() != null) {

app/src/main/java/apps/amine/bou/readerforselfoss/utils/drawer/CustomUrlPrimaryDrawerItem.kt

@@ -5,15 +5,11 @@ import android.support.annotation.LayoutRes
 import android.support.annotation.StringRes
 import android.view.View
 import android.widget.TextView
-
+import apps.amine.bou.readerforselfoss.R
 import com.mikepenz.materialdrawer.holder.BadgeStyle
 import com.mikepenz.materialdrawer.holder.StringHolder
 import com.mikepenz.materialdrawer.model.interfaces.ColorfulBadgeable
 
-import apps.amine.bou.readerforselfoss.R
-
-
-
 class CustomUrlPrimaryDrawerItem : CustomUrlBasePrimaryDrawerItem<CustomUrlPrimaryDrawerItem, CustomUrlPrimaryDrawerItem.ViewHolder>(), ColorfulBadgeable<CustomUrlPrimaryDrawerItem> {
     protected var mBadge: StringHolder = StringHolder("")
     protected var mBadgeStyle = BadgeStyle()
@@ -67,7 +63,10 @@ class CustomUrlPrimaryDrawerItem : CustomUrlBasePrimaryDrawerItem<CustomUrlPrima
         val badgeVisible = StringHolder.applyToOrHide(mBadge, viewHolder.badge)
         //style the badge if it is visible
         if (badgeVisible) {
-            mBadgeStyle.style(viewHolder.badge, getTextColorStateList(getColor(ctx), getSelectedTextColor(ctx)))
+            mBadgeStyle.style(
+                    viewHolder.badge,
+                    getTextColorStateList(getColor(ctx), getSelectedTextColor(ctx))
+            )
             viewHolder.badgeContainer.visibility = View.VISIBLE
         } else {
             viewHolder.badgeContainer.visibility = View.GONE
@@ -89,6 +88,5 @@ class CustomUrlPrimaryDrawerItem : CustomUrlBasePrimaryDrawerItem<CustomUrlPrima
     class ViewHolder(view: View) : CustomBaseViewHolder(view) {
         val badgeContainer: View = view.findViewById(R.id.material_drawer_badge_container)
         val badge: TextView = view.findViewById(R.id.material_drawer_badge)
-
     }
 }

app/src/main/java/apps/amine/bou/readerforselfoss/utils/glide/GlideUtils.kt

@@ -8,21 +8,31 @@ import com.bumptech.glide.Glide
 import com.bumptech.glide.request.RequestOptions
 import com.bumptech.glide.request.target.BitmapImageViewTarget
 
-
 fun Context.bitmapCenterCrop(url: String, iv: ImageView) =
-    Glide.with(this).asBitmap().load(url).apply(RequestOptions.centerCropTransform()).into(iv)
+        Glide.with(this)
+                .asBitmap()
+                .load(url)
+                .apply(RequestOptions.centerCropTransform())
+                .into(iv)
 
 fun Context.bitmapFitCenter(url: String, iv: ImageView) =
-    Glide.with(this).asBitmap().load(url).apply(RequestOptions.fitCenterTransform()).into(iv)
+        Glide.with(this)
+                .asBitmap()
+                .load(url)
+                .apply(RequestOptions.fitCenterTransform())
+                .into(iv)
 
 fun Context.circularBitmapDrawable(url: String, iv: ImageView) =
         Glide.with(this)
                 .asBitmap()
                 .load(url)
-        .apply(RequestOptions.centerCropTransform()).
+                .apply(RequestOptions.centerCropTransform())
-        into(object : BitmapImageViewTarget(iv) {
+                .into(object : BitmapImageViewTarget(iv) {
                     override fun setResource(resource: Bitmap?) {
-                val circularBitmapDrawable = RoundedBitmapDrawableFactory.create(resources, resource)
+                        val circularBitmapDrawable = RoundedBitmapDrawableFactory.create(
+                                resources,
+                                resource
+                        )
                         circularBitmapDrawable.isCircular = true
                         iv.setImageDrawable(circularBitmapDrawable)
                     }

app/src/main/java/apps/amine/bou/readerforselfoss/utils/glide/SelfSignedGlideModule.kt

@@ -6,14 +6,14 @@ import apps.amine.bou.readerforselfoss.utils.getUnsafeHttpClient
 import com.bumptech.glide.Glide
 import com.bumptech.glide.GlideBuilder
 import com.bumptech.glide.Registry
-import com.bumptech.glide.module.GlideModule
 import com.bumptech.glide.load.model.GlideUrl
+import com.bumptech.glide.module.GlideModule
 import java.io.InputStream
 
-
 class SelfSignedGlideModule : GlideModule {
 
-    override fun applyOptions(context: Context?, builder: GlideBuilder?) {}
+    override fun applyOptions(context: Context?, builder: GlideBuilder?) {
+    }
 
     override fun registerComponents(context: Context?, glide: Glide?, registry: Registry?) {
 
@@ -22,11 +22,12 @@ class SelfSignedGlideModule : GlideModule {
             if (pref.getBoolean("isSelfSignedCert", false)) {
                 val client = getUnsafeHttpClient().build()
 
-                registry?.append(GlideUrl::class.java, InputStream::class.java,
+                registry?.append(
-                    com.bumptech.glide.integration.okhttp3.OkHttpUrlLoader.Factory(client))
+                        GlideUrl::class.java,
-            }
+                        InputStream::class.java,
-
+                        com.bumptech.glide.integration.okhttp3.OkHttpUrlLoader.Factory(client)
+                )
+            }
         }
     }
-
 }

app/src/main/res/layout/activity_add_source.xml

@@ -15,7 +15,8 @@
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
-            app:theme="@style/ToolBarStyle" />
+            app:theme="@style/ToolBarStyle"
+            app:popupTheme="?attr/toolbarPopupTheme" />
 
     </android.support.design.widget.AppBarLayout>
 

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

@@ -9,7 +9,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <com.github.stkent.amplify.prompt.DefaultLayoutPromptView
-        android:id="@+id/prompt_view"
+        android:id="@+id/promptView"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:prompt_view_user_opinion_question_title="@string/rating_prompt_title"
@@ -34,7 +34,7 @@
         android:id="@+id/coordLayout"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_below="@id/prompt_view">
+        android:layout_below="@id/promptView">
 
         <android.support.design.widget.CoordinatorLayout
             android:id="@+id/intern_coordLayout"
@@ -51,10 +51,11 @@
                     android:layout_height="wrap_content">
 
                     <android.support.v7.widget.Toolbar
-                        android:id="@+id/toolbar"
+                        android:id="@+id/toolBar"
                         android:layout_width="match_parent"
                         android:layout_height="?attr/actionBarSize"
-                        app:theme="@style/ToolBarStyle" />
+                        app:theme="@style/ToolBarStyle"
+                        app:popupTheme="?attr/toolbarPopupTheme" />
 
                 </android.support.design.widget.AppBarLayout>
 
@@ -88,7 +89,7 @@
                                 android:background="@color/transparent"
                                 android:visibility="gone" />
                             <android.support.v7.widget.RecyclerView
-                                android:id="@+id/my_recycler_view"
+                                android:id="@+id/recyclerView"
                                 android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
                                 android:background="@color/transparent"

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

@@ -14,7 +14,8 @@
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
-            app:theme="@style/ToolBarStyle" />
+            app:theme="@style/ToolBarStyle"
+            app:popupTheme="?attr/toolbarPopupTheme" />
 
     </android.support.design.widget.AppBarLayout>
     <LinearLayout
@@ -27,7 +28,7 @@
         android:paddingTop="@dimen/activity_vertical_margin">
         <!-- Login progress -->
         <ProgressBar
-            android:id="@+id/login_progress"
+            android:id="@+id/loginProgress"
             style="?android:attr/progressBarStyleLarge"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -35,7 +36,7 @@
             android:visibility="gone"/>
 
         <ScrollView
-            android:id="@+id/login_form"
+            android:id="@+id/loginForm"
             android:layout_width="match_parent"
             android:layout_height="match_parent">
 
@@ -51,15 +52,13 @@
                     >
 
                     <EditText
-                        android:id="@+id/url"
+                        android:id="@+id/urlView"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:hint="@string/prompt_url"
-                        android:imeActionId="@+id/login"
-                        android:inputType="textUri"
                         android:imeOptions="actionUnspecified"
-                        android:maxLines="1"
+                        android:inputType="textUri"
-                        />
+                        android:maxLines="1" />
 
                 </android.support.design.widget.TextInputLayout>
 
@@ -77,13 +76,12 @@
                     android:visibility="gone">
 
                     <AutoCompleteTextView
-                        android:id="@+id/login"
+                        android:id="@+id/loginView"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:hint="@string/prompt_login"
                         android:inputType="text"
-                        android:maxLines="1"
+                        android:maxLines="1" />
-                        />
 
                 </android.support.design.widget.TextInputLayout>
 
@@ -94,13 +92,12 @@
                     android:visibility="gone">
 
                     <EditText
-                        android:id="@+id/password"
+                        android:id="@+id/passwordView"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:hint="@string/prompt_password"
                         android:inputType="textPassword"
-                        android:maxLines="1"
+                        android:maxLines="1" />
-                        />
 
                 </android.support.design.widget.TextInputLayout>
 
@@ -118,7 +115,7 @@
                     android:visibility="gone">
 
                     <EditText
-                        android:id="@+id/httpLogin"
+                        android:id="@+id/httpLoginView"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:hint="@string/prompt_http_login" />
@@ -131,11 +128,11 @@
                     android:visibility="gone">
 
                     <EditText
-                        android:id="@+id/httpPassword"
+                        android:id="@+id/httpPasswordView"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:inputType="textPassword"
+                        android:hint="@string/prompt_http_password"
-                        android:hint="@string/prompt_http_password" />
+                        android:inputType="textPassword" />
                 </android.support.design.widget.TextInputLayout>
 
                 <Switch
@@ -153,7 +150,7 @@
                     android:visibility="gone" />
 
                 <Button
-                    android:id="@+id/email_sign_in_button"
+                    android:id="@+id/signInButton"
                     style="?android:textAppearanceSmall"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"

app/src/main/res/layout/activity_reader.xml

@@ -1,12 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout
+<android.support.design.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"
-    android:layout_height="match_parent"
+    android:layout_height="match_parent">
-    tools:context="apps.amine.bou.readerforselfoss.ReaderActivity"
+
-    android:background="?android:attr/windowBackground">
+    <android.support.v4.widget.NestedScrollView
+        android:id="@+id/nestedScrollView"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <android.support.constraint.ConstraintLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
 
             <ImageView
                 android:id="@+id/imageView"
@@ -35,7 +41,7 @@
                 app:layout_constraintTop_toBottomOf="@+id/imageView" />
 
             <TextView
-        android:id="@+id/title"
+                android:id="@+id/titleView"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginEnd="16dp"
@@ -50,7 +56,7 @@
                 app:layout_constraintRight_toRightOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/source" />
 
-    <org.sufficientlysecure.htmltextview.HtmlTextView
+            <TextView
                 android:id="@+id/content"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
@@ -63,64 +69,80 @@
                 app:layout_constraintHorizontal_bias="0.0"
                 app:layout_constraintLeft_toLeftOf="parent"
                 app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/title"
+                app:layout_constraintTop_toBottomOf="@+id/titleView"
-        tools:text="Some text @android:string/fingerprint_icon_content_description" />
+                android:textColorLink="?attr/colorAccent"/>
 
-    <android.support.constraint.ConstraintLayout
+            <!--<org.sufficientlysecure.htmltextview.HtmlTextView
-        android:layout_width="match_parent"
+                android:id="@+id/content"
-        android:layout_height="35dp"
+                android:layout_width="0dp"
-        android:layout_marginBottom="0dp"
+                android:layout_height="wrap_content"
-        android:layout_marginEnd="0dp"
-        android:layout_marginRight="16dp"
-        android:layout_marginTop="16dp"
-        android:background="#BBBBBB"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.0"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/content"
-        app:layout_constraintVertical_bias="1.0">
-
-        <ImageButton
-            android:id="@+id/browserBtn"
-            android:layout_width="35dp"
-            android:layout_height="35dp"
-            android:layout_centerVertical="true"
                 android:layout_marginEnd="16dp"
+                android:layout_marginLeft="16dp"
                 android:layout_marginRight="16dp"
-            android:layout_toLeftOf="@+id/shareBtn"
+                android:layout_marginStart="16dp"
-            android:layout_toStartOf="@+id/shareBtn"
+                android:layout_marginTop="24dp"
-            android:adjustViewBounds="true"
+                android:paddingBottom="48dp"
-            android:background="@android:color/transparent"
+                app:layout_constraintHorizontal_bias="0.0"
-            android:elevation="5dp"
+                app:layout_constraintLeft_toLeftOf="parent"
-            android:padding="4dp"
+                app:layout_constraintRight_toRightOf="parent"
-            android:scaleType="centerCrop"
+                app:layout_constraintTop_toBottomOf="@+id/titleView" />-->
-            android:src="@drawable/ic_open_in_browser_black_24dp"
-            android:tint="@android:color/black"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toStartOf="@+id/shareBtn"
-            app:layout_constraintHorizontal_bias="0.5"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <ImageButton
-            android:id="@+id/shareBtn"
-            android:layout_width="35dp"
-            android:layout_height="35dp"
-            android:adjustViewBounds="true"
-            android:background="@android:color/transparent"
-            android:elevation="5dp"
-            android:padding="4dp"
-            android:scaleType="centerCrop"
-            android:src="@drawable/ic_share_black_24dp"
-            android:tint="@android:color/black"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintHorizontal_bias="0.5"
-            app:layout_constraintStart_toEndOf="@+id/browserBtn"
-            app:layout_constraintTop_toTopOf="parent" />
 
         </android.support.constraint.ConstraintLayout>
 
-</android.support.constraint.ConstraintLayout>
+    </android.support.v4.widget.NestedScrollView>
+
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        android:layout_gravity="end|bottom|right">
+
+        <com.github.rubensousa.floatingtoolbar.FloatingToolbar
+            android:id="@+id/floatingToolbar"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize"
+            android:layout_gravity="bottom"
+            app:floatingItemBackground="?attr/colorAccent"
+            app:floatingMenu="@menu/reader_toolbar" />
+
+        <android.support.design.widget.FloatingActionButton
+            android:id="@+id/fab"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentBottom="true"
+            android:layout_alignParentEnd="true"
+            android:layout_alignParentRight="true"
+            android:layout_gravity="end|bottom|right"
+            android:layout_marginBottom="16dp"
+            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"
+            app:backgroundTint="?attr/colorAccent"
+            app:fabSize="mini"
+            app:rippleColor="?attr/colorAccentDark" />
+    </FrameLayout>
+
+    <FrameLayout
+        android:id="@+id/progressBar"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:visibility="gone"
+        android:animateLayoutChanges="true"
+        android:alpha="0.8"
+        android:background="@color/black"
+        android:clickable="false">
+
+        <ProgressBar
+            style="?android:attr/progressBarStyleLarge"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:progressTint="?attr/colorAccent" />
+    </FrameLayout>
+
+</android.support.design.widget.CoordinatorLayout>
+

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<RelativeLayout
+<android.support.design.widget.CoordinatorLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     xmlns:app="http://schemas.android.com/apk/res-auto"
@@ -16,28 +16,25 @@
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
-            app:theme="@style/ToolBarStyle" />
+            app:theme="@style/ToolBarStyle"
+            app:popupTheme="?attr/toolbarPopupTheme" />
 
     </android.support.design.widget.AppBarLayout>
 
     <android.support.v7.widget.RecyclerView
-        android:id="@+id/activity_sources"
+        android:id="@+id/recyclerView"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:scrollbars="vertical"
         app:layout_behavior="@string/appbar_scrolling_view_behavior">
     </android.support.v7.widget.RecyclerView>
 
-    <com.melnykov.fab.FloatingActionButton
+    <android.support.design.widget.FloatingActionButton
         android:id="@+id/fab"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="end|bottom|right"
-        android:src="@drawable/ic_add_black_24dp"
+        android:src="@drawable/ic_add"
-        android:tint="?android:textColorPrimary"
-        fab:fab_colorNormal="?attr/colorAccent"
-        fab:fab_colorPressed="?attr/colorAccentDark"
-        fab:fab_colorRipple="@color/pink"
         android:paddingBottom="@dimen/activity_vertical_margin"
         android:paddingTop="@dimen/activity_vertical_margin"
         android:layout_alignParentBottom="true"
@@ -45,5 +42,6 @@
         android:layout_alignParentEnd="true"
         android:layout_marginBottom="16dp"
         android:layout_marginEnd="16dp"
-        android:layout_marginRight="16dp"/>
+        android:layout_marginRight="16dp"
-</RelativeLayout>
+        app:layout_behavior="apps.amine.bou.readerforselfoss.utils.ScrollAwareFABBehavior" />
+</android.support.design.widget.CoordinatorLayout>

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

@@ -1,65 +1,58 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<android.support.v7.widget.CardView
+    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="wrap_content">
-
-    <android.support.v7.widget.CardView
-        android:id="@+id/card"
     xmlns:card_view="http://schemas.android.com/apk/res-auto"
-        android:layout_width="0dp"
+    xmlns:tools="http://schemas.android.com/tools"
-        app:layout_constraintRight_toRightOf="parent"
+    android:id="@+id/card"
-        app:layout_constraintLeft_toLeftOf="parent"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginLeft="8dp"
+    android:layout_marginRight="8dp"
+    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"
-        android:layout_height="wrap_content"
+    card_view:layout_constraintBottom_toBottomOf="parent">
-        android:layout_marginStart="8dp"
-        android:layout_marginLeft="8dp"
-        android:layout_marginTop="8dp"
-        android:layout_marginEnd="8dp"
-        android:layout_marginRight="8dp">
 
     <android.support.constraint.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
         <ImageView
+            android:id="@+id/itemImage"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-                app:srcCompat="@drawable/background_splash"
-                android:id="@+id/itemImage"
-                android:scaleType="fitCenter"
             android:adjustViewBounds="true"
             android:cropToPadding="true"
-                app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintLeft_toLeftOf="parent"
-                android:layout_marginTop="0dp"
-                android:layout_marginRight="0dp"
             app:layout_constraintRight_toRightOf="parent"
-                android:layout_marginLeft="0dp"
+            app:layout_constraintTop_toTopOf="parent"
-                app:layout_constraintLeft_toLeftOf="parent" />
+            app:srcCompat="@drawable/background_splash"
+            card_view:layout_constraintBottom_toTopOf="@+id/constraintLayout" />
 
         <android.support.constraint.ConstraintLayout
+            android:id="@+id/constraintLayout"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-                app:layout_constraintTop_toBottomOf="@+id/itemImage"
-                app:layout_constraintRight_toRightOf="parent"
-                app:layout_constraintLeft_toLeftOf="parent"
             app:layout_constraintBottom_toBottomOf="parent"
-                >
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/itemImage">
 
             <ImageView
-                    android:layout_height="40dp"
-                    app:srcCompat="@drawable/background_splash"
                 android:id="@+id/sourceImage"
-                    app:layout_constraintLeft_toLeftOf="parent"
+                android:layout_width="40dp"
-                    android:layout_marginStart="8dp"
+                android:layout_height="40dp"
                 android:layout_marginLeft="8dp"
-                    app:layout_constraintTop_toTopOf="parent"
+                android:layout_marginStart="8dp"
                 android:layout_marginTop="8dp"
-                    android:layout_width="40dp" />
+                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                app:srcCompat="@drawable/background_splash" />
 
             <TextView
                 android:id="@+id/title"
@@ -79,40 +72,40 @@
                 tools:text="Titre" />
 
             <TextView
+                android:id="@+id/sourceTitleAndDate"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                    android:id="@+id/sourceTitleAndDate"
-                    android:textSize="14sp"
-                    tools:text="Google Actualité Il y a 5h"
-                    android:textAlignment="viewStart"
-                    app:layout_constraintTop_toBottomOf="@+id/title"
                 android:layout_marginTop="8dp"
+                android:gravity="start"
+                android:textAlignment="viewStart"
+                android:textSize="14sp"
                 app:layout_constraintLeft_toLeftOf="@+id/title"
-                    android:gravity="start" />
+                app:layout_constraintTop_toBottomOf="@+id/title"
+                tools:text="Google Actualité Il y a 5h" />
 
             <RelativeLayout
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                    app:layout_constraintTop_toBottomOf="@+id/sourceTitleAndDate"
                 android:layout_marginTop="16dp"
+                app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintLeft_toLeftOf="parent"
                 app:layout_constraintRight_toRightOf="parent"
-                    app:layout_constraintBottom_toBottomOf="parent">
+                app:layout_constraintTop_toBottomOf="@+id/sourceTitleAndDate">
 
                 <com.like.LikeButton
-                        app:icon_type="heart"
-                        app:icon_size="22dp"
                     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_alignParentRight="true"
+                    android:layout_marginEnd="8dp"
-                        android:layout_alignParentEnd="true"
+                    android:layout_marginRight="8dp"
                     android:elevation="5dp"
                     android:padding="4dp"
-                        android:layout_marginRight="8dp"
+                    app:icon_size="22dp"
-                        android:layout_marginEnd="8dp"/>
+                    app:icon_type="heart" />
 
                 <ImageButton
                     android:id="@+id/shareBtn"
@@ -153,5 +146,4 @@
         </android.support.constraint.ConstraintLayout>
     </android.support.constraint.ConstraintLayout>
 
-    </android.support.v7.widget.CardView>
+</android.support.v7.widget.CardView>
-</android.support.constraint.ConstraintLayout>

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

@@ -1,55 +1,66 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout
+<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    android:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:minHeight="88dp">
 
+
+    <android.support.constraint.Guideline
+        android:id="@+id/guideline4"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        app:layout_constraintGuide_begin="99dp" />
+
     <ImageView
         android:id="@+id/itemImage"
         android:layout_width="88dp"
         android:layout_height="88dp"
-        android:src="@color/about_libraries_accent"
+        app:layout_constraintBottom_toTopOf="@+id/guideline4"
-        app:layout_constraintBottom_toTopOf="@+id/actionBar"
+        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
-        app:layout_constraintTop_toTopOf="parent"
-        />
 
     <TextView
         android:id="@+id/title"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
+        android:layout_marginBottom="8dp"
         android:layout_marginEnd="16dp"
-        android:layout_marginLeft="16dp"
-        android:layout_marginRight="16dp"
         android:layout_marginStart="16dp"
         android:layout_marginTop="16dp"
         android:fontFamily="sans-serif"
         android:gravity="start"
+        android:maxLines="3"
+        android:ellipsize="end"
         android:textAlignment="viewStart"
         android:textAllCaps="false"
         android:textSize="16sp"
         android:textStyle="bold"
+        app:layout_constraintBottom_toTopOf="@+id/sourceTitleAndDate"
+        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.0"
-        app:layout_constraintLeft_toRightOf="@+id/itemImage"
+        app:layout_constraintStart_toEndOf="@+id/itemImage"
-        app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0.0"
         tools:text="Titre" />
 
     <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
         android:id="@+id/sourceTitleAndDate"
-        android:textSize="14sp"
+        android:layout_width="0dp"
-        tools:text="Google Actualité Il y a 5h"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="8dp"
+        android:layout_marginEnd="16dp"
+        android:layout_marginStart="16dp"
+        android:gravity="start"
         android:textAlignment="viewStart"
-        app:layout_constraintTop_toBottomOf="@+id/title"
+        android:textSize="14sp"
-        android:layout_marginTop="8dp"
+        app:layout_constraintBottom_toTopOf="@+id/guideline4"
-        app:layout_constraintLeft_toLeftOf="@+id/title"
+        app:layout_constraintEnd_toEndOf="parent"
-        android:gravity="start" />
+        app:layout_constraintHorizontal_bias="0.0"
+        app:layout_constraintStart_toEndOf="@+id/itemImage"
+        tools:text="Google Actualité Il y a 5h" />
 
     <RelativeLayout
         android:id="@+id/actionBar"
@@ -58,9 +69,11 @@
         android:background="#BBBBBB"
         android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/sourceTitleAndDate">
+        app:layout_constraintTop_toTopOf="@+id/guideline4"
+        app:layout_constraintVertical_bias="1.0"
+        tools:visibility="visible">
 
         <com.like.LikeButton
             android:id="@+id/favButton"
@@ -68,7 +81,6 @@
             android:layout_height="35dp"
             android:layout_alignParentEnd="true"
             android:layout_alignParentRight="true"
-
             android:layout_centerVertical="true"
             android:layout_marginEnd="8dp"
             android:layout_marginRight="8dp"
@@ -110,7 +122,7 @@
             android:padding="4dp"
             android:scaleType="centerCrop"
             android:src="@drawable/ic_open_in_browser_black_24dp" />
+
     </RelativeLayout>
 
-
 </android.support.constraint.ConstraintLayout>

app/src/main/res/layout/settings_toolbar.xml

@@ -9,6 +9,7 @@
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
         android:layout_height="?attr/actionBarSize"
-        app:theme="@style/ToolBarStyle" />
+        app:theme="@style/ToolBarStyle"
+        app:popupTheme="?attr/toolbarPopupTheme" />
 
 </android.support.design.widget.AppBarLayout>

app/src/main/res/layout/switch_item.xml

@@ -1,11 +0,0 @@
-<RelativeLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <Switch
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_centerHorizontal="true"
-        android:layout_centerVertical="true" />
-</RelativeLayout>

app/src/main/res/menu/home_menu.xml

@@ -5,14 +5,14 @@
     <item android:id="@+id/action_search"
         android:title="@string/menu_home_search"
         android:icon="@drawable/ic_action_search"
-        app:showAsAction="always|collapseActionView"
+        app:showAsAction="ifRoom|collapseActionView"
         app:actionViewClass="android.support.v7.widget.SearchView" />
 
     <item android:id="@+id/readAll"
           android:icon="@drawable/ic_done_all_white_24dp"
           android:title="@string/readAll"
           android:orderInCategory="1"
-          app:showAsAction="always"/>
+          app:showAsAction="ifRoom"/>
 
     <item
         android:id="@+id/refresh"

app/src/main/res/menu/login_menu.xml

@@ -3,7 +3,7 @@
       xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <item
-        android:id="@+id/loging_debug"
+        android:id="@+id/login_debug"
         android:checkable="true"
         android:checked="false"
         android:icon="@drawable/ic_bug_report"

app/src/main/res/menu/reader_toolbar.xml

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:tools="http://schemas.android.com/tools"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <item
+        android:id="@+id/more_action"
+        android:icon="@drawable/ic_chrome_reader_mode"
+        android:title="@string/reader_action_more"
+        app:showAsAction="ifRoom" />
+
+    <item
+        android:id="@+id/open_action"
+        android:icon="@drawable/ic_open_in_browser"
+        android:iconTint="@color/white"
+        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>

app/src/main/res/values-af/strings.xml

@@ -46,9 +46,7 @@
   <string name="pref_header_links">"Links"</string>
   <string name="issue_tracker_link">"Issue Tracker"</string>
   <string name="issue_tracker_summary">"Report a bug or ask for a new feature"</string>
-  <string name="warning_version">"WARNING"</string>
   <string name="warning_wrong_url">"WARNING"</string>
-  <string name="text_version">"You seem to be using a version of the app that doesn't come from the store. The app could have been tampered with. I will not be responsible if it causes any damage to your device. Consider using the ReaderForSelfoss app from the Play Store."</string>
   <string name="pref_switch_card_view_title">"Card View"</string>
   <string name="cant_mark_favortie">"Can't mark article as favorite"</string>
   <string name="cant_unmark_favortie">"Can't remove item from favorite"</string>
@@ -77,7 +75,7 @@
   <string name="prefer_article_viewer_title">"Use the article viewer"</string>
   <string name="prefer_article_viewer_on">"Will use the article viewer instead of the internal browser"</string>
   <string name="prefer_article_viewer_off">"Will use the internal browser instead of the article viewer"</string>
-  <string name="pref_general_category_links">"Link handeling"</string>
+  <string name="pref_general_category_links">"Link handling"</string>
   <string name="pref_general_category_displaying">"Displaying"</string>
   <string name="pref_general_category_actions">"Actions"</string>
   <string name="pref_switch_card_view_on">"The articles will be displayed as cards"</string>
@@ -116,7 +114,7 @@
   <string name="no_sources_loaded">No sources loaded</string>
   <string name="drawer_loading">Loading …</string>
   <string name="menu_home_search">Search</string>
-  <string name="can_delete_source">Can\'t delete the source...</string>
+  <string name="can_delete_source">Can\'t delete the source…</string>
   <string name="base_url_error">There was an issue when trying to communicate with your Selfoss Instance. If the issue persists, please get in touch with me.</string>
   <string name="pref_header_theme">Themes</string>
   <string name="default_theme">Default</string>
@@ -152,7 +150,12 @@
   <string name="login_everything_title">Logging every api calls</string>
   <string name="login_everything_on">This will log every api call for debug purpose.</string>
   <string name="login_everything_off">No api call will be logged</string>
-  <string name="pref_general_infinite_loading_title">(BETA) Load more articles on scroll</string>
+  <string name="pref_general_infinite_loading_title">Load more articles on scroll</string>
   <string name="translation">Translation</string>
   <string name="cant_open_invalid_url">The item url is invalid. I\'m looking into solving this issue so the app won\'t crash.</string>
+  <string name="drawer_report_bug">Report a bug</string>
+  <string name="items_number_should_be_number">The items number should be an integer.</string>
+  <string name="reader_action_more">Read more</string>
+  <string name="reader_action_open">Open in browser</string>
+  <string name="reader_action_share">Share</string>
 </resources>

app/src/main/res/values-ar/strings.xml

@@ -46,9 +46,7 @@
   <string name="pref_header_links">"Links"</string>
   <string name="issue_tracker_link">"Issue Tracker"</string>
   <string name="issue_tracker_summary">"Report a bug or ask for a new feature"</string>
-  <string name="warning_version">"WARNING"</string>
   <string name="warning_wrong_url">"WARNING"</string>
-  <string name="text_version">"You seem to be using a version of the app that doesn't come from the store. The app could have been tampered with. I will not be responsible if it causes any damage to your device. Consider using the ReaderForSelfoss app from the Play Store."</string>
   <string name="pref_switch_card_view_title">"Card View"</string>
   <string name="cant_mark_favortie">"Can't mark article as favorite"</string>
   <string name="cant_unmark_favortie">"Can't remove item from favorite"</string>
@@ -77,7 +75,7 @@
   <string name="prefer_article_viewer_title">"Use the article viewer"</string>
   <string name="prefer_article_viewer_on">"Will use the article viewer instead of the internal browser"</string>
   <string name="prefer_article_viewer_off">"Will use the internal browser instead of the article viewer"</string>
-  <string name="pref_general_category_links">"Link handeling"</string>
+  <string name="pref_general_category_links">"Link handling"</string>
   <string name="pref_general_category_displaying">"Displaying"</string>
   <string name="pref_general_category_actions">"Actions"</string>
   <string name="pref_switch_card_view_on">"The articles will be displayed as cards"</string>
@@ -116,7 +114,7 @@
   <string name="no_sources_loaded">No sources loaded</string>
   <string name="drawer_loading">Loading …</string>
   <string name="menu_home_search">Search</string>
-  <string name="can_delete_source">Can\'t delete the source...</string>
+  <string name="can_delete_source">Can\'t delete the source…</string>
   <string name="base_url_error">There was an issue when trying to communicate with your Selfoss Instance. If the issue persists, please get in touch with me.</string>
   <string name="pref_header_theme">Themes</string>
   <string name="default_theme">Default</string>
@@ -152,7 +150,12 @@
   <string name="login_everything_title">Logging every api calls</string>
   <string name="login_everything_on">This will log every api call for debug purpose.</string>
   <string name="login_everything_off">No api call will be logged</string>
-  <string name="pref_general_infinite_loading_title">(BETA) Load more articles on scroll</string>
+  <string name="pref_general_infinite_loading_title">Load more articles on scroll</string>
   <string name="translation">Translation</string>
   <string name="cant_open_invalid_url">The item url is invalid. I\'m looking into solving this issue so the app won\'t crash.</string>
+  <string name="drawer_report_bug">Report a bug</string>
+  <string name="items_number_should_be_number">The items number should be an integer.</string>
+  <string name="reader_action_more">Read more</string>
+  <string name="reader_action_open">Open in browser</string>
+  <string name="reader_action_share">Share</string>
 </resources>

app/src/main/res/values-ca/strings.xml

@@ -46,9 +46,7 @@
   <string name="pref_header_links">"Links"</string>
   <string name="issue_tracker_link">"Issue Tracker"</string>
   <string name="issue_tracker_summary">"Report a bug or ask for a new feature"</string>
-  <string name="warning_version">"WARNING"</string>
   <string name="warning_wrong_url">"WARNING"</string>
-  <string name="text_version">"You seem to be using a version of the app that doesn't come from the store. The app could have been tampered with. I will not be responsible if it causes any damage to your device. Consider using the ReaderForSelfoss app from the Play Store."</string>
   <string name="pref_switch_card_view_title">"Card View"</string>
   <string name="cant_mark_favortie">"Can't mark article as favorite"</string>
   <string name="cant_unmark_favortie">"Can't remove item from favorite"</string>
@@ -77,7 +75,7 @@
   <string name="prefer_article_viewer_title">"Use the article viewer"</string>
   <string name="prefer_article_viewer_on">"Will use the article viewer instead of the internal browser"</string>
   <string name="prefer_article_viewer_off">"Will use the internal browser instead of the article viewer"</string>
-  <string name="pref_general_category_links">"Link handeling"</string>
+  <string name="pref_general_category_links">"Link handling"</string>
   <string name="pref_general_category_displaying">"Displaying"</string>
   <string name="pref_general_category_actions">"Actions"</string>
   <string name="pref_switch_card_view_on">"The articles will be displayed as cards"</string>
@@ -116,7 +114,7 @@
   <string name="no_sources_loaded">No sources loaded</string>
   <string name="drawer_loading">Loading …</string>
   <string name="menu_home_search">Search</string>
-  <string name="can_delete_source">Can\'t delete the source...</string>
+  <string name="can_delete_source">Can\'t delete the source…</string>
   <string name="base_url_error">There was an issue when trying to communicate with your Selfoss Instance. If the issue persists, please get in touch with me.</string>
   <string name="pref_header_theme">Themes</string>
   <string name="default_theme">Default</string>
@@ -152,7 +150,12 @@
   <string name="login_everything_title">Logging every api calls</string>
   <string name="login_everything_on">This will log every api call for debug purpose.</string>
   <string name="login_everything_off">No api call will be logged</string>
-  <string name="pref_general_infinite_loading_title">(BETA) Load more articles on scroll</string>
+  <string name="pref_general_infinite_loading_title">Load more articles on scroll</string>
   <string name="translation">Translation</string>
   <string name="cant_open_invalid_url">The item url is invalid. I\'m looking into solving this issue so the app won\'t crash.</string>
+  <string name="drawer_report_bug">Report a bug</string>
+  <string name="items_number_should_be_number">The items number should be an integer.</string>
+  <string name="reader_action_more">Read more</string>
+  <string name="reader_action_open">Open in browser</string>
+  <string name="reader_action_share">Share</string>
 </resources>

app/src/main/res/values-cs/strings.xml

@@ -46,9 +46,7 @@
   <string name="pref_header_links">"Links"</string>
   <string name="issue_tracker_link">"Issue Tracker"</string>
   <string name="issue_tracker_summary">"Report a bug or ask for a new feature"</string>
-  <string name="warning_version">"WARNING"</string>
   <string name="warning_wrong_url">"WARNING"</string>
-  <string name="text_version">"You seem to be using a version of the app that doesn't come from the store. The app could have been tampered with. I will not be responsible if it causes any damage to your device. Consider using the ReaderForSelfoss app from the Play Store."</string>
   <string name="pref_switch_card_view_title">"Card View"</string>
   <string name="cant_mark_favortie">"Can't mark article as favorite"</string>
   <string name="cant_unmark_favortie">"Can't remove item from favorite"</string>
@@ -77,7 +75,7 @@
   <string name="prefer_article_viewer_title">"Use the article viewer"</string>
   <string name="prefer_article_viewer_on">"Will use the article viewer instead of the internal browser"</string>
   <string name="prefer_article_viewer_off">"Will use the internal browser instead of the article viewer"</string>
-  <string name="pref_general_category_links">"Link handeling"</string>
+  <string name="pref_general_category_links">"Link handling"</string>
   <string name="pref_general_category_displaying">"Displaying"</string>
   <string name="pref_general_category_actions">"Actions"</string>
   <string name="pref_switch_card_view_on">"The articles will be displayed as cards"</string>
@@ -116,7 +114,7 @@
   <string name="no_sources_loaded">No sources loaded</string>
   <string name="drawer_loading">Loading …</string>
   <string name="menu_home_search">Search</string>
-  <string name="can_delete_source">Can\'t delete the source...</string>
+  <string name="can_delete_source">Can\'t delete the source…</string>
   <string name="base_url_error">There was an issue when trying to communicate with your Selfoss Instance. If the issue persists, please get in touch with me.</string>
   <string name="pref_header_theme">Themes</string>
   <string name="default_theme">Default</string>
@@ -152,7 +150,12 @@
   <string name="login_everything_title">Logging every api calls</string>
   <string name="login_everything_on">This will log every api call for debug purpose.</string>
   <string name="login_everything_off">No api call will be logged</string>
-  <string name="pref_general_infinite_loading_title">(BETA) Load more articles on scroll</string>
+  <string name="pref_general_infinite_loading_title">Load more articles on scroll</string>
   <string name="translation">Translation</string>
   <string name="cant_open_invalid_url">The item url is invalid. I\'m looking into solving this issue so the app won\'t crash.</string>
+  <string name="drawer_report_bug">Report a bug</string>
+  <string name="items_number_should_be_number">The items number should be an integer.</string>
+  <string name="reader_action_more">Read more</string>
+  <string name="reader_action_open">Open in browser</string>
+  <string name="reader_action_share">Share</string>
 </resources>

app/src/main/res/values-da/strings.xml

@@ -46,9 +46,7 @@
   <string name="pref_header_links">"Links"</string>
   <string name="issue_tracker_link">"Issue Tracker"</string>
   <string name="issue_tracker_summary">"Report a bug or ask for a new feature"</string>
-  <string name="warning_version">"WARNING"</string>
   <string name="warning_wrong_url">"WARNING"</string>
-  <string name="text_version">"You seem to be using a version of the app that doesn't come from the store. The app could have been tampered with. I will not be responsible if it causes any damage to your device. Consider using the ReaderForSelfoss app from the Play Store."</string>
   <string name="pref_switch_card_view_title">"Card View"</string>
   <string name="cant_mark_favortie">"Can't mark article as favorite"</string>
   <string name="cant_unmark_favortie">"Can't remove item from favorite"</string>
@@ -77,7 +75,7 @@
   <string name="prefer_article_viewer_title">"Use the article viewer"</string>
   <string name="prefer_article_viewer_on">"Will use the article viewer instead of the internal browser"</string>
   <string name="prefer_article_viewer_off">"Will use the internal browser instead of the article viewer"</string>
-  <string name="pref_general_category_links">"Link handeling"</string>
+  <string name="pref_general_category_links">"Link handling"</string>
   <string name="pref_general_category_displaying">"Displaying"</string>
   <string name="pref_general_category_actions">"Actions"</string>
   <string name="pref_switch_card_view_on">"The articles will be displayed as cards"</string>
@@ -116,7 +114,7 @@
   <string name="no_sources_loaded">No sources loaded</string>
   <string name="drawer_loading">Loading …</string>
   <string name="menu_home_search">Search</string>
-  <string name="can_delete_source">Can\'t delete the source...</string>
+  <string name="can_delete_source">Can\'t delete the source…</string>
   <string name="base_url_error">There was an issue when trying to communicate with your Selfoss Instance. If the issue persists, please get in touch with me.</string>
   <string name="pref_header_theme">Themes</string>
   <string name="default_theme">Default</string>
@@ -152,7 +150,12 @@
   <string name="login_everything_title">Logging every api calls</string>
   <string name="login_everything_on">This will log every api call for debug purpose.</string>
   <string name="login_everything_off">No api call will be logged</string>
-  <string name="pref_general_infinite_loading_title">(BETA) Load more articles on scroll</string>
+  <string name="pref_general_infinite_loading_title">Load more articles on scroll</string>
   <string name="translation">Translation</string>
   <string name="cant_open_invalid_url">The item url is invalid. I\'m looking into solving this issue so the app won\'t crash.</string>
+  <string name="drawer_report_bug">Report a bug</string>
+  <string name="items_number_should_be_number">The items number should be an integer.</string>
+  <string name="reader_action_more">Read more</string>
+  <string name="reader_action_open">Open in browser</string>
+  <string name="reader_action_share">Share</string>
 </resources>

app/src/main/res/values-de/strings.xml

@@ -46,9 +46,7 @@
   <string name="pref_header_links">"Links"</string>
   <string name="issue_tracker_link">"Issue Tracker"</string>
   <string name="issue_tracker_summary">"Melde einen Bug oder rege ein neues Feature an"</string>
-  <string name="warning_version">"WARNUNG"</string>
   <string name="warning_wrong_url">"WARNUNG"</string>
-  <string name="text_version">"Du scheinst eine Version der App verwenden, die nicht aus dem Play Store kommt. Die App könnte manipuliert wurden. Ich bin nicht verantwortlich für daraus resultierende Schäden an deinem Gerät. Bitte erwäge, die ReaderForSelfoss App aus dem Play Store zu nutzen."</string>
   <string name="pref_switch_card_view_title">"Kachelansicht"</string>
   <string name="cant_mark_favortie">"Artikel kann nicht als Favorit markiert werden"</string>
   <string name="cant_unmark_favortie">"Eintrag kann nicht aus Favoriten entfernt werden"</string>
@@ -116,7 +114,7 @@
   <string name="no_sources_loaded">Keine Quellen geladen</string>
   <string name="drawer_loading">Lade…</string>
   <string name="menu_home_search">Suche</string>
-  <string name="can_delete_source">Quelle kann nicht gelöscht werden...</string>
+  <string name="can_delete_source">Can\'t delete the source…</string>
   <string name="base_url_error">Beim Versuch deine Selfoss-Instanz zu erreichen ist ein Fehler aufgetreten. Solltet dieser Fehler bestehen bleiben, trete bitte mit mir in Kontakt.</string>
   <string name="pref_header_theme">Designs</string>
   <string name="default_theme">Standard</string>
@@ -152,7 +150,12 @@
   <string name="login_everything_title">Logging every api calls</string>
   <string name="login_everything_on">This will log every api call for debug purpose.</string>
   <string name="login_everything_off">No api call will be logged</string>
-  <string name="pref_general_infinite_loading_title">(BETA) Load more articles on scroll</string>
+  <string name="pref_general_infinite_loading_title">Load more articles on scroll</string>
   <string name="translation">Übersetzung</string>
   <string name="cant_open_invalid_url">The item url is invalid. I\'m looking into solving this issue so the app won\'t crash.</string>
+  <string name="drawer_report_bug">Report a bug</string>
+  <string name="items_number_should_be_number">The items number should be an integer.</string>
+  <string name="reader_action_more">Read more</string>
+  <string name="reader_action_open">Open in browser</string>
+  <string name="reader_action_share">Share</string>
 </resources>

app/src/main/res/values-el/strings.xml

@@ -46,9 +46,7 @@
   <string name="pref_header_links">"Links"</string>
   <string name="issue_tracker_link">"Issue Tracker"</string>
   <string name="issue_tracker_summary">"Report a bug or ask for a new feature"</string>
-  <string name="warning_version">"WARNING"</string>
   <string name="warning_wrong_url">"WARNING"</string>
-  <string name="text_version">"You seem to be using a version of the app that doesn't come from the store. The app could have been tampered with. I will not be responsible if it causes any damage to your device. Consider using the ReaderForSelfoss app from the Play Store."</string>
   <string name="pref_switch_card_view_title">"Card View"</string>
   <string name="cant_mark_favortie">"Can't mark article as favorite"</string>
   <string name="cant_unmark_favortie">"Can't remove item from favorite"</string>
@@ -77,7 +75,7 @@
   <string name="prefer_article_viewer_title">"Use the article viewer"</string>
   <string name="prefer_article_viewer_on">"Will use the article viewer instead of the internal browser"</string>
   <string name="prefer_article_viewer_off">"Will use the internal browser instead of the article viewer"</string>
-  <string name="pref_general_category_links">"Link handeling"</string>
+  <string name="pref_general_category_links">"Link handling"</string>
   <string name="pref_general_category_displaying">"Displaying"</string>
   <string name="pref_general_category_actions">"Actions"</string>
   <string name="pref_switch_card_view_on">"The articles will be displayed as cards"</string>
@@ -116,7 +114,7 @@
   <string name="no_sources_loaded">No sources loaded</string>
   <string name="drawer_loading">Loading …</string>
   <string name="menu_home_search">Search</string>
-  <string name="can_delete_source">Can\'t delete the source...</string>
+  <string name="can_delete_source">Can\'t delete the source…</string>
   <string name="base_url_error">There was an issue when trying to communicate with your Selfoss Instance. If the issue persists, please get in touch with me.</string>
   <string name="pref_header_theme">Themes</string>
   <string name="default_theme">Default</string>
@@ -152,7 +150,12 @@
   <string name="login_everything_title">Logging every api calls</string>
   <string name="login_everything_on">This will log every api call for debug purpose.</string>
   <string name="login_everything_off">No api call will be logged</string>
-  <string name="pref_general_infinite_loading_title">(BETA) Load more articles on scroll</string>
+  <string name="pref_general_infinite_loading_title">Load more articles on scroll</string>
   <string name="translation">Translation</string>
   <string name="cant_open_invalid_url">The item url is invalid. I\'m looking into solving this issue so the app won\'t crash.</string>
+  <string name="drawer_report_bug">Report a bug</string>
+  <string name="items_number_should_be_number">The items number should be an integer.</string>
+  <string name="reader_action_more">Read more</string>
+  <string name="reader_action_open">Open in browser</string>
+  <string name="reader_action_share">Share</string>
 </resources>

app/src/main/res/values-es/strings.xml

@@ -46,9 +46,7 @@
   <string name="pref_header_links">"Links"</string>
   <string name="issue_tracker_link">"Issue Tracker"</string>
   <string name="issue_tracker_summary">"Report a bug or ask for a new feature"</string>
-  <string name="warning_version">"WARNING"</string>
   <string name="warning_wrong_url">"WARNING"</string>
-  <string name="text_version">"You seem to be using a version of the app that doesn't come from the store. The app could have been tampered with. I will not be responsible if it causes any damage to your device. Consider using the ReaderForSelfoss app from the Play Store."</string>
   <string name="pref_switch_card_view_title">"Card View"</string>
   <string name="cant_mark_favortie">"Can't mark article as favorite"</string>
   <string name="cant_unmark_favortie">"Can't remove item from favorite"</string>
@@ -77,7 +75,7 @@
   <string name="prefer_article_viewer_title">"Use the article viewer"</string>
   <string name="prefer_article_viewer_on">"Will use the article viewer instead of the internal browser"</string>
   <string name="prefer_article_viewer_off">"Will use the internal browser instead of the article viewer"</string>
-  <string name="pref_general_category_links">"Link handeling"</string>
+  <string name="pref_general_category_links">"Link handling"</string>
   <string name="pref_general_category_displaying">"Displaying"</string>
   <string name="pref_general_category_actions">"Actions"</string>
   <string name="pref_switch_card_view_on">"The articles will be displayed as cards"</string>
@@ -116,7 +114,7 @@
   <string name="no_sources_loaded">No sources loaded</string>
   <string name="drawer_loading">Loading …</string>
   <string name="menu_home_search">Search</string>
-  <string name="can_delete_source">Can\'t delete the source...</string>
+  <string name="can_delete_source">Can\'t delete the source…</string>
   <string name="base_url_error">There was an issue when trying to communicate with your Selfoss Instance. If the issue persists, please get in touch with me.</string>
   <string name="pref_header_theme">Themes</string>
   <string name="default_theme">Default</string>
@@ -152,7 +150,12 @@
   <string name="login_everything_title">Logging every api calls</string>
   <string name="login_everything_on">This will log every api call for debug purpose.</string>
   <string name="login_everything_off">No api call will be logged</string>
-  <string name="pref_general_infinite_loading_title">(BETA) Load more articles on scroll</string>
+  <string name="pref_general_infinite_loading_title">Load more articles on scroll</string>
   <string name="translation">Translation</string>
   <string name="cant_open_invalid_url">The item url is invalid. I\'m looking into solving this issue so the app won\'t crash.</string>
+  <string name="drawer_report_bug">Report a bug</string>
+  <string name="items_number_should_be_number">The items number should be an integer.</string>
+  <string name="reader_action_more">Read more</string>
+  <string name="reader_action_open">Open in browser</string>
+  <string name="reader_action_share">Share</string>
 </resources>

app/src/main/res/values-fi/strings.xml

@@ -46,9 +46,7 @@
   <string name="pref_header_links">"Links"</string>
   <string name="issue_tracker_link">"Issue Tracker"</string>
   <string name="issue_tracker_summary">"Report a bug or ask for a new feature"</string>
-  <string name="warning_version">"WARNING"</string>
   <string name="warning_wrong_url">"WARNING"</string>
-  <string name="text_version">"You seem to be using a version of the app that doesn't come from the store. The app could have been tampered with. I will not be responsible if it causes any damage to your device. Consider using the ReaderForSelfoss app from the Play Store."</string>
   <string name="pref_switch_card_view_title">"Card View"</string>
   <string name="cant_mark_favortie">"Can't mark article as favorite"</string>
   <string name="cant_unmark_favortie">"Can't remove item from favorite"</string>
@@ -77,7 +75,7 @@
   <string name="prefer_article_viewer_title">"Use the article viewer"</string>
   <string name="prefer_article_viewer_on">"Will use the article viewer instead of the internal browser"</string>
   <string name="prefer_article_viewer_off">"Will use the internal browser instead of the article viewer"</string>
-  <string name="pref_general_category_links">"Link handeling"</string>
+  <string name="pref_general_category_links">"Link handling"</string>
   <string name="pref_general_category_displaying">"Displaying"</string>
   <string name="pref_general_category_actions">"Actions"</string>
   <string name="pref_switch_card_view_on">"The articles will be displayed as cards"</string>
@@ -116,7 +114,7 @@
   <string name="no_sources_loaded">No sources loaded</string>
   <string name="drawer_loading">Loading …</string>
   <string name="menu_home_search">Search</string>
-  <string name="can_delete_source">Can\'t delete the source...</string>
+  <string name="can_delete_source">Can\'t delete the source…</string>
   <string name="base_url_error">There was an issue when trying to communicate with your Selfoss Instance. If the issue persists, please get in touch with me.</string>
   <string name="pref_header_theme">Themes</string>
   <string name="default_theme">Default</string>
@@ -152,7 +150,12 @@
   <string name="login_everything_title">Logging every api calls</string>
   <string name="login_everything_on">This will log every api call for debug purpose.</string>
   <string name="login_everything_off">No api call will be logged</string>
-  <string name="pref_general_infinite_loading_title">(BETA) Load more articles on scroll</string>
+  <string name="pref_general_infinite_loading_title">Load more articles on scroll</string>
   <string name="translation">Translation</string>
   <string name="cant_open_invalid_url">The item url is invalid. I\'m looking into solving this issue so the app won\'t crash.</string>
+  <string name="drawer_report_bug">Report a bug</string>
+  <string name="items_number_should_be_number">The items number should be an integer.</string>
+  <string name="reader_action_more">Read more</string>
+  <string name="reader_action_open">Open in browser</string>
+  <string name="reader_action_share">Share</string>
 </resources>

app/src/main/res/values-fr/strings.xml

@@ -6,20 +6,20 @@
   <string name="prompt_password">"Mot de passe"</string>
   <string name="prompt_http_password">"Mot de passe HTTP"</string>
   <string name="action_sign_in">"Valider"</string>
-  <string name="error_invalid_password">"Mot de passe pas assez lent"</string>
+  <string name="error_invalid_password">"Mot de passe trop court"</string>
   <string name="error_field_required">"Champ requis"</string>
   <string name="prompt_url">"Url Selfoss"</string>
   <string name="withLoginSwitch">"Avec login ?"</string>
   <string name="withHttpLoginSwitch">"Avec login HTTP ?"</string>
-  <string name="login_url_problem">"Petit soucis. Il manque peut être un / à la fin ?"</string>
+  <string name="login_url_problem">"Petit souci. Il manque peut être un / à la fin ?"</string>
   <string name="prompt_login">"Utilisateur"</string>
   <string name="prompt_http_login">"Utilisateur HTTP"</string>
   <string name="label_share">"Partager"</string>
   <string name="readAll">"Tout lire"</string>
   <string name="action_disconnect">"Déconnecter"</string>
   <string name="title_activity_settings">"Paramètres"</string>
-  <string name="pref_header_general">"General"</string>
+  <string name="pref_header_general">"Général"</string>
-  <string name="pref_switch_actions_tap_title">"Action du clique sur un article"</string>
+  <string name="pref_switch_actions_tap_title">"Action du clic sur un article"</string>
   <string name="add_source_hint_tags">"Tag1, Tag2, Tag3"</string>
   <string name="add_source_hint_url">"Lien"</string>
   <string name="add_source_hint_name">"Nom"</string>
@@ -46,9 +46,7 @@
   <string name="pref_header_links">"Liens utils"</string>
   <string name="issue_tracker_link">"Suivie des problèmes"</string>
   <string name="issue_tracker_summary">"Pour signaler un bug ou demander une nouvelle fonctionnalité"</string>
-  <string name="warning_version">"ATTENTION"</string>
   <string name="warning_wrong_url">"ATTENTION"</string>
-  <string name="text_version">"Il semblerait que vous utilisiez une version de l'application ne provenant pas du Play Store. L'application peut avoir été modifié et son utilisation peut être dangereuse. Je ne serai en aucun cas tenu responsable en cas de dommage causé sur votre appareil. Pour éviter tout problème, je vous conseille de télécharger ReaderForSelfoss directement depuis le Play Store."</string>
   <string name="pref_switch_card_view_title">"Card View"</string>
   <string name="cant_mark_favortie">"Impossible de marquer l'élément comme favoris"</string>
   <string name="cant_unmark_favortie">"Impossible de retirer l'élément des favoris"</string>
@@ -103,20 +101,20 @@
   <string name="card_height_on">La taille de la carte s\'adaptera au contenu</string>
   <string name="card_height_off">La taille de la carte sera fixe</string>
   <string name="source_code">Code source</string>
-  <string name="cant_mark_read">Kan het artikel niet als gelezen markeren</string>
+  <string name="cant_mark_read">Impossible de marquer l\'article comme lu</string>
   <string name="drawer_error_loading_tags">Erreur lors du chargement des tags…</string>
   <string name="drawer_error_loading_sources">Erreur lors du chargement des sources…</string>
   <string name="drawer_item_filters">Filtres</string>
   <string name="drawer_action_clear">raz</string>
   <string name="drawer_item_tags">Tags</string>
   <string name="drawer_item_sources">Sources</string>
-  <string name="drawer_action_edit">editer</string>
+  <string name="drawer_action_edit">éditer</string>
   <string name="cache_drawer_error" tools:keep="@string/cache_drawer_error">Impossible de mettre en cache les filtres pour le drawer</string>
   <string name="no_tags_loaded">Pas de tags chargés</string>
   <string name="no_sources_loaded">Pas de sources chargés</string>
   <string name="drawer_loading">Chargement …</string>
   <string name="menu_home_search">Rechercher</string>
-  <string name="can_delete_source">Petit soucis lors de la suppression de la source.</string>
+  <string name="can_delete_source">Impossible de supprimer la source…</string>
   <string name="base_url_error">Il y a eu un souci lors de la communication avec votre instance Selfoss. Si le problèmes persiste, contactez-moi pour trouver une solution.</string>
   <string name="pref_header_theme">Thèmes</string>
   <string name="default_theme">Par défaut</string>
@@ -134,7 +132,7 @@
   <string name="indigo_pink_dark_theme">Indigo/Rose/Foncé</string>
   <string name="red_teal_dark_theme">Rouge/Sarcelle/Foncé</string>
   <string name="pref_header_debug">Debug</string>
-  <string name="login_debug_title">Activez pour loguer toutes les erreurs de conexion</string>
+  <string name="login_debug_title">Activez pour logguer toutes les erreurs de connexion</string>
   <string name="login_debug_on">Toutes les erreurs de connexion vont être loguées</string>
   <string name="login_debug_off">Aucune erreur de connexion ne sera loguée</string>
   <string name="login_menu_debug">Debug</string>
@@ -144,7 +142,7 @@
   <string name="pref_api_items_number_title">Nombre d\'articles chargés</string>
   <string name="read_debug_title">Des articles lus marqués comme non lus ?</string>
   <string name="read_debug_off">Aucun log quand un article est marqué comme lu</string>
-  <string name="read_debug_on">Les appels API vont être logués lorsequ\'un article est marqué comme lu</string>
+  <string name="read_debug_on">Les appels API vont être logués lorsqu\'un article est marqué comme lu</string>
   <string name="summary_debug_identifier">Identifiant de debug</string>
   <string name="unique_id_to_clipboard">Texte  copié</string>
   <string name="display_header_drawer_summary">Afficher une entête avec l\'url de votre instance de Selfoss en haut du drawer lateral.</string>
@@ -152,7 +150,12 @@
   <string name="login_everything_title">Log de tous les appels à l\'API</string>
   <string name="login_everything_on">Tous les appels à l\'API vont êtres logués</string>
   <string name="login_everything_off">Aucun appel à l\'API ne sera logué</string>
-  <string name="pref_general_infinite_loading_title">(BETA) Charger plus d\'articles au scroll</string>
+  <string name="pref_general_infinite_loading_title">Charger plus d\'articles au scroll</string>
   <string name="translation">Traduction</string>
   <string name="cant_open_invalid_url">L’url de l’élément n’est pas valide. En attendant la résolution du problème, le lien ne s\'ouvrira pas.</string>
+  <string name="drawer_report_bug">Signaler un bug</string>
+  <string name="items_number_should_be_number">Le nombre d\'articles doit être un entier.</string>
+  <string name="reader_action_more">Lire plus</string>
+  <string name="reader_action_open">Ouvrir</string>
+  <string name="reader_action_share">Partager</string>
 </resources>

app/src/main/res/values-he/strings.xml

@@ -46,9 +46,7 @@
   <string name="pref_header_links">"Links"</string>
   <string name="issue_tracker_link">"Issue Tracker"</string>
   <string name="issue_tracker_summary">"Report a bug or ask for a new feature"</string>
-  <string name="warning_version">"WARNING"</string>
   <string name="warning_wrong_url">"WARNING"</string>
-  <string name="text_version">"You seem to be using a version of the app that doesn't come from the store. The app could have been tampered with. I will not be responsible if it causes any damage to your device. Consider using the ReaderForSelfoss app from the Play Store."</string>
   <string name="pref_switch_card_view_title">"Card View"</string>
   <string name="cant_mark_favortie">"Can't mark article as favorite"</string>
   <string name="cant_unmark_favortie">"Can't remove item from favorite"</string>
@@ -77,7 +75,7 @@
   <string name="prefer_article_viewer_title">"Use the article viewer"</string>
   <string name="prefer_article_viewer_on">"Will use the article viewer instead of the internal browser"</string>
   <string name="prefer_article_viewer_off">"Will use the internal browser instead of the article viewer"</string>
-  <string name="pref_general_category_links">"Link handeling"</string>
+  <string name="pref_general_category_links">"Link handling"</string>
   <string name="pref_general_category_displaying">"Displaying"</string>
   <string name="pref_general_category_actions">"Actions"</string>
   <string name="pref_switch_card_view_on">"The articles will be displayed as cards"</string>
@@ -116,7 +114,7 @@
   <string name="no_sources_loaded">No sources loaded</string>
   <string name="drawer_loading">Loading …</string>
   <string name="menu_home_search">Search</string>
-  <string name="can_delete_source">Can\'t delete the source...</string>
+  <string name="can_delete_source">Can\'t delete the source…</string>
   <string name="base_url_error">There was an issue when trying to communicate with your Selfoss Instance. If the issue persists, please get in touch with me.</string>
   <string name="pref_header_theme">Themes</string>
   <string name="default_theme">Default</string>
@@ -152,7 +150,12 @@
   <string name="login_everything_title">Logging every api calls</string>
   <string name="login_everything_on">This will log every api call for debug purpose.</string>
   <string name="login_everything_off">No api call will be logged</string>
-  <string name="pref_general_infinite_loading_title">(BETA) Load more articles on scroll</string>
+  <string name="pref_general_infinite_loading_title">Load more articles on scroll</string>
   <string name="translation">Translation</string>
   <string name="cant_open_invalid_url">The item url is invalid. I\'m looking into solving this issue so the app won\'t crash.</string>
+  <string name="drawer_report_bug">Report a bug</string>
+  <string name="items_number_should_be_number">The items number should be an integer.</string>
+  <string name="reader_action_more">Read more</string>
+  <string name="reader_action_open">Open in browser</string>
+  <string name="reader_action_share">Share</string>
 </resources>

app/src/main/res/values-hu/strings.xml

@@ -46,9 +46,7 @@
   <string name="pref_header_links">"Links"</string>
   <string name="issue_tracker_link">"Issue Tracker"</string>
   <string name="issue_tracker_summary">"Report a bug or ask for a new feature"</string>
-  <string name="warning_version">"WARNING"</string>
   <string name="warning_wrong_url">"WARNING"</string>
-  <string name="text_version">"You seem to be using a version of the app that doesn't come from the store. The app could have been tampered with. I will not be responsible if it causes any damage to your device. Consider using the ReaderForSelfoss app from the Play Store."</string>
   <string name="pref_switch_card_view_title">"Card View"</string>
   <string name="cant_mark_favortie">"Can't mark article as favorite"</string>
   <string name="cant_unmark_favortie">"Can't remove item from favorite"</string>
@@ -77,7 +75,7 @@
   <string name="prefer_article_viewer_title">"Use the article viewer"</string>
   <string name="prefer_article_viewer_on">"Will use the article viewer instead of the internal browser"</string>
   <string name="prefer_article_viewer_off">"Will use the internal browser instead of the article viewer"</string>
-  <string name="pref_general_category_links">"Link handeling"</string>
+  <string name="pref_general_category_links">"Link handling"</string>
   <string name="pref_general_category_displaying">"Displaying"</string>
   <string name="pref_general_category_actions">"Actions"</string>
   <string name="pref_switch_card_view_on">"The articles will be displayed as cards"</string>
@@ -116,7 +114,7 @@
   <string name="no_sources_loaded">No sources loaded</string>
   <string name="drawer_loading">Loading …</string>
   <string name="menu_home_search">Search</string>
-  <string name="can_delete_source">Can\'t delete the source...</string>
+  <string name="can_delete_source">Can\'t delete the source…</string>
   <string name="base_url_error">There was an issue when trying to communicate with your Selfoss Instance. If the issue persists, please get in touch with me.</string>
   <string name="pref_header_theme">Themes</string>
   <string name="default_theme">Default</string>
@@ -152,7 +150,12 @@
   <string name="login_everything_title">Logging every api calls</string>
   <string name="login_everything_on">This will log every api call for debug purpose.</string>
   <string name="login_everything_off">No api call will be logged</string>
-  <string name="pref_general_infinite_loading_title">(BETA) Load more articles on scroll</string>
+  <string name="pref_general_infinite_loading_title">Load more articles on scroll</string>
   <string name="translation">Translation</string>
   <string name="cant_open_invalid_url">The item url is invalid. I\'m looking into solving this issue so the app won\'t crash.</string>
+  <string name="drawer_report_bug">Report a bug</string>
+  <string name="items_number_should_be_number">The items number should be an integer.</string>
+  <string name="reader_action_more">Read more</string>
+  <string name="reader_action_open">Open in browser</string>
+  <string name="reader_action_share">Share</string>
 </resources>

app/src/main/res/values-it/strings.xml

@@ -46,9 +46,7 @@
   <string name="pref_header_links">"Links"</string>
   <string name="issue_tracker_link">"Issue Tracker"</string>
   <string name="issue_tracker_summary">"Report a bug or ask for a new feature"</string>
-  <string name="warning_version">"WARNING"</string>
   <string name="warning_wrong_url">"WARNING"</string>
-  <string name="text_version">"You seem to be using a version of the app that doesn't come from the store. The app could have been tampered with. I will not be responsible if it causes any damage to your device. Consider using the ReaderForSelfoss app from the Play Store."</string>
   <string name="pref_switch_card_view_title">"Card View"</string>
   <string name="cant_mark_favortie">"Can't mark article as favorite"</string>
   <string name="cant_unmark_favortie">"Can't remove item from favorite"</string>
@@ -77,7 +75,7 @@
   <string name="prefer_article_viewer_title">"Use the article viewer"</string>
   <string name="prefer_article_viewer_on">"Will use the article viewer instead of the internal browser"</string>
   <string name="prefer_article_viewer_off">"Will use the internal browser instead of the article viewer"</string>
-  <string name="pref_general_category_links">"Link handeling"</string>
+  <string name="pref_general_category_links">"Link handling"</string>
   <string name="pref_general_category_displaying">"Displaying"</string>
   <string name="pref_general_category_actions">"Actions"</string>
   <string name="pref_switch_card_view_on">"The articles will be displayed as cards"</string>
@@ -116,7 +114,7 @@
   <string name="no_sources_loaded">No sources loaded</string>
   <string name="drawer_loading">Loading …</string>
   <string name="menu_home_search">Search</string>
-  <string name="can_delete_source">Can\'t delete the source...</string>
+  <string name="can_delete_source">Can\'t delete the source…</string>
   <string name="base_url_error">There was an issue when trying to communicate with your Selfoss Instance. If the issue persists, please get in touch with me.</string>
   <string name="pref_header_theme">Themes</string>
   <string name="default_theme">Default</string>
@@ -152,7 +150,12 @@
   <string name="login_everything_title">Logging every api calls</string>
   <string name="login_everything_on">This will log every api call for debug purpose.</string>
   <string name="login_everything_off">No api call will be logged</string>
-  <string name="pref_general_infinite_loading_title">(BETA) Load more articles on scroll</string>
+  <string name="pref_general_infinite_loading_title">Load more articles on scroll</string>
   <string name="translation">Translation</string>
   <string name="cant_open_invalid_url">The item url is invalid. I\'m looking into solving this issue so the app won\'t crash.</string>
+  <string name="drawer_report_bug">Report a bug</string>
+  <string name="items_number_should_be_number">The items number should be an integer.</string>
+  <string name="reader_action_more">Read more</string>
+  <string name="reader_action_open">Open in browser</string>
+  <string name="reader_action_share">Share</string>
 </resources>

app/src/main/res/values-ja/strings.xml

@@ -46,9 +46,7 @@
   <string name="pref_header_links">"Links"</string>
   <string name="issue_tracker_link">"Issue Tracker"</string>
   <string name="issue_tracker_summary">"Report a bug or ask for a new feature"</string>
-  <string name="warning_version">"WARNING"</string>
   <string name="warning_wrong_url">"WARNING"</string>
-  <string name="text_version">"You seem to be using a version of the app that doesn't come from the store. The app could have been tampered with. I will not be responsible if it causes any damage to your device. Consider using the ReaderForSelfoss app from the Play Store."</string>
   <string name="pref_switch_card_view_title">"Card View"</string>
   <string name="cant_mark_favortie">"Can't mark article as favorite"</string>
   <string name="cant_unmark_favortie">"Can't remove item from favorite"</string>
@@ -77,7 +75,7 @@
   <string name="prefer_article_viewer_title">"Use the article viewer"</string>
   <string name="prefer_article_viewer_on">"Will use the article viewer instead of the internal browser"</string>
   <string name="prefer_article_viewer_off">"Will use the internal browser instead of the article viewer"</string>
-  <string name="pref_general_category_links">"Link handeling"</string>
+  <string name="pref_general_category_links">"Link handling"</string>
   <string name="pref_general_category_displaying">"Displaying"</string>
   <string name="pref_general_category_actions">"Actions"</string>
   <string name="pref_switch_card_view_on">"The articles will be displayed as cards"</string>
@@ -116,7 +114,7 @@
   <string name="no_sources_loaded">No sources loaded</string>
   <string name="drawer_loading">Loading …</string>
   <string name="menu_home_search">Search</string>
-  <string name="can_delete_source">Can\'t delete the source...</string>
+  <string name="can_delete_source">Can\'t delete the source…</string>
   <string name="base_url_error">There was an issue when trying to communicate with your Selfoss Instance. If the issue persists, please get in touch with me.</string>
   <string name="pref_header_theme">Themes</string>
   <string name="default_theme">Default</string>
@@ -152,7 +150,12 @@
   <string name="login_everything_title">Logging every api calls</string>
   <string name="login_everything_on">This will log every api call for debug purpose.</string>
   <string name="login_everything_off">No api call will be logged</string>
-  <string name="pref_general_infinite_loading_title">(BETA) Load more articles on scroll</string>
+  <string name="pref_general_infinite_loading_title">Load more articles on scroll</string>
   <string name="translation">Translation</string>
   <string name="cant_open_invalid_url">The item url is invalid. I\'m looking into solving this issue so the app won\'t crash.</string>
+  <string name="drawer_report_bug">Report a bug</string>
+  <string name="items_number_should_be_number">The items number should be an integer.</string>
+  <string name="reader_action_more">Read more</string>
+  <string name="reader_action_open">Open in browser</string>
+  <string name="reader_action_share">Share</string>
 </resources>

app/src/main/res/values-ko/strings.xml

@@ -46,9 +46,7 @@
   <string name="pref_header_links">"Links"</string>
   <string name="issue_tracker_link">"Issue Tracker"</string>
   <string name="issue_tracker_summary">"Report a bug or ask for a new feature"</string>
-  <string name="warning_version">"WARNING"</string>
   <string name="warning_wrong_url">"WARNING"</string>
-  <string name="text_version">"You seem to be using a version of the app that doesn't come from the store. The app could have been tampered with. I will not be responsible if it causes any damage to your device. Consider using the ReaderForSelfoss app from the Play Store."</string>
   <string name="pref_switch_card_view_title">"Card View"</string>
   <string name="cant_mark_favortie">"Can't mark article as favorite"</string>
   <string name="cant_unmark_favortie">"Can't remove item from favorite"</string>
@@ -77,7 +75,7 @@
   <string name="prefer_article_viewer_title">"Use the article viewer"</string>
   <string name="prefer_article_viewer_on">"Will use the article viewer instead of the internal browser"</string>
   <string name="prefer_article_viewer_off">"Will use the internal browser instead of the article viewer"</string>
-  <string name="pref_general_category_links">"Link handeling"</string>
+  <string name="pref_general_category_links">"Link handling"</string>
   <string name="pref_general_category_displaying">"Displaying"</string>
   <string name="pref_general_category_actions">"Actions"</string>
   <string name="pref_switch_card_view_on">"The articles will be displayed as cards"</string>
@@ -116,7 +114,7 @@
   <string name="no_sources_loaded">No sources loaded</string>
   <string name="drawer_loading">Loading …</string>
   <string name="menu_home_search">Search</string>
-  <string name="can_delete_source">Can\'t delete the source...</string>
+  <string name="can_delete_source">Can\'t delete the source…</string>
   <string name="base_url_error">There was an issue when trying to communicate with your Selfoss Instance. If the issue persists, please get in touch with me.</string>
   <string name="pref_header_theme">Themes</string>
   <string name="default_theme">Default</string>
@@ -152,7 +150,12 @@
   <string name="login_everything_title">Logging every api calls</string>
   <string name="login_everything_on">This will log every api call for debug purpose.</string>
   <string name="login_everything_off">No api call will be logged</string>
-  <string name="pref_general_infinite_loading_title">(BETA) Load more articles on scroll</string>
+  <string name="pref_general_infinite_loading_title">Load more articles on scroll</string>
   <string name="translation">Translation</string>
   <string name="cant_open_invalid_url">The item url is invalid. I\'m looking into solving this issue so the app won\'t crash.</string>
+  <string name="drawer_report_bug">Report a bug</string>
+  <string name="items_number_should_be_number">The items number should be an integer.</string>
+  <string name="reader_action_more">Read more</string>
+  <string name="reader_action_open">Open in browser</string>
+  <string name="reader_action_share">Share</string>
 </resources>