Refactored GroupHeader and added option for text colour. Additionally…

…, added option for content colour in ListPref (#2)

.gitignore

@@ -1,12 +1,7 @@
 *.iml
 .gradle
 /local.properties
-/.idea/caches
-/.idea/libraries
-/.idea/modules.xml
-/.idea/workspace.xml
-/.idea/navEditor.xml
-/.idea/assetWizardSettings.xml
+/.idea
 .DS_Store
 /build
 /captures

ComposePrefs/build.gradle

@@ -11,7 +11,7 @@ android {
         minSdk 21
         targetSdk 31
         versionCode 1
-        versionName "1.0"
+        versionName "1.0.1"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"
@@ -54,7 +54,7 @@ afterEvaluate {
 
                 groupId = 'com.github.jamalmulla'
                 artifactId = 'ComposePrefs'
-                version = '1.0'
+                version = '1.0.1'
             }
         }
     }

ComposePrefs/src/main/java/com/jamal/composeprefs/ui/PrefCategoryHeader.kt → ComposePrefs/src/main/java/com/jamal/composeprefs/ui/GroupHeader.kt

@@ -9,12 +9,14 @@ import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
 
 @Composable
-fun PrefsCategoryHeader(
-    title: String
+fun GroupHeader(
+    title: String,
+    color: Color = MaterialTheme.colors.primary
 ) {
     Box(
         Modifier
@@ -26,7 +28,7 @@ fun PrefsCategoryHeader(
     ) {
         Text(
             title,
-            color = MaterialTheme.colors.primary,
+            color = color,
             fontSize = LocalTextStyle.current.fontSize.times(FontSizeMultiplier),
             fontWeight = FontWeight.SemiBold
         )

ComposePrefs/src/main/java/com/jamal/composeprefs/ui/PrefDsl.kt

@@ -18,12 +18,20 @@ interface PrefsScope {
     fun prefsItem(content: @Composable PrefsScope.() -> Unit)
 
     /**
-     * Adds a group of Prefs
+     * Adds a group of Prefs with a title.
      *
      * @param title Group header text. Will be shown above the list of Prefs
      * @param items All the prefs in this group
      */
     fun prefsGroup(title: String, items: PrefsScope.() -> Unit)
+
+    /**
+     * Adds a group of Prefs. This overload is intended for passing in a [GroupHeader] if you want more control over the header.
+     *
+     * @param header Group header. Will be shown above the list of Prefs
+     * @param items All the prefs in this group
+     */
+    fun prefsGroup(header: @Composable PrefsScope.() -> Unit, items: PrefsScope.() -> Unit)
 }
 
 internal class PrefsScopeImpl : PrefsScope {
@@ -52,12 +60,32 @@ internal class PrefsScopeImpl : PrefsScope {
         // - if current current item is header of new group
         // - if current item is end of group
 
+        // add header index so we know where each group starts
+        _headerIndexes.add(this.prefsItems.size)
+
+        this.prefsItem {
+            GroupHeader(title)
+        }
+
+        // add all children to hierarchy
+        this.apply(items)
+
+        this.prefsItem { Spacer(modifier = Modifier.height(16.dp)) }
+
+        // add totalSize -2/-1 to footerIndexes as that is the index of the last item added and the spacer respectively
+        _footerIndexes.add(this.prefsItems.size - 2)
+        _footerIndexes.add(this.prefsItems.size - 1)
+    }
 
+    override fun prefsGroup(
+        header: @Composable PrefsScope.() -> Unit,
+        items: PrefsScope.() -> Unit
+    ) {
         // add header index so we know where each group starts
         _headerIndexes.add(this.prefsItems.size)
 
         this.prefsItem {
-            PrefsCategoryHeader(title)
+            header()
         }
 
         // add all children to hierarchy

ComposePrefs/src/main/java/com/jamal/composeprefs/ui/prefs/ListPref.kt

@@ -19,8 +19,6 @@ import com.jamal.composeprefs.ui.LocalPrefsDataStore
 import kotlinx.coroutines.launch
 import java.lang.Exception
 
-//TODO useSelectedAsSummary
-
 /**
  * Preference that shows a list of entries in a Dialog where a single entry can be selected at one time.
  *
@@ -48,6 +46,7 @@ fun ListPref(
     onValueChange: ((String) -> Unit)? = null,
     useSelectedAsSummary: Boolean = false,
     dialogBackgroundColor: Color = MaterialTheme.colors.surface,
+    contentColor: Color = contentColorFor(dialogBackgroundColor),
     textColor: Color = MaterialTheme.colors.onBackground,
     enabled: Boolean = true,
     entries: Map<String, String> = mapOf()
@@ -133,6 +132,7 @@ fun ListPref(
 
             },
             backgroundColor = dialogBackgroundColor,
+            contentColor = contentColor,
             properties = DialogProperties(
                 usePlatformDefaultWidth = true
             ),