From 578a2eebfc77a45dab91b3ab0f37da5eb6fba731 Mon Sep 17 00:00:00 2001 From: Anders Lunde Date: Fri, 9 Nov 2018 19:43:15 +0100 Subject: [PATCH 1/2] Test exposing the addedView list --- .../java/ja/burhanrashid52/photoeditor/PhotoEditor.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/photoeditor/src/main/java/ja/burhanrashid52/photoeditor/PhotoEditor.java b/photoeditor/src/main/java/ja/burhanrashid52/photoeditor/PhotoEditor.java index 4bc404a8..e021c445 100644 --- a/photoeditor/src/main/java/ja/burhanrashid52/photoeditor/PhotoEditor.java +++ b/photoeditor/src/main/java/ja/burhanrashid52/photoeditor/PhotoEditor.java @@ -609,6 +609,14 @@ public int getAddedViews() { return addedViews.size(); } + /** + * WARNING: Do not use unless you know what you are doing! + * @return All added views + */ + public List getAddedViewsList(){ + return addedViews; + } + /** * Undo the last operation perform on the {@link PhotoEditor} * From b742c4c10a804682848fcb237094d49e2b269cb6 Mon Sep 17 00:00:00 2001 From: Anders Lunde Date: Fri, 9 Nov 2018 20:14:55 +0100 Subject: [PATCH 2/2] Test exposing the addedView list ViewType --- .../java/ja/burhanrashid52/photoeditor/PhotoEditor.java | 6 +++--- .../main/java/ja/burhanrashid52/photoeditor/ViewInfo.java | 8 +++++++- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/photoeditor/src/main/java/ja/burhanrashid52/photoeditor/PhotoEditor.java b/photoeditor/src/main/java/ja/burhanrashid52/photoeditor/PhotoEditor.java index e021c445..285371ed 100644 --- a/photoeditor/src/main/java/ja/burhanrashid52/photoeditor/PhotoEditor.java +++ b/photoeditor/src/main/java/ja/burhanrashid52/photoeditor/PhotoEditor.java @@ -151,7 +151,7 @@ public void onDoubleTap() { frmBorder.setTag(false); } - imageRootView.setTag(R.id.viewInfoTag, new ViewInfo(imageRootView.getScaleX(), imageRootView.getScaleY())); + imageRootView.setTag(R.id.viewInfoTag, new ViewInfo(imageRootView.getScaleX(), imageRootView.getScaleY(), viewType)); imageRootView.setOnTouchListener(multiTouchListener); @@ -245,7 +245,7 @@ public void onDoubleTap() { frmBorder.setTag(false); } - textRootView.setTag(R.id.viewInfoTag, new ViewInfo(textRootView.getScaleX(), textRootView.getScaleY())); + textRootView.setTag(R.id.viewInfoTag, new ViewInfo(textRootView.getScaleX(), textRootView.getScaleY(), ViewType.TEXT)); textRootView.setOnTouchListener(multiTouchListener); addViewToParent(textRootView, ViewType.TEXT); @@ -343,7 +343,7 @@ public void onDoubleTap() { frmBorder.setTag(false); } - emojiRootView.setTag(R.id.viewInfoTag, new ViewInfo(emojiRootView.getScaleX(), emojiRootView.getScaleY())); + emojiRootView.setTag(R.id.viewInfoTag, new ViewInfo(emojiRootView.getScaleX(), emojiRootView.getScaleY(), ViewType.EMOJI)); emojiRootView.setOnTouchListener(multiTouchListener); addViewToParent(emojiRootView, ViewType.EMOJI); diff --git a/photoeditor/src/main/java/ja/burhanrashid52/photoeditor/ViewInfo.java b/photoeditor/src/main/java/ja/burhanrashid52/photoeditor/ViewInfo.java index 46486fb7..8cb56040 100644 --- a/photoeditor/src/main/java/ja/burhanrashid52/photoeditor/ViewInfo.java +++ b/photoeditor/src/main/java/ja/burhanrashid52/photoeditor/ViewInfo.java @@ -23,7 +23,10 @@ public class ViewInfo { private float scaleDownX = 0; private float scaleDownY = 0; - public ViewInfo(float scaleX, float scaleY) { + private ViewType viewType; + + public ViewInfo(float scaleX, float scaleY, ViewType currentViewType) { + viewType = currentViewType; defaultScaleX = scaleX; defaultScaleY = scaleY; scaleDownX = defaultScaleX/SCALE_DOWN_FACTOR; @@ -63,4 +66,7 @@ public float getScaledDownY(){ return scaleDownY; } + public ViewType getViewType() { + return viewType; + } } \ No newline at end of file