Refactor package structure

BlueMatthew · Jan 6, 2021 · eb76a43 · eb76a43
1 parent 5c3224a
commit eb76a43
Show file tree

Hide file tree

Showing 28 changed files with 53 additions and 51 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -14,7 +14,7 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
-        <activity android:name="org.wakin.flexlayout.MainActivity">
+        <activity android:name="org.wakin.flexlayout.app.MainActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 

diff --git a/...va/org/wakin/flexlayout/MainActivity.java → ...rg/wakin/flexlayout/app/MainActivity.java b/...va/org/wakin/flexlayout/MainActivity.java → ...rg/wakin/flexlayout/app/MainActivity.java
@@ -1,4 +1,4 @@
-package org.wakin.flexlayout;
+package org.wakin.flexlayout.app;
 
 
 import android.content.pm.ActivityInfo;
@@ -17,6 +17,7 @@
 import android.view.View;
 import android.view.ViewGroup;
 
+import org.wakin.flexlayout.R;
 import org.wakin.flexlayout.layoutmanager.graphics.Insets;
 import org.wakin.flexlayout.layoutmanager.LayoutCallback;
 import org.wakin.flexlayout.layoutmanager.FlexLayoutManager;

diff --git a/...in/flexlayout/MainActivityDataSource.java → ...lexlayout/app/MainActivityDataSource.java b/...in/flexlayout/MainActivityDataSource.java → ...lexlayout/app/MainActivityDataSource.java
@@ -1,4 +1,4 @@
-package org.wakin.flexlayout;
+package org.wakin.flexlayout.app;
 
 import android.content.Context;
 import android.content.res.Resources;
@@ -13,15 +13,16 @@
 import androidx.recyclerview.widget.RecyclerView;
 import androidx.recyclerview.widget.StaggeredGridLayoutManager;
 
+import org.wakin.flexlayout.R;
 import org.wakin.flexlayout.layoutmanager.FlexLayoutManager;
 import org.wakin.flexlayout.layoutmanager.graphics.Insets;
 import org.wakin.flexlayout.layoutmanager.impl.SectionPosition;
 import org.wakin.flexlayout.layoutmanager.graphics.Size;
-import org.wakin.flexlayout.cells.ItemView;
-import org.wakin.flexlayout.models.PageData;
-import org.wakin.flexlayout.models.PageFixedData;
-import org.wakin.flexlayout.models.SectionData;
-import org.wakin.flexlayout.models.CellData;
+import org.wakin.flexlayout.app.cells.ItemView;
+import org.wakin.flexlayout.app.models.PageData;
+import org.wakin.flexlayout.app.models.PageFixedData;
+import org.wakin.flexlayout.app.models.SectionData;
+import org.wakin.flexlayout.app.models.CellData;
 
 import java.util.ArrayList;
 import java.util.List;

diff --git a/.../wakin/flexlayout/MainActivityHelper.java → ...in/flexlayout/app/MainActivityHelper.java b/.../wakin/flexlayout/MainActivityHelper.java → ...in/flexlayout/app/MainActivityHelper.java
@@ -1,4 +1,4 @@
-package org.wakin.flexlayout;
+package org.wakin.flexlayout.app;
 
 import java.io.IOException;
 import android.content.Context;
@@ -19,8 +19,9 @@
 import androidx.recyclerview.widget.RecyclerView;
 import androidx.recyclerview.widget.StaggeredGridLayoutManager;
 
+import org.wakin.flexlayout.R;
 import org.wakin.flexlayout.layoutmanager.FlexLayoutManager;
-import org.wakin.flexlayout.cells.ItemView;
+import org.wakin.flexlayout.app.cells.ItemView;
 
 import java.io.InputStream;
 import java.io.ByteArrayOutputStream;

diff --git a/...va/org/wakin/flexlayout/NetImageView.java → ...rg/wakin/flexlayout/app/NetImageView.java b/...va/org/wakin/flexlayout/NetImageView.java → ...rg/wakin/flexlayout/app/NetImageView.java
@@ -1,4 +1,4 @@
-package org.wakin.flexlayout;
+package org.wakin.flexlayout.app;
 /**
  * Created by matthew on 23/06/2020.
  */

