[core, layouts] Move TwoWayView to the layouts library

lucasr · Oct 20, 2014 · 2b21213 · 2b21213
1 parent 7c5fb03
commit 2b21213
Show file tree

Hide file tree

Showing 11 changed files with 12 additions and 13 deletions.
diff --git a/core/src/main/res/values/attrs.xml b/core/src/main/res/values/attrs.xml
@@ -17,10 +17,6 @@
 
 <resources xmlns:tools="http://schemas.android.com/tools">
 
-    <declare-styleable name="twowayview_TwoWayView">
-        <attr name="twowayview_layoutManager" format="string"/>
-    </declare-styleable>
-
     <declare-styleable name="twowayview_TwoWayLayoutManager">
         <attr name="android:orientation" tools:ignore="ResourceName"/>
     </declare-styleable>

diff --git a/layouts/src/main/java/org/lucasr/twowayview/widget/SpannableGridLayoutManager.java b/layouts/src/main/java/org/lucasr/twowayview/widget/SpannableGridLayoutManager.java
@@ -28,7 +28,6 @@
 import android.view.ViewGroup;
 import android.view.ViewGroup.MarginLayoutParams;
 
-import org.lucasr.twowayview.TwoWayView;
 import org.lucasr.twowayview.widget.Lanes.LaneInfo;
 
 public class SpannableGridLayoutManager extends GridLayoutManager {

diff --git a/layouts/src/main/java/org/lucasr/twowayview/widget/StaggeredGridLayoutManager.java b/layouts/src/main/java/org/lucasr/twowayview/widget/StaggeredGridLayoutManager.java
@@ -28,7 +28,6 @@
 import android.view.View;
 import android.view.ViewGroup;
 
-import org.lucasr.twowayview.TwoWayView;
 import org.lucasr.twowayview.widget.Lanes.LaneInfo;
 
 public class StaggeredGridLayoutManager extends GridLayoutManager {

diff --git a/...ava/org/lucasr/twowayview/TwoWayView.java → .../lucasr/twowayview/widget/TwoWayView.java b/...ava/org/lucasr/twowayview/TwoWayView.java → .../lucasr/twowayview/widget/TwoWayView.java
@@ -14,14 +14,15 @@
  * limitations under the License.
  */
 
-package org.lucasr.twowayview;
+package org.lucasr.twowayview.widget;
 
 import android.content.Context;
 import android.content.res.TypedArray;
 import android.support.v7.widget.RecyclerView;
 import android.text.TextUtils;
 import android.util.AttributeSet;
 
+import org.lucasr.twowayview.TwoWayLayoutManager;
 import org.lucasr.twowayview.TwoWayLayoutManager.Orientation;
 
 import java.lang.reflect.Constructor;

diff --git a/layouts/src/main/res/values/attrs.xml b/layouts/src/main/res/values/attrs.xml
@@ -17,6 +17,10 @@
 
 <resources xmlns:tools="http://schemas.android.com/tools">
 
+    <declare-styleable name="twowayview_TwoWayView">
+        <attr name="twowayview_layoutManager" format="string"/>
+    </declare-styleable>
+
     <declare-styleable name="twowayview_GridLayoutManager">
         <attr name="twowayview_numColumns" format="integer"/>
         <attr name="twowayview_numRows" format="integer"/>

diff --git a/sample/src/main/java/org/lucasr/twowayview/sample/LayoutAdapter.java b/sample/src/main/java/org/lucasr/twowayview/sample/LayoutAdapter.java
@@ -24,7 +24,7 @@
 import android.widget.TextView;
 
 import org.lucasr.twowayview.TwoWayLayoutManager;
-import org.lucasr.twowayview.TwoWayView;
+import org.lucasr.twowayview.widget.TwoWayView;
 import org.lucasr.twowayview.widget.SpannableGridLayoutManager;
 import org.lucasr.twowayview.widget.StaggeredGridLayoutManager;
 

diff --git a/sample/src/main/java/org/lucasr/twowayview/sample/LayoutFragment.java b/sample/src/main/java/org/lucasr/twowayview/sample/LayoutFragment.java
@@ -36,7 +36,7 @@
 import org.lucasr.twowayview.ItemClickSupport.OnItemClickListener;
 import org.lucasr.twowayview.ItemClickSupport.OnItemLongClickListener;
 import org.lucasr.twowayview.widget.DividerItemDecoration;
-import org.lucasr.twowayview.TwoWayView;
+import org.lucasr.twowayview.widget.TwoWayView;
 
 public class LayoutFragment extends Fragment {
     private static final String ARG_LAYOUT_ID = "layout_id";

diff --git a/sample/src/main/res/layout/layout_grid.xml b/sample/src/main/res/layout/layout_grid.xml
@@ -15,7 +15,7 @@
    limitations under the License.
 -->
 
-<org.lucasr.twowayview.TwoWayView
+<org.lucasr.twowayview.widget.TwoWayView
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/list"

diff --git a/sample/src/main/res/layout/layout_list.xml b/sample/src/main/res/layout/layout_list.xml
@@ -15,7 +15,7 @@
    limitations under the License.
 -->
 
-<org.lucasr.twowayview.TwoWayView
+<org.lucasr.twowayview.widget.TwoWayView
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/list"

diff --git a/sample/src/main/res/layout/layout_spannable_grid.xml b/sample/src/main/res/layout/layout_spannable_grid.xml
@@ -15,7 +15,7 @@
    limitations under the License.
 -->
 
-<org.lucasr.twowayview.TwoWayView
+<org.lucasr.twowayview.widget.TwoWayView
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/list"

diff --git a/sample/src/main/res/layout/layout_staggered_grid.xml b/sample/src/main/res/layout/layout_staggered_grid.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License.
   -->
 
-<org.lucasr.twowayview.TwoWayView
+<org.lucasr.twowayview.widget.TwoWayView
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/list"