Merge pull request #1 from panicstyle/3.3

3.3
panicstyle · Nov 2, 2016 · 83aea44 · 83aea44
2 parents ae359c6 + 21eb26f
commit 83aea44
Show file tree

Hide file tree

Showing 33 changed files with 4,369 additions and 375 deletions.
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/app/build.gradle b/app/build.gradle
@@ -9,8 +9,8 @@ android {
         applicationId "com.panicstyle.Gongdong"
         minSdkVersion 15
         targetSdkVersion 23
-        versionCode 19
-        versionName "3.2.0"
+        versionCode 20
+        versionName "3.3.0"
     }
     buildTypes {
         release {
@@ -35,5 +35,8 @@ dependencies {
     testCompile 'junit:junit:4.12'
     compile 'com.android.support:appcompat-v7:23.1.1'
     compile 'com.android.support:design:23.1.1'
-    compile 'com.google.android.gms:play-services-ads:8.4.0'
+    compile 'com.google.android.gms:play-services-ads:9.4.0'
+    compile 'com.google.firebase:firebase-messaging:9.4.0'
 }
+
+apply plugin: 'com.google.gms.google-services'
diff --git a/app/google-services.json b/app/google-services.json
@@ -0,0 +1,42 @@
+{
+  "project_info": {
+    "project_number": "61638236478",
+    "firebase_url": "https://gongdong-push.firebaseio.com",
+    "project_id": "gongdong-push",
+    "storage_bucket": "gongdong-push.appspot.com"
+  },
+  "client": [
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:61638236478:android:410a15401074fa50",
+        "android_client_info": {
+          "package_name": "com.panicstyle.Gongdong"
+        }
+      },
+      "oauth_client": [
+        {
+          "client_id": "61638236478-t7r6gfrt8kg5iah2arm5ev7c90supta2.apps.googleusercontent.com",
+          "client_type": 3
+        }
+      ],
+      "api_key": [
+        {
+          "current_key": "AIzaSyA5rMZg-2TLudv5WoiUhF2mZt2d-QXOia8"
+        }
+      ],
+      "services": {
+        "analytics_service": {
+          "status": 1
+        },
+        "appinvite_service": {
+          "status": 1,
+          "other_platform_oauth_client": []
+        },
+        "ads_service": {
+          "status": 2
+        }
+      }
+    }
+  ],
+  "configuration_version": "1"
+}
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -5,6 +5,13 @@
     <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+    <uses-permission android:name="android.permission.GET_ACCOUNTS" />
+    <uses-permission android:name="android.permission.WAKE_LOCK" />
+    <uses-permission android:name="com.google.android.c2dm.permission.RECEIVE" />
+
+    <permission android:name="com.panicstyle.Gongdong.permission.C2D_MESSAGE"
+                android:protectionLevel="signature" />
+    <uses-permission android:name="com.panicstyle.Moojigae.permission.C2D_MESSAGE" />
 
     <application
         android:allowBackup="true"
@@ -34,6 +41,10 @@
         <activity
             android:name=".ArticleViewActivity"
             android:label="@string/app_name">
+            <intent-filter>
+                <action android:name="OPEN_ACTIVITY" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
         </activity>
         <activity
             android:name=".ArticleWriteActivity"
@@ -55,6 +66,18 @@
             android:name=".CalendarActivity"
             android:label="@string/app_name">
         </activity>
+        <service
+            android:name=".MyFirebaseMessagingService">
+            <intent-filter>
+                <action android:name="com.google.firebase.MESSAGING_EVENT"/>
+            </intent-filter>
+        </service>
+        <service
+            android:name=".MyFirebaseInstanceIDService">
+            <intent-filter>
+                <action android:name="com.google.firebase.INSTANCE_ID_EVENT"/>
+            </intent-filter>
+        </service>
     </application>
 
 </manifest>