From 579250fdb8d14ca432251df1e5f83f2b64504b51 Mon Sep 17 00:00:00 2001 From: dankl Date: Tue, 31 Dec 2019 00:28:52 +0100 Subject: [PATCH] Fixed list_item_bank_info: - Texts now align well - Added icons for supported and unsupported banks --- .../android/ui/adapter/BankListAdapter.kt | 10 ++- .../ic_check_circle_white_48dp.png | Bin 0 -> 628 bytes .../res/drawable-hdpi/ic_clear_white_48dp.png | Bin 0 -> 347 bytes .../ic_check_circle_white_48dp.png | Bin 0 -> 428 bytes .../res/drawable-mdpi/ic_clear_white_48dp.png | Bin 0 -> 257 bytes .../ic_check_circle_white_48dp.png | Bin 0 -> 872 bytes .../drawable-xhdpi/ic_clear_white_48dp.png | Bin 0 -> 436 bytes .../ic_check_circle_white_48dp.png | Bin 0 -> 1307 bytes .../drawable-xxhdpi/ic_clear_white_48dp.png | Bin 0 -> 524 bytes .../ic_check_circle_white_48dp.png | Bin 0 -> 1788 bytes .../drawable-xxxhdpi/ic_clear_white_48dp.png | Bin 0 -> 702 bytes .../main/res/layout/list_item_bank_info.xml | 67 ++++++++++-------- .../src/main/res/values/colors.xml | 3 + .../src/main/res/values/dimens.xml | 7 +- 14 files changed, 53 insertions(+), 34 deletions(-) create mode 100755 fints4javaAndroidApp/src/main/res/drawable-hdpi/ic_check_circle_white_48dp.png create mode 100755 fints4javaAndroidApp/src/main/res/drawable-hdpi/ic_clear_white_48dp.png create mode 100755 fints4javaAndroidApp/src/main/res/drawable-mdpi/ic_check_circle_white_48dp.png create mode 100755 fints4javaAndroidApp/src/main/res/drawable-mdpi/ic_clear_white_48dp.png create mode 100755 fints4javaAndroidApp/src/main/res/drawable-xhdpi/ic_check_circle_white_48dp.png create mode 100755 fints4javaAndroidApp/src/main/res/drawable-xhdpi/ic_clear_white_48dp.png create mode 100755 fints4javaAndroidApp/src/main/res/drawable-xxhdpi/ic_check_circle_white_48dp.png create mode 100755 fints4javaAndroidApp/src/main/res/drawable-xxhdpi/ic_clear_white_48dp.png create mode 100755 fints4javaAndroidApp/src/main/res/drawable-xxxhdpi/ic_check_circle_white_48dp.png create mode 100755 fints4javaAndroidApp/src/main/res/drawable-xxxhdpi/ic_clear_white_48dp.png diff --git a/fints4javaAndroidApp/src/main/java/net/dankito/banking/fints4java/android/ui/adapter/BankListAdapter.kt b/fints4javaAndroidApp/src/main/java/net/dankito/banking/fints4java/android/ui/adapter/BankListAdapter.kt index 7b8b7bc6..ee546231 100644 --- a/fints4javaAndroidApp/src/main/java/net/dankito/banking/fints4java/android/ui/adapter/BankListAdapter.kt +++ b/fints4javaAndroidApp/src/main/java/net/dankito/banking/fints4java/android/ui/adapter/BankListAdapter.kt @@ -11,6 +11,7 @@ import net.dankito.banking.fints4java.android.R import net.dankito.banking.fints4java.android.ui.adapter.filter.BankInfoFilter import net.dankito.fints.banks.BankFinder import net.dankito.fints.model.BankInfo +import net.dankito.utils.android.extensions.setTintColor import net.dankito.utils.android.ui.adapter.ListAdapter @@ -24,7 +25,14 @@ open class BankListAdapter(protected val bankFinder: BankFinder = BankFinder()) val view = convertView ?: inflater?.inflate(R.layout.list_item_bank_info, parent, false) view?.let { - // view.imgSupportsFints30.setImageResource(if (item.supportsFinTs3_0) ) // TODO + if (item.supportsFinTs3_0) { + view.imgSupportsFints30.setImageResource(R.drawable.ic_check_circle_white_48dp) + view.imgSupportsFints30.setTintColor(R.color.list_item_bank_info_bank_supported) + } + else { + view.imgSupportsFints30.setImageResource(R.drawable.ic_clear_white_48dp) + view.imgSupportsFints30.setTintColor(R.color.list_item_bank_info_bank_not_supported) + } view.txtvwBankName.text = item.name diff --git a/fints4javaAndroidApp/src/main/res/drawable-hdpi/ic_check_circle_white_48dp.png b/fints4javaAndroidApp/src/main/res/drawable-hdpi/ic_check_circle_white_48dp.png new file mode 100755 index 0000000000000000000000000000000000000000..4f967453e471741faac341e14a41aacefd0dd400 GIT binary patch literal 628 zcmV-)0*n2LP)Ms=a-g3B1_rZ?=v(1a6h!BCsM0hON0OlvTACMBgt#UE&l@646&m5xFG z0_J?f_knj`D=I3Yi#nf~Vx2usiHSL7k9DT_Or5SgDX$o2nI`U_$udK{%pOxEBtcq2 zNHsf5jV12V5;c2FiFq{5Q?lgr^9yYeeKwdj#<6OQHZ8}efn^PR4d*%AShvmdyK;Oz z$3gP%_StEWRSnwGgT~0Rv9z2%vaT=P&tQag=UgqKBnQo7-9B&l%+=dKye}`5LeATi99VOM_HO5R ze{++R9N2Y(P92>8@tz~>IdI|z#cqz9q~t)H5+ouWxH%foDF{f1rW`ntf2f@#IY;-Q zUI!8B9fxKdSQGp(ib)!d;D_-uq#>Db;FI9bRYo%5KwU6?$Veufm@dtL78rA2Sv$f8 zrW_d35BY&1C*h^VGAJ6~BiYVRx zExr4{>6zEI@B(f3Y2$ng|GpkA+=IiH1$_PS)EHKc(&kx29}(IjdToz5=g>4q={_C; z+ean!F?l7Aiv&ZWiv)wb%=@avCni~AmlI-QPS|CQNj}+KwXmvMkH8EXyh{JTRaptiwcq@D(P;=ehLbl?EMKm*m7(@7_siS}}k zNFtnck{HL4mc!ypcyUoqJV~4rM^fS3C#iAnkyJU3biCmDy`VZLOv=LXld^HVqyR*@QLiBP%EHH7g5$BP^lVKZ~1l7QzK|Rc?fgP`zvRCUNss>Vkm*apwd!-(d zYM^+fzd=Zt=%FwQR1-#eA&`Qcu+&2$e`Gmfu7^k-rc%O24|DlPlM*(12;`|kNLcB? zH=pc6g+8{Mu0u<`I9+?>@&y+99M68q42|_L)GzubWVAnJ+wut;F9BROXj$Wa<=KB>HuO6ZH7iis3Gk-hro~+iI@=2sSiE@b0QK73KAmb+GFhJ^UpQ5 WvIyEJhhKL90000 zOA5m<3jYBNi%A&<@ZO?$P9};P4Y5CjG5$M&YXI45J{s}~# zf|&?x1_gn4B7+hS@X!l}&!voFhmZP^sujifL@~PKMMM~{6xH}^g$q7WOzwCQ5vHTU z6`v~H@rlA8e;CUh_(b84zg=+ih`wG<)HiJjzSlQx5#CnjMR;A)R^jtaTa9;7rSy)7O%~`cm?ZjXImW?6TYRT<;U^@VKiSj`soFk00000NkvXX Hu0mjfhD&W| literal 0 HcmV?d00001 diff --git a/fints4javaAndroidApp/src/main/res/drawable-xhdpi/ic_check_circle_white_48dp.png b/fints4javaAndroidApp/src/main/res/drawable-xhdpi/ic_check_circle_white_48dp.png new file mode 100755 index 0000000000000000000000000000000000000000..2c6e474158737965740708e36016926ce82292fd GIT binary patch literal 872 zcmV-u1DE`XP)Dt%n8p=Gl~vd4WmJWW-d$!d;>Beq?=H!yT9)OS^7BkhF`v4D*az{6!suGR7e$hm7%% z0Yb?KYWR`&#H1DTjvuHIp9r|d99hhAg}~Q~<{rz~P~je-xWypz*fdAKxI!;q(C~?F z(Z@w%v}|xrG||Khv^`OKQ`5%3xbQcvVjo>hSK=}GplE#J;(J7|dUZIfQ97GH2_i}xJobJa(jj`P0}A>ud# zk{%)RuJc7sm@rQ$X>rd({>c;WrvLO`_K<(_gbIPA!8OCog_oZe>u#Dm{5{nAeZ^cztDJ?(|mX!Nidevd>9ooN*v}i9}X#r z3BTnwAK+Ip;Z~0G;ij1I43qb4dCG^UV!|+|i$wT_Eid^{7852+`6A{CO8GD@CM=lq z%@dUJVO~sFGv}KpDCNVdn6PWkH&0N?haGzZ3=_=xS_9U=&IE;gShe#eHcUvKukj|H z04ozT@?qS{7nym2Qa+Sz97>ocXywCGD+hCi33~Z()577jVS;8p{A%HZ#xOxM|BzDl zQ%b`G#e5jGeNrDe&4&l}e^!Yc=EHy_K}ei^f|zk&}FQCrR-G=|uYZ!1t0A zHO!`;pqxKTjU>kv(u!2`;fka|KqdVI#rz6^i;H}bQa;?3vhPI7_$1Y$n@xP%pj)cPIea@K+3*CP9!gdO{EaVv&?wo_$|OFF(;{}z>E*V|4zY(m zmK^8ziCuIui7VrDh<&v3H!l1^i|C+{Cun;}qiEuS>K`D^h(3DxjE0YNiz^H${|QJR zA$O@@LxsD9;sXI!Gyf6pGJ*I+4L|UXn6zTv@;x32ETvhYyB39D^lU%DgQgv&#U%8l^-CA%qY@2qA=!B5=cm zUgehujQG*l{{`@rPr!f|fEk^>KI9WteE@ilV6HEl&_rJ@p_zU*;T}RirIc{5NocNLm*7JGdV(AM zYYDFOvk5~8{Z*t_>U=!XvoehUSEh=adIga45oe)B9kGgT}7UT3Cirmr(oHPv^YQ1-p=Hlh5u;xggf zX{&yw+El-OrrKQJRl@b7x{HLmNkj95`a#LLnW{Veb2C+!`ppt#r)=g4@?c8RY{yJj~W@W|h^mU4q`i)2y~Rw@J`jIh$1%|In!~{Tb{nMqaxlgb+dq eA%qY@zJ@mriVM?qfwL0;0000fA_f;Sc5bp zX{_%f{7fQi#PdAQ^E}VqZu0sFe$?Znu(q0 zMiLt&>1yYfau!)2Bt^<-Samt`HP{^{&Lmgnk>Dd8~4=UqH4NEGittz ztM1TJ!p0$7b};-YX&#s5nGx=SMi$ovbd_+>j3jZ8q?v?)jkw`9g{%)}tvSF2dqmhq z(=xOd-8k(^9+4sv9oIj#$h(uLh(tMth)z6lD^C%L9%vo?xRsi!f`Oun<1x+y$3zWn_yv3IR?Gvnv=J37jCCG> z1)_pmG0y`x)ei2~$2j0`kBmDHq>YKpyx`%0sV;$OF(*%E8tO z$pc%Y99*lAJaARY!Rrdi1FxiXB*;}r9>|f9Qqd24>{85ASl?)7VYi*hqdp_!9ZI!L zguPDYfw!epoG(3(hJPLsVFpy}ckvxzI z^Gmt_c3YnZUa9}gt0%HI4?I^ND5@v2HxH!LryA;s?9Brog+EzUNn|w1fdLn!BKwtff_Uei3$&(|Yf7?erku7=PmHv%G^+e|LC~q8Y zf$$Pplm|AOIJ~gUnLN-@oo5*0EPecdCqR%#q^1vw3gLGJljOIy-E=)(KZC2!g$)XRB^d~Z$=bq@qQ1W^c z8P1bqkm$up;^e4->v0_NGwlpqu;h?+{)(=qd_%MFE_n<5C2vh)hV$11PM2_T0GI8T zu+fq%SHVf!WLMn*od7kHap67X<_aCL)1$+kt RyYT=3002ovPDHLkV1mzVWjO!< literal 0 HcmV?d00001 diff --git a/fints4javaAndroidApp/src/main/res/drawable-xxhdpi/ic_clear_white_48dp.png b/fints4javaAndroidApp/src/main/res/drawable-xxhdpi/ic_clear_white_48dp.png new file mode 100755 index 0000000000000000000000000000000000000000..4927bc242e23be272c9fd4be0f4da56a0e1c54d6 GIT binary patch literal 524 zcmeAS@N?(olHy`uVBq!ia0vp^6F``Q8Ax83A=Cw=v;urWT!Hj|;y~N(Q~E&Fyd^u<8%L#D-{7p<|%4@n9yOn_`BhIN5Se>F5&yX=g3#NJr`MF8+b%+$B8BmnCIPndHJicwnxNiHsOkk&+*iSjJjmJe1$X)E`JjJT7)$8wm+rVMFtHWj=GUBk= z=ke_WBcq(Ni(Gt*T>KFvWMaekQTMd-+4Z${JvAkNz8{`iZ@=$N<$){y-?y+S-FBWF zc%ND6E)u%gY+Qf)aIpRD!%Emtu>HZuoi`qLflzYyjmJ==_n}6?N_~C6*PuJQ&feR6 zYOCY7g5y!UB2LPQOzopr0M`r!;Q#;t literal 0 HcmV?d00001 diff --git a/fints4javaAndroidApp/src/main/res/drawable-xxxhdpi/ic_check_circle_white_48dp.png b/fints4javaAndroidApp/src/main/res/drawable-xxxhdpi/ic_check_circle_white_48dp.png new file mode 100755 index 0000000000000000000000000000000000000000..60463c56fb90f9d929091249be080b2f81b1e3bf GIT binary patch literal 1788 zcmVG0000KVNkl4~VO`UygXFc!oGGKp(uzDeP=p?S#yBzm#&AB*Bcv3m#Y23S;TC@i=d%Z2c5@z+rK*_Cl{E0J z&gIOMs$n5Fkx~{ZH?Tmef<@d-o3iQS&I*h`7i(!zR!vqhO5(+5*i6}NHz3s1cLHd_=;*cj+ZIDc_VZ@E79L;rCK@4B{eU*3F=D=f8#6-B98Q zxR@&Fwqw6|-#}Hnps$OP@ z_{KV_Y^DE?TRK!(o3s2L{dZDz+nM6;=>HmEUShELz;Xb<{Ke1reCot(EB#kvmK2T0 ziP;B?C87Twkz(=b*z=2sWSZcU#eT(hQ~dcePOyDGQp+d z4pV5vonK*sI+Mf|&W}C6!T_*N++a9+EPp@jWSF?X=PiFfeOg@L5#sW`qx|rI=wm#o z2YPOtkTi<l^hUL$w!3fd9 z8Cd@8P8Th#vix4ZxXT+@{_I{C9gHT$@@JRQB^vmMMFpdu^m>*7-y!cW6{30R>6NHx^ zekgfyzD9n92|~;d=SyDPsgPe`f*|w59g-K%DCAd|AjtgiwB*IR3i%Z#2r@ssBYCkw zC;xvjmJceDAJ$7=Y*)yyFhP*{VVmT|K85@W69kzb_DWvV74j=g5M+L+NnW%S@+(Xb zWPa%LGJwJaapYGSpbl;)h&Vsge4d2ePw<}m{QghE+rjw+@5hs0|1xwvc$grL{IFi_ zQH1*m;>fT6DB@}GFhLyo;VIR}(e5XRAiw(K=<~tD1aahtZpn)uf`$PYj8@S(iI z1hM2-`A~i$6gtli_^6&BY)kK8}Ld~!L)x?{@&jf+zhnqwLOTgCz zLFb3Rhz8CDe-i|pAI=dCbdma-AmIEhxsWp_#2qfjy(HlLaIv_=Oj6uSg3aGzy12y+6d?&RKU^oSv4B2` zkOY{&kNM&rcT$Wbu>5d`6oG{_DMk`h{w52g7_6cw2??QCAw^*n8~J}`JtL(!e3JiX zJ}SlHQU1$3C`Ds7H4Fe8W`-1xB^UtsqxirOUdF)l3>H6_$_}b-E0e?@&Y?|}wK+rl zVl`Fv5Als5yh2sIz+myl&IH?-Eakwl9Hwdxa-@_8A0eemTAVHA!Z+zq6&=1J<-_l( zieE`NaXwYBR?3P&+(7KEkuqZt-S+DDjNj8CMjd`FVc;92#HPhpBpiH%!^GquXG>T( zmL0@m8%Ifan99q<-~}d2m>9xJ+Jvml-x(|+<7{>is%@Mh;bST<5u)drEOB5kf1yT5 z4)aF_OH7!}BZT5XW=f3sBpWHa^?Xd?#VA(OqO6*%V5G#3MchRnWz)wUERd>T0XL9R z7A>x2o>UDpxr{o#)wr1HQdLZ19lP*l2WyxpRmU(s%>%S3Qj`1nBtzxj4CDA2Jrv{h7Xucuj2CI(LY?PX+K($8!w61iC2x?Tp~Y*g;53Gd$%fIK%MxzpE%uVt9^T?6 z{=zwQiOG+NoXih7pF4P(cUaFh_EMvdK5Fb`8|!(8r?`V|e!$605Mzun#u#IaF~%5U ej4{TTlK3Y+GE0R+(o38G0000L&0wqCy z!3?}ShmRdO`suT!jkVQ|?c1(&>uh9TVAAq*aSW-5dwa(*PbyG=?IF*RV-kihZ5`K%4WRLhrBZ|F1`7uibhLg{ZBIk7Kr&_g(j2|L0$mnjU|z+@1e% z{_2El_4Br`m;D!N@TR><^S_qFH|K*>>P3Bi{};6}`w@O{jy%`0KLG|0+M76ml3&-? zf<;^8xsLr^op5ab;s?KN7A73n|1I6-!KZJ@2XChy;+OYxY&^ivnr1J4<8MsD_u|I8 z=UL0(oIB@P+mD>LUf}ThIn(a>+;8giHvHas;2j#Ldp`HQdX>HMKz%R%#ykKTa{oN* zn{x3D_hS##RWkni%KGHH_=NlM40ZL5ch1LueXv~&ELG0<`z~BvHRI2}Fm?Z!esN5c z=lUh}w!P<1%!R`-{g>Z7Z~7PXZTY;v*R@4%{1vaTc7MP8d-tC@jSIgQI=pXZ+AELh zx+isd7H{h6tdFBR7R?*?a|M6wg*yVpML^D9);Hh9Z4TPUe30S)u`Accm+AO6Hmvuct~^wI jTJ;u6{1-oD!M - + > + android:gravity="center_vertical" + android:textSize="@dimen/list_item_bank_info_bank_name_text_size" + /> - + android:layout_marginBottom="@dimen/list_item_bank_info_bank_name_margin_bottom" + android:layout_alignParentLeft="true" + android:layout_alignParentStart="true" + android:layout_alignParentBottom="true" + style="@style/TextAppearance.AppCompat.Small" + android:gravity="center_vertical" + /> - + - - - - - + \ No newline at end of file diff --git a/fints4javaAndroidApp/src/main/res/values/colors.xml b/fints4javaAndroidApp/src/main/res/values/colors.xml index a7ed4f4b..f792bb38 100644 --- a/fints4javaAndroidApp/src/main/res/values/colors.xml +++ b/fints4javaAndroidApp/src/main/res/values/colors.xml @@ -6,4 +6,7 @@ @android:color/darker_gray + #ff669900 + #ffcc0000 + diff --git a/fints4javaAndroidApp/src/main/res/values/dimens.xml b/fints4javaAndroidApp/src/main/res/values/dimens.xml index 72f9a0c7..5823c689 100644 --- a/fints4javaAndroidApp/src/main/res/values/dimens.xml +++ b/fints4javaAndroidApp/src/main/res/values/dimens.xml @@ -25,9 +25,10 @@ 60dp 60dp 60dp - 12dp - 30dp - 80dp + 16sp + 4dp + 18dp + 74dp 12dp 12dp