Rx search view

buildSrc/src/main/kotlin/com/jakewharton/rxbinding/project/KotlinGenTask.kt

@@ -6,7 +6,6 @@ import com.github.javaparser.ast.PackageDeclaration
 import com.github.javaparser.ast.TypeParameter
 import com.github.javaparser.ast.body.ClassOrInterfaceDeclaration
 import com.github.javaparser.ast.body.MethodDeclaration
-import com.github.javaparser.ast.body.ModifierSet
 import com.github.javaparser.ast.type.ClassOrInterfaceType
 import com.github.javaparser.ast.type.PrimitiveType
 import com.github.javaparser.ast.type.ReferenceType
@@ -36,9 +35,9 @@ open class KotlinGenTask : SourceTask() {
      */
     private val IGNORED_IMPORTS = listOf(
         "java.util.List",
-        "android.annotation.TargetApi",
         "android.support.annotation.CheckResult",
-        "android.support.annotation.NonNull"
+        "android.support.annotation.NonNull",
+        "android.support.annotation.RequiresApi"
     )
 
     fun resolveKotlinTypeByName(input: String): String {
@@ -187,7 +186,6 @@ open class KotlinGenTask : SourceTask() {
   class KMethod(val n: MethodDeclaration) {
     private val name = n.name
     private val comment = if (n.comment != null) cleanUpDoc(n.comment.toString()) else null
-    private val accessModifier = ModifierSet.getAccessSpecifier(n.modifiers).codeRepresenation
     private val extendedClass = n.parameters[0].type.toString()
     private val parameters = n.parameters.subList(1, n.parameters.size)
     private val returnType = n.type
@@ -276,8 +274,8 @@ open class KotlinGenTask : SourceTask() {
       // doc
       builder.append("${comment ?: ""}\n")
 
-      // access modifier and other signature boilerplate
-      builder.append("$accessModifier inline fun ")
+      // signature boilerplate
+      builder.append("inline fun ")
 
       // type params
       builder.append(if (typeParameters != null) typeParameters + " " else "")

dependencies.gradle

@@ -9,12 +9,13 @@ ext {
   kotlinPlugin = 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.0.3'
   kotlinStdlib = 'org.jetbrains.kotlin:kotlin-stdlib:1.0.3'
 
-  supportAnnotations = 'com.android.support:support-annotations:24.0.0'
-  supportV4 = 'com.android.support:support-v4:24.0.0'
-  supportRecyclerView = 'com.android.support:recyclerview-v7:24.0.0'
-  supportAppCompat = 'com.android.support:appcompat-v7:24.0.0'
-  supportDesign = 'com.android.support:design:24.0.0'
-  supportLeanback = 'com.android.support:leanback-v17:24.0.0'
+  supportVersion = '25.0.0'
+  supportAnnotations = "com.android.support:support-annotations:$supportVersion"
+  supportV4CoreUi = "com.android.support:support-core-ui:$supportVersion"
+  supportRecyclerView = "com.android.support:recyclerview-v7:$supportVersion"
+  supportAppCompat = "com.android.support:appcompat-v7:$supportVersion"
+  supportDesign = "com.android.support:design:$supportVersion"
+  supportLeanback = "com.android.support:leanback-v17:$supportVersion"
 
   supportTestRunner = 'com.android.support.test:runner:0.5'
   supportTestRules = 'com.android.support.test:rules:0.5'
@@ -27,3 +28,15 @@ ext {
 
   javaParser = 'com.github.javaparser:javaparser-core:2.1.0'
 }
+
+subprojects { project ->
+  project.configurations.all {
+    resolutionStrategy {
+      eachDependency { details ->
+        if (details.requested.group == 'com.android.support') {
+          details.useVersion(rootProject.ext.supportVersion)
+        }
+      }
+    }
+  }
+}

rxbinding-appcompat-v7-kotlin/src/main/kotlin/com/jakewharton/rxbinding/support/v7/widget/RxActionMenuView.kt

@@ -10,4 +10,4 @@ import rx.Observable
  * *Warning:* The created observable keeps a strong reference to `view`.
  * Unsubscribe to free this reference.
  */
-public inline fun ActionMenuView.itemClicks(): Observable<MenuItem> = RxActionMenuView.itemClicks(this)
+inline fun ActionMenuView.itemClicks(): Observable<MenuItem> = RxActionMenuView.itemClicks(this)

rxbinding-appcompat-v7-kotlin/src/main/kotlin/com/jakewharton/rxbinding/support/v7/widget/RxPopupMenu.kt

@@ -13,7 +13,7 @@ import rx.Observable
  * *Warning:* The created observable uses [PopupMenu.setOnMenuItemClickListener]
  * to observe dismiss change. Only one observable can be used for a view at a time.
  */
-public inline fun PopupMenu.itemClicks(): Observable<MenuItem> = RxPopupMenu.itemClicks(this)
+inline fun PopupMenu.itemClicks(): Observable<MenuItem> = RxPopupMenu.itemClicks(this)
 
 /**
  * Create an observable which emits on `view` dismiss events. The emitted value is
@@ -25,4 +25,4 @@ public inline fun PopupMenu.itemClicks(): Observable<MenuItem> = RxPopupMenu.ite
  * *Warning:* The created observable uses [PopupMenu.setOnDismissListener] to
  * observe dismiss change. Only one observable can be used for a view at a time.
  */
-public inline fun PopupMenu.dismisses(): Observable<Unit> = RxPopupMenu.dismisses(this).map { Unit }
+inline fun PopupMenu.dismisses(): Observable<Unit> = RxPopupMenu.dismisses(this).map { Unit }

rxbinding-appcompat-v7-kotlin/src/main/kotlin/com/jakewharton/rxbinding/support/v7/widget/RxSearchView.kt

@@ -1,7 +1,6 @@
 package com.jakewharton.rxbinding.support.v7.widget
 
 import android.support.v7.widget.SearchView
-import com.jakewharton.rxbinding.internal.Functions
 import rx.Observable
 import rx.functions.Action1
 import rx.functions.Func1
@@ -15,7 +14,7 @@ import rx.functions.Func1
  *
  * *Note:* A value will be emitted immediately on subscribe.
  */
-public inline fun SearchView.queryTextChangeEvents(): Observable<SearchViewQueryTextEvent> = RxSearchView.queryTextChangeEvents(this)
+inline fun SearchView.queryTextChangeEvents(): Observable<SearchViewQueryTextEvent> = RxSearchView.queryTextChangeEvents(this)
 
 /**
  * Create an observable of character sequences for query text changes on `view`.
@@ -25,7 +24,7 @@ public inline fun SearchView.queryTextChangeEvents(): Observable<SearchViewQuery
  *
  * *Note:* A value will be emitted immediately on subscribe.
  */
-public inline fun SearchView.queryTextChanges(): Observable<CharSequence> = RxSearchView.queryTextChanges(this)
+inline fun SearchView.queryTextChanges(): Observable<CharSequence> = RxSearchView.queryTextChanges(this)
 
 /**
  * An action which sets the query property of `view` with character sequences.
@@ -35,38 +34,38 @@ public inline fun SearchView.queryTextChanges(): Observable<CharSequence> = RxSe
  *
  * @param submit weather to submit query right after updating query text
  */
-public inline fun SearchView.query(submit: Boolean): Action1<in CharSequence> = RxSearchView.query(this, submit)
+inline fun SearchView.query(submit: Boolean): Action1<in CharSequence> = RxSearchView.query(this, submit)
 
 /**
  * Create an observable of booleans representing the focus of the query text field.
- * 
+ *
  * *Warning:* The created observable keeps a strong reference to `view`. Unsubscribe
  * to free this reference.
- * 
+ *
  */
-public inline fun SearchView.queryTextFocusChange(): Observable<Boolean> = RxSearchView.queryTextFocusChange(this)
+inline fun SearchView.queryTextFocusChange(): Observable<Boolean> = RxSearchView.queryTextFocusChange(this)
 
 /**
  * Create an observable of the absolute position of the clicked item in the list of suggestions
- * 
+ *
  * *Warning:* The created observable keeps a strong reference to `view`. Unsubscribe
  * to free this reference.
- * 
+ *
  * *Warning:* The created observable uses [SearchView.setOnSuggestionListener] to
  * observe search view events. Only one observable can be used for a search view at a time.
  */
-public inline fun SearchView.suggestionClick(): Observable<Int> = RxSearchView.suggestionClick(this)
+inline fun SearchView.suggestionClick(): Observable<Int> = RxSearchView.suggestionClick(this)
 
 /**
  * Create an observable of the absolute position of the clicked item in the list of suggestions
- * 
+ *
  * *Warning:* The created observable keeps a strong reference to `view`. Unsubscribe
  * to free this reference.
- * 
+ *
  * *Warning:* The created observable uses [SearchView.setOnSuggestionListener] to
  * observe search view events. Only one observable can be used for a search view at a time.
  *
  * @param handled Function invoked with each value to determine the return value of the
  * underlying [SearchView.OnSuggestionListener].
  */
-public inline fun SearchView.suggestionClick(handled: Func1<in Int, Boolean>): Observable<Int> = RxSearchView.suggestionClick(this, handled)
+inline fun SearchView.suggestionClick(handled: Func1<in Int, Boolean>): Observable<Int> = RxSearchView.suggestionClick(this, handled)

rxbinding-appcompat-v7-kotlin/src/main/kotlin/com/jakewharton/rxbinding/support/v7/widget/RxToolbar.kt

@@ -10,7 +10,7 @@ import rx.Observable
  * *Warning:* The created observable keeps a strong reference to `view`. Unsubscribe
  * to free this reference.
  */
-public inline fun Toolbar.itemClicks(): Observable<MenuItem> = RxToolbar.itemClicks(this)
+inline fun Toolbar.itemClicks(): Observable<MenuItem> = RxToolbar.itemClicks(this)
 
 /**
  * Create an observable which emits on `view` navigation click events. The emitted value is
@@ -22,4 +22,4 @@ public inline fun Toolbar.itemClicks(): Observable<MenuItem> = RxToolbar.itemCli
  * *Warning:* The created observable uses [Toolbar.setNavigationOnClickListener]
  * to observe clicks. Only one observable can be used for a view at a time.
  */
-public inline fun Toolbar.navigationClicks(): Observable<Unit> = RxToolbar.navigationClicks(this).map { Unit }
+inline fun Toolbar.navigationClicks(): Observable<Unit> = RxToolbar.navigationClicks(this).map { Unit }

rxbinding-appcompat-v7/src/main/java/com/jakewharton/rxbinding/support/v7/widget/ActionMenuViewItemClickOnSubscribe.java

@@ -28,13 +28,14 @@ final class ActionMenuViewItemClickOnSubscribe implements Observable.OnSubscribe
           return true;
         }
       };
-    view.setOnMenuItemClickListener(listener);
 
     subscriber.add(new MainThreadSubscription() {
       @Override
       protected void onUnsubscribe() {
         view.setOnMenuItemClickListener(null);
       }
     });
+
+    view.setOnMenuItemClickListener(listener);
   }
 }

rxbinding-appcompat-v7/src/main/java/com/jakewharton/rxbinding/support/v7/widget/PopupMenuDismissOnSubscribe.java

@@ -26,12 +26,12 @@ public PopupMenuDismissOnSubscribe(PopupMenu view) {
       }
     };
 
-    view.setOnDismissListener(listener);
-
     subscriber.add(new MainThreadSubscription() {
       @Override protected void onUnsubscribe() {
         view.setOnDismissListener(null);
       }
     });
+
+    view.setOnDismissListener(listener);
   }
 }

