Skip to content

Commit 48b8434

Browse files
jkasten2jkasten2
authored
Merge pull request #72 from OneSignal/background_image
Background image support and misc fixes
2 parents f8c19c9 + 246400e commit 48b8434

19 files changed

+352
-194
lines changed

‎OneSignalSDK/.idea/gradle.xml

Lines changed: 9 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎OneSignalSDK/.idea/vcs.xml

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎OneSignalSDK/app/app.iml

Lines changed: 34 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,8 @@
1212
<option name="SELECTED_TEST_ARTIFACT" value="_unit_test_" />
1313
<option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
1414
<option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
15-
<option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugUnitTest" />
16-
<option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileDebugUnitTestSources" />
1715
<afterSyncTasks>
1816
<task>generateDebugSources</task>
19-
<task>mockableAndroidJar</task>
20-
<task>prepareDebugUnitTestDependencies</task>
2117
</afterSyncTasks>
2218
<option name="ALLOW_USER_CONFIGURATION" value="false" />
2319
<option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
@@ -38,53 +34,74 @@
3834
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
3935
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
4036
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
37+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
38+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
39+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
40+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
41+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
42+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" />
4143
<sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
4244
<sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
4345
<sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
4446
<sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
4547
<sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
4648
<sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
4749
<sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
50+
<sourceFolder url="file://$MODULE_DIR$/src/debug/shaders" isTestSource="false" />
4851
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
4952
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
5053
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
5154
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
5255
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
5356
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/jni" isTestSource="true" />
5457
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
58+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
5559
<sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
5660
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
5761
<sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
5862
<sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
5963
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
6064
<sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
6165
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
66+
<sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
6267
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
6368
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
6469
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
6570
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
6671
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
6772
<sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
6873
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
74+
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
75+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
76+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
77+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
78+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
79+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
80+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
81+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
82+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
6983
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
7084
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
85+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
7186
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
7287
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
7388
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/23.1.1/jars" />
7489
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/23.1.1/jars" />
75-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-base/8.4.0/jars" />
76-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-basement/8.4.0/jars" />
77-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-gcm/8.4.0/jars" />
78-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-location/8.4.0/jars" />
79-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-maps/8.4.0/jars" />
80-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-measurement/8.4.0/jars" />
90+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-base/9.2.0/jars" />
91+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-basement/9.2.0/jars" />
92+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-gcm/9.2.0/jars" />
93+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-iid/9.2.0/jars" />
94+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-location/9.2.0/jars" />
95+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-tasks/9.2.0/jars" />
8196
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
97+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
98+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-support" />
8299
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
83100
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
84101
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
85-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/proguard-rules" />
86102
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
87103
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
104+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
88105
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/sourceFolderJavaResources" />
89106
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
90107
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
@@ -93,35 +110,35 @@
93110
</content>
94111
<orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />
95112
<orderEntry type="sourceFolder" forTests="false" />
96-
<orderEntry type="library" exported="" name="play-services-base-8.4.0" level="project" />
113+
<orderEntry type="library" exported="" name="play-services-base-9.2.0" level="project" />
97114
<orderEntry type="library" exported="" scope="TEST" name="asm-5.0.1" level="project" />
98115
<orderEntry type="library" exported="" scope="TEST" name="robolectric-utils-3.0" level="project" />
99116
<orderEntry type="library" exported="" scope="TEST" name="ant-1.8.0" level="project" />
100117
<orderEntry type="library" exported="" name="appcompat-v7-23.1.1" level="project" />
101118
<orderEntry type="library" exported="" scope="TEST" name="accessibility-test-framework-1.0" level="project" />
102119
<orderEntry type="library" exported="" scope="TEST" name="bcprov-jdk16-1.46" level="project" />
103-
<orderEntry type="library" exported="" name="play-services-location-8.4.0" level="project" />
104120
<orderEntry type="library" exported="" scope="TEST" name="sqlite4java-0.282" level="project" />
105121
<orderEntry type="library" exported="" scope="TEST" name="maven-ant-tasks-2.1.3" level="project" />
106122
<orderEntry type="library" exported="" scope="TEST" name="robolectric-resources-3.0" level="project" />
107123
<orderEntry type="library" exported="" scope="TEST" name="robolectric-annotations-3.0" level="project" />
108124
<orderEntry type="library" exported="" name="support-annotations-23.1.1" level="project" />
109125
<orderEntry type="library" exported="" scope="TEST" name="shadows-core-3.0" level="project" />
110-
<orderEntry type="library" exported="" name="play-services-basement-8.4.0" level="project" />
111-
<orderEntry type="library" exported="" name="play-services-maps-8.4.0" level="project" />
112126
<orderEntry type="library" exported="" scope="TEST" name="asm-commons-5.0.1" level="project" />
113127
<orderEntry type="library" exported="" scope="TEST" name="vtd-xml-2.11" level="project" />
128+
<orderEntry type="library" exported="" name="play-services-location-9.2.0" level="project" />
114129
<orderEntry type="library" exported="" scope="TEST" name="hamcrest-core-1.3" level="project" />
115130
<orderEntry type="library" exported="" scope="TEST" name="asm-tree-5.0.1" level="project" />
116131
<orderEntry type="library" exported="" scope="TEST" name="junit-4.12" level="project" />
117132
<orderEntry type="library" exported="" scope="TEST" name="asm-analysis-5.0.1" level="project" />
118133
<orderEntry type="library" exported="" scope="TEST" name="icu4j-53.1" level="project" />
119134
<orderEntry type="library" exported="" name="support-v4-23.1.1" level="project" />
135+
<orderEntry type="library" exported="" name="play-services-iid-9.2.0" level="project" />
120136
<orderEntry type="library" exported="" scope="TEST" name="ant-launcher-1.8.0" level="project" />
121-
<orderEntry type="library" exported="" name="play-services-gcm-8.4.0" level="project" />
122137
<orderEntry type="library" exported="" scope="TEST" name="robolectric-3.0" level="project" />
138+
<orderEntry type="library" exported="" name="play-services-gcm-9.2.0" level="project" />
123139
<orderEntry type="library" exported="" scope="TEST" name="asm-util-5.0.1" level="project" />
124-
<orderEntry type="library" exported="" name="play-services-measurement-8.4.0" level="project" />
140+
<orderEntry type="library" exported="" name="play-services-basement-9.2.0" level="project" />
141+
<orderEntry type="library" exported="" name="play-services-tasks-9.2.0" level="project" />
125142
<orderEntry type="module" module-name="onesignal" exported="" />
126143
</component>
127144
</module>

