From c09f0a64f897f805b40675be4804e3d8349af28d Mon Sep 17 00:00:00 2001 From: Wei Lun Date: Mon, 31 Jul 2017 19:48:05 +0800 Subject: [PATCH 1/6] edited buildscript --- build.gradle | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 1255b6627..c83ec81fb 100644 --- a/build.gradle +++ b/build.gradle @@ -3,9 +3,15 @@ buildscript { repositories { jcenter() } + android { + lintOptions { + abortOnError false + } + } +} dependencies { - classpath 'com.android.tools.build:gradle:2.3.0' + classpath 'com.android.tools.build:gradle:2.3.3' classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8' classpath 'com.getkeepsafe.dexcount:dexcount-gradle-plugin:0.5.2' classpath 'me.tatarka:gradle-retrolambda:3.2.5' From eb5f99f340e63d019a79d92784947e621ee20109 Mon Sep 17 00:00:00 2001 From: Wei Lun Date: Mon, 31 Jul 2017 19:50:00 +0800 Subject: [PATCH 2/6] edited buildscript --- build.gradle | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/build.gradle b/build.gradle index c83ec81fb..380a09716 100644 --- a/build.gradle +++ b/build.gradle @@ -3,12 +3,7 @@ buildscript { repositories { jcenter() } - android { - lintOptions { - abortOnError false - } - } -} + dependencies { classpath 'com.android.tools.build:gradle:2.3.3' @@ -25,3 +20,9 @@ allprojects { maven { url "https://oss.sonatype.org/content/repositories/snapshots/" } } } + +android { + lintOptions { + abortOnError false + } + } From bef0c27945ae2ebd45affdeb2a096d8e845e7cfc Mon Sep 17 00:00:00 2001 From: Wei Lun Date: Mon, 31 Jul 2017 19:51:41 +0800 Subject: [PATCH 3/6] edited buildscript --- build.gradle | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/build.gradle b/build.gradle index 380a09716..dae974228 100644 --- a/build.gradle +++ b/build.gradle @@ -3,8 +3,11 @@ buildscript { repositories { jcenter() } - - + android { + lintOptions { + abortOnError false + } + } dependencies { classpath 'com.android.tools.build:gradle:2.3.3' classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8' @@ -19,10 +22,4 @@ allprojects { jcenter() maven { url "https://oss.sonatype.org/content/repositories/snapshots/" } } -} - -android { - lintOptions { - abortOnError false - } - } +} \ No newline at end of file From dcb23530d24df73930a61fa5230ef983b68f9c47 Mon Sep 17 00:00:00 2001 From: Wei Lun Date: Mon, 31 Jul 2017 19:53:56 +0800 Subject: [PATCH 4/6] removed android{} from buildscripp --- build.gradle | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index dae974228..a09337fce 100644 --- a/build.gradle +++ b/build.gradle @@ -3,11 +3,7 @@ buildscript { repositories { jcenter() } - android { - lintOptions { - abortOnError false - } - } + dependencies { classpath 'com.android.tools.build:gradle:2.3.3' classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8' From 2c33fc5544e489e70f14404ece1ccab8c56cea0a Mon Sep 17 00:00:00 2001 From: Wei Lun Date: Tue, 1 Aug 2017 10:24:23 +0800 Subject: [PATCH 5/6] edited build.gradle file --- app/build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/app/build.gradle b/app/build.gradle index 8c816c10e..2d9008817 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -31,6 +31,7 @@ android { lintOptions { checkReleaseBuilds false + abortOnError false } compileOptions { From ac287b8f53bc541bb0af456c475eb09a7d34eb80 Mon Sep 17 00:00:00 2001 From: Wei Lun Date: Tue, 1 Aug 2017 11:40:28 +0800 Subject: [PATCH 6/6] Fixed error for textsize Using dp instead of sp for text sizes --- app/src/main/res/values/pickers.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/src/main/res/values/pickers.xml b/app/src/main/res/values/pickers.xml index c83a58066..c396c2747 100644 --- a/app/src/main/res/values/pickers.xml +++ b/app/src/main/res/values/pickers.xml @@ -55,14 +55,14 @@ 10sp 16dp 45dp - 30dp - 75dp - 30dp - 14dp + 30sp + 75sp + 30sp + 14sp 16sp 16sp 64dp - 22dp + 22sp Color %1$d Color %1$d selected