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

Commit 29f5df1

Browse files
AndroidDeveloperLBAndroidDeveloperLB
committed
fixed issue of dialogMessage not used and shown
updated all sdks.
1 parent 8055eef commit 29f5df1

File tree

11 files changed

+209
-229
lines changed

11 files changed

+209
-229
lines changed

‎.idea/gradle.xml‎

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

‎.idea/misc.xml‎

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

‎.idea/runConfigurations.xml‎

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

‎app/app.iml‎

Lines changed: 17 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
<facet type="android" name="Android">
1010
<configuration>
1111
<option name="SELECTED_BUILD_VARIANT" value="debug" />
12-
<option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
1312
<option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
1413
<option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
1514
<afterSyncTasks>
@@ -32,88 +31,87 @@
3231
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
3332
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
3433
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
34+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/debug" isTestSource="false" generated="true" />
3535
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
3636
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
3737
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
3838
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
3939
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
4040
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
41+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
4142
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
4243
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" />
4344
<sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
4445
<sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
4546
<sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
4647
<sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
4748
<sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
48-
<sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
4949
<sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
5050
<sourceFolder url="file://$MODULE_DIR$/src/debug/shaders" isTestSource="false" />
5151
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
5252
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
5353
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
5454
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
5555
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
56-
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/jni" isTestSource="true" />
5756
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
5857
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
5958
<sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
6059
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
6160
<sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
6261
<sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
6362
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
64-
<sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
6563
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
6664
<sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
6765
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
6866
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
6967
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
7068
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
7169
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
72-
<sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
7370
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
7471
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
7572
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
7673
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
7774
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
7875
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
7976
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
80-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
8177
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
8278
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
8379
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
8480
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
85-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
81+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/builds" />
8682
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
87-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
88-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/animated-vector-drawable/23.4.0/jars" />
89-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/23.4.0/jars" />
90-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/23.4.0/jars" />
91-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-vector-drawable/23.4.0/jars" />
9283
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
9384
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-classes" />
9485
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-runtime-classes" />
9586
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
9687
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-verifier" />
88+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-resources" />
9789
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-support" />
9890
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
9991
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
100-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
92+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/reload-dex" />
10193
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
10294
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/restart-dex" />
10395
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
10496
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
97+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/split-apk" />
10598
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
10699
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
107100
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
108101
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
109102
</content>
110-
<orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />
103+
<orderEntry type="jdk" jdkName="Android API 25 Platform" jdkType="Android SDK" />
111104
<orderEntry type="sourceFolder" forTests="false" />
112-
<orderEntry type="library" exported="" name="support-annotations-23.4.0" level="project" />
113-
<orderEntry type="library" exported="" name="animated-vector-drawable-23.4.0" level="project" />
114-
<orderEntry type="library" exported="" name="support-v4-23.4.0" level="project" />
115-
<orderEntry type="library" exported="" name="support-vector-drawable-23.4.0" level="project" />
116-
<orderEntry type="library" exported="" name="appcompat-v7-23.4.0" level="project" />
105+
<orderEntry type="library" exported="" name="support-compat-25.3.0" level="project" />
106+
<orderEntry type="library" exported="" name="support-v4-25.3.0" level="project" />
107+
<orderEntry type="library" exported="" name="support-media-compat-25.3.0" level="project" />
108+
<orderEntry type="library" exported="" name="support-core-ui-25.3.0" level="project" />
109+
<orderEntry type="library" exported="" name="support-core-utils-25.3.0" level="project" />
110+
<orderEntry type="library" exported="" name="appcompat-v7-25.3.0" level="project" />
111+
<orderEntry type="library" exported="" name="support-fragment-25.3.0" level="project" />
112+
<orderEntry type="library" exported="" name="animated-vector-drawable-25.3.0" level="project" />
113+
<orderEntry type="library" exported="" name="support-annotations-25.3.0" level="project" />
114+
<orderEntry type="library" exported="" name="support-vector-drawable-25.3.0" level="project" />
117115
<orderEntry type="module" module-name="material_preferences_library" exported="" />
118116
</component>
119117
</module>

‎app/build.gradle‎

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

33
android {
4-
compileSdkVersion 23
5-
buildToolsVersion "23.0.3"
4+
compileSdkVersion 25
5+
buildToolsVersion '25.0.2'
66

77
defaultConfig {
88
vectorDrawables.useSupportLibrary = true
99
applicationId "com.lb.material_preferences"
10-
minSdkVersion 7
11-
targetSdkVersion 23
10+
minSdkVersion 9
11+
targetSdkVersion 25
1212
versionCode 1
1313
versionName "1.0"
1414
}
@@ -32,7 +32,7 @@ android {
3232

3333
dependencies {
3434
compile fileTree(include: ['*.jar'], dir: 'libs')
35-
compile 'com.android.support:appcompat-v7:23.4.0'
35+
compile 'com.android.support:appcompat-v7:25.3.0'
3636
compile project(':material_preferences_library')
3737
// compile 'com.github.AndroidDeveloperLB:MaterialPreferenceLibrary:7'
3838

‎build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ buildscript {
66
}
77
dependencies {
88
// https://bintray.com/android/android-tools/com.android.tools.build.gradle/view
9-
classpath 'com.android.tools.build:gradle:2.1.2'
9+
classpath 'com.android.tools.build:gradle:2.3.0'
1010
// https://github.com/dcendents/android-maven-gradle-plugin
1111
classpath 'com.github.dcendents:android-maven-gradle-plugin:1.3'
1212
// NOTE: Do not place your application dependencies here; they belong

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Sat Mar 05 10:37:58 IST 2016
1+
#Wed Mar 22 01:53:52 IST 2017
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.10-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip

‎material_preferences_library/build.gradle‎

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

33
android {
4-
compileSdkVersion 23
5-
buildToolsVersion "23.0.3"
4+
compileSdkVersion 25
5+
buildToolsVersion '25.0.2'
66

77
defaultConfig {
88
vectorDrawables.useSupportLibrary = true
9-
minSdkVersion 7
10-
targetSdkVersion 23
9+
minSdkVersion 9
10+
targetSdkVersion 25
1111
versionCode 1
1212
versionName "1.0"
1313
}
@@ -25,5 +25,5 @@ android {
2525

2626
dependencies {
2727
compile fileTree(include: ['*.jar'], dir: 'libs')
28-
compile 'com.android.support:appcompat-v7:23.4.0'
28+
compile 'com.android.support:appcompat-v7:25.3.0'
2929
}

0 commit comments

Comments
 (0)