Replace .let calls for arguments with checkNotNull checks

zsmb13 · Jan 7, 2020 · d380051 · d380051
1 parent 12b51db
commit d380051
Show file tree

Hide file tree

Showing 3 changed files with 68 additions and 76 deletions.
diff --git a/app/src/main/java/dev/marcosfarias/pokedex/ui/dashboard/DashboardFragment.kt b/app/src/main/java/dev/marcosfarias/pokedex/ui/dashboard/DashboardFragment.kt
@@ -34,52 +34,47 @@ class DashboardFragment : Fragment() {
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        arguments?.getString("id").let {
+        val id = checkNotNull(arguments?.getString("id"))
-            dashboardViewModel.getPokemonById(it).observe(viewLifecycleOwner, Observer { list ->
+        dashboardViewModel.getPokemonById(id).observe(viewLifecycleOwner, Observer { list ->
-                list?.get(0).let { pokemon ->
+            list?.get(0).let { pokemon ->
-                    textViewID.text = pokemon?.id
+                textViewID.text = pokemon?.id
-                    textViewName.text = pokemon?.name
+                textViewName.text = pokemon?.name
-
+
-                    val color =
+                val color =
-                        PokemonColorUtil(view.context).getPokemonColor(pokemon?.typeofpokemon)
+                    PokemonColorUtil(view.context).getPokemonColor(pokemon?.typeofpokemon)
-                    app_bar.background.colorFilter =
+                app_bar.background.colorFilter =
-                        PorterDuffColorFilter(color, PorterDuff.Mode.SRC_ATOP)
+                    PorterDuffColorFilter(color, PorterDuff.Mode.SRC_ATOP)
-                    toolbar_layout.contentScrim?.colorFilter =
+                toolbar_layout.contentScrim?.colorFilter =
-                        PorterDuffColorFilter(color, PorterDuff.Mode.SRC_ATOP)
+                    PorterDuffColorFilter(color, PorterDuff.Mode.SRC_ATOP)
-                    activity?.window?.statusBarColor =
+                activity?.window?.statusBarColor =
-                        PokemonColorUtil(view.context).getPokemonColor(pokemon?.typeofpokemon)
+                    PokemonColorUtil(view.context).getPokemonColor(pokemon?.typeofpokemon)
-
+
-                    pokemon?.typeofpokemon?.getOrNull(0).let { firstType ->
+                pokemon?.typeofpokemon?.getOrNull(0).let { firstType ->
-                        textViewType3.text = firstType
+                    textViewType3.text = firstType
-                        textViewType3.isVisible = firstType != null
+                    textViewType3.isVisible = firstType != null
-                    }
-
-                    pokemon?.typeofpokemon?.getOrNull(1).let { secondType ->
-                        textViewType2.text = secondType
-                        textViewType2.isVisible = secondType != null
-                    }
-
-                    pokemon?.typeofpokemon?.getOrNull(2).let { thirdType ->
-                        textViewType1.text = thirdType
-                        textViewType1.isVisible = thirdType != null
-                    }
-
-                    Glide.with(view.context)
-                        .load(pokemon?.imageurl)
-                        .placeholder(android.R.color.transparent)
-                        .into(imageView)
-
-                    val pager = viewPager
-                    val tabs = tabs
-                    pager.adapter = ViewPagerAdapter(fragmentManager!!, context!!, pokemon?.id!!)
-                    tabs.setupWithViewPager(pager)
                 }
 
+                pokemon?.typeofpokemon?.getOrNull(1).let { secondType ->
+                    textViewType2.text = secondType
+                    textViewType2.isVisible = secondType != null
+                }
 
-            })
+                pokemon?.typeofpokemon?.getOrNull(2).let { thirdType ->
-
+                    textViewType1.text = thirdType
+                    textViewType1.isVisible = thirdType != null
+                }
 
-        }
+                Glide.with(view.context)
+                    .load(pokemon?.imageurl)
+                    .placeholder(android.R.color.transparent)
+                    .into(imageView)
+
+                val pager = viewPager
+                val tabs = tabs
+                pager.adapter = ViewPagerAdapter(fragmentManager!!, context!!, pokemon?.id!!)
+                tabs.setupWithViewPager(pager)
+            }
+        })
     }
 
 }
