aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res/values
diff options
context:
space:
mode:
authoriNPUTmice <daniel@gultsch.de>2015-01-29 23:26:41 +0100
committeriNPUTmice <daniel@gultsch.de>2015-01-29 23:26:41 +0100
commit6c3ea7f2bdde738c48067ecb6b6588b7ad39a05e (patch)
tree741f7defe8265ee8b61f95ddc3f3ecab9a72d158 /src/main/res/values
parentf2bf64d19d7eb14f34324311ebf4f95378d81fbe (diff)
parent26bc2d387f9efb4fa936b95b2c6cc26b8503757f (diff)
Merge branch 'development' of https://github.com/siacs/Conversations into development
Diffstat (limited to 'src/main/res/values')
-rw-r--r--src/main/res/values/attrs.xml20
-rw-r--r--src/main/res/values/strings.xml1
-rw-r--r--src/main/res/values/themes.xml21
3 files changed, 42 insertions, 0 deletions
diff --git a/src/main/res/values/attrs.xml b/src/main/res/values/attrs.xml
index 2354a5e8..e314f752 100644
--- a/src/main/res/values/attrs.xml
+++ b/src/main/res/values/attrs.xml
@@ -5,4 +5,24 @@
<attr name="TextSizeBody" format="dimension" />
<attr name="TextSizeHeadline" format="dimension" />
+ <attr name="icon_add_group" format="reference"/>
+ <attr name="icon_add_person" format="reference"/>
+ <attr name="icon_cancel" format="reference"/>
+ <attr name="icon_chat" format="reference"/>
+ <attr name="icon_copy" format="reference"/>
+ <attr name="icon_discard" format="reference"/>
+ <attr name="icon_download" format="reference"/>
+ <attr name="icon_edit" format="reference"/>
+ <attr name="icon_edit_dark" format="reference"/>
+ <attr name="icon_group" format="reference"/>
+ <attr name="icon_new" format="reference"/>
+ <attr name="icon_new_attachment" format="reference"/>
+ <attr name="icon_not_secure" format="reference"/>
+ <attr name="icon_refresh" format="reference"/>
+ <attr name="icon_remove" format="reference"/>
+ <attr name="icon_search" format="reference"/>
+ <attr name="icon_secure" format="reference"/>
+ <attr name="icon_settings" format="reference"/>
+ <attr name="icon_import_export" format="reference"/>
+
</resources> \ No newline at end of file
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 3d3d69a3..ae8dcd67 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -296,6 +296,7 @@
\n\nhttps://github.com/jitsi/otr4j\n(LGPL-3.0)
\n\nhttps://developer.android.com/tools/support-library\n(Apache License, Version 2.0)
\n\nhttps://github.com/zxing/zxing\n(Apache License, Version 2.0)
+ \n\nhttps://github.com/google/material-design-icons\n(CC BY 4.0)
</string>
<string name="title_pref_quiet_hours">Quiet Hours</string>
<string name="title_pref_quiet_hours_start_time">Start time</string>
diff --git a/src/main/res/values/themes.xml b/src/main/res/values/themes.xml
index fa7973d2..80f2bfe6 100644
--- a/src/main/res/values/themes.xml
+++ b/src/main/res/values/themes.xml
@@ -8,6 +8,27 @@
<item name="TextSizeInfo">12sp</item>
<item name="TextSizeBody">14sp</item>
<item name="TextSizeHeadline">20sp</item>
+
+ <item name="attr/icon_add_group">@drawable/ic_action_add_group</item>
+ <item name="attr/icon_add_person">@drawable/ic_action_add_person</item>
+ <item name="attr/icon_cancel">@drawable/ic_action_cancel</item>
+ <item name="attr/icon_chat">@drawable/ic_action_chat</item>
+ <item name="attr/icon_copy">@drawable/ic_action_copy</item>
+ <item name="attr/icon_discard">@drawable/ic_action_discard</item>
+ <item name="attr/icon_download">@drawable/ic_action_download</item>
+ <item name="attr/icon_edit">@drawable/ic_action_edit</item>
+ <item name="attr/icon_edit_dark">@drawable/ic_action_edit_dark</item>
+
+ <item name="attr/icon_group">@drawable/ic_action_group</item>
+ <item name="attr/icon_new">@drawable/ic_action_new</item>
+ <item name="attr/icon_new_attachment">@drawable/ic_action_new_attachment</item>
+ <item name="attr/icon_not_secure">@drawable/ic_action_not_secure</item>
+ <item name="attr/icon_refresh">@drawable/ic_action_refresh</item>
+ <item name="attr/icon_remove">@drawable/ic_action_remove</item>
+ <item name="attr/icon_search">@drawable/ic_action_search</item>
+ <item name="attr/icon_secure">@drawable/ic_action_secure</item>
+ <item name="attr/icon_settings">@drawable/ic_action_settings</item>
+ <item name="attr/icon_import_export">@drawable/ic_stat_communication_import_export</item>
</style>
<style name="ConversationsTheme.LargerText" parent="ConversationsTheme">