From 72c14b8651db3400e7ab33a3f8e7482753b5f8ac Mon Sep 17 00:00:00 2001 From: Alex Hart Date: Fri, 1 Nov 2019 10:18:49 -0300 Subject: [PATCH] Apply new Keyboard and Dial Pad icons. --- res/drawable-hdpi/ic_dialpad_white_24dp.webp | Bin 248 -> 0 bytes res/drawable-hdpi/ic_keyboard_white_24dp.webp | Bin 166 -> 0 bytes res/drawable-mdpi/ic_dialpad_white_24dp.webp | Bin 140 -> 0 bytes res/drawable-mdpi/ic_keyboard_white_24dp.webp | Bin 102 -> 0 bytes res/drawable-xhdpi/ic_dialpad_white_24dp.webp | Bin 244 -> 0 bytes res/drawable-xhdpi/ic_keyboard_white_24dp.webp | Bin 154 -> 0 bytes res/drawable-xxhdpi/ic_dialpad_white_24dp.webp | Bin 306 -> 0 bytes res/drawable-xxhdpi/ic_keyboard_white_24dp.webp | Bin 192 -> 0 bytes res/drawable-xxxhdpi/ic_dialpad_white_24dp.webp | Bin 264 -> 0 bytes res/drawable-xxxhdpi/ic_keyboard_white_24dp.webp | Bin 234 -> 0 bytes res/drawable/ic_keyboard_outline_24.xml | 5 +++++ .../ic_keyboard_outline_contact_filter_24.xml | 5 +++++ res/drawable/ic_keyboard_solid_24.xml | 5 +++++ .../ic_keyboard_solid_contact_filter_24.xml | 5 +++++ .../ic_number_pad_conversation_filter_24.xml | 5 +++++ res/drawable/ic_x_conversation_filter_24.xml | 9 +++++++++ res/layout/contact_filter_toolbar.xml | 11 +++++------ res/values/attrs.xml | 1 + res/values/themes.xml | 6 ++++-- .../securesms/ApplicationPreferencesActivity.java | 12 ++++++++++++ 20 files changed, 56 insertions(+), 8 deletions(-) delete mode 100644 res/drawable-hdpi/ic_dialpad_white_24dp.webp delete mode 100644 res/drawable-hdpi/ic_keyboard_white_24dp.webp delete mode 100644 res/drawable-mdpi/ic_dialpad_white_24dp.webp delete mode 100644 res/drawable-mdpi/ic_keyboard_white_24dp.webp delete mode 100644 res/drawable-xhdpi/ic_dialpad_white_24dp.webp delete mode 100644 res/drawable-xhdpi/ic_keyboard_white_24dp.webp delete mode 100644 res/drawable-xxhdpi/ic_dialpad_white_24dp.webp delete mode 100644 res/drawable-xxhdpi/ic_keyboard_white_24dp.webp delete mode 100644 res/drawable-xxxhdpi/ic_dialpad_white_24dp.webp delete mode 100644 res/drawable-xxxhdpi/ic_keyboard_white_24dp.webp create mode 100644 res/drawable/ic_keyboard_outline_24.xml create mode 100644 res/drawable/ic_keyboard_outline_contact_filter_24.xml create mode 100644 res/drawable/ic_keyboard_solid_24.xml create mode 100644 res/drawable/ic_keyboard_solid_contact_filter_24.xml create mode 100644 res/drawable/ic_number_pad_conversation_filter_24.xml create mode 100644 res/drawable/ic_x_conversation_filter_24.xml diff --git a/res/drawable-hdpi/ic_dialpad_white_24dp.webp b/res/drawable-hdpi/ic_dialpad_white_24dp.webp deleted file mode 100644 index 2745be7b45d523e17439e28d5a461a13e8b4dffb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 248 zcmV|5LIcNnwrXKial! zVl>;ZR(~_K?F-4LlF#_$sxn9o%j3|i0HrCwr!YbN^#m5*bo$wW{)Tq uEwV@CZq#`2YX_ diff --git a/res/drawable-xhdpi/ic_dialpad_white_24dp.webp b/res/drawable-xhdpi/ic_dialpad_white_24dp.webp deleted file mode 100644 index 3ff68838ad2426afc572dae37b9568e95d0f5aba..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 244 zcmVu!_fBwz1ZBzFg zkC7O>Ax|VP0HAmj0070o$H0*!NsTl3^^5)gUo|6WWUmqZN87e-tY#MqT|wW2T~k^N z3EWZ3Zu<_%-R;4pg<52X+x8vCTbm%T!_fp=-(kGe1c@DL6Xd=FyvPov>sH_`P2kyK zZ-S-oFrK+s=Tt=W^yjA@I}FevMK6xXZaFV{;P8j|`Q75J7I=88c(-_~6W!vi{;zKF uR^e{(R`G7(Rwuf}Tm2v1{yE@QCk}2E2X7SzZxyG!e0Zxk6Rl3XZ*CO=?RKXC diff --git a/res/drawable-xhdpi/ic_keyboard_white_24dp.webp b/res/drawable-xhdpi/ic_keyboard_white_24dp.webp deleted file mode 100644 index efe30aaf78dc65422f5c0b7a071109e8e79d20e9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 154 zcmWIYbaR`;z`zjh>J$(bVBymWWb5l6;1-x}@c*;@f38~|UF*Ixcm*`tw6H%CXOL%Q zs9^A5kYQkWY&J>cs$uX``FC#(|0(^lXZ-WH@ZPTKcs1@tx17y9HNGxzU18-VF4dQm zVZ+(Lqya<+F3(Kst1x3=4FIBs-5*ulYuwhkcwT&aJyr0( G1p@%i9Xs^^ diff --git a/res/drawable-xxhdpi/ic_dialpad_white_24dp.webp b/res/drawable-xxhdpi/ic_dialpad_white_24dp.webp deleted file mode 100644 index 8d31a0653744968857ca9b4e5641c3a4a3f092d7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 306 zcmV-20nPqWNk&F00RRA3MM6+kP&iB;0RR9mN5Byf_aGKb<}ckB!~D;`nzoVT>?Zs5 z2jC!GcZui$00%%k03d+);2KPvq{b%I1Z6s@Y*KB%( z_agE0_Ph>d;8_T(@#f6QsV)OkT?VGQ3`}(ym|8O2&zR~mFx6#%s>=XXm*MqS E7f82{4gdfE diff --git a/res/drawable-xxhdpi/ic_keyboard_white_24dp.webp b/res/drawable-xxhdpi/ic_keyboard_white_24dp.webp deleted file mode 100644 index 5d3798cdeb6ac7d99babaa30ee6de1e4a8594ba5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 192 zcmWIYbaUImz`zjh>J$(bVBxbG$kum1ASiI&;Qwd){~1!AS-+n5B{azShOj)7E@0qy zWRPcNU=cXr8py)U@W5+QimKF|*w_EU=Spz2ef`_<;y=rY`^Ob@)%Et9R90xbDzG}j z-XylYHo?1K&P^`=t+`)JZio5b*!J8t!~p`Yn4hh)*PE{r$Owh;I`hP*&u6my8@ypo n!NZ%^Dpuv}Tz*B2uWr`?wZivHyPsstxcd3)GcDdH@0A$<;m%P; diff --git a/res/drawable-xxxhdpi/ic_dialpad_white_24dp.webp b/res/drawable-xxxhdpi/ic_dialpad_white_24dp.webp deleted file mode 100644 index fb65d3fa27b10bc4bd27787dcb0dd00b7fecedf1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 264 zcmV+j0r&n=Nk&Eh0RRA3MM6+kP&iEU0000lU%(d-zcByvKmUr_MslN@TqAJre#kBm zZvfyyhz|e+$T$$90|+nx3V_2lk`(EfnI`{Sckga$o-v~T4BNJiWZnS2-!lYHiL9R2 zb*fT>K9IN(*H%XceF$+cJGuz(gB*?Qsto$*WwLKe`9Av8a-ih<=rhZKk?*6=DhC$6 z&-G`L0|VbjpGpqod>?(%O?GVw-$$RL2fZ-p1Bg1=(S`a7S3`asfhT$UkE z4EnrH{IT6#Zy)r&;^F&>$L}j1zOQ)vzT)xwipTFO9>0HZR}g+*@%VkkGuT%=eqZqn O_7%@yUm1AL_7wnR6Mjzs diff --git a/res/drawable-xxxhdpi/ic_keyboard_white_24dp.webp b/res/drawable-xxxhdpi/ic_keyboard_white_24dp.webp deleted file mode 100644 index 8b1cc291a74ca3400c35d8ee31d94be6453538b6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 234 zcmVu!_fBw}*vO%Z4 z_k41ZoW>+97k~vp01pBO;s5{*2S5x8_;BDxlB4wHob$o#|NprfX3@=&ks|s(0r)E( zm(ywvzfNW3%CE^NNtN%!Z;hgz@1iiOmJR~ag(6vEl+9(mHlu9TW|1x07}@$#0c(M^ zz*=A}u;;eDz4lYl@%3`K39JRy0&9V_z`i%GFBKinhu&W1v~c&&vDMjO7ulrEAS<;= kWfAE@p$wHS865hZCXMF;ennbP=D~54kIV6vAr0|Y9I2jh!T + + diff --git a/res/drawable/ic_keyboard_outline_contact_filter_24.xml b/res/drawable/ic_keyboard_outline_contact_filter_24.xml new file mode 100644 index 000000000..2f8defd76 --- /dev/null +++ b/res/drawable/ic_keyboard_outline_contact_filter_24.xml @@ -0,0 +1,5 @@ + + + diff --git a/res/drawable/ic_keyboard_solid_24.xml b/res/drawable/ic_keyboard_solid_24.xml new file mode 100644 index 000000000..0f4c43b4a --- /dev/null +++ b/res/drawable/ic_keyboard_solid_24.xml @@ -0,0 +1,5 @@ + + + diff --git a/res/drawable/ic_keyboard_solid_contact_filter_24.xml b/res/drawable/ic_keyboard_solid_contact_filter_24.xml new file mode 100644 index 000000000..087b44f1b --- /dev/null +++ b/res/drawable/ic_keyboard_solid_contact_filter_24.xml @@ -0,0 +1,5 @@ + + + diff --git a/res/drawable/ic_number_pad_conversation_filter_24.xml b/res/drawable/ic_number_pad_conversation_filter_24.xml new file mode 100644 index 000000000..e124c4818 --- /dev/null +++ b/res/drawable/ic_number_pad_conversation_filter_24.xml @@ -0,0 +1,5 @@ + + + diff --git a/res/drawable/ic_x_conversation_filter_24.xml b/res/drawable/ic_x_conversation_filter_24.xml new file mode 100644 index 000000000..7214e629e --- /dev/null +++ b/res/drawable/ic_x_conversation_filter_24.xml @@ -0,0 +1,9 @@ + + + diff --git a/res/layout/contact_filter_toolbar.xml b/res/layout/contact_filter_toolbar.xml index 7fb217f05..40aa3167c 100644 --- a/res/layout/contact_filter_toolbar.xml +++ b/res/layout/contact_filter_toolbar.xml @@ -1,5 +1,6 @@ - + + app:srcCompat="@drawable/ic_number_pad_conversation_filter_24" /> + app:srcCompat="?conversation_keyboard_toggle" /> + app:srcCompat="@drawable/ic_x_conversation_filter_24" /> diff --git a/res/values/attrs.xml b/res/values/attrs.xml index 4e1bdfbd6..486081f42 100644 --- a/res/values/attrs.xml +++ b/res/values/attrs.xml @@ -125,6 +125,7 @@ + diff --git a/res/values/themes.xml b/res/values/themes.xml index a8b711921..1d953c0b6 100644 --- a/res/values/themes.xml +++ b/res/values/themes.xml @@ -180,6 +180,7 @@ ?icon_tint ?icon_tint + @drawable/ic_keyboard_outline_contact_filter_24 @drawable/conversation_list_item_background @color/core_grey_90 @@ -210,7 +211,7 @@ @color/white @drawable/ic_emoji_smiley_outline_24 @drawable/ic_sticker_outline_24 - @drawable/ic_keyboard_grey600_24dp + @drawable/ic_keyboard_outline_24 @drawable/ic_camera_outline_24 @drawable/ic_image_light @drawable/ic_movie_creation_light @@ -396,6 +397,7 @@ ?icon_tint ?icon_tint + @drawable/ic_keyboard_solid_contact_filter_24 @drawable/conversation_list_item_background_dark #ffdddddd @@ -461,7 +463,7 @@ @color/black @drawable/ic_emoji_smiley_solid_24 @drawable/ic_sticker_solid_24 - @drawable/ic_keyboard_white_24dp + @drawable/ic_keyboard_solid_24 @drawable/ic_camera_solid_24 @drawable/ic_image_dark @drawable/ic_movie_creation_dark diff --git a/src/org/thoughtcrime/securesms/ApplicationPreferencesActivity.java b/src/org/thoughtcrime/securesms/ApplicationPreferencesActivity.java index 0bb355edd..0b13a567c 100644 --- a/src/org/thoughtcrime/securesms/ApplicationPreferencesActivity.java +++ b/src/org/thoughtcrime/securesms/ApplicationPreferencesActivity.java @@ -19,6 +19,8 @@ package org.thoughtcrime.securesms; import android.content.Intent; import android.content.SharedPreferences; +import android.graphics.PorterDuff; +import android.os.Build; import android.os.Bundle; import androidx.annotation.Nullable; @@ -40,6 +42,7 @@ import org.thoughtcrime.securesms.service.KeyCachingService; import org.thoughtcrime.securesms.util.DynamicLanguage; import org.thoughtcrime.securesms.util.DynamicTheme; import org.thoughtcrime.securesms.util.TextSecurePreferences; +import org.thoughtcrime.securesms.util.ThemeUtil; /** * The Activity for application preference display and management. @@ -148,6 +151,15 @@ public class ApplicationPreferencesActivity extends PassphraseRequiredActionBarA .setOnPreferenceClickListener(new CategoryClickListener(PREFERENCE_CATEGORY_DEVICES)); this.findPreference(PREFERENCE_CATEGORY_ADVANCED) .setOnPreferenceClickListener(new CategoryClickListener(PREFERENCE_CATEGORY_ADVANCED)); + + tintIcons(); + } + + private void tintIcons() { + if (Build.VERSION.SDK_INT >= 21) return; + + Preference preference = this.findPreference(PREFERENCE_CATEGORY_SMS_MMS); + preference.getIcon().setColorFilter(ThemeUtil.getThemedColor(requireContext(), R.attr.icon_tint), PorterDuff.Mode.SRC_IN); } @Override