From 10a54de9a6a95f67bb33e908a80dfd61c95df871 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 17 Mar 2021 22:12:26 +0100
Subject: [PATCH 01/28] Bump dokka-gradle-plugin from 1.4.20 to 1.4.30 (#115)

Bumps [dokka-gradle-plugin](https://github.com/Kotlin/dokka) from 1.4.20 to 1.4.30.
- [Release notes](https://github.com/Kotlin/dokka/releases)
- [Commits](https://github.com/Kotlin/dokka/compare/v1.4.20...v1.4.30)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 3f4e4786..54c744ea 100644
--- a/build.gradle
+++ b/build.gradle
@@ -15,7 +15,7 @@ buildscript {
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath 'org.jfrog.buildinfo:build-info-extractor-gradle:4.20.0'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
-        classpath 'org.jetbrains.dokka:dokka-gradle-plugin:1.4.20'
+        classpath 'org.jetbrains.dokka:dokka-gradle-plugin:1.4.30'
     }
 }
 

From 2e3b4ec2e56b6acf5b8b038b4008b1a2d0039098 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 19 Mar 2021 09:43:16 +0100
Subject: [PATCH 02/28] Bump gradle from 4.1.2 to 4.1.3 (#116)

Bumps gradle from 4.1.2 to 4.1.3.

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 54c744ea..c4aea88a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -11,7 +11,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.2'
+        classpath 'com.android.tools.build:gradle:4.1.3'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath 'org.jfrog.buildinfo:build-info-extractor-gradle:4.20.0'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'

From bd69b08d1ff1a9dcc5aef43c62eb24eaf1453696 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 22 Mar 2021 11:45:10 +0100
Subject: [PATCH 03/28] Bump fastadapter from 5.3.2 to 5.3.5 (#118)

Bumps [fastadapter](https://github.com/mikepenz/FastAdapter) from 5.3.2 to 5.3.5.
- [Release notes](https://github.com/mikepenz/FastAdapter/releases)
- [Changelog](https://github.com/mikepenz/FastAdapter/blob/develop/CHANGELOG.md)
- [Commits](https://github.com/mikepenz/FastAdapter/compare/v5.3.2...v5.3.5)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 simplesettings/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/simplesettings/build.gradle b/simplesettings/build.gradle
index 8b273a6c..8c245443 100644
--- a/simplesettings/build.gradle
+++ b/simplesettings/build.gradle
@@ -50,7 +50,7 @@ dependencies {
     // External dependencies
     api 'com.mikepenz:aboutlibraries-core:8.8.0'
     api 'com.mikepenz:aboutlibraries:8.8.0@aar'
-    api 'com.mikepenz:fastadapter:5.3.2'
+    api 'com.mikepenz:fastadapter:5.3.5'
     api 'com.github.ibrahimsn98:live-preferences:1.9'
     api 'com.github.skydoves:colorpickerpreference:2.0.5'
 

From 9a6c23a3b3b691ca718baea874bb823e4c9fb1a6 Mon Sep 17 00:00:00 2001
From: Marc Auberer <contact@marc-auberer.com>
Date: Mon, 22 Mar 2021 13:35:41 +0100
Subject: [PATCH 04/28] Add Jitpack repository due to build errors without it

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index e73c49e4..84571564 100644
--- a/README.md
+++ b/README.md
@@ -22,6 +22,7 @@ allprojects {
     repositories {
         ...
         maven { url "https://repo.chillibits.com/artifactory/android" }
+        maven { url "https://jitpack.io" }
     }
 }
 ```

From 6d569e71d92106d87cee3b589b56ac5f62968f04 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 23 Mar 2021 12:23:43 +0100
Subject: [PATCH 05/28] Bump kotlin_version from 1.4.31 to 1.4.32 (#119)

Bumps `kotlin_version` from 1.4.31 to 1.4.32.

Updates `kotlin-gradle-plugin` from 1.4.31 to 1.4.32
- [Release notes](https://github.com/JetBrains/kotlin/releases)
- [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md)
- [Commits](https://github.com/JetBrains/kotlin/commits)

Updates `kotlin-stdlib-jdk7` from 1.4.31 to 1.4.32
- [Release notes](https://github.com/JetBrains/kotlin/releases)
- [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md)
- [Commits](https://github.com/JetBrains/kotlin/commits)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index c4aea88a..635e0891 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@
 buildscript {
     ext.library_version = '1.2.0'
     ext.library_version_code = 1200
-    ext.kotlin_version = '1.4.31'
+    ext.kotlin_version = '1.4.32'
     repositories {
         google()
         jcenter()

From 059e12212f02cc6a9a7499500299a5107a0d1b11 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 25 Mar 2021 14:20:30 +0100
Subject: [PATCH 06/28] Bump appcompat from 1.3.0-beta01 to 1.3.0-rc01 (#122)

Bumps appcompat from 1.3.0-beta01 to 1.3.0-rc01.

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 app/build.gradle            | 2 +-
 simplesettings/build.gradle | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 8755d4a1..899d1881 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -35,7 +35,7 @@ dependencies {
 
     // Base dependencies
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation 'androidx.appcompat:appcompat:1.3.0-beta01'
+    implementation 'androidx.appcompat:appcompat:1.3.0-rc01'
     implementation 'androidx.core:core-ktx:1.5.0-beta03'
 
     // Google dependencies
diff --git a/simplesettings/build.gradle b/simplesettings/build.gradle
index 8c245443..bd601aa1 100644
--- a/simplesettings/build.gradle
+++ b/simplesettings/build.gradle
@@ -36,7 +36,7 @@ android {
 dependencies {
     // Base dependencies
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation 'androidx.appcompat:appcompat:1.2.0'
+    implementation 'androidx.appcompat:appcompat:1.3.0-rc01'
     implementation 'androidx.core:core-ktx:1.5.0-beta03'
     implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
     implementation 'androidx.navigation:navigation-fragment-ktx:2.3.4'

From 9bf31e1f48774aeb889c1ed9f42d3d8d28c11585 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 25 Mar 2021 14:27:56 +0100
Subject: [PATCH 07/28] Bump activity-ktx from 1.3.0-alpha04 to 1.3.0-alpha05
 (#120)

Bumps activity-ktx from 1.3.0-alpha04 to 1.3.0-alpha05.

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 simplesettings/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/simplesettings/build.gradle b/simplesettings/build.gradle
index bd601aa1..fbf78da7 100644
--- a/simplesettings/build.gradle
+++ b/simplesettings/build.gradle
@@ -41,7 +41,7 @@ dependencies {
     implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
     implementation 'androidx.navigation:navigation-fragment-ktx:2.3.4'
     implementation 'androidx.navigation:navigation-ui-ktx:2.3.4'
-    implementation 'androidx.activity:activity-ktx:1.3.0-alpha04'
+    implementation 'androidx.activity:activity-ktx:1.3.0-alpha05'
 
     // Google dependencies
     api 'com.google.android.material:material:1.3.0'

From 7c49fa9ecf1a8f3f8308a35a01b8f06f2a9787a7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 30 Mar 2021 22:47:54 +0200
Subject: [PATCH 08/28] Bump aboutlibraries from 8.8.0 to 8.8.4 (#123)

Bumps [aboutlibraries](https://github.com/mikepenz/AboutLibraries) from 8.8.0 to 8.8.4.
- [Release notes](https://github.com/mikepenz/AboutLibraries/releases)
- [Changelog](https://github.com/mikepenz/AboutLibraries/blob/develop/gradle-release.gradle)
- [Commits](https://github.com/mikepenz/AboutLibraries/compare/v8.8.0...v8.8.4)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 simplesettings/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/simplesettings/build.gradle b/simplesettings/build.gradle
index fbf78da7..805912ac 100644
--- a/simplesettings/build.gradle
+++ b/simplesettings/build.gradle
@@ -48,7 +48,7 @@ dependencies {
     api 'androidx.preference:preference-ktx:1.1.1'
 
     // External dependencies
-    api 'com.mikepenz:aboutlibraries-core:8.8.0'
+    api 'com.mikepenz:aboutlibraries-core:8.8.4'
     api 'com.mikepenz:aboutlibraries:8.8.0@aar'
     api 'com.mikepenz:fastadapter:5.3.5'
     api 'com.github.ibrahimsn98:live-preferences:1.9'

From dbdef863b4ef8cef80aec694753dabb6f4534e9f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 31 Mar 2021 08:27:12 +0200
Subject: [PATCH 09/28] Bump aboutlibraries from 8.8.0 to 8.8.4 (#124)

Bumps [aboutlibraries](https://github.com/mikepenz/AboutLibraries) from 8.8.0 to 8.8.4.
- [Release notes](https://github.com/mikepenz/AboutLibraries/releases)
- [Changelog](https://github.com/mikepenz/AboutLibraries/blob/develop/gradle-release.gradle)
- [Commits](https://github.com/mikepenz/AboutLibraries/compare/v8.8.0...v8.8.4)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 simplesettings/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/simplesettings/build.gradle b/simplesettings/build.gradle
index 805912ac..5a7b5899 100644
--- a/simplesettings/build.gradle
+++ b/simplesettings/build.gradle
@@ -49,7 +49,7 @@ dependencies {
 
     // External dependencies
     api 'com.mikepenz:aboutlibraries-core:8.8.4'
-    api 'com.mikepenz:aboutlibraries:8.8.0@aar'
+    api 'com.mikepenz:aboutlibraries:8.8.4@aar'
     api 'com.mikepenz:fastadapter:5.3.5'
     api 'com.github.ibrahimsn98:live-preferences:1.9'
     api 'com.github.skydoves:colorpickerpreference:2.0.5'

From 04dba9883b6b118afb35a4a91270d87bf64f0c13 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 8 Apr 2021 09:08:03 +0200
Subject: [PATCH 10/28] Bump activity-ktx from 1.3.0-alpha05 to 1.3.0-alpha06
 (#127)

Bumps activity-ktx from 1.3.0-alpha05 to 1.3.0-alpha06.

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 simplesettings/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/simplesettings/build.gradle b/simplesettings/build.gradle
index 5a7b5899..71028bf8 100644
--- a/simplesettings/build.gradle
+++ b/simplesettings/build.gradle
@@ -41,7 +41,7 @@ dependencies {
     implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
     implementation 'androidx.navigation:navigation-fragment-ktx:2.3.4'
     implementation 'androidx.navigation:navigation-ui-ktx:2.3.4'
-    implementation 'androidx.activity:activity-ktx:1.3.0-alpha05'
+    implementation 'androidx.activity:activity-ktx:1.3.0-alpha06'
 
     // Google dependencies
     api 'com.google.android.material:material:1.3.0'

From a47532f38926fcf748af23b6c4d6e188ed62faa0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 8 Apr 2021 10:26:07 +0200
Subject: [PATCH 11/28] Bump navigation-fragment-ktx from 2.3.4 to 2.3.5 (#126)

Bumps navigation-fragment-ktx from 2.3.4 to 2.3.5.

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 simplesettings/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/simplesettings/build.gradle b/simplesettings/build.gradle
index 71028bf8..1d951383 100644
--- a/simplesettings/build.gradle
+++ b/simplesettings/build.gradle
@@ -39,7 +39,7 @@ dependencies {
     implementation 'androidx.appcompat:appcompat:1.3.0-rc01'
     implementation 'androidx.core:core-ktx:1.5.0-beta03'
     implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
-    implementation 'androidx.navigation:navigation-fragment-ktx:2.3.4'
+    implementation 'androidx.navigation:navigation-fragment-ktx:2.3.5'
     implementation 'androidx.navigation:navigation-ui-ktx:2.3.4'
     implementation 'androidx.activity:activity-ktx:1.3.0-alpha06'
 

From 69a75c019d8c91c49ae3aa4993c7f8df4e9dbd27 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 8 Apr 2021 10:34:40 +0200
Subject: [PATCH 12/28] Bump navigation-ui-ktx from 2.3.4 to 2.3.5 (#125)

Bumps navigation-ui-ktx from 2.3.4 to 2.3.5.

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 simplesettings/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/simplesettings/build.gradle b/simplesettings/build.gradle
index 1d951383..5ac0d917 100644
--- a/simplesettings/build.gradle
+++ b/simplesettings/build.gradle
@@ -40,7 +40,7 @@ dependencies {
     implementation 'androidx.core:core-ktx:1.5.0-beta03'
     implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
     implementation 'androidx.navigation:navigation-fragment-ktx:2.3.5'
-    implementation 'androidx.navigation:navigation-ui-ktx:2.3.4'
+    implementation 'androidx.navigation:navigation-ui-ktx:2.3.5'
     implementation 'androidx.activity:activity-ktx:1.3.0-alpha06'
 
     // Google dependencies

From 947e0cfbb23119d8deae998f6c09da3d5220c25a Mon Sep 17 00:00:00 2001
From: Marc Auberer <contact@marc-auberer.com>
Date: Fri, 9 Apr 2021 15:29:57 +0200
Subject: [PATCH 13/28] Migrate demo app to Jetpack Compose (#128)

* First Jetpack Compose migrations

* Finalize UI structure

* Add methods to receive LiveData without observer
---
 README.md                                     |   6 +
 app/build.gradle                              |  41 ++++--
 app/src/main/AndroidManifest.xml              |  15 +-
 .../simplesettingssample/MainActivity.kt      | 135 +++++++++++++-----
 .../simplesettingssample/Theming.kt           |  35 +++++
 app/src/main/res/layout/activity_main.xml     |  85 -----------
 app/src/main/res/values-night/colors.xml      |   9 ++
 app/src/main/res/values/colors.xml            |   7 -
 app/src/main/res/values/styles.xml            |  17 +--
 build.gradle                                  |   3 +-
 gradle.properties                             |  24 ++--
 gradle/wrapper/gradle-wrapper.properties      |  10 +-
 simplesettings/build.gradle                   |   7 +-
 .../tool/SimpleSettingsStore.kt               | 111 +++++++++++++-
 14 files changed, 313 insertions(+), 192 deletions(-)
 create mode 100644 app/src/main/java/com/chillibits/simplesettingssample/Theming.kt
 delete mode 100644 app/src/main/res/layout/activity_main.xml
 create mode 100644 app/src/main/res/values-night/colors.xml

diff --git a/README.md b/README.md
index 84571564..a0172544 100644
--- a/README.md
+++ b/README.md
@@ -223,10 +223,16 @@ As you can see, this works for the types `String`, `Int`, `Boolean`, `Float`, `L
 ### Retrieval as LiveData
 Furthermore, the library offers a feature to observe preference values as LiveData as follows:
 ```kotlin
+val inputPref = getPreferenceLiveData(this@MainActivity, "listpreference")
+```
+
+or you can retrieve it directly as an LiveData Observer:
+```kotlin
 getPrefObserver(this@MainActivity, "listpreference", Observer<String> { value ->
     textField.text = value
 })
 ```
+
 Like above, this works for the types `String`, `Int`, `Boolean`, `Float`, `Long`, `StringSet`.<br>
 *Note: This extension functions are only available for the classes, which implement `LifecycleOwner`.*
 
diff --git a/app/build.gradle b/app/build.gradle
index 899d1881..abb16390 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -2,13 +2,15 @@
  * Copyright © Marc Auberer 2020-2021. All rights reserved
  */
 
-apply plugin: 'com.android.application'
-apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
+plugins {
+    id 'com.android.application'
+    id 'kotlin-android'
+    id 'kotlin-android-extensions'
+}
 
 android {
     compileSdkVersion 30
-    buildToolsVersion "30.0.2"
+    buildToolsVersion "30.0.3"
 
     defaultConfig {
         applicationId "com.chillibits.simplesettingssample"
@@ -18,7 +20,6 @@ android {
         versionName library_version
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
-
     buildTypes {
         release {
             minifyEnabled true
@@ -26,7 +27,24 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
-
+    kotlinOptions {
+        jvmTarget = '11'
+        useIR = true
+    }
+    buildFeatures {
+        compose true
+    }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+    kotlinOptions {
+        jvmTarget = "1.8"
+    }
+    composeOptions {
+        kotlinCompilerExtensionVersion compose_version
+        kotlinCompilerVersion '1.4.30'
+    }
 }
 
 dependencies {
@@ -34,14 +52,21 @@ dependencies {
     implementation project(':simplesettings')
 
     // Base dependencies
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     implementation 'androidx.appcompat:appcompat:1.3.0-rc01'
-    implementation 'androidx.core:core-ktx:1.5.0-beta03'
+    implementation 'androidx.core:core-ktx:1.5.0-rc01'
 
     // Google dependencies
     implementation 'com.google.android.material:material:1.3.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
 
+    // Jetpack Compose
+    implementation "androidx.compose.ui:ui:$compose_version"
+    implementation "androidx.compose.ui:ui-tooling:$compose_version"
+    implementation "androidx.compose.material:material:$compose_version"
+    implementation "androidx.compose.runtime:runtime-livedata:$compose_version"
+    implementation 'androidx.constraintlayout:constraintlayout-compose:1.0.0-alpha05'
+    implementation 'androidx.activity:activity-compose:1.3.0-alpha06'
+
     // Test dependencies
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.2'
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 3a8d5da7..d0bff5a4 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,12 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright © Marc Auberer 2020-2021. All rights reserved
-  -->
-
-<manifest
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.chillibits.simplesettingssample"
-    android:installLocation="auto">
+    android:installLocation="auto" >
 
     <application
         android:allowBackup="true"
@@ -15,12 +10,9 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
-
         <activity
             android:name=".MainActivity"
-            android:theme="@style/AppTheme"
-            android:windowSoftInputMode="adjustPan">
-
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <action android:name="android.intent.action.VIEW" />
@@ -29,4 +21,5 @@
             </intent-filter>
         </activity>
     </application>
+
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/com/chillibits/simplesettingssample/MainActivity.kt b/app/src/main/java/com/chillibits/simplesettingssample/MainActivity.kt
index 366b02e7..5ef0d658 100644
--- a/app/src/main/java/com/chillibits/simplesettingssample/MainActivity.kt
+++ b/app/src/main/java/com/chillibits/simplesettingssample/MainActivity.kt
@@ -7,16 +7,33 @@ package com.chillibits.simplesettingssample
 import android.content.Context
 import android.content.Intent
 import android.net.Uri
-import android.os.Build
 import android.os.Bundle
 import android.view.Menu
 import android.view.MenuItem
-import android.view.View
+import android.widget.NumberPicker
 import android.widget.Toast
+import androidx.activity.compose.setContent
 import androidx.annotation.IdRes
 import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatActivity
-import androidx.lifecycle.Observer
+import androidx.compose.foundation.layout.*
+import androidx.compose.material.*
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.livedata.observeAsState
+import androidx.compose.ui.Alignment.Companion.CenterHorizontally
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.layout.layoutId
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import androidx.constraintlayout.compose.ConstraintLayout
+import androidx.constraintlayout.compose.ConstraintSet
+import androidx.core.view.WindowCompat
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
 import androidx.preference.Preference
 import com.chillibits.simplesettings.clicklistener.DialogClickListener
 import com.chillibits.simplesettings.clicklistener.LibsClickListener
@@ -26,37 +43,21 @@ import com.chillibits.simplesettings.core.SimpleSettings
 import com.chillibits.simplesettings.core.SimpleSettingsConfig
 import com.chillibits.simplesettings.item.SimpleSwitchPreference
 import com.chillibits.simplesettings.tool.*
-import kotlinx.android.synthetic.main.activity_main.*
-import kotlinx.android.synthetic.main.toolbar.*
 
 class MainActivity : AppCompatActivity(), SimpleSettingsConfig.OptionsItemSelectedCallback,
     SimpleSettingsConfig.PreferenceCallback, DialogClickListener.DialogResultCallback {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_main)
+        WindowCompat.setDecorFitsSystemWindows(window, true)
 
-        // Initialize toolbar
-        setSupportActionBar(toolbar)
+        val inputPref = getPreferenceLiveData(this, "inputpreference", "Default")
 
-        // Set window insets
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-            window.decorView.systemUiVisibility = View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION or View.SYSTEM_UI_FLAG_LAYOUT_STABLE or View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR
-            window.decorView.setOnApplyWindowInsetsListener { v, insets ->
-                v.setPadding(0, 0, insets.systemWindowInsetRight, insets.systemWindowInsetBottom)
-                toolbar.setPadding(0, insets.systemWindowInsetTop, 0, 0)
-                insets.consumeSystemWindowInsets()
+        setContent {
+            AppTheme {
+                MainView(inputPref = inputPref)
             }
         }
-
-        // Initialize number picker
-        numberPicker.apply {
-            minValue = 1
-            maxValue = 10
-            value = 3
-        }
-
-        subscribeToPreferenceValues()
     }
 
     override fun onCreateOptionsMenu(menu: Menu?): Boolean {
@@ -71,10 +72,78 @@ class MainActivity : AppCompatActivity(), SimpleSettingsConfig.OptionsItemSelect
         return super.onOptionsItemSelected(item)
     }
 
-    fun openSettingsCodeConfig(view: View) {
-        // Get number from number picker
-        val numberOfSwitchPreferences = numberPicker.value
+    @Preview(name = "MainView", showSystemUi = true)
+    @Composable
+    private fun MainView(inputPref: LiveData<String> = MutableLiveData()) {
+        val context = LocalContext.current
+        val inputPrefState by inputPref.observeAsState()
+
+        ConstraintLayout(
+            constraintSet = ConstraintSet {
+                val layout = createRefFor("layout")
+                constrain(layout) {
+                    top.linkTo(parent.top)
+                    bottom.linkTo(parent.bottom)
+                    start.linkTo(parent.start)
+                    end.linkTo(parent.end)
+                }
+            },
+            modifier = Modifier
+                .fillMaxSize()
+        ) {
+            Column(modifier = Modifier.layoutId("layout")) {
+                val componentModifiers = Modifier
+                    .align(CenterHorizontally)
+                    .padding(6.dp)
+                lateinit var picker: NumberPicker
 
+                Row(modifier = componentModifiers) {
+                    Text(stringResource(R.string.number_of_switch_preferences))
+                    picker = NumberPicker(context).apply {
+                        minValue = 1
+                        maxValue = 10
+                        value = 3
+                    }
+                }
+                Button(
+                    onClick = { openSettingsCodeConfig(picker.value) },
+                    modifier = componentModifiers,
+                ) {
+                    Text(
+                        text = stringResource(R.string.open_settings_code),
+                        color = MaterialTheme.colors.onPrimary
+                    )
+                }
+                Button(
+                    onClick = { openSettingsXmlConfig() },
+                    modifier = componentModifiers
+                ) {
+                    Text(
+                        text = stringResource(R.string.open_settings_xml),
+                        color = MaterialTheme.colors.onPrimary
+                    )
+                }
+                Button(
+                    onClick = { openSettingsPaged() },
+                    modifier = componentModifiers
+                ) {
+                    Text(
+                        text = stringResource(R.string.open_settings_paged),
+                        color = MaterialTheme.colors.onPrimary
+                    )
+                }
+                Spacer(Modifier.height(50.dp))
+                Text(
+                    text = stringResource(R.string.value_input_preference_, inputPrefState.orEmpty()),
+                    modifier = componentModifiers,
+                    textAlign = TextAlign.Center,
+                    color = MaterialTheme.colors.onBackground
+                )
+            }
+        }
+    }
+
+    private fun openSettingsCodeConfig(numberOfSwitchPreferences: Int) {
         val config = SimpleSettingsConfig.Builder()
             .displayHomeAsUpEnabled(true)
             .setOptionsMenu(R.menu.menu_settings, this)
@@ -170,7 +239,7 @@ class MainActivity : AppCompatActivity(), SimpleSettingsConfig.OptionsItemSelect
         overridePendingTransition(android.R.anim.slide_in_left, android.R.anim.slide_out_right)
     }
 
-    fun openSettingsXmlConfig(view: View) {
+    private fun openSettingsXmlConfig() {
         val config = SimpleSettingsConfig.Builder()
             .displayHomeAsUpEnabled(true)
             .setOptionsMenu(R.menu.menu_settings, this)
@@ -188,7 +257,7 @@ class MainActivity : AppCompatActivity(), SimpleSettingsConfig.OptionsItemSelect
         overridePendingTransition(android.R.anim.slide_in_left, android.R.anim.slide_out_right)
     }
 
-    fun openSettingsPaged(view: View) {
+    private fun openSettingsPaged() {
         val config = SimpleSettingsConfig.Builder()
             .displayHomeAsUpEnabled(true)
             .setOptionsMenu(R.menu.menu_settings, this)
@@ -266,12 +335,6 @@ class MainActivity : AppCompatActivity(), SimpleSettingsConfig.OptionsItemSelect
         }
     }
 
-    private fun subscribeToPreferenceValues() {
-        getPrefObserver( this, "inputpreference", Observer<String> {
-            inputPreferenceValue.text = getString(R.string.value_input_preference_, it)
-        })
-    }
-
     override fun onPreferenceClick(context: Context, key: String): Preference.OnPreferenceClickListener? {
         return when(key) {
             "preference" -> WebsiteClickListener(this, getString(R.string.github_link))
@@ -309,4 +372,4 @@ class MainActivity : AppCompatActivity(), SimpleSettingsConfig.OptionsItemSelect
             data = Uri.parse(getString(R.string.github_link))
         })
     }
-}
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/chillibits/simplesettingssample/Theming.kt b/app/src/main/java/com/chillibits/simplesettingssample/Theming.kt
new file mode 100644
index 00000000..ebe8f8ab
--- /dev/null
+++ b/app/src/main/java/com/chillibits/simplesettingssample/Theming.kt
@@ -0,0 +1,35 @@
+package com.chillibits.simplesettingssample
+
+import androidx.compose.foundation.isSystemInDarkTheme
+import androidx.compose.material.MaterialTheme
+import androidx.compose.material.darkColors
+import androidx.compose.material.lightColors
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.graphics.Color
+
+private val LightColors = lightColors(
+    primary = Color(0xFF3DDC84),
+    primaryVariant = Color(0xFF32B56C),
+    secondary = Color(0xFFFF9800),
+    secondaryVariant = Color(0xFFFF9800)
+)
+
+private val DarkColors = darkColors(
+    primary = Color(0xFF313131),
+    primaryVariant = Color(0xFF202020),
+    secondary = Color(0xFFBD7000),
+    secondaryVariant = Color(0xFFBD7000),
+    onPrimary = Color.White,
+    onBackground = Color.White
+)
+
+@Composable
+fun AppTheme(
+    darkTheme: Boolean = isSystemInDarkTheme(),
+    content: @Composable () -> Unit
+) {
+    MaterialTheme(
+        colors = if (darkTheme) DarkColors else LightColors,
+        content = content
+    )
+}
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
deleted file mode 100644
index f8c9a319..00000000
--- a/app/src/main/res/layout/activity_main.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright © Marc Auberer 2020-2021. All rights reserved
-  -->
-
-<androidx.constraintlayout.widget.ConstraintLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".MainActivity">
-
-    <include layout="@layout/toolbar" />
-
-    <LinearLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/toolbar"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        android:orientation="vertical">
-
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal"
-            android:orientation="horizontal">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/number_of_switch_preferences"
-                android:layout_gravity="center_vertical"
-                android:gravity="center_horizontal"
-                android:layout_marginEnd="20dp"/>
-
-            <NumberPicker
-                android:id="@+id/numberPicker"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content" />
-        </LinearLayout>
-
-        <!-- Normal setup -->
-
-        <Button
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal"
-            style="?attr/materialButtonStyle"
-            android:onClick="openSettingsCodeConfig"
-            android:text="@string/open_settings_code"/>
-
-        <Button
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal"
-            style="?attr/materialButtonStyle"
-            android:onClick="openSettingsXmlConfig"
-            android:text="@string/open_settings_xml"/>
-
-        <!-- Pages setup -->
-
-        <Button
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal"
-            style="?attr/materialButtonStyle"
-            android:onClick="openSettingsPaged"
-            android:text="@string/open_settings_paged"/>
-
-        <!-- LivePreference monitoring -->
-
-        <TextView
-            android:id="@+id/inputPreferenceValue"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal"
-            android:layout_marginTop="50dp"
-            android:textSize="16sp"
-            android:gravity="center_horizontal"
-            android:text="@string/value_input_preference_"/>
-    </LinearLayout>
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
new file mode 100644
index 00000000..68156c6a
--- /dev/null
+++ b/app/src/main/res/values-night/colors.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright © Marc Auberer 2020-2021. All rights reserved
+  -->
+
+<resources>
+    <color name="colorPrimaryVariant">#313131</color>
+    <color name="colorPrimaryDarkVariant">#202020</color>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 25f2b359..d209b3be 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -6,11 +6,4 @@
 <resources>
     <color name="colorPrimaryVariant">#3DDC84</color>
     <color name="colorPrimaryDarkVariant">#32B56C</color>
-    <color name="colorSecondaryVariant">#FF9800</color>
-    <color name="colorSurface">#FAFAFA</color>
-    <color name="colorOnPrimary">#FFFFFF</color>
-    <color name="colorOnSecondary">#FFFFFF</color>
-    <color name="colorOnBackground">#000000</color>
-    <color name="colorOnError">#810000</color>
-    <color name="colorOnSurface">@color/colorPrimaryVariant</color>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index d1ed645e..0081fc69 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -3,20 +3,17 @@
   -->
 
 <resources>
-    <style name="AppTheme" parent="Theme.MaterialComponents.DayNight.NoActionBar">
-        <!-- MaterialComponents colors -->
-        <item name="colorPrimaryVariant">@color/colorPrimaryVariant</item>
-        <item name="colorSecondaryVariant">@color/colorSecondaryVariant</item>
-        <item name="colorSurface">@color/colorSurface</item>
-        <item name="colorOnPrimary">@color/colorOnPrimary</item>
-        <item name="colorOnSecondary">@color/colorOnSecondary</item>
-        <item name="colorOnBackground">@color/colorOnBackground</item>
-        <item name="colorOnError">@color/colorOnError</item>
-        <item name="colorOnSurface">@color/colorOnSurface</item>
+    <style name="AppTheme" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
+        <item name="actionBarStyle">@style/Custom.ActionBar</item>
+        <item name="android:navigationBarColor">@android:color/transparent</item>
         <item name="android:statusBarColor">@color/colorPrimaryDarkVariant</item>
     </style>
 
     <style name="toolbarStyle" parent="Theme.MaterialComponents">
         <item name="popupTheme">@style/Theme.MaterialComponents.Light</item>
     </style>
+
+    <style name="Custom.ActionBar" parent="Widget.MaterialComponents.Light.ActionBar.Solid">
+        <item name="background">@color/colorPrimaryVariant</item>
+    </style>
 </resources>
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 635e0891..587933f0 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,12 +6,13 @@ buildscript {
     ext.library_version = '1.2.0'
     ext.library_version_code = 1200
     ext.kotlin_version = '1.4.32'
+    ext.compose_version = '1.0.0-beta04'
     repositories {
         google()
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.3'
+        classpath 'com.android.tools.build:gradle:7.0.0-alpha14'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath 'org.jfrog.buildinfo:build-info-extractor-gradle:4.20.0'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
diff --git a/gradle.properties b/gradle.properties
index 2dbefd3c..7e11dd45 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,25 +1,17 @@
-#
-# Copyright © Marc Auberer 2020-2021. All rights reserved
-#
-
-# Project-wide Gradle settings.
-# IDE (e.g. Android Studio) users:
-# Gradle settings configured through the IDE *will override*
-# any settings specified in this file.
-# For more details on how to configure your build environment visit
+## For more details on how to configure your build environment visit
 # http://www.gradle.org/docs/current/userguide/build_environment.html
+#
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
-org.gradle.jvmargs=-Xmx1536m
+# Default value: -Xmx1024m -XX:MaxPermSize=256m
+# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
+#
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
-# AndroidX package structure to make it clearer which packages are bundled with the
-# Android operating system, and which are packaged with your app's APK
-# https://developer.android.com/topic/libraries/support-library/androidx-rn
+#Fri Apr 09 13:40:44 CEST 2021
+kotlin.code.style=official
+org.gradle.jvmargs=-Xmx2048M -Dkotlin.daemon.jvm.options\="-Xmx2048M"
 android.useAndroidX=true
-# Automatically convert third-party libraries to use AndroidX
 android.enableJetifier=true
-# Kotlin code style for this project: "official" or "obsolete":
-kotlin.code.style=official
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 5d90bf89..d9f2b836 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,10 +1,6 @@
-#
-# Copyright © Marc Auberer 2020-2021. All rights reserved
-#
-
-#Mon Oct 12 23:16:01 CEST 2020
+#Fri Apr 09 02:42:25 CEST 2021
 distributionBase=GRADLE_USER_HOME
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-rc-2-bin.zip
 distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
+zipStoreBase=GRADLE_USER_HOME
diff --git a/simplesettings/build.gradle b/simplesettings/build.gradle
index 5ac0d917..6ad3c80f 100644
--- a/simplesettings/build.gradle
+++ b/simplesettings/build.gradle
@@ -8,13 +8,13 @@ plugins {
     id 'kotlin-android-extensions'
     id 'com.jfrog.artifactory'
     id 'maven-publish'
-    id 'android-maven'
+    //id 'android-maven'
     id 'org.jetbrains.dokka'
 }
 
 android {
     compileSdkVersion 30
-    buildToolsVersion "30.0.2"
+    buildToolsVersion "30.0.3"
 
     defaultConfig {
         minSdkVersion 21
@@ -35,9 +35,8 @@ android {
 
 dependencies {
     // Base dependencies
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     implementation 'androidx.appcompat:appcompat:1.3.0-rc01'
-    implementation 'androidx.core:core-ktx:1.5.0-beta03'
+    implementation 'androidx.core:core-ktx:1.5.0-rc01'
     implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
     implementation 'androidx.navigation:navigation-fragment-ktx:2.3.5'
     implementation 'androidx.navigation:navigation-ui-ktx:2.3.5'
diff --git a/simplesettings/src/main/java/com/chillibits/simplesettings/tool/SimpleSettingsStore.kt b/simplesettings/src/main/java/com/chillibits/simplesettings/tool/SimpleSettingsStore.kt
index a2441306..12105f3d 100644
--- a/simplesettings/src/main/java/com/chillibits/simplesettings/tool/SimpleSettingsStore.kt
+++ b/simplesettings/src/main/java/com/chillibits/simplesettings/tool/SimpleSettingsStore.kt
@@ -89,7 +89,7 @@ fun LifecycleOwner.getPrefObserver(
  * @param observer Observer, which fires the value on every update
  * @param default Default value, if the pref does not exist yet
  *
- * @return LiveData instance
+ * @return LiveData Observer instance
  */
 fun Context.getPrefObserverForViewModel(
         name: String,
@@ -99,6 +99,22 @@ fun Context.getPrefObserverForViewModel(
     observeForever(observer)
 }
 
+/**
+ * Returns a LiveData object for a preference value
+ *
+ * @param context Context for creating instance of SharedPreferences
+ * @param name Name of the observed preference
+ * @param default Default value, if the pref does not exist yet
+ *
+ * @return LiveData instance
+ */
+fun getPreferenceLiveData(
+        context: Context,
+        name: String,
+        default: String = ""
+) = LiveSharedPreferences(context.getPrefs()).getString(name, default)
+
+
 
 /**
  * Returns an observer for a preference value
@@ -122,7 +138,7 @@ fun LifecycleOwner.getPrefObserver(
  * @param observer Observer, which fires the value on every update
  * @param default Default value, if the pref does not exist yet
  *
- * @return LiveData instance
+ * @return LiveData Observer instance
  */
 fun Context.getPrefObserverForViewModel(
         name: String,
@@ -132,6 +148,22 @@ fun Context.getPrefObserverForViewModel(
     observeForever(observer)
 }
 
+/**
+ * Returns a LiveData object for a preference value
+ *
+ * @param context Context for creating instance of SharedPreferences
+ * @param name Name of the observed preference
+ * @param default Default value, if the pref does not exist yet
+ *
+ * @return LiveData instance
+ */
+fun getPreferenceLiveData(
+        context: Context,
+        name: String,
+        default: Int = 0
+) = LiveSharedPreferences(context.getPrefs()).getInt(name, default)
+
+
 
 /**
  * Returns an observer for a preference value
@@ -155,7 +187,7 @@ fun LifecycleOwner.getPrefObserver(
  * @param observer Observer, which fires the value on every update
  * @param default Default value, if the pref does not exist yet
  *
- * @return LiveData instance
+ * @return LiveData Observer instance
  */
 fun Context.getPrefObserverForViewModel(
         name: String,
@@ -165,6 +197,22 @@ fun Context.getPrefObserverForViewModel(
     observeForever(observer)
 }
 
+/**
+ * Returns a LiveData object for a preference value
+ *
+ * @param context Context for creating instance of SharedPreferences
+ * @param name Name of the observed preference
+ * @param default Default value, if the pref does not exist yet
+ *
+ * @return LiveData instance
+ */
+fun getPreferenceLiveData(
+        context: Context,
+        name: String,
+        default: Boolean = false
+) = LiveSharedPreferences(context.getPrefs()).getBoolean(name, default)
+
+
 
 /**
  * Returns an observer for a preference value
@@ -188,7 +236,7 @@ fun LifecycleOwner.getPrefObserver(
  * @param observer Observer, which fires the value on every update
  * @param default Default value, if the pref does not exist yet
  *
- * @return LiveData instance
+ * @return LiveData Observer instance
  */
 fun Context.getPrefObserverForViewModel(
         name: String,
@@ -198,6 +246,22 @@ fun Context.getPrefObserverForViewModel(
     observeForever(observer)
 }
 
+/**
+ * Returns a LiveData object for a preference value
+ *
+ * @param context Context for creating instance of SharedPreferences
+ * @param name Name of the observed preference
+ * @param default Default value, if the pref does not exist yet
+ *
+ * @return LiveData instance
+ */
+fun getPreferenceLiveData(
+        context: Context,
+        name: String,
+        default: Float = 0f
+) = LiveSharedPreferences(context.getPrefs()).getFloat(name, default)
+
+
 
 /**
  * Returns an observer for a preference value
@@ -231,6 +295,22 @@ fun Context.getPrefObserver(
     observeForever(observer)
 }
 
+/**
+ * Returns a LiveData object for a preference value
+ *
+ * @param context Context for creating instance of SharedPreferences
+ * @param name Name of the observed preference
+ * @param default Default value, if the pref does not exist yet
+ *
+ * @return LiveData instance
+ */
+fun getPreferenceLiveData(
+        context: Context,
+        name: String,
+        default: Long = 0
+) = LiveSharedPreferences(context.getPrefs()).getLong(name, default)
+
+
 
 /**
  * Returns an observer for a preference value
@@ -254,7 +334,7 @@ fun LifecycleOwner.getPrefObserver(
  * @param observer Observer, which fires the value on every update
  * @param default Default value, if the pref does not exist yet
  *
- * @return LiveData instance
+ * @return LiveData Observer instance
  */
 fun Context.getPrefObserverForViewModel(
         name: String,
@@ -264,6 +344,21 @@ fun Context.getPrefObserverForViewModel(
     observeForever(observer)
 }
 
+/**
+ * Returns a LiveData object for a preference value
+ *
+ * @param context Context for creating instance of SharedPreferences
+ * @param name Name of the observed preference
+ * @param default Default value, if the pref does not exist yet
+ *
+ * @return LiveData instance
+ */
+fun getPreferenceLiveData(
+        context: Context,
+        name: String,
+        default: Set<String> = emptySet()
+) = LiveSharedPreferences(context.getPrefs()).getStringSet(name, default)
+
 // -------------------------------- Multiple live preferences -------------------------------
 
 /**
@@ -288,7 +383,7 @@ fun <T> LifecycleOwner.getMultiplePrefObserver(
  * @param observer Observer, which fires the value on every update
  * @param default Default value, if the pref does not exist yet
  *
- * @return LiveData instance
+ * @return LiveData Observer instance
  */
 fun <T> Context.getMultiplePrefObserver(
         names: List<String>,
@@ -296,4 +391,6 @@ fun <T> Context.getMultiplePrefObserver(
         default: T
 ) = LiveSharedPreferences(getPrefs()).listenMultiple(names, default).apply {
     observeForever(observer)
-}
\ No newline at end of file
+}
+
+// L
\ No newline at end of file

From 79d1fde5b83a5270c3c508b360021cf3d0156200 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 12 Apr 2021 09:03:14 +0200
Subject: [PATCH 14/28] Bump aboutlibraries-core from 8.8.4 to 8.8.5 (#131)

Bumps [aboutlibraries-core](https://github.com/mikepenz/AboutLibraries) from 8.8.4 to 8.8.5.
- [Release notes](https://github.com/mikepenz/AboutLibraries/releases)
- [Changelog](https://github.com/mikepenz/AboutLibraries/blob/develop/gradle-release.gradle)
- [Commits](https://github.com/mikepenz/AboutLibraries/compare/v8.8.4...v8.8.5)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 simplesettings/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/simplesettings/build.gradle b/simplesettings/build.gradle
index 6ad3c80f..db321ca3 100644
--- a/simplesettings/build.gradle
+++ b/simplesettings/build.gradle
@@ -47,7 +47,7 @@ dependencies {
     api 'androidx.preference:preference-ktx:1.1.1'
 
     // External dependencies
-    api 'com.mikepenz:aboutlibraries-core:8.8.4'
+    api 'com.mikepenz:aboutlibraries-core:8.8.5'
     api 'com.mikepenz:aboutlibraries:8.8.4@aar'
     api 'com.mikepenz:fastadapter:5.3.5'
     api 'com.github.ibrahimsn98:live-preferences:1.9'

From 83195117606586ddd9ab9e4e3998dc46bf175964 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 12 Apr 2021 13:22:57 +0200
Subject: [PATCH 15/28] Bump aboutlibraries from 8.8.4 to 8.8.5 (#130)

Bumps [aboutlibraries](https://github.com/mikepenz/AboutLibraries) from 8.8.4 to 8.8.5.
- [Release notes](https://github.com/mikepenz/AboutLibraries/releases)
- [Changelog](https://github.com/mikepenz/AboutLibraries/blob/develop/gradle-release.gradle)
- [Commits](https://github.com/mikepenz/AboutLibraries/compare/v8.8.4...v8.8.5)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 simplesettings/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/simplesettings/build.gradle b/simplesettings/build.gradle
index db321ca3..a6f8fc2a 100644
--- a/simplesettings/build.gradle
+++ b/simplesettings/build.gradle
@@ -48,7 +48,7 @@ dependencies {
 
     // External dependencies
     api 'com.mikepenz:aboutlibraries-core:8.8.5'
-    api 'com.mikepenz:aboutlibraries:8.8.4@aar'
+    api 'com.mikepenz:aboutlibraries:8.8.5@aar'
     api 'com.mikepenz:fastadapter:5.3.5'
     api 'com.github.ibrahimsn98:live-preferences:1.9'
     api 'com.github.skydoves:colorpickerpreference:2.0.5'

From 71dce91cf8b6187f9d7ab84d0ed646c09fc304fb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 12 Apr 2021 13:35:43 +0200
Subject: [PATCH 16/28] Bump fastadapter from 5.3.5 to 5.4.0 (#129)

Bumps [fastadapter](https://github.com/mikepenz/FastAdapter) from 5.3.5 to 5.4.0.
- [Release notes](https://github.com/mikepenz/FastAdapter/releases)
- [Changelog](https://github.com/mikepenz/FastAdapter/blob/develop/CHANGELOG.md)
- [Commits](https://github.com/mikepenz/FastAdapter/compare/v5.3.5...v5.4.0)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 simplesettings/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/simplesettings/build.gradle b/simplesettings/build.gradle
index a6f8fc2a..2d487936 100644
--- a/simplesettings/build.gradle
+++ b/simplesettings/build.gradle
@@ -49,7 +49,7 @@ dependencies {
     // External dependencies
     api 'com.mikepenz:aboutlibraries-core:8.8.5'
     api 'com.mikepenz:aboutlibraries:8.8.5@aar'
-    api 'com.mikepenz:fastadapter:5.3.5'
+    api 'com.mikepenz:fastadapter:5.4.0'
     api 'com.github.ibrahimsn98:live-preferences:1.9'
     api 'com.github.skydoves:colorpickerpreference:2.0.5'
 

From 502a12fd8cebf387e42d67eff8324c86f6e1578f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 19 Apr 2021 08:57:43 +0200
Subject: [PATCH 17/28] Bump fastadapter from 5.4.0 to 5.4.1 (#133)

Bumps [fastadapter](https://github.com/mikepenz/FastAdapter) from 5.4.0 to 5.4.1.
- [Release notes](https://github.com/mikepenz/FastAdapter/releases)
- [Changelog](https://github.com/mikepenz/FastAdapter/blob/develop/CHANGELOG.md)
- [Commits](https://github.com/mikepenz/FastAdapter/compare/v5.4.0...v5.4.1)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 simplesettings/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/simplesettings/build.gradle b/simplesettings/build.gradle
index 2d487936..79f935e0 100644
--- a/simplesettings/build.gradle
+++ b/simplesettings/build.gradle
@@ -49,7 +49,7 @@ dependencies {
     // External dependencies
     api 'com.mikepenz:aboutlibraries-core:8.8.5'
     api 'com.mikepenz:aboutlibraries:8.8.5@aar'
-    api 'com.mikepenz:fastadapter:5.4.0'
+    api 'com.mikepenz:fastadapter:5.4.1'
     api 'com.github.ibrahimsn98:live-preferences:1.9'
     api 'com.github.skydoves:colorpickerpreference:2.0.5'
 

From 486b012bb147e81b954dc53d3be63756f0eedfd0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 22 Apr 2021 08:31:35 +0200
Subject: [PATCH 18/28] Bump activity-compose from 1.3.0-alpha06 to
 1.3.0-alpha07 (#136)

Bumps activity-compose from 1.3.0-alpha06 to 1.3.0-alpha07.

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index abb16390..9009a15c 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -65,7 +65,7 @@ dependencies {
     implementation "androidx.compose.material:material:$compose_version"
     implementation "androidx.compose.runtime:runtime-livedata:$compose_version"
     implementation 'androidx.constraintlayout:constraintlayout-compose:1.0.0-alpha05'
-    implementation 'androidx.activity:activity-compose:1.3.0-alpha06'
+    implementation 'androidx.activity:activity-compose:1.3.0-alpha07'
 
     // Test dependencies
     testImplementation 'junit:junit:4.13.2'

From 7141a9577705295f7de9c93bdefc2832dc0ba54f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 22 Apr 2021 08:36:42 +0200
Subject: [PATCH 19/28] Bump activity-ktx from 1.3.0-alpha06 to 1.3.0-alpha07
 (#135)

Bumps activity-ktx from 1.3.0-alpha06 to 1.3.0-alpha07.

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 simplesettings/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/simplesettings/build.gradle b/simplesettings/build.gradle
index 79f935e0..d0efb78c 100644
--- a/simplesettings/build.gradle
+++ b/simplesettings/build.gradle
@@ -40,7 +40,7 @@ dependencies {
     implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
     implementation 'androidx.navigation:navigation-fragment-ktx:2.3.5'
     implementation 'androidx.navigation:navigation-ui-ktx:2.3.5'
-    implementation 'androidx.activity:activity-ktx:1.3.0-alpha06'
+    implementation 'androidx.activity:activity-ktx:1.3.0-alpha07'
 
     // Google dependencies
     api 'com.google.android.material:material:1.3.0'

From 5020902d0e40f5408f9aa6d22c94714092a5514e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 22 Apr 2021 10:53:43 +0200
Subject: [PATCH 20/28] Bump compose_version from 1.0.0-beta04 to 1.0.0-beta05
 (#134)

Bumps `compose_version` from 1.0.0-beta04 to 1.0.0-beta05.

Updates `ui` from 1.0.0-beta04 to 1.0.0-beta05

Updates `ui-tooling` from 1.0.0-beta04 to 1.0.0-beta05

Updates `material` from 1.0.0-beta04 to 1.0.0-beta05

Updates `runtime-livedata` from 1.0.0-beta04 to 1.0.0-beta05

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 587933f0..f29b67d8 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
     ext.library_version = '1.2.0'
     ext.library_version_code = 1200
     ext.kotlin_version = '1.4.32'
-    ext.compose_version = '1.0.0-beta04'
+    ext.compose_version = '1.0.0-beta05'
     repositories {
         google()
         jcenter()

From 321b96f130371aca8420f4f6ddd915be47614050 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 23 Apr 2021 08:53:17 +0200
Subject: [PATCH 21/28] Bump dokka-gradle-plugin from 1.4.30 to 1.4.32 (#137)

Bumps [dokka-gradle-plugin](https://github.com/Kotlin/dokka) from 1.4.30 to 1.4.32.
- [Release notes](https://github.com/Kotlin/dokka/releases)
- [Commits](https://github.com/Kotlin/dokka/compare/v1.4.30...v1.4.32)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index f29b67d8..c17d022a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -16,7 +16,7 @@ buildscript {
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath 'org.jfrog.buildinfo:build-info-extractor-gradle:4.20.0'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
-        classpath 'org.jetbrains.dokka:dokka-gradle-plugin:1.4.30'
+        classpath 'org.jetbrains.dokka:dokka-gradle-plugin:1.4.32'
     }
 }
 

From 62af5c2840a6e42cf0bbf6c8d034fd4d2d04596a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 29 Apr 2021 10:20:01 +0200
Subject: [PATCH 22/28] Bump build-info-extractor-gradle from 4.20.0 to 4.23.4
 (#139)

Bumps [build-info-extractor-gradle](https://github.com/jfrog/build-info) from 4.20.0 to 4.23.4.
- [Release notes](https://github.com/jfrog/build-info/releases)
- [Changelog](https://github.com/jfrog/build-info/blob/master/RELEASE.md)
- [Commits](https://github.com/jfrog/build-info/compare/build-info-gradle-extractor-4.20.0...build-info-gradle-extractor-4.23.4)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index c17d022a..55d43484 100644
--- a/build.gradle
+++ b/build.gradle
@@ -14,7 +14,7 @@ buildscript {
     dependencies {
         classpath 'com.android.tools.build:gradle:7.0.0-alpha14'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath 'org.jfrog.buildinfo:build-info-extractor-gradle:4.20.0'
+        classpath 'org.jfrog.buildinfo:build-info-extractor-gradle:4.23.4'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
         classpath 'org.jetbrains.dokka:dokka-gradle-plugin:1.4.32'
     }

From e36efbe83f3dbfe33ce73079e513b86307d3da22 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 30 Apr 2021 09:06:51 +0200
Subject: [PATCH 23/28] Bump gradle from 7.0.0-alpha14 to 7.0.0-alpha15 (#140)

* Bump gradle from 7.0.0-alpha14 to 7.0.0-alpha15

Bumps gradle from 7.0.0-alpha14 to 7.0.0-alpha15.

Signed-off-by: dependabot[bot] <support@github.com>

* Update Gradle wrapper

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Marc Auberer <marc.auberer@sap.com>
---
 build.gradle                             | 2 +-
 gradle/wrapper/gradle-wrapper.properties | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/build.gradle b/build.gradle
index 55d43484..ced3f80d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -12,7 +12,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.0-alpha14'
+        classpath 'com.android.tools.build:gradle:7.0.0-alpha15'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath 'org.jfrog.buildinfo:build-info-extractor-gradle:4.23.4'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index d9f2b836..8669449c 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Fri Apr 09 02:42:25 CEST 2021
+#Fri Apr 30 09:01:37 CEST 2021
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-rc-2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME

From 24e871807058e94d836a0cfcc71a837765fbbee6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 6 May 2021 18:49:49 +0200
Subject: [PATCH 24/28] Bump compose_version from 1.0.0-beta05 to 1.0.0-beta06
 (#142)

Bumps `compose_version` from 1.0.0-beta05 to 1.0.0-beta06.

Updates `ui` from 1.0.0-beta05 to 1.0.0-beta06

Updates `ui-tooling` from 1.0.0-beta05 to 1.0.0-beta06

Updates `material` from 1.0.0-beta05 to 1.0.0-beta06

Updates `runtime-livedata` from 1.0.0-beta05 to 1.0.0-beta06

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index ced3f80d..70bb0607 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
     ext.library_version = '1.2.0'
     ext.library_version_code = 1200
     ext.kotlin_version = '1.4.32'
-    ext.compose_version = '1.0.0-beta05'
+    ext.compose_version = '1.0.0-beta06'
     repositories {
         google()
         jcenter()

From 5ba7adc85ae3260c87b59810ab1beba458a0b386 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 6 May 2021 18:56:10 +0200
Subject: [PATCH 25/28] Bump core-ktx from 1.5.0-rc01 to 1.5.0-rc02 (#143)

Bumps core-ktx from 1.5.0-rc01 to 1.5.0-rc02.

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 app/build.gradle            | 2 +-
 simplesettings/build.gradle | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 9009a15c..66657797 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -53,7 +53,7 @@ dependencies {
 
     // Base dependencies
     implementation 'androidx.appcompat:appcompat:1.3.0-rc01'
-    implementation 'androidx.core:core-ktx:1.5.0-rc01'
+    implementation 'androidx.core:core-ktx:1.5.0-rc02'
 
     // Google dependencies
     implementation 'com.google.android.material:material:1.3.0'
diff --git a/simplesettings/build.gradle b/simplesettings/build.gradle
index d0efb78c..5ec65d0a 100644
--- a/simplesettings/build.gradle
+++ b/simplesettings/build.gradle
@@ -36,7 +36,7 @@ android {
 dependencies {
     // Base dependencies
     implementation 'androidx.appcompat:appcompat:1.3.0-rc01'
-    implementation 'androidx.core:core-ktx:1.5.0-rc01'
+    implementation 'androidx.core:core-ktx:1.5.0-rc02'
     implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
     implementation 'androidx.navigation:navigation-fragment-ktx:2.3.5'
     implementation 'androidx.navigation:navigation-ui-ktx:2.3.5'

From 104b25cbc53db603ea9b58f753274f18b829a62b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 6 May 2021 19:00:43 +0200
Subject: [PATCH 26/28] Bump constraintlayout-compose from 1.0.0-alpha05 to
 1.0.0-alpha06 (#141)

Bumps [constraintlayout-compose](https://github.com/androidx/constraintlayout) from 1.0.0-alpha05 to 1.0.0-alpha06.
- [Release notes](https://github.com/androidx/constraintlayout/releases)
- [Commits](https://github.com/androidx/constraintlayout/compare/compose-1.0.0-alpha05...compose-1.0.0-alpha06)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 66657797..8a26fdb3 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -64,7 +64,7 @@ dependencies {
     implementation "androidx.compose.ui:ui-tooling:$compose_version"
     implementation "androidx.compose.material:material:$compose_version"
     implementation "androidx.compose.runtime:runtime-livedata:$compose_version"
-    implementation 'androidx.constraintlayout:constraintlayout-compose:1.0.0-alpha05'
+    implementation 'androidx.constraintlayout:constraintlayout-compose:1.0.0-alpha06'
     implementation 'androidx.activity:activity-compose:1.3.0-alpha07'
 
     // Test dependencies

From d3d90e77b1dcceaa870e4349018ba4714756b792 Mon Sep 17 00:00:00 2001
From: Marc Auberer <marc.auberer@chillibits.com>
Date: Wed, 12 May 2021 20:04:07 +0200
Subject: [PATCH 27/28] Add new number picker & dependency upgrades

---
 app/build.gradle                              |  4 +++
 .../simplesettingssample/MainActivity.kt      | 25 ++++++++++---------
 app/src/main/res/xml/preferences.xml          |  3 ++-
 build.gradle                                  |  1 +
 4 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 8a26fdb3..a91abb23 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -6,6 +6,7 @@ plugins {
     id 'com.android.application'
     id 'kotlin-android'
     id 'kotlin-android-extensions'
+    id 'com.mikepenz.aboutlibraries.plugin'
 }
 
 android {
@@ -67,6 +68,9 @@ dependencies {
     implementation 'androidx.constraintlayout:constraintlayout-compose:1.0.0-alpha06'
     implementation 'androidx.activity:activity-compose:1.3.0-alpha07'
 
+    // ChilliBits dependencies
+    implementation 'com.chillibits:composenumberpicker:1.0.3'
+
     // Test dependencies
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.2'
diff --git a/app/src/main/java/com/chillibits/simplesettingssample/MainActivity.kt b/app/src/main/java/com/chillibits/simplesettingssample/MainActivity.kt
index 5ef0d658..65c5cf94 100644
--- a/app/src/main/java/com/chillibits/simplesettingssample/MainActivity.kt
+++ b/app/src/main/java/com/chillibits/simplesettingssample/MainActivity.kt
@@ -10,7 +10,6 @@ import android.net.Uri
 import android.os.Bundle
 import android.view.Menu
 import android.view.MenuItem
-import android.widget.NumberPicker
 import android.widget.Toast
 import androidx.activity.compose.setContent
 import androidx.annotation.IdRes
@@ -18,13 +17,11 @@ import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatActivity
 import androidx.compose.foundation.layout.*
 import androidx.compose.material.*
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
+import androidx.compose.runtime.*
 import androidx.compose.runtime.livedata.observeAsState
 import androidx.compose.ui.Alignment.Companion.CenterHorizontally
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.layout.layoutId
-import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
@@ -35,6 +32,7 @@ import androidx.core.view.WindowCompat
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.preference.Preference
+import com.chillibits.composenumberpicker.HorizontalNumberPicker
 import com.chillibits.simplesettings.clicklistener.DialogClickListener
 import com.chillibits.simplesettings.clicklistener.LibsClickListener
 import com.chillibits.simplesettings.clicklistener.PlayStoreClickListener
@@ -75,8 +73,8 @@ class MainActivity : AppCompatActivity(), SimpleSettingsConfig.OptionsItemSelect
     @Preview(name = "MainView", showSystemUi = true)
     @Composable
     private fun MainView(inputPref: LiveData<String> = MutableLiveData()) {
-        val context = LocalContext.current
         val inputPrefState by inputPref.observeAsState()
+        val numberSwitchPreferences = remember { mutableStateOf(3) }
 
         ConstraintLayout(
             constraintSet = ConstraintSet {
@@ -95,18 +93,21 @@ class MainActivity : AppCompatActivity(), SimpleSettingsConfig.OptionsItemSelect
                 val componentModifiers = Modifier
                     .align(CenterHorizontally)
                     .padding(6.dp)
-                lateinit var picker: NumberPicker
 
                 Row(modifier = componentModifiers) {
                     Text(stringResource(R.string.number_of_switch_preferences))
-                    picker = NumberPicker(context).apply {
-                        minValue = 1
-                        maxValue = 10
-                        value = 3
-                    }
+                }
+                Row(modifier = componentModifiers) {
+                    HorizontalNumberPicker(
+                        min = 1,
+                        max = 10,
+                        default = 3,
+                        modifier = Modifier.padding(10.dp),
+                        onValueChange = { numberSwitchPreferences.value = it }
+                    )
                 }
                 Button(
-                    onClick = { openSettingsCodeConfig(picker.value) },
+                    onClick = { openSettingsCodeConfig(numberSwitchPreferences.value) },
                     modifier = componentModifiers,
                 ) {
                     Text(
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index a1249b2a..85d3143f 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -38,7 +38,8 @@
             app:title="@string/libsPreferenceTitle"
             app:summary="@string/libsPreferenceSummary"
             app:sort="true"
-            app:activity_title="@string/app_name"/>
+            app:activity_title="@string/app_name"
+            app:about_show_version="false"/>
 
         <ListPreference
             app:key="list_preference"
diff --git a/build.gradle b/build.gradle
index 70bb0607..ebeb24eb 100644
--- a/build.gradle
+++ b/build.gradle
@@ -13,6 +13,7 @@ buildscript {
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:7.0.0-alpha15'
+        classpath 'com.mikepenz.aboutlibraries.plugin:aboutlibraries-plugin:8.3.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath 'org.jfrog.buildinfo:build-info-extractor-gradle:4.23.4'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'

From 33732f082075a9c6493a654a9ba23ff3bc1173d2 Mon Sep 17 00:00:00 2001
From: Marc Auberer <marc.auberer@chillibits.com>
Date: Wed, 12 May 2021 20:32:36 +0200
Subject: [PATCH 28/28] Migrate to Maven Central

---
 .github/workflows/ci.yml         |  16 ++---
 .github/workflows/publish.yml    |  66 +++++++++---------
 .gitignore                       |   3 +-
 README.md                        |   4 +-
 app/build.gradle                 |  16 ++---
 build.gradle                     |  12 ++--
 gradle-release.gradle            | 111 +++++++++++++++++++++++++++++++
 gradle.properties                |  17 +++++
 simplesettings/build.gradle      |  93 +++-----------------------
 simplesettings/gradle.properties |   4 ++
 10 files changed, 201 insertions(+), 141 deletions(-)
 create mode 100644 gradle-release.gradle
 create mode 100644 simplesettings/gradle.properties

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 9390bdd7..102a8af6 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -12,13 +12,9 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - name: Checkout
-      uses: actions/checkout@v2
-    - name: Make gradlew executable
-      run: chmod +x ./gradlew
-    - name: Prepare publishing environment
-      run: mkdir ~/.gradle && echo "$ARTIFACTORY_CREDENTIALS" > ./simplesettings/gradle.properties
-      env:
-        ARTIFACTORY_CREDENTIALS: ${{ secrets.ARTIFACTORY_CREDENTIALS }}
-    - name: Android Build
-      run: ./gradlew assembleDebug
\ No newline at end of file
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Make gradlew executable
+        run: chmod +x ./gradlew
+      - name: Android Build
+        run: ./gradlew assembleDebug
\ No newline at end of file
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index d3cff27d..0d2e8739 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -1,44 +1,46 @@
 # Workflow for Android CI release
 
-name: Publish to Artifactory
+name: Publish to Sonatype
 
 on:
-  release:
-    types: [ published ]
+  push:
+    tags:
+      - '*'
 
 jobs:
   publish:
+    name: Release build and publish
     runs-on: ubuntu-latest
-
     steps:
-      - name: Get version name
-        id: get_version
-        uses: battila7/get-version-action@v2
-      - name: Checkout code
+      - name: Check out code
         uses: actions/checkout@v2
-        with:
-          persist-credentials: false  # Avoids messing up PagesDeployAction
-      - name: Configure JDK
-        uses: actions/setup-java@v1
-        with:
-          java-version: 1.8
+
       - name: Make gradlew executable
-        run: chmod +x gradlew
-      - name: Prepare publishing environment
-        run: mkdir ~/.gradle && echo "$ARTIFACTORY_CREDENTIALS" > ./simplesettings/gradle.properties
-        env:
-          ARTIFACTORY_CREDENTIALS: ${{ secrets.ARTIFACTORY_CREDENTIALS }}
-      - name: Publish Dev
-        if: ${{ contains(steps.get_version.outputs.version, 'alpha') }}
-        run: ./gradlew simplesettings:assemble dokkaHtml
-      - name: Publish
-        if: ${{ !contains(steps.get_version.outputs.version, 'alpha') }}
-        run: ./gradlew simplesettings:assemble -PparamEnv=RELEASE dokkaHtml
-      - name: Deploy Documentation
-        uses: JamesIves/github-pages-deploy-action@3.6.2
+        run: chmod +x ./gradlew
+
+      - name: Set up JDK 11
+        uses: actions/setup-java@v2
         with:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          BRANCH: gh-pages
-          FOLDER: simplesettings/build/dokka/html
-          TARGET_FOLDER: docs
-          CLEAN: true
\ No newline at end of file
+          distribution: zulu
+          java-version: 11
+
+      - name: Prepare environment
+        env:
+          SONATYPE_GPG_FILE_CONTENTS: ${{ secrets.SONATYPE_GPG_FILE_CONTENTS }}
+          SONATYPE_GPG_FILE: ${{ secrets.SONATYPE_GPG_FILE }}
+        run: |
+          git fetch --unshallow
+          sudo bash -c "echo '$SONATYPE_GPG_FILE_CONTENTS' | base64 -d > '$SONATYPE_GPG_FILE'"
+
+      - name: Release build
+        run: ./gradlew simplesettings:assembleRelease
+
+      - name: Publish to MavenCentral
+        run: ./gradlew simplesettings:publishReleasePublicationToSonatypeRepository -Plibrary_only --no-configure-on-demand --no-parallel dokkaHtml
+        env:
+          NEXUS_USERNAME: ${{ secrets.NEXUS_USERNAME }}
+          NEXUS_PASSWORD: ${{ secrets.NEXUS_PASSWORD }}
+          SONATYPE_GPG_KEY: ${{ secrets.SONATYPE_GPG_KEY }}
+          SONATYPE_GPG_PASS: ${{ secrets.SONATYPE_GPG_PASS }}
+          SONATYPE_GPG_FILE: ${{ secrets.SONATYPE_GPG_FILE }}
+          SONATYPE_STAGING_PROFILE_ID: ${{ secrets.SONATYPE_STAGING_PROFILE_ID }}
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index 2bd7a270..28cd9887 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,5 +6,4 @@
 /build
 /captures
 .externalNativeBuild
-.cxx
-simplesettings/gradle.properties
\ No newline at end of file
+.cxx
\ No newline at end of file
diff --git a/README.md b/README.md
index a0172544..5ca16ee7 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,5 @@
 # Simple Settings Library for Android
+[![Maven Central](https://img.shields.io/maven-central/v/com.chillibits/simplesettings.svg?label=Maven%20Central)](https://search.maven.org/search?q=g:%22com.chillibits%22%20AND%20a:%22simplesettings%22)
 ![GitHub release](https://img.shields.io/github/v/release/marcauberer/simple-settings?include_prereleases)
 ![Android CI](https://github.com/marcauberer/simple-settings/workflows/Android%20CI/badge.svg)
 [![API](https://img.shields.io/badge/API-21%2B-red.svg?style=flat)](https://android-arsenal.com/api?level=21)
@@ -21,7 +22,6 @@ Add repository to build.gradle file on project level:
 allprojects {
     repositories {
         ...
-        maven { url "https://repo.chillibits.com/artifactory/android" }
         maven { url "https://jitpack.io" }
     }
 }
@@ -29,7 +29,7 @@ allprojects {
 
 Add dependencies to build.gradle file on module level (e.g. app/build.gradle):
 ```gradle
-implementation 'com.chillibits:simplesettings:1.2.0'
+implementation 'com.chillibits:simplesettings:1.3.0'
 
 // Required dependencies
 implementation 'com.google.android.material:material:<latest-version>'
diff --git a/app/build.gradle b/app/build.gradle
index a91abb23..734cd8ff 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -17,8 +17,8 @@ android {
         applicationId "com.chillibits.simplesettingssample"
         minSdkVersion 21
         targetSdkVersion 30
-        versionCode library_version_code
-        versionName library_version
+        versionCode libraryVersionCode
+        versionName libraryVersion
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
@@ -43,8 +43,8 @@ android {
         jvmTarget = "1.8"
     }
     composeOptions {
-        kotlinCompilerExtensionVersion compose_version
-        kotlinCompilerVersion '1.4.30'
+        kotlinCompilerExtensionVersion composeVersion
+        kotlinCompilerVersion '1.4.32'
     }
 }
 
@@ -61,10 +61,10 @@ dependencies {
     implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
 
     // Jetpack Compose
-    implementation "androidx.compose.ui:ui:$compose_version"
-    implementation "androidx.compose.ui:ui-tooling:$compose_version"
-    implementation "androidx.compose.material:material:$compose_version"
-    implementation "androidx.compose.runtime:runtime-livedata:$compose_version"
+    implementation "androidx.compose.ui:ui:$composeVersion"
+    implementation "androidx.compose.ui:ui-tooling:$composeVersion"
+    implementation "androidx.compose.material:material:$composeVersion"
+    implementation "androidx.compose.runtime:runtime-livedata:$composeVersion"
     implementation 'androidx.constraintlayout:constraintlayout-compose:1.0.0-alpha06'
     implementation 'androidx.activity:activity-compose:1.3.0-alpha07'
 
diff --git a/build.gradle b/build.gradle
index ebeb24eb..01c080ef 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3,10 +3,12 @@
  */
 
 buildscript {
-    ext.library_version = '1.2.0'
-    ext.library_version_code = 1200
-    ext.kotlin_version = '1.4.32'
-    ext.compose_version = '1.0.0-beta06'
+    ext {
+        libraryVersion = "$VERSION"
+        libraryVersionCode = Integer.parseInt(rootProject.properties["VERSION_CODE"])
+        kotlinVersion = '1.4.32'
+        composeVersion = '1.0.0-beta06'
+    }
     repositories {
         google()
         jcenter()
@@ -14,7 +16,7 @@ buildscript {
     dependencies {
         classpath 'com.android.tools.build:gradle:7.0.0-alpha15'
         classpath 'com.mikepenz.aboutlibraries.plugin:aboutlibraries-plugin:8.3.0'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
         classpath 'org.jfrog.buildinfo:build-info-extractor-gradle:4.23.4'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
         classpath 'org.jetbrains.dokka:dokka-gradle-plugin:1.4.32'
diff --git a/gradle-release.gradle b/gradle-release.gradle
new file mode 100644
index 00000000..1afd1919
--- /dev/null
+++ b/gradle-release.gradle
@@ -0,0 +1,111 @@
+/*
+ * Copyright © Marc Auberer 2021. All rights reserved
+ */
+
+apply plugin: 'maven-publish'
+apply plugin: 'signing'
+
+ext["signing.keyId"] = project.hasProperty('sonatype.gpg.key') ? project.property('sonatype.gpg.key') : System.getenv('SONATYPE_GPG_KEY')
+ext["signing.password"] = project.hasProperty('sonatype.gpg.password') ? project.property('sonatype.gpg.password') : System.getenv('SONATYPE_GPG_PASS')
+ext["signing.secretKeyRingFile"] = project.hasProperty('sonatype.gpg.secretKeyRingFile') ? project.property('sonatype.gpg.secretKeyRingFile') : System.getenv('SONATYPE_GPG_FILE')
+
+@SuppressWarnings("GroovyUnusedDeclaration")
+def getRepositoryUsername() {
+    return project.hasProperty('NEXUS_USERNAME') ? project.property('NEXUS_USERNAME') : System.getenv('NEXUS_USERNAME')
+}
+
+@SuppressWarnings("GroovyUnusedDeclaration")
+def getRepositoryPassword() {
+    return project.hasProperty('NEXUS_PASSWORD') ? project.property('NEXUS_PASSWORD') : System.getenv('NEXUS_PASSWORD')
+}
+
+afterEvaluate { project ->
+    if (JavaVersion.current().isJava8Compatible()) {
+        allprojects {
+            tasks.withType(Javadoc) {
+                options.addStringOption('Xdoclint:none', '-quiet')
+            }
+        }
+    }
+
+    task androidJavadocs(type: Javadoc) {
+        failOnError = false
+        source = android.sourceSets.main.java.source
+        classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
+    }
+
+    task androidJavadocsJar(type: Jar, dependsOn: androidJavadocs) {
+        from androidJavadocs.destinationDir
+        archiveClassifier.set('javadoc')
+    }
+
+    task androidSourcesJar(type: Jar) {
+        from android.sourceSets.main.java.srcDirs
+        archiveClassifier.set('sources')
+    }
+
+    def pomConfig = {
+        licenses {
+            license {
+                name POM_LICENCE_NAME
+                url POM_LICENCE_URL
+                distribution POM_LICENCE_DIST
+            }
+        }
+        developers {
+            developer {
+                id POM_DEVELOPER_ID
+                name POM_DEVELOPER_NAME
+                email 'marc.auberer@chillibits.com'
+            }
+        }
+        scm {
+            url POM_SCM_URL
+            connection POM_SCM_CONNECTION
+            developerConnection POM_SCM_DEV_CONNECTION
+        }
+    }
+
+    publishing {
+        publications {
+            release(MavenPublication) {
+                from components.release
+
+                groupId GROUP
+                artifactId POM_ARTIFACT_ID
+                version android.defaultConfig.versionName
+
+                artifact androidSourcesJar
+                artifact androidJavadocsJar
+
+                pom.withXml {
+                    asNode().appendNode('name', POM_NAME)
+                    asNode().appendNode('description', POM_DESCRIPTION)
+                    asNode().appendNode('url', POM_SCM_URL)
+                    asNode().children().last() + pomConfig
+
+                    // we want dependencies as compile, to ensure they are transitively resolved
+                    asNode().dependencies.'*'.findAll() { it.scope.text() == 'runtime' }.each { it.scope*.value = 'compile' }
+                }
+            }
+        }
+
+        repositories {
+            maven {
+                name = "sonatype"
+                def releasesRepoUrl = "https://oss.sonatype.org/service/local/staging/deploy/maven2/"
+                def snapshotsRepoUrl = "https://oss.sonatype.org/content/repositories/snapshots/"
+                url = version.endsWith('SNAPSHOT') ? snapshotsRepoUrl : releasesRepoUrl
+
+                credentials {
+                    username getRepositoryUsername()
+                    password getRepositoryPassword()
+                }
+            }
+        }
+    }
+}
+
+signing {
+    sign publishing.publications
+}
\ No newline at end of file
diff --git a/gradle.properties b/gradle.properties
index 7e11dd45..37a44384 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -15,3 +15,20 @@ kotlin.code.style=official
 org.gradle.jvmargs=-Xmx2048M -Dkotlin.daemon.jvm.options\="-Xmx2048M"
 android.useAndroidX=true
 android.enableJetifier=true
+
+# Custom settings
+GROUP=com.chillibits
+VERSION=1.3.0
+VERSION_CODE=1300
+POM_URL=https://github.com/marcauberer/simple-settings
+POM_SCM_URL=https://github.com/marcauberer/simple-settings
+POM_SCM_CONNECTION=scm:git@github.com:marcauberer/simple-settings.git
+POM_SCM_DEV_CONNECTION=scm:git@github.com:marcauberer/simple-settings.git
+POM_SCM_URL_ISSUES=https://github.com/marcauberer/simple-settings/issues
+POM_GITHUB_REPO=marcauberer/simple-settings
+POM_GITHUB_README=README.md
+POM_LICENCE_NAME=MIT
+POM_LICENCE_URL=https://opensource.org/licenses/MIT
+POM_LICENCE_DIST=repo
+POM_DEVELOPER_ID=marcauberer
+POM_DEVELOPER_NAME=Marc Auberer
\ No newline at end of file
diff --git a/simplesettings/build.gradle b/simplesettings/build.gradle
index 5ec65d0a..485094d5 100644
--- a/simplesettings/build.gradle
+++ b/simplesettings/build.gradle
@@ -6,9 +6,6 @@ plugins {
     id 'com.android.library'
     id 'kotlin-android'
     id 'kotlin-android-extensions'
-    id 'com.jfrog.artifactory'
-    id 'maven-publish'
-    //id 'android-maven'
     id 'org.jetbrains.dokka'
 }
 
@@ -19,18 +16,24 @@ android {
     defaultConfig {
         minSdkVersion 21
         targetSdkVersion 30
-        versionCode library_version_code
-        versionName library_version
+        versionCode libraryVersionCode
+        versionName libraryVersion
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles 'consumer-rules.pro'
     }
-
     buildTypes {
         release {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+
+    // specify the artifactId as module-name for kotlin
+    kotlinOptions.freeCompilerArgs += ["-module-name", POM_ARTIFACT_ID]
 }
 
 dependencies {
@@ -63,80 +66,6 @@ dokkaHtml.configure {
     dokkaSourceSets {}
 }
 
-task sourcesJar(type: Jar) {
-    from android.sourceSets.main.java.srcDirs
-    archiveClassifier = "sources"
-}
-
-publishing {
-    publications {
-        android.libraryVariants.all { variant ->
-            def filename = "${archivesBaseName}-${variant.baseName}"
-            "${variant.name}"(MavenPublication) {
-                groupId 'com.chillibits'
-                artifactId = "simplesettings"
-                if (project.hasProperty('paramEnv') && project.property('paramEnv') != 'RELEASE' || variant.name != "release") {
-                    groupId "com.chillibits.${variant.name}"
-                }
-                version = "${android.defaultConfig.versionName}"
-                if (variant.buildType.name == "debug") {
-                    artifact(sourcesJar)
-                }
-                artifact file("$buildDir/outputs/aar/${filename}.aar")
-                pom.withXml {
-                    // for dependencies and exclusions
-                    def dependenciesNode = asNode().appendNode('dependencies')
-                    def configurationNames = ["implementation", "api", "runtimeOnly"]
-                    configurationNames.each { confName ->
-                        configurations[confName].allDependencies.each {
-                            def dependencyNode = dependenciesNode.appendNode('dependency')
-                            dependencyNode.appendNode('groupId', it.group)
-                            dependencyNode.appendNode('artifactId', it.name)
-                            dependencyNode.appendNode('version', it.version)
-                            if (it.excludeRules.size() > 0) {
-                                def exclusionsNode = dependencyNode.appendNode('exclusions')
-                                it.excludeRules.each { rule ->
-                                    def exclusionNode = exclusionsNode.appendNode('exclusion')
-                                    exclusionNode.appendNode('groupId', rule.group)
-                                    exclusionNode.appendNode('artifactId', rule.module)
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-}
-assemble.finalizedBy(artifactoryPublish)
-artifactory {
-    contextUrl = "${artifactory_context_url}"
-    publish {
-        repository {
-            repoKey = "${artifactory_dev_repo_key}"
-            if (project.hasProperty('paramEnv') && project.property('paramEnv') == 'RELEASE') {
-                repoKey = "${artifactory_rel_repo_key}"
-            }
-            username = "${artifactory_user}"
-            password = "${artifactory_password}"
-            maven = true
-        }
-        defaults {
-            if (project.hasProperty('paramEnv') && project.property('paramEnv') == 'RELEASE') {
-                publications('release')
-            } else {
-                publications('debug', 'release')
-            }
-            publishArtifacts = true
-            publishPom = true
-        }
-    }
-    resolve {
-        repository {
-            repoKey = "${artifactory_rel_repo_key}"
-            username = "${artifactory_user}"
-            password = "${artifactory_password}"
-            maven = true
-        }
-    }
+if (project.hasProperty('pushall') || project.hasProperty('library_only')) {
+    apply from: '../gradle-release.gradle'
 }
\ No newline at end of file
diff --git a/simplesettings/gradle.properties b/simplesettings/gradle.properties
new file mode 100644
index 00000000..02e82e08
--- /dev/null
+++ b/simplesettings/gradle.properties
@@ -0,0 +1,4 @@
+POM_NAME=Simple Settings
+POM_DESCRIPTION=Simple Settings library for Android.
+POM_ARTIFACT_ID=simplesettings
+POM_PACKAGING=aar
\ No newline at end of file