From d474239b21f01465975ff43944ea4c2981802ff0 Mon Sep 17 00:00:00 2001 From: AndyScherzinger Date: Sun, 26 Jul 2015 01:49:27 +0200 Subject: [PATCH] initial material design changes for the action bar --- AndroidManifest.xml | 2 +- build.gradle | 10 +- project.properties | 2 +- res/drawable-xxhdpi/ic_action_create_dir.png | Bin 0 -> 503 bytes res/drawable-xxhdpi/ic_action_download.png | Bin 0 -> 351 bytes res/drawable-xxhdpi/ic_action_upload.png | Bin 0 -> 325 bytes res/drawable-xxhdpi/ic_cancel.png | Bin 0 -> 920 bytes res/drawable-xxhdpi/ic_folder_open.png | Bin 0 -> 442 bytes res/drawable-xxhdpi/ic_hide.png | Bin 0 -> 1112 bytes res/drawable-xxhdpi/ic_log.png | Bin 0 -> 461 bytes res/drawable-xxhdpi/ic_ok.png | Bin 0 -> 460 bytes res/drawable-xxhdpi/ic_settings.png | Bin 0 -> 994 bytes res/drawable-xxhdpi/ic_view.png | Bin 0 -> 1046 bytes res/drawable-xxhdpi/no_network.png | Bin 0 -> 1015 bytes res/layout/account_setup.xml | 22 ++++- res/layout/drawer.xml | 102 ++++++++++++-------- res/layout/drawer_list_item.xml | 23 +++-- res/values/colors.xml | 11 ++- res/values/strings.xml | 1 + res/values/styles.xml | 14 ++- .../owncloud/android/ui/NavigationDrawerItem.java | 12 ++- .../ui/activity/ConflictsResolveActivity.java | 10 +- .../owncloud/android/ui/activity/FileActivity.java | 36 +++---- .../android/ui/activity/FileDisplayActivity.java | 12 ++- .../android/ui/activity/FolderPickerActivity.java | 2 - .../ui/activity/GenericExplanationActivity.java | 3 - .../android/ui/activity/LogHistoryActivity.java | 4 +- .../android/ui/activity/PassCodeActivity.java | 3 - .../owncloud/android/ui/activity/Preferences.java | 106 +++++++++++++++++---- .../android/ui/activity/UploadFilesActivity.java | 1 - src/com/owncloud/android/ui/activity/Uploader.java | 5 - .../ui/adapter/NavigationDrawerListAdapter.java | 9 +- .../android/ui/dialog/ConflictsResolveDialog.java | 6 +- 33 files changed, 270 insertions(+), 126 deletions(-) create mode 100644 res/drawable-xxhdpi/ic_action_create_dir.png create mode 100644 res/drawable-xxhdpi/ic_action_download.png create mode 100644 res/drawable-xxhdpi/ic_action_upload.png create mode 100644 res/drawable-xxhdpi/ic_cancel.png create mode 100644 res/drawable-xxhdpi/ic_folder_open.png create mode 100644 res/drawable-xxhdpi/ic_hide.png create mode 100644 res/drawable-xxhdpi/ic_log.png create mode 100644 res/drawable-xxhdpi/ic_ok.png create mode 100644 res/drawable-xxhdpi/ic_settings.png create mode 100644 res/drawable-xxhdpi/ic_view.png create mode 100644 res/drawable-xxhdpi/no_network.png diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 5b9fc717..7b4d742d 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -37,7 +37,7 @@ + android:targetSdkVersion="22" /> diff --git a/build.gradle b/build.gradle index 209b7ee9..576eb82d 100644 --- a/build.gradle +++ b/build.gradle @@ -3,7 +3,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:1.0.0' + classpath 'com.android.tools.build:gradle:1.2.3' } } @@ -20,15 +20,15 @@ repositories { dependencies { compile name: 'touch-image-view' - compile 'com.android.support:support-v4:19.1.0' + compile 'com.android.support:support-v4:22.2.1' compile project(':owncloud-android-library') compile 'com.jakewharton:disklrucache:2.0.2' - compile 'com.android.support:appcompat-v7:19.1.0' + compile 'com.android.support:appcompat-v7:22.2.1' } android { - compileSdkVersion 19 - buildToolsVersion "20.0.0" + compileSdkVersion 22 + buildToolsVersion "22.0.1" sourceSets { main { manifest.srcFile 'AndroidManifest.xml' diff --git a/project.properties b/project.properties index 3abf7906..b7cabddb 100644 --- a/project.properties +++ b/project.properties @@ -8,6 +8,6 @@ # project structure. # Project target. -target=android-19 +target=android-22 android.library.reference.1=owncloud-android-library android.library.reference.2=libs/android-support-appcompat-v7-exploded-aar diff --git a/res/drawable-xxhdpi/ic_action_create_dir.png b/res/drawable-xxhdpi/ic_action_create_dir.png new file mode 100644 index 0000000000000000000000000000000000000000..7bd3c8fbc6f39dc978eb7ccfebeab0cefe130e6a GIT binary patch literal 503 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY1|&n@ZgvM!Y)RhkE=uJQvb0|R4|r;B4q#jUru_WCj#%CvpF&Y{XG#BIR5D5YZq z15d+>1eR+FOcJaYRTbP47@1g2^p6U5D($Nm()*@bS@-s?=Qrj1?Lyu_QyCiWZM5A` zoBR9XxAxt|(bajeM=UqlzBD-X&1IAAmcM(BSI(3)EF2VS{N990fib~ zFff!FFfhDIU|_JC!N4G1FlSew4N!t9$=lt9;eUJonf*W>XMsm#F#`j)FbFd;%$g$s z6uj=~;uw-~@9mA#T!#&KTmpZeeqC3&%R^zxvaL&IIytR7=zaJg|4Et>m>r}pHG&O#44M?2En65gEBI}yVNhdm{<`9z&c#oh_j|hb ziAB_^PqoZyD)SMts9N&fbCN}0&&RncMK%kc`%SW3CsL*=X|XS&BImP-!fghY7iA0T lE3AQzTHy?K*9)fw;x4M4jL}V}Wq@8}@O1TaS?83{1OPBPeft0a literal 0 HcmV?d00001 diff --git a/res/drawable-xxhdpi/ic_action_upload.png b/res/drawable-xxhdpi/ic_action_upload.png new file mode 100644 index 0000000000000000000000000000000000000000..a6c31e93228dadd8e1c5eea2b0152272e961ce6e GIT binary patch literal 325 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY0wn)GsXhaw6p}rHd>I(3)EF2VS{N990fib~ zFff!FFfhDIU|_JC!N4G1FlSew4N!t9$=lt9;eUJonf*W>XMsm#F#`j)FbFd;%$g$s z6x{3S;uw-~@9m91K4wJ@*NYoxw(c(8)vS4l`Rx-s``#x30r=I;Yj4$Mn|Go8b8Hd1voE@hb7@4+MH!!4rX07In=m-fjp9b^@ NgQu&X%Q~loCIGyWaJ2vc literal 0 HcmV?d00001 diff --git a/res/drawable-xxhdpi/ic_cancel.png b/res/drawable-xxhdpi/ic_cancel.png new file mode 100644 index 0000000000000000000000000000000000000000..f6f7844defb4822385405ca6414c2449859d40c9 GIT binary patch literal 920 zcmV;J184k+P)004R> z004l5008;`004mK004C`008P>0026e000+ooVrmw00002VoOIv0RM-N%)bBt010qN zS#tmY3ljhU3ljkVnw%H_00R(7L_t(&-tF4WN?Sn`!123kQmxumjnZeS)u6^?QEL}2 zd_SkZgsg1o1BiPO6gNo}ri);!N#@MQohuf?Y=_B@+_`7Y zIddbTmo=ger~~SN9!57gmf57j1y|ImbHxP}Hdtbu?&kyzu)ryGlrZX?Fi(H-pe#l1 zMatuG&mP0cfySsg5FXJ z#!)B^>5T)*@H;3+q4+5W1Nq+x&uNf)eL(5J59{$b((ffbXe}{LV|zP-W)kHnlr9M9 z!r*P|YH%VVQWS-GLuOFXf@326<1|Qn!kPxqfRKKDZknqjJ>^71OljA=Yd%Pt zK?~wz$T!WNXhUk{$UAOM2Avvq#)N_7%2AXg&>KVQZX&sJ6g9f^pqy27(UE*O3dN`% zv}_shnn^jT-W9>p}KqPAkcmqbTb^7Y;|GL~`LM&h?-xr_)+T za^om2^`N?A0@04-%2Cw*BhZU`WT7^7KGdcT_uA*fy!IR3oI*<`kPi_Um%KSu%jCrI z=ot6r*d-^^~`k3f5&%TBu)l%yrqY@b?z~k_y&^Vp=SxKiHJgWnqCm$5LA6lvyO$Ufe*SZ(o?}~Gf?=hot zCj2Gvh@s)9KSGC+yC(n0E_c?HJ9b(VjPM^4^fO0^njv*RW>$W|Lw{<~#VCucQ|6pY uYSg&ooHFYyGWxWV=zJa10d+txY5W0V->`*MDIA{w0000I(3)EF2VS{N990fib~ zFff!FFfhDIU|_JC!N4G1FlSew4N!t9$=lt9;eUJonf*W>XMsm#F#`j)FbFd;%$g&? zz`$ta>EalYaqsOddoN~3k>elVyLfU`FsX`nxQIA*n`}F%ePd~7>!f2 zCwOD)I*fa&zc0AE^m%QZnh_cYqBuI%5zm-~7L z7jMaoZKXf7KUCC(UweMso=GwlWVw(>Zy=Zg5gHp#+x?xPH|OWkdpwVy@bH>Xnv!Vr zB2{_8^OOt9@%Jp}+o(1#Gm)rx7GvZcovM5;zopr0QZKgkpKVy literal 0 HcmV?d00001 diff --git a/res/drawable-xxhdpi/ic_hide.png b/res/drawable-xxhdpi/ic_hide.png new file mode 100644 index 0000000000000000000000000000000000000000..394b85e4f72fbeac1436147b9e8973274a7f4d7f GIT binary patch literal 1112 zcmV-e1gHCnP)004R> z004l5008;`004mK004C`008P>0026e000+ooVrmw00002VoOIv0RM-N%)bBt010qN zS#tmY3ljhU3ljkVnw%H_00YoTL_t(&-tF2;NK{c6!13`h1}!Qhl~zFnJ-{$j8nUP; zs+EzC%E}f+TBFzl{}dHHs5Z6e1r>z7ghHYRR?sE_35s0UqD-WBR(Da1!Mk`_&*E{i!S#B&xzGjt3G z=@;i26Zu%?9t2dw&<`KV#Qm2^f5I%Rk_IjP)0 zIv@en3VMp16f~5y&IFpPL?1b65}kB%nWbSQ_qNnSt{W(m58`-YCr#laAwoQ6nyq=e z_qcXOJA)bxhzGXlttWkFp>qGAq0|#jpe2Tk{Y(rSP@G89mAK>{DhDahfzs(PfbMI@ zI6di!a`&#GM-o;Ny{wv>WpQV*+Cg}88gjxoC)Yijg~t_#d7)ZgGkj}~%im6;Oe7GiC^L8VZYDpdz zibKEBQ3I))gGyYou0UFBJuaMdB$CaBEyitwKJHRS5!s9)ogC&-&qK{lh@F%f>CwV$ z-bJtrq>oFbu{rC=kPNYDy?%oaV_jQd0a5 zo+@Odc%FrcNbxG ef|8)&Prm`3!r)ORl)Q}q0000004R> z004l5008;`004mK004C`008P>0026e000+ooVrmw00002VoOIv0RM-N%)bBt010qN zS#tmY3ljhU3ljkVnw%H_00BiwL_t(&-tF2wN<&c)#qs}Bhz}9$1yS4B7z@QUxCHG5 z1q&g)F2G6~>#QN9wGu&v6mG!A+D;L_YLy$AxtW(db7ldDAH%s*-J;ESO(Bp#lLcz9 z$1Y9gjHxFaM}QXSvgXWnlhU9D*R(Qr?N!mU^$PJ2E8-o0+C0G0A-P4KpCVcked_-a*`rJE>bMWL5c>MN%0^fsS1#Z zR1L^LstWX*R9HbD1HwI^pQJGWeJ51}%BBk>kU#>}4`gM24hv)q5=fx>f=2f21rlgt zK)OQ$38XtDkU(_-y)YBVd1lrMx??>Mbi;-fbi`>O=#VojsN|N_AWol6UacTlq!&W! zv(00&>jS@9li^zT4lo3xiPaL!4n00000NkvXXu0mjf DC$OxD literal 0 HcmV?d00001 diff --git a/res/drawable-xxhdpi/ic_ok.png b/res/drawable-xxhdpi/ic_ok.png new file mode 100644 index 0000000000000000000000000000000000000000..6e03d54cf42955e7a3169bcfbe4649277e729727 GIT binary patch literal 460 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 QDgXcg07*qoM6N<$f&fI*004R> z004l5008;`004mK004C`008P>0026e000+ooVrmw00002VoOIv0RM-N%)bBt010qN zS#tmY3ljhU3ljkVnw%H_00VDHL_t(&-tC&tZxTTi$6=vTY;B;GAN@^1sKG*0@CVS+ z9}x@1b8mVuHZdkW)SI#Cp*OWvPbQ`@(LckhntJeT)Ppe|OyfaM9=!SW!0s@xv%h9{ z*(S2@#_YcNWac|FZ{EWN*YPq}7pM#57?2x&1Q5jprjS4iDI_q32}BWqAMQ>8^&o^4 z@>oJ0S5>TzCFGDq2wr=D1cZ>rqAG-vEh3E&1gn4qM3F;{3x&2C<`C7!Qg0r>463G4 zXj{cOoZYD7C0B+mVmrib{uE9aSS&X zeAQ8$D*D@(eZ*0q2y0_ZI);-}+Ntxl?=~64F^)0BktMp#D<2(R+qTD5OvBFzZ?Y)2 z#+2=^^w}cr40=>zbB)tJZ1JvLL)2_cea2FpV2kf8Hn4*oY#?JKVzf@&VJe!qiO-;) zkGLVfF0p~U76oZ(;&B*n!Fpb|PpHydp2VtYoC;Y#qxcG?=SyoSt1PdOX>rHNc)y3* z^9~+;*Pw*S_~wM@XN&6mCmv!Q>)69D>eo%Z_p+R+t4_m*2S=piHyEO3;E??Oy*Wne zKpvF2fl{K671Hey0xjML@q@H2>%B_zi+e=$uuVF>EA!rL+tz=#Kg}s_>BjYpbh;q( zT_$Y@MzSAqE+9!QL5zteKhG`^pclr{F>@S1dQPz01ZdY75RbUynqIy5K!8?^CanCp zVh|{&>GLVU`P9rC=?@Hs42rv|k(_!$aQ@;lUygB#bK$e>F||)`@h3fJ4Q7Cpa~)rB+5__9RC=g`Vphk$uaoO$Lxbe#Y_vbOlri;6}(-OK#$76H0r zbu}ocB5szL8&<%+XhrMmWs{0PlTH=zGEAJTa}`AaB^gdhZz0N_5~r_C+!gp#-`~eK z(eB$-a}8jPx{C!h-hN3|*>n4fz~cmHLi62@0J$(DrlnlR1;~veO1di19RhN}ry*v^ linu0Pq5IE @@ -63,6 +62,8 @@ android:text="@string/auth_expired_basic_auth_toast" android:visibility="gone" android:layout_marginBottom="10dp" + android:textColor="#AAAAAA" + android:textColorHint="#AAAAAA" android:contentDescription="@string/auth_expired_basic_auth_toast"/> @@ -108,6 +111,8 @@ android:drawableLeft="@android:drawable/stat_notify_sync" android:drawablePadding="5dp" android:gravity="center_vertical" + android:textColor="#AAAAAA" + android:textColorHint="#AAAAAA" android:text="@string/auth_testing_connection" android:contentDescription="@string/auth_testing_connection"/> @@ -119,6 +124,8 @@ android:onClick="onCheckClick" android:text="@string/oauth_check_onoff" android:textAppearance="?android:attr/textAppearanceSmall" + android:textColor="#AAAAAA" + android:textColorHint="#AAAAAA" android:contentDescription="@string/oauth_check_onoff" /> @@ -128,6 +135,8 @@ android:layout_height="wrap_content" android:ems="10" android:enabled="false" + android:textColor="#AAAAAA" + android:textColorHint="#AAAAAA" android:text="@string/oauth2_url_endpoint_auth" android:singleLine="true" android:inputType="textUri" @@ -143,6 +152,8 @@ android:text="@string/oauth2_url_endpoint_access" android:singleLine="true" android:inputType="textUri" + android:textColor="#AAAAAA" + android:textColorHint="#AAAAAA" android:visibility="gone"/> @@ -163,6 +176,8 @@ android:ems="10" android:hint="@string/auth_password" android:inputType="textPassword" + android:textColor="#AAAAAA" + android:textColorHint="#AAAAAA" android:contentDescription="@string/auth_password" /> @@ -175,6 +190,8 @@ android:drawablePadding="5dp" android:gravity="center_vertical" android:text="@string/auth_unauthorized" + android:textColor="#AAAAAA" + android:textColorHint="#AAAAAA" android:contentDescription="@string/auth_unauthorized"/>