Skip to content

Commit ba6d45b

Browse files
attenzioneattenzione
committed
Merge pull request #34 from JoseGD/sample-separated
Sample project moved to a separate directory
2 parents 8e0e4fc + 778a4e2 commit ba6d45b

File tree

14 files changed

+160
-28
lines changed

14 files changed

+160
-28
lines changed

‎ColorPickerPreference/ColorPickerPreference.iml‎

Lines changed: 91 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,91 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/../../MonthCalendarWidget" external.system.id="GRADLE" external.system.module.group="MonthCalendarWidget....android-ColorPickerPreference" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
3+
<component name="FacetManager">
4+
<facet type="android-gradle" name="Android-Gradle">
5+
<configuration>
6+
<option name="GRADLE_PROJECT_PATH" value=":..:android-ColorPickerPreference:ColorPickerPreference" />
7+
</configuration>
8+
</facet>
9+
<facet type="android" name="Android">
10+
<configuration>
11+
<option name="SELECTED_BUILD_VARIANT" value="debug" />
12+
<option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
13+
<option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
14+
<option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
15+
<option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugTest" />
16+
<option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
17+
<option name="TEST_SOURCE_GEN_TASK_NAME" value="generateDebugTestSources" />
18+
<option name="ALLOW_USER_CONFIGURATION" value="false" />
19+
<option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
20+
<option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
21+
<option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res" />
22+
<option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
23+
<option name="LIBRARY_PROJECT" value="true" />
24+
</configuration>
25+
</facet>
26+
</component>
27+
<component name="NewModuleRootManager" inherit-compiler-output="false">
28+
<output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
29+
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
30+
<exclude-output />
31+
<content url="file://$MODULE_DIR$">
32+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
33+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
34+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
35+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
36+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
37+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/debug" type="java-resource" />
38+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/test/debug" isTestSource="true" generated="true" />
39+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/test/debug" isTestSource="true" generated="true" />
40+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/test/debug" isTestSource="true" generated="true" />
41+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/test/debug" isTestSource="true" generated="true" />
42+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/test/debug" type="java-test-resource" />
43+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/test/debug" type="java-test-resource" />
44+
<sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
45+
<sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
46+
<sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
47+
<sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
48+
<sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
49+
<sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
50+
<sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
51+
<sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
52+
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
53+
<sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
54+
<sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
55+
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
56+
<sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
57+
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
58+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
59+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
60+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
61+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
62+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
63+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
64+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
65+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
66+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
67+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
68+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/coverage-instrumented-classes" />
69+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
70+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
71+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" />
72+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
73+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jacoco" />
74+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaResources" />
75+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/libs" />
76+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
77+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
78+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/ndk" />
79+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
80+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/proguard" />
81+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
82+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
83+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
84+
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
85+
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
86+
</content>
87+
<orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" />
88+
<orderEntry type="sourceFolder" forTests="false" />
89+
</component>
90+
</module>
91+

‎ColorPickerPreference/src/main/AndroidManifest.xml‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,6 @@
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
33
package="net.margaritov.preference.colorpicker">
44

5-
<application
6-
android:icon="@drawable/icon"
7-
android:label="@string/app_name">
8-
<activity
9-
android:name="net.margaritov.preference.colorpicker.Test"
10-
android:label="@string/app_name">
11-
<intent-filter>
12-
<action android:name="android.intent.action.MAIN" />
13-
<category android:name="android.intent.category.LAUNCHER" />
14-
</intent-filter>
15-
</activity>
16-
17-
</application>
185
<uses-sdk android:minSdkVersion="7" />
196

207
</manifest>

‎ColorPickerPreference/src/main/res/values/strings.xml‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<resources>
3-
<!-- App -->
4-
<string name="hello">Hello World, Main!</string>
5-
<string name="app_name">ColorPickerPreference</string>
6-
73
<!-- Color Picker -->
84
<string name="dialog_color_picker">Color Picker</string>
95
<string name="press_color_to_apply">Press on Color to apply</string>
10-
11-
<!-- Preferences -->
12-
<string name="pref_category">Category</string>
13-
<string name="color1_title">Color 1</string>
14-
<string name="color1_summary">black color by default, set by reference</string>
15-
<string name="color2_title">Color 2</string>
16-
<string name="color2_summary">not persistent color\nalpha slider added via code</string>
17-
<string name="color3_title">Color 3</string>
18-
<string name="color3_summary">picker with alpha slider</string>
19-
<string name="color4_title">Color 4</string>
20-
<string name="color4_summary">color set with HEX code in xml</string>
216
</resources>

‎Sample/build.gradle‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
apply plugin: 'com.android.application'
2+
3+
android {
4+
compileSdkVersion 21
5+
buildToolsVersion "21.1.2"
6+
7+
defaultConfig {
8+
minSdkVersion 7
9+
targetSdkVersion 21
10+
}
11+
12+
}

‎Sample/src/main/AndroidManifest.xml‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3+
package="net.margaritov.preference.colorpicker">
4+
5+
<application
6+
android:icon="@drawable/icon"
7+
android:label="@string/app_name">
8+
<activity
9+
android:name="net.margaritov.preference.colorpicker.Test"
10+
android:label="@string/app_name">
11+
<intent-filter>
12+
<action android:name="android.intent.action.MAIN" />
13+
<category android:name="android.intent.category.LAUNCHER" />
14+
</intent-filter>
15+
</activity>
16+
17+
</application>
18+
<uses-sdk android:minSdkVersion="7" />
19+
20+
</manifest>

‎ColorPickerPreference/src/main/java/net/margaritov/preference/colorpicker/Test.java‎ renamed to ‎Sample/src/main/java/net/margaritov/preference/colorpicker/Test.java‎

File renamed without changes.

‎ColorPickerPreference/src/main/res/drawable-hdpi/icon.png‎ renamed to ‎Sample/src/main/res/drawable-hdpi/icon.png‎

File renamed without changes.

‎ColorPickerPreference/src/main/res/drawable-ldpi/icon.png‎ renamed to ‎Sample/src/main/res/drawable-ldpi/icon.png‎

File renamed without changes.

‎ColorPickerPreference/src/main/res/drawable-mdpi/icon.png‎ renamed to ‎Sample/src/main/res/drawable-mdpi/icon.png‎

File renamed without changes.

‎ColorPickerPreference/src/main/res/values/integer.xml‎ renamed to ‎Sample/src/main/res/values/integer.xml‎

File renamed without changes.

0 commit comments

Comments
 (0)