Skip to content

Commit fddf164

Browse files
committed
update commons to 2.19.6
1 parent a1baea3 commit fddf164

File tree

9 files changed

+15
-15
lines changed

9 files changed

+15
-15
lines changed

app/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ android {
3232
}
3333

3434
dependencies {
35-
compile 'com.simplemobiletools:commons:2.16.9'
35+
compile 'com.simplemobiletools:commons:2.19.6'
3636
compile 'com.facebook.stetho:stetho:1.4.1'
3737
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
3838
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ class MainActivity : SimpleActivity(), ViewPager.OnPageChangeListener {
5959

6060
val itemIndex = getNoteIndexWithId(wantedNoteId)
6161

62-
mAdapter = NotesPagerAdapter(supportFragmentManager, mNotes, applicationContext)
62+
mAdapter = NotesPagerAdapter(supportFragmentManager, mNotes, this)
6363
view_pager.apply {
6464
adapter = mAdapter
6565
currentItem = itemIndex

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.simplemobiletools.notes.adapters
22

3-
import android.content.Context
3+
import android.app.Activity
44
import android.os.Bundle
55
import android.support.v4.app.Fragment
66
import android.support.v4.app.FragmentManager
@@ -13,7 +13,7 @@ import com.simplemobiletools.notes.fragments.NoteFragment
1313
import com.simplemobiletools.notes.helpers.NOTE_ID
1414
import com.simplemobiletools.notes.models.Note
1515

16-
class NotesPagerAdapter(fm: FragmentManager, val notes: List<Note>, val context: Context) : FragmentStatePagerAdapter(fm) {
16+
class NotesPagerAdapter(fm: FragmentManager, val notes: List<Note>, val activity: Activity) : FragmentStatePagerAdapter(fm) {
1717
var fragments: SparseArray<NoteFragment> = SparseArray(5)
1818

1919
override fun getCount() = notes.size
@@ -44,7 +44,7 @@ class NotesPagerAdapter(fm: FragmentManager, val notes: List<Note>, val context:
4444
try {
4545
super.finishUpdate(container)
4646
} catch (e: Exception) {
47-
context.toast(R.string.unknown_error_occurred)
47+
activity.toast(R.string.unknown_error_occurred)
4848
}
4949
}
5050
}

app/src/main/kotlin/com/simplemobiletools/notes/dialogs/DeleteNoteDialog.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ class DeleteNoteDialog(val activity: SimpleActivity, val note: Note, val callbac
3131
}
3232

3333
private fun dialogConfirmed(deleteFile: Boolean) {
34-
callback.invoke(deleteFile && note.path.isNotEmpty())
34+
callback(deleteFile && note.path.isNotEmpty())
3535
dialog?.dismiss()
3636
}
3737
}

app/src/main/kotlin/com/simplemobiletools/notes/dialogs/ExportAsDialog.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,17 +38,17 @@ class ExportAsDialog(val activity: SimpleActivity, val note: Note, val callback:
3838
val filename = view.file_name.value
3939

4040
if (filename.isEmpty()) {
41-
context.toast(R.string.filename_cannot_be_empty)
41+
activity.toast(R.string.filename_cannot_be_empty)
4242
return@setOnClickListener
4343
}
4444

4545
val newFile = File(realPath, filename)
4646
if (!newFile.name.isAValidFilename()) {
47-
context.toast(R.string.filename_invalid_characters)
47+
activity.toast(R.string.filename_invalid_characters)
4848
return@setOnClickListener
4949
}
5050

51-
callback.invoke(newFile.absolutePath)
51+
callback(newFile.absolutePath)
5252
dismiss()
5353
})
5454
}

app/src/main/kotlin/com/simplemobiletools/notes/dialogs/NewNoteDialog.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ class NewNoteDialog(val activity: Activity, val db: DBHelper, callback: (title:
2828
} else if (db.doesTitleExist(title)) {
2929
activity.toast(R.string.title_taken)
3030
} else {
31-
callback.invoke(title)
31+
callback(title)
3232
dismiss()
3333
}
3434
}

app/src/main/kotlin/com/simplemobiletools/notes/dialogs/OpenFileDialog.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ class OpenFileDialog(val activity: SimpleActivity, val path: String, val callbac
4646
private fun saveNote(storeContent: String, storePath: String) {
4747
val filename = path.getFilenameFromPath()
4848
val note = Note(0, filename, storeContent, TYPE_NOTE, storePath)
49-
callback.invoke(note)
49+
callback(note)
5050
dialog.dismiss()
5151
}
5252
}

app/src/main/kotlin/com/simplemobiletools/notes/dialogs/OpenNoteDialog.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ class OpenNoteDialog(val activity: Activity, val callback: (checkedId: Int) -> U
3131
id = note.id
3232

3333
setOnClickListener {
34-
callback.invoke(id)
34+
callback(id)
3535
dialog.dismiss()
3636
}
3737
}

app/src/main/kotlin/com/simplemobiletools/notes/dialogs/RenameNoteDialog.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,14 @@ class RenameNoteDialog(val activity: SimpleActivity, val db: DBHelper, val note:
3434
val path = note.path
3535
if (path.isNotEmpty()) {
3636
if (title.isEmpty()) {
37-
context.toast(R.string.filename_cannot_be_empty)
37+
activity.toast(R.string.filename_cannot_be_empty)
3838
return@setOnClickListener
3939
}
4040

4141
val file = File(path)
4242
val newFile = File(file.parent, title)
4343
if (!newFile.name.isAValidFilename()) {
44-
context.toast(R.string.invalid_name)
44+
activity.toast(R.string.invalid_name)
4545
return@setOnClickListener
4646
}
4747

@@ -57,7 +57,7 @@ class RenameNoteDialog(val activity: SimpleActivity, val db: DBHelper, val note:
5757
}
5858
db.updateNoteTitle(note)
5959
dismiss()
60-
callback.invoke(note)
60+
callback(note)
6161
}
6262
})
6363
}

0 commit comments

Comments
 (0)