android: reorganize (overlay, canvas packages), move classes

Added new packages:
* overlay - overlay elements like TextCursor*
* canvas - classes that its only purpose is to draw to canvas

Change-Id: I0dec06e76819231dacae26d24e43bb6315bba6e4

6 files changed, 42 insertions, 34 deletions

diff --git a/android/experimental/LOAndroid3/src/java/org/libreoffice/InvalidationHandler.java b/android/experimental/LOAndroid3/src/java/org/libreoffice/InvalidationHandler.java
index 1e8c2d9b2cbc..359f0ca71cd2 100644
--- a/android/experimental/LOAndroid3/src/java/org/libreoffice/InvalidationHandler.java
+++ b/android/experimental/LOAndroid3/src/java/org/libreoffice/InvalidationHandler.java
@@ -5,6 +5,7 @@ import android.graphics.RectF;
 import android.net.Uri;
 
 import org.libreoffice.kit.Document;
+import org.libreoffice.overlay.TextCursorLayer;
 import org.mozilla.gecko.TextSelection;
 import org.mozilla.gecko.TextSelectionHandle;
 
diff --git a/android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java b/android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java
index 3c573019c825..c054143bcad0 100644
--- a/android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java
+++ b/android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java
@@ -8,7 +8,6 @@ import android.os.Bundle;
 import android.os.Handler;
 import android.support.v4.widget.DrawerLayout;
 import android.support.v7.app.ActionBarActivity;
-import android.support.v7.app.ActionBarDrawerToggle;
 import android.support.v7.widget.Toolbar;
 import android.util.Log;
 import android.view.Menu;
@@ -17,9 +16,8 @@ import android.view.View;
 import android.view.inputmethod.InputMethodManager;
 import android.widget.AdapterView;
 import android.widget.ListView;
-import android.widget.RelativeLayout;
-import android.widget.Toast;
 
+import org.libreoffice.overlay.TextCursorLayer;
 import org.mozilla.gecko.TextSelection;
 import org.mozilla.gecko.ZoomConstraints;
 import org.mozilla.gecko.gfx.GeckoLayerClient;
diff --git a/android/experimental/LOAndroid3/src/java/org/libreoffice/DrawElementGraphicSelection.java b/android/experimental/LOAndroid3/src/java/org/libreoffice/canvas/GraphicSelectionCanvasElement.java
index e4319fc28f96..5adf8d3250e6 100644
--- a/android/experimental/LOAndroid3/src/java/org/libreoffice/DrawElementGraphicSelection.java
+++ b/android/experimental/LOAndroid3/src/java/org/libreoffice/canvas/GraphicSelectionCanvasElement.java
@@ -1,4 +1,12 @@
-package org.libreoffice;
+/* -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+package org.libreoffice.canvas;
 
 import android.graphics.Canvas;
 import android.graphics.Paint;
@@ -9,7 +17,7 @@ import android.graphics.RectF;
  * This class is responsible to draw and reposition the selection
  * rectangle.
  */
