code cleaning

Author: AndroidDeveloperLB

video_trimmer_library/src/main/java/com/lb/video_trimmer_library/view/RangeSeekBarView.kt

@@ -56,7 +56,7 @@ open class RangeSeekBarView @JvmOverloads constructor(context: Context, attrs: A
     private val shadowPaint = Paint()
     private val strokePaint = Paint()
     private val edgePaint = Paint()
-    private var currentThumb = 0
+    private var currentThumb = ThumbType.LEFT.index
 
 
     init {
@@ -96,7 +96,7 @@ open class RangeSeekBarView @JvmOverloads constructor(context: Context, attrs: A
     fun initMaxWidth() {
         maxWidth = thumbs[ThumbType.RIGHT.index].pos - thumbs[ThumbType.LEFT.index].pos
         onSeekStop(this, ThumbType.LEFT.index, thumbs[ThumbType.LEFT.index].value)
-        onSeekStop(this, 1, thumbs[1].value)
+        onSeekStop(this, ThumbType.RIGHT.index, thumbs[ThumbType.RIGHT.index].value)
     }
 
     override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
@@ -143,7 +143,6 @@ open class RangeSeekBarView @JvmOverloads constructor(context: Context, attrs: A
             timeLineHeight.toFloat(),
             strokePaint
         )
-
         //draw edges
         val circleRadius = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 6f, context.resources.displayMetrics)
         canvas.drawCircle(
@@ -223,16 +222,16 @@ open class RangeSeekBarView @JvmOverloads constructor(context: Context, attrs: A
         return false
     }
 
-    private fun checkPositionThumb(mThumbLeft: Thumb, mThumbRight: Thumb, dx: Float, isLeftMove: Boolean) {
+    private fun checkPositionThumb(thumbLeft: Thumb, thumbRight: Thumb, dx: Float, isLeftMove: Boolean) {
         if (isLeftMove && dx < 0) {
-            if (mThumbRight.pos - (mThumbLeft.pos + dx) > maxWidth) {
-                mThumbRight.pos = mThumbLeft.pos + dx + maxWidth
-                setThumbPos(ThumbType.RIGHT.index, mThumbRight.pos)
+            if (thumbRight.pos - (thumbLeft.pos + dx) > maxWidth) {
+                thumbRight.pos = thumbLeft.pos + dx + maxWidth
+                setThumbPos(ThumbType.RIGHT.index, thumbRight.pos)
             }
         } else if (!isLeftMove && dx > 0) {
-            if (mThumbRight.pos + dx - mThumbLeft.pos > maxWidth) {
-                mThumbLeft.pos = mThumbRight.pos + dx - maxWidth
-                setThumbPos(ThumbType.LEFT.index, mThumbLeft.pos)
+            if (thumbRight.pos + dx - thumbLeft.pos > maxWidth) {
+                thumbLeft.pos = thumbRight.pos + dx - maxWidth
+                setThumbPos(ThumbType.LEFT.index, thumbLeft.pos)
             }
         }
     }

video_trimmer_library/src/main/java/com/lb/video_trimmer_library/view/TimeLineView.kt

@@ -39,17 +39,17 @@ import com.lb.video_trimmer_library.utils.BackgroundExecutor
 import com.lb.video_trimmer_library.utils.UiThreadExecutor
 
 open class TimeLineView @JvmOverloads constructor(context: Context, attrs: AttributeSet?, defStyleAttr: Int = 0) : View(context, attrs, defStyleAttr) {
-    private var mVideoUri: Uri? = null
+    private var videoUri: Uri? = null
     @Suppress("LeakingThis")
-    private var mHeightView: Int = initHeightView()
-    private var mBitmapList: LongSparseArray<Bitmap>? = null
+    private var heightView: Int = initHeightView()
+    private var bitmapList: LongSparseArray<Bitmap>? = null
 
     open fun initHeightView(): Int = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 40f, context.resources.displayMetrics).toInt().coerceAtLeast(1)
 
     override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
         val minW = paddingLeft + paddingRight + suggestedMinimumWidth
         val w = View.resolveSizeAndState(minW, widthMeasureSpec, 1)
-        val minH = paddingBottom + paddingTop + mHeightView
+        val minH = paddingBottom + paddingTop + heightView
         val h = View.resolveSizeAndState(minH, heightMeasureSpec, 1)
         setMeasuredDimension(w, h)
     }
@@ -66,11 +66,11 @@ open class TimeLineView @JvmOverloads constructor(context: Context, attrs: Attri
                 try {
                     val thumbnailList = LongSparseArray<Bitmap>()
                     val mediaMetadataRetriever = MediaMetadataRetriever()
-                    mediaMetadataRetriever.setDataSource(context, mVideoUri)
+                    mediaMetadataRetriever.setDataSource(context, videoUri)
                     // Retrieve media data
                     val videoLengthInMs = (Integer.parseInt(mediaMetadataRetriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_DURATION)) * 1000).toLong()
                     // Set thumbnail properties (Thumbs are squares)
-                    val thumbSize = mHeightView
+                    val thumbSize = heightView
                     val numThumbs = Math.ceil((viewWidth.toFloat() / thumbSize).toDouble()).toInt()
                     val interval = videoLengthInMs / numThumbs
                     for (i in 0 until numThumbs) {
@@ -96,18 +96,18 @@ open class TimeLineView @JvmOverloads constructor(context: Context, attrs: Attri
 
     private fun returnBitmaps(thumbnailList: LongSparseArray<Bitmap>) {
         UiThreadExecutor.runTask("", Runnable {
-            mBitmapList = thumbnailList
+            bitmapList = thumbnailList
             invalidate()
         }, 0L)
     }
 
     override fun onDraw(canvas: Canvas) {
         super.onDraw(canvas)
-        if (mBitmapList != null) {
+        if (bitmapList != null) {
             canvas.save()
             var x = 0
-            for (i in 0 until mBitmapList!!.size()) {
-                val bitmap = mBitmapList!!.get(i.toLong())
+            for (i in 0 until bitmapList!!.size()) {
+                val bitmap = bitmapList!!.get(i.toLong())
                 if (bitmap != null) {
                     canvas.drawBitmap(bitmap, x.toFloat(), 0f, null)
                     x += bitmap.width
@@ -117,6 +117,6 @@ open class TimeLineView @JvmOverloads constructor(context: Context, attrs: Attri
     }
 
     fun setVideo(data: Uri) {
-        mVideoUri = data
+        videoUri = data
     }
 }