From 9103e49e204bf4ccda5496506b4bbb86247be7ad Mon Sep 17 00:00:00 2001 From: Conny Duck Date: Sun, 29 Apr 2018 09:23:57 +0200 Subject: [PATCH] fix icon color in search for dark theme --- .../fdroid/views/swap/SwapWorkflowActivity.java | 2 +- app/src/main/res/drawable-hdpi/ic_close_white.png | Bin 451 -> 0 bytes .../res/drawable-ldrtl/ic_back_white_24dp.xml | 7 +++++++ app/src/main/res/drawable-mdpi/ic_close_white.png | Bin 368 -> 0 bytes .../main/res/drawable-xhdpi/ic_close_white.png | Bin 542 -> 0 bytes .../main/res/drawable-xxhdpi/ic_close_white.png | Bin 663 -> 0 bytes .../main/res/drawable-xxxhdpi/ic_close_white.png | Bin 703 -> 0 bytes app/src/main/res/drawable/ic_back_white_24dp.xml | 5 +++++ app/src/main/res/drawable/ic_close_white_24dp.xml | 9 +++++++++ app/src/main/res/layout/activity_app_list.xml | 4 ++-- app/src/main/res/values/attrs.xml | 4 +++- app/src/main/res/values/styles.xml | 4 ++++ 12 files changed, 31 insertions(+), 4 deletions(-) delete mode 100644 app/src/main/res/drawable-hdpi/ic_close_white.png create mode 100644 app/src/main/res/drawable-ldrtl/ic_back_white_24dp.xml delete mode 100644 app/src/main/res/drawable-mdpi/ic_close_white.png delete mode 100644 app/src/main/res/drawable-xhdpi/ic_close_white.png delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_close_white.png delete mode 100644 app/src/main/res/drawable-xxxhdpi/ic_close_white.png create mode 100644 app/src/main/res/drawable/ic_back_white_24dp.xml create mode 100644 app/src/main/res/drawable/ic_close_white_24dp.xml diff --git a/app/src/main/java/org/fdroid/fdroid/views/swap/SwapWorkflowActivity.java b/app/src/main/java/org/fdroid/fdroid/views/swap/SwapWorkflowActivity.java index 5d93b8e72..71f86e287 100644 --- a/app/src/main/java/org/fdroid/fdroid/views/swap/SwapWorkflowActivity.java +++ b/app/src/main/java/org/fdroid/fdroid/views/swap/SwapWorkflowActivity.java @@ -370,7 +370,7 @@ public class SwapWorkflowActivity extends AppCompatActivity { toolbar.setBackgroundColor(getResources().getColor(currentView.getToolbarColour())); toolbar.setTitle(currentView.getToolbarTitle()); - toolbar.setNavigationIcon(R.drawable.ic_close_white); + toolbar.setNavigationIcon(R.drawable.ic_close_white_24dp); toolbar.setNavigationOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { diff --git a/app/src/main/res/drawable-hdpi/ic_close_white.png b/app/src/main/res/drawable-hdpi/ic_close_white.png deleted file mode 100644 index d67500d35e4465d3bf4fd2009f879cb39268d33b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 451 zcmeAS@N?(olHy`uVBq!ia0vp^W+2SL3?z5Yp7kC`1qS$pxB}__R0SO7&*OlGN|glp z1v9ASh)d+Es&D!+d+vsRvwm(A5uNi(Y{}n6i)GF!o?>8NWcPG&4DmSrcB;2fvx0z& z=>ow&3mmT${BK?suu;j#B1%m=o%8CK=7ow~?{>Y`7q#!GZ&K4-QmL?%Th_K$zdbZO6r}dg@c(?vQEJ@HG9k){=MOx5N6oG81p^ zXwg+)$Y)aYWXciMoI`VGf7_nJ;`rjBi(r&rqUFSvX_sHHgmZcCc=X1qP4$o6mwm^D zZ!w#=xpSnSI~Vb?F5u$()aMH4Wl!FD`mlBd<2O02r>6sF6qqQ=)b0%XUNCvFt<$5k zf=vQve)Bz4bN4t@+UFp9c5mc73)UCxw(Et}y%{2-+T}ho{jqsu^`Uf0czsCu-O|)r ZhV!%J9^Eo}7!3?K22WQ%mvv4FO#rN2>G1#n diff --git a/app/src/main/res/drawable-ldrtl/ic_back_white_24dp.xml b/app/src/main/res/drawable-ldrtl/ic_back_white_24dp.xml new file mode 100644 index 000000000..c486e30c3 --- /dev/null +++ b/app/src/main/res/drawable-ldrtl/ic_back_white_24dp.xml @@ -0,0 +1,7 @@ + + + + diff --git a/app/src/main/res/drawable-mdpi/ic_close_white.png b/app/src/main/res/drawable-mdpi/ic_close_white.png deleted file mode 100644 index dd663c5b1ec884b9510188d1ec173a1246385666..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 368 zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k3?#4J%UA`ZJOX?|T!Hj|YJlez6&rwNiI)WV z1v79siHYYuoFF1PDfidpDHDIr`Zq&(X3l}n*EoPm4tTmahFF|_JNYhOvjR`+)ARs= zrApEF|NAcY>*3gyvinYzd-0_8w#!Y#}vw z9|fU%6E8~#-gq;U%gX(Q;>HPcT8oN4%;+%YHofvKx+6|y+REJwf1O&4uUVaPIg)t5 zI4p`wv&A!cT}`{9K&zqI{VuaP7T3?nJ*wC*^XF+|kJM+G;%l!SKFgZBwQ9!Gh)oI8 zljCQoe%>RtXzJ9(o8R~KZGHOF?uNSj!}iylSsQqi{;}@_g(QQgtDnm{r-UW|yOYJz diff --git a/app/src/main/res/drawable-xhdpi/ic_close_white.png b/app/src/main/res/drawable-xhdpi/ic_close_white.png deleted file mode 100644 index cea8dc1e7060eec9b0d613f9942b6cd401a416ee..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 542 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY3?!3`olAjKRDe&2E0F$A8xU!T^nPus{b*+A{60S2Txo$YE_i(!2g|ExF%XCX}rQgiT{~+PG?&rk( z!n37wSKkbHzBD^`VY|mar-gens&l`^9k-7?as2u+Zp**>r4%3ZITU~8ZY!=hgr*5^u;d-+Qc?mJ^%e-tuo7wFl(m?*-MobJ}ds2_y3||vTv0VUlf<* zmK$>|e$Cx@aGF(*-9^TkW^(qDbvf0%Z+_Q09qAB!Tz|y;N{zFX=dXuXflFVdQ I&MBb@0G%-%K>z>% diff --git a/app/src/main/res/drawable-xxhdpi/ic_close_white.png b/app/src/main/res/drawable-xxhdpi/ic_close_white.png deleted file mode 100644 index d55633b59c558b0b9e0eb83ef341a6ad71f43449..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 663 zcmeAS@N?(olHy`uVBq!ia0vp^IUvlz3?z5#SpFYK#Rm9R%r zH5u@*B{vc1Z;^_+av>vv5n%HHhGJUQXv>eS-3E2UzL zba&rZWezi%$2;9YHT|$^JJ)s9`SIVUPF~U^t#?v5hWq=k{ZadyrS&9EsNIu{5BbiO z*HLxm`wDON=_b5^ynn)Z^?qjD*zqQ7!;C1dKI*jXKhud>9XBePj`#U>f1G`HmZoiN+#$^EIB71Hik zdLAcRTr`~_dHi%i9#`vJvAaCi+gs*{&E=I{=F0EFJlV79+zppW2P}_TJvNZY^XWd)mcQJ!$XV#5ZQixdlYBOAzSpc$#I9ob z%_G@MDgO4c(AWQ*cCFoTUF_ygT;Gre(KF$1ANnUp+*=JW~HKbs9KEggRMf a%dcyj)!}_iZ!RzaFnGH9xvX%4p#U;g{^%~|{Tb0OQw*NvZMT|29~4#>I_s8C^RT&cF+BjEFTRkugB zR`HLsy{@dO)^-fGF8yfxGwYtNSIH95PewYYp03(kc~P#{#l4bsZSuS0GYkZ;gvH5Z zCu@X9S8rT%^=Ovp9*?ZhJseq6_jFxdRe9FFeCe~Rd!BKxxw2-yQV!kv6CYA;;&VroF}ms`P;zuyX*-4u8#eXHZz`RB8~cL(;w>)C%4KM|F-a;vhm*H?2iFS>R7edVJw^RK?HH1;sA4_m*V zTYF{hoBbhI%)ZBSWm*4DE!=wd@1_m68vho3JF|b$^@o;AW=!93>*3F~2~o#vyj*m% zH1Y!EtUDArk85=HAxlPonM!> z^7GHFQY#mK>#OFVdQ&MBb@01#qrtN;K2 diff --git a/app/src/main/res/drawable/ic_back_white_24dp.xml b/app/src/main/res/drawable/ic_back_white_24dp.xml new file mode 100644 index 000000000..0bf3489b1 --- /dev/null +++ b/app/src/main/res/drawable/ic_back_white_24dp.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/drawable/ic_close_white_24dp.xml b/app/src/main/res/drawable/ic_close_white_24dp.xml new file mode 100644 index 000000000..1e2d044be --- /dev/null +++ b/app/src/main/res/drawable/ic_close_white_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/layout/activity_app_list.xml b/app/src/main/res/layout/activity_app_list.xml index 12bfd0df8..2de5dac54 100644 --- a/app/src/main/res/layout/activity_app_list.xml +++ b/app/src/main/res/layout/activity_app_list.xml @@ -33,7 +33,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:contentDescription="@string/back" - android:src="@drawable/ic_back_black_24dp" + android:src="?attr/backButtonDrawable" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent"/> @@ -59,7 +59,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:contentDescription="@string/clear_search" - android:src="@drawable/ic_close_black_24dp" + android:src="?attr/clearButtonDrawable" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent"/> diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml index 95581fea5..7a31395eb 100644 --- a/app/src/main/res/values/attrs.xml +++ b/app/src/main/res/values/attrs.xml @@ -1,5 +1,5 @@ - + @@ -12,6 +12,8 @@ + + 1337 diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index c883929da..624f273b6 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -23,6 +23,8 @@ #ffffff #a6a6a6 @drawable/ic_warning_white_24dp + @drawable/ic_back_white_24dp + @drawable/ic_close_white_24dp @style/PreferenceThemeOverlay.v14.Material @@ -48,6 +50,8 @@ #424242 #4a4a4a @drawable/ic_warning_black_24dp + @drawable/ic_back_black_24dp + @drawable/ic_close_black_24dp @style/PreferenceThemeOverlay.v14.Material