From 215883014cdab57590320365b79d8480a099f10c Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Sat, 26 Nov 2016 19:45:23 +0100
Subject: [PATCH] couple correections to viewpager

---
 .../notes/activities/MainActivity.kt          | 24 +++++++++++--------
 .../notes/adapters/NotesPagerAdapter.kt       |  4 ----
 app/src/main/res/layout/activity_main.xml     |  3 +--
 app/src/main/res/layout/fragment_note.xml     |  3 ++-
 app/src/main/res/values-pt-rPT/strings.xml    |  2 +-
 5 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/notes/activities/MainActivity.kt
index 2e301369..a89cdb68 100644
--- a/app/src/main/kotlin/com/simplemobiletools/notes/activities/MainActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/notes/activities/MainActivity.kt
@@ -2,6 +2,7 @@ package com.simplemobiletools.notes.activities
 
 import android.content.Intent
 import android.os.Bundle
+import android.support.v4.view.ViewPager
 import android.view.Menu
 import android.view.MenuItem
 import android.view.View
@@ -21,7 +22,7 @@ import com.simplemobiletools.notes.models.Note
 import kotlinx.android.synthetic.main.activity_main.*
 import kotlinx.android.synthetic.main.fragment_note.*
 
-class MainActivity : SimpleActivity() {
+class MainActivity : SimpleActivity(), ViewPager.OnPageChangeListener {
     lateinit var mCurrentNote: Note
     lateinit var mAdapter: NotesPagerAdapter
     lateinit var mDb: DBHelper
@@ -38,6 +39,7 @@ class MainActivity : SimpleActivity() {
         mAdapter = NotesPagerAdapter(supportFragmentManager, mNotes)
         view_pager.apply {
             adapter = mAdapter
+            addOnPageChangeListener(this@MainActivity)
         }
 
         notes_fab.setOnClickListener { displayNewNoteDialog() }
@@ -52,11 +54,6 @@ class MainActivity : SimpleActivity() {
         invalidateOptionsMenu()
     }
 
-    override fun onPause() {
-        super.onPause()
-        mAdapter.saveNote(mCurrentNote.id)
-    }
-
     override fun onDestroy() {
         super.onDestroy()
         config.isFirstRun = false
@@ -125,11 +122,7 @@ class MainActivity : SimpleActivity() {
     }
 
     private fun updateSelectedNote(id: Int) {
-        mNotes = mDb.getNotes()
         config.currentNoteId = id
-        notes_view.setText(mCurrentNote.value)
-        current_note_title.text = mCurrentNote.title
-        current_note_title.visibility = if (mNotes.size <= 1) View.GONE else View.VISIBLE
     }
 
     fun displayNewNoteDialog() {
@@ -185,4 +178,15 @@ class MainActivity : SimpleActivity() {
             startActivity(Intent.createChooser(this, shareTitle))
         }
     }
+
+    override fun onPageScrollStateChanged(state: Int) {
+    }
+
+    override fun onPageScrolled(position: Int, positionOffset: Float, positionOffsetPixels: Int) {
+    }
+
+    override fun onPageSelected(position: Int) {
+        mCurrentNote = mNotes[position]
+        config.currentNoteId = mCurrentNote.id
+    }
 }
diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/adapters/NotesPagerAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/notes/adapters/NotesPagerAdapter.kt
index eb9c653b..b2c1ebee 100644
--- a/app/src/main/kotlin/com/simplemobiletools/notes/adapters/NotesPagerAdapter.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/notes/adapters/NotesPagerAdapter.kt
@@ -31,8 +31,4 @@ class NotesPagerAdapter(fm: FragmentManager, private val notes: List<Note>) : Fr
         fragments.put(position, fragment)
         return fragment
     }
-
-    fun saveNote(pos: Int) {
-        fragments.get(pos)?.saveText()
-    }
 }
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 1f92ff0f..0d52fd43 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -9,8 +9,7 @@
     <com.simplemobiletools.notes.views.MyViewPager
         android:id="@+id/view_pager"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_marginTop="@dimen/activity_margin"/>
+        android:layout_height="match_parent"/>
 
     <android.support.design.widget.FloatingActionButton
         android:id="@+id/notes_fab"
diff --git a/app/src/main/res/layout/fragment_note.xml b/app/src/main/res/layout/fragment_note.xml
index d178c988..8201c2de 100644
--- a/app/src/main/res/layout/fragment_note.xml
+++ b/app/src/main/res/layout/fragment_note.xml
@@ -3,7 +3,8 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/note_Fragment_holder"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:paddingTop="@dimen/activity_margin">
 
     <TextView
         android:id="@+id/current_note_title"
diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml
index 2181c309..047993e4 100644
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@@ -60,7 +60,7 @@
 
         Pode abrir a aplicação e aceder à sua nota através de um toque no widget.
 
-        Não contém anúncios nem permissões desnecessárias. Disponibiliza um tema escuro e é totalmente 'open source'.
+        Não contém anúncios nem permissões desnecessárias. Disponibiliza um tema escuro e é totalmente \'open source\'.
 
         Esta aplicação é apenas parte de um conjunto mais vasto de aplicações. Saiba mais em http://www.simplemobiletools.com
     </string>