fenix/Simple-Notes
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Notes.git synced 2025-04-05 11:11:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix #68, invalid share error message

Browse Source
This commit is contained in:
tibbi 2017-03-06 22:12:12 +01:00
parent 79285a197c
commit db26e22067
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/kotlin/com/simplemobiletools/notes/activities/MainActivity.kt
View File

@ -12,7 +12,6 @@ import com.simplemobiletools.commons.dialogs.ConfirmationDialog
import com.simplemobiletools.commons.extensions.checkWhatsNew import com.simplemobiletools.commons.extensions.checkWhatsNew
import com.simplemobiletools.commons.extensions.toast import com.simplemobiletools.commons.extensions.toast
import com.simplemobiletools.commons.extensions.updateTextColors import com.simplemobiletools.commons.extensions.updateTextColors
import com.simplemobiletools.commons.extensions.value
import com.simplemobiletools.commons.helpers.LICENSE_KOTLIN import com.simplemobiletools.commons.helpers.LICENSE_KOTLIN
import com.simplemobiletools.commons.helpers.LICENSE_RTL import com.simplemobiletools.commons.helpers.LICENSE_RTL
import com.simplemobiletools.commons.helpers.LICENSE_STETHO import com.simplemobiletools.commons.helpers.LICENSE_STETHO
@ -29,7 +28,6 @@ import com.simplemobiletools.notes.helpers.DBHelper
import com.simplemobiletools.notes.helpers.TYPE_NOTE import com.simplemobiletools.notes.helpers.TYPE_NOTE
import com.simplemobiletools.notes.models.Note import com.simplemobiletools.notes.models.Note
import kotlinx.android.synthetic.main.activity_main.* import kotlinx.android.synthetic.main.activity_main.*
import kotlinx.android.synthetic.main.fragment_note.*
class MainActivity : SimpleActivity(), ViewPager.OnPageChangeListener { class MainActivity : SimpleActivity(), ViewPager.OnPageChangeListener {
lateinit var mCurrentNote: Note lateinit var mCurrentNote: Note
@ -179,7 +177,7 @@ class MainActivity : SimpleActivity(), ViewPager.OnPageChangeListener {
} }
private fun shareText() { private fun shareText() {
val text = notes_view.value val text = (view_pager.adapter as NotesPagerAdapter).getCurrentNoteText(view_pager.currentItem)
if (text.isEmpty()) { if (text.isEmpty()) {
toast(R.string.cannot_share_empty_text) toast(R.string.cannot_share_empty_text)
return return

2
app/src/main/kotlin/com/simplemobiletools/notes/adapters/NotesPagerAdapter.kt
View File

@ -30,5 +30,7 @@ class NotesPagerAdapter(fm: FragmentManager, private val notes: List<Note>) : Fr
override fun getPageTitle(position: Int) = notes[position].title override fun getPageTitle(position: Int) = notes[position].title
fun getCurrentNoteText(position: Int) = fragments[position].getCurrentNoteText()
fun showKeyboard(position: Int) = fragments[position]?.showKeyboard() fun showKeyboard(position: Int) = fragments[position]?.showKeyboard()
} }

5
app/src/main/kotlin/com/simplemobiletools/notes/fragments/NoteFragment.kt
View File

@ -22,7 +22,6 @@ import com.simplemobiletools.notes.helpers.NOTE_ID
import com.simplemobiletools.notes.models.Note import com.simplemobiletools.notes.models.Note
import kotlinx.android.synthetic.main.fragment_note.view.* import kotlinx.android.synthetic.main.fragment_note.view.*
class NoteFragment : Fragment() { class NoteFragment : Fragment() {
var noteId = 0 var noteId = 0
lateinit var view: ViewGroup lateinit var view: ViewGroup
@ -57,8 +56,10 @@ class NoteFragment : Fragment() {
return view return view
} }
fun getCurrentNoteText() = view.notes_view.text.toString()
fun saveText() { fun saveText() {
val newText = view.notes_view.text.toString() val newText = getCurrentNoteText()
val oldText = note.value val oldText = note.value
if (newText != oldText) { if (newText != oldText) {
note.value = newText note.value = newText