From f6418e79798525d805223e72733bfd46b929cf53 Mon Sep 17 00:00:00 2001 From: YEP Date: Thu, 5 Nov 2015 14:18:04 +0200 Subject: [PATCH 1/3] fixed default child design position --- .../myapplication/AvatarImageBehavior.java | 29 +++++++++---------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/app/src/main/java/saulmm/myapplication/AvatarImageBehavior.java b/app/src/main/java/saulmm/myapplication/AvatarImageBehavior.java index bea21a3..0089597 100644 --- a/app/src/main/java/saulmm/myapplication/AvatarImageBehavior.java +++ b/app/src/main/java/saulmm/myapplication/AvatarImageBehavior.java @@ -11,8 +11,8 @@ @SuppressWarnings("unused") public class AvatarImageBehavior extends CoordinatorLayout.Behavior { - private final static float MIN_AVATAR_PERCENTAGE_SIZE = 0.3f; - private final static int EXTRA_FINAL_AVATAR_PADDING = 80; + private final static float MIN_AVATAR_PERCENTAGE_SIZE = 0.3f; + private final static int EXTRA_FINAL_AVATAR_PADDING = 80; private final static String TAG = "behavior"; private final Context mContext; @@ -22,13 +22,17 @@ public class AvatarImageBehavior extends CoordinatorLayout.Behavior Date: Thu, 5 Nov 2015 14:21:32 +0200 Subject: [PATCH 2/3] fixed default child design position --- app/src/main/java/saulmm/myapplication/AvatarImageBehavior.java | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/java/saulmm/myapplication/AvatarImageBehavior.java b/app/src/main/java/saulmm/myapplication/AvatarImageBehavior.java index 0089597..933b751 100644 --- a/app/src/main/java/saulmm/myapplication/AvatarImageBehavior.java +++ b/app/src/main/java/saulmm/myapplication/AvatarImageBehavior.java @@ -27,6 +27,7 @@ public class AvatarImageBehavior extends CoordinatorLayout.Behavior Date: Fri, 16 Sep 2016 10:19:46 +0300 Subject: [PATCH 3/3] Updated gradle plugin --- build.gradle | 2 +- gradle.properties | 19 ++++++++++--------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/build.gradle b/build.gradle index d743c29..0777e85 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:1.2.3' + classpath 'com.android.tools.build:gradle:2.1.3' } diff --git a/gradle.properties b/gradle.properties index 1d3591c..1b01be7 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,18 +1,19 @@ -# Project-wide Gradle settings. - -# IDE (e.g. Android Studio) users: -# Gradle settings configured through the IDE *will override* -# any settings specified in this file. - +## Project-wide Gradle settings. +# # For more details on how to configure your build environment visit # http://www.gradle.org/docs/current/userguide/build_environment.html - +# # Specifies the JVM arguments used for the daemon process. # The setting is particularly useful for tweaking memory settings. # Default value: -Xmx10248m -XX:MaxPermSize=256m # org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 - +# # When configured, Gradle will run in incubating parallel mode. # This option should only be used with decoupled projects. More details, visit # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects -# org.gradle.parallel=true \ No newline at end of file +# org.gradle.parallel=true +#Fri Sep 16 10:05:41 EEST 2016 +systemProp.https.proxyPort=3128 +systemProp.http.proxyHost=10.0.0.78 +systemProp.https.proxyHost=10.0.0.78 +systemProp.http.proxyPort=3128