From 1b81267841acb66f73bf4c61c7066b364e5dd5de Mon Sep 17 00:00:00 2001
From: relan <relan@users.noreply.github.com>
Date: Mon, 17 Aug 2015 13:06:39 +0300
Subject: [PATCH 1/5] Use system constant for the transparent color

---
 F-Droid/res/layout/install_app_details.xml | 2 +-
 F-Droid/res/values/colors.xml              | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/F-Droid/res/layout/install_app_details.xml b/F-Droid/res/layout/install_app_details.xml
index bed2ecfc2..24cd14d5a 100644
--- a/F-Droid/res/layout/install_app_details.xml
+++ b/F-Droid/res/layout/install_app_details.xml
@@ -32,7 +32,7 @@ installation screens
         android:layout_width="32dip"
         android:layout_height="32dip"
         android:layout_marginStart="8dip"
-        android:background="@color/transparent"
+        android:background="@android:color/transparent"
         android:layout_alignParentStart="true"
         android:gravity="start"
         android:scaleType="centerCrop"/>
diff --git a/F-Droid/res/values/colors.xml b/F-Droid/res/values/colors.xml
index df3fa5142..ffea98b41 100644
--- a/F-Droid/res/values/colors.xml
+++ b/F-Droid/res/values/colors.xml
@@ -20,7 +20,6 @@
     <color name="swap_wifi_likely_to_work">#00a14b</color>
 
     <color name="shadow">#cc222222</color>
-    <color name="transparent">#00000000</color>
 
     <color name="perms_costs_money">#fff4511e</color>
 

From a49ea5c3c3dcd33e9a8a0f432b3257d0c421a286 Mon Sep 17 00:00:00 2001
From: relan <relan@users.noreply.github.com>
Date: Mon, 17 Aug 2015 13:11:35 +0300
Subject: [PATCH 2/5] Remove unused constant for the black color

---
 F-Droid/res/values/styles.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/F-Droid/res/values/styles.xml b/F-Droid/res/values/styles.xml
index c28aa35bb..124361b4d 100644
--- a/F-Droid/res/values/styles.xml
+++ b/F-Droid/res/values/styles.xml
@@ -20,7 +20,6 @@
         <item name="alertDialogTheme">@style/AlertDialogThemeLight</item>
     </style>
 
-    <color name="black">#FF000000</color>
     <color name="white">#FFFFFFFF</color>
     <color name="red">#FFFF0000</color>
 

From f25dafe91364c881fc5ceb40e32fa28c779dec7a Mon Sep 17 00:00:00 2001
From: relan <relan@users.noreply.github.com>
Date: Mon, 17 Aug 2015 13:12:48 +0300
Subject: [PATCH 3/5] Use system constant for the white color

---
 F-Droid/res/drawable/swap_button_normal.xml  | 4 ++--
 F-Droid/res/drawable/swap_button_pressed.xml | 4 ++--
 F-Droid/res/values/styles.xml                | 3 +--
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/F-Droid/res/drawable/swap_button_normal.xml b/F-Droid/res/drawable/swap_button_normal.xml
index c31b230a8..59a26ad97 100644
--- a/F-Droid/res/drawable/swap_button_normal.xml
+++ b/F-Droid/res/drawable/swap_button_normal.xml
@@ -2,7 +2,7 @@
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
     <item>
         <shape>
-            <solid android:color="@color/white" />
+            <solid android:color="@android:color/white" />
             <padding
                 android:top="1dp"/>
         </shape>
@@ -17,4 +17,4 @@
                 android:bottom="10dp" />
         </shape>
     </item>
-</layer-list>
\ No newline at end of file
+</layer-list>
diff --git a/F-Droid/res/drawable/swap_button_pressed.xml b/F-Droid/res/drawable/swap_button_pressed.xml
index 06e7b3b70..0c53b71d5 100644
--- a/F-Droid/res/drawable/swap_button_pressed.xml
+++ b/F-Droid/res/drawable/swap_button_pressed.xml
@@ -2,7 +2,7 @@
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
     <item>
         <shape>
