diff --git a/.gitignore b/.gitignore old mode 100644 new mode 100755 diff --git a/LICENSE b/LICENSE old mode 100644 new mode 100755 diff --git a/README.md b/README.md old mode 100644 new mode 100755 diff --git a/build.gradle b/build.gradle old mode 100644 new mode 100755 diff --git a/collectionpicker/.gitignore b/collectionpicker/.gitignore old mode 100644 new mode 100755 diff --git a/collectionpicker/build.gradle b/collectionpicker/build.gradle old mode 100644 new mode 100755 diff --git a/collectionpicker/collectionpicker.iml b/collectionpicker/collectionpicker.iml index 8c987e5..5705214 100644 --- a/collectionpicker/collectionpicker.iml +++ b/collectionpicker/collectionpicker.iml @@ -90,8 +90,8 @@ - + diff --git a/collectionpicker/proguard-rules.pro b/collectionpicker/proguard-rules.pro old mode 100644 new mode 100755 diff --git a/collectionpicker/src/androidTest/java/com/anton46/collectionitempicker/ApplicationTest.java b/collectionpicker/src/androidTest/java/com/anton46/collectionitempicker/ApplicationTest.java old mode 100644 new mode 100755 diff --git a/collectionpicker/src/main/AndroidManifest.xml b/collectionpicker/src/main/AndroidManifest.xml old mode 100644 new mode 100755 index ef63348..efa6c84 --- a/collectionpicker/src/main/AndroidManifest.xml +++ b/collectionpicker/src/main/AndroidManifest.xml @@ -1,8 +1,5 @@ + - - - - diff --git a/collectionpicker/src/main/java/com/anton46/collectionitempicker/CollectionPicker.java b/collectionpicker/src/main/java/com/anton46/collectionitempicker/CollectionPicker.java old mode 100644 new mode 100755 index 252c6ac..fa88663 --- a/collectionpicker/src/main/java/com/anton46/collectionitempicker/CollectionPicker.java +++ b/collectionpicker/src/main/java/com/anton46/collectionitempicker/CollectionPicker.java @@ -19,8 +19,11 @@ import android.widget.TextView; import java.util.ArrayList; +import java.util.HashMap; import java.util.HashSet; import java.util.List; +import java.util.Map; +import java.util.Objects; import java.util.Set; public class CollectionPicker extends LinearLayout { @@ -32,7 +35,7 @@ public class CollectionPicker extends LinearLayout { private List mItems = new ArrayList<>(); private LinearLayout mRow; - private Set mCheckedItems; + private HashMap mCheckedItems; private OnItemClickListener mClickListener; private int mWidth; private int mItemMargin = 10; @@ -119,11 +122,11 @@ protected void onSizeChanged(int w, int h, int oldw, int oldh) { /** * Selected flags */ - public void setCheckedItems(Set checkedItems) { + public void setCheckedItems(HashMap checkedItems) { mCheckedItems = checkedItems; } - public Set getCheckedItems() { + public HashMap getCheckedItems() { return mCheckedItems; } @@ -141,7 +144,7 @@ public void drawItemView() { for (int i = 0; i < mItems.size(); i++) { final Item item = mItems.get(i); - if (mCheckedItems != null && mCheckedItems.contains(item.id)) { + if (mCheckedItems != null && mCheckedItems.containsKey(item.id)) { item.isSelected = true; } @@ -153,7 +156,7 @@ public void onClick(View v) { animateView(v); item.isSelected = !item.isSelected; if (item.isSelected) { - mCheckedItems.add(item.id); + mCheckedItems.put(item.id, item); } else { mCheckedItems.remove(item.id); } diff --git a/collectionpicker/src/main/java/com/anton46/collectionitempicker/Item.java b/collectionpicker/src/main/java/com/anton46/collectionitempicker/Item.java old mode 100644 new mode 100755 diff --git a/collectionpicker/src/main/java/com/anton46/collectionitempicker/OnItemClickListener.java b/collectionpicker/src/main/java/com/anton46/collectionitempicker/OnItemClickListener.java old mode 100644 new mode 100755 diff --git a/collectionpicker/src/main/java/com/anton46/collectionitempicker/Utils.java b/collectionpicker/src/main/java/com/anton46/collectionitempicker/Utils.java old mode 100644 new mode 100755 diff --git a/collectionpicker/src/main/res/layout/item_layout.xml b/collectionpicker/src/main/res/layout/item_layout.xml old mode 100644 new mode 100755 diff --git a/collectionpicker/src/main/res/values/attrs.xml b/collectionpicker/src/main/res/values/attrs.xml old mode 100644 new mode 100755 diff --git a/collectionpicker/src/main/res/values/colors.xml b/collectionpicker/src/main/res/values/colors.xml old mode 100644 new mode 100755 diff --git a/collectionpicker/src/main/res/values/strings.xml b/collectionpicker/src/main/res/values/strings.xml old mode 100644 new mode 100755 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar old mode 100644 new mode 100755 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties old mode 100644 new mode 100755 diff --git a/gradlew.bat b/gradlew.bat old mode 100644 new mode 100755 diff --git a/image1.png b/image1.png old mode 100644 new mode 100755 diff --git a/image2.png b/image2.png old mode 100644 new mode 100755 diff --git a/maven_push.gradle b/maven_push.gradle old mode 100644 new mode 100755 diff --git a/sample/.gitignore b/sample/.gitignore old mode 100644 new mode 100755 diff --git a/sample/build.gradle b/sample/build.gradle old mode 100644 new mode 100755 index ca597f7..dede739 --- a/sample/build.gradle +++ b/sample/build.gradle @@ -22,5 +22,5 @@ android { dependencies { compile fileTree(dir: 'libs', include: ['*.jar']) compile 'com.android.support:appcompat-v7:21.0.3' - compile 'com.anton46:collection-picker:1.0.0' + compile 'com.anton46:collection-picker:1.0.+' } diff --git a/sample/proguard-rules.pro b/sample/proguard-rules.pro old mode 100644 new mode 100755 diff --git a/sample/sample.iml b/sample/sample.iml index 588e465..3bcfe88 100644 --- a/sample/sample.iml +++ b/sample/sample.iml @@ -85,10 +85,10 @@ - - + + diff --git a/sample/src/androidTest/java/com/anton46/collectionitempicker/sample/ApplicationTest.java b/sample/src/androidTest/java/com/anton46/collectionitempicker/sample/ApplicationTest.java old mode 100644 new mode 100755 diff --git a/sample/src/main/AndroidManifest.xml b/sample/src/main/AndroidManifest.xml old mode 100644 new mode 100755 diff --git a/sample/src/main/java/com/anton46/collectionitempicker/sample/MainActivity.java b/sample/src/main/java/com/anton46/collectionitempicker/sample/MainActivity.java old mode 100644 new mode 100755 index 8b45785..f09f0b3 --- a/sample/src/main/java/com/anton46/collectionitempicker/sample/MainActivity.java +++ b/sample/src/main/java/com/anton46/collectionitempicker/sample/MainActivity.java @@ -62,6 +62,24 @@ private List generateItems() { items.add(new Item("c", "Pizza")); items.add(new Item("d", "Burger")); items.add(new Item("e", "Ice Cream")); + items.add(new Item("c", "Pizza")); + items.add(new Item("d", "Burger")); + items.add(new Item("e", "Ice Cream")); + items.add(new Item("g", "Goods for working")); + items.add(new Item("h", "Romantic Places")); + items.add(new Item("f", "Japanese food")); + items.add(new Item("c", "Pizza")); + items.add(new Item("d", "Burger")); + items.add(new Item("e", "Ice Cream")); + items.add(new Item("c", "Pizza")); + items.add(new Item("d", "Burger")); + items.add(new Item("e", "Ice Cream")); + items.add(new Item("g", "Goods for working")); + items.add(new Item("h", "Romantic Places")); + items.add(new Item("f", "Japanese food")); + items.add(new Item("c", "Pizza")); + items.add(new Item("d", "Burger")); + items.add(new Item("e", "Ice Cream")); return items; } } diff --git a/sample/src/main/res/layout/activity_main.xml b/sample/src/main/res/layout/activity_main.xml old mode 100644 new mode 100755 index 37162ee..ede8328 --- a/sample/src/main/res/layout/activity_main.xml +++ b/sample/src/main/res/layout/activity_main.xml @@ -3,30 +3,36 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent" - android:paddingTop="16dp" - android:orientation="vertical"> + android:orientation="vertical" + android:paddingTop="16dp"> - + android:layout_weight="1"> + + + + android:layout_margin="10dp" + android:text="0 Items Selected" /> \ No newline at end of file diff --git a/sample/src/main/res/mipmap-hdpi/ic_launcher.png b/sample/src/main/res/mipmap-hdpi/ic_launcher.png old mode 100644 new mode 100755 diff --git a/sample/src/main/res/mipmap-mdpi/ic_launcher.png b/sample/src/main/res/mipmap-mdpi/ic_launcher.png old mode 100644 new mode 100755 diff --git a/sample/src/main/res/mipmap-xhdpi/ic_launcher.png b/sample/src/main/res/mipmap-xhdpi/ic_launcher.png old mode 100644 new mode 100755 diff --git a/sample/src/main/res/mipmap-xxhdpi/ic_launcher.png b/sample/src/main/res/mipmap-xxhdpi/ic_launcher.png old mode 100644 new mode 100755 diff --git a/sample/src/main/res/values/colors.xml b/sample/src/main/res/values/colors.xml old mode 100644 new mode 100755 diff --git a/sample/src/main/res/values/strings.xml b/sample/src/main/res/values/strings.xml old mode 100644 new mode 100755 diff --git a/sample/src/main/res/values/styles.xml b/sample/src/main/res/values/styles.xml old mode 100644 new mode 100755 diff --git a/settings.gradle b/settings.gradle old mode 100644 new mode 100755