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

update commons to 3.18.9

Browse Source
This commit is contained in:
tibbi
2018-04-05 15:47:07 +02:00
parent f14bc3d1e4
commit 153fd81150
13 changed files with 175 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
app/src/main/kotlin/com/simplemobiletools/notes/activities/MainActivity.kt
View File

@ -14,7 +14,10 @@ import android.view.MenuItem
import com.simplemobiletools.commons.dialogs.FilePickerDialog
import com.simplemobiletools.commons.dialogs.RadioGroupDialog
import com.simplemobiletools.commons.extensions.*
import com.simplemobiletools.commons.helpers.*
import com.simplemobiletools.commons.helpers.LICENSE_LEAK_CANARY
import com.simplemobiletools.commons.helpers.LICENSE_RTL
import com.simplemobiletools.commons.helpers.LICENSE_STETHO
import com.simplemobiletools.commons.helpers.PERMISSION_WRITE_STORAGE
import com.simplemobiletools.commons.models.FAQItem
import com.simplemobiletools.commons.models.FileDirItem
import com.simplemobiletools.commons.models.RadioItem
@ -44,7 +47,6 @@ 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
@ -84,11 +86,6 @@ class MainActivity : SimpleActivity(), ViewPager.OnPageChangeListener {
override fun onResume() {
super.onResume()
if (storedUseEnglish != config.useEnglish) {
restartActivity()
return
}
if (storedEnableLineWrap != config.enableLineWrap) {
initViewPager()
}
@ -173,7 +170,6 @@ class MainActivity : SimpleActivity(), ViewPager.OnPageChangeListener {
private fun storeStateVariables() {
config.apply {
storedUseEnglish = useEnglish
storedEnableLineWrap = enableLineWrap
}
}
@ -241,7 +237,7 @@ class MainActivity : SimpleActivity(), ViewPager.OnPageChangeListener {
}
private fun displayRenameDialog() {
RenameNoteDialog(this, dbHelper, mCurrentNote) {
RenameNoteDialog(this, mCurrentNote) {
mCurrentNote = it
initViewPager()
}
@ -276,10 +272,10 @@ class MainActivity : SimpleActivity(), ViewPager.OnPageChangeListener {
private fun launchAbout() {
val faqItems = arrayListOf(
FAQItem(R.string.faq_1_title_commons, R.string.faq_1_text_commons),
FAQItem(R.string.faq_2_title_commons, R.string.faq_2_text_commons),
FAQItem(R.string.faq_4_title_commons, R.string.faq_4_text_commons)
FAQItem(R.string.faq_4_title_commons, R.string.faq_4_text_commons),
FAQItem(R.string.faq_2_title_commons, R.string.faq_2_text_commons)
)
startAboutActivity(R.string.app_name, LICENSE_KOTLIN or LICENSE_STETHO or LICENSE_RTL or LICENSE_LEAK_CANARY, BuildConfig.VERSION_NAME, faqItems)
startAboutActivity(R.string.app_name, LICENSE_STETHO or LICENSE_RTL or LICENSE_LEAK_CANARY, BuildConfig.VERSION_NAME, faqItems)
}
private fun tryOpenFile() {

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

@ -6,7 +6,6 @@ import android.view.View
import com.simplemobiletools.commons.dialogs.RadioGroupDialog
import com.simplemobiletools.commons.extensions.beVisibleIf
import com.simplemobiletools.commons.extensions.updateTextColors
import com.simplemobiletools.commons.extensions.useEnglishToggled
import com.simplemobiletools.commons.models.RadioItem
import com.simplemobiletools.notes.R
import com.simplemobiletools.notes.extensions.config
@ -61,7 +60,7 @@ class SettingsActivity : SimpleActivity() {
settings_use_english_holder.setOnClickListener {
settings_use_english.toggle()
config.useEnglish = settings_use_english.isChecked
useEnglishToggled()
System.exit(0)
}
}

16
app/src/main/kotlin/com/simplemobiletools/notes/activities/WidgetConfigureActivity.kt
View File

@ -111,16 +111,20 @@ class WidgetConfigureActivity : SimpleActivity() {
}
private fun pickBackgroundColor() {
ColorPickerDialog(this, mBgColorWithoutTransparency) {
mBgColorWithoutTransparency = it
updateBackgroundColor()
ColorPickerDialog(this, mBgColorWithoutTransparency) { wasPositivePressed, color ->
if (wasPositivePressed) {
mBgColorWithoutTransparency = color
updateBackgroundColor()
}
}
}
private fun pickTextColor() {
ColorPickerDialog(this, mTextColor) {
mTextColor = it
updateTextColor()
ColorPickerDialog(this, mTextColor) { wasPositivePressed, color ->
if (wasPositivePressed) {
mTextColor = color
updateTextColor()
}
}
}