From 88923d9c2a24a31411adee361a181a7df6680b29 Mon Sep 17 00:00:00 2001
From: Evgeny Shishkin <johnkil78@gmail.com>
Date: Mon, 17 Feb 2014 12:39:05 +0400
Subject: [PATCH 1/2] minor fixes

---
 library/project.properties   |  2 +-
 sample/project.properties    |  2 +-
 sample/res/layout/sticky.xml | 49 ++++++++++++++++++------------------
 3 files changed, 27 insertions(+), 26 deletions(-)

diff --git a/library/project.properties b/library/project.properties
index 1b8c5a3..91d2b02 100644
--- a/library/project.properties
+++ b/library/project.properties
@@ -11,5 +11,5 @@
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 
 # Project target.
-target=android-18
+target=android-19
 android.library=true
diff --git a/sample/project.properties b/sample/project.properties
index 7143bfd..a6cf15d 100644
--- a/sample/project.properties
+++ b/sample/project.properties
@@ -11,5 +11,5 @@
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 
 # Project target.
-target=android-18
+target=android-19
 android.library.reference.1=../library
diff --git a/sample/res/layout/sticky.xml b/sample/res/layout/sticky.xml
index 5ce34dd..82c1dd9 100644
--- a/sample/res/layout/sticky.xml
+++ b/sample/res/layout/sticky.xml
@@ -1,32 +1,33 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:minHeight="48dp">
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:minHeight="48dp">
 
     <ImageButton
-        android:id="@+id/remove_btn"
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:layout_gravity="center|right"
-        android:minWidth="48dp"
-        android:minHeight="48dp"
-        android:src="@drawable/ic_action_cancel_inset"
-        style="@style/SelectableItem"
-        />
+            android:id="@+id/remove_btn"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentRight="true"
+            android:layout_centerVertical="true"
+            android:minWidth="48dp"
+            android:minHeight="48dp"
+            android:src="@drawable/ic_action_cancel_inset"
+            style="@style/SelectableItem"/>
 
 
     <TextView
-        android:id="@android:id/message"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:gravity="center"
-        android:layout_gravity="center"
-        android:padding="8dp"
-        android:textColor="#ff222222"
-        android:textIsSelectable="false"
-        android:textSize="14sp"
-        android:textStyle="bold" />
+            android:id="@android:id/message"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_toLeftOf="@id/remove_btn"
+            android:layout_centerVertical="true"
+            android:gravity="center"
+            android:padding="8dp"
+            android:textColor="#ff222222"
+            android:textIsSelectable="false"
+            android:textSize="14sp"
+            android:textStyle="bold"/>
 
-</FrameLayout>
\ No newline at end of file
+</RelativeLayout>
\ No newline at end of file

From eadefef498695881a6e64d05d44b6d8307a7f790 Mon Sep 17 00:00:00 2001
From: Evgeny Shishkin <johnkil78@gmail.com>
Date: Mon, 17 Feb 2014 12:40:54 +0400
Subject: [PATCH 2/2] Update version (1.2.0)

---
 CHANGELOG.md                | 10 ++++++++++
 gradle.properties           |  4 ++--
 library/AndroidManifest.xml |  6 +++---
 sample/AndroidManifest.xml  | 10 ++++++----
 4 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index dd2248f..46964b4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,16 @@ Change Log
 ==========
 
 
+Version 1.2.0 *(2014-02-17)*
+----------------------------
+
+ * Added support for custom Animations.
+ * Added support for displaying Sticky notifications closed manually.
+ * Allow to provide a custom parent.
+ * Allow to provide a priority, so some urgent AppMsgs can jump to the front of the queue.
+ * Fix: Activity leaking.
+
+
 Version 1.1.1 *(2013-10-29)*
 ----------------------------
 
diff --git a/gradle.properties b/gradle.properties
index 5a9a781..d41e066 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,5 +1,5 @@
-VERSION_NAME=1.1.1-SNAPSHOT
-VERSION_CODE=4
+VERSION_NAME=1.2.0-SNAPSHOT
+VERSION_CODE=5
 GROUP=com.github.johnkil.android-appmsg
 
 POM_DESCRIPTION=In-layout android notifications
diff --git a/library/AndroidManifest.xml b/library/AndroidManifest.xml
index 2a75f57..c03f665 100644
--- a/library/AndroidManifest.xml
+++ b/library/AndroidManifest.xml
@@ -1,11 +1,11 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="com.devspark.appmsg"
-          android:versionCode="4"
-          android:versionName="1.1.1">
+          android:versionCode="5"
+          android:versionName="1.2.0">
 
     <uses-sdk
             android:minSdkVersion="4"
-            android:targetSdkVersion="18"/>
+            android:targetSdkVersion="19"/>
 
     <application/>
 
diff --git a/sample/AndroidManifest.xml b/sample/AndroidManifest.xml
index e14c182..701560e 100644
--- a/sample/AndroidManifest.xml
+++ b/sample/AndroidManifest.xml
@@ -1,17 +1,19 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="com.devspark.appmsg.sample"
-          android:versionCode="4"
-          android:versionName="1.1.1">
+          android:versionCode="5"
+          android:versionName="1.2.0">
 
     <uses-sdk
             android:minSdkVersion="7"
-            android:targetSdkVersion="18"/>
+            android:targetSdkVersion="19"/>
 
     <application
             android:icon="@drawable/ic_launcher"
             android:label="@string/app_name"
             android:theme="@style/Theme.Sherlock.Light.DarkActionBar">
-        <activity android:name=".MainActivity" android:windowSoftInputMode="stateUnchanged">
+        <activity
+                android:name=".MainActivity"
+                android:windowSoftInputMode="stateUnchanged">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>