Skip to content

Commit 31efe23

Browse files
author
deano2390
committed
Sorting package names to match folder structure
1 parent 8dba750 commit 31efe23

File tree

13 files changed

+35
-34
lines changed

13 files changed

+35
-34
lines changed

flowtextview-sample/src/main/java/uk/co/deanwild/flowtext/sample/MainActivity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import android.view.View;
88
import android.widget.Button;
99

10-
import uk.flowtext.FlowTextView;
10+
import uk.co.deanwild.flowtext.FlowTextView;
1111

1212

1313
public class MainActivity extends ActionBarActivity implements View.OnClickListener {

flowtextview-sample/src/main/res/layout/activity_main.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
android:layout_width="match_parent"
1313
android:layout_height="0dip"
1414
android:layout_weight="1" >
15-
<uk.flowtext.FlowTextView
15+
<uk.co.deanwild.flowtext.FlowTextView
1616
android:id="@+id/ftv"
1717
android:layout_width="fill_parent"
1818
android:layout_height="wrap_content" >
@@ -32,7 +32,7 @@
3232
android:layout_marginTop="400dip"
3333
android:padding="10dip"
3434
android:src="@drawable/android2"/>
35-
</uk.flowtext.FlowTextView>
35+
</uk.co.deanwild.flowtext.FlowTextView>
3636
</ScrollView>
3737
<LinearLayout
3838
android:layout_width="match_parent"

flowtextview/src/main/java/uk/co/deanwild/flowtext/FlowTextView.java

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package uk.flowtext;
1+
package uk.co.deanwild.flowtext;
22

33
import android.content.Context;
44
import android.content.res.Configuration;
@@ -13,18 +13,18 @@
1313
import android.view.View;
1414
import android.widget.RelativeLayout;
1515

16-
import uk.flowtext.helpers.ClickHandler;
17-
import uk.flowtext.helpers.CollisionHelper;
18-
import uk.flowtext.helpers.PaintHelper;
19-
import uk.flowtext.helpers.SpanParser;
20-
import uk.flowtext.listeners.OnLinkClickListener;
21-
import uk.flowtext.models.HtmlLink;
22-
import uk.flowtext.models.HtmlObject;
23-
import uk.flowtext.models.Line;
24-
import uk.flowtext.models.Obstacle;
25-
2616
import java.util.ArrayList;
2717

18+
import uk.co.deanwild.flowtext.helpers.ClickHandler;
19+
import uk.co.deanwild.flowtext.helpers.CollisionHelper;
20+
import uk.co.deanwild.flowtext.helpers.PaintHelper;
21+
import uk.co.deanwild.flowtext.helpers.SpanParser;
22+
import uk.co.deanwild.flowtext.listeners.OnLinkClickListener;
23+
import uk.co.deanwild.flowtext.models.HtmlLink;
24+
import uk.co.deanwild.flowtext.models.HtmlObject;
25+
import uk.co.deanwild.flowtext.models.Line;
26+
import uk.co.deanwild.flowtext.models.Obstacle;
27+
2828
public class FlowTextView extends RelativeLayout {
2929

3030
// FIELDS

flowtextview/src/main/java/uk/co/deanwild/flowtext/helpers/ClickHandler.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
package uk.flowtext.helpers;
1+
package uk.co.deanwild.flowtext.helpers;
22

33
import android.view.MotionEvent;
44
import android.view.View;
55

6-
import uk.flowtext.listeners.OnLinkClickListener;
7-
import uk.flowtext.models.HtmlLink;
8-
96
import java.util.ArrayList;
107

8+
import uk.co.deanwild.flowtext.listeners.OnLinkClickListener;
9+
import uk.co.deanwild.flowtext.models.HtmlLink;
10+
1111
/**
1212
* Created by Dean on 24/06/2014.
1313
*/

flowtextview/src/main/java/uk/co/deanwild/flowtext/helpers/CollisionHelper.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
1-
package uk.flowtext.helpers;
1+
package uk.co.deanwild.flowtext.helpers;
22

3-
import uk.flowtext.models.Area;
4-
import uk.flowtext.models.Obstacle;
5-
import uk.flowtext.models.Line;
63

74
import java.util.ArrayList;
85

6+
import uk.co.deanwild.flowtext.models.Area;
7+
import uk.co.deanwild.flowtext.models.Line;
8+
import uk.co.deanwild.flowtext.models.Obstacle;
9+
910
/**
1011
* Created by Dean on 24/06/2014.
1112
*/

flowtextview/src/main/java/uk/co/deanwild/flowtext/helpers/PaintHelper.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package uk.flowtext.helpers;
1+
package uk.co.deanwild.flowtext.helpers;
22

33
import android.graphics.Paint;
44
import android.text.TextPaint;

flowtextview/src/main/java/uk/co/deanwild/flowtext/helpers/SpanParser.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
1-
package uk.flowtext.helpers;
1+
package uk.co.deanwild.flowtext.helpers;
22

33
import android.graphics.Typeface;
44
import android.text.Spannable;
55
import android.text.TextPaint;
66
import android.text.style.StyleSpan;
77
import android.text.style.URLSpan;
88

9-
import uk.flowtext.FlowTextView;
10-
import uk.flowtext.models.HtmlLink;
11-
import uk.flowtext.models.HtmlObject;
12-
139
import java.util.ArrayList;
1410
import java.util.Arrays;
1511
import java.util.HashMap;
1612

13+
import uk.co.deanwild.flowtext.FlowTextView;
14+
import uk.co.deanwild.flowtext.models.HtmlLink;
15+
import uk.co.deanwild.flowtext.models.HtmlObject;
16+
1717
/**
1818
* Created by Dean on 24/06/2014.
1919
*/

flowtextview/src/main/java/uk/co/deanwild/flowtext/listeners/OnLinkClickListener.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package uk.flowtext.listeners;
1+
package uk.co.deanwild.flowtext.listeners;
22

33
/**
44
* Created by Dean on 24/06/2014.

flowtextview/src/main/java/uk/co/deanwild/flowtext/models/Area.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package uk.flowtext.models;
1+
package uk.co.deanwild.flowtext.models;
22

33
/**
44
* Created by Dean on 24/06/2014.

flowtextview/src/main/java/uk/co/deanwild/flowtext/models/HtmlLink.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package uk.flowtext.models;
1+
package uk.co.deanwild.flowtext.models;
22

33
import android.text.TextPaint;
44

0 commit comments

Comments
 (0)