up

app/src/main/java/io/legado/app/ui/search/SearchActivity.kt

@@ -17,6 +17,7 @@ import io.legado.app.ui.bookinfo.BookInfoActivity
 import io.legado.app.utils.getViewModel
 import kotlinx.android.synthetic.main.activity_search.*
 import kotlinx.android.synthetic.main.view_search.*
+import org.jetbrains.anko.sdk27.listeners.onClick
 import org.jetbrains.anko.startActivity
 
 class SearchActivity : VMBaseActivity<SearchViewModel>(R.layout.activity_search), SearchAdapter.CallBack {
@@ -31,6 +32,9 @@ class SearchActivity : VMBaseActivity<SearchViewModel>(R.layout.activity_search)
         initRecyclerView()
         initSearchView()
         initData(0L)
+        intent.getStringExtra("key")?.let {
+            search_view.setQuery(it, true)
+        }
     }
 
     private fun initSearchView() {
@@ -59,9 +63,7 @@ class SearchActivity : VMBaseActivity<SearchViewModel>(R.layout.activity_search)
             }
 
         })
-        intent.getStringExtra("key")?.let {
+        fb_stop.onClick { viewModel.stop() }
-            search_view.setQuery(it, true)
-        }
     }
 
     private fun initRecyclerView() {

app/src/main/java/io/legado/app/ui/widget/recycler/refresh/RefreshProgressBar.kt

@@ -1,195 +0,0 @@
-package io.legado.app.ui.widget.recycler.refresh
-
-import android.content.Context
-import android.graphics.Canvas
-import android.graphics.Paint
-import android.graphics.Rect
-import android.graphics.RectF
-import android.os.Looper
-import android.util.AttributeSet
-import android.view.View
-import io.legado.app.R
-
-class RefreshProgressBar @JvmOverloads constructor(
-    context: Context,
-    attrs: AttributeSet? = null,
-    defStyleAttr: Int = 0
-) : View(context, attrs, defStyleAttr) {
-    internal var a = 1
-    var maxProgress = 100
-    private var durProgress = 0
-    var secondMaxProgress = 100
-    private var secondDurProgress = 0
-    var bgColor = 0x00000000
-    var secondColor = -0x3e3e3f
-    var fontColor = -0xc9c9ca
-    var speed = 1
-    var secondFinalProgress = 0
-        private set
-    private var paint: Paint = Paint()
-    private var rect = Rect()
-    private var rectF = RectF()
-    var isAutoLoading: Boolean = false
-        set(loading) {
-            if (loading && visibility != VISIBLE) {
-                visibility = VISIBLE
-            }
-            field = loading
-            if ((!this.isAutoLoading)) {
-                secondDurProgress = 0
-                secondFinalProgress = 0
-            }
-            maxProgress = 0
-
-            invalidate()
-        }
-
-    init {
-        paint.style = Paint.Style.FILL
-
-        val a = context.obtainStyledAttributes(attrs, R.styleable.RefreshProgressBar)
-        speed = a.getDimensionPixelSize(R.styleable.RefreshProgressBar_speed, speed)
-        maxProgress = a.getInt(R.styleable.RefreshProgressBar_max_progress, maxProgress)
-        durProgress = a.getInt(R.styleable.RefreshProgressBar_dur_progress, durProgress)
-        secondDurProgress =
-            a.getDimensionPixelSize(R.styleable.RefreshProgressBar_second_dur_progress, secondDurProgress)
-        secondFinalProgress = secondDurProgress
-        secondMaxProgress =
-            a.getDimensionPixelSize(R.styleable.RefreshProgressBar_second_max_progress, secondMaxProgress)
-        bgColor = a.getColor(R.styleable.RefreshProgressBar_bg_color, bgColor)
-        secondColor = a.getColor(R.styleable.RefreshProgressBar_second_color, secondColor)
-        fontColor = a.getColor(R.styleable.RefreshProgressBar_font_color, fontColor)
-        a.recycle()
-    }
-
-    override fun onSizeChanged(w: Int, h: Int, oldw: Int, oldh: Int) {
-        super.onSizeChanged(w, h, oldw, oldh)
-    }
-
-    override fun onDraw(canvas: Canvas) {
-        super.onDraw(canvas)
-
-        paint.color = bgColor
-        rect.set(0, 0, measuredWidth, measuredHeight)
-        canvas.drawRect(rect, paint)
-
-        if (secondDurProgress > 0 && secondMaxProgress > 0) {
-            var secondDur = secondDurProgress
-            if (secondDur < 0) {
-                secondDur = 0
-            }
-            if (secondDur > secondMaxProgress) {
-                secondDur = secondMaxProgress
-            }
-            paint.color = secondColor
-            val tempW = (measuredWidth.toFloat() * 1.0f * (secondDur * 1.0f / secondMaxProgress)).toInt()
-            rect.set(measuredWidth / 2 - tempW / 2, 0, measuredWidth / 2 + tempW / 2, measuredHeight)
-            canvas.drawRect(rect, paint)
-        }
-
-        if (durProgress > 0 && maxProgress > 0) {
-            paint.color = fontColor
-            rectF.set(
-                0f,
-                0f,
-                measuredWidth.toFloat() * 1.0f * (durProgress * 1.0f / maxProgress),
-                measuredHeight.toFloat()
-            )
-            canvas.drawRect(rectF, paint)
-        }
-
-        if (this.isAutoLoading) {
-            if (secondDurProgress >= secondMaxProgress) {
-                a = -1
-            } else if (secondDurProgress <= 0) {
-                a = 1
-            }
-            secondDurProgress += a * speed
-            if (secondDurProgress < 0)
-                secondDurProgress = 0
-            else if (secondDurProgress > secondMaxProgress)
-                secondDurProgress = secondMaxProgress
-            secondFinalProgress = secondDurProgress
-            invalidate()
-        } else {
-            if (secondDurProgress != secondFinalProgress) {
-                if (secondDurProgress > secondFinalProgress) {
-                    secondDurProgress -= speed
-                    if (secondDurProgress < secondFinalProgress) {
-                        secondDurProgress = secondFinalProgress
-                    }
-                } else {
-                    secondDurProgress += speed
-                    if (secondDurProgress > secondFinalProgress) {
-                        secondDurProgress = secondFinalProgress
-                    }
-                }
-                this.invalidate()
-            }
-            if (secondDurProgress == 0 && durProgress == 0 && secondFinalProgress == 0 && visibility == VISIBLE) {
-                visibility = View.INVISIBLE
-            }
-        }
-    }
-
-    fun getDurProgress(): Int {
-        return durProgress
-    }
-
-    fun setDurProgress(durProgress: Int) {
-        var durProgress = durProgress
-        if (durProgress < 0) {
-            durProgress = 0
-        }
-        if (durProgress > maxProgress) {
-            durProgress = maxProgress
-        }
-        this.durProgress = durProgress
-        if (Looper.myLooper() == Looper.getMainLooper()) {
-            this.invalidate()
-        } else {
-            this.postInvalidate()
-        }
-    }
-
-    fun getSecondDurProgress(): Int {
-        return secondDurProgress
-    }
-
-    fun setSecondDurProgress(secondDur: Int) {
-        this.secondDurProgress = secondDur
-        this.secondFinalProgress = secondDurProgress
-        if (Looper.myLooper() == Looper.getMainLooper()) {
-            this.invalidate()
-        } else {
-            this.postInvalidate()
-        }
-    }
-
-    fun setSecondDurProgressWithAnim(secondDur: Int) {
-        var secondDur = secondDur
-        if (secondDur < 0) {
-            secondDur = 0
-        }
-        if (secondDur > secondMaxProgress) {
-            secondDur = secondMaxProgress
-        }
-        this.secondFinalProgress = secondDur
-        if (Looper.myLooper() == Looper.getMainLooper()) {
-            this.invalidate()
-        } else {
-            this.postInvalidate()
-        }
-    }
-
-    fun clean() {
-        durProgress = 0
-        secondDurProgress = 0
-        secondFinalProgress = 0
-        if (Looper.myLooper() == Looper.getMainLooper()) {
-            this.invalidate()
-        } else {
-            this.postInvalidate()
-        }
-    }
-}

app/src/main/res/layout/activity_search.xml

@@ -32,5 +32,15 @@
 
     </io.legado.app.ui.widget.dynamiclayout.DynamicFrameLayout>
 
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
+        android:id="@+id/fb_stop"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_margin="16dp"
+        android:src="@drawable/ic_stop_black_24dp"
+        app:fabSize="mini"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintRight_toRightOf="parent" />
+
 </androidx.constraintlayout.widget.ConstraintLayout>