DataHearth/tachiyomi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Code review cleanup and refactoring.

Browse Source
This commit is contained in:
mpm11011 2020-09-05 14:28:41 -04:00
parent 6f4b84c8fb
commit a5098e5b5b
6 changed files with 51 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsController.kt
View File

@ -82,14 +82,14 @@ abstract class SettingsController : PreferenceController() {
}
private fun animatePreferenceHighlight(view: View) {
val duration = 500L
val repeat = 2
val colorAnimation = ValueAnimator.ofObject(ArgbEvaluator(), Color.TRANSPARENT, Color.WHITE)
colorAnimation.duration = duration
colorAnimation.repeatCount = repeat
colorAnimation.addUpdateListener { animator -> view.setBackgroundColor(animator.animatedValue as Int) }
colorAnimation.reverse()
ValueAnimator
.ofObject(ArgbEvaluator(), Color.TRANSPARENT, R.attr.rippleColor)
.apply {
duration = 500L
repeatCount = 2
addUpdateListener { animator -> view.setBackgroundColor(animator.animatedValue as Int) }
reverse()
}
}
open fun getTitle(): String? {

10
app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsMainController.kt
View File

@ -108,14 +108,10 @@ class SettingsMainController : SettingsController() {
searchView.queryTextEvents()
.filterIsInstance<QueryTextEvent.QueryChanged>()
.onEach {
performSettingsSearch(it.queryText.toString())
router.pushController(
SettingsSearchController().withFadeTransaction()
)
}
.launchIn(scope)
}
private fun performSettingsSearch(query: String) {
router.pushController(
SettingsSearchController().withFadeTransaction()
)
}
}

12
app/src/main/java/eu/kanade/tachiyomi/ui/setting/settingssearch/SettingsSearchController.kt
View File

@ -137,16 +137,12 @@ class SettingsSearchController :
* returns a list of `SettingsSearchItem` to be shown as search results
*/
fun getResultSet(query: String? = null): List<SettingsSearchItem> {
val list = mutableListOf<SettingsSearchItem>()
if (!query.isNullOrBlank()) {
SettingsSearchHelper.getFilteredResults(query)
.forEach {
list.add(SettingsSearchItem(it, null))
}
if (!query.isNullOrBlank() && query.length >= 3) {
return SettingsSearchHelper.getFilteredResults(query)
.map { SettingsSearchItem(it, null) }
}
return list
return mutableListOf()
}
/**

4
app/src/main/java/eu/kanade/tachiyomi/ui/setting/settingssearch/SettingsSearchPresenter.kt
View File

@ -1,9 +1,7 @@
package eu.kanade.tachiyomi.ui.setting.settingssearch
import android.os.Bundle
import eu.kanade.tachiyomi.data.database.DatabaseHelper
import eu.kanade.tachiyomi.data.preference.PreferencesHelper
import eu.kanade.tachiyomi.source.SourceManager
import eu.kanade.tachiyomi.ui.base.presenter.BasePresenter
import uy.kohesive.injekt.Injekt
import uy.kohesive.injekt.api.get
@ -20,8 +18,6 @@ open class SettingsSearchPresenter : BasePresenter<SettingsSearchController>() {
var query = ""
private set
val sourceManager: SourceManager = Injekt.get()
val db: DatabaseHelper = Injekt.get()
val preferences: PreferencesHelper = Injekt.get()
override fun onCreate(savedState: Bundle?) {

79
app/src/main/res/layout/settings_search_controller_card.xml
View File

@ -1,52 +1,45 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/title_wrapper"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
android:layout_marginStart="48dp"
android:layout_marginTop="16dp"
android:layout_marginBottom="16dp"
android:background="?attr/selectableItemBackground">
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/title_wrapper"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginStart="@dimen/search_result_wrapper_margin_start"
android:layout_marginTop="@dimen/search_result_wrapper_margin_top"
android:layout_marginBottom="@dimen/search_result_wrapper_margin_bottom"
android:background="?attr/selectableItemBackground">
<TextView
android:id="@+id/search_result_pref_title"
style="@style/TextAppearance.Regular.SubHeading"
android:layout_width="0dp"
android:layout_height="wrap_content"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:text="Title" />
<TextView
android:id="@+id/search_result_pref_title"
style="@style/TextAppearance.Regular.SubHeading"
android:layout_width="0dp"
android:layout_height="wrap_content"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:text="Title" />
<TextView
android:id="@+id/search_result_pref_summary"
android:layout_width="0dp"
android:layout_height="wrap_content"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/search_result_pref_title"
tools:text="Summary" />
<TextView
android:id="@+id/search_result_pref_summary"
android:layout_width="0dp"
android:layout_height="wrap_content"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/search_result_pref_title"
tools:text="Summary" />
<TextView
android:id="@+id/search_result_pref_breadcrumb"
style="@style/TextAppearance.Regular.Caption"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:ellipsize="end"
android:maxLines="1"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/search_result_pref_summary"
tools:text="Location" />
</androidx.constraintlayout.widget.ConstraintLayout>
<TextView
android:id="@+id/search_result_pref_breadcrumb"
style="@style/TextAppearance.Regular.Caption"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:ellipsize="end"
android:maxLines="1"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/search_result_pref_summary"
tools:text="Location" />
</androidx.constraintlayout.widget.ConstraintLayout>
</LinearLayout>

4
app/src/main/res/values/dimens.xml
View File

@ -23,8 +23,4 @@
<dimen name="text_small_body">14sp</dimen>
<dimen name="bottom_sheet_width">0dp</dimen>
<dimen name="search_result_wrapper_margin_start">50dp</dimen>
<dimen name="search_result_wrapper_margin_top">20dp</dimen>
<dimen name="search_result_wrapper_margin_bottom">20dp</dimen>
</resources>