Allow to choose whether to put cursor to end of note

trubitsyn · trubitsyn · commit cad1cee0a2a4 · 2017-06-19T01:35:52.000+03:00
diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/activities/SettingsActivity.kt b/app/src/main/kotlin/com/simplemobiletools/notes/activities/SettingsActivity.kt
@@ -31,6 +31,7 @@ class SettingsActivity : SimpleActivity() {
         setupFontSize()
         setupGravity()
         setupWidgetNote()
+        setupCursorPlacement()
         updateTextColors(settings_scrollview)
     }
 
@@ -121,6 +122,14 @@ class SettingsActivity : SimpleActivity() {
         }
     }
 
+    private fun setupCursorPlacement() {
+        settings_cursor_placement.isChecked = config.placeCursorToEnd
+        settings_cursor_placement_holder.setOnClickListener {
+            settings_cursor_placement.toggle()
+            config.placeCursorToEnd = settings_cursor_placement.isChecked
+        }
+    }
+
     private fun getCurrentWidgetNoteTitle(currentNoteId: Int, notes: List<Note>): String {
         return notes.firstOrNull { it.id == currentNoteId }?.title ?: ""
     }
diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/fragments/NoteFragment.kt b/app/src/main/kotlin/com/simplemobiletools/notes/fragments/NoteFragment.kt
@@ -111,7 +111,10 @@ class NoteFragment : Fragment() {
             setColors(config.textColor, config.primaryColor, config.backgroundColor)
             setTextSize(TypedValue.COMPLEX_UNIT_PX, context.getTextSize())
             gravity = getTextGravity()
-            setSelection(text.length)
+
+            if (config.placeCursorToEnd) {
+                setSelection(text.length)
+            }
         }
     }
 
diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/helpers/Config.kt b/app/src/main/kotlin/com/simplemobiletools/notes/helpers/Config.kt
@@ -31,4 +31,8 @@ class Config(context: Context) : BaseConfig(context) {
     var widgetNoteId: Int
         get() = prefs.getInt(WIDGET_NOTE_ID, 1)
         set(id) = prefs.edit().putInt(WIDGET_NOTE_ID, id).apply()
+
+    var placeCursorToEnd: Boolean
+        get() = prefs.getBoolean(CURSOR_PLACEMENT, true)
+        set(placement) = prefs.edit().putBoolean(CURSOR_PLACEMENT, placement).apply()
 }
diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/helpers/Constants.kt b/app/src/main/kotlin/com/simplemobiletools/notes/helpers/Constants.kt
@@ -10,6 +10,7 @@ val CLICKABLE_LINKS = "clickable_links"
 val WIDGET_NOTE_ID = "widget_note_id"
 val FONT_SIZE = "font_size"
 val GRAVITY = "gravity"
+val CURSOR_PLACEMENT = "cursor_placement"
 
 // gravity
 val GRAVITY_LEFT = 0
diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
@@ -70,6 +70,29 @@
 
         </RelativeLayout>
 
+        <RelativeLayout
+            android:id="@+id/settings_cursor_placement_holder"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/medium_margin"
+            android:background="?attr/selectableItemBackground"
+            android:paddingBottom="@dimen/bigger_margin"
+            android:paddingLeft="@dimen/activity_margin"
+            android:paddingRight="@dimen/activity_margin"
+            android:paddingTop="@dimen/bigger_margin">
+
+            <com.simplemobiletools.commons.views.MySwitchCompat
+                android:id="@+id/settings_cursor_placement"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="@null"
+                android:clickable="false"
+                android:paddingLeft="@dimen/medium_margin"
+                android:paddingStart="@dimen/medium_margin"
+                android:text="@string/place_cursor_end"/>
+
+        </RelativeLayout>
+
         <RelativeLayout
             android:id="@+id/settings_font_size_holder"
             android:layout_width="match_parent"
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
@@ -30,6 +30,7 @@
     <!-- Settings -->
     <string name="widget_note">Widget-Notiz</string>
     <string name="links_and_emails_clickable">Links und E-Mail Adressen anklickbar</string>
+    <string name="place_cursor_end">Place cursor to the end of note</string>
     <string name="note_font_size">Schriftgröße</string>
     <string name="small">Klein</string>
     <string name="normal">Normal</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
@@ -30,6 +30,7 @@
     <!-- Settings -->
     <string name="note_font_size">Tamaño de fuente</string>
     <string name="links_and_emails_clickable">Make links and emails clickable</string>
+    <string name="place_cursor_end">Place cursor to the end of note</string>
     <string name="widget_note">Nota del widget</string>
     <string name="small">Pequeña</string>
     <string name="normal">Normal</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
@@ -30,6 +30,7 @@
     <!-- Settings -->
     <string name="widget_note">Note utilisée dans le widget</string>
     <string name="links_and_emails_clickable">Rendre les liens et les emails cliquables</string>
+    <string name="place_cursor_end">Place cursor to the end of note</string>
     <string name="note_font_size">Taille de la police de la note</string>
     <string name="small">Petite</string>
     <string name="normal">Normale</string>
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
@@ -30,6 +30,7 @@
     <!-- Settings -->
     <string name="widget_note">Widgetben használt jegyzet</string>
     <string name="links_and_emails_clickable">Hivatkozások és e-mail címek felismerése</string>
+    <string name="place_cursor_end">Place cursor to the end of note</string>
     <string name="note_font_size">Jegyzet betűméret</string>
     <string name="small">Kicsi</string>
     <string name="normal">Közepes</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
@@ -30,6 +30,7 @@
     <!-- Settings -->
     <string name="note_font_size">Note font size</string>
     <string name="links_and_emails_clickable">Make links and emails clickable</string>
