From 4e8c4af262ebe838cdbe848c40588f4bcc4a4d36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= Date: Mon, 23 Feb 2015 00:11:06 +0100 Subject: [PATCH] Update tab lib and fix colors of tabs --- OpenKeychain/build.gradle | 2 +- OpenKeychain/src/main/res/layout/help_activity.xml | 5 +++-- OpenKeychain/src/main/res/layout/view_key_activity.xml | 5 +++-- OpenKeychain/src/main/res/values/colors.xml | 5 +++++ 4 files changed, 12 insertions(+), 5 deletions(-) diff --git a/OpenKeychain/build.gradle b/OpenKeychain/build.gradle index bf7208060..1f95983c4 100644 --- a/OpenKeychain/build.gradle +++ b/OpenKeychain/build.gradle @@ -25,7 +25,7 @@ dependencies { compile 'com.journeyapps:zxing-android-embedded:2.0.1@aar' compile 'com.journeyapps:zxing-android-integration:2.0.1@aar' compile 'com.google.zxing:core:3.0.1' - compile 'com.jpardogo.materialtabstrip:library:1.0.8' + compile 'com.jpardogo.materialtabstrip:library:1.0.9' compile 'it.neokree:MaterialNavigationDrawer:1.3.1' compile 'com.nispok:snackbar:2.7.4' compile 'com.getbase:floatingactionbutton:1.8.0' diff --git a/OpenKeychain/src/main/res/layout/help_activity.xml b/OpenKeychain/src/main/res/layout/help_activity.xml index 6a78aa273..1722f03ea 100644 --- a/OpenKeychain/src/main/res/layout/help_activity.xml +++ b/OpenKeychain/src/main/res/layout/help_activity.xml @@ -20,8 +20,9 @@ android:layout_width="match_parent" android:layout_height="?attr/actionBarSize" android:background="?attr/colorPrimary" - android:textColor="#FFFFFF" - app:pstsIndicatorColor="#FFFFFF" /> + android:textColor="@color/tab_text" + app:pstsTextColorSelected="@color/tab_text_selected" + app:pstsIndicatorColor="@color/tab_indicator" /> + android:textColor="@color/tab_text" + app:pstsTextColorSelected="@color/tab_text_selected" + app:pstsIndicatorColor="@color/tab_indicator" /> #33999999 #33CCCCCC + + #70FFFFFF + #FFFFFF + #FFFFFF + #B2000000