From 91777569699222ad4bae5f027a439599ebe4b3cb Mon Sep 17 00:00:00 2001
From: PeratX <1215714524@qq.com>
Date: Sun, 25 Mar 2018 00:23:02 +0800
Subject: [PATCH] Added Google Services

---
 .gitignore                                  |  2 -
 app/build.gradle                            | 14 ++----
 app/google-services.json                    | 55 +++++++++++++++++++++
 app/src/main/res/layout/activity_config.xml |  4 +-
 app/src/main/res/layout/app_bar_main.xml    |  4 +-
 gradle/wrapper/gradle-wrapper.properties    |  2 +-
 6 files changed, 63 insertions(+), 18 deletions(-)
 create mode 100644 app/google-services.json

diff --git a/.gitignore b/.gitignore
index d644c43..e56ed97 100644
--- a/.gitignore
+++ b/.gitignore
@@ -41,5 +41,3 @@ captures/
 
 # Keystore files
 *.jks
-
-app/google-services.json
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index 41c1860..f57f9cc 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -50,15 +50,7 @@ dependencies {
     implementation 'de.measite.minidns:minidns-core:0.2.4'
     implementation 'com.google.code.gson:gson:2.8.2'
     //Analytics
-    android.applicationVariants.all { v ->
-        if (v.buildType.name == "release") {
-            implementation 'com.google.firebase:firebase-core:12.0.0'
-            implementation 'com.crashlytics.sdk.android:crashlytics:2.9.1'
-        }
-    }
-}
-android.applicationVariants.all {  v ->
-    if (v.buildType.name == "release"){
-        apply plugin: 'com.google.gms.google-services'
-    }
+    implementation 'com.google.firebase:firebase-core:12.0.0'
+    implementation 'com.crashlytics.sdk.android:crashlytics:2.9.1'
 }
+apply plugin: 'com.google.gms.google-services'
diff --git a/app/google-services.json b/app/google-services.json
new file mode 100644
index 0000000..fb2bf54
--- /dev/null
+++ b/app/google-services.json
@@ -0,0 +1,55 @@
+{
+  "project_info": {
+    "project_number": "720850593604",
+    "firebase_url": "https://daedalus-5a287.firebaseio.com",
+    "project_id": "daedalus-5a287",
+    "storage_bucket": "daedalus-5a287.appspot.com"
+  },
+  "client": [
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:720850593604:android:51675184b44f9aaf",
+        "android_client_info": {
+          "package_name": "org.itxtech.daedalus"
+        }
+      },
+      "oauth_client": [
+        {
+          "client_id": "720850593604-j2t0ev8gci03fomja2is6eo2d3rrq3t0.apps.googleusercontent.com",
+          "client_type": 1,
+          "android_info": {
+            "package_name": "org.itxtech.daedalus",
+            "certificate_hash": "1beaad0246ccbfbe5176736d1d2c9ee6ce85fd5f"
+          }
+        },
+        {
+          "client_id": "720850593604-f07km08hrt0ocopsqrbq408j5qnl7nb5.apps.googleusercontent.com",
+          "client_type": 3
+        }
+      ],
+      "api_key": [
+        {
+          "current_key": "AIzaSyCA_AW1WmTg2f1Juwd5-D5VdVyv7B_4IPE"
+        }
+      ],
+      "services": {
+        "analytics_service": {
+          "status": 1
+        },
+        "appinvite_service": {
+          "status": 2,
+          "other_platform_oauth_client": [
+            {
+              "client_id": "720850593604-f07km08hrt0ocopsqrbq408j5qnl7nb5.apps.googleusercontent.com",
+              "client_type": 3
+            }
+          ]
+        },
+        "ads_service": {
+          "status": 2
+        }
+      }
+    }
+  ],
+  "configuration_version": "1"
+}
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_config.xml b/app/src/main/res/layout/activity_config.xml
index cd1ef50..3064dd7 100644
--- a/app/src/main/res/layout/activity_config.xml
+++ b/app/src/main/res/layout/activity_config.xml
@@ -15,8 +15,8 @@
         <android.support.v7.widget.Toolbar
                 android:id="@+id/toolbar_config"
                 android:layout_width="match_parent"
-                android:layout_height="?attr/actionBarSize"
-                android:background="?attr/colorPrimary"
+                android:layout_height="?android:attr/actionBarSize"
+                android:background="@color/colorPrimary"
                 app:popupTheme="@style/AppTheme.PopupOverlay">
         </android.support.v7.widget.Toolbar>
 
diff --git a/app/src/main/res/layout/app_bar_main.xml b/app/src/main/res/layout/app_bar_main.xml
index b7b3b9d..65a9ea6 100644
--- a/app/src/main/res/layout/app_bar_main.xml
+++ b/app/src/main/res/layout/app_bar_main.xml
@@ -15,8 +15,8 @@
         <android.support.v7.widget.Toolbar
                 android:id="@+id/toolbar"
                 android:layout_width="match_parent"
-                android:layout_height="?attr/actionBarSize"
-                android:background="?attr/colorPrimary"
+                android:layout_height="?android:attr/actionBarSize"
+                android:background="@color/colorPrimary"
                 app:popupTheme="@style/AppTheme.PopupOverlay"/>
 
     </android.support.design.widget.AppBarLayout>
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 931e585..68c1981 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https://services.gradle.org/distributions/gradle-4.5.1-bin.zip
+distributionUrl=https://services.gradle.org/distributions/gradle-4.6-bin.zip