Changelog.

* New translations strings.xml (Afrikaans)

* New translations strings.xml (Japanese)

* New translations strings.xml (Ukrainian)

* New translations strings.xml (Turkish)

* New translations strings.xml (Swedish)

* New translations strings.xml (Spanish)

* New translations strings.xml (Serbian (Cyrillic))

* New translations strings.xml (Russian)

* New translations strings.xml (Romanian)

* New translations strings.xml (Portuguese, Brazilian)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Polish)

* New translations strings.xml (Norwegian)

* New translations strings.xml (Korean)

* New translations strings.xml (Italian)

* New translations strings.xml (Arabic)

* New translations strings.xml (Hungarian)

* New translations strings.xml (Hebrew)

* New translations strings.xml (Greek)

* New translations strings.xml (German)

* New translations strings.xml (French)

* New translations strings.xml (Finnish)

* New translations strings.xml (Dutch)

* New translations strings.xml (Danish)

* New translations strings.xml (Czech)

* New translations strings.xml (Chinese Traditional)

* New translations strings.xml (Catalan)

* New translations strings.xml (Vietnamese)

* New translations strings.xml (Portuguese, Brazilian)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Portuguese, Brazilian)

.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,113 @@
+**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.
+
+- Fixed logs not working.
+
+- Temporary workaround handling opening invalid urls. Waiting to solve #83.
+
+**1.5.3.05**
+
+- Fixed an issue on older versions of Android.
+
+- Libs update.
+
 **1.5.3.04**
 
 - Crowdin translations
@@ -299,4 +409,4 @@ _Updates_
 
 **1.3.3.4**
 
-...
+...

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
-    buildToolsVersion '26.0.2'
+    compileSdkVersion 27
+    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,33 +97,33 @@ android {
 
 dependencies {
     // Testing
-    androidTestCompile 'com.android.support.test.espresso:espresso-core:3.0.0'
-    androidTestCompile 'com.android.support.test:runner:1.0.0'
+    androidTestCompile 'com.android.support.test.espresso:espresso-core:3.0.1'
+    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:design:26.0.1'
-    compile 'com.android.support:recyclerview-v7:26.0.1'
-    compile 'com.android.support:support-v4:26.0.1'
-    compile 'com.android.support:support-vector-drawable:26.0.1'
-    compile 'com.android.support:customtabs:26.0.1'
-    compile 'com.android.support:cardview-v7:26.0.1'
+    compile 'com.android.support:appcompat-v7:27.0.0'
+    compile 'com.android.support:design:27.0.0'
+    compile 'com.android.support:recyclerview-v7:27.0.0'
+    compile 'com.android.support:support-v4:27.0.0'
+    compile 'com.android.support:support-vector-drawable:27.0.0'
+    compile 'com.android.support:customtabs:27.0.0'
+    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-config:11.2.0'
-    compile 'com.google.firebase:firebase-invites:11.2.0'
-    compile('com.crashlytics.sdk.android:crashlytics:2.6.8@aar') {
-        transitive = true
+    compile 'com.google.firebase:firebase-core:11.4.2'
+    compile 'com.google.firebase:firebase-config:11.4.2'
+    compile 'com.google.firebase:firebase-invites:11.4.2'
+    compile('com.crashlytics.sdk.android:crashlytics:2.7.1@aar') {
+        transitive = true;
     }
 
     //multidex
@@ -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
     }
 
@@ -141,11 +144,10 @@ dependencies {
     compile 'com.burgstaller:okhttp-digest:1.12'
 
     // Material-ish things
-    compile 'com.ashokvarma.android:bottom-navigation-bar:2.0.2'
-    compile 'com.melnykov:floatingactionbutton:1.3.0'
+    compile 'com.ashokvarma.android:bottom-navigation-bar:2.0.3'
     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'
@@ -155,17 +157,19 @@ dependencies {
     compile 'com.github.stkent:amplify:2.1.0'
 
     // For the article reader
-    compile 'com.klinkerapps:drag-dismiss-activity:1.4.3'
+    compile 'com.klinkerapps:drag-dismiss-activity:1.5.0'
 
     // Drawer
-    compile('com.mikepenz:materialdrawer:5.9.5@aar') {
-        transitive = true
-    }
+    implementation 'co.zsmb:materialdrawer-kt:1.2.1'
     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/HomeActivityEspressoTest.kt

@@ -23,8 +23,8 @@ 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 com.heinrichreimersoftware.androidissuereporter.IssueReporterLauncher
 import org.junit.After
 
 
@@ -72,9 +72,6 @@ class HomeActivityEspressoTest {
 
         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))
@@ -86,9 +83,6 @@ class HomeActivityEspressoTest {
 
         intended(hasComponent(LoginActivity::class.java.name), times(1))
 
-        //onView(isRoot()).perform(pressBack())
-
-
     }
 
     @Test
@@ -98,8 +92,9 @@ class HomeActivityEspressoTest {
 
         onView(withId(R.id.material_drawer_layout)).perform(DrawerActions.open())
 
-        onView(withText(R.string.action_about)).perform(click())
-        intended(hasComponent(LibsActivity::class.java.name))
+        onView(withText(R.string.drawer_report_bug)).perform(click())
+        intended(hasComponent(IssueReporterLauncher.Activity::class.java.name))
+        onView(isRoot()).perform(pressBack())
         onView(isRoot()).perform(pressBack())
         intended(hasComponent(HomeActivity::class.java.name))
 
@@ -108,10 +103,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

@@ -46,7 +46,7 @@ class IntroActivityEspressoTest {
         Intents.init()
     }
 
-    /*@Test
+    @Test
     fun nextEachTimes() {
 
         rule.launchActivity(Intent())
@@ -61,7 +61,7 @@ class IntroActivityEspressoTest {
         intended(hasComponent(IntroActivity::class.java.name), times(1))
         intended(hasComponent(LoginActivity::class.java.name), times(1))
 
-    }*/
+    }
 
     @Test
     fun nextBackRandomTimes() {
@@ -91,29 +91,6 @@ class IntroActivityEspressoTest {
 
     }
 
-    @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
     fun releaseIntents() {
         Intents.release()

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

@@ -32,18 +32,18 @@ class LoginActivityEspressoTest {
     @Rule @JvmField
     val rule = ActivityTestRule(LoginActivity::class.java, true, false)
 
-    lateinit var context: Context
-    lateinit var url: String
-    lateinit var username: String
-    lateinit var password: String
+    private lateinit var context: Context
+    private lateinit var url: String
+    private lateinit var username: String
+    private lateinit var password: String
 
     @Before
     fun setUp() {
         context = InstrumentationRegistry.getInstrumentation().targetContext
         val editor =
-            context
-                .getSharedPreferences(Config.settingsName, Context.MODE_PRIVATE)
-                .edit()
+                context
+                        .getSharedPreferences(Config.settingsName, Context.MODE_PRIVATE)
+                        .edit()
         editor.clear()
         editor.commit()
 
@@ -77,12 +77,12 @@ class LoginActivityEspressoTest {
     fun wrongLoginUrl() {
         rule.launchActivity(Intent())
 
-        onView(withId(R.id.login_progress))
-            .check(matches(withEffectiveVisibility(ViewMatchers.Visibility.GONE)))
+        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,24 +94,24 @@ 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())
+                matches(
+                        isHintOrErrorEnabled())
         )
 
     }
@@ -121,15 +121,15 @@ 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()))
@@ -142,15 +142,15 @@ 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))
 

app/src/main/AndroidManifest.xml

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

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

@@ -5,20 +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 retrofit2.Call
-import retrofit2.Callback
-import retrofit2.Response
-
+import android.widget.AdapterView
+import android.widget.ArrayAdapter
+import android.widget.EditText
+import android.widget.ProgressBar
+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 +33,43 @@ 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
-        if (Intent.ACTION_SEND == intent.action && "text/plain" == intent.type) {
-            mSourceUri.setText(intent.getStringExtra(Intent.EXTRA_TEXT))
-            mNameInput.setText(intent.getStringExtra(Intent.EXTRA_TITLE))
+        maybeGetDetailsFromIntentSharing(intent, sourceUri, nameInput)
+
+        saveBtn.setOnClickListener {
+            handleSaveSource(tags, nameInput.text.toString(), sourceUri.text.toString(), api!!)
         }
 
-        mSaveBtn.setOnClickListener {
-            handleSaveSource(mTags, mNameInput.text.toString(), mSourceUri.text.toString(), api!!)
+        val config = Config(this)
+
+        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,48 +80,48 @@ class AddSourceActivity : AppCompatActivity() {
             }
         }
 
-        val config = Config(this)
+        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>>) {
+                if (response.body() != null) {
+                    items = response.body()!!
 
-        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>>) {
-                    if (response.body() != null) {
-                        items = response.body()!!
-
-                        val itemsStrings = items.map { it.value.name }
-                        for ((key, value) in items) {
-                            spoutsKV.put(value.name, key)
-                        }
-
-                        mProgress.visibility = View.GONE
-                        mForm.visibility = View.VISIBLE
-
-                        val spinnerArrayAdapter =
-                            ArrayAdapter(
-                                this@AddSourceActivity,
-                                android.R.layout.simple_spinner_item,
-                                itemsStrings)
-                        spinnerArrayAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
-                        mSpoutsSpinner.adapter = spinnerArrayAdapter
-
-                    } else {
-                        handleProblemWithSpouts()
+                    val itemsStrings = items.map { it.value.name }
+                    for ((key, value) in items) {
+                        spoutsKV.put(value.name, key)
                     }
-                }
 
-                override fun onFailure(call: Call<Map<String, Spout>>, t: Throwable) {
+                    mProgress.visibility = View.GONE
+                    formContainer.visibility = View.VISIBLE
+
+                    val spinnerArrayAdapter =
+                            ArrayAdapter(
+                                    this@AddSourceActivity,
+                                    android.R.layout.simple_spinner_item,
+                                    itemsStrings)
+                    spinnerArrayAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
+                    spoutsSpinner.adapter = spinnerArrayAdapter
+
+                } else {
                     handleProblemWithSpouts()
                 }
+            }
 
-                private fun handleProblemWithSpouts() {
-                    Toast.makeText(this@AddSourceActivity, R.string.cant_get_spouts, Toast.LENGTH_SHORT).show()
-                    mProgress.visibility = View.GONE
-                }
-            })
+            override fun onFailure(call: Call<Map<String, Spout>>, t: Throwable) {
+                handleProblemWithSpouts()
+            }
+
+            private fun handleProblemWithSpouts() {
+                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))
         }
     }
 
