Skip to content

Commit 7913e8e

Browse files
zeseeitzeseeit
committed
added push notification options
1 parent a5e97ec commit 7913e8e

30 files changed

+931
-141
lines changed

‎app-release.apk

367 KB
Binary file not shown.

‎app/app.iml

Lines changed: 32 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
3333
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
3434
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
35+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/google-services/debug" type="java-resource" />
3536
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
3637
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
3738
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
@@ -64,14 +65,6 @@
6465
<sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
6566
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
6667
<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" />
7568
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
7669
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
7770
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
@@ -80,6 +73,14 @@
8073
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
8174
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
8275
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
76+
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
77+
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
78+
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
79+
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
80+
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
81+
<sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
82+
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
83+
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
8384
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
8485
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
8586
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
@@ -100,6 +101,14 @@
100101
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.bartoszlipinski/viewpropertyobjectanimator/1.2.0/jars" />
101102
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.github.arimorty/floatingsearchview/2.0.3/jars" />
102103
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.exoplayer/exoplayer/r1.5.3/jars" />
104+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-basement/10.0.1/jars" />
105+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-tasks/10.0.1/jars" />
106+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.firebase/firebase-analytics-impl/10.0.1/jars" />
107+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.firebase/firebase-analytics/10.0.1/jars" />
108+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.firebase/firebase-common/10.0.1/jars" />
109+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.firebase/firebase-core/10.0.1/jars" />
110+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.firebase/firebase-iid/10.0.1/jars" />
111+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.firebase/firebase-messaging/10.0.1/jars" />
103112
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
104113
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
105114
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-support" />
@@ -118,21 +127,29 @@
118127
<orderEntry type="sourceFolder" forTests="false" />
119128
<orderEntry type="library" exported="" name="support-v4-24.2.1" level="project" />
120129
<orderEntry type="library" exported="" name="support-compat-24.2.1" level="project" />
121-
<orderEntry type="library" exported="" name="support-media-compat-24.2.1" level="project" />
122130
<orderEntry type="library" exported="" name="animated-vector-drawable-24.2.1" level="project" />
131+
<orderEntry type="library" exported="" name="firebase-analytics-10.0.1" level="project" />
123132
<orderEntry type="library" exported="" name="support-fragment-24.2.1" level="project" />
124-
<orderEntry type="library" exported="" name="support-core-ui-24.2.1" level="project" />
125133
<orderEntry type="library" exported="" name="picasso-2.5.2" level="project" />
126-
<orderEntry type="library" exported="" name="recyclerview-v7-24.2.1" level="project" />
134+
<orderEntry type="library" exported="" name="firebase-core-10.0.1" level="project" />
127135
<orderEntry type="library" exported="" name="volley" level="project" />
128136
<orderEntry type="library" exported="" name="floatingsearchview-2.0.3" level="project" />
129-
<orderEntry type="library" exported="" name="appcompat-v7-24.2.1" level="project" />
130-
<orderEntry type="library" exported="" name="support-vector-drawable-24.2.1" level="project" />
131-
<orderEntry type="library" exported="" name="support-core-utils-24.2.1" level="project" />
137+
<orderEntry type="library" exported="" name="play-services-tasks-10.0.1" level="project" />
132138
<orderEntry type="library" exported="" name="viewpropertyobjectanimator-1.2.0" level="project" />
133-
<orderEntry type="library" exported="" name="support-annotations-24.2.1" level="project" />
134139
<orderEntry type="library" exported="" name="exoplayer-r1.5.3" level="project" />
135140
<orderEntry type="library" exported="" name="cardview-v7-24.2.1" level="project" />
141+
<orderEntry type="library" exported="" name="firebase-iid-10.0.1" level="project" />
136142
<orderEntry type="library" exported="" name="design-24.2.1" level="project" />
143+
<orderEntry type="library" exported="" name="support-media-compat-24.2.1" level="project" />
144+
<orderEntry type="library" exported="" name="support-core-ui-24.2.1" level="project" />
145+
<orderEntry type="library" exported="" name="recyclerview-v7-24.2.1" level="project" />
146+
<orderEntry type="library" exported="" name="appcompat-v7-24.2.1" level="project" />
147+
<orderEntry type="library" exported="" name="support-vector-drawable-24.2.1" level="project" />
148+
<orderEntry type="library" exported="" name="support-core-utils-24.2.1" level="project" />
149+
<orderEntry type="library" exported="" name="firebase-analytics-impl-10.0.1" level="project" />
150+
<orderEntry type="library" exported="" name="firebase-common-10.0.1" level="project" />
151+
<orderEntry type="library" exported="" name="firebase-messaging-10.0.1" level="project" />
152+
<orderEntry type="library" exported="" name="support-annotations-24.2.1" level="project" />
153+
<orderEntry type="library" exported="" name="play-services-basement-10.0.1" level="project" />
137154
</component>
138155
</module>

