Skip to content

Commit 3c368db

Browse files
tibbitibbi
committed
updating Commons with some code updates
1 parent eedf0c3 commit 3c368db

File tree

5 files changed

+32
-53
lines changed

5 files changed

+32
-53
lines changed

‎app/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ android {
4141
}
4242

4343
dependencies {
44-
implementation 'com.simplemobiletools:commons:5.1.4'
44+
implementation 'com.simplemobiletools:commons:5.2.9'
4545
implementation 'com.facebook.stetho:stetho:1.5.0'
4646
}
4747

‎app/src/main/kotlin/com/simplemobiletools/notes/activities/MainActivity.kt‎

Lines changed: 15 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -36,19 +36,18 @@ import kotlinx.android.synthetic.main.activity_main.*
3636
import java.io.File
3737
import java.nio.charset.Charset
3838

39-
class MainActivity : SimpleActivity(), androidx.viewpager.widget.ViewPager.OnPageChangeListener {
40-
private var mAdapter: NotesPagerAdapter? = null
41-
39+
class MainActivity : SimpleActivity() {
4240
private lateinit var mCurrentNote: Note
4341
private var mNotes = ArrayList<Note>()
44-
42+
private var mAdapter: NotesPagerAdapter? = null
4543
private var noteViewWithTextSelected: MyEditText? = null
44+
private var saveNoteButton: MenuItem? = null
45+
4646
private var wasInit = false
4747
private var storedEnableLineWrap = true
4848
private var showSaveButton = false
4949
private var showUndoButton = false
5050
private var showRedoButton = false
51-
private var saveNoteButton: MenuItem? = null
5251

5352
override fun onCreate(savedInstanceState: Bundle?) {
5453
super.onCreate(savedInstanceState)
@@ -182,10 +181,8 @@ class MainActivity : SimpleActivity(), androidx.viewpager.widget.ViewPager.OnPag
182181
ConfirmationAdvancedDialog(this, "", R.string.unsaved_changes_warning, R.string.save, R.string.discard) {
183182
if (it) {
184183
mAdapter?.saveAllFragmentTexts()
185-
super.onBackPressed()
186-
} else {
187-
super.onBackPressed()
188184
}
185+
super.onBackPressed()
189186
}
190187
} else {
191188
super.onBackPressed()
@@ -244,7 +241,11 @@ class MainActivity : SimpleActivity(), androidx.viewpager.widget.ViewPager.OnPag
244241
view_pager.apply {
245242
adapter = mAdapter
246243
currentItem = getWantedNoteIndex()
247-
addOnPageChangeListener(this@MainActivity)
244+
245+
onPageChangeListener {
246+
mCurrentNote = mNotes[it]
247+
config.currentNoteId = mCurrentNote.id
248+
}
248249
}
249250

250251
if (!config.showKeyboard) {
@@ -499,11 +500,13 @@ class MainActivity : SimpleActivity(), androidx.viewpager.widget.ViewPager.OnPag
499500
}
500501
}
501502

502-
private fun getCurrentNoteText() = (view_pager.adapter as NotesPagerAdapter).getCurrentNoteViewText(view_pager.currentItem)
503+
private fun getPagerAdapter() = view_pager.adapter as NotesPagerAdapter
504+
505+
private fun getCurrentNoteText() = getPagerAdapter().getCurrentNoteViewText(view_pager.currentItem)
503506

504-
private fun addTextToCurrentNote(text: String) = (view_pager.adapter as NotesPagerAdapter).appendText(view_pager.currentItem, text)
507+
private fun addTextToCurrentNote(text: String) = getPagerAdapter().appendText(view_pager.currentItem, text)
505508

506-
private fun saveCurrentNote(force: Boolean) = (view_pager.adapter as NotesPagerAdapter).saveCurrentNote(view_pager.currentItem, force)
509+
private fun saveCurrentNote(force: Boolean) = getPagerAdapter().saveCurrentNote(view_pager.currentItem, force)
507510

508511
private fun displayDeleteNotePrompt() {
509512
DeleteNoteDialog(this, mCurrentNote) {
@@ -596,17 +599,6 @@ class MainActivity : SimpleActivity(), androidx.viewpager.widget.ViewPager.OnPag
596599
}
597600
}
598601

599-
override fun onPageScrollStateChanged(state: Int) {
600-
}
601-
602-
override fun onPageScrolled(position: Int, positionOffset: Float, positionOffsetPixels: Int) {
603-
}
604-
605-
override fun onPageSelected(position: Int) {
606-
mCurrentNote = mNotes[position]
607-
config.currentNoteId = mCurrentNote.id
608-
}
609-
610602
fun currentNoteTextChanged(newText: String, showUndo: Boolean, showRedo: Boolean) {
611603
var shouldRecreateMenu = false
612604
if (showUndo != showUndoButton) {

‎app/src/main/kotlin/com/simplemobiletools/notes/activities/SettingsActivity.kt‎

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package com.simplemobiletools.notes.activities
22

33
import android.content.Intent
4-
import android.content.res.Resources
54
import android.os.Bundle
65
import com.simplemobiletools.commons.dialogs.RadioGroupDialog
76
import com.simplemobiletools.commons.extensions.*
@@ -18,13 +17,11 @@ import kotlinx.android.synthetic.main.activity_settings.*
1817
import java.util.*
1918

2019
class SettingsActivity : SimpleActivity() {
21-
lateinit var res: Resources
2220
var notes = ArrayList<Note>()
2321

2422
override fun onCreate(savedInstanceState: Bundle?) {
2523
super.onCreate(savedInstanceState)
2624
setContentView(R.layout.activity_settings)
27-
res = resources
2825
notes = dbHelper.getNotes()
2926
}
3027

@@ -159,10 +156,10 @@ class SettingsActivity : SimpleActivity() {
159156
settings_font_size.text = getFontSizeText()
160157
settings_font_size_holder.setOnClickListener {
161158
val items = arrayListOf(
162-
RadioItem(FONT_SIZE_SMALL, res.getString(R.string.small)),
163-
RadioItem(FONT_SIZE_MEDIUM, res.getString(R.string.medium)),
164-
RadioItem(FONT_SIZE_LARGE, res.getString(R.string.large)),
165-
RadioItem(FONT_SIZE_EXTRA_LARGE, res.getString(R.string.extra_large)))
159+
RadioItem(FONT_SIZE_SMALL, getString(R.string.small)),
160+
RadioItem(FONT_SIZE_MEDIUM, getString(R.string.medium)),
161+
RadioItem(FONT_SIZE_LARGE, getString(R.string.large)),
162+
RadioItem(FONT_SIZE_EXTRA_LARGE, getString(R.string.extra_large)))
166163

167164
RadioGroupDialog(this@SettingsActivity, items, config.fontSize) {
168165
config.fontSize = it as Int
@@ -183,9 +180,9 @@ class SettingsActivity : SimpleActivity() {
183180
settings_gravity.text = getGravityText()
184181
settings_gravity_holder.setOnClickListener {
185182
val items = arrayListOf(
186-
RadioItem(GRAVITY_LEFT, res.getString(R.string.left)),
187-
RadioItem(GRAVITY_CENTER, res.getString(R.string.center)),
188-
RadioItem(GRAVITY_RIGHT, res.getString(R.string.right)))
183+
RadioItem(GRAVITY_LEFT, getString(R.string.left)),
184+
RadioItem(GRAVITY_CENTER, getString(R.string.center)),
185+
RadioItem(GRAVITY_RIGHT, getString(R.string.right)))
189186

190187
RadioGroupDialog(this@SettingsActivity, items, config.gravity) {
191188
config.gravity = it as Int

‎app/src/main/kotlin/com/simplemobiletools/notes/activities/WidgetConfigureActivity.kt‎

Lines changed: 6 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import android.graphics.drawable.ColorDrawable
88
import android.os.Bundle
99
import android.util.TypedValue
1010
import android.widget.RemoteViews
11-
import android.widget.SeekBar
1211
import com.simplemobiletools.commons.dialogs.ColorPickerDialog
1312
import com.simplemobiletools.commons.dialogs.RadioGroupDialog
1413
import com.simplemobiletools.commons.extensions.*
@@ -65,13 +64,17 @@ class WidgetConfigureActivity : SimpleActivity() {
6564
mBgColor = Color.BLACK
6665
mBgAlpha = .2f
6766
} else {
68-
mBgAlpha = Color.alpha(mBgColor) / 255.toFloat()
67+
mBgAlpha = Color.alpha(mBgColor) / 255f
6968
}
7069

7170
mBgColorWithoutTransparency = Color.rgb(Color.red(mBgColor), Color.green(mBgColor), Color.blue(mBgColor))
7271
config_bg_seekbar.apply {
73-
setOnSeekBarChangeListener(bgSeekbarChangeListener)
7472
progress = (mBgAlpha * 100).toInt()
73+
74+
onSeekBarChangeListener {
75+
mBgAlpha = it / 100f
76+
updateBackgroundColor()
77+
}
7578
}
7679
updateBackgroundColor()
7780

@@ -163,19 +166,4 @@ class WidgetConfigureActivity : SimpleActivity() {
163166
}
164167
}
165168
}
166-
167-
private val bgSeekbarChangeListener = object : SeekBar.OnSeekBarChangeListener {
168-
override fun onProgressChanged(seekBar: SeekBar, progress: Int, fromUser: Boolean) {
169-
mBgAlpha = progress.toFloat() / 100.toFloat()
170-
updateBackgroundColor()
171-
}
172-
173-
override fun onStartTrackingTouch(seekBar: SeekBar) {
174-
175-
}
176-
177-
override fun onStopTrackingTouch(seekBar: SeekBar) {
178-
179-
}
180-
}
181169
}

‎app/src/main/kotlin/com/simplemobiletools/notes/adapters/NotesPagerAdapter.kt‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,14 @@ package com.simplemobiletools.notes.adapters
33
import android.app.Activity
44
import android.os.Bundle
55
import android.view.ViewGroup
6+
import androidx.fragment.app.FragmentManager
7+
import androidx.fragment.app.FragmentStatePagerAdapter
68
import com.simplemobiletools.commons.extensions.showErrorToast
79
import com.simplemobiletools.notes.fragments.NoteFragment
810
import com.simplemobiletools.notes.helpers.NOTE_ID
911
import com.simplemobiletools.notes.models.Note
1012

11-
class NotesPagerAdapter(fm: androidx.fragment.app.FragmentManager, val notes: List<Note>, val activity: Activity) : androidx.fragment.app.FragmentStatePagerAdapter(fm) {
13+
class NotesPagerAdapter(fm: FragmentManager, val notes: List<Note>, val activity: Activity) : FragmentStatePagerAdapter(fm) {
1214
private var fragments: HashMap<Int, NoteFragment> = LinkedHashMap()
1315

1416
override fun getCount() = notes.size

0 commit comments

Comments
 (0)