From 7726472a02be0da4843b017ee54895c79fdb53ea Mon Sep 17 00:00:00 2001 From: Alex Baker Date: Sun, 31 May 2015 23:58:13 -0500 Subject: [PATCH] Use FAB from support design library --- .gitignore | 1 + build.gradle | 7 ++----- .../res/drawable-hdpi/ic_action_add_black.png | Bin 0 -> 256 bytes .../res/drawable-xhdpi/ic_action_add_black.png | Bin 0 -> 320 bytes .../res/drawable-xxhdpi/ic_action_add_black.png | Bin 0 -> 405 bytes src/main/res/drawable/ic_action_add_black.png | Bin 0 -> 222 bytes src/main/res/layout/task_list_activity.xml | 8 ++------ src/main/res/values/attrs.xml | 4 +--- src/main/res/values/styles.xml | 15 +++++---------- 9 files changed, 11 insertions(+), 24 deletions(-) create mode 100644 src/main/res/drawable-hdpi/ic_action_add_black.png create mode 100644 src/main/res/drawable-xhdpi/ic_action_add_black.png create mode 100644 src/main/res/drawable-xxhdpi/ic_action_add_black.png create mode 100644 src/main/res/drawable/ic_action_add_black.png diff --git a/.gitignore b/.gitignore index 18f8b46f9..9a8c7a8bc 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ build/ *.apk local.properties +Thumbs.db \ No newline at end of file diff --git a/build.gradle b/build.gradle index d2dffa0cd..52a7eec70 100644 --- a/build.gradle +++ b/build.gradle @@ -88,8 +88,7 @@ dependencies { compile group: 'com.jakewharton', name: 'butterknife', version: '6.0.0' - compile group: 'com.android.support', name: 'support-v4', version: '22.1.1' - compile group: 'com.android.support', name: 'appcompat-v7', version: '22.1.1' + compile group: 'com.android.support', name: 'design', version: '22.2.0' compile group: 'org.slf4j', name: 'slf4j-api', version: '1.7.7' compile group: 'joda-time', name: 'joda-time', version: '2.6', transitive: false @@ -97,13 +96,11 @@ dependencies { compile group: 'com.rubiconproject.oss', name: 'jchronic', version: '0.2.6', transitive: false compile group: 'org.scala-saddle', name: 'google-rfc-2445', version: '20110304', transitive: false - compile group: 'net.i2p.android.ext', name: 'floatingactionbutton', version: '1.8.0' - compile (group: 'com.github.flavienlaurent.datetimepicker', name: 'library', version: '0.0.2') { exclude group: 'com.android.support', module: 'support-v4' } - googleplayCompile group: 'com.google.android.gms', name: 'play-services-location', version: '7.3.0' + googleplayCompile group: 'com.google.android.gms', name: 'play-services-location', version: '7.5.0' compile(group: 'com.google.apis', name: 'google-api-services-tasks', version: 'v1-rev33-1.18.0-rc') { exclude group: 'org.apache.httpcomponents', module: 'httpclient' diff --git a/src/main/res/drawable-hdpi/ic_action_add_black.png b/src/main/res/drawable-hdpi/ic_action_add_black.png new file mode 100644 index 0000000000000000000000000000000000000000..4858aa1b689d54c3136e942b82dc5790e5288bb8 GIT binary patch literal 256 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpTCmSQK*5Dp-y;YjHK@;M7UB8!3Q zuY)k7lg8`{prB-lYeY$Kep*R+Vo@qXd3m{BW?pu2a$-TMUVc&f>~}U&Kt;8lE{-7? zjc;!_ay1z6umh_*C_vkXzU^}bC1 hC~VLG;>=>)B7HeqB3Q@V-xlZ)22WQ%mvv4FO#tm-SQ-ET literal 0 HcmV?d00001 diff --git a/src/main/res/drawable-xhdpi/ic_action_add_black.png b/src/main/res/drawable-xhdpi/ic_action_add_black.png new file mode 100644 index 0000000000000000000000000000000000000000..e79c6a44eb8851d7f67a7d239f7705474c802734 GIT binary patch literal 320 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=EX7WqAsj$Z!;#Vf2?p zUk71ECym(^Ktah8*NBqf{Irtt#G+J&^73-M%)IR4g>!G-y-v9oOtY9W7|*)P+8EoPzi?OfVc{PZG)Z5^Ee*>UAbMx+-hcS|_dUTfF5D+boFyt=akR{0O00rQ~&?~ literal 0 HcmV?d00001 diff --git a/src/main/res/drawable-xxhdpi/ic_action_add_black.png b/src/main/res/drawable-xxhdpi/ic_action_add_black.png new file mode 100644 index 0000000000000000000000000000000000000000..ab71d49cc8ed7845f3d41333b84be1d9b81bc32c GIT binary patch literal 405 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7OGoEX7WqAsj$Z!;#Vf2?p zUk71ECym(^Ktah8*NBqf{Irtt#G+J&^73-M%)IR4Bauk%M3LSiWWD|<>1s2vHTz2b2W%EXfuQ{tYL^? z+`yE;dH{#Ow+qZQNo&7;nv{@s?dIm1)x5YA;xcOM~}U&Kt<7>E{-7) zt#7Xyaxo|hI0rud`+iRDwW6&vT37tpqGZRsc+=fUFE3tZWU!D^I629yxTcJmfgy(R z!W-*#=YDkL)~<{ISK&N&v%iY{4W?E!)|2a^Y!PC{x JWt~$(69CrFOsoI^ literal 0 HcmV?d00001 diff --git a/src/main/res/layout/task_list_activity.xml b/src/main/res/layout/task_list_activity.xml index 44cca73d8..4792c9c13 100644 --- a/src/main/res/layout/task_list_activity.xml +++ b/src/main/res/layout/task_list_activity.xml @@ -4,7 +4,6 @@ ** See the file "LICENSE" for the full license governing this code. --> - diff --git a/src/main/res/values/attrs.xml b/src/main/res/values/attrs.xml index d1ba0055f..26fa74ac0 100644 --- a/src/main/res/values/attrs.xml +++ b/src/main/res/values/attrs.xml @@ -48,9 +48,7 @@ - - - + diff --git a/src/main/res/values/styles.xml b/src/main/res/values/styles.xml index 37f0f3c7b..69c309a2f 100644 --- a/src/main/res/values/styles.xml +++ b/src/main/res/values/styles.xml @@ -8,7 +8,7 @@ -