pagination

app/src/androidTest/java/com/rthoni/camotion/ApplicationTest.java

@@ -1,13 +0,0 @@
-package com.rthoni.camotion;
-
-import android.app.Application;
-import android.test.ApplicationTestCase;
-
-/**
- * <a href="http://d.android.com/tools/testing/testing_android.html">Testing Fundamentals</a>
- */
-public class ApplicationTest extends ApplicationTestCase<Application> {
-    public ApplicationTest() {
-        super(Application.class);
-    }
-}

app/src/main/java/com/rthoni/camotion/ui/fragments/CamotionFragment.java

@@ -2,7 +2,7 @@ package com.rthoni.camotion.ui.fragments;
 
 import com.luticate.auth.dbo.LuFullLoginDbo;
 import com.luticate.utils.dbo.LuDbo;
-import com.luticate.utils.ui.ViewPaginationFragment;
+import com.luticate.utils.ui.fragments.ViewPaginationFragment;
 import com.rthoni.camotion.dbo.LocationDbo;
 
 /**

luticateauth/src/androidTest/java/com/luticate/auth/ApplicationTest.java

@@ -1,13 +0,0 @@
-package com.luticate.auth;
-
-import android.app.Application;
-import android.test.ApplicationTestCase;
-
-/**
- * <a href="http://d.android.com/tools/testing/testing_android.html">Testing Fundamentals</a>
- */
-public class ApplicationTest extends ApplicationTestCase<Application> {
-    public ApplicationTest() {
-        super(Application.class);
-    }
-}

luticateutils/src/androidTest/java/com/rthoni/utils/ApplicationTest.java

@@ -1,13 +0,0 @@
-package com.luticate.utils;
-
-import android.app.Application;
-import android.test.ApplicationTestCase;
-
-/**
- * <a href="http://d.android.com/tools/testing/testing_android.html">Testing Fundamentals</a>
- */
-public class ApplicationTest extends ApplicationTestCase<Application> {
-    public ApplicationTest() {
-        super(Application.class);
-    }
-}

luticateutils/src/main/java/com/luticate/utils/ui/PaginationFragment.java → luticateutils/src/main/java/com/luticate/utils/ui/fragments/AbstractPaginationFragment.java

@@ -1,4 +1,4 @@
-package com.luticate.utils.ui;
+package com.luticate.utils.ui.fragments;
 
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
@@ -8,21 +8,18 @@ import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.LinearLayout;
-import android.widget.TextView;
 
-import com.luticate.utils.R;
 import com.luticate.utils.business.LuPromise;
 import com.luticate.utils.dbo.LuDbo;
 import com.luticate.utils.dbo.LuMultipleDbo;
+import com.luticate.utils.ui.views.AbstractPaginationView;
 
-import java.util.List;
 import java.util.Vector;
 
 /**
  * Created by robin on 12/6/15.
  */