rxbinding-appcompat-v7/src/main/java/com/jakewharton/rxbinding/support/v7/widget/PopupMenuItemClickOnSubscribe.java

@@ -28,12 +28,12 @@ public PopupMenuItemClickOnSubscribe(PopupMenu view) {
       }
     };
 
-    view.setOnMenuItemClickListener(listener);
-
     subscriber.add(new MainThreadSubscription() {
       @Override protected void onUnsubscribe() {
         view.setOnMenuItemClickListener(null);
       }
     });
+
+    view.setOnMenuItemClickListener(listener);
   }
 }

rxbinding-appcompat-v7/src/main/java/com/jakewharton/rxbinding/support/v7/widget/SearchViewQueryTextChangeEventsOnSubscribe.java

@@ -36,14 +36,14 @@ final class SearchViewQueryTextChangeEventsOnSubscribe
       }
     };
 
-    view.setOnQueryTextListener(watcher);
-
     subscriber.add(new MainThreadSubscription() {
       @Override protected void onUnsubscribe() {
         view.setOnQueryTextListener(null);
       }
     });
 
+    view.setOnQueryTextListener(watcher);
+
     // Emit initial value.
     subscriber.onNext(SearchViewQueryTextEvent.create(view, view.getQuery(), false));
   }

rxbinding-appcompat-v7/src/main/java/com/jakewharton/rxbinding/support/v7/widget/SearchViewQueryTextChangesOnSubscribe.java

