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

minor code style updates

Browse Source
This commit is contained in:
tibbi
2017-06-23 21:37:27 +02:00
parent 6ba81b0a39
commit 5386ea8ffa
1 changed files with 13 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
app/src/main/kotlin/com/simplemobiletools/draw/MyCanvas.kt
View File

@ -14,11 +14,12 @@ import com.simplemobiletools.commons.extensions.getContrastColor
import java.util.* import java.util.*
class MyCanvas(context: Context, attrs: AttributeSet) : View(context, attrs) { class MyCanvas(context: Context, attrs: AttributeSet) : View(context, attrs) {
var mPaths: MutableMap<MyPath, PaintOptions> var mPaths = LinkedHashMap<MyPath, PaintOptions>()
var mBackgroundBitmap: Bitmap? = null var mBackgroundBitmap: Bitmap? = null
private var mPaint: Paint private var mPaint = Paint()
private var mPath: MyPath private var mPath = MyPath()
private var mPaintOptions: PaintOptions private var mPaintOptions = PaintOptions()
private var mIsNothingDrawn = true
private var mListener: PathsChangedListener? = null private var mListener: PathsChangedListener? = null
private var mCurX = 0f private var mCurX = 0f
@ -29,9 +30,7 @@ class MyCanvas(context: Context, attrs: AttributeSet) : View(context, attrs) {
private var mIsStrokeWidthBarEnabled = false private var mIsStrokeWidthBarEnabled = false
init { init {
mPath = MyPath() mPaint.apply {
mPaintOptions = PaintOptions()
mPaint = Paint().apply {
color = mPaintOptions.color color = mPaintOptions.color
style = Paint.Style.STROKE style = Paint.Style.STROKE
strokeJoin = Paint.Join.ROUND strokeJoin = Paint.Join.ROUND
@ -40,8 +39,6 @@ class MyCanvas(context: Context, attrs: AttributeSet) : View(context, attrs) {
isAntiAlias = true isAntiAlias = true
} }
mPaths = LinkedHashMap<MyPath, PaintOptions>()
mPaths.put(mPath, mPaintOptions)
pathsUpdated() pathsUpdated()
} }
@ -53,7 +50,7 @@ class MyCanvas(context: Context, attrs: AttributeSet) : View(context, attrs) {
if (mPaths.isEmpty()) if (mPaths.isEmpty())
return return
val lastKey: MyPath? = mPaths.keys.lastOrNull() val lastKey = mPaths.keys.lastOrNull()
mPaths.remove(lastKey) mPaths.remove(lastKey)
pathsUpdated() pathsUpdated()
@ -220,7 +217,6 @@ class MyCanvas(context: Context, attrs: AttributeSet) : View(context, attrs) {
public override fun onSaveInstanceState(): Parcelable { public override fun onSaveInstanceState(): Parcelable {
val superState = super.onSaveInstanceState() val superState = super.onSaveInstanceState()
val savedState = SavedState(superState) val savedState = SavedState(superState)
savedState.paths = mPaths savedState.paths = mPaths
return savedState return savedState
} }
@ -230,19 +226,18 @@ class MyCanvas(context: Context, attrs: AttributeSet) : View(context, attrs) {
super.onRestoreInstanceState(state) super.onRestoreInstanceState(state)
return return
} }
val savedState = state
super.onRestoreInstanceState(savedState.superState)
mPaths = savedState.paths super.onRestoreInstanceState(state.superState)
mPaths = state.paths
pathsUpdated() pathsUpdated()
} }
internal class SavedState : View.BaseSavedState { internal class SavedState : View.BaseSavedState {
var paths: MutableMap<MyPath, PaintOptions> = HashMap() var paths = LinkedHashMap<MyPath, PaintOptions>()
companion object { companion object {
val CREATOR: Parcelable.Creator<SavedState> = object : Parcelable.Creator<SavedState> { val CREATOR: Parcelable.Creator<SavedState> = object : Parcelable.Creator<SavedState> {
override fun newArray(size: Int): Array<SavedState> = arrayOf() override fun newArray(size: Int) = arrayOf<SavedState>()
override fun createFromParcel(source: Parcel) = SavedState(source) override fun createFromParcel(source: Parcel) = SavedState(source)
} }
@ -253,8 +248,8 @@ class MyCanvas(context: Context, attrs: AttributeSet) : View(context, attrs) {
override fun writeToParcel(out: Parcel, flags: Int) { override fun writeToParcel(out: Parcel, flags: Int) {
super.writeToParcel(out, flags) super.writeToParcel(out, flags)
out.writeInt(paths.size) out.writeInt(paths.size)
for ((key, paintOptions) in paths) { for ((path, paintOptions) in paths) {
out.writeSerializable(key) out.writeSerializable(path)
out.writeInt(paintOptions.color) out.writeInt(paintOptions.color)
out.writeFloat(paintOptions.strokeWidth) out.writeFloat(paintOptions.strokeWidth)
} }