mirror of
https://github.com/SimpleMobileTools/Simple-Notes.git
synced 2025-06-05 17:00:23 +02:00
fix #160, allow disabling line wrap
This commit is contained in:
@ -43,6 +43,7 @@ class MainActivity : SimpleActivity(), ViewPager.OnPageChangeListener {
|
||||
private var noteViewWithTextSelected: MyEditText? = null
|
||||
private var wasInit = false
|
||||
private var storedUseEnglish = false
|
||||
private var storedEnableLineWrap = true
|
||||
private var showSaveButton = false
|
||||
private var saveNoteButton: MenuItem? = null
|
||||
|
||||
@ -86,6 +87,10 @@ class MainActivity : SimpleActivity(), ViewPager.OnPageChangeListener {
|
||||
return
|
||||
}
|
||||
|
||||
if (storedEnableLineWrap != config.enableLineWrap) {
|
||||
initViewPager()
|
||||
}
|
||||
|
||||
invalidateOptionsMenu()
|
||||
pager_title_strip.apply {
|
||||
setTextSize(TypedValue.COMPLEX_UNIT_PX, getTextSize())
|
||||
@ -165,7 +170,10 @@ class MainActivity : SimpleActivity(), ViewPager.OnPageChangeListener {
|
||||
}
|
||||
|
||||
private fun storeStateVariables() {
|
||||
storedUseEnglish = config.useEnglish
|
||||
config.apply {
|
||||
storedUseEnglish = useEnglish
|
||||
storedEnableLineWrap = enableLineWrap
|
||||
}
|
||||
}
|
||||
|
||||
private fun handleText(text: String) {
|
||||
@ -206,8 +214,9 @@ class MainActivity : SimpleActivity(), ViewPager.OnPageChangeListener {
|
||||
mNotes = dbHelper.getNotes()
|
||||
mCurrentNote = mNotes[0]
|
||||
var wantedNoteId = intent.getIntExtra(OPEN_NOTE_ID, -1)
|
||||
if (wantedNoteId == -1)
|
||||
if (wantedNoteId == -1) {
|
||||
wantedNoteId = config.currentNoteId
|
||||
}
|
||||
|
||||
val itemIndex = getNoteIndexWithId(wantedNoteId)
|
||||
|
||||
|
@ -40,6 +40,7 @@ class SettingsActivity : SimpleActivity() {
|
||||
setupShowKeyboard()
|
||||
setupShowNotePicker()
|
||||
setupShowWordCount()
|
||||
setupEnableLineWrap()
|
||||
setupFontSize()
|
||||
setupGravity()
|
||||
setupWidgetNote()
|
||||
@ -120,6 +121,14 @@ class SettingsActivity : SimpleActivity() {
|
||||
}
|
||||
}
|
||||
|
||||
private fun setupEnableLineWrap() {
|
||||
settings_enable_line_wrap.isChecked = config.enableLineWrap
|
||||
settings_enable_line_wrap_holder.setOnClickListener {
|
||||
settings_enable_line_wrap.toggle()
|
||||
config.enableLineWrap = settings_enable_line_wrap.isChecked
|
||||
}
|
||||
}
|
||||
|
||||
private fun setupFontSize() {
|
||||
settings_font_size.text = getFontSizeText()
|
||||
settings_font_size_holder.setOnClickListener {
|
||||
|
Reference in New Issue
Block a user