@@ -31,14 +31,14 @@ final class SearchViewQueryTextChangesOnSubscribe implements Observable.OnSubscr
       }
     };
 
-    view.setOnQueryTextListener(watcher);
-
     subscriber.add(new MainThreadSubscription() {
       @Override protected void onUnsubscribe() {
         view.setOnQueryTextListener(null);
       }
     });
 
+    view.setOnQueryTextListener(watcher);
+
     // Emit initial value.
     subscriber.onNext(view.getQuery());
   }

rxbinding-appcompat-v7/src/main/java/com/jakewharton/rxbinding/support/v7/widget/ToolbarItemClickOnSubscribe.java

@@ -26,12 +26,13 @@ final class ToolbarItemClickOnSubscribe implements Observable.OnSubscribe<MenuIt
         return true;
       }
     };
-    view.setOnMenuItemClickListener(listener);
 
     subscriber.add(new MainThreadSubscription() {
       @Override protected void onUnsubscribe() {
         view.setOnMenuItemClickListener(null);
       }
     });
+
+    view.setOnMenuItemClickListener(listener);
   }
 }

rxbinding-appcompat-v7/src/main/java/com/jakewharton/rxbinding/support/v7/widget/ToolbarNavigationClickOnSubscribe.java

@@ -25,12 +25,13 @@ final class ToolbarNavigationClickOnSubscribe implements Observable.OnSubscribe<
         }
       }
     };