‎app/build.gradle

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ android {
88
applicationId "any.audio"
99
minSdkVersion 17
1010
targetSdkVersion 24
11-
versionCode 5
12-
versionName "0.0.4"
11+
versionCode 7
12+
versionName "1.0"
1313
generatedDensities = []
1414

1515
}
@@ -47,4 +47,6 @@ dependencies {
4747
compile 'com.android.support:cardview-v7:24.2.1'
4848
compile 'com.android.support:support-v4:24.2.1'
4949
compile 'com.google.android.exoplayer:exoplayer:r1.5.3'
50-
}
50+
compile 'com.google.firebase:firebase-messaging:10.0.1'
51+
}
52+
apply plugin: 'com.google.gms.google-services'

‎app/google-services.json

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
{
2+
"project_info": {
3+
"project_number": "93619712247",
4+
"firebase_url": "https://anyaudio-20420.firebaseio.com",
5+
"project_id": "anyaudio-20420",
6+
"storage_bucket": "anyaudio-20420.appspot.com"
7+
},
8+
"client": [
9+
{
10+
"client_info": {
11+
"mobilesdk_app_id": "1:93619712247:android:5f936ad019fef0f7",
12+
"android_client_info": {
13+
"package_name": "any.audio"
14+
}
15+
},
16+
"oauth_client": [
17+
{
18+
"client_id": "93619712247-dveg7rqe8e0qcnh9jgj2k4elvvcmo8uc.apps.googleusercontent.com",
19+
"client_type": 3
20+
}
21+
],
22+
"api_key": [
23+
{
24+
"current_key": "AIzaSyDZdqpWfrmCbteaP3RdHr_XNEje3MItVJ8"
25+
}
26+
],
27+
"services": {
28+
"analytics_service": {
29+
"status": 1
30+
},
31+
"appinvite_service": {
32+
"status": 1,
33+
"other_platform_oauth_client": []
34+
},
35+
"ads_service": {
36+
"status": 2
37+
}
38+
}
39+
}
40+
],
41+
"configuration_version": "1"
42+
}

‎app/src/main/AndroidManifest.xml

Lines changed: 44 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3-
android:versionCode="5"
4-
android:versionName="0.1.0"
5-
package="any.audio" >
3+
package="any.audio"
4+
android:versionCode="7"
5+
android:versionName="1.0">
66

77
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
88
<uses-permission android:name="android.permission.INTERNET" />
@@ -17,54 +17,69 @@
1717
android:allowBackup="true"
1818
android:icon="@mipmap/ic_launcher_rnd"
1919
android:label="@string/app_name"
20-
android:theme="@style/AppTheme" >
20+
android:theme="@style/AppTheme">
2121

22-
<service android:name=".services.UpdateCheckService" />
23-
<service android:name=".services.NotificationPlayerService"/>
24-
<!--<receiver android:name=".Activity.ErrorSplash$NetworkChangeReceiver" >-->
25-
<!--<intent-filter>-->
26-
<!--<action android:name="android.net.conn.CONNECTIVITY_CHANGE" />-->
27-
<!--</intent-filter>-->
28-
<!--</receiver>-->
22+
<meta-data
23+
android:name="com.google.firebase.messaging.default_notification_icon"
24+
android:resource="@mipmap/ic_launcher_rnd" />
25+
<meta-data
26+
android:name="com.google.firebase.messaging.default_notification_color"
27+
android:resource="@color/PrimaryColorDark" />
2928

