Merge pull request #255 from marcauberer/dev

Release of version 1.3.4
marcauberer · Mar 5, 2022 · c2fca8c · c2fca8c
2 parents ee00a38 + c1753d7
commit c2fca8c
Show file tree

Hide file tree

Showing 82 changed files with 231 additions and 166 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -1,20 +1,24 @@
 # Workflow for Android CI debug build
-
 name: Android CI
 
 on:
   push:
   pull_request:
-    branches: [ main, beta, dev ]
+    branches:
+      - main
+      - beta
+      - dev
 
 jobs:
   build:
     runs-on: ubuntu-latest
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
+
       - name: Make gradlew executable
-        run: chmod +x ./gradlew
+        run: chmod +x gradlew
+
       - name: Android Build
-        run: ./gradlew assembleDebug
+        run: ./gradlew build
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -1,5 +1,4 @@
 # Workflow for Android CI release
-
 name: Publish to Sonatype
 
 on:
@@ -12,11 +11,11 @@ jobs:
     name: Release build and publish
     runs-on: ubuntu-latest
     steps:
-      - name: Check out code
-        uses: actions/checkout@v2
+      - name: Checkout
+        uses: actions/checkout@v3
 
       - name: Make gradlew executable
-        run: chmod +x ./gradlew
+        run: chmod +x gradlew
 
       - name: Set up JDK 11
         uses: actions/setup-java@v2

diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2020-2021 Marc Auberer
+Copyright (c) 2020-2022 Marc Auberer
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/README.md b/README.md
@@ -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.3.3'
+implementation 'com.chillibits:simplesettings:1.3.4'
 
 // Required dependencies
 implementation 'com.google.android.material:material:<latest-version>'
@@ -284,4 +284,4 @@ If you want to contribute to this project, please feel free to send us a pull re
 ## Credits
 Thanks to all contributors and translators!
 
