Merge remote-tracking branch 'upstream/master'
This commit is contained in:
commit
19bade53a0
3 changed files with 17 additions and 20 deletions
2
.github/workflows/build.yml
vendored
2
.github/workflows/build.yml
vendored
|
|
@ -64,4 +64,4 @@ jobs:
|
|||
uses: actions/upload-artifact@v4
|
||||
with:
|
||||
name: app-release
|
||||
path: /tmp/ShiggyXposedbuild/apks/app-release.apk
|
||||
path: /tmp/ShiggyXposedbuild/apks/app-release.apk
|
||||
|
|
@ -5,17 +5,17 @@ plugins {
|
|||
}
|
||||
|
||||
android {
|
||||
namespace = "GoonXposed.xposed"
|
||||
namespace = "ShiggyXposed.xposed"
|
||||
compileSdk = 36
|
||||
|
||||
|
||||
defaultConfig {
|
||||
applicationId = "GoonXposed.xposed"
|
||||
minSdk = 28
|
||||
targetSdk = 28
|
||||
versionCode = 1310
|
||||
versionName = "1.3.1"
|
||||
applicationId = "ShiggyXposed.xposed"
|
||||
minSdk = 24
|
||||
targetSdk = 36
|
||||
versionCode = 1210
|
||||
versionName = "1.2.1"
|
||||
}
|
||||
|
||||
|
||||
buildTypes {
|
||||
debug {
|
||||
isDebuggable = true
|
||||
|
|
@ -27,29 +27,21 @@ android {
|
|||
isMinifyEnabled = false
|
||||
}
|
||||
}
|
||||
|
||||
compileOptions {
|
||||
sourceCompatibility = JavaVersion.VERSION_1_8
|
||||
targetCompatibility = JavaVersion.VERSION_1_8
|
||||
}
|
||||
|
||||
kotlinOptions {
|
||||
jvmTarget = "1.8"
|
||||
}
|
||||
|
||||
buildFeatures {
|
||||
buildConfig = true
|
||||
}
|
||||
|
||||
// Add this to fix the lint error
|
||||
lint {
|
||||
abortOnError = false
|
||||
checkReleaseBuilds = false
|
||||
}
|
||||
}
|
||||
|
||||
dependencies {
|
||||
compileOnly("de.robv.android.xposed:api:82")
|
||||
|
||||
implementation("androidx.core:core-ktx:1.17.0")
|
||||
implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.9.0")
|
||||
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.10.2")
|
||||
|
|
|
|||
|
|
@ -7,6 +7,7 @@ import android.app.AlertDialog
|
|||
import android.content.Context
|
||||
import android.content.res.ColorStateList
|
||||
import android.graphics.Color
|
||||
import android.os.Build
|
||||
import android.graphics.drawable.GradientDrawable
|
||||
import android.util.TypedValue
|
||||
import android.view.Gravity
|
||||
|
|
@ -465,7 +466,9 @@ object LogBoxModule : Module() {
|
|||
textSize = 14f
|
||||
setTextColor(colors.onSurfaceVariant)
|
||||
setPadding(0, 0, 0, dpToPx(context, 24))
|
||||
lineHeight = dpToPx(context, 20)
|
||||
if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.P) {
|
||||
lineHeight = dpToPx(context, 20)
|
||||
}
|
||||
}
|
||||
container.addView(messageView)
|
||||
|
||||
|
|
@ -1017,7 +1020,9 @@ object LogBoxModule : Module() {
|
|||
textSize = 14f
|
||||
setTextColor(colors.onSurfaceVariant)
|
||||
setPadding(0, 0, 0, dpToPx(context, 24))
|
||||
lineHeight = dpToPx(context, 20)
|
||||
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
|
||||
lineHeight = dpToPx(context, 20)
|
||||
}
|
||||
}
|
||||
container.addView(messageView)
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue