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

update SDK to 27 and Commons

Browse Source
This commit is contained in:
tibbi
2017-11-10 15:28:22 +01:00
parent 14f8716c5b
commit bff373afac
10 changed files with 47 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -12,10 +12,7 @@ import android.view.View
import android.view.ViewGroup
import com.simplemobiletools.notes.R
import com.simplemobiletools.notes.activities.MainActivity
import com.simplemobiletools.notes.extensions.config
import com.simplemobiletools.notes.extensions.getNoteStoredValue
import com.simplemobiletools.notes.extensions.getTextSize
import com.simplemobiletools.notes.extensions.updateWidget
import com.simplemobiletools.notes.extensions.*
import com.simplemobiletools.notes.helpers.DBHelper
import com.simplemobiletools.notes.helpers.GRAVITY_CENTER
import com.simplemobiletools.notes.helpers.GRAVITY_RIGHT
@ -32,11 +29,11 @@ class NoteFragment : Fragment() {
override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
view = inflater.inflate(R.layout.fragment_note, container, false) as ViewGroup
noteId = arguments.getInt(NOTE_ID)
mDb = DBHelper.newInstance(context)
noteId = arguments!!.getInt(NOTE_ID)
mDb = context!!.dbHelper
note = mDb.getNote(noteId) ?: return view
if (context.config.clickableLinks) {
if (context!!.config.clickableLinks) {
view.notes_view.apply {
linksClickable = true
autoLinkMask = Linkify.WEB_URLS or Linkify.EMAIL_ADDRESSES
@ -49,8 +46,9 @@ class NoteFragment : Fragment() {
override fun setMenuVisibility(menuVisible: Boolean) {
super.setMenuVisibility(menuVisible)
if (noteId != 0)
if (noteId != 0) {
saveText()
}
}
fun getNotesView() = view.notes_view
@ -63,11 +61,11 @@ class NoteFragment : Fragment() {
return
val newText = getCurrentNoteViewText()
val oldText = context.getNoteStoredValue(note)
val oldText = context!!.getNoteStoredValue(note)
if (newText != oldText) {
note.value = newText
saveNoteValue(note)
context.updateWidget()
context!!.updateWidget()
}
}
@ -86,7 +84,7 @@ class NoteFragment : Fragment() {
fun getCurrentNoteViewText() = view.notes_view?.text.toString()
private fun getTextGravity() = when (context.config.gravity) {
private fun getTextGravity() = when (context!!.config.gravity) {
GRAVITY_CENTER -> Gravity.CENTER_HORIZONTAL
GRAVITY_RIGHT -> Gravity.RIGHT
else -> Gravity.LEFT
@ -95,7 +93,7 @@ class NoteFragment : Fragment() {
override fun onResume() {
super.onResume()
val config = context.config
val config = context!!.config
view.notes_view.apply {
typeface = if (config.monospacedFont) Typeface.MONOSPACE else Typeface.DEFAULT