From 7b76b7290ce256f0fad406029554fa4896a73e27 Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Sat, 24 Dec 2022 23:04:51 +0100
Subject: [PATCH] updating commons, increasing min SDK to 23
---
app/build.gradle | 4 ++--
app/src/main/AndroidManifest.xml | 16 ++++------------
.../notes/pro/databases/NotesDatabase.kt | 2 +-
3 files changed, 7 insertions(+), 15 deletions(-)
diff --git a/app/build.gradle b/app/build.gradle
index d131fa16..d89281c2 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -14,7 +14,7 @@ android {
defaultConfig {
applicationId "com.simplemobiletools.notes.pro"
- minSdkVersion 21
+ minSdkVersion 23
targetSdkVersion 33
versionCode 99
versionName "6.14.1"
@@ -63,7 +63,7 @@ android {
}
dependencies {
- implementation 'com.github.SimpleMobileTools:Simple-Commons:a1ecb048c0'
+ implementation 'com.github.SimpleMobileTools:Simple-Commons:6323be1fd7'
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
implementation 'androidx.documentfile:documentfile:1.0.1'
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 20d01af8..f1f26f9e 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -29,6 +29,7 @@
<activity
android:name=".activities.MainActivity"
+ android:configChanges="orientation"
android:exported="true"
android:launchMode="singleTask">
@@ -57,30 +58,21 @@
<activity
android:name="com.simplemobiletools.commons.activities.AboutActivity"
+ android:configChanges="orientation"
android:exported="false"
android:label="@string/about"
android:parentActivityName=".activities.MainActivity" />
<activity
android:name="com.simplemobiletools.commons.activities.CustomizationActivity"
+ android:configChanges="orientation"
android:exported="false"
android:label="@string/customize_colors"
android:parentActivityName=".activities.SettingsActivity" />
- <activity
- android:name="com.simplemobiletools.commons.activities.LicenseActivity"
- android:exported="false"
- android:label="@string/third_party_licences"
- android:parentActivityName="com.simplemobiletools.commons.activities.AboutActivity" />
-
- <activity
- android:name="com.simplemobiletools.commons.activities.FAQActivity"
- android:exported="false"
- android:label="@string/frequently_asked_questions"
- android:parentActivityName="com.simplemobiletools.commons.activities.AboutActivity" />
-
<activity
android:name=".activities.SettingsActivity"
+ android:configChanges="orientation"
android:exported="true"
android:label="@string/settings"
android:parentActivityName=".activities.MainActivity">
diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/databases/NotesDatabase.kt b/app/src/main/kotlin/com/simplemobiletools/notes/pro/databases/NotesDatabase.kt
index 8b459dc8..e54611a8 100644
--- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/databases/NotesDatabase.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/notes/pro/databases/NotesDatabase.kt
@@ -28,7 +28,7 @@ abstract class NotesDatabase : RoomDatabase() {
private var defaultWidgetBgColor = 0
fun getInstance(context: Context): NotesDatabase {
- defaultWidgetBgColor = context.resources.getInteger(R.integer.default_widget_bg_color)
+ defaultWidgetBgColor = context.resources.getColor(R.color.default_widget_bg_color)
if (db == null) {
synchronized(NotesDatabase::class) {
if (db == null) {