From 75faa60be162c95716e49fe1f4635bd04ab582b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Sun, 2 Feb 2014 16:24:58 +0100
Subject: [PATCH] Hacks to make dialogs on Android 2.3 black on white, and not
 black on black

---
 OpenPGP-Keychain/src/main/AndroidManifest.xml |   2 +-
 .../ui/dialog/FileDialogFragment.java         |   8 ++++--
 .../ui/dialog/ShareQrCodeDialogFragment.java  |   3 +-
 .../drawable-hdpi/popup_center_bright.9.png   | Bin 0 -> 1110 bytes
 .../res/drawable-hdpi/popup_full_bright.9.png | Bin 0 -> 2039 bytes
 .../src/main/res/layout/file_dialog.xml       |  27 ++++++------------
 .../src/main/res/values-v14/styles.xml        |  18 ++++++++++++
 .../src/main/res/values/styles.xml            |  22 +++++++++++++-
 8 files changed, 57 insertions(+), 23 deletions(-)
 create mode 100644 OpenPGP-Keychain/src/main/res/drawable-hdpi/popup_center_bright.9.png
 create mode 100644 OpenPGP-Keychain/src/main/res/drawable-hdpi/popup_full_bright.9.png
 create mode 100644 OpenPGP-Keychain/src/main/res/values-v14/styles.xml

diff --git a/OpenPGP-Keychain/src/main/AndroidManifest.xml b/OpenPGP-Keychain/src/main/AndroidManifest.xml
index 49442f163..414361a47 100644
--- a/OpenPGP-Keychain/src/main/AndroidManifest.xml
+++ b/OpenPGP-Keychain/src/main/AndroidManifest.xml
@@ -56,7 +56,7 @@
         android:allowBackup="false"
         android:hardwareAccelerated="true"
         android:icon="@drawable/icon"
-        android:theme="@style/Theme.AppCompat.Light"
+        android:theme="@style/KeychainTheme"
         android:label="@string/app_name">
         <activity
             android:name=".ui.KeyListPublicActivity"
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/FileDialogFragment.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/FileDialogFragment.java
index 80ba8c725..39ce63b5f 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/FileDialogFragment.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/FileDialogFragment.java
@@ -33,10 +33,12 @@ import android.os.Message;
 import android.os.Messenger;
 import android.os.RemoteException;
 import android.support.v4.app.DialogFragment;
+import android.text.Html;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.CheckBox;
 import android.widget.EditText;
+import android.widget.TextView;
 
 import com.beardedhen.androidbootstrap.BootstrapButton;
 
