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

allow changing text gravity

Browse Source
This commit is contained in:
tibbi 2016-11-27 10:50:45 +01:00
parent e83c41fa35
commit 8cf5df20b2
16 changed files with 96 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/kotlin/com/simplemobiletools/notes/Config.kt
View File

@ -26,6 +26,10 @@ class Config(context: Context) {
get() = mPrefs.getInt(FONT_SIZE, FONT_SIZE_MEDIUM)
set(size) = mPrefs.edit().putInt(FONT_SIZE, size).apply()
var gravity: Int
get() = mPrefs.getInt(GRAVITY, GRAVITY_LEFT)
set(size) = mPrefs.edit().putInt(GRAVITY, size).apply()
var currentNoteId: Int
get() = mPrefs.getInt(CURRENT_NOTE_ID, 1)
set(id) = mPrefs.edit().putInt(CURRENT_NOTE_ID, id).apply()

6
app/src/main/kotlin/com/simplemobiletools/notes/Constants.kt
View File

@ -10,9 +10,15 @@ val IS_DARK_THEME = "is_dark_theme"
val CURRENT_NOTE_ID = "current_note_id"
val WIDGET_NOTE_ID = "widget_note_id"
val FONT_SIZE = "font_size"
val GRAVITY = "gravity"
val WIDGET_BG_COLOR = "widget_bg_color"
val WIDGET_TEXT_COLOR = "widget_text_color"
// gravity
val GRAVITY_LEFT = 0
val GRAVITY_CENTER = 1
val GRAVITY_RIGHT = 2
// font sizes
val FONT_SIZE_SMALL = 0
val FONT_SIZE_MEDIUM = 1

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

@ -54,7 +54,7 @@ class MyWidgetProvider : AppWidgetProvider() {
private fun updateWidget(widgetManager: AppWidgetManager, widgetId: Int, remoteViews: RemoteViews) {
val widgetNoteId = mPrefs.getInt(WIDGET_NOTE_ID, 1)
val note = mDb.getNote(widgetNoteId)
remoteViews.setTextViewText(R.id.notes_view, if (note != null) note.value else "")
remoteViews.setTextViewText(R.id.notes_view, note?.value ?: "")
widgetManager.updateAppWidget(widgetId, remoteViews)
}
}

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

@ -19,6 +19,7 @@ class SettingsActivity : SimpleActivity() {
setupDarkTheme()
setupFontSize()
setupWidgetNote()
setupGravity()
}
private fun setupDarkTheme() {
@ -66,6 +67,18 @@ class SettingsActivity : SimpleActivity() {
}
}
private fun setupGravity() {
settings_gravity.setSelection(config.gravity)
settings_gravity.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
override fun onItemSelected(parent: AdapterView<*>?, view: View?, position: Int, id: Long) {
config.gravity = settings_gravity.selectedItemPosition
}
override fun onNothingSelected(parent: AdapterView<*>?) {
}
}
}
private fun getNoteIndexWithId(id: Int, notes: List<Note>): Int {
for (i in 0..notes.count() - 1) {
if (notes[i].id == id) {

7
app/src/main/kotlin/com/simplemobiletools/notes/extensions/Context.kt
View File

@ -5,6 +5,7 @@ import android.content.ComponentName
import android.content.Context
import android.content.Intent
import android.util.TypedValue
import android.view.Gravity
import com.simplemobiletools.notes.*
fun Context.getTextSize() =
@ -15,6 +16,12 @@ fun Context.getTextSize() =
else -> resources.getDimension(R.dimen.medium_text_size)
}
fun Context.getTextGravity() =
when (Config.newInstance(this).gravity) {
GRAVITY_CENTER -> Gravity.CENTER_HORIZONTAL
GRAVITY_RIGHT -> Gravity.RIGHT
else -> Gravity.LEFT
}
fun Context.updateWidget() {
val widgetManager = AppWidgetManager.getInstance(this)

2
app/src/main/kotlin/com/simplemobiletools/notes/fragments/NoteFragment.kt
View File

@ -10,6 +10,7 @@ import com.simplemobiletools.filepicker.extensions.value
import com.simplemobiletools.notes.NOTE_ID
import com.simplemobiletools.notes.R
import com.simplemobiletools.notes.databases.DBHelper
import com.simplemobiletools.notes.extensions.getTextGravity
import com.simplemobiletools.notes.extensions.getTextSize
import com.simplemobiletools.notes.extensions.updateWidget
import com.simplemobiletools.notes.models.Note
@ -44,6 +45,7 @@ class NoteFragment : Fragment() {
override fun onResume() {
super.onResume()
view.notes_view.setTextSize(TypedValue.COMPLEX_UNIT_PX, context.getTextSize())
view.notes_view.gravity = context.getTextGravity()
}
override fun onPause() {

27
app/src/main/res/layout/activity_settings.xml
View File

@ -64,6 +64,33 @@
</RelativeLayout>
<RelativeLayout
android:id="@+id/settings_gravity_holder"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/normal_padding"
android:paddingBottom="@dimen/activity_margin"
android:paddingLeft="@dimen/activity_margin"
android:paddingRight="@dimen/normal_padding"
android:paddingTop="@dimen/activity_margin">
<TextView
android:id="@+id/settings_gravity_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:paddingLeft="@dimen/normal_padding"
android:text="@string/gravity"/>
<android.support.v7.widget.AppCompatSpinner
android:id="@+id/settings_gravity"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:entries="@array/gravity"/>
</RelativeLayout>
<RelativeLayout
android:id="@+id/settings_widget_note_holder"
android:layout_width="match_parent"

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

@ -10,7 +10,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@null"
android:gravity="top"
android:gravity="start"
android:padding="@dimen/activity_margin"/>
</RelativeLayout>

4
app/src/main/res/values-de/strings.xml
View File

@ -30,6 +30,10 @@
<string name="normal">Normal</string>
<string name="large">Groß</string>
<string name="extra_large">Sehr groß</string>
<string name="gravity">Gravity</string>
<string name="left">Left</string>
<string name="center">Center</string>
<string name="right">Right</string>
<!-- About -->
<string name="about">Über</string>

4
app/src/main/res/values-es/strings.xml
View File

@ -30,6 +30,10 @@
<string name="normal">Normal</string>
<string name="large">Grande</string>
<string name="extra_large">Enorme</string>
<string name="gravity">Gravity</string>
<string name="left">Left</string>
<string name="center">Center</string>
<string name="right">Right</string>
<!-- About -->
<string name="about">Acerca de Simple Notes</string>

4
app/src/main/res/values-it/strings.xml
View File

@ -30,6 +30,10 @@
<string name="normal">Normal</string>
<string name="large">Large</string>
<string name="extra_large">Extra Large</string>
<string name="gravity">Gravity</string>
<string name="left">Left</string>
<string name="center">Center</string>
<string name="right">Right</string>
<!-- About -->
<string name="about">Informazioni</string>

4
app/src/main/res/values-ja/strings.xml
View File

@ -30,6 +30,10 @@
<string name="normal">通常</string>
<string name="large">大</string>
<string name="extra_large">特大</string>
<string name="gravity">Gravity</string>
<string name="left">Left</string>
<string name="center">Center</string>
<string name="right">Right</string>
<!-- About -->
<string name="about">アプリについて</string>

4
app/src/main/res/values-pt-rPT/strings.xml
View File

@ -30,6 +30,10 @@
<string name="normal">Normal</string>
<string name="large">Grande</string>
<string name="extra_large">Muito grande</string>
<string name="gravity">Gravity</string>
<string name="left">Left</string>
<string name="center">Center</string>
<string name="right">Right</string>
<!-- About -->
<string name="about">Acerca</string>

4
app/src/main/res/values-sv/strings.xml
View File

@ -30,6 +30,10 @@
<string name="normal">Normal</string>
<string name="large">Large</string>
<string name="extra_large">Extra Large</string>
<string name="gravity">Gravity</string>
<string name="left">Left</string>
<string name="center">Center</string>
<string name="right">Right</string>
<!-- About -->
<string name="about">Om</string>

6
app/src/main/res/values/array.xml
View File

@ -6,4 +6,10 @@
<item>@string/large</item>
<item>@string/extra_large</item>
</string-array>
<string-array name="gravity" translatable="false">
<item>@string/left</item>
<item>@string/center</item>
<item>@string/right</item>
</string-array>
</resources>

6
app/src/main/res/values/strings.xml
View File

@ -24,12 +24,16 @@
<!-- Settings -->
<string name="settings">Settings</string>
<string name="dark_theme">Dark theme</string>
<string name="note_font_size">Note font size</string>
<string name="widget_note">Note used in widget</string>
<string name="note_font_size">Note font size</string>
<string name="small">Small</string>
<string name="normal">Normal</string>
<string name="large">Large</string>
<string name="extra_large">Extra Large</string>
<string name="gravity">Gravity</string>
<string name="left">Left</string>
<string name="center">Center</string>
<string name="right">Right</string>
<!-- About -->
<string name="about">About</string>