Merge pull request #4803 from Catrobat/revert-4627-CATROID-1367

Catrobat · Jun 7, 2023 · 77398df · 77398df
2 parents a2b52e2 + 815baf5
commit 77398df
Show file tree

Hide file tree

Showing 22 changed files with 86 additions and 527 deletions.
diff --git a/...oidTest/java/org/catrobat/catroid/uiespresso/formulaeditor/FormulaEditorEditTextTest.java b/...oidTest/java/org/catrobat/catroid/uiespresso/formulaeditor/FormulaEditorEditTextTest.java
@@ -107,6 +107,13 @@ public void testLongClickDeletion() {
 	@Test
 	public void testFunctionDeletion() {
 		String random = getResourcesString(R.string.formula_editor_function_rand) + getResourcesString(R.string.formula_editor_function_rand_parameter);
+		onFormulaEditor()
+				.performOpenCategory(FUNCTIONS)
+				.performSelect(random);
+		onFormulaEditor()
+				.performClickOn(BACKSPACE);
+		onFormulaEditor()
+				.performClickOn(BACKSPACE);
 		onFormulaEditor()
 				.performOpenCategory(FUNCTIONS)
 				.performSelect(random);

diff --git a/...ava/org/catrobat/catroid/uiespresso/formulaeditor/utils/FormulaEditorDataListWrapper.java b/...ava/org/catrobat/catroid/uiespresso/formulaeditor/utils/FormulaEditorDataListWrapper.java
@@ -66,11 +66,6 @@ public FormulaEditorDataListWrapper performAdd(String itemName) {
 		return performAdd(itemName, ItemType.VARIABLE, ItemScope.GLOBAL);
 	}
 
-	public void performUndo() {
-		onView(withId(R.id.undo))
-				.perform(click());
-	}
-
 	public FormulaEditorDataListWrapper performAdd(String itemName, ItemType type) {
 		return performAdd(itemName, type, ItemScope.GLOBAL);
 	}

diff --git a/.../androidTest/java/org/catrobat/catroid/uiespresso/ui/fragment/DataListFragmentUndoTest.kt b/.../androidTest/java/org/catrobat/catroid/uiespresso/ui/fragment/DataListFragmentUndoTest.kt
diff --git a/catroid/src/main/java/org/catrobat/catroid/formulaeditor/UserList.java b/catroid/src/main/java/org/catrobat/catroid/formulaeditor/UserList.java
@@ -35,7 +35,6 @@ public class UserList implements Serializable, UserData<List<Object>> {
 	private int initialIndex = -1;
 	private UUID deviceListKey;
 	private transient List<Object> list;
-	private transient boolean visible = true;
 
 	public UserList() {
 		list = new ArrayList<>();
@@ -67,14 +66,6 @@ public void setInitialIndex(int initialIndex) {
 		this.initialIndex = initialIndex;
 	}
 
-	public boolean getVisible() {
-		return visible;
-	}
-
-	public void setVisible(boolean visible) {
-		this.visible = visible;
-	}
-
 	@Override
 	public String getName() {
 		return name;

diff --git a/catroid/src/main/java/org/catrobat/catroid/ui/filepicker/FilePickerAdapter.java b/catroid/src/main/java/org/catrobat/catroid/ui/filepicker/FilePickerAdapter.java
@@ -53,11 +53,16 @@ public FileViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType
 	public void onBindViewHolder(CheckableViewHolder holder, int position) {
 		super.onBindViewHolder(holder, position);
 
-		File item = getItems().get(position);
+		File item = items.get(position);
 		holder.title.setText(item.getName());
 		((FileViewHolder) holder).subtitle.setText(item.getAbsolutePath());
 	}
 
+	@Override
+	public int getItemCount() {
+		return items.size();
+	}
+
 	public interface OnItemClickListener {
 
 		void onItemClick(File item);