Skip to content

Commit 0d406e2

Browse files
johnkiljohnkil
committed
Merge branch 'release/1.2.0'
2 parents 2124473 + eadefef commit 0d406e2

File tree

7 files changed

+48
-35
lines changed

7 files changed

+48
-35
lines changed

‎CHANGELOG.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,16 @@ Change Log
22
==========
33

44

5+
Version 1.2.0 *(2014-02-17)*
6+
----------------------------
7+
8+
* Added support for custom Animations.
9+
* Added support for displaying Sticky notifications closed manually.
10+
* Allow to provide a custom parent.
11+
* Allow to provide a priority, so some urgent AppMsgs can jump to the front of the queue.
12+
* Fix: Activity leaking.
13+
14+
515
Version 1.1.1 *(2013-10-29)*
616
----------------------------
717

‎gradle.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
VERSION_NAME=1.1.1-SNAPSHOT
2-
VERSION_CODE=4
1+
VERSION_NAME=1.2.0-SNAPSHOT
2+
VERSION_CODE=5
33
GROUP=com.github.johnkil.android-appmsg
44

55
POM_DESCRIPTION=In-layout android notifications

‎library/AndroidManifest.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
22
package="com.devspark.appmsg"
3-
android:versionCode="4"
4-
android:versionName="1.1.1">
3+
android:versionCode="5"
4+
android:versionName="1.2.0">
55

66
<uses-sdk
77
android:minSdkVersion="4"
8-
android:targetSdkVersion="18"/>
8+
android:targetSdkVersion="19"/>
99

1010
<application/>
1111

‎library/project.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@
1111
#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
1212

1313
# Project target.
14-
target=android-18
14+
target=android-19
1515
android.library=true

‎sample/AndroidManifest.xml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,19 @@
11
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
22
package="com.devspark.appmsg.sample"
3-
android:versionCode="4"
4-
android:versionName="1.1.1">
3+
android:versionCode="5"
4+
android:versionName="1.2.0">
55

66
<uses-sdk
77
android:minSdkVersion="7"
8-
android:targetSdkVersion="18"/>
8+
android:targetSdkVersion="19"/>
99

1010
<application
1111
android:icon="@drawable/ic_launcher"
1212
android:label="@string/app_name"
1313
android:theme="@style/Theme.Sherlock.Light.DarkActionBar">
14-
<activity android:name=".MainActivity" android:windowSoftInputMode="stateUnchanged">
14+
<activity
15+
android:name=".MainActivity"
16+
android:windowSoftInputMode="stateUnchanged">
1517
<intent-filter>
1618
<action android:name="android.intent.action.MAIN"/>
1719

‎sample/project.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@
1111
#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
1212

1313
# Project target.
14-
target=android-18
14+
target=android-19
1515
android.library.reference.1=../library

‎sample/res/layout/sticky.xml

Lines changed: 25 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,33 @@
11
<?xml version="1.0" encoding="utf-8"?>
22

3-
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
4-
android:layout_width="match_parent"
5-
android:layout_height="wrap_content"
6-
android:minHeight="48dp">
3+
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
4+
android:layout_width="match_parent"
5+
android:layout_height="wrap_content"
6+
android:minHeight="48dp">
77

88
<ImageButton
9-
android:id="@+id/remove_btn"
10-
android:layout_width="wrap_content"
11-
android:layout_height="match_parent"
12-
android:layout_gravity="center|right"
13-
android:minWidth="48dp"
14-
android:minHeight="48dp"
15-
android:src="@drawable/ic_action_cancel_inset"
16-
style="@style/SelectableItem"
17-
/>
9+
android:id="@+id/remove_btn"
10+
android:layout_width="wrap_content"
11+
android:layout_height="wrap_content"
12+
android:layout_alignParentRight="true"
13+
android:layout_centerVertical="true"
14+
android:minWidth="48dp"
15+
android:minHeight="48dp"
16+
android:src="@drawable/ic_action_cancel_inset"
17+
style="@style/SelectableItem"/>
1818

1919

2020
<TextView
21-
android:id="@android:id/message"
22-
android:layout_width="wrap_content"
23-
android:layout_height="wrap_content"
24-
android:gravity="center"
25-
android:layout_gravity="center"
26-
android:padding="8dp"
27-
android:textColor="#ff222222"
28-
android:textIsSelectable="false"
29-
android:textSize="14sp"
30-
android:textStyle="bold" />
21+
android:id="@android:id/message"
22+
android:layout_width="match_parent"
23+
android:layout_height="wrap_content"
24+
android:layout_toLeftOf="@id/remove_btn"
25+
android:layout_centerVertical="true"
26+
android:gravity="center"
27+
android:padding="8dp"
28+
android:textColor="#ff222222"
29+
android:textIsSelectable="false"
30+
android:textSize="14sp"
31+
android:textStyle="bold"/>
3132

32-
</FrameLayout>
33+
</RelativeLayout>

0 commit comments

Comments
 (0)