ref: removed nullable type in BottomScreenCommon#showBottomSheet

openfoodfacts · Feb 15, 2021 · 610ea2c · 610ea2c
1 parent 40943e5
commit 610ea2c
Showing 1 changed file with 34 additions and 26 deletions.
diff --git a/app/src/main/java/openfoodfacts/github/scrachx/openfood/utils/BottomScreenCommon.kt b/app/src/main/java/openfoodfacts/github/scrachx/openfood/utils/BottomScreenCommon.kt
@@ -10,53 +10,61 @@ import openfoodfacts.github.scrachx.openfood.models.entities.label.LabelName
 
 private fun showBottomSheet(
         result: JsonNode?,
-        id: Long?,
+        id: Long,
         name: String?,
         searchType: SearchType,
         fragmentTag: String,
         fragmentManager: FragmentManager
-) = ProductAttributeFragment.newInstance(result, id!!, searchType, name).show(fragmentManager, fragmentTag)
+) = ProductAttributeFragment.newInstance(result, id, searchType, name).show(fragmentManager, fragmentTag)
 
 fun showBottomSheet(
         result: JsonNode,
         allergen: AllergenName,
         fragmentManager: FragmentManager
-) {
-    showBottomSheet(result, allergen.id,
-            allergen.name,
-            SearchType.ALLERGEN, "allergen_details_fragment",
-            fragmentManager)
-}
+) = showBottomSheet(
+        result,
+        allergen.id,
+        allergen.name,
+        SearchType.ALLERGEN,
+        "allergen_details_fragment",
+        fragmentManager
+)
 
 fun showBottomSheet(
         result: JsonNode,
         category: CategoryName,
         fragmentManager: FragmentManager
-) {
-    showBottomSheet(result, category.id,
-            category.name,
-            SearchType.CATEGORY, "category_details_fragment",
-            fragmentManager)
-}
+) = showBottomSheet(
+        result,
+        category.id!!,
+        category.name,
+        SearchType.CATEGORY,
+        "category_details_fragment",
+        fragmentManager
+)
 
 fun showBottomSheet(
         result: JsonNode,
         label: LabelName,
         fragmentManager: FragmentManager
-) {
-    showBottomSheet(result, label.id,
-            label.name,
-            SearchType.LABEL, "label_details_fragment",
-            fragmentManager)
-}
+) = showBottomSheet(
+        result,
+        label.id,
+        label.name,
+        SearchType.LABEL,
+        "label_details_fragment",
+        fragmentManager
+)
 
 fun showBottomSheet(
         result: JsonNode?,
         additive: AdditiveName,
         fragmentManager: FragmentManager
-) {
-    showBottomSheet(result, additive.id,
-            additive.name,
-            SearchType.ADDITIVE, "additive_details_fragment",
-            fragmentManager)
-}
+) = showBottomSheet(
+        result,
+        additive.id,
+        additive.name,
+        SearchType.ADDITIVE,
+        "additive_details_fragment",
+        fragmentManager
+)