Moved to version 1.5.6.X due to an automatic versioncode problem.

CHANGELOG.md

@@ -1,9 +1,19 @@
-**1.5.5.x**
+**1.5.5.x (didn't last long) AND 1.5.6.x**
 
 - Completed Dutch and Indonesian translation !
 
+- Fixed #142.
+
+- Added an animation to the viewpager.
+
 - Changed versions handling.
 
+- Toolbar in reader activity.
+
+- Marking items as read on scroll (with settings to enable/disable).
+
+- Swapped the title and subtitle in the article viewer.
+
 **1.5.4.22**
 
 - You can now scroll through the loaded articles !

app/build.gradle

@@ -20,7 +20,7 @@ def gitVersion() {
 }
 
 def versionCodeFromGit() {
-    def versionCode = gitVersion() + (ext.configuration.buildDate.format("SSssmm")).toInteger()
+    def versionCode = gitVersion() + (ext.configuration.buildDate.format("yyMd")).toInteger()
     println "version code " + versionCode
     return versionCode.toInteger()
 }

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

@@ -1,13 +1,27 @@
 package apps.amine.bou.readerforselfoss
 
+import android.content.Context
 import android.os.Bundle
+import android.preference.PreferenceManager
 import android.support.v4.app.FragmentManager
 import android.support.v4.app.FragmentStatePagerAdapter
+import android.support.v4.view.ViewPager
 import android.support.v7.app.AppCompatActivity
+import android.view.MenuItem
 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.fragments.ArticleFragment
+import apps.amine.bou.readerforselfoss.transformers.DepthPageTransformer
+import apps.amine.bou.readerforselfoss.utils.Config
+import apps.amine.bou.readerforselfoss.utils.succeeded
+import com.crashlytics.android.Crashlytics
+import com.ftinc.scoop.Scoop
 import kotlinx.android.synthetic.main.activity_reader.*
 import me.relex.circleindicator.CircleIndicator
+import retrofit2.Call
+import retrofit2.Callback
+import retrofit2.Response
 
 class ReaderActivity : AppCompatActivity() {
 
@@ -15,8 +29,27 @@ class ReaderActivity : AppCompatActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        Scoop.getInstance().apply(this)
         setContentView(R.layout.activity_reader)
 
+        setSupportActionBar(toolBar)
+        supportActionBar?.setDisplayHomeAsUpEnabled(true)
+        supportActionBar?.setDisplayShowHomeEnabled(true)
+
+        val settings = getSharedPreferences(Config.settingsName, Context.MODE_PRIVATE)
+        val sharedPref = PreferenceManager.getDefaultSharedPreferences(this)
+
+        val debugReadingItems = sharedPref.getBoolean("read_debug", false)
+        val userIdentifier = sharedPref.getString("unique_id", "")
+        val markOnScroll = sharedPref.getBoolean("mark_on_scroll", false)
+
+        val api = SelfossApi(
+                this,
+                this@ReaderActivity,
+                settings.getBoolean("isSelfSignedCert", false),
+                sharedPref.getBoolean("should_log_everything", false)
+        )
+
         allItems = intent.getParcelableArrayListExtra<Item>("allItems")
         val currentItem = intent.getIntExtra("currentItem", 0)
 
@@ -24,7 +57,58 @@ class ReaderActivity : AppCompatActivity() {
         pager.adapter = adapter
         pager.currentItem = currentItem
 
+        pager.setPageTransformer(true, DepthPageTransformer())
         (indicator as CircleIndicator).setViewPager(pager)
+
+        if (markOnScroll) {
+            pager.addOnPageChangeListener(object : ViewPager.SimpleOnPageChangeListener() {
+                var isLastItem = false
+
+                override fun onPageSelected(position: Int) {
+                    isLastItem = (position === (allItems.size - 1))
+                }
+
+                override fun onPageScrollStateChanged(state: Int) {
+                    if (state === ViewPager.SCROLL_STATE_DRAGGING || (state === ViewPager.SCROLL_STATE_IDLE && isLastItem)) {
+                        api.markItem(allItems[pager.currentItem].id).enqueue(
+                                object : Callback<SuccessResponse> {
+                                    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}"
+                                            Crashlytics.setUserIdentifier(userIdentifier)
+                                            Crashlytics.log(100, "READ_DEBUG_SUCCESS", message)
+                                            Crashlytics.logException(Exception("Was success, but did it work ?"))
+                                        }
+                                    }
+
+                                    override fun onFailure(call: Call<SuccessResponse>, t: Throwable) {
+                                        if (debugReadingItems) {
+                                            Crashlytics.setUserIdentifier(userIdentifier)
+                                            Crashlytics.log(100, "READ_DEBUG_ERROR", t.message)
+                                            Crashlytics.logException(t)
+                                        }
+                                    }
+                                }
+                        )
+                    }
+                }
+            })
+        }
+    }
+
+    override fun onPause() {
+        super.onPause()
+        pager.clearOnPageChangeListeners()
     }
 
     private inner class ScreenSlidePagerAdapter(fm: FragmentManager) : FragmentStatePagerAdapter(fm) {
@@ -36,4 +120,14 @@ class ReaderActivity : AppCompatActivity() {
             return ArticleFragment.newInstance(position, allItems)
         }
     }
