diff --git a/magellan-sample-migration/src/main/java/com/wealthfront/magellan/sample/migration/tide/DogListAdapter.kt b/magellan-sample-migration/src/main/java/com/wealthfront/magellan/sample/migration/tide/DogListAdapter.kt index 4aaf5bd6..358c891e 100644 --- a/magellan-sample-migration/src/main/java/com/wealthfront/magellan/sample/migration/tide/DogListAdapter.kt +++ b/magellan-sample-migration/src/main/java/com/wealthfront/magellan/sample/migration/tide/DogListAdapter.kt @@ -8,11 +8,10 @@ import androidx.recyclerview.widget.RecyclerView import com.wealthfront.magellan.sample.migration.R class DogListAdapter( + var dataSet: List = emptyList(), private val onDogSelected: (String) -> Unit ) : RecyclerView.Adapter() { - var dataSet: Array = emptyArray() - class ViewHolder(view: View) : RecyclerView.ViewHolder(view) { val textView: TextView = view.findViewById(R.id.dogName) diff --git a/magellan-sample-migration/src/main/java/com/wealthfront/magellan/sample/migration/tide/DogListStep.kt b/magellan-sample-migration/src/main/java/com/wealthfront/magellan/sample/migration/tide/DogListStep.kt index 61d40f09..b0f83810 100644 --- a/magellan-sample-migration/src/main/java/com/wealthfront/magellan/sample/migration/tide/DogListStep.kt +++ b/magellan-sample-migration/src/main/java/com/wealthfront/magellan/sample/migration/tide/DogListStep.kt @@ -30,7 +30,7 @@ class DogListStep @AssistedInject constructor( override fun onShow(context: Context, binding: DashboardBinding) { toolbarHelper.setTitle(context.getText(R.string.app_name)) binding.dogItems.layoutManager = LinearLayoutManager(context, VERTICAL, false) - binding.dogItems.adapter = DogListAdapter(goToDogDetails) + binding.dogItems.adapter = DogListAdapter(emptyList(), goToDogDetails) val decoration = DividerItemDecoration(context, VERTICAL) binding.dogItems.addItemDecoration(decoration) @@ -38,7 +38,7 @@ class DogListStep @AssistedInject constructor( shownScope.launch { val dogBreedsResponse = runCatching { api.getAllBreeds() } dogBreedsResponse.onSuccess { dogBreeds -> - (binding.dogItems.adapter as DogListAdapter).dataSet = dogBreeds.message.keys.toTypedArray() + (binding.dogItems.adapter as DogListAdapter).dataSet = dogBreeds.message.keys.toList() (binding.dogItems.adapter as DogListAdapter).notifyDataSetChanged() } dogBreedsResponse.onFailure { throwable -> diff --git a/magellan-sample-migration/src/test/java/com/wealthfront/magellan/sample/migration/tide/DogDetailsScreenTest.kt b/magellan-sample-migration/src/test/java/com/wealthfront/magellan/sample/migration/tide/DogDetailsScreenTest.kt index a1b8e1d1..5d1e2b2d 100644 --- a/magellan-sample-migration/src/test/java/com/wealthfront/magellan/sample/migration/tide/DogDetailsScreenTest.kt +++ b/magellan-sample-migration/src/test/java/com/wealthfront/magellan/sample/migration/tide/DogDetailsScreenTest.kt @@ -11,8 +11,8 @@ import com.wealthfront.magellan.sample.migration.AppComponentContainer import com.wealthfront.magellan.sample.migration.TestAppComponent import com.wealthfront.magellan.sample.migration.api.DogImageResponse import io.mockk.coEvery -import io.mockk.coVerify import io.mockk.mockk +import io.mockk.verify import org.junit.Before import org.junit.Test import org.junit.runner.RunWith @@ -55,6 +55,6 @@ class DogDetailsScreenTest { fun fetchesDogBreedOnShow() { screen.transitionToState(LifecycleState.Shown(activity)) shadowOf(getMainLooper()).idle() - coVerify { dogDetailsView.setDogPic("image-url") } + verify { dogDetailsView.setDogPic("image-url") } } }