From 4a8ff47fce34779a9017f79a6e1d9b273978ad14 Mon Sep 17 00:00:00 2001 From: Peter Serwylo Date: Thu, 11 Jun 2015 23:35:28 +1000 Subject: [PATCH] WIP: Implementing mockups from Carrie, added "Toolbar" The Toolbar is the new thing from Google which acts as an ActionBar. It is not a special view like the action bar is, it is implemented and added to your layout the same as any view. The InnerView classes of the swap workflow have the choice of what colour to make the toolbar, so that they can distinguish themselves as per the mockups (some deep blue, others bright blue). Added icons for close, but they don't do anything yet. Minor tweaks to layout so that it looks more like the latest mockups. --- .../drawable-hdpi/ic_arrow_forward_white.png | Bin 0 -> 195 bytes F-Droid/res/drawable-hdpi/ic_close_white.png | Bin 0 -> 634 bytes .../drawable-mdpi/ic_arrow_forward_white.png | Bin 0 -> 160 bytes F-Droid/res/drawable-mdpi/ic_close_white.png | Bin 0 -> 495 bytes .../drawable-xhdpi/ic_arrow_forward_white.png | Bin 0 -> 235 bytes F-Droid/res/drawable-xhdpi/ic_close_white.png | Bin 0 -> 725 bytes .../ic_arrow_forward_white.png | Bin 0 -> 308 bytes .../res/drawable-xxhdpi/ic_close_white.png | Bin 0 -> 983 bytes .../ic_arrow_forward_white.png | Bin 0 -> 372 bytes .../res/drawable-xxxhdpi/ic_close_white.png | Bin 0 -> 1094 bytes .../res/drawable/ic_arrow_forward_white.png | Bin 0 -> 160 bytes F-Droid/res/drawable/ic_close_white.png | Bin 0 -> 495 bytes F-Droid/res/layout/swap_activity.xml | 19 +++++++---- F-Droid/res/layout/swap_wifi_qr.xml | 17 ++++++---- F-Droid/res/menu/swap_next.xml | 1 + F-Droid/res/menu/swap_next_search.xml | 11 ++++--- F-Droid/res/menu/swap_skip.xml | 1 + F-Droid/res/values-v11/styles.xml | 8 +++++ F-Droid/res/values-v21/styles.xml | 4 +++ F-Droid/res/values/colors.xml | 1 + F-Droid/res/values/strings.xml | 13 +++++--- F-Droid/res/values/styles.xml | 27 +++++++++------ .../fdroid/fdroid/localrepo/SwapManager.java | 1 + .../fdroid/views/swap/JoinWifiView.java | 11 +++++++ .../org/fdroid/fdroid/views/swap/NfcView.java | 11 +++++++ .../fdroid/views/swap/SelectAppsView.java | 31 ++++++++++-------- .../fdroid/views/swap/StartSwapView.java | 12 +++++++ .../views/swap/SwapWorkflowActivity.java | 26 +++++++++++++++ .../fdroid/fdroid/views/swap/WifiQrView.java | 11 +++++++ F-Droid/tools/download-material-icon.sh | 2 +- 30 files changed, 160 insertions(+), 47 deletions(-) create mode 100644 F-Droid/res/drawable-hdpi/ic_arrow_forward_white.png create mode 100644 F-Droid/res/drawable-hdpi/ic_close_white.png create mode 100644 F-Droid/res/drawable-mdpi/ic_arrow_forward_white.png create mode 100644 F-Droid/res/drawable-mdpi/ic_close_white.png create mode 100644 F-Droid/res/drawable-xhdpi/ic_arrow_forward_white.png create mode 100644 F-Droid/res/drawable-xhdpi/ic_close_white.png create mode 100644 F-Droid/res/drawable-xxhdpi/ic_arrow_forward_white.png create mode 100644 F-Droid/res/drawable-xxhdpi/ic_close_white.png create mode 100644 F-Droid/res/drawable-xxxhdpi/ic_arrow_forward_white.png create mode 100644 F-Droid/res/drawable-xxxhdpi/ic_close_white.png create mode 100644 F-Droid/res/drawable/ic_arrow_forward_white.png create mode 100644 F-Droid/res/drawable/ic_close_white.png create mode 100644 F-Droid/res/values-v11/styles.xml diff --git a/F-Droid/res/drawable-hdpi/ic_arrow_forward_white.png b/F-Droid/res/drawable-hdpi/ic_arrow_forward_white.png new file mode 100644 index 0000000000000000000000000000000000000000..8c4c394e4eb1317612782a2943e4fbee8dc8d7f7 GIT binary patch literal 195 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY0wn)GsXhawx;$MRLo)8Yy?mS3!GXagP&RznYnLV4=JylzIMWb?Jmd6AI z$0im|p(Xi~zQi2lo#Hm>jK_bbnZDCL|N8h%SjNJ04jbQ`lyf}nenQJjAL|s{JG63* ug|%ixVV(;6xz;C#EIs^Wl#~|rtX=Tt#jmu@OkaSmV(@hJb6Mw<&;$V25lZU- literal 0 HcmV?d00001 diff --git a/F-Droid/res/drawable-hdpi/ic_close_white.png b/F-Droid/res/drawable-hdpi/ic_close_white.png new file mode 100644 index 0000000000000000000000000000000000000000..a7486ae4f78df53730d1ed6c61bdcba3c2a1f56d GIT binary patch literal 634 zcmeAS@N?(olHy`uVBq!ia0vp^W+2SL0wmRZ7KH&RmUKs7M+SzC{oH>NS%G|}ByV>Y zhX3vTXZ8bm>?NMQuI%^OxCONsi%OlD7#JAWdAc};L>zuQ-EmU0f`DsvQCm+1^97ANWH)lMOxvPt zI9EepVz8@gOp7SjA^vp%69g14#25V8-+7|2;gF>2j5O7C8H^fldS#s!_fBnLyYQ%~ zDLu^bpoe49>+RK1wTs){DVNz8Gv2&?_m4q!gK6HiM=a&%S-ypp`OQ#nXr5?e+$6DP zyWHUthBuN1XFA@cEz-^6PRl*~h2c(}l!C6(=f2^E`;2p+0BX@(;<{N{iBVIrGjkJdnnzt-brssxwO&Z(Wi-6Fgt|!h;ST zmY|87bCiy+T`p?4?X_q}+1*C>KYrf!WzUlsZn;}Hf7{1c%lDzQh4smoU9)&Ea|T3- zZ`{mywn;Ki=^@(|1&7ULq8Sc4GZY)vcg}KPPCC%@_Ru`GBXu91So~nPRdnErnswjI z#}i-O<7D?~?Me@OVD$TE?K8XmoT_^3i}>;@;sc%?UzG4R^7hTQJy(ARHKIE4Y~O#nQ4`{HCX>pe-6~Z;OXk;vd$@?2>{!-__hE5 literal 0 HcmV?d00001 diff --git a/F-Droid/res/drawable-mdpi/ic_arrow_forward_white.png b/F-Droid/res/drawable-mdpi/ic_arrow_forward_white.png new file mode 100644 index 0000000000000000000000000000000000000000..878b6e5e8844faf9723a2460d56d53af7c74babb GIT binary patch literal 160 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA0wn)(8}b0DbWaz@kch)?r&@D0IPkC*>)MM8 z>nw7=#%#lV{gUfNb|vH5v@RAQMh5eXOG;j)du~!Sd39iNz~WXGP9c?V6V;bk7pQ)G zd*F9>SoU7!?fabLFRy=b{)_Fes00K1=^RT#zopr0I2>qsQ>@~ literal 0 HcmV?d00001 diff --git a/F-Droid/res/drawable-mdpi/ic_close_white.png b/F-Droid/res/drawable-mdpi/ic_close_white.png new file mode 100644 index 0000000000000000000000000000000000000000..24b2e4d2d56b7104304fecca08134fd7657c5be5 GIT binary patch literal 495 zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k0wldT1B8JTOS+@4BLl<6e(pbstUx|flDE4H z!~gdFGy8!&_7YEDSN8jC+=5z+MWxP63=E9Qo-U3d9>?EKb)3|!AmCcPDQW%1-v#qL z&n-IU`sl4qn@&Zfha}H}AmiB~OT#00_y22t7xqMYzPSBs|Devhvda@D3+YbfxHmCe zPH7LCp)e|x*Mm3dRWI*etN#jk9ekjBEZJ>b;IFA@nZ`P`vfBo15%*vN2BTg%FR zx2npNI|c__eivwVJs&K=1$~cf(V^jjBbbE}ZLEiJID(_V?559iKnw-%k7a@$~uy z3nHgy@Lk#U=aA6ZhNx5e*P6?&`)^r(uWG~m+C0vyALnsZZCGq)c4OCmKC`1wFRb`` zS9)uc)AD;q8Lwqrss4Ar&i($6BNa?86Zqy`Y% literal 0 HcmV?d00001 diff --git a/F-Droid/res/drawable-xhdpi/ic_arrow_forward_white.png b/F-Droid/res/drawable-xhdpi/ic_arrow_forward_white.png new file mode 100644 index 0000000000000000000000000000000000000000..5e93f8862b879d31e51adaf46b3a0ebd2063c5a1 GIT binary patch literal 235 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD0wg^q?%xcgHhH=@hE&{od-WkNqa#C0AnyXt zUlw25*12(Xp7<;H#OGZt@0&d-=DQ<2CaHK{@;^0UVdX!)>rtFHp9d;G%&b#ZY~ORu z<%C)CSAk7u1Q}7m!^6tUvNG6fx+hE#o>atipl5x+Pvv(%&TLxsuluZd{jtyf&t~WE z`}u6Y`Tv}KKR3_WZ+5@t^V#_f8&=M%SLV6;*_|Wzb38}y=lL9KKfiBz_7muWN&j|n Y%N<#k$X1qa1#~@wr>mdKI;Vst0GCi?UH||9 literal 0 HcmV?d00001 diff --git a/F-Droid/res/drawable-xhdpi/ic_close_white.png b/F-Droid/res/drawable-xhdpi/ic_close_white.png new file mode 100644 index 0000000000000000000000000000000000000000..04fa6efe64327637235f13acca643afdd0606867 GIT binary patch literal 725 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY0wn)GsXhawSkfJR9T^xl_H+M9WCik>lDyqr z82-2SpV<%Ov6p!Iy0YJA;}+CndR-&511Qhw>EalYaqsO+>#}A80awwCh!*>s(>yoL zU$XhSfb-M}|Gw>lJ2XG=b0*eKa9a5MoV(n-XGT`Wn*=-|VDhV%7nyRz`~{SayJmDd z@#W+$H>keW?3%lMnaKO3w=?GXoqyz<<5Jf5LT#77-^tE+EwQ`ie1_AmnEVNtbo=-V z_R|`cOcy?6X1~l@zKHdKhv&0ojpx0>;-(>M*6^-falVYfZ_lLN(ponz6-;K`VI8r5 zFGn<&d`kAJd8*C@Tx+8HuAe(GOYcRK|H(;=I~XI%XJ_8wiT%EF!K6!eTz=fASNfG! zPd)fHl8;@!F*Q^mYU_0NH)jv@9{yw@#{OMLdBP?UiD{NQw#`2su%YL`)$Q%B4W=A^ z#{%OIxHg$Gth*KxBNK7#!J~sgMJ6rJ4k&8r9Gx?!B^EtNQK1A4k92%k)vW33ic(~5POucO zZ^(YwdwuH%(}ZKv(chNMB?ajX$PcJZ-6;Xd9o=IO?3^-bPWwd49%@fjI0cdv<(fc3=FD$TaTe= c$jwj5OsmALflI))3aEj>)78&qol`;+076ABr~m)} literal 0 HcmV?d00001 diff --git a/F-Droid/res/drawable-xxhdpi/ic_arrow_forward_white.png b/F-Droid/res/drawable-xxhdpi/ic_arrow_forward_white.png new file mode 100644 index 0000000000000000000000000000000000000000..f8cf79f9dc0f29130bd6e84fd9a7b5f5877a81cc GIT binary patch literal 308 zcmeAS@N?(olHy`uVBq!ia0vp^6F``Q8Ax83A=Cw=R04cLT!Hj|LSPGL?@ORM?vfzC zV1|a8`nuZ2<|ccG1t)s%1BJJEx;TbZ+rvF=^WD~e3x_m~4zY99}!XLOk z>@SCxaOtcSmtE$ny(-mSz}mm~UsPoe_q>&JD}X?)^vT1A4`*I!YzKnpp&vhd_~7$O z?vZ3@M|z0jyuj89H&YwMs~=Q4Peo)Vo>K)mFVdQ&MBb@ E048>ifB*mh literal 0 HcmV?d00001 diff --git a/F-Droid/res/drawable-xxhdpi/ic_close_white.png b/F-Droid/res/drawable-xxhdpi/ic_close_white.png new file mode 100644 index 0000000000000000000000000000000000000000..279cce3fea150d11dc715bc7b1340cd0b48aff0b GIT binary patch literal 983 zcmeAS@N?(olHy`uVBq!ia0vp^IUvlz0wh)Q=eq$ZmUKs7M+SzC{oH>NS%G|oWRD45bDP46hOx7_4S6Fo+k-*%fF5lweBoc6VX;-`;;_Kaj^> z;_2(kexHq7P>bnxjnEFD{C!Us$B>F!Z)XP<-7*kp6JH*F@Tg^Db>oaUiQD}q<_nBV zPDFP7w~?^nTC-6nv-8Q#_nl`P!uJ0VaLX3d>{_G&M<+KFRSLGbr~gtk+3@IYVhGsPz@Elk<^_Um0E6m?ZZer$Wf zE*Rhu%{jmLt)S0|{OJ>BK6ZC{R@U6<z7N)NqQC~w(sHm816gT4J^v!AY zadA?+rL1VKF=^t3l%Ny#75*MhlRXtLPnyvA&8o_D(zKSGE!VUn=6dKT-`X-E)8m9o zwaybuNzR!WtoPiT-=-#8emVZ8skJ_hMJMEFtDfB4%SG~UO^;7)t#j1>GAYaHkny)0 z-X&Qr8-JDV;k>`H(r?Yl_~Q$$O%L73zj$IRAM1wuiza5vo;o^f+J&03KThZFtNS>4 zY_C1^qIHhCqV(C_r5X+Q(@JMtTgdQl_SHbHmwJlQx?+llOMMmz8RZ;5vM>1aoQQcs zn=Y=2Zf82NUE)B}7%T!Hj|BEULZFH4|Oo{}KH zV1|bGCLc`A%^I7UrIo%4IRnK%c)B=-RK&f#z0tSXP=vkEJy2*t6>~*P$QegbLndVd zH@5^9ts_kF|K+uUq`X5oN{&u`Csy(6`3($=OmPVZvcZgdi3e7iI{<~;r9NDfR&Z!&$d@oE z6G$+PJfO6M?Me*8lmO;zJqC{zjAr5t$|23izn=KcUNS%G|oWRD45bDP46hOx7_4S6Fo+k-*%fF5lweBoc6VX;-`;;_Kaj^> z;_2(kexHq7P>Xp^wUQnK1GAr}i(^Q|t+#VMn`RpbxK4djqpD1S_ISww5Zz%{0-o5HFJO531l-ll$?xIMS%N!Z*%xfoy zZVBCK!Th#_$>@t~x_jYGm*P`j4f{)(K6PqzXT%kCX6!p;(^kF9v-_Fu^dG`EgIpFZ zVm+}`y5CT0QK+K0d)St&C!5@+#BN#jgFuHV?@YJH?PcWP0j{sG-67niH2 zj-FJHx>^*ecO=?mKleh1on5`hXUHrvRTNiWn{oC;>dqA`i%eC;)q69}o;><7EV+<% zwdYP9@fULcyM4E$J$+PR|NEZ3Yj%{L-<*uIr&BvM9Jc5^dDPN%tutm$!o^<`P76(( zpYiv^(T`$p&Huji(CgctQF}7A^Mr0xd{N;Z*Vo>9=h!YrO*<_VxFTci>7$(jYuR^N zG%l(wSDLQ6sQL5C_7@Aa!xybrYGI%9-&~8W>*o>SkM6s=JNDcci^~6e_Wtn?3tkAH zKh`gG)=fk+Tz}ES(sqBFyq$7iUIdur@7$NEe>WtC;o$2Sue-l@ePr3w#hVJO-!BD#jQ{$xRd+hw$cm}{afGodY8F+UtTzI`N|y(m$uqJeS0rlDff49 z@uH>q^;uq9Z1%RE?U=TH`v%U7pT3EO=|}xLc6XKQxvg7aJWXNNoS18yr|HeQ7w)%8z&CE)ip{S(pG78YyLX7;VqX+vVz-{VLz~~~ zqfe4RL!%Y6}9duFW{cU8!iyfW?Z8KEY= zJHxsUm!0GmOgx;MUbtTOb}3i2tBHshzjog8-(86*p-Z~h|C=$PX8|C8)gM-ce_q>I zCgofM@>EM)BT7;dOH!?pi&B9UgOP!usjh*UuAyOwp}Ccbk(Gh5wxNNQfx%s?z9JM2 bx%nxXX_dG&tVuUJ2eRMO)z4*}Q$iB}igwZY literal 0 HcmV?d00001 diff --git a/F-Droid/res/drawable/ic_arrow_forward_white.png b/F-Droid/res/drawable/ic_arrow_forward_white.png new file mode 100644 index 0000000000000000000000000000000000000000..878b6e5e8844faf9723a2460d56d53af7c74babb GIT binary patch literal 160 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA0wn)(8}b0DbWaz@kch)?r&@D0IPkC*>)MM8 z>nw7=#%#lV{gUfNb|vH5v@RAQMh5eXOG;j)du~!Sd39iNz~WXGP9c?V6V;bk7pQ)G zd*F9>SoU7!?fabLFRy=b{)_Fes00K1=^RT#zopr0I2>qsQ>@~ literal 0 HcmV?d00001 diff --git a/F-Droid/res/drawable/ic_close_white.png b/F-Droid/res/drawable/ic_close_white.png new file mode 100644 index 0000000000000000000000000000000000000000..24b2e4d2d56b7104304fecca08134fd7657c5be5 GIT binary patch literal 495 zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k0wldT1B8JTOS+@4BLl<6e(pbstUx|flDE4H z!~gdFGy8!&_7YEDSN8jC+=5z+MWxP63=E9Qo-U3d9>?EKb)3|!AmCcPDQW%1-v#qL z&n-IU`sl4qn@&Zfha}H}AmiB~OT#00_y22t7xqMYzPSBs|Devhvda@D3+YbfxHmCe zPH7LCp)e|x*Mm3dRWI*etN#jk9ekjBEZJ>b;IFA@nZ`P`vfBo15%*vN2BTg%FR zx2npNI|c__eivwVJs&K=1$~cf(V^jjBbbE}ZLEiJID(_V?559iKnw-%k7a@$~uy z3nHgy@Lk#U=aA6ZhNx5e*P6?&`)^r(uWG~m+C0vyALnsZZCGq)c4OCmKC`1wFRb`` zS9)uc)AD;q8Lwqrss4Ar&i($6BNa?86Zqy`Y% literal 0 HcmV?d00001 diff --git a/F-Droid/res/layout/swap_activity.xml b/F-Droid/res/layout/swap_activity.xml index 4f8096856..8349507a5 100644 --- a/F-Droid/res/layout/swap_activity.xml +++ b/F-Droid/res/layout/swap_activity.xml @@ -1,14 +1,21 @@ - + android:layout_height="match_parent" + android:orientation="vertical"> + + + android:layout_height="fill_parent" /> - - - \ No newline at end of file + \ No newline at end of file diff --git a/F-Droid/res/layout/swap_wifi_qr.xml b/F-Droid/res/layout/swap_wifi_qr.xml index da0ba3a3b..38dba512b 100644 --- a/F-Droid/res/layout/swap_wifi_qr.xml +++ b/F-Droid/res/layout/swap_wifi_qr.xml @@ -12,13 +12,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content"> - - + +