Sorting package names to match folder structure

deano2390 · Jun 25, 2014 · 31efe23 · 31efe23
1 parent 8dba750
commit 31efe23
Show file tree

Hide file tree

Showing 13 changed files with 35 additions and 34 deletions.
diff --git a/flowtextview-sample/src/main/java/uk/co/deanwild/flowtext/sample/MainActivity.java b/flowtextview-sample/src/main/java/uk/co/deanwild/flowtext/sample/MainActivity.java
@@ -7,7 +7,7 @@
 import android.view.View;
 import android.widget.Button;
 
-import uk.flowtext.FlowTextView;
+import uk.co.deanwild.flowtext.FlowTextView;
 
 
 public class MainActivity extends ActionBarActivity implements View.OnClickListener {

diff --git a/flowtextview-sample/src/main/res/layout/activity_main.xml b/flowtextview-sample/src/main/res/layout/activity_main.xml
@@ -12,7 +12,7 @@
         android:layout_width="match_parent"
         android:layout_height="0dip"
         android:layout_weight="1" >
-        <uk.flowtext.FlowTextView
+        <uk.co.deanwild.flowtext.FlowTextView
             android:id="@+id/ftv"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content" >
@@ -32,7 +32,7 @@
                 android:layout_marginTop="400dip"
                 android:padding="10dip"
                 android:src="@drawable/android2"/>
-        </uk.flowtext.FlowTextView>
+        </uk.co.deanwild.flowtext.FlowTextView>
     </ScrollView>
     <LinearLayout
         android:layout_width="match_parent"

diff --git a/flowtextview/src/main/java/uk/co/deanwild/flowtext/FlowTextView.java b/flowtextview/src/main/java/uk/co/deanwild/flowtext/FlowTextView.java
@@ -1,4 +1,4 @@
-package uk.flowtext;
+package uk.co.deanwild.flowtext;
 
 import android.content.Context;
 import android.content.res.Configuration;
@@ -13,18 +13,18 @@
 import android.view.View;
 import android.widget.RelativeLayout;
 
-import uk.flowtext.helpers.ClickHandler;
-import uk.flowtext.helpers.CollisionHelper;
-import uk.flowtext.helpers.PaintHelper;
-import uk.flowtext.helpers.SpanParser;
-import uk.flowtext.listeners.OnLinkClickListener;
-import uk.flowtext.models.HtmlLink;
-import uk.flowtext.models.HtmlObject;
-import uk.flowtext.models.Line;
-import uk.flowtext.models.Obstacle;
-
 import java.util.ArrayList;
 
+import uk.co.deanwild.flowtext.helpers.ClickHandler;
+import uk.co.deanwild.flowtext.helpers.CollisionHelper;
+import uk.co.deanwild.flowtext.helpers.PaintHelper;
+import uk.co.deanwild.flowtext.helpers.SpanParser;
+import uk.co.deanwild.flowtext.listeners.OnLinkClickListener;
+import uk.co.deanwild.flowtext.models.HtmlLink;
+import uk.co.deanwild.flowtext.models.HtmlObject;
+import uk.co.deanwild.flowtext.models.Line;
+import uk.co.deanwild.flowtext.models.Obstacle;
+
 public class FlowTextView extends RelativeLayout {
 
     // FIELDS

diff --git a/flowtextview/src/main/java/uk/co/deanwild/flowtext/helpers/ClickHandler.java b/flowtextview/src/main/java/uk/co/deanwild/flowtext/helpers/ClickHandler.java
@@ -1,13 +1,13 @@
-package uk.flowtext.helpers;
+package uk.co.deanwild.flowtext.helpers;
 
 import android.view.MotionEvent;
 import android.view.View;
 
-import uk.flowtext.listeners.OnLinkClickListener;
-import uk.flowtext.models.HtmlLink;
-
 import java.util.ArrayList;
 
+import uk.co.deanwild.flowtext.listeners.OnLinkClickListener;
+import uk.co.deanwild.flowtext.models.HtmlLink;
+
 /**
  * Created by Dean on 24/06/2014.
  */

diff --git a/flowtextview/src/main/java/uk/co/deanwild/flowtext/helpers/CollisionHelper.java b/flowtextview/src/main/java/uk/co/deanwild/flowtext/helpers/CollisionHelper.java
@@ -1,11 +1,12 @@
-package uk.flowtext.helpers;
+package uk.co.deanwild.flowtext.helpers;
 
-import uk.flowtext.models.Area;
-import uk.flowtext.models.Obstacle;
-import uk.flowtext.models.Line;
 
 import java.util.ArrayList;
 
+import uk.co.deanwild.flowtext.models.Area;
+import uk.co.deanwild.flowtext.models.Line;
+import uk.co.deanwild.flowtext.models.Obstacle;
+
 /**
  * Created by Dean on 24/06/2014.
  */

diff --git a/flowtextview/src/main/java/uk/co/deanwild/flowtext/helpers/PaintHelper.java b/flowtextview/src/main/java/uk/co/deanwild/flowtext/helpers/PaintHelper.java
@@ -1,4 +1,4 @@
-package uk.flowtext.helpers;
+package uk.co.deanwild.flowtext.helpers;
 
 import android.graphics.Paint;
 import android.text.TextPaint;

diff --git a/flowtextview/src/main/java/uk/co/deanwild/flowtext/helpers/SpanParser.java b/flowtextview/src/main/java/uk/co/deanwild/flowtext/helpers/SpanParser.java
@@ -1,19 +1,19 @@
-package uk.flowtext.helpers;
+package uk.co.deanwild.flowtext.helpers;
 
 import android.graphics.Typeface;
 import android.text.Spannable;
 import android.text.TextPaint;
 import android.text.style.StyleSpan;
 import android.text.style.URLSpan;
 
-import uk.flowtext.FlowTextView;
-import uk.flowtext.models.HtmlLink;
-import uk.flowtext.models.HtmlObject;
-
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
 
+import uk.co.deanwild.flowtext.FlowTextView;
+import uk.co.deanwild.flowtext.models.HtmlLink;
+import uk.co.deanwild.flowtext.models.HtmlObject;
+
 /**
  * Created by Dean on 24/06/2014.
  */

diff --git a/flowtextview/src/main/java/uk/co/deanwild/flowtext/listeners/OnLinkClickListener.java b/flowtextview/src/main/java/uk/co/deanwild/flowtext/listeners/OnLinkClickListener.java
@@ -1,4 +1,4 @@
-package uk.flowtext.listeners;
+package uk.co.deanwild.flowtext.listeners;
 
 /**
 * Created by Dean on 24/06/2014.

diff --git a/flowtextview/src/main/java/uk/co/deanwild/flowtext/models/Area.java b/flowtextview/src/main/java/uk/co/deanwild/flowtext/models/Area.java
@@ -1,4 +1,4 @@
-package uk.flowtext.models;
+package uk.co.deanwild.flowtext.models;
 
 /**
 * Created by Dean on 24/06/2014.

diff --git a/flowtextview/src/main/java/uk/co/deanwild/flowtext/models/HtmlLink.java b/flowtextview/src/main/java/uk/co/deanwild/flowtext/models/HtmlLink.java
@@ -1,4 +1,4 @@
-package uk.flowtext.models;
+package uk.co.deanwild.flowtext.models;
 
 import android.text.TextPaint;
 

diff --git a/flowtextview/src/main/java/uk/co/deanwild/flowtext/models/HtmlObject.java b/flowtextview/src/main/java/uk/co/deanwild/flowtext/models/HtmlObject.java
@@ -1,4 +1,4 @@
-package uk.flowtext.models;
+package uk.co.deanwild.flowtext.models;
 
 import android.text.TextPaint;
 

diff --git a/flowtextview/src/main/java/uk/co/deanwild/flowtext/models/Line.java b/flowtextview/src/main/java/uk/co/deanwild/flowtext/models/Line.java
@@ -1,4 +1,4 @@
-package uk.flowtext.models;
+package uk.co.deanwild.flowtext.models;
 
 /**
 * Created by Dean on 24/06/2014.

diff --git a/flowtextview/src/main/java/uk/co/deanwild/flowtext/models/Obstacle.java b/flowtextview/src/main/java/uk/co/deanwild/flowtext/models/Obstacle.java
@@ -1,4 +1,4 @@
-package uk.flowtext.models;
+package uk.co.deanwild.flowtext.models;
 
 /**
 * Created by Dean on 24/06/2014.