CATROID-1339 "Add to backpack" option missing for "Define" bricks

Catrobat · Feb 3, 2022 · b6dbc05 · b6dbc05
1 parent c744b5d
commit b6dbc05
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/...oid/src/androidTest/java/org/catrobat/catroid/test/content/bricks/BrickContextMenuTest.kt b/...oid/src/androidTest/java/org/catrobat/catroid/test/content/bricks/BrickContextMenuTest.kt
@@ -1,6 +1,6 @@
 /*
  * Catroid: An on-device visual programming system for Android devices
- * Copyright (C) 2010-2021 The Catrobat Team
+ * Copyright (C) 2010-2022 The Catrobat Team
  * (<http://developer.catrobat.org/credits>)
  *
  * This program is free software: you can redistribute it and/or modify
@@ -153,4 +153,13 @@ class BrickContextMenuTest(
     fun testExpectedHelp() {
         assertTrue(contextMenuItems.contains(R.string.brick_context_dialog_help))
     }
+
+    @Test
+    fun testExpectedAddToBackpack() {
+        val showsAddToBackpack: Boolean = when (brick) {
+            is UserDefinedReceiverBrick, is WhenStartedBrick -> contextMenuItems.contains(R.string.backpack_add)
+            else -> !contextMenuItems.contains(R.string.backpack_add)
+        }
+        assertTrue(showsAddToBackpack)
+    }
 }
diff --git a/catroid/src/main/java/org/catrobat/catroid/ui/recyclerview/fragment/ScriptFragment.java b/catroid/src/main/java/org/catrobat/catroid/ui/recyclerview/fragment/ScriptFragment.java
@@ -1,6 +1,6 @@
 /*
  * Catroid: An on-device visual programming system for Android devices
- * Copyright (C) 2010-2021 The Catrobat Team
+ * Copyright (C) 2010-2022 The Catrobat Team
  * (<http://developer.catrobat.org/credits>)
  *
  * This program is free software: you can redistribute it and/or modify
@@ -662,6 +662,7 @@ public static List<Integer> getContextMenuItems(Brick brick) {
 		List<Integer> items = new ArrayList<>();
 
 		if (brick instanceof UserDefinedReceiverBrick) {
+			items.add(R.string.backpack_add);
 			items.add(R.string.brick_context_dialog_delete_definition);
 			items.add(R.string.brick_context_dialog_move_definition);
 			items.add(R.string.brick_context_dialog_help);