From 720afa8fbefd1b8c4cc9caa37e6a6b16d3ab74d1 Mon Sep 17 00:00:00 2001
From: Anton Chekulaev <metaphore@bk.ru>
Date: Wed, 19 Aug 2020 11:48:16 +1000
Subject: [PATCH] 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)<h;3K|Lk000e1NJLTq001Na001Ni1^@s6;Q*MJ00074Nkl<ZSV!%a
zJxClu7=~}r!Xgq;Flcq4HlmP#V2U)+LQyz8>;(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><I`Encs-ws2vr#EO<u$BKnB70Lz$yc?Eh(
z;AvE2Ti`GEStrD~0^8UZ?t1{*^c_g0DM{c?75o?N3|dA%R9^*cE9ydJs&AI|g=zYX
z9Resu;Dkz(z`PT;Sm=*^_slC4SJ04xlJvb|o;a($jDT3=0g*nTh>AEuJK%)LuBM=d
z`Q5Mj=4rc`f2t!g1*#*^3aUg>GZBI>T@@UtHpWv(YU(>`;h9~(fa(b(JC<}Dqd38(
zU|lbO<Qdt7)Rm;QiD%Y*0n!D@H4adie);Rys`2Llt?6PJrA!y(?g3%<BX<27#gJI<
z=anYdBubFNJ!jyYDFbMfi7$~9aS+#Uf{p|9))Yuye5FB<*kT?4lzp3DcDp%b{4x9=
zXn_7%{~pNh=$&!sh+ThEJFlXBXj)f6IP{st2hoOtct-mkJu!ju8%Uh#CFp{Eao%Ba
z)}AtP%5R`m7L5}0!~s;yZ#m>Q>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<MNUMnLSTaF(=ea_
diff --git a/res/drawable-hdpi/icon_cached.png b/res/drawable-hdpi/icon_cached.png
index d319ca5216abecf5f738213d3c544e8ec4c782bb..777153ba4db532af55b8de58ae806878bd1c3809 100644
GIT binary patch
literal 656
zcmV;B0&o3^P)<h;3K|Lk000e1NJLTq001Na001Ni1^@s6;Q*MJ00074Nkl<ZSV!%a
zJxClu7=~}r!Xgq;Flcq4HlmP#V2U)+LQyz8>;(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><I`Encs-ws2vr#EO<u$BKnB70Lz$yc?Eh(
z;AvE2Ti`GEStrD~0^8UZ?t1{*^c_g0DM{c?75o?N3|dA%R9^*cE9ydJs&AI|g=zYX
z9Resu;Dkz(z`PT;Sm=*^_slC4SJ04xlJvb|o;a($jDT3=0g*nTh>AEuJK%)LuBM=d
z`Q5Mj=4rc`f2t!g1*#*^3aUg>GZBI>T@@UtHpWv(YU(>`;h9~(fa(b(JC<}Dqd38(
zU|lbO<Qdt7)Rm;QiD%Y*0n!D@H4adie);Rys`2Llt?6PJrA!y(?g3%<BX<27#gJI<
z=anYdBubFNJ!jyYDFbMfi7$~9aS+#Uf{p|9))Yuye5FB<*kT?4lzp3DcDp%b{4x9=
zXn_7%{~pNh=$&!sh+ThEJFlXBXj)f6IP{st2hoOtct-mkJu!ju8%Uh#CFp{Eao%Ba
z)}AtP%5R`m7L5}0!~s;yZ#m>Q>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<MNUMnLSTaF(=ea_
literal 721
zcmV;?0xtcDP)<h;3K|Lk000e1NJLTq001Tc001Tk1^@s6s6FYf00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru-~$L0AvErQ3FiO+0$xc(
zK~z}7?N>c$6hRn$-`wqP>X36&SPGJmv?AEpXys24D;u%2$QGyJLO`>X7HPskut}jd
zR@Vptjg6J*0%>9+q%wu4UEJN9ot<Zsz#%cY+e{7u`<lnH^9^t2d-H|?DpaUY;bKF|
z7RGVxHyVvO&+{HyYp;vQ1j%0_vSo~U-|cogaUAQi^Q$sNBqa>PCV=%MN$w;`GI4Nl
zfFwyK(losbU_A`OCdtwZuazm9oSb}WjCq-5nNRXF$!8>A0oWutp6B^hrPR&s?d?As
z8yj0AX=S_JzAPe}y<TrhL^_`5J&B^I+xNeb=lN@rb3qX7=6Qa**=+te_g2<wwR>9Y
zDFA!Mn5bVA07OyLHO52$_O#a1K@i*@iN}hfNJxHBN_}XxTKmV1X|-DWN~t}Pu+}!p
z2&)fU5Jk}&0B;5unvz6O6!npv%7M%)a{f8Cwzl>_M3w<e15hL(A~=bAy&jA)@O>Y?
z?^^)7MN!1_^Ya~Nt+dv@$g*sP<j^bET0?8CL}X@cY-|}o$5|`WG@T`hBVlEjB+@jU
zb?&i2+IJc|H@~&kDLWH3z>fST`Sp-b9Pd=vN!}5Wk3~^TEiNwJP)bb$_;i}*Mv`M9
z@@{EqsS5xL3kyG$Qg2=4V11Y!I}V=bseiw-EIYF>7s>x<Wo6|O0IaUAh9n=4bjSW@
z=seGF1wrtw-EMy;dBqqr?jkbk!{pd;Y>a_1W?U(Ctv?RVVtgm3@`$aq1K$Lr%&~#l
zb@K0&y(9biXdaiRa+%}~09#U&J*<CTy_hRhxTyFGd<`oq)j5FB00000NkvXXu0mjf
D6Fxu!
diff --git a/res/drawable-mdpi-v11/icon_cached.png b/res/drawable-mdpi-v11/icon_cached.png
deleted file mode 100644
index 5654c491471e04bd526ecbb368c5c23954db8f25..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 454
zcmV;%0XhDOP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv0004vNkl<ZNK4g}
zzbi#i9Kancl))mUn7kNFWTT|WAnIjNCXw>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&<FAi8ddHdJn`IuTUh67?!1A%O-7Jpu_Y+8VLgeU)g*Xl
zF+YMJjiA6Ja3UoC3`OAUN@k1xRB%Rt7f=WKV`=#X`y}lp_L+lF%6!8;L0KKOZP7S^
z3!eYL81wn>_RCfvSH%#)X}&;C$qMx6QXtp#ES!McPm@rTOF`(<Yulp#Be<c|>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)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv0004vNkl<ZNK4g}
zzbi#i9Kancl))mUn7kNFWTT|WAnIjNCXw>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&<FAi8ddHdJn`IuTUh67?!1A%O-7Jpu_Y+8VLgeU)g*Xl
zF+YMJjiA6Ja3UoC3`OAUN@k1xRB%Rt7f=WKV`=#X`y}lp_L+lF%6!8;L0KKOZP7S^
z3!eYL81wn>_RCfvSH%#)X}&;C$qMx6QXtp#ES!McPm@rTOF`(<Yulp#Be<c|>d@t8
wznG#$G1FBccl?Z{Bqf`VU{@=MP`Nhr11({f8MFXb9RL6T07*qoM6N<$f>Z&_H2?qr
literal 549
zcmV+=0^0qFP)<h;3K|Lk000e1NJLTq000>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_>D2<c9JB16-U%0
z;=SJwA>44zJsb{)_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>*)te7<X~-HoDX55P_<k)kLDbq;DA!F!LgEC;OzUlFvetwoj=
z0X$OG%OoH3H%{!?IKm5}$Fte&U^E(iD2n0%$>Vj;uI)rb`rU5#3IOzay{jV9U)M>r
zN@Q`!s(O~>`^jYTHH2_ZRpYu4w0?}LS_wczkmq@9jJdGfuj(e(<?CWw5!S@nZ!-9)
ns^*oWhMJ4WlkLyB#R>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 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
- <corners android:topLeftRadius="44dp"
- android:topRightRadius="44dp"
- android:bottomLeftRadius="44dp"
- android:bottomRightRadius="0dp"/>
- <solid android:color="#FF0288D1" />
- <size android:height="88dp" android:width="88dp" />
-</shape>
\ 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 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ripple xmlns:android="http://schemas.android.com/apk/res/android"
- android:color="@color/touch_highlight">
- <item android:id="@android:id/mask">
- <shape android:shape="oval">
- <solid android:color="@color/black" />
- </shape>
- </item>
-</ripple>
\ 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 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ripple xmlns:android="http://schemas.android.com/apk/res/android"
- android:color="@color/textsecure_primary">
- <item android:id="@android:id/mask" android:drawable="@android:color/black" />
- <item>
- <selector>
- <item android:drawable="@color/textsecure_primary_alpha33" android:state_selected="true" />
- </selector>
- </item>
-</ripple>
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 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ripple xmlns:android="http://schemas.android.com/apk/res/android"
- android:color="@color/textsecure_primary">
- <item android:id="@android:id/mask" android:drawable="@android:color/black" />
- <item>
- <selector>
- <item android:drawable="@color/textsecure_primary_alpha33" android:state_selected="true" />
- </selector>
- </item>
-</ripple>
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 @@
-<?xml version="1.0" encoding="utf-8"?>
-<inset xmlns:android="http://schemas.android.com/apk/res/android"
- android:insetLeft="0dp"
- android:insetTop="16dp"
- android:insetRight="0dp"
- android:insetBottom="16dp">
- <shape android:shape="rectangle">
- <corners android:radius="2dp" />
- <solid android:color="?dialog_background_color" />
- </shape>
-</inset>
\ 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 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ripple
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:color="@color/core_grey_45">
- <item android:id="@+id/mask">
- <shape>
- <corners android:radius="1000dp" />
- <solid android:color="@color/white" />
- </shape>
- </item>
- <item>
- <shape android:shape="oval">
- <solid android:color="@color/core_white" />
- </shape>
- </item>
-</ripple>
\ 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 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ripple
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:color="@color/transparent_white_40">
- <item android:id="@+id/mask">
- <shape>
- <corners android:radius="1000dp" />
- <solid android:color="@color/white" />
- </shape>
- </item>
- <item android:drawable="@drawable/pill" />
-</ripple>
\ 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 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ripple
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:color="@color/transparent_white_40">
-
- <item android:id="@+id/mask">
- <shape>
- <corners android:radius="5dp" />
- <solid android:color="@color/transparent_black" />
- </shape>
- </item>
-
- <item>
- <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle" >
- <corners android:radius="5dp" />
- <solid android:color="@color/transparent_black_70"/>
- </shape>
- </item>
-</ripple>
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 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ripple
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:color="@color/transparent_white_40">
-
- <item android:id="@+id/mask">
- <shape android:shape="oval">
- <solid android:color="@color/transparent_black" />
- </shape>
- </item>
-
- <item>
- <shape android:shape="oval" >
- <solid android:color="@color/core_grey_75"/>
- </shape>
- </item>
-</ripple>
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 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ripple
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:color="@color/transparent_black_40">
-
- <item android:id="@+id/mask">
- <shape android:shape="oval">
- <solid android:color="@color/transparent_black" />
- </shape>
- </item>
-
- <item>
- <shape android:shape="oval" >
- <solid android:color="@color/core_grey_05"/>
- </shape>
- </item>
-</ripple>
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 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ripple xmlns:android="http://schemas.android.com/apk/res/android"
- android:color="@color/touch_highlight">
- <item
- android:id="@android:id/mask"
- android:drawable="@android:color/white" />
-</ripple>
\ 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
zcmV-u1DE`XP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm0009oNkl<ZXhZFp
zO^8il7{}*OzD6dKk4Z@>S&B)rKoXHesZo@Lh1p1~CW@G{nGFjG3mZxeDWVh$3v3Xv
zQK-qnSLECHzJ7n5Tdy<c+;iXey!X9L&QnkK-gBPk`Tzg#^WJmb^PZ?>m|HZ=`L}o#
zP^nbLGay~~DttaZBOaiqeBQw?;r&q*ee^YOUIajV1cWx?$MLZ_<bH5|8-4;IKZ^<}
zECBMYkhp>`v?Ozj_~nRrZ<+T`cp(9hA49eK_^cEXzc}_iK0b=ikts1xI5r0npIt>1
z6>tpTtqJgN{62#BLhPN+A#?&CyYQX(=tTTU;x-2t0I7L^>W^vK2Yz%wXfTZsIqJkK
zye)Bl5jodgL^yW<G8X_`lK^dlh(u%>dE+?w64w>0YUjyY7fb*orU3Q~ug>cV-#a03
zw;mGY&m`^<uB(^qH$I(w)wD9F4nSZvC>IT+Pkf(fb6KRub8<S28XL&(w_;DQtAK8D
zj~Zat0AFeYo-ze{sL^LrL$R&`7LdEr0DA!VIU8^U93XzTk+Y8)`)z7C3$O)Ai$}l?
zjvp)q_!v!>8bLb%m@b!-a4j8t*%k`zHHsbLyIl4af6aeF%aNLv`zMYUYXh->ym~&*
z>xMWjZ=F<+fHxFs_sPtnmhLZ;5uuKxT1^3relJ;jEC3r3+J}H1R{>v0%zHp-1ZlJ8
zAOf_0a_WHAI88SMWX_blDO3vZ(Y~?+K1Q)fjj{s{qo<9l!?;$PS`KW-^+2zOdut2b
z0o^sHCZCPDDe6J~1#Z2b3N2tRfcMgdIer$_UXYcA7SIZy?%+cV0ooJFT-Ri&3M!x$
zm<S@m`sNr^036!^e4Eh$?W1aiX=R}WbOWee>a;1eiG!!C*b^LDfcSL*dd4Km%vsOx
zv$o_F-wXl5y@_AOwd=M5U+hA@nF3t-4#{g)2TB3e5hy$0Z7w(#`ma0ikU^X6IB>qw
z9@BxemxzDs=RMRfBj&0vCXRL1B0#URQmvkyx!YuRI)WEXyFq~^wf0DJ1&BesL#K6&
y-fe}j0YFYe+<XDz)`1Xgi(u5%fg%8n&iw-s5Gp`aw;DVE0000<MNUMnLSTXj(1Kt9
diff --git a/res/drawable-xhdpi/icon_cached.png b/res/drawable-xhdpi/icon_cached.png
index b34b69604cd2f29779cc5ffef379364cb6dcad4d..66a4b60dd38b1e6d47fb53f62b557d313523d1f3 100644
GIT binary patch
literal 872
zcmV-u1DE`XP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm0009oNkl<ZXhZFp
zO^8il7{}*OzD6dKk4Z@>S&B)rKoXHesZo@Lh1p1~CW@G{nGFjG3mZxeDWVh$3v3Xv
zQK-qnSLECHzJ7n5Tdy<c+;iXey!X9L&QnkK-gBPk`Tzg#^WJmb^PZ?>m|HZ=`L}o#
zP^nbLGay~~DttaZBOaiqeBQw?;r&q*ee^YOUIajV1cWx?$MLZ_<bH5|8-4;IKZ^<}
zECBMYkhp>`v?Ozj_~nRrZ<+T`cp(9hA49eK_^cEXzc}_iK0b=ikts1xI5r0npIt>1
z6>tpTtqJgN{62#BLhPN+A#?&CyYQX(=tTTU;x-2t0I7L^>W^vK2Yz%wXfTZsIqJkK
zye)Bl5jodgL^yW<G8X_`lK^dlh(u%>dE+?w64w>0YUjyY7fb*orU3Q~ug>cV-#a03
zw;mGY&m`^<uB(^qH$I(w)wD9F4nSZvC>IT+Pkf(fb6KRub8<S28XL&(w_;DQtAK8D
zj~Zat0AFeYo-ze{sL^LrL$R&`7LdEr0DA!VIU8^U93XzTk+Y8)`)z7C3$O)Ai$}l?
zjvp)q_!v!>8bLb%m@b!-a4j8t*%k`zHHsbLyIl4af6aeF%aNLv`zMYUYXh->ym~&*
z>xMWjZ=F<+fHxFs_sPtnmhLZ;5uuKxT1^3relJ;jEC3r3+J}H1R{>v0%zHp-1ZlJ8
zAOf_0a_WHAI88SMWX_blDO3vZ(Y~?+K1Q)fjj{s{qo<9l!?;$PS`KW-^+2zOdut2b
z0o^sHCZCPDDe6J~1#Z2b3N2tRfcMgdIer$_UXYcA7SIZy?%+cV0ooJFT-Ri&3M!x$
zm<S@m`sNr^036!^e4Eh$?W1aiX=R}WbOWee>a;1eiG!!C*b^LDfcSL*dd4Km%vsOx
zv$o_F-wXl5y@_AOwd=M5U+hA@nF3t-4#{g)2TB3e5hy$0Z7w(#`ma0ikU^X6IB>qw
z9@BxemxzDs=RMRfBj&0vCXRL1B0#URQmvkyx!YuRI)WEXyFq~^wf0DJ1&BesL#K6&
y-fe}j0YFYe+<XDz)`1Xgi(u5%fg%8n&iw-s5Gp`aw;DVE0000<MNUMnLSTXj(1Kt9
literal 932
zcmV;V16%xwP)<h;3K|Lk000e1NJLTq001%o001%w1^@s69zTe&00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru-~$L0A|^HzD{KG&12IWN
zK~!ko?UzAl9Ay;8|L=X1-2qu!iX>M{D+%;ayew!G@ho^z$)O-Zp(G>_Z<7Vlt(PPh
zk#S*TZx%|?f(IcNK?^0I#DMfrun@sR!Cnlki`n^h=Dp`-1EqwrS$5Wm%<uBSFz=i1
zzwiCu`xYoEDJdx_Df$0E<KD2<YF!F~-~%Fh)6C|G=s7d{hlqYt)gMIU=E};-gTe|i
zGuqnPde6*07LiL?mch(mW*{OE5rQCqbM65VeY&`~c!!8=T;F%&+Gu8G=4}9Rk|Y;I
z1ZD;RhXDQpz-BfjA`p@3AP8RF+uPgU-rjy#sEoAR?YgSoOp;_4fC2awz%4V|HM75o
z=y@Wl1Goa<WdIb0;X`JAe`#rHcN}L3#<7WrT<!P!vx74FHp{XPqbPdx)N4DNo15PR
zLGZbmz2m)~tyC&k0gOcmk0Be=B2rgX5K)(zTgQk107Oyrh?!eN)Kyi8NWI-|PZvT6
z5nax*?EJv+_dA`=Gk@Vur?YEj_W>ZwvhzfAxe!9U_dPTF9>5)D{;t_<9zN^+X0v(d
zocnVi{7k>!f1wZ_SzTS-0kCtzu--rjnAr-Ekx^&PpgluG{=4?Ov9WQcR;#_Ds^><D
zPt)|8h`eEDs8*|AF!RsMe9-N7e_C5x>r6yQ9LII%+$SRPI)K{I<UYxoWf?@|$!QM&
zUFY0A0N0n7mw(CKBSiFBk|guvC<!w|nx;t86aZ?@xwk5n%2@!f<u1f~Usu&!ydxs;
z-q$B$c2%7^GHM>Hs!mNr$S9sT={m9Yn`cH&)f~x#VAPBZQ6~GUdW)HVSJey5e8tQz
z4pUwe5i(?X>;t&gXf*B~#jUTe-y@<g&Fo?x<&~F5ZbVUZ_sN(>qw%Ae-6)JlhAFEs
z3?CmC8;0TIQ`NOpbv};c>Qh&ns;bVPwyw1R;N4@MEu5;Z<-I@4%wNTE{1JdZ0K6z7
zFM01>p}N*Ehw1ftj+y6(Xl`)z$aS&@Id!cguZ$E|PWDl<Q8Y%$$U)9$I+&D@ugy$y
zy8WgAZcobW*9YBYfr!qH@qfqx5#3JHw26|El9G~=3G*)!91Pf4ZMm=j0000<MNUMn
GLSTZ4inP`M
diff --git a/res/drawable-xxhdpi-v11/icon_cached.png b/res/drawable-xxhdpi-v11/icon_cached.png
deleted file mode 100644
index d17e250790fa4d23ccae08e4f4c4998abe57e9bd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 1437
zcmV;O1!DS%P)<h;3K|Lk000e1NJLTq002k;002k`1^@s6RqeA!000GKNkl<ZcwX(C
zeW(>h7>7M(N#aLYf>@|wK_W$^_MM6#Mre_uBxO_<lplC01v3!}vOiK$(JU)P5u*G<
zG*AgluHCYrz(6YK>n0L}qFxIsvu@81cHz2rcW378?m2g027a8&o|$*v_c^n(GrRBJ
zTCY%Y3Dg3gd;$TGVT3dVP-kc7W%xB1-GZi~d(n01s>t87eEx_&Lm#0p(V1GU_IIO4
zd_w^NrY`~BiXK3-(e>yOL(u<4us+~(Kl%z#e>DnJ!vFzi7(qRa=Aawv4Dbiqy^pp4
z>3E$soSHQR5O8$*Y)5xRBc@2d7ot;c9+19qinfl*MI1GD2N>BOjrO8Z#s+Q`+Nu5^
zItHjtx2E>Bs|GY4SKdUo8C?2@?@yuMk%Aq7u11>7^UAk;`3!(QwGY{?W@Uh)IcF{I
z%tU=M-1?K_@1jqTu3GU`N|X6Wbe{mAei`lm<@i3d2uQ!Ug>F~7N<dHGf<}*mO)H;A
zzy7g2R{?zk-)}(oXVg2-@g-;zkaWc>wNwI#p!ACiz)dOM>U7$QmJ`rvn`p2%ka{np
z1?bY0HagWNV(+AlJ(oIF0eTiEHfK1pn&Ybo=8TJ@KpI5-rRb%McJr~B)u&5W7uBr_
zP&>VhNb%|r$7Z_1iR}RCa{k_pwE9k#cI;|7QEDk25JB9IhhL<4`3J|IBZ!?vBEbGb
zwBLbr+9k_9*w^-?v{D72=kab$iifQndy)WtF5*3auA%)Fr0q(wtib-OMeHZrRsl%!
zfaajCMVDhu%nJ!XSDm^GfHX<Jh8Cmb@?j_T=hkgJrC}9-4${x$L|@umzJl`#tZ)I+
zB8;p;{S(HtksVjKgDwWD0Q5HYlTHfI2AqGd4Ceu)QL-LgnXq@1K6JOBv{E{t(mcyC
z1RyOMx1pf{PztC3$S@28pa7`YOch3u?;|MMUEfU{^O5e^Tv2RHRMz?&mfO%<sFfu^
zhigyHmwDifp_3QUqpqDbx&AKt*J3sI{!`LNCqTft76a>$HjG(!37gCzv-|k&<6@Wn
zpevxKqT%WroS2#*y#OGs!mWxcAU)-rVr9AKRyquziMH;!0@5wg<o?IDubxt`13=an
z6<0u&J%4H>Jpft9ZCz0TFi8hMdB0=;WEkfGPyp18K$wFJgCYP5fVvY1mwD5u@NgZZ
zydWhW=u<_HbA}-02{}yzHVaPQM$iF*(&HdygZ!lRDAF_bJJ2I&noZCyb$kN!I)UkV
z*@?6Oqa>^rzEf65X~h>ndRG5f7Mz#{kaVi)j^M*(5%K|$=9*<V`i4!=K$=0lcTg#J
z5_|xpxn??!TBY$uX~cVIla{e&!}y{)J^=a}kH_Pv((#N1K+4Ad7)>x%wy59>ps_fr
zTcE}QpxzN6>pOvYMtuOJl;3GM`kj#u6#%4kJ|&~yY*XJ<#|J=qUbPfQl__Q{QQDpI
zspGeSjBR`$L0SxIPI(+izvcx496{05ZWbzKRqewFikT?)c_R+%HH2;@g0qY-lqg<W
z@d=QEj<*^|_*)5{8eJn%yw#Xq8kxwDZ-C^slFGH+(5C=tL8xq2y_HzXY1I|7kATV^
zB)RqiAOr3IC;%#UMurg-Mo<_*#R!BERE%GkgPJ&kLIPDDd^V41uR0YQ?~QNW#wn)M
zWvk+}&jFC$VYj-6W7T_eDlGv}+8dFn-nar9j+Ko_uS1&tYfE#&&+b+K^Fv9fEdcu7
z);T9YGRi0#%g1u0M=?H?4{>%SaE`h-?F=Y_q=$Kv&^&Y}(mU-vvFJ@}J<`_8cL#y<
ro2!#`0dnoc=lTJV;nxd*41oRz5<uHnEMTdA00000NkvXXu0mjfA`zn9
diff --git a/res/drawable-xxhdpi/icon_cached.png b/res/drawable-xxhdpi/icon_cached.png
index ac8c295810834d099c901726afdad9f0b95e84c8..d17e250790fa4d23ccae08e4f4c4998abe57e9bd 100644
GIT binary patch
literal 1437
zcmV;O1!DS%P)<h;3K|Lk000e1NJLTq002k;002k`1^@s6RqeA!000GKNkl<ZcwX(C
zeW(>h7>7M(N#aLYf>@|wK_W$^_MM6#Mre_uBxO_<lplC01v3!}vOiK$(JU)P5u*G<
zG*AgluHCYrz(6YK>n0L}qFxIsvu@81cHz2rcW378?m2g027a8&o|$*v_c^n(GrRBJ
zTCY%Y3Dg3gd;$TGVT3dVP-kc7W%xB1-GZi~d(n01s>t87eEx_&Lm#0p(V1GU_IIO4
zd_w^NrY`~BiXK3-(e>yOL(u<4us+~(Kl%z#e>DnJ!vFzi7(qRa=Aawv4Dbiqy^pp4
z>3E$soSHQR5O8$*Y)5xRBc@2d7ot;c9+19qinfl*MI1GD2N>BOjrO8Z#s+Q`+Nu5^
zItHjtx2E>Bs|GY4SKdUo8C?2@?@yuMk%Aq7u11>7^UAk;`3!(QwGY{?W@Uh)IcF{I
z%tU=M-1?K_@1jqTu3GU`N|X6Wbe{mAei`lm<@i3d2uQ!Ug>F~7N<dHGf<}*mO)H;A
zzy7g2R{?zk-)}(oXVg2-@g-;zkaWc>wNwI#p!ACiz)dOM>U7$QmJ`rvn`p2%ka{np
z1?bY0HagWNV(+AlJ(oIF0eTiEHfK1pn&Ybo=8TJ@KpI5-rRb%McJr~B)u&5W7uBr_
zP&>VhNb%|r$7Z_1iR}RCa{k_pwE9k#cI;|7QEDk25JB9IhhL<4`3J|IBZ!?vBEbGb
zwBLbr+9k_9*w^-?v{D72=kab$iifQndy)WtF5*3auA%)Fr0q(wtib-OMeHZrRsl%!
zfaajCMVDhu%nJ!XSDm^GfHX<Jh8Cmb@?j_T=hkgJrC}9-4${x$L|@umzJl`#tZ)I+
zB8;p;{S(HtksVjKgDwWD0Q5HYlTHfI2AqGd4Ceu)QL-LgnXq@1K6JOBv{E{t(mcyC
z1RyOMx1pf{PztC3$S@28pa7`YOch3u?;|MMUEfU{^O5e^Tv2RHRMz?&mfO%<sFfu^
zhigyHmwDifp_3QUqpqDbx&AKt*J3sI{!`LNCqTft76a>$HjG(!37gCzv-|k&<6@Wn
zpevxKqT%WroS2#*y#OGs!mWxcAU)-rVr9AKRyquziMH;!0@5wg<o?IDubxt`13=an
z6<0u&J%4H>Jpft9ZCz0TFi8hMdB0=;WEkfGPyp18K$wFJgCYP5fVvY1mwD5u@NgZZ
zydWhW=u<_HbA}-02{}yzHVaPQM$iF*(&HdygZ!lRDAF_bJJ2I&noZCyb$kN!I)UkV
z*@?6Oqa>^rzEf65X~h>ndRG5f7Mz#{kaVi)j^M*(5%K|$=9*<V`i4!=K$=0lcTg#J
z5_|xpxn??!TBY$uX~cVIla{e&!}y{)J^=a}kH_Pv((#N1K+4Ad7)>x%wy59>ps_fr
zTcE}QpxzN6>pOvYMtuOJl;3GM`kj#u6#%4kJ|&~yY*XJ<#|J=qUbPfQl__Q{QQDpI
zspGeSjBR`$L0SxIPI(+izvcx496{05ZWbzKRqewFikT?)c_R+%HH2;@g0qY-lqg<W
z@d=QEj<*^|_*)5{8eJn%yw#Xq8kxwDZ-C^slFGH+(5C=tL8xq2y_HzXY1I|7kATV^
zB)RqiAOr3IC;%#UMurg-Mo<_*#R!BERE%GkgPJ&kLIPDDd^V41uR0YQ?~QNW#wn)M
zWvk+}&jFC$VYj-6W7T_eDlGv}+8dFn-nar9j+Ko_uS1&tYfE#&&+b+K^Fv9fEdcu7
z);T9YGRi0#%g1u0M=?H?4{>%SaE`h-?F=Y_q=$Kv&^&Y}(mU-vvFJ@}J<`_8cL#y<
ro2!#`0dnoc=lTJV;nxd*41oRz5<uHnEMTdA00000NkvXXu0mjfA`zn9
literal 1190
zcmV;X1X=ruP)<h;3K|Lk000e1NJLTq002t>002t}1^@s6I8J)%00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru-~$L0BLWi){`>#{1T#rQ
zK~#9!?V3$!V^tK#|L4B<l1CTg$54!x5s^WZ8Am97pkP4-2WKI(5MBAPa4{1~XqqhA
zbdzO4n%2J5O~HkVjtVa7Al(dNK^MB1g<l9(M#QO3ixns7%j?TK$3+{AwVig_O!G|7
z55h_A&Al)0&$;KEoCHu5MNt$*Q4~c{6h%?m47K|MOifMQXN-BuvaC}gaty$o>r=k~
z_yNFd7>2X`{r%q_Sh2>($8UCB_cZ{oMp1;u0{}z>#uyM0Y}<x02F92VYPDKsU|`_)
z10~k<^z`G*JQD=LO<@=k5kW+7Eo)hpB$LUj%=}_Hot`-mVtJnTtYukm`@Vl@H|t&3
ztyq?I_RN_x?{u_SV`F1ST-W`wR;#5pOfeCC!^{_nXr72fMD7C63*ZC*tNG2zWOCUU
z^I$ri{;4CyDi(_-l}de8tyX(COw|CqlFQ}Z-$LM106qlJ)jZzS)pa=x!@Dz?Ot4?~
zVD{@msZ{D--}g^!7+x{P^ll{-0OWGHPmD3g095|9aAhTxNF@69)3f$XtSE}kMNwoo
zvK@d>MEbJX?DyNP&1SQgMC7=L{MEGHgkf0fII&8lQcn;B_ixB@bCpWv;!gL-=kq@k
z(Z|hMG7Q7x<#PF+juOjt-J{Ih@CeA-lT5K#<m(EsM8$uW1I&!|B+yaE@Rkj)m-G4j
zch|eg;Nako0Dfy86Or5YODuaoE>f@8zXmYSG*sPn`X;)<%(pj=A~RbZB~~VrnFsKC
zEA|o*zd81GWHxMBVYn_-Q&v>5;>iC}taf=;%MZQhd3RWrb(V-;7Lg;Z-rx8AM#%sG
zNF)+)9H((a7ewT}APBr{HhU@7Vogp?CT-jPH3)*kQ51ohv6J>oD{Uf?fNk4<EG;ed
z6pO`LY>%PiIA2sMmBaOVy)8l!5mr}M;rsrr-QC^uv5r~QYW3)5F{K^0TCH}+S}bNh
zg!tgZTC6yD)Q!xNEfuRBG3r`YJ*!hZODlNwtQ!}z;$&mpqS<3mW)ZnSM4yRBWQ=)?
znV%sdd$;?>TC6<?waCmb4G#~`Ht#n&I@%{9?-EguX2Uhhn+XK~LqkJz%>06gux7(G
zE^H=LgF>P3Ie?Ee8;ZcT?YV7Zg>9eL3Z4i=wC$Z)mc<&gL?9xM?%)ghNsU?SLU^9{
z<W}<&6BCax^Ya?BL=Z)hU9Z>QDwoUu`IASfRC*Y|xiAc!ICxge>#W__AP9Ph=u^-0
zW&oTgqB=956p`nA-*>cvZ?en`-}j9%=CtEDrvV^}B7|YMr#4NeR`89V;!&&Bw4bG2
z2kmF6XT`RH*B-oj){eLuqYx9u-LvLn<XL~lS}bGC(*TxZ(1TwD@Ib7^DijKf%>0mu
zya8aL4IXs`z?)GNJuxyevY^F|q9}@@D2k#eiqdNS2783t&ipG;tpET307*qoM6N<$
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)<h;3K|Lk000e1NJLTq003kF003kN1^@s6aN?Cz00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru-~$L0EgGKVOC$gQ1{X<0
zK~#9!?VDeSRCN@`zvtdNJF~N*Xs#|rR$z*jru32zs}fWwf>3HmMiP{6f~?yvlh($4
z(JXVYVMDj4AVeIA3Ph}=C?9%}z%c)mmXeAqVx)sJbMNo`P7kSU<Ls`kJLBBpd|uAO
z{q65}?|$d}&i8lj44^2Aq9}@@D2k#eilQirq9}@@D2k#eN;xP>H=E67-Sg+qk8f&f
zddyn82*5lMd5DPayFTQyh@26TgG97fL=N}$^<DOT->4uXi0}JeOH0cv0E+=E5s}Hp
z7>}7@t^MCv$8q4gE?n0&j^i9BqP+mV1n~2!RjWc3WCYl;W5;@H?JLauXc&eL0Eh^P
zXwY~=oLDS&(ptOI^Sq6<E=o-c(%aiRUPN|=Vfd^u2G-gkMJN{mprN4wuIqjWV0l|x
z+eH=R4(aLXnc{g~PoYqFhM7lXPS<r2kH-%Jc%!YY?MN*?w_A%hmC0n{uIp|u7K_g@
z^I-RA0Gt7E62N%?MF33$J(q}pnIG^x@8Q<g)_n&K94OY>vwO8Di065!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?-#<XU$Syu(QH9L~l+9!#~1#t8H
zKtv#-J=d;XJ2l+7bGh7KM3e;(_MaDkD<U(`o;^E81-X?`%sjJ9?SSWbU-`ao?;`sw
zfc@oai7{qcJRTpXf|S6_p0##tnM=QyTHE2!(a~`dz;9)2@EB%pP(jKFA|ew?KfwV0
z7%`7ebh>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+aN<Dg6$*vc8x~kZ;JPjx
z$5}gJ!i4<*7Sv^iY~8x`!DKSIKcCM}H^x*=gu983;~<$#9xD_I3)ih%ce<`>NFtHw
z%;j=ZjWL6|omz^_j9e}^Ef$M)*IiK$!|-VlsmXWvL)qjY2<FzKAd@0|plqo-K}2M9
zgasK@kAg%x)}0_xa8-jv%@ECy%4bNFqh^R^h*Aq^hN#O@msJzp-U|J*E{Vu5M0D=@
zR}$|Rkr_lZairJN3>iA^CZZ+Gyds~^uS}&<E17wP<2XyLwV!E*RI!E-(UyEZ|4#px
zN51a^Kp%iU-}iq?BogNUyrngy@*Hv;XZv7p@_gSnMD($U{GcwY^6c*F>iTo2L8(;g
ztm8OY6{OO8tmo~$-LbJ)>>CxN!ZoC`v-9}vuG!JiaZ+nYg<V!AlWD%)HPh+zIPLaU
zI767Z^$xbTIhrAr=hbvN-8j^sOePa&=9jgGRG2Uf=XjpCe6ZgI`o8Y~c!`<ks~{DI
zna3GpHea}KVa-5e#*Q8Px-sVcFbpR~&P7JCmsKnln?>ZKOeXUhGw*O+_xpT4&y9_Z
z^8u_f#>_4h3X$w(RZWnQ?kxpDfFKASkH_OZ)><SI34~z?V+@#CyS>%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<bLWCjhKozkdA}Rr}ypdo$j&
zY10%Dd69^gT5D(2sH-|kM4wx0cXfAnAJhJUq9}@@D2k#eilQirq9}@@D9Xt3FOZJJ
U=wwQee*gdg07*qoM6N<$f|4{BLjV8(
diff --git a/res/drawable/circle_touch_highlight_background.xml b/res/drawable/circle_touch_highlight_background.xml
index 96f6b341a6..fe392b45e6 100644
--- a/res/drawable/circle_touch_highlight_background.xml
+++ b/res/drawable/circle_touch_highlight_background.xml
@@ -1,8 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:state_pressed="true">
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+ android:color="@color/touch_highlight">
+ <item android:id="@android:id/mask">
<shape android:shape="oval">
- <solid android:color="@color/touch_highlight" />
+ <solid android:color="@color/black" />
</shape>
</item>
-</selector>
\ No newline at end of file
+</ripple>
\ 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 @@
<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:drawable="@color/textsecure_primary_alpha33" android:state_selected="true" />
- <item android:drawable="@color/textsecure_primary_alpha33" android:state_pressed="true" />
- <item android:drawable="@color/signal_primary_alpha_focus" android:state_focused="true" />
-</selector>
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+ android:color="@color/textsecure_primary">
+ <item android:id="@android:id/mask" android:drawable="@android:color/black" />
+ <item>
+ <selector>
+ <item android:drawable="@color/textsecure_primary_alpha33" android:state_selected="true" />
+ </selector>
+ </item>
+</ripple>
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 @@
<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:drawable="@color/textsecure_primary_alpha33" android:state_selected="true" />
- <item android:drawable="@color/textsecure_primary_alpha33" android:state_pressed="true" />
- <item android:drawable="@color/signal_primary_alpha_focus" android:state_focused="true" />
-</selector>
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+ android:color="@color/textsecure_primary">
+ <item android:id="@android:id/mask" android:drawable="@android:color/black" />
+ <item>
+ <selector>
+ <item android:drawable="@color/textsecure_primary_alpha33" android:state_selected="true" />
+ </selector>
+ </item>
+</ripple>
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 @@
<gradient
android:angle="90"
- android:startColor="#121212"
- android:endColor="#171717"
+ android:startColor="@color/default_background_start"
+ android:endColor="@color/default_background_end"
android:type="linear" />
</shape>
\ 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 @@
<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
- android:shape="rectangle">
- <solid android:color="@color/transparent" />
-</shape>
\ No newline at end of file
+<inset xmlns:android="http://schemas.android.com/apk/res/android"
+ android:insetLeft="0dp"
+ android:insetTop="16dp"
+ android:insetRight="0dp"
+ android:insetBottom="16dp">
+ <shape android:shape="rectangle">
+ <corners android:radius="2dp" />
+ <solid android:color="?dialog_background_color" />
+ </shape>
+</inset>
\ 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 @@
<?xml version="1.0" encoding="utf-8"?>
<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
android:src="@drawable/ic_advanced_white_24dp"
- android:tint="?attr/pref_icon_tint"/>
+ 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 @@
<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval">
- <solid android:color="@color/core_white"/>
-</shape>
\ No newline at end of file
+<ripple
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:color="@color/core_grey_45">
+ <item android:id="@+id/mask">
+ <shape>
+ <corners android:radius="1000dp" />
+ <solid android:color="@color/white" />
+ </shape>
+ </item>
+ <item>
+ <shape android:shape="oval">
+ <solid android:color="@color/core_white" />
+ </shape>
+ </item>
+</ripple>
\ 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 @@
<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
- <corners android:radius="1000dp" />
- <solid android:color="@color/accent" />
-</shape>
+<ripple
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:color="@color/transparent_white_40">
+ <item android:id="@+id/mask">
+ <shape>
+ <corners android:radius="1000dp" />
+ <solid android:color="@color/white" />
+ </shape>
+ </item>
+ <item android:drawable="@drawable/pill" />
+</ripple>
\ 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 @@
<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle" >
- <corners android:radius="5dp" />
- <solid android:color="@color/transparent_black_70"/>
-</shape>
\ No newline at end of file
+<ripple
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:color="@color/transparent_white_40">
+
+ <item android:id="@+id/mask">
+ <shape>
+ <corners android:radius="5dp" />
+ <solid android:color="@color/transparent_black" />
+ </shape>
+ </item>
+
+ <item>
+ <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle" >
+ <corners android:radius="5dp" />
+ <solid android:color="@color/transparent_black_70"/>
+ </shape>
+ </item>
+</ripple>
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 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
<corners android:topLeftRadius="44dp"
android:topRightRadius="44dp"
- android:bottomLeftRadius="0dp"
- android:bottomRightRadius="44dp"/>
+ android:bottomLeftRadius="44dp"
+ android:bottomRightRadius="0dp"/>
<solid android:color="#FF0288D1" />
<size android:height="88dp" android:width="88dp" />
</shape>
\ 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 @@
<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval" >
- <solid android:color="@color/core_grey_75"/>
-</shape>
\ No newline at end of file
+<ripple
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:color="@color/transparent_white_40">
+
+ <item android:id="@+id/mask">
+ <shape android:shape="oval">
+ <solid android:color="@color/transparent_black" />
+ </shape>
+ </item>
+
+ <item>
+ <shape android:shape="oval" >
+ <solid android:color="@color/core_grey_75"/>
+ </shape>
+ </item>
+</ripple>
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 @@
<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval" >
- <solid android:color="@color/core_grey_05"/>
-</shape>
\ No newline at end of file
+<ripple
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:color="@color/transparent_black_40">
+
+ <item android:id="@+id/mask">
+ <shape android:shape="oval">
+ <solid android:color="@color/transparent_black" />
+ </shape>
+ </item>
+
+ <item>
+ <shape android:shape="oval" >
+ <solid android:color="@color/core_grey_05"/>
+ </shape>
+ </item>
+</ripple>
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 @@
<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:state_pressed="true" android:drawable="@color/touch_highlight" />
- <item android:state_focused="true" android:drawable="@color/signal_primary" />
- <item android:drawable="@android:color/transparent" />
-</selector>
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+ android:color="@color/touch_highlight">
+ <item
+ android:id="@android:id/mask"
+ android:drawable="@android:color/white" />
+</ripple>
\ 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 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout
- xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:app="http://schemas.android.com/apk/res-auto"
- android:orientation="vertical"
- android:layout_width="match_parent"
- android:layout_height="match_parent">
-
- <com.google.android.exoplayer2.ui.PlayerView
- android:id="@+id/video_view"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:layout_gravity="center"
- android:gravity="center"
- app:player_layout_id="@layout/media_preview_exoplayer_layout"/>
-
-</FrameLayout>
\ 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" />
+ <TextView
+ android:id="@+id/themeSwitchButton"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/setting_button_height"
+ android:background="@color/accent"
+ android:textColor="@color/text"
+ android:textSize="@dimen/medium_font_size"
+ android:textStyle="bold"
+ android:gravity="center"
+ android:text="Switch Theme" />
+
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="1px"
+ android:background="@color/separator" />
+
<TextView
android:id="@+id/privacyButton"
android:layout_width="match_parent"
diff --git a/res/layout/video_player.xml b/res/layout/video_player.xml
index 144e0f51ec..b855fca65a 100644
--- a/res/layout/video_player.xml
+++ b/res/layout/video_player.xml
@@ -1,13 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:orientation="vertical"
- android:layout_width="match_parent"
- android:layout_height="match_parent">
+<FrameLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ android:orientation="vertical"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
- <VideoView android:id="@+id/video_view"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:layout_gravity="center"
- android:gravity="center"/>
+ <com.google.android.exoplayer2.ui.PlayerView
+ android:id="@+id/video_view"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_gravity="center"
+ android:gravity="center"
+ app:player_layout_id="@layout/media_preview_exoplayer_layout"/>
</FrameLayout>
\ 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 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+
+<!-- Session -->
+<color name="accent">#00E97B</color>
+<color name="text">#000000</color>
+<color name="cell_background">#FCFCFC</color>
+<color name="cell_selected">#DFDFDF</color>
+<color name="navigation_bar_background">#FCFCFC</color>
+<color name="unimportant_button_background">@color/transparent</color>
+<color name="dialog_background">#FCFCFC</color>
+<color name="dialog_border">#212121</color>
+<color name="compose_view_background">#FCFCFC</color>
+<color name="compose_text_view_background">#EDEDED</color>
+<color name="received_message_background">#F5F5F5</color>
+<color name="sent_message_background">#00E97B</color>
+<color name="new_conversation_button_collapsed_background">#F5F5F5</color>
+<color name="pn_option_background">#FCFCFC</color>
+<color name="fake_chat_bubble_background">#F5F5F5</color>
+
+
+<color name="default_background_start">#fcfcfd</color>
+<color name="default_background_end">#fcfcfd</color>
+<color name="action_bar_background">#fcfcfd</color>
+
+
+<color name="unimportant_dialog_button_background">#1B1B1B</color>
+<color name="app_icon_background">#333132</color>
+<color name="progress_bar_background">#0AFFFFFF</color>
+<color name="quote_not_found_background">#99FFFFFF</color>
+
+</resources>
\ 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 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
- <style name="Widget.ProgressBar.Horizontal" parent="@android:style/Widget.Holo.ProgressBar.Horizontal">
- </style>
-
-</resources>
\ 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 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
- <color name="touch_highlight">#22000000</color>
-</resources>
\ 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 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
- <style name="TextSecure.ScribbleTheme" parent="TextSecure.DarkNoActionBar">
- <item name="android:windowNoTitle">true</item>
- <item name="android:windowFullscreen">true</item>
- </style>
-</resources>
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 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
- <style name="TextSecure.DarkTheme" parent="@style/TextSecure.BaseDarkTheme">
- <item name="android:navigationBarColor">@color/compose_view_background</item>
- </style>
-
- <style name="TextSecure.DarkNoActionBar" parent="@style/TextSecure.BaseDarkNoActionBar">
- <item name="android:navigationBarColor">@color/compose_view_background</item>
- <item name="android:colorControlActivated">@color/signal_primary_dark</item>
- </style>
-
-</resources>
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 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
- <style name="NotificationText" parent="android:TextAppearance.StatusBar.EventContent" />
- <style name="NotificationTitle" parent="android:TextAppearance.StatusBar.EventContent.Title" />
-</resources>
\ No newline at end of file
diff --git a/res/values/colors.xml b/res/values/colors.xml
index e46a888f01..63ebf4387d 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -82,7 +82,7 @@
<color name="conversation_compose_divider">#32000000</color>
<color name="action_mode_status_bar">@color/gray65</color>
- <color name="touch_highlight">#400099cc</color>
+ <color name="touch_highlight">#22000000</color>
<color name="device_link_item_background_light">#ffffffff</color>
<color name="device_link_item_background_dark">#ff333333</color>
@@ -107,4 +107,7 @@
<color name="avatar_background">@color/transparent_black_90</color>
+ <color name="default_background_start">#121212</color>
+ <color name="default_background_end">#171717</color>
+
</resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 3355423f77..9fc46d2f60 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -296,13 +296,12 @@
<item name="android:textColor">#BFffffff</item>
</style>
- <style name="NotificationText">
- <item name="android:textColor">?android:attr/textColorPrimary</item>
+ <style name="NotificationText" parent="android:TextAppearance.StatusBar.EventContent">
+ <item name="android:textColor">?android:attr/textColorPrimary</item>
</style>
-
- <style name="NotificationTitle">
- <item name="android:textColor">?android:attr/textColorPrimary</item>
- <item name="android:textStyle">bold</item>
+ <style name="NotificationTitle" parent="android:TextAppearance.StatusBar.EventContent.Title">
+ <item name="android:textColor">?android:attr/textColorPrimary</item>
+ <item name="android:textStyle">bold</item>
</style>
<style name="Registration.Description" parent="@android:style/TextAppearance">
@@ -350,7 +349,7 @@
<!-- For Holo Light Dialog Activity Styling Emulation -->
- <style name="Widget.ProgressBar.Horizontal" parent="@android:style/Widget.ProgressBar.Horizontal">
+ <style name="Widget.ProgressBar.Horizontal" parent="@android:style/Widget.Holo.ProgressBar.Horizontal">
</style>
<style name="MaterialButton">
diff --git a/res/values/themes.xml b/res/values/themes.xml
index edd5adf795..fde5f00df2 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -3,43 +3,23 @@
<resources>
<!-- Session -->
- <style name="Session.DarkTheme" parent="@style/Theme.AppCompat">
- <item name="actionBarStyle">@style/Session.DarkActionBar</item>
+ <style name="Session.DarkTheme" parent="@style/Theme.AppCompat.DayNight.DarkActionBar">
<item name="colorPrimary">@color/action_bar_background</item>
<item name="colorPrimaryDark">@color/action_bar_background</item>
- <item name="android:navigationBarColor">@color/navigation_bar_background</item>
+ <item name="colorAccent">@color/accent</item>
+ <item name="actionBarStyle">@style/Session.DarkActionBar</item>
<item name="alertDialogTheme">@style/Session.AlertDialog</item>
+ <item name="android:navigationBarColor">@color/compose_view_background</item>
<item name="android:windowBackground">@drawable/default_session_background</item>
<item name="preferenceTheme">@style/Session.SettingsTheme</item>
- <item name="colorAccent">@color/accent</item>
<item name="actionModeBackground">@color/compose_view_background</item>
<item name="windowActionModeOverlay">true</item>
</style>
- <style name="Session.DarkTheme.NoActionBar" parent="@style/Theme.AppCompat.NoActionBar">
- <item name="actionBarStyle">@style/Session.DarkActionBar</item>
- <item name="colorPrimary">@color/action_bar_background</item>
- <item name="colorPrimaryDark">@color/action_bar_background</item>
- <item name="android:navigationBarColor">@color/navigation_bar_background</item>
- <item name="alertDialogTheme">@style/Session.AlertDialog</item>
- <item name="android:windowBackground">@drawable/default_session_background</item>
- <item name="preferenceTheme">@style/Session.SettingsTheme</item>
- <item name="colorAccent">@color/accent</item>
- <item name="actionModeBackground">@color/compose_view_background</item>
- <item name="windowActionModeOverlay">true</item>
- </style>
+ <style name="Session.DarkTheme.NoActionBar" parent="@style/Theme.AppCompat.DayNight.NoActionBar"/>
- <style name="Session.DarkTheme.SubtitleActionBar" parent="@style/Theme.AppCompat">
+ <style name="Session.DarkTheme.SubtitleActionBar" parent="@style/Theme.AppCompat.DayNight.NoActionBar">
<item name="actionBarStyle">@style/Session.DarkSubtitleActionBar</item>
- <item name="colorPrimary">@color/action_bar_background</item>
- <item name="colorPrimaryDark">@color/action_bar_background</item>
- <item name="android:navigationBarColor">@color/navigation_bar_background</item>
- <item name="alertDialogTheme">@style/Session.AlertDialog</item>
- <item name="android:windowBackground">@drawable/default_session_background</item>
- <item name="preferenceTheme">@style/Session.SettingsTheme</item>
- <item name="colorAccent">@color/accent</item>
- <item name="actionModeBackground">@color/compose_view_background</item>
- <item name="windowActionModeOverlay">true</item>
</style>
<!-- Session -->
@@ -68,7 +48,8 @@
</style>
<style name="TextSecure.DarkNoActionBar" parent="@style/TextSecure.BaseDarkNoActionBar">
- <!-- leave empty to allow overriding -->
+ <item name="android:navigationBarColor">@color/compose_view_background</item>
+ <item name="android:colorControlActivated">@color/signal_primary_dark</item>
</style>
<style name="TextSecure.BaseDarkNoActionBar" parent="@style/TextSecure.BaseDarkTheme">
@@ -535,6 +516,8 @@
</style>
<style name="TextSecure.ScribbleTheme" parent="TextSecure.DarkNoActionBar">
+ <item name="android:windowNoTitle">true</item>
+ <item name="android:windowFullscreen">true</item>
</style>
<style name="TextSecure.MediaSendProgressDialog" parent="@android:style/Theme.Dialog">
diff --git a/src/org/thoughtcrime/securesms/loki/activities/SettingsActivity.kt b/src/org/thoughtcrime/securesms/loki/activities/SettingsActivity.kt
index 79cf26157f..281d965d3f 100644
--- a/src/org/thoughtcrime/securesms/loki/activities/SettingsActivity.kt
+++ b/src/org/thoughtcrime/securesms/loki/activities/SettingsActivity.kt
@@ -5,11 +5,13 @@ import android.content.ClipData
import android.content.ClipboardManager
import android.content.Context
import android.content.Intent
+import android.content.res.Configuration
import android.net.Uri
import android.os.AsyncTask
import android.os.Bundle
import android.os.Handler
import android.os.Looper
+import android.support.v7.app.AppCompatDelegate
import android.view.View
import android.view.inputmethod.InputMethodManager
import android.widget.LinearLayout
@@ -66,6 +68,11 @@ class SettingsActivity : PassphraseRequiredActionBarActivity() {
// region Lifecycle
override fun onCreate(savedInstanceState: Bundle?, isReady: Boolean) {
super.onCreate(savedInstanceState, isReady)
+// setTheme(if (isDarkTheme())
+// R.style.Session_DarkTheme_NoActionBar
+// else
+// R.style.Session_LightTheme_NoActionBar)
+
setContentView(R.layout.activity_settings)
setSupportActionBar(toolbar)
cancelButton.setOnClickListener { cancelEditingDisplayName() }
@@ -96,6 +103,21 @@ class SettingsActivity : PassphraseRequiredActionBarActivity() {
seedButton.setOnClickListener { showSeed() }
clearAllDataButton.setOnClickListener { clearAllData() }
versionTextView.text = String.format(getString(R.string.version_s), BuildConfig.VERSION_NAME)
+
+ themeSwitchButton.setOnClickListener {
+ setDarkTheme(!isDarkTheme())
+ recreate()
+ }
+ }
+
+ private fun isDarkTheme(): Boolean {
+ val themeFlag = resources.configuration.uiMode and Configuration.UI_MODE_NIGHT_MASK
+ return themeFlag == Configuration.UI_MODE_NIGHT_YES;
+ }
+
+ private fun setDarkTheme(darkTheme: Boolean) {
+// AppCompatDelegate.setDefaultNightMode(if (darkTheme) AppCompatDelegate.MODE_NIGHT_YES else AppCompatDelegate.MODE_NIGHT_NO )
+ AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_AUTO)
}
public override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {