Skip to content

検索できるようにする #255

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mori-atsushi merged 2 commits into from
May 2, 2018
Merged

検索できるようにする #255

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8c293ed
[fix] fix feature that cannot search youtube video
chigichan24 May 2, 2018
e9cfd95
[clean] Remove unused argument
chigichan24 May 2, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 10 additions & 14 deletions app/src/main/kotlin/com/cyder/android/syncpod/viewmodel/SearchVideoActivityViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,9 @@ package com.cyder.android.syncpod.viewmodel
import android.databinding.ObservableArrayList
import android.databinding.ObservableField
import android.databinding.ObservableList
import android.view.inputmethod.EditorInfo
import com.cyder.android.syncpod.model.Video
import com.cyder.android.syncpod.repository.VideoRepository
import com.cyder.android.syncpod.repository.YouTubeRepository
import com.cyder.android.syncpod.view.activity.SearchVideoActivity
import com.cyder.android.syncpod.view.helper.Navigator
import com.cyder.android.syncpod.viewmodel.base.ActivityViewModel
import javax.inject.Inject
Expand Down Expand Up @@ -41,18 +39,16 @@ class SearchVideoActivityViewModel @Inject constructor(

fun onBackButtonClicked() = navigator.closeActivity()

fun onEnterKeyClicked(actionId: Int): Boolean {
if (actionId == EditorInfo.IME_ACTION_SEARCH) {
val word = searchWord.get() ?: ""
videoViewModels.removeAll(videoViewModels)
repository.getYouTubeSearch(word)
.map { convertToViewModel(it) }
.subscribe({
videoViewModels.addAll(it)
}, {

})
}
fun onEnterKeyClicked(): Boolean {
val word = searchWord.get() ?: ""
videoViewModels.clear()
repository.getYouTubeSearch(word)
.map { convertToViewModel(it) }
.subscribe({
videoViewModels.addAll(it)
}, {

})
return false
}

Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/layout/activity_search_video.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
android:imeOptions="actionSearch"
android:inputType="text"
android:text="@={viewModel.searchWord}"
app:onEnterClick="@{(v, id, event) -> viewModel.onEnterKeyClicked(id)}">
app:onEnterClick="@{(v, id, event) -> viewModel.onEnterKeyClicked()}">

<requestFocus />
</EditText>
Expand Down