feat: added attribute fragment to OBF product view

Closes https://github.com/openfoodfacts/openfoodfacts-androidapp/pull/3825/files
openfoodfacts · Feb 15, 2021 · 8665bc6 · 8665bc6
1 parent e3e0ee3
commit 8665bc6
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 20 deletions.
diff --git a/...n/java/openfoodfacts/github/scrachx/openfood/features/product/view/ProductViewActivity.kt b/...n/java/openfoodfacts/github/scrachx/openfood/features/product/view/ProductViewActivity.kt
@@ -246,29 +246,22 @@ class ProductViewActivity : BaseActivity(), OnRefreshListener {
             val preferences = PreferenceManager.getDefaultSharedPreferences(activity)
 
             // Add Ingredients fragment for off, obf and opff
-            if (isFlavors(OFF, OBF, OPFF)) {
-                adapter.add(IngredientsProductFragment.newInstance(productState), titles[1])
+            if (isFlavors(OFF, OBF, OPFF)) adapter.add(IngredientsProductFragment.newInstance(productState), titles[1])
+
+            if (isFlavors(OFF, OPFF)) adapter.add(NutritionProductFragment.newInstance(productState), titles[2])
+
+            if (isFlavors(OFF)) adapter.add(EnvironmentProductFragment().applyBundle(fBundle), titles[4])
+
+            if (isFlavors(OFF, OPFF, OBF) && isPhotoMode(activity) || isFlavors(OPF)) {
+                adapter.add(ProductPhotosFragment.newInstance(productState), newTitles[0])
             }
-            if (isFlavors(OFF)) {
-                adapter.add(NutritionProductFragment().applyBundle(fBundle), titles[2])
-                adapter.add(EnvironmentProductFragment().applyBundle(fBundle), titles[4])
-                if (isPhotoMode(activity)) {
-                    adapter.add(ProductPhotosFragment().applyBundle(fBundle), newTitles[0])
-                }
+
+            if (isFlavors(OFF, OBF)) {
                 adapter.add(ServerAttributesFragment.newInstance(productState), activity.getString(R.string.synthesis_tab))
-            } else if (isFlavors(OPFF)) {
-                adapter.add(NutritionProductFragment().applyBundle(fBundle), titles[2])
-                if (isPhotoMode(activity)) {
-                    adapter.add(ProductPhotosFragment().applyBundle(fBundle), newTitles[0])
-                }
-            } else if (isFlavors(OBF)) {
-                if (isPhotoMode(activity)) {
-                    adapter.add(ProductPhotosFragment().applyBundle(fBundle), newTitles[0])
-                }
-                adapter.add(IngredientsAnalysisProductFragment().applyBundle(fBundle), newTitles[1])
-            } else if (isFlavors(OPF)) {
-                adapter.add(ProductPhotosFragment().applyBundle(fBundle), newTitles[0])
             }
+
+            if (isFlavors(OBF)) adapter.add(IngredientsAnalysisProductFragment().applyBundle(fBundle), newTitles[1])
+
             if (preferences.getBoolean(activity.getString(R.string.pref_contribution_tab_key), false)) {
                 adapter.add(ContributorsFragment.newInstance(productState), activity.getString(R.string.contribution_tab))
             }

diff --git a/...facts/github/scrachx/openfood/features/product/view/nutrition/NutritionProductFragment.kt b/...facts/github/scrachx/openfood/features/product/view/nutrition/NutritionProductFragment.kt
@@ -57,6 +57,7 @@ import openfoodfacts.github.scrachx.openfood.features.FullScreenActivityOpener
 import openfoodfacts.github.scrachx.openfood.features.ImagesManageActivity
 import openfoodfacts.github.scrachx.openfood.features.adapters.NutrimentsGridAdapter
 import openfoodfacts.github.scrachx.openfood.features.product.edit.ProductEditActivity
+import openfoodfacts.github.scrachx.openfood.features.product.edit.ProductEditActivity.Companion.KEY_STATE
 import openfoodfacts.github.scrachx.openfood.features.product.view.CalculateDetailsActivity
 import openfoodfacts.github.scrachx.openfood.features.product.view.ProductViewActivity
 import openfoodfacts.github.scrachx.openfood.features.product.view.summary.SummaryProductFragment.Companion.EDIT_PRODUCT_AFTER_LOGIN
@@ -134,6 +135,15 @@ class NutritionProductFragment : BaseFragment(), CustomTabActivityHelper.Connect
         refreshView(requireProductState())
     }
 
+
+    companion object {
+        fun newInstance(productState: ProductState) = NutritionProductFragment().apply {
+            arguments = Bundle().apply {
+                putSerializable(KEY_STATE, productState)
+            }
+        }
+    }
+
     override fun onDestroyView() {
         super.onDestroyView()
         _binding = null
@@ -570,4 +580,5 @@ class NutritionProductFragment : BaseFragment(), CustomTabActivityHelper.Connect
             },
     )
 
+
 }
diff --git a/...enfoodfacts/github/scrachx/openfood/features/product/view/photos/ProductPhotosFragment.kt b/...enfoodfacts/github/scrachx/openfood/features/product/view/photos/ProductPhotosFragment.kt
@@ -11,8 +11,10 @@ import io.reactivex.rxkotlin.addTo
 import openfoodfacts.github.scrachx.openfood.BuildConfig
 import openfoodfacts.github.scrachx.openfood.databinding.FragmentProductPhotosBinding
 import openfoodfacts.github.scrachx.openfood.features.FullScreenActivityOpener
+import openfoodfacts.github.scrachx.openfood.features.product.edit.ProductEditActivity
 import openfoodfacts.github.scrachx.openfood.features.shared.BaseFragment
 import openfoodfacts.github.scrachx.openfood.images.ImageNameJsonParser
+import openfoodfacts.github.scrachx.openfood.models.ProductState
 import openfoodfacts.github.scrachx.openfood.network.OpenFoodAPIClient
 import openfoodfacts.github.scrachx.openfood.utils.requireProductState
 
@@ -87,5 +89,10 @@ class ProductPhotosFragment : BaseFragment() {
 
     companion object {
         private val LOG_TAG = ProductPhotosFragment::class.simpleName
+        fun newInstance(productState: ProductState) = ProductPhotosFragment().apply {
+            arguments = Bundle().apply {
+                putSerializable(ProductEditActivity.KEY_STATE, productState)
+            }
+        }
     }
 }