+
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        when (item.itemId) {
+            android.R.id.home -> {
+                onBackPressed()
+                return true
+            }
+        }
+        return super.onOptionsItemSelected(item)
+    }
 }

app/src/main/java/apps/amine/bou/readerforselfoss/transformers/DepthPageTransformer.kt

@@ -0,0 +1,43 @@
+package apps.amine.bou.readerforselfoss.transformers
+
+import android.support.v4.view.ViewPager
+import android.view.View
+
+class DepthPageTransformer : ViewPager.PageTransformer {
+
+    override fun transformPage(view: View, position: Float) {
+        val pageWidth = view.width
+
+        when {
+            position < -1 -> // [-Infinity,-1)
+                // This page is way off-screen to the left.
+                view.alpha = 0F
+            position <= 0 -> { // [-1,0]
+                // Use the default slide transition when moving to the left page
+                view.alpha = 1F
+                view.translationX = 0F
+                view.scaleX = 1F
+                view.scaleY = 1F
+            }
+            position <= 1 -> { // (0,1]
+                // Fade the page out.
+                view.alpha = 1 - position
+
+                // Counteract the default slide transition
+                view.translationX = pageWidth * -position
+
+                // Scale the page down (between MIN_SCALE and 1)
+                val scaleFactor = MIN_SCALE + (1 - MIN_SCALE) * (1 - Math.abs(position))
+                view.scaleX = scaleFactor
+                view.scaleY = scaleFactor
+            }
+            else -> // (1,+Infinity]
+                // This page is way off-screen to the right.
+                view.alpha = 0F
+        }
+    }
+
+    companion object {
+        private val MIN_SCALE = 0.75f
+    }
+}

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

@@ -1,11 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout
+<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
+    <android.support.design.widget.AppBarLayout
+        android:id="@+id/appBarLayout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <android.support.v7.widget.Toolbar
+            android:id="@+id/toolBar"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize"
+            app:popupTheme="?attr/toolbarPopupTheme"
+            app:theme="@style/ToolBarStyle" />
+
+    </android.support.design.widget.AppBarLayout>
+
     <android.support.v4.view.ViewPager
         android:id="@+id/pager"
         android:layout_width="match_parent"
@@ -13,7 +29,7 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toBottomOf="@+id/appBarLayout" />
 
 
     <me.relex.circleindicator.CircleIndicator

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

@@ -1,6 +1,7 @@
 <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">
 
@@ -27,49 +28,43 @@
                 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" />
+                app:layout_constraintTop_toBottomOf="@+id/titleView" />
 
             <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="8dp"
-                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" />
+                app:layout_constraintTop_toBottomOf="@+id/imageView" />
 
             <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"