-            <solid android:color="@color/white" />
+            <solid android:color="@android:color/white" />
             <padding
                 android:top="1dp"/>
         </shape>
@@ -17,4 +17,4 @@
                 android:bottom="10dp" />
         </shape>
     </item>
-</layer-list>
\ No newline at end of file
+</layer-list>
diff --git a/F-Droid/res/values/styles.xml b/F-Droid/res/values/styles.xml
index 124361b4d..58987f497 100644
--- a/F-Droid/res/values/styles.xml
+++ b/F-Droid/res/values/styles.xml
@@ -20,7 +20,6 @@
         <item name="alertDialogTheme">@style/AlertDialogThemeLight</item>
     </style>
 
-    <color name="white">#FFFFFFFF</color>
     <color name="red">#FFFF0000</color>
 
     <style name="AppThemeDark" parent="AppBaseThemeDark">
@@ -48,7 +47,7 @@
     </style>
 
     <style name="SwapTheme.StartSwap" parent="AppThemeLight">
-        <item name="android:background">@color/white</item>
+        <item name="android:background">@android:color/white</item>
     </style>
 
     <style name="SwapTheme.AppList" parent="AppThemeLight">

From 83c8d6d3038d3e69ec52cab40501e38155953a9f Mon Sep 17 00:00:00 2001
From: relan <relan@users.noreply.github.com>
Date: Mon, 17 Aug 2015 14:25:58 +0300
Subject: [PATCH 4/5] Move the red color constant from styles.xml to colors.xml

Because this is the proper place for colors definitions.
---
 F-Droid/res/values/colors.xml | 1 +
 F-Droid/res/values/styles.xml | 2 --
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/F-Droid/res/values/colors.xml b/F-Droid/res/values/colors.xml
index ffea98b41..b72242298 100644
--- a/F-Droid/res/values/colors.xml
+++ b/F-Droid/res/values/colors.xml
@@ -3,6 +3,7 @@
     <color name="signed">#ffcccccc</color>
     <color name="unsigned">#ffCC0000</color>
     <color name="unverified">#ff999999</color>
+    <color name="red">#FFFF0000</color>
 
     <color name="fdroid_blue">#ff1976d2</color>
     <color name="fdroid_blue_dark">#ff0d47a1</color>
diff --git a/F-Droid/res/values/styles.xml b/F-Droid/res/values/styles.xml
index 58987f497..daa73fb7e 100644
--- a/F-Droid/res/values/styles.xml
+++ b/F-Droid/res/values/styles.xml
@@ -20,8 +20,6 @@
         <item name="alertDialogTheme">@style/AlertDialogThemeLight</item>
     </style>
 
-    <color name="red">#FFFF0000</color>
-
     <style name="AppThemeDark" parent="AppBaseThemeDark">
         <!-- customizations that are not API-level specific go here. -->
     </style>

From 0d864a866cb55e20cce8358ba2d9be0a67f73597 Mon Sep 17 00:00:00 2001
From: relan <relan@users.noreply.github.com>
Date: Mon, 17 Aug 2015 14:27:41 +0300
Subject: [PATCH 5/5] Use the red color suggested by the Material Design spec

See http://www.google.com/design/spec/patterns/errors.html#errors-user-input-errors
---
 F-Droid/res/values/colors.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/F-Droid/res/values/colors.xml b/F-Droid/res/values/colors.xml
index b72242298..88e4491e4 100644
--- a/F-Droid/res/values/colors.xml
+++ b/F-Droid/res/values/colors.xml
@@ -3,7 +3,7 @@
     <color name="signed">#ffcccccc</color>
     <color name="unsigned">#ffCC0000</color>
     <color name="unverified">#ff999999</color>
-    <color name="red">#FFFF0000</color>
+    <color name="red">#ffdd2c00</color>
 
     <color name="fdroid_blue">#ff1976d2</color>
     <color name="fdroid_blue_dark">#ff0d47a1</color>