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

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

@ -1,10 +1,7 @@
package com.simplemobiletools.notes.activities
import android.Manifest
import android.content.Intent
import android.content.pm.PackageManager
import android.os.Bundle
import android.support.v4.app.ActivityCompat
import android.support.v4.view.ViewPager
import android.text.method.ArrowKeyMovementMethod
import android.text.method.LinkMovementMethod
@ -16,6 +13,7 @@ import com.simplemobiletools.commons.extensions.*
import com.simplemobiletools.commons.helpers.LICENSE_KOTLIN
import com.simplemobiletools.commons.helpers.LICENSE_RTL
import com.simplemobiletools.commons.helpers.LICENSE_STETHO
import com.simplemobiletools.commons.helpers.PERMISSION_WRITE_STORAGE
import com.simplemobiletools.commons.models.RadioItem
import com.simplemobiletools.commons.models.Release
import com.simplemobiletools.commons.views.MyEditText
@ -24,6 +22,7 @@ import com.simplemobiletools.notes.R
import com.simplemobiletools.notes.adapters.NotesPagerAdapter
import com.simplemobiletools.notes.dialogs.*
import com.simplemobiletools.notes.extensions.config
import com.simplemobiletools.notes.extensions.dbHelper
import com.simplemobiletools.notes.extensions.getTextSize
import com.simplemobiletools.notes.extensions.updateWidget
import com.simplemobiletools.notes.helpers.DBHelper
@ -37,11 +36,6 @@ import java.io.File
import java.nio.charset.Charset
class MainActivity : SimpleActivity(), ViewPager.OnPageChangeListener {
private val STORAGE_OPEN_FILE = 1
private val STORAGE_OPEN_FILE_ACTION = 2
private val STORAGE_EXPORT_AS_FILE = 3
private var openFilePath = ""
private var mAdapter: NotesPagerAdapter? = null
lateinit var mCurrentNote: Note
@ -54,7 +48,7 @@ class MainActivity : SimpleActivity(), ViewPager.OnPageChangeListener {
super.onCreate(savedInstanceState)
setContentView(R.layout.activity_main)
mDb = DBHelper.newInstance(applicationContext)
mDb = applicationContext.dbHelper
initViewPager()
pager_title_strip.setTextSize(TypedValue.COMPLEX_UNIT_PX, getTextSize())
@ -105,11 +99,10 @@ class MainActivity : SimpleActivity(), ViewPager.OnPageChangeListener {
return
}
if (hasWriteStoragePermission()) {
importFileWithSync(path)
} else {
this.openFilePath = path
ActivityCompat.requestPermissions(this, arrayOf(Manifest.permission.WRITE_EXTERNAL_STORAGE), STORAGE_OPEN_FILE_ACTION)
handlePermission(PERMISSION_WRITE_STORAGE) {
if (it) {
importFileWithSync(path)
}
}
}
@ -147,6 +140,7 @@ class MainActivity : SimpleActivity(), ViewPager.OnPageChangeListener {
override fun onCreateOptionsMenu(menu: Menu): Boolean {
menuInflater.inflate(R.menu.menu, menu)
updateMenuTextSize(resources, menu)
return true
}
@ -239,10 +233,10 @@ class MainActivity : SimpleActivity(), ViewPager.OnPageChangeListener {
}
private fun tryOpenFile() {
if (hasWriteStoragePermission()) {
openFile()
} else {
ActivityCompat.requestPermissions(this, arrayOf(Manifest.permission.WRITE_EXTERNAL_STORAGE), STORAGE_OPEN_FILE)
handlePermission(PERMISSION_WRITE_STORAGE) {
if (it) {
openFile()
}
}
}
@ -281,10 +275,10 @@ class MainActivity : SimpleActivity(), ViewPager.OnPageChangeListener {
}
private fun tryExportAsFile() {
if (hasWriteStoragePermission()) {
exportAsFile()
} else {
ActivityCompat.requestPermissions(this, arrayOf(Manifest.permission.WRITE_EXTERNAL_STORAGE), STORAGE_EXPORT_AS_FILE)
handlePermission(PERMISSION_WRITE_STORAGE) {
if (it) {
exportAsFile()
}
}
}
@ -407,18 +401,6 @@ class MainActivity : SimpleActivity(), ViewPager.OnPageChangeListener {
}
}
override fun onRequestPermissionsResult(requestCode: Int, permissions: Array<String>, grantResults: IntArray) {
super.onRequestPermissionsResult(requestCode, permissions, grantResults)
if (grantResults.isNotEmpty() && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
when (requestCode) {
STORAGE_OPEN_FILE -> openFile()
STORAGE_EXPORT_AS_FILE -> exportAsFile()
STORAGE_OPEN_FILE_ACTION -> importFileWithSync(openFilePath)
}
}
}
override fun onPageScrollStateChanged(state: Int) {
}

3
app/src/main/kotlin/com/simplemobiletools/notes/activities/SettingsActivity.kt
View File

@ -8,6 +8,7 @@ import com.simplemobiletools.commons.extensions.updateTextColors
import com.simplemobiletools.commons.models.RadioItem
import com.simplemobiletools.notes.R
import com.simplemobiletools.notes.extensions.config
import com.simplemobiletools.notes.extensions.dbHelper
import com.simplemobiletools.notes.extensions.updateWidget
import com.simplemobiletools.notes.helpers.*
import com.simplemobiletools.notes.models.Note
@ -122,7 +123,7 @@ class SettingsActivity : SimpleActivity() {
})
private fun setupWidgetNote() {
val notes = DBHelper.newInstance(this).getNotes()
val notes = dbHelper.getNotes()
if (notes.size <= 1) {
settings_widget_note_holder.visibility = View.GONE
return