Skip to content

Commit eb06b84

Browse files
committed
添加搜索仓库和搜索用户排序功能
1 parent 39497ff commit eb06b84

File tree

4 files changed

+18
-7
lines changed

4 files changed

+18
-7
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ class CommonSearchActivity : BaseDataBindActivity<ActivityCommonSearchBinding>()
2121

2222
private var mIsSearchRepos = true//类型自动推导,无需写声明类型即:Boolean
2323

24-
private var mSearchReposModel = SearchModel()
24+
private val mSearchReposModel by lazy { SearchModel() }
2525

2626
private val mReposFragment by lazy { ReposFragment() }
2727
private val mUsersFragment by lazy { UserFragment() }

app/src/main/java/com/fmt/github/home/viewmodel/HomeViewModel.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package com.fmt.github.home.viewmodel
33
import androidx.lifecycle.LiveData
44
import androidx.lifecycle.MutableLiveData
55
import com.fmt.github.base.viewmodel.BaseViewModel
6+
import com.fmt.github.ext.yes
67
import com.fmt.github.user.repository.UserRepository
78

89
class HomeViewModel(private val mUserRepository : UserRepository) : BaseViewModel() {
@@ -11,7 +12,7 @@ class HomeViewModel(private val mUserRepository : UserRepository) : BaseViewMode
1112
val mutableLiveData = MutableLiveData<Boolean>()
1213
launch {
1314
val response = mUserRepository.deleteAuthorization(id)
14-
if (response.code() == 204) {
15+
(response.code() == 204).yes {
1516
mutableLiveData.value = true
1617
}
1718
}

app/src/main/java/com/fmt/github/repos/viewmodel/ReposViewModel.kt

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,21 @@ package com.fmt.github.repos.viewmodel
33
import androidx.lifecycle.LiveData
44
import androidx.lifecycle.MutableLiveData
55
import com.fmt.github.base.viewmodel.BaseViewModel
6+
import com.fmt.github.ext.yes
67
import com.fmt.github.repos.model.ReposItemModel
78
import com.fmt.github.repos.repository.ReposRepository
89

910
class ReposViewModel(private val mReposRepository: ReposRepository) : BaseViewModel() {
1011

11-
fun searchRepos(query: String,sort: String, order: String,page: Int): LiveData<List<ReposItemModel>> {
12+
fun searchRepos(
13+
query: String,
14+
sort: String,
15+
order: String,
16+
page: Int
17+
): LiveData<List<ReposItemModel>> {
1218
val mutableLiveData = MutableLiveData<List<ReposItemModel>>()
1319
launch {
14-
mutableLiveData.value = mReposRepository.searchRepos(query, sort,order, page).items
20+
mutableLiveData.value = mReposRepository.searchRepos(query, sort, order, page).items
1521
}
1622
return mutableLiveData
1723
}
@@ -33,7 +39,7 @@ class ReposViewModel(private val mReposRepository: ReposRepository) : BaseViewMo
3339
val mutableLiveData = MutableLiveData<Boolean>()
3440
launch {
3541
val response = mReposRepository.starRepo(owner, repo)
36-
if (response.code() == 204) {
42+
(response.code() == 204).yes {
3743
mutableLiveData.value = true
3844
}
3945
}
@@ -44,7 +50,7 @@ class ReposViewModel(private val mReposRepository: ReposRepository) : BaseViewMo
4450
val mutableLiveData = MutableLiveData<Boolean>()
4551
launch {
4652
val response = mReposRepository.unStarRepo(owner, repo)
47-
if (response.code() == 204) {
53+
(response.code() == 204).yes {
4854
mutableLiveData.value = true
4955
}
5056
}

app/src/main/java/com/fmt/github/user/fragment/UserFragment.kt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,11 @@ class UserFragment : BaseListMVFragment<UserModel>() {
5454
putExtra(UserInfoActivity.USER_INFO, userModel)
5555
}.run {
5656
//共享元素共享动画
57-
ActivityOptionsCompat.makeSceneTransitionAnimation(mActivity, view.findViewById(R.id.iv_head), "image")
57+
ActivityOptionsCompat.makeSceneTransitionAnimation(
58+
mActivity,
59+
view.findViewById(R.id.iv_head),
60+
"image"
61+
)
5862
.toBundle()
5963
.also { bundle ->
6064
startActivity(this, bundle)

0 commit comments

Comments
 (0)