From 2b13026d9bcc1e9110ddcf70fc3706d48bd74c7d Mon Sep 17 00:00:00 2001 From: Arne Jans Date: Fri, 13 Jan 2012 01:16:29 +0100 Subject: [PATCH] Actionbar styling as the old navigationbar. Smaller Astrid-icon in the actionbar. Astrid-icon as up-button, first try, some quirks (see issue in buglist). Linked actionbarsherlock-sourcefolder into astrid-project for easier debugging. --- astrid/.classpath | 1 + astrid/.project | 7 ++++ astrid/res/drawable/header_background.9.png | Bin 0 -> 268 bytes astrid/res/drawable/header_background.png | Bin 308 -> 0 bytes .../drawable/header_background_pressed.9.png | Bin 0 -> 325 bytes .../drawable/header_background_pressed.png | Bin 2860 -> 0 bytes .../drawable/header_background_white.9.png | Bin 0 -> 340 bytes .../res/drawable/header_background_white.png | Bin 2849 -> 0 bytes astrid/res/drawable/icon_48.png | Bin 0 -> 5777 bytes astrid/res/values/styles.xml | 35 ++++++++++++------ .../activity/TaskEditWrapperActivity.java | 2 + .../astrid/activity/TaskListActivity.java | 2 +- .../activity/TaskListWrapperActivity.java | 6 ++- 13 files changed, 40 insertions(+), 13 deletions(-) create mode 100644 astrid/res/drawable/header_background.9.png delete mode 100644 astrid/res/drawable/header_background.png create mode 100644 astrid/res/drawable/header_background_pressed.9.png delete mode 100644 astrid/res/drawable/header_background_pressed.png create mode 100644 astrid/res/drawable/header_background_white.9.png delete mode 100644 astrid/res/drawable/header_background_white.png create mode 100644 astrid/res/drawable/icon_48.png diff --git a/astrid/.classpath b/astrid/.classpath index 40651759a..7065d4619 100644 --- a/astrid/.classpath +++ b/astrid/.classpath @@ -1,6 +1,7 @@ + diff --git a/astrid/.project b/astrid/.project index a8cc9332f..87cb5642d 100644 --- a/astrid/.project +++ b/astrid/.project @@ -36,4 +36,11 @@ org.eclipse.jdt.core.javanature org.eclipse.wst.common.project.facet.core.nature + + + abs_src + 2 + PARENT_LOC/astrid/actionbarsherlock/library/src + + diff --git a/astrid/res/drawable/header_background.9.png b/astrid/res/drawable/header_background.9.png new file mode 100644 index 0000000000000000000000000000000000000000..0058ddd7999080aaecf903a38f57eda4e876a13c GIT binary patch literal 268 zcmV+n0rUQeP)rQ1-W=eir>c>xp+c~yJ13#+kQYU z9+Bdv>rq@>w;fV^Jax#$EmC}FTBNwD8>D!DY>1&TL<97c1tTubj3`c@Gb4&OX=)_-XSeOqe*Xa2_1?u> SrIum<0000$qDcYan;b) z*4ES4(FY;}T>~I8)HgCRFg7tVH8nCdGd43fwXig^w6d_av9Pwaw6V3awYRndA_p6L z2U`axdnadmCl?22S4S5ha(8kCA`fRb4;ObY7k6(rPayJf_wx1d_Df06RE_rR134ne z+uensgH_f8$l)yTh%9Dc;1&j9Muu5)B!GhKC7!;n?6=wFxGbeSc6mPo3ORbZIEHXs z=RL$J=ENYvaA0H06fVV}!0-E$|DXNwv+eG)$8S@=Zkb{0!?w8kMQN0IxOi`|MXOav i->HC><`}i9AJ~`nG2Olt(jKR~@&t;ucLK6T^QB{5b diff --git a/astrid/res/drawable/header_background_pressed.9.png b/astrid/res/drawable/header_background_pressed.9.png new file mode 100644 index 0000000000000000000000000000000000000000..84a9cc086fc5b3c3075271e579acd29f2854cf5a GIT binary patch literal 325 zcmV-L0lNN)P)aE-a#3<{kWx~Li;|@H21G=XB#Gi6rKrsT5hC(wXh);j>^9rXew8s7 zkIV9uw|-~stcY9pJ`{1wZls8VoyZYyM~-;w z-4Snwj(8(<#Ot9WUMsu*#j9mUyz=I_V9Ui~n5AMd%wn+^X5lqg%zW|E{BgJQX7~FG X%%b)at?)S@00000NkvXXu0mjf=7Ez_ literal 0 HcmV?d00001 diff --git a/astrid/res/drawable/header_background_pressed.png b/astrid/res/drawable/header_background_pressed.png deleted file mode 100644 index 010269fbdd1cbf4bceb67158b788ddd8fea23920..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2860 zcmV+{3)A$8P)KLZ*U+IBfRsybQWXdwQbLP>6pAqfylh#{fb6;Z(vMMVS~$e@S=j*ftg6;Uhf59&ghTmgWD0l;*T zI709Y^p6lP1rIRMx#05C~cW=H_Aw*bJ-5DT&Z2n+x)QHX^p z00esgV8|mQcmRZ%02D^@S3L16t`O%c004NIvOKvYIYoh62rY33S640`D9%Y2D-rV&neh&#Q1i z007~1e$oCcFS8neI|hJl{-P!B1ZZ9hpmq0)X0i`JwE&>$+E?>%_LC6RbVIkUx0b+_+BaR3cnT7Zv!AJxW zizFb)h!jyGOOZ85F;a?DAXP{m@;!0_IfqH8(HlgRxt7s3}k3K`kFu>>-2Q$QMFfPW!La{h336o>X zu_CMttHv6zR;&ZNiS=X8v3CR#fknUxHUxJ0uoBa_M6WNWeqIg~6QE69c9o#eyhGvpiOA@W-aonk<7r1(?fC{oI5N*U!4 zfg=2N-7=cNnjjOr{yriy6mMFgG#l znCF=fnQv8CDz++o6_Lscl}eQ+l^ZHARH>?_s@|##Rr6KLRFA1%Q+=*RRWnoLsR`7U zt5vFIcfW3@?wFpwUVxrVZ>QdQz32KIeJ}k~{cZZE^+ya? z2D1z#2HOnI7(B%_ac?{wFUQ;QQA1tBKtrWrm0_3Rgps+?Jfqb{jYbcQX~taRB;#$y zZN{S}1|}gUOHJxc?wV3fxuz+mJ4`!F$IZ;mqRrNsHJd##*D~ju=bP7?-?v~|cv>vB zsJ6IeNwVZxrdjT`yl#bBIa#GxRa#xMMy;K#CDyyGyQdMSxlWT#tDe?p!?5wT$+oGt z8L;Kp2HUQ-ZMJ=3XJQv;x5ci*?vuTfeY$;({XGW_huIFR9a(?@3)XSs8O^N5RyOM=TTmp(3=8^+zpz2r)C z^>JO{deZfso3oq3?Wo(Y?l$ge?uXo;%ru`Vo>?<<(8I_>;8Eq#KMS9gFl*neeosSB zfoHYnBQIkwkyowPu(zdms`p{<7e4kra-ZWq<2*OsGTvEV%s0Td$hXT+!*8Bnh2KMe zBmZRodjHV?r+_5^X9J0WL4jKW`}lf%A-|44I@@LTvf1rHjG(ze6+w@Jt%Bvjts!X0 z?2xS?_ve_-kiKB_KiJlZ$9G`c^=E@oNG)mWWaNo-3TIW8)$Hg0Ub-~8?KhvJ>$ z3*&nim@mj(aCxE5!t{lw7O5^0EIO7zOo&c6l<+|iDySBWCGrz@C5{St!X3hAA}`T4 z(TLbXTq+(;@<=L8dXnssyft|w#WSTW<++3>sgS%(4NTpeI-VAqb|7ssJvzNHgOZVu zaYCvgO_R1~>SyL=cFU|~g|hy|Zi}}s9+d~lYqOB71z9Z$wnC=pR9Yz4DhIM>Wmjgu z&56o6maCpC&F##y%G;1PobR9i?GnNg;gYtchD%p19a!eQtZF&3JaKv33gZ<8D~47E ztUS1iwkmDaPpj=$m#%)jCVEY4fnLGNg2A-`YwHVD3gv};>)hAvT~AmqS>Lr``i7kw zJ{5_It`yrBmlc25DBO7E8;5VoznR>Ww5hAaxn$2~(q`%A-YuS64wkBy=9dm`4cXeX z4c}I@?e+FW+b@^RDBHV(wnMq2zdX3SWv9u`%{xC-q*U}&`cyXV(%rRT*Z6MH?i+i& z_B8C(+grT%{XWUQ+f@NoP1R=AW&26{v-dx)iK^-Nmiuj8txj!m?Z*Ss1N{dh4z}01 z)YTo*JycSU)+_5r4#yw9{+;i4Ee$peRgIj+;v;ZGdF1K$3E%e~4LaI(jC-u%2h$&R z9cLXcYC@Xwnns&bn)_Q~Te?roKGD|d-g^8;+aC{{G(1^(O7m37Y1-+6)01cN&y1aw zoqc{T`P^XJqPBbIW6s}d4{z_f5Om?vMgNQEJG?v2T=KYd^0M3I6IZxbny)%vZR&LD zJpPl@Psh8QyPB@KTx+@RdcC!KX7}kEo;S|j^u2lU7XQ}Oo;f|;z4Ll+_r>@1-xl3| zawq-H%e&ckC+@AhPrP6BKT#_XdT7&;F71j}Joy zkC~6lh7E@6o;W@^IpRNZ{ptLtL(gQ-CY~4mqW;US7Zxvm_|@yz&e53Bp_lTPlfP|z zrTyx_>lv@x#=^!PzR7qqF<$gm`|ZJZ+;<)Cqu&ot2z=0000WV@Og>004R=004l4008;_004mL004C`008P>0026e000+nl3&F} z00012Nkl4 zT`L4(7>DusObAI5B}qzBl9H4pMWQ6axpyIiNSkPr_xJB%c8poGvorfGZgb-AWV!D8 z9o%&tJkQbXIOWHjzh?2RWJK}8YsrY>`E((A-`q=re*R&z&k0gI^OT_9_%TL`rypXZ zcj)_xy^4_Hk;?*7Je(~c#Y5Q;DIUBCk>Y{#5Gn3I z`$CHQGI^x9H(iM0p3^*1+zKLZ*U+IBfRsybQWXdwQbLP>6pAqfylh#{fb6;Z(vMMVS~$e@S=j*ftg6;Uhf59&ghTmgWD0l;*T zI709Y^p6lP1rIRMx#05C~cW=H_Aw*bJ-5DT&Z2n+x)QHX^p z00esgV8|mQcmRZ%02D^@S3L16t`O%c004NIvOKvYIYoh62rY33S640`D9%Y2D-rV&neh&#Q1i z007~1e$oCcFS8neI|hJl{-P!B1ZZ9hpmq0)X0i`JwE&>$+E?>%_LC6RbVIkUx0b+_+BaR3cnT7Zv!AJxW zizFb)h!jyGOOZ85F;a?DAXP{m@;!0_IfqH8(HlgRxt7s3}k3K`kFu>>-2Q$QMFfPW!La{h336o>X zu_CMttHv6zR;&ZNiS=X8v3CR#fknUxHUxJ0uoBa_M6WNWeqIg~6QE69c9o#eyhGvpiOA@W-aonk<7r1(?fC{oI5N*U!4 zfg=2N-7=cNnjjOr{yriy6mMFgG#l znCF=fnQv8CDz++o6_Lscl}eQ+l^ZHARH>?_s@|##Rr6KLRFA1%Q+=*RRWnoLsR`7U zt5vFIcfW3@?wFpwUVxrVZ>QdQz32KIeJ}k~{cZZE^+ya? z2D1z#2HOnI7(B%_ac?{wFUQ;QQA1tBKtrWrm0_3Rgps+?Jfqb{jYbcQX~taRB;#$y zZN{S}1|}gUOHJxc?wV3fxuz+mJ4`!F$IZ;mqRrNsHJd##*D~ju=bP7?-?v~|cv>vB zsJ6IeNwVZxrdjT`yl#bBIa#GxRa#xMMy;K#CDyyGyQdMSxlWT#tDe?p!?5wT$+oGt z8L;Kp2HUQ-ZMJ=3XJQv;x5ci*?vuTfeY$;({XGW_huIFR9a(?@3)XSs8O^N5RyOM=TTmp(3=8^+zpz2r)C z^>JO{deZfso3oq3?Wo(Y?l$ge?uXo;%ru`Vo>?<<(8I_>;8Eq#KMS9gFl*neeosSB zfoHYnBQIkwkyowPu(zdms`p{<7e4kra-ZWq<2*OsGTvEV%s0Td$hXT+!*8Bnh2KMe zBmZRodjHV?r+_5^X9J0WL4jKW`}lf%A-|44I@@LTvf1rHjG(ze6+w@Jt%Bvjts!X0 z?2xS?_ve_-kiKB_KiJlZ$9G`c^=E@oNG)mWWaNo-3TIW8)$Hg0Ub-~8?KhvJ>$ z3*&nim@mj(aCxE5!t{lw7O5^0EIO7zOo&c6l<+|iDySBWCGrz@C5{St!X3hAA}`T4 z(TLbXTq+(;@<=L8dXnssyft|w#WSTW<++3>sgS%(4NTpeI-VAqb|7ssJvzNHgOZVu zaYCvgO_R1~>SyL=cFU|~g|hy|Zi}}s9+d~lYqOB71z9Z$wnC=pR9Yz4DhIM>Wmjgu z&56o6maCpC&F##y%G;1PobR9i?GnNg;gYtchD%p19a!eQtZF&3JaKv33gZ<8D~47E ztUS1iwkmDaPpj=$m#%)jCVEY4fnLGNg2A-`YwHVD3gv};>)hAvT~AmqS>Lr``i7kw zJ{5_It`yrBmlc25DBO7E8;5VoznR>Ww5hAaxn$2~(q`%A-YuS64wkBy=9dm`4cXeX z4c}I@?e+FW+b@^RDBHV(wnMq2zdX3SWv9u`%{xC-q*U}&`cyXV(%rRT*Z6MH?i+i& z_B8C(+grT%{XWUQ+f@NoP1R=AW&26{v-dx)iK^-Nmiuj8txj!m?Z*Ss1N{dh4z}01 z)YTo*JycSU)+_5r4#yw9{+;i4Ee$peRgIj+;v;ZGdF1K$3E%e~4LaI(jC-u%2h$&R z9cLXcYC@Xwnns&bn)_Q~Te?roKGD|d-g^8;+aC{{G(1^(O7m37Y1-+6)01cN&y1aw zoqc{T`P^XJqPBbIW6s}d4{z_f5Om?vMgNQEJG?v2T=KYd^0M3I6IZxbny)%vZR&LD zJpPl@Psh8QyPB@KTx+@RdcC!KX7}kEo;S|j^u2lU7XQ}Oo;f|;z4Ll+_r>@1-xl3| zawq-H%e&ckC+@AhPrP6BKT#_XdT7&;F71j}Joy zkC~6lh7E@6o;W@^IpRNZ{ptLtL(gQ-CY~4mqW;US7Zxvm_|@yz&e53Bp_lTPlfP|z zrTyx_>lv@x#=^!PzR7qqF<$gm`|ZJZ+;<)Cqu&ot2z=0000WV@Og>004R=004l4008;_004mL004C`008P>0026e000+nl3&F} z0000?NklCpoXXnwk`?rkF;H>6p5B`!NLz zDY3)bfE_GJAuqdFi>p~%!}rJTem~o()#DieC%a(mkLzBJ00000NkvXXu0mjfSwc#L diff --git a/astrid/res/drawable/icon_48.png b/astrid/res/drawable/icon_48.png new file mode 100644 index 0000000000000000000000000000000000000000..cbd7ed44ac91e56949c39ac7418ed8174ad92a66 GIT binary patch literal 5777 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/edit_titlebar @drawable/ios_fabric_480_dark #888888 + + @drawable/header_background + useLogo|showHome|showTitle + @drawable/icon_48 - + + @drawable/header_background + useLogo|showHome|showTitle + @drawable/icon_48 + - - - - - diff --git a/astrid/src/com/todoroo/astrid/activity/TaskEditWrapperActivity.java b/astrid/src/com/todoroo/astrid/activity/TaskEditWrapperActivity.java index 1ea79ebcf..85584fa9c 100644 --- a/astrid/src/com/todoroo/astrid/activity/TaskEditWrapperActivity.java +++ b/astrid/src/com/todoroo/astrid/activity/TaskEditWrapperActivity.java @@ -18,6 +18,8 @@ public class TaskEditWrapperActivity extends AstridWrapperActivity { ThemeService.applyTheme(this); super.onCreate(savedInstanceState); setContentView(R.layout.task_edit_wrapper_activity); + + getSupportActionBar().setDisplayHomeAsUpEnabled(true); } /* (non-Javadoc) diff --git a/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java b/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java index 8a08247af..8f965e926 100644 --- a/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java +++ b/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java @@ -1427,7 +1427,7 @@ public class TaskListActivity extends ListFragment implements OnScrollListener, private void showFilterListActivity() { Intent intent = (Intent) getActivity().getIntent().clone(); intent.setComponent(new ComponentName(getActivity(), FilterListWrapperActivity.class)); - intent.setFlags(0); + intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP); startActivity(intent); AndroidUtilities.callOverridePendingTransition(getActivity(), R.anim.slide_right_in, R.anim.slide_right_out); } diff --git a/astrid/src/com/todoroo/astrid/activity/TaskListWrapperActivity.java b/astrid/src/com/todoroo/astrid/activity/TaskListWrapperActivity.java index e4d3455ff..58b5c17ee 100644 --- a/astrid/src/com/todoroo/astrid/activity/TaskListWrapperActivity.java +++ b/astrid/src/com/todoroo/astrid/activity/TaskListWrapperActivity.java @@ -19,7 +19,9 @@ public class TaskListWrapperActivity extends AstridWrapperActivity { super.onCreate(savedInstanceState); setContentView(R.layout.task_list_wrapper_activity); - Filter savedFilter = getIntent().getParcelableExtra(TaskListActivity.TOKEN_FILTER); + getSupportActionBar().setDisplayHomeAsUpEnabled(true); + + Filter savedFilter = getIntent().getParcelableExtra(TaskListActivity.TOKEN_FILTER); setupTasklistFragmentWithFilter(savedFilter); } @@ -33,8 +35,10 @@ public class TaskListWrapperActivity extends AstridWrapperActivity { Fragment frag = getFilterListFragment(); if (frag != null) { mMultipleFragments = true; + getSupportActionBar().setDisplayHomeAsUpEnabled(false); } else { mMultipleFragments = false; + getSupportActionBar().setDisplayHomeAsUpEnabled(true); } }