Skip to content

Commit 2322491

Browse files
authored
Merge pull request #26 from youfeng11/main
改进
2 parents 7d891ef + 75c4442 commit 2322491

14 files changed

Lines changed: 363 additions & 298 deletions

File tree

app/build.gradle.kts

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@ plugins {
55

66
android {
77
namespace = "com.fcl.plugin.mobileglues"
8-
compileSdk = 35
8+
compileSdk = 36
99

1010
ndkVersion = "27.1.12297006"
1111

1212
defaultConfig {
1313
applicationId = "com.fcl.plugin.mobileglues"
1414
minSdk = 26
15-
targetSdk = 35
15+
targetSdk = 36
1616
versionCode = 1300
1717
versionName = "1.3.0"
1818

@@ -73,12 +73,6 @@ android {
7373
}
7474
}
7575

76-
packagingOptions {
77-
jniLibs {
78-
useLegacyPackaging = true
79-
}
80-
}
81-
8276
compileOptions {
8377
sourceCompatibility = JavaVersion.VERSION_11
8478
targetCompatibility = JavaVersion.VERSION_11
@@ -90,6 +84,11 @@ android {
9084
buildConfig = true
9185
viewBinding = true
9286
}
87+
packaging {
88+
jniLibs {
89+
useLegacyPackaging = true
90+
}
91+
}
9392
}
9493

9594
dependencies {

app/src/main/AndroidManifest.xml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,6 @@
1111

1212
<application
1313
android:allowBackup="true"
14-
android:dataExtractionRules="@xml/data_extraction_rules"
15-
android:extractNativeLibs="true"
16-
android:fullBackupContent="@xml/backup_rules"
1714
android:icon="@mipmap/ic_launcher"
1815
android:label="@string/app_name"
1916
android:preserveLegacyExternalStorage="true"

app/src/main/java/com/fcl/plugin/mobileglues/AppInfoDialogBuilder.kt

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,29 @@
11
package com.fcl.plugin.mobileglues
22

3+
import android.annotation.SuppressLint
34
import android.content.Context
45
import android.content.Intent
5-
import android.net.Uri
66
import android.view.LayoutInflater
7-
import android.view.View
87
import android.widget.TextView
8+
import androidx.core.net.toUri
99
import com.google.android.material.dialog.MaterialAlertDialogBuilder
1010

11+
@SuppressLint("InflateParams")
1112
class AppInfoDialogBuilder(context: Context) : MaterialAlertDialogBuilder(context) {
1213

1314
init {
14-
val view = LayoutInflater.from(context).inflate(R.layout.dialog_app_info, null)
15+
val view = LayoutInflater.from(context).inflate(R.layout.dialog_app_info, null, false)
1516
view.findViewById<TextView>(R.id.info_version).text = BuildConfig.VERSION_NAME
1617

1718
setTitle(R.string.dialog_info)
1819
setView(view)
1920
setPositiveButton(R.string.dialog_positive, null)
2021
setNeutralButton(R.string.dialog_github) { _, _ ->
2122
context.startActivity(
22-
Intent(Intent.ACTION_VIEW, Uri.parse("https://github.com/MobileGL-Dev/MobileGlues-release"))
23+
Intent(
24+
Intent.ACTION_VIEW,
25+
"https://github.com/MobileGL-Dev/MobileGlues-release".toUri()
26+
)
2327
)
2428
}
2529
}

0 commit comments

Comments
 (0)