diff --git a/app/src/main/java/dev/marcosfarias/pokedex/ui/dashboard/about/AboutFragment.kt b/app/src/main/java/dev/marcosfarias/pokedex/ui/dashboard/about/AboutFragment.kt
@@ -39,17 +39,16 @@ class AboutFragment : Fragment() {
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        arguments?.getString("id").let {
+        val id = checkNotNull(arguments?.getString("id"))
-            dashboardViewModel.getPokemonById(it).observe(viewLifecycleOwner, Observer { list ->
+        dashboardViewModel.getPokemonById(id).observe(viewLifecycleOwner, Observer { list ->
-                list?.get(0).let { pokemon ->
+            list?.get(0).let { pokemon ->
-                    textViewDescription.text = pokemon?.xdescription
+                textViewDescription.text = pokemon?.xdescription
-                    textViewHeight.text = pokemon?.height
+                textViewHeight.text = pokemon?.height
-                    textViewWeight.text = pokemon?.weight
+                textViewWeight.text = pokemon?.weight
-                    textViewEggCycle.text = pokemon?.cycles
+                textViewEggCycle.text = pokemon?.cycles
-                    textViewEggGroups.text = pokemon?.egg_groups
+                textViewEggGroups.text = pokemon?.egg_groups
-                    textViewBaseEXP.text = pokemon?.base_exp
+                textViewBaseEXP.text = pokemon?.base_exp
-                }
+            }
-            })
+        })
-        }
     }
 }
diff --git a/app/src/main/java/dev/marcosfarias/pokedex/ui/dashboard/stats/StatsFragment.kt b/app/src/main/java/dev/marcosfarias/pokedex/ui/dashboard/stats/StatsFragment.kt
@@ -40,29 +40,27 @@ class StatsFragment : Fragment() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
-        arguments?.getString("id").let {
+        val id = checkNotNull(arguments?.getString("id"))
+        dashboardViewModel.getPokemonById(id).observe(viewLifecycleOwner, Observer { list ->
+            list?.get(0).let { pokemon ->
+                textViewTypeDefenses.text = pokemon?.ydescription
 
-            dashboardViewModel.getPokemonById(it).observe(viewLifecycleOwner, Observer { list ->
+                textViewHP.text = pokemon?.hp.toString()
-                list?.get(0).let { pokemon ->
+                textViewAttack.text = pokemon?.attack.toString()
-                    textViewTypeDefenses.text = pokemon?.ydescription
+                textViewDefense.text = pokemon?.defense.toString()
+                textViewSpAtk.text = pokemon?.special_attack.toString()
+                textViewSpDef.text = pokemon?.special_defense.toString()
+                textViewSpeed.text = pokemon?.speed.toString()
+                textViewTotal.text = pokemon?.total.toString()
 
-                    textViewHP.text = pokemon?.hp.toString()
+                progressBarHP.progress = pokemon?.hp ?: 0
-                    textViewAttack.text = pokemon?.attack.toString()
+                progressBarAttack.progress = pokemon?.attack ?: 0
-                    textViewDefense.text = pokemon?.defense.toString()
+                progressBarDefense.progress = pokemon?.defense ?: 0
-                    textViewSpAtk.text = pokemon?.special_attack.toString()
+                progressBarSpAtk.progress = pokemon?.special_attack ?: 0
-                    textViewSpDef.text = pokemon?.special_defense.toString()
+                progressBarSpDef.progress = pokemon?.special_defense ?: 0
-                    textViewSpeed.text = pokemon?.speed.toString()
+                progressBarSpeed.progress = pokemon?.speed ?: 0
-                    textViewTotal.text = pokemon?.total.toString()
+                progressBarTotal.progress = pokemon?.total ?: 0
-
+            }
-                    progressBarHP.progress = pokemon?.hp ?: 0
+        })
-                    progressBarAttack.progress = pokemon?.attack ?: 0
-                    progressBarDefense.progress = pokemon?.defense ?: 0
-                    progressBarSpAtk.progress = pokemon?.special_attack ?: 0
-                    progressBarSpDef.progress = pokemon?.special_defense ?: 0
-                    progressBarSpeed.progress = pokemon?.speed ?: 0
-                    progressBarTotal.progress = pokemon?.total ?: 0
-                }
-            })
-        }
     }
 }