aboutsummaryrefslogtreecommitdiff
path: root/searchview/src/main/kotlin/ca/allanwang
diff options
context:
space:
mode:
authorAllan Wang <me@allanwang.ca>2019-08-16 00:24:22 -0700
committerAllan Wang <me@allanwang.ca>2019-08-16 00:24:22 -0700
commit71dcceaf1970873596a59a734f1a574120beff6b (patch)
treed8d79984f591ec5fc43ac93a15715eaef9b887d3 /searchview/src/main/kotlin/ca/allanwang
parentd6f213563be35b183f81e20e95d925dbd65e4694 (diff)
parenta9407288fad0d30e71e2f6862b66533e043f9311 (diff)
downloadkau-71dcceaf1970873596a59a734f1a574120beff6b.tar.gz
kau-71dcceaf1970873596a59a734f1a574120beff6b.tar.bz2
kau-71dcceaf1970873596a59a734f1a574120beff6b.zip
Fix conflicts
Diffstat (limited to 'searchview/src/main/kotlin/ca/allanwang')
-rw-r--r--searchview/src/main/kotlin/ca/allanwang/kau/searchview/SearchView.kt10
1 files changed, 5 insertions, 5 deletions
diff --git a/searchview/src/main/kotlin/ca/allanwang/kau/searchview/SearchView.kt b/searchview/src/main/kotlin/ca/allanwang/kau/searchview/SearchView.kt
index a552a01..c2da5fa 100644
--- a/searchview/src/main/kotlin/ca/allanwang/kau/searchview/SearchView.kt
+++ b/searchview/src/main/kotlin/ca/allanwang/kau/searchview/SearchView.kt
@@ -298,9 +298,9 @@ class SearchView @JvmOverloads constructor(
* These are calculated every time the search view is opened,
* and can be overridden with the open listener if necessary
*/
- var menuX: Int = -1 //starting x for circular reveal
- var menuY: Int = -1 //reference for cardview's marginTop
- var menuHalfHeight: Int = -1 //starting y for circular reveal (relative to the cardview)
+ var menuX: Int = -1 // starting x for circular reveal
+ var menuY: Int = -1 // reference for cardview's marginTop
+ var menuHalfHeight: Int = -1 // starting y for circular reveal (relative to the cardview)
init {
View.inflate(context, R.layout.kau_search_view, this)
@@ -383,8 +383,8 @@ class SearchView @JvmOverloads constructor(
internal fun cardTransition(builder: TransitionSet.() -> Unit = {}) {
TransitionManager.beginDelayedTransition(kau_search_cardview,
- //we are only using change bounds, as the recyclerview items may be animated as well,
- //which causes a measure IllegalStateException
+ // we are only using change bounds, as the recyclerview items may be animated as well,
+ // which causes a measure IllegalStateException
TransitionSet().addTransition(ChangeBounds()).apply {
duration = configs.transitionDuration
builder()