diff --git a/...ava/org/wakin/flexlayout/PageWebView.java → ...org/wakin/flexlayout/app/PageWebView.java b/...ava/org/wakin/flexlayout/PageWebView.java → ...org/wakin/flexlayout/app/PageWebView.java
@@ -1,4 +1,4 @@
-package org.wakin.flexlayout;
+package org.wakin.flexlayout.app;
 
 
 import android.content.Context;

diff --git a/...g/wakin/flexlayout/RecyclerViewPager.java → ...kin/flexlayout/app/RecyclerViewPager.java b/...g/wakin/flexlayout/RecyclerViewPager.java → ...kin/flexlayout/app/RecyclerViewPager.java
@@ -1,9 +1,8 @@
-package org.wakin.flexlayout;
+package org.wakin.flexlayout.app;
 
 import android.animation.Animator;
 import android.animation.ValueAnimator;
 import android.content.res.Resources;
-import android.graphics.Rect;
 import android.util.Log;
 import android.view.GestureDetector;
 import android.view.MotionEvent;
@@ -20,6 +19,8 @@
 import androidx.recyclerview.widget.RecyclerView.OnItemTouchListener;
 import androidx.recyclerview.widget.RecyclerView.ViewHolder;
 
+import org.wakin.flexlayout.R;
+
 import java.util.List;
 
 public class RecyclerViewPager {

diff --git a/...kin/flexlayout/cells/CategoryBarView.java → ...flexlayout/app/cells/CategoryBarView.java b/...kin/flexlayout/cells/CategoryBarView.java → ...flexlayout/app/cells/CategoryBarView.java
@@ -1,4 +1,4 @@
-package org.wakin.flexlayout.cells;
+package org.wakin.flexlayout.app.cells;
 
 import android.content.Context;
 import android.graphics.Color;
@@ -11,9 +11,9 @@
 import android.view.ViewGroup;
 import android.widget.TextView;
 
-import org.wakin.flexlayout.NetImageView;
+import org.wakin.flexlayout.app.NetImageView;
 import org.wakin.flexlayout.R;
-import org.wakin.flexlayout.models.CellData;
+import org.wakin.flexlayout.app.models.CellData;
 
 public class CategoryBarView extends ViewGroup {
 

diff --git a/.../org/wakin/flexlayout/cells/ItemView.java → .../wakin/flexlayout/app/cells/ItemView.java b/.../org/wakin/flexlayout/cells/ItemView.java → .../wakin/flexlayout/app/cells/ItemView.java
@@ -1,4 +1,4 @@
-package org.wakin.flexlayout.cells;
+package org.wakin.flexlayout.app.cells;
 
 import android.content.Context;
 import android.graphics.Color;
@@ -12,9 +12,9 @@
 import android.view.ViewGroup;
 import android.widget.TextView;
 
-import org.wakin.flexlayout.NetImageView;
+import org.wakin.flexlayout.app.NetImageView;
 import org.wakin.flexlayout.R;
-import org.wakin.flexlayout.models.CellData;
+import org.wakin.flexlayout.app.models.CellData;
 
 public class ItemView extends ViewGroup {
 

diff --git a/...a/org/wakin/flexlayout/cells/NavView.java → ...g/wakin/flexlayout/app/cells/NavView.java b/...a/org/wakin/flexlayout/cells/NavView.java → ...g/wakin/flexlayout/app/cells/NavView.java
@@ -1,10 +1,8 @@
-package org.wakin.flexlayout.cells;
+package org.wakin.flexlayout.app.cells;
 
 import android.content.Context;
 import android.util.AttributeSet;
-import android.view.View;
 
-import androidx.annotation.NonNull;
 import androidx.constraintlayout.widget.ConstraintLayout;
 
 

diff --git a/...org/wakin/flexlayout/models/CellData.java → ...wakin/flexlayout/app/models/CellData.java b/...org/wakin/flexlayout/models/CellData.java → ...wakin/flexlayout/app/models/CellData.java
@@ -1,4 +1,4 @@
-package org.wakin.flexlayout.models;
+package org.wakin.flexlayout.app.models;
 
 import android.graphics.Color;
 

diff --git a/...org/wakin/flexlayout/models/PageData.java → ...wakin/flexlayout/app/models/PageData.java b/...org/wakin/flexlayout/models/PageData.java → ...wakin/flexlayout/app/models/PageData.java
@@ -1,4 +1,4 @@
-package org.wakin.flexlayout.models;
+package org.wakin.flexlayout.app.models;
 
 import java.util.ArrayList;
 import java.util.List;

diff --git a/...akin/flexlayout/models/PageFixedData.java → .../flexlayout/app/models/PageFixedData.java b/...akin/flexlayout/models/PageFixedData.java → .../flexlayout/app/models/PageFixedData.java
@@ -1,4 +1,4 @@
-package org.wakin.flexlayout.models;
+package org.wakin.flexlayout.app.models;
 
 import java.util.ArrayList;
 import java.util.List;

diff --git a/.../wakin/flexlayout/models/SectionData.java → ...in/flexlayout/app/models/SectionData.java b/.../wakin/flexlayout/models/SectionData.java → ...in/flexlayout/app/models/SectionData.java
@@ -1,4 +1,4 @@
-package org.wakin.flexlayout.models;
+package org.wakin.flexlayout.app.models;
 
 import android.util.Log;
 

diff --git a/.../org/wakin/flexlayout/util/Algorithm.java → .../wakin/flexlayout/app/util/Algorithm.java b/.../org/wakin/flexlayout/util/Algorithm.java → .../wakin/flexlayout/app/util/Algorithm.java
@@ -1,4 +1,4 @@
-package org.wakin.flexlayout.util;
+package org.wakin.flexlayout.app.util;
 
 import java.util.List;
 import java.util.ListIterator;

diff --git a/...org/wakin/flexlayout/util/Comparator.java → ...wakin/flexlayout/app/util/Comparator.java b/...org/wakin/flexlayout/util/Comparator.java → ...wakin/flexlayout/app/util/Comparator.java
@@ -1,4 +1,4 @@
-package org.wakin.flexlayout.util;
+package org.wakin.flexlayout.app.util;
 
 public interface Comparator<T1, T2> {
     /**

diff --git a/app/src/main/java/org/wakin/flexlayout/layoutmanager/FlexLayoutManager.java b/app/src/main/java/org/wakin/flexlayout/layoutmanager/FlexLayoutManager.java
@@ -16,8 +16,8 @@
 import androidx.recyclerview.widget.RecyclerView;
 
 import org.wakin.flexlayout.layoutmanager.impl.LayoutImpl;
-import org.wakin.flexlayout.util.Algorithm;
-import org.wakin.flexlayout.util.Comparator;
+import org.wakin.flexlayout.app.util.Algorithm;
+import org.wakin.flexlayout.app.util.Comparator;
 
 import java.util.ArrayList;
 import java.util.HashMap;

diff --git a/app/src/main/java/org/wakin/flexlayout/layoutmanager/impl/LayoutImpl.java b/app/src/main/java/org/wakin/flexlayout/layoutmanager/impl/LayoutImpl.java
@@ -12,8 +12,8 @@
 import org.wakin.flexlayout.layoutmanager.impl.elements.FlexItem;
 import org.wakin.flexlayout.layoutmanager.impl.elements.FlexSection;
 import org.wakin.flexlayout.layoutmanager.impl.elements.FlexWaterfallSection;
-import org.wakin.flexlayout.util.Algorithm;
-import org.wakin.flexlayout.util.Comparator;
+import org.wakin.flexlayout.app.util.Algorithm;
+import org.wakin.flexlayout.app.util.Comparator;
 
 import java.util.ArrayList;
 import java.util.Collections;

diff --git a/app/src/main/java/org/wakin/flexlayout/layoutmanager/impl/elements/FlexColumn.java b/app/src/main/java/org/wakin/flexlayout/layoutmanager/impl/elements/FlexColumn.java
@@ -2,8 +2,8 @@
 
 import android.graphics.Rect;
 
-import org.wakin.flexlayout.util.Algorithm;
-import org.wakin.flexlayout.util.Comparator;
+import org.wakin.flexlayout.app.util.Algorithm;
+import org.wakin.flexlayout.app.util.Comparator;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -62,7 +62,7 @@ public int deleteItemsFrom(FlexItem item) {
         return -1;
     }
 
-    public int mergeItemsInBounds(List<FlexItem> items, Rect rect, org.wakin.flexlayout.util.Comparator<FlexItem, Rect> boundComparator, org.wakin.flexlayout.util.Comparator<FlexItem, Rect> filterComparator) {
+    public int mergeItemsInBounds(List<FlexItem> items, Rect rect, org.wakin.flexlayout.app.util.Comparator<FlexItem, Rect> boundComparator, org.wakin.flexlayout.app.util.Comparator<FlexItem, Rect> filterComparator) {
         int lowerBound = Algorithm.lowerBound(mItems, rect, boundComparator);
         if (lowerBound == -1) {
             return 0;
@@ -82,7 +82,7 @@ public int mergeItemsInBounds(List<FlexItem> items, Rect rect, org.wakin.flexlay
         return matchedItems;
     }
 
-    public int mergeItemsInBounds(List<FlexItem> items, Rect rect, org.wakin.flexlayout.util.Comparator<FlexItem, Rect> boundComparator) {
+    public int mergeItemsInBounds(List<FlexItem> items, Rect rect, org.wakin.flexlayout.app.util.Comparator<FlexItem, Rect> boundComparator) {
         int lowerBound = Algorithm.lowerBound(mItems, rect, boundComparator);
         if (lowerBound == -1) {
             return 0;

diff --git a/app/src/main/java/org/wakin/flexlayout/layoutmanager/impl/elements/FlexFlowSection.java b/app/src/main/java/org/wakin/flexlayout/layoutmanager/impl/elements/FlexFlowSection.java
@@ -7,8 +7,8 @@
 import org.wakin.flexlayout.layoutmanager.graphics.Insets;
 import org.wakin.flexlayout.layoutmanager.LayoutCallback;
 import org.wakin.flexlayout.layoutmanager.graphics.Size;
-import org.wakin.flexlayout.util.Algorithm;
-import org.wakin.flexlayout.util.Comparator;
+import org.wakin.flexlayout.app.util.Algorithm;
+import org.wakin.flexlayout.app.util.Comparator;
 
 import java.util.ArrayList;
 import java.util.List;

diff --git a/app/src/main/java/org/wakin/flexlayout/layoutmanager/impl/elements/FlexItem.java b/app/src/main/java/org/wakin/flexlayout/layoutmanager/impl/elements/FlexItem.java
@@ -4,7 +4,7 @@
 import android.graphics.Rect;
 
 import org.wakin.flexlayout.layoutmanager.graphics.Size;
-import org.wakin.flexlayout.util.Comparator;
+import org.wakin.flexlayout.app.util.Comparator;
 
 public class FlexItem implements Comparable<FlexItem> {
 

diff --git a/app/src/main/java/org/wakin/flexlayout/layoutmanager/impl/elements/FlexRow.java b/app/src/main/java/org/wakin/flexlayout/layoutmanager/impl/elements/FlexRow.java
@@ -3,8 +3,8 @@
 import android.graphics.Point;
 import android.graphics.Rect;
 
-import org.wakin.flexlayout.util.Algorithm;
-import org.wakin.flexlayout.util.Comparator;
+import org.wakin.flexlayout.app.util.Algorithm;
+import org.wakin.flexlayout.app.util.Comparator;
 
 import java.util.ArrayList;
 import java.util.List;

diff --git a/app/src/main/java/org/wakin/flexlayout/layoutmanager/impl/elements/FlexSection.java b/app/src/main/java/org/wakin/flexlayout/layoutmanager/impl/elements/FlexSection.java
@@ -5,7 +5,7 @@
 
 import org.wakin.flexlayout.layoutmanager.LayoutCallback;
 import org.wakin.flexlayout.layoutmanager.graphics.Size;
-import org.wakin.flexlayout.util.Comparator;
+import org.wakin.flexlayout.app.util.Comparator;
 
 import java.util.ArrayList;
 import java.util.List;

diff --git a/app/src/main/java/org/wakin/flexlayout/layoutmanager/impl/elements/FlexWaterfallSection.java b/app/src/main/java/org/wakin/flexlayout/layoutmanager/impl/elements/FlexWaterfallSection.java
@@ -6,7 +6,7 @@
 import org.wakin.flexlayout.layoutmanager.graphics.Insets;
 import org.wakin.flexlayout.layoutmanager.LayoutCallback;
 import org.wakin.flexlayout.layoutmanager.graphics.Size;
-import org.wakin.flexlayout.util.Algorithm;
+import org.wakin.flexlayout.app.util.Algorithm;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -42,17 +42,17 @@ public int mergeItemsInRect(List<FlexItem> items, Rect rect, final boolean verti
 
         Rect offsettedRect = new Rect(rect);
         offsettedRect.offset(-mFrame.left, -mFrame.top);
-        org.wakin.flexlayout.util.Comparator<FlexColumn, Rect> comparator = vertical ? new FlexColumn.RectHorizontalComparator() : new FlexColumn.RectVerticalComparator();
+        org.wakin.flexlayout.app.util.Comparator<FlexColumn, Rect> comparator = vertical ? new FlexColumn.RectHorizontalComparator() : new FlexColumn.RectVerticalComparator();
 
         int lowerRowBound = Algorithm.lowerBound(mColumns, offsettedRect, comparator);
         if (lowerRowBound == -1) {
             return 0;
         }
         int upperRowBound = Algorithm.upperBound(mColumns, offsettedRect, comparator);
 
-        org.wakin.flexlayout.util.Comparator<FlexItem, Rect> rowItemComparator = vertical ? new FlexItem.RectVerticalComparator() : new FlexItem.RectHorizontalComparator();
+        org.wakin.flexlayout.app.util.Comparator<FlexItem, Rect> rowItemComparator = vertical ? new FlexItem.RectVerticalComparator() : new FlexItem.RectHorizontalComparator();
         // Check if the item is in rect vertically
-        org.wakin.flexlayout.util.Comparator<FlexItem, Rect> itemFilterComparator = new org.wakin.flexlayout.util.Comparator<FlexItem, Rect>() {
+        org.wakin.flexlayout.app.util.Comparator<FlexItem, Rect> itemFilterComparator = new org.wakin.flexlayout.app.util.Comparator<FlexItem, Rect>() {
             @Override
             public int compare(FlexItem o1, Rect o2) {
                 Rect itemRect = o1.getFrame();

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -5,7 +5,7 @@
     android:id="@+id/recycler_view_container"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".MainActivity">
+    tools:context=".app.MainActivity">
 
     <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/recycler_view"

diff --git a/app/src/main/res/layout/cell_item.xml b/app/src/main/res/layout/cell_item.xml
@@ -6,7 +6,7 @@
     android:layout_height="160dp"
     android:gravity="start">
 
-    <org.wakin.flexlayout.NetImageView
+    <org.wakin.flexlayout.app.NetImageView
         android:id="@+id/netImageView"
         android:layout_width="0dp"
         android:layout_height="match_parent"

diff --git a/app/src/main/res/layout/cell_item_v.xml b/app/src/main/res/layout/cell_item_v.xml
@@ -6,7 +6,7 @@
     android:layout_height="0dp"
     >
 
-    <org.wakin.flexlayout.NetImageView
+    <org.wakin.flexlayout.app.NetImageView
         android:id="@+id/netImageView"
         android:layout_width="match_parent"
         android:layout_height="0dp"

diff --git a/app/src/main/res/layout/cell_webview.xml b/app/src/main/res/layout/cell_webview.xml
@@ -8,7 +8,7 @@
     android:gravity="start">
 
 
-    <org.wakin.flexlayout.NetImageView
+    <org.wakin.flexlayout.app.NetImageView
         android:id="@+id/image"
         android:layout_width="150dp"
         android:layout_height="150dp"