diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-02-23 00:11:06 +0100 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-02-23 00:11:06 +0100 |
| commit | 4e8c4af262ebe838cdbe848c40588f4bcc4a4d36 (patch) | |
| tree | e4700ef6bf3f0e128a0f4b9a3ee5a4f57e489519 | |
| parent | d984f50cb77db4fe8d1eae17c669673a3380bb92 (diff) | |
| download | open-keychain-4e8c4af262ebe838cdbe848c40588f4bcc4a4d36.tar.gz open-keychain-4e8c4af262ebe838cdbe848c40588f4bcc4a4d36.tar.bz2 open-keychain-4e8c4af262ebe838cdbe848c40588f4bcc4a4d36.zip | |
Update tab lib and fix colors of tabs
| -rw-r--r-- | OpenKeychain/build.gradle | 2 | ||||
| -rw-r--r-- | OpenKeychain/src/main/res/layout/help_activity.xml | 5 | ||||
| -rw-r--r-- | OpenKeychain/src/main/res/layout/view_key_activity.xml | 5 | ||||
| -rw-r--r-- | 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.support.v4.view.ViewPager android:id="@+id/pager" diff --git a/OpenKeychain/src/main/res/layout/view_key_activity.xml b/OpenKeychain/src/main/res/layout/view_key_activity.xml index cb6456082..f9a329acd 100644 --- a/OpenKeychain/src/main/res/layout/view_key_activity.xml +++ b/OpenKeychain/src/main/res/layout/view_key_activity.xml @@ -52,8 +52,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.support.v4.view.ViewPager android:id="@+id/view_key_pager" diff --git a/OpenKeychain/src/main/res/values/colors.xml b/OpenKeychain/src/main/res/values/colors.xml index 895273967..c49e06b4b 100644 --- a/OpenKeychain/src/main/res/values/colors.xml +++ b/OpenKeychain/src/main/res/values/colors.xml @@ -32,6 +32,11 @@ <color name="holo_gray_light">#33999999</color> <color name="holo_gray_bright">#33CCCCCC</color> + <!-- tabs --> + <color name="tab_text">#70FFFFFF</color> + <color name="tab_text_selected">#FFFFFF</color> + <color name="tab_indicator">#FFFFFF</color> + <!-- floating action buttons --> <color name="black_semi_transparent">#B2000000</color> |