minor code refactoring

elevenetc · elevenetc · commit 1ab0610e3b7c · 2015-10-15T03:25:01.000+03:00
diff --git a/app/src/main/java/su/levenetc/android/textsurface/sample/SampleActivity.java b/app/src/main/java/su/levenetc/android/textsurface/sample/SampleActivity.java
@@ -45,16 +45,7 @@ public class SampleActivity extends AppCompatActivity {
 	}
 
 	private void show() {
-
 		textSurface.reset();
-
-//		AlignSample.play(textSurface);
-//		SurfaceTransCheck.play(textSurface);
-//		SurfaceScaleCheck.play(textSurface);
-//		SlideCheck.play(textSurface);
-//		CheckRotation3D.play(textSurface);
-//		CheckShapeReveal.play(textSurface);
-//		ColorSample.play(textSurface);
 		CookieThumperSample.play(textSurface, getAssets());
 	}
 
diff --git a/app/src/main/java/su/levenetc/android/textsurface/sample/checks/AlignSample.java b/app/src/main/java/su/levenetc/android/textsurface/sample/checks/AlignSample.java
@@ -1,7 +1,7 @@
 package su.levenetc.android.textsurface.sample.checks;
 
-import su.levenetc.android.textsurface.Align;
-import su.levenetc.android.textsurface.TYPE;
+import su.levenetc.android.textsurface.contants.Align;
+import su.levenetc.android.textsurface.contants.TYPE;
 import su.levenetc.android.textsurface.Text;
 import su.levenetc.android.textsurface.TextBuilder;
 import su.levenetc.android.textsurface.TextSurface;
diff --git a/app/src/main/java/su/levenetc/android/textsurface/sample/checks/ColorSample.java b/app/src/main/java/su/levenetc/android/textsurface/sample/checks/ColorSample.java
@@ -2,8 +2,8 @@
 
 import android.graphics.Color;
 
-import su.levenetc.android.textsurface.Align;
-import su.levenetc.android.textsurface.TYPE;
+import su.levenetc.android.textsurface.contants.Align;
+import su.levenetc.android.textsurface.contants.TYPE;
 import su.levenetc.android.textsurface.Text;
 import su.levenetc.android.textsurface.TextBuilder;
 import su.levenetc.android.textsurface.TextSurface;
diff --git a/app/src/main/java/su/levenetc/android/textsurface/sample/checks/CookieThumperSample.java b/app/src/main/java/su/levenetc/android/textsurface/sample/checks/CookieThumperSample.java
@@ -5,7 +5,7 @@
 import android.graphics.Paint;
 import android.graphics.Typeface;
 
-import su.levenetc.android.textsurface.Align;
+import su.levenetc.android.textsurface.contants.Align;
 import su.levenetc.android.textsurface.Text;
 import su.levenetc.android.textsurface.TextBuilder;
 import su.levenetc.android.textsurface.TextSurface;
diff --git a/app/src/main/java/su/levenetc/android/textsurface/sample/checks/Rotation3DSample.java b/app/src/main/java/su/levenetc/android/textsurface/sample/checks/Rotation3DSample.java
@@ -1,8 +1,8 @@
 package su.levenetc.android.textsurface.sample.checks;
 
-import su.levenetc.android.textsurface.Align;
+import su.levenetc.android.textsurface.contants.Align;
 import su.levenetc.android.textsurface.animations.AnimationsSet;
-import su.levenetc.android.textsurface.TYPE;
+import su.levenetc.android.textsurface.contants.TYPE;
 import su.levenetc.android.textsurface.Text;
 import su.levenetc.android.textsurface.TextBuilder;
 import su.levenetc.android.textsurface.TextSurface;
@@ -14,7 +14,7 @@
 /**
  * Created by Eugene Levenetc.
  */
-public class CheckRotation3D {
+public class Rotation3DSample {
 	public static void play(TextSurface textSurface) {
 		Text textA = TextBuilder.create("How are you?").setPosition(Align.SURFACE_CENTER).build();
 		Text textB = TextBuilder.create("I'm fine! And you?").setPosition(Align.SURFACE_CENTER, textA).build();
diff --git a/app/src/main/java/su/levenetc/android/textsurface/sample/checks/ScaleTextSample.java b/app/src/main/java/su/levenetc/android/textsurface/sample/checks/ScaleTextSample.java
@@ -1,8 +1,8 @@
 package su.levenetc.android.textsurface.sample.checks;
 
-import su.levenetc.android.textsurface.Align;
+import su.levenetc.android.textsurface.contants.Align;
 import su.levenetc.android.textsurface.animations.Sequential;
-import su.levenetc.android.textsurface.TYPE;
+import su.levenetc.android.textsurface.contants.TYPE;
 import su.levenetc.android.textsurface.Text;
 import su.levenetc.android.textsurface.TextBuilder;
 import su.levenetc.android.textsurface.TextSurface;
diff --git a/app/src/main/java/su/levenetc/android/textsurface/sample/checks/ShapeRevealSample.java b/app/src/main/java/su/levenetc/android/textsurface/sample/checks/ShapeRevealSample.java
@@ -1,8 +1,8 @@
 package su.levenetc.android.textsurface.sample.checks;
 
-import su.levenetc.android.textsurface.Align;
+import su.levenetc.android.textsurface.contants.Align;
 import su.levenetc.android.textsurface.animations.AnimationsSet;
-import su.levenetc.android.textsurface.TYPE;
+import su.levenetc.android.textsurface.contants.TYPE;
 import su.levenetc.android.textsurface.Text;
 import su.levenetc.android.textsurface.TextBuilder;
 import su.levenetc.android.textsurface.TextSurface;
@@ -22,7 +22,7 @@
 /**
  * Created by Eugene Levenetc.
  */
-public class CheckShapeReveal {
+public class ShapeRevealSample {
 	public static void play(TextSurface textSurface) {
 
 		Text textA = TextBuilder.create("Now why you loer en kyk gelyk?").setPosition(Align.SURFACE_CENTER).build();
diff --git a/app/src/main/java/su/levenetc/android/textsurface/sample/checks/SlideSample.java b/app/src/main/java/su/levenetc/android/textsurface/sample/checks/SlideSample.java
@@ -1,8 +1,8 @@
 package su.levenetc.android.textsurface.sample.checks;
 
-import su.levenetc.android.textsurface.Align;
+import su.levenetc.android.textsurface.contants.Align;
 import su.levenetc.android.textsurface.animations.AnimationsSet;
-import su.levenetc.android.textsurface.TYPE;
+import su.levenetc.android.textsurface.contants.TYPE;
 import su.levenetc.android.textsurface.Text;
 import su.levenetc.android.textsurface.TextBuilder;
 import su.levenetc.android.textsurface.TextSurface;
@@ -14,7 +14,7 @@
 /**
  * Created by Eugene Levenetc.
  */
-public class SlideCheck {
+public class SlideSample {
 	public static void play(TextSurface textSurface) {
 
 		Text textA = TextBuilder.create(" How are you?").build();
diff --git a/app/src/main/java/su/levenetc/android/textsurface/sample/checks/SurfaceScaleSample.java b/app/src/main/java/su/levenetc/android/textsurface/sample/checks/SurfaceScaleSample.java
@@ -1,8 +1,8 @@
 package su.levenetc.android.textsurface.sample.checks;
 
-import su.levenetc.android.textsurface.Align;
+import su.levenetc.android.textsurface.contants.Align;
 import su.levenetc.android.textsurface.animations.AnimationsSet;
-import su.levenetc.android.textsurface.TYPE;
+import su.levenetc.android.textsurface.contants.TYPE;
 import su.levenetc.android.textsurface.Text;
 import su.levenetc.android.textsurface.TextBuilder;
 import su.levenetc.android.textsurface.TextSurface;
@@ -14,7 +14,7 @@
 /**
  * Created by Eugene Levenetc.
  */
-public class SurfaceScaleCheck {
+public class SurfaceScaleSample {
 	public static void play(TextSurface textSurface) {
 
 		Text textA = TextBuilder.create("How are you?").setPosition(Align.SURFACE_CENTER).build();
diff --git a/app/src/main/java/su/levenetc/android/textsurface/sample/checks/SurfaceTransSample.java b/app/src/main/java/su/levenetc/android/textsurface/sample/checks/SurfaceTransSample.java
@@ -1,9 +1,9 @@
 package su.levenetc.android.textsurface.sample.checks;
 
-import su.levenetc.android.textsurface.Align;
+import su.levenetc.android.textsurface.contants.Align;
 import su.levenetc.android.textsurface.animations.AnimationsSet;
 import su.levenetc.android.textsurface.contants.Pivot;
-import su.levenetc.android.textsurface.TYPE;
+import su.levenetc.android.textsurface.contants.TYPE;
 import su.levenetc.android.textsurface.Text;
 import su.levenetc.android.textsurface.TextBuilder;
 import su.levenetc.android.textsurface.TextSurface;
@@ -13,7 +13,7 @@
 /**
  * Created by Eugene Levenetc.
  */
-public class SurfaceTransCheck {
+public class SurfaceTransSample {
 	public static void play(TextSurface textSurface) {
 		Text textA = TextBuilder.create("TextA").setPosition(Align.SURFACE_CENTER).build();
 		Text textB = TextBuilder.create("TextB").setPosition(Align.RIGHT_OF | Align.BOTTOM_OF, textA).build();
diff --git a/app/src/main/res/drawable/alium.png b/app/src/main/res/drawable/alium.png
diff --git a/library/src/main/java/su/levenetc/android/textsurface/SurfaceCamera.java b/library/src/main/java/su/levenetc/android/textsurface/SurfaceCamera.java
@@ -3,6 +3,8 @@
 import android.graphics.Canvas;
 import android.graphics.PointF;
 
+import su.levenetc.android.textsurface.common.ScaleValue;
+
 /**
  * Created by Eugene Levenetc.
  */
diff --git a/library/src/main/java/su/levenetc/android/textsurface/Text.java b/library/src/main/java/su/levenetc/android/textsurface/Text.java
@@ -9,6 +9,8 @@
 
 import java.util.ArrayList;
 
+import su.levenetc.android.textsurface.common.Position;
+import su.levenetc.android.textsurface.common.ScaleValue;
 import su.levenetc.android.textsurface.interfaces.ITextEffect;
 import su.levenetc.android.textsurface.utils.Utils;
 
diff --git a/library/src/main/java/su/levenetc/android/textsurface/TextBuilder.java b/library/src/main/java/su/levenetc/android/textsurface/TextBuilder.java
@@ -7,6 +7,7 @@
 import android.graphics.RectF;
 import android.util.TypedValue;
 
+import su.levenetc.android.textsurface.common.Position;
 import su.levenetc.android.textsurface.contants.Pivot;
 
 /**
diff --git a/library/src/main/java/su/levenetc/android/textsurface/TextSurface.java b/library/src/main/java/su/levenetc/android/textsurface/TextSurface.java
@@ -2,7 +2,6 @@
 
 import android.content.Context;
 import android.graphics.Canvas;
-import android.graphics.Color;
 import android.util.AttributeSet;
 import android.widget.FrameLayout;
 
@@ -11,6 +10,7 @@
 import java.util.TreeSet;
 
 import su.levenetc.android.textsurface.animations.AnimationsSet;
+import su.levenetc.android.textsurface.contants.TYPE;
 import su.levenetc.android.textsurface.interfaces.ICameraAnimation;
 import su.levenetc.android.textsurface.interfaces.ISet;
 import su.levenetc.android.textsurface.interfaces.ISurfaceAnimation;
diff --git a/library/src/main/java/su/levenetc/android/textsurface/animations/AnimationsSet.java b/library/src/main/java/su/levenetc/android/textsurface/animations/AnimationsSet.java
@@ -10,7 +10,7 @@
 import java.util.LinkedList;
 
 import su.levenetc.android.textsurface.Debug;
-import su.levenetc.android.textsurface.TYPE;
+import su.levenetc.android.textsurface.contants.TYPE;
 import su.levenetc.android.textsurface.TextSurface;
 import su.levenetc.android.textsurface.interfaces.IEndListener;
 import su.levenetc.android.textsurface.interfaces.ISet;
diff --git a/library/src/main/java/su/levenetc/android/textsurface/animations/Just.java b/library/src/main/java/su/levenetc/android/textsurface/animations/Just.java
@@ -2,7 +2,7 @@
 
 import android.support.annotation.Nullable;
 
-import su.levenetc.android.textsurface.TYPE;
+import su.levenetc.android.textsurface.contants.TYPE;
 import su.levenetc.android.textsurface.Text;
 import su.levenetc.android.textsurface.interfaces.IEndListener;
 
diff --git a/library/src/main/java/su/levenetc/android/textsurface/animations/Parallel.java b/library/src/main/java/su/levenetc/android/textsurface/animations/Parallel.java
@@ -1,6 +1,6 @@
 package su.levenetc.android.textsurface.animations;
 
-import su.levenetc.android.textsurface.TYPE;
+import su.levenetc.android.textsurface.contants.TYPE;
 import su.levenetc.android.textsurface.interfaces.ISurfaceAnimation;
 
 /**
diff --git a/library/src/main/java/su/levenetc/android/textsurface/animations/Sequential.java b/library/src/main/java/su/levenetc/android/textsurface/animations/Sequential.java
@@ -1,6 +1,6 @@
 package su.levenetc.android.textsurface.animations;
 
-import su.levenetc.android.textsurface.TYPE;
+import su.levenetc.android.textsurface.contants.TYPE;
 import su.levenetc.android.textsurface.interfaces.ISurfaceAnimation;
 
 /**
diff --git a/library/src/main/java/su/levenetc/android/textsurface/common/Position.java b/library/src/main/java/su/levenetc/android/textsurface/common/Position.java
@@ -1,7 +1,10 @@
-package su.levenetc.android.textsurface;
+package su.levenetc.android.textsurface.common;
 
 import android.graphics.PointF;
 
+import su.levenetc.android.textsurface.Text;
+import su.levenetc.android.textsurface.TextSurface;
+import su.levenetc.android.textsurface.contants.Align;
 import su.levenetc.android.textsurface.contants.Pivot;
 
 /**
@@ -52,7 +55,6 @@ public PointF getPoint() {
 		return point;
 	}
 
-
 	public float getRelativeX(int pivot, Text text, boolean global) {
 		float result = 0;
 
@@ -82,7 +84,7 @@ public float getRelativeY(int pivot, Text text, boolean global) {
 		return global ? (result + point.y + translationY) : result;
 	}
 
-	float getX(TextSurface textSurface, float textWidth) {
+	public float getX(TextSurface textSurface, float textWidth) {
 
 
 		if (isAligned()) {
diff --git a/library/src/main/java/su/levenetc/android/textsurface/common/ScaleValue.java b/library/src/main/java/su/levenetc/android/textsurface/common/ScaleValue.java
@@ -1,4 +1,4 @@
-package su.levenetc.android.textsurface;
+package su.levenetc.android.textsurface.common;
 
 import android.graphics.PointF;
 
diff --git a/library/src/main/java/su/levenetc/android/textsurface/contants/Align.java b/library/src/main/java/su/levenetc/android/textsurface/contants/Align.java
@@ -1,4 +1,4 @@
-package su.levenetc.android.textsurface;
+package su.levenetc.android.textsurface.contants;
 
 /**
  * Created by Eugene Levenetc.
diff --git a/library/src/main/java/su/levenetc/android/textsurface/contants/TYPE.java b/library/src/main/java/su/levenetc/android/textsurface/contants/TYPE.java
@@ -1,4 +1,4 @@
-package su.levenetc.android.textsurface;
+package su.levenetc.android.textsurface.contants;
 
 /**
  * Created by Eugene Levenetc.
diff --git a/library/src/main/java/su/levenetc/android/textsurface/interfaces/ISet.java b/library/src/main/java/su/levenetc/android/textsurface/interfaces/ISet.java
@@ -2,7 +2,7 @@
 
 import java.util.LinkedList;
 
-import su.levenetc.android.textsurface.TYPE;
+import su.levenetc.android.textsurface.contants.TYPE;
 
 /**
  * Created by Eugene Levenetc.
diff --git a/library/src/main/java/su/levenetc/android/textsurface/interfaces/ITextSurfaceAnimation.java b/library/src/main/java/su/levenetc/android/textsurface/interfaces/ITextSurfaceAnimation.java
@@ -11,6 +11,6 @@ public interface ITextSurfaceAnimation extends ISurfaceAnimation {
 
 	void setInitValues(@NonNull Text text);
 
-	@NonNull Text getText();
+	Text getText();
 
 }
