From 8c293ed748cba426ab2e149aff4bba19ae8cd7f3 Mon Sep 17 00:00:00 2001 From: Kazuki Chigita Date: Wed, 2 May 2018 14:26:39 +0900 Subject: [PATCH 1/2] [fix] fix feature that cannot search youtube video --- .../viewmodel/SearchVideoActivityViewModel.kt | 22 ++++++++----------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/app/src/main/kotlin/com/cyder/android/syncpod/viewmodel/SearchVideoActivityViewModel.kt b/app/src/main/kotlin/com/cyder/android/syncpod/viewmodel/SearchVideoActivityViewModel.kt index 25c20b4a..7d7796ca 100644 --- a/app/src/main/kotlin/com/cyder/android/syncpod/viewmodel/SearchVideoActivityViewModel.kt +++ b/app/src/main/kotlin/com/cyder/android/syncpod/viewmodel/SearchVideoActivityViewModel.kt @@ -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 @@ -42,17 +40,15 @@ 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) - }, { - - }) - } + val word = searchWord.get() ?: "" + videoViewModels.clear() + repository.getYouTubeSearch(word) + .map { convertToViewModel(it) } + .subscribe({ + videoViewModels.addAll(it) + }, { + + }) return false } From e9cfd954125a8aa621e61040d8cb76d13589cf7b Mon Sep 17 00:00:00 2001 From: Kazuki Chigita Date: Wed, 2 May 2018 14:29:08 +0900 Subject: [PATCH 2/2] [clean] Remove unused argument --- .../android/syncpod/viewmodel/SearchVideoActivityViewModel.kt | 2 +- app/src/main/res/layout/activity_search_video.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/kotlin/com/cyder/android/syncpod/viewmodel/SearchVideoActivityViewModel.kt b/app/src/main/kotlin/com/cyder/android/syncpod/viewmodel/SearchVideoActivityViewModel.kt index 7d7796ca..13f95119 100644 --- a/app/src/main/kotlin/com/cyder/android/syncpod/viewmodel/SearchVideoActivityViewModel.kt +++ b/app/src/main/kotlin/com/cyder/android/syncpod/viewmodel/SearchVideoActivityViewModel.kt @@ -39,7 +39,7 @@ class SearchVideoActivityViewModel @Inject constructor( fun onBackButtonClicked() = navigator.closeActivity() - fun onEnterKeyClicked(actionId: Int): Boolean { + fun onEnterKeyClicked(): Boolean { val word = searchWord.get() ?: "" videoViewModels.clear() repository.getYouTubeSearch(word) diff --git a/app/src/main/res/layout/activity_search_video.xml b/app/src/main/res/layout/activity_search_video.xml index 5582b801..7aef522d 100644 --- a/app/src/main/res/layout/activity_search_video.xml +++ b/app/src/main/res/layout/activity_search_video.xml @@ -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()}">