Always show sticker icon in image editor.

Fixes flicker seen jumping toggling view once.
signalapp · Jan 27, 2020 · 544a538 · 544a538
1 parent 2d50221
commit 544a538
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 87 deletions.
diff --git a/app/src/main/java/org/thoughtcrime/securesms/scribbles/ImageEditorFragment.java b/app/src/main/java/org/thoughtcrime/securesms/scribbles/ImageEditorFragment.java
@@ -14,7 +14,6 @@
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
-import androidx.lifecycle.ViewModelProviders;
 
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.imageeditor.ColorableRenderer;
@@ -55,10 +54,9 @@ public final class ImageEditorFragment extends Fragment implements ImageEditorHu
 
   private EditorModel restoredModel;
 
-  @Nullable private EditorElement                currentSelection;
-            private int                          imageMaxHeight;
-            private int                          imageMaxWidth;
-            private ImageEditorFragmentViewModel viewModel;
+  @Nullable private EditorElement currentSelection;
+            private int           imageMaxHeight;
+            private int           imageMaxWidth;
 
   public static class Data {
     private final Bundle bundle;
@@ -123,11 +121,6 @@ public void onCreate(@Nullable Bundle savedInstanceState) {
     imageMaxHeight = mediaConstraints.getImageMaxHeight(requireContext());
 
     StickerSearchRepository repository = new StickerSearchRepository(requireContext());
-
-    viewModel = ViewModelProviders.of(this, new ImageEditorFragmentViewModel.Factory(requireActivity().getApplication(), repository))
-                                  .get(ImageEditorFragmentViewModel.class);
-
-    viewModel.getStickersAvailability().observe(this, isAvailable -> imageEditorHud.setStickersAvailable(isAvailable));
   }
 
   @Nullable

diff --git a/app/src/main/java/org/thoughtcrime/securesms/scribbles/ImageEditorFragmentViewModel.java b/app/src/main/java/org/thoughtcrime/securesms/scribbles/ImageEditorFragmentViewModel.java
diff --git a/app/src/main/java/org/thoughtcrime/securesms/scribbles/ImageEditorHud.java b/app/src/main/java/org/thoughtcrime/securesms/scribbles/ImageEditorHud.java
@@ -82,7 +82,7 @@ private void initialize() {
     drawButton       = findViewById(R.id.scribble_draw_button);
     highlightButton  = findViewById(R.id.scribble_highlight_button);
     textButton       = findViewById(R.id.scribble_text_button);
-    stickerButton = findViewById(R.id.scribble_sticker_button);
+    stickerButton    = findViewById(R.id.scribble_sticker_button);
     undoButton       = findViewById(R.id.scribble_undo_button);
     saveButton       = findViewById(R.id.scribble_save_button);
     deleteButton     = findViewById(R.id.scribble_delete_button);
@@ -104,7 +104,7 @@ private void updateCropAspectLockImage(boolean cropAspectLocked) {
   }
 
   private void initializeVisibilityMap() {
-    setStickersAvailable(false);
+    setVisibleViewsWhenInMode(Mode.NONE, drawButton, highlightButton, textButton, stickerButton, cropButton, undoButton, saveButton);
 
     setVisibleViewsWhenInMode(Mode.DRAW, confirmButton, undoButton, colorPicker, colorPalette);
 
@@ -129,16 +129,6 @@ private void setVisibleViewsWhenInMode(Mode mode, View... views) {
     visibilityModeMap.put(mode, new HashSet<>(Arrays.asList(views)));
   }
 
-  @MainThread
-  public void setStickersAvailable(boolean stickersAvailable) {
-    if (stickersAvailable) {
-      setVisibleViewsWhenInMode(Mode.NONE, drawButton, highlightButton, textButton, stickerButton, cropButton, undoButton, saveButton);
-    } else {
-      setVisibleViewsWhenInMode(Mode.NONE, drawButton, highlightButton, textButton, cropButton, undoButton, saveButton);
-    }
-    updateButtonVisibility(currentMode);
-  }
-
   private void initializeViews() {
     undoButton.setOnClickListener(v -> eventListener.onUndo());