diff options
author | Christian Schneppe <christian@pix-art.de> | 2018-04-22 21:39:19 +0200 |
---|---|---|
committer | Christian Schneppe <christian@pix-art.de> | 2018-04-22 21:39:19 +0200 |
commit | ad839a1ddaea72f766be80266ae5b6d4fa7cae7f (patch) | |
tree | 9e11f0d427f83a595f866200ffaa6dff62523172 /src/main/res/values | |
parent | bcc69353e16dac911de23505b1c37bea2d3bdb80 (diff) |
made all text styleable
Diffstat (limited to '')
-rw-r--r-- | src/main/res/values/attrs.xml | 58 | ||||
-rw-r--r-- | src/main/res/values/styles.xml | 54 | ||||
-rw-r--r-- | src/main/res/values/themes.xml | 295 |
3 files changed, 246 insertions, 161 deletions
diff --git a/src/main/res/values/attrs.xml b/src/main/res/values/attrs.xml index 02461ec1a..cbfa86c23 100644 --- a/src/main/res/values/attrs.xml +++ b/src/main/res/values/attrs.xml @@ -1,32 +1,36 @@ <?xml version="1.0" encoding="utf-8"?> <resources> - <attr name="TextSizeTitle" format="dimension" /> <attr name="TextSizeCaption" format="dimension" /> <attr name="TextSizeInfo" format="dimension" /> + <attr name="TextSizeTitle" format="dimension" /> + <attr name="TextSizeSubhead" format="dimension" /> + <attr name="TextSizeBody1" format="dimension" /> + <attr name="TextSizeBody2" format="dimension" /> <attr name="TextSizeInput" format="dimension" /> + <attr name="TextSeparation" format="dimension" /> <attr name="TextSizeBody" format="dimension" /> <attr name="TextSizeHeadline" format="dimension" /> - <attr name="TextSeparation" format="dimension"/> + <attr name="IconSize" format="dimension" /> - <attr name="text_Color_Main" format="reference|color"/> + <attr name="text_Color_Main" format="reference|color" /> <attr name="color_background_secondary" format="reference|color" /> <attr name="color_background_primary" format="reference|color" /> - <attr name="color_warning" format="reference|color"/> + <attr name="color_warning" format="reference|color" /> - <attr name="ic_send_cancel_offline" format="reference"/> - <attr name="ic_send_location_offline" format="reference"/> - <attr name="ic_send_photo_offline" format="reference"/> - <attr name="ic_send_picture_offline" format="reference"/> - <attr name="ic_send_text_offline" format="reference"/> - <attr name="ic_send_videocam_offline" format="reference"/> - <attr name="ic_send_voice_offline" format="reference"/> + <attr name="ic_send_cancel_offline" format="reference" /> + <attr name="ic_send_location_offline" format="reference" /> + <attr name="ic_send_photo_offline" format="reference" /> + <attr name="ic_send_picture_offline" format="reference" /> + <attr name="ic_send_text_offline" format="reference" /> + <attr name="ic_send_videocam_offline" format="reference" /> + <attr name="ic_send_voice_offline" format="reference" /> <attr name="unread_count" format="reference|color" /> - <attr name="conversations_overview_background" format="reference|color"/> + <attr name="conversations_overview_background" format="reference|color" /> <attr name="icon_add_group" format="reference" /> <attr name="icon_add_person" format="reference" /> @@ -52,7 +56,7 @@ <attr name="icon_import_export" format="reference" /> <attr name="icon_scan_qr_code" format="reference" /> <attr name="icon_enable_undecided_device" format="reference" /> - <attr name="icon_scroll_down" format="reference"/> + <attr name="icon_scroll_down" format="reference" /> <attr name="icon_notifications" format="reference" /> <attr name="icon_notifications_off" format="reference" /> @@ -74,25 +78,25 @@ <attr name="ic_file_vcard" format="reference" /> <attr name="ic_file_calendar" format="reference" /> - <attr name="icon_alpha" format="float"/> + <attr name="icon_alpha" format="float" /> - <attr name="popupOverlayStyle" format="reference"/> + <attr name="popupOverlayStyle" format="reference" /> - <attr name="color_bubble_light" format="reference|color"/> - <attr name="color_bubble_blue" format="reference|color"/> - <attr name="color_bubble_date" format="reference|color"/> - <attr name="color_bubble_warning" format="reference|color"/> + <attr name="color_bubble_light" format="reference|color" /> + <attr name="color_bubble_blue" format="reference|color" /> + <attr name="color_bubble_date" format="reference|color" /> + <attr name="color_bubble_warning" format="reference|color" /> - <attr name="color_border" format="reference|color"/> + <attr name="color_border" format="reference|color" /> <!-- settings --> - <attr name="ic_settings_ui" format="reference"/> - <attr name="ic_settings_notifications" format="reference"/> - <attr name="ic_settings_attachments" format="reference"/> - <attr name="ic_settings_status" format="reference"/> - <attr name="ic_settings_security" format="reference"/> - <attr name="ic_settings_expert" format="reference"/> - <attr name="ic_settings_about" format="reference"/> + <attr name="ic_settings_ui" format="reference" /> + <attr name="ic_settings_notifications" format="reference" /> + <attr name="ic_settings_attachments" format="reference" /> + <attr name="ic_settings_status" format="reference" /> + <attr name="ic_settings_security" format="reference" /> + <attr name="ic_settings_expert" format="reference" /> + <attr name="ic_settings_about" format="reference" /> <declare-styleable name="UnreadCountCustomView"> <attr name="backgroundColor" format="reference|color" /> diff --git a/src/main/res/values/styles.xml b/src/main/res/values/styles.xml index ae3a66e48..abf61f8ce 100644 --- a/src/main/res/values/styles.xml +++ b/src/main/res/values/styles.xml @@ -4,30 +4,55 @@ <item name="android:textSize">?TextSizeTitle</item> </style> - <style name="TextAppearance.Conversations.Body1.Secondary" parent="TextAppearance.AppCompat.Body1"> - <item name="android:textColor">?android:textColorSecondary</item> + <style name="TextAppearance.Conversations.Subhead" parent="TextAppearance.AppCompat.Subhead"> + <item name="android:textSize">?TextSizeSubhead</item> </style> - <style name="TextAppearance.Conversations.Fingerprint" parent="TextAppearance.AppCompat.Body1"> - <item name="android:fontFamily" tools:targetApi="jelly_bean">monospace</item> - <item name="android:typeface">monospace</item> + <style name="TextAppearance.Conversations.Body2" parent="TextAppearance.AppCompat.Body2"> + <item name="android:textSize">?TextSizeBody2</item> + </style> + + <style name="TextAppearance.Conversations.Body1" parent="TextAppearance.AppCompat.Body1"> + <item name="android:textSize">?TextSizeBody1</item> + <item name="android:textColorLink">?android:textColorPrimary</item> + </style> + + <style name="TextAppearance.Conversations.Caption" parent="TextAppearance.AppCompat.Caption"> + <item name="android:textSize">?TextSizeCaption</item> </style> <style name="Widget.Conversations.EditText" parent="Widget.AppCompat.EditText"> <item name="android:textSize">?TextSizeInput</item> </style> - <style name="InputLabel" parent="TextAppearance.AppCompat.Caption"> + <style name="TextAppearance.Conversations.Design.Hint" parent="TextAppearance.Design.Hint"> + <item name="android:textSize">?TextSizeCaption</item> + </style> + + <style name="TextAppearance.Conversations.Design.Error" parent="TextAppearance.Design.Error"> + <item name="android:textSize">?TextSizeCaption</item> + </style> + + <style name="TextAppearance.Conversations.Body1.Secondary" parent="TextAppearance.Conversations.Body1"> + <item name="android:textColor">?android:textColorSecondary</item> + </style> + + <style name="TextAppearance.Conversations.Fingerprint" parent="TextAppearance.Conversations.Body1"> + <item name="android:fontFamily" tools:targetApi="jelly_bean">monospace</item> + <item name="android:typeface">monospace</item> + </style> + + <style name="InputLabel" parent="TextAppearance.Conversations.Caption"> <item name="android:paddingBottom">@dimen/input_label_vertical_spacing</item> <item name="android:paddingLeft">@dimen/input_label_horizontal_spacing</item> <item name="android:paddingRight">@dimen/input_label_horizontal_spacing</item> </style> - <style name="TextAppearance.Conversations.Status" parent="TextAppearance.AppCompat.Caption"> + <style name="TextAppearance.Conversations.Status" parent="TextAppearance.Conversations.Caption"> <item name="android:textStyle">italic</item> </style> - <style name="TextAppearance.Conversations.Tag" parent="TextAppearance.AppCompat.Caption"> + <style name="TextAppearance.Conversations.Tag" parent="TextAppearance.Conversations.Caption"> <item name="android:textColor">@color/white</item> </style> @@ -39,10 +64,6 @@ <item name="android:textStyle">bold</item> </style> - <style name="TextAppearance.Conversations.Caption" parent="TextAppearance.AppCompat.Caption"> - <item name="android:textSize">?TextSizeCaption</item> - </style> - <style name="TextAppearance.Conversations.Caption.Waring" parent="TextAppearance.Conversations.Caption"> <item name="android:textColor">@color/red800</item> </style> @@ -59,17 +80,12 @@ <item name="android:textColor">?android:textColorTertiary</item> </style> - <style name="TextAppearance.Conversations.Body1.OnDark" parent="TextAppearance.AppCompat.Body1"> + <style name="TextAppearance.Conversations.Body1.OnDark" parent="TextAppearance.Conversations.Body1"> <item name="android:textColor">@color/white</item> <item name="android:textColorLink">@color/white</item> </style> - <style name="TextAppearance.Conversations.Body1.Secondary.OnDark" parent="TextAppearance.AppCompat.Body1"> + <style name="TextAppearance.Conversations.Body1.Secondary.OnDark" parent="TextAppearance.Conversations.Body1"> <item name="android:textColor">@color/white70</item> </style> - - <style name="TextAppearance.Conversations.Body1" parent="TextAppearance.AppCompat.Body1"> - <item name="android:textColorLink">?android:textColorPrimary</item> - </style> - </resources>
\ No newline at end of file diff --git a/src/main/res/values/themes.xml b/src/main/res/values/themes.xml index 85c18e84e..4495b2f49 100644 --- a/src/main/res/values/themes.xml +++ b/src/main/res/values/themes.xml @@ -24,77 +24,95 @@ <item name="windowActionModeOverlay">true</item> <item name="android:actionModeBackground">@color/accent</item> - <item type="reference" name="android:homeAsUpIndicator">@drawable/ic_arrow_back_white_24dp</item> + <item name="android:homeAsUpIndicator" type="reference">@drawable/ic_arrow_back_white_24dp + </item> - <item name="TextSizeTitle">20sp</item> <item name="TextSizeCaption">12sp</item> + <item name="TextSizeBody1">14sp</item> + <item name="TextSizeBody2">14sp</item> + <item name="TextSizeSubhead">16sp</item> + <item name="TextSizeTitle">20sp</item> + <item name="TextSizeInput">16sp</item> + <item name="TextSeparation">5sp</item> + <item name="IconSize">18sp</item> <item name="TextSizeInfo">12sp</item> - <item name="TextSizeInput">14sp</item> <item name="TextSizeBody">14sp</item> - <item name="TextSeparation">5sp</item> - <item name="IconSize">16sp</item> <item name="TextSizeHeadline">18sp</item> <!--<item type="reference" name="infocard_border">@drawable/infocard_border</item>--> <item name="divider">@color/black12</item> - <item type="reference" name="icon_add_group">@drawable/ic_group_add_white_24dp</item> - <item type="reference" name="icon_add_person">@drawable/ic_person_add_white_24dp</item> - <item type="reference" name="icon_cancel">@drawable/ic_cancel_white_24dp</item> - <item type="reference" name="icon_chat">@drawable/ic_action_chat</item> - <item type="reference" name="icon_copy">@drawable/ic_content_copy_grey600_24dp</item> - <item type="reference" name="icon_discard">@drawable/ic_delete_white_24dp</item> - <item type="reference" name="icon_download">@drawable/ic_file_download_white_24dp</item> - <item type="reference" name="icon_edit">@drawable/ic_edit_white_24dp</item> - <item type="reference" name="icon_edit_body">@drawable/ic_edit_black_24dp</item> - <item type="reference" name="icon_done">@drawable/ic_done_black_24dp</item> - <item type="reference" name="icon_group">@drawable/ic_group_white_24dp</item> - <item type="reference" name="icon_new">@drawable/ic_contacts_white_24dp</item> - <item type="reference" name="icon_new_attachment">@drawable/ic_attach_file_white_24dp</item> - <item type="reference" name="icon_not_secure">@drawable/ic_lock_open_white_24dp</item> - <item type="reference" name="icon_quote">@drawable/ic_reply_white_24dp</item> - <item type="reference" name="icon_refresh">@drawable/ic_refresh_grey600_24dp</item> - <item type="reference" name="icon_remove">@drawable/ic_delete_grey600_24dp</item> - <item type="reference" name="icon_search">@drawable/ic_search_white_24dp</item> - <item type="reference" name="icon_secure">@drawable/ic_lock_open_white_24dp</item> - <item type="reference" name="icon_settings">@drawable/ic_settings_grey600_24dp</item> - <item type="reference" name="icon_import_export">@drawable/ic_import_export_white_24dp</item> - <item type="reference" name="icon_share">@drawable/ic_share_white_24dp</item> - <item type="reference" name="icon_scan_qr_code">@drawable/ic_barcode_scan_white_24dp</item> - <item type="reference" name="icon_scroll_down">@drawable/ic_scroll_to_end_black</item> + <item name="icon_add_group" type="reference">@drawable/ic_group_add_white_24dp</item> + <item name="icon_add_person" type="reference">@drawable/ic_person_add_white_24dp</item> + <item name="icon_cancel" type="reference">@drawable/ic_cancel_white_24dp</item> + <item name="icon_chat" type="reference">@drawable/ic_action_chat</item> + <item name="icon_copy" type="reference">@drawable/ic_content_copy_grey600_24dp</item> + <item name="icon_discard" type="reference">@drawable/ic_delete_white_24dp</item> + <item name="icon_download" type="reference">@drawable/ic_file_download_white_24dp</item> + <item name="icon_edit" type="reference">@drawable/ic_edit_white_24dp</item> + <item name="icon_edit_body" type="reference">@drawable/ic_edit_black_24dp</item> + <item name="icon_done" type="reference">@drawable/ic_done_black_24dp</item> + <item name="icon_group" type="reference">@drawable/ic_group_white_24dp</item> + <item name="icon_new" type="reference">@drawable/ic_contacts_white_24dp</item> + <item name="icon_new_attachment" type="reference">@drawable/ic_attach_file_white_24dp</item> + <item name="icon_not_secure" type="reference">@drawable/ic_lock_open_white_24dp</item> + <item name="icon_quote" type="reference">@drawable/ic_reply_white_24dp</item> + <item name="icon_refresh" type="reference">@drawable/ic_refresh_grey600_24dp</item> + <item name="icon_remove" type="reference">@drawable/ic_delete_grey600_24dp</item> + <item name="icon_search" type="reference">@drawable/ic_search_white_24dp</item> + <item name="icon_secure" type="reference">@drawable/ic_lock_open_white_24dp</item> + <item name="icon_settings" type="reference">@drawable/ic_settings_grey600_24dp</item> + <item name="icon_import_export" type="reference">@drawable/ic_import_export_white_24dp + </item> + <item name="icon_share" type="reference">@drawable/ic_share_white_24dp</item> + <item name="icon_scan_qr_code" type="reference">@drawable/ic_barcode_scan_white_24dp</item> + <item name="icon_scroll_down" type="reference">@drawable/ic_scroll_to_end_black</item> <!-- settings--> - <item type="reference" name="ic_settings_ui">@drawable/ic_image_black_24dp</item> - <item type="reference" name="ic_settings_notifications">@drawable/ic_notifications_black_24dp</item> - <item type="reference" name="ic_settings_attachments">@drawable/ic_attachment_black_24dp</item> - <item type="reference" name="ic_settings_status">@drawable/ic_new_releases_black_24dp</item> - <item type="reference" name="ic_settings_security">@drawable/ic_security_black_24dp</item> - <item type="reference" name="ic_settings_expert">@drawable/ic_settings_black_24dp</item> + <item name="ic_settings_ui" type="reference">@drawable/ic_image_black_24dp</item> + <item name="ic_settings_notifications" type="reference"> + @drawable/ic_notifications_black_24dp + </item> + <item name="ic_settings_attachments" type="reference">@drawable/ic_attachment_black_24dp + </item> + <item name="ic_settings_status" type="reference">@drawable/ic_new_releases_black_24dp</item> + <item name="ic_settings_security" type="reference">@drawable/ic_security_black_24dp</item> + <item name="ic_settings_expert" type="reference">@drawable/ic_settings_black_24dp</item> <item name="dialog_horizontal_padding">16dp</item> <item name="dialog_vertical_padding">16dp</item> - <item type="float" name="icon_alpha">0.54</item> + <item name="icon_alpha" type="float">0.54</item> - <item type="reference" name="ic_attach_camera">@drawable/ic_attach_camera</item> - <item type="reference" name="ic_attach_document">@drawable/ic_attach_document</item> - <item type="reference" name="ic_attach_location">@drawable/ic_attach_location</item> - <item type="reference" name="ic_attach_photo">@drawable/ic_attach_photo</item> - <item type="reference" name="ic_attach_video">@drawable/ic_attach_video</item> - <item type="reference" name="ic_attach_record">@drawable/ic_attach_record</item> + <item name="ic_attach_camera" type="reference">@drawable/ic_attach_camera</item> + <item name="ic_attach_document" type="reference">@drawable/ic_attach_document</item> + <item name="ic_attach_location" type="reference">@drawable/ic_attach_location</item> + <item name="ic_attach_photo" type="reference">@drawable/ic_attach_photo</item> + <item name="ic_attach_video" type="reference">@drawable/ic_attach_video</item> + <item name="ic_attach_record" type="reference">@drawable/ic_attach_record</item> <item name="conversations_overview_background">@color/primary</item> - <item type="reference" name="ic_file_apk">@drawable/ic_file_grey600_48dp</item> - <item type="reference" name="ic_file_pdf">@drawable/ic_file_pdf_grey600_48dp</item> - <item type="reference" name="ic_file_vcard">@drawable/ic_account_card_details_grey600_48dp</item> - <item type="reference" name="ic_file_calendar">@drawable/ic_calendar_grey600_48dp</item> - - <item type="reference" name="icon_notifications">@drawable/ic_notifications_black_24dp</item> - <item type="reference" name="icon_notifications_off">@drawable/ic_notifications_off_black_24dp</item> - <item type="reference" name="icon_notifications_paused">@drawable/ic_notifications_paused_black_24dp</item> - <item type="reference" name="icon_notifications_none">@drawable/ic_notifications_none_black_24dp</item> - <item type="reference" name="icon_enable_undecided_device">@drawable/ic_new_releases_black_24dp</item> - <item type="reference" name="ic_settings_about">@drawable/ic_help_black_24dp</item> + <item name="ic_file_apk" type="reference">@drawable/ic_file_grey600_48dp</item> + <item name="ic_file_pdf" type="reference">@drawable/ic_file_pdf_grey600_48dp</item> + <item name="ic_file_vcard" type="reference">@drawable/ic_account_card_details_grey600_48dp + </item> + <item name="ic_file_calendar" type="reference">@drawable/ic_calendar_grey600_48dp</item> + + <item name="icon_notifications" type="reference">@drawable/ic_notifications_black_24dp + </item> + <item name="icon_notifications_off" type="reference"> + @drawable/ic_notifications_off_black_24dp + </item> + <item name="icon_notifications_paused" type="reference"> + @drawable/ic_notifications_paused_black_24dp + </item> + <item name="icon_notifications_none" type="reference"> + @drawable/ic_notifications_none_black_24dp + </item> + <item name="icon_enable_undecided_device" type="reference"> + @drawable/ic_new_releases_black_24dp + </item> + <item name="ic_settings_about" type="reference">@drawable/ic_help_black_24dp</item> </style> <style name="ConversationsTheme.Dark" parent="Theme.AppCompat.NoActionBar"> @@ -120,98 +138,137 @@ <item name="windowActionModeOverlay">true</item> <item name="android:actionModeBackground">@color/accent</item> - <item name="TextSizeTitle">20sp</item> <item name="TextSizeCaption">12sp</item> + <item name="TextSizeBody1">14sp</item> + <item name="TextSizeBody2">14sp</item> + <item name="TextSizeSubhead">16sp</item> + <item name="TextSizeTitle">20sp</item> + <item name="TextSizeInput">16sp</item> + <item name="TextSeparation">5sp</item> + <item name="IconSize">18sp</item> <item name="TextSizeInfo">12sp</item> - <item name="TextSizeInput">14sp</item> <item name="TextSizeBody">14sp</item> - <item name="TextSeparation">5sp</item> - <item name="IconSize">16sp</item> <item name="TextSizeHeadline">18sp</item> <item name="divider">@color/white12</item> - <item type="reference" name="ic_send_cancel_offline">@drawable/ic_send_cancel_offline_white</item> - <item type="reference" name="ic_send_location_offline">@drawable/ic_send_location_offline_white</item> - <item type="reference" name="ic_send_photo_offline">@drawable/ic_send_photo_offline_white</item> - <item type="reference" name="ic_send_picture_offline">@drawable/ic_send_picture_offline_white</item> - <item type="reference" name="ic_send_text_offline">@drawable/ic_send_text_offline_white</item> - <item type="reference" name="ic_send_videocam_offline">@drawable/ic_send_videocam_offline_white</item> - <item type="reference" name="ic_send_voice_offline">@drawable/ic_send_voice_offline_white</item> - - <item type="reference" name="ic_attach_camera">@drawable/ic_attach_camera_white</item> - <item type="reference" name="ic_attach_video">@drawable/ic_attach_videocam_white</item> - <item type="reference" name="ic_attach_document">@drawable/ic_attach_document_white</item> - <item type="reference" name="ic_attach_location">@drawable/ic_attach_location_white</item> - <item type="reference" name="ic_attach_photo">@drawable/ic_attach_photo_white</item> - <item type="reference" name="ic_attach_record">@drawable/ic_attach_record_white</item> + <item name="ic_send_cancel_offline" type="reference"> + @drawable/ic_send_cancel_offline_white + </item> + <item name="ic_send_location_offline" type="reference"> + @drawable/ic_send_location_offline_white + </item> + <item name="ic_send_photo_offline" type="reference">@drawable/ic_send_photo_offline_white + </item> + <item name="ic_send_picture_offline" type="reference"> + @drawable/ic_send_picture_offline_white + </item> + <item name="ic_send_text_offline" type="reference">@drawable/ic_send_text_offline_white + </item> + <item name="ic_send_videocam_offline" type="reference"> + @drawable/ic_send_videocam_offline_white + </item> + <item name="ic_send_voice_offline" type="reference">@drawable/ic_send_voice_offline_white + </item> + + <item name="ic_attach_camera" type="reference">@drawable/ic_attach_camera_white</item> + <item name="ic_attach_video" type="reference">@drawable/ic_attach_videocam_white</item> + <item name="ic_attach_document" type="reference">@drawable/ic_attach_document_white</item> + <item name="ic_attach_location" type="reference">@drawable/ic_attach_location_white</item> + <item name="ic_attach_photo" type="reference">@drawable/ic_attach_photo_white</item> + <item name="ic_attach_record" type="reference">@drawable/ic_attach_record_white</item> <item name="conversations_overview_background">@color/primary_dark</item> - <item type="float" name="icon_alpha">0.7</item> + <item name="icon_alpha" type="float">0.7</item> <item name="dialog_horizontal_padding">24dp</item> <item name="dialog_vertical_padding">16dp</item> - <item type="reference" name="icon_add_group">@drawable/ic_group_add_white_24dp</item> - <item type="reference" name="icon_add_person">@drawable/ic_person_add_white_24dp</item> - <item type="reference" name="icon_cancel">@drawable/ic_cancel_white_24dp</item> - <item type="reference" name="icon_copy">@drawable/ic_content_copy_white_24dp</item> - <item type="reference" name="icon_discard">@drawable/ic_delete_white_24dp</item> - <item type="reference" name="icon_download">@drawable/ic_file_download_white_24dp</item> - <item type="reference" name="icon_edit">@drawable/ic_edit_white_24dp</item> - <item type="reference" name="icon_edit_body">@drawable/ic_edit_white_24dp</item> - <item type="reference" name="icon_done">@drawable/ic_done_black_24dp</item> - <item type="reference" name="icon_group">@drawable/ic_group_white_24dp</item> - <item type="reference" name="icon_new">@drawable/ic_add_white_24dp</item> - <item type="reference" name="icon_quote">@drawable/ic_reply_white_24dp</item> - <item type="reference" name="icon_refresh">@drawable/ic_refresh_white_24dp</item> - <item type="reference" name="icon_new_attachment">@drawable/ic_attach_file_white_24dp</item> - <item type="reference" name="icon_not_secure">@drawable/ic_lock_open_white_24dp</item> - <item type="reference" name="icon_remove">@drawable/ic_delete_white_24dp</item> - <item type="reference" name="icon_search">@drawable/ic_search_white_24dp</item> - <item type="reference" name="icon_secure">@drawable/ic_lock_open_white_24dp</item> - <item type="reference" name="icon_settings">@drawable/ic_settings_white_24dp</item> - <item type="reference" name="icon_import_export">@drawable/ic_import_export_white_24dp</item> - <item type="reference" name="icon_share">@drawable/ic_share_white_24dp</item> - <item type="reference" name="icon_scan_qr_code">@drawable/ic_barcode_scan_white_24dp</item> - <item type="reference" name="icon_scroll_down">@drawable/ic_scroll_to_end_white</item> - - <item type="reference" name="icon_notifications">@drawable/ic_notifications_white_24dp</item> - <item type="reference" name="icon_notifications_off">@drawable/ic_notifications_off_white_24dp</item> - <item type="reference" name="icon_notifications_paused">@drawable/ic_notifications_paused_white_24dp</item> - <item type="reference" name="icon_notifications_none">@drawable/ic_notifications_none_white_24dp</item> - <item type="reference" name="icon_enable_undecided_device">@drawable/ic_new_releases_white_24dp</item> + <item name="icon_add_group" type="reference">@drawable/ic_group_add_white_24dp</item> + <item name="icon_add_person" type="reference">@drawable/ic_person_add_white_24dp</item> + <item name="icon_cancel" type="reference">@drawable/ic_cancel_white_24dp</item> + <item name="icon_copy" type="reference">@drawable/ic_content_copy_white_24dp</item> + <item name="icon_discard" type="reference">@drawable/ic_delete_white_24dp</item> + <item name="icon_download" type="reference">@drawable/ic_file_download_white_24dp</item> + <item name="icon_edit" type="reference">@drawable/ic_edit_white_24dp</item> + <item name="icon_edit_body" type="reference">@drawable/ic_edit_white_24dp</item> + <item name="icon_done" type="reference">@drawable/ic_done_black_24dp</item> + <item name="icon_group" type="reference">@drawable/ic_group_white_24dp</item> + <item name="icon_new" type="reference">@drawable/ic_add_white_24dp</item> + <item name="icon_quote" type="reference">@drawable/ic_reply_white_24dp</item> + <item name="icon_refresh" type="reference">@drawable/ic_refresh_white_24dp</item> + <item name="icon_new_attachment" type="reference">@drawable/ic_attach_file_white_24dp</item> + <item name="icon_not_secure" type="reference">@drawable/ic_lock_open_white_24dp</item> + <item name="icon_remove" type="reference">@drawable/ic_delete_white_24dp</item> + <item name="icon_search" type="reference">@drawable/ic_search_white_24dp</item> + <item name="icon_secure" type="reference">@drawable/ic_lock_open_white_24dp</item> + <item name="icon_settings" type="reference">@drawable/ic_settings_white_24dp</item> + <item name="icon_import_export" type="reference">@drawable/ic_import_export_white_24dp + </item> + <item name="icon_share" type="reference">@drawable/ic_share_white_24dp</item> + <item name="icon_scan_qr_code" type="reference">@drawable/ic_barcode_scan_white_24dp</item> + <item name="icon_scroll_down" type="reference">@drawable/ic_scroll_to_end_white</item> + + <item name="icon_notifications" type="reference">@drawable/ic_notifications_white_24dp + </item> + <item name="icon_notifications_off" type="reference"> + @drawable/ic_notifications_off_white_24dp + </item> + <item name="icon_notifications_paused" type="reference"> + @drawable/ic_notifications_paused_white_24dp + </item> + <item name="icon_notifications_none" type="reference"> + @drawable/ic_notifications_none_white_24dp + </item> + <item name="icon_enable_undecided_device" type="reference"> + @drawable/ic_new_releases_white_24dp + </item> <!-- settings--> - <item type="reference" name="ic_settings_ui">@drawable/ic_image_white_24dp</item> - <item type="reference" name="ic_settings_notifications">@drawable/ic_notifications_white_24dp</item> - <item type="reference" name="ic_settings_attachments">@drawable/ic_attachment_white_24dp</item> - <item type="reference" name="ic_settings_status">@drawable/ic_new_releases_white_24dp</item> - <item type="reference" name="ic_settings_security">@drawable/ic_security_white_24dp</item> - <item type="reference" name="ic_settings_expert">@drawable/ic_settings_white_24dp</item> - <item type="reference" name="ic_settings_about">@drawable/ic_help_circle_white_24dp</item> + <item name="ic_settings_ui" type="reference">@drawable/ic_image_white_24dp</item> + <item name="ic_settings_notifications" type="reference"> + @drawable/ic_notifications_white_24dp + </item> + <item name="ic_settings_attachments" type="reference">@drawable/ic_attachment_white_24dp + </item> + <item name="ic_settings_status" type="reference">@drawable/ic_new_releases_white_24dp</item> + <item name="ic_settings_security" type="reference">@drawable/ic_security_white_24dp</item> + <item name="ic_settings_expert" type="reference">@drawable/ic_settings_white_24dp</item> + <item name="ic_settings_about" type="reference">@drawable/ic_help_circle_white_24dp</item> </style> <style name="ConversationsTheme.LargerText" parent="ConversationsTheme"> - <item name="TextSizeTitle">22sp</item> - <item name="TextSizeCaption">14sp</item> - <item name="TextSizeInfo">14sp</item> + <item name="TextSizeCaption">12sp</item> + <item name="TextSizeBody1">14sp</item> + <item name="TextSizeBody2">14sp</item> + <item name="TextSizeSubhead">16sp</item> + <item name="TextSizeTitle">20sp</item> <item name="TextSizeInput">16sp</item> - <item name="TextSizeBody">16sp</item> + <item name="TextSeparation">5sp</item> <item name="IconSize">18sp</item> - <item name="TextSizeHeadline">20sp</item> + <item name="TextSizeInfo">12sp</item> + <item name="TextSizeBody">14sp</item> + <item name="TextSizeHeadline">18sp</item> </style> <style name="ConversationsDialog" parent="Theme.AppCompat.Light.Dialog"> <item name="android:windowNoTitle">true</item> <item name="android:windowActionBar">false</item> + <item name="TextSizeCaption">12sp</item> + <item name="TextSizeBody1">14sp</item> + <item name="TextSizeBody2">14sp</item> + <item name="TextSizeSubhead">16sp</item> + <item name="TextSizeTitle">20sp</item> + <item name="TextSizeInput">16sp</item> + <item name="TextSeparation">5sp</item> + <item name="IconSize">18sp</item> <item name="TextSizeInfo">12sp</item> <item name="TextSizeBody">14sp</item> - <item name="TextSizeInput">14sp</item> <item name="TextSizeHeadline">18sp</item> + <item name="colorAccent">@color/accent</item> <item name="color_background_primary">@color/grey50</item> <item name="color_background_secondary">@color/grey200</item> @@ -222,9 +279,17 @@ <style name="ConversationsDialog.Dark" parent="Theme.AppCompat.Dialog"> <item name="android:windowNoTitle">true</item> <item name="android:windowActionBar">false</item> + + <item name="TextSizeCaption">12sp</item> + <item name="TextSizeBody1">14sp</item> + <item name="TextSizeBody2">14sp</item> + <item name="TextSizeSubhead">16sp</item> + <item name="TextSizeTitle">20sp</item> + <item name="TextSizeInput">16sp</item> + <item name="TextSeparation">5sp</item> + <item name="IconSize">18sp</item> <item name="TextSizeInfo">12sp</item> <item name="TextSizeBody">14sp</item> - <item name="TextSizeInput">14sp</item> <item name="TextSizeHeadline">18sp</item> <item name="colorAccent">@color/accent</item> |