From 720afa8fbefd1b8c4cc9caa37e6a6b16d3ab74d1 Mon Sep 17 00:00:00 2001 From: Anton Chekulaev Date: Wed, 19 Aug 2020 11:48:16 +1000 Subject: [PATCH 01/72] Resource and style cleanup. --- res/drawable-hdpi-v11/icon_cached.png | Bin 656 -> 0 bytes res/drawable-hdpi/icon_cached.png | Bin 721 -> 656 bytes res/drawable-mdpi-v11/icon_cached.png | Bin 454 -> 0 bytes res/drawable-mdpi/icon_cached.png | Bin 549 -> 454 bytes .../recycler_view_fast_scroller_bubble.xml | 9 ----- .../circle_touch_highlight_background.xml | 9 ----- .../conversation_list_item_background.xml | 10 ----- ...conversation_list_item_background_dark.xml | 10 ----- res/drawable-v21/dialog_background.xml | 11 ------ .../media_camera_button_background.xml | 16 -------- .../media_count_button_background.xml | 12 ------ .../mediarail_button_background.xml | 19 --------- res/drawable-v21/sticker_button_dark.xml | 17 -------- res/drawable-v21/sticker_button_light.xml | 17 -------- .../touch_highlight_background.xml | 7 ---- res/drawable-xhdpi-v11/icon_cached.png | Bin 872 -> 0 bytes res/drawable-xhdpi/icon_cached.png | Bin 932 -> 872 bytes res/drawable-xxhdpi-v11/icon_cached.png | Bin 1437 -> 0 bytes res/drawable-xxhdpi/icon_cached.png | Bin 1190 -> 1437 bytes res/drawable-xxxhdpi-v11/icon_cached.png | Bin 2118 -> 0 bytes res/drawable-xxxhdpi/icon_cached.png | Bin 1674 -> 2118 bytes .../circle_touch_highlight_background.xml | 9 +++-- .../conversation_list_item_background.xml | 14 ++++--- ...conversation_list_item_background_dark.xml | 14 ++++--- res/drawable/default_session_background.xml | 4 +- res/drawable/dialog_background.xml | 14 +++++-- res/drawable/ic_advanced_24dp.xml | 2 +- .../media_camera_button_background.xml | 18 +++++++-- .../media_count_button_background.xml | 15 +++++-- res/drawable/mediarail_button_background.xml | 22 +++++++++-- .../recycler_view_fast_scroller_bubble.xml | 4 +- res/drawable/sticker_button_dark.xml | 19 +++++++-- res/drawable/sticker_button_light.xml | 19 +++++++-- res/drawable/touch_highlight_background.xml | 11 +++--- res/layout-v16/video_player.xml | 17 -------- res/layout/activity_settings.xml | 16 ++++++++ res/layout/video_player.xml | 22 ++++++----- res/values-notnight/colors.xml | 32 +++++++++++++++ res/values-v11/styles.xml | 7 ---- res/values-v19/colors.xml | 4 -- res/values-v19/themes.xml | 7 ---- res/values-v21/themes.xml | 13 ------ res/values-v9/styles.xml | 5 --- res/values/colors.xml | 5 ++- res/values/styles.xml | 13 +++--- res/values/themes.xml | 37 +++++------------- .../loki/activities/SettingsActivity.kt | 22 +++++++++++ 47 files changed, 223 insertions(+), 279 deletions(-) delete mode 100644 res/drawable-hdpi-v11/icon_cached.png delete mode 100644 res/drawable-mdpi-v11/icon_cached.png delete mode 100644 res/drawable-v12/recycler_view_fast_scroller_bubble.xml delete mode 100644 res/drawable-v21/circle_touch_highlight_background.xml delete mode 100644 res/drawable-v21/conversation_list_item_background.xml delete mode 100644 res/drawable-v21/conversation_list_item_background_dark.xml delete mode 100644 res/drawable-v21/dialog_background.xml delete mode 100644 res/drawable-v21/media_camera_button_background.xml delete mode 100644 res/drawable-v21/media_count_button_background.xml delete mode 100644 res/drawable-v21/mediarail_button_background.xml delete mode 100644 res/drawable-v21/sticker_button_dark.xml delete mode 100644 res/drawable-v21/sticker_button_light.xml delete mode 100644 res/drawable-v21/touch_highlight_background.xml delete mode 100644 res/drawable-xhdpi-v11/icon_cached.png delete mode 100644 res/drawable-xxhdpi-v11/icon_cached.png delete mode 100644 res/drawable-xxxhdpi-v11/icon_cached.png delete mode 100644 res/layout-v16/video_player.xml create mode 100644 res/values-notnight/colors.xml delete mode 100644 res/values-v11/styles.xml delete mode 100644 res/values-v19/colors.xml delete mode 100644 res/values-v19/themes.xml delete mode 100644 res/values-v21/themes.xml delete mode 100644 res/values-v9/styles.xml diff --git a/res/drawable-hdpi-v11/icon_cached.png b/res/drawable-hdpi-v11/icon_cached.png deleted file mode 100644 index 777153ba4db532af55b8de58ae806878bd1c3809..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 656 zcmV;B0&o3^P);(0Sgd{{8Ia0@z5^Mxd@I(<}C+dNs zg&=65h^g$7z*PxEBmNai63*v?IaxNh&aBym^Jn2@_GV_kdFK7T+Z`*EXP1>{JfUj= zWipu(HqxQgKwGXh_LFuS&7qWKS%+RX>AEuJK%)LuBM=d z`Q5Mj=4rc`f2t!g1*#*^3aUg>GZBI>T@@UtHpWv(YU(>`;h9~(fa(b(JC<}Dqd38( zU|lbOQ>s-3^KyE3E;*5N&w8ibWLz0ml^ubZoQsj?y>5}mv zfF!Os^;H2>n>dq&4GPG_jGS}sfppg0XovFdfEM%-_MCJkNm-vWt!@W2Ipn{QZxssb qYQf`pn)wrG44{1@Add_9I{gAfm*^!fbxh9y0000;(0Sgd{{8Ia0@z5^Mxd@I(<}C+dNs zg&=65h^g$7z*PxEBmNai63*v?IaxNh&aBym^Jn2@_GV_kdFK7T+Z`*EXP1>{JfUj= zWipu(HqxQgKwGXh_LFuS&7qWKS%+RX>AEuJK%)LuBM=d z`Q5Mj=4rc`f2t!g1*#*^3aUg>GZBI>T@@UtHpWv(YU(>`;h9~(fa(b(JC<}Dqd38( zU|lbOQ>s-3^KyE3E;*5N&w8ibWLz0ml^ubZoQsj?y>5}mv zfF!Os^;H2>n>dq&4GPG_jGS}sfppg0XovFdfEM%-_MCJkNm-vWt!@W2Ipn{QZxssb qYQf`pn)wrG44{1@Add_9I{gAfm*^!fbxh9y0000c$6hRn$-`wqP>X36&SPGJmv?AEpXys24D;u%2$QGyJLO`>X7HPskut}jd zR@Vptjg6J*0%>9+q%wu4UEJN9otPCV=%MN$w;`GI4Nl zfFwyK(losbU_A`OCdtwZuazm9oSb}WjCq-5nNRXF$!8>A0oWutp6B^hrPR&s?d?As z8yj0AX=S_JzAPe}y9Y zDFA!Mn5bVA07OyLHO52$_O#a1K@i*@iN}hfNJxHBN_}XxTKmV1X|-DWN~t}Pu+}!p z2&)fU5Jk}&0B;5unvz6O6!npv%7M%)a{f8Cwzl>_M3wY? z?^^)7MN!1_^Ya~Nt+dv@$g*sPfST`Sp-b9Pd=vN!}5Wk3~^TEiNwJP)bb$_;i}*Mv`M9 z@@{EqsS5xL3kyG$Qg2=4V11Y!I}V=bseiw-EIYF>7s>xa_1W?U(Ctv?RVVtgm3@`$aq1K$Lr%&~#l zb@K0&y(9biXdaiRa+%}~09#U&J*9EdB*C_&H#+81y7c7~Vh@F)8G2q$Fif zCf@b=>Z*I+bI!faeUek3?&+QT{eHgpd(Jy5@0W)P%I`Q%4ev}r2b94h?7_5B>N+Ui zC?I(o3Fe>{-ryCAp%AWM0?DCCq7{(5k-%*zhXgFcJygIj#Nh$Dk(}xzCcz>>BX9sc zBzgHtg1m(JCbYv6Yoj)TBZ8V>kOXU)36Ko%+bSHh-fSbNCrB#2B!O(KZy@M$TX@cT z!;b~J08g7bneRY&0aaBJ&_RCfvSH%#)X}&;C$qMx6QXtp#ES!McPm@rTOF`(d@t8 wznG#$G1FBccl?Z{Bqf`VU{@=MP`Nhr11({f8MFXb9RL6T07*qoM6N<$f>Z&_H2?qr diff --git a/res/drawable-mdpi/icon_cached.png b/res/drawable-mdpi/icon_cached.png index 07d3a7e9d584942b3efd9c5aeb1711f15c6746fb..5654c491471e04bd526ecbb368c5c23954db8f25 100644 GIT binary patch literal 454 zcmV;%0XhDOP)9EdB*C_&H#+81y7c7~Vh@F)8G2q$Fif zCf@b=>Z*I+bI!faeUek3?&+QT{eHgpd(Jy5@0W)P%I`Q%4ev}r2b94h?7_5B>N+Ui zC?I(o3Fe>{-ryCAp%AWM0?DCCq7{(5k-%*zhXgFcJygIj#Nh$Dk(}xzCcz>>BX9sc zBzgHtg1m(JCbYv6Yoj)TBZ8V>kOXU)36Ko%+bSHh-fSbNCrB#2B!O(KZy@M$TX@cT z!;b~J08g7bneRY&0aaBJ&_RCfvSH%#)X}&;C$qMx6QXtp#ES!McPm@rTOF`(d@t8 wznG#$G1FBccl?Z{Bqf`VU{@=MP`Nhr11({f8MFXb9RL6T07*qoM6N<$f>Z&_H2?qr literal 549 zcmV+=0^0qFP)P000>X1^@s6#OZ}&00006VoOIv0RI60 z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru-~$L0F(W6Do^b#G0kTO% zK~zY`?Nu?06G0e#-^{KCtwK`dM6ka?5Y!)V&4C~YVj=#3t+q=OK`cB3B~?suTUZF9 zg;*(wKSB_(J&P-}(MpzVW_G@3p$oaNX0x%e$b;d7kD2#)^Sxn!E&eyiI-9aA>#OQL zW6Vte0|4Jhz7~;#BuT#ivq+X@v8ulG-d_(Pyb2+FvesU-*4~Qa_>D244zJsb{)_eF#xWjr2#A$iwYyAR;)Dh|^mLh`(G?lZ|}B0>NV5sJtQ=bR^b zsfnY}Nt&jI01lV?&bc3P9RDPFYU7zqr_*Zy?igdvkc5a}u>v@q=lNcz(>XH6d?fii zP1AR+oT%#4vMdLG2>*)te7Vj;uI)rb`rU5#3IOzay{jV9U)M>r zN@Q`!s(O~>`^jYTHH2_ZRpYu4w0?}LS_wczkmq@9jJdGfuj(e(cZZjw;q!3kIT00000NkvXXu0mjfhw}7= diff --git a/res/drawable-v12/recycler_view_fast_scroller_bubble.xml b/res/drawable-v12/recycler_view_fast_scroller_bubble.xml deleted file mode 100644 index f135c5c6d6..0000000000 --- a/res/drawable-v12/recycler_view_fast_scroller_bubble.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/res/drawable-v21/circle_touch_highlight_background.xml b/res/drawable-v21/circle_touch_highlight_background.xml deleted file mode 100644 index fe392b45e6..0000000000 --- a/res/drawable-v21/circle_touch_highlight_background.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/res/drawable-v21/conversation_list_item_background.xml b/res/drawable-v21/conversation_list_item_background.xml deleted file mode 100644 index 642879178e..0000000000 --- a/res/drawable-v21/conversation_list_item_background.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - diff --git a/res/drawable-v21/conversation_list_item_background_dark.xml b/res/drawable-v21/conversation_list_item_background_dark.xml deleted file mode 100644 index 642879178e..0000000000 --- a/res/drawable-v21/conversation_list_item_background_dark.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - diff --git a/res/drawable-v21/dialog_background.xml b/res/drawable-v21/dialog_background.xml deleted file mode 100644 index d607bfc022..0000000000 --- a/res/drawable-v21/dialog_background.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/res/drawable-v21/media_camera_button_background.xml b/res/drawable-v21/media_camera_button_background.xml deleted file mode 100644 index e129933aea..0000000000 --- a/res/drawable-v21/media_camera_button_background.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/res/drawable-v21/media_count_button_background.xml b/res/drawable-v21/media_count_button_background.xml deleted file mode 100644 index a5fdc45a06..0000000000 --- a/res/drawable-v21/media_count_button_background.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/res/drawable-v21/mediarail_button_background.xml b/res/drawable-v21/mediarail_button_background.xml deleted file mode 100644 index 035512fbff..0000000000 --- a/res/drawable-v21/mediarail_button_background.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/res/drawable-v21/sticker_button_dark.xml b/res/drawable-v21/sticker_button_dark.xml deleted file mode 100644 index bbd18b7e9f..0000000000 --- a/res/drawable-v21/sticker_button_dark.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/res/drawable-v21/sticker_button_light.xml b/res/drawable-v21/sticker_button_light.xml deleted file mode 100644 index f20b4e89d1..0000000000 --- a/res/drawable-v21/sticker_button_light.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/res/drawable-v21/touch_highlight_background.xml b/res/drawable-v21/touch_highlight_background.xml deleted file mode 100644 index 80e27edf3d..0000000000 --- a/res/drawable-v21/touch_highlight_background.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - \ No newline at end of file diff --git a/res/drawable-xhdpi-v11/icon_cached.png b/res/drawable-xhdpi-v11/icon_cached.png deleted file mode 100644 index 66a4b60dd38b1e6d47fb53f62b557d313523d1f3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 872 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 Ef|mI+9RL6T diff --git a/res/drawable-xxxhdpi-v11/icon_cached.png b/res/drawable-xxxhdpi-v11/icon_cached.png deleted file mode 100644 index fc6a8335472dbb472dec1d83c406230e6d6a8ed6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2118 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 diff --git a/res/drawable-xxxhdpi/icon_cached.png b/res/drawable-xxxhdpi/icon_cached.png index 07c7bd5382878564160c3855d97cfc9532486f33..fc6a8335472dbb472dec1d83c406230e6d6a8ed6 100644 GIT binary patch literal 2118 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 literal 1674 zcmV;526g#~P)3HmMiP{6f~?yvlh($4 z(JXVYVMDj4AVeIA3Ph}=C?9%}z%c)mmXeAqVx)sJbMNo`P7kSUH=E67-Sg+qk8f&f zddyn82*5lMd5DPayFTQyh@26TgG97fL=N}$^4uXi0}JeOH0cv0E+=E5s}Hp z7>}7@t^MCv$8q4gE?n0&j^i9BqP+mV1n~2!RjWc3WCYl;W5;@H?JLauXc&eL0Eh^P zXwY~=oLDS&(ptOI^Sq6vwO8Di065!Fbtm`Bs1~= zK5$)kS9^Q=iT)ST>GWi4?GhsD29PZMLu;*9EEX4y9z8k*V1sU1Ll^KlVHkcJ1VK}o z%OQZQwRUr7XXmd(Bm>Q}ZQHh~#+VcltpE@!y&j9jt~E3?ELgpI^^djm{7#M8+XORr z20_pyA~(00>oEYZ(HPU#)zx)mFfjn2y}kWJV`Jl55qTFtv2?y52$IbFw(t8%6=VRK zo15n{^HT#@*blE>z4~4%mAZPn^Q~F4CO2u)q%9)imvdi15IoV+(lS>CDW4sVh|CUx zU}8yTKtv81V?OnLKe*F*mn~by0CoX5_}_HWzrc?-#nYYwdW)aT0nkEFqapp3CKOvr6`OSZlA0;4(*v=!Mc6r6=_=T<^jju5bsS z7zDvBmRfD^Jz}74u?lhzDd*x;5Jd%v3RT}gdwY9h%sfv-7822vYOZaJd8Ak@PA}u| z4ieFoe%sn95&8PkrAr5f)2@k>%QD975s}4V7~bep4ePb+aNNFtHw z%;j=ZjWL6|omz^_j9e}^Ef$M)*IiK$!|-VlsmXWvL)qjY2iA^CZZ+Gyds~^uS}&iTo2L8(;g ztm8OY6{OO8tmo~$-LbJ)>>CxN!ZoC`v-9}vuG!JiaZ+nYgZKOeXUhGw*O+_xpT4&y9_Z z^8u_f#>_4h3X$w(RZWnQ?kxpDfFKASkH_OZ)>%yW%ZARLZK?_ z)#W)P%2CfD`o>VvUY2G^^m|$Q&BYo#hun*(8KN0d@eBzgTtiIV2?F3;gw4;zdKBbv zR5QeJoa1#T2oZe(;O_{Y)c*m{Q+I-F*sx(A5xprQM - - + + - + - \ No newline at end of file + \ No newline at end of file diff --git a/res/drawable/conversation_list_item_background.xml b/res/drawable/conversation_list_item_background.xml index 92908acc6a..642879178e 100644 --- a/res/drawable/conversation_list_item_background.xml +++ b/res/drawable/conversation_list_item_background.xml @@ -1,6 +1,10 @@ - - - - - + + + + + + + + diff --git a/res/drawable/conversation_list_item_background_dark.xml b/res/drawable/conversation_list_item_background_dark.xml index 92908acc6a..642879178e 100644 --- a/res/drawable/conversation_list_item_background_dark.xml +++ b/res/drawable/conversation_list_item_background_dark.xml @@ -1,6 +1,10 @@ - - - - - + + + + + + + + diff --git a/res/drawable/default_session_background.xml b/res/drawable/default_session_background.xml index c6e75f86e6..d397981ab5 100644 --- a/res/drawable/default_session_background.xml +++ b/res/drawable/default_session_background.xml @@ -5,8 +5,8 @@ \ No newline at end of file diff --git a/res/drawable/dialog_background.xml b/res/drawable/dialog_background.xml index 1c3a6cfb02..d607bfc022 100644 --- a/res/drawable/dialog_background.xml +++ b/res/drawable/dialog_background.xml @@ -1,5 +1,11 @@ - - - \ No newline at end of file + + + + + + \ No newline at end of file diff --git a/res/drawable/ic_advanced_24dp.xml b/res/drawable/ic_advanced_24dp.xml index 4fb9e1ab03..7f05df0360 100644 --- a/res/drawable/ic_advanced_24dp.xml +++ b/res/drawable/ic_advanced_24dp.xml @@ -1,4 +1,4 @@ + android:tint="?attr/pref_icon_tint"/> \ No newline at end of file diff --git a/res/drawable/media_camera_button_background.xml b/res/drawable/media_camera_button_background.xml index a5074afb2a..e129933aea 100644 --- a/res/drawable/media_camera_button_background.xml +++ b/res/drawable/media_camera_button_background.xml @@ -1,4 +1,16 @@ - - - \ No newline at end of file + + + + + + + + + + + + + \ No newline at end of file diff --git a/res/drawable/media_count_button_background.xml b/res/drawable/media_count_button_background.xml index 57cfd3a85c..a5fdc45a06 100644 --- a/res/drawable/media_count_button_background.xml +++ b/res/drawable/media_count_button_background.xml @@ -1,5 +1,12 @@ - - - - + + + + + + + + + \ No newline at end of file diff --git a/res/drawable/mediarail_button_background.xml b/res/drawable/mediarail_button_background.xml index 09e616ea41..035512fbff 100644 --- a/res/drawable/mediarail_button_background.xml +++ b/res/drawable/mediarail_button_background.xml @@ -1,5 +1,19 @@ - - - - \ No newline at end of file + + + + + + + + + + + + + + + + diff --git a/res/drawable/recycler_view_fast_scroller_bubble.xml b/res/drawable/recycler_view_fast_scroller_bubble.xml index 417f6e4bc6..f135c5c6d6 100644 --- a/res/drawable/recycler_view_fast_scroller_bubble.xml +++ b/res/drawable/recycler_view_fast_scroller_bubble.xml @@ -2,8 +2,8 @@ + android:bottomLeftRadius="44dp" + android:bottomRightRadius="0dp"/> \ No newline at end of file diff --git a/res/drawable/sticker_button_dark.xml b/res/drawable/sticker_button_dark.xml index 646748d34b..bbd18b7e9f 100644 --- a/res/drawable/sticker_button_dark.xml +++ b/res/drawable/sticker_button_dark.xml @@ -1,4 +1,17 @@ - - - \ No newline at end of file + + + + + + + + + + + + + + diff --git a/res/drawable/sticker_button_light.xml b/res/drawable/sticker_button_light.xml index 97fcffe0fb..f20b4e89d1 100644 --- a/res/drawable/sticker_button_light.xml +++ b/res/drawable/sticker_button_light.xml @@ -1,4 +1,17 @@ - - - \ No newline at end of file + + + + + + + + + + + + + + diff --git a/res/drawable/touch_highlight_background.xml b/res/drawable/touch_highlight_background.xml index 8089a02808..80e27edf3d 100644 --- a/res/drawable/touch_highlight_background.xml +++ b/res/drawable/touch_highlight_background.xml @@ -1,6 +1,7 @@ - - - - - + + + \ No newline at end of file diff --git a/res/layout-v16/video_player.xml b/res/layout-v16/video_player.xml deleted file mode 100644 index b855fca65a..0000000000 --- a/res/layout-v16/video_player.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/res/layout/activity_settings.xml b/res/layout/activity_settings.xml index bff6499952..e0312b15f8 100644 --- a/res/layout/activity_settings.xml +++ b/res/layout/activity_settings.xml @@ -161,6 +161,22 @@ android:layout_marginTop="@dimen/large_spacing" android:background="@color/separator" /> + + + + - + - + \ No newline at end of file diff --git a/res/values-notnight/colors.xml b/res/values-notnight/colors.xml new file mode 100644 index 0000000000..ba86608401 --- /dev/null +++ b/res/values-notnight/colors.xml @@ -0,0 +1,32 @@ + + + + +#00E97B +#000000 +#FCFCFC +#DFDFDF +#FCFCFC +@color/transparent +#FCFCFC +#212121 +#FCFCFC +#EDEDED +#F5F5F5 +#00E97B +#F5F5F5 +#FCFCFC +#F5F5F5 + + +#fcfcfd +#fcfcfd +#fcfcfd + + +#1B1B1B +#333132 +#0AFFFFFF +#99FFFFFF + + \ No newline at end of file diff --git a/res/values-v11/styles.xml b/res/values-v11/styles.xml deleted file mode 100644 index e5a9a0dffe..0000000000 --- a/res/values-v11/styles.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/res/values-v19/colors.xml b/res/values-v19/colors.xml deleted file mode 100644 index 8eee1017ab..0000000000 --- a/res/values-v19/colors.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - #22000000 - \ No newline at end of file diff --git a/res/values-v19/themes.xml b/res/values-v19/themes.xml deleted file mode 100644 index 1d73d342bf..0000000000 --- a/res/values-v19/themes.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - diff --git a/res/values-v21/themes.xml b/res/values-v21/themes.xml deleted file mode 100644 index c3189760de..0000000000 --- a/res/values-v21/themes.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - diff --git a/res/values-v9/styles.xml b/res/values-v9/styles.xml deleted file mode 100644 index 736e77a5d6..0000000000 --- a/res/values-v9/styles.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - - - + @@ -68,7 +48,8 @@ + + \ No newline at end of file diff --git a/res/values-notnight/themes.xml b/res/values-notnight/themes.xml new file mode 100644 index 0000000000..3fa42d6cf9 --- /dev/null +++ b/res/values-notnight/themes.xml @@ -0,0 +1,18 @@ + + + + + + + + \ No newline at end of file diff --git a/res/values/styles.xml b/res/values/styles.xml index 9fc46d2f60..dcbe287776 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -4,22 +4,18 @@ - - + + @@ -48,7 +67,7 @@ @@ -332,11 +351,12 @@ - - \ No newline at end of file diff --git a/res/values/themes.xml b/res/values/themes.xml index 8f006438c4..5a63b2db9a 100644 --- a/res/values/themes.xml +++ b/res/values/themes.xml @@ -20,6 +20,7 @@ @color/text @style/Widget.Design.AppBarLayout @color/text + #9FFF true @drawable/ic_baseline_clear_24 @@ -350,7 +351,7 @@ - + - - diff --git a/res/values/themes.xml b/res/values/themes.xml index add1507ed1..a6b5369b83 100644 --- a/res/values/themes.xml +++ b/res/values/themes.xml @@ -7,6 +7,11 @@ @color/action_bar_background @color/action_bar_background @color/accent + @color/text + ?android:textColorPrimary + @color/unimportant + ?android:textColorPrimary + @color/gray27 @drawable/default_session_background @color/default_background_start @color/compose_view_background @@ -19,15 +24,16 @@ @color/compose_view_background @color/accent true - @color/text - @color/text + ?android:textColorPrimary + ?android:textColorPrimary @style/Widget.Design.AppBarLayout - @color/text - #9FFF true @drawable/ic_baseline_clear_24 + @color/separator + ?dividerVertical + @color/dialog_background diff --git a/src/org/thoughtcrime/securesms/components/SendButton.java b/src/org/thoughtcrime/securesms/components/SendButton.java index 3c86779ef2..f8050dcfaf 100644 --- a/src/org/thoughtcrime/securesms/components/SendButton.java +++ b/src/org/thoughtcrime/securesms/components/SendButton.java @@ -2,13 +2,10 @@ package org.thoughtcrime.securesms.components; import android.content.Context; -import androidx.annotation.AttrRes; import androidx.annotation.DrawableRes; import androidx.annotation.NonNull; import androidx.appcompat.widget.AppCompatImageButton; import android.util.AttributeSet; -import android.util.Log; -import android.util.TypedValue; import android.view.View; import org.thoughtcrime.securesms.TransportOption; @@ -116,7 +113,7 @@ public class SendButton extends AppCompatImageButton case SMS: case TEXTSECURE: default: { - sendDrawable = ThemeUtil.getDrawableResWithAttribute( + sendDrawable = ThemeUtil.getThemedDrawableResId( getContext(), R.attr.conversation_transport_sms_indicator); } } diff --git a/src/org/thoughtcrime/securesms/loki/views/LabeledSeparatorView.kt b/src/org/thoughtcrime/securesms/loki/views/LabeledSeparatorView.kt index 1056afdbdf..028dd34a49 100644 --- a/src/org/thoughtcrime/securesms/loki/views/LabeledSeparatorView.kt +++ b/src/org/thoughtcrime/securesms/loki/views/LabeledSeparatorView.kt @@ -9,21 +9,21 @@ import android.view.LayoutInflater import android.widget.RelativeLayout import kotlinx.android.synthetic.main.view_separator.view.* import network.loki.messenger.R -import org.thoughtcrime.securesms.loki.utilities.getColorWithID import org.thoughtcrime.securesms.loki.utilities.toPx +import org.thoughtcrime.securesms.util.ThemeUtil class LabeledSeparatorView : RelativeLayout { private val path = Path() - private val paint: Paint = { + private val paint: Paint by lazy{ val result = Paint() result.style = Paint.Style.STROKE - result.color = resources.getColorWithID(R.color.separator, context.theme) + result.color = ThemeUtil.getThemedColor(context, R.attr.dividerHorizontal) result.strokeWidth = toPx(1, resources).toFloat() result.isAntiAlias = true result - }() + } // region Lifecycle constructor(context: Context) : super(context) { @@ -43,7 +43,7 @@ class LabeledSeparatorView : RelativeLayout { } private fun setUpViewHierarchy() { - val inflater = context.applicationContext.getSystemService(Context.LAYOUT_INFLATER_SERVICE) as LayoutInflater + val inflater = context.getSystemService(Context.LAYOUT_INFLATER_SERVICE) as LayoutInflater val contentView = inflater.inflate(R.layout.view_separator, null) val layoutParams = LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT) addView(contentView, layoutParams) @@ -56,7 +56,7 @@ class LabeledSeparatorView : RelativeLayout { super.onDraw(c) val w = width.toFloat() val h = height.toFloat() - val hMargin = toPx(10, resources).toFloat() + val hMargin = toPx(16, resources).toFloat() path.reset() path.moveTo(0.0f, h / 2) path.lineTo(titleTextView.left - hMargin, h / 2) diff --git a/src/org/thoughtcrime/securesms/util/ThemeUtil.java b/src/org/thoughtcrime/securesms/util/ThemeUtil.java index 24e2854f2a..b9e6f6c169 100644 --- a/src/org/thoughtcrime/securesms/util/ThemeUtil.java +++ b/src/org/thoughtcrime/securesms/util/ThemeUtil.java @@ -4,6 +4,7 @@ import android.content.Context; import android.content.res.Resources; import android.graphics.Color; import androidx.annotation.AttrRes; +import androidx.annotation.ColorInt; import androidx.annotation.DrawableRes; import androidx.annotation.NonNull; import androidx.annotation.StyleRes; @@ -19,17 +20,33 @@ public class ThemeUtil { private static final String TAG = ThemeUtil.class.getSimpleName(); public static boolean isDarkTheme(@NonNull Context context) { - return getAttribute(context, R.attr.theme_type, "light").equals("dark"); + return getAttributeText(context, R.attr.theme_type, "light").equals("dark"); } + @ColorInt public static int getThemedColor(@NonNull Context context, @AttrRes int attr) { TypedValue typedValue = new TypedValue(); Resources.Theme theme = context.getTheme(); if (theme.resolveAttribute(attr, typedValue, true)) { return typedValue.data; + } else { + Log.e(TAG, "Couldn't find a color attribute with id: " + attr); + return Color.RED; + } + } + + @DrawableRes + public static int getThemedDrawableResId(@NonNull Context context, @AttrRes int attr) { + TypedValue typedValue = new TypedValue(); + Resources.Theme theme = context.getTheme(); + + if (theme.resolveAttribute(attr, typedValue, true)) { + return typedValue.resourceId; + } else { + Log.e(TAG, "Couldn't find a drawable attribute with id: " + attr); + return 0; } - return Color.RED; } public static LayoutInflater getThemedInflater(@NonNull Context context, @NonNull LayoutInflater inflater, @StyleRes int theme) { @@ -37,7 +54,7 @@ public class ThemeUtil { return inflater.cloneInContext(contextThemeWrapper); } - private static String getAttribute(Context context, int attribute, String defaultValue) { + private static String getAttributeText(Context context, int attribute, String defaultValue) { TypedValue outValue = new TypedValue(); if (context.getTheme().resolveAttribute(attribute, outValue, true)) { @@ -49,15 +66,4 @@ public class ThemeUtil { return defaultValue; } - - @DrawableRes - public static int getDrawableResWithAttribute(Context context, @AttrRes int attributeId) { - TypedValue resolvedValue = new TypedValue(); - context.getTheme().resolveAttribute(attributeId, resolvedValue, true); - if (resolvedValue.type != TypedValue.TYPE_STRING) { - Log.e(TAG, "Cannot resolve a drawable resource from an attribute ID: " + attributeId); - return 0; - } - return resolvedValue.resourceId; - } } From a499cce8852d4b51f2106f0bc595b47745266f12 Mon Sep 17 00:00:00 2001 From: Anton Chekulaev Date: Fri, 21 Aug 2020 17:23:34 +1000 Subject: [PATCH 09/72] Attachment type selector style fixes. --- res/values/styles.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/res/values/styles.xml b/res/values/styles.xml index 2a70e89f76..d70f125fd4 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -376,7 +376,7 @@ From 4aa77a1e0cc40ef21c840b7ef09ca483e0f931c7 Mon Sep 17 00:00:00 2001 From: Anton Chekulaev Date: Mon, 24 Aug 2020 10:44:43 +1000 Subject: [PATCH 10/72] Light theme for media preview activity. --- AndroidManifest.xml | 2 +- res/drawable-hdpi/ic_forward_white_24dp.png | Bin 305 -> 0 bytes res/drawable-hdpi/ic_save_white_24dp.png | Bin 482 -> 0 bytes res/drawable-mdpi/ic_forward_white_24dp.png | Bin 309 -> 0 bytes res/drawable-mdpi/ic_save_white_24dp.png | Bin 370 -> 0 bytes res/drawable-xhdpi/ic_forward_white_24dp.png | Bin 418 -> 0 bytes res/drawable-xhdpi/ic_save_white_24dp.png | Bin 560 -> 0 bytes res/drawable-xxhdpi/ic_forward_white_24dp.png | Bin 346 -> 0 bytes res/drawable-xxhdpi/ic_save_white_24dp.png | Bin 489 -> 0 bytes res/drawable/ic_baseline_forward_24.xml | 10 +++++ res/drawable/ic_baseline_photo_library_24.xml | 10 +++++ res/drawable/ic_baseline_save_24.xml | 10 +++++ res/menu/media_overview_context.xml | 2 +- res/menu/media_preview.xml | 41 ++++++++++-------- res/values-notnight/themes.xml | 2 - res/values/attrs.xml | 2 + res/values/styles.xml | 7 ++- res/values/themes.xml | 10 ++--- 18 files changed, 66 insertions(+), 30 deletions(-) delete mode 100644 res/drawable-hdpi/ic_forward_white_24dp.png delete mode 100644 res/drawable-hdpi/ic_save_white_24dp.png delete mode 100644 res/drawable-mdpi/ic_forward_white_24dp.png delete mode 100644 res/drawable-mdpi/ic_save_white_24dp.png delete mode 100644 res/drawable-xhdpi/ic_forward_white_24dp.png delete mode 100644 res/drawable-xhdpi/ic_save_white_24dp.png delete mode 100644 res/drawable-xxhdpi/ic_forward_white_24dp.png delete mode 100644 res/drawable-xxhdpi/ic_save_white_24dp.png create mode 100644 res/drawable/ic_baseline_forward_24.xml create mode 100644 res/drawable/ic_baseline_photo_library_24.xml create mode 100644 res/drawable/ic_baseline_save_24.xml diff --git a/AndroidManifest.xml b/AndroidManifest.xml index a98134a55e..3a5500570c 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -411,7 +411,7 @@ android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize" android:label="@string/AndroidManifest__media_preview" android:screenOrientation="portrait" - android:theme="@style/Session.DarkTheme.SubtitleActionBar" + android:theme="@style/Session.DarkTheme" android:launchMode="singleTask" android:windowSoftInputMode="stateHidden" /> |k0wldT1B8JTOS+@4BLidG0>c;6;(>goByV>Y zhX3vTXZ8bmoCO|{#S9GGK$YCWj105pNB{+sJzX3_JdVG;>d1FMfx{*6^5pN&_W#y9 zCGhW%$vMV(f-KjqerE2_<>+Jr!zMM?NiAIqTDTU@>RQ;9<#0cQyDISdi`X|MrYmm* z{nmDqnfRcA^YQwLnvd5-H4E-vJo)S=2FCqT6Ta;%y9=~VwZt`|BqgyV)hf9t6-Y4{ z85o-C8W`#t8iW`cSs9yJ85`;vSXdbt+_1cR5=BF9eoAIqB}jt_P_?d+QHT*xgMpQ) Zv95tRP=mLIk~UBSgQu&X%Q~loCIB5?VLku= diff --git a/res/drawable-hdpi/ic_save_white_24dp.png b/res/drawable-hdpi/ic_save_white_24dp.png deleted file mode 100644 index 8e4fdd006e4d1a461f3dd3a61f05b869af239503..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 482 zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k0wldT1B8JTOS+@4BLidG0>c;6;(>goByV>Y zhX3vTXZ8bmoCO|{#S9GGK$YCWj105pNH8!kig>y>hIkx*JJm4guz`T<{1*NR(gn={ zla~~T1~KSPxpU;9T8WQT8xL=bn(HIGI}O4G%{5&Hn;iRcwAan}la;!D-ZyV4U71kz z;Fe7>m!2;vJGZ=&fcVI#AR0%b~DfX?Qqp% zLi?s%|K&^8l(@u=*D0w?U32da2H{uCg5E_vd=Du%UBwLfu>sG8c~vxSdwa$T$Bo=7>o=IO?3?nbqx(d42`UeO|4AK zbqy@63=B5vJbZ#x;k-qmluIluEuZt7jd>t;zSzjAcXS=q7jj?dejLS@{R z913%OuaZ8&!*FWpf!+J%wk@}kn#tR++feyRR^QA24y$L+`SvMG`HF?zx>#BHV_A&5 zzopr0GZ8wi2wiq diff --git a/res/drawable-xhdpi/ic_forward_white_24dp.png b/res/drawable-xhdpi/ic_forward_white_24dp.png deleted file mode 100644 index 80841b13296edafcc5105f34fc75f3cfa033d096..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 418 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA0wn)(8}a}tmUKs7M+U~W1%@xC#RK_FN#5=* z4FB8v&+G^CI14-?iy0WWg+Z8+Vb&Z8px_lx7srr@!*8c43LP>Ka1~!RD>>m}go#-1 z(P_eOIA5e%2+mQ6d62B+rRF(1&3@5jedEiu|F6F3+OlPhe)YQ_+Z{G4Gbt2YU>0R) z$au)eSG9zxLQJ`#dESbKnPRa&K4?Ass+3+kt+w%!Pejh@|55tixvwT1T6FI~bj(UN zNp5N8{KCajDmrg?_OOZzbm}HdaQ|^dcc$=J_qJXmUZuBhd4#|?m&fQW2#c%S$l!~z zHR9e7|7XAV{fY{P1@m<0d{bulTJmJ8_|L;X?_Jt-s)kWRtL5SSn0t?b{!=Y+jVMV; zEJ?LWE=mPb3`Pcqrn&}(x`qZJhDKJ#rdGy=x&{_j1_n1Q@18`_kei>9nN|tXU;gTe~DWM4f@ePuc diff --git a/res/drawable-xhdpi/ic_save_white_24dp.png b/res/drawable-xhdpi/ic_save_white_24dp.png deleted file mode 100644 index 273f33ac657491e76ef9de07f6971cffc73ca2f5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 560 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA0wn)(8}a}tmUKs7M+U~W1%@xC#RK_FN#5=* z4FB8v&+G^CI14-?iy0WWg+Z8+Vb&Z81_s6?PZ!6Kh{JEE`T89S5NYL4P*`?s2jgQO z_cjNOPJ!tU&bL@bUl85EQpoDOl8 z{{8jN?|0ryeg4N;zE6(39d*6vjFNd(_cRa2*>>-bgtlMhc>4L!GsUvP2E(~$?=z-e z^bfIH)orVq(RbX{Qs%;>+0unczZgFjPVBEtI8?gi@!SyEA3F?QKe+6=i|^Sz^Y;mU zE19SLIlG+4!1Kp%;}Z;$32w}DS15T;(|UEv^FS7BTwH^5^P<_F6V(nsc=Dq`T2Vv9s~WjN0=?hZ?u9zMC7&0vAID0jEka*M>3j19Gh$6DMNjU~LU z8}5F!e)WOM;OB)8-|t^8*0HSNtm@(?XCF36u`1V|nDWwFzPD9Nf9kE-(}7W-TH+c} zl9E`GYL#4+3Zxi}3=BqOw4r+EUXL+HtIZlg`y!hKP5A*5~RTd ls9M*^D8vY;!NAJYSl7TDsKHx9NgJqv!PC{xWt~$(696dx-Vgu) diff --git a/res/drawable-xxhdpi/ic_forward_white_24dp.png b/res/drawable-xxhdpi/ic_forward_white_24dp.png deleted file mode 100644 index 26294e574dd5e5fdbd02ac6c2238f5d370f40fb4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 346 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY0wn)GsXhaw6p}rHd>I(3)EF2VS{N990fib~ zFff!FFfhDIU|_JC!N4G1FlSew4N!t9$=lt9;eUJonf*W>XMsm#F#`j)FbFd;%$g$s z6uji=;uw-~@9oV--UbC8m%uwQ>eo44xUPRnUMIYVrS)6Yo!-!PM>ffn365-UndZJt zX?$0v>ERU+JYkChqbF~a+DpgoB|H~|G}*T}oMQ5w{K;YR5}ykqn&KvoRqQL5I0o5i zc&uV*^)Ow)u#(HfXB9K=BrQkhB~cd`R!V*GT*Y2Hp{!xo659oQClww|JZP77BcFe_ zM4~_Yo5I$u@*CKAuN^uxtLCOei?m3+h1cOjY!Ncd+-njh%ISP*IeKWr1DS164Z86K juQda~E|g3O*dXV3cp2lNYYr=czGLuo^>bP0l+XkKcyV_B diff --git a/res/drawable-xxhdpi/ic_save_white_24dp.png b/res/drawable-xxhdpi/ic_save_white_24dp.png deleted file mode 100644 index 6c87e1358816aaec842a21e215d2a70a3f0f2035..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 489 zcmV004R> z004l5008;`004mK004C`008P>0026e000+ooVrmw00002VoOIv0RM-N%)bBt010qN zS#tmY3ljhU3ljkVnw%H_00Ci1L_t(&-tF1XO2a@92Jl?k6>MKX@X$Z6Af@;yE$tJO zqEC>QDlH<#s}T`21o|9G@zl?Qm!iAbP1>Ew;hVV)B>Z4EnSn`=G%FK=2qK7}hJp;1 zc*ZBr73pc9YrNy!k=6&92%KP&t++(2Nb7+zK#ycAegS$UTk$wf`GjkcG(e>!9Z(5L z3*;o}fgB`Fkd>qh0zm{36g>zch#-OpB1ju_zzP%e&_Wx1OtIDl<+%Cx^azC(=n{n1}JxMeo2Ki=wLal;~YzaR^EAWBMX{%K{HuU&kGvJf?8gXkp;Dz2I_l3Ls`(& z3!2M<)?Uzq^q+cE%DI(q9R)g0P8U0k=DKx|x_HtWKMIU3hqbHlh6oem1~Uv`U@*iy z@G4gXeTxmS`!LX}7$^$^-HU-1VW11-BAho{M|7o>RnD+*%?sSy f6GRX}1pUb$u{XmgXM?Q~00000NkvXXu0mjfr`^33 diff --git a/res/drawable/ic_baseline_forward_24.xml b/res/drawable/ic_baseline_forward_24.xml new file mode 100644 index 0000000000..3f0ba0b613 --- /dev/null +++ b/res/drawable/ic_baseline_forward_24.xml @@ -0,0 +1,10 @@ + + + diff --git a/res/drawable/ic_baseline_photo_library_24.xml b/res/drawable/ic_baseline_photo_library_24.xml new file mode 100644 index 0000000000..ee0f6931c5 --- /dev/null +++ b/res/drawable/ic_baseline_photo_library_24.xml @@ -0,0 +1,10 @@ + + + diff --git a/res/drawable/ic_baseline_save_24.xml b/res/drawable/ic_baseline_save_24.xml new file mode 100644 index 0000000000..1a8d86d20c --- /dev/null +++ b/res/drawable/ic_baseline_save_24.xml @@ -0,0 +1,10 @@ + + + diff --git a/res/menu/media_overview_context.xml b/res/menu/media_overview_context.xml index 5ebdf2b524..f7e59ef8ae 100644 --- a/res/menu/media_overview_context.xml +++ b/res/menu/media_overview_context.xml @@ -2,7 +2,7 @@ - - - - + xmlns:app="http://schemas.android.com/apk/res-auto"> + + + + + + + diff --git a/res/values-notnight/themes.xml b/res/values-notnight/themes.xml index f27c4e2895..1401bf37fb 100644 --- a/res/values-notnight/themes.xml +++ b/res/values-notnight/themes.xml @@ -147,8 +147,6 @@ @drawable/ic_refresh_white_24dp @drawable/ic_content_copy_white_24dp @drawable/ic_info_outline_white_24dp - @drawable/ic_forward_white_24dp - @drawable/ic_save_white_24dp @drawable/ic_reply_white_24dp @drawable/ic_audio_light diff --git a/res/values/attrs.xml b/res/values/attrs.xml index d214178e77..658f6dbb0e 100644 --- a/res/values/attrs.xml +++ b/res/values/attrs.xml @@ -145,6 +145,8 @@ + + diff --git a/res/values/styles.xml b/res/values/styles.xml index d70f125fd4..7fc706df54 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -12,25 +12,24 @@ - @@ -323,8 +327,6 @@ @drawable/ic_refresh_white_24dp @drawable/ic_content_copy_white_24dp @drawable/ic_info_outline_white_24dp - @drawable/ic_forward_white_24dp - @drawable/ic_save_white_24dp @drawable/ic_reply_white_24dp @drawable/ic_audio_light @@ -507,8 +509,6 @@ @drawable/ic_refresh_white_24dp @drawable/ic_content_copy_white_24dp @drawable/ic_info_outline_white_24dp - @drawable/ic_forward_white_24dp - @drawable/ic_save_white_24dp @drawable/ic_reply_white_24dp @drawable/ic_audio_dark From cd32885db6cd5b3d7f2866ab1f98a7122ab2ed5c Mon Sep 17 00:00:00 2001 From: Anton Chekulaev Date: Mon, 24 Aug 2020 12:52:50 +1000 Subject: [PATCH 11/72] Conversation menu resources adjusted for light theme support. --- res/drawable/ic_baseline_call_split_24.xml | 10 +++++++ res/drawable/ic_baseline_file_copy_24.xml | 10 +++++++ res/drawable/ic_baseline_key_24.xml | 10 +++++++ res/drawable/ic_baseline_launch_24.xml | 10 +++++++ res/drawable/ic_baseline_reply_24.xml | 10 +++++++ res/drawable/ic_baseline_select_all_24.xml | 10 +++++++ res/drawable/ic_baseline_timer_off_24.xml | 10 +++++++ res/menu/conversation_add_to_contacts.xml | 10 ------- res/menu/conversation_callable_insecure.xml | 9 ------- res/menu/conversation_callable_secure.xml | 10 ------- res/menu/conversation_context.xml | 2 +- res/menu/conversation_expiring_off.xml | 2 +- res/menu/conversation_group_options.xml | 9 ------- res/menu/conversation_list_batch_archive.xml | 10 ------- .../conversation_list_batch_unarchive.xml | 10 ------- res/menu/conversation_mms_group_options.xml | 26 ++++++++++++------- res/menu/conversation_unblock.xml | 2 +- res/values-notnight/themes.xml | 6 ----- res/values/themes.xml | 18 ++++++------- .../securesms/ConversationListFragment.java | 2 +- .../conversation/ConversationActivity.java | 8 +++--- 21 files changed, 104 insertions(+), 90 deletions(-) create mode 100644 res/drawable/ic_baseline_call_split_24.xml create mode 100644 res/drawable/ic_baseline_file_copy_24.xml create mode 100644 res/drawable/ic_baseline_key_24.xml create mode 100644 res/drawable/ic_baseline_launch_24.xml create mode 100644 res/drawable/ic_baseline_reply_24.xml create mode 100644 res/drawable/ic_baseline_select_all_24.xml create mode 100644 res/drawable/ic_baseline_timer_off_24.xml delete mode 100644 res/menu/conversation_add_to_contacts.xml delete mode 100644 res/menu/conversation_callable_insecure.xml delete mode 100644 res/menu/conversation_callable_secure.xml delete mode 100644 res/menu/conversation_group_options.xml delete mode 100644 res/menu/conversation_list_batch_archive.xml delete mode 100644 res/menu/conversation_list_batch_unarchive.xml diff --git a/res/drawable/ic_baseline_call_split_24.xml b/res/drawable/ic_baseline_call_split_24.xml new file mode 100644 index 0000000000..ada5e609da --- /dev/null +++ b/res/drawable/ic_baseline_call_split_24.xml @@ -0,0 +1,10 @@ + + + diff --git a/res/drawable/ic_baseline_file_copy_24.xml b/res/drawable/ic_baseline_file_copy_24.xml new file mode 100644 index 0000000000..0cd5895478 --- /dev/null +++ b/res/drawable/ic_baseline_file_copy_24.xml @@ -0,0 +1,10 @@ + + + diff --git a/res/drawable/ic_baseline_key_24.xml b/res/drawable/ic_baseline_key_24.xml new file mode 100644 index 0000000000..2316df207c --- /dev/null +++ b/res/drawable/ic_baseline_key_24.xml @@ -0,0 +1,10 @@ + + + diff --git a/res/drawable/ic_baseline_launch_24.xml b/res/drawable/ic_baseline_launch_24.xml new file mode 100644 index 0000000000..455b503a1f --- /dev/null +++ b/res/drawable/ic_baseline_launch_24.xml @@ -0,0 +1,10 @@ + + + diff --git a/res/drawable/ic_baseline_reply_24.xml b/res/drawable/ic_baseline_reply_24.xml new file mode 100644 index 0000000000..f49d97d888 --- /dev/null +++ b/res/drawable/ic_baseline_reply_24.xml @@ -0,0 +1,10 @@ + + + diff --git a/res/drawable/ic_baseline_select_all_24.xml b/res/drawable/ic_baseline_select_all_24.xml new file mode 100644 index 0000000000..c997121c75 --- /dev/null +++ b/res/drawable/ic_baseline_select_all_24.xml @@ -0,0 +1,10 @@ + + + diff --git a/res/drawable/ic_baseline_timer_off_24.xml b/res/drawable/ic_baseline_timer_off_24.xml new file mode 100644 index 0000000000..9216da7aff --- /dev/null +++ b/res/drawable/ic_baseline_timer_off_24.xml @@ -0,0 +1,10 @@ + + + diff --git a/res/menu/conversation_add_to_contacts.xml b/res/menu/conversation_add_to_contacts.xml deleted file mode 100644 index 498dfb4692..0000000000 --- a/res/menu/conversation_add_to_contacts.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/res/menu/conversation_callable_insecure.xml b/res/menu/conversation_callable_insecure.xml deleted file mode 100644 index 04be0b922a..0000000000 --- a/res/menu/conversation_callable_insecure.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - diff --git a/res/menu/conversation_callable_secure.xml b/res/menu/conversation_callable_secure.xml deleted file mode 100644 index 6cf92f0624..0000000000 --- a/res/menu/conversation_callable_secure.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/res/menu/conversation_context.xml b/res/menu/conversation_context.xml index 705aac2052..dec8cb8de3 100644 --- a/res/menu/conversation_context.xml +++ b/res/menu/conversation_context.xml @@ -18,7 +18,7 @@ + + @color/text_color_dark_theme @color/text_color_secondary_dark_theme @color/accent @@ -499,17 +504,12 @@ @drawable/ic_group_white_24dp @drawable/ic_search_white_24dp @drawable/ic_call_white_24dp - @drawable/ic_launch_white_24dp @drawable/ic_unlocked_white_24dp @drawable/ic_lock_white_24dp @drawable/ic_lock_white_18dp - @drawable/ic_select_all_white_24dp - @drawable/ic_call_split_white_24dp @drawable/ic_check_white_24dp @drawable/ic_refresh_white_24dp - @drawable/ic_content_copy_white_24dp @drawable/ic_info_outline_white_24dp - @drawable/ic_reply_white_24dp @drawable/ic_audio_dark @drawable/ic_video_dark diff --git a/src/org/thoughtcrime/securesms/ConversationListFragment.java b/src/org/thoughtcrime/securesms/ConversationListFragment.java index e5a72655d4..8155c7e341 100644 --- a/src/org/thoughtcrime/securesms/ConversationListFragment.java +++ b/src/org/thoughtcrime/securesms/ConversationListFragment.java @@ -455,7 +455,7 @@ public class ConversationListFragment extends Fragment switch (item.getItemId()) { case R.id.menu_select_all: handleSelectAllThreads(); return true; case R.id.menu_delete_selected: handleDeleteAllSelected(); return true; - case R.id.menu_archive_selected: handleArchiveAllSelected(); return true; +// case R.id.menu_archive_selected: handleArchiveAllSelected(); return true; } return false; diff --git a/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java b/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java index 1a10b5e98a..85469aef1e 100644 --- a/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java +++ b/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java @@ -849,16 +849,16 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity public boolean onOptionsItemSelected(MenuItem item) { super.onOptionsItemSelected(item); switch (item.getItemId()) { - case R.id.menu_call_secure: handleDial(getRecipient(), true); return true; - case R.id.menu_call_insecure: handleDial(getRecipient(), false); return true; +// case R.id.menu_call_secure: handleDial(getRecipient(), true); return true; +// case R.id.menu_call_insecure: handleDial(getRecipient(), false); return true; case R.id.menu_unblock: handleUnblock(); return true; case R.id.menu_block: handleBlock(); return true; case R.id.menu_view_media: handleViewMedia(); return true; case R.id.menu_add_shortcut: handleAddShortcut(); return true; case R.id.menu_search: handleSearch(); return true; - case R.id.menu_add_to_contacts: handleAddToContacts(); return true; +// case R.id.menu_add_to_contacts: handleAddToContacts(); return true; case R.id.menu_reset_secure_session: handleResetSecureSession(); return true; - case R.id.menu_group_recipients: handleDisplayGroupRecipients(); return true; +// case R.id.menu_group_recipients: handleDisplayGroupRecipients(); return true; case R.id.menu_distribution_broadcast: handleDistributionBroadcastEnabled(item); return true; case R.id.menu_distribution_conversation: handleDistributionConversationEnabled(item); return true; case R.id.menu_edit_group: handleEditPushGroup(); return true; From da20dc1d4f3e34d1ea69ca7c7307c62ee7099f6f Mon Sep 17 00:00:00 2001 From: Anton Chekulaev Date: Mon, 24 Aug 2020 13:06:01 +1000 Subject: [PATCH 12/72] Themed conversation mute icon. --- res/drawable/ic_mute.xml | 5 +++-- res/layout/conversation_activity.xml | 11 +++++++---- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/res/drawable/ic_mute.xml b/res/drawable/ic_mute.xml index 2f6d3c2950..64d2c68a59 100644 --- a/res/drawable/ic_mute.xml +++ b/res/drawable/ic_mute.xml @@ -2,8 +2,9 @@ android:width="512dp" android:height="512dp" android:viewportWidth="512" - android:viewportHeight="512"> + android:viewportHeight="512" + android:tint="?attr/colorControlNormal"> + android:fillColor="@android:color/white"/> diff --git a/res/layout/conversation_activity.xml b/res/layout/conversation_activity.xml index f2aeb4907d..05fe9db713 100644 --- a/res/layout/conversation_activity.xml +++ b/res/layout/conversation_activity.xml @@ -2,6 +2,7 @@ @@ -43,11 +44,13 @@ + android:layout_marginRight="6dp" + android:visibility="gone" + tools:visibility="visible"/> Date: Mon, 24 Aug 2020 13:34:34 +1000 Subject: [PATCH 13/72] User view is now compatible with light theme. --- res/drawable/ic_circle.xml | 14 ++++++++++---- res/drawable/ic_circle_check.xml | 18 +++++++++++++----- res/drawable/ic_edit_white_24dp.xml | 5 ----- res/drawable/ic_more_horiz_white.xml | 13 +++++++++---- res/layout-sw400dp/view_seed_reminder.xml | 2 +- res/layout/activity_create_closed_group.xml | 2 +- res/layout/activity_edit_closed_group.xml | 4 ++-- res/layout/activity_settings.xml | 16 ++++++++-------- res/layout/conversation_activity.xml | 4 ++-- res/layout/session_restore_banner.xml | 4 ++-- res/layout/view_seed_reminder.xml | 2 +- res/layout/view_user.xml | 15 ++++++++------- .../securesms/loki/views/UserView.kt | 2 +- 13 files changed, 58 insertions(+), 43 deletions(-) delete mode 100644 res/drawable/ic_edit_white_24dp.xml diff --git a/res/drawable/ic_circle.xml b/res/drawable/ic_circle.xml index c73285b7d2..b5b8615d22 100644 --- a/res/drawable/ic_circle.xml +++ b/res/drawable/ic_circle.xml @@ -1,6 +1,12 @@ - - + + android:strokeColor="@android:color/white" + android:strokeWidth="1"/> diff --git a/res/drawable/ic_circle_check.xml b/res/drawable/ic_circle_check.xml index a258b5c30c..e88b286a9d 100644 --- a/res/drawable/ic_circle_check.xml +++ b/res/drawable/ic_circle_check.xml @@ -1,7 +1,15 @@ - - + - + android:strokeColor="@android:color/white" + android:strokeWidth="1"/> + diff --git a/res/drawable/ic_edit_white_24dp.xml b/res/drawable/ic_edit_white_24dp.xml deleted file mode 100644 index 46462b5726..0000000000 --- a/res/drawable/ic_edit_white_24dp.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - diff --git a/res/drawable/ic_more_horiz_white.xml b/res/drawable/ic_more_horiz_white.xml index 8bb3fc306f..efb34a24a3 100644 --- a/res/drawable/ic_more_horiz_white.xml +++ b/res/drawable/ic_more_horiz_white.xml @@ -1,5 +1,10 @@ - - + + diff --git a/res/layout-sw400dp/view_seed_reminder.xml b/res/layout-sw400dp/view_seed_reminder.xml index c1b16634fe..e9bb3bbe81 100644 --- a/res/layout-sw400dp/view_seed_reminder.xml +++ b/res/layout-sw400dp/view_seed_reminder.xml @@ -71,6 +71,6 @@ + android:background="?android:dividerHorizontal" /> \ No newline at end of file diff --git a/res/layout/activity_create_closed_group.xml b/res/layout/activity_create_closed_group.xml index f8446309d1..4c773cc6ad 100644 --- a/res/layout/activity_create_closed_group.xml +++ b/res/layout/activity_create_closed_group.xml @@ -24,7 +24,7 @@ + android:background="?android:dividerHorizontal" /> + android:background="?android:dividerHorizontal" /> + android:background="?android:dividerHorizontal" /> + android:background="?android:dividerHorizontal" /> + android:background="?android:dividerHorizontal" /> + android:background="?android:dividerHorizontal" /> + android:background="?android:dividerHorizontal" /> + android:background="?android:dividerHorizontal" /> + android:background="?android:dividerHorizontal" /> + android:background="?android:dividerHorizontal" /> + android:background="?android:dividerHorizontal" /> + android:background="?android:dividerHorizontal" /> + android:background="?android:dividerHorizontal" /> diff --git a/res/layout/session_restore_banner.xml b/res/layout/session_restore_banner.xml index 30a6d99c96..4d402326e2 100644 --- a/res/layout/session_restore_banner.xml +++ b/res/layout/session_restore_banner.xml @@ -11,7 +11,7 @@ + android:background="?android:dividerHorizontal" /> + android:background="?android:dividerHorizontal" /> diff --git a/res/layout/view_seed_reminder.xml b/res/layout/view_seed_reminder.xml index 362e25b32c..02258d49b1 100644 --- a/res/layout/view_seed_reminder.xml +++ b/res/layout/view_seed_reminder.xml @@ -71,6 +71,6 @@ + android:background="?android:dividerHorizontal" /> \ No newline at end of file diff --git a/res/layout/view_user.xml b/res/layout/view_user.xml index 6d9aa37e09..f213e59972 100644 --- a/res/layout/view_user.xml +++ b/res/layout/view_user.xml @@ -1,6 +1,6 @@ - + android:layout_weight="1" + android:textColor="?android:textColorPrimary" + tools:text="Spiderman" /> + android:src="@drawable/ic_circle" + android:tint="?android:textColorPrimary"/> + android:background="?android:dividerHorizontal" /> \ No newline at end of file diff --git a/src/org/thoughtcrime/securesms/loki/views/UserView.kt b/src/org/thoughtcrime/securesms/loki/views/UserView.kt index 3305294a34..43cd12cf4c 100644 --- a/src/org/thoughtcrime/securesms/loki/views/UserView.kt +++ b/src/org/thoughtcrime/securesms/loki/views/UserView.kt @@ -66,7 +66,7 @@ class UserView : LinearLayout { profilePictureView.additionalPublicKey = null profilePictureView.isRSSFeed = false } - actionIndicatorImageView.setImageResource(R.drawable.ic_edit_white_24dp) + actionIndicatorImageView.setImageResource(R.drawable.ic_baseline_edit_24) profilePictureView.glide = glide profilePictureView.update() nameTextView.text = user.name ?: "Unknown Contact" From 9cb0a18a85271926c5f51b1492165e6216d912e8 Mon Sep 17 00:00:00 2001 From: Anton Chekulaev Date: Mon, 24 Aug 2020 14:43:24 +1000 Subject: [PATCH 14/72] Consistent dialog styles. --- .../default_bottom_sheet_background.xml | 6 +++-- res/drawable/default_dialog_background.xml | 2 +- res/drawable/ic_baseline_folder_48.xml | 5 ++++ res/drawable/ic_baseline_mic_48.xml | 5 ++++ res/drawable/ic_baseline_photo_camera_48.xml | 6 +++++ .../permission_rationale_dialog_corners.xml | 2 +- res/values-notnight/themes.xml | 15 ++++++----- res/values/dimens.xml | 2 +- res/values/themes.xml | 27 +++++++++++-------- .../conversation/ConversationActivity.java | 4 +-- .../mediasend/MediaSendActivity.java | 2 +- .../registration/WelcomeActivity.java | 2 +- 12 files changed, 51 insertions(+), 27 deletions(-) create mode 100644 res/drawable/ic_baseline_folder_48.xml create mode 100644 res/drawable/ic_baseline_mic_48.xml create mode 100644 res/drawable/ic_baseline_photo_camera_48.xml diff --git a/res/drawable/default_bottom_sheet_background.xml b/res/drawable/default_bottom_sheet_background.xml index 24809b2d43..4b8cb781e3 100644 --- a/res/drawable/default_bottom_sheet_background.xml +++ b/res/drawable/default_bottom_sheet_background.xml @@ -5,7 +5,9 @@ - + - + \ No newline at end of file diff --git a/res/drawable/default_dialog_background.xml b/res/drawable/default_dialog_background.xml index c0937a9d1d..fff764ebd5 100644 --- a/res/drawable/default_dialog_background.xml +++ b/res/drawable/default_dialog_background.xml @@ -7,5 +7,5 @@ - + \ No newline at end of file diff --git a/res/drawable/ic_baseline_folder_48.xml b/res/drawable/ic_baseline_folder_48.xml new file mode 100644 index 0000000000..f22a0be81e --- /dev/null +++ b/res/drawable/ic_baseline_folder_48.xml @@ -0,0 +1,5 @@ + + + diff --git a/res/drawable/ic_baseline_mic_48.xml b/res/drawable/ic_baseline_mic_48.xml new file mode 100644 index 0000000000..2ac4dd40a0 --- /dev/null +++ b/res/drawable/ic_baseline_mic_48.xml @@ -0,0 +1,5 @@ + + + diff --git a/res/drawable/ic_baseline_photo_camera_48.xml b/res/drawable/ic_baseline_photo_camera_48.xml new file mode 100644 index 0000000000..33acb83243 --- /dev/null +++ b/res/drawable/ic_baseline_photo_camera_48.xml @@ -0,0 +1,6 @@ + + + + diff --git a/res/drawable/permission_rationale_dialog_corners.xml b/res/drawable/permission_rationale_dialog_corners.xml index cce2c87f18..5c4923cb9f 100644 --- a/res/drawable/permission_rationale_dialog_corners.xml +++ b/res/drawable/permission_rationale_dialog_corners.xml @@ -3,5 +3,5 @@ - + \ No newline at end of file diff --git a/res/values-notnight/themes.xml b/res/values-notnight/themes.xml index 547d50d07b..178009a599 100644 --- a/res/values-notnight/themes.xml +++ b/res/values-notnight/themes.xml @@ -15,13 +15,14 @@ @color/gray78 light - @style/TextSecure.LightActionBar.TabBar - @color/action_bar_background - @color/action_bar_background - @color/accent - @color/accent - @color/text - @color/accent + + + + + + + + @style/AppCompatAlertDialogStyleLight @style/AppCompatDialogStyleLight @style/Theme.MaterialComponents.Light.BottomSheetDialog diff --git a/res/values/dimens.xml b/res/values/dimens.xml index c5659f4ce1..81794200db 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -30,7 +30,7 @@ 10dp 234dp 56dp - 8dp + 12dp 4dp 8dp 8dp diff --git a/res/values/themes.xml b/res/values/themes.xml index 67b18adb07..05a426921d 100644 --- a/res/values/themes.xml +++ b/res/values/themes.xml @@ -7,6 +7,9 @@ @color/action_bar_background @color/action_bar_background @color/accent + ?android:textColorPrimary + ?colorAccent + ?colorAccent @color/text ?android:textColorPrimary @color/unimportant @@ -24,9 +27,9 @@ @color/accent true ?android:textColorPrimary - ?android:textColorPrimary @style/Widget.Design.AppBarLayout + true @drawable/ic_baseline_clear_24 @color/compose_view_background @@ -106,7 +109,7 @@ @style/ThemeOverlay.AppCompat.Dark @color/action_bar_background @color/action_bar_background - @color/signal_primary_dark + @color/compose_view_background #d00000 @@ -382,12 +385,12 @@ - @color/text_color_dark_theme - @color/text_color_secondary_dark_theme - @color/accent - @color/accent - @color/text - @color/accent + + + + + + @color/compose_view_background @@ -544,12 +547,14 @@ @color/core_grey_85 - diff --git a/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java b/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java index 85469aef1e..01934be718 100644 --- a/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java +++ b/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java @@ -2535,7 +2535,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity Permissions.with(this) .request(Manifest.permission.RECORD_AUDIO) .ifNecessary() - .withRationaleDialog(getString(R.string.ConversationActivity_to_send_audio_messages_allow_signal_access_to_your_microphone), R.drawable.ic_mic_white_48dp) + .withRationaleDialog(getString(R.string.ConversationActivity_to_send_audio_messages_allow_signal_access_to_your_microphone), R.drawable.ic_baseline_mic_48) .withPermanentDenialDialog(getString(R.string.ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages)) .execute(); } @@ -2736,7 +2736,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity Permissions.with(ConversationActivity.this) .request(Manifest.permission.CAMERA) .ifNecessary() - .withRationaleDialog(getString(R.string.ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera), R.drawable.ic_photo_camera_white_48dp) + .withRationaleDialog(getString(R.string.ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera), R.drawable.ic_baseline_photo_camera_48) .withPermanentDenialDialog(getString(R.string.ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video)) .onAllGranted(() -> { composeText.clearFocus(); diff --git a/src/org/thoughtcrime/securesms/mediasend/MediaSendActivity.java b/src/org/thoughtcrime/securesms/mediasend/MediaSendActivity.java index a2e0e4190d..41324d4e61 100644 --- a/src/org/thoughtcrime/securesms/mediasend/MediaSendActivity.java +++ b/src/org/thoughtcrime/securesms/mediasend/MediaSendActivity.java @@ -376,7 +376,7 @@ public class MediaSendActivity extends PassphraseRequiredActionBarActivity imple Permissions.with(this) .request(Manifest.permission.CAMERA) .ifNecessary() - .withRationaleDialog(getString(R.string.ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera), R.drawable.ic_photo_camera_white_48dp) + .withRationaleDialog(getString(R.string.ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera), R.drawable.ic_baseline_photo_camera_48) .withPermanentDenialDialog(getString(R.string.ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video)) .onAllGranted(() -> { Camera1Fragment fragment = getOrCreateCameraFragment(); diff --git a/src/org/thoughtcrime/securesms/registration/WelcomeActivity.java b/src/org/thoughtcrime/securesms/registration/WelcomeActivity.java index 3f56db3525..e9f8f2e026 100644 --- a/src/org/thoughtcrime/securesms/registration/WelcomeActivity.java +++ b/src/org/thoughtcrime/securesms/registration/WelcomeActivity.java @@ -56,7 +56,7 @@ public class WelcomeActivity extends BaseActionBarActivity { Permissions.with(this) .request(Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.READ_EXTERNAL_STORAGE) .ifNecessary() - .withRationaleDialog(getString(R.string.activity_landing_permission_dialog_message), R.drawable.ic_folder_white_48dp) + .withRationaleDialog(getString(R.string.activity_landing_permission_dialog_message), R.drawable.ic_baseline_folder_48) .onAnyResult(() -> { Intent nextIntent = getIntent().getParcelableExtra("next_intent"); From 1191353fde5024673135987cbbd12f1557ceaece Mon Sep 17 00:00:00 2001 From: Anton Chekulaev Date: Mon, 24 Aug 2020 15:33:01 +1000 Subject: [PATCH 15/72] Conversation scroll date label themed. New muted icon. --- res/drawable/ic_outline_notifications_off_24.xml | 10 ++++++++++ res/layout/conversation_activity.xml | 6 +++--- res/layout/conversation_fragment.xml | 4 ++-- res/layout/conversation_item_header.xml | 2 +- res/layout/view_conversation.xml | 9 +++++---- res/values/themes.xml | 2 +- .../securesms/loki/views/ConversationView.kt | 2 +- 7 files changed, 23 insertions(+), 12 deletions(-) create mode 100644 res/drawable/ic_outline_notifications_off_24.xml diff --git a/res/drawable/ic_outline_notifications_off_24.xml b/res/drawable/ic_outline_notifications_off_24.xml new file mode 100644 index 0000000000..cdb23eefa6 --- /dev/null +++ b/res/drawable/ic_outline_notifications_off_24.xml @@ -0,0 +1,10 @@ + + + diff --git a/res/layout/conversation_activity.xml b/res/layout/conversation_activity.xml index 8151fbefba..b2279351a1 100644 --- a/res/layout/conversation_activity.xml +++ b/res/layout/conversation_activity.xml @@ -44,10 +44,10 @@ diff --git a/res/layout/conversation_fragment.xml b/res/layout/conversation_fragment.xml index 4931b36efd..9476a0f9ff 100644 --- a/res/layout/conversation_fragment.xml +++ b/res/layout/conversation_fragment.xml @@ -26,8 +26,8 @@ android:paddingBottom="4dp" android:layout_marginTop="8dp" android:textSize="@dimen/small_font_size" - android:textColor="#99FFFFFF" - android:background="?attr/conversation_item_sticky_date_background" + android:textColor="?conversation_item_sticky_date_text_color" + android:background="?conversation_item_sticky_date_background" android:elevation="10dp" android:visibility="gone" tools:text="March 1, 2015" /> diff --git a/res/layout/conversation_item_header.xml b/res/layout/conversation_item_header.xml index 80721f010f..588ddd64ef 100644 --- a/res/layout/conversation_item_header.xml +++ b/res/layout/conversation_item_header.xml @@ -15,7 +15,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:gravity="center" - android:textColor="#99FFFFFF" + android:textColor="?conversation_item_sticky_date_text_color" android:textSize="@dimen/small_font_size" tools:text="March 1, 2015" /> diff --git a/res/layout/view_conversation.xml b/res/layout/view_conversation.xml index 0df9155353..26e9647fdb 100644 --- a/res/layout/view_conversation.xml +++ b/res/layout/view_conversation.xml @@ -69,11 +69,12 @@ + android:layout_marginEnd="6dp" /> @color/core_grey_45 @color/core_grey_05 @drawable/sticky_date_header_background_dark - @color/core_grey_25 + @color/core_grey_45 @color/transparent_white_30 @drawable/contact_list_divider_dark diff --git a/src/org/thoughtcrime/securesms/loki/views/ConversationView.kt b/src/org/thoughtcrime/securesms/loki/views/ConversationView.kt index 73463326d7..382ac63a84 100644 --- a/src/org/thoughtcrime/securesms/loki/views/ConversationView.kt +++ b/src/org/thoughtcrime/securesms/loki/views/ConversationView.kt @@ -38,7 +38,7 @@ class ConversationView : LinearLayout { } private fun setUpViewHierarchy() { - val inflater = context.applicationContext.getSystemService(Context.LAYOUT_INFLATER_SERVICE) as LayoutInflater + val inflater = context.getSystemService(Context.LAYOUT_INFLATER_SERVICE) as LayoutInflater val contentView = inflater.inflate(R.layout.view_conversation, null) addView(contentView) } From afe90200f102cdef29bdb07d02c7afbed7acf60b Mon Sep 17 00:00:00 2001 From: Anton Chekulaev Date: Mon, 24 Aug 2020 16:46:12 +1000 Subject: [PATCH 16/72] Dividers for home screen conversation items. Themed common/dialog button styles. --- ...minent_filled_button_medium_background.xml | 6 +- ...inent_outline_button_medium_background.xml | 4 +- ...ortant_filled_button_medium_background.xml | 2 +- ...rtant_outline_button_medium_background.xml | 4 +- res/layout-sw400dp/activity_display_name.xml | 2 +- res/layout-sw400dp/activity_landing.xml | 4 +- res/layout-sw400dp/activity_pn_mode.xml | 2 +- res/layout-sw400dp/activity_register.xml | 4 +- res/layout-sw400dp/activity_restore.xml | 2 +- res/layout-sw400dp/activity_seed.xml | 2 +- .../fragment_enter_chat_url.xml | 2 +- .../fragment_enter_public_key.xml | 6 +- res/layout-sw400dp/view_seed_reminder.xml | 2 +- .../fragment_enter_session_id.xml | 2 +- res/layout/activity_create_closed_group.xml | 2 +- res/layout/activity_display_name.xml | 2 +- res/layout/activity_edit_closed_group.xml | 5 +- res/layout/activity_home.xml | 5 +- res/layout/activity_landing.xml | 4 +- res/layout/activity_linked_devices.xml | 2 +- res/layout/activity_path.xml | 2 +- res/layout/activity_pn_mode.xml | 2 +- res/layout/activity_register.xml | 4 +- res/layout/activity_restore.xml | 2 +- res/layout/activity_seed.xml | 2 +- res/layout/activity_settings.xml | 4 +- res/layout/dialog_clear_all_data.xml | 4 +- res/layout/dialog_edit_device_name.xml | 4 +- res/layout/dialog_link_device_master_mode.xml | 4 +- res/layout/dialog_link_device_slave_mode.xml | 2 +- res/layout/dialog_seed.xml | 4 +- res/layout/fragment_enter_chat_url.xml | 2 +- res/layout/fragment_enter_public_key.xml | 6 +- res/layout/fragment_enter_session_id.xml | 2 +- ...ment_multi_device_removal_bottom_sheet.xml | 2 +- ...ent_open_group_suggestion_bottom_sheet.xml | 4 +- .../fragment_scan_qr_code_placeholder.xml | 2 +- res/layout/fragment_view_my_qr_code.xml | 2 +- res/layout/prompt_passphrase_activity.xml | 2 +- res/layout/session_restore_banner.xml | 13 +- res/layout/view_conversation.xml | 160 ++++++++++-------- res/layout/view_seed_reminder.xml | 2 +- res/layout/view_user.xml | 4 +- res/values-notnight/colors.xml | 2 +- res/values/dimens.xml | 1 + res/values/styles.xml | 50 +++--- .../EditClosedGroupMembersAdapter.kt | 1 + .../securesms/loki/views/UserView.kt | 2 +- 48 files changed, 182 insertions(+), 173 deletions(-) diff --git a/res/drawable/prominent_filled_button_medium_background.xml b/res/drawable/prominent_filled_button_medium_background.xml index 9e4eeed50c..a06a0d11e5 100644 --- a/res/drawable/prominent_filled_button_medium_background.xml +++ b/res/drawable/prominent_filled_button_medium_background.xml @@ -3,9 +3,9 @@ xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle"> - + - + - + \ No newline at end of file diff --git a/res/drawable/prominent_outline_button_medium_background.xml b/res/drawable/prominent_outline_button_medium_background.xml index b5f3dc5355..183ed83282 100644 --- a/res/drawable/prominent_outline_button_medium_background.xml +++ b/res/drawable/prominent_outline_button_medium_background.xml @@ -5,7 +5,7 @@ - + - + \ No newline at end of file diff --git a/res/drawable/unimportant_filled_button_medium_background.xml b/res/drawable/unimportant_filled_button_medium_background.xml index 4880fd4fed..dc3b8df238 100644 --- a/res/drawable/unimportant_filled_button_medium_background.xml +++ b/res/drawable/unimportant_filled_button_medium_background.xml @@ -5,7 +5,7 @@ - + \ No newline at end of file diff --git a/res/drawable/unimportant_outline_button_medium_background.xml b/res/drawable/unimportant_outline_button_medium_background.xml index 81471826c3..183ed83282 100644 --- a/res/drawable/unimportant_outline_button_medium_background.xml +++ b/res/drawable/unimportant_outline_button_medium_background.xml @@ -5,7 +5,7 @@ - + - + \ No newline at end of file diff --git a/res/layout-sw400dp/activity_display_name.xml b/res/layout-sw400dp/activity_display_name.xml index d0420ab46d..ecb0a35967 100644 --- a/res/layout-sw400dp/activity_display_name.xml +++ b/res/layout-sw400dp/activity_display_name.xml @@ -49,7 +49,7 @@ android:layout_weight="1"/>