Merge branch 'master' of github.com:donnfelker/android-bootstrap

Author: donnfelker

app/pom.xml

@@ -77,7 +77,7 @@
         <dependency>
             <groupId>com.github.kevinsawicki</groupId>
             <artifactId>wishlist</artifactId>
-            <version>0.3</version>
+            <version>0.4</version>
             <type>apklib</type>
         </dependency>
         <dependency>

app/src/main/java/com/donnfelker/android/bootstrap/ui/CheckInsListAdapter.java

@@ -39,6 +39,6 @@ protected int[] getChildViewIds() {
     protected void update(int position, CheckIn item) {
         super.update(position, item);
 
-        setText(R.id.tv_name, item.getName());
+        setText(0, item.getName());
     }
-}
+}

app/src/main/java/com/donnfelker/android/bootstrap/ui/NewsListAdapter.java

@@ -37,8 +37,8 @@ protected int[] getChildViewIds() {
     protected void update(int position, News item) {
         super.update(position, item);
 
-        setText(R.id.tv_title, item.getTitle());
-        setText(R.id.tv_summary, item.getContent());
+        setText(0, item.getTitle());
+        setText(1, item.getContent());
         //setNumber(R.id.tv_date, item.getCreatedAt());
     }
 }

app/src/main/java/com/donnfelker/android/bootstrap/ui/UserListAdapter.java

@@ -53,9 +53,9 @@ protected int[] getChildViewIds() {
     @Override
     protected void update(int position, User user) {
 
-        avatars.bind(imageView(R.id.iv_avatar), user);
+        avatars.bind(imageView(0), user);
 
-        setText(R.id.tv_name, String.format("%1$s %2$s", user.getFirstName(), user.getLastName()));
+        setText(1, String.format("%1$s %2$s", user.getFirstName(), user.getLastName()));
 
     }
 

pom.xml

@@ -53,7 +53,7 @@
                 <plugin>
                     <groupId>com.jayway.maven.plugins.android.generation2</groupId>
                     <artifactId>android-maven-plugin</artifactId>
-                    <version>3.3.0</version>
+                    <version>3.4.0</version>
                     <extensions>true</extensions>
                     <configuration>
                         <sdk>

proguard.cfg

@@ -57,3 +57,17 @@
 }
 
 -keepclassmembers class * extends com.actionbarsherlock.ActionBarSherlock { public <init>(...); }
+
+-keepnames class * implements java.io.Serializable
+
+-keepclassmembers class * implements java.io.Serializable {
+    static final long serialVersionUID;
+    private static final java.io.ObjectStreamField[] serialPersistentFields;
+    !static !transient <fields>;
+    !private <fields>;
+    !private <methods>;
+    private void writeObject(java.io.ObjectOutputStream);
+    private void readObject(java.io.ObjectInputStream);
+    java.lang.Object writeReplace();
+    java.lang.Object readResolve();
+}