-    view.setNavigationOnClickListener(listener);
 
     subscriber.add(new MainThreadSubscription() {
       @Override protected void onUnsubscribe() {
         view.setNavigationOnClickListener(null);
       }
     });
+
+    view.setNavigationOnClickListener(listener);
   }
 }

rxbinding-design-kotlin/src/main/kotlin/com/jakewharton/rxbinding/support/design/widget/RxAppBarLayout.kt

@@ -9,4 +9,4 @@ import rx.Observable
  * *Warning:* The created observable keeps a strong reference to `view`. Unsubscribe
  * to free this reference.
  */
-public inline fun AppBarLayout.offsetChanges(): Observable<Int> = RxAppBarLayout.offsetChanges(this)
+inline fun AppBarLayout.offsetChanges(): Observable<Int> = RxAppBarLayout.offsetChanges(this)

rxbinding-design-kotlin/src/main/kotlin/com/jakewharton/rxbinding/support/design/widget/RxBottomNavigationView.kt

@@ -0,0 +1,15 @@
+package com.jakewharton.rxbinding.support.design.widget
+
+import android.support.design.widget.BottomNavigationView
+import android.view.MenuItem
+import rx.Observable
+
+/**
+ * Create an observable which emits the selected item in `view`.
+ *
+ * *Warning:* The created observable keeps a strong reference to `view`. Unsubscribe
+ * to free this reference.
+ *
+ * *Note:* If an item is already selected, it will be emitted immediately on subscribe.
+ */
+inline fun BottomNavigationView.itemSelections(): Observable<MenuItem> = RxBottomNavigationView.itemSelections(this)

