updating commons and target SDK to 31

tibbi · tibbi · commit 43fa37e3ed1d · 2022-04-02T22:26:25.000+02:00
diff --git a/app/build.gradle b/app/build.gradle
@@ -10,12 +10,12 @@ if (keystorePropertiesFile.exists()) {
 }
 
 android {
-    compileSdkVersion 30
+    compileSdkVersion 31
 
     defaultConfig {
         applicationId "com.simplemobiletools.notes.pro"
         minSdkVersion 21
-        targetSdkVersion 30
+        targetSdkVersion 31
         versionCode 92
         versionName "6.11.1"
         setProperty("archivesBaseName", "notes")
@@ -63,7 +63,7 @@ android {
 }
 
 dependencies {
-    implementation 'com.github.SimpleMobileTools:Simple-Commons:47f816b35e'
+    implementation 'com.github.SimpleMobileTools:Simple-Commons:a6fa9c19ac'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
     implementation 'androidx.documentfile:documentfile:1.0.1'
 
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -22,11 +22,13 @@
 
         <activity
             android:name=".activities.SplashActivity"
+            android:exported="false"
             android:launchMode="singleTask"
             android:theme="@style/SplashTheme" />
 
         <activity
             android:name=".activities.MainActivity"
+            android:exported="true"
             android:launchMode="singleTask">
 
             <intent-filter>
@@ -44,6 +46,7 @@
 
         <activity
             android:name=".activities.WidgetConfigureActivity"
+            android:exported="true"
             android:screenOrientation="portrait"
             android:theme="@style/MyWidgetConfigTheme">
             <intent-filter>
@@ -53,35 +56,48 @@
 
         <activity
             android:name="com.simplemobiletools.commons.activities.AboutActivity"
+            android:exported="false"
             android:label="@string/about"
             android:parentActivityName=".activities.MainActivity" />
 
         <activity
             android:name="com.simplemobiletools.commons.activities.CustomizationActivity"
+            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:exported="true"
             android:label="@string/settings"
-            android:parentActivityName=".activities.MainActivity" />
+            android:parentActivityName=".activities.MainActivity">
+
+            <intent-filter>
+                <action android:name="android.intent.action.APPLICATION_PREFERENCES" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
 
         <service
             android:name=".services.WidgetService"
+            android:exported="true"
             android:permission="android.permission.BIND_REMOTEVIEWS" />
 
         <receiver
             android:name=".helpers.MyWidgetProvider"
+            android:exported="true"
             android:icon="@drawable/img_widget_preview">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
@@ -95,6 +111,7 @@
         <activity-alias
             android:name=".activities.SplashActivity.Red"
             android:enabled="false"
+            android:exported="true"
             android:icon="@mipmap/ic_launcher_red"
             android:roundIcon="@mipmap/ic_launcher_red"
             android:targetActivity=".activities.SplashActivity">
@@ -108,6 +125,7 @@
         <activity-alias
             android:name=".activities.SplashActivity.Pink"
             android:enabled="false"
+            android:exported="true"
             android:icon="@mipmap/ic_launcher_pink"
             android:roundIcon="@mipmap/ic_launcher_pink"
             android:targetActivity=".activities.SplashActivity">
@@ -121,6 +139,7 @@
         <activity-alias
             android:name=".activities.SplashActivity.Purple"
             android:enabled="false"
+            android:exported="true"
             android:icon="@mipmap/ic_launcher_purple"
             android:roundIcon="@mipmap/ic_launcher_purple"
             android:targetActivity=".activities.SplashActivity">
@@ -134,6 +153,7 @@
         <activity-alias
             android:name=".activities.SplashActivity.Deep_purple"
             android:enabled="false"
+            android:exported="true"
             android:icon="@mipmap/ic_launcher_deep_purple"
             android:roundIcon="@mipmap/ic_launcher_deep_purple"
             android:targetActivity=".activities.SplashActivity">
@@ -147,6 +167,7 @@
         <activity-alias
             android:name=".activities.SplashActivity.Indigo"
             android:enabled="false"
+            android:exported="true"
             android:icon="@mipmap/ic_launcher_indigo"
             android:roundIcon="@mipmap/ic_launcher_indigo"
             android:targetActivity=".activities.SplashActivity">
@@ -160,6 +181,7 @@
         <activity-alias
             android:name=".activities.SplashActivity.Blue"
             android:enabled="false"
+            android:exported="true"
             android:icon="@mipmap/ic_launcher_blue"
             android:roundIcon="@mipmap/ic_launcher_blue"
             android:targetActivity=".activities.SplashActivity">
@@ -173,6 +195,7 @@
         <activity-alias
             android:name=".activities.SplashActivity.Light_blue"
             android:enabled="false"
+            android:exported="true"
             android:icon="@mipmap/ic_launcher_light_blue"
             android:roundIcon="@mipmap/ic_launcher_light_blue"
             android:targetActivity=".activities.SplashActivity">
@@ -186,6 +209,7 @@
         <activity-alias
             android:name=".activities.SplashActivity.Cyan"
             android:enabled="false"
+            android:exported="true"
             android:icon="@mipmap/ic_launcher_cyan"
             android:roundIcon="@mipmap/ic_launcher_cyan"
             android:targetActivity=".activities.SplashActivity">
@@ -199,6 +223,7 @@
         <activity-alias
             android:name=".activities.SplashActivity.Teal"
             android:enabled="false"
+            android:exported="true"
             android:icon="@mipmap/ic_launcher_teal"
             android:roundIcon="@mipmap/ic_launcher_teal"
             android:targetActivity=".activities.SplashActivity">
@@ -212,6 +237,7 @@
         <activity-alias
             android:name=".activities.SplashActivity.Green"
             android:enabled="false"
+            android:exported="true"
             android:icon="@mipmap/ic_launcher_green"
             android:roundIcon="@mipmap/ic_launcher_green"
             android:targetActivity=".activities.SplashActivity">
@@ -225,6 +251,7 @@
         <activity-alias
             android:name=".activities.SplashActivity.Light_green"
             android:enabled="false"
+            android:exported="true"
             android:icon="@mipmap/ic_launcher_light_green"
             android:roundIcon="@mipmap/ic_launcher_light_green"
             android:targetActivity=".activities.SplashActivity">
@@ -238,6 +265,7 @@
         <activity-alias
             android:name=".activities.SplashActivity.Lime"
             android:enabled="false"
+            android:exported="true"
             android:icon="@mipmap/ic_launcher_lime"
             android:roundIcon="@mipmap/ic_launcher_lime"
             android:targetActivity=".activities.SplashActivity">
@@ -251,6 +279,7 @@
         <activity-alias
             android:name=".activities.SplashActivity.Yellow"
             android:enabled="false"
+            android:exported="true"
             android:icon="@mipmap/ic_launcher_yellow"
             android:roundIcon="@mipmap/ic_launcher_yellow"
             android:targetActivity=".activities.SplashActivity">
@@ -264,6 +293,7 @@
         <activity-alias
             android:name=".activities.SplashActivity.Amber"
             android:enabled="false"
+            android:exported="true"
             android:icon="@mipmap/ic_launcher_amber"
             android:roundIcon="@mipmap/ic_launcher_amber"
             android:targetActivity=".activities.SplashActivity">
@@ -277,6 +307,7 @@
         <activity-alias
             android:name=".activities.SplashActivity.Orange"
             android:enabled="true"
+            android:exported="true"
             android:icon="@mipmap/ic_launcher"
             android:roundIcon="@mipmap/ic_launcher"
             android:targetActivity=".activities.SplashActivity">
@@ -289,6 +320,7 @@
         <activity-alias
             android:name=".activities.SplashActivity.Deep_orange"
             android:enabled="false"
+            android:exported="true"
             android:icon="@mipmap/ic_launcher_deep_orange"
             android:roundIcon="@mipmap/ic_launcher_deep_orange"
             android:targetActivity=".activities.SplashActivity">
@@ -302,6 +334,7 @@
         <activity-alias
             android:name=".activities.SplashActivity.Brown"
             android:enabled="false"
+            android:exported="true"
             android:icon="@mipmap/ic_launcher_brown"
             android:roundIcon="@mipmap/ic_launcher_brown"
             android:targetActivity=".activities.SplashActivity">
@@ -315,6 +348,7 @@
         <activity-alias
             android:name=".activities.SplashActivity.Blue_grey"
             android:enabled="false"
+            android:exported="true"
             android:icon="@mipmap/ic_launcher_blue_grey"
             android:roundIcon="@mipmap/ic_launcher_blue_grey"
             android:targetActivity=".activities.SplashActivity">
@@ -328,6 +362,7 @@
         <activity-alias
             android:name=".activities.SplashActivity.Grey_black"
             android:enabled="false"
+            android:exported="true"
             android:icon="@mipmap/ic_launcher_grey_black"
             android:roundIcon="@mipmap/ic_launcher_grey_black"
             android:targetActivity=".activities.SplashActivity">
diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/MainActivity.kt
@@ -487,7 +487,7 @@ class MainActivity : SimpleActivity() {
 
             if (text.isNotBlank() && text.length > 1) {
                 searchMatches = noteView.value.searchMatches(text)
-                noteView.highlightText(text, getAdjustedPrimaryColor())
+                noteView.highlightText(text, getProperPrimaryColor())
             }
 
             currentTextFragment?.setTextWatcher()
diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/SettingsActivity.kt b/app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/SettingsActivity.kt
@@ -52,7 +52,7 @@ class SettingsActivity : SimpleActivity() {
             settings_startup_label,
             settings_saving_label
         ).forEach {
-            it.setTextColor(getAdjustedPrimaryColor())
+            it.setTextColor(getProperPrimaryColor())
         }
 
         arrayOf(
@@ -62,7 +62,7 @@ class SettingsActivity : SimpleActivity() {
             settings_startup_holder,
             settings_saving_holder
         ).forEach {
-            it.background.applyColorFilter(baseConfig.backgroundColor.getContrastColor())
+            it.background.applyColorFilter(getProperBackgroundColor().getContrastColor())
         }
     }
 
diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/NewChecklistItemDialog.kt b/app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/NewChecklistItemDialog.kt
@@ -22,7 +22,7 @@ class NewChecklistItemDialog(val activity: Activity, callback: (titles: ArrayLis
     init {
         addNewEditText()
         view.apply {
-            add_item.applyColorFilter(activity.getAdjustedPrimaryColor())
+            add_item.applyColorFilter(activity.getProperPrimaryColor())
             add_item.background.applyColorFilter(textColor)
             add_item.setOnClickListener {
                 addNewEditText()
diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/fragments/ChecklistFragment.kt b/app/src/main/kotlin/com/simplemobiletools/notes/pro/fragments/ChecklistFragment.kt
@@ -95,7 +95,7 @@ class ChecklistFragment : NoteFragment(), ChecklistItemsListener {
             return
         }
 
-        val adjustedPrimaryColor = requireActivity().getAdjustedPrimaryColor()
+        val adjustedPrimaryColor = requireActivity().getProperPrimaryColor()
         view.checklist_fab.apply {
             setColors(
                 requireActivity().config.textColor,
diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/fragments/NoteFragment.kt b/app/src/main/kotlin/com/simplemobiletools/notes/pro/fragments/NoteFragment.kt
@@ -5,7 +5,7 @@ import android.view.ViewGroup
 import androidx.fragment.app.Fragment
 import com.simplemobiletools.commons.extensions.applyColorFilter
 import com.simplemobiletools.commons.extensions.beVisibleIf
-import com.simplemobiletools.commons.extensions.getAdjustedPrimaryColor
+import com.simplemobiletools.commons.extensions.getProperPrimaryColor
 import com.simplemobiletools.commons.extensions.performSecurityCheck
 import com.simplemobiletools.commons.helpers.PROTECTION_NONE
 import com.simplemobiletools.notes.pro.activities.MainActivity
@@ -27,7 +27,7 @@ abstract class NoteFragment : Fragment() {
             note_locked_label.setTextColor(requireContext().config.textColor)
             note_locked_label.setTextSize(TypedValue.COMPLEX_UNIT_PX, context.getPercentageFontSize())
 
-            note_locked_show.setTextColor(requireContext().getAdjustedPrimaryColor())
+            note_locked_show.setTextColor(requireContext().getProperPrimaryColor())
             note_locked_show.setTextSize(TypedValue.COMPLEX_UNIT_PX, context.getPercentageFontSize())
             note_locked_show.setOnClickListener {
                 handleUnlocking()
diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/fragments/TextFragment.kt b/app/src/main/kotlin/com/simplemobiletools/notes/pro/fragments/TextFragment.kt
@@ -123,7 +123,7 @@ class TextFragment : NoteFragment() {
                 return
             }
 
-            val adjustedPrimaryColor = context.getAdjustedPrimaryColor()
+            val adjustedPrimaryColor = context.getProperPrimaryColor()
             setColors(config.textColor, adjustedPrimaryColor, config.backgroundColor)
             setTextSize(TypedValue.COMPLEX_UNIT_PX, context.getPercentageFontSize())
             highlightColor = adjustedPrimaryColor.adjustAlpha(.4f)
diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/helpers/MyWidgetProvider.kt b/app/src/main/kotlin/com/simplemobiletools/notes/pro/helpers/MyWidgetProvider.kt
@@ -24,7 +24,7 @@ class MyWidgetProvider : AppWidgetProvider() {
     private fun setupAppOpenIntent(context: Context, views: RemoteViews, id: Int, widget: Widget) {
         val intent = context.getLaunchIntent() ?: Intent(context, SplashActivity::class.java)
         intent.putExtra(OPEN_NOTE_ID, widget.noteId)
-        val pendingIntent = PendingIntent.getActivity(context, widget.widgetId, intent, PendingIntent.FLAG_UPDATE_CURRENT)
+        val pendingIntent = PendingIntent.getActivity(context, widget.widgetId, intent, PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE)
         views.setOnClickPendingIntent(id, pendingIntent)
     }
 
@@ -50,7 +50,8 @@ class MyWidgetProvider : AppWidgetProvider() {
 
                 val startActivityIntent = context.getLaunchIntent() ?: Intent(context, SplashActivity::class.java)
                 startActivityIntent.putExtra(OPEN_NOTE_ID, widget.noteId)
-                val startActivityPendingIntent = PendingIntent.getActivity(context, widgetId, startActivityIntent, PendingIntent.FLAG_UPDATE_CURRENT)
+                val startActivityPendingIntent =
+                    PendingIntent.getActivity(context, widgetId, startActivityIntent, PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE)
                 views.setPendingIntentTemplate(R.id.notes_widget_listview, startActivityPendingIntent)
 
                 appWidgetManager.updateAppWidget(widgetId, views)
diff --git a/build.gradle b/build.gradle
@@ -9,7 +9,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.4'
+        classpath 'com.android.tools.build:gradle:7.1.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip

Original file line number	Diff line number	Diff line change
`@@ -487,7 +487,7 @@ class MainActivity : SimpleActivity() {`
`487`	`487`
`488`	`488`	`if (text.isNotBlank() && text.length > 1) {`
`489`	`489`	`searchMatches = noteView.value.searchMatches(text)`
`490`		`- noteView.highlightText(text, getAdjustedPrimaryColor())`
	`490`	`+ noteView.highlightText(text, getProperPrimaryColor())`
`491`	`491`	`}`
`492`	`492`
`493`	`493`	`currentTextFragment?.setTextWatcher()`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ class SettingsActivity : SimpleActivity() {`
`52`	`52`	`settings_startup_label,`
`53`	`53`	`settings_saving_label`
`54`	`54`	`).forEach {`
`55`		`- it.setTextColor(getAdjustedPrimaryColor())`
	`55`	`+ it.setTextColor(getProperPrimaryColor())`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`arrayOf(`
`@@ -62,7 +62,7 @@ class SettingsActivity : SimpleActivity() {`
`62`	`62`	`settings_startup_holder,`
`63`	`63`	`settings_saving_holder`
`64`	`64`	`).forEach {`
`65`		`- it.background.applyColorFilter(baseConfig.backgroundColor.getContrastColor())`
	`65`	`+ it.background.applyColorFilter(getProperBackgroundColor().getContrastColor())`
`66`	`66`	`}`
`67`	`67`	`}`
`68`	`68`
Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,7 @@ class ChecklistFragment : NoteFragment(), ChecklistItemsListener {`
`95`	`95`	`return`
`96`	`96`	`}`
`97`	`97`
`98`		`- val adjustedPrimaryColor = requireActivity().getAdjustedPrimaryColor()`
	`98`	`+ val adjustedPrimaryColor = requireActivity().getProperPrimaryColor()`
`99`	`99`	`view.checklist_fab.apply {`
`100`	`100`	`setColors(`
`101`	`101`	`requireActivity().config.textColor,`
Original file line number	Diff line number	Diff line change
`@@ -123,7 +123,7 @@ class TextFragment : NoteFragment() {`
`123`	`123`	`return`
`124`	`124`	`}`
`125`	`125`
`126`		`- val adjustedPrimaryColor = context.getAdjustedPrimaryColor()`
	`126`	`+ val adjustedPrimaryColor = context.getProperPrimaryColor()`
`127`	`127`	`setColors(config.textColor, adjustedPrimaryColor, config.backgroundColor)`
`128`	`128`	`setTextSize(TypedValue.COMPLEX_UNIT_PX, context.getPercentageFontSize())`
`129`	`129`	`highlightColor = adjustedPrimaryColor.adjustAlpha(.4f)`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ buildscript {`
`9`	`9`	`}`
`10`	`10`
`11`	`11`	`dependencies {`
`12`		`- classpath 'com.android.tools.build:gradle:7.0.4'`
	`12`	`+ classpath 'com.android.tools.build:gradle:7.1.2'`
`13`	`13`	`classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"`
`14`	`14`
`15`	`15`	`// NOTE: Do not place your application dependencies here; they belong`