mirror of
				https://github.com/SimpleMobileTools/Simple-Notes.git
				synced 2025-06-05 17:00:23 +02:00 
			
		
		
		
	move text size getter in an extension
This commit is contained in:
		| @@ -11,6 +11,7 @@ import android.widget.RemoteViews | |||||||
| import com.simplemobiletools.notes.R.layout.widget | import com.simplemobiletools.notes.R.layout.widget | ||||||
| import com.simplemobiletools.notes.activities.MainActivity | import com.simplemobiletools.notes.activities.MainActivity | ||||||
| import com.simplemobiletools.notes.databases.DBHelper | import com.simplemobiletools.notes.databases.DBHelper | ||||||
|  | import com.simplemobiletools.notes.extensions.getTextSize | ||||||
|  |  | ||||||
| class MyWidgetProvider : AppWidgetProvider() { | class MyWidgetProvider : AppWidgetProvider() { | ||||||
|     lateinit var mDb: DBHelper |     lateinit var mDb: DBHelper | ||||||
| @@ -28,7 +29,7 @@ class MyWidgetProvider : AppWidgetProvider() { | |||||||
|         mRemoteViews.apply { |         mRemoteViews.apply { | ||||||
|             setInt(R.id.notes_view, "setBackgroundColor", newBgColor) |             setInt(R.id.notes_view, "setBackgroundColor", newBgColor) | ||||||
|             setInt(R.id.notes_view, "setTextColor", newTextColor) |             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) { |         for (widgetId in appWidgetIds) { | ||||||
|   | |||||||
| @@ -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) |  | ||||||
|         } |  | ||||||
|     } |  | ||||||
| } |  | ||||||
| @@ -16,15 +16,15 @@ import com.simplemobiletools.filepicker.extensions.value | |||||||
| import com.simplemobiletools.notes.MyWidgetProvider | import com.simplemobiletools.notes.MyWidgetProvider | ||||||
| import com.simplemobiletools.notes.R | import com.simplemobiletools.notes.R | ||||||
| import com.simplemobiletools.notes.TYPE_NOTE | import com.simplemobiletools.notes.TYPE_NOTE | ||||||
| import com.simplemobiletools.notes.Utils |  | ||||||
| import com.simplemobiletools.notes.databases.DBHelper | import com.simplemobiletools.notes.databases.DBHelper | ||||||
| import com.simplemobiletools.notes.dialogs.NewNoteDialog | import com.simplemobiletools.notes.dialogs.NewNoteDialog | ||||||
| import com.simplemobiletools.notes.dialogs.OpenNoteDialog | import com.simplemobiletools.notes.dialogs.OpenNoteDialog | ||||||
| import com.simplemobiletools.notes.dialogs.WidgetNoteDialog | import com.simplemobiletools.notes.dialogs.WidgetNoteDialog | ||||||
|  | import com.simplemobiletools.notes.extensions.getTextSize | ||||||
| import com.simplemobiletools.notes.models.Note | import com.simplemobiletools.notes.models.Note | ||||||
| import kotlinx.android.synthetic.main.activity_main.* | import kotlinx.android.synthetic.main.activity_main.* | ||||||
|  |  | ||||||
| class MainActivity : SimpleActivity(), OpenNoteDialog.OpenNoteListener { | class MainActivity : SimpleActivity() { | ||||||
|     private var mCurrentNote: Note? = null |     private var mCurrentNote: Note? = null | ||||||
|  |  | ||||||
|     lateinit var mDb: DBHelper |     lateinit var mDb: DBHelper | ||||||
| @@ -50,7 +50,7 @@ class MainActivity : SimpleActivity(), OpenNoteDialog.OpenNoteListener { | |||||||
|     override fun onResume() { |     override fun onResume() { | ||||||
|         super.onResume() |         super.onResume() | ||||||
|         invalidateOptionsMenu() |         invalidateOptionsMenu() | ||||||
|         notes_view.setTextSize(TypedValue.COMPLEX_UNIT_PX, Utils.getTextSize(applicationContext)) |         notes_view.setTextSize(TypedValue.COMPLEX_UNIT_PX, applicationContext.getTextSize()) | ||||||
|     } |     } | ||||||
|  |  | ||||||
|     override fun onPause() { |     override fun onPause() { | ||||||
| @@ -160,7 +160,9 @@ class MainActivity : SimpleActivity(), OpenNoteDialog.OpenNoteListener { | |||||||
|     } |     } | ||||||
|  |  | ||||||
|     private fun displayOpenNoteDialog() { |     private fun displayOpenNoteDialog() { | ||||||
|         OpenNoteDialog(this) |         OpenNoteDialog(this) { | ||||||
|  |             updateSelectedNote(it) | ||||||
|  |         } | ||||||
|     } |     } | ||||||
|  |  | ||||||
|     private fun saveText() { |     private fun saveText() { | ||||||
| @@ -202,8 +204,6 @@ class MainActivity : SimpleActivity(), OpenNoteDialog.OpenNoteListener { | |||||||
|         imm.hideSoftInputFromWindow(notes_view.windowToken, 0) |         imm.hideSoftInputFromWindow(notes_view.windowToken, 0) | ||||||
|     } |     } | ||||||
|  |  | ||||||
|     override fun noteSelected(id: Int) = updateSelectedNote(id) |  | ||||||
|  |  | ||||||
|     fun updateWidget(context: Context) { |     fun updateWidget(context: Context) { | ||||||
|         val widgetManager = AppWidgetManager.getInstance(context) |         val widgetManager = AppWidgetManager.getInstance(context) | ||||||
|         val ids = widgetManager.getAppWidgetIds(ComponentName(context, MyWidgetProvider::class.java)) |         val ids = widgetManager.getAppWidgetIds(ComponentName(context, MyWidgetProvider::class.java)) | ||||||
|   | |||||||
| @@ -11,6 +11,7 @@ import android.util.TypedValue | |||||||
| import android.widget.RemoteViews | import android.widget.RemoteViews | ||||||
| import android.widget.SeekBar | import android.widget.SeekBar | ||||||
| import com.simplemobiletools.notes.* | import com.simplemobiletools.notes.* | ||||||
|  | import com.simplemobiletools.notes.extensions.getTextSize | ||||||
| import kotlinx.android.synthetic.main.widget_config.* | import kotlinx.android.synthetic.main.widget_config.* | ||||||
| import yuku.ambilwarna.AmbilWarnaDialog | import yuku.ambilwarna.AmbilWarnaDialog | ||||||
|  |  | ||||||
| @@ -41,7 +42,7 @@ class WidgetConfigureActivity : AppCompatActivity() { | |||||||
|  |  | ||||||
|     override fun onResume() { |     override fun onResume() { | ||||||
|         super.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() { |     private fun initVariables() { | ||||||
|   | |||||||
| @@ -10,7 +10,7 @@ import com.simplemobiletools.notes.R | |||||||
| import com.simplemobiletools.notes.databases.DBHelper | import com.simplemobiletools.notes.databases.DBHelper | ||||||
| import kotlinx.android.synthetic.main.dialog_radio_group.view.* | 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? |     val dialog: AlertDialog? | ||||||
|  |  | ||||||
|     init { |     init { | ||||||
| @@ -39,11 +39,7 @@ class OpenNoteDialog(val activity: Activity) : RadioGroup.OnCheckedChangeListene | |||||||
|     } |     } | ||||||
|  |  | ||||||
|     override fun onCheckedChanged(group: RadioGroup, checkedId: Int) { |     override fun onCheckedChanged(group: RadioGroup, checkedId: Int) { | ||||||
|         (activity as OpenNoteListener).noteSelected(checkedId) |         callback.invoke(checkedId) | ||||||
|         dialog?.dismiss() |         dialog?.dismiss() | ||||||
|     } |     } | ||||||
|  |  | ||||||
|     interface OpenNoteListener { |  | ||||||
|         fun noteSelected(id: Int) |  | ||||||
|     } |  | ||||||
| } | } | ||||||
|   | |||||||
| @@ -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) | ||||||
|  |         } | ||||||
		Reference in New Issue
	
	Block a user