From 0b253653307c02e02cf2bd2892276a57445c8008 Mon Sep 17 00:00:00 2001 From: Isira Seneviratne Date: Fri, 25 Sep 2020 15:07:12 +0530 Subject: [PATCH] Replace add circle outline PNGs with a vector drawable. --- .../fdroid/fdroid/nearby/SelectAppsView.java | 16 +++++++++------- .../fdroid/panic/PanicPreferencesFragment.java | 16 +++++++++------- .../ic_add_circle_outline_white.png | Bin 899 -> 0 bytes .../ic_add_circle_outline_white.png | Bin 623 -> 0 bytes .../ic_add_circle_outline_white.png | Bin 1217 -> 0 bytes .../ic_add_circle_outline_white.png | Bin 1857 -> 0 bytes .../ic_add_circle_outline_white.png | Bin 2463 -> 0 bytes .../full/res/drawable/ic_add_circle_outline.xml | 5 +++++ .../layout-v11/select_local_apps_list_item.xml | 2 +- .../layout-v17/select_local_apps_list_item.xml | 2 +- 10 files changed, 25 insertions(+), 16 deletions(-) delete mode 100644 app/src/full/res/drawable-hdpi/ic_add_circle_outline_white.png delete mode 100644 app/src/full/res/drawable-mdpi/ic_add_circle_outline_white.png delete mode 100644 app/src/full/res/drawable-xhdpi/ic_add_circle_outline_white.png delete mode 100644 app/src/full/res/drawable-xxhdpi/ic_add_circle_outline_white.png delete mode 100644 app/src/full/res/drawable-xxxhdpi/ic_add_circle_outline_white.png create mode 100644 app/src/full/res/drawable/ic_add_circle_outline.xml diff --git a/app/src/full/java/org/fdroid/fdroid/nearby/SelectAppsView.java b/app/src/full/java/org/fdroid/fdroid/nearby/SelectAppsView.java index 4e7940fce..cd014af2f 100644 --- a/app/src/full/java/org/fdroid/fdroid/nearby/SelectAppsView.java +++ b/app/src/full/java/org/fdroid/fdroid/nearby/SelectAppsView.java @@ -8,12 +8,6 @@ import android.graphics.PorterDuff; import android.graphics.drawable.Drawable; import android.net.Uri; import android.os.Bundle; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.loader.app.LoaderManager; -import androidx.loader.content.CursorLoader; -import androidx.loader.content.Loader; -import androidx.cursoradapter.widget.CursorAdapter; import android.text.TextUtils; import android.util.AttributeSet; import android.view.ContextThemeWrapper; @@ -26,6 +20,14 @@ import android.widget.CompoundButton; import android.widget.ImageView; import android.widget.ListView; import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.cursoradapter.widget.CursorAdapter; +import androidx.loader.app.LoaderManager; +import androidx.loader.content.CursorLoader; +import androidx.loader.content.Loader; + import org.fdroid.fdroid.R; import org.fdroid.fdroid.data.InstalledAppProvider; import org.fdroid.fdroid.data.Schema.InstalledAppTable; @@ -220,7 +222,7 @@ public class SelectAppsView extends SwapView implements LoaderManager.LoaderCall resource = R.drawable.ic_check_circle_white; colour = getResources().getColor(R.color.swap_bright_blue); } else { - resource = R.drawable.ic_add_circle_outline_white; + resource = R.drawable.ic_add_circle_outline; colour = 0xFFD0D0D4; } imageView.setImageDrawable(getResources().getDrawable(resource)); diff --git a/app/src/full/java/org/fdroid/fdroid/panic/PanicPreferencesFragment.java b/app/src/full/java/org/fdroid/fdroid/panic/PanicPreferencesFragment.java index 7338a624d..ddf61b1a1 100644 --- a/app/src/full/java/org/fdroid/fdroid/panic/PanicPreferencesFragment.java +++ b/app/src/full/java/org/fdroid/fdroid/panic/PanicPreferencesFragment.java @@ -13,20 +13,19 @@ import android.graphics.PorterDuff; import android.graphics.drawable.Drawable; import android.net.Uri; import android.os.Bundle; +import android.text.TextUtils; +import android.util.TypedValue; + import androidx.annotation.ColorInt; import androidx.annotation.Nullable; -import androidx.core.content.ContextCompat; import androidx.appcompat.app.AlertDialog; +import androidx.core.content.ContextCompat; import androidx.preference.CheckBoxPreference; import androidx.preference.ListPreference; import androidx.preference.Preference; import androidx.preference.PreferenceCategory; import androidx.preference.PreferenceFragmentCompat; -import android.text.TextUtils; -import android.util.TypedValue; -import info.guardianproject.panic.Panic; -import info.guardianproject.panic.PanicResponder; import org.fdroid.fdroid.Preferences; import org.fdroid.fdroid.R; import org.fdroid.fdroid.installer.PrivilegedInstaller; @@ -34,6 +33,9 @@ import org.fdroid.fdroid.installer.PrivilegedInstaller; import java.util.ArrayList; import java.util.Set; +import info.guardianproject.panic.Panic; +import info.guardianproject.panic.PanicResponder; + public class PanicPreferencesFragment extends PreferenceFragmentCompat implements SharedPreferences.OnSharedPreferenceChangeListener { @@ -130,9 +132,9 @@ public class PanicPreferencesFragment extends PreferenceFragmentCompat } } } else { - Preference preference = new Preference(getActivity()); + Preference preference = new Preference(requireActivity()); preference.setIntent(intent); - Drawable icon = getResources().getDrawable(R.drawable.ic_add_circle_outline_white); + Drawable icon = ContextCompat.getDrawable(requireContext(), R.drawable.ic_add_circle_outline); icon.setColorFilter(new LightingColorFilter(0, getResources().getColor(R.color.swap_light_grey_icon))); preference.setSingleLineTitle(true); preference.setTitle(R.string.panic_add_apps_to_uninstall); diff --git a/app/src/full/res/drawable-hdpi/ic_add_circle_outline_white.png b/app/src/full/res/drawable-hdpi/ic_add_circle_outline_white.png deleted file mode 100644 index dfb1269b5644c9b41f595f02ca9dcd37ecda665f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 899 zcmV-}1AP36P)DtjzkvT+e(ZQDj{XH_G1*0ycdwh^li%2672zM1sd_@6U8pY9g(i~Y>Z z!J9MI($aFiqMQ3z#5e5VC^-TGavWs`->`^#>9X;|D6`m1KqEyqF_RHX8@IEBGQLVI z=2lA!ce0fzHglULjm!9jIDTNvlEZVHA+7>XSrTaHV`@9ePrSr^OkkM&f`@gCP$16<4doX=<3{2)rTu+8O z2G6)TmH;=20;A@OpAqG*1I^YBLesT$2*LB>Wh)YBXGISZuBMD^ z^cye)UNwmkB)kR4&DIP{kmGbG9@NW8TWd5;I7cift`*q)F026UZRP#a@gu2hYY3~G=yZV9s;B-)u48yc>V{S zH$U0=zo^fLZGRpdj9>a)9Y3cU^cynY>fv7G)VN))cUwJl5g^z8Z{vrs33)%YppTLD z{);W2(g@p20ePX>kY7S(rxG+D2^g}*Sd5&YC+Q&iIF0;m&2TFqZzLY{E+98rb8JRR zT$N-H*HQLd(86ti9HKv|AO<*soZ}|*!w-NgPUtyiGRpw@+I%ra0gx{&HYV^jAUTH3 zA5Y=>BKDKsH@F_NaCjfrV)`v223UscEene_R^vLv)fNHQaRk>2rdW9NvIkd*x9AP| z`2H?sT)XJDXc(?af|Jap$MXX%;51a_3|VyavW9ATKH>%@G}uu$@-YRft)ScDp^f*b zEyJ(O$%y| z!p;0c310z!bCacwVP0edMH)HFdR}12#t)s`!vely8;8kIq)3LtY~xGja~BLH(oj;d657B002ovPDHLkV1myHr4s-E diff --git a/app/src/full/res/drawable-mdpi/ic_add_circle_outline_white.png b/app/src/full/res/drawable-mdpi/ic_add_circle_outline_white.png deleted file mode 100644 index 2bfb3f60b5ffe4e55295f87c002f7b7c898893d9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 623 zcmV-#0+9WQP)A`#wONeYq^dWo`E<>P>9h&ezqc=1%UQZocK{H%IYraD}GZ zE%SjN9dyn)2mR;+OWmd!b(!Y{JLTEoIdh{b)2wpNFlQ|{CCc-lLy9`+-Y7%I8ju|G zh9}%?vaYTvZuX=%9S6yB?I^}5Um;oNF(Y%Hd%}7opBq)|@4u3qvOs&t(~F%ZB?^qf zYRP(6M**(2QL=pa(k9=S76qB^JIOtf&oqYt>(l28CpH2Om>hYm0-PE=IRG($>zo0+ znty7~0TxCS4y#$_El}1D0fOeE@i(R-g}fH+$bipEX5)`XYY-c=FHMrb_{D)(X4>Se!q&<3?2t7~@3lL~Ggsc%pKk z57?>^S)K>1*QpZFwF&S{3}UWxfW?&p%K&H0ioq-goOW&5fE%0vycBs%aS*W4^eDkh zn*sYwjC}5ud{;bSrtc+p#^qTq+330`zzsG_UXEe3eJ(j|iB4RGu4T?hKGllhj7kZx z!IMVk9IL)f5{0r?>5u)^h|S`zIUCFz{^@uhI<`Q)IN7cc_w?+S;L(1 zl8I53Ii9smo~@oSE9%m8izVLmz5UKQYrpTkYq6U(;);KPp8(2%FK1l%;g|pb002ov JPDHLkV1i|yAS?g? diff --git a/app/src/full/res/drawable-xhdpi/ic_add_circle_outline_white.png b/app/src/full/res/drawable-xhdpi/ic_add_circle_outline_white.png deleted file mode 100644 index 972d0f0aaebba2062cfe2493d560809740267065..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1217 zcmV;y1U~zTP);U>s%=}*+N^EGs_mrlGOBI8#%p_vcu_voZXe6J|BaLL&3(Oti)lK) z*!O>Rz8uNQ%F4>hat}=yz#_KtBgeVMU1G$z%QcSk16x?c02)gsBA1bDqL@USW+TIi zN@gI30TfX~vZ^`2`{YQF$Y&m9q@$EMAIw@!}WS@jYJn zhBo3orcsGk%9$iyBFqk)oZ|qC8A>0T5++25Fiq*pFqUwD^ElbWbKVW9W7N*#H)hg7 z9MF;3{K2FAMI&(^ohYL=xA@4sbjOU3DW^8Yv=?{Loy*v}$zt+SoFdD(jlGL>b@%RH z#!iei)R#2Sfc03|Cv*^Z(3CRloZ0WWg~JH<3|=g)HtJG+RAOUPp%b`HDnM`Ani zV$2bju>gyBo6{d#@$NBFJir+46K`^QhlWa<%O5BnVX#d?1#Kl&e2*!{NbwM3u`qp; z`iV2%9Ptq8MXMqriC`p}MTbBFx?mb2iC`1jZz6sLXdFgcCyAgK zZDwEr^UzKtwtFyj2rQr*riRJ?LeGi#8K7|q?LBeABD4d61{9&q7bk2*TO4S>aM^ajEG91mKV-Nv!#WY9~L6mB= zj{^z#46Tx|B!&ZM<>dPvKp~ZAyCqS)k7=3j0jn^*BZ(r1QncGN@H2qMRG<}8M-s;z zOzV9O*n(+>B!fI|pjo`^R{*bJx<*uz!(vQl$nztB0!lH>lVlO$9HxD~1QcN^BP_{d zJnx80*p9e?YwP zk{&h_&tjnm@4iL6^^z{0<1lviktZ&pfFkVt!84LR8c~d$GrTM=;5ACIbD9R?4mxlV zI~E&hC~2TETd{Y6w&EVTauIvwtfW9vKq0HBz}|Vfh`Z=O3AHKbQ#vPkLq4N|+MK4X zxR1sh=1~qak8a|C?#$;1kMai%#2Y-v7Mxt7h~FuNg|H3hCzfS6VZtGn9oMO;~%b2%|jki%@zLPTQ)F{cWEfD f$;!&g%F6m5q`8&k5t=}y00000NkvXXu0mjf@ia0i diff --git a/app/src/full/res/drawable-xxhdpi/ic_add_circle_outline_white.png b/app/src/full/res/drawable-xxhdpi/ic_add_circle_outline_white.png deleted file mode 100644 index a676ca8804115c82687286638dff13c204ef1905..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1857 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 + + diff --git a/app/src/full/res/layout-v11/select_local_apps_list_item.xml b/app/src/full/res/layout-v11/select_local_apps_list_item.xml index 40884a6cf..c3eac8226 100644 --- a/app/src/full/res/layout-v11/select_local_apps_list_item.xml +++ b/app/src/full/res/layout-v11/select_local_apps_list_item.xml @@ -43,7 +43,7 @@ android:layout_alignParentEnd="true" android:layout_centerVertical="true" tools:suppress="InconsistentLayout" - android:src="@drawable/ic_add_circle_outline_white" /> + android:src="@drawable/ic_add_circle_outline" /> + android:src="@drawable/ic_add_circle_outline" />