From 1e28f600386f1f1dcd734363c932d5ccbd6267fb Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Sun, 10 May 2015 03:14:13 +0200
Subject: changed conversation red to material red

---
 src/main/res/values/colors.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/main/res/values/colors.xml')

diff --git a/src/main/res/values/colors.xml b/src/main/res/values/colors.xml
index c21650a5..753a56df 100644
--- a/src/main/res/values/colors.xml
+++ b/src/main/res/values/colors.xml
@@ -11,7 +11,7 @@
     <color name="secondarybackground" type="color">#ffeeeeee</color>
     <color name="darkbackground" type="color">#ff323232</color>
     <color name="divider">#1f000000</color>
-    <color name="red">#ffe51c23</color>
+    <color name="red">#fff44336</color>
     <color name="orange">#ffff9800</color>
     <color name="green">#ff259b24</color>
 
-- 
cgit v1.2.3


From ffffca10f0c3e399fbbcde200ea4758acc5ba03f Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Mon, 13 Jul 2015 12:55:13 +0200
Subject: renamed colors

---
 src/main/res/values/colors.xml | 28 +++++++++++++---------------
 1 file changed, 13 insertions(+), 15 deletions(-)

(limited to 'src/main/res/values/colors.xml')

diff --git a/src/main/res/values/colors.xml b/src/main/res/values/colors.xml
index 753a56df..3a778a21 100644
--- a/src/main/res/values/colors.xml
+++ b/src/main/res/values/colors.xml
@@ -1,18 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-
-    <color name="primary" type="color">#ff259b24</color>
-    <color name="primarydark" type="color">#ff0a7e07</color>
-    <color name="accent">#ff0091ea</color>
-    <color name="primarytext" type="color">#de000000</color>
-    <color name="secondarytext" type="color">#8a000000</color>
-    <color name="ondarktext" type="color">#fffafafa</color>
-    <color name="primarybackground" type="color">#fffafafa</color>
-    <color name="secondarybackground" type="color">#ffeeeeee</color>
-    <color name="darkbackground" type="color">#ff323232</color>
-    <color name="divider">#1f000000</color>
-    <color name="red">#fff44336</color>
-    <color name="orange">#ffff9800</color>
-    <color name="green">#ff259b24</color>
-
+	<color name="green500">#ff259b24</color>
+	<color name="green700">#ff0a7e07</color>
+	<color name="accent">#ff0091ea</color>
+	<color name="black87">#de000000</color>
+	<color name="black54">#8a000000</color>
+	<color name="black12">#1f000000</color>
+	<color name="white">#ffffffff</color>
+	<color name="white70">#b2ffffff</color>
+	<color name="grey50">#fffafafa</color>
+	<color name="grey200">#ffeeeeee</color>
+	<color name="grey800">#ff424242</color>
+	<color name="red500">#fff44336</color>
+	<color name="orange500">#ffff9800</color>
 </resources>
\ No newline at end of file
-- 
cgit v1.2.3


From 92b5081b5ebac1a3108a821a270beb3f7d9c39ee Mon Sep 17 00:00:00 2001
From: Andreas Straub <andy@strb.org>
Date: Tue, 21 Jul 2015 14:18:16 +0200
Subject: Add INACTIVE state for removed keys

We introduce a new trust state: INACTIVE. This state is intended for
old keys that have been removed.

When a TRUSTED device is removed from the PEP devicelist, it's status
will be set to INACTIVE. INACTIVE keys are shown in the UI as greyed
out, non-interactible key rows. Messages are not encrypted for INACTIVE
devices.

When an INACTIVE device reappears in PEP, or a message is received from
an INACTIVE device, it is set back to trusted.
---
 src/main/res/values/colors.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/main/res/values/colors.xml')

diff --git a/src/main/res/values/colors.xml b/src/main/res/values/colors.xml
index 3a778a21..85a442c8 100644
--- a/src/main/res/values/colors.xml
+++ b/src/main/res/values/colors.xml
@@ -5,6 +5,7 @@
 	<color name="accent">#ff0091ea</color>
 	<color name="black87">#de000000</color>
 	<color name="black54">#8a000000</color>
