From 4745e6199df99bb7b468777386be53b0e2b9ab6b Mon Sep 17 00:00:00 2001 From: Oyewale Oyediran Date: Sat, 15 Oct 2016 15:36:53 +0100 Subject: [PATCH 1/3] Bumped Gradle Plugin, support libraries, and google play services version --- Android/SpikaChatModule/app/build.gradle | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/Android/SpikaChatModule/app/build.gradle b/Android/SpikaChatModule/app/build.gradle index 0972250..3abe07e 100644 --- a/Android/SpikaChatModule/app/build.gradle +++ b/Android/SpikaChatModule/app/build.gradle @@ -1,12 +1,12 @@ apply plugin: 'com.android.library' android { - compileSdkVersion 23 - buildToolsVersion "23.0.2" + compileSdkVersion 24 + buildToolsVersion "23.0.3" defaultConfig { minSdkVersion 14 - targetSdkVersion 23 + targetSdkVersion 24 versionCode 1 versionName "1.0" } @@ -30,18 +30,18 @@ android { dependencies { compile fileTree(dir: 'libs', include: ['*.jar']) - compile 'com.android.support:appcompat-v7:23.1.1' - compile 'com.android.support:recyclerview-v7:23.1.1' + compile 'com.android.support:appcompat-v7:24.2.1' + compile 'com.android.support:recyclerview-v7:24.2.1' compile 'com.balysv.materialmenu:material-menu:1.5.4' compile 'de.greenrobot:greendao:1.3.7' compile ('com.github.nkzawa:socket.io-client:0.6.0'){ exclude group: 'org.json', module: 'json' } - compile 'com.android.support:design:23.1.1' - compile 'com.android.support:cardview-v7:23.1.1' - compile 'com.google.android.gms:play-services-maps:8.3.0' + compile 'com.android.support:design:24.2.1' + compile 'com.android.support:cardview-v7:24.2.1' + compile 'com.google.android.gms:play-services-maps:9.4.0' compile 'com.googlecode.ez-vcard:ez-vcard:0.9.6' - compile 'com.google.android.gms:play-services-appindexing:8.3.0' + compile 'com.google.android.gms:play-services-appindexing:9.4.0' compile 'com.commit451:PhotoView:1.2.4' //RETROFIT From b6400229685819f8a6c41122eeb4057137b5aa02 Mon Sep 17 00:00:00 2001 From: Oyewale Oyediran Date: Sat, 15 Oct 2016 15:40:58 +0100 Subject: [PATCH 2/3] Bumped Gradle build plugin --- Android/SpikaChatModule/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Android/SpikaChatModule/build.gradle b/Android/SpikaChatModule/build.gradle index 1b7886d..573f4fd 100644 --- a/Android/SpikaChatModule/build.gradle +++ b/Android/SpikaChatModule/build.gradle @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:1.3.0' + classpath 'com.android.tools.build:gradle:2.2.1' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files From fcb69d4e6e1ac6f33c420cdfb1d9baee988dd7cf Mon Sep 17 00:00:00 2001 From: Oyewale Oyediran Date: Sat, 15 Oct 2016 16:47:16 +0100 Subject: [PATCH 3/3] prefixed resource attribute namespace issues clashing with Android support library --- .../view/roundimage/RoundedImageView.java | 10 +++++----- .../SpikaChatModule/app/src/main/res/values/attrs.xml | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Android/SpikaChatModule/app/src/main/java/com/clover_studio/spikachatmodule/view/roundimage/RoundedImageView.java b/Android/SpikaChatModule/app/src/main/java/com/clover_studio/spikachatmodule/view/roundimage/RoundedImageView.java index aaf1361..be942e5 100644 --- a/Android/SpikaChatModule/app/src/main/java/com/clover_studio/spikachatmodule/view/roundimage/RoundedImageView.java +++ b/Android/SpikaChatModule/app/src/main/java/com/clover_studio/spikachatmodule/view/roundimage/RoundedImageView.java @@ -56,8 +56,8 @@ public RoundedImageView(Context context, AttributeSet attrs, int defStyle) { setScaleType(ScaleType.FIT_CENTER); } - cornerRadius = a.getDimensionPixelSize(R.styleable.RoundedImageView_corner_radius, -1); - borderWidth = a.getDimensionPixelSize(R.styleable.RoundedImageView_border_width, -1); + cornerRadius = a.getDimensionPixelSize(R.styleable.RoundedImageView_spika_corner_radius, -1); + borderWidth = a.getDimensionPixelSize(R.styleable.RoundedImageView_spika_border_width, -1); // don't allow negative values for radius and border if (cornerRadius < 0) { @@ -67,13 +67,13 @@ public RoundedImageView(Context context, AttributeSet attrs, int defStyle) { borderWidth = DEFAULT_BORDER_WIDTH; } - borderColor = a.getColorStateList(R.styleable.RoundedImageView_border_color); + borderColor = a.getColorStateList(R.styleable.RoundedImageView_spika_border_color); if (borderColor == null) { borderColor = ColorStateList.valueOf(RoundedDrawable.DEFAULT_BORDER_COLOR); } - mutateBackground = a.getBoolean(R.styleable.RoundedImageView_mutate_background, false); - isOval = a.getBoolean(R.styleable.RoundedImageView_oval, false); + mutateBackground = a.getBoolean(R.styleable.RoundedImageView_spika_mutate_background, false); + isOval = a.getBoolean(R.styleable.RoundedImageView_spika_oval, false); updateDrawableAttrs(); updateBackgroundDrawableAttrs(true); diff --git a/Android/SpikaChatModule/app/src/main/res/values/attrs.xml b/Android/SpikaChatModule/app/src/main/res/values/attrs.xml index c305778..ea1e123 100644 --- a/Android/SpikaChatModule/app/src/main/res/values/attrs.xml +++ b/Android/SpikaChatModule/app/src/main/res/values/attrs.xml @@ -2,11 +2,11 @@ - - - - - + + + + +