Fixes #221

* New translations strings.xml (French)

* New translations strings.xml (French)

* New translations strings.xml (Spanish)

* New translations strings.xml (Galician)

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

@@ -3,9 +3,11 @@ package apps.amine.bou.readerforselfoss
 import android.graphics.drawable.ColorDrawable
 import android.os.Build
 import android.os.Bundle
+import android.preference.PreferenceManager
 import android.support.v4.app.FragmentManager
 import android.support.v4.app.FragmentStatePagerAdapter
 import android.support.v4.content.ContextCompat
+import android.support.v4.view.ViewPager
 import android.support.v7.app.AppCompatActivity
 import android.view.Menu
 import android.view.MenuItem
@@ -18,10 +20,13 @@ import apps.amine.bou.readerforselfoss.fragments.ArticleFragment
 import apps.amine.bou.readerforselfoss.themes.AppColors
 import apps.amine.bou.readerforselfoss.themes.Toppings
 import apps.amine.bou.readerforselfoss.transformers.DepthPageTransformer
+import apps.amine.bou.readerforselfoss.utils.maybeHandleSilentException
+import apps.amine.bou.readerforselfoss.utils.succeeded
 import apps.amine.bou.readerforselfoss.utils.toggleStar
 import com.ftinc.scoop.Scoop
 import kotlinx.android.synthetic.main.activity_reader.*
 import me.relex.circleindicator.CircleIndicator
+import org.acra.ACRA
 import retrofit2.Call
 import retrofit2.Callback
 import retrofit2.Response
@@ -29,7 +34,9 @@ import retrofit2.Response
 class ReaderActivity : AppCompatActivity() {
 
     private var markOnScroll: Boolean = false
+    private var debugReadingItems: Boolean = false
     private var currentItem: Int = 0
+    private lateinit var userIdentifier: String
 
     private lateinit var api: SelfossApi
 
@@ -63,6 +70,18 @@ class ReaderActivity : AppCompatActivity() {
         supportActionBar?.setDisplayHomeAsUpEnabled(true)
         supportActionBar?.setDisplayShowHomeEnabled(true)
 
+        val prefs = PreferenceManager.getDefaultSharedPreferences(this)
+
+        debugReadingItems = prefs.getBoolean("read_debug", false)
+        userIdentifier = prefs.getString("unique_id", "")
+        markOnScroll = prefs.getBoolean("mark_on_scroll", false)
+
+        api = SelfossApi(
+            this,
+            this@ReaderActivity,
+            prefs.getBoolean("isSelfSignedCert", false),
+            prefs.getBoolean("should_log_everything", false)
+        )
 
         if (allItems.isEmpty()) {
             finish()
@@ -70,6 +89,8 @@ class ReaderActivity : AppCompatActivity() {
 
         currentItem = intent.getIntExtra("currentItem", 0)
 
+        readItem(allItems[currentItem].id)
+
         pager.adapter = ScreenSlidePagerAdapter(supportFragmentManager, AppColors(this@ReaderActivity))
         pager.currentItem = currentItem
     }
@@ -77,10 +98,64 @@ class ReaderActivity : AppCompatActivity() {
     override fun onResume() {
         super.onResume()
 
-        (pager.adapter as ScreenSlidePagerAdapter).notifyDataSetChanged()
+        notifyAdapter()
 
         pager.setPageTransformer(true, DepthPageTransformer())
         (indicator as CircleIndicator).setViewPager(pager)
+
+        pager.addOnPageChangeListener(
+            object : ViewPager.SimpleOnPageChangeListener() {
+
+                override fun onPageSelected(position: Int) {
+
+                    if (allItems[position].starred) {
+                        canRemoveFromFavorite()
+                    } else {
+                        canFavorite()
+                    }
+                    readItem(allItems[pager.currentItem].id)
+                }
+            }
+        )
+    }
+
+    fun readItem(id: String) {
+        if (markOnScroll) {
+            api.markItem(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}"
+                            ACRA.getErrorReporter()
+                                .maybeHandleSilentException(Exception(message), this@ReaderActivity)
+                        }
+                    }
+
+                    override fun onFailure(
+                        call: Call<SuccessResponse>,
+                        t: Throwable
+                    ) {
+                        if (debugReadingItems) {
+                            ACRA.getErrorReporter().maybeHandleSilentException(t, this@ReaderActivity)
+                        }
+                    }
+                }
+            )
+        }
+    }
+
+    private fun notifyAdapter() {
+        (pager.adapter as ScreenSlidePagerAdapter).notifyDataSetChanged()
     }
 
     override fun onPause() {
@@ -142,6 +217,7 @@ class ReaderActivity : AppCompatActivity() {
                             response: Response<SuccessResponse>
                         ) {
                             allItems[pager.currentItem] = allItems[pager.currentItem].toggleStar()
+                            notifyAdapter()
                             canRemoveFromFavorite()
                         }
 
@@ -165,6 +241,7 @@ class ReaderActivity : AppCompatActivity() {
                             response: Response<SuccessResponse>
                         ) {
                             allItems[pager.currentItem] = allItems[pager.currentItem].toggleStar()
+                            notifyAdapter()
                             canFavorite()
                         }
 

app/src/main/java/apps/amine/bou/readerforselfoss/fragments/ArticleFragment.kt

@@ -101,7 +101,6 @@ class ArticleFragment : Fragment() {
 
         val settings = activity!!.getSharedPreferences(Config.settingsName, Context.MODE_PRIVATE)
         val debugReadingItems = prefs.getBoolean("read_debug", false)
-        val markOnScroll = prefs.getBoolean("mark_on_scroll", false)
 
         val api = SelfossApi(
             context!!,
@@ -211,38 +210,6 @@ class ArticleFragment : Fragment() {
             }
         )
 
-        if (markOnScroll) {
-            api.markItem(allItems[pageNumber.toInt()].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}"
-                            ACRA.getErrorReporter().maybeHandleSilentException(Exception(message), activity!!)
-                        }
-                    }
-
-                    override fun onFailure(
-                        call: Call<SuccessResponse>,
-                        t: Throwable
-                    ) {
-                        if (debugReadingItems) {
-                            ACRA.getErrorReporter().maybeHandleSilentException(t, activity!!)
-                        }
-                    }
-                }
-            )
-        }
-
         return rootView
     }
 

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

@@ -168,5 +168,5 @@
   <string name="pref_debug_debug_logs">Registro de depuración (éstos se enviarán sin diálogo)</string>
   <string name="acra_login">Habilitar el registro</string>
   <string name="drawer_item_hidden_tags">Etiquetas ocultas</string>
-  <string name="unmark">Mark item as unread</string>
+  <string name="unmark">Marcar artículo como no leído</string>
 </resources>

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

@@ -168,5 +168,5 @@
   <string name="pref_debug_debug_logs">Rexistro de depuración (Estes enviaranse automáticamente)</string>
   <string name="acra_login">Habilitar o rexistro</string>
   <string name="drawer_item_hidden_tags">Etiquetas ocultas</string>
-  <string name="unmark">Mark item as unread</string>
+  <string name="unmark">Marcar artículo como non lido</string>
 </resources>