+    <string name="place_cursor_end">Place cursor to the end of note</string>
     <string name="widget_note">Note used in widget</string>
     <string name="small">Small</string>
     <string name="normal">Normal</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
@@ -30,6 +30,7 @@
     <!-- Settings -->
     <string name="note_font_size">メモのフォントサイズ</string>
     <string name="links_and_emails_clickable">Make links and emails clickable</string>
+    <string name="place_cursor_end">Place cursor to the end of note</string>
     <string name="widget_note">ウィジェットで使用するメモ</string>
     <string name="small">小</string>
     <string name="normal">通常</string>
diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml
@@ -30,6 +30,7 @@
     <!-- Settings -->
     <string name="widget_note">Note used in widget</string>
     <string name="links_and_emails_clickable">Make links and emails clickable</string>
+    <string name="place_cursor_end">Place cursor to the end of note</string>
     <string name="note_font_size">Note font size</string>
     <string name="small">Small</string>
     <string name="normal">Normal</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
@@ -30,6 +30,7 @@
     <!-- Settings -->
     <string name="note_font_size">Tamanho do texto da nota</string>
     <string name="links_and_emails_clickable">Ativar clique em ligações e endereços de e-mail</string>
+    <string name="place_cursor_end">Place cursor to the end of note</string>
     <string name="widget_note">Nota utilizada no widget</string>
     <string name="small">Pequeno</string>
     <string name="normal">Normal</string>
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
@@ -30,6 +30,7 @@
     <!-- Settings -->
     <string name="note_font_size">Tamanho do texto da nota</string>
     <string name="links_and_emails_clickable">Ativar clique em ligações e endereços de e-mail</string>
+    <string name="place_cursor_end">Place cursor to the end of note</string>
     <string name="widget_note">Nota utilizada no widget</string>
     <string name="small">Pequeno</string>
     <string name="normal">Normal</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
@@ -30,6 +30,7 @@
     <!-- Settings -->
     <string name="widget_note">Заметка, отображаемая в виджете</string>
     <string name="links_and_emails_clickable">Сделать ссылки и адреса электронной почты активными</string>
+    <string name="place_cursor_end">Помещать курсор в конец заметки</string>
     <string name="note_font_size">Размер текста заметки</string>
     <string name="small">Мелкий</string>
     <string name="normal">Нормальный</string>
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
@@ -30,6 +30,7 @@
     <!-- Settings -->
     <string name="note_font_size">Note font size</string>
     <string name="links_and_emails_clickable">Make links and emails clickable</string>
+    <string name="place_cursor_end">Place cursor to the end of note</string>
     <string name="widget_note">Note used in widget</string>
     <string name="small">Small</string>
     <string name="normal">Normal</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -30,6 +30,7 @@
     <!-- Settings -->
     <string name="widget_note">Note used in widget</string>
     <string name="links_and_emails_clickable">Make links and emails clickable</string>
+    <string name="place_cursor_end">Place cursor to the end of note</string>
     <string name="note_font_size">Note font size</string>
     <string name="small">Small</string>
     <string name="normal">Normal</string>

Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,7 @@ class SettingsActivity : SimpleActivity() {`
`31`	`31`	`setupFontSize()`
`32`	`32`	`setupGravity()`
`33`	`33`	`setupWidgetNote()`
	`34`	`+ setupCursorPlacement()`
`34`	`35`	`updateTextColors(settings_scrollview)`
`35`	`36`	`}`
`36`	`37`
`@@ -121,6 +122,14 @@ class SettingsActivity : SimpleActivity() {`
`121`	`122`	`}`
`122`	`123`	`}`
`123`	`124`
	`125`	`+ private fun setupCursorPlacement() {`
	`126`	`+ settings_cursor_placement.isChecked = config.placeCursorToEnd`
	`127`	`+ settings_cursor_placement_holder.setOnClickListener {`
	`128`	`+ settings_cursor_placement.toggle()`
	`129`	`+ config.placeCursorToEnd = settings_cursor_placement.isChecked`
	`130`	`+ }`
	`131`	`+ }`
	`132`	`+`
`124`	`133`	`private fun getCurrentWidgetNoteTitle(currentNoteId: Int, notes: List<Note>): String {`
`125`	`134`	`return notes.firstOrNull { it.id == currentNoteId }?.title ?: ""`
`126`	`135`	`}`
Original file line number	Diff line number	Diff line change
`@@ -111,7 +111,10 @@ class NoteFragment : Fragment() {`
`111`	`111`	`setColors(config.textColor, config.primaryColor, config.backgroundColor)`
`112`	`112`	`setTextSize(TypedValue.COMPLEX_UNIT_PX, context.getTextSize())`
`113`	`113`	`gravity = getTextGravity()`
`114`		`- setSelection(text.length)`
	`114`	`+`
	`115`	`+ if (config.placeCursorToEnd) {`
	`116`	`+ setSelection(text.length)`
	`117`	`+ }`
`115`	`118`	`}`
`116`	`119`	`}`
`117`	`120`
Original file line number	Diff line number	Diff line change
`@@ -31,4 +31,8 @@ class Config(context: Context) : BaseConfig(context) {`
`31`	`31`	`var widgetNoteId: Int`
`32`	`32`	`get() = prefs.getInt(WIDGET_NOTE_ID, 1)`
`33`	`33`	`set(id) = prefs.edit().putInt(WIDGET_NOTE_ID, id).apply()`
	`34`	`+`
	`35`	`+ var placeCursorToEnd: Boolean`
	`36`	`+ get() = prefs.getBoolean(CURSOR_PLACEMENT, true)`
	`37`	`+ set(placement) = prefs.edit().putBoolean(CURSOR_PLACEMENT, placement).apply()`
`34`	`38`	`}`