Skip to content

Commit b9ad1a5

Browse files
authored
Merge pull request #11 from zTrap/v2.1
Fix Javadocs, sources and logs
2 parents b27c180 + cbd2bde commit b9ad1a5

2 files changed

Lines changed: 38 additions & 17 deletions

File tree

library/build.gradle

Lines changed: 24 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,30 @@ android {
2323

2424
dependencies {
2525
compile fileTree(dir: 'libs', include: ['*.jar'])
26-
// androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
27-
// exclude group: 'com.android.support', module: 'support-annotations'
28-
// })
2926
compile 'com.android.support:appcompat-v7:25.1.0'
3027
testCompile 'junit:junit:4.12'
3128
}
29+
30+
// build a jar with source files
31+
task sourcesJar(type: Jar) {
32+
from android.sourceSets.main.java.srcDirs
33+
classifier = 'sources'
34+
}
35+
36+
task javadoc(type: Javadoc) {
37+
failOnError false
38+
source = android.sourceSets.main.java.sourceFiles
39+
classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
40+
classpath += configurations.compile
41+
}
42+
43+
// build a jar with javadoc
44+
task javadocJar(type: Jar, dependsOn: javadoc) {
45+
classifier = 'javadoc'
46+
from javadoc.destinationDir
47+
}
48+
49+
artifacts {
50+
archives sourcesJar
51+
archives javadocJar
52+
}

library/src/main/java/com/mancj/slideup/SlideUp.java

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ public State[] newArray(int size) {
100100
public interface Listener {
101101

102102
/**
103-
* @param percent percents of complete slide <b>(100 = HIDDEN, 0 = SHOWED)</b>
103+
* @param percent percents of complete slide <b color="#FFEE58">(100 = HIDDEN, 0 = SHOWED)</b>
104104
* */
105105
void onSlide(float percent);
106106

@@ -143,7 +143,7 @@ public Builder(@NonNull T sliderView){
143143
/**
144144
* <p>Define a start state on screen</p>
145145
*
146-
* @param startState <b>(default - {@link State#HIDDEN})</b>
146+
* @param startState <b>(default - <b color="#FFEE58">{@link State#HIDDEN}</b>)</b>
147147
* */
148148
public Builder withStartState(@NonNull State startState){
149149
this.startState = startState;
@@ -153,7 +153,7 @@ public Builder withStartState(@NonNull State startState){
153153
/**
154154
* <p>Define a start gravity, <b>this parameter affects the motion vector slider</b></p>
155155
*
156-
* @param gravity <b>(default - {@link android.view.Gravity#BOTTOM})</b>
156+
* @param gravity <b>(default - <b color="#FFEE58">{@link android.view.Gravity#BOTTOM}</b>)</b>
157157
* */
158158
public Builder withStartGravity(@StartVector int gravity){
159159
startGravity = gravity;
@@ -184,7 +184,7 @@ public Builder withListeners(@NonNull Listener... listeners){
184184
/**
185185
* <p>Turning on/off debug logging for all handled events</p>
186186
*
187-
* @param enabled <b>(default - false)</b>
187+
* @param enabled <b>(default - <b color="#FFEE58">false</b>)</b>
188188
* */
189189
public Builder withLoggingEnabled(boolean enabled){
190190
debug = enabled;
@@ -194,7 +194,7 @@ public Builder withLoggingEnabled(boolean enabled){
194194
/**
195195
* <p>Define duration of animation (when you using {@link #hide()} or {@link #show()} methods)</p>
196196
*
197-
* @param duration <b>(default - 300)</b>
197+
* @param duration <b>(default - <b color="#FFEE58">300</b>)</b>
198198
* */
199199
public Builder withAutoSlideDuration(int duration){
200200
autoSlideDuration = duration;
@@ -204,7 +204,7 @@ public Builder withAutoSlideDuration(int duration){
204204
/**
205205
* <p>Define touchable area <b>(in dp)</b> for interaction</p>
206206
*
207-
* @param area <b>(default - 300dp)</b>
207+
* @param area <b>(default - <b color="#FFEE58">300dp</b>)</b>
208208
* */
209209
public Builder withTouchableArea(float area){
210210
touchableArea = area * density;
@@ -214,7 +214,7 @@ public Builder withTouchableArea(float area){
214214
/**
215215
* <p>Turning on/off sliding on touch event</p>
216216
*
217-
* @param enabled <b>(default - true)</b>
217+
* @param enabled <b>(default - <b color="#FFEE58">true</b>)</b>
218218
* */
219219
public Builder withGesturesEnabled(boolean enabled){
220220
gesturesEnabled = enabled;
@@ -223,7 +223,7 @@ public Builder withGesturesEnabled(boolean enabled){
223223

224224
/**
225225
* <p>
226-
* <b>WARNING:</b>
226+
* <b color="#FFEE58">WARNING:</b>
227227
* If you want to restore saved parameters, place this method at the end of builder
228228
* </p>
229229
* @param savedState parameters will be restored from this bundle, if it contains them
@@ -262,7 +262,7 @@ private SlideUp(Builder<T> builder){
262262
density = builder.density;
263263
touchableArea = builder.touchableArea;
264264
autoSlideDuration = builder.autoSlideDuration;
265-
debug = BuildConfig.DEBUG && builder.debug;
265+
debug = builder.debug;
266266
isRTL = builder.isRTL;
267267
gesturesEnabled = builder.gesturesEnabled;
268268
init();
@@ -338,7 +338,7 @@ public T getSliderView() {
338338
/**
339339
* <p>Set duration of animation (when you using {@link #hide()} or {@link #show()} methods)</p>
340340
*
341-
* @param autoSlideDuration <b>(default - 300)</b>
341+
* @param autoSlideDuration <b>(default - <b color="#FFEE58">300</b>)</b>
342342
* */
343343
public void setAutoSlideDuration(int autoSlideDuration) {
344344
this.autoSlideDuration = autoSlideDuration;
@@ -354,7 +354,7 @@ public float getAutoSlideDuration(){
354354
/**
355355
* <p>Set touchable area <b>(in dp)</b> for interaction</p>
356356
*
357-
* @param touchableArea <b>(default - 300dp)</b>
357+
* @param touchableArea <b>(default - <b color="#FFEE58">300dp</b>)</b>
358358
* */
359359
public void setTouchableArea(float touchableArea) {
360360
this.touchableArea = touchableArea * density;
@@ -407,10 +407,10 @@ public void showImmediately() {
407407
/**
408408
* <p>Turning on/off debug logging</p>
409409
*
410-
* @param enabled <b>(default - false)</b>
410+
* @param enabled <b>(default - <b color="#FFEE58">false</b>)</b>
411411
* */
412412
public void setLoggingEnabled(boolean enabled){
413-
debug = BuildConfig.DEBUG && enabled;
413+
debug = enabled;
414414
}
415415

416416
/**
@@ -423,7 +423,7 @@ public boolean isLoggingEnabled(){
423423
/**
424424
* <p>Turning on/off gestures</p>
425425
*
426-
* @param enabled <b>(default - true)</b>
426+
* @param enabled <b>(default - <b color="#FFEE58">true</b>)</b>
427427
* */
428428
public void setGesturesEnabled(boolean enabled) {
429429
this.gesturesEnabled = gesturesEnabled;

0 commit comments

Comments
 (0)