Added changelog and changed fab size.

Enhancements. Three first items of #108 .
Merge branch 'master' of github.com:aminecmi/ReaderforSelfoss
2017-11-12 07:55:01 +01:00 · 2017-11-12 07:51:11 +01:00 · 2017-11-11 21:01:48 +01:00 · 2017-11-11 21:01:25 +01:00 · 2017-11-11 20:55:31 +01:00 · 2017-11-11 20:53:15 +01:00
62 changed files with 646 additions and 413 deletions
--- a/.github/CONTRIBUTING.md
+++ b/.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.
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,3 +1,21 @@
+**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.
--- a/app/build.gradle
+++ b/app/build.gradle
@ -38,12 +38,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()

@ -107,13 +107,13 @@ dependencies {
    compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"

    // Android Support
-    compile 'com.android.support:appcompat-v7:26.1.0'
-    compile 'com.android.support:design:26.1.0'
-    compile 'com.android.support:recyclerview-v7:26.1.0'
-    compile 'com.android.support:support-v4:26.1.0'
-    compile 'com.android.support:support-vector-drawable:26.1.0'
-    compile 'com.android.support:customtabs:26.1.0'
-    compile 'com.android.support:cardview-v7:26.1.0'
+    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
@ -131,7 +131,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
    }

@ -143,7 +143,6 @@ dependencies {

    // Material-ish things
    compile 'com.ashokvarma.android:bottom-navigation-bar:2.0.3'
-    compile 'com.melnykov:floatingactionbutton:1.3.0'
    compile 'com.github.jd-alexander:LikeButton:0.2.1'
    compile 'com.amulyakhare:com.amulyakhare.textdrawable:1.0.1'
    compile 'org.sufficientlysecure:html-textview:3.5'
@ -159,9 +158,7 @@ dependencies {
    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
@ -169,6 +166,8 @@ dependencies {

    // 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'
--- a/app/src/main/AndroidManifest.xml
+++ b/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
--- a/app/src/main/java/apps/amine/bou/readerforselfoss/HomeActivity.kt
+++ b/app/src/main/java/apps/amine/bou/readerforselfoss/HomeActivity.kt
@ -41,6 +41,11 @@ import apps.amine.bou.readerforselfoss.utils.checkApkVersion
 import apps.amine.bou.readerforselfoss.utils.customtabs.CustomTabActivityHelper
 import apps.amine.bou.readerforselfoss.utils.drawer.CustomUrlPrimaryDrawerItem
 import apps.amine.bou.readerforselfoss.utils.longHash
+import co.zsmb.materialdrawerkt.builders.accountHeader
+import co.zsmb.materialdrawerkt.builders.drawer
+import co.zsmb.materialdrawerkt.builders.footer
+import co.zsmb.materialdrawerkt.draweritems.badgeable.primaryItem
+import co.zsmb.materialdrawerkt.draweritems.profile.profile
 import com.anupcowkur.reservoir.Reservoir
 import com.anupcowkur.reservoir.ReservoirGetCallback
 import com.anupcowkur.reservoir.ReservoirPutCallback
@ -61,20 +66,14 @@ import com.google.gson.reflect.TypeToken
 import com.heinrichreimersoftware.androidissuereporter.IssueReporterLauncher
 import com.mikepenz.aboutlibraries.Libs
 import com.mikepenz.aboutlibraries.LibsBuilder
-import com.mikepenz.materialdrawer.AccountHeader
-import com.mikepenz.materialdrawer.AccountHeaderBuilder
 import com.mikepenz.materialdrawer.Drawer
-import com.mikepenz.materialdrawer.DrawerBuilder
 import com.mikepenz.materialdrawer.holder.BadgeStyle
 import com.mikepenz.materialdrawer.model.DividerDrawerItem
 import com.mikepenz.materialdrawer.model.PrimaryDrawerItem
-import com.mikepenz.materialdrawer.model.ProfileDrawerItem
 import com.mikepenz.materialdrawer.model.SecondaryDrawerItem
 import retrofit2.Call
 import retrofit2.Callback
 import retrofit2.Response
-import java.lang.Exception
-

 class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {

@ -114,7 +113,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
    private lateinit var tabNewBadge: TextBadgeItem
    private lateinit var tabArchiveBadge: TextBadgeItem
    private lateinit var tabStarredBadge: TextBadgeItem
-    private lateinit var toolbar: Toolbar
+    private lateinit var toolBar: Toolbar
    private lateinit var drawer: Drawer
    private lateinit var api: SelfossApi
    private lateinit var customTabActivityHelper: CustomTabActivityHelper
@ -146,8 +145,8 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {

        setContentView(R.layout.activity_home)

-        toolbar = findViewById(R.id.toolbar)
-        setSupportActionBar(toolbar)
+        toolBar = findViewById(R.id.toolbar)
+        setSupportActionBar(toolBar)

        if (savedInstanceState == null) {
            val promptView: DefaultLayoutPromptView = findViewById(R.id.prompt_view)
@ -331,86 +330,68 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {

    private fun handleDrawer() {
        displayAccountHeader =
-            PreferenceManager.getDefaultSharedPreferences(this)
-                .getBoolean("account_header_displaying", false)
-        val headerResult: AccountHeader? = if (displayAccountHeader) {
-            AccountHeaderBuilder()
-                .withActivity(this)
-                .withHeaderBackground(R.drawable.bg)
-                .addProfiles(
-                    ProfileDrawerItem()
-                        .withName(
-                            settings.getString("url", "")
+                PreferenceManager.getDefaultSharedPreferences(this)
+                        .getBoolean("account_header_displaying", false)
+
+        drawer = drawer {
+            rootViewRes = R.id.drawer_layout
+            toolbar = toolBar
+            actionBarDrawerToggleEnabled = true
+            actionBarDrawerToggleAnimated = true
+            showOnFirstLaunch = true
+            onSlide { _, p1 ->
+                bottomBar.alpha = (1 - p1)
+            }
+            onClosed {
+                bottomBar.show()
+            }
+            onOpened {
+                bottomBar.hide()
+            }
+
+            if (displayAccountHeader)
+                accountHeader {
+                    background = R.drawable.bg
+                    profile(settings.getString("url", "")) {
+                        iconDrawable = resources.getDrawable(R.mipmap.ic_launcher)
+                    }
+                    selectionListEnabledForSingleProfile = false
+                }
+
+            footer {
+                primaryItem(R.string.drawer_report_bug) {
+                    icon = R.drawable.ic_bug_report
+                    iconTintingEnabled = true
+                    onClick { _ ->
+                        IssueReporterLauncher.forTarget(getString(R.string.report_github_user), getString(R.string.report_github_repo))
+                                .theme(R.style.Theme_App_Light)
+                                .guestToken(BuildConfig.GITHUB_TOKEN)
+                                .guestEmailRequired(true)
+                                .minDescriptionLength(20)
+                                .putExtraInfo("Unique ID", settings.getString("unique_id", ""))
+                                .putExtraInfo("From github", BuildConfig.GITHUB_VERSION)
+                                .homeAsUpEnabled(true)
+                                .launch(this@HomeActivity)
+                        false
+                    }
+                }
+
+                primaryItem(R.string.title_activity_settings) {
+                    icon = R.drawable.ic_settings
+                    iconTintingEnabled = true
+                    onClick { _ ->
+                        startActivityForResult(
+                                Intent(
+                                        this@HomeActivity,
+                                        SettingsActivity::class.java
+                                ),
+                                MENU_PREFERENCES
                        )
-                        .withIcon(resources.getDrawable(R.mipmap.ic_launcher))
-                )
-                .withSelectionListEnabledForSingleProfile(false)
-                .build()
-        } else null
-
-        val drawerBuilder =
-            DrawerBuilder()
-                .withActivity(this)
-                .withRootView(R.id.drawer_layout)
-                .withToolbar(toolbar)
-                .withActionBarDrawerToggle(true)
-                .withActionBarDrawerToggleAnimated(true)
-                .withShowDrawerOnFirstLaunch(true)
-                .withOnDrawerListener(object: Drawer.OnDrawerListener {
-                    override fun onDrawerSlide(v: View?, p1: Float) {
-                        bottomBar.alpha = (1 - p1)
+                        false
                    }
-
-                    override fun onDrawerClosed(v: View?) {
-                        bottomBar.show()
-                    }
-
-                    override fun onDrawerOpened(v: View?) {
-                        bottomBar.hide()
-                    }
-
-                })
-
-        if (displayAccountHeader && headerResult != null)
-            drawerBuilder.withAccountHeader(headerResult)
-
-        drawer = drawerBuilder.build()
-
-        drawer.addStickyFooterItem(
-            PrimaryDrawerItem()
-                .withName(R.string.drawer_report_bug)
-                .withIcon(R.drawable.ic_bug_report)
-                .withIconTintingEnabled(true)
-                .withOnDrawerItemClickListener { _, _, _ ->
-                    IssueReporterLauncher.forTarget(getString(R.string.report_github_user), getString(R.string.report_github_repo))
-                        .theme(R.style.Theme_App_Light)
-                        .guestToken(BuildConfig.GITHUB_TOKEN)
-                        .guestEmailRequired(true)
-                        .minDescriptionLength(20)
-                        .putExtraInfo("Unique ID", settings.getString("unique_id", ""))
-                        .putExtraInfo("From github", BuildConfig.GITHUB_VERSION)
-                        .homeAsUpEnabled(true)
-                        .launch(this)
-                    false
                }
-        )
-
-        drawer.addStickyFooterItem(
-            PrimaryDrawerItem()
-                .withName(R.string.title_activity_settings)
-                .withIcon(R.drawable.ic_settings)
-                .withIconTintingEnabled(true)
-                .withOnDrawerItemClickListener { _, _, _ ->
-                    startActivityForResult(
-                        Intent(
-                            this@HomeActivity,
-                            SettingsActivity::class.java
-                        ),
-                        MENU_PREFERENCES
-                    )
-                    false
-                }
-        )
+            }
+        }

    }

@ -419,10 +400,11 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
            fun handleTags(maybeTags: List<Tag>?) {
                if (maybeTags == null) {
                    if (loadedFromCache)
+
                        drawer.addItem(
-                            SecondaryDrawerItem()
-                                .withName(getString(R.string.drawer_error_loading_tags))
-                                .withSelectable(false))
+                                SecondaryDrawerItem()
+                                        .withName(getString(R.string.drawer_error_loading_tags))
+                                        .withSelectable(false))
                }
                else {
                    for (tag in maybeTags) {
@ -432,20 +414,20 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
                        gd.setSize(30, 30)
                        gd.cornerRadius = 30F
                        drawer.addItem(
-                            PrimaryDrawerItem()
-                                .withName(tag.tag)
-                                .withIdentifier(tag.tag.longHash())
-                                .withIcon(gd)
-                                .withBadge("${tag.unread}")
-                                .withBadgeStyle(
-                                    BadgeStyle().withTextColor(Color.WHITE)
-                                        .withColor(appColors.accent)
-                                )
-                                .withOnDrawerItemClickListener { _, _, _ ->
-                                    maybeTagFilter = tag
-                                    getElementsAccordingToTab()
-                                    false
-                                }
+                                PrimaryDrawerItem()
+                                        .withName(tag.tag)
+                                        .withIdentifier(tag.tag.longHash())
+                                        .withIcon(gd)
+                                        .withBadge("${tag.unread}")
+                                        .withBadgeStyle(
+                                                BadgeStyle().withTextColor(Color.WHITE)
+                                                        .withColor(appColors.accent)
+                                        )
+                                        .withOnDrawerItemClickListener { _, _, _ ->
+                                            maybeTagFilter = tag
+                                            getElementsAccordingToTab()
+                                            false
+                                        }
                        )
                    }
                }
@ -456,22 +438,22 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
                if (maybeSources == null) {
                    if (loadedFromCache)
                        drawer.addItem(
-                            SecondaryDrawerItem()
-                                .withName(getString(R.string.drawer_error_loading_sources))
-                                .withSelectable(false))
+                                SecondaryDrawerItem()
+                                        .withName(getString(R.string.drawer_error_loading_sources))
+                                        .withSelectable(false))
                }
                else
                    for (tag in maybeSources)
                        drawer.addItem(
-                            CustomUrlPrimaryDrawerItem()
-                                .withName(tag.title)
-                                .withIdentifier(tag.id.toLong())
-                                .withIcon(tag.getIcon(this@HomeActivity))
-                                .withOnDrawerItemClickListener { _, _, _ ->
-                                    maybeSourceFilter = tag
-                                    getElementsAccordingToTab()
-                                    false
-                                }
+                                CustomUrlPrimaryDrawerItem()
+                                        .withName(tag.title)
+                                        .withIdentifier(tag.id.toLong())
+                                        .withIcon(tag.getIcon(this@HomeActivity))
+                                        .withOnDrawerItemClickListener { _, _, _ ->
+                                            maybeSourceFilter = tag
+                                            getElementsAccordingToTab()
+                                            false
+                                        }
                        )

            }
@ -479,58 +461,58 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
            drawer.removeAllItems()
            if (maybeDrawerData != null) {
                drawer.addItem(
-                    SecondaryDrawerItem()
-                        .withName(getString(R.string.drawer_item_filters))
-                        .withSelectable(false)
-                        .withIdentifier(DRAWER_ID_FILTERS)
-                        .withBadge(getString(R.string.drawer_action_clear))
-                        .withOnDrawerItemClickListener { _, _, _ ->
-                            maybeSourceFilter = null
-                            maybeTagFilter = null
-                            getElementsAccordingToTab()
-                            false
-                        }
+                        SecondaryDrawerItem()
+                                .withName(getString(R.string.drawer_item_filters))
+                                .withSelectable(false)
+                                .withIdentifier(DRAWER_ID_FILTERS)
+                                .withBadge(getString(R.string.drawer_action_clear))
+                                .withOnDrawerItemClickListener { _, _, _ ->
+                                    maybeSourceFilter = null
+                                    maybeTagFilter = null
+                                    getElementsAccordingToTab()
+                                    false
+                                }
                )
                drawer.addItem(DividerDrawerItem())
                drawer.addItem(
-                    SecondaryDrawerItem()
-                        .withName(getString(R.string.drawer_item_tags))
-                        .withIdentifier(DRAWER_ID_TAGS)
-                        .withSelectable(false))
+                        SecondaryDrawerItem()
+                                .withName(getString(R.string.drawer_item_tags))
+                                .withIdentifier(DRAWER_ID_TAGS)
+                                .withSelectable(false))
                handleTags(maybeDrawerData.tags)
                drawer.addItem(DividerDrawerItem())
                drawer.addItem(
-                    SecondaryDrawerItem()
-                        .withName(getString(R.string.drawer_item_sources))
-                        .withIdentifier(DRAWER_ID_TAGS)
-                        .withBadge(getString(R.string.drawer_action_edit))
-                        .withSelectable(false)
-                        .withOnDrawerItemClickListener { _, _, _ ->
-                            startActivity(Intent(this, SourcesActivity::class.java))
-                            false
-                        }
+                        SecondaryDrawerItem()
+                                .withName(getString(R.string.drawer_item_sources))
+                                .withIdentifier(DRAWER_ID_TAGS)
+                                .withBadge(getString(R.string.drawer_action_edit))
+                                .withSelectable(false)
+                                .withOnDrawerItemClickListener { _, _, _ ->
+                                    startActivity(Intent(this, SourcesActivity::class.java))
+                                    false
+                                }
                )
                handleSources(maybeDrawerData.sources)
                drawer.addItem(DividerDrawerItem())
                drawer.addItem(
-                    PrimaryDrawerItem()
-                        .withName(R.string.action_about)
-                        .withSelectable(false)
-                        .withIcon(R.drawable.ic_info_outline)
-                        .withIconTintingEnabled(true)
-                        .withOnDrawerItemClickListener { _, _, _ ->
-                            LibsBuilder()
-                                .withActivityStyle(
-                                    if (appColors.isDarkTheme)
-                                        Libs.ActivityStyle.LIGHT_DARK_TOOLBAR
-                                    else
-                                        Libs.ActivityStyle.DARK
-                                )
-                                .withAboutIconShown(true)
-                                .withAboutVersionShown(true)
-                                .start(this@HomeActivity)
-                            false
-                        })
+                        PrimaryDrawerItem()
+                                .withName(R.string.action_about)
+                                .withSelectable(false)
+                                .withIcon(R.drawable.ic_info_outline)
+                                .withIconTintingEnabled(true)
+                                .withOnDrawerItemClickListener { _, _, _ ->
+                                    LibsBuilder()
+                                            .withActivityStyle(
+                                                    if (appColors.isDarkTheme)
+                                                        Libs.ActivityStyle.LIGHT_DARK_TOOLBAR
+                                                    else
+                                                        Libs.ActivityStyle.DARK
+                                            )
+                                            .withAboutIconShown(true)
+                                            .withAboutVersionShown(true)
+                                            .start(this@HomeActivity)
+                                    false
+                                })


                if (!loadedFromCache)
@ -544,15 +526,15 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
            } else {
                if (!loadedFromCache) {
                    drawer.addItem(
-                        PrimaryDrawerItem()
-                            .withName(getString(R.string.no_tags_loaded))
-                            .withIdentifier(DRAWER_ID_TAGS)
-                            .withSelectable(false))
+                            PrimaryDrawerItem()
+                                    .withName(getString(R.string.no_tags_loaded))
+                                    .withIdentifier(DRAWER_ID_TAGS)
+                                    .withSelectable(false))
                    drawer.addItem(
-                        PrimaryDrawerItem()
-                            .withName(getString(R.string.no_sources_loaded))
-                            .withIdentifier(DRAWER_ID_SOURCES)
-                            .withSelectable(false))
+                            PrimaryDrawerItem()
+                                    .withName(getString(R.string.no_sources_loaded))
+                                    .withIdentifier(DRAWER_ID_SOURCES)
+                                    .withSelectable(false))
                }
            }

--- a/app/src/main/java/apps/amine/bou/readerforselfoss/ReaderActivity.kt
+++ b/app/src/main/java/apps/amine/bou/readerforselfoss/ReaderActivity.kt
@ -1,114 +1,194 @@
 package apps.amine.bou.readerforselfoss

+import android.content.SharedPreferences
 import android.os.Bundle
 import android.preference.PreferenceManager
-import android.view.LayoutInflater
+import android.support.customtabs.CustomTabsIntent
+import android.support.design.widget.FloatingActionButton
+import android.support.v4.widget.NestedScrollView
+import android.support.v7.app.AppCompatActivity
+import android.text.Html
+import android.view.MenuItem
 import android.view.View
-import android.view.ViewGroup
-import android.widget.ImageButton
+import android.widget.FrameLayout
 import android.widget.ImageView
+import android.widget.ProgressBar
 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


-class ReaderActivity : DragDismissActivity() {
+class ReaderActivity : AppCompatActivity() {
    private lateinit var mCustomTabActivityHelper: CustomTabActivityHelper
+    private lateinit var image: ImageView
+    private lateinit var source: TextView
+    private lateinit var title: TextView
+    private lateinit var content: TextView
+    private lateinit var progress: FrameLayout
+    private lateinit var nestedScrollView: NestedScrollView
+    //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()
-        val prefs = PreferenceManager.getDefaultSharedPreferences(this)
+        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, prefs.getBoolean("should_log_everything", false))
-        val browserBtn: ImageButton = v.findViewById(R.id.browserBtn)
-        val shareBtn: ImageButton = v.findViewById(R.id.shareBtn)
+        image = findViewById(R.id.imageView)
+        source = findViewById(R.id.source)
+        title = findViewById(R.id.title)
+        content = findViewById(R.id.content)
+        progress = findViewById(R.id.progressBar)
+        nestedScrollView = findViewById(R.id.nestedScrollView)
+        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
+            title.text = contentTitle
+            tryToHandleHtml(contentText, customTabsIntent, prefs)
+
+            if (!contentImage.isEmptyOrNullOrNullString()) {
+                image.visibility = View.VISIBLE
+                Glide
+                        .with(baseContext)
+                        .asBitmap()
+                        .load(contentImage)
+                        .apply(RequestOptions.fitCenterTransform())
+                        .into(image)
+            } else {
+                image.visibility = View.GONE
+            }
+        }
+    }
+
+    private fun getContentFromMercury(customTabsIntent: CustomTabsIntent, prefs: SharedPreferences) {
+        progress.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
+                    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()) {
+                        image.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(image)
+                    } else {
+                        image.visibility = View.GONE
                    }

-                    browserBtn.setOnClickListener {
-                        this@ReaderActivity.openItemUrl(
-                            response.body()!!.url,
-                            customTabsIntent,
-                            false,
-                            false,
-                            this@ReaderActivity)
-                    }
+                    nestedScrollView.scrollTo(0, 0)

-                    hideProgressBar()
-                } else openInBrowserAfterFailing()
+                    progress.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) {
+        progress.visibility = View.GONE
+        this@ReaderActivity.openItemUrl(
+                url,
+                contentText,
+                contentImage,
+                contentTitle,
+                contentSource,
+                customTabsIntent,
+                true,
+                false,
+                this@ReaderActivity
+        )
+        finish()
    }
 }