-public abstract class PaginationFragment<Dbo extends LuDbo> extends Fragment {
+public abstract class AbstractPaginationFragment<Dbo extends LuDbo> extends Fragment {
 
     protected int _page = 0;
 
@@ -43,6 +40,14 @@ public abstract class PaginationFragment<Dbo extends LuDbo> extends Fragment {
     @Override
     public void onStart() {
         super.onStart();
+        View v = getView();
+        AbstractPaginationView paginationView = (AbstractPaginationView) v.findViewById(getPaginationViewId());
+        paginationView.setOnPageChanged(new LuPromise.LuConsumer<Integer>() {
+            @Override
+            public void execute(Integer page) {
+                loadPage(page);
+            }
+        });
         loadPage(_page);
     }
 
@@ -91,6 +96,9 @@ public abstract class PaginationFragment<Dbo extends LuDbo> extends Fragment {
 
     public void loadPage(final int page)
     {
+        final View v = getView();
+        if (!isAdded() || v == null)
+            return;
         showProgress(true);
         _items.setData(new Vector<Dbo>());
         getLoadPagePromise(page, _perPage, _query).then(new LuPromise.LuConsumer<LuMultipleDbo<Dbo>>() {
@@ -99,7 +107,9 @@ public abstract class PaginationFragment<Dbo extends LuDbo> extends Fragment {
                 _items = items;
                 _page = page;
                 _maxPage = Math.max(items.getCount() / _perPage, 1);
-                updatePages();
+                AbstractPaginationView paginationView = (AbstractPaginationView) v.findViewById(getPaginationViewId());
+                paginationView.setMaxPage(_maxPage);
+                paginationView.setPage(_page);
                 onPageChanged();
                 showProgress(false);
             }
@@ -112,44 +122,7 @@ public abstract class PaginationFragment<Dbo extends LuDbo> extends Fragment {
         });
     }
 
-    protected List<Integer> getPages()
-    {
-        List<Integer> pages = new Vector<>();
-        int start = Math.max(0, _page - 2);
-        int end = Math.min(start + 5, _maxPage);
-        for (int i = start; i < end; ++i)
-        {
-            pages.add(i);
-        }
-        return pages;
-    }
-
-    protected void updatePages()
-    {
-        View v = getView();
-        ViewGroup layout = (ViewGroup) v.findViewById(R.id.pagesLayout);
-        if (layout != null)
-        {
-            layout.removeAllViews();
-            for (final int page : getPages())
-            {
-                TextView tv = new TextView(getActivity());
-                tv.setText(" " + String.valueOf(page + 1) + " ");
-                tv.setOnClickListener(new View.OnClickListener() {
-                    @Override
-                    public void onClick(View v) {
-                        loadPage(page);
-                    }
-                });
-                tv.setTextAppearance(getActivity(), android.R.style.TextAppearance_DeviceDefault_Large);
-                layout.addView(tv);
-            }
-        }
-    }
-
-    protected void onPageChanged()
-    {
-    }
+    protected abstract void onPageChanged();
 
     protected abstract LuPromise<LuMultipleDbo<Dbo>> getLoadPagePromise(int page, int perPage, String query);
 
@@ -158,4 +131,6 @@ public abstract class PaginationFragment<Dbo extends LuDbo> extends Fragment {
     protected abstract int getLoaderViewId();
 
     protected abstract int getLayoutId();
+
+    protected abstract int getPaginationViewId();
 }

luticateutils/src/main/java/com/luticate/utils/ui/ViewPaginationFragment.java → luticateutils/src/main/java/com/luticate/utils/ui/fragments/ViewPaginationFragment.java

@@ -1,4 +1,4 @@
-package com.luticate.utils.ui;
+package com.luticate.utils.ui.fragments;
 
 import android.view.View;
 import android.widget.LinearLayout;
@@ -9,7 +9,7 @@ import com.luticate.utils.dbo.LuDbo;
 /**
  * Created by robin on 12/6/15.
  */
-public abstract class ViewPaginationFragment<Dbo extends LuDbo> extends PaginationFragment<Dbo> {
+public abstract class ViewPaginationFragment<Dbo extends LuDbo> extends AbstractPaginationFragment<Dbo> {
 
     @Override
     protected int getLoaderViewId() {
@@ -26,10 +26,15 @@ public abstract class ViewPaginationFragment<Dbo extends LuDbo> extends Paginati
         return R.layout.view_pagination_fragment_layout;
     }
 
+    @Override
+    protected int getPaginationViewId() {
+        return R.id.paginationView;
+    }
+
     @Override
     protected void onPageChanged() {
-        super.onPageChanged();
-        LinearLayout layout = (LinearLayout) getView().findViewById(R.id.itemsLayoutScrollView);
+        View view = getView();
+        LinearLayout layout = (LinearLayout) view.findViewById(R.id.itemsLayoutScrollView);
         layout.removeAllViews();
         for (Dbo item : _items.getData())
         {

luticateutils/src/main/java/com/luticate/utils/ui/views/AbstractPaginationView.java

@@ -0,0 +1,133 @@
+package com.luticate.utils.ui.views;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.widget.LinearLayout;
+
+import com.luticate.utils.business.LuPromise;
+
+import java.util.List;
+import java.util.Vector;
+
+/**
+ * Created by robin on 12/8/15.
+ */
+public abstract class AbstractPaginationView extends LinearLayout {
+
+    private LuPromise.LuConsumer<Integer> _onPageChanged = null;
+
+    private int _page = 0;
+
+    private int _maxPage = 1;
+
+    private int _contextPagesCount = 2;
+
+    public AbstractPaginationView(Context context) {
+        super(context);
+        init();
+    }
+
+    public AbstractPaginationView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        init(attrs);
+    }
+
+    public AbstractPaginationView(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        init(attrs);
+    }
+
+    private void init(AttributeSet attrs)
+    {
+        init();
+        //_contextPagesCount = attrs.getAttributeIntValue(R.styleable.DefaultPaginationView_contextPagesCount, _contextPagesCount);
+    }
+
+    private void init()
+    {
+
+    }
+
+    @Override
+    protected void onAttachedToWindow() {
+        super.onAttachedToWindow();
+
+        if (isInEditMode())
+        {
+            onUpdatePages();
+        }
+    }
+
+    protected List<Integer> getPages()
+    {
+        List<Integer> pages = new Vector<>();
+        int start = Math.max(0, getPage() - getContextPagesCount());
+        int end = Math.min(start + getContextPagesCount() + 1, getMaxPage());
+        for (int i = start; i < end; ++i)
+        {
+            pages.add(i);
+        }
+        return pages;
+    }
+
+    protected abstract void onUpdatePages();
+
+    public int getMaxPage() {
+        return isInEditMode() ? 50 : _maxPage;
+    }
+
+    public void setMaxPage(int maxPage) {
+        _maxPage = maxPage;
+        onUpdatePages();
+    }
+
+    public int getContextPagesCount() {
+        return _contextPagesCount;
+    }
+
+    public void setContextPagesCount(int contextPagesCount) {
+        _contextPagesCount = contextPagesCount;
+        onUpdatePages();
+    }
+
+    public void setPage(int page)
+    {
+        _page = page;
+        onUpdatePages();
+    }
+
+    public int getPage()
+    {
+        return isInEditMode() ? 24 : _page;
+    }
+
+    public void setOnPageChanged(LuPromise.LuConsumer<Integer> onPageChanged) {
+        _onPageChanged = onPageChanged;
+    }
+
+    public void loadPage(int page)
+    {
+        if (_onPageChanged != null)
+        {
+            _onPageChanged.execute(page);
+        }
+    }
+
+    public void loadNextPage()
+    {
+        int page = getPage();
+        if (page < getMaxPage() - 1)
+        {
+            loadPage(page + 1);
+        }
+    }
+
+    public void loadPreviousPage()
+    {
+        int page = getPage();
+        if (page > 0)
+        {
+            loadPage(page - 1);
+        }
+    }
+}

luticateutils/src/main/java/com/luticate/utils/ui/views/DefaultPaginationView.java

@@ -0,0 +1,53 @@
+package com.luticate.utils.ui.views;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+
+import com.luticate.utils.R;
+
+/**
+ * Created by robin on 12/8/15.
+ */
+public class DefaultPaginationView extends AbstractPaginationView {
+    public DefaultPaginationView(Context context) {
+        super(context);
+        init();
+    }
+
+    public DefaultPaginationView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        init();
+    }
+
+    public DefaultPaginationView(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        init();
+    }
+
+    public void init()
+    {
+        inflate(getContext(), R.layout.default_pagination_view_layout, this);
+    }
+
+    @Override
+    protected void onUpdatePages() {
+        ViewGroup layout = (ViewGroup) findViewById(R.id.pagesLayout);
+        layout.removeAllViews();
+        for (final int page : getPages())
+        {
+            TextView tv = new TextView(getContext());
+            tv.setText(" " + String.valueOf(page + 1) + " ");
+            tv.setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                            loadPage(page);
+                        }
+                });
+            tv.setTextAppearance(getContext(), android.R.style.TextAppearance_DeviceDefault_Large);
+            layout.addView(tv);
+        }
+    }
+}

luticateutils/src/main/res/layout/default_pagination_view_layout.xml

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:layout_width="match_parent"
+              android:layout_height="wrap_content"
+              android:gravity="center">
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:id="@+id/previousPageView"
+        android:textAppearance="?android:attr/textAppearanceLarge"
+        android:layout_margin="2dp"
+        android:text=" &lt; "/>
+
+    <LinearLayout
+        android:id="@+id/pagesLayout"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:layout_gravity="center_horizontal"
+        android:orientation="horizontal">
+    </LinearLayout>
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:id="@+id/nextPageView"
+        android:textAppearance="?android:attr/textAppearanceLarge"
+        android:layout_margin="2dp"
+        android:text=" &gt; "/>
+</LinearLayout>

luticateutils/src/main/res/layout/view_pagination_fragment_layout.xml

@@ -2,6 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
               android:layout_width="match_parent"
               android:layout_height="match_parent"
+              xmlns:app="http://schemas.android.com/apk/res-auto"
               android:orientation="vertical">
 
     <!-- Loading progress -->
@@ -39,45 +40,13 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:orientation="vertical">
-
-                <ProgressBar
-                    style="?android:attr/progressBarStyleLarge"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginBottom="8dp"/>
             </LinearLayout>
 
-
-            <LinearLayout
+            <com.luticate.utils.ui.views.DefaultPaginationView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_below="@+id/itemsLayoutScrollView"
-                android:gravity="center">
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:id="@+id/previousPageView"
-                    android:textAppearance="?android:attr/textAppearanceLarge"
-                    android:layout_margin="2dp"
-                    android:text=" &lt; "/>
-
-                <LinearLayout
-                    android:id="@+id/pagesLayout"
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:layout_gravity="center_horizontal"
-                    android:orientation="horizontal">
-                </LinearLayout>
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:id="@+id/nextPageView"
-                    android:textAppearance="?android:attr/textAppearanceLarge"
-                    android:layout_margin="2dp"
-                    android:text=" &gt; "/>
-            </LinearLayout>
+                android:id="@+id/paginationView"/>
         </RelativeLayout>
     </ScrollView>
 </LinearLayout>

luticateutils/src/main/res/values/attrs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <declare-styleable name="DefaultPaginationView">
+        <attr name="contextPagesCount" format="integer" />
+    </declare-styleable>
+</resources>