Skip to content

Commit 7c720be

Browse files
jfishman1jkasten2
jfishman1
authored and
jkasten2
committed
Updated Android Example (#234)
* Added methods and deep linking example
1 parent 6fb20bd commit 7c720be

File tree

18 files changed

+566
-266
lines changed

18 files changed

+566
-266
lines changed

‎Examples/.DS_Store

6 KB
Binary file not shown.

‎Examples/AndroidStudio/.idea/inspectionProfiles/Project_Default.xml

Lines changed: 10 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Examples/AndroidStudio/.idea/inspectionProfiles/profiles_settings.xml

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Examples/AndroidStudio/.idea/misc.xml

Lines changed: 4 additions & 56 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Examples/AndroidStudio/app/app.iml

Lines changed: 39 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
<facet type="android" name="Android">
1010
<configuration>
1111
<option name="SELECTED_BUILD_VARIANT" value="debug" />
12-
<option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
1312
<option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
1413
<option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
1514
<afterSyncTasks>
@@ -32,99 +31,92 @@
3231
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
3332
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
3433
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
34+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/debug" isTestSource="false" generated="true" />
3535
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
3636
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
3737
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
3838
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
3939
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
4040
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
41+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
4142
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
4243
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" />
4344
<sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
4445
<sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
4546
<sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
4647
<sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
4748
<sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
48-
<sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
4949
<sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
5050
<sourceFolder url="file://$MODULE_DIR$/src/debug/shaders" isTestSource="false" />
5151
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
5252
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
5353
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
5454
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
5555
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
56-
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/jni" isTestSource="true" />
5756
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
5857
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
5958
<sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
6059
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
6160
<sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
6261
<sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
6362
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
64-
<sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
6563
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
6664
<sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
67-
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
68-
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
69-
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
70-
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
71-
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
72-
<sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
73-
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
74-
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
7565
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
7666
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
7767
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
7868
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
7969
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
80-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
8170
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
8271
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
72+
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
73+
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
74+
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
75+
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
76+
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
77+
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
78+
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
8379
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
8480
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
85-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
86-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/animated-vector-drawable/24.2.1/jars" />
87-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/24.2.1/jars" />
88-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-compat/24.2.1/jars" />
89-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-core-ui/24.2.1/jars" />
90-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-core-utils/24.2.1/jars" />
91-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-fragment/24.2.1/jars" />
92-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-media-compat/24.2.1/jars" />
93-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/24.2.1/jars" />
94-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-vector-drawable/24.2.1/jars" />
95-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-base/9.6.1/jars" />
96-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-basement/9.6.1/jars" />
97-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-gcm/9.6.1/jars" />
98-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-iid/9.6.1/jars" />
99-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-location/9.6.1/jars" />
100-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-tasks/9.6.1/jars" />
101-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.onesignal/OneSignal/3.3.0/jars" />
81+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/builds" />
82+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
10283
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
84+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-classes" />
85+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-runtime-classes" />
86+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
87+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-verifier" />
88+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-resources" />
89+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-support" />
90+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
10391
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
92+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
93+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/reload-dex" />
10494
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
95+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/restart-dex" />
10596
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
10697
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
98+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/split-apk" />
10799
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
100+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
108101
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
102+
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
109103
</content>
110104
<orderEntry type="jdk" jdkName="Android API 24 Platform" jdkType="Android SDK" />
111105
<orderEntry type="sourceFolder" forTests="false" />
112-
<orderEntry type="library" exported="" name="support-v4-24.2.1" level="project" />
113-
<orderEntry type="library" exported="" name="support-compat-24.2.1" level="project" />
114-
<orderEntry type="library" exported="" name="support-media-compat-24.2.1" level="project" />
115-
<orderEntry type="library" exported="" name="animated-vector-drawable-24.2.1" level="project" />
116-
<orderEntry type="library" exported="" name="play-services-base-9.6.1" level="project" />
117-
<orderEntry type="library" exported="" name="support-fragment-24.2.1" level="project" />
118-
<orderEntry type="library" exported="" name="play-services-iid-9.6.1" level="project" />
119-
<orderEntry type="library" exported="" name="support-core-ui-24.2.1" level="project" />
120-
<orderEntry type="library" exported="" name="play-services-location-9.6.1" level="project" />
121-
<orderEntry type="library" exported="" name="appcompat-v7-24.2.1" level="project" />
122-
<orderEntry type="library" exported="" name="support-vector-drawable-24.2.1" level="project" />
123-
<orderEntry type="library" exported="" name="support-core-utils-24.2.1" level="project" />
124-
<orderEntry type="library" exported="" name="play-services-tasks-9.6.1" level="project" />
125-
<orderEntry type="library" exported="" name="play-services-basement-9.6.1" level="project" />
126-
<orderEntry type="library" exported="" name="support-annotations-24.2.1" level="project" />
127-
<orderEntry type="library" exported="" name="OneSignal-3.3.0" level="project" />
128-
<orderEntry type="library" exported="" name="play-services-gcm-9.6.1" level="project" />
106+
<orderEntry type="library" exported="" name="play-services-iid-10.2.4" level="project" />
107+
<orderEntry type="library" exported="" name="constraint-layout-solver-1.0.2" level="project" />
108+
<orderEntry type="library" exported="" name="constraint-layout-1.0.2" level="project" />
109+
<orderEntry type="library" exported="" name="play-services-base-10.2.4" level="project" />
110+
<orderEntry type="library" exported="" name="appcompat-v7-24.0.0" level="project" />
111+
<orderEntry type="library" exported="" name="OneSignal-3.5.6" level="project" />
112+
<orderEntry type="library" exported="" name="play-services-tasks-10.2.4" level="project" />
113+
<orderEntry type="library" exported="" name="support-annotations-24.0.0" level="project" />
114+
<orderEntry type="library" exported="" name="play-services-basement-10.2.4" level="project" />
115+
<orderEntry type="library" exported="" name="support-v4-24.0.0" level="project" />
116+
<orderEntry type="library" exported="" name="support-vector-drawable-24.0.0" level="project" />
117+
<orderEntry type="library" exported="" name="animated-vector-drawable-24.0.0" level="project" />
118+
<orderEntry type="library" exported="" name="customtabs-24.0.0" level="project" />
119+
<orderEntry type="library" exported="" name="play-services-gcm-10.2.4" level="project" />
120+
<orderEntry type="library" exported="" name="play-services-location-10.2.4" level="project" />
129121
</component>
130122
</module>

‎Examples/AndroidStudio/app/build.gradle

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,18 @@ apply plugin: 'com.android.application'
22

33
android {
44
compileSdkVersion 24
5-
buildToolsVersion "23.0.3"
5+
buildToolsVersion '25.0.2'
66

77
defaultConfig {
88
applicationId "com.onesignal.example"
99

1010
// TODO: Please update the OneSignal ID below to yours!
11-
manifestPlaceholders = [onesignal_app_id: "b2f7f966-d8cc-11e4-bed1-df8f05be55ba",
11+
manifestPlaceholders = [onesignal_app_id: "3beb3078-e0f1-4629-af17-fde833b9f716",
1212
// Project number pulled from dashboard, local value is ignored.
1313
onesignal_google_project_number: "REMOTE"]
1414

15-
minSdkVersion 10
16-
targetSdkVersion 24
15+
minSdkVersion 14
16+
targetSdkVersion 25
1717
versionCode 1
1818
versionName "1.0"
1919
}
@@ -29,17 +29,19 @@ dependencies {
2929
compile fileTree(dir: 'libs', include: ['*.jar'])
3030

3131
// OneSignal SDK
32-
compile 'com.onesignal:OneSignal:3.+@aar'
32+
compile 'com.onesignal:OneSignal:[3.5.3,4.0.0)'
3333

3434
// OneSignal requires at least version 7.0.0 of GMS but the newest version is recommend.
3535
// Required for OneSignal, even if you have added FCM.
36-
compile 'com.google.android.gms:play-services-gcm:+'
36+
compile 'com.google.android.gms:play-services-gcm:10.2.4'
3737

3838
// Required for geotagging
39-
compile 'com.google.android.gms:play-services-location:+'
39+
compile 'com.google.android.gms:play-services-location:10.2.4'
4040

41-
compile 'com.android.support:appcompat-v7:+'
4241

4342
// play-services-analytics is only needed when using 8.1.0 or older.
4443
// compile 'com.google.android.gms:play-services-analytics:+'
44+
//noinspection GradleCompatible
45+
compile 'com.android.support:appcompat-v7:24.0.0'
46+
compile 'com.android.support.constraint:constraint-layout:1.0.2'
4547
}

0 commit comments

Comments
 (0)