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

move text size getter in an extension

Browse Source
This commit is contained in:
tibbi
2016-11-21 20:59:22 +01:00
parent 2f46805271
commit 625ee1ac90
6 changed files with 24 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16,15 +16,15 @@ import com.simplemobiletools.filepicker.extensions.value
import com.simplemobiletools.notes.MyWidgetProvider
import com.simplemobiletools.notes.R
import com.simplemobiletools.notes.TYPE_NOTE
import com.simplemobiletools.notes.Utils
import com.simplemobiletools.notes.databases.DBHelper
import com.simplemobiletools.notes.dialogs.NewNoteDialog
import com.simplemobiletools.notes.dialogs.OpenNoteDialog
import com.simplemobiletools.notes.dialogs.WidgetNoteDialog
import com.simplemobiletools.notes.extensions.getTextSize
import com.simplemobiletools.notes.models.Note
import kotlinx.android.synthetic.main.activity_main.*
class MainActivity : SimpleActivity(), OpenNoteDialog.OpenNoteListener {
class MainActivity : SimpleActivity() {
private var mCurrentNote: Note? = null
lateinit var mDb: DBHelper
@ -50,7 +50,7 @@ class MainActivity : SimpleActivity(), OpenNoteDialog.OpenNoteListener {
override fun onResume() {
super.onResume()
invalidateOptionsMenu()
notes_view.setTextSize(TypedValue.COMPLEX_UNIT_PX, Utils.getTextSize(applicationContext))
notes_view.setTextSize(TypedValue.COMPLEX_UNIT_PX, applicationContext.getTextSize())
}
override fun onPause() {
@ -160,7 +160,9 @@ class MainActivity : SimpleActivity(), OpenNoteDialog.OpenNoteListener {
}
private fun displayOpenNoteDialog() {
OpenNoteDialog(this)
OpenNoteDialog(this) {
updateSelectedNote(it)
}
}
private fun saveText() {
@ -202,8 +204,6 @@ class MainActivity : SimpleActivity(), OpenNoteDialog.OpenNoteListener {
imm.hideSoftInputFromWindow(notes_view.windowToken, 0)
}
override fun noteSelected(id: Int) = updateSelectedNote(id)
fun updateWidget(context: Context) {
val widgetManager = AppWidgetManager.getInstance(context)
val ids = widgetManager.getAppWidgetIds(ComponentName(context, MyWidgetProvider::class.java))

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

@ -11,6 +11,7 @@ import android.util.TypedValue
import android.widget.RemoteViews
import android.widget.SeekBar
import com.simplemobiletools.notes.*
import com.simplemobiletools.notes.extensions.getTextSize
import kotlinx.android.synthetic.main.widget_config.*
import yuku.ambilwarna.AmbilWarnaDialog
@ -41,7 +42,7 @@ class WidgetConfigureActivity : AppCompatActivity() {
override fun onResume() {
super.onResume()
notes_view.setTextSize(TypedValue.COMPLEX_UNIT_PX, Utils.getTextSize(applicationContext))
notes_view.setTextSize(TypedValue.COMPLEX_UNIT_PX, applicationContext.getTextSize())
}
private fun initVariables() {