fenix/Simple-Notes
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Notes.git synced 2025-05-25 03:14:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

properly update the gravity of widgets too

Browse Source
This commit is contained in:
tibbi 2016-11-27 11:21:47 +01:00
parent 576f3a0c91
commit c575415c51
3 changed files with 45 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7,6 +7,7 @@ import android.content.Context
import android.content.Intent import android.content.Intent
import android.content.SharedPreferences import android.content.SharedPreferences
import android.graphics.Color import android.graphics.Color
import android.view.View
import android.widget.RemoteViews 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
@ -15,6 +16,7 @@ import com.simplemobiletools.notes.extensions.getTextSize
class MyWidgetProvider : AppWidgetProvider() { class MyWidgetProvider : AppWidgetProvider() {
lateinit var mDb: DBHelper lateinit var mDb: DBHelper
var textIds = arrayOf(R.id.notes_view_left, R.id.notes_view_center, R.id.notes_view_right)
companion object { companion object {
lateinit var mPrefs: SharedPreferences lateinit var mPrefs: SharedPreferences
@ -26,11 +28,17 @@ class MyWidgetProvider : AppWidgetProvider() {
val defaultColor = context.resources.getColor(R.color.dark_grey) val defaultColor = context.resources.getColor(R.color.dark_grey)
val newBgColor = mPrefs.getInt(WIDGET_BG_COLOR, defaultColor) val newBgColor = mPrefs.getInt(WIDGET_BG_COLOR, defaultColor)
val newTextColor = mPrefs.getInt(WIDGET_TEXT_COLOR, Color.WHITE) val newTextColor = mPrefs.getInt(WIDGET_TEXT_COLOR, Color.WHITE)
for (id in textIds) {
mRemoteViews.apply { mRemoteViews.apply {
setInt(R.id.notes_view, "setBackgroundColor", newBgColor) setInt(id, "setBackgroundColor", newBgColor)
setInt(R.id.notes_view, "setTextColor", newTextColor) setInt(id, "setTextColor", newTextColor)
setFloat(R.id.notes_view, "setTextSize", context.getTextSize() / context.resources.displayMetrics.density) setFloat(id, "setTextSize", context.getTextSize() / context.resources.displayMetrics.density)
setViewVisibility(id, View.GONE)
} }
}
mRemoteViews.setViewVisibility(getProperTextView(context), View.VISIBLE)
for (widgetId in appWidgetIds) { for (widgetId in appWidgetIds) {
updateWidget(appWidgetManager, widgetId, mRemoteViews) updateWidget(appWidgetManager, widgetId, mRemoteViews)
@ -38,6 +46,14 @@ class MyWidgetProvider : AppWidgetProvider() {
super.onUpdate(context, appWidgetManager, appWidgetIds) super.onUpdate(context, appWidgetManager, appWidgetIds)
} }
private fun getProperTextView(context: Context): Int {
return when (Config.newInstance(context).gravity) {
GRAVITY_CENTER -> R.id.notes_view_center
GRAVITY_RIGHT -> R.id.notes_view_right
else -> R.id.notes_view_left
}
}
private fun initVariables(context: Context) { private fun initVariables(context: Context) {
mPrefs = context.getSharedPreferences(PREFS_KEY, Context.MODE_PRIVATE) mPrefs = context.getSharedPreferences(PREFS_KEY, Context.MODE_PRIVATE)
mDb = DBHelper.newInstance(context) mDb = DBHelper.newInstance(context)
@ -54,7 +70,8 @@ class MyWidgetProvider : AppWidgetProvider() {
private fun updateWidget(widgetManager: AppWidgetManager, widgetId: Int, remoteViews: RemoteViews) { private fun updateWidget(widgetManager: AppWidgetManager, widgetId: Int, remoteViews: RemoteViews) {
val widgetNoteId = mPrefs.getInt(WIDGET_NOTE_ID, 1) val widgetNoteId = mPrefs.getInt(WIDGET_NOTE_ID, 1)
val note = mDb.getNote(widgetNoteId) val note = mDb.getNote(widgetNoteId)
remoteViews.setTextViewText(R.id.notes_view, note?.value ?: "") for (id in textIds)
remoteViews.setTextViewText(id, note?.value ?: "")
widgetManager.updateAppWidget(widgetId, remoteViews) widgetManager.updateAppWidget(widgetId, remoteViews)
} }
} }

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

@ -72,6 +72,7 @@ class SettingsActivity : SimpleActivity() {
settings_gravity.onItemSelectedListener = object : AdapterView.OnItemSelectedListener { settings_gravity.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
override fun onItemSelected(parent: AdapterView<*>?, view: View?, position: Int, id: Long) { override fun onItemSelected(parent: AdapterView<*>?, view: View?, position: Int, id: Long) {
config.gravity = settings_gravity.selectedItemPosition config.gravity = settings_gravity.selectedItemPosition
updateWidget()
} }
override fun onNothingSelected(parent: AdapterView<*>?) { override fun onNothingSelected(parent: AdapterView<*>?) {

25
app/src/main/res/layout/widget.xml
View File

@ -6,11 +6,30 @@
android:layout_height="match_parent"> android:layout_height="match_parent">
<TextView <TextView
android:id="@+id/notes_view" android:id="@+id/notes_view_left"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@null" android:background="@null"
android:gravity="start" android:gravity="left"
android:padding="@dimen/activity_margin"/> android:padding="@dimen/activity_margin"
android:visibility="gone"/>
<TextView
android:id="@+id/notes_view_center"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@null"
android:gravity="center_horizontal"
android:padding="@dimen/activity_margin"
android:visibility="gone"/>
<TextView
android:id="@+id/notes_view_right"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@null"
android:gravity="right"
android:padding="@dimen/activity_margin"
android:visibility="gone"/>
</RelativeLayout> </RelativeLayout>