Merge pull request #37 from liaohuqiu/dev

add ViewPager in Demo, release 1.0.7
liaohuqiu · Jan 16, 2015 · 93e9fc1 · 93e9fc1
2 parents 340a74b + 0deae99
commit 93e9fc1
Show file tree

Hide file tree

Showing 24 changed files with 452 additions and 17 deletions.
diff --git a/README-cn.md b/README-cn.md
@@ -58,7 +58,7 @@
     <groupId>in.srain.cube</groupId>
     <artifactId>ultra-ptr</artifactId>
     <type>apklib</type>
-    <version>1.0.6</version>
+    <version>1.0.7</version>
 </dependency>
 ```
 或者
@@ -68,13 +68,13 @@
     <groupId>in.srain.cube</groupId>
     <artifactId>ultra-ptr</artifactId>
     <type>aar</type>
-    <version>1.0.6</version>
+    <version>1.0.7</version>
 </dependency>
 ```
 
 gradle / Android Studio
 ```
-compile 'in.srain.cube:ultra-ptr:1.0.6@aar'
+compile 'in.srain.cube:ultra-ptr:1.0.7@aar'
 ```
 
 #### 配置
@@ -244,6 +244,12 @@ ptrFrame.setPtrHandler(new PtrHandler() {
 });
 ```
 
+# 常见问题
+
+*  ViewPager滑动冲突: `disableWhenHorizontalMove()`
+
+*  长按LongPressed, `setInterceptEventWhileWorking()`
+
 
 # License
 

diff --git a/README.md b/README.md
@@ -61,7 +61,7 @@ pom.xml
     <groupId>in.srain.cube</groupId>
     <artifactId>ultra-ptr</artifactId>
     <type>apklib</type>
-    <version>1.0.6</version>
+    <version>1.0.7</version>
 </dependency>
 ```
 or 
@@ -71,13 +71,13 @@ or
     <groupId>in.srain.cube</groupId>
     <artifactId>ultra-ptr</artifactId>
     <type>aar</type>
-    <version>1.0.6</version>
+    <version>1.0.7</version>
 </dependency>
 ```
 
 gradle
 ```
-compile 'in.srain.cube:ultra-ptr:1.0.6@aar'
+compile 'in.srain.cube:ultra-ptr:1.0.7@aar'
 ```
 
 #### Config
@@ -280,6 +280,11 @@ public interface PtrUIHandler {
 }
 ```
 
+# Q & A
+
+*  work with ViewPager: `disableWhenHorizontalMove()`
+
+*  work with LongPressed, `setInterceptEventWhileWorking()`
 
 # License
 

diff --git a/build-template.py b/build-template.py
@@ -1,6 +1,6 @@
 import os
 vars = {
-        'ptr_lib_version': '1.0.6',
+        'ptr_lib_version': '1.0.7',
         'cube_sdk_version': '1.0.43-SNAPSHOT'
         }
 

diff --git a/ptr-demo/AndroidManifest.xml b/ptr-demo/AndroidManifest.xml
@@ -27,6 +27,10 @@
             </intent-filter>
         </activity>
 
+        <activity
+            android:name=".ui.viewpager.ViewPagerActivity"
+            android:windowSoftInputMode="stateAlwaysHidden|adjustResize"></activity>
+
     </application>
 
 </manifest>
diff --git a/ptr-demo/pom.xml b/ptr-demo/pom.xml
@@ -37,7 +37,7 @@
             <groupId>in.srain.cube</groupId>
             <artifactId>ultra-ptr</artifactId>
             <type>aar</type>
-            <version>1.0.6</version>
+            <version>1.0.7</version>
         </dependency>
         <dependency>
             <groupId>in.srain.cube</groupId>

diff --git a/ptr-demo/res/drawable/text_view_bg.xml b/ptr-demo/res/drawable/text_view_bg.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@color/cube_mints_app_base_background" android:state_pressed="true" />
+    <item android:drawable="@color/cube_mints_4d90fe" />
+</selector>
diff --git a/ptr-demo/res/layout/activity_main.xml b/ptr-demo/res/layout/activity_main.xml
@@ -1,7 +1,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:orientation="vertical">
 
     <FrameLayout
         android:id="@+id/id_fragment"

