添加搜索仓库和搜索用户排序功能

Author: fmtcias

app/src/main/java/com/fmt/github/ext/BooleanExt.kt

@@ -4,22 +4,24 @@ package com.fmt.github.ext
 
 sealed class BooleanExt<out T>//巧用协变与密封类(增强版枚举)
 
-class Success<T>(val data: T) : BooleanExt<T>()
+class Success<T>(val data: T) : BooleanExt<T>()//data是协变点(get方法)
 
 object OtherWise : BooleanExt<Nothing>()//Nothing是任何类的子类
 
 inline fun <T> Boolean.yes(block: () -> T): BooleanExt<T> =//inline提升性能
-    when {
-        this -> {
-            Success(block())
-        }
-        else -> {
-            OtherWise
-        }
+    when {//类似于if-else if - else链,不提供参数，所有的分支条件都是简单的布尔表达式，而当一个分支的条件为真时则执行该分支
+        this -> Success(block())
+        else -> OtherWise
     }
 
+fun <T> Boolean.no(block: () -> T): BooleanExt<T> = when {
+    this -> OtherWise
+    else -> Success(block())
+}
+
 inline fun <T> BooleanExt<T>.otherwise(block: () -> T): T =
     when (this) {
         is Success -> this.data
         OtherWise -> block()
     }
+

app/src/main/java/com/fmt/github/home/activity/CommonSearchActivity.kt

@@ -97,15 +97,15 @@ class CommonSearchActivity : BaseDataBindActivity<ActivityCommonSearchBinding>()
 
     private fun searchReposOrUsers() {
         mSearchReposModel.searchKey.get()?.apply {
-            this.isEmpty().yes {
-                warningToast(R.string.please_enter_search_keywords)
-            }.otherwise {
+            this.isEmpty().no {
                 mSortTv.visibility = View.VISIBLE
                 mIsSearchRepos.yes {
                     mReposFragment.searchReposByKey(this, mSort, mOrder)
                 }.otherwise {
                     mUsersFragment.searchUsersByKey(this, mSort, mOrder)
                 }
+            }.otherwise {
+                warningToast(R.string.please_enter_search_keywords)
             }
         }
     }

app/src/main/java/com/fmt/github/home/activity/HomeActivity.kt

@@ -131,7 +131,7 @@ class HomeActivity : BaseVMActivity(), NavigationView.OnNavigationItemSelectedLi
     }
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
-        when (item.itemId) {
+        when (item.itemId) {//增强版switch
             R.id.item_search_repos -> go2SearchActivity(true)
             R.id.item_search_users -> go2SearchActivity(false)
         }