backup,change choince listener

Author: ValuesFeng

app/src/main/java/cc/fotoplace/fotoplacegallery/MainActivity.java

@@ -34,6 +34,6 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
     }
 
     public void onClickButton(View view) {
-        Picker.from(this).count(0,1000).setEnableCamera(true).forResult(1);
+        Picker.from(this).count(0,3).setEnableCamera(true).singleChoice().forResult(1);
     }
 }

gallery/src/main/java/io/valuesfeng/picker/ImageSelectActivity.java

@@ -64,11 +64,20 @@ protected void onCreate(Bundle savedInstanceState) {
         mCapturePhotoUriHolder = savedInstanceState != null ? savedInstanceState.getString(STATE_CAPTURE_PHOTO_URI) : "";
         selectionSpec = getIntent().getParcelableExtra(ImageSelectActivity.EXTRA_SELECTION_SPEC);
         mMediaStoreCompat = new MediaStoreCompat(this, new Handler(Looper.getMainLooper()));
+
         mCollection.onCreate(savedInstanceState);
         mCollection.prepareSelectionSpec(selectionSpec);
         mCollection.setDefaultSelection(getIntent().<Uri>getParcelableArrayListExtra(EXTRA_RESUME_LIST));
+        mCollection.setOnSelectionChange(new SelectedUriCollection.OnSelectionChange() {
+            @Override
+            public void onChange(int maxCount, int selectCount) {
+                commit.setText("确定("+selectCount+"/"+maxCount+")");
+            }
+        });
+
         mGridView = (GridView) findViewById(R.id.gridView);
         mGridView.setOnScrollListener(new PauseOnScrollListener(ImageLoader.getInstance(),false,true));
+
         mListView = (ListView) findViewById(R.id.listView);
         btnBack = (ImageView) findViewById(R.id.btn_back);
         mListViewGroup = findViewById(R.id.listViewParent);
@@ -77,12 +86,18 @@ protected void onCreate(Bundle savedInstanceState) {
         galleryTip = (ImageView) findViewById(R.id.gallery_tip);
         LinearLayout selectFold = (LinearLayout) findViewById(R.id.selectFold);
         commit = (Button) findViewById(R.id.commit);
+        commit.setText("确定(0/"+selectionSpec.getMaxSelectable()+")");
+        if (selectionSpec.isSingleChoose()){
+            commit.setVisibility(View.GONE);
+        }
         mFoldName.setText("最近图片");
         selectFold.setOnClickListener(mOnClickFoldName);
+
         albumCollection.onCreate(ImageSelectActivity.this,this,selectionSpec,mListView);
         albumCollection.loadAlbums();
         mPhotoCollection.onCreate(ImageSelectActivity.this,mGridView,mCollection,selectionSpec);
         mPhotoCollection.loadAllPhoto();
+
         commit.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {

gallery/src/main/java/io/valuesfeng/picker/adapter/PictureAdapter.java

@@ -34,13 +34,11 @@
  */
 public class PictureAdapter extends CursorAdapter {
     LayoutInflater mInflater;
-    Context mContext;
     SelectedUriCollection mCollection;
 
     public PictureAdapter(Context context, Cursor c, SelectedUriCollection mCollection) {
         super(context, c, CursorAdapter.FLAG_REGISTER_CONTENT_OBSERVER);
         mInflater = LayoutInflater.from(context);
-        mContext = context;
         this.mCollection = mCollection;
     }
 

gallery/src/main/java/io/valuesfeng/picker/control/SelectedUriCollection.java

@@ -37,6 +37,7 @@ public class SelectedUriCollection {
     private final WeakReference<Context> mContext;
     private Set<Uri> mUris;
     private SelectionSpec mSpec;
+    private OnSelectionChange onSelectionChange;
 
     public SelectedUriCollection(Context context) {
         mContext = new WeakReference<>(context);
@@ -64,10 +65,14 @@ public void onSaveInstanceState(Bundle outState) {
     }
 
     public boolean add(Uri uri) {
+        if (onSelectionChange!=null)
+            onSelectionChange.onChange(maxCount(),count()+1);
         return mUris.add(uri);
     }
 
     public boolean remove(Uri uri) {
+        if (onSelectionChange!=null)
+            onSelectionChange.onChange(maxCount(),count()-1);
         return mUris.remove(uri);
     }
 
@@ -103,4 +108,11 @@ public boolean isSingleChoose() {
         return mSpec.isSingleChoose();
     }
 
+    public void setOnSelectionChange(OnSelectionChange onSelectionChange) {
+        this.onSelectionChange = onSelectionChange;
+    }
+
+    public interface OnSelectionChange{
+        void onChange(int maxCount,int selectCount);
+    }
 }

gallery/src/main/res/layout/activity_image_select.xml

@@ -1,5 +1,4 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 

gallery/src/main/res/layout/include_select_image_top.xml

@@ -1,9 +1,8 @@
 <?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="38dip"
-    android:background="#0f0f0f"
-    android:orientation="vertical">
+    android:layout_height="wrap_content"
+    android:background="#0f0f0f">
 
     <ImageView
         android:id="@+id/btn_back"
@@ -46,19 +45,19 @@
     <Button
         android:id="@+id/commit"
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_height="match_parent"
         android:layout_alignParentRight="true"
         android:layout_centerVertical="true"
-        android:layout_marginRight="16dp"
+        android:layout_marginRight="10dp"
+        android:background="@null"
         android:minHeight="1dp"
         android:minWidth="1dp"
         android:paddingBottom="5dp"
         android:paddingLeft="10dp"
         android:paddingRight="10dp"
         android:paddingTop="5dp"
-        android:text="确定"
-        android:textSize="14sp"
-        android:visibility="gone" />
-
+        android:text="确定(3/4)"
+        android:textColor="#d6d6d6"
+        android:textSize="14dp" />
 
 </RelativeLayout>