+                android:textColorLink="?attr/colorAccent"
                 app:layout_constraintHorizontal_bias="0.0"
                 app:layout_constraintLeft_toLeftOf="parent"
                 app:layout_constraintRight_toRightOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/titleView"
+                app:layout_constraintTop_toBottomOf="@+id/source" />
-                android:textColorLink="?attr/colorAccent"/>
 
             <!--<org.sufficientlysecure.htmltextview.HtmlTextView
                 android:id="@+id/content"

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

@@ -158,4 +158,5 @@
   <string name="reader_action_more">Read more</string>
   <string name="reader_action_open">Open in browser</string>
   <string name="reader_action_share">Share</string>
+    <string name="pref_switch_actions_pager_scroll">Mark articles as read when scrolling between articles.</string>
 </resources>

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

@@ -158,4 +158,5 @@
   <string name="reader_action_more">Read more</string>
   <string name="reader_action_open">Open in browser</string>
   <string name="reader_action_share">Share</string>
+    <string name="pref_switch_actions_pager_scroll">Mark articles as read when scrolling between articles.</string>
 </resources>

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

@@ -158,4 +158,5 @@
   <string name="reader_action_more">Read more</string>
   <string name="reader_action_open">Open in browser</string>
   <string name="reader_action_share">Share</string>
+    <string name="pref_switch_actions_pager_scroll">Mark articles as read when scrolling between articles.</string>
 </resources>

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

@@ -158,4 +158,5 @@
   <string name="reader_action_more">Read more</string>
   <string name="reader_action_open">Open in browser</string>
   <string name="reader_action_share">Share</string>
+    <string name="pref_switch_actions_pager_scroll">Mark articles as read when scrolling between articles.</string>
 </resources>

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

@@ -158,4 +158,5 @@
   <string name="reader_action_more">Read more</string>
   <string name="reader_action_open">Open in browser</string>
   <string name="reader_action_share">Share</string>
+    <string name="pref_switch_actions_pager_scroll">Mark articles as read when scrolling between articles.</string>
 </resources>

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

@@ -158,4 +158,5 @@
   <string name="reader_action_more">Read more</string>
   <string name="reader_action_open">Open in browser</string>
   <string name="reader_action_share">Share</string>
+    <string name="pref_switch_actions_pager_scroll">Mark articles as read when scrolling between articles.</string>
 </resources>

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

@@ -158,4 +158,5 @@
   <string name="reader_action_more">Read more</string>
   <string name="reader_action_open">Open in browser</string>
   <string name="reader_action_share">Share</string>
+    <string name="pref_switch_actions_pager_scroll">Mark articles as read when scrolling between articles.</string>
 </resources>

app/src/main/res/values-en-rID/strings.xml

@@ -158,4 +158,5 @@
   <string name="reader_action_more">Read more</string>
   <string name="reader_action_open">Open in browser</string>
   <string name="reader_action_share">Share</string>
+    <string name="pref_switch_actions_pager_scroll">Mark articles as read when scrolling between articles.</string>
 </resources>

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

@@ -158,4 +158,5 @@
   <string name="reader_action_more">Leer más</string>
   <string name="reader_action_open">Abrir en el navegador</string>
   <string name="reader_action_share">Compartir</string>
+    <string name="pref_switch_actions_pager_scroll">Mark articles as read when scrolling between articles.</string>
 </resources>

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

@@ -158,4 +158,5 @@
   <string name="reader_action_more">Read more</string>
   <string name="reader_action_open">Open in browser</string>
   <string name="reader_action_share">Share</string>
+    <string name="pref_switch_actions_pager_scroll">Mark articles as read when scrolling between articles.</string>
 </resources>

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

@@ -158,4 +158,5 @@
   <string name="reader_action_more">Lire plus</string>
   <string name="reader_action_open">Ouvrir</string>
   <string name="reader_action_share">Partager</string>
+    <string name="pref_switch_actions_pager_scroll">Marquer les articles comme lues au sroll.</string>
 </resources>

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