diff --git a/ptr-demo/res/layout/activity_view_pager.xml b/ptr-demo/res/layout/activity_view_pager.xml
@@ -0,0 +1,32 @@
+<?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="match_parent"
+    android:background="@color/cube_mints_f1f1f1"
+    android:orientation="vertical">
+
+    <in.srain.cube.views.pager.TabPageIndicator
+        android:id="@+id/view_pager_tab_indicator"
+        android:layout_width="match_parent"
+        android:layout_height="36dp"
+        android:background="@color/cube_mints_white"
+        android:fadingEdge="none"
+        android:paddingLeft="15dp"
+        android:paddingRight="15dp" />
+
+    <in.srain.cube.views.ptr.PtrClassicFrameLayout
+        android:id="@+id/view_pager_ptr_frame"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_weight="1">
+
+        <android.support.v4.view.ViewPager
+            android:id="@+id/view_pager_view_pager"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="@color/cube_mints_white" />
+
+    </in.srain.cube.views.ptr.PtrClassicFrameLayout>
+
+
+</LinearLayout>
diff --git a/ptr-demo/res/layout/fragment_classic_header_with_list_view.xml b/ptr-demo/res/layout/fragment_classic_header_with_list_view.xml
@@ -25,7 +25,8 @@
             android:listSelector="@android:color/transparent"
             android:paddingLeft="12dp"
             android:paddingRight="12dp"
-            android:scrollbarStyle="outsideOverlay" />
+            android:scrollbarStyle="outsideOverlay"
+            android:choiceMode="singleChoice" />
 
     </in.srain.cube.views.ptr.PtrClassicFrameLayout>
 </RelativeLayout>
diff --git a/ptr-demo/res/layout/fragment_classic_header_with_textview.xml b/ptr-demo/res/layout/fragment_classic_header_with_textview.xml
@@ -22,7 +22,8 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layout_margin="@dimen/cube_mints_content_view_padding"
-            android:background="@color/cube_mints_4d90fe"
+            android:clickable="true"
+            android:background="@drawable/text_view_bg"
             android:gravity="center"
             android:text="I am a TextView"
             android:textColor="@color/cube_mints_white"

diff --git a/ptr-demo/res/layout/fragment_view_pager.xml b/ptr-demo/res/layout/fragment_view_pager.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/cube_mints_white">
+
+    <ListView
+        android:id="@+id/view_pager_list_view"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:divider="@null"
+        android:fadingEdge="none"
+        android:listSelector="@android:color/transparent"
+        android:paddingLeft="12dp"
+        android:paddingRight="12dp"
+        android:scrollbarStyle="outsideOverlay" />
+
+</RelativeLayout>
diff --git a/ptr-demo/res/layout/view_pager_fragment_list_view_header.xml b/ptr-demo/res/layout/view_pager_fragment_list_view_header.xml
@@ -0,0 +1,18 @@
+<?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="match_parent"
+    android:paddingBottom="15dp"
+    android:paddingTop="15dp">
+
+    <TextView
+        android:id="@+id/view_pager_fragment_list_view_header_title"
+        android:layout_width="match_parent"
+        android:layout_height="200dp"
+        android:layout_weight="1"
+        android:gravity="center"
+        android:padding="5dp"
+        android:textColor="#000"
+        android:textSize="16sp" />
+
+</LinearLayout>
diff --git a/ptr-demo/res/layout/view_pager_indicator_item.xml b/ptr-demo/res/layout/view_pager_indicator_item.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="match_parent">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_gravity="center_horizontal"
+        android:orientation="vertical">
+
+        <TextView
+            android:id="@+id/view_pager_indicator_name"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1"
+            android:gravity="center"
+            android:paddingLeft="10dp"
+            android:paddingRight="10dp"
+            android:textColor="#000"
+            android:textSize="16sp" />
+
+        <TextView
+            android:id="@+id/view_pager_indicator_tab_current"
+            android:layout_width="match_parent"
+            android:layout_height="2dp"
+            android:background="@color/cube_mints_4d90fe" />
+
+    </LinearLayout>
+</LinearLayout>
diff --git a/ptr-demo/res/values/strings.xml b/ptr-demo/res/values/strings.xml
@@ -17,7 +17,7 @@
     <string name="ptr_demo_block_keep_header">Keep Header while Refreshing</string>
     <string name="ptr_demo_block_hide_header">Hide Header while Refreshing</string>
     <string name="ptr_demo_block_with_long_press">Long Press</string>
