Use android-ktx ViewGroup.forEach

DroidKaigi · Feb 7, 2018 · e7b2222 · e7b2222
1 parent e00010a
commit e7b2222
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 11 deletions.
diff --git a/app/src/main/java/io/github/droidkaigi/confsched2018/presentation/search/SearchFragment.kt b/app/src/main/java/io/github/droidkaigi/confsched2018/presentation/search/SearchFragment.kt
@@ -22,6 +22,7 @@ import android.view.View
 import android.view.ViewGroup
 import android.view.inputmethod.InputMethodManager
 import android.widget.TextView
+import androidx.view.forEach
 import com.google.firebase.analytics.FirebaseAnalytics
 import com.xwray.groupie.GroupAdapter
 import com.xwray.groupie.ViewHolder
@@ -39,7 +40,6 @@ import io.github.droidkaigi.confsched2018.presentation.sessions.item.SimpleSessi
 import io.github.droidkaigi.confsched2018.presentation.sessions.item.SpeechSessionItem
 import io.github.droidkaigi.confsched2018.util.SessionAlarm
 import io.github.droidkaigi.confsched2018.util.ext.color
-import io.github.droidkaigi.confsched2018.util.ext.eachChildView
 import io.github.droidkaigi.confsched2018.util.ext.observe
 import io.github.droidkaigi.confsched2018.util.ext.setLinearDivider
 import io.github.droidkaigi.confsched2018.util.ext.toGone
@@ -213,7 +213,7 @@ class SearchFragment : DaggerFragment() {
         }
 
         if (view is ViewGroup) {
-            view.eachChildView {
+            view.forEach {
                 changeSearchViewTextColor(it)
             }
         }

diff --git a/app/src/main/java/io/github/droidkaigi/confsched2018/util/ext/BottomNavigationViewExt.kt b/app/src/main/java/io/github/droidkaigi/confsched2018/util/ext/BottomNavigationViewExt.kt
@@ -7,6 +7,7 @@ import android.support.design.widget.BottomNavigationView
 import android.view.Gravity
 import android.view.ViewGroup
 import android.widget.FrameLayout
+import androidx.view.forEach
 import timber.log.Timber
 
 @SuppressLint("RestrictedApi")
@@ -17,7 +18,7 @@ fun BottomNavigationView.disableShiftMode() {
         shiftingMode.isAccessible = true
         shiftingMode.setBoolean(menuView, false)
         shiftingMode.isAccessible = false
-        menuView.eachChildView {
+        menuView.forEach {
             val item = it as BottomNavigationItemView
             // NOTE: This removing the BottomNavigationItem labels including small and large text container.
             item.removeViewAt(1)

diff --git a/app/src/main/java/io/github/droidkaigi/confsched2018/util/ext/ViewGroupExt.kt b/app/src/main/java/io/github/droidkaigi/confsched2018/util/ext/ViewGroupExt.kt