@@ -158,4 +158,5 @@
   <string name="reader_action_more">Read more</string>
   <string name="reader_action_open">Open in browser</string>
   <string name="reader_action_share">Share</string>
+    <string name="pref_switch_actions_pager_scroll">Mark articles as read when scrolling between articles.</string>
 </resources>

app/src/main/res/values-in-rID/strings.xml

@@ -158,4 +158,5 @@
   <string name="reader_action_more">Baca lebih lanjut</string>
   <string name="reader_action_open">Buka di peramban</string>
   <string name="reader_action_share">Bagikan</string>
+    <string name="pref_switch_actions_pager_scroll">Mark articles as read when scrolling between articles.</string>
 </resources>

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

@@ -158,4 +158,5 @@
   <string name="reader_action_more">Read more</string>
   <string name="reader_action_open">Open in browser</string>
   <string name="reader_action_share">Share</string>
+    <string name="pref_switch_actions_pager_scroll">Mark articles as read when scrolling between articles.</string>
 </resources>

app/src/main/res/values-iw-rIL/strings.xml

@@ -158,4 +158,5 @@
   <string name="reader_action_more">Read more</string>
   <string name="reader_action_open">Open in browser</string>
   <string name="reader_action_share">Share</string>
+    <string name="pref_switch_actions_pager_scroll">Mark articles as read when scrolling between articles.</string>
 </resources>

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

@@ -158,4 +158,5 @@
   <string name="reader_action_more">Read more</string>
   <string name="reader_action_open">Open in browser</string>
   <string name="reader_action_share">Share</string>
+    <string name="pref_switch_actions_pager_scroll">Mark articles as read when scrolling between articles.</string>
 </resources>

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

@@ -158,4 +158,5 @@
   <string name="reader_action_more">Read more</string>
   <string name="reader_action_open">Open in browser</string>
   <string name="reader_action_share">Share</string>
+    <string name="pref_switch_actions_pager_scroll">Mark articles as read when scrolling between articles.</string>
 </resources>

app/src/main/res/values-nl-rNL/strings.xml

@@ -158,4 +158,5 @@
   <string name="reader_action_more">Lees meer</string>
   <string name="reader_action_open">Openen in browser</string>
   <string name="reader_action_share">Delen</string>
+    <string name="pref_switch_actions_pager_scroll">Mark articles as read when scrolling between articles.</string>
 </resources>

app/src/main/res/values-no-rNO/strings.xml

@@ -158,4 +158,5 @@
   <string name="reader_action_more">Read more</string>
   <string name="reader_action_open">Open in browser</string>
   <string name="reader_action_share">Share</string>
+    <string name="pref_switch_actions_pager_scroll">Mark articles as read when scrolling between articles.</string>
 </resources>

app/src/main/res/values-pl-rPL/strings.xml

@@ -158,4 +158,5 @@
   <string name="reader_action_more">Read more</string>
   <string name="reader_action_open">Open in browser</string>
   <string name="reader_action_share">Share</string>
+    <string name="pref_switch_actions_pager_scroll">Mark articles as read when scrolling between articles.</string>
 </resources>

app/src/main/res/values-pt-rBR/strings.xml

@@ -158,4 +158,5 @@
   <string name="reader_action_more">Leia mais</string>
   <string name="reader_action_open">Abrir no navegador</string>
   <string name="reader_action_share">Compartilhar</string>
+    <string name="pref_switch_actions_pager_scroll">Mark articles as read when scrolling between articles.</string>
 </resources>

app/src/main/res/values-pt-rPT/strings.xml

@@ -158,4 +158,5 @@
   <string name="reader_action_more">Read more</string>
   <string name="reader_action_open">Open in browser</string>
   <string name="reader_action_share">Share</string>
+    <string name="pref_switch_actions_pager_scroll">Mark articles as read when scrolling between articles.</string>
 </resources>

app/src/main/res/values-ro-rRO/strings.xml

@@ -158,4 +158,5 @@
   <string name="reader_action_more">Read more</string>
   <string name="reader_action_open">Open in browser</string>
   <string name="reader_action_share">Share</string>
