diff --git a/build.gradle b/build.gradle index 1b07e8b6..ff78ace3 100644 --- a/build.gradle +++ b/build.gradle @@ -84,7 +84,8 @@ dependencies { compile 'com.google.code.gson:gson:2.3' compile 'com.android.support:support-v4:21.0.0' compile 'net.lingala.zip4j:zip4j:1.3.2' - compile 'com.android.support:appcompat-v7:20.0.0' + compile 'com.android.support:appcompat-v7:21.0.0' + compile 'com.android.support:cardview-v7:21.0.0' compile 'com.jakewharton:butterknife:5.1.2' compile 'joda-time:joda-time:2.5' compile 'com.squareup:otto:1.3.5' @@ -101,7 +102,7 @@ dependencies { compile fileTree(dir: 'libs', include: 'zxing-core-2.3.0-SNAPSHOT.jar') - def play_services = 'com.google.android.gms:play-services:5.0.89' + def play_services = 'com.google.android.gms:play-services:6.1.+' withAnalyticsCompile play_services withMapsCompile play_services diff --git a/src/main/res/layout/fragment_navigation.xml b/src/main/res/layout/fragment_navigation.xml index 11193400..7daf30f8 100644 --- a/src/main/res/layout/fragment_navigation.xml +++ b/src/main/res/layout/fragment_navigation.xml @@ -11,11 +11,8 @@ android:animateLayoutChanges="true"> + style="@style/nav_topic" + android:text="@string/nav_sort" /> #dfdfdf #FF4eacc6 #ff0099cc + #ff366ce8 + #ff2c51a7 #ff6ea0f2 #ffbfdf00 diff --git a/src/main/res/values/styles.xml b/src/main/res/values/styles.xml index a898e852..7ccc5410 100644 --- a/src/main/res/values/styles.xml +++ b/src/main/res/values/styles.xml @@ -1,7 +1,10 @@ - \ No newline at end of file