Merge pull request #10 from johnkil/dev

Updating the code to version 1.2.1

CHANGELOG.md

@@ -8,6 +8,12 @@ Version 1.3.0 *(In Development)*
  * ...
 
 
+Version 1.2.1 *(2013-02-16)*
+--------------------------------
+
+ * Fix: Library not support Android 2.1 and below
+
+
 Version 1.2.0 *(2013-01-23)*
 --------------------------------
 

library/AndroidManifest.xml

@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.devspark.sidenavigation"
-    android:versionCode="3"
-    android:versionName="1.2.0" >
+    android:versionCode="4"
+    android:versionName="1.2.1" >
 
-    <uses-sdk
-        android:minSdkVersion="4"
-        android:targetSdkVersion="16" />
+    <uses-sdk android:minSdkVersion="4" />
 
 </manifest>

library/project.properties

@@ -11,5 +11,5 @@
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 
 # Project target.
-target=android-16
+target=android-4
 android.library=true

library/res/layout/side_navigation_item.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
+    android:layout_width="fill_parent"
     android:layout_height="wrap_content"
     android:orientation="horizontal"
     android:paddingBottom="@dimen/side_navigation_item_padding_topbottom"

library/res/layout/side_navigation_left.xml

@@ -1,27 +1,27 @@
 <?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="match_parent" >
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent" >
 
     <View
         android:id="@+id/side_navigation_outside_view"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
         android:background="@color/side_navigation_outside_background"
         android:clickable="true"
         android:visibility="gone" />
 
     <LinearLayout
         android:id="@+id/side_navigation_menu"
         android:layout_width="wrap_content"
-        android:layout_height="match_parent"
+        android:layout_height="fill_parent"
         android:layout_alignParentLeft="true"
         android:visibility="gone" >
 
         <ListView
             android:id="@+id/side_navigation_listview"
             android:layout_width="@dimen/side_navigation_width"
-            android:layout_height="match_parent"
+            android:layout_height="fill_parent"
             android:background="@color/side_navigation_background"
             android:cacheColorHint="#00000000"
             android:divider="@color/side_navigation_list_divider_color"
@@ -30,7 +30,7 @@
         <View
             android:id="@+id/shadow"
             android:layout_width="6dp"
-            android:layout_height="match_parent"
+            android:layout_height="fill_parent"
             android:background="@drawable/side_navigation_shadow_left" />
     </LinearLayout>
 

library/res/layout/side_navigation_right.xml

@@ -1,33 +1,33 @@
 <?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="match_parent" >
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent" >
 
     <View
         android:id="@+id/side_navigation_outside_view"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
         android:background="@color/side_navigation_outside_background"
         android:clickable="true"
         android:visibility="gone" />
 
     <LinearLayout
         android:id="@+id/side_navigation_menu"
         android:layout_width="wrap_content"
-        android:layout_height="match_parent"
+        android:layout_height="fill_parent"
         android:layout_alignParentRight="true"
         android:visibility="gone" >
 
         <View
             android:id="@+id/shadow"
             android:layout_width="6dp"
-            android:layout_height="match_parent"
+            android:layout_height="fill_parent"
             android:background="@drawable/side_navigation_shadow_right" />
 
         <ListView
             android:id="@+id/side_navigation_listview"
             android:layout_width="@dimen/side_navigation_width"
-            android:layout_height="match_parent"
+            android:layout_height="fill_parent"
             android:background="@color/side_navigation_background"
             android:cacheColorHint="#00000000"
             android:divider="@color/side_navigation_list_divider_color"

sample/AndroidManifest.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.devspark.sidenavigation.sample"
-    android:versionCode="6"
-    android:versionName="1.2.0" >
+    android:versionCode="7"
+    android:versionName="1.2.1" >
 
     <uses-sdk
         android:minSdkVersion="7"