+	<color name="black26">#42000000</color>
 	<color name="black12">#1f000000</color>
 	<color name="white">#ffffffff</color>
 	<color name="white70">#b2ffffff</color>
-- 
cgit v1.2.3


From 1ed550b5c54ff873375c30fd94e4f20523f15187 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Thu, 30 Jul 2015 12:40:50 +0200
Subject: fixed some colors in message adapter

---
 src/main/res/values/colors.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/main/res/values/colors.xml')

diff --git a/src/main/res/values/colors.xml b/src/main/res/values/colors.xml
index 85a442c8..a5d7eea3 100644
--- a/src/main/res/values/colors.xml
+++ b/src/main/res/values/colors.xml
@@ -13,5 +13,6 @@
 	<color name="grey200">#ffeeeeee</color>
 	<color name="grey800">#ff424242</color>
 	<color name="red500">#fff44336</color>
+	<color name="red800">#ffc62828</color>
 	<color name="orange500">#ffff9800</color>
 </resources>
\ No newline at end of file
-- 
cgit v1.2.3


From e10e9942ded6eac8c7c82244c0209c6d67d17370 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Wed, 5 Aug 2015 18:30:49 +0200
Subject: changed text selection color

---
 src/main/res/values/colors.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/main/res/values/colors.xml')

diff --git a/src/main/res/values/colors.xml b/src/main/res/values/colors.xml
index a5d7eea3..c2a3ad60 100644
--- a/src/main/res/values/colors.xml
+++ b/src/main/res/values/colors.xml
@@ -11,6 +11,7 @@
 	<color name="white70">#b2ffffff</color>
 	<color name="grey50">#fffafafa</color>
 	<color name="grey200">#ffeeeeee</color>
+	<color name="grey500">#ff9e9e9e</color>
 	<color name="grey800">#ff424242</color>
 	<color name="red500">#fff44336</color>
 	<color name="red800">#ffc62828</color>
-- 
cgit v1.2.3


From eff9e417e02bef9c4d94b659f7a90f3ff334ce25 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Wed, 26 Aug 2015 21:17:29 +0200
Subject: use dedicated colors for primary and primary_dark

---
 src/main/res/values/colors.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src/main/res/values/colors.xml')

diff --git a/src/main/res/values/colors.xml b/src/main/res/values/colors.xml
index c2a3ad60..b3567b44 100644
--- a/src/main/res/values/colors.xml
+++ b/src/main/res/values/colors.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-	<color name="green500">#ff259b24</color>
-	<color name="green700">#ff0a7e07</color>
+	<color name="primary">#ff259b24</color>
+	<color name="primary_dark">#ff0a7e07</color>
 	<color name="accent">#ff0091ea</color>
 	<color name="black87">#de000000</color>
 	<color name="black54">#8a000000</color>
@@ -16,4 +16,5 @@
 	<color name="red500">#fff44336</color>
 	<color name="red800">#ffc62828</color>
 	<color name="orange500">#ffff9800</color>
+	<color name="green500">#ff259b24</color>
 </resources>
\ No newline at end of file
-- 
cgit v1.2.3


From 73084c9cd30dacb6228a0851efa928aaeabcb229 Mon Sep 17 00:00:00 2001
From: steckbrief <steckbrief@chefmail.de>
Date: Thu, 11 Feb 2016 21:20:51 +0100
Subject: Fixed XML errors after merge

---
 src/main/res/values/colors.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/main/res/values/colors.xml')

diff --git a/src/main/res/values/colors.xml b/src/main/res/values/colors.xml
index 3ecc2225..2d744395 100644
--- a/src/main/res/values/colors.xml
+++ b/src/main/res/values/colors.xml
@@ -26,4 +26,5 @@
 	<color name="red800">#ffc62828</color>
 	<color name="orange500">#ffff9800</color>
 	<color name="green500">#ff259b24</color>
+    <color name="green700">#ff0a7e07</color>
 </resources>
\ No newline at end of file
-- 
cgit v1.2.3