rxbinding-design-kotlin/src/main/kotlin/com/jakewharton/rxbinding/support/design/widget/RxNavigationView.kt

@@ -13,4 +13,4 @@ import rx.Observable
  * *Note:* If an item is already selected, it will be emitted immediately on subscribe.
  * This behavior assumes but does not enforce that the items are exclusively checkable.
  */
-public inline fun NavigationView.itemSelections(): Observable<MenuItem> = RxNavigationView.itemSelections(this)
+inline fun NavigationView.itemSelections(): Observable<MenuItem> = RxNavigationView.itemSelections(this)

rxbinding-design-kotlin/src/main/kotlin/com/jakewharton/rxbinding/support/design/widget/RxSnackbar.kt

@@ -9,4 +9,4 @@ import rx.Observable
  * *Warning:* The created observable keeps a strong reference to `view`. Unsubscribe
  * to free this reference.
  */
-public inline fun Snackbar.dismisses(): Observable<Int> = RxSnackbar.dismisses(this)
+inline fun Snackbar.dismisses(): Observable<Int> = RxSnackbar.dismisses(this)

rxbinding-design-kotlin/src/main/kotlin/com/jakewharton/rxbinding/support/design/widget/RxSwipeDismissBehavior.kt

@@ -11,4 +11,4 @@ import rx.Observable
  * *Warning:* The created observable keeps a strong reference to `view`. Unsubscribe
  * to free this reference.
  */
-public inline fun View.dismisses(): Observable<View> = RxSwipeDismissBehavior.dismisses(this)
+inline fun View.dismisses(): Observable<View> = RxSwipeDismissBehavior.dismisses(this)

rxbinding-design-kotlin/src/main/kotlin/com/jakewharton/rxbinding/support/design/widget/RxTabLayout.kt

@@ -13,7 +13,7 @@ import rx.functions.Action1
  *
  * *Note:* If a tab is already selected, it will be emitted immediately on subscribe.
  */
-public inline fun TabLayout.selections(): Observable<Tab> = RxTabLayout.selections(this)
+inline fun TabLayout.selections(): Observable<Tab> = RxTabLayout.selections(this)
 
 /**
  * Create an observable which emits selection, reselection, and unselection events for the tabs
@@ -24,12 +24,12 @@ public inline fun TabLayout.selections(): Observable<Tab> = RxTabLayout.selectio
  *
  * *Note:* If a tab is already selected, an event will be emitted immediately on subscribe.
  */
-public inline fun TabLayout.selectionEvents(): Observable<TabLayoutSelectionEvent> = RxTabLayout.selectionEvents(this)
+inline fun TabLayout.selectionEvents(): Observable<TabLayoutSelectionEvent> = RxTabLayout.selectionEvents(this)
 
 /**
  * An action which sets the selected tab of `view`.
  *
  * *Warning:* The created observable keeps a strong reference to `view`. Unsubscribe
  * to free this reference.
  */
-public inline fun TabLayout.select(): Action1<in Int> = RxTabLayout.select(this)
+inline fun TabLayout.select(): Action1<in Int> = RxTabLayout.select(this)