@@ -57,6 +59,7 @@ public class FileDialogFragment extends DialogFragment {
     private EditText mFilename;
     private BootstrapButton mBrowse;
     private CheckBox mCheckBox;
+    private TextView mMessageTextView;
 
     private static final int REQUEST_CODE = 0x00007004;
 
@@ -96,12 +99,13 @@ public class FileDialogFragment extends DialogFragment {
         LayoutInflater inflater = (LayoutInflater) activity
                 .getSystemService(Context.LAYOUT_INFLATER_SERVICE);
         AlertDialog.Builder alert = new AlertDialog.Builder(activity);
-
         alert.setTitle(title);
-        alert.setMessage(message);
 
         View view = inflater.inflate(R.layout.file_dialog, null);
 
+        mMessageTextView = (TextView) view.findViewById(R.id.message);
+        mMessageTextView.setText(message);
+
         mFilename = (EditText) view.findViewById(R.id.input);
         mFilename.setText(defaultFile);
         mBrowse = (BootstrapButton) view.findViewById(R.id.btn_browse);
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/ShareQrCodeDialogFragment.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/ShareQrCodeDialogFragment.java
index 653393749..9f3270250 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/ShareQrCodeDialogFragment.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/ShareQrCodeDialogFragment.java
@@ -32,6 +32,7 @@ import android.app.Dialog;
 import android.net.Uri;
 import android.os.Bundle;
 import android.support.v4.app.DialogFragment;
+import android.view.ContextThemeWrapper;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.Button;
@@ -76,7 +77,7 @@ public class ShareQrCodeDialogFragment extends DialogFragment {
         Uri dataUri = getArguments().getParcelable(ARG_KEY_URI);
         mFingerprintOnly = getArguments().getBoolean(ARG_FINGERPRINT_ONLY);
 
-        AlertDialog.Builder alert = new AlertDialog.Builder(activity);
+        AlertDialog.Builder alert = new AlertDialog.Builder(getActivity());
 
         alert.setTitle(R.string.share_qr_code_dialog_title);
 
diff --git a/OpenPGP-Keychain/src/main/res/drawable-hdpi/popup_center_bright.9.png b/OpenPGP-Keychain/src/main/res/drawable-hdpi/popup_center_bright.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..c2a739c42a8da829b5d91f0b86ccfa128ae362c6
GIT binary patch
literal 1110
zcmbVLNodqi7>?Gh#Y#PBsX~3G;DXNNB{Ny+Skf#y;M6i5a3~0-$!i<hEGDncv<H<c
zq8AT>dQlX;D2Vi?REp?D1@)jeQ4kkU6kJQMzO<d{p?ENmye0qlegAs8yK8r2!-fWm
zq8jsi^deci$XmZ^1^Hf_+3=VwE!ZgIo}eFBtO!x66Z9dF_pAX_M3ysp=rL-isJec)
zRL14PUd0Z)w3XPTt6oUZ6xH5Q4J~^JVbF&LTt7#Dy?c)au9Ktp^95K4H8kk%8H-TQ
zSXap&8?t4G?$`y|s|q3T5Vk<o8}?(RnxkiV6|zsR85+!*;GrBn=Ty1S4YVLafKS7e
z4Fw1UHqB<TqA2bJ9AqH_Ifms@tf*u-1wt_Y&_peA`jw(?&TElVjvmA~R2ZgGsiZ5J
zbPx?NtSrk32gjv|MJgWku~kj^aa)Z+N3k8bA$9{FB#c&HFoJV5@pLW(FDw)mi2Zmz
zQ6yzd)e0Fl4H?f%;+nONaS{D-V^Qn4G#VnNh~i)*vPnJq+iGBvyMGHMhQu3XU*wXa
zSi^c?k9f$(c|AvyKWWEx6v#@DWyLHMIVeahEAytI>zb;`qMVgfp~kT&Rx)8{Mvyd<
z&#<g+%AHxw&}6~LN<7cQYz>?DV{G|0s_D9ku4HI}DQo}4Dq4gr97Lrc7_N0d_h5j7
zcrXZo*29B>WxIZIPRcVEt&Sr1FmlW&@W5<-6?YMRK@|;A)eR_fY%Ok8&gfZ5Fb$~l
z^gP!2pPVto8766tznZ0XMLICqF0?*5EDR6w$;3otG%^Q{+#+LjGOw$p>dP<ZpEeu=
zO($Mo-}Y(k^rv5IuU+lj__^=sg{B`9b(=o7u0Q#mdq34IpFY*vcz-MU@beoMmj7IC
zURk#8x?0x@)aK3Sid$Z_*!r{Qy<cDSZfvdl*!E!8c>R-uOLl~h9v<kp-E?!`+c%Q5
t=FIVTZ^|>u*~y1f(-Zg3O|JBpuBPtX*j|5W{PMSC((^`_eyj7~_-{0*XD0vv

literal 0
HcmV?d00001

diff --git a/OpenPGP-Keychain/src/main/res/drawable-hdpi/popup_full_bright.9.png b/OpenPGP-Keychain/src/main/res/drawable-hdpi/popup_full_bright.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..6b8aa9d521be701b45eed7a26bceaf5faa32d1ce
GIT binary patch
literal 2039
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

literal 0
HcmV?d00001

diff --git a/OpenPGP-Keychain/src/main/res/layout/file_dialog.xml b/OpenPGP-Keychain/src/main/res/layout/file_dialog.xml
index 87816067f..a2939f571 100644
--- a/OpenPGP-Keychain/src/main/res/layout/file_dialog.xml
+++ b/OpenPGP-Keychain/src/main/res/layout/file_dialog.xml
@@ -1,32 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2010 Thialfihar <thi@thialfihar.org>
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:bootstrapbutton="http://schemas.android.com/apk/res-auto"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical"
     android:paddingLeft="5dip"
-    android:paddingRight="5dip" >
+    android:paddingRight="5dip">
+
+    <TextView
+        android:id="@+id/message"
+        android:layout_marginBottom="8dp"
+        android:textAppearance="?android:attr/textAppearanceMedium"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content" />
 
     <LinearLayout
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
-        android:orientation="horizontal" >
+        android:orientation="horizontal">
 
         <EditText
             android:id="@+id/input"
diff --git a/OpenPGP-Keychain/src/main/res/values-v14/styles.xml b/OpenPGP-Keychain/src/main/res/values-v14/styles.xml
new file mode 100644
index 000000000..4f8c45117
--- /dev/null
+++ b/OpenPGP-Keychain/src/main/res/values-v14/styles.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Used in Android >= 4 -->
+
+    <style name="KeychainTheme" parent="@style/Theme.AppCompat.Light">
+    </style>
+
+    <style name="SectionHeader">
+        <item name="android:drawableBottom">@drawable/section_header</item>
+        <item name="android:drawablePadding">4dp</item>
+        <item name="android:layout_marginTop">8dp</item>
+        <item name="android:paddingLeft">4dp</item>
+        <item name="android:textAllCaps">true</item>
+        <item name="android:textColor">@color/emphasis</item>
+        <item name="android:textSize">14sp</item>
+    </style>
+
+</resources>
\ No newline at end of file
diff --git a/OpenPGP-Keychain/src/main/res/values/styles.xml b/OpenPGP-Keychain/src/main/res/values/styles.xml
index 9e61bbef4..f03d72605 100644
--- a/OpenPGP-Keychain/src/main/res/values/styles.xml
+++ b/OpenPGP-Keychain/src/main/res/values/styles.xml
@@ -1,14 +1,34 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <!-- Used in Android < 4 -->
+
+
+    <style name="KeychainTheme" parent="@style/Theme.AppCompat.Light">
+        <item name="android:alertDialogStyle">@style/CustomDialogTheme</item>
+    </style>
+
+    <!-- Ugly fix to make content background of Dialogs on Android < 4 white not black! -->
+    <style name="CustomDialogTheme" parent="@android:style/Theme.Dialog">
+        <item name="android:fullDark">@drawable/popup_full_bright</item>
+        <!--<item name="android:topDark">@android:drawable/popup_full_dark</item>-->
+        <item name="android:centerDark">@drawable/popup_center_bright</item>
+        <!--<item name="android:bottomDark">@android:drawable/popup_bottom_dark</item>-->
+        <!--<item name="fullBright">@android:drawable/popup_full_bright</item>-->
+        <!--<item name="topBright">@android:drawable/popup_top_bright</item>-->
+        <!--<item name="centerBright">@android:drawable/popup_center_bright</item>-->
+        <!--<item name="bottomBright">@android:drawable/popup_bottom_bright</item>-->
+        <!--<item name="bottomMedium">@android:drawable/popup_bottom_medium</item>-->
+        <!--<item name="centerMedium">@android:drawable/popup_center_medium</item>-->
+    </style>
 
     <style name="SectionHeader">
         <item name="android:drawableBottom">@drawable/section_header</item>
         <item name="android:drawablePadding">4dp</item>
         <item name="android:layout_marginTop">8dp</item>
         <item name="android:paddingLeft">4dp</item>
-        <!-- <item name="android:textAllCaps">true</item> -->
         <item name="android:textColor">@color/emphasis</item>
         <item name="android:textSize">14sp</item>
     </style>
 
+
 </resources>
\ No newline at end of file