Skip to content

Commit 43fa37e

Browse files
tibbitibbi
committed
updating commons and target SDK to 31
1 parent 7c82273 commit 43fa37e

File tree

11 files changed

+52
-16
lines changed

11 files changed

+52
-16
lines changed

‎app/build.gradle‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@ if (keystorePropertiesFile.exists()) {
1010
}
1111

1212
android {
13-
compileSdkVersion 30
13+
compileSdkVersion 31
1414

1515
defaultConfig {
1616
applicationId "com.simplemobiletools.notes.pro"
1717
minSdkVersion 21
18-
targetSdkVersion 30
18+
targetSdkVersion 31
1919
versionCode 92
2020
versionName "6.11.1"
2121
setProperty("archivesBaseName", "notes")
@@ -63,7 +63,7 @@ android {
6363
}
6464

6565
dependencies {
66-
implementation 'com.github.SimpleMobileTools:Simple-Commons:47f816b35e'
66+
implementation 'com.github.SimpleMobileTools:Simple-Commons:a6fa9c19ac'
6767
implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
6868
implementation 'androidx.documentfile:documentfile:1.0.1'
6969

‎app/src/main/AndroidManifest.xml‎

Lines changed: 36 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,13 @@
2222

2323
<activity
2424
android:name=".activities.SplashActivity"
25+
android:exported="false"
2526
android:launchMode="singleTask"
2627
android:theme="@style/SplashTheme" />
2728

2829
<activity
2930
android:name=".activities.MainActivity"
31+
android:exported="true"
3032
android:launchMode="singleTask">
3133

3234
<intent-filter>
@@ -44,6 +46,7 @@
4446

4547
<activity
4648
android:name=".activities.WidgetConfigureActivity"
49+
android:exported="true"
4750
android:screenOrientation="portrait"
4851
android:theme="@style/MyWidgetConfigTheme">
4952
<intent-filter>
@@ -53,35 +56,48 @@
5356

5457
<activity
5558
android:name="com.simplemobiletools.commons.activities.AboutActivity"
59+
android:exported="false"
5660
android:label="@string/about"
5761
android:parentActivityName=".activities.MainActivity" />
5862

5963
<activity
6064
android:name="com.simplemobiletools.commons.activities.CustomizationActivity"
65+
android:exported="false"
6166
android:label="@string/customize_colors"
6267
android:parentActivityName=".activities.SettingsActivity" />
6368

6469
<activity
6570
android:name="com.simplemobiletools.commons.activities.LicenseActivity"
71+
android:exported="false"
6672
android:label="@string/third_party_licences"
6773
android:parentActivityName="com.simplemobiletools.commons.activities.AboutActivity" />
6874

6975
<activity
7076
android:name="com.simplemobiletools.commons.activities.FAQActivity"
77+
android:exported="false"
7178
android:label="@string/frequently_asked_questions"
7279
android:parentActivityName="com.simplemobiletools.commons.activities.AboutActivity" />
7380

7481
<activity
7582
android:name=".activities.SettingsActivity"
83+
android:exported="true"
7684
android:label="@string/settings"
77-
android:parentActivityName=".activities.MainActivity" />
85+
android:parentActivityName=".activities.MainActivity">
86+
87+
<intent-filter>
88+
<action android:name="android.intent.action.APPLICATION_PREFERENCES" />
89+
<category android:name="android.intent.category.DEFAULT" />
90+
</intent-filter>
91+
</activity>
7892

7993
<service
8094
android:name=".services.WidgetService"
95+
android:exported="true"
8196
android:permission="android.permission.BIND_REMOTEVIEWS" />
8297

8398
<receiver
8499
android:name=".helpers.MyWidgetProvider"
100+
android:exported="true"
85101
android:icon="@drawable/img_widget_preview">
86102
<intent-filter>
87103
<action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
@@ -95,6 +111,7 @@
95111
<activity-alias
96112
android:name=".activities.SplashActivity.Red"
97113
android:enabled="false"
114+
android:exported="true"
98115
android:icon="@mipmap/ic_launcher_red"
99116
android:roundIcon="@mipmap/ic_launcher_red"
100117
android:targetActivity=".activities.SplashActivity">
@@ -108,6 +125,7 @@
108125
<activity-alias
109126
android:name=".activities.SplashActivity.Pink"
110127
android:enabled="false"
128+
android:exported="true"
111129
android:icon="@mipmap/ic_launcher_pink"
112130
android:roundIcon="@mipmap/ic_launcher_pink"
113131
android:targetActivity=".activities.SplashActivity">
@@ -121,6 +139,7 @@
121139
<activity-alias
122140
android:name=".activities.SplashActivity.Purple"
123141
android:enabled="false"
142+
android:exported="true"
124143
android:icon="@mipmap/ic_launcher_purple"
125144
android:roundIcon="@mipmap/ic_launcher_purple"
126145
android:targetActivity=".activities.SplashActivity">
@@ -134,6 +153,7 @@
134153
<activity-alias
135154
android:name=".activities.SplashActivity.Deep_purple"
136155
android:enabled="false"
156+
android:exported="true"
137157
android:icon="@mipmap/ic_launcher_deep_purple"
138158
android:roundIcon="@mipmap/ic_launcher_deep_purple"
139159
android:targetActivity=".activities.SplashActivity">
@@ -147,6 +167,7 @@
147167
<activity-alias
148168
android:name=".activities.SplashActivity.Indigo"
149169
android:enabled="false"
170+
android:exported="true"
150171
android:icon="@mipmap/ic_launcher_indigo"
151172
android:roundIcon="@mipmap/ic_launcher_indigo"
152173
android:targetActivity=".activities.SplashActivity">
@@ -160,6 +181,7 @@
160181
<activity-alias
161182
android:name=".activities.SplashActivity.Blue"
162183
android:enabled="false"
184+
android:exported="true"
163185
android:icon="@mipmap/ic_launcher_blue"
164186
android:roundIcon="@mipmap/ic_launcher_blue"
165187
android:targetActivity=".activities.SplashActivity">
@@ -173,6 +195,7 @@
173195
<activity-alias
174196
android:name=".activities.SplashActivity.Light_blue"
175197
android:enabled="false"
198+
android:exported="true"
176199
android:icon="@mipmap/ic_launcher_light_blue"
177200
android:roundIcon="@mipmap/ic_launcher_light_blue"
178201
android:targetActivity=".activities.SplashActivity">
@@ -186,6 +209,7 @@
186209
<activity-alias
187210
android:name=".activities.SplashActivity.Cyan"
188211
android:enabled="false"
212+
android:exported="true"
189213
android:icon="@mipmap/ic_launcher_cyan"
190214
android:roundIcon="@mipmap/ic_launcher_cyan"
191215
android:targetActivity=".activities.SplashActivity">
@@ -199,6 +223,7 @@
199223
<activity-alias
200224
android:name=".activities.SplashActivity.Teal"
201225
android:enabled="false"
226+
android:exported="true"
202227
android:icon="@mipmap/ic_launcher_teal"
203228
android:roundIcon="@mipmap/ic_launcher_teal"
204229
android:targetActivity=".activities.SplashActivity">
@@ -212,6 +237,7 @@
212237
<activity-alias
213238
android:name=".activities.SplashActivity.Green"
214239
android:enabled="false"
240+
android:exported="true"
215241
android:icon="@mipmap/ic_launcher_green"
216242
android:roundIcon="@mipmap/ic_launcher_green"
217243
android:targetActivity=".activities.SplashActivity">
@@ -225,6 +251,7 @@
225251
<activity-alias
226252
android:name=".activities.SplashActivity.Light_green"
227253
android:enabled="false"
254+
android:exported="true"
228255
android:icon="@mipmap/ic_launcher_light_green"
229256
android:roundIcon="@mipmap/ic_launcher_light_green"
230257
android:targetActivity=".activities.SplashActivity">
@@ -238,6 +265,7 @@
238265
<activity-alias
239266
android:name=".activities.SplashActivity.Lime"
240267
android:enabled="false"
268+
android:exported="true"
241269
android:icon="@mipmap/ic_launcher_lime"
242270
android:roundIcon="@mipmap/ic_launcher_lime"
243271
android:targetActivity=".activities.SplashActivity">
@@ -251,6 +279,7 @@
251279
<activity-alias
252280
android:name=".activities.SplashActivity.Yellow"
253281
android:enabled="false"
282+
android:exported="true"
254283
android:icon="@mipmap/ic_launcher_yellow"
255284
android:roundIcon="@mipmap/ic_launcher_yellow"
256285
android:targetActivity=".activities.SplashActivity">
@@ -264,6 +293,7 @@
264293
<activity-alias
265294
android:name=".activities.SplashActivity.Amber"
266295
android:enabled="false"
296+
android:exported="true"
267297
android:icon="@mipmap/ic_launcher_amber"
268298
android:roundIcon="@mipmap/ic_launcher_amber"
269299
android:targetActivity=".activities.SplashActivity">
@@ -277,6 +307,7 @@
277307
<activity-alias
278308
android:name=".activities.SplashActivity.Orange"
279309
android:enabled="true"
310+
android:exported="true"
280311
android:icon="@mipmap/ic_launcher"
281312
android:roundIcon="@mipmap/ic_launcher"
282313
android:targetActivity=".activities.SplashActivity">
@@ -289,6 +320,7 @@
289320
<activity-alias
290321
android:name=".activities.SplashActivity.Deep_orange"
291322
android:enabled="false"
323+
android:exported="true"
292324
android:icon="@mipmap/ic_launcher_deep_orange"
293325
android:roundIcon="@mipmap/ic_launcher_deep_orange"
294326
android:targetActivity=".activities.SplashActivity">
@@ -302,6 +334,7 @@
302334
<activity-alias
303335
android:name=".activities.SplashActivity.Brown"
304336
android:enabled="false"
337+
android:exported="true"
305338
android:icon="@mipmap/ic_launcher_brown"
306339
android:roundIcon="@mipmap/ic_launcher_brown"
307340
android:targetActivity=".activities.SplashActivity">
@@ -315,6 +348,7 @@
315348
<activity-alias
316349
android:name=".activities.SplashActivity.Blue_grey"
317350
android:enabled="false"
351+
android:exported="true"
318352
android:icon="@mipmap/ic_launcher_blue_grey"
319353
android:roundIcon="@mipmap/ic_launcher_blue_grey"
320354
android:targetActivity=".activities.SplashActivity">
@@ -328,6 +362,7 @@
328362
<activity-alias
329363
android:name=".activities.SplashActivity.Grey_black"
330364
android:enabled="false"
365+
android:exported="true"
331366
android:icon="@mipmap/ic_launcher_grey_black"
332367
android:roundIcon="@mipmap/ic_launcher_grey_black"
333368
android:targetActivity=".activities.SplashActivity">

‎app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/MainActivity.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -487,7 +487,7 @@ class MainActivity : SimpleActivity() {
487487

488488
if (text.isNotBlank() && text.length > 1) {
489489
searchMatches = noteView.value.searchMatches(text)
490-
noteView.highlightText(text, getAdjustedPrimaryColor())
490+
noteView.highlightText(text, getProperPrimaryColor())
491491
}
492492

493493
currentTextFragment?.setTextWatcher()

‎app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/SettingsActivity.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ class SettingsActivity : SimpleActivity() {
5252
settings_startup_label,
5353
settings_saving_label
5454
).forEach {
55-
it.setTextColor(getAdjustedPrimaryColor())
55+
it.setTextColor(getProperPrimaryColor())
5656
}
5757

5858
arrayOf(
@@ -62,7 +62,7 @@ class SettingsActivity : SimpleActivity() {
6262
settings_startup_holder,
6363
settings_saving_holder
6464
).forEach {
65-
it.background.applyColorFilter(baseConfig.backgroundColor.getContrastColor())
65+
it.background.applyColorFilter(getProperBackgroundColor().getContrastColor())
6666
}
6767
}
6868

‎app/src/main/kotlin/com/simplemobiletools/notes/pro/dialogs/NewChecklistItemDialog.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ class NewChecklistItemDialog(val activity: Activity, callback: (titles: ArrayLis
2222
init {
2323
addNewEditText()
2424
view.apply {
25-
add_item.applyColorFilter(activity.getAdjustedPrimaryColor())
25+
add_item.applyColorFilter(activity.getProperPrimaryColor())
2626
add_item.background.applyColorFilter(textColor)
2727
add_item.setOnClickListener {
2828
addNewEditText()

‎app/src/main/kotlin/com/simplemobiletools/notes/pro/fragments/ChecklistFragment.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ class ChecklistFragment : NoteFragment(), ChecklistItemsListener {
9595
return
9696
}
9797

98-
val adjustedPrimaryColor = requireActivity().getAdjustedPrimaryColor()
98+
val adjustedPrimaryColor = requireActivity().getProperPrimaryColor()
9999
view.checklist_fab.apply {
100100
setColors(
101101
requireActivity().config.textColor,

‎app/src/main/kotlin/com/simplemobiletools/notes/pro/fragments/NoteFragment.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import android.view.ViewGroup
55
import androidx.fragment.app.Fragment
66
import com.simplemobiletools.commons.extensions.applyColorFilter
77
import com.simplemobiletools.commons.extensions.beVisibleIf
8-
import com.simplemobiletools.commons.extensions.getAdjustedPrimaryColor
8+
import com.simplemobiletools.commons.extensions.getProperPrimaryColor
99
import com.simplemobiletools.commons.extensions.performSecurityCheck
1010
import com.simplemobiletools.commons.helpers.PROTECTION_NONE
1111
import com.simplemobiletools.notes.pro.activities.MainActivity
@@ -27,7 +27,7 @@ abstract class NoteFragment : Fragment() {
2727
note_locked_label.setTextColor(requireContext().config.textColor)
2828
note_locked_label.setTextSize(TypedValue.COMPLEX_UNIT_PX, context.getPercentageFontSize())
2929

30-
note_locked_show.setTextColor(requireContext().getAdjustedPrimaryColor())
30+
note_locked_show.setTextColor(requireContext().getProperPrimaryColor())
3131
note_locked_show.setTextSize(TypedValue.COMPLEX_UNIT_PX, context.getPercentageFontSize())
3232
note_locked_show.setOnClickListener {
3333
handleUnlocking()

‎app/src/main/kotlin/com/simplemobiletools/notes/pro/fragments/TextFragment.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ class TextFragment : NoteFragment() {
123123
return
124124
}
125125

126-
val adjustedPrimaryColor = context.getAdjustedPrimaryColor()
126+
val adjustedPrimaryColor = context.getProperPrimaryColor()
127127
setColors(config.textColor, adjustedPrimaryColor, config.backgroundColor)
128128
setTextSize(TypedValue.COMPLEX_UNIT_PX, context.getPercentageFontSize())
129129
highlightColor = adjustedPrimaryColor.adjustAlpha(.4f)

‎app/src/main/kotlin/com/simplemobiletools/notes/pro/helpers/MyWidgetProvider.kt‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ class MyWidgetProvider : AppWidgetProvider() {
2424
private fun setupAppOpenIntent(context: Context, views: RemoteViews, id: Int, widget: Widget) {
2525
val intent = context.getLaunchIntent() ?: Intent(context, SplashActivity::class.java)
2626
intent.putExtra(OPEN_NOTE_ID, widget.noteId)
27-
val pendingIntent = PendingIntent.getActivity(context, widget.widgetId, intent, PendingIntent.FLAG_UPDATE_CURRENT)
27+
val pendingIntent = PendingIntent.getActivity(context, widget.widgetId, intent, PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE)
2828
views.setOnClickPendingIntent(id, pendingIntent)
2929
}
3030

@@ -50,7 +50,8 @@ class MyWidgetProvider : AppWidgetProvider() {
5050

5151
val startActivityIntent = context.getLaunchIntent() ?: Intent(context, SplashActivity::class.java)
5252
startActivityIntent.putExtra(OPEN_NOTE_ID, widget.noteId)
53-
val startActivityPendingIntent = PendingIntent.getActivity(context, widgetId, startActivityIntent, PendingIntent.FLAG_UPDATE_CURRENT)
53+
val startActivityPendingIntent =
54+
PendingIntent.getActivity(context, widgetId, startActivityIntent, PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE)
5455
views.setPendingIntentTemplate(R.id.notes_widget_listview, startActivityPendingIntent)
5556

5657
appWidgetManager.updateAppWidget(widgetId, views)

‎build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ buildscript {
99
}
1010

1111
dependencies {
12-
classpath 'com.android.tools.build:gradle:7.0.4'
12+
classpath 'com.android.tools.build:gradle:7.1.2'
1313
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1414

1515
// NOTE: Do not place your application dependencies here; they belong

0 commit comments

Comments
 (0)