Merge pull request #4 from studyplus/bugfix/crash_bottom_tab

koji-1009 · web-flow · commit ba700fffc7ed · 2019-05-29T14:34:56.000+09:00
下タブのidが見つからない場合のクラッシュを避ける
diff --git a/jasper/src/main/java/jp/studyplus/android/app/jasper/internal/bnv/MenuImpl.kt b/jasper/src/main/java/jp/studyplus/android/app/jasper/internal/bnv/MenuImpl.kt
@@ -99,11 +99,11 @@ class MenuImpl(
     }
 
     override fun hasVisibleItems(): Boolean {
-        return items.firstOrNull() { it.isVisible } != null
+        return items.firstOrNull { it.isVisible } != null
     }
 
     override fun findItem(id: Int): MenuItem? {
-        return items.first { it.itemId == id }
+        return items.firstOrNull { it.itemId == id }
     }
 
     override fun size(): Int {

Original file line number	Diff line number	Diff line change
`@@ -99,11 +99,11 @@ class MenuImpl(`
`99`	`99`	`}`
`100`	`100`
`101`	`101`	`override fun hasVisibleItems(): Boolean {`
`102`		`- return items.firstOrNull() { it.isVisible } != null`
	`102`	`+ return items.firstOrNull { it.isVisible } != null`
`103`	`103`	`}`
`104`	`104`
`105`	`105`	`override fun findItem(id: Int): MenuItem? {`
`106`		`- return items.first { it.itemId == id }`
	`106`	`+ return items.firstOrNull { it.itemId == id }`
`107`	`107`	`}`
`108`	`108`
`109`	`109`	`override fun size(): Int {`