Skip to content

Commit

Permalink
文字改為「垃圾車班表 找附近的垃圾車」
Browse files Browse the repository at this point in the history
  • Loading branch information
@ccjeng
ccjeng committed Aug 27, 2016
1 parent 80b3a45 commit e7420ba
Show file tree
Hide file tree
Showing 8 changed files with 321 additions and 352 deletions.
4 changes: 2 additions & 2 deletions .idea/gradle.xml
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

611 changes: 285 additions & 326 deletions .idea/workspace.xml
View file

Large diffs are not rendered by default.

36 changes: 23 additions & 13 deletions app/app.iml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,13 +86,18 @@
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/animated-vector-drawable/24.1.1/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/24.1.1/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/animated-vector-drawable/24.2.0/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/24.2.0/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/cardview-v7/23.4.0/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/design/24.1.1/jars" />
<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.android.support/design/24.2.0/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/recyclerview-v7/24.2.0/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-compat/24.2.0/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-core-ui/24.2.0/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-core-utils/24.2.0/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-fragment/24.2.0/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-media-compat/24.2.0/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/24.2.0/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-vector-drawable/24.2.0/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" />
Expand Down Expand Up @@ -137,23 +142,27 @@
<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-compat-24.2.0" level="project" />
<orderEntry type="library" exported="" name="support-v4-24.2.0" 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="support-fragment-24.2.0" level="project" />
<orderEntry type="library" exported="" name="design-24.2.0" 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="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="recyclerview-v7-24.2.0" level="project" />
<orderEntry type="library" exported="" name="play-services-gass-9.4.0" level="project" />
<orderEntry type="library" exported="" name="support-core-ui-24.2.0" level="project" />
<orderEntry type="library" exported="" name="appcompat-v7-24.2.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" />
Expand All @@ -163,17 +172,16 @@
<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="animated-vector-drawable-24.2.0" 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="support-media-compat-24.2.0" 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="rxjava-1.1.6" level="project" />
<orderEntry type="library" exported="" name="appcompat-v7-24.1.1" level="project" />
<orderEntry type="library" exported="" name="support-core-utils-24.2.0" 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" />
Expand All @@ -182,6 +190,8 @@
<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="avoscloud-sdk-v3.14.3" level="project" />
<orderEntry type="library" exported="" name="support-annotations-24.2.0" level="project" />
<orderEntry type="library" exported="" name="support-vector-drawable-24.2.0" 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" />
Expand Down
8 changes: 4 additions & 4 deletions app/build.gradle
View file
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 55
versionName '4.2.2.081316TT'
versionCode 56
versionName '4.2.3.082716TT'
}
buildTypes {
release {
Expand Down Expand Up @@ -49,8 +49,8 @@ dependencies {
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.android.support:appcompat-v7:24.2.0'
compile 'com.android.support:design:24.2.0'
compile 'com.jakewharton:butterknife:7.0.1'
compile 'com.mikepenz:iconics-core:2.7.1@aar'
compile 'com.mikepenz:fontawesome-typeface:4.5.0.1@aar'
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/res/values/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<string name="app_name">台北倒垃圾</string>
<string name="about">關於</string>
<string name="recycle">垃圾分類小幫手</string>
<string name="lbs">垃圾車班表\n依距離查詢</string>
<string name="lbs">垃圾車班表\n找附近的垃圾車</string>
<string name="query">垃圾車班表\n依行政區查詢</string>
<string name="tpfix">台北市垃圾資源回收、廚餘回收限時收受點</string>
<string name="tpfood">台北市週三、週日廚餘專用限時收受點</string>
Expand Down Expand Up @@ -187,6 +187,6 @@

<string name="changelog_title">更新記錄</string>
<string name="welcome_title">歡迎使用台北倒垃圾</string>
<string name="welcome_message">免責聲明：本應用之資料來源均為政府公布之開放資料，垃圾車資訊可能因為氣候或交通等外在因素，而與現實狀況略有誤差。
<string name="welcome_message">請加入臉書粉絲專頁，以獲得最新訊息\n\n免責聲明：本應用之資料來源均為政府公布之開放資料，垃圾車資訊可能因為氣候或交通等外在因素，而與現實狀況略有誤差。
</string>
</resources>
3 changes: 2 additions & 1 deletion app/src/main/res/values/updates.xml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string-array name="updates">
<item>4.2.2\n改善地圖載入速度
<item>4.2.3\n文字改為「垃圾車班表 找附近的垃圾車」
\n\n歡迎加入臉書粉絲專頁
</item>
</string-array>
</resources>
2 changes: 1 addition & 1 deletion build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ buildscript {
}
}
dependencies {
classpath 'com.android.tools.build:gradle:2.1.2'
classpath 'com.android.tools.build:gradle:2.1.3'
classpath 'com.google.gms:google-services:3.0.0'

// NOTE: Do not place your application dependencies here; they belong
Expand Down
5 changes: 2 additions & 3 deletions gradle/wrapper/gradle-wrapper.properties
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
#Wed Apr 10 15:27:10 PDT 2013
#Sat Aug 27 16:07:25 CST 2016
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
#distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip

0 comments on commit e7420ba

Please sign in to comment.