29+
<service android:name=".services.UpdateCheckService" />
30+
<service android:name=".services.NotificationPlayerService" />
31+
<service android:name=".services.AnyAudioFirebaseMessageService">
32+
<intent-filter>
33+
<action android:name="com.google.firebase.MESSAGING_EVENT" />
34+
</intent-filter>
35+
</service>
36+
<service android:name=".services.AnyAudioInstanceIdService">
37+
<intent-filter>
38+
<action android:name="com.google.firebase.INSTANCE_ID_EVENT" />
39+
</intent-filter>
40+
</service>
3041

3142
<activity
32-
android:screenOrientation="portrait"
3343
android:name=".Activity.ErrorSplash"
34-
android:label="AnyAudio" >
35-
44+
android:label="AnyAudio"
45+
android:screenOrientation="portrait">
3646
<intent-filter>
3747
<action android:name="android.intent.action.MAIN" />
3848

3949
<category android:name="android.intent.category.LAUNCHER" />
4050
</intent-filter>
41-
4251
</activity>
4352
<activity
44-
android:screenOrientation="portrait"
4553
android:name=".Activity.Home"
4654
android:hardwareAccelerated="true"
47-
android:label="@string/title_activity_home" >
48-
49-
</activity>
55+
android:label="@string/title_activity_home"
56+
android:screenOrientation="portrait" />
5057
<activity
51-
android:screenOrientation="portrait"
5258
android:name=".Activity.DowloadsActivity"
5359
android:label="@string/activity_downloads"
54-
android:parentActivityName=".Activity.Home" >
55-
</activity>
60+
android:parentActivityName=".Activity.Home"
61+
android:screenOrientation="portrait" />
5662
<activity
57-
android:screenOrientation="portrait"
5863
android:name=".Activity.UserPreferenceSetting"
5964
android:label="@string/activity_preferences"
60-
android:parentActivityName=".Activity.Home" >
61-
</activity>
65+
android:parentActivityName=".Activity.Home"
66+
android:screenOrientation="portrait" />
6267
<activity
63-
android:screenOrientation="portrait"
64-
android:theme="@style/Theme.AppCompat.Light.Dialog"
6568
android:name=".Activity.UpdateThemedActivity"
66-
android:label="@string/title_activity_update_themed" >
69+
android:label="@string/title_activity_update_themed"
70+
android:screenOrientation="portrait"
71+
android:theme="@style/Theme.AppCompat.Light.Dialog" />
72+
<activity
73+
android:name=".Activity.EveWisherThemedActivity"
74+
android:label="@string/title_activity_update_themed"
75+
android:screenOrientation="portrait"
76+
android:theme="@style/Theme.AppCompat.Light.Dialog" />
77+
<activity
78+
android:name=".Activity.RecommendationThemed"
79+
android:screenOrientation="portrait"
80+
android:theme="@android:style/Theme.Holo.Dialog">
6781
</activity>
82+
6883
</application>
6984

70-
</manifest>
85+
</manifest>

‎app/src/main/java/any/audio/Activity/EveWisherThemedActivity.java

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
package any.audio.Activity;
2+
3+
import android.os.Bundle;
4+
import android.support.v7.app.AppCompatActivity;
5+
import android.view.View;
6+
import android.widget.ImageView;
7+
import android.widget.TextView;
8+
9+
import com.squareup.picasso.Picasso;
10+
11+
import any.audio.R;
12+
13+
public class EveWisherThemedActivity extends AppCompatActivity {
14+
15+
TextView eveMessage;
16+
ImageView evePic;
17+
TextView okBtn;
18+
19+
@Override
20+
protected void onCreate(Bundle savedInstanceState) {
21+
super.onCreate(savedInstanceState);
22+
setContentView(R.layout.activity_eve_wisher_themed);
23+
Bundle bundle = getIntent().getExtras();
24+
String eve_msg = bundle.getString("message");
25+
String dpUrl = bundle.getString("dp");
26+
27+
eveMessage = (TextView) findViewById(R.id.eveMessage);
28+
evePic = (ImageView) findViewById(R.id.evePic);
29+
okBtn = (TextView) findViewById(R.id.sayThanks);
30+
okBtn.setOnClickListener(new View.OnClickListener() {
31+
@Override
32+
public void onClick(View view) {
33+
finish();
34+
}
35+
});
36+
37+
eveMessage.setText(eve_msg);
38+
if (dpUrl.length() > 0)
39+
Picasso.with(this).load(dpUrl).into(evePic);
40+
41+
}
42+
}

0 commit comments

Comments
 (0)