Skip to content

Commit 0a22fea

Browse files
author
Dean Wild
committed
Merge pull request #14 from jeromevdl/master
Disable default clickHandler and small improvements
2 parents 7f6ddd5 + 1a0d353 commit 0a22fea

File tree

10 files changed

+123
-52
lines changed

10 files changed

+123
-52
lines changed

‎FlowTextView.iml‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,15 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
3-
<component name="NewModuleRootManager" inherit-compiler-output="true">
3+
<component name="FacetManager">
4+
<facet type="java-gradle" name="Java-Gradle">
5+
<configuration>
6+
<option name="BUILD_FOLDER_PATH" value="$MODULE_DIR$/build" />
7+
</configuration>
8+
</facet>
9+
</component>
10+
<component name="NewModuleRootManager" inherit-compiler-output="false">
11+
<output url="file://$MODULE_DIR$/build/classes/main" />
12+
<output-test url="file://$MODULE_DIR$/build/classes/test" />
413
<exclude-output />
514
<content url="file://$MODULE_DIR$">
615
<excludeFolder url="file://$MODULE_DIR$/.gradle" />

‎build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ buildscript {
44
mavenCentral()
55
}
66
dependencies {
7-
classpath 'com.android.tools.build:gradle:0.11.+'
7+
classpath 'com.android.tools.build:gradle:1.0.0'
88
}
99
}
1010

‎flowtextview-sample/build.gradle‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
apply plugin: 'android'
1+
apply plugin: 'com.android.application'
22

33
android {
4-
compileSdkVersion 19
5-
buildToolsVersion '19.1.0'
4+
compileSdkVersion 21
5+
buildToolsVersion '21.1.2'
66
defaultConfig {
77
applicationId 'com.dean.flowtextviewsampleapp.sample'
88
minSdkVersion 8
@@ -12,7 +12,7 @@ android {
1212
}
1313
buildTypes {
1414
release {
15-
runProguard false
15+
minifyEnabled false
1616
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
1717
}
1818
}
@@ -22,6 +22,6 @@ android {
2222

2323
dependencies {
2424
compile fileTree(dir: 'libs', include: ['*.jar'])
25-
compile 'com.android.support:appcompat-v7:19.+'
25+
compile 'com.android.support:appcompat-v7:21.0.3'
2626
compile project(':flowtextview')
2727
}

‎flowtextview-sample/flowtextview-sample.iml‎

Lines changed: 31 additions & 9 deletions
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="FlowTextView" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
2+
<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" type="JAVA_MODULE" version="4">
33
<component name="FacetManager">
44
<facet type="android-gradle" name="Android-Gradle">
55
<configuration>
@@ -10,9 +10,10 @@
1010
<configuration>
1111
<option name="SELECTED_BUILD_VARIANT" value="debug" />
1212
<option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
13-
<option name="COMPILE_JAVA_TASK_NAME" value="compileDebugJava" />
13+
<option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
1414
<option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugTest" />
1515
<option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
16+
<option name="TEST_SOURCE_GEN_TASK_NAME" value="generateDebugTestSources" />
1617
<option name="ALLOW_USER_CONFIGURATION" value="false" />
1718
<option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
1819
<option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
@@ -30,39 +31,60 @@
3031
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
3132
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
3233
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
34+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/debug" type="java-resource" />
3335
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/test/debug" isTestSource="true" generated="true" />
3436
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/test/debug" isTestSource="true" generated="true" />
3537
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/test/debug" isTestSource="true" generated="true" />
3638
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/test/debug" isTestSource="true" generated="true" />
3739
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/test/debug" type="java-test-resource" />
40+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/test/debug" type="java-test-resource" />
3841
<sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
3942
<sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
43+
<sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
4044
<sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
41-
<sourceFolder url="file://$MODULE_DIR$/src/debug/assets" isTestSource="false" />
4245
<sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
4346
<sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
4447
<sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
4548
<sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
4649
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
50+
<sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
4751
<sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
48-
<sourceFolder url="file://$MODULE_DIR$/src/main/assets" isTestSource="false" />
4952
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
5053
<sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
5154
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
5255
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
5356
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
57+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
5458
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
55-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" isTestSource="true" />
5659
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
5760
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
5861
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
59-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates" />
62+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
63+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
64+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
65+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/coverage-instrumented-classes" />
66+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
67+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
68+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" />
69+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
70+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jacoco" />
71+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaResources" />
72+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/libs" />
73+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
74+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
75+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/ndk" />
76+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
77+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/proguard" />
78+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
79+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
80+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
6081
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
6182
</content>
62-
<orderEntry type="jdk" jdkName="Android API 19 Platform" jdkType="Android SDK" />
83+
<orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" />
6384
<orderEntry type="sourceFolder" forTests="false" />
64-
<orderEntry type="library" exported="" name="appcompat-v7-19.1.0" level="project" />
65-
<orderEntry type="library" exported="" name="support-v4-19.1.0" level="project" />
85+
<orderEntry type="library" exported="" name="appcompat-v7-21.0.3" level="project" />
86+
<orderEntry type="library" exported="" name="support-annotations-21.0.3" level="project" />
87+
<orderEntry type="library" exported="" name="support-v4-21.0.3" level="project" />
6688
<orderEntry type="module" module-name="flowtextview" exported="" />
6789
</component>
6890
</module>

‎flowtextview/build.gradle‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
apply plugin: 'android-library'
1+
apply plugin: 'com.android.library'
22
apply plugin: 'maven'
33
apply plugin: 'signing'
44

@@ -58,18 +58,17 @@ uploadArchives {
5858
}
5959

6060
android {
61-
compileSdkVersion 16
62-
buildToolsVersion "19.1.0"
61+
compileSdkVersion 21
62+
buildToolsVersion "21.1.2"
6363

6464
defaultConfig {
65-
applicationId "uk.co.deanwild.flowtext"
6665
minSdkVersion 8
6766
targetSdkVersion 15
6867
}
6968

7069
buildTypes {
7170
release {
72-
runProguard false
71+
minifyEnabled false
7372
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
7473
}
7574
}

‎flowtextview/flowtextview.iml‎

Lines changed: 28 additions & 8 deletions
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="uk.co.deanwild" external.system.module.version="2.0.2" type="JAVA_MODULE" version="4">
2+
<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" type="JAVA_MODULE" version="4">
33
<component name="FacetManager">
44
<facet type="android-gradle" name="Android-Gradle">
55
<configuration>
@@ -10,9 +10,10 @@
1010
<configuration>
1111
<option name="SELECTED_BUILD_VARIANT" value="debug" />
1212
<option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
13-
<option name="COMPILE_JAVA_TASK_NAME" value="compileDebugJava" />
13+
<option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
1414
<option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugTest" />
1515
<option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
16+
<option name="TEST_SOURCE_GEN_TASK_NAME" value="generateDebugTestSources" />
1617
<option name="ALLOW_USER_CONFIGURATION" value="false" />
1718
<option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
1819
<option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
@@ -31,38 +32,57 @@
3132
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
3233
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
3334
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
35+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/debug" type="java-resource" />
3436
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/test/debug" isTestSource="true" generated="true" />
3537
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/test/debug" isTestSource="true" generated="true" />
3638
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/test/debug" isTestSource="true" generated="true" />
3739
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/test/debug" isTestSource="true" generated="true" />
3840
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/test/debug" type="java-test-resource" />
41+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/test/debug" type="java-test-resource" />
3942
<sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
4043
<sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
44+
<sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
4145
<sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
42-
<sourceFolder url="file://$MODULE_DIR$/src/debug/assets" isTestSource="false" />
4346
<sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
4447
<sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
4548
<sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
4649
<sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
4750
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
51+
<sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
4852
<sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
49-
<sourceFolder url="file://$MODULE_DIR$/src/main/assets" isTestSource="false" />
5053
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
5154
<sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
5255
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
5356
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
5457
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
58+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
5559
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
56-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" isTestSource="true" />
5760
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
5861
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
5962
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
60-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates" />
63+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
64+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
65+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
66+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/coverage-instrumented-classes" />
67+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
68+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
69+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" />
70+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
71+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jacoco" />
72+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaResources" />
73+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/libs" />
74+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
75+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
76+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/ndk" />
77+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
78+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/proguard" />
79+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
80+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
81+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
6182
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
62-
<excludeFolder url="file://$MODULE_DIR$/build/poms" />
6383
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
6484
</content>
65-
<orderEntry type="jdk" jdkName="Android API 16 Platform" jdkType="Android SDK" />
85+
<orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" />
6686
<orderEntry type="sourceFolder" forTests="false" />
6787
</component>
6888
</module>

0 commit comments

Comments
 (0)