‎OneSignalSDK/app/build.gradle

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,17 +47,20 @@ dependencies {
4747
exclude group: 'com.google.android.gms', module: 'play-services-location'
4848
}
4949

50+
// Use to run local .aar file
51+
// compile(name: 'OneSignal-release', ext: 'aar')
52+
5053
// Use for released SDK
5154
// compile 'com.onesignal:OneSignal:2.+@aar'
5255

5356
// Test with 7.0.0 to make sure there are no breaking changes in Google's libraries.
5457
// This insure that the SDK will work if an app developer is using an older version of GMS.
55-
compile "com.google.android.gms:play-services-gcm:8.4.0"
58+
compile "com.google.android.gms:play-services-gcm:+"
5659

5760
// play-services-analytics is required for AdvertisingIdClient when using GMS 8.1.0 or lower.
5861
// 8.3.0 it is included in 'basement' which is required by 'base'.
5962
//compile "com.google.android.gms:play-services-analytics:7.0.0"
60-
compile "com.google.android.gms:play-services-location:8.4.0"
63+
compile "com.google.android.gms:play-services-location:+"
6164

6265
testCompile 'junit:junit:4.12'
6366
testCompile('org.robolectric:robolectric:3.0') {

‎OneSignalSDK/app/src/main/res/drawable/onesignal_bgimage_default_image_rm_this_last_part_to_use.png

344 KB
Loading

‎OneSignalSDK/app/src/main/res/values/colors.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<resources>
3+
<color name="onesignal_notif_bg_image_title_color">#FFFF0000</color>
4+
<color name="onesignal_notif_bg_image_body_color">#FF00FF00</color>
5+
</resources>

‎OneSignalSDK/app/src/test/java/com/test/onesignal/GenerateNotificationRunner.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -375,6 +375,10 @@ public void shouldFireNotificationExtenderService() throws Exception {
375375
Assert.assertEquals("button2", notification.actionButtons.get(1).text);
376376
Assert.assertEquals("ic_menu_send", notification.actionButtons.get(1).icon);
377377

378+
Assert.assertEquals("test_image_url", notification.backgroundImageLayout.image);
379+
Assert.assertEquals("FF000000", notification.backgroundImageLayout.titleTextColor);
380+
Assert.assertEquals("FFFFFFFF", notification.backgroundImageLayout.bodyTextColor);
381+
378382
JSONObject additionalData = notification.additionalData;
379383
Assert.assertEquals("myValue", additionalData.getString("myKey"));
380384
Assert.assertEquals("nValue", additionalData.getJSONObject("nested").getString("nKey"));
@@ -416,6 +420,9 @@ private static Bundle getBundleWithAllOptionsSet() {
416420
bundle.putString("sound", "test_sound");
417421
bundle.putString("grp_msg", "You test $[notif_count] MSGs!");
418422
bundle.putString("collapse_key", "do_not_collapse");
423+
bundle.putString("bg_img", "{\"img\": \"test_image_url\"," +
424+
"\"tc\": \"FF000000\"," +
425+
"\"bc\": \"FFFFFFFF\"}");
419426

420427

421428
bundle.putString("custom",

‎OneSignalSDK/app/src/test/java/com/test/onesignal/MainOneSignalClassRunner.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,6 @@ public static void afterEverything() {
161161
}
162162

163163

164-
165164
@Test
166165
public void testInitFromApplicationContext() throws Exception {
167166
// Application.onCreate

‎OneSignalSDK/build.gradle

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,8 @@ buildscript {
1515
allprojects {
1616
repositories {
1717
jcenter()
18+
flatDir {
19+
dirs 'libs'
20+
}
1821
}
1922
}

‎OneSignalSDK/gradle/wrapper/gradle-wrapper.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Wed Apr 10 15:27:10 PDT 2013
1+
#Wed Jun 29 18:11:13 PDT 2016
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip

0 commit comments

Comments
 (0)