-    <string name="ptr_demo_block_with_view_page">ViewPager</string>
+    <string name="ptr_demo_block_with_view_pager">View Pager</string>
     <string name="ptr_demo_block_storehouse_header_using_string_array">StoreHouse Style \nusing string array from xml</string>
     <string name="ptr_demo_storehouse_header_using_string_array_in_title">using xml:&#160;</string>
     <string name="ptr_demo_block_storehouse_header_using_string">StoreHouse Style \n\nusing string</string>

diff --git a/ptr-demo/src/in/srain/cube/views/ptr/demo/ui/HomeFragment.java b/ptr-demo/src/in/srain/cube/views/ptr/demo/ui/HomeFragment.java
@@ -1,5 +1,6 @@
 package in.srain.cube.views.ptr.demo.ui;
 
+import android.content.Intent;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -15,6 +16,7 @@
 import in.srain.cube.views.ptr.demo.ui.storehouse.StoreHouseUsingPointList;
 import in.srain.cube.views.ptr.demo.ui.storehouse.StoreHouseUsingString;
 import in.srain.cube.views.ptr.demo.ui.storehouse.StoreHouseUsingStringArray;
+import in.srain.cube.views.ptr.demo.ui.viewpager.ViewPagerActivity;
 import in.srain.cube.views.ptr.header.StoreHouseHeader;
 
 import java.util.ArrayList;
@@ -136,10 +138,13 @@ public void onClick(View v) {
                 getContext().pushFragmentToBackStack(WithLongPressFragment.class, null);
             }
         }));
-        itemInfos.add(newItemInfo(R.string.ptr_demo_placeholder, R.color.cube_mints_4d90fe, new OnClickListener() {
+        itemInfos.add(newItemInfo(R.string.ptr_demo_block_with_view_pager, R.color.cube_mints_4d90fe, new OnClickListener() {
 
             @Override
             public void onClick(View v) {
+                Intent intent = new Intent();
+                intent.setClass(getContext(), ViewPagerActivity.class);
+                startActivity(intent);
             }
         }));
         itemInfos.add(newItemInfo(R.string.ptr_demo_placeholder, R.color.cube_mints_4d90fe, new OnClickListener() {

diff --git a/ptr-demo/src/in/srain/cube/views/ptr/demo/ui/classic/WithListView.java b/ptr-demo/src/in/srain/cube/views/ptr/demo/ui/classic/WithListView.java
@@ -118,7 +118,6 @@ public View createView(LayoutInflater inflater) {
 
         @Override
         public void showData(int position, JsonData itemData) {
-            CLog.d("test", "%s", itemData);
             mImageView.loadImage(mImageLoader, itemData.optString("pic"));
         }
     }

diff --git a/ptr-demo/src/in/srain/cube/views/ptr/demo/ui/viewpager/ImageListViewHolder.java b/ptr-demo/src/in/srain/cube/views/ptr/demo/ui/viewpager/ImageListViewHolder.java
@@ -0,0 +1,33 @@
+package in.srain.cube.views.ptr.demo.ui.viewpager;
+
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.ImageView;
+import in.srain.cube.image.CubeImageView;
+import in.srain.cube.image.ImageLoader;
+import in.srain.cube.request.JsonData;
+import in.srain.cube.views.list.ViewHolderBase;
+import in.srain.cube.views.ptr.demo.R;
+
+public class ImageListViewHolder extends ViewHolderBase<JsonData> {
+
+    private ImageLoader mImageLoader;
+    private CubeImageView mImageView;
+
+    private ImageListViewHolder(ImageLoader imageLoader) {
+        mImageLoader = imageLoader;
+    }
+
+    @Override
+    public View createView(LayoutInflater inflater) {
+        View v = inflater.inflate(R.layout.list_view_item, null);
+        mImageView = (CubeImageView) v.findViewById(R.id.list_view_item_image_view);
+        mImageView.setScaleType(ImageView.ScaleType.CENTER_CROP);
+        return v;
+    }
+
+    @Override
+    public void showData(int position, JsonData itemData) {
+        mImageView.loadImage(mImageLoader, itemData.optString("pic"));
+    }
+}