Merge branch 'development'

4 files changed, 43 insertions, 0 deletions

diff --git a/src/main/res/drawable/message_border.xml b/src/main/res/drawable/account_image_border.xml
index 990d0288..990d0288 100644
--- a/src/main/res/drawable/message_border.xml
+++ b/src/main/res/drawable/account_image_border.xml
diff --git a/src/main/res/drawable/switch_back_off.xml b/src/main/res/drawable/switch_back_off.xml
new file mode 100644
index 00000000..20d2fb14
--- /dev/null
+++ b/src/main/res/drawable/switch_back_off.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_enabled="false"><shape android:shape="rectangle">
+            <solid android:color="#D5D5D5" />
+
+            <corners android:radius="99dp" />
+        </shape></item>
+    <item android:state_enabled="true"><shape android:shape="rectangle">
+            <solid android:color="#939393" />
+
+            <corners android:radius="99dp" />
+        </shape></item>
+
+</selector>
\ No newline at end of file
diff --git a/src/main/res/drawable/switch_back_on.xml b/src/main/res/drawable/switch_back_on.xml
new file mode 100644
index 00000000..45117a98
--- /dev/null
+++ b/src/main/res/drawable/switch_back_on.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_enabled="false">
+        <shape android:shape="rectangle">
+            <solid android:color="#D5D5D5"/>
+            <corners android:radius="99dp"/>
+        </shape>
+    </item>
+    <item android:state_enabled="true">
+        <shape android:shape="rectangle">
+            <!-- 30% accent on white -->
+            <solid android:color="#b3ddf7"/>
+            <corners android:radius="99dp"/>
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/src/main/res/drawable/switch_thumb.xml b/src/main/res/drawable/switch_thumb.xml
new file mode 100644
index 00000000..ba3d1c45
--- /dev/null
+++ b/src/main/res/drawable/switch_thumb.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:drawable="@drawable/switch_thumb_disable" android:state_enabled="false"/>
+    <item android:drawable="@drawable/switch_thumb_on_pressed" android:state_checked="true" android:state_pressed="true"/>
+    <item android:drawable="@drawable/switch_thumb_on_pressed" android:state_checked="true" android:state_focused="true"/>
+    <item android:drawable="@drawable/switch_thumb_on_normal" android:state_checked="true"/>
+    <item android:drawable="@drawable/switch_thumb_off_pressed" android:state_checked="false" android:state_pressed="true"/>
+    <item android:drawable="@drawable/switch_thumb_off_pressed" android:state_checked="false" android:state_focused="true"/>
+    <item android:drawable="@drawable/switch_thumb_off_normal" android:state_checked="false"/>
+
+</selector>
\ No newline at end of file