Skip to content
This repository was archived by the owner on May 1, 2021. It is now read-only.

Commit a7d4759

Browse files
AndroidDeveloperLBAndroidDeveloperLB
committed
fixed duplicate ripple effect on Android 6 and above.
updated versions of all stuff...
1 parent a3ef8e8 commit a7d4759

20 files changed

+168
-150
lines changed

‎.idea/.name

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/gradle.xml

Lines changed: 7 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/misc.xml

Lines changed: 6 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/modules.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎MaterialPreferenceLibrary.iml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<module external.linked.project.id="MaterialPreferenceLibrary" 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="FacetManager">
4+
<facet type="java-gradle" name="Java-Gradle">
5+
<configuration>
6+
<option name="BUILD_FOLDER_PATH" value="$MODULE_DIR$/build" />
7+
<option name="BUILDABLE" value="false" />
8+
</configuration>
9+
</facet>
10+
</component>
11+
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="true">
12+
<exclude-output />
13+
<content url="file://$MODULE_DIR$">
14+
<excludeFolder url="file://$MODULE_DIR$/.gradle" />
15+
</content>
16+
<orderEntry type="inheritedJdk" />
17+
<orderEntry type="sourceFolder" forTests="false" />
18+
</component>
19+
</module>

‎README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ In addition to all of those, I've disabled the truncating of the text of all the
2020

2121
Import
2222
======
23-
Via gradle (as shown here: https://jitpack.io/#AndroidDeveloperLB/MaterialPreferenceLibrary/5 ) :
23+
Via gradle (as shown here: https://jitpack.io/#AndroidDeveloperLB/MaterialPreferenceLibrary/7 ) :
2424

2525
allprojects {
2626
repositories {
@@ -32,7 +32,7 @@ Via gradle (as shown here: https://jitpack.io/#AndroidDeveloperLB/MaterialPrefer
3232
}
3333

3434
dependencies {
35-
compile 'com.github.AndroidDeveloperLB:MaterialPreferenceLibrary:5'
35+
compile 'com.github.AndroidDeveloperLB:MaterialPreferenceLibrary:7'
3636
}
3737

3838
Sample

‎app/app.iml

Lines changed: 32 additions & 18 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.id=":app" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="MaterialPreferences" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
2+
<module external.linked.project.id=":app" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="MaterialPreferenceLibrary" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
33
<component name="FacetManager">
44
<facet type="android-gradle" name="Android-Gradle">
55
<configuration>
@@ -12,10 +12,7 @@
1212
<option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
1313
<option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
1414
<option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
15-
<option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugAndroidTest" />
16-
<option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileDebugAndroidTestSources" />
1715
<afterSyncTasks>
18-
<task>generateDebugAndroidTestSources</task>
1916
<task>generateDebugSources</task>
2017
</afterSyncTasks>
2118
<option name="ALLOW_USER_CONFIGURATION" value="false" />
@@ -28,7 +25,7 @@
2825
</component>
2926
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
3027
<output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
31-
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/androidTest/debug" />
28+
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
3229
<exclude-output />
3330
<content url="file://$MODULE_DIR$">
3431
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
@@ -50,6 +47,13 @@
5047
<sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
5148
<sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
5249
<sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
50+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
51+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
52+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
53+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
54+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
55+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/jni" isTestSource="true" />
56+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
5357
<sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
5458
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
5559
<sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
@@ -64,35 +68,45 @@
6468
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
6569
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
6670
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
71+
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
72+
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
73+
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
74+
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
75+
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
76+
<sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
77+
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
6778
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
79+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
6880
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
6981
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
70-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/coverage-instrumented-classes" />
82+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/debug" />
7183
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
7284
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
73-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" />
74-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/23.0.0/jars" />
75-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/23.0.0/jars" />
85+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/animated-vector-drawable/23.2.0/jars" />
86+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/23.2.0/jars" />
87+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/23.2.0/jars" />
88+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-vector-drawable/23.2.0/jars" />
7689
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
77-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jacoco" />
78-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaResources" />
79-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/libs" />
80-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
90+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-support" />
91+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
8192
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
82-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/ndk" />
93+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/mockable-android-23.jar" />
8394
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
84-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/proguard" />
8595
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
8696
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
8797
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
98+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/tmp" />
99+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
88100
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
89101
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
90102
</content>
91103
<orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />
92104
<orderEntry type="sourceFolder" forTests="false" />
93-
<orderEntry type="library" exported="" name="appcompat-v7-23.0.0" level="project" />
94-
<orderEntry type="library" exported="" name="support-v4-23.0.0" level="project" />
95-
<orderEntry type="library" exported="" name="support-annotations-23.0.0" level="project" />
105+
<orderEntry type="library" exported="" name="support-v4-23.2.0" level="project" />
106+
<orderEntry type="library" exported="" name="support-annotations-23.2.0" level="project" />
107+
<orderEntry type="library" exported="" name="appcompat-v7-23.2.0" level="project" />
108+
<orderEntry type="library" exported="" name="animated-vector-drawable-23.2.0" level="project" />
109+
<orderEntry type="library" exported="" name="support-vector-drawable-23.2.0" level="project" />
96110
<orderEntry type="module" module-name="material_preferences_library" exported="" />
97111
</component>
98112
</module>

‎app/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
22

33
android {
44
compileSdkVersion 23
5-
buildToolsVersion "23.0.0"
5+
buildToolsVersion "23.0.2"
66

77
defaultConfig {
88
applicationId "com.lb.material_preferences"
@@ -31,8 +31,8 @@ android {
3131

3232
dependencies {
3333
compile fileTree(include: ['*.jar'], dir: 'libs')
34-
compile 'com.android.support:appcompat-v7:23.0.0'
34+
compile 'com.android.support:appcompat-v7:23.2.0'
3535
compile project(':material_preferences_library')
36-
// compile 'com.github.AndroidDeveloperLB:MaterialPreferenceLibrary:4'
36+
// compile 'com.github.AndroidDeveloperLB:MaterialPreferenceLibrary:7'
3737

3838
}

‎build.gradle

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@ buildscript {
55
jcenter()
66
}
77
dependencies {
8-
classpath 'com.android.tools.build:gradle:1.3.0'
8+
// https://bintray.com/android/android-tools/com.android.tools.build.gradle/view
9+
classpath 'com.android.tools.build:gradle:2.0.0-beta6'
10+
// https://github.com/dcendents/android-maven-gradle-plugin
911
classpath 'com.github.dcendents:android-maven-plugin:1.2'
1012
// NOTE: Do not place your application dependencies here; they belong
1113
// in the individual module build.gradle files

‎gradle/wrapper/gradle-wrapper.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Wed Apr 10 15:27:10 PDT 2013
1+
#Sat Mar 05 10:37:58 IST 2016
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip

0 commit comments

Comments
 (0)