Skip to content

Commit 356b56f

Browse files
tibbitibbi
committed
updating commons and target SDK to 31
1 parent d8536a0 commit 356b56f

File tree

9 files changed

+58
-29
lines changed

9 files changed

+58
-29
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-
compileSdk 30
13+
compileSdk 31
1414

1515
defaultConfig {
1616
applicationId "com.simplemobiletools.keyboard"
1717
minSdk 23
18-
targetSdk 30
18+
targetSdk 31
1919
versionCode 5
2020
versionName "5.0.4"
2121
multiDexEnabled true
@@ -64,7 +64,7 @@ android {
6464
}
6565

6666
dependencies {
67-
implementation 'com.github.SimpleMobileTools:Simple-Commons:4bbd82056d'
67+
implementation 'com.github.SimpleMobileTools:Simple-Commons:a6fa9c19ac'
6868

6969
kapt 'androidx.room:room-compiler:2.3.0'
7070
implementation 'androidx.room:room-runtime:2.3.0'

‎app/src/main/AndroidManifest.xml‎

Lines changed: 34 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
<application
1616
android:name=".App"
1717
android:allowBackup="true"
18+
android:appCategory="productivity"
1819
android:icon="@mipmap/ic_launcher"
1920
android:label="@string/app_launcher_name"
2021
android:roundIcon="@mipmap/ic_launcher"
@@ -23,17 +24,23 @@
2324

2425
<activity
2526
android:name=".activities.SplashActivity"
27+
android:exported="false"
2628
android:theme="@style/SplashTheme" />
2729

28-
<activity android:name=".activities.MainActivity" />
30+
<activity
31+
android:name=".activities.MainActivity"
32+
android:exported="false" />
33+
2934

3035
<activity
3136
android:name=".activities.ManageClipboardItemsActivity"
37+
android:exported="false"
3238
android:label="@string/manage_clipboard_items"
3339
android:parentActivityName=".activities.SettingsActivity" />
3440

3541
<service
3642
android:name=".services.SimpleKeyboardIME"
43+
android:exported="true"
3744
android:label="@string/app_name"
3845
android:permission="android.permission.BIND_INPUT_METHOD">
3946
<meta-data
@@ -46,11 +53,18 @@
4653

4754
<activity
4855
android:name=".activities.SettingsActivity"
56+
android:exported="true"
4957
android:label="@string/settings"
5058
android:parentActivityName=".activities.MainActivity">
59+
5160
<intent-filter>
5261
<action android:name="android.intent.action.MAIN" />
5362
</intent-filter>
63+
64+
<intent-filter>
65+
<action android:name="android.intent.action.APPLICATION_PREFERENCES" />
66+
<category android:name="android.intent.category.DEFAULT" />
67+
</intent-filter>
5468
</activity>
5569

5670
<activity
@@ -66,6 +80,7 @@
6680
<activity-alias
6781
android:name=".activities.SplashActivity.Red"
6882
android:enabled="false"
83+
android:exported="true"
6984
android:icon="@mipmap/ic_launcher_red"
7085
android:roundIcon="@mipmap/ic_launcher_red"
7186
android:targetActivity=".activities.SplashActivity">
@@ -79,6 +94,7 @@
7994
<activity-alias
8095
android:name=".activities.SplashActivity.Pink"
8196
android:enabled="false"
97+
android:exported="true"
8298
android:icon="@mipmap/ic_launcher_pink"
8399
android:roundIcon="@mipmap/ic_launcher_pink"
84100
android:targetActivity=".activities.SplashActivity">
@@ -92,6 +108,7 @@
92108
<activity-alias
93109
android:name=".activities.SplashActivity.Purple"
94110
android:enabled="false"
111+
android:exported="true"
95112
android:icon="@mipmap/ic_launcher_purple"
96113
android:roundIcon="@mipmap/ic_launcher_purple"
97114
android:targetActivity=".activities.SplashActivity">
@@ -105,6 +122,7 @@
105122
<activity-alias
106123
android:name=".activities.SplashActivity.Deep_purple"
107124
android:enabled="false"
125+
android:exported="true"
108126
android:icon="@mipmap/ic_launcher_deep_purple"
109127
android:roundIcon="@mipmap/ic_launcher_deep_purple"
110128
android:targetActivity=".activities.SplashActivity">
@@ -118,6 +136,7 @@
118136
<activity-alias
119137
android:name=".activities.SplashActivity.Indigo"
120138
android:enabled="false"
139+
android:exported="true"
121140
android:icon="@mipmap/ic_launcher_indigo"
122141
android:roundIcon="@mipmap/ic_launcher_indigo"
123142
android:targetActivity=".activities.SplashActivity">
@@ -131,6 +150,7 @@
131150
<activity-alias
132151
android:name=".activities.SplashActivity.Blue"
133152
android:enabled="false"
153+
android:exported="true"
134154
android:icon="@mipmap/ic_launcher_blue"
135155
android:roundIcon="@mipmap/ic_launcher_blue"
136156
android:targetActivity=".activities.SplashActivity">
@@ -144,6 +164,7 @@
144164
<activity-alias
145165
android:name=".activities.SplashActivity.Light_blue"
146166
android:enabled="false"
167+
android:exported="true"
147168
android:icon="@mipmap/ic_launcher_light_blue"
148169
android:roundIcon="@mipmap/ic_launcher_light_blue"
149170
android:targetActivity=".activities.SplashActivity">
@@ -157,6 +178,7 @@
157178
<activity-alias
158179
android:name=".activities.SplashActivity.Cyan"
159180
android:enabled="false"
181+
android:exported="true"
160182
android:icon="@mipmap/ic_launcher_cyan"
161183
android:roundIcon="@mipmap/ic_launcher_cyan"
162184
android:targetActivity=".activities.SplashActivity">
@@ -170,6 +192,7 @@
170192
<activity-alias
171193
android:name=".activities.SplashActivity.Teal"
172194
android:enabled="false"
195+
android:exported="true"
173196
android:icon="@mipmap/ic_launcher_teal"
174197
android:roundIcon="@mipmap/ic_launcher_teal"
175198
android:targetActivity=".activities.SplashActivity">
@@ -183,6 +206,7 @@
183206
<activity-alias
184207
android:name=".activities.SplashActivity.Green"
185208
android:enabled="false"
209+
android:exported="true"
186210
android:icon="@mipmap/ic_launcher_green"
187211
android:roundIcon="@mipmap/ic_launcher_green"
188212
android:targetActivity=".activities.SplashActivity">
@@ -196,6 +220,7 @@
196220
<activity-alias
197221
android:name=".activities.SplashActivity.Light_green"
198222
android:enabled="false"
223+
android:exported="true"
199224
android:icon="@mipmap/ic_launcher_light_green"
200225
android:roundIcon="@mipmap/ic_launcher_light_green"
201226
android:targetActivity=".activities.SplashActivity">
@@ -209,6 +234,7 @@
209234
<activity-alias
210235
android:name=".activities.SplashActivity.Lime"
211236
android:enabled="false"
237+
android:exported="true"
212238
android:icon="@mipmap/ic_launcher_lime"
213239
android:roundIcon="@mipmap/ic_launcher_lime"
214240
android:targetActivity=".activities.SplashActivity">
@@ -222,6 +248,7 @@
222248
<activity-alias
223249
android:name=".activities.SplashActivity.Yellow"
224250
android:enabled="false"
251+
android:exported="true"
225252
android:icon="@mipmap/ic_launcher_yellow"
226253
android:roundIcon="@mipmap/ic_launcher_yellow"
227254
android:targetActivity=".activities.SplashActivity">
@@ -235,6 +262,7 @@
235262
<activity-alias
236263
android:name=".activities.SplashActivity.Amber"
237264
android:enabled="false"
265+
android:exported="true"
238266
android:icon="@mipmap/ic_launcher_amber"
239267
android:roundIcon="@mipmap/ic_launcher_amber"
240268
android:targetActivity=".activities.SplashActivity">
@@ -248,6 +276,7 @@
248276
<activity-alias
249277
android:name=".activities.SplashActivity.Orange"
250278
android:enabled="true"
279+
android:exported="true"
251280
android:icon="@mipmap/ic_launcher"
252281
android:roundIcon="@mipmap/ic_launcher"
253282
android:targetActivity=".activities.SplashActivity">
@@ -260,6 +289,7 @@
260289
<activity-alias
261290
android:name=".activities.SplashActivity.Deep_orange"
262291
android:enabled="false"
292+
android:exported="true"
263293
android:icon="@mipmap/ic_launcher_deep_orange"
264294
android:roundIcon="@mipmap/ic_launcher_deep_orange"
265295
android:targetActivity=".activities.SplashActivity">
@@ -273,6 +303,7 @@
273303
<activity-alias
274304
android:name=".activities.SplashActivity.Brown"
275305
android:enabled="false"
306+
android:exported="true"
276307
android:icon="@mipmap/ic_launcher_brown"
277308
android:roundIcon="@mipmap/ic_launcher_brown"
278309
android:targetActivity=".activities.SplashActivity">
@@ -286,6 +317,7 @@
286317
<activity-alias
287318
android:name=".activities.SplashActivity.Blue_grey"
288319
android:enabled="false"
320+
android:exported="true"
289321
android:icon="@mipmap/ic_launcher_blue_grey"
290322
android:roundIcon="@mipmap/ic_launcher_blue_grey"
291323
android:targetActivity=".activities.SplashActivity">
@@ -299,6 +331,7 @@
299331
<activity-alias
300332
android:name=".activities.SplashActivity.Grey_black"
301333
android:enabled="false"
334+
android:exported="true"
302335
android:icon="@mipmap/ic_launcher_grey_black"
303336
android:roundIcon="@mipmap/ic_launcher_grey_black"
304337
android:targetActivity=".activities.SplashActivity">

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ import com.simplemobiletools.commons.helpers.LICENSE_GSON
1414
import com.simplemobiletools.commons.models.FAQItem
1515
import com.simplemobiletools.keyboard.BuildConfig
1616
import com.simplemobiletools.keyboard.R
17-
import com.simplemobiletools.keyboard.extensions.config
1817
import kotlinx.android.synthetic.main.activity_main.*
1918

2019
class MainActivity : SimpleActivity() {
@@ -44,7 +43,7 @@ class MainActivity : SimpleActivity() {
4443

4544
updateTextColors(main_holder)
4645
updateChangeKeyboardColor()
47-
main_holder.setBackgroundColor(config.backgroundColor)
46+
main_holder.setBackgroundColor(getProperBackgroundColor())
4847
}
4948

5049
override fun onCreateOptionsMenu(menu: Menu): Boolean {
@@ -80,9 +79,9 @@ class MainActivity : SimpleActivity() {
8079

8180
private fun updateChangeKeyboardColor() {
8281
val applyBackground = resources.getDrawable(R.drawable.button_background_rounded, theme) as RippleDrawable
83-
(applyBackground as LayerDrawable).findDrawableByLayerId(R.id.button_background_holder).applyColorFilter(getAdjustedPrimaryColor())
82+
(applyBackground as LayerDrawable).findDrawableByLayerId(R.id.button_background_holder).applyColorFilter(getProperPrimaryColor())
8483
change_keyboard.background = applyBackground
85-
change_keyboard.setTextColor(getAdjustedPrimaryColor().getContrastColor())
84+
change_keyboard.setTextColor(getProperPrimaryColor().getContrastColor())
8685
}
8786

8887
private fun isKeyboardEnabled(): Boolean {

‎app/src/main/kotlin/com/simplemobiletools/keyboard/activities/ManageClipboardItemsActivity.kt‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,10 @@ import com.google.gson.Gson
99
import com.google.gson.reflect.TypeToken
1010
import com.simplemobiletools.commons.dialogs.FilePickerDialog
1111
import com.simplemobiletools.commons.extensions.*
12-
import com.simplemobiletools.commons.helpers.*
12+
import com.simplemobiletools.commons.helpers.PERMISSION_READ_STORAGE
13+
import com.simplemobiletools.commons.helpers.PERMISSION_WRITE_STORAGE
14+
import com.simplemobiletools.commons.helpers.ensureBackgroundThread
15+
import com.simplemobiletools.commons.helpers.isQPlus
1316
import com.simplemobiletools.commons.interfaces.RefreshRecyclerViewListener
1417
import com.simplemobiletools.keyboard.R
1518
import com.simplemobiletools.keyboard.adapters.ClipsActivityAdapter
@@ -23,7 +26,6 @@ import kotlinx.android.synthetic.main.activity_manage_clipboard_items.*
2326
import java.io.File
2427
import java.io.InputStream
2528
import java.io.OutputStream
26-
import java.util.*
2729

2830
class ManageClipboardItemsActivity : SimpleActivity(), RefreshRecyclerViewListener {
2931
private val PICK_EXPORT_CLIPS_INTENT = 21
@@ -38,7 +40,7 @@ class ManageClipboardItemsActivity : SimpleActivity(), RefreshRecyclerViewListen
3840
clipboard_items_placeholder.text = "${getText(R.string.manage_clipboard_empty)}\n\n${getText(R.string.manage_clips)}"
3941
clipboard_items_placeholder_2.apply {
4042
underlineText()
41-
setTextColor(getAdjustedPrimaryColor())
43+
setTextColor(getProperPrimaryColor())
4244
setOnClickListener {
4345
addOrEditClip()
4446
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,11 @@ class SettingsActivity : SimpleActivity() {
3838
updateTextColors(settings_scrollview)
3939

4040
arrayOf(settings_color_customization_label, settings_general_settings_label).forEach {
41-
it.setTextColor(getAdjustedPrimaryColor())
41+
it.setTextColor(getProperPrimaryColor())
4242
}
4343

4444
arrayOf(settings_color_customization_holder, settings_general_settings_holder).forEach {
45-
it.background.applyColorFilter(baseConfig.backgroundColor.getContrastColor())
45+
it.background.applyColorFilter(getProperBackgroundColor().getContrastColor())
4646
}
4747
}
4848

‎app/src/main/kotlin/com/simplemobiletools/keyboard/adapters/ClipsKeyboardAdapter.kt‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,9 @@ import android.view.View
99
import android.view.ViewGroup
1010
import androidx.recyclerview.widget.RecyclerView
1111
import androidx.recyclerview.widget.StaggeredGridLayoutManager
12-
import com.simplemobiletools.commons.extensions.applyColorFilter
13-
import com.simplemobiletools.commons.extensions.performHapticFeedback
14-
import com.simplemobiletools.commons.extensions.removeUnderlines
15-
import com.simplemobiletools.commons.extensions.toast
12+
import com.simplemobiletools.commons.extensions.*
1613
import com.simplemobiletools.commons.helpers.ensureBackgroundThread
1714
import com.simplemobiletools.keyboard.R
18-
import com.simplemobiletools.keyboard.extensions.clipsDB
1915
import com.simplemobiletools.keyboard.extensions.config
2016
import com.simplemobiletools.keyboard.extensions.getCurrentClip
2117
import com.simplemobiletools.keyboard.helpers.ClipsHelper
@@ -27,7 +23,6 @@ import com.simplemobiletools.keyboard.models.ClipsSectionLabel
2723
import com.simplemobiletools.keyboard.models.ListItem
2824
import kotlinx.android.synthetic.main.item_clip_on_keyboard.view.*
2925
import kotlinx.android.synthetic.main.item_section_label.view.*
30-
import java.util.*
3126

3227
class ClipsKeyboardAdapter(
3328
val context: Context, var items: ArrayList<ListItem>, val refreshClipsListener: RefreshClipsListener,
@@ -36,8 +31,8 @@ class ClipsKeyboardAdapter(
3631

3732
private val layoutInflater = LayoutInflater.from(context)
3833
private val baseConfig = context.config
39-
private var textColor = baseConfig.textColor
40-
private var backgroundColor = baseConfig.backgroundColor
34+
private var textColor = context.getProperTextColor()
35+
private var backgroundColor = context.getProperBackgroundColor()
4136

4237
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
4338
val layoutId = when (viewType) {

‎app/src/main/kotlin/com/simplemobiletools/keyboard/views/MyKeyboardView.kt‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -212,9 +212,9 @@ class MyKeyboardView @JvmOverloads constructor(context: Context, attrs: Attribut
212212
mLabelTextSize = resources.getDimension(R.dimen.label_text_size).toInt()
213213
mPreviewHeight = resources.getDimension(R.dimen.key_height).toInt()
214214
mSpaceMoveThreshold = resources.getDimension(R.dimen.medium_margin).toInt()
215-
mTextColor = context.config.textColor
216-
mBackgroundColor = context.config.backgroundColor
217-
mPrimaryColor = context.getAdjustedPrimaryColor()
215+
mTextColor = context.getProperTextColor()
216+
mBackgroundColor = context.getProperBackgroundColor()
217+
mPrimaryColor = context.getProperPrimaryColor()
218218

219219
mPreviewPopup = PopupWindow(context)
220220
mPreviewText = inflater.inflate(resources.getLayout(R.layout.keyboard_key_preview), null) as TextView
@@ -263,9 +263,9 @@ class MyKeyboardView @JvmOverloads constructor(context: Context, attrs: Attribut
263263
closeClipboardManager()
264264

265265
if (visibility == VISIBLE) {
266-
mTextColor = context.config.textColor
267-
mBackgroundColor = context.config.backgroundColor
268-
mPrimaryColor = context.getAdjustedPrimaryColor()
266+
mTextColor = context.getProperTextColor()
267+
mBackgroundColor = context.getProperBackgroundColor()
268+
mPrimaryColor = context.getProperPrimaryColor()
269269

270270
if (changedView == mini_keyboard_view) {
271271
val previewBackground = background as LayerDrawable

‎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

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#Tue Jan 04 09:48:27 CET 2022
22
distributionBase=GRADLE_USER_HOME
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
44
distributionPath=wrapper/dists
55
zipStorePath=wrapper/dists
66
zipStoreBase=GRADLE_USER_HOME

0 commit comments

Comments
 (0)