Skip to content

Commit f62836d

Browse files
committed
Update 1.1.1
1 parent 861bca3 commit f62836d

4 files changed

Lines changed: 17 additions & 5 deletions

File tree

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,14 @@ Or use Gradle jCenter:
2525

2626
Or Gradle Maven Central:
2727

28-
compile 'com.github.gigamole.slideimageview:library:1.1.0'
28+
compile 'com.github.gigamole.slideimageview:library:1.1.1'
2929

3030
Or Maven:
3131

3232
<dependency>
3333
<groupId>com.github.gigamole.slideimageview</groupId>
3434
<artifactId>library</artifactId>
35-
<version>1.1.0</version>
35+
<version>1.1.1</version>
3636
<type>aar</type>
3737
</dependency>
3838

library/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apply plugin: 'com.android.library'
22
apply plugin: 'com.github.dcendents.android-maven'
33
apply plugin: "com.jfrog.bintray"
44

5-
version = "1.1.0"
5+
version = "1.1.1"
66

77
android {
88
compileSdkVersion 21
@@ -12,7 +12,7 @@ android {
1212
minSdkVersion 10
1313
targetSdkVersion 21
1414
versionCode 1
15-
versionName "1.1.0"
15+
versionName "1.1.1"
1616
}
1717
buildTypes {
1818
release {

library/library.iml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="com.github.gigamole.slideimageview" external.system.module.version="1.1.0" type="JAVA_MODULE" version="4">
2+
<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="com.github.gigamole.slideimageview" external.system.module.version="1.1.1" type="JAVA_MODULE" version="4">
33
<component name="FacetManager">
44
<facet type="android-gradle" name="Android-Gradle">
55
<configuration>
@@ -62,6 +62,7 @@
6262
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
6363
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
6464
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
65+
<excludeFolder url="file://$MODULE_DIR$/build/docs" />
6566
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
6667
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
6768
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
@@ -81,7 +82,9 @@
8182
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
8283
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
8384
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
85+
<excludeFolder url="file://$MODULE_DIR$/build/libs" />
8486
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
87+
<excludeFolder url="file://$MODULE_DIR$/build/poms" />
8588
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
8689
</content>
8790
<orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" />

library/src/main/java/com/gigamole/slideimageview/lib/SlideImageView.java

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import android.graphics.Bitmap;
2323
import android.graphics.Canvas;
2424
import android.graphics.drawable.BitmapDrawable;
25+
import android.graphics.drawable.Drawable;
2526
import android.util.AttributeSet;
2627
import android.widget.ImageView;
2728

@@ -108,6 +109,14 @@ private void setAxis(int axis) {
108109
}
109110
}
110111

112+
public void setSource(Drawable source) {
113+
this.bitmap = ((BitmapDrawable) source).getBitmap();
114+
}
115+
116+
public void setSource(Bitmap source) {
117+
this.bitmap = source;
118+
}
119+
111120
public void setSource(int sourceId) {
112121
this.bitmap = ((BitmapDrawable) getResources().getDrawable(sourceId)).getBitmap();
113122
}

0 commit comments

Comments
 (0)