Karl/BobStore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'bump-appcompat-v7' into 'master'

Browse Source 
Bump appcompat-v7 library to 22.2.1

This is the proper fix for #356.

See merge request !156
This commit is contained in:
Daniel Martí 2015-10-19 06:54:48 +00:00
commit 0b2aac253b
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
F-Droid/build.gradle
View File

@ -10,7 +10,7 @@ dependencies {
compile project(':privileged-api-lib') compile project(':privileged-api-lib')
compile 'com.android.support:support-v4:22.2.1' compile 'com.android.support:support-v4:22.2.1'
compile 'com.android.support:appcompat-v7:22.1.1' compile 'com.android.support:appcompat-v7:22.2.1'
compile 'com.android.support:support-annotations:22.2.1' compile 'com.android.support:support-annotations:22.2.1'
compile 'org.thoughtcrime.ssl.pinning:AndroidPinning:1.0.0' compile 'org.thoughtcrime.ssl.pinning:AndroidPinning:1.0.0'
@ -60,7 +60,7 @@ if (!hasProperty('sourceDeps')) {
dependencyVerification { dependencyVerification {
verify = [ verify = [
'com.android.support:support-v4:c62f0d025dafa86f423f48df9185b0d89496adbc5f6a9be5a7c394d84cf91423', 'com.android.support:support-v4:c62f0d025dafa86f423f48df9185b0d89496adbc5f6a9be5a7c394d84cf91423',
'com.android.support:appcompat-v7:9a2355537c2f01cf0b95523605c18606b8d824017e6e94a05c77b0cfc8f21c96', 'com.android.support:appcompat-v7:4b5ccba8c4557ef04f99aa0a80f8aa7d50f05f926a709010a54afd5c878d3618',
'com.android.support:support-annotations:104f353b53d5dd8d64b2f77eece4b37f6b961de9732eb6b706395e91033ec70a', 'com.android.support:support-annotations:104f353b53d5dd8d64b2f77eece4b37f6b961de9732eb6b706395e91033ec70a',
'org.thoughtcrime.ssl.pinning:AndroidPinning:afa1d74e699257fa75cb109ff29bac50726ef269c6e306bdeffe8223cee06ef4', 'org.thoughtcrime.ssl.pinning:AndroidPinning:afa1d74e699257fa75cb109ff29bac50726ef269c6e306bdeffe8223cee06ef4',
'com.nostra13.universalimageloader:universal-image-loader:b99382c5536c7325ef8dc0a0fe9a6cad803cf3488942bea7e1cca4db3e5dec43', 'com.nostra13.universalimageloader:universal-image-loader:b99382c5536c7325ef8dc0a0fe9a6cad803cf3488942bea7e1cca4db3e5dec43',

6
F-Droid/res/values/styles.xml
View File

@ -9,6 +9,7 @@
<item name="colorAccent">@color/fdroid_green</item> <item name="colorAccent">@color/fdroid_green</item>
<item name="android:textColorLink">@color/fdroid_green</item> <item name="android:textColorLink">@color/fdroid_green</item>
<item name="alertDialogTheme">@style/AlertDialogThemeDark</item> <item name="alertDialogTheme">@style/AlertDialogThemeDark</item>
<item name="android:textViewStyle">@style/TextViewStyle</item>
</style> </style>
<style name="AppBaseThemeLight" parent="Theme.AppCompat.Light.DarkActionBar"> <style name="AppBaseThemeLight" parent="Theme.AppCompat.Light.DarkActionBar">
@ -19,6 +20,7 @@
<item name="colorAccent">@color/fdroid_green</item> <item name="colorAccent">@color/fdroid_green</item>
<item name="android:textColorLink">@color/fdroid_green</item> <item name="android:textColorLink">@color/fdroid_green</item>
<item name="alertDialogTheme">@style/AlertDialogThemeLight</item> <item name="alertDialogTheme">@style/AlertDialogThemeLight</item>
<item name="android:textViewStyle">@style/TextViewStyle</item>
</style> </style>
<style name="AppThemeDark" parent="AppBaseThemeDark"> <style name="AppThemeDark" parent="AppBaseThemeDark">
@ -46,6 +48,10 @@
<item name="colorAccent">@color/fdroid_green</item> <item name="colorAccent">@color/fdroid_green</item>
</style> </style>
<style name="TextViewStyle" parent="android:Widget.TextView">
<item name="android:textColor">?android:attr/textColorPrimary</item>
</style>
<style name="RepoDetailsCaption"> <style name="RepoDetailsCaption">
<item name="android:paddingTop">16dp</item> <item name="android:paddingTop">16dp</item>
<item name="android:paddingBottom">4dp</item> <item name="android:paddingBottom">4dp</item>