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

Commit 9284110

Browse files
AndroidDeveloperLBAndroidDeveloperLB
committed
updated versions.
1 parent 1f913fb commit 9284110

File tree

8 files changed

+129
-134
lines changed

8 files changed

+129
-134
lines changed

‎.idea/encodings.xml

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

‎MaterialPreferences.iml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<content url="file://$MODULE_DIR$">
1414
<excludeFolder url="file://$MODULE_DIR$/.gradle" />
1515
</content>
16-
<orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
16+
<orderEntry type="inheritedJdk" />
1717
<orderEntry type="sourceFolder" forTests="false" />
1818
</component>
1919
</module>

‎app/app.iml

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,13 @@
3636
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
3737
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
3838
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
39-
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/debug" type="java-resource" />
39+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
4040
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
4141
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
4242
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
4343
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
4444
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
45-
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/androidTest/debug" type="java-test-resource" />
45+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" />
4646
<sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
4747
<sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
4848
<sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
@@ -71,7 +71,8 @@
7171
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
7272
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
7373
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" />
74-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/22.2.1/jars" />
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" />
7576
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
7677
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jacoco" />
7778
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaResources" />
@@ -87,10 +88,11 @@
8788
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
8889
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
8990
</content>
90-
<orderEntry type="jdk" jdkName="Android API 22 Platform" jdkType="Android SDK" />
91+
<orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />
9192
<orderEntry type="sourceFolder" forTests="false" />
92-
<orderEntry type="library" exported="" name="support-v4-22.2.1" level="project" />
93-
<orderEntry type="library" exported="" name="support-annotations-22.2.1" level="project" />
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" />
9496
<orderEntry type="module" module-name="material_preferences_library" exported="" />
9597
</component>
9698
</module>

‎app/build.gradle

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

33
android {
4-
compileSdkVersion 22
5-
buildToolsVersion "22.0.1"
4+
compileSdkVersion 23
5+
buildToolsVersion "23.0.0"
66

77
defaultConfig {
88
applicationId "com.lb.material_preferences"
99
minSdkVersion 7
10-
targetSdkVersion 22
10+
targetSdkVersion 23
1111
versionCode 1
1212
versionName "1.0"
1313
}
1414
buildTypes {
1515
release {
16-
minifyEnabled false
16+
minifyEnabled true
1717
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
1818
}
1919
}
2020
compileOptions {
2121
sourceCompatibility JavaVersion.VERSION_1_7
2222
targetCompatibility JavaVersion.VERSION_1_7
2323
}
24+
repositories {
25+
jcenter()
26+
maven {
27+
url "https://jitpack.io"
28+
}
29+
}
2430
}
2531

2632
dependencies {
2733
compile fileTree(include: ['*.jar'], dir: 'libs')
28-
compile 'com.android.support:support-v4:22.2.1'
34+
compile 'com.android.support:appcompat-v7:23.0.0'
2935
compile project(':material_preferences_library')
36+
// compile 'com.github.AndroidDeveloperLB:MaterialPreferenceLibrary:4'
37+
3038
}

‎app/src/main/res/xml/settings_example.xml

Lines changed: 89 additions & 89 deletions
Original file line numberDiff line numberDiff line change
@@ -1,104 +1,104 @@
11
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
22
xmlns:app="http://schemas.android.com/apk/res-auto">
3-
<PreferenceCategory android:title="Material Preferences">
4-
<com.lb.material_preferences_library.custom_preferences.Preference
5-
android:summary="just some summary text"
6-
android:title="A simple Preference"/>
3+
<PreferenceCategory android:title="Material Preferences">
4+
<com.lb.material_preferences_library.custom_preferences.Preference
5+
android:summary="just some summary text"
6+
android:title="A simple Preference"/>
77

8-
<!--Note: for icons, you need to use this : app:icon="..." -->
8+
<!--Note: for icons, you need to use this : app:icon="..." , example: app:icon="@android:drawable/sym_def_app_icon" -->
99

10-
<com.lb.material_preferences_library.custom_preferences.ListPreference
11-
android:defaultValue="dark"
12-
android:key="@string/pref_theme"
13-
android:summary="%s"
14-
android:title="Theme"
15-
app:dialogTitle="dialog title"
16-
app:entries="@array/pref_theme_list_entries"
17-
app:entryValues="@array/pref_theme_list_values"/>
10+
<com.lb.material_preferences_library.custom_preferences.ListPreference
11+
android:defaultValue="dark"
12+
android:key="@string/pref_theme"
13+
android:summary="%s"
14+
android:title="Theme"
15+
app:dialogTitle="dialog title"
16+
app:entries="@array/pref_theme_list_entries"
17+
app:entryValues="@array/pref_theme_list_values"/>
1818

19-
<com.lb.material_preferences_library.custom_preferences.EditTextPreference
20-
android:capitalize="words"
21-
android:defaultValue="EditTextPreference default value"
22-
android:inputType="textCapWords"
23-
android:key="custom_example_edittext"
24-
android:maxLines="1"
25-
android:selectAllOnFocus="true"
26-
android:singleLine="true"
27-
android:summary="EditTextPreference summary"
28-
android:title="EditTextPreference title"
29-
app:dialogMessage="editText dialogMessage"
30-
app:negativeButtonText="@android:string/cancel"
31-
app:positiveButtonText="@android:string/ok"/>
19+
<com.lb.material_preferences_library.custom_preferences.EditTextPreference
20+
android:capitalize="words"
21+
android:defaultValue="EditTextPreference default value"
22+
android:inputType="textCapWords"
23+
android:key="custom_example_edittext"
24+
android:maxLines="1"
25+
android:selectAllOnFocus="true"
26+
android:singleLine="true"
27+
android:summary="EditTextPreference summary"
28+
android:title="EditTextPreference title"
29+
app:dialogMessage="editText dialogMessage"
30+
app:negativeButtonText="@android:string/cancel"
31+
app:positiveButtonText="@android:string/ok"/>
3232

33-
<com.lb.material_preferences_library.custom_preferences.NumberEditTextPreference
34-
android:capitalize="words"
35-
android:defaultValue="123"
36-
android:inputType="textCapWords"
37-
android:key="custom_example_numberedittext"
38-
android:maxLines="1"
39-
android:selectAllOnFocus="true"
40-
android:singleLine="true"
41-
android:summary="Like EditTextPreference, but allows only numbers to be used"
42-
android:title="NumberEditTextPreference title"
43-
app:dialogMessage="NumberEditTextPreference dialogMessage"
44-
app:negativeButtonText="@android:string/cancel"
45-
app:positiveButtonText="@android:string/ok"/>
33+
<com.lb.material_preferences_library.custom_preferences.NumberEditTextPreference
34+
android:capitalize="words"
35+
android:defaultValue="123"
36+
android:inputType="textCapWords"
37+
android:key="custom_example_numberedittext"
38+
android:maxLines="1"
39+
android:selectAllOnFocus="true"
40+
android:singleLine="true"
41+
android:summary="Like EditTextPreference, but allows only numbers to be used"
42+
android:title="NumberEditTextPreference title"
43+
app:dialogMessage="NumberEditTextPreference dialogMessage"
44+
app:negativeButtonText="@android:string/cancel"
45+
app:positiveButtonText="@android:string/ok"/>
4646

47-
<!--<com.lb.material_preferences_library.custom_preferences.SwitchPreference-->
48-
<!--android:defaultValue="true"-->
49-
<!--android:key="switchPref"-->
50-
<!--android:title="SwitchPreference title"-->
51-
<!--app:summaryOff="summaryOff"-->
52-
<!--app:summaryOn="summaryOn"/>-->
47+
<!--<com.lb.material_preferences_library.custom_preferences.SwitchPreference-->
48+
<!--android:defaultValue="true"-->
49+
<!--android:key="switchPref"-->
50+
<!--android:title="SwitchPreference title"-->
51+
<!--app:summaryOff="summaryOff"-->
52+
<!--app:summaryOn="summaryOn"/>-->
5353

54-
<com.lb.material_preferences_library.custom_preferences.CheckBoxPreference
55-
android:defaultValue="true"
56-
android:key="checkboxPref"
57-
android:summary="CheckBoxPreference summary"
58-
android:title="CheckBoxPreference title"
59-
/>
60-
</PreferenceCategory>
54+
<com.lb.material_preferences_library.custom_preferences.CheckBoxPreference
55+
android:defaultValue="true"
56+
android:key="checkboxPref"
57+
android:summary="CheckBoxPreference summary"
58+
android:title="CheckBoxPreference title"
59+
/>
60+
</PreferenceCategory>
6161

62-
<PreferenceCategory
63-
android:title="Native Preferences">
64-
<!--<SwitchPreference-->
65-
<!--android:summary="just some summary text"-->
66-
<!--android:title="switch"/>-->
67-
<Preference
68-
android:summary="just some summary text"
69-
android:title="A simple Preference"/>
70-
<CheckBoxPreference
71-
android:defaultValue="true"
72-
android:key="example_checkbox"
73-
android:summary="CheckBoxPreference summary"
74-
android:title="CheckBoxPreference title"/>
62+
<PreferenceCategory
63+
android:title="Native Preferences">
64+
<!--<SwitchPreference-->
65+
<!--android:summary="just some summary text"-->
66+
<!--android:title="switch"/>-->
67+
<Preference
68+
android:summary="just some summary text"
69+
android:title="A simple Preference"/>
70+
<CheckBoxPreference
71+
android:defaultValue="true"
72+
android:key="example_checkbox"
73+
android:summary="CheckBoxPreference summary"
74+
android:title="CheckBoxPreference title"/>
7575

76-
<EditTextPreference
77-
android:capitalize="words"
78-
android:defaultValue="EditTextPreference default value"
79-
android:dialogMessage="editText dialogMessage"
80-
android:inputType="textCapWords"
81-
android:key="custom_example_edittext"
82-
android:maxLines="1"
83-
android:negativeButtonText="@android:string/cancel"
84-
android:positiveButtonText="@android:string/ok"
85-
android:selectAllOnFocus="true"
86-
android:singleLine="true"
87-
android:summary="EditTextPreference summary"
88-
android:title="EditTextPreference title"/>
76+
<EditTextPreference
77+
android:capitalize="words"
78+
android:defaultValue="EditTextPreference default value"
79+
android:dialogMessage="editText dialogMessage"
80+
android:inputType="textCapWords"
81+
android:key="custom_example_edittext"
82+
android:maxLines="1"
83+
android:negativeButtonText="@android:string/cancel"
84+
android:positiveButtonText="@android:string/ok"
85+
android:selectAllOnFocus="true"
86+
android:singleLine="true"
87+
android:summary="EditTextPreference summary"
88+
android:title="EditTextPreference title"/>
8989

90-
<ListPreference
91-
android:defaultValue="item1"
92-
android:dialogTitle="dialog title"
93-
android:entries="@array/pref_example_list_entries"
94-
android:entryValues="@array/pref_example_list_values"
95-
android:key="example_list"
96-
android:negativeButtonText="@null"
97-
android:positiveButtonText="@null"
98-
android:summary="%s"
99-
android:title="ListPreference title"/>
90+
<ListPreference
91+
android:defaultValue="item1"
92+
android:dialogTitle="dialog title"
93+
android:entries="@array/pref_example_list_entries"
94+
android:entryValues="@array/pref_example_list_values"
95+
android:key="example_list"
96+
android:negativeButtonText="@null"
97+
android:positiveButtonText="@null"
98+
android:summary="%s"
99+
android:title="ListPreference title"/>
100100

101-
</PreferenceCategory>
101+
</PreferenceCategory>
102102

103103

104104
</PreferenceScreen>

‎build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ buildscript {
55
jcenter()
66
}
77
dependencies {
8-
classpath 'com.android.tools.build:gradle:1.2.3'
8+
classpath 'com.android.tools.build:gradle:1.3.0'
99
classpath 'com.github.dcendents:android-maven-plugin:1.2'
1010
// NOTE: Do not place your application dependencies here; they belong
1111
// in the individual module build.gradle files

‎material_preferences_library/build.gradle

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,21 @@ apply plugin: 'com.android.library'
22
apply plugin: 'com.github.dcendents.android-maven'
33

44
android {
5-
compileSdkVersion 22
6-
buildToolsVersion "22.0.1"
5+
compileSdkVersion 23
6+
buildToolsVersion "23.0.0"
77

88
defaultConfig {
99
minSdkVersion 7
10-
targetSdkVersion 22
10+
targetSdkVersion 23
1111
versionCode 1
1212
versionName "1.0"
1313
}
14-
buildTypes {
15-
release {
16-
minifyEnabled false
17-
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
18-
}
19-
}
14+
// buildTypes {
15+
// release {
16+
// minifyEnabled true
17+
// proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
18+
// }
19+
// }
2020
compileOptions {
2121
sourceCompatibility JavaVersion.VERSION_1_7
2222
targetCompatibility JavaVersion.VERSION_1_7
@@ -25,5 +25,5 @@ android {
2525

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

0 commit comments

Comments
 (0)