-public class DrawElementGraphicSelection {
+public class GraphicSelectionCanvasElement {
     private final Paint mGraphicSelectionPaint;
     public RectF mRectangle = new RectF();
     public RectF mScaledRectangle = new RectF();
@@ -17,7 +25,7 @@ public class DrawElementGraphicSelection {
     private DragType mType = DragType.NONE;
     private PointF mStartDragPosition;
 
-    public DrawElementGraphicSelection(Paint graphicSelectionPaint) {
+    public GraphicSelectionCanvasElement(Paint graphicSelectionPaint) {
         mGraphicSelectionPaint = graphicSelectionPaint;
     }
 
@@ -58,9 +66,10 @@ public class DrawElementGraphicSelection {
         mDrawRectangle = mScaledRectangle;
     }
 
-    enum DragType {
+    public enum DragType {
         NONE,
         MOVE,
         EXTEND
     }
 }
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file
diff --git a/android/experimental/LOAndroid3/src/java/org/libreoffice/DrawElementHandle.java b/android/experimental/LOAndroid3/src/java/org/libreoffice/canvas/GraphicSelectionHandleCanvasElement.java
index 1912d01d0978..64d369fc9848 100644
--- a/android/experimental/LOAndroid3/src/java/org/libreoffice/DrawElementHandle.java
+++ b/android/experimental/LOAndroid3/src/java/org/libreoffice/canvas/GraphicSelectionHandleCanvasElement.java
@@ -6,7 +6,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
-package org.libreoffice;
+package org.libreoffice.canvas;
 
 import android.graphics.Canvas;
 import android.graphics.Color;
@@ -14,14 +14,12 @@ import android.graphics.Paint;
 import android.graphics.PointF;
 import android.graphics.RectF;
 
-import org.mozilla.gecko.gfx.RectUtils;
-
 /**
  * This class is responsible to draw the selection handles, track the handle
  * position and perform a hit test to determine if the selection handle was
  * touched.
  */
-public class DrawElementHandle {
+public class GraphicSelectionHandleCanvasElement {
     public PointF mPosition = new PointF();
     private float mRadius = 20.0f;
     private Paint mGraphicHandleFillPaint = new Paint();
@@ -29,7 +27,7 @@ public class DrawElementHandle {
     private Paint mGraphicHandleSelectedFillPaint = new Paint();
     private RectF mHitRect = new RectF();
 
-    public DrawElementHandle(Paint graphicSelectionPaint) {
+    public GraphicSelectionHandleCanvasElement(Paint graphicSelectionPaint) {
         mGraphicSelectionPaint = graphicSelectionPaint;
 
         mGraphicHandleFillPaint.setStyle(Paint.Style.FILL);
diff --git a/android/experimental/LOAndroid3/src/java/org/libreoffice/TextCursorLayer.java b/android/experimental/LOAndroid3/src/java/org/libreoffice/overlay/TextCursorLayer.java
index 8c044ed68c03..dc7650bdee5c 100644
--- a/android/experimental/LOAndroid3/src/java/org/libreoffice/TextCursorLayer.java
+++ b/android/experimental/LOAndroid3/src/java/org/libreoffice/overlay/TextCursorLayer.java
@@ -6,13 +6,14 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
-package org.libreoffice;
+package org.libreoffice.overlay;
 
 import android.app.Activity;
 import android.graphics.RectF;
 import android.util.Log;
-import android.view.View;
 
+import org.libreoffice.LOKitShell;
+import org.libreoffice.R;
 import org.mozilla.gecko.gfx.Layer;
 import org.mozilla.gecko.gfx.LayerView;
 import org.mozilla.gecko.util.FloatUtils;
diff --git a/android/experimental/LOAndroid3/src/java/org/libreoffice/TextCursorView.java b/android/experimental/LOAndroid3/src/java/org/libreoffice/overlay/TextCursorView.java
index 320cffc2ae9f..d952b8007d7b 100644
--- a/android/experimental/LOAndroid3/src/java/org/libreoffice/TextCursorView.java
+++ b/android/experimental/LOAndroid3/src/java/org/libreoffice/overlay/TextCursorView.java
@@ -6,21 +6,22 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
-package org.libreoffice;
+package org.libreoffice.overlay;
 
 import android.content.Context;
 import android.graphics.Canvas;
 import android.graphics.Color;
 import android.graphics.Paint;
-import android.graphics.Point;
 import android.graphics.PointF;
 import android.graphics.RectF;
 import android.util.AttributeSet;
 import android.util.Log;
 import android.view.MotionEvent;
 import android.view.View;
-import android.widget.RelativeLayout;
 
+import org.libreoffice.LOKitShell;
+import org.libreoffice.canvas.GraphicSelectionCanvasElement;
+import org.libreoffice.canvas.GraphicSelectionHandleCanvasElement;
 import org.mozilla.gecko.gfx.ImmutableViewportMetrics;
 import org.mozilla.gecko.gfx.LayerView;
 import org.mozilla.gecko.gfx.RectUtils;
@@ -50,7 +51,7 @@ public class TextCursorView extends View implements View.OnTouchListener {
 
     private Paint mGraphicSelectionPaint = new Paint();
 
-    private DrawElementGraphicSelection mGraphicSelection;
+    private GraphicSelectionCanvasElement mGraphicSelection;
 
     private PointF mTouchStart = new PointF();
     private PointF mDeltaPoint = new PointF();
@@ -60,8 +61,8 @@ public class TextCursorView extends View implements View.OnTouchListener {
 
     private LayerView mLayerView;
 
-    private DrawElementHandle mHandles[] = new DrawElementHandle[8];
-    private DrawElementHandle mDragHandle = null;
+    private GraphicSelectionHandleCanvasElement mHandles[] = new GraphicSelectionHandleCanvasElement[8];
+    private GraphicSelectionHandleCanvasElement mDragHandle = null;
 
     public TextCursorView(Context context) {
         super(context);
@@ -97,18 +98,18 @@ public class TextCursorView extends View implements View.OnTouchListener {
             mGraphicSelectionPaint.setColor(Color.BLACK);
             mGraphicSelectionPaint.setStrokeWidth(2);
 
-            mGraphicSelection = new DrawElementGraphicSelection(mGraphicSelectionPaint);
+            mGraphicSelection = new GraphicSelectionCanvasElement(mGraphicSelectionPaint);
 
             mGraphicSelectionVisible = false;
 
-            mHandles[0] = new DrawElementHandle(mGraphicSelectionPaint);
-            mHandles[1] = new DrawElementHandle(mGraphicSelectionPaint);
-            mHandles[2] = new DrawElementHandle(mGraphicSelectionPaint);
-            mHandles[3] = new DrawElementHandle(mGraphicSelectionPaint);
-            mHandles[4] = new DrawElementHandle(mGraphicSelectionPaint);
-            mHandles[5] = new DrawElementHandle(mGraphicSelectionPaint);
-            mHandles[6] = new DrawElementHandle(mGraphicSelectionPaint);
-            mHandles[7] = new DrawElementHandle(mGraphicSelectionPaint);
+            mHandles[0] = new GraphicSelectionHandleCanvasElement(mGraphicSelectionPaint);
+            mHandles[1] = new GraphicSelectionHandleCanvasElement(mGraphicSelectionPaint);
+            mHandles[2] = new GraphicSelectionHandleCanvasElement(mGraphicSelectionPaint);
+            mHandles[3] = new GraphicSelectionHandleCanvasElement(mGraphicSelectionPaint);
+            mHandles[4] = new GraphicSelectionHandleCanvasElement(mGraphicSelectionPaint);
+            mHandles[5] = new GraphicSelectionHandleCanvasElement(mGraphicSelectionPaint);
+            mHandles[6] = new GraphicSelectionHandleCanvasElement(mGraphicSelectionPaint);
+            mHandles[7] = new GraphicSelectionHandleCanvasElement(mGraphicSelectionPaint);
 
             postDelayed(cursorAnimation, CURSOR_BLINK_TIME);
 
@@ -201,7 +202,7 @@ public class TextCursorView extends View implements View.OnTouchListener {
             mGraphicSelection.draw(canvas);
 
             if (mGraphicSelectionMove) {
-                for (DrawElementHandle handle : mHandles) {
+                for (GraphicSelectionHandleCanvasElement handle : mHandles) {
                     if (mDragHandle == handle) {
                         handle.drawSelected(canvas);
                     } else {
@@ -209,7 +210,7 @@ public class TextCursorView extends View implements View.OnTouchListener {
                     }
                 }
             } else {
-                for (DrawElementHandle handle : mHandles) {
+                for (GraphicSelectionHandleCanvasElement handle : mHandles) {
                     handle.draw(canvas);
                 }
             }
@@ -296,11 +297,11 @@ public class TextCursorView extends View implements View.OnTouchListener {
     private boolean checkIfGraphicSelectionWasHit() {
         // Check if handle was hit
         mDragHandle = null;
-        for (DrawElementHandle handle : mHandles) {
+        for (GraphicSelectionHandleCanvasElement handle : mHandles) {
             if (handle.contains(mTouchStart.x, mTouchStart.y)) {
                 mDragHandle = handle;
                 mGraphicSelectionMove = true;
-                mGraphicSelection.dragStart(DrawElementGraphicSelection.DragType.EXTEND, mTouchStart);
+                mGraphicSelection.dragStart(GraphicSelectionCanvasElement.DragType.EXTEND, mTouchStart);
                 sendGraphicSelectionStart(handle.mPosition);
                 return true;
             }
@@ -308,7 +309,7 @@ public class TextCursorView extends View implements View.OnTouchListener {
         // Check if inside graphic selection was hit
         if (mGraphicSelection.contains(mTouchStart.x, mTouchStart.y)) {
             mGraphicSelectionMove = true;
-            mGraphicSelection.dragStart(DrawElementGraphicSelection.DragType.MOVE, mTouchStart);
+            mGraphicSelection.dragStart(GraphicSelectionCanvasElement.DragType.MOVE, mTouchStart);
             sendGraphicSelectionStart(mTouchStart);
             return true;
         }