Fix typo

hi-dhl · Aug 24, 2020 · 7900fcf · 7900fcf
1 parent 88c9293
commit 7900fcf
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 19 deletions.
diff --git a/app/src/main/java/com/hi/dhl/pokemon/data/repository/PokemonRepositoryImpl.kt b/app/src/main/java/com/hi/dhl/pokemon/data/repository/PokemonRepositoryImpl.kt
@@ -49,7 +49,7 @@ class PokemonRepositoryImpl(
     val mapper2InfoModel: Mapper<PokemonInfoEntity, PokemonInfoModel>
 ) : Repository {
 
-    override fun featchPokemonList(): Flow<PagingData<PokemonItemModel>> {
+    override fun fetchPokemonList(): Flow<PagingData<PokemonItemModel>> {
         return Pager(
             config = pageConfig,
             remoteMediator = PokemonRemoteMediator(api, db)
@@ -60,7 +60,7 @@ class PokemonRepositoryImpl(
         }
     }
 
-    override suspend fun featchPokemonInfo(name: String): Flow<PokemonResult<PokemonInfoModel>> {
+    override suspend fun fetchPokemonInfo(name: String): Flow<PokemonResult<PokemonInfoModel>> {
         return flow {
             try {
                 val pokemonDao = db.pokemonInfoDao()

diff --git a/app/src/main/java/com/hi/dhl/pokemon/data/repository/Repository.kt b/app/src/main/java/com/hi/dhl/pokemon/data/repository/Repository.kt
@@ -30,7 +30,7 @@ import kotlinx.coroutines.flow.Flow
  * </pre>
  */
 interface Repository {
-    fun featchPokemonList(): Flow<PagingData<PokemonItemModel>>
+    fun fetchPokemonList(): Flow<PagingData<PokemonItemModel>>
 
-    suspend fun featchPokemonInfo(name: String): Flow<PokemonResult<PokemonInfoModel>>
+    suspend fun fetchPokemonInfo(name: String): Flow<PokemonResult<PokemonInfoModel>>
 }
diff --git a/app/src/main/java/com/hi/dhl/pokemon/ui/detail/DetailViewModel.kt b/app/src/main/java/com/hi/dhl/pokemon/ui/detail/DetailViewModel.kt
@@ -38,7 +38,7 @@ import kotlinx.coroutines.launch
  * </pre>
  */
 class DetailViewModel @ViewModelInject constructor(
-    val polemonRepository: Repository
+    private val pokemonRepository: Repository
 ) : ViewModel() {
     val mLoading = ObservableBoolean()
 
@@ -56,7 +56,7 @@ class DetailViewModel @ViewModelInject constructor(
      */
     @OptIn(ExperimentalCoroutinesApi::class)
     fun fectchPokemonInfo2(name: String) = liveData<PokemonInfoModel> {
-        polemonRepository.featchPokemonInfo(name)
+        pokemonRepository.fetchPokemonInfo(name)
             .onStart {
                 // 在调用 flow 请求数据之前，做一些准备工作，例如显示正在加载数据的按钮
                 mLoading.set(true)
@@ -84,8 +84,8 @@ class DetailViewModel @ViewModelInject constructor(
      * 方法三
      */
     @OptIn(ExperimentalCoroutinesApi::class)
-    suspend fun fectchPokemonInfo3(name: String) =
-        polemonRepository.featchPokemonInfo(name)
+    suspend fun fetchPokemonInfo3(name: String) =
+        pokemonRepository.fetchPokemonInfo(name)
             .onStart {
                 // 在调用 flow 请求数据之前，做一些准备工作，例如显示正在加载数据的按钮
                 mLoading.set(true)
@@ -103,8 +103,8 @@ class DetailViewModel @ViewModelInject constructor(
      * 方法一
      */
     @OptIn(ExperimentalCoroutinesApi::class)
-    fun fectchPokemonInfo1(name: String) = viewModelScope.launch {
-        polemonRepository.featchPokemonInfo(name)
+    fun fetchPokemonInfo1(name: String) = viewModelScope.launch {
+        pokemonRepository.fetchPokemonInfo(name)
             .onStart {
                 // 在调用 flow 请求数据之前，做一些准备工作，例如显示正在加载数据的按钮
                 mLoading.set(true)

diff --git a/app/src/main/java/com/hi/dhl/pokemon/ui/main/MainActivity.kt b/app/src/main/java/com/hi/dhl/pokemon/ui/main/MainActivity.kt
@@ -32,25 +32,25 @@ import kotlinx.coroutines.launch
 
 @AndroidEntryPoint
 class MainActivity : DataBindingAppCompatActivity() {
-    private val mBidning: ActivityMainBinding by binding(R.layout.activity_main)
+    private val mBinding: ActivityMainBinding by binding(R.layout.activity_main)
     private val mViewModel: MainViewModel by viewModels()
-    private val mPomemonAdapter by lazy { PokemonAdapter() }
+    private val mPokemonAdapter by lazy { PokemonAdapter() }
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        mBidning.apply {
-            recyleView.adapter = mPomemonAdapter.withLoadStateFooter(FooterAdapter(mPomemonAdapter))
+        mBinding.apply {
+            recyleView.adapter = mPokemonAdapter.withLoadStateFooter(FooterAdapter(mPokemonAdapter))
             mainViewModel = mViewModel
             lifecycleOwner = this@MainActivity
         }
 
         mViewModel.postOfData().observe(this, Observer {
-            mPomemonAdapter.submitData(lifecycle, it)
+            mPokemonAdapter.submitData(lifecycle, it)
             swiperRefresh.isEnabled = false
         })
 
         lifecycleScope.launchWhenCreated {
-            mPomemonAdapter.loadStateFlow.collectLatest { state ->
+            mPokemonAdapter.loadStateFlow.collectLatest { state ->
                 swiperRefresh.isRefreshing = state.refresh is LoadState.Loading
             }
         }

diff --git a/app/src/main/java/com/hi/dhl/pokemon/ui/main/MainViewModel.kt b/app/src/main/java/com/hi/dhl/pokemon/ui/main/MainViewModel.kt
@@ -32,10 +32,9 @@ import com.hi.dhl.pokemon.model.PokemonItemModel
  */
 
 class MainViewModel @ViewModelInject constructor(
-    val polemonRepository: Repository
+    private val pokemonRepository: Repository
 ) : ViewModel() {
 
     fun postOfData(): LiveData<PagingData<PokemonItemModel>> =
-        polemonRepository.featchPokemonList().cachedIn(viewModelScope).asLiveData()
-
+        pokemonRepository.fetchPokemonList().cachedIn(viewModelScope).asLiveData()
 }