Remove "allowBackup" attribute from androidManifest

anton46 · Mar 4, 2015 · 26df9e6 · 26df9e6
1 parent 615a3de
commit 26df9e6
Show file tree

Hide file tree

Showing 40 changed files with 53 additions and 29 deletions.
diff --git a/.gitignore b/.gitignore
diff --git a/LICENSE b/LICENSE
diff --git a/README.md b/README.md
diff --git a/build.gradle b/build.gradle
diff --git a/collectionpicker/.gitignore b/collectionpicker/.gitignore
diff --git a/collectionpicker/build.gradle b/collectionpicker/build.gradle
diff --git a/collectionpicker/collectionpicker.iml b/collectionpicker/collectionpicker.iml
@@ -90,8 +90,8 @@
     <orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" exported="" name="appcompat-v7-21.0.3" level="project" />
-    <orderEntry type="library" exported="" name="support-annotations-21.0.3" level="project" />
     <orderEntry type="library" exported="" name="support-v4-21.0.3" level="project" />
+    <orderEntry type="library" exported="" name="support-annotations-21.0.3" level="project" />
   </component>
 </module>
 
diff --git a/collectionpicker/proguard-rules.pro b/collectionpicker/proguard-rules.pro
diff --git a/collectionpicker/src/androidTest/java/com/anton46/collectionitempicker/ApplicationTest.java b/collectionpicker/src/androidTest/java/com/anton46/collectionitempicker/ApplicationTest.java
diff --git a/collectionpicker/src/main/AndroidManifest.xml b/collectionpicker/src/main/AndroidManifest.xml
@@ -1,8 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.anton46.collectionpicker">
 
-    <application android:allowBackup="true" android:label="@string/app_name">
-
-    </application>
-
 </manifest>
diff --git 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<Item> mItems = new ArrayList<>();
     private LinearLayout mRow;
-    private Set<String> mCheckedItems;
+    private HashMap<String, Object> 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<String> checkedItems) {
+    public void setCheckedItems(HashMap<String, Object> checkedItems) {
         mCheckedItems = checkedItems;
     }
 
-    public Set<String> getCheckedItems() {
+    public HashMap<String, Object> 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
diff --git a/collectionpicker/src/main/java/com/anton46/collectionitempicker/OnItemClickListener.java b/collectionpicker/src/main/java/com/anton46/collectionitempicker/OnItemClickListener.java
diff --git a/collectionpicker/src/main/java/com/anton46/collectionitempicker/Utils.java b/collectionpicker/src/main/java/com/anton46/collectionitempicker/Utils.java
diff --git a/collectionpicker/src/main/res/layout/item_layout.xml b/collectionpicker/src/main/res/layout/item_layout.xml
diff --git a/collectionpicker/src/main/res/values/attrs.xml b/collectionpicker/src/main/res/values/attrs.xml
diff --git a/collectionpicker/src/main/res/values/colors.xml b/collectionpicker/src/main/res/values/colors.xml
diff --git a/collectionpicker/src/main/res/values/strings.xml b/collectionpicker/src/main/res/values/strings.xml
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
diff --git a/gradlew.bat b/gradlew.bat
diff --git a/image1.png b/image1.png
diff --git a/image2.png b/image2.png
diff --git a/maven_push.gradle b/maven_push.gradle
diff --git a/sample/.gitignore b/sample/.gitignore
diff --git 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
diff --git a/sample/sample.iml b/sample/sample.iml
@@ -85,10 +85,10 @@
     </content>
     <orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" exported="" name="collection-picker-1.0.0" level="project" />
     <orderEntry type="library" exported="" name="appcompat-v7-21.0.3" level="project" />
-    <orderEntry type="library" exported="" name="support-annotations-21.0.3" level="project" />
+    <orderEntry type="library" exported="" name="collection-picker-1.0.0" level="project" />
     <orderEntry type="library" exported="" name="support-v4-21.0.3" level="project" />
+    <orderEntry type="library" exported="" name="support-annotations-21.0.3" level="project" />
   </component>
 </module>
 
diff --git a/sample/src/androidTest/java/com/anton46/collectionitempicker/sample/ApplicationTest.java b/sample/src/androidTest/java/com/anton46/collectionitempicker/sample/ApplicationTest.java
diff --git a/sample/src/main/AndroidManifest.xml b/sample/src/main/AndroidManifest.xml
diff --git 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<Item> 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
@@ -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">
 
-    <com.anton46.collectionitempicker.CollectionPicker
-        android:id="@+id/collection_item_picker"
+    <ScrollView
         android:layout_width="match_parent"
         android:layout_height="0dp"
-        android:layout_weight="1"
-        app:cp_addIcon="@android:drawable/ic_menu_add"
-        app:cp_cancelIcon="@android:drawable/ic_menu_close_clear_cancel"
-        app:cp_itemBackgroundNormal="@color/blue"
-        app:cp_itemBackgroundPressed="@color/red"
-        app:cp_itemMargin="5dp"
-        app:cp_textPaddingBottom="5dp"
-        app:cp_textPaddingLeft="10dp"
-        app:cp_textPaddingRight="10dp"
-        app:cp_textPaddingTop="5dp" />
+        android:layout_weight="1">
+
+        <com.anton46.collectionitempicker.CollectionPicker
+            android:id="@+id/collection_item_picker"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1"
+            app:cp_addIcon="@android:drawable/ic_menu_add"
+            app:cp_cancelIcon="@android:drawable/ic_menu_close_clear_cancel"
+            app:cp_itemBackgroundNormal="@color/blue"
+            app:cp_itemBackgroundPressed="@color/red"
+            app:cp_itemMargin="5dp"
+            app:cp_textPaddingBottom="5dp"
+            app:cp_textPaddingLeft="10dp"
+            app:cp_textPaddingRight="10dp"
+            app:cp_textPaddingTop="5dp" />
+    </ScrollView>
 
     <TextView
         android:id="@+id/text"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
-        android:text="0 Items Selected"
-        android:layout_margin="10dp"/>
+        android:layout_margin="10dp"
+        android:text="0 Items Selected" />
 
 </LinearLayout>
diff --git a/sample/src/main/res/mipmap-hdpi/ic_launcher.png b/sample/src/main/res/mipmap-hdpi/ic_launcher.png
diff --git a/sample/src/main/res/mipmap-mdpi/ic_launcher.png b/sample/src/main/res/mipmap-mdpi/ic_launcher.png
diff --git a/sample/src/main/res/mipmap-xhdpi/ic_launcher.png b/sample/src/main/res/mipmap-xhdpi/ic_launcher.png
diff --git a/sample/src/main/res/mipmap-xxhdpi/ic_launcher.png b/sample/src/main/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/sample/src/main/res/values/colors.xml b/sample/src/main/res/values/colors.xml
diff --git a/sample/src/main/res/values/strings.xml b/sample/src/main/res/values/strings.xml
diff --git a/sample/src/main/res/values/styles.xml b/sample/src/main/res/values/styles.xml
diff --git a/settings.gradle b/settings.gradle