Skip to content

Commit

Permalink
Merge pull request #159 from KieronQuinn/release/1.9.1
Browse files Browse the repository at this point in the history
1.9.1
  • Loading branch information
KieronQuinn authored Oct 15, 2024
2 parents e735016 + 8c24989 commit 9aa6e01
Show file tree
Hide file tree
Showing 11 changed files with 58 additions and 35 deletions.
2 changes: 1 addition & 1 deletion .idea/compiler.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 13 additions & 0 deletions .idea/runConfigurations.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Controls/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@ android {

dependencies {
implementation 'androidx.core:core-ktx:1.13.1'
implementation "androidx.lifecycle:lifecycle-common-java8:2.8.4"
implementation "androidx.lifecycle:lifecycle-common-java8:2.8.6"
implementation 'androidx.recyclerview:recyclerview:1.3.2'
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
implementation 'androidx.fragment:fragment-ktx:1.8.2'
implementation 'androidx.fragment:fragment-ktx:1.8.4'
implementation 'androidx.preference:preference-ktx:1.2.1'
implementation 'androidx.viewpager2:viewpager2:1.1.0'
implementation "io.insert-koin:koin-android:$koin_version"
Expand Down
22 changes: 11 additions & 11 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,16 @@ plugins {
id 'com.google.devtools.ksp'
}

def version = '1.9'
def version = '1.9.1'

android {
compileSdk 34
compileSdk 35

defaultConfig {
applicationId "com.kieronquinn.app.classicpowermenu"
minSdk 30
targetSdk 34
versionCode 190
targetSdk 35
versionCode 191
versionName version

testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
Expand Down Expand Up @@ -79,10 +79,10 @@ dependencies {
ksp "androidx.room:room-compiler:$room_version"

//AndroidX
def lifecycle_version = "2.8.4"
def lifecycle_version = "2.8.6"
implementation 'androidx.core:core-ktx:1.13.1'
implementation "androidx.activity:activity-ktx:1.9.1"
implementation "androidx.fragment:fragment-ktx:1.8.2"
implementation "androidx.activity:activity-ktx:1.9.2"
implementation "androidx.fragment:fragment-ktx:1.8.4"
implementation 'androidx.appcompat:appcompat:1.7.0'
implementation "androidx.lifecycle:lifecycle-runtime-ktx:$lifecycle_version"
implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"
Expand Down Expand Up @@ -143,13 +143,13 @@ dependencies {
implementation 'com.google.android.gms:play-services-oss-licenses:17.1.0'

//Retrofit for update checking
implementation 'com.squareup.retrofit2:retrofit:2.9.0'
implementation 'com.squareup.retrofit2:converter-gson:2.9.0'
implementation 'com.squareup.retrofit2:retrofit:2.11.0'
implementation 'com.squareup.retrofit2:converter-gson:2.11.0'

//Other third party
implementation 'org.lsposed.hiddenapibypass:hiddenapibypass:4.3'
implementation 'com.airbnb.android:lottie:6.3.0'
implementation 'com.jakewharton:process-phoenix:2.1.2'
implementation 'com.airbnb.android:lottie:6.4.1'
implementation 'com.jakewharton:process-phoenix:3.0.0'
implementation 'me.saket:better-link-movement-method:2.2.0'
implementation "io.noties.markwon:core:4.6.2"

Expand Down
Binary file added app/release/baselineProfiles/0/app-release.dm
Binary file not shown.
Binary file added app/release/baselineProfiles/1/app-release.dm
Binary file not shown.
23 changes: 20 additions & 3 deletions app/release/output-metadata.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,27 @@
"type": "SINGLE",
"filters": [],
"attributes": [],
"versionCode": 172,
"versionName": "1.7.2",
"versionCode": 190,
"versionName": "1.9",
"outputFile": "app-release.apk"
}
],
"elementType": "File"
"elementType": "File",
"baselineProfiles": [
{
"minApi": 28,
"maxApi": 30,
"baselineProfiles": [
"baselineProfiles/1/app-release.dm"
]
},
{
"minApi": 31,
"maxApi": 2147483647,
"baselineProfiles": [
"baselineProfiles/0/app-release.dm"
]
}
],
"minSdkVersionForDexing": 30
}
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,8 @@ class WalletCardBlurProviderImpl(context: Context, private val settings: Setting
//Don't blur if not locked
if(!keyguardManager.isDeviceLocked && !settings.developerContentCreatorMode) return cardDrawable
if(!settings.quickAccessWalletHideCardNumberWhenLocked && !settings.developerContentCreatorMode) return cardDrawable
val cardBitmap = cardDrawable.bitmap.copy(cardDrawable.bitmap.config, true)
val cardBitmap = cardDrawable.bitmap.config?.let { cardDrawable.bitmap.copy(it, true) }
?: return cardDrawable
//Calculate the position of the last 4 digits of the card number
val cardYTop = (CARD_Y_TOP * cardBitmap.height).roundToInt()
val cardYBottom = (CARD_Y_BOTTOM * cardBitmap.height).roundToInt()
Expand All @@ -67,7 +68,7 @@ class WalletCardBlurProviderImpl(context: Context, private val settings: Setting
}

private fun blurBitmap(source: Bitmap, radius: Float): Bitmap {
val bitmap = source.copy(source.config, true)
val bitmap = source.config?.let { source.copy(it, true) } ?: return source
val input = Allocation.createFromBitmap(
renderScript,
source,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ class PowerMenuActivity : MonetCompatActivity(), PowerMenuStarter.PowerMenuStart
window.returnTransition = Fade()
window.enterTransition = Fade()
window.reenterTransition = Fade()
window.setupWindowFlags()
setShowWhenLocked(true)
setTurnScreenOn(true)
super.onCreate(savedInstanceState)
Expand Down Expand Up @@ -102,13 +101,6 @@ class PowerMenuActivity : MonetCompatActivity(), PowerMenuStarter.PowerMenuStart
finishAfterTransition()
}

private fun Window.setupWindowFlags(){
//addFlags(WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED)
//addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
//addFlags(WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON)
//addFlags(WindowManager.LayoutParams.FLAG_ALLOW_LOCK_WHILE_SCREEN_ON)
}

private fun Window.setupLayout(){
setLayout(WindowManager.LayoutParams.MATCH_PARENT, WindowManager.LayoutParams.MATCH_PARENT)
navigationBarColor = Color.TRANSPARENT
Expand Down
12 changes: 6 additions & 6 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript {
ext.nav_version = "2.7.7"
ext.koin_version = "3.5.3"
ext.nav_version = "2.8.2"
ext.koin_version = "3.5.6"
ext.protobuf_version = '0.9.1'
ext.room_version = "2.6.1"
dependencies {
Expand All @@ -12,10 +12,10 @@ buildscript {
}

plugins {
id 'com.android.application' version '8.5.2' apply false
id 'com.android.library' version '8.5.2' apply false
id 'org.jetbrains.kotlin.android' version '1.9.0' apply false
id 'com.google.devtools.ksp' version '1.9.10-1.0.13' apply false
id 'com.android.application' version '8.7.0' apply false
id 'com.android.library' version '8.7.0' apply false
id 'org.jetbrains.kotlin.android' version '2.0.20' apply false
id 'com.google.devtools.ksp' version '2.0.20-1.0.25' apply false
}

task clean(type: Delete) {
Expand Down
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Fri Aug 23 23:23:13 BST 2024
#Tue Oct 15 22:59:53 BST 2024
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists

0 comments on commit 9aa6e01

Please sign in to comment.