fenix/Simple-Notes
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Notes.git synced 2025-03-03 10:27:44 +01: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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -11,6 +11,7 @@ import android.widget.RemoteViews
import com.simplemobiletools.notes.R.layout.widget
import com.simplemobiletools.notes.activities.MainActivity
import com.simplemobiletools.notes.databases.DBHelper
import com.simplemobiletools.notes.extensions.getTextSize
class MyWidgetProvider : AppWidgetProvider() {
lateinit var mDb: DBHelper
@ -28,7 +29,7 @@ class MyWidgetProvider : AppWidgetProvider() {
mRemoteViews.apply {
setInt(R.id.notes_view, "setBackgroundColor", newBgColor)
setInt(R.id.notes_view, "setTextColor", newTextColor)
setFloat(R.id.notes_view, "setTextSize", Utils.getTextSize(context) / context.resources.displayMetrics.density)
setFloat(R.id.notes_view, "setTextSize", context.getTextSize() / context.resources.displayMetrics.density)
}
for (widgetId in appWidgetIds) {

16
app/src/main/kotlin/com/simplemobiletools/notes/Utils.kt
View File

@ -1,16 +0,0 @@
package com.simplemobiletools.notes
import android.content.Context
object Utils {
fun getTextSize(context: Context): Float {
val fontSize = Config.newInstance(context).fontSize
val res = context.resources
return when (fontSize) {
FONT_SIZE_SMALL -> res.getDimension(R.dimen.small_text_size)
FONT_SIZE_LARGE -> res.getDimension(R.dimen.large_text_size)
FONT_SIZE_EXTRA_LARGE -> res.getDimension(R.dimen.extra_large_text_size)
else -> res.getDimension(R.dimen.medium_text_size)
}
}
}

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() {

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

@ -10,7 +10,7 @@ import com.simplemobiletools.notes.R
import com.simplemobiletools.notes.databases.DBHelper
import kotlinx.android.synthetic.main.dialog_radio_group.view.*
class OpenNoteDialog(val activity: Activity) : RadioGroup.OnCheckedChangeListener {
class OpenNoteDialog(val activity: Activity, val callback: (checkedId: Int) -> Unit) : RadioGroup.OnCheckedChangeListener {
val dialog: AlertDialog?
init {
@ -39,11 +39,7 @@ class OpenNoteDialog(val activity: Activity) : RadioGroup.OnCheckedChangeListene
}
override fun onCheckedChanged(group: RadioGroup, checkedId: Int) {
(activity as OpenNoteListener).noteSelected(checkedId)
callback.invoke(checkedId)
dialog?.dismiss()
}
interface OpenNoteListener {
fun noteSelected(id: Int)
}
}

12
app/src/main/kotlin/com/simplemobiletools/notes/extensions/context.kt Normal file
View File

@ -0,0 +1,12 @@
package com.simplemobiletools.notes.extensions
import android.content.Context
import com.simplemobiletools.notes.*
fun Context.getTextSize() =
when (Config.newInstance(this).fontSize) {
FONT_SIZE_SMALL -> resources.getDimension(R.dimen.small_text_size)
FONT_SIZE_LARGE -> resources.getDimension(R.dimen.large_text_size)
FONT_SIZE_EXTRA_LARGE -> resources.getDimension(R.dimen.extra_large_text_size)
else -> resources.getDimension(R.dimen.medium_text_size)
}