@@ -125,17 +132,19 @@ 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(),
-                ""
+                    title,
+                    url,
+                    mSpoutsValue!!,
+                    tags.text.toString(),
+                    ""
             ).enqueue(object : Callback<SuccessResponse> {
                 override fun onResponse(call: Call<SuccessResponse>, response: Response<SuccessResponse>) {
                     if (response.body() != null && response.body()!!.isSuccess) {

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

@@ -1,15 +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() {

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

@@ -6,7 +6,6 @@ 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
@@ -15,11 +14,11 @@ 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
@@ -29,6 +28,8 @@ import com.mikepenz.aboutlibraries.LibsBuilder
 import retrofit2.Call
 import retrofit2.Callback
 import retrofit2.Response
+import kotlinx.android.synthetic.main.activity_login.*
+
 
 
 class LoginActivity : AppCompatActivity() {
@@ -40,14 +41,7 @@ class LoginActivity : AppCompatActivity() {
 
     private lateinit var settings: SharedPreferences
     private lateinit var editor: SharedPreferences.Editor
-    private lateinit var mFirebaseAnalytics: 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 firebaseAnalytics: FirebaseAnalytics
     private lateinit var userIdentifier: String
     private var logErrors: Boolean = false
 
@@ -58,83 +52,72 @@ class LoginActivity : AppCompatActivity() {
         Scoop.getInstance().apply(this)
         setContentView(R.layout.activity_login)
 
-        val toolbar: Toolbar = findViewById(R.id.toolbar)
         setSupportActionBar(toolbar)
 
-        if (intent.getBooleanExtra("baseUrlFail", false)) {
-            val alertDialog = AlertDialog.Builder(this).create()
-            alertDialog.setTitle(getString(R.string.warning_wrong_url))
-            alertDialog.setMessage(getString(R.string.base_url_error))
-            alertDialog.setButton(
-                AlertDialog.BUTTON_NEUTRAL,
-                "OK",
-                { dialog, _ -> dialog.dismiss() })
-            alertDialog.show()
-        }
+        handleBaseUrlFail()
 
 
         settings = getSharedPreferences(Config.settingsName, Context.MODE_PRIVATE)
         userIdentifier = settings.getString("unique_id", "")
-        logErrors = settings.getBoolean("loging_debug", false)
+        logErrors = settings.getBoolean("login_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)
+        firebaseAnalytics = FirebaseAnalytics.getInstance(this)
 
-        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)
+        handleActions()
+    }
 
-        selfHostedSwitch.setOnCheckedChangeListener {_, b ->
+    private fun handleActions() {
+
+        withSelfhostedCert.setOnCheckedChangeListener { _, b ->
             isWithSelfSignedCert = !isWithSelfSignedCert
             val visi: Int = if (b) View.VISIBLE else View.GONE
 
-            warningTextview.visibility = visi
+            warningText.visibility = visi
         }
 
-        mPasswordView.setOnEditorActionListener(TextView.OnEditorActionListener { _, id, _ ->
-            if (id == R.id.login || id == EditorInfo.IME_NULL) {
+        passwordView.setOnEditorActionListener(TextView.OnEditorActionListener { _, id, _ ->
+            if (id == R.id.loginView || id == EditorInfo.IME_NULL) {
                 attemptLogin()
                 return@OnEditorActionListener true
             }
             false
         })
 
-        mEmailSignInButton.setOnClickListener { attemptLogin() }
+        signInButton.setOnClickListener { attemptLogin() }
 
-        mSwitch.setOnCheckedChangeListener { _, b ->
+        withLogin.setOnCheckedChangeListener { _, b ->
             isWithLogin = !isWithLogin
             val visi: Int = if (b) View.VISIBLE else View.GONE
 
-            mLoginLayout.visibility = visi
-            mPasswordLayout.visibility = visi
+            loginLayout.visibility = visi
+            passwordLayout.visibility = visi
         }
 
-        mHTTPSwitch.setOnCheckedChangeListener { _, b ->
+        withHttpLogin.setOnCheckedChangeListener { _, b ->
             isWithHTTPLogin = !isWithHTTPLogin
             val visi: Int = if (b) View.VISIBLE else View.GONE
 
-            mHTTPLoginLayout.visibility = visi
-            mHTTPPasswordLayout.visibility = visi
+            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))
+            alertDialog.setMessage(getString(R.string.base_url_error))
+            alertDialog.setButton(
+                    AlertDialog.BUTTON_NEUTRAL,
+                    "OK",
+                    { dialog, _ -> dialog.dismiss() })
+            alertDialog.show()
         }
     }
 
@@ -147,25 +130,25 @@ class LoginActivity : AppCompatActivity() {
     private fun attemptLogin() {
 
         // Reset errors.
-        mUrlView.error = null
-        mLoginView.error = null
-        mHTTPLoginView.error = null
-        mPasswordView.error = null
-        mHTTPPasswordView.error = null
+        urlView.error = null
+        loginView.error = null
+        httpLoginView.error = null
+        passwordView.error = null
+        httpPasswordView.error = null
 
         // Store values at the time of the login attempt.
-        val url = mUrlView.text.toString()
-        val login = mLoginView.text.toString()
-        val httpLogin = mHTTPLoginView.text.toString()
-        val password = mPasswordView.text.toString()
-        val httpPassword = mHTTPPasswordView.text.toString()
+        val url = urlView.text.toString()
+        val login = loginView.text.toString()
+        val httpLogin = httpLoginView.text.toString()
+        val password = passwordView.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)
-            focusView = mUrlView
+            urlView.error = getString(R.string.login_url_problem)
+            focusView = urlView
             cancel = true
             inValidCount++
             if (inValidCount == 3) {
@@ -173,9 +156,9 @@ class LoginActivity : AppCompatActivity() {
                 alertDialog.setTitle(getString(R.string.warning_wrong_url))
                 alertDialog.setMessage(getString(R.string.text_wrong_url))
                 alertDialog.setButton(
-                    AlertDialog.BUTTON_NEUTRAL,
-                    "OK",
-                    { dialog, _ -> dialog.dismiss() })
+                        AlertDialog.BUTTON_NEUTRAL,
+                        "OK",
+                        { dialog, _ -> dialog.dismiss() })
                 alertDialog.show()
                 inValidCount = 0
             }
@@ -183,14 +166,14 @@ class LoginActivity : AppCompatActivity() {
 
         if (isWithLogin || isWithHTTPLogin) {
             if (TextUtils.isEmpty(password)) {
-                mPasswordView.error = getString(R.string.error_invalid_password)
-                focusView = mPasswordView
+                passwordView.error = getString(R.string.error_invalid_password)
+                focusView = passwordView
                 cancel = true
             }
 
             if (TextUtils.isEmpty(login)) {
-                mLoginView.error = getString(R.string.error_field_required)
-                focusView = mLoginView
+                loginView.error = getString(R.string.error_field_required)
+                focusView = loginView
                 cancel = true
             }
         }
@@ -217,11 +200,11 @@ class LoginActivity : AppCompatActivity() {
                     editor.remove("password")
                     editor.remove("httpPassword")
                     editor.apply()
-                    mUrlView.error = getString(R.string.wrong_infos)
-                    mLoginView.error = getString(R.string.wrong_infos)
-                    mPasswordView.error = getString(R.string.wrong_infos)
-                    mHTTPLoginView.error = getString(R.string.wrong_infos)
-                    mHTTPPasswordView.error = getString(R.string.wrong_infos)
+                    urlView.error = getString(R.string.wrong_infos)
+                    loginView.error = getString(R.string.wrong_infos)
+                    passwordView.error = getString(R.string.wrong_infos)
+                    httpLoginView.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)
@@ -233,7 +216,7 @@ class LoginActivity : AppCompatActivity() {
 
                 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 +230,38 @@ 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
-        mLoginFormView
-            .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
+        loginForm
+                .animate()
+                .setDuration(shortAnimTime.toLong())
+                .alpha(
+                        if (show) 0F else 1F
+                ).setListener(object : AnimatorListenerAdapter() {
+            override fun onAnimationEnd(animation: Animator) {
+                loginForm.visibility = if (show) View.GONE else View.VISIBLE
+            }
+        })
 
-        mProgressView.visibility = if (show) View.VISIBLE else View.GONE
-        mProgressView
-            .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
+        loginProgress
+                .animate()
+                .setDuration(shortAnimTime.toLong())
+                .alpha(
+                        if (show) 1F else 0F
+                ).setListener(object : AnimatorListenerAdapter() {
+            override fun onAnimationEnd(animation: Animator) {
+                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
     }
 
@@ -288,17 +269,17 @@ class LoginActivity : AppCompatActivity() {
         when (item.itemId) {
             R.id.about -> {
                 LibsBuilder()
-                    .withActivityStyle(Libs.ActivityStyle.LIGHT_DARK_TOOLBAR)
-                    .withAboutIconShown(true)
-                    .withAboutVersionShown(true)
-                    .start(this)
+                        .withActivityStyle(Libs.ActivityStyle.LIGHT_DARK_TOOLBAR)
+                        .withAboutIconShown(true)
+                        .withAboutVersionShown(true)
+                        .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/ReaderActivity.kt

@@ -1,112 +1,190 @@
 package apps.amine.bou.readerforselfoss
 
+import android.content.SharedPreferences
 import android.os.Bundle
-import android.view.LayoutInflater
+import android.preference.PreferenceManager
+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 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
+import kotlinx.android.synthetic.main.activity_reader.*
 
 
-class ReaderActivity : DragDismissActivity() {
+class ReaderActivity : AppCompatActivity() {
     private lateinit var mCustomTabActivityHelper: CustomTabActivityHelper
+    //private lateinit var content: HtmlTextView
+    private lateinit var url: String
+    private lateinit var contentText: String
+    private lateinit var contentSource: String
+    private lateinit var contentImage: String
+    private lateinit var contentTitle: String
+    private lateinit var fab: FloatingActionButton
 
-    override fun onStart() {
-        super.onStart()
-        mCustomTabActivityHelper.bindCustomTabsService(this)
-    }
 
     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)
-        showProgressBar()
+        setContentView(R.layout.activity_reader)
 
-        val image: ImageView = v.findViewById(R.id.imageView)
-        val source: TextView = v.findViewById(R.id.source)
-        val title: TextView = v.findViewById(R.id.title)
-        val content: HtmlTextView = v.findViewById(R.id.content)
-        val url = intent.getStringExtra("url")
-        val parser = MercuryApi(BuildConfig.MERCURY_KEY)
-        val browserBtn: ImageButton = v.findViewById(R.id.browserBtn)
-        val shareBtn: ImageButton = v.findViewById(R.id.shareBtn)
+        url = intent.getStringExtra("url")
+        contentText = intent.getStringExtra("content")
+        contentTitle = intent.getStringExtra("title")
+        contentImage = intent.getStringExtra("image")
+        contentSource = intent.getStringExtra("source")
 
+        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>) {
                 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 {
-                            content.setHtml(response.body()!!.content, HtmlHttpImageGetter(content, null, true))
-                        } catch (e: IndexOutOfBoundsException) {
-                            openInBrowserAfterFailing()
-                        }
+                        tryToHandleHtml(response.body()!!.content, customTabsIntent, prefs)
                     }
-                    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)
-
-                    shareBtn.setOnClickListener {
-                        this@ReaderActivity.shareLink(response.body()!!.url)
+                                .with(baseContext)
+                                .asBitmap()
+                                .load(response.body()!!.lead_image_url)
+                                .apply(RequestOptions.fitCenterTransform())
+                                .into(imageView)
+                    } else {
+                        imageView.visibility = View.GONE
                     }
 
-                    browserBtn.setOnClickListener {
-                        this@ReaderActivity.openItemUrl(
-                            response.body()!!.url,
-                            customTabsIntent,
-                            false,
-                            false,
-                            this@ReaderActivity)
-                    }
+                    nestedScrollView.scrollTo(0, 0)
 
-                    hideProgressBar()
-                } else openInBrowserAfterFailing()
+                    progressBar.visibility = View.GONE
+                } else openInBrowserAfterFailing(customTabsIntent)
             }
 
-            override fun onFailure(call: Call<ParsedContent>, t: Throwable) = openInBrowserAfterFailing()
-
-            private fun openInBrowserAfterFailing() {
-                this@ReaderActivity.openItemUrl(
-                    url,
-                    customTabsIntent,
-                    true,
-                    false,
-                    this@ReaderActivity
-                )
-                finish()
-            }
+            override fun onFailure(call: Call<ParsedContent>, t: Throwable) = openInBrowserAfterFailing(customTabsIntent)
         })
-        return v
+    }
+
+    private fun tryToHandleHtml(c: String, customTabsIntent: CustomTabsIntent, prefs: SharedPreferences) {
+        try {
+            content.text = Html.fromHtml(c, HtmlHttpImageGetter(content, null, true), null)
+
+            //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,
+                this@ReaderActivity
+        )
+        finish()
     }
 }

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

@@ -5,37 +5,36 @@ 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 retrofit2.Call
+import retrofit2.Callback
+import retrofit2.Response
+import kotlinx.android.synthetic.main.activity_sources.*
 
 class SourcesActivity : AppCompatActivity() {
 
+
     override fun onCreate(savedInstanceState: Bundle?) {
         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)
@@ -43,9 +42,8 @@ class SourcesActivity : AppCompatActivity() {
         val api = SelfossApi(this, this@SourcesActivity, prefs.getBoolean("isSelfSignedCert", false), prefs.getBoolean("should_log_everything", false))
         var items: ArrayList<Sources> = ArrayList()
 
-        mFab.attachToRecyclerView(mRecyclerView)
-        mRecyclerView.setHasFixedSize(true)
-        mRecyclerView.layoutManager = mLayoutManager
+        recyclerView.setHasFixedSize(true)
+        recyclerView.layoutManager = mLayoutManager
 
         api.sources.enqueue(object : Callback<List<Sources>> {
             override fun onResponse(call: Call<List<Sources>>, response: Response<List<Sources>>) {
@@ -53,7 +51,7 @@ class SourcesActivity : AppCompatActivity() {
                     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()
             }
@@ -63,7 +61,7 @@ class SourcesActivity : AppCompatActivity() {
             }
         })
 
-        mFab.setOnClickListener {
+        fab.setOnClickListener {
             startActivity(Intent(this@SourcesActivity, AddSourceActivity::class.java))
         }
     }

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

@@ -3,40 +3,40 @@ 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 retrofit2.Call
+import retrofit2.Callback
+import retrofit2.Response
+import kotlinx.android.synthetic.main.card_item.view.*
 
 class ItemCardAdapter(private val app: Activity,
                       private val items: ArrayList<Item>,
@@ -52,7 +52,7 @@ class ItemCardAdapter(private val app: Activity,
     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,37 +60,32 @@ class ItemCardAdapter(private val app: Activity,
         val itm = items[position]
 
 
-        holder.saveBtn.isLiked = itm.starred
-        holder.title.text = Html.fromHtml(itm.title)
+        holder.mView.favButton.isLiked = itm.starred
+        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)
-            holder.itemImage.setImageDrawable(null)
+            Glide.with(c).clear(holder.mView.itemImage)
+            holder.mView.itemImage.setImageDrawable(null)
         } else {
-            if (fullHeightCards) {
-                c.bitmapFitCenter(itm.getThumbnail(c), holder.itemImage)
-            } else {
-                c.bitmapCenterCrop(itm.getThumbnail(c), holder.itemImage)
-            }
+            c.bitmapCenterCrop(itm.getThumbnail(c), holder.mView.itemImage)
         }
 
-        val fHolder = holder
         if (itm.getIcon(c).isEmpty()) {
             val color = generator.getColor(itm.sourcetitle)
 
             val drawable =
-                TextDrawable
-                    .builder()
-                    .round()
-                    .build(itm.sourcetitle.toTextDrawableString(), color)
-            holder.sourceImage.setImageDrawable(drawable)
+                    TextDrawable
+                            .builder()
+                            .round()
+                            .build(itm.sourcetitle.toTextDrawableString(), color)
+            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 {
@@ -130,15 +125,15 @@ class ItemCardAdapter(private val app: Activity,
 
         api.markItem(i.id).enqueue(object : Callback<SuccessResponse> {
             override fun onResponse(call: Call<SuccessResponse>, response: Response<SuccessResponse>) {
-                if (debugReadingItems) {
+                if (!response.succeeded() && debugReadingItems) {
                     val message =
-                        "message: ${response.message()} " +
-                            "response isSuccess: ${response.isSuccessful} " +
-                            "response code: ${response.code()} " +
-                            "response message: ${response.message()} " +
-                            "response errorBody: ${response.errorBody()?.string()} " +
-                            "body success: ${response.body()?.success} " +
-                            "body isSuccess: ${response.body()?.isSuccess}"
+                            "message: ${response.message()} " +
+                                    "response isSuccess: ${response.isSuccessful} " +
+                                    "response code: ${response.code()} " +
+                                    "response message: ${response.message()} " +
+                                    "response errorBody: ${response.errorBody()?.string()} " +
+                                    "body success: ${response.body()?.success} " +
+                                    "body isSuccess: ${response.body()?.isSuccess}"
                     Crashlytics.setUserIdentifier(userIdentifier)
                     Crashlytics.log(100, "READ_DEBUG_SUCCESS", message)
                     Crashlytics.logException(Exception("Was success, but did it work ?"))
@@ -163,43 +158,28 @@ class ItemCardAdapter(private val app: Activity,
 
     }
 
-    inner class ViewHolder(val mView: ConstraintLayout) : 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
-
+    inner class ViewHolder(val mView: CardView) : RecyclerView.ViewHolder(mView) {
         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()
-                itemImage.scaleType = ScaleType.CENTER_CROP
+                mView.itemImage.maxHeight = c.resources.getDimension(R.dimen.card_image_max_height).toInt()
+                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 onFailure(call: Call<SuccessResponse>, t: Throwable) {
-                            saveBtn.isLiked = false
+                            mView.favButton.isLiked = false
                             Toast.makeText(c, R.string.cant_mark_favortie, Toast.LENGTH_SHORT).show()
                         }
                     })
@@ -211,19 +191,19 @@ class ItemCardAdapter(private val app: Activity,
                         override fun onResponse(call: Call<SuccessResponse>, response: Response<SuccessResponse>) {}
 
                         override fun onFailure(call: Call<SuccessResponse>, t: Throwable) {
-                            saveBtn.isLiked = true
+                            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 {
-                c.openInBrowser(items[adapterPosition])
+            mView.browserBtn.setOnClickListener {
+                c.openInBrowserAsNewTask(items[adapterPosition])
             }
         }
 
@@ -233,10 +213,14 @@ class ItemCardAdapter(private val app: Activity,
 
             mView.setOnClickListener {
                 c.openItemUrl(items[adapterPosition].getLinkDecoded(),
-                    customTabsIntent,
-                    internalBrowser,
-                    articleViewer,
-                    app)
+                        items[adapterPosition].content,
+                        items[adapterPosition].getThumbnail(c),
+                        items[adapterPosition].title,
+                        items[adapterPosition].sourceAndDateText(),
+                        customTabsIntent,
+                        internalBrowser,
+                        articleViewer,
+                        app)
             }
         }
     }

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

@@ -12,28 +12,32 @@ 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 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.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 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.customtabs.CustomTabActivityHelper
-import apps.amine.bou.readerforselfoss.utils.glide.bitmapCenterCrop
-import apps.amine.bou.readerforselfoss.utils.glide.circularBitmapDrawable
-import com.crashlytics.android.Crashlytics
 import kotlin.collections.ArrayList
-
+import kotlinx.android.synthetic.main.list_item.view.*
 
 class ItemListAdapter(private val app: Activity,
                       private val items: ArrayList<Item>,
@@ -57,27 +61,27 @@ class ItemListAdapter(private val app: Activity,
         val itm = items[position]
 
 
-        holder.saveBtn.isLiked = itm.starred
-        holder.title.text = Html.fromHtml(itm.title)
+        holder.mView.favButton.isLiked = itm.starred
+        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()
+                    TypedValue.COMPLEX_UNIT_DIP, sizeInInt.toFloat(), c.resources
+                    .displayMetrics).toInt()
 
             val marginInInt = 16
             val marginInDp = TypedValue.applyDimension(
                     TypedValue.COMPLEX_UNIT_DIP, marginInInt.toFloat(), c.resources
                     .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,17 +93,17 @@ 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
@@ -138,15 +142,15 @@ class ItemListAdapter(private val app: Activity,
 
         api.markItem(i.id).enqueue(object : Callback<SuccessResponse> {
             override fun onResponse(call: Call<SuccessResponse>, response: Response<SuccessResponse>) {
-                if (debugReadingItems) {
+                if (!response.succeeded() && debugReadingItems) {
                     val message =
-                        "message: ${response.message()} " +
-                            "response isSuccess: ${response.isSuccessful} " +
-                            "response code: ${response.code()} " +
-                            "response message: ${response.message()} " +
-                            "response errorBody: ${response.errorBody()?.string()} " +
-                            "body success: ${response.body()?.success} " +
-                            "body isSuccess: ${response.body()?.isSuccess}"
+                            "message: ${response.message()} " +
+                                    "response isSuccess: ${response.isSuccessful} " +
+                                    "response code: ${response.code()} " +
+                                    "response message: ${response.message()} " +
+                                    "response errorBody: ${response.errorBody()?.string()} " +
+                                    "body success: ${response.body()?.success} " +
+                                    "body isSuccess: ${response.body()?.isSuccess}"
                     Crashlytics.setUserIdentifier(userIdentifier)
                     Crashlytics.log(100, "READ_DEBUG_SUCCESS", message)
                     Crashlytics.logException(Exception("Was success, but did it work ?"))
@@ -172,13 +176,6 @@ class ItemListAdapter(private val app: Activity,
     }
 
     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,23 +183,15 @@ 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)
 
-
-            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 onFailure(call: Call<SuccessResponse>, t: Throwable) {
-                            saveBtn.isLiked = false
+                            mView.favButton.isLiked = false
                             Toast.makeText(c, R.string.cant_mark_favortie, Toast.LENGTH_SHORT).show()
                         }
                     })
@@ -214,19 +203,19 @@ class ItemListAdapter(private val app: Activity,
                         override fun onResponse(call: Call<SuccessResponse>, response: Response<SuccessResponse>) {}
 
                         override fun onFailure(call: Call<SuccessResponse>, t: Throwable) {
-                            saveBtn.isLiked = true
+                            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 {
-                c.openInBrowser(items[adapterPosition])
+            mView.browserBtn.setOnClickListener {
+                c.openInBrowserAsNewTask(items[adapterPosition])
 
             }
         }
@@ -240,10 +229,14 @@ class ItemListAdapter(private val app: Activity,
             if (!clickBehavior) {
                 mView.setOnClickListener {
                     c.openItemUrl(items[adapterPosition].getLinkDecoded(),
-                        customTabsIntent,
-                        internalBrowser,
-                        articleViewer,
-                        app)
+                            items[adapterPosition].content,
+                            items[adapterPosition].getThumbnail(c),
+                            items[adapterPosition].title,
+                            items[adapterPosition].sourceAndDateText(),
+                            customTabsIntent,
+                            internalBrowser,
+                            articleViewer,
+                            app)
                 }
                 mView.setOnLongClickListener {
                     actionBarShowHide()
@@ -253,10 +246,14 @@ class ItemListAdapter(private val app: Activity,
                 mView.setOnClickListener { actionBarShowHide() }
                 mView.setOnLongClickListener {
                     c.openItemUrl(items[adapterPosition].getLinkDecoded(),
-                        customTabsIntent,
-                        internalBrowser,
-                        articleViewer,
-                        app)
+                            items[adapterPosition].content,
+                            items[adapterPosition].getThumbnail(c),
+                            items[adapterPosition].title,
+                            items[adapterPosition].sourceAndDateText(),
+                            customTabsIntent,
+                            internalBrowser,
+                            articleViewer,
+                            app)
                     true
                 }
             }
@@ -264,7 +261,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

@@ -10,19 +10,18 @@ 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 retrofit2.Call
+import retrofit2.Callback
+import retrofit2.Response
+import kotlinx.android.synthetic.main.source_list_item.view.*
 
 
 class SourcesListAdapter(private val app: Activity,
@@ -43,34 +42,27 @@ class SourcesListAdapter(private val app: Activity,
             val color = generator.getColor(itm.title)
 
             val drawable =
-                TextDrawable
-                    .builder()
-                    .round()
-                    .build(itm.title.toTextDrawableString(), color)
-            holder.sourceImage.setImageDrawable(drawable)
+                    TextDrawable
+                            .builder()
+                            .round()
+                            .build(itm.title.toTextDrawableString(), color)
+            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 {
-        return items.size
-    }
+    override fun getItemCount(): Int = 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)
 

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

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

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

@@ -1,12 +1,10 @@
 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> {

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,18 +13,13 @@ 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 apps.amine.bou.readerforselfoss.utils.Config
-import apps.amine.bou.readerforselfoss.utils.getUnsafeHttpClient
-import okhttp3.logging.HttpLoggingInterceptor
+import java.util.concurrent.ConcurrentHashMap
 
 
-
-
-// codebeat:disable[ARITY,TOO_MANY_FUNCTIONS]
 class SelfossApi(c: Context, callingActivity: Activity, isWithSelfSignedCert: Boolean, shouldLog: Boolean) {
 
     private lateinit var service: SelfossService
@@ -148,5 +143,3 @@ class SelfossApi(c: Context, callingActivity: Activity, isWithSelfSignedCert: Bo
         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

@@ -55,6 +55,7 @@ data class Sources(@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,
@@ -72,15 +73,16 @@ data class Item(@SerializedName("id") val id: String,
     }
 
     constructor(source: Parcel) : this(
-        id = source.readString(),
-        datetime = source.readString(),
-        title = source.readString(),
-        unread = 0.toByte() != source.readByte(),
-        starred = 0.toByte() != source.readByte(),
-        thumbnail = source.readString(),
-        icon = source.readString(),
-        link = source.readString(),
-        sourcetitle = source.readString()
+            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(),
+            icon = source.readString(),
+            link = source.readString(),
+            sourcetitle = source.readString()
     )
 
     override fun describeContents() = 0
@@ -89,6 +91,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)
@@ -128,6 +131,12 @@ data class Item(@SerializedName("id") val id: String,
         if (stringUrl.contains(":443")) {
             stringUrl = stringUrl.replace(":443", "").replace("http://", "https://")
         }
+
+        // handle url not starting with http
+        if (stringUrl.startsWith("//")) {
+            stringUrl = "http:" + stringUrl
+        }
+
         return stringUrl
     }
 

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

@@ -5,17 +5,18 @@ 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,
                  @Query("tag") tag: String?,
@@ -26,17 +27,21 @@ internal interface SelfossService {
                  @Query("items") items: Int,
                  @Query("offset") offset: Int): Call<List<Item>>
 
+
+    @Headers("Content-Type: application/x-www-form-urlencoded")
     @POST("mark/{id}")
     fun markAsRead(@Path("id") id: String,
                    @Query("username") username: String,
                    @Query("password") password: String): Call<SuccessResponse>
 
 
+    @Headers("Content-Type: application/x-www-form-urlencoded")
     @POST("unmark/{id}")
     fun unmarkAsRead(@Path("id") id: String,
                      @Query("username") username: String,
                      @Query("password") password: String): Call<SuccessResponse>
 
+
     @FormUrlEncoded
     @POST("mark")
     fun markAllAsRead(@Field("ids[]") ids: List<String>,
@@ -44,12 +49,14 @@ internal interface SelfossService {
                       @Query("password") password: String): Call<SuccessResponse>
 
 
+    @Headers("Content-Type: application/x-www-form-urlencoded")
     @POST("starr/{id}")
     fun starr(@Path("id") id: String,
               @Query("username") username: String,
               @Query("password") password: String): Call<SuccessResponse>
 
 
+    @Headers("Content-Type: application/x-www-form-urlencoded")
     @POST("unstarr/{id}")
     fun unstarr(@Path("id") id: String,
                 @Query("username") username: String,
@@ -70,10 +77,12 @@ internal interface SelfossService {
     fun update(@Query("username") username: String,
                @Query("password") password: String): Call<String>
 
+
     @GET("sources/spouts")
     fun spouts(@Query("username") username: String,
                @Query("password") password: String): Call<Map<String, Spout>>
 
+
     @GET("sources/list")
     fun sources(@Query("username") username: String,
                 @Query("password") password: String): Call<List<Sources>>
@@ -84,6 +93,7 @@ internal interface SelfossService {
                      @Query("username") username: String,
                      @Query("password") password: String): Call<SuccessResponse>
 
+
     @FormUrlEncoded
     @POST("source")
     fun createSource(@Field("title") title: String,
@@ -94,4 +104,3 @@ internal interface SelfossService {
                      @Query("username") username: String,
                      @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/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,51 +5,10 @@ import android.content.Intent
 import android.content.SharedPreferences
 import android.net.Uri
 import android.support.v7.app.AlertDialog
-import android.text.TextUtils
-import android.util.Patterns
-
-import com.google.firebase.remoteconfig.FirebaseRemoteConfig
-import okhttp3.HttpUrl
-
-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.isUrlValid(): Boolean =
-    HttpUrl.parse(this) != null && Patterns.WEB_URL.matcher(this).matches()
-
-fun String.isBaseUrlValid(): Boolean {
-    val baseUrl = HttpUrl.parse(this)
-    var existsAndEndsWithSlash = false
-    if (baseUrl != null) {
-        val pathSegments = baseUrl.pathSegments()
-        existsAndEndsWithSlash = "" == pathSegments[pathSegments.size - 1]
-    }
-
-    return Patterns.WEB_URL.matcher(this).matches() && existsAndEndsWithSlash
-}
-
 fun String?.isEmptyOrNullOrNullString(): Boolean =
     this == null || this == "null" || this.isEmpty()
 
@@ -116,11 +75,4 @@ fun Context.shareLink(itemUrl: String) {
     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))
-}
-
-fun Context.openInBrowser(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/LinksUtils.kt

@@ -7,9 +7,13 @@ import android.content.Intent
 import android.graphics.BitmapFactory
 import android.net.Uri
 import android.support.customtabs.CustomTabsIntent
+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
 
 
@@ -46,35 +50,61 @@ fun Context.buildCustomTabsIntent(): CustomTabsIntent {
     return intentBuilder.build()
 }
 
+fun Context.openItemUrlInternally(linkDecoded: String,
+                                  content: String,
+                                  image: String,
+                                  title: String,
+                                  source: String,
+                                  customTabsIntent: CustomTabsIntent,
+                                  articleViewer: Boolean,
+                                  app: Activity) {
+    if (articleViewer) {
+        val intent = Intent(this, ReaderActivity::class.java)
+
+        /*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)*/
+
+
+        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)
+            ) { _, uri ->
+                val intent = Intent(Intent.ACTION_VIEW, uri)
+                intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK
+                startActivity(intent)
+            }
+        } catch (e: Exception) {
+            openInBrowser(linkDecoded, app)
+        }
+    }
+}
+
 fun Context.openItemUrl(linkDecoded: String,
+                        content: String,
+                        image: String,
+                        title: String,
+                        source: String,
                         customTabsIntent: CustomTabsIntent,
                         internalBrowser: Boolean,
                         articleViewer: Boolean,
                         app: Activity) {
-    if (!internalBrowser || !linkDecoded.isUrlValid()) {
-        openInBrowser(linkDecoded, app)
+
+    if (!linkDecoded.isUrlValid()) {
+        Toast.makeText(this, this.getString(R.string.cant_open_invalid_url), Toast.LENGTH_LONG).show()
     } else {
-        if (articleViewer) {
-            val intent = Intent(this, ReaderActivity::class.java)
-
-            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.
-                    .build(intent)
-
-            intent.putExtra("url", linkDecoded)
-            app.startActivity(intent)
+        if (!internalBrowser) {
+            openInBrowser(linkDecoded, app)
         } else {
-            try {
-                CustomTabActivityHelper.openCustomTab(app, customTabsIntent, Uri.parse(linkDecoded)
-                ) { _, uri ->
-                    val intent = Intent(Intent.ACTION_VIEW, uri)
-                    intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK
-                    startActivity(intent)
-                }
-            } catch (e: Exception) {
-                openInBrowser(linkDecoded, app)
-            }
+            this.openItemUrlInternally(linkDecoded, content, image, title, source, customTabsIntent, articleViewer, app)
         }
     }
 }
@@ -84,3 +114,24 @@ private fun openInBrowser(linkDecoded: String, app: Activity) {
     intent.data = Uri.parse(linkDecoded)
     app.startActivity(intent)
 }
+
+fun String.isUrlValid(): Boolean =
+        HttpUrl.parse(this) != null && Patterns.WEB_URL.matcher(this).matches()
+
+fun String.isBaseUrlValid(): Boolean {
+    val baseUrl = HttpUrl.parse(this)
+    var existsAndEndsWithSlash = false
+    if (baseUrl != null) {
+        val pathSegments = baseUrl.pathSegments()
+        existsAndEndsWithSlash = "" == pathSegments[pathSegments.size - 1]
+    }
+
+    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,33 @@
+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/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 java.util.List;
+import apps.amine.bou.readerforselfoss.utils.customtabs.helpers.KeepAliveService;
 
 @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/CustomUrlPrimaryDrawerItem.kt

@@ -5,14 +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("")

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

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

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,126 +1,148 @@
 <?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"
-    tools:context="apps.amine.bou.readerforselfoss.ReaderActivity"
-    android:background="?android:attr/windowBackground">
+    android:layout_height="match_parent">
 
-    <ImageView
-        android:id="@+id/imageView"
-        android:layout_width="0dp"
-        android:layout_height="200dp"
-        android:scaleType="centerCrop"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        />
-
-    <TextView
-        android:id="@+id/source"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginEnd="16dp"
-        android:layout_marginLeft="16dp"
-        android:layout_marginRight="16dp"
-        android:layout_marginStart="16dp"
-        android:layout_marginTop="8dp"
-        android:textAppearance="@style/TextAppearance.AppCompat.Small"
-        android:textSize="12sp"
-        app:layout_constraintHorizontal_bias="0.0"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/imageView" />
-
-    <TextView
-        android:id="@+id/title"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginEnd="16dp"
-        android:layout_marginLeft="16dp"
-        android:layout_marginRight="16dp"
-        android:layout_marginStart="16dp"
-        android:layout_marginTop="6dp"
-        android:textAppearance="@style/TextAppearance.AppCompat.Headline"
-        android:textStyle="bold"
-        app:layout_constraintHorizontal_bias="0.0"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/source" />
-
-    <org.sufficientlysecure.htmltextview.HtmlTextView
-        android:id="@+id/content"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginEnd="16dp"
-        android:layout_marginLeft="16dp"
-        android:layout_marginRight="16dp"
-        android:layout_marginStart="16dp"
-        android:layout_marginTop="24dp"
-        android:paddingBottom="48dp"
-        app:layout_constraintHorizontal_bias="0.0"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/title"
-        tools:text="Some text @android:string/fingerprint_icon_content_description" />
-
-    <android.support.constraint.ConstraintLayout
+    <android.support.v4.widget.NestedScrollView
+        android:id="@+id/nestedScrollView"
         android:layout_width="match_parent"
-        android:layout_height="35dp"
-        android:layout_marginBottom="0dp"
-        android:layout_marginEnd="0dp"
-        android:layout_marginRight="16dp"
-        android:layout_marginTop="16dp"
-        android:background="#BBBBBB"
+        android:layout_height="match_parent">
+
+        <android.support.constraint.ConstraintLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+
+            <ImageView
+                android:id="@+id/imageView"
+                android:layout_width="0dp"
+                android:layout_height="200dp"
+                android:scaleType="centerCrop"
+                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintRight_toRightOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                />
+
+            <TextView
+                android:id="@+id/source"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginEnd="16dp"
+                android:layout_marginLeft="16dp"
+                android:layout_marginRight="16dp"
+                android:layout_marginStart="16dp"
+                android:layout_marginTop="8dp"
+                android:textAppearance="@style/TextAppearance.AppCompat.Small"
+                android:textSize="12sp"
+                app:layout_constraintHorizontal_bias="0.0"
+                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintRight_toRightOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/imageView" />
+
+            <TextView
+                android:id="@+id/titleView"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginEnd="16dp"
+                android:layout_marginLeft="16dp"
+                android:layout_marginRight="16dp"
+                android:layout_marginStart="16dp"
+                android:layout_marginTop="6dp"
+                android:textAppearance="@style/TextAppearance.AppCompat.Headline"
+                android:textStyle="bold"
+                app:layout_constraintHorizontal_bias="0.0"
+                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintRight_toRightOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/source" />
+
+            <TextView
+                android:id="@+id/content"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginEnd="16dp"
+                android:layout_marginLeft="16dp"
+                android:layout_marginRight="16dp"
+                android:layout_marginStart="16dp"
+                android:layout_marginTop="24dp"
+                android:paddingBottom="48dp"
+                app:layout_constraintHorizontal_bias="0.0"
+                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintRight_toRightOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/titleView"
+                android:textColorLink="?attr/colorAccent"/>
+
+            <!--<org.sufficientlysecure.htmltextview.HtmlTextView
+                android:id="@+id/content"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginEnd="16dp"
+                android:layout_marginLeft="16dp"
+                android:layout_marginRight="16dp"
+                android:layout_marginStart="16dp"
+                android:layout_marginTop="24dp"
+                android:paddingBottom="48dp"
+                app:layout_constraintHorizontal_bias="0.0"
+                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintRight_toRightOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/titleView" />-->
+
+        </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_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">
+        app:layout_constraintLeft_toLeftOf="parent"
+        android:layout_gravity="end|bottom|right">
 
-        <ImageButton
-            android:id="@+id/browserBtn"
-            android:layout_width="35dp"
-            android:layout_height="35dp"
-            android:layout_centerVertical="true"
+        <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:layout_toLeftOf="@+id/shareBtn"
-            android:layout_toStartOf="@+id/shareBtn"
-            android:adjustViewBounds="true"
-            android:background="@android:color/transparent"
-            android:elevation="5dp"
-            android:padding="4dp"
-            android:scaleType="centerCrop"
-            android:src="@drawable/ic_open_in_browser_black_24dp"
-            android:tint="?android:attr/textColorPrimary"
-            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" />
+            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>
 
-        <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:attr/textColorPrimary"
-            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" />
+    <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">
 
-    </android.support.constraint.ConstraintLayout>
+        <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>
 
-</android.support.constraint.ConstraintLayout>

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:tint="?android:textColorPrimary"
-        fab:fab_colorNormal="?attr/colorAccent"
-        fab:fab_colorPressed="?attr/colorAccentDark"
-        fab:fab_colorRipple="@color/pink"
+        android:src="@drawable/ic_add"
         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"/>
-</RelativeLayout>
+        android:layout_marginRight="16dp"
+        app:layout_behavior="apps.amine.bou.readerforselfoss.utils.ScrollAwareFABBehavior" />
+</android.support.design.widget.CoordinatorLayout>

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

@@ -1,157 +1,149 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                                             xmlns:app="http://schemas.android.com/apk/res-auto"
-                                             xmlns:tools="http://schemas.android.com/tools"
-                                             android:layout_width="match_parent"
-                                             android:layout_height="wrap_content">
+<android.support.v7.widget.CardView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:card_view="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/card"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_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"
+    card_view:layout_constraintBottom_toBottomOf="parent">
 
-    <android.support.v7.widget.CardView
-        android:id="@+id/card"
-        xmlns:card_view="http://schemas.android.com/apk/res-auto"
-        android:layout_width="0dp"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintHorizontal_bias="0.62"
-        app:layout_constraintTop_toTopOf="parent"
-        card_view:cardElevation="2dp"
-        card_view:cardUseCompatPadding="true"
-        android:layout_height="wrap_content"
-        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"
+            android:adjustViewBounds="true"
+            android:cropToPadding="true"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:srcCompat="@drawable/background_splash"
+            card_view:layout_constraintBottom_toTopOf="@+id/constraintLayout" />
 
         <android.support.constraint.ConstraintLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
+            android:id="@+id/constraintLayout"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/itemImage">
 
             <ImageView
-                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"
-                android:layout_marginTop="0dp"
-                android:layout_marginRight="0dp"
-                app:layout_constraintRight_toRightOf="parent"
-                android:layout_marginLeft="0dp"
-                app:layout_constraintLeft_toLeftOf="parent" />
-
-            <android.support.constraint.ConstraintLayout
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                app:layout_constraintTop_toBottomOf="@+id/itemImage"
-                app:layout_constraintRight_toRightOf="parent"
+                android:id="@+id/sourceImage"
+                android:layout_width="40dp"
+                android:layout_height="40dp"
+                android:layout_marginLeft="8dp"
+                android:layout_marginStart="8dp"
+                android:layout_marginTop="8dp"
                 app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                app:srcCompat="@drawable/background_splash" />
+
+            <TextView
+                android:id="@+id/title"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginEnd="8dp"
+                android:layout_marginLeft="8dp"
+                android:layout_marginRight="8dp"
+                android:layout_marginStart="8dp"
+                android:gravity="start"
+                android:textAlignment="viewStart"
+                android:textStyle="bold"
+                app:layout_constraintHorizontal_bias="0.0"
+                app:layout_constraintLeft_toRightOf="@+id/sourceImage"
+                app:layout_constraintRight_toRightOf="parent"
+                app:layout_constraintTop_toTopOf="@+id/sourceImage"
+                tools:text="Titre" />
+
+            <TextView
+                android:id="@+id/sourceTitleAndDate"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="8dp"
+                android:gravity="start"
+                android:textAlignment="viewStart"
+                android:textSize="14sp"
+                app:layout_constraintLeft_toLeftOf="@+id/title"
+                app:layout_constraintTop_toBottomOf="@+id/title"
+                tools:text="Google Actualité Il y a 5h" />
+
+            <RelativeLayout
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="16dp"
                 app:layout_constraintBottom_toBottomOf="parent"
-                >
+                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintRight_toRightOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/sourceTitleAndDate">
 
-                <ImageView
-                    android:layout_height="40dp"
-                    app:srcCompat="@drawable/background_splash"
-                    android:id="@+id/sourceImage"
-                    app:layout_constraintLeft_toLeftOf="parent"
-                    android:layout_marginStart="8dp"
-                    android:layout_marginLeft="8dp"
-                    app:layout_constraintTop_toTopOf="parent"
-                    android:layout_marginTop="8dp"
-                    android:layout_width="40dp" />
+                <com.like.LikeButton
+                    android:id="@+id/favButton"
+                    android:layout_width="35dp"
+                    android:layout_height="35dp"
+                    android:layout_alignParentEnd="true"
+                    android:layout_alignParentRight="true"
 
-                <TextView
-                    android:id="@+id/title"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
+                    android:layout_centerVertical="true"
                     android:layout_marginEnd="8dp"
-                    android:layout_marginLeft="8dp"
                     android:layout_marginRight="8dp"
-                    android:layout_marginStart="8dp"
-                    android:gravity="start"
-                    android:textAlignment="viewStart"
-                    android:textStyle="bold"
-                    app:layout_constraintHorizontal_bias="0.0"
-                    app:layout_constraintLeft_toRightOf="@+id/sourceImage"
-                    app:layout_constraintRight_toRightOf="parent"
-                    app:layout_constraintTop_toTopOf="@+id/sourceImage"
-                    tools:text="Titre" />
+                    android:elevation="5dp"
+                    android:padding="4dp"
+                    app:icon_size="22dp"
+                    app:icon_type="heart" />
 
-                <TextView
-                    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"
-                    app:layout_constraintLeft_toLeftOf="@+id/title"
-                    android:gravity="start" />
+                <ImageButton
+                    android:id="@+id/shareBtn"
+                    android:layout_width="35dp"
+                    android:layout_height="35dp"
+                    android:layout_centerVertical="true"
+                    android:layout_marginEnd="16dp"
+                    android:layout_marginRight="16dp"
+                    android:layout_toLeftOf="@+id/favButton"
+                    android:layout_toStartOf="@+id/favButton"
+                    android:adjustViewBounds="true"
+                    android:background="@android:color/transparent"
+                    android:elevation="5dp"
+                    android:padding="4dp"
+                    android:scaleType="centerCrop"
+                    android:src="@drawable/ic_share_black_24dp"
+                    android:tint="?android:attr/textColorPrimary" />
 
-                <RelativeLayout
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    app:layout_constraintTop_toBottomOf="@+id/sourceTitleAndDate"
-                    android:layout_marginTop="16dp"
-                    app:layout_constraintLeft_toLeftOf="parent"
-                    app:layout_constraintRight_toRightOf="parent"
-                    app:layout_constraintBottom_toBottomOf="parent">
+                <ImageButton
+                    android:id="@+id/browserBtn"
+                    android:layout_width="35dp"
+                    android:layout_height="35dp"
+                    android:layout_centerVertical="true"
+                    android:layout_marginEnd="16dp"
+                    android:layout_marginRight="16dp"
+                    android:layout_toLeftOf="@+id/shareBtn"
+                    android:layout_toStartOf="@+id/shareBtn"
+                    android:adjustViewBounds="true"
+                    android:background="@android:color/transparent"
+                    android:elevation="5dp"
+                    android:padding="4dp"
+                    android:scaleType="centerCrop"
+                    android:src="@drawable/ic_open_in_browser_black_24dp"
+                    android:tint="?android:attr/textColorPrimary" />
 
-                    <com.like.LikeButton
-                        app:icon_type="heart"
-                        app:icon_size="22dp"
-                        android:id="@+id/favButton"
-                        android:layout_width="35dp"
-                        android:layout_height="35dp"
+            </RelativeLayout>
 
-                        android:layout_centerVertical="true"
-                        android:layout_alignParentRight="true"
-                        android:layout_alignParentEnd="true"
-                        android:elevation="5dp"
-                        android:padding="4dp"
-                        android:layout_marginRight="8dp"
-                        android:layout_marginEnd="8dp"/>
-
-                    <ImageButton
-                        android:id="@+id/shareBtn"
-                        android:layout_width="35dp"
-                        android:layout_height="35dp"
-                        android:layout_centerVertical="true"
-                        android:layout_marginEnd="16dp"
-                        android:layout_marginRight="16dp"
-                        android:layout_toLeftOf="@+id/favButton"
-                        android:layout_toStartOf="@+id/favButton"
-                        android:adjustViewBounds="true"
-                        android:background="@android:color/transparent"
-                        android:elevation="5dp"
-                        android:padding="4dp"
-                        android:scaleType="centerCrop"
-                        android:src="@drawable/ic_share_black_24dp"
-                        android:tint="?android:attr/textColorPrimary" />
-
-                    <ImageButton
-                        android:id="@+id/browserBtn"
-                        android:layout_width="35dp"
-                        android:layout_height="35dp"
-                        android:layout_centerVertical="true"
-                        android:layout_marginEnd="16dp"
-                        android:layout_marginRight="16dp"
-                        android:layout_toLeftOf="@+id/shareBtn"
-                        android:layout_toStartOf="@+id/shareBtn"
-                        android:adjustViewBounds="true"
-                        android:background="@android:color/transparent"
-                        android:elevation="5dp"
-                        android:padding="4dp"
-                        android:scaleType="centerCrop"
-                        android:src="@drawable/ic_open_in_browser_black_24dp"
-                        android:tint="?android:attr/textColorPrimary" />
-
-                </RelativeLayout>
-
-            </android.support.constraint.ConstraintLayout>
         </android.support.constraint.ConstraintLayout>
+    </android.support.constraint.ConstraintLayout>
 
-    </android.support.v7.widget.CardView>
-</android.support.constraint.ConstraintLayout>
+</android.support.v7.widget.CardView>

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

@@ -1,55 +1,66 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    android:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="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/actionBar"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        />
+        app:layout_constraintBottom_toTopOf="@+id/guideline4"
+        app:layout_constraintStart_toStartOf="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_constraintRight_toRightOf="parent"
+        app:layout_constraintStart_toEndOf="@+id/itemImage"
         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"
-        tools:text="Google Actualité Il y a 5h"
+        android:layout_width="0dp"
+        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:layout_marginTop="8dp"
-        app:layout_constraintLeft_toLeftOf="@+id/title"
-        android:gravity="start" />
+        android:textSize="14sp"
+        app:layout_constraintBottom_toTopOf="@+id/guideline4"
+        app:layout_constraintEnd_toEndOf="parent"
+        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_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/sourceTitleAndDate">
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        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>
@@ -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,6 +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>
@@ -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,6 +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>
@@ -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,6 +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>
@@ -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,6 +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>
@@ -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,6 +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,6 +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>
@@ -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,6 +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>
@@ -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,6 +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>
@@ -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,6 +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_switch_actions_tap_title">"Action du clique sur un article"</string>
+  <string name="pref_header_general">"Général"</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,6 +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>
@@ -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,6 +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>
@@ -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,6 +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>
@@ -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,6 +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>
@@ -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,6 +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>
@@ -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,6 +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-nl/strings.xml

@@ -46,9 +46,7 @@
   <string name="pref_header_links">"Links"</string>
   <string name="issue_tracker_link">"Bug tracker"</string>
   <string name="issue_tracker_summary">"Rapporteer een probleem of dien een verzoek in"</string>
-  <string name="warning_version">"WAARSCHUWING"</string>
   <string name="warning_wrong_url">"WAARSCHUWING"</string>
-  <string name="text_version">"Deze versie van de applicatie lijkt niet afkomstig van de Play Store en kan mogelijk virussen bevatten. De ontwikkelaar is niet verantwoordelijk voor mogelijke schade aan uw apparaat. Overweeg om de ReaderForSelfoss app uit de Play Store te gebruiken."</string>
   <string name="pref_switch_card_view_title">"Kaart weergave"</string>
   <string name="cant_mark_favortie">"Kan het artikel niet markeren als favoriet"</string>
   <string name="cant_unmark_favortie">"Kan het item niet verwijderen uit favorieten"</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">Zoeken</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,6 +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">Vertaling</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-no/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>
@@ -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,6 +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-pl/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>
@@ -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,6 +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-pt/strings.xml

@@ -2,156 +2,160 @@
 <!--Generated by crowdin.com-->
 <resources xmlns:tools="http://schemas.android.com/tools">
   <string name="app_name">"Reader for Selfoss"</string>
-  <string name="title_activity_login">"Log in"</string>
-  <string name="prompt_password">"Password"</string>
-  <string name="prompt_http_password">"HTTP Password"</string>
-  <string name="action_sign_in">"Go"</string>
-  <string name="error_invalid_password">"Password not long enough"</string>
-  <string name="error_field_required">"Field required"</string>
+  <string name="title_activity_login">"Entrar"</string>
+  <string name="prompt_password">"Senha"</string>
+  <string name="prompt_http_password">"Senha HTTP"</string>
+  <string name="action_sign_in">"Vamos lá"</string>
+  <string name="error_invalid_password">"Senha muito pequena"</string>
+  <string name="error_field_required">"Campo obrigatório"</string>
   <string name="prompt_url">"Url"</string>
-  <string name="withLoginSwitch">"Login required ?"</string>
-  <string name="withHttpLoginSwitch">"HTTP Login required ?"</string>
-  <string name="login_url_problem">"Oops. You may need to add a \"/\" at the end of the url."</string>
-  <string name="prompt_login">"Username"</string>
-  <string name="prompt_http_login">"HTTP Username"</string>
-  <string name="label_share">"Share"</string>
-  <string name="readAll">"Read all"</string>
-  <string name="action_disconnect">"Disconnect"</string>
-  <string name="title_activity_settings">"Settings"</string>
-  <string name="pref_header_general">"General"</string>
-  <string name="pref_switch_actions_tap_title">"Tap action on the articles"</string>
+  <string name="withLoginSwitch">"É necessário o login ?"</string>
+  <string name="withHttpLoginSwitch">"É necessário o login HTTP ?"</string>
+  <string name="login_url_problem">"Oops. Talvez você precise adicionar uma \"/\" no final da url."</string>
+  <string name="prompt_login">"Usuário"</string>
+  <string name="prompt_http_login">"Usuário HTTP"</string>
+  <string name="label_share">"Compartilhar"</string>
+  <string name="readAll">"Ler todos"</string>
+  <string name="action_disconnect">"Desconectar"</string>
+  <string name="title_activity_settings">"Configurações"</string>
+  <string name="pref_header_general">"Geral"</string>
+  <string name="pref_switch_actions_tap_title">"Ação de tocar nos artigos"</string>
   <string name="add_source_hint_tags">"Tag1, Tag2, Tag3"</string>
   <string name="add_source_hint_url">"Link"</string>
-  <string name="add_source_hint_name">"Name"</string>
-  <string name="add_source">"Add a source"</string>
-  <string name="add_source_save">"Save"</string>
-  <string name="wrong_infos">"Check your details again."</string>
-  <string name="all_posts_not_read">"All posts weren't read"</string>
-  <string name="all_posts_read">"All posts were read"</string>
-  <string name="cant_get_favs">"Can't get favorites"</string>
-  <string name="cant_get_new_elements">"Can't get new articles"</string>
-  <string name="cant_get_read">"Can't get read articles"</string>
-  <string name="nothing_here">"Nothing here"</string>
-  <string name="tab_new">"New"</string>
-  <string name="tab_read">"All"</string>
-  <string name="tab_favs">"Favorites"</string>
-  <string name="action_about">"About"</string>
-  <string name="marked_as_read">"Item read"</string>
-  <string name="undo_string">"Undo"</string>
-  <string name="addStringNoUrl">"Log in to add sources."</string>
-  <string name="cant_get_sources">"Can't get sources list."</string>
-  <string name="cant_create_source">"Can't create source."</string>
-  <string name="cant_get_spouts">"Can't get spouts list."</string>
-  <string name="form_not_complete">"The form is not complete"</string>
+  <string name="add_source_hint_name">"Nome"</string>
+  <string name="add_source">"Adicionar uma fonte"</string>
+  <string name="add_source_save">"Salvar"</string>
+  <string name="wrong_infos">"Verifique os detalhes novamente."</string>
+  <string name="all_posts_not_read">"Nenhum post foi lido"</string>
+  <string name="all_posts_read">"Todos os posts foram lidos"</string>
+  <string name="cant_get_favs">"Não consigo obter os favoritos"</string>
+  <string name="cant_get_new_elements">"Não consigo obter novos artigos"</string>
+  <string name="cant_get_read">"Não consigo ler artigos"</string>
+  <string name="nothing_here">"Nada aqui"</string>
+  <string name="tab_new">"Novo"</string>
+  <string name="tab_read">"Todos"</string>
+  <string name="tab_favs">"Favoritos"</string>
+  <string name="action_about">"Sobre"</string>
+  <string name="marked_as_read">"Item lido"</string>
+  <string name="undo_string">"Desfazer"</string>
+  <string name="addStringNoUrl">"Faça login para adicionar fontes."</string>
+  <string name="cant_get_sources">"Não é possível obter a lista de fontes."</string>
+  <string name="cant_create_source">"Não é possível criar fonte."</string>
+  <string name="cant_get_spouts">"Não é possível obter a lista de spouts."</string>
+  <string name="form_not_complete">"O formulário não está completo"</string>
   <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="issue_tracker_link">"Rastreador de problemas"</string>
+  <string name="issue_tracker_summary">"Informe um erro ou peça um novo recurso"</string>
+  <string name="warning_wrong_url">"ATENÇÃO"</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>
-  <string name="share">"Share"</string>
-  <string name="rating_prompt_title">"Enjoying the app ?"</string>
-  <string name="rating_prompt_yes">"Yes !"</string>
-  <string name="rating_prompt_no">"Not really …"</string>
-  <string name="rating_prompt_feedback_title">"Can you tell us why ?"</string>
+  <string name="cant_mark_favortie">"Não é possível marcar o artigo como favorito"</string>
+  <string name="cant_unmark_favortie">"Não é possível remover o item do favorito"</string>
+  <string name="share">"Compartilhar"</string>
+  <string name="rating_prompt_title">"Aproveitando o app ?"</string>
+  <string name="rating_prompt_yes">"Sim !"</string>
+  <string name="rating_prompt_no">"Na verdade não …"</string>
+  <string name="rating_prompt_feedback_title">"Você pode nos dizer o porquê ?"</string>
   <string name="rating_prompt_feedback_yes">"OK !"</string>
-  <string name="rating_prompt_feedback_no">"Not now."</string>
-  <string name="rating_prompt_rating_title">"Great ! Can you rate us on the Store ?"</string>
-  <string name="rating_prompt_rating_yes">"Sure !"</string>
-  <string name="rating_prompt_rating_no">"Not right now."</string>
-  <string name="rating_prompt_thanks">"Thanks, your feedback help enhance the app !"</string>
-  <string name="switch_unread_count">"Display the unread count as a badge for the bottom bar."</string>
-  <string name="switch_unread_count_title">"Display unread count"</string>
-  <string name="display_all_counts_title">"Display count for favorite and read"</string>
-  <string name="menu_share_the_app">"Invite friends"</string>
-  <string name="invitation_title">"Try this app for your Selfoss RSS feeds !"</string>
-  <string name="invitation_message">"I use this app for my Selfoss RSS feeds. You may like it too !"</string>
-  <string name="invitation_cta">"Try the app"</string>
-  <string name="text_wrong_url">"You seem to be trying to use an invalid URL. Make sure it is correct, and if the problem persists, contact me (via the store contact link). Please note that the app needs you to be using Selfoss. You can't access RSS feeds without it."</string>
-  <string name="pref_general_internal_browser_title">"Open links inside the app"</string>
-  <string name="pref_general_internal_browser_on">"Articles will open inside the app"</string>
-  <string name="pref_general_internal_browser_off">"Articles will open with your default browser"</string>
-  <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_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>
-  <string name="pref_switch_card_view_off">"The articles will be displayed as a list"</string>
-  <string name="pref_switch_actions_tap_on">"Displays the action bar under the article"</string>
-  <string name="pref_switch_actions_tap_off">"When selecting an article it will open in your selected browser"</string>
-  <string name="menu_home_refresh">"Update remote"</string>
-  <string name="refresh_success_response">"The remote is updated, you can now reload the articles list"</string>
-  <string name="refresh_failer_message">"The update didn't work, try again later, or check your selfoss logs."</string>
-  <string name="refresh_in_progress">"Refresh in progress"</string>
-  <string name="new_apk_available_title">"A new APK is available."</string>
-  <string name="new_apk_available_message">"A new APK is available to download on the official repository."</string>
-  <string name="new_apk_available_get">"Download now"</string>
-  <string name="new_apk_available_no">"Ignore version"</string>
-  <string name="intro_hello_title">"Hi there !"</string>
-  <string name="intro_hello_message">"Thanks for downloading the app !"</string>
-  <string name="intro_needs_selfoss_title">"Before you start…"</string>
-  <string name="intro_needs_selfoss_message">"You can't use the app without a Selfoss instance."</string>
-  <string name="intro_needs_selfoss_link">"What is Selfoss ?"</string>
-  <string name="intro_all_set_title">"All set !"</string>
-  <string name="intro_all_set_message">"You are ready to use the app. Don't forget to go to the settings page to configure your app, and where you'll find some useful links."</string>
-  <string name="card_height_title">Full height cards</string>
-  <string name="card_height_on">Cards height will adjust to its content</string>
-  <string name="card_height_off">Card height will be fixed</string>
-  <string name="source_code">Source code</string>
-  <string name="cant_mark_read">Can\'t mark article as read</string>
-  <string name="drawer_error_loading_tags">Error loading tags…</string>
-  <string name="drawer_error_loading_sources">Error loading sources…</string>
-  <string name="drawer_item_filters">Filters</string>
-  <string name="drawer_action_clear">clear</string>
+  <string name="rating_prompt_feedback_no">"Não agora."</string>
+  <string name="rating_prompt_rating_title">"Ótimo ! Você pode nos avaliar na loja ?"</string>
+  <string name="rating_prompt_rating_yes">"Com certeza !"</string>
+  <string name="rating_prompt_rating_no">"Não agora."</string>
+  <string name="rating_prompt_thanks">"Obrigado, seu comentário ajuda a melhorar o app !"</string>
+  <string name="switch_unread_count">"Exibir a contagem de artigos não lidos como um badge na barra inferior."</string>
+  <string name="switch_unread_count_title">"Exibir contagem de artigos não lidos"</string>
+  <string name="display_all_counts_title">"Exibir contagem de lidos e favoritos"</string>
+  <string name="menu_share_the_app">"Convidar amigos"</string>
+  <string name="invitation_title">"Experimente este aplicativo para seus feeds RSS do Selfoss !"</string>
+  <string name="invitation_message">"Eu uso o app para o visualizar meu feed RSS do Selfoss. Você vai gostar também !"</string>
+  <string name="invitation_cta">"Experimente o aplicativo"</string>
+  <string name="text_wrong_url">"Parece que você está tentando utilizar uma URL inválida. Certifique-se de que está correto, e se o problema persistir, entre em contato comigo (através do link de contato da loja). Por favor, note que o aplicativo precisa que você esteja usando o Selfoss. Você não pode acessar feeds RSS sem ele."</string>
+  <string name="pref_general_internal_browser_title">"Abrir links dentro do aplicativo"</string>
+  <string name="pref_general_internal_browser_on">"Os artigos serão abertos dentro do aplicativo"</string>
+  <string name="pref_general_internal_browser_off">"Os artigos serão abertos com seu navegador padrão"</string>
+  <string name="prefer_article_viewer_title">"Use o visualizador de artigos"</string>
+  <string name="prefer_article_viewer_on">"Usará o visualizador de artigos em vez do navegador"</string>
+  <string name="prefer_article_viewer_off">"Utilizará o navegador em vez do visualizador de artigos"</string>
+  <string name="pref_general_category_links">"Manipulação de links"</string>
+  <string name="pref_general_category_displaying">"Mostrando"</string>
+  <string name="pref_general_category_actions">"Ações"</string>
+  <string name="pref_switch_card_view_on">"Os artigos serão exibidos no formato de cards"</string>
+  <string name="pref_switch_card_view_off">"Os artigos serão exibidos em lista"</string>
+  <string name="pref_switch_actions_tap_on">"Exibe a barra de ação sob o artigo"</string>
+  <string name="pref_switch_actions_tap_off">"Ao selecionar um artigo, ele será aberto no seu navegador selecionado"</string>
+  <string name="menu_home_refresh">"Atualizar controle remoto"</string>
+  <string name="refresh_success_response">"O controle remoto foi atualizado, agora você pode recarregar a lista de artigos"</string>
+  <string name="refresh_failer_message">"A atualização não funcionou, tente novamente mais tarde ou verifique seus logs do Selfoss."</string>
+  <string name="refresh_in_progress">"Atualização em progresso"</string>
+  <string name="new_apk_available_title">"Um novo APK está disponível."</string>
+  <string name="new_apk_available_message">"Um novo APK está disponível para download no repositório oficial."</string>
+  <string name="new_apk_available_get">"Baixar agora"</string>
+  <string name="new_apk_available_no">"Ignorar"</string>
+  <string name="intro_hello_title">"Olá !"</string>
+  <string name="intro_hello_message">"Obrigado por baixar o app !"</string>
+  <string name="intro_needs_selfoss_title">"Antes que você comece…"</string>
+  <string name="intro_needs_selfoss_message">"Você não pode usar o aplicativo sem uma instância do Selfoss."</string>
+  <string name="intro_needs_selfoss_link">"O que é Selfoss ?"</string>
+  <string name="intro_all_set_title">"Tudo pronto !"</string>
+  <string name="intro_all_set_message">"Você está pronto para usar o aplicativo. Não se esqueça de acessar a página de configurações para configurar seu aplicativo e onde você encontrará alguns links úteis."</string>
+  <string name="card_height_title">Cards com altura total</string>
+  <string name="card_height_on">Cards com altura ajustáveis de acordo com o conteúdo</string>
+  <string name="card_height_off">Cards com altura de tamanho fixo</string>
+  <string name="source_code">Código fonte</string>
+  <string name="cant_mark_read">Não é possível marcar o artigo como lido</string>
+  <string name="drawer_error_loading_tags">Erro ao carregar as tags…</string>
+  <string name="drawer_error_loading_sources">Erro ao carregar as fontes…</string>
+  <string name="drawer_item_filters">Filtros</string>
+  <string name="drawer_action_clear">limpar</string>
   <string name="drawer_item_tags">Tags</string>
-  <string name="drawer_item_sources">Sources</string>
-  <string name="drawer_action_edit">edit</string>
-  <string name="cache_drawer_error" tools:keep="@string/cache_drawer_error">Couldn\'t cache your drawer data</string>
-  <string name="no_tags_loaded">No tags loaded</string>
-  <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="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>
-  <string name="teal_orange_theme">Teal/Orange/Light</string>
-  <string name="cyan_pink_theme">Cyan/Pink/Light</string>
-  <string name="grey_orange_theme">Grey/Orange/Light</string>
-  <string name="blue_amber_theme">Blue/Amber/Light</string>
-  <string name="indigo_pink_theme">Indigo/Pink/Light</string>
-  <string name="red_teal_theme">Red/Teal/Light</string>
-  <string name="teal_orange_dark_theme">Teal/Orange/Dark</string>
-  <string name="cyan_pink_dark_theme">Cyan/Pink/Dark</string>
-  <string name="default_dark_theme">Default/Dark</string>
-  <string name="grey_orange_dark_theme">Grey/Orange/Dark</string>
-  <string name="blue_amber_dark_theme">Blue/Amber/Dark</string>
-  <string name="indigo_pink_dark_theme">Indigo/Pink/Dark</string>
-  <string name="red_teal_dark_theme">Red/Teal/Dark</string>
-  <string name="pref_header_debug">Debug</string>
-  <string name="login_debug_title">Activate to log login errors</string>
-  <string name="login_debug_on">Any error on the login page will be logged</string>
-  <string name="login_debug_off">No log on the login page</string>
-  <string name="login_menu_debug">Debug</string>
-  <string name="self_hosted_cert_switch">Using a self hosted certificate ?</string>
-  <string name="self_signed_cert_warning">Due to security reasons, self signed certificates are not supported by default. By activating this, I\'ll not be responsible of any security problem you encounter.</string>
+  <string name="drawer_item_sources">Fontes</string>
+  <string name="drawer_action_edit">editar</string>
+  <string name="cache_drawer_error" tools:keep="@string/cache_drawer_error">Não foi possível recuperar os dados em cache</string>
+  <string name="no_tags_loaded">Nenhuma tag carregada</string>
+  <string name="no_sources_loaded">Nenhuma fonte carregada</string>
+  <string name="drawer_loading">Carregando …</string>
+  <string name="menu_home_search">Procurar</string>
+  <string name="can_delete_source">Não foi possível apagar a fonte…</string>
+  <string name="base_url_error">Houve um problema ao tentar se comunicar com o seu Selfoss. Se o problema persistir, entre em contato comigo.</string>
+  <string name="pref_header_theme">Temas</string>
+  <string name="default_theme">Padrão</string>
+  <string name="teal_orange_theme">Cerceta/Laranja/Claro</string>
+  <string name="cyan_pink_theme">Ciano/Rosa/Claro</string>
+  <string name="grey_orange_theme">Cinza/Laranja/Claro</string>
+  <string name="blue_amber_theme">Azul/Âmbar/Claro</string>
+  <string name="indigo_pink_theme">Índigo/Rosa/Claro</string>
+  <string name="red_teal_theme">Vermelho/Cerceta/Claro</string>
+  <string name="teal_orange_dark_theme">Cerceta/Laranja/Escuro</string>
+  <string name="cyan_pink_dark_theme">Ciano/Rosa/Escuro</string>
+  <string name="default_dark_theme">Padrão/Escuro</string>
+  <string name="grey_orange_dark_theme">Cinza/Laranja/Escuro</string>
+  <string name="blue_amber_dark_theme">Azul/Âmbar/Escuro</string>
+  <string name="indigo_pink_dark_theme">Índigo/Rosa/Escuro</string>
+  <string name="red_teal_dark_theme">Vermelho/Âmbar/Escuro</string>
+  <string name="pref_header_debug">Depurar</string>
+  <string name="login_debug_title">Ativar para registrar erros de login</string>
+  <string name="login_debug_on">Qualquer erro na página de login será registrado</string>
+  <string name="login_debug_off">Nenhum registro na página de login</string>
+  <string name="login_menu_debug">Depurar</string>
+  <string name="self_hosted_cert_switch">Usando um certificado autônomo ?</string>
+  <string name="self_signed_cert_warning">Por motivos de segurança, certificados autônomos não são suportados por padrão. Ao ativar, não serei responsável por qualquer problema de segurança que você encontre.</string>
   <string name="pref_selfoss_category">Selfoss Api</string>
-  <string name="pref_api_items_number_title">Loaded items number</string>
-  <string name="read_debug_title">Read articles appearing as unread ?</string>
-  <string name="read_debug_off">No log when marking an item as read</string>
-  <string name="read_debug_on">Api calls will be logged when marking an article as read</string>
-  <string name="summary_debug_identifier">Debug identifier</string>
-  <string name="unique_id_to_clipboard">Identifier copied to your clipboard</string>
-  <string name="display_header_drawer_summary">Display a header with the selfoss instance url on the lateral drawer.</string>
-  <string name="display_header_drawer_title">Account header</string>
-  <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="translation">Translation</string>
+  <string name="pref_api_items_number_title">Quantidade de itens carregados</string>
+  <string name="read_debug_title">Ler os artigos que aparecem como não lidos ?</string>
+  <string name="read_debug_off">Nenhum registro ao marcar um item como lido</string>
+  <string name="read_debug_on">As chamadas Api serão registradas ao marcar um artigo como lido</string>
+  <string name="summary_debug_identifier">Identificador de depuração</string>
+  <string name="unique_id_to_clipboard">Identificador copiado para a área de transferência</string>
+  <string name="display_header_drawer_summary">Exibir um cabeçalho com o URL da instância do Selfoss na barra lateral.</string>
+  <string name="display_header_drawer_title">Cabeçalho da conta</string>
+  <string name="login_everything_title">Registrando todas as chamadas a api</string>
+  <string name="login_everything_on">Isso registrará todas as chamadas api para fins de depuração.</string>
+  <string name="login_everything_off">Nenhuma chamada a api será registrada</string>
+  <string name="pref_general_infinite_loading_title">Carregar mais artigos ao realizar o scroll</string>
+  <string name="translation">Traduções</string>
+  <string name="cant_open_invalid_url">A url está inválida. Estou tentando resolver esse problema para que o aplicativo não encerre.</string>
+  <string name="drawer_report_bug">Reportar erro</string>
+  <string name="items_number_should_be_number">O número dos itens deve ser um número inteiro.</string>
+  <string name="reader_action_more">Leia mais</string>
+  <string name="reader_action_open">Abrir no navegador</string>
+  <string name="reader_action_share">Compartilhar</string>
 </resources>

app/src/main/res/values-ro/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>
@@ -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,6 +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-ru/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>
@@ -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,6 +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-sr/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>
@@ -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,6 +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-sv/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>
@@ -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,6 +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-tr/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>
@@ -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,6 +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-uk/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>
@@ -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,6 +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-vi/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>
@@ -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,6 +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-zh/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>
@@ -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,6 +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/strings.xml

@@ -44,9 +44,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>
@@ -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>
@@ -153,6 +151,14 @@
     <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="report_github_user" translatable="false">aminecmi</string>
+    <string name="report_github_repo" translatable="false">ReaderforSelfoss</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/styles.xml

@@ -14,6 +14,8 @@
         <item name="android:textColorPrimary">@color/md_grey_900</item>
         <item name="android:textColorSecondary">@color/md_grey_400</item>
         <item name="material_drawer_header_selection_text">@color/md_grey_900</item>
+
+        <item name="toolbarPopupTheme">@style/ThemeOverlay.AppCompat.Light</item>
     </style>
 
     <style name="NoBarDark" parent="MaterialDrawerTheme">
@@ -27,6 +29,8 @@
         <item name="android:textColorPrimary">@color/md_white_1000</item>
         <item name="android:textColorSecondary">@color/md_grey_600</item>
         <item name="material_drawer_header_selection_text">@color/md_grey_900</item>
+
+        <item name="toolbarPopupTheme">@style/ThemeOverlay.AppCompat.Dark</item>
     </style>
 
     <!-- ToolBar -->
@@ -50,6 +54,8 @@
         <item name="android:textColorPrimary">@color/md_grey_900</item>
         <item name="android:textColorSecondary">@color/md_grey_400</item>
         <item name="material_drawer_header_selection_text">@color/md_grey_900</item>
+
+        <item name="toolbarPopupTheme">@style/ThemeOverlay.AppCompat.Light</item>
     </style>
 
     <style name="NoBarBlueAmberDark" parent="MaterialDrawerTheme">
@@ -63,6 +69,8 @@
         <item name="android:textColorPrimary">@color/md_white_1000</item>
         <item name="android:textColorSecondary">@color/md_grey_600</item>
         <item name="material_drawer_header_selection_text">@color/md_grey_900</item>
+
+        <item name="toolbarPopupTheme">@style/ThemeOverlay.AppCompat.Dark</item>
     </style>
 
     <style name="NoBarGreyOrange" parent="MaterialDrawerTheme.Light">
@@ -75,6 +83,8 @@
         <item name="android:textColorPrimary">@color/md_grey_900</item>
         <item name="android:textColorSecondary">@color/md_grey_400</item>
         <item name="material_drawer_header_selection_text">@color/md_grey_900</item>
+
+        <item name="toolbarPopupTheme">@style/ThemeOverlay.AppCompat.Light</item>
     </style>
 
     <style name="NoBarGreyOrangeDark" parent="MaterialDrawerTheme">
@@ -88,6 +98,8 @@
         <item name="android:textColorPrimary">@color/md_white_1000</item>
         <item name="android:textColorSecondary">@color/md_grey_600</item>
         <item name="material_drawer_header_selection_text">@color/md_grey_900</item>
+
+        <item name="toolbarPopupTheme">@style/ThemeOverlay.AppCompat.Dark</item>
     </style>
 
     <style name="NoBarIndigoPink" parent="MaterialDrawerTheme.Light">
@@ -100,6 +112,8 @@
         <item name="android:textColorPrimary">@color/md_grey_900</item>
         <item name="android:textColorSecondary">@color/md_grey_400</item>
         <item name="material_drawer_header_selection_text">@color/md_grey_900</item>
+
+        <item name="toolbarPopupTheme">@style/ThemeOverlay.AppCompat.Light</item>
     </style>
 
     <style name="NoBarIndigoPinkDark" parent="MaterialDrawerTheme">
@@ -113,6 +127,8 @@
         <item name="android:textColorPrimary">@color/md_white_1000</item>
         <item name="android:textColorSecondary">@color/md_grey_600</item>
         <item name="material_drawer_header_selection_text">@color/md_grey_900</item>
+
+        <item name="toolbarPopupTheme">@style/ThemeOverlay.AppCompat.Dark</item>
     </style>
 
     <style name="NoBarRedTeal" parent="MaterialDrawerTheme.Light">
@@ -125,6 +141,8 @@
         <item name="android:textColorPrimary">@color/md_grey_900</item>
         <item name="android:textColorSecondary">@color/md_grey_400</item>
         <item name="material_drawer_header_selection_text">@color/md_grey_900</item>
+
+        <item name="toolbarPopupTheme">@style/ThemeOverlay.AppCompat.Light</item>
     </style>
 
     <style name="NoBarRedTealDark" parent="MaterialDrawerTheme">
@@ -138,6 +156,8 @@
         <item name="android:textColorPrimary">@color/md_white_1000</item>
         <item name="android:textColorSecondary">@color/md_grey_600</item>
         <item name="material_drawer_header_selection_text">@color/md_grey_900</item>
+
+        <item name="toolbarPopupTheme">@style/ThemeOverlay.AppCompat.Dark</item>
     </style>
 
     <style name="NoBarCyanPink" parent="MaterialDrawerTheme.Light">
@@ -150,6 +170,8 @@
         <item name="android:textColorPrimary">@color/md_grey_900</item>
         <item name="android:textColorSecondary">@color/md_grey_400</item>
         <item name="material_drawer_header_selection_text">@color/md_grey_900</item>
+
+        <item name="toolbarPopupTheme">@style/ThemeOverlay.AppCompat.Light</item>
     </style>
 
     <style name="NoBarCyanPinkDark" parent="MaterialDrawerTheme">
@@ -163,6 +185,8 @@
         <item name="android:textColorPrimary">@color/md_white_1000</item>
         <item name="android:textColorSecondary">@color/md_grey_600</item>
         <item name="material_drawer_header_selection_text">@color/md_grey_900</item>
+
+        <item name="toolbarPopupTheme">@style/ThemeOverlay.AppCompat.Dark</item>
     </style>
 
 
@@ -176,6 +200,8 @@
         <item name="android:textColorPrimary">@color/md_grey_900</item>
         <item name="android:textColorSecondary">@color/md_grey_400</item>
         <item name="material_drawer_header_selection_text">@color/md_grey_900</item>
+
+        <item name="toolbarPopupTheme">@style/ThemeOverlay.AppCompat.Light</item>
     </style>
 
     <style name="NoBarTealOrangeDark" parent="MaterialDrawerTheme">
@@ -189,6 +215,15 @@
         <item name="android:textColorPrimary">@color/md_white_1000</item>
         <item name="android:textColorSecondary">@color/md_grey_600</item>
         <item name="material_drawer_header_selection_text">@color/md_grey_900</item>
+
+        <item name="toolbarPopupTheme">@style/ThemeOverlay.AppCompat.Dark</item>
+    </style>
+
+    <style name="Theme.App.Light" parent="Theme.IssueReporter.Light.DarkActionBar">
+        <item name="colorPrimary">@color/colorPrimary</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
+        <item name="colorAccent">@color/colorAccent</item>
+        <item name="android:textColorPrimary">@color/md_grey_900</item>
     </style>
 
 </resources>

app/src/main/res/xml/bottombar.xml

@@ -1,20 +0,0 @@
-<tabs>
-    <tab
-        id="@+id/tab_new"
-        icon="@drawable/ic_fiber_new_black_24dp"
-        title="@string/tab_new"
-        barColorWhenSelected="@color/colorAccent" />
-
-    <tab
-        id="@+id/tab_archive"
-        icon="@drawable/ic_archive_black_24dp"
-        title="@string/tab_read"
-        barColorWhenSelected="@color/colorAccentDark"/>
-
-    <tab
-        id="@+id/tab_fav"
-        icon="@drawable/ic_favorite_black_24dp"
-        title="@string/tab_favs"
-        barColorWhenSelected="@color/pink"/>
-
-</tabs>