From 3c368db0fe00718a8de37920be5487c99546ee88 Mon Sep 17 00:00:00 2001 From: tibbi Date: Thu, 25 Oct 2018 21:09:36 +0200 Subject: [PATCH] updating Commons with some code updates --- app/build.gradle | 2 +- .../notes/activities/MainActivity.kt | 38 ++++++++----------- .../notes/activities/SettingsActivity.kt | 17 ++++----- .../activities/WidgetConfigureActivity.kt | 24 +++--------- .../notes/adapters/NotesPagerAdapter.kt | 4 +- 5 files changed, 32 insertions(+), 53 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 5e71e159..51df75ba 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -41,7 +41,7 @@ android { } dependencies { - implementation 'com.simplemobiletools:commons:5.1.4' + implementation 'com.simplemobiletools:commons:5.2.9' implementation 'com.facebook.stetho:stetho:1.5.0' } diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/notes/activities/MainActivity.kt index 91a10801..a41dae79 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/activities/MainActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/notes/activities/MainActivity.kt @@ -36,19 +36,18 @@ import kotlinx.android.synthetic.main.activity_main.* import java.io.File import java.nio.charset.Charset -class MainActivity : SimpleActivity(), androidx.viewpager.widget.ViewPager.OnPageChangeListener { - private var mAdapter: NotesPagerAdapter? = null - +class MainActivity : SimpleActivity() { private lateinit var mCurrentNote: Note private var mNotes = ArrayList() - + private var mAdapter: NotesPagerAdapter? = null private var noteViewWithTextSelected: MyEditText? = null + private var saveNoteButton: MenuItem? = null + private var wasInit = false private var storedEnableLineWrap = true private var showSaveButton = false private var showUndoButton = false private var showRedoButton = false - private var saveNoteButton: MenuItem? = null override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) @@ -182,10 +181,8 @@ class MainActivity : SimpleActivity(), androidx.viewpager.widget.ViewPager.OnPag ConfirmationAdvancedDialog(this, "", R.string.unsaved_changes_warning, R.string.save, R.string.discard) { if (it) { mAdapter?.saveAllFragmentTexts() - super.onBackPressed() - } else { - super.onBackPressed() } + super.onBackPressed() } } else { super.onBackPressed() @@ -244,7 +241,11 @@ class MainActivity : SimpleActivity(), androidx.viewpager.widget.ViewPager.OnPag view_pager.apply { adapter = mAdapter currentItem = getWantedNoteIndex() - addOnPageChangeListener(this@MainActivity) + + onPageChangeListener { + mCurrentNote = mNotes[it] + config.currentNoteId = mCurrentNote.id + } } if (!config.showKeyboard) { @@ -499,11 +500,13 @@ class MainActivity : SimpleActivity(), androidx.viewpager.widget.ViewPager.OnPag } } - private fun getCurrentNoteText() = (view_pager.adapter as NotesPagerAdapter).getCurrentNoteViewText(view_pager.currentItem) + private fun getPagerAdapter() = view_pager.adapter as NotesPagerAdapter - private fun addTextToCurrentNote(text: String) = (view_pager.adapter as NotesPagerAdapter).appendText(view_pager.currentItem, text) + private fun getCurrentNoteText() = getPagerAdapter().getCurrentNoteViewText(view_pager.currentItem) - private fun saveCurrentNote(force: Boolean) = (view_pager.adapter as NotesPagerAdapter).saveCurrentNote(view_pager.currentItem, force) + private fun addTextToCurrentNote(text: String) = getPagerAdapter().appendText(view_pager.currentItem, text) + + private fun saveCurrentNote(force: Boolean) = getPagerAdapter().saveCurrentNote(view_pager.currentItem, force) private fun displayDeleteNotePrompt() { DeleteNoteDialog(this, mCurrentNote) { @@ -596,17 +599,6 @@ class MainActivity : SimpleActivity(), androidx.viewpager.widget.ViewPager.OnPag } } - override fun onPageScrollStateChanged(state: Int) { - } - - override fun onPageScrolled(position: Int, positionOffset: Float, positionOffsetPixels: Int) { - } - - override fun onPageSelected(position: Int) { - mCurrentNote = mNotes[position] - config.currentNoteId = mCurrentNote.id - } - fun currentNoteTextChanged(newText: String, showUndo: Boolean, showRedo: Boolean) { var shouldRecreateMenu = false if (showUndo != showUndoButton) { diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/activities/SettingsActivity.kt b/app/src/main/kotlin/com/simplemobiletools/notes/activities/SettingsActivity.kt index 38d3b125..58ef2e91 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/activities/SettingsActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/notes/activities/SettingsActivity.kt @@ -1,7 +1,6 @@ package com.simplemobiletools.notes.activities import android.content.Intent -import android.content.res.Resources import android.os.Bundle import com.simplemobiletools.commons.dialogs.RadioGroupDialog import com.simplemobiletools.commons.extensions.* @@ -18,13 +17,11 @@ import kotlinx.android.synthetic.main.activity_settings.* import java.util.* class SettingsActivity : SimpleActivity() { - lateinit var res: Resources var notes = ArrayList() override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) setContentView(R.layout.activity_settings) - res = resources notes = dbHelper.getNotes() } @@ -159,10 +156,10 @@ class SettingsActivity : SimpleActivity() { settings_font_size.text = getFontSizeText() settings_font_size_holder.setOnClickListener { val items = arrayListOf( - RadioItem(FONT_SIZE_SMALL, res.getString(R.string.small)), - RadioItem(FONT_SIZE_MEDIUM, res.getString(R.string.medium)), - RadioItem(FONT_SIZE_LARGE, res.getString(R.string.large)), - RadioItem(FONT_SIZE_EXTRA_LARGE, res.getString(R.string.extra_large))) + RadioItem(FONT_SIZE_SMALL, getString(R.string.small)), + RadioItem(FONT_SIZE_MEDIUM, getString(R.string.medium)), + RadioItem(FONT_SIZE_LARGE, getString(R.string.large)), + RadioItem(FONT_SIZE_EXTRA_LARGE, getString(R.string.extra_large))) RadioGroupDialog(this@SettingsActivity, items, config.fontSize) { config.fontSize = it as Int @@ -183,9 +180,9 @@ class SettingsActivity : SimpleActivity() { settings_gravity.text = getGravityText() settings_gravity_holder.setOnClickListener { val items = arrayListOf( - RadioItem(GRAVITY_LEFT, res.getString(R.string.left)), - RadioItem(GRAVITY_CENTER, res.getString(R.string.center)), - RadioItem(GRAVITY_RIGHT, res.getString(R.string.right))) + RadioItem(GRAVITY_LEFT, getString(R.string.left)), + RadioItem(GRAVITY_CENTER, getString(R.string.center)), + RadioItem(GRAVITY_RIGHT, getString(R.string.right))) RadioGroupDialog(this@SettingsActivity, items, config.gravity) { config.gravity = it as Int diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/activities/WidgetConfigureActivity.kt b/app/src/main/kotlin/com/simplemobiletools/notes/activities/WidgetConfigureActivity.kt index 8fe4c9ba..f017a8fd 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/activities/WidgetConfigureActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/notes/activities/WidgetConfigureActivity.kt @@ -8,7 +8,6 @@ import android.graphics.drawable.ColorDrawable import android.os.Bundle import android.util.TypedValue import android.widget.RemoteViews -import android.widget.SeekBar import com.simplemobiletools.commons.dialogs.ColorPickerDialog import com.simplemobiletools.commons.dialogs.RadioGroupDialog import com.simplemobiletools.commons.extensions.* @@ -65,13 +64,17 @@ class WidgetConfigureActivity : SimpleActivity() { mBgColor = Color.BLACK mBgAlpha = .2f } else { - mBgAlpha = Color.alpha(mBgColor) / 255.toFloat() + mBgAlpha = Color.alpha(mBgColor) / 255f } mBgColorWithoutTransparency = Color.rgb(Color.red(mBgColor), Color.green(mBgColor), Color.blue(mBgColor)) config_bg_seekbar.apply { - setOnSeekBarChangeListener(bgSeekbarChangeListener) progress = (mBgAlpha * 100).toInt() + + onSeekBarChangeListener { + mBgAlpha = it / 100f + updateBackgroundColor() + } } updateBackgroundColor() @@ -163,19 +166,4 @@ class WidgetConfigureActivity : SimpleActivity() { } } } - - private val bgSeekbarChangeListener = object : SeekBar.OnSeekBarChangeListener { - override fun onProgressChanged(seekBar: SeekBar, progress: Int, fromUser: Boolean) { - mBgAlpha = progress.toFloat() / 100.toFloat() - updateBackgroundColor() - } - - override fun onStartTrackingTouch(seekBar: SeekBar) { - - } - - override fun onStopTrackingTouch(seekBar: SeekBar) { - - } - } } diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/adapters/NotesPagerAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/notes/adapters/NotesPagerAdapter.kt index 0d9a879c..24ee1fc2 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/adapters/NotesPagerAdapter.kt +++ b/app/src/main/kotlin/com/simplemobiletools/notes/adapters/NotesPagerAdapter.kt @@ -3,12 +3,14 @@ package com.simplemobiletools.notes.adapters import android.app.Activity import android.os.Bundle import android.view.ViewGroup +import androidx.fragment.app.FragmentManager +import androidx.fragment.app.FragmentStatePagerAdapter import com.simplemobiletools.commons.extensions.showErrorToast import com.simplemobiletools.notes.fragments.NoteFragment import com.simplemobiletools.notes.helpers.NOTE_ID import com.simplemobiletools.notes.models.Note -class NotesPagerAdapter(fm: androidx.fragment.app.FragmentManager, val notes: List, val activity: Activity) : androidx.fragment.app.FragmentStatePagerAdapter(fm) { +class NotesPagerAdapter(fm: FragmentManager, val notes: List, val activity: Activity) : FragmentStatePagerAdapter(fm) { private var fragments: HashMap = LinkedHashMap() override fun getCount() = notes.size