+    <string name="pref_switch_actions_pager_scroll">Mark articles as read when scrolling between articles.</string>
 </resources>

app/src/main/res/values-ru-rRU/strings.xml

@@ -158,4 +158,5 @@
   <string name="reader_action_more">Read more</string>
   <string name="reader_action_open">Open in browser</string>
   <string name="reader_action_share">Share</string>
+    <string name="pref_switch_actions_pager_scroll">Mark articles as read when scrolling between articles.</string>
 </resources>

app/src/main/res/values-sr-rSP/strings.xml

@@ -158,4 +158,5 @@
   <string name="reader_action_more">Read more</string>
   <string name="reader_action_open">Open in browser</string>
   <string name="reader_action_share">Share</string>
+    <string name="pref_switch_actions_pager_scroll">Mark articles as read when scrolling between articles.</string>
 </resources>

app/src/main/res/values-sv-rSE/strings.xml

@@ -158,4 +158,5 @@
   <string name="reader_action_more">Read more</string>
   <string name="reader_action_open">Open in browser</string>
   <string name="reader_action_share">Share</string>
+    <string name="pref_switch_actions_pager_scroll">Mark articles as read when scrolling between articles.</string>
 </resources>

app/src/main/res/values-tr-rTR/strings.xml

@@ -158,4 +158,5 @@
   <string name="reader_action_more">Daha fazlasını görüntüle</string>
   <string name="reader_action_open">Tarayıcıda aç</string>
   <string name="reader_action_share">Paylaş</string>
+    <string name="pref_switch_actions_pager_scroll">Mark articles as read when scrolling between articles.</string>
 </resources>

app/src/main/res/values-uk-rUA/strings.xml

@@ -158,4 +158,5 @@
   <string name="reader_action_more">Read more</string>
   <string name="reader_action_open">Open in browser</string>
   <string name="reader_action_share">Share</string>
+    <string name="pref_switch_actions_pager_scroll">Mark articles as read when scrolling between articles.</string>
 </resources>

app/src/main/res/values-vi-rVN/strings.xml

@@ -158,4 +158,5 @@
   <string name="reader_action_more">Read more</string>
   <string name="reader_action_open">Open in browser</string>
   <string name="reader_action_share">Share</string>
+    <string name="pref_switch_actions_pager_scroll">Mark articles as read when scrolling between articles.</string>
 </resources>

app/src/main/res/values-zh-rCN/strings.xml

@@ -158,4 +158,5 @@
   <string name="reader_action_more">阅读更多</string>
   <string name="reader_action_open">在浏览器中打开</string>
   <string name="reader_action_share">分享</string>
+    <string name="pref_switch_actions_pager_scroll">Mark articles as read when scrolling between articles.</string>
 </resources>

app/src/main/res/values-zh-rTW/strings.xml

@@ -158,4 +158,5 @@
   <string name="reader_action_more">阅读更多</string>
   <string name="reader_action_open">在浏览器中打开</string>
   <string name="reader_action_share">分享</string>
+    <string name="pref_switch_actions_pager_scroll">Mark articles as read when scrolling between articles.</string>
 </resources>

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

@@ -161,4 +161,5 @@
     <string name="reader_action_more">Read more</string>
     <string name="reader_action_open">Open in browser</string>
     <string name="reader_action_share">Share</string>
+    <string name="pref_switch_actions_pager_scroll">Mark articles as read when scrolling between articles.</string>
 </resources>

app/src/main/res/xml/pref_general.xml

@@ -81,5 +81,9 @@
         android:summaryOff="@string/pref_switch_actions_tap_off"
         android:summaryOn="@string/pref_switch_actions_tap_on"
         android:title="@string/pref_switch_actions_tap_title" />
+    <SwitchPreference
+        android:defaultValue="false"
+        android:key="mark_on_scroll"
+        android:title="@string/pref_switch_actions_pager_scroll" />
 
 </PreferenceScreen>