diff options
| author | Allan Wang <allanwang@google.com> | 2019-07-27 17:46:04 -0700 |
|---|---|---|
| committer | Allan Wang <allanwang@google.com> | 2019-07-27 17:46:04 -0700 |
| commit | 50c8012e2fe88d6b275d1a3269033590962caa7f (patch) | |
| tree | 65ebb32525be83441e6caac8362e3e9ae022bfd1 /searchview | |
| parent | 01058912580a3ecfe77eaf6af209e1c46a97f2d7 (diff) | |
| parent | d94017e6f6df67e80604111028ea16f6c7f4e077 (diff) | |
| download | kau-50c8012e2fe88d6b275d1a3269033590962caa7f.tar.gz kau-50c8012e2fe88d6b275d1a3269033590962caa7f.tar.bz2 kau-50c8012e2fe88d6b275d1a3269033590962caa7f.zip | |
Fix initial conflicts
Diffstat (limited to 'searchview')
| -rw-r--r-- | searchview/build.gradle | 2 | ||||
| -rw-r--r-- | searchview/src/main/kotlin/ca/allanwang/kau/searchview/SearchItem.kt | 2 | ||||
| -rw-r--r-- | searchview/src/main/kotlin/ca/allanwang/kau/searchview/SearchView.kt | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/searchview/build.gradle b/searchview/build.gradle index 39a3662..f9e83fc 100644 --- a/searchview/build.gradle +++ b/searchview/build.gradle @@ -4,7 +4,7 @@ apply from: '../android-lib.gradle' dependencies { implementation project(':core-ui') - implementation project(':adapter') + implementation project(':fastadapter') } apply from: '../artifacts.gradle' diff --git a/searchview/src/main/kotlin/ca/allanwang/kau/searchview/SearchItem.kt b/searchview/src/main/kotlin/ca/allanwang/kau/searchview/SearchItem.kt index 98921bb..7747d81 100644 --- a/searchview/src/main/kotlin/ca/allanwang/kau/searchview/SearchItem.kt +++ b/searchview/src/main/kotlin/ca/allanwang/kau/searchview/SearchItem.kt @@ -32,7 +32,7 @@ import ca.allanwang.kau.utils.setIcon import ca.allanwang.kau.utils.setRippleBackground import ca.allanwang.kau.utils.visible import com.mikepenz.iconics.typeface.IIcon -import com.mikepenz.iconics.typeface.library.googlematerial.GoogleMaterial +import com.mikepenz.google_material_typeface_library.GoogleMaterial /** * Created by Allan Wang on 2017-06-23. 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 39e0d28..18eb675 100644 --- a/searchview/src/main/kotlin/ca/allanwang/kau/searchview/SearchView.kt +++ b/searchview/src/main/kotlin/ca/allanwang/kau/searchview/SearchView.kt @@ -64,7 +64,7 @@ import ca.allanwang.kau.utils.visible import ca.allanwang.kau.utils.withLinearAdapter import com.mikepenz.fastadapter.adapters.FastItemAdapter import com.mikepenz.iconics.typeface.IIcon -import com.mikepenz.iconics.typeface.library.googlematerial.GoogleMaterial +import com.mikepenz.google_material_typeface_library.GoogleMaterial import kotlinx.android.synthetic.main.kau_search_view.view.* /** |