From aded8fab0ad37be71d7a9499885c6b213a9f0e73 Mon Sep 17 00:00:00 2001 From: J-Jamet Date: Sat, 7 Apr 2018 15:41:52 +0200 Subject: [PATCH] Rebuild classic icons (Add apple icon and remove numbers) --- .../dialogs/IconPickerDialogFragment.java | 46 ++---- app/src/main/res/drawable-hdpi/ic64.png | Bin 196 -> 2199 bytes app/src/main/res/drawable-ldpi/ic64.png | Bin 189 -> 1032 bytes app/src/main/res/drawable/ic64.png | Bin 191 -> 1393 bytes app/src/main/res/layout/icon.xml | 27 +--- app/src/main/res/layout/icon_picker.xml | 12 +- art/ic64_classic_replacement.svg | 138 ++++++++++++++++++ 7 files changed, 167 insertions(+), 56 deletions(-) create mode 100644 art/ic64_classic_replacement.svg diff --git a/app/src/main/java/com/kunzisoft/keepass/dialogs/IconPickerDialogFragment.java b/app/src/main/java/com/kunzisoft/keepass/dialogs/IconPickerDialogFragment.java index ffd3509c1..a68aca235 100644 --- a/app/src/main/java/com/kunzisoft/keepass/dialogs/IconPickerDialogFragment.java +++ b/app/src/main/java/com/kunzisoft/keepass/dialogs/IconPickerDialogFragment.java @@ -21,7 +21,6 @@ package com.kunzisoft.keepass.dialogs; import android.app.Dialog; import android.content.Context; -import android.content.DialogInterface; import android.os.Bundle; import android.support.annotation.NonNull; import android.support.v4.app.DialogFragment; @@ -29,12 +28,9 @@ import android.support.v7.app.AlertDialog; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import android.widget.AdapterView; -import android.widget.AdapterView.OnItemClickListener; import android.widget.BaseAdapter; import android.widget.GridView; import android.widget.ImageView; -import android.widget.TextView; import com.kunzisoft.keepass.R; import com.kunzisoft.keepass.icons.Icons; @@ -75,47 +71,39 @@ public class IconPickerDialogFragment extends DialogFragment { View root = inflater.inflate(R.layout.icon_picker, null); builder.setView(root); - GridView currIconGridView = (GridView) root.findViewById(R.id.IconGridView); + GridView currIconGridView = root.findViewById(R.id.IconGridView); currIconGridView.setAdapter(new ImageAdapter(this.getContext())); - currIconGridView.setOnItemClickListener(new OnItemClickListener() { - public void onItemClick(AdapterView parent, View v, int position, long id) { - Bundle bundle = new Bundle(); - bundle.putInt(KEY_ICON_ID, position); - iconPickerListener.iconPicked(bundle); - - dismiss(); - } - }); - - builder.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() { - public void onClick(DialogInterface dialog, int id) { - IconPickerDialogFragment.this.getDialog().cancel(); - } + currIconGridView.setOnItemClickListener((parent, v, position, id) -> { + Bundle bundle = new Bundle(); + bundle.putInt(KEY_ICON_ID, position); + iconPickerListener.iconPicked(bundle); + dismiss(); }); + builder.setNegativeButton(R.string.cancel, (dialog, id) -> + IconPickerDialogFragment.this.getDialog().cancel()); + return builder.create(); } public class ImageAdapter extends BaseAdapter { private Context context; - public ImageAdapter(Context c) { + ImageAdapter(Context c) { context = c; } - public int getCount() { + public int getCount() { /* Return number of KeePass icons */ return Icons.count(); } - public Object getItem(int position) - { + public Object getItem(int position) { return null; } - public long getItemId(int position) - { + public long getItemId(int position) { return 0; } @@ -123,15 +111,13 @@ public class IconPickerDialogFragment extends DialogFragment { View currView; if(convertView == null) { LayoutInflater li = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE); - currView = li.inflate(R.layout.icon, parent, false); + assert li != null; + currView = li.inflate(R.layout.icon, parent, false); } else { currView = convertView; } - - TextView tv = (TextView) currView.findViewById(R.id.icon_text); - tv.setText("" + position); - ImageView iv = (ImageView) currView.findViewById(R.id.icon_image); + ImageView iv = currView.findViewById(R.id.icon_image); iv.setImageResource(Icons.iconToResId(position)); return currView; diff --git a/app/src/main/res/drawable-hdpi/ic64.png b/app/src/main/res/drawable-hdpi/ic64.png index f7f573863d0ceef97415dd0dd54cc0eda7b569c3..4d896d0a1041d6131e748bcd41d6b304bf332af1 100644 GIT binary patch delta 2164 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 delta 143 zcmbO(c!Y6+3KwH>kh>GZx^prwCo0NRaSJmra0@ds%$g&?z`(#>;_2(kev5;hn@h$Z zckfmP1_sFz*N775{M_8syb=cIqSVBa)D(sC%#sWRcTeAd@J2py1_lOsPZ!6KjC*en pGBPqSFf=LrU!UjU0AezLfIgdw0Rv<9q`jgbo~Nsy%Q~loCIH$}C2arz diff --git a/app/src/main/res/drawable-ldpi/ic64.png b/app/src/main/res/drawable-ldpi/ic64.png index 5d8aa999e2e6a8e30f68866b5fe415f0313d6df4..2a22d9b5f63a3d3832e64d87eafda52d2ac2f0db 100644 GIT binary patch delta 988 zcmdnX*ugPDWul>EJy#+F16LyBpEF*n3=9nHC7!;n?2lO3c~uSlex1F?z`#7!)5S5w z-YFx^~5?SC5x1QxkAnweGcF*y^kKZtm{q|MNDOsByJA zS<3Lqw;z7k|NHmv#horndw1{t9U2~fJ!fM?&9u``@109AI(#$7Z2yK02j1~8G`xNL z_Uhrohi5i7H}m^ku35Zz@#0RyZ?5$=a`jT3E_Gr~F2{}?%VC(!aL1aNVL{N!KU;V1 z{JA1RM^3WsqEN5f`}V^R{g+Phy?ps{{fuQN8GPZi+eZBqtm&2Ld+}uLW{an9y@80*zF278R zy!dBn7c~fv{(944S{Pz!^Jb7||`s4__Q@w1Q^wzfwXGeV{Y9r|ojG4J~$)%pBgiw->hyf@@y#hv*cDsoI5_irdU zooG%lSW$Rxp$6BIDFw0OL0%k+3QJq2d|H+2x>8$$=hvUQ|F#VIOcA@-KG^gZo>NU; z6SwEv*Llw!IT#h|UGB#6Ml?rFQ_Zsv!2e|78=_r6Nuo0#2_QqHbqRIKAQ4 z=EaMZ6D8UzUr$h1Q=1pQ`f68dWP!}{E{&yM&nEU9EWN9(aL)4FxpQ|WPZkzFa4$ES z<^1P5ovB_;K~=nuEY68?Jm15oHU0FxTeoh>F|Z%_xR&AcraFzOUeD@ZzI@rMCpEX= zT;gprGc&UcyZQB(D(u$XU3B!Q>&45LjrZ^0|36Y`;s@pi0j71Y?`fQ~eD?hL%_~=~ ztV)#dXRP6O*z@IvuD-tfmMvRyT&+yAXV0$Q zv}w~O&IFzVo3C4zF*KwY{jAfPS`{SHee@B7$mvZo`|rQMUK-1~z@qPPdU|^O{ad%R zm@9Y^UX`wY`80#=gJnaxURoN%j&jAAHBbB*!v4*+|69+Xb=Gv-TicK;3=9kmp00i_ I>zopr00^Vy`v3p{ delta 136 zcmeC+*vmLUg^RH`$lZxy-8q?;6BT8OxrG@RxP=)RX3ddcU|?V`@$_|Nzs14M&28R# zs&oqj1A}CVYeb22er|4RUI~M9QEFmIYKlU6W=V#EyQgnJcq5-U0|SGEr;B5V$MLrZ p85tQE7#b%0TmO!Oi=kl^Bc}udqgps`5Ca1PgQu&X%Q~loCIB3ZCDZ@_ diff --git a/app/src/main/res/drawable/ic64.png b/app/src/main/res/drawable/ic64.png index 5dd1edf299adebbec7be08a4ff11dd9a50147f89..0472df7bf7c181c29f962774f56118fdede163cc 100644 GIT binary patch delta 1352 zcmdnb_>pUZ%0xrSdfw{{47}GFoit`wFfcH%mw5WRvOi*B=T+6-Ji}xO0|U!HPZ!6K zh{JEEduK?8i?sc(ey-Z9WVJ0oX=jnnqZ>!Oawk^>o2v-KWGtM$rPb-+?6ye`ikmKn zzFa4=>y%R5&I>^qX3J(YXrv??#BSNBdOMcor{Yi1>t2hsCaEquAy;qv?A+T$(`Im3 zhDqsjy=|N?nZ`CZ|6ldHi;@ri|5(qSS@Q8%uk_kEpWmlO?u*cxYT_uMwMplAY3%=^ zoSZl30+~2^_1X?6-hKU5?^e#X{=aqmZES3Gwr<}(-$O;{{r7L*_Lcwp^Hcut!-9*y zlny3**y^G3>4ygcgMwJMZCrf({CW+s?)Q1Qxm$1Km=(Req}pg$rZm%s&3~?y>DC=P zeq@xCe3^Xk;K59WEES}5Ys9XY~s|L$E;hCjb9nHD%~$)05<#KB_s;{E&YUXzwEJZKS^bo%MM z`g{9ot3?mAGnmD*IOIHA`1<<#av`UCECOd!jLMH6KVEA$|NX62Zt-6>a{a}LiHg1) zkvwe8c}^!>&+T;4?6s}=QIJ+tH0f_LyPLcF-%UFHL0;8XR#q0zV|>&m=aiRU7hrj~ zyTod3)~vGJ%uLP8w{K^MhhELe%nbCo>|!?Cw7xV}zwq4pp5ETpIEjRmlqLR?mc+NU zwaG9uGczgH+h@&EGn&bhmX>yA=~7icP1U;n^32T4A)%omTA~tdjE4;-cr7)swmxlU zZl2%fwDA0Fy+fFKr4&&^%DNW)3Qm7|Hli6bP`H9TDW<-2#wmiy0F z`}_B=OJKc7!8yhSWm|6Me5kN7nSGWoZSzh0%{SlVf8Cj(%+P-LW1zcx`{L!x+c}yT zJSQofF7lnE;wa*}<8I!T?c1FNT4rf1-KxA)#BaIq-Me?cyt%nKp0Q%9CWC8W+wWh$ z`mSE<6zEtK;eAKrqN7sFgC{2^A9?Rr&2rp`rXq^{o%*Os=tuXA8(%CcJLx<;?Y$U)DT(yLMYt>;@;3qSW+s z_TRpqY!fWEaCk4h9?5+w!f@*b`-Gdbz5w>{o*)OJG4;fHr-8mDhs8S?7wwryrw9EXb6uFH>_>c#r~-Cg6u4?irvdiAPE!+8dq z+J&7j{{8*^`FOwl_a{X=ubcWV?pkEB=GUwG%ByvU4Foz}&P<&;_0N?nAu;F))Sid_Hmxef{j_io;-bP{o07^An@MQP%76W_v}F?@j{tmiDbTAS?5&8J7j z#rbP0l+XkKq3nQ; delta 138 zcmey!wV!c<3KwH>kh>GZx^prwCo0O6atkvsa0@ds%$g&?z`(#>;_2(kev5;hn_IQ4 znB@-x1A}CVYeb22er|4RUI~M9QEFmIYKlU6W=V#EyQgnJcq5-U0|SGUr;B4q#NoFG p85tQE7@8FRug~*v05RXQ2`DfyPX8W$oq>UY!PC{xWt~$(698)XCi4IQ diff --git a/app/src/main/res/layout/icon.xml b/app/src/main/res/layout/icon.xml index ef74cfb8c..d3b4bc816 100644 --- a/app/src/main/res/layout/icon.xml +++ b/app/src/main/res/layout/icon.xml @@ -17,27 +17,12 @@ You should have received a copy of the GNU General Public License along with KeePass DX. If not, see . --> - - - - - - + android:layout_gravity="center" + android:layout_margin="32dp" + android:src="@drawable/ic99_blank"> + diff --git a/app/src/main/res/layout/icon_picker.xml b/app/src/main/res/layout/icon_picker.xml index e08e0b131..570cc5e01 100644 --- a/app/src/main/res/layout/icon_picker.xml +++ b/app/src/main/res/layout/icon_picker.xml @@ -19,11 +19,13 @@ --> + android:stretchMode="spacingWidthUniform"> diff --git a/art/ic64_classic_replacement.svg b/art/ic64_classic_replacement.svg new file mode 100644 index 000000000..ea96a4875 --- /dev/null +++ b/art/ic64_classic_replacement.svg @@ -0,0 +1,138 @@ + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + +