fix: search hint

Signed-off-by: ReChinX <cyuunichin@gmail.com>
jczh98 · Dec 13, 2018 · a107e16 · a107e16
1 parent 383ca54
commit a107e16
Show file tree

Hide file tree

Showing 24 changed files with 17 additions and 172 deletions.
diff --git a/app/src/main/java/top/rechinx/meow/core/extension/ExtensionLoader.kt b/app/src/main/java/top/rechinx/meow/core/extension/ExtensionLoader.kt
@@ -9,8 +9,6 @@ import kotlinx.coroutines.runBlocking
 import top.rechinx.meow.core.extension.model.Extension
 import top.rechinx.meow.core.extension.model.LoadResult
 import top.rechinx.meow.core.source.HttpSource
-import top.rechinx.meow.core.source.Source
-import top.rechinx.meow.support.log.L
 import java.lang.Exception
 
 object ExtensionLoader {

diff --git a/app/src/main/java/top/rechinx/meow/core/extension/ExtensionManager.kt b/app/src/main/java/top/rechinx/meow/core/extension/ExtensionManager.kt
@@ -2,15 +2,9 @@ package top.rechinx.meow.core.extension
 
 import android.content.Context
 import com.jakewharton.rxrelay2.BehaviorRelay
-import com.jakewharton.rxrelay2.PublishRelay
-import io.reactivex.Observable
-import org.koin.standalone.KoinComponent
-import org.koin.standalone.inject
 import top.rechinx.meow.core.extension.model.Extension
 import top.rechinx.meow.core.extension.model.LoadResult
-import top.rechinx.meow.core.source.Source
 import top.rechinx.meow.core.source.SourceManager
-import top.rechinx.meow.support.log.L
 
 class ExtensionManager(private val context: Context,
                        private val sourceManager: SourceManager) {

diff --git a/app/src/main/java/top/rechinx/meow/glide/MangaModelLoader.kt b/app/src/main/java/top/rechinx/meow/glide/MangaModelLoader.kt
@@ -6,12 +6,10 @@ import com.bumptech.glide.load.Options
 import com.bumptech.glide.load.model.*
 import org.koin.standalone.KoinComponent
 import org.koin.standalone.inject
-import top.rechinx.meow.core.network.NetworkHelper
 import top.rechinx.meow.core.source.HttpSource
 import top.rechinx.meow.core.source.SourceManager
 import top.rechinx.meow.data.cache.CoverCache
 import top.rechinx.meow.data.database.model.Manga
-import top.rechinx.meow.support.log.L
 import java.io.File
 import java.io.InputStream
 

diff --git a/app/src/main/java/top/rechinx/meow/support/log/L.kt b/app/src/main/java/top/rechinx/meow/support/log/L.kt
diff --git a/app/src/main/java/top/rechinx/meow/support/log/LoggerPrinter.kt b/app/src/main/java/top/rechinx/meow/support/log/LoggerPrinter.kt
diff --git a/app/src/main/java/top/rechinx/meow/ui/base/BaseAdapter.kt b/app/src/main/java/top/rechinx/meow/ui/base/BaseAdapter.kt
@@ -4,7 +4,6 @@ import android.content.Context
 import androidx.recyclerview.widget.RecyclerView
 import android.view.LayoutInflater
 import android.view.View
-import top.rechinx.meow.support.log.L
 
 abstract class BaseAdapter<T>: RecyclerView.Adapter<RecyclerView.ViewHolder> {
 

diff --git a/app/src/main/java/top/rechinx/meow/ui/filter/FilterActivity.kt b/app/src/main/java/top/rechinx/meow/ui/filter/FilterActivity.kt
@@ -67,6 +67,8 @@ class FilterActivity: BaseMvpActivityWithoutReflection<FilterPresenter>(),
         filterDrawer.addDrawerListener(drawerToggle)
         initSideSheet()
         initRecyclerView()
+        // setting search hint
+        filterSearchView.setHint(getString(R.string.specific_search_hint).format(presenter.source.name))
         filterSearchView.setOnQueryTextListener(object : MaterialSearchView.OnQueryTextListener {
             override fun onQueryTextSubmit(query: String): Boolean {
                 if(query.isEmpty()) {

diff --git a/app/src/main/java/top/rechinx/meow/ui/filter/FilterPresenter.kt b/app/src/main/java/top/rechinx/meow/ui/filter/FilterPresenter.kt
@@ -9,14 +9,12 @@ import io.reactivex.disposables.Disposable
 import io.reactivex.schedulers.Schedulers
 import org.koin.standalone.KoinComponent
 import org.koin.standalone.inject
-import timber.log.Timber
 import top.rechinx.meow.core.source.Source
 import top.rechinx.meow.core.source.SourceManager
 import top.rechinx.meow.core.source.model.Filter
 import top.rechinx.meow.core.source.model.FilterList
 import top.rechinx.meow.data.database.model.Manga
 import top.rechinx.meow.data.repository.CataloguePager
-import top.rechinx.meow.support.log.L
 import top.rechinx.meow.ui.filter.items.*
 import top.rechinx.rikka.mvp.BasePresenter
 
@@ -70,7 +68,6 @@ class FilterPresenter(sourceId: Long): BasePresenter<FilterActivity>(), KoinComp
                     view.onAddPage(page, mangas)
                 }, { _, error ->
                     error.printStackTrace()
-                    L.d(error.message)
                 })
 
         // request first page

diff --git a/app/src/main/java/top/rechinx/meow/ui/filter/items/SelectItem.kt b/app/src/main/java/top/rechinx/meow/ui/filter/items/SelectItem.kt
@@ -12,7 +12,6 @@ import eu.davidea.flexibleadapter.items.IFlexible
 import eu.davidea.viewholders.FlexibleViewHolder
 import top.rechinx.meow.R
 import top.rechinx.meow.core.source.model.Filter
-import top.rechinx.meow.support.log.L
 
 open class SelectItem(val filter: Filter.Select<*>) : AbstractFlexibleItem<SelectItem.Holder>() {
 

diff --git a/app/src/main/java/top/rechinx/meow/ui/grid/GridAdapter.kt b/app/src/main/java/top/rechinx/meow/ui/grid/GridAdapter.kt
@@ -1,25 +1,8 @@
 package top.rechinx.meow.ui.grid
 
 import android.content.Context
-import android.view.Gravity
-import androidx.recyclerview.widget.RecyclerView
-import android.view.View
-import android.view.ViewGroup
-import android.widget.FrameLayout
-import android.widget.ImageView
-import android.widget.TextView
-import com.bumptech.glide.Glide
 import eu.davidea.flexibleadapter.FlexibleAdapter
-import eu.davidea.flexibleadapter.items.IFlexible
-import kotlinx.android.synthetic.main.item_grid_fit.view.*
-import top.rechinx.meow.R
-import top.rechinx.meow.data.database.model.Manga
-import top.rechinx.meow.ui.base.BaseAdapter
-import top.rechinx.meow.glide.GlideApp
-import top.rechinx.meow.support.log.L
 import top.rechinx.meow.ui.grid.items.GridItem
-import top.rechinx.meow.widget.AutofitRecyclerView
-import top.rechinx.rikka.ext.visible
 
 class GridAdapter(context: Context): FlexibleAdapter<GridItem>(null, context, true) {
 

diff --git a/app/src/main/java/top/rechinx/meow/ui/reader/ReaderPresenter.kt b/app/src/main/java/top/rechinx/meow/ui/reader/ReaderPresenter.kt
@@ -2,27 +2,24 @@ package top.rechinx.meow.ui.reader
 
 import android.os.Bundle
 import com.jakewharton.rxrelay2.BehaviorRelay
-import io.reactivex.Completable
 import io.reactivex.Observable
 import io.reactivex.android.schedulers.AndroidSchedulers
-import io.reactivex.disposables.CompositeDisposable
 import io.reactivex.disposables.Disposable
 import io.reactivex.schedulers.Schedulers
 import org.koin.standalone.KoinComponent
 import org.koin.standalone.inject
+import timber.log.Timber
 import top.rechinx.meow.core.source.SourceManager
 import top.rechinx.meow.data.database.model.Manga
 import top.rechinx.meow.data.preference.PreferenceHelper
 import top.rechinx.meow.data.repository.ChapterRepository
 import top.rechinx.meow.data.repository.MangaRepository
-import top.rechinx.meow.support.log.L
 import top.rechinx.meow.ui.reader.loader.ChapterLoader
 import top.rechinx.meow.ui.reader.model.ReaderChapter
 import top.rechinx.meow.ui.reader.model.ReaderPage
 import top.rechinx.meow.ui.reader.model.ViewerChapters
 import top.rechinx.rikka.mvp.BasePresenter
 import top.rechinx.rikka.rxbus.RxBus
-import java.util.*
 import java.util.concurrent.TimeUnit
 
 class ReaderPresenter : BasePresenter<ReaderActivity>(), KoinComponent{
@@ -55,7 +52,7 @@ class ReaderPresenter : BasePresenter<ReaderActivity>(), KoinComponent{
             mangaRepository.getManga(mangaId)
                     .observeOn(AndroidSchedulers.mainThread())
                     .doOnNext { loadInit(it, initialChapterId, isContinued) }
-                    .subscribeFirst({_, _ -> }, {_, e -> L.d(e.message)})
+                    .subscribeFirst({_, _ -> }, {_, e -> Timber.d(e.message)})
     }
 
     fun loadInit(manga: Manga, initialChapterId: Long, isContinued: Boolean) {
@@ -74,7 +71,7 @@ class ReaderPresenter : BasePresenter<ReaderActivity>(), KoinComponent{
                 .flatMap { getLoadObservable(loader!!, it, isContinued) }
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
-                .subscribeFirst({_, _ -> }, {_, e -> L.d(e.message)})
+                .subscribeFirst({_, _ -> }, {_, e -> Timber.d(e.message)})
     }
 
     private fun getLoadObservable(loader: ChapterLoader, chapter: ReaderChapter, isContinued: Boolean = false): Observable<ViewerChapters> {

diff --git a/app/src/main/java/top/rechinx/meow/ui/reader/loader/HttpPageLoader.kt b/app/src/main/java/top/rechinx/meow/ui/reader/loader/HttpPageLoader.kt
@@ -8,10 +8,10 @@ import io.reactivex.rxkotlin.plusAssign
 import io.reactivex.schedulers.Schedulers
 import org.koin.standalone.KoinComponent
 import org.koin.standalone.inject
+import timber.log.Timber
 import top.rechinx.meow.core.source.HttpSource
 import top.rechinx.meow.core.source.model.MangaPage
 import top.rechinx.meow.data.cache.ChapterCache
-import top.rechinx.meow.support.log.L
 import top.rechinx.meow.ui.reader.model.ReaderChapter
 import top.rechinx.meow.ui.reader.model.ReaderPage
 import java.util.concurrent.PriorityBlockingQueue
@@ -38,7 +38,7 @@ class HttpPageLoader(private val chapter: ReaderChapter,
                 .subscribe({
                 }, {
                     if(it !is InterruptedException) {
-                        L.e(it.message)
+                        Timber.e(it.message)
                     }
                 })
     }

diff --git a/app/src/main/java/top/rechinx/meow/ui/reader/viewer/pager/PagerViewer.kt b/app/src/main/java/top/rechinx/meow/ui/reader/viewer/pager/PagerViewer.kt
@@ -5,9 +5,6 @@ import android.view.KeyEvent
 import android.view.MotionEvent
 import android.view.View
 import android.view.ViewGroup
-import top.rechinx.meow.R
-import top.rechinx.meow.support.log.L
-import top.rechinx.meow.ui.base.BaseActivity
 import top.rechinx.meow.ui.reader.ReaderActivity
 import top.rechinx.meow.ui.reader.model.ChapterTransition
 import top.rechinx.meow.ui.reader.model.ReaderPage

diff --git a/app/src/main/java/top/rechinx/meow/ui/reader/viewer/pager/PagerViewerAdapter.kt b/app/src/main/java/top/rechinx/meow/ui/reader/viewer/pager/PagerViewerAdapter.kt
@@ -3,7 +3,7 @@ package top.rechinx.meow.ui.reader.viewer.pager
 import androidx.viewpager.widget.PagerAdapter
 import android.view.View
 import android.view.ViewGroup
-import top.rechinx.meow.support.log.L
+import timber.log.Timber
 import top.rechinx.meow.ui.reader.model.ChapterTransition
 import top.rechinx.meow.ui.reader.model.ReaderPage
 import top.rechinx.meow.ui.reader.model.ViewerChapters
@@ -91,7 +91,7 @@ class PagerViewerAdapter(private val viewer: PagerViewer) : ViewPagerAdapter() {
             if (position != -1) {
                 return position
             } else {
-                L.d("Position for ${view.item} not found")
+                Timber.d("Position for ${view.item} not found")
             }
         }
         return PagerAdapter.POSITION_NONE

diff --git a/app/src/main/java/top/rechinx/meow/ui/reader/viewer/webtoon/WebtoonViewer.kt b/app/src/main/java/top/rechinx/meow/ui/reader/viewer/webtoon/WebtoonViewer.kt
@@ -7,7 +7,6 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.recyclerview.widget.WebtoonLayoutManager
 import io.reactivex.disposables.CompositeDisposable
-import top.rechinx.meow.support.log.L
 import top.rechinx.meow.ui.reader.ReaderActivity
 import top.rechinx.meow.ui.reader.model.ChapterTransition
 import top.rechinx.meow.ui.reader.model.ReaderPage

diff --git a/app/src/main/java/top/rechinx/meow/ui/result/ResultPresenter.kt b/app/src/main/java/top/rechinx/meow/ui/result/ResultPresenter.kt
@@ -7,15 +7,11 @@ import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.schedulers.Schedulers
 import org.koin.standalone.KoinComponent
 import org.koin.standalone.inject
-import top.rechinx.meow.R
 import top.rechinx.meow.core.source.Source
 import top.rechinx.meow.core.source.SourceManager
 import top.rechinx.meow.core.source.model.FilterList
 import top.rechinx.meow.data.database.model.Manga
 import top.rechinx.meow.data.preference.PreferenceHelper
-import top.rechinx.meow.data.repository.CataloguePager
-import top.rechinx.meow.exception.NoMoreResultException
-import top.rechinx.meow.support.log.L
 import top.rechinx.rikka.mvp.BasePresenter
 import java.lang.Exception
 import java.util.*

diff --git a/app/src/main/java/top/rechinx/meow/ui/task/TaskActivity.kt b/app/src/main/java/top/rechinx/meow/ui/task/TaskActivity.kt
@@ -9,7 +9,6 @@ import android.os.IBinder
 import android.view.Menu
 import android.view.MenuItem
 import android.view.View
-import androidx.core.content.ContextCompat
 import androidx.recyclerview.widget.LinearLayoutManager
 import kotlinx.android.synthetic.main.activity_task.*
 import kotlinx.android.synthetic.main.custom_toolbar.*
@@ -21,12 +20,10 @@ import top.rechinx.meow.data.database.model.Manga
 import top.rechinx.meow.data.database.model.Task
 import top.rechinx.meow.data.download.DownloadService
 import top.rechinx.meow.global.Extras
-import top.rechinx.meow.support.log.L
 import top.rechinx.meow.ui.base.BaseAdapter
 import top.rechinx.meow.ui.base.BaseMvpActivity
 import top.rechinx.meow.ui.details.DetailActivity
 import top.rechinx.meow.ui.reader.ReaderActivity
-import top.rechinx.rikka.mvp.MvpAppCompatActivity
 import top.rechinx.rikka.mvp.factory.RequiresPresenter
 import kotlin.collections.ArrayList
 

diff --git a/app/src/main/java/top/rechinx/meow/utils/FileUtils.kt b/app/src/main/java/top/rechinx/meow/utils/FileUtils.kt
@@ -3,7 +3,6 @@ package top.rechinx.meow.utils
 import android.content.Context
 import io.reactivex.Observable
 import top.rechinx.meow.App
-import top.rechinx.meow.support.log.L
 import java.io.*
 import java.nio.charset.Charset
 
@@ -58,7 +57,6 @@ object FileUtils {
         try {
             var files = manager.list("sites")
             for(file in files) {
-                L.d(file)
                 var ins = manager.open("sites/$file")
                 var outFile = File(app.getBasePath(), file)
                 var ous = FileOutputStream(outFile)

diff --git a/app/src/main/java/top/rechinx/meow/widget/AutofitRecyclerView.kt b/app/src/main/java/top/rechinx/meow/widget/AutofitRecyclerView.kt
@@ -4,7 +4,6 @@ import android.content.Context
 import android.util.AttributeSet
 import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.RecyclerView
-import top.rechinx.meow.support.log.L
 
 class AutofitRecyclerView @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null) :
         RecyclerView(context, attrs) {