From 68de2356c5b10047d8be64eab9c9e1c5a007b609 Mon Sep 17 00:00:00 2001
From: relan <relan@users.noreply.github.com>
Date: Fri, 16 Oct 2015 14:30:05 +0300
Subject: [PATCH 1/2] Fix default textColor for TextView

TextView respects textViewStyle since appcompat-v7:22.2:

     public AppCompatTextView(Context context, AttributeSet attrs) {
-        this(context, attrs, 0);
+        this(context, attrs, android.R.attr.textViewStyle);
     }

This change in appcompat-v7 breaks previous behaviour by applying
textColorSecondary to TextViews: text becomes grey after upgrading
appcompat-v7 to 22.2.

See https://code.google.com/p/android/issues/detail?id=170476
---
 F-Droid/res/values/styles.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/F-Droid/res/values/styles.xml b/F-Droid/res/values/styles.xml
index 0339e3313..af3567065 100644
--- a/F-Droid/res/values/styles.xml
+++ b/F-Droid/res/values/styles.xml
@@ -9,6 +9,7 @@
         <item name="colorAccent">@color/fdroid_green</item>
         <item name="android:textColorLink">@color/fdroid_green</item>
         <item name="alertDialogTheme">@style/AlertDialogThemeDark</item>
+        <item name="android:textViewStyle">@style/TextViewStyle</item>
     </style>
 
     <style name="AppBaseThemeLight" parent="Theme.AppCompat.Light.DarkActionBar">
@@ -19,6 +20,7 @@
         <item name="colorAccent">@color/fdroid_green</item>
         <item name="android:textColorLink">@color/fdroid_green</item>
         <item name="alertDialogTheme">@style/AlertDialogThemeLight</item>
+        <item name="android:textViewStyle">@style/TextViewStyle</item>
     </style>
 
     <style name="AppThemeDark" parent="AppBaseThemeDark">
@@ -46,6 +48,10 @@
         <item name="colorAccent">@color/fdroid_green</item>
     </style>
 
+    <style name="TextViewStyle" parent="android:Widget.TextView">
+        <item name="android:textColor">?android:attr/textColorPrimary</item>
+    </style>
+
     <style name="RepoDetailsCaption">
         <item name="android:paddingTop">16dp</item>
         <item name="android:paddingBottom">4dp</item>

From b1a1bedc6867e2fb02406c06e3cd1335ea5555f2 Mon Sep 17 00:00:00 2001
From: relan <relan@users.noreply.github.com>
Date: Fri, 16 Oct 2015 14:48:52 +0300
Subject: [PATCH 2/2] Bump support appcompat-v7 library to 22.2.1

Let it be the same version as other support libraries.
---
 F-Droid/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/F-Droid/build.gradle b/F-Droid/build.gradle
index 0a1ee7f12..6a7069654 100644
--- a/F-Droid/build.gradle
+++ b/F-Droid/build.gradle
@@ -10,7 +10,7 @@ dependencies {
     compile project(':privileged-api-lib')
 
     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 'org.thoughtcrime.ssl.pinning:AndroidPinning:1.0.0'
@@ -60,7 +60,7 @@ if (!hasProperty('sourceDeps')) {
     dependencyVerification {
         verify = [
             'com.android.support:support-v4:c62f0d025dafa86f423f48df9185b0d89496adbc5f6a9be5a7c394d84cf91423',
-            'com.android.support:appcompat-v7:9a2355537c2f01cf0b95523605c18606b8d824017e6e94a05c77b0cfc8f21c96',
+            'com.android.support:appcompat-v7:4b5ccba8c4557ef04f99aa0a80f8aa7d50f05f926a709010a54afd5c878d3618',
             'com.android.support:support-annotations:104f353b53d5dd8d64b2f77eece4b37f6b961de9732eb6b706395e91033ec70a',
             'org.thoughtcrime.ssl.pinning:AndroidPinning:afa1d74e699257fa75cb109ff29bac50726ef269c6e306bdeffe8223cee06ef4',
             'com.nostra13.universalimageloader:universal-image-loader:b99382c5536c7325ef8dc0a0fe9a6cad803cf3488942bea7e1cca4db3e5dec43',