Skip to content

Commit d5ac98f

Browse files
committed
Add module for adapterflowlayout
1 parent fe10ba5 commit d5ac98f

14 files changed

Lines changed: 103 additions & 18 deletions

File tree

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ android:
55
- tools
66

77
# The BuildTools version used by your project
8-
- build-tools-23.0.3
8+
- build-tools-24.0.0
99

1010
# The SDK version used to compile your project
11-
- android-23
11+
- android-24
1212

1313
# Additional components
1414
- extra-android-m2repository

adapterflowlayout/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/build

adapterflowlayout/build.gradle

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
apply plugin: 'com.android.library'
2+
3+
android {
4+
compileSdkVersion 24
5+
buildToolsVersion "24.0.0"
6+
7+
defaultConfig {
8+
minSdkVersion 9
9+
targetSdkVersion 24
10+
versionCode 1
11+
versionName "1.0"
12+
}
13+
buildTypes {
14+
release {
15+
minifyEnabled false
16+
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
17+
}
18+
}
19+
}
20+
21+
dependencies {
22+
compile fileTree(dir: 'libs', include: ['*.jar'])
23+
testCompile 'junit:junit:4.12'
24+
compile 'com.wefika:flowlayout:0.4.1'
25+
provided project(':adapterlayout')
26+
}
27+
28+
apply from: 'https://raw.githubusercontent.com/Commit451/gradle-android-javadocs/1.0.0/gradle-android-javadocs.gradle'
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
# Add project specific ProGuard rules here.
2+
# By default, the flags in this file are appended to flags specified
3+
# in /Users/Jawn/Develop/Android/sdk/tools/proguard/proguard-android.txt
4+
# You can edit the include path and order by changing the proguardFiles
5+
# directive in build.gradle.
6+
#
7+
# For more details, see
8+
# http://developer.android.com/guide/developing/tools/proguard.html
9+
10+
# Add any project specific keep options here:
11+
12+
# If your project uses WebView with JS, uncomment the following
13+
# and specify the fully qualified class name to the JavaScript interface
14+
# class:
15+
#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
16+
# public *;
17+
#}
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
package com.commit451.adapterflowlayout;
2+
3+
import android.app.Application;
4+
import android.test.ApplicationTestCase;
5+
6+
/**
7+
* <a href="http://d.android.com/tools/testing/testing_android.html">Testing Fundamentals</a>
8+
*/
9+
public class ApplicationTest extends ApplicationTestCase<Application> {
10+
public ApplicationTest() {
11+
super(Application.class);
12+
}
13+
}
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
2+
package="com.commit451.adapterflowlayout">
3+
4+
<application />
5+
6+
</manifest>

app/src/main/java/com/commit451/adapterlayout/sample/AdapterFlowLayout.java renamed to adapterflowlayout/src/main/java/com/commit451/adapterflowlayout/AdapterFlowLayout.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.commit451.adapterlayout.sample;
1+
package com.commit451.adapterflowlayout;
22

33
import android.content.Context;
44
import android.support.annotation.Nullable;
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
package com.commit451.adapterflowlayout;
2+
3+
import org.junit.Test;
4+
5+
import static org.junit.Assert.*;
6+
7+
/**
8+
* To work on unit tests, switch the Test Artifact in the Build Variants view.
9+
*/
10+
public class ExampleUnitTest {
11+
@Test
12+
public void addition_isCorrect() throws Exception {
13+
assertEquals(4, 2 + 2);
14+
}
15+
}

adapterlayout/build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
apply plugin: 'com.android.library'
22

33
android {
4-
compileSdkVersion 23
5-
buildToolsVersion "23.0.3"
4+
compileSdkVersion 24
5+
buildToolsVersion "24.0.0"
66

77
defaultConfig {
88
minSdkVersion 7
9-
targetSdkVersion 23
9+
targetSdkVersion 24
1010
versionCode 1
1111
versionName "1.0"
1212
}
@@ -23,7 +23,7 @@ android {
2323

2424
dependencies {
2525
compile fileTree(include: ['*.jar'], dir: 'libs')
26-
compile 'com.android.support:recyclerview-v7:23.4.0'
26+
compile 'com.android.support:recyclerview-v7:24.0.0'
2727
}
2828

2929
apply from: 'https://raw.githubusercontent.com/Commit451/gradle-android-javadocs/1.0.0/gradle-android-javadocs.gradle'

adapterlayout/src/main/java/com/commit451/adapterlayout/AdapterLinearLayout.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import android.annotation.TargetApi;
44
import android.content.Context;
5+
import android.os.Build;
56
import android.support.annotation.Nullable;
67
import android.support.v7.widget.RecyclerView;
78
import android.util.AttributeSet;
@@ -25,11 +26,12 @@ public AdapterLinearLayout(Context context, AttributeSet attrs) {
2526
super(context, attrs);
2627
}
2728

29+
@TargetApi(Build.VERSION_CODES.HONEYCOMB)
2830
public AdapterLinearLayout(Context context, AttributeSet attrs, int defStyleAttr) {
2931
super(context, attrs, defStyleAttr);
3032
}
3133

32-
@TargetApi(21)
34+
@TargetApi(Build.VERSION_CODES.LOLLIPOP)
3335
public AdapterLinearLayout(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
3436
super(context, attrs, defStyleAttr, defStyleRes);
3537
}

0 commit comments

Comments
 (0)