--- a/app/src/main/java/apps/amine/bou/readerforselfoss/SourcesActivity.kt
+++ b/app/src/main/java/apps/amine/bou/readerforselfoss/SourcesActivity.kt
@ -3,6 +3,7 @@ package apps.amine.bou.readerforselfoss
 import android.content.Intent
 import android.os.Bundle
 import android.preference.PreferenceManager
+import android.support.design.widget.FloatingActionButton
 import android.support.v7.app.AppCompatActivity
 import android.support.v7.widget.LinearLayoutManager
 import android.support.v7.widget.RecyclerView
@ -12,7 +13,6 @@ 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 com.melnykov.fab.FloatingActionButton
 import retrofit2.Call
 import retrofit2.Callback
 import retrofit2.Response
@ -41,7 +41,6 @@ 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

--- a/app/src/main/java/apps/amine/bou/readerforselfoss/adapters/ItemCardAdapter.kt
+++ b/app/src/main/java/apps/amine/bou/readerforselfoss/adapters/ItemCardAdapter.kt
@ -77,10 +77,10 @@ class ItemCardAdapter(private val app: Activity,
            val color = generator.getColor(itm.sourcetitle)

            val drawable =
-                TextDrawable
-                    .builder()
-                    .round()
-                    .build(itm.sourcetitle.toTextDrawableString(), color)
+                    TextDrawable
+                            .builder()
+                            .round()
+                            .build(itm.sourcetitle.toTextDrawableString(), color)
            holder.sourceImage.setImageDrawable(drawable)
        } else {
            c.circularBitmapDrawable(itm.getIcon(c), holder.sourceImage)
@ -128,13 +128,13 @@ class ItemCardAdapter(private val app: Activity,
            override fun onResponse(call: Call<SuccessResponse>, response: Response<SuccessResponse>) {
                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 ?"))
@ -229,10 +229,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)
            }
        }
    }
--- a/app/src/main/java/apps/amine/bou/readerforselfoss/adapters/ItemListAdapter.kt
+++ b/app/src/main/java/apps/amine/bou/readerforselfoss/adapters/ItemListAdapter.kt
@ -72,8 +72,8 @@ class ItemListAdapter(private val app: Activity,
        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(
@ -147,13 +147,13 @@ class ItemListAdapter(private val app: Activity,
            override fun onResponse(call: Call<SuccessResponse>, response: Response<SuccessResponse>) {
                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 ?"))
@ -247,10 +247,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()
@ -260,10 +264,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
                }
            }
--- a/app/src/main/java/apps/amine/bou/readerforselfoss/api/selfoss/SelfossModels.kt
+++ b/app/src/main/java/apps/amine/bou/readerforselfoss/api/selfoss/SelfossModels.kt
@ -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)
--- a/app/src/main/java/apps/amine/bou/readerforselfoss/utils/LinksUtils.kt
+++ b/app/src/main/java/apps/amine/bou/readerforselfoss/utils/LinksUtils.kt
@ -51,19 +51,28 @@ fun Context.buildCustomTabsIntent(): CustomTabsIntent {
 }

 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)
+        /*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 {
@ -80,6 +89,10 @@ fun Context.openItemUrlInternally(linkDecoded: String,
 }

 fun Context.openItemUrl(linkDecoded: String,
+                        content: String,
+                        image: String,
+                        title: String,
+                        source: String,
                        customTabsIntent: CustomTabsIntent,
                        internalBrowser: Boolean,
                        articleViewer: Boolean,
@ -91,7 +104,7 @@ fun Context.openItemUrl(linkDecoded: String,
        if (!internalBrowser) {
            openInBrowser(linkDecoded, app)
        } else {
-            this.openItemUrlInternally(linkDecoded, customTabsIntent, articleViewer, app)
+            this.openItemUrlInternally(linkDecoded, content, image, title, source, customTabsIntent, articleViewer, app)
        }
    }
 }
@ -103,7 +116,7 @@ private fun openInBrowser(linkDecoded: String, app: Activity) {
 }

 fun String.isUrlValid(): Boolean =
-    HttpUrl.parse(this) != null && Patterns.WEB_URL.matcher(this).matches()
+        HttpUrl.parse(this) != null && Patterns.WEB_URL.matcher(this).matches()

 fun String.isBaseUrlValid(): Boolean {
    val baseUrl = HttpUrl.parse(this)
--- a/app/src/main/res/drawable-hdpi/ic_add.png
+++ b/app/src/main/res/drawable-hdpi/ic_add.png
--- a/app/src/main/res/drawable-hdpi/ic_add_black_24dp.png
+++ b/app/src/main/res/drawable-hdpi/ic_add_black_24dp.png
--- a/app/src/main/res/drawable-hdpi/ic_chrome_reader_mode.png
+++ b/app/src/main/res/drawable-hdpi/ic_chrome_reader_mode.png
--- a/app/src/main/res/drawable-hdpi/ic_open_in_browser.png
+++ b/app/src/main/res/drawable-hdpi/ic_open_in_browser.png
--- a/app/src/main/res/drawable-mdpi/ic_add.png
+++ b/app/src/main/res/drawable-mdpi/ic_add.png
--- a/app/src/main/res/drawable-mdpi/ic_add_black_24dp.png
+++ b/app/src/main/res/drawable-mdpi/ic_add_black_24dp.png
--- a/app/src/main/res/drawable-mdpi/ic_chrome_reader_mode.png
+++ b/app/src/main/res/drawable-mdpi/ic_chrome_reader_mode.png
--- a/app/src/main/res/drawable-mdpi/ic_open_in_browser.png
+++ b/app/src/main/res/drawable-mdpi/ic_open_in_browser.png
--- a/app/src/main/res/drawable-xhdpi/ic_add.png
+++ b/app/src/main/res/drawable-xhdpi/ic_add.png
--- a/app/src/main/res/drawable-xhdpi/ic_add_black_24dp.png
+++ b/app/src/main/res/drawable-xhdpi/ic_add_black_24dp.png
--- a/app/src/main/res/drawable-xhdpi/ic_chrome_reader_mode.png
+++ b/app/src/main/res/drawable-xhdpi/ic_chrome_reader_mode.png
--- a/app/src/main/res/drawable-xhdpi/ic_open_in_browser.png
+++ b/app/src/main/res/drawable-xhdpi/ic_open_in_browser.png
--- a/app/src/main/res/drawable-xxhdpi/ic_add.png
+++ b/app/src/main/res/drawable-xxhdpi/ic_add.png
--- a/app/src/main/res/drawable-xxhdpi/ic_add_black_24dp.png
+++ b/app/src/main/res/drawable-xxhdpi/ic_add_black_24dp.png
--- a/app/src/main/res/drawable-xxhdpi/ic_chrome_reader_mode.png
+++ b/app/src/main/res/drawable-xxhdpi/ic_chrome_reader_mode.png
--- a/app/src/main/res/drawable-xxhdpi/ic_open_in_browser.png
+++ b/app/src/main/res/drawable-xxhdpi/ic_open_in_browser.png
--- a/app/src/main/res/drawable-xxxhdpi/ic_add.png
+++ b/app/src/main/res/drawable-xxxhdpi/ic_add.png
--- a/app/src/main/res/drawable-xxxhdpi/ic_add_black_24dp.png
+++ b/app/src/main/res/drawable-xxxhdpi/ic_add_black_24dp.png
--- a/app/src/main/res/drawable-xxxhdpi/ic_chrome_reader_mode.png
+++ b/app/src/main/res/drawable-xxxhdpi/ic_chrome_reader_mode.png
--- a/app/src/main/res/drawable-xxxhdpi/ic_open_in_browser.png
+++ b/app/src/main/res/drawable-xxxhdpi/ic_open_in_browser.png
--- a/app/src/main/res/layout/activity_reader.xml
+++ b/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/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" />
+
+            <TextView
+                android:id="@+id/content"
+                android:autoLink="web"
+                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" />
+
+            <!--<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" />-->
+
+        </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:color/black"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toStartOf="@+id/shareBtn"
-            app:layout_constraintHorizontal_bias="0.5"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+            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:color/black"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintHorizontal_bias="0.5"
-            app:layout_constraintStart_toEndOf="@+id/browserBtn"
-            app:layout_constraintTop_toTopOf="parent" />
+    <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>
--- a/app/src/main/res/layout/activity_sources.xml
+++ b/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"
@ -29,16 +29,13 @@
        app:layout_behavior="@string/appbar_scrolling_view_behavior">
    </android.support.v7.widget.RecyclerView>

-    <com.melnykov.fab.FloatingActionButton
+    <android.support.design.widget.FloatingActionButton
        android:id="@+id/fab"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:layout_gravity="end|bottom|right"
-        android:src="@drawable/ic_add_black_24dp"
+        android:src="@drawable/ic_add"
        android:tint="?android:textColorPrimary"
-        fab:fab_colorNormal="?attr/colorAccent"
-        fab:fab_colorPressed="?attr/colorAccentDark"
-        fab:fab_colorRipple="@color/pink"
        android:paddingBottom="@dimen/activity_vertical_margin"
        android:paddingTop="@dimen/activity_vertical_margin"
        android:layout_alignParentBottom="true"
@ -46,5 +43,5 @@
        android:layout_alignParentEnd="true"
        android:layout_marginBottom="16dp"
        android:layout_marginEnd="16dp"
-        android:layout_marginRight="16dp"/>
-</RelativeLayout>
+        android:layout_marginRight="16dp" />
+</android.support.design.widget.CoordinatorLayout>
--- a/app/src/main/res/menu/reader_toolbar.xml
+++ b/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>
--- a/app/src/main/res/values-af/strings.xml
+++ b/app/src/main/res/values-af/strings.xml
@ -155,4 +155,7 @@
  <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>
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@ -155,4 +155,7 @@
  <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>
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@ -155,4 +155,7 @@
  <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>
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@ -155,4 +155,7 @@
  <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>
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@ -155,4 +155,7 @@
  <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>
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@ -155,4 +155,7 @@
  <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>
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@ -155,4 +155,7 @@
  <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>
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@ -155,4 +155,7 @@
  <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>
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@ -155,4 +155,7 @@
  <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>
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@ -155,4 +155,7 @@
  <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>
--- a/app/src/main/res/values-he/strings.xml
+++ b/app/src/main/res/values-he/strings.xml
@ -155,4 +155,7 @@
  <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>
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@ -155,4 +155,7 @@
  <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>
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@ -155,4 +155,7 @@
  <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>
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@ -155,4 +155,7 @@
  <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>
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@ -155,4 +155,7 @@
  <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>
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@ -155,4 +155,7 @@
  <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>
--- a/app/src/main/res/values-no/strings.xml
+++ b/app/src/main/res/values-no/strings.xml
@ -155,4 +155,7 @@
  <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>
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@ -155,4 +155,7 @@
  <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>
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@ -155,4 +155,7 @@
  <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">Read more</string>
+  <string name="reader_action_open">Open in browser</string>
+  <string name="reader_action_share">Share</string>
 </resources>
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@ -155,4 +155,7 @@
  <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>
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@ -155,4 +155,7 @@
  <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>
--- a/app/src/main/res/values-sr/strings.xml
+++ b/app/src/main/res/values-sr/strings.xml
@ -155,4 +155,7 @@
  <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>
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@ -155,4 +155,7 @@
  <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>
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@ -155,4 +155,7 @@
  <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>
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@ -155,4 +155,7 @@
  <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>
--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@ -155,4 +155,7 @@
  <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>
--- a/app/src/main/res/values-zh/strings.xml
+++ b/app/src/main/res/values-zh/strings.xml
@ -155,4 +155,7 @@
  <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>
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@ -158,4 +158,7 @@
    <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>
Author	SHA1	Message	Date
Amine	3bdfef9f8b	Added changelog and changed fab size.	2017-11-12 07:55:01 +01:00
Amine	6f7f475a6b	Enhancements. Three first items of #108 .	2017-11-12 07:51:11 +01:00
Amine	8fc5fab67b	Merge branch 'master' of github.com:aminecmi/ReaderforSelfoss	2017-11-11 21:01:48 +01:00
Amine Bou	6927e92396	New Crowdin translations (#105 ) * New translations strings.xml (French) * 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 (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, Brazilian) * New translations strings.xml (Portuguese) * New translations strings.xml (Portuguese, Brazilian) * 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 (Arabic) * New translations strings.xml (Greek) * 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 (Hungarian) * New translations strings.xml (Hebrew) * New translations strings.xml (German) * New translations strings.xml (Catalan) * 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 (Portuguese, Brazilian) * New translations strings.xml (Vietnamese)	2017-11-11 21:01:25 +01:00
Amine	c7470396d7	Changelog.	2017-11-11 20:55:31 +01:00
Amine Bou	f21570e2e4	New Crowdin translations (#104 ) * New translations strings.xml (French) * 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 (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, Brazilian) * New translations strings.xml (Portuguese) * New translations strings.xml (Portuguese, Brazilian) * 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 (Arabic) * New translations strings.xml (Greek) * 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 (Hungarian) * New translations strings.xml (Hebrew) * New translations strings.xml (German) * New translations strings.xml (Catalan) * 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)	2017-11-11 20:53:15 +01:00
Amine	51f406e20c	New action bar. Closes #103 .	2017-11-11 20:39:56 +01:00
Amine	9e3fde744e	Changed to Textview to disaply the simple content from the API.	2017-11-11 16:50:17 +01:00
Amine Bou	ccf406ae68	Update CONTRIBUTING.md	2017-11-11 14:47:40 +01:00
Amine	bc78d1e079	Changelog and updated target sdk.	2017-11-11 14:35:13 +01:00
Amine	d151eb261e	Updates to make the build work.	2017-11-11 14:28:06 +01:00
Amine	0856598cd9	Changelog.	2017-11-11 08:44:18 +01:00
Amine	f0563efc62	Fixed #98 . Using kotlin implementation for the drawer. Using the new style code.	2017-11-11 07:58:29 +01:00