Skip to content

Commit

Permalink
Add Firebase library
Browse files Browse the repository at this point in the history
  • Loading branch information
ccjeng committed Aug 13, 2016
1 parent aedf0c5 commit 54266a9
Show file tree
Hide file tree
Showing 6 changed files with 386 additions and 202 deletions.
434 changes: 279 additions & 155 deletions .idea/workspace.xml

Large diffs are not rendered by default.

89 changes: 52 additions & 37 deletions app/app.iml
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/google-services/debug" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
Expand Down Expand Up @@ -92,18 +93,25 @@
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/recyclerview-v7/24.1.1/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/24.1.1/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-vector-drawable/24.1.1/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.facebook.android/audience-network-sdk/4.12.1/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-ads-lite/9.2.1/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-ads/9.2.1/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-analytics-impl/9.2.1/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-analytics/9.2.1/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-base/9.2.1/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-basement/9.2.1/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-clearcut/9.2.1/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-gass/9.2.1/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-location/9.2.1/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-maps/9.2.1/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-tasks/9.2.1/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.facebook.android/audience-network-sdk/4.14.1/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-ads-lite/9.4.0/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-ads/9.4.0/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-analytics-impl/9.4.0/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-analytics/9.4.0/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-base/9.4.0/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-basement/9.4.0/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-clearcut/9.4.0/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-gass/9.4.0/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-location/9.4.0/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-maps/9.4.0/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-tasks/9.4.0/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.firebase/firebase-ads/9.4.0/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.firebase/firebase-analytics-impl/9.4.0/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.firebase/firebase-analytics/9.4.0/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.firebase/firebase-common/9.4.0/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.firebase/firebase-core/9.4.0/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.firebase/firebase-crash/9.4.0/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.firebase/firebase-iid/9.4.0/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.mikepenz/aboutlibraries/5.6.7/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.mikepenz/community-material-typeface/1.3.41.1/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.mikepenz/fastadapter/1.5.2/jars" />
Expand All @@ -129,46 +137,53 @@
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" exported="" name="butterknife-7.0.1" level="project" />
<orderEntry type="library" exported="" name="okio-1.8.0" level="project" />
<orderEntry type="library" exported="" name="support-v4-24.1.1" level="project" />
<orderEntry type="library" exported="" name="play-services-base-9.2.1" level="project" />
<orderEntry type="library" exported="" name="play-services-clearcut-9.2.1" level="project" />
<orderEntry type="library" exported="" name="audience-network-sdk-4.12.1" level="project" />
<orderEntry type="library" exported="" name="fastjson-1.1.39-leancloud" level="project" />
<orderEntry type="library" exported="" name="play-services-base-9.4.0" level="project" />
<orderEntry type="library" exported="" name="audience-network-sdk-4.14.1" level="project" />
<orderEntry type="library" exported="" name="play-services-clearcut-9.4.0" level="project" />
<orderEntry type="library" exported="" name="animated-vector-drawable-24.1.1" level="project" />
<orderEntry type="library" exported="" name="design-24.1.1" level="project" />
<orderEntry type="library" exported="" name="FacebookAdapter" level="project" />
<orderEntry type="library" exported="" name="vpadn-sdk-obf453-71606102-1606171046-2512837" level="project" />
<orderEntry type="library" exported="" name="play-services-maps-9.2.1" level="project" />
<orderEntry type="library" exported="" name="firebase-common-9.4.0" level="project" />
<orderEntry type="library" exported="" name="firebase-iid-9.4.0" level="project" />
<orderEntry type="library" exported="" name="okhttp-2.6.0-leancloud" level="project" />
<orderEntry type="library" exported="" name="play-services-gass-9.4.0" level="project" />
<orderEntry type="library" exported="" name="aboutlibraries-5.6.7" level="project" />
<orderEntry type="library" exported="" name="materialish-progress-1.5" level="project" />
<orderEntry type="library" exported="" name="adapter-rxjava-2.1.0" level="project" />
<orderEntry type="library" exported="" name="play-services-tasks-9.4.0" level="project" />
<orderEntry type="library" exported="" name="cardview-v7-23.4.0" level="project" />
<orderEntry type="library" exported="" name="support-annotations-24.1.1" level="project" />
<orderEntry type="library" exported="" name="support-vector-drawable-24.1.1" level="project" />
<orderEntry type="library" exported="" name="okio-1.6.0-leancloud" level="project" />
<orderEntry type="library" exported="" name="okhttp-3.3.1" level="project" />
<orderEntry type="library" exported="" name="logging-interceptor-3.3.1" level="project" />
<orderEntry type="library" exported="" name="play-services-ads-9.4.0" level="project" />
<orderEntry type="library" exported="" name="play-services-location-9.4.0" level="project" />
<orderEntry type="library" exported="" name="play-services-analytics-impl-9.4.0" level="project" />
<orderEntry type="library" exported="" name="play-services-ads-lite-9.4.0" level="project" />
<orderEntry type="library" exported="" name="firebase-ads-9.4.0" level="project" />
<orderEntry type="library" exported="" name="iconics-core-2.7.1" level="project" />
<orderEntry type="library" exported="" name="support-v4-24.1.1" level="project" />
<orderEntry type="library" exported="" name="fastjson-1.1.39-leancloud" level="project" />
<orderEntry type="library" exported="" name="firebase-analytics-impl-9.4.0" level="project" />
<orderEntry type="library" exported="" name="design-24.1.1" level="project" />
<orderEntry type="library" exported="" name="firebase-core-9.4.0" level="project" />
<orderEntry type="library" exported="" name="play-services-maps-9.4.0" level="project" />
<orderEntry type="library" exported="" name="community-material-typeface-1.3.41.1" level="project" />
<orderEntry type="library" exported="" name="play-services-analytics-9.4.0" level="project" />
<orderEntry type="library" exported="" name="recyclerview-v7-24.1.1" level="project" />
<orderEntry type="library" exported="" name="play-services-gass-9.2.1" level="project" />
<orderEntry type="library" exported="" name="play-services-analytics-9.2.1" level="project" />
<orderEntry type="library" exported="" name="avoscloud-sdk-v3.14.1" level="project" />
<orderEntry type="library" exported="" name="rxjava-1.1.6" level="project" />
<orderEntry type="library" exported="" name="appcompat-v7-24.1.1" level="project" />
<orderEntry type="library" exported="" name="aboutlibraries-5.6.7" level="project" />
<orderEntry type="library" exported="" name="fastadapter-1.5.2" level="project" />
<orderEntry type="library" exported="" name="play-services-basement-9.4.0" level="project" />
<orderEntry type="library" exported="" name="fontawesome-typeface-4.5.0.1" level="project" />
<orderEntry type="library" exported="" name="materialish-progress-1.5" level="project" />
<orderEntry type="library" exported="" name="adapter-rxjava-2.1.0" level="project" />
<orderEntry type="library" exported="" name="retrofit-2.1.0" level="project" />
<orderEntry type="library" exported="" name="gson-2.7" level="project" />
<orderEntry type="library" exported="" name="play-services-basement-9.2.1" level="project" />
<orderEntry type="library" exported="" name="play-services-tasks-9.2.1" level="project" />
<orderEntry type="library" exported="" name="converter-gson-2.1.0" level="project" />
<orderEntry type="library" exported="" name="rxandroid-1.2.1" level="project" />
<orderEntry type="library" exported="" name="cardview-v7-23.4.0" level="project" />
<orderEntry type="library" exported="" name="support-annotations-24.1.1" level="project" />
<orderEntry type="library" exported="" name="support-vector-drawable-24.1.1" level="project" />
<orderEntry type="library" exported="" name="okio-1.6.0-leancloud" level="project" />
<orderEntry type="library" exported="" name="okhttp-3.3.1" level="project" />
<orderEntry type="library" exported="" name="play-services-location-9.2.1" level="project" />
<orderEntry type="library" exported="" name="logging-interceptor-3.3.1" level="project" />
<orderEntry type="library" exported="" name="play-services-ads-9.2.1" level="project" />
<orderEntry type="library" exported="" name="play-services-analytics-impl-9.2.1" level="project" />
<orderEntry type="library" exported="" name="firebase-crash-9.4.0" level="project" />
<orderEntry type="library" exported="" name="firebase-analytics-9.4.0" level="project" />
<orderEntry type="library" exported="" name="admob-adapter-1.0.0-1505261651-830485e" level="project" />
<orderEntry type="library" exported="" name="iconics-core-2.7.1" level="project" />
<orderEntry type="library" exported="" name="play-services-ads-lite-9.2.1" level="project" />
</component>
</module>
18 changes: 11 additions & 7 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ android {
applicationId 'com.oddsoft.tpetrash2'
minSdkVersion 16
targetSdkVersion 21
versionCode 54
versionName '4.2.1.072916TT'
versionCode 55
versionName '4.2.2.081316TT'
}
buildTypes {
release {
Expand Down Expand Up @@ -42,11 +42,13 @@ dependencies {
compile files('libs/vpadn-sdk-obf453-71606102-1606171046-2512837.jar')
compile files('libs/admob-adapter-1.0.0-1505261651-830485e.jar')
compile files('libs/FacebookAdapter.jar')
compile 'com.facebook.android:audience-network-sdk:4.12.1'
compile 'com.google.android.gms:play-services-ads:9.2.1'
compile 'com.google.android.gms:play-services-maps:9.2.1'
compile 'com.google.android.gms:play-services-analytics:9.2.1'
compile 'com.google.android.gms:play-services-location:9.2.1'
compile 'com.facebook.android:audience-network-sdk:4.14.1'
compile 'com.google.android.gms:play-services-maps:9.4.0'
compile 'com.google.android.gms:play-services-analytics:9.4.0'
compile 'com.google.android.gms:play-services-location:9.4.0'
compile 'com.google.firebase:firebase-core:9.4.0'
compile 'com.google.firebase:firebase-ads:9.4.0'
compile 'com.google.firebase:firebase-crash:9.4.0'
compile 'com.android.support:appcompat-v7:24.1.1'
compile 'com.android.support:design:24.1.1'
compile 'com.jakewharton:butterknife:7.0.1'
Expand All @@ -62,3 +64,5 @@ dependencies {
compile 'com.squareup.retrofit2:converter-gson:2.1.0'
compile 'com.squareup.okhttp3:logging-interceptor:3.3.1'
}

apply plugin: 'com.google.gms.google-services'
42 changes: 42 additions & 0 deletions app/google-services.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
{
"project_info": {
"project_number": "867943348513",
"firebase_url": "https://admob-app-id-9661997611.firebaseio.com",
"project_id": "admob-app-id-9661997611",
"storage_bucket": "admob-app-id-9661997611.appspot.com"
},
"client": [
{
"client_info": {
"mobilesdk_app_id": "1:867943348513:android:3e5af172814083db",
"android_client_info": {
"package_name": "com.oddsoft.tpetrash2"
}
},
"oauth_client": [
{
"client_id": "867943348513-3nj1jmtlvqpa34lrmpijq7fsa6iqe01n.apps.googleusercontent.com",
"client_type": 3
}
],
"api_key": [
{
"current_key": "AIzaSyAqaWPYo4X6KqV2-n9In1uqNS4qi1lIHmY"
}
],
"services": {
"analytics_service": {
"status": 1
},
"appinvite_service": {
"status": 1,
"other_platform_oauth_client": []
},
"ads_service": {
"status": 2
}
}
}
],
"configuration_version": "1"
}
3 changes: 1 addition & 2 deletions app/src/main/res/values/updates.xml
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string-array name="updates">
<item>4.2.1\n
修正台北市開放資料平台網站當機後,部分功能無法使用的問題
<item>4.2.2\n改善地圖載入速度
</item>
</string-array>
</resources>
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ buildscript {
}
dependencies {
classpath 'com.android.tools.build:gradle:2.1.2'

classpath 'com.google.gms:google-services:3.0.0'

// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
Expand Down

0 comments on commit 54266a9

Please sign in to comment.