aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res/values-v21
diff options
context:
space:
mode:
authorlookshe <github@lookshe.org>2015-08-11 20:30:11 +0200
committerlookshe <github@lookshe.org>2015-08-11 20:30:11 +0200
commit639babfdb5289a035e0a22bf607c068caefa5c99 (patch)
tree6a11aa6a189f3a5988d5d1e1c733d2027bc3494f /src/main/res/values-v21
parent1b5966ae3b1108c88a810d7d32a0aefa8812d11f (diff)
parent8fd688ca96005152be754eeba1be72c7c0aab9ad (diff)
Merge branch 'trz/rebase' into trz/rename
Conflicts: build.gradle src/main/java/de/thedevstack/conversationsplus/crypto/OtrEngine.java src/main/java/de/thedevstack/conversationsplus/entities/Account.java src/main/java/de/thedevstack/conversationsplus/entities/Contact.java src/main/java/de/thedevstack/conversationsplus/entities/Downloadable.java src/main/java/de/thedevstack/conversationsplus/entities/DownloadableFile.java src/main/java/de/thedevstack/conversationsplus/entities/DownloadablePlaceholder.java src/main/java/de/thedevstack/conversationsplus/entities/Message.java src/main/java/de/thedevstack/conversationsplus/generator/IqGenerator.java src/main/java/de/thedevstack/conversationsplus/http/HttpConnection.java src/main/java/de/thedevstack/conversationsplus/http/HttpConnectionManager.java src/main/java/de/thedevstack/conversationsplus/parser/AbstractParser.java src/main/java/de/thedevstack/conversationsplus/parser/MessageParser.java src/main/java/de/thedevstack/conversationsplus/parser/PresenceParser.java src/main/java/de/thedevstack/conversationsplus/persistance/DatabaseBackend.java src/main/java/de/thedevstack/conversationsplus/persistance/FileBackend.java src/main/java/de/thedevstack/conversationsplus/services/NotificationService.java src/main/java/de/thedevstack/conversationsplus/services/XmppConnectionService.java src/main/java/de/thedevstack/conversationsplus/ui/ConversationActivity.java src/main/java/de/thedevstack/conversationsplus/ui/ConversationFragment.java src/main/java/de/thedevstack/conversationsplus/ui/SettingsActivity.java src/main/java/de/thedevstack/conversationsplus/ui/StartConversationActivity.java src/main/java/de/thedevstack/conversationsplus/ui/adapter/AccountAdapter.java src/main/java/de/thedevstack/conversationsplus/ui/adapter/ConversationAdapter.java src/main/java/de/thedevstack/conversationsplus/ui/adapter/ListItemAdapter.java src/main/java/de/thedevstack/conversationsplus/ui/adapter/MessageAdapter.java src/main/java/de/thedevstack/conversationsplus/utils/UIHelper.java src/main/java/de/thedevstack/conversationsplus/xmpp/jingle/JingleConnection.java src/main/java/de/thedevstack/conversationsplus/xmpp/jingle/JingleConnectionManager.java src/main/java/de/thedevstack/conversationsplus/xmpp/jingle/JingleInbandTransport.java src/main/java/de/thedevstack/conversationsplus/xmpp/jingle/JingleSocks5Transport.java src/main/java/de/thedevstack/conversationsplus/xmpp/stanzas/MessagePacket.java src/main/java/eu/siacs/conversations/crypto/OtrEngine.java src/main/java/eu/siacs/conversations/crypto/OtrService.java src/main/java/eu/siacs/conversations/entities/DownloadablePlaceholder.java src/main/java/eu/siacs/conversations/entities/TransferablePlaceholder.java src/main/java/eu/siacs/conversations/http/HttpConnection.java src/main/java/eu/siacs/conversations/http/HttpDownloadConnection.java src/main/res/layout/activity_about.xml
Diffstat (limited to 'src/main/res/values-v21')
-rw-r--r--src/main/res/values-v21/dimens.xml5
-rw-r--r--src/main/res/values-v21/themes.xml36
2 files changed, 22 insertions, 19 deletions
diff --git a/src/main/res/values-v21/dimens.xml b/src/main/res/values-v21/dimens.xml
new file mode 100644
index 00000000..b689d100
--- /dev/null
+++ b/src/main/res/values-v21/dimens.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+ <dimen name="elv_undo_bottom_offset">63dp</dimen> <!-- 48dp + 15dp -->
+ <dimen name="image_button_padding">12dp</dimen>
+</resources> \ No newline at end of file
diff --git a/src/main/res/values-v21/themes.xml b/src/main/res/values-v21/themes.xml
index 75539533..d1679f92 100644
--- a/src/main/res/values-v21/themes.xml
+++ b/src/main/res/values-v21/themes.xml
@@ -2,33 +2,31 @@
<resources>
<style name="ConversationsTheme" parent="@android:style/Theme.Material.Light.DarkActionBar">
- <item name="android:colorPrimary">@color/primary</item>
- <item name="android:colorPrimaryDark">@color/primarydark</item>
+ <item name="android:colorPrimary">@color/green500</item>
+ <item name="android:colorPrimaryDark">@color/green700</item>
<item name="android:colorAccent">@color/accent</item>
<item name="TextSizeInfo">12sp</item>
<item name="TextSizeBody">14sp</item>
<item name="TextSizeHeadline">20sp</item>
- <item name="attr/icon_add_group">@drawable/ic_group_add_white_48dp</item>
- <item name="attr/icon_add_person">@drawable/ic_person_add_white_48dp</item>
+ <item name="attr/icon_add_group">@drawable/ic_group_add_white_24dp</item>
+ <item name="attr/icon_add_person">@drawable/ic_person_add_white_24dp</item>
<item name="attr/icon_cancel">@drawable/ic_cancel_white_24dp</item>
- <item name="attr/icon_chat">@drawable/ic_chat_white_48dp</item>
- <item name="attr/icon_copy">@drawable/ic_content_copy_grey600_36dp</item>
- <item name="attr/icon_discard">@drawable/ic_delete_white_48dp</item>
+ <item name="attr/icon_copy">@drawable/ic_content_copy_grey600_24dp</item>
+ <item name="attr/icon_discard">@drawable/ic_delete_white_24dp</item>
<item name="attr/icon_download">@drawable/ic_file_download_white_24dp</item>
- <item name="attr/icon_edit">@drawable/ic_edit_white_48dp</item>
- <item name="attr/icon_edit_dark">@drawable/ic_edit_grey600_36dp</item>
- <item name="attr/icon_group">@drawable/ic_group_white_48dp</item>
- <item name="attr/icon_new">@drawable/ic_add_white_48dp</item>
- <item name="attr/icon_new_attachment">@drawable/ic_attach_file_white_48dp</item>
- <item name="attr/icon_not_secure">@drawable/ic_lock_open_white_48dp</item>
- <item name="attr/icon_refresh">@drawable/ic_refresh_white_48dp</item>
- <item name="attr/icon_remove">@drawable/ic_remove_grey600_36dp</item>
- <item name="attr/icon_search">@drawable/ic_search_white_48dp</item>
- <item name="attr/icon_secure">@drawable/ic_lock_outline_white_48dp</item>
- <item name="attr/icon_settings">@drawable/ic_settings_grey600_36dp</item>
- <item name="attr/icon_import_export">@drawable/ic_import_export_white_48dp</item>
+ <item name="attr/icon_edit">@drawable/ic_edit_white_24dp</item>
+ <item name="attr/icon_edit_dark">@drawable/ic_edit_grey600_24dp</item>
+ <item name="attr/icon_group">@drawable/ic_group_white_24dp</item>
+ <item name="attr/icon_new">@drawable/ic_add_white_24dp</item>
+ <item name="attr/icon_new_attachment">@drawable/ic_attach_file_white_24dp</item>
+ <item name="attr/icon_not_secure">@drawable/ic_lock_open_white_24dp</item>
+ <item name="attr/icon_remove">@drawable/ic_delete_grey600_24dp</item>
+ <item name="attr/icon_search">@drawable/ic_search_white_24dp</item>
+ <item name="attr/icon_secure">@drawable/ic_lock_open_white_24dp</item>
+ <item name="attr/icon_settings">@drawable/ic_settings_grey600_24dp</item>
+ <item name="attr/icon_import_export">@drawable/ic_import_export_white_24dp</item>
</style>