aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAllan Wang <me@allanwang.ca>2017-06-24 12:26:39 -0700
committerAllan Wang <me@allanwang.ca>2017-06-24 12:26:39 -0700
commite38252e1576c7259626222067f872ffbe2b25ccb (patch)
tree26aa561691fb185e69cdd12fa8565743a4ae2989
parentbe1dc924a7b7cce61fabe0b03ff26c780920db95 (diff)
downloadkau-e38252e1576c7259626222067f872ffbe2b25ccb.tar.gz
kau-e38252e1576c7259626222067f872ffbe2b25ccb.tar.bz2
kau-e38252e1576c7259626222067f872ffbe2b25ccb.zip
Fix travis
-rw-r--r--.travis.yml28
-rw-r--r--library/src/main/kotlin/ca/allanwang/kau/searchview/SearchView.kt5
-rw-r--r--sample/src/main/res/menu/menu_main.xml3
3 files changed, 19 insertions, 17 deletions
diff --git a/.travis.yml b/.travis.yml
index cc4bfda..7e0a791 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,29 +1,31 @@
language: android
+jdk:
+- oraclejdk8
android:
components:
- - tools
- - platform-tools
- - build-tools-26.0.0
- - android-26
- - extra-google-m2repository
- - extra-android-m2repository
-jdk:
- - oraclejdk8
-licenses:
+ - tools
+ - platform-tools
+ - build-tools-26.0.0
+ - android-26
+ - extra-android-support
+ - extra-android-m2repository
+ - extra-google-m2repository
+ licenses:
- '.+'
script: ./gradlew clean test
branches:
except:
- - gh-pages
+ - gh-pages
notifications:
email: false
- rooms:
+ slack:
+ rooms:
- pitchedapps:G5OB9U1vsDxy9mxt0Nt6gbFu#kau
on_success: always
on_failure: always
sudo: false
cache:
directories:
- - $HOME/.m2
+ - $HOME/.m2
before_script:
- - chmod +x gradlew \ No newline at end of file
+- chmod +x gradlew \ No newline at end of file
diff --git a/library/src/main/kotlin/ca/allanwang/kau/searchview/SearchView.kt b/library/src/main/kotlin/ca/allanwang/kau/searchview/SearchView.kt
index 45274b8..4f2bf50 100644
--- a/library/src/main/kotlin/ca/allanwang/kau/searchview/SearchView.kt
+++ b/library/src/main/kotlin/ca/allanwang/kau/searchview/SearchView.kt
@@ -16,6 +16,7 @@ import android.widget.FrameLayout
import android.widget.ImageView
import android.widget.ProgressBar
import ca.allanwang.kau.R
+import ca.allanwang.kau.logging.KL
import ca.allanwang.kau.utils.*
import com.mikepenz.fastadapter.commons.adapters.FastItemAdapter
import com.mikepenz.google_material_typeface_library.GoogleMaterial
@@ -116,8 +117,8 @@ class SearchView @JvmOverloads constructor(
this.parent = parent
val item = menu.findItem(id)
if (item.icon == null) item.icon = GoogleMaterial.Icon.gmd_search.toDrawable(context, 20)
- gone()
- item.setOnMenuItemClickListener { getMenuItemCoords(it); revealOpen(); true }
+ card.gone()
+ item.setOnMenuItemClickListener { KL.e("Click"); getMenuItemCoords(it); revealOpen(); true }
shadow.setOnClickListener { revealClose() }
}
diff --git a/sample/src/main/res/menu/menu_main.xml b/sample/src/main/res/menu/menu_main.xml
index 3bfc3d2..0481ae5 100644
--- a/sample/src/main/res/menu/menu_main.xml
+++ b/sample/src/main/res/menu/menu_main.xml
@@ -7,8 +7,7 @@
android:id="@+id/action_search"
android:orderInCategory="90"
android:title="@string/kau_search"
- app:showAsAction="always|collapseActionView"
- app:actionViewClass="android.support.v7.widget.SearchView" />
+ app:showAsAction="always|collapseActionView" />
<item
android:id="@+id/action_settings"