diff options
author | Christian Schneppe <christian@pix-art.de> | 2018-04-13 23:33:56 +0200 |
---|---|---|
committer | Christian Schneppe <christian@pix-art.de> | 2018-04-21 23:49:06 +0200 |
commit | 2e43a5c0a6176911f0ab86b3c55dd57845b45f30 (patch) | |
tree | 5448c941e6a23944340afef3d456d00b2bbd50a9 /src/main/res/values | |
parent | 0be385fec3caee21a5eab3b9ca2c659749b4a1aa (diff) |
more theme working
Diffstat (limited to 'src/main/res/values')
-rw-r--r-- | src/main/res/values/arrays.xml | 9 | ||||
-rw-r--r-- | src/main/res/values/attrs.xml | 22 | ||||
-rw-r--r-- | src/main/res/values/colors.xml | 11 | ||||
-rw-r--r-- | src/main/res/values/defaults.xml | 1 | ||||
-rw-r--r-- | src/main/res/values/strings.xml | 5 | ||||
-rw-r--r-- | src/main/res/values/styles.xml | 11 | ||||
-rw-r--r-- | src/main/res/values/themes.xml | 81 |
7 files changed, 132 insertions, 8 deletions
diff --git a/src/main/res/values/arrays.xml b/src/main/res/values/arrays.xml index 3ded5490e..7d7823a46 100644 --- a/src/main/res/values/arrays.xml +++ b/src/main/res/values/arrays.xml @@ -1,5 +1,14 @@ <?xml version="1.0" encoding="utf-8"?> <resources> + <string-array name="themes"> + <item>@string/pref_theme_light</item> + <item>@string/pref_theme_dark</item> + </string-array> + <string-array name="themes_values"> + <item>light</item> + <item>dark</item> + </string-array> + <string-array name="filesizes"> <item>@string/never</item> <item>256 KiB</item> diff --git a/src/main/res/values/attrs.xml b/src/main/res/values/attrs.xml index faaa662ec..f9fb003f6 100644 --- a/src/main/res/values/attrs.xml +++ b/src/main/res/values/attrs.xml @@ -1,12 +1,17 @@ <?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="TextSizeInput" 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="color_background_secondary" format="reference|color" /> <attr name="color_background_primary" format="reference|color" /> <attr name="color_warning" format="reference|color"/> @@ -71,5 +76,20 @@ <attr name="icon_alpha" format="float"/> <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_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"/> </resources>
\ No newline at end of file diff --git a/src/main/res/values/colors.xml b/src/main/res/values/colors.xml index 347783b72..e25826403 100644 --- a/src/main/res/values/colors.xml +++ b/src/main/res/values/colors.xml @@ -4,10 +4,11 @@ <color name="primary">#ff2e4272</color> <color name="primary_dark">#ff08183e</color> <color name="dark">#ff000309</color> - <color name="accent">#ff2e4272</color> + <color name="accent">#ff0091ea</color> <color name="black87">#de000309</color> <color name="black54">#8a000309</color> <color name="black12">#1f000000</color> + <color name="realblack">#ff000000</color> <color name="white">#ffe2e7f1</color> <color name="white12">#1fffffff</color> <color name="white70">#b2e2e7f1</color> @@ -24,14 +25,22 @@ <color name="orange500">#ffff9800</color> <color name="bubble">#ff2e4272</color> <color name="realwhite">#ffffffff</color> + + <!-- bubbles --> <color name="lightwhite">#fffafbfd</color> + <color name="darkwhite">#ff424242</color> <color name="lightblue">#ffd7deee</color> + <color name="darkblue">#ff08183e</color> <color name="lightred">#fff5d9d9</color> + <color name="darkred">#ff521010</color> <color name="lightgreen">#ffcaf2ca</color> + <color name="darkgreen">#ff165d15</color> + <color name="online">#ff259b24</color> <color name="away">#ffff9800</color> <color name="notavailable">#fff44336</color> <color name="warning_button">#fff5d9d9</color> + <color name="warning_button_dark">#ff521010</color> <!-- scanner --> <color name="scan_result_dots">#c04CAF50</color> diff --git a/src/main/res/values/defaults.xml b/src/main/res/values/defaults.xml index 201b9aedc..d3f76d528 100644 --- a/src/main/res/values/defaults.xml +++ b/src/main/res/values/defaults.xml @@ -103,5 +103,6 @@ <bool name="show_qr_code_scan">true</bool> <bool name="scroll_to_bottom">true</bool> <string name="omemo_setting_default">default_off</string> + <string name="theme">light</string> </resources> diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index b78ea9b49..6b72fa1a7 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -753,7 +753,6 @@ <string name="mtm_connect_anyway">Do you want to connect anyway?</string> <string name="mtm_cert_details">Certificate details:</string> <string name="once">Once</string> - <string name="theme">Theme</string> <string name="qr_code_scanner_needs_access_to_camera">The QR code scanner needs access to the camera</string> <string name="pref_scroll_to_bottom_summary">Scroll down after sending a message</string> <string name="pref_scroll_to_bottom">Scroll to bottom</string> @@ -778,4 +777,8 @@ <string name="pref_omemo_setting_summary_default_off">OMEMO will have to be turned on explicitly for new conversations.</string> <string name="default_on">On by default</string> <string name="default_off">Off by default</string> + <string name="pref_theme_light">Light theme</string> + <string name="pref_theme_dark">Dark theme</string> + <string name="pref_theme_options_summary">Select the color palette</string> + <string name="pref_theme_options">Theme</string> </resources> diff --git a/src/main/res/values/styles.xml b/src/main/res/values/styles.xml index 1995c7130..ae3a66e48 100644 --- a/src/main/res/values/styles.xml +++ b/src/main/res/values/styles.xml @@ -1,5 +1,8 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools"> + <style name="TextAppearance.Conversations.Title" parent="TextAppearance.AppCompat.Title"> + <item name="android:textSize">?TextSizeTitle</item> + </style> <style name="TextAppearance.Conversations.Body1.Secondary" parent="TextAppearance.AppCompat.Body1"> <item name="android:textColor">?android:textColorSecondary</item> @@ -10,6 +13,10 @@ <item name="android:typeface">monospace</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"> <item name="android:paddingBottom">@dimen/input_label_vertical_spacing</item> <item name="android:paddingLeft">@dimen/input_label_horizontal_spacing</item> @@ -32,7 +39,9 @@ <item name="android:textStyle">bold</item> </style> - <style name="TextAppearance.Conversations.Caption" parent="TextAppearance.AppCompat.Caption"></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> diff --git a/src/main/res/values/themes.xml b/src/main/res/values/themes.xml index 0fed4d2b3..e757b7817 100644 --- a/src/main/res/values/themes.xml +++ b/src/main/res/values/themes.xml @@ -6,17 +6,30 @@ <item name="colorPrimaryDark">@color/primary_dark</item> <item name="colorAccent">@color/accent</item> <item name="popupOverlayStyle">@style/ThemeOverlay.AppCompat.Light</item> + <item name="colorControlNormal">@color/accent</item> + <item name="colorControlActivated">@color/accent</item> + <item name="text_Color_Main">@color/realblack</item> <item name="color_background_primary">@color/grey50</item> <item name="color_background_secondary">@color/grey200</item> <item name="color_warning">@color/red_a700</item> + <item name="color_bubble_light">@color/lightwhite</item> + <item name="color_bubble_blue">@color/lightblue</item> + <item name="color_bubble_date">@color/lightgreen</item> + <item name="color_bubble_warning">@color/lightred</item> + + <item name="color_border">@color/grey500</item> + <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="TextSizeTitle">20sp</item> + <item name="TextSizeCaption">12sp</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> @@ -48,6 +61,15 @@ <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> + + <!-- 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="dialog_horizontal_padding">16dp</item> <item name="dialog_vertical_padding">16dp</item> <item type="float" name="icon_alpha">0.54</item> @@ -71,6 +93,7 @@ <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> </style> <style name="ConversationsTheme.Dark" parent="Theme.AppCompat.NoActionBar"> @@ -78,17 +101,32 @@ <item name="colorPrimaryDark">@color/primary_dark</item> <item name="colorAccent">@color/accent</item> <item name="popupOverlayStyle">@style/ThemeOverlay.AppCompat.Dark</item> + <item name="colorControlNormal">@color/accent</item> + <item name="colorControlActivated">@color/accent</item> + <item name="text_Color_Main">@color/realwhite</item> + + <item name="color_background_primary">@color/grey900</item> + <item name="color_background_secondary">@color/realblack</item> + <item name="color_warning">@color/red_a700</item> + + <item name="color_bubble_light">@color/darkwhite</item> + <item name="color_bubble_blue">@color/darkblue</item> + <item name="color_bubble_date">@color/darkgreen</item> + <item name="color_bubble_warning">@color/darkred</item> - <item name="color_background_primary">@color/grey800</item> - <item name="color_background_secondary">@color/grey900</item> - <item name="color_warning">@color/red_a100</item> + <item name="color_border">@color/grey800</item> <item name="windowActionModeOverlay">true</item> <item name="android:actionModeBackground">@color/accent</item> + <item name="TextSizeTitle">20sp</item> + <item name="TextSizeCaption">12sp</item> <item name="TextSizeInfo">12sp</item> + <item name="TextSizeInput">14sp</item> + <item name="TextSizeBody">14sp</item> <item name="TextSeparation">5sp</item> - <item name="IconSize">18sp</item> + <item name="IconSize">16sp</item> + <item name="TextSizeHeadline">18sp</item> <item name="divider">@color/white12</item> @@ -142,11 +180,23 @@ <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> + + <!-- 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> </style> <style name="ConversationsTheme.LargerText" parent="ConversationsTheme"> + <item name="TextSizeTitle">22sp</item> + <item name="TextSizeCaption">14sp</item> <item name="TextSizeInfo">14sp</item> + <item name="TextSizeInput">16sp</item> <item name="TextSizeBody">16sp</item> <item name="IconSize">18sp</item> <item name="TextSizeHeadline">20sp</item> @@ -154,9 +204,32 @@ <style name="ConversationsDialog" parent="Theme.AppCompat.Light.Dialog"> <item name="android:windowNoTitle">true</item> + <item name="android:windowActionBar">false</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> + + <item name="android:background">@color/grey50</item> + </style> + + <style name="ConversationsDialog.Dark" parent="Theme.AppCompat.Dialog"> + <item name="android:windowNoTitle">true</item> + <item name="android:windowActionBar">false</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/grey900</item> + <item name="color_background_secondary">@color/realblack</item> + + <item name="android:background">@color/grey900</item> </style> <style name="ConversationsTheme.FullScreen" parent="@style/Theme.AppCompat.Light"> |