diff --git a/.gitignore b/.gitignore
index 63d4a40..85f67d8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,17 +15,33 @@ gen/
# Gradle files
.gradle/
build/
-/*/build/
-/local.properties
-/.idea/workspace.xml
-/.idea/libraries
-.DS_Store
# Local configuration file (sdk path, etc)
local.properties
+gradle.properties
# Proguard folder generated by Eclipse
proguard/
# Log Files
*.log
+
+### Android Patch ###
+gen-external-apklibs
+
+# Windows thumbnail db
+Thumbs.db
+
+# OSX files
+.DS_Store
+
+# Eclipse project files
+.classpath
+.project
+
+# Android Studio
+.navigation/
+.idea
+#.idea/workspace.xml - remove # and delete .idea if it better suit your needs.
+*/build/
+*.iml
\ No newline at end of file
diff --git a/.idea/.name b/.idea/.name
deleted file mode 100644
index 5a43c55..0000000
--- a/.idea/.name
+++ /dev/null
@@ -1 +0,0 @@
-MultiImageSelector
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
deleted file mode 100644
index 217af47..0000000
--- a/.idea/compiler.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml
deleted file mode 100644
index e7bedf3..0000000
--- a/.idea/copyright/profiles_settings.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
-
\ No newline at end of file
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
deleted file mode 100644
index e206d70..0000000
--- a/.idea/encodings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
-
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
deleted file mode 100644
index 85a6c64..0000000
--- a/.idea/gradle.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-
-
-
-
diff --git a/.idea/misc.xml b/.idea/misc.xml
deleted file mode 100644
index 9076de5..0000000
--- a/.idea/misc.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
-
-
-
diff --git a/.idea/modules.xml b/.idea/modules.xml
deleted file mode 100644
index 16aeed6..0000000
--- a/.idea/modules.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml
deleted file mode 100644
index 922003b..0000000
--- a/.idea/scopes/scope_settings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
deleted file mode 100644
index def6a6a..0000000
--- a/.idea/vcs.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
-
-
-
diff --git a/MultiImageSelector.iml b/MultiImageSelector.iml
index 8935ebd..f4dae0c 100644
--- a/MultiImageSelector.iml
+++ b/MultiImageSelector.iml
@@ -1,19 +1,19 @@
-
+
+
-
+
-
+
-
-
+
\ No newline at end of file
diff --git a/app/app.iml b/app/app.iml
index 46168ca..7a40917 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -1,5 +1,5 @@
-
+
@@ -13,8 +13,11 @@
-
-
+
+
+ generateDebugAndroidTestSources
+ generateDebugSources
+
@@ -23,7 +26,7 @@
-
+
@@ -62,34 +65,26 @@
-
-
-
-
-
-
-
-
-
+
+
-
-
+
+
-
-
+
\ No newline at end of file
diff --git a/multi-image-selector/multi-image-selector.iml b/multi-image-selector/multi-image-selector.iml
index 325fdde..f5c5e86 100644
--- a/multi-image-selector/multi-image-selector.iml
+++ b/multi-image-selector/multi-image-selector.iml
@@ -12,10 +12,12 @@
-
-
+
+ generateDebugAndroidTestSources
+ generateDebugSources
+
@@ -25,7 +27,7 @@
-
+
@@ -63,23 +65,16 @@
+
-
-
-
-
-
-
-
-
-
+
diff --git a/multi-image-selector/src/main/java/me/nereo/multi_image_selector/MultiImageSelectorFragment.java b/multi-image-selector/src/main/java/me/nereo/multi_image_selector/MultiImageSelectorFragment.java
index d1bc4b4..5677fb7 100644
--- a/multi-image-selector/src/main/java/me/nereo/multi_image_selector/MultiImageSelectorFragment.java
+++ b/multi-image-selector/src/main/java/me/nereo/multi_image_selector/MultiImageSelectorFragment.java
@@ -226,14 +226,13 @@ public void onGlobalLayout() {
final int desireSize = getResources().getDimensionPixelOffset(R.dimen.image_size);
final int numCount = width / desireSize;
+ mGridView.setNumColumns(numCount);
final int columnSpace = getResources().getDimensionPixelOffset(R.dimen.space_size);
int columnWidth = (width - columnSpace*(numCount-1)) / numCount;
mImageAdapter.setItemSize(columnWidth);
- if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN){
- mGridView.getViewTreeObserver().removeOnGlobalLayoutListener(this);
- }else{
- mGridView.getViewTreeObserver().removeGlobalOnLayoutListener(this);
+ if (mFolderPopupWindow != null) {
+ mFolderPopupWindow.setHeight(height * 5 / 8);
}
}
});
@@ -353,33 +352,7 @@ public void onConfigurationChanged(Configuration newConfig) {
}
}
- mGridView.getViewTreeObserver().addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() {
- @Override
- @TargetApi(Build.VERSION_CODES.JELLY_BEAN)
- public void onGlobalLayout() {
-
- final int height = mGridView.getHeight();
-
- final int desireSize = getResources().getDimensionPixelOffset(R.dimen.image_size);
- Log.d(TAG, "Desire Size = " + desireSize);
- final int numCount = mGridView.getWidth() / desireSize;
- Log.d(TAG, "Grid Size = " + mGridView.getWidth());
- Log.d(TAG, "num count = " + numCount);
- final int columnSpace = getResources().getDimensionPixelOffset(R.dimen.space_size);
- int columnWidth = (mGridView.getWidth() - columnSpace * (numCount - 1)) / numCount;
- mImageAdapter.setItemSize(columnWidth);
-
- if (mFolderPopupWindow != null) {
- mFolderPopupWindow.setHeight(height * 5 / 8);
- }
-
- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
- mGridView.getViewTreeObserver().removeOnGlobalLayoutListener(this);
- } else {
- mGridView.getViewTreeObserver().removeGlobalOnLayoutListener(this);
- }
- }
- });
+ mGridView.getViewTreeObserver().dispatchOnGlobalLayout();
super.onConfigurationChanged(newConfig);
diff --git a/multi-image-selector/src/main/res/layout-v14/fragment_multi_image.xml b/multi-image-selector/src/main/res/layout-v14/fragment_multi_image.xml
index 1b41929..6681ae0 100644
--- a/multi-image-selector/src/main/res/layout-v14/fragment_multi_image.xml
+++ b/multi-image-selector/src/main/res/layout-v14/fragment_multi_image.xml
@@ -13,8 +13,7 @@
android:verticalSpacing="@dimen/space_size"
android:paddingBottom="?android:attr/actionBarSize"
android:clipToPadding="false"
- android:numColumns="auto_fit"
- android:columnWidth="@dimen/image_size"/>
+ android:numColumns="auto_fit"/>
+ android:numColumns="auto_fit"/>