From 0328ebc25cb57d91281a9adde2a0c6aec022a2e3 Mon Sep 17 00:00:00 2001 From: "ali.hn" Date: Tue, 5 Jun 2018 21:35:44 +0430 Subject: [PATCH] fix some issues --- app/build.gradle | 2 +- autoimageslider/build.gradle | 20 ++++++++++++++----- .../com/autoimageslider/SliderView.java | 9 +++++++++ .../src/main/res/layout/slider_layout.xml | 1 + gradle/wrapper/gradle-wrapper.properties | 2 +- 5 files changed, 27 insertions(+), 7 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index c391ba3..1eb3bc2 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -4,7 +4,7 @@ android { compileSdkVersion 27 defaultConfig { applicationId "imageslider.smarteist.com.imgeslider" - minSdkVersion 17 + minSdkVersion 15 targetSdkVersion 27 versionCode 1 versionName "1.0" diff --git a/autoimageslider/build.gradle b/autoimageslider/build.gradle index 4db2806..279f71d 100644 --- a/autoimageslider/build.gradle +++ b/autoimageslider/build.gradle @@ -1,5 +1,16 @@ apply plugin: 'com.android.library' +buildscript { + repositories { + google() + jcenter() + mavenCentral() + } + dependencies { + classpath 'com.android.tools.build:gradle:3.1.2' + } +} + ext { //For bintray and jcenter distribution @@ -32,10 +43,10 @@ android { compileSdkVersion 27 defaultConfig { - minSdkVersion 17 + minSdkVersion 15 targetSdkVersion 27 - versionCode 1 - versionName "1.0" + versionCode 2 + versionName "1.2" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" @@ -52,15 +63,14 @@ android { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) - //noinspection GradleCompatible implementation 'com.android.support:appcompat-v7:27.1.1' testImplementation 'junit:junit:4.12' androidTestImplementation 'com.android.support.test:runner:1.0.2' androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2' - implementation 'com.romandanylyk:pageindicatorview:1.0.0' implementation 'com.github.bumptech.glide:glide:4.7.1' annotationProcessor 'com.github.bumptech.glide:compiler:4.7.1' + implementation 'com.romandanylyk:pageindicatorview:1.0.1' } diff --git a/autoimageslider/src/main/java/imageslider/smarteist/com/autoimageslider/SliderView.java b/autoimageslider/src/main/java/imageslider/smarteist/com/autoimageslider/SliderView.java index 0c1364b..b0b8944 100644 --- a/autoimageslider/src/main/java/imageslider/smarteist/com/autoimageslider/SliderView.java +++ b/autoimageslider/src/main/java/imageslider/smarteist/com/autoimageslider/SliderView.java @@ -29,6 +29,7 @@ public class SliderView { private String description; private int descriptionTextColor = Color.WHITE; + private float descriptionTextSize = 1; @DrawableRes private int imageRes = 0; @@ -56,6 +57,11 @@ public SliderView setDescriptionTextColor (int descriptionTextColor) { return this; } + public SliderView setDescriptionTextSize (float descriptionTextSize) { + this.descriptionTextSize = descriptionTextSize; + return this; + } + public int getImageRes() { return imageRes; } @@ -118,6 +124,9 @@ public View getView() { ImageView autoSliderImage = v.findViewById(R.id.iv_auto_image_slider); TextView tv_description = v.findViewById(R.id.tv_auto_image_slider); tv_description.getBackground(); + if (descriptionTextSize != 1) { + tv_description.setTextSize(descriptionTextSize); + } tv_description.setTextColor(descriptionTextColor); tv_description.setText(getDescription()); bindData(v, autoSliderImage); diff --git a/autoimageslider/src/main/res/layout/slider_layout.xml b/autoimageslider/src/main/res/layout/slider_layout.xml index c74af81..73a9a65 100644 --- a/autoimageslider/src/main/res/layout/slider_layout.xml +++ b/autoimageslider/src/main/res/layout/slider_layout.xml @@ -15,4 +15,5 @@ android:layout_height="25dp" android:layout_gravity="bottom|center" android:gravity="center" /> + \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index d021462..fef039e 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,4 +1,4 @@ -#Wed Apr 18 21:45:35 IRDT 2018 +#Tue Jun 05 21:06:03 IRDT 2018 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME