fenix/Simple-Thank-You
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Thank-You.git synced 2025-06-05 22:09:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

updating commons and target SDK to 31

Browse Source
This commit is contained in:
tibbi
2022-04-02 09:00:33 +02:00
parent 3ec872d69e
commit 39aac01574
6 changed files with 91 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/build.gradle
View File

@@ -9,12 +9,12 @@ if (keystorePropertiesFile.exists()) {
} }
android { android {
compileSdkVersion 30 compileSdkVersion 31
defaultConfig { defaultConfig {
applicationId "com.simplemobiletools.thankyou" applicationId "com.simplemobiletools.thankyou"
minSdkVersion 21 minSdkVersion 21
targetSdkVersion 30 targetSdkVersion 31
versionCode 23 versionCode 23
versionName "5.4.2" versionName "5.4.2"
setProperty("archivesBaseName", "thank-you") setProperty("archivesBaseName", "thank-you")
@@ -61,5 +61,5 @@ android {
} }
dependencies { dependencies {
implementation 'com.github.SimpleMobileTools:Simple-Commons:03e4d214b1' implementation 'com.github.SimpleMobileTools:Simple-Commons:a6fa9c19ac'
} }

134
app/src/main/AndroidManifest.xml
View File

@@ -1,16 +1,16 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
package="com.simplemobiletools.thankyou" package="com.simplemobiletools.thankyou"
android:installLocation="auto"> android:installLocation="auto">
<uses-permission <uses-permission
android:name="android.permission.USE_FINGERPRINT" android:name="android.permission.USE_FINGERPRINT"
tools:node="remove"/> tools:node="remove" />
<uses-feature <uses-feature
android:name="android.hardware.faketouch" android:name="android.hardware.faketouch"
android:required="false"/> android:required="false" />
<application <application
android:name=".App" android:name=".App"
@@ -23,283 +23,315 @@
<activity <activity
android:name=".activities.SplashActivity" android:name=".activities.SplashActivity"
android:theme="@style/SplashTheme"/> android:theme="@style/SplashTheme" />
<activity android:name=".activities.MainActivity"/> <activity
android:name=".activities.MainActivity"
android:exported="false" />
<activity <activity
android:name=".activities.SettingsActivity" android:name=".activities.SettingsActivity"
android:exported="true"
android:label="@string/settings" 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>
<activity <activity
android:name="com.simplemobiletools.commons.activities.AboutActivity" android:name="com.simplemobiletools.commons.activities.AboutActivity"
android:exported="false"
android:label="@string/about" android:label="@string/about"
android:parentActivityName=".activities.MainActivity"/> android:parentActivityName=".activities.MainActivity" />
<activity <activity
android:name="com.simplemobiletools.commons.activities.LicenseActivity" android:name="com.simplemobiletools.commons.activities.LicenseActivity"
android:exported="false"
android:label="@string/third_party_licences" android:label="@string/third_party_licences"
android:parentActivityName="com.simplemobiletools.commons.activities.AboutActivity"/> android:parentActivityName="com.simplemobiletools.commons.activities.AboutActivity" />
<activity <activity
android:name="com.simplemobiletools.commons.activities.CustomizationActivity" android:name="com.simplemobiletools.commons.activities.CustomizationActivity"
android:exported="false"
android:label="@string/customize_colors" android:label="@string/customize_colors"
android:parentActivityName=".activities.SettingsActivity"/> android:parentActivityName=".activities.SettingsActivity" />
<activity <activity
android:name="com.simplemobiletools.commons.activities.FAQActivity" android:name="com.simplemobiletools.commons.activities.FAQActivity"
android:exported="false"
android:label="@string/frequently_asked_questions" android:label="@string/frequently_asked_questions"
android:parentActivityName="com.simplemobiletools.commons.activities.AboutActivity"/> android:parentActivityName="com.simplemobiletools.commons.activities.AboutActivity" />
<provider <provider
android:name=".contentproviders.MyContentProvider" android:name=".contentproviders.MyContentProvider"
android:authorities="com.simplemobiletools.commons.provider" android:authorities="com.simplemobiletools.commons.provider"
android:exported="true"/> android:exported="true" />
<activity-alias <activity-alias
android:name=".activities.SplashActivity.Red" android:name=".activities.SplashActivity.Red"
android:enabled="false" android:enabled="false"
android:exported="true"
android:icon="@mipmap/ic_launcher_red" android:icon="@mipmap/ic_launcher_red"
android:roundIcon="@mipmap/ic_launcher_red" android:roundIcon="@mipmap/ic_launcher_red"
android:targetActivity=".activities.SplashActivity"> android:targetActivity=".activities.SplashActivity">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN"/> <action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER"/> <category android:name="android.intent.category.LAUNCHER" />
</intent-filter> </intent-filter>
</activity-alias> </activity-alias>
<activity-alias <activity-alias
android:name=".activities.SplashActivity.Pink" android:name=".activities.SplashActivity.Pink"
android:enabled="false" android:enabled="false"
android:exported="true"
android:icon="@mipmap/ic_launcher_pink" android:icon="@mipmap/ic_launcher_pink"
android:roundIcon="@mipmap/ic_launcher_pink" android:roundIcon="@mipmap/ic_launcher_pink"
android:targetActivity=".activities.SplashActivity"> android:targetActivity=".activities.SplashActivity">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN"/> <action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER"/> <category android:name="android.intent.category.LAUNCHER" />
</intent-filter> </intent-filter>
</activity-alias> </activity-alias>
<activity-alias <activity-alias
android:name=".activities.SplashActivity.Purple" android:name=".activities.SplashActivity.Purple"
android:enabled="false" android:enabled="false"
android:exported="true"
android:icon="@mipmap/ic_launcher_purple" android:icon="@mipmap/ic_launcher_purple"
android:roundIcon="@mipmap/ic_launcher_purple" android:roundIcon="@mipmap/ic_launcher_purple"
android:targetActivity=".activities.SplashActivity"> android:targetActivity=".activities.SplashActivity">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN"/> <action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER"/> <category android:name="android.intent.category.LAUNCHER" />
</intent-filter> </intent-filter>
</activity-alias> </activity-alias>
<activity-alias <activity-alias
android:name=".activities.SplashActivity.Deep_purple" android:name=".activities.SplashActivity.Deep_purple"
android:enabled="false" android:enabled="false"
android:exported="true"
android:icon="@mipmap/ic_launcher_deep_purple" android:icon="@mipmap/ic_launcher_deep_purple"
android:roundIcon="@mipmap/ic_launcher_deep_purple" android:roundIcon="@mipmap/ic_launcher_deep_purple"
android:targetActivity=".activities.SplashActivity"> android:targetActivity=".activities.SplashActivity">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN"/> <action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER"/> <category android:name="android.intent.category.LAUNCHER" />
</intent-filter> </intent-filter>
</activity-alias> </activity-alias>
<activity-alias <activity-alias
android:name=".activities.SplashActivity.Indigo" android:name=".activities.SplashActivity.Indigo"
android:enabled="false" android:enabled="false"
android:exported="true"
android:icon="@mipmap/ic_launcher_indigo" android:icon="@mipmap/ic_launcher_indigo"
android:roundIcon="@mipmap/ic_launcher_indigo" android:roundIcon="@mipmap/ic_launcher_indigo"
android:targetActivity=".activities.SplashActivity"> android:targetActivity=".activities.SplashActivity">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN"/> <action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER"/> <category android:name="android.intent.category.LAUNCHER" />
</intent-filter> </intent-filter>
</activity-alias> </activity-alias>
<activity-alias <activity-alias
android:name=".activities.SplashActivity.Blue" android:name=".activities.SplashActivity.Blue"
android:enabled="false" android:enabled="false"
android:exported="true"
android:icon="@mipmap/ic_launcher_blue" android:icon="@mipmap/ic_launcher_blue"
android:roundIcon="@mipmap/ic_launcher_blue" android:roundIcon="@mipmap/ic_launcher_blue"
android:targetActivity=".activities.SplashActivity"> android:targetActivity=".activities.SplashActivity">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN"/> <action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER"/> <category android:name="android.intent.category.LAUNCHER" />
</intent-filter> </intent-filter>
</activity-alias> </activity-alias>
<activity-alias <activity-alias
android:name=".activities.SplashActivity.Light_blue" android:name=".activities.SplashActivity.Light_blue"
android:enabled="false" android:enabled="false"
android:exported="true"
android:icon="@mipmap/ic_launcher_light_blue" android:icon="@mipmap/ic_launcher_light_blue"
android:roundIcon="@mipmap/ic_launcher_light_blue" android:roundIcon="@mipmap/ic_launcher_light_blue"
android:targetActivity=".activities.SplashActivity"> android:targetActivity=".activities.SplashActivity">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN"/> <action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER"/> <category android:name="android.intent.category.LAUNCHER" />
</intent-filter> </intent-filter>
</activity-alias> </activity-alias>
<activity-alias <activity-alias
android:name=".activities.SplashActivity.Cyan" android:name=".activities.SplashActivity.Cyan"
android:enabled="false" android:enabled="false"
android:exported="true"
android:icon="@mipmap/ic_launcher_cyan" android:icon="@mipmap/ic_launcher_cyan"
android:roundIcon="@mipmap/ic_launcher_cyan" android:roundIcon="@mipmap/ic_launcher_cyan"
android:targetActivity=".activities.SplashActivity"> android:targetActivity=".activities.SplashActivity">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN"/> <action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER"/> <category android:name="android.intent.category.LAUNCHER" />
</intent-filter> </intent-filter>
</activity-alias> </activity-alias>
<activity-alias <activity-alias
android:name=".activities.SplashActivity.Teal" android:name=".activities.SplashActivity.Teal"
android:enabled="false" android:enabled="false"
android:exported="true"
android:icon="@mipmap/ic_launcher_teal" android:icon="@mipmap/ic_launcher_teal"
android:roundIcon="@mipmap/ic_launcher_teal" android:roundIcon="@mipmap/ic_launcher_teal"
android:targetActivity=".activities.SplashActivity"> android:targetActivity=".activities.SplashActivity">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN"/> <action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER"/> <category android:name="android.intent.category.LAUNCHER" />
</intent-filter> </intent-filter>
</activity-alias> </activity-alias>
<activity-alias <activity-alias
android:name=".activities.SplashActivity.Green" android:name=".activities.SplashActivity.Green"
android:enabled="false" android:enabled="false"
android:exported="true"
android:icon="@mipmap/ic_launcher_green" android:icon="@mipmap/ic_launcher_green"
android:roundIcon="@mipmap/ic_launcher_green" android:roundIcon="@mipmap/ic_launcher_green"
android:targetActivity=".activities.SplashActivity"> android:targetActivity=".activities.SplashActivity">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN"/> <action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER"/> <category android:name="android.intent.category.LAUNCHER" />
</intent-filter> </intent-filter>
</activity-alias> </activity-alias>
<activity-alias <activity-alias
android:name=".activities.SplashActivity.Light_green" android:name=".activities.SplashActivity.Light_green"
android:enabled="false" android:enabled="false"
android:exported="true"
android:icon="@mipmap/ic_launcher_light_green" android:icon="@mipmap/ic_launcher_light_green"
android:roundIcon="@mipmap/ic_launcher_light_green" android:roundIcon="@mipmap/ic_launcher_light_green"
android:targetActivity=".activities.SplashActivity"> android:targetActivity=".activities.SplashActivity">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN"/> <action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER"/> <category android:name="android.intent.category.LAUNCHER" />
</intent-filter> </intent-filter>
</activity-alias> </activity-alias>
<activity-alias <activity-alias
android:name=".activities.SplashActivity.Lime" android:name=".activities.SplashActivity.Lime"
android:enabled="false" android:enabled="false"
android:exported="true"
android:icon="@mipmap/ic_launcher_lime" android:icon="@mipmap/ic_launcher_lime"
android:roundIcon="@mipmap/ic_launcher_lime" android:roundIcon="@mipmap/ic_launcher_lime"
android:targetActivity=".activities.SplashActivity"> android:targetActivity=".activities.SplashActivity">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN"/> <action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER"/> <category android:name="android.intent.category.LAUNCHER" />
</intent-filter> </intent-filter>
</activity-alias> </activity-alias>
<activity-alias <activity-alias
android:name=".activities.SplashActivity.Yellow" android:name=".activities.SplashActivity.Yellow"
android:enabled="false" android:enabled="false"
android:exported="true"
android:icon="@mipmap/ic_launcher_yellow" android:icon="@mipmap/ic_launcher_yellow"
android:roundIcon="@mipmap/ic_launcher_yellow" android:roundIcon="@mipmap/ic_launcher_yellow"
android:targetActivity=".activities.SplashActivity"> android:targetActivity=".activities.SplashActivity">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN"/> <action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER"/> <category android:name="android.intent.category.LAUNCHER" />
</intent-filter> </intent-filter>
</activity-alias> </activity-alias>
<activity-alias <activity-alias
android:name=".activities.SplashActivity.Amber" android:name=".activities.SplashActivity.Amber"
android:enabled="false" android:enabled="false"
android:exported="true"
android:icon="@mipmap/ic_launcher_amber" android:icon="@mipmap/ic_launcher_amber"
android:roundIcon="@mipmap/ic_launcher_amber" android:roundIcon="@mipmap/ic_launcher_amber"
android:targetActivity=".activities.SplashActivity"> android:targetActivity=".activities.SplashActivity">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN"/> <action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER"/> <category android:name="android.intent.category.LAUNCHER" />
</intent-filter> </intent-filter>
</activity-alias> </activity-alias>
<activity-alias <activity-alias
android:name=".activities.SplashActivity.Orange" android:name=".activities.SplashActivity.Orange"
android:enabled="true" android:enabled="true"
android:exported="true"
android:icon="@mipmap/ic_launcher" android:icon="@mipmap/ic_launcher"
android:roundIcon="@mipmap/ic_launcher" android:roundIcon="@mipmap/ic_launcher"
android:targetActivity=".activities.SplashActivity"> android:targetActivity=".activities.SplashActivity">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN"/> <action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER"/> <category android:name="android.intent.category.LAUNCHER" />
</intent-filter> </intent-filter>
</activity-alias> </activity-alias>
<activity-alias <activity-alias
android:name=".activities.SplashActivity.Deep_orange" android:name=".activities.SplashActivity.Deep_orange"
android:enabled="false" android:enabled="false"
android:exported="true"
android:icon="@mipmap/ic_launcher_deep_orange" android:icon="@mipmap/ic_launcher_deep_orange"
android:roundIcon="@mipmap/ic_launcher_deep_orange" android:roundIcon="@mipmap/ic_launcher_deep_orange"
android:targetActivity=".activities.SplashActivity"> android:targetActivity=".activities.SplashActivity">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN"/> <action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER"/> <category android:name="android.intent.category.LAUNCHER" />
</intent-filter> </intent-filter>
</activity-alias> </activity-alias>
<activity-alias <activity-alias
android:name=".activities.SplashActivity.Brown" android:name=".activities.SplashActivity.Brown"
android:enabled="false" android:enabled="false"
android:exported="true"
android:icon="@mipmap/ic_launcher_brown" android:icon="@mipmap/ic_launcher_brown"
android:roundIcon="@mipmap/ic_launcher_brown" android:roundIcon="@mipmap/ic_launcher_brown"
android:targetActivity=".activities.SplashActivity"> android:targetActivity=".activities.SplashActivity">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN"/> <action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER"/> <category android:name="android.intent.category.LAUNCHER" />
</intent-filter> </intent-filter>
</activity-alias> </activity-alias>
<activity-alias <activity-alias
android:name=".activities.SplashActivity.Blue_grey" android:name=".activities.SplashActivity.Blue_grey"
android:enabled="false" android:enabled="false"
android:exported="true"
android:icon="@mipmap/ic_launcher_blue_grey" android:icon="@mipmap/ic_launcher_blue_grey"
android:roundIcon="@mipmap/ic_launcher_blue_grey" android:roundIcon="@mipmap/ic_launcher_blue_grey"
android:targetActivity=".activities.SplashActivity"> android:targetActivity=".activities.SplashActivity">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN"/> <action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER"/> <category android:name="android.intent.category.LAUNCHER" />
</intent-filter> </intent-filter>
</activity-alias> </activity-alias>
<activity-alias <activity-alias
android:name=".activities.SplashActivity.Grey_black" android:name=".activities.SplashActivity.Grey_black"
android:enabled="false" android:enabled="false"
android:exported="true"
android:icon="@mipmap/ic_launcher_grey_black" android:icon="@mipmap/ic_launcher_grey_black"
android:roundIcon="@mipmap/ic_launcher_grey_black" android:roundIcon="@mipmap/ic_launcher_grey_black"
android:targetActivity=".activities.SplashActivity"> android:targetActivity=".activities.SplashActivity">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN"/> <action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER"/> <category android:name="android.intent.category.LAUNCHER" />
</intent-filter> </intent-filter>
</activity-alias> </activity-alias>
</application> </application>

1
app/src/main/kotlin/com/simplemobiletools/thankyou/activities/MainActivity.kt
View File

@@ -29,6 +29,7 @@ class MainActivity : SimpleActivity() {
override fun onCreateOptionsMenu(menu: Menu): Boolean { override fun onCreateOptionsMenu(menu: Menu): Boolean {
menuInflater.inflate(R.menu.menu_main, menu) menuInflater.inflate(R.menu.menu_main, menu)
updateMenuItemColors(menu)
return true return true
} }

4
app/src/main/kotlin/com/simplemobiletools/thankyou/activities/SettingsActivity.kt
View File

@@ -24,11 +24,11 @@ class SettingsActivity : SimpleActivity() {
updateTextColors(settings_holder) updateTextColors(settings_holder)
arrayOf(settings_color_customization_label, settings_general_settings_label).forEach { arrayOf(settings_color_customization_label, settings_general_settings_label).forEach {
it.setTextColor(getAdjustedPrimaryColor()) it.setTextColor(getProperPrimaryColor())
} }
arrayOf(settings_color_customization_holder, settings_general_settings_holder).forEach { arrayOf(settings_color_customization_holder, settings_general_settings_holder).forEach {
it.background.applyColorFilter(baseConfig.backgroundColor.getContrastColor()) it.background.applyColorFilter(getProperBackgroundColor().getContrastColor())
} }
} }

2
build.gradle
View File

@@ -9,7 +9,7 @@ buildscript {
} }
dependencies { 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" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
// NOTE: Do not place your application dependencies here; they belong // NOTE: Do not place your application dependencies here; they belong

2
gradle/wrapper/gradle-wrapper.properties vendored
View File

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists 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