-© Marc Auberer 2020-2021
+© Marc Auberer 2020-2022
diff --git a/app/build.gradle b/app/build.gradle
@@ -1,5 +1,5 @@
 /*
- * Copyright © Marc Auberer 2020-2021. All rights reserved
+ * Copyright © Marc Auberer 2020-2022. All rights reserved
  */
 
 plugins {
@@ -9,13 +9,13 @@ plugins {
 }
 
 android {
-    compileSdk 30
-    buildToolsVersion "30.0.3"
+    compileSdk 32
+    buildToolsVersion "32.0.0"
 
     defaultConfig {
         applicationId "com.chillibits.simplesettingssample"
         minSdk 21
-        targetSdk 30
+        targetSdk 31
         versionCode libraryVersionCode
         versionName libraryVersion
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -49,20 +49,20 @@ dependencies {
     implementation project(':simplesettings')
 
     // Base dependencies
-    implementation 'androidx.appcompat:appcompat:1.3.1'
-    implementation 'androidx.core:core-ktx:1.6.0'
+    implementation 'androidx.appcompat:appcompat:1.4.1'
+    implementation 'androidx.core:core-ktx:1.7.0'
 
     // Google dependencies
-    implementation 'com.google.android.material:material:1.4.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.0'
+    implementation 'com.google.android.material:material:1.5.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
 
     // Jetpack Compose
     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-beta02'
-    implementation 'androidx.activity:activity-compose:1.3.1'
+    implementation 'androidx.constraintlayout:constraintlayout-compose:1.0.0'
+    implementation 'androidx.activity:activity-compose:1.4.0'
 
     // ChilliBits dependencies
     implementation 'com.chillibits:composenumberpicker:1.1.0'

diff --git a/app/src/androidTest/java/com/chillibits/simplesettingssample/ExampleInstrumentedTest.kt b/app/src/androidTest/java/com/chillibits/simplesettingssample/ExampleInstrumentedTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright © Marc Auberer 2020-2021. All rights reserved
+ * Copyright © Marc Auberer 2020-2022. All rights reserved
  */
 
 package com.chillibits.simplesettingssample

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -1,4 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright © Marc Auberer 2020-2022. All rights reserved
+  -->
+
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.chillibits.simplesettingssample"
     android:installLocation="auto" >

diff --git a/app/src/main/java/com/chillibits/simplesettingssample/MainActivity.kt b/app/src/main/java/com/chillibits/simplesettingssample/MainActivity.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright © Marc Auberer 2020-2021. All rights reserved
+ * Copyright © Marc Auberer 2020-2022. All rights reserved
  */
 
 package com.chillibits.simplesettingssample
@@ -58,7 +58,7 @@ class MainActivity : AppCompatActivity(), SimpleSettingsConfig.OptionsItemSelect
         }
     }
 
-    override fun onCreateOptionsMenu(menu: Menu?): Boolean {
+    override fun onCreateOptionsMenu(menu: Menu): Boolean {
         menuInflater.inflate(R.menu.menu_activity_main, menu)
         return super.onCreateOptionsMenu(menu)
     }
@@ -92,7 +92,7 @@ class MainActivity : AppCompatActivity(), SimpleSettingsConfig.OptionsItemSelect
             Column(modifier = Modifier.layoutId("layout")) {
                 val componentModifiers = Modifier
                     .align(CenterHorizontally)
-                    .padding(6.dp)
+                    .padding(4.dp)
 
                 Row(modifier = componentModifiers) {
                     Text(stringResource(R.string.number_of_switch_preferences))
@@ -356,15 +356,12 @@ class MainActivity : AppCompatActivity(), SimpleSettingsConfig.OptionsItemSelect
 
     override fun onDialogButtonClicked(button: DialogClickListener.Button) {
         when(button) {
-            DialogClickListener.Button.POSITIVE -> {
+            DialogClickListener.Button.POSITIVE ->
                 Toast.makeText(this, R.string.yes, Toast.LENGTH_SHORT).show()
-            }
-            DialogClickListener.Button.NEGATIVE -> {
+            DialogClickListener.Button.NEGATIVE ->
                 Toast.makeText(this, R.string.no, Toast.LENGTH_SHORT).show()
-            }
-            DialogClickListener.Button.NEUTRAL -> {
+            DialogClickListener.Button.NEUTRAL ->
                 Toast.makeText(this, R.string.cancel, Toast.LENGTH_SHORT).show()
-            }
         }
     }
 

diff --git a/app/src/main/java/com/chillibits/simplesettingssample/Theming.kt b/app/src/main/java/com/chillibits/simplesettingssample/Theming.kt
@@ -1,3 +1,7 @@
+/*
+ * Copyright © Marc Auberer 2020-2022. All rights reserved
+ */
+
 package com.chillibits.simplesettingssample
 
 import androidx.compose.foundation.isSystemInDarkTheme

diff --git a/app/src/main/res/drawable/android.xml b/app/src/main/res/drawable/android.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright © Marc Auberer 2020-2021. All rights reserved
+  ~ Copyright © Marc Auberer 2020-2022. All rights reserved
   -->
 
 <vector xmlns:android="http://schemas.android.com/apk/res/android"

diff --git a/app/src/main/res/drawable/github.xml b/app/src/main/res/drawable/github.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  ~ Copyright © Marc Auberer 2021. All rights reserved
+  ~ Copyright © Marc Auberer 2020-2022. All rights reserved
   -->
 
 <vector xmlns:android="http://schemas.android.com/apk/res/android"

diff --git a/app/src/main/res/drawable/header_gradient.xml b/app/src/main/res/drawable/header_gradient.xml
@@ -1,4 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright © Marc Auberer 2020-2022. All rights reserved
+  -->
+
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <gradient
         android:startColor="@color/colorPrimaryVariant"

diff --git a/app/src/main/res/drawable/ic_launcher_foreground.xml b/app/src/main/res/drawable/ic_launcher_foreground.xml
@@ -1,3 +1,7 @@
+<!--
+  ~ Copyright © Marc Auberer 2020-2022. All rights reserved
+  -->
+
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="108dp"
     android:height="108dp"

diff --git a/app/src/main/res/drawable/settings.xml b/app/src/main/res/drawable/settings.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright © Marc Auberer 2020-2021. All rights reserved
+  ~ Copyright © Marc Auberer 2020-2022. All rights reserved
   -->
 
 <vector xmlns:android="http://schemas.android.com/apk/res/android"

diff --git a/app/src/main/res/drawable/share_white.xml b/app/src/main/res/drawable/share_white.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright © Marc Auberer 2020-2021. All rights reserved
+  ~ Copyright © Marc Auberer 2020-2022. All rights reserved
   -->
 
 <vector android:height="24dp" android:tint="#FFFFFF"

diff --git a/app/src/main/res/drawable/star_border_white.xml b/app/src/main/res/drawable/star_border_white.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright © Marc Auberer 2020-2021. All rights reserved
+  ~ Copyright © Marc Auberer 2020-2022. All rights reserved
   -->
 
 <vector android:height="24dp" android:tint="#FFFFFF"

diff --git a/app/src/main/res/layout/header.xml b/app/src/main/res/layout/header.xml
@@ -1,4 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright © Marc Auberer 2020-2022. All rights reserved
+  -->
+
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="240dp"

diff --git a/app/src/main/res/layout/toolbar.xml b/app/src/main/res/layout/toolbar.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright © Marc Auberer 2020-2021. All rights reserved
+  ~ Copyright © Marc Auberer 2020-2022. All rights reserved
   -->
 
 <androidx.appcompat.widget.Toolbar

diff --git a/app/src/main/res/menu/menu_activity_main.xml b/app/src/main/res/menu/menu_activity_main.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright © Marc Auberer 2021. All rights reserved
+  ~ Copyright © Marc Auberer 2020-2022. All rights reserved
   -->
 
 <menu

diff --git a/app/src/main/res/menu/menu_settings.xml b/app/src/main/res/menu/menu_settings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright © Marc Auberer 2020-2021. All rights reserved
+  ~ Copyright © Marc Auberer 2020-2022. All rights reserved
   -->
 
 <menu

diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -1,4 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright © Marc Auberer 2020-2022. All rights reserved
+  -->
+
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@color/ic_launcher_background"/>
     <foreground android:drawable="@drawable/ic_launcher_foreground"/>

diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -1,4 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright © Marc Auberer 2020-2022. All rights reserved
+  -->
+
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@color/ic_launcher_background"/>
     <foreground android:drawable="@drawable/ic_launcher_foreground"/>

diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright © Marc Auberer 2020-2021. All rights reserved
+  ~ Copyright © Marc Auberer 2020-2022. All rights reserved
   -->
 
 <resources>

diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright © Marc Auberer 2020-2021. All rights reserved
+  ~ Copyright © Marc Auberer 2020-2022. All rights reserved
   -->
 
 <resources>

diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright © Marc Auberer 2020-2021. All rights reserved
+  ~ Copyright © Marc Auberer 2020-2022. All rights reserved
   -->
 
 <resources>

diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright © Marc Auberer 2020-2021. All rights reserved
+  ~ Copyright © Marc Auberer 2020-2022. All rights reserved
   -->
 
 <resources>

diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright © Marc Auberer 2020-2021. All rights reserved
+  ~ Copyright © Marc Auberer 2020-2022. All rights reserved
   -->
 
 <resources>

diff --git a/app/src/main/res/values/ic_launcher_background.xml b/app/src/main/res/values/ic_launcher_background.xml
@@ -1,4 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright © Marc Auberer 2020-2022. All rights reserved
+  -->
+
 <resources>
     <color name="ic_launcher_background">#3DDC84</color>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright © Marc Auberer 2020-2021. All rights reserved
+  ~ Copyright © Marc Auberer 2020-2022. All rights reserved
   -->
 
 <resources>

diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright © Marc Auberer 2020-2021. All rights reserved
+  ~ Copyright © Marc Auberer 2020-2022. All rights reserved
   -->
 
 <resources>

diff --git a/app/src/main/res/values/uris.xml b/app/src/main/res/values/uris.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright © Marc Auberer 2020-2021. All rights reserved
+  ~ Copyright © Marc Auberer 2020-2022. All rights reserved
   -->
 
 <resources>

diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright © Marc Auberer 2020-2021. All rights reserved
+  ~ Copyright © Marc Auberer 2020-2022. All rights reserved
   -->
 
 <PreferenceScreen xmlns:app="http://schemas.android.com/apk/res-auto"

diff --git a/app/src/test/java/com/chillibits/simplesettingssample/ExampleUnitTest.kt b/app/src/test/java/com/chillibits/simplesettingssample/ExampleUnitTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright © Marc Auberer 2020-2021. All rights reserved
+ * Copyright © Marc Auberer 2020-2022. All rights reserved
  */
 
 package com.chillibits.simplesettingssample