Added options to set texts of more buttons via the dialog and the preference: transparency, select, custom, presets

.gitignore

@@ -1,49 +1,15 @@
-########### Specifies intentionally untracked files to ignore ###########
-
-### Gradle
-.gradle/
-build/
-
-### IntelliJ IDEA
-/.idea
 *.iml
-*.iws
-captures/
-.navigation/
-local.properties
-bin/
-gen/
-out/
-*.apk
-*.ap_
-
-### Android
-*.jks
-*.dex
-
-### Java
-*.class
-hs_err_pid*
-
-### Windows
-Desktop.ini
-Thumbs.db
-ehthumbs.db
-
-### OSX
+.gradle
+/local.properties
+/.idea/caches
+/.idea/libraries
+/.idea/modules.xml
+/.idea/workspace.xml
+/.idea/navEditor.xml
+/.idea/assetWizardSettings.xml
 .DS_Store
-
-### Linux
-*~
-.fuse_hidden*
-.directory
-.Trash-*
-
-### Logs
-*.log
-
-### Crashlytics
-com_crashlytics_export_strings.xml
-crashlytics.properties
-crashlytics-build.properties
-fabric.properties
+/build
+/captures
+.externalNativeBuild
+.cxx
+local.properties

README.md

@@ -44,17 +44,21 @@ Note: Using AndroidX's `PreferenceFragmentCompat`? Then use `com.jaredrummler.an
 
 You can add attributes to customize the `ColorPreference`:
 
-| name                | type      | documentation                                                                         |
-|---------------------|-----------|---------------------------------------------------------------------------------------|
-| cpv_dialogType      | enum      | "custom" to show the color picker, "preset" to show pre-defined colors                |
-| cpv_showAlphaSlider | boolean   | Show a slider for changing the alpha of a color (adding transparency)                 |
-| cpv_colorShape      | enum      | "square" or "circle" for the shape of the color preview                               |
-| cpv_colorPresets    | reference | An int-array of pre-defined colors to show in the dialog                              |
-| cpv_dialogTitle     | reference | The string resource id for the dialog title. By default the title is "Select a Color" |
-| cpv_showColorShades | boolean   | true to show different shades of the selected color                                   |
-| cpv_allowPresets    | boolean   | true to add a button to toggle to the custom color picker                             |
-| cpv_allowCustom     | boolean   | true to add a button to toggle to the presets color picker                            |
-| cpv_showDialog      | boolean   | true to let the ColorPreference handle showing the dialog                             |
+| name                         | type      | documentation                                                                             |
+|------------------------------|-----------|-------------------------------------------------------------------------------------------|
+| cpv_dialogType               | enum      | "custom" to show the color picker, "preset" to show pre-defined colors                    |
+| cpv_showAlphaSlider          | boolean   | Show a slider for changing the alpha of a color (adding transparency)                     |
+| cpv_colorShape               | enum      | "square" or "circle" for the shape of the color preview                                   |
+| cpv_colorPresets             | reference | An int-array of pre-defined colors to show in the dialog                                  |
+| cpv_dialogTitle              | reference | The string resource id for the dialog title. By default the title is "Select a Color"     |
+| cpv_dialogPresetsActionText      | reference | The string resource id for the dialog button that has "Presets" by default            |
+| cpv_dialogSelectActionText       | reference | The string resource id for the dialog button that has "Select" by default             |
+| cpv_dialogCustomActionText       | reference | The string resource id for the dialog button that has "Custom" by default             |
+| cpv_dialogTransparencyActionText | reference | The string resource id for the dialog button that has "Transparency" by default       |
+| cpv_showColorShades          | boolean   | true to show different shades of the selected color                                       |
+| cpv_allowPresets             | boolean   | true to add a button to toggle to the custom color picker                                 |
+| cpv_allowCustom              | boolean   | true to add a button to toggle to the presets color picker                                |
+| cpv_showDialog               | boolean   | true to let the ColorPreference handle showing the dialog                                 |
 
 You can also show a `ColorPickerDialog` without using the `ColorPreference`:
 

app/.gitignore

@@ -0,0 +1 @@
+/build

app/build.gradle

@@ -0,0 +1,42 @@
+plugins {
+    alias(libs.plugins.android.application)
+    alias(libs.plugins.kotlin.android)
+}
+
+android {
+    namespace 'com.jaredrummler.android.colorpicker.demo'
+    compileSdk 34
+
+    defaultConfig {
+        applicationId "com.jaredrummler.android.colorpicker.demo"
+        minSdk 21
+        targetSdk 34
+        versionCode 1
+        versionName "1.0"
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+        }
+    }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+    kotlinOptions {
+        jvmTarget = '1.8'
+    }
+}
+
+dependencies {
+
+    implementation libs.androidx.core.ktx
+    implementation libs.androidx.appcompat
+    implementation libs.material
+    implementation project(':library')
+
+    api("androidx.preference:preference-ktx:1.2.1")
+
+}

app/proguard-rules.pro

@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile

demo/src/main/AndroidManifest.xml → app/src/main/AndroidManifest.xml

@@ -25,7 +25,7 @@
       android:label="@string/app_name"
       android:supportsRtl="true"
       android:theme="@style/AppTheme">
-    <activity android:name=".MainActivity">
+    <activity android:name=".MainActivity" android:exported="true">
       <intent-filter>
         <action android:name="android.intent.action.MAIN"/>
 
@@ -38,4 +38,4 @@
         android:screenOrientation="portrait"/>
   </application>
 
-</manifest>
+</manifest>

demo/src/main/java/com/jaredrummler/android/colorpicker/demo/BasePreferenceFragment.java → app/src/main/java/com/jaredrummler/android/colorpicker/demo/BasePreferenceFragment.java

@@ -31,7 +31,7 @@ public abstract class BasePreferenceFragment extends PreferenceFragmentCompat {
         if (preference instanceof PreferenceCategory) {
           setZeroPaddingToLayoutChildren(holder.itemView);
         } else {
-          View iconFrame = holder.itemView.findViewById(R.id.icon_frame);
+          View iconFrame = holder.itemView.findViewById(android.R.id.icon_frame);
           if (iconFrame != null) {
             iconFrame.setVisibility(preference.getIcon() == null ? View.GONE : View.VISIBLE);
           }
@@ -54,4 +54,4 @@ private void setZeroPaddingToLayoutChildren(View view) {
       }
     }
   }
-}
+}