Skip to content

Upgraded Gradle Plugin and Fixed Namespace collision with Androis support library #30

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
waleoyediran wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Upgraded Gradle Plugin and Fixed Namespace collision with Androis support library #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4745e61
Bumped Gradle Plugin, support libraries, and google play services ver…
waleoyediran Oct 15, 2016
b640022
Bumped Gradle build plugin
waleoyediran Oct 15, 2016
fcb69d4
prefixed resource attribute namespace issues clashing with Android su…
waleoyediran Oct 15, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions Android/SpikaChatModule/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
}
Expand All @@ -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
Expand Down
10 changes: 5 additions & 5 deletions ...app/src/main/java/com/clover_studio/spikachatmodule/view/roundimage/RoundedImageView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand All @@ -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);
Expand Down
10 changes: 5 additions & 5 deletions Android/SpikaChatModule/app/src/main/res/values/attrs.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
<resources>

<declare-styleable name="RoundedImageView">
<attr name="corner_radius" format="dimension" />
<attr name="border_width" format="dimension" />
<attr name="border_color" format="color" />
<attr name="mutate_background" format="boolean" />
<attr name="oval" format="boolean" />
<attr name="spika_corner_radius" format="dimension" />
<attr name="spika_border_width" format="dimension" />
<attr name="spika_border_color" format="color" />
<attr name="spika_mutate_background" format="boolean" />
<attr name="spika_oval" format="boolean" />
<attr name="android:scaleType" />
</declare-styleable>

Expand Down
2 changes: 1 addition & 1 deletion Android/SpikaChatModule/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down