Skip to content

Commit 6d668d3

Browse files
authored
Merge pull request #22 from youfeng11/dev
迁移至kotlin与改进
2 parents 62290c9 + b58ce60 commit 6d668d3

17 files changed

Lines changed: 1209 additions & 1525 deletions

app/build.gradle.kts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,12 @@ android {
7373
}
7474
}
7575

76+
packagingOptions {
77+
jniLibs {
78+
useLegacyPackaging = true
79+
}
80+
}
81+
7682
compileOptions {
7783
sourceCompatibility = JavaVersion.VERSION_11
7884
targetCompatibility = JavaVersion.VERSION_11

app/proguard-rules.pro

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,3 @@
1919
# If you keep the line number information, uncomment this to
2020
# hide the original source file name.
2121
#-renamesourcefileattribute SourceFile
22-
23-
-keep class com.fcl.plugin.mobileglues.settings.MGConfig { *; }

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

Lines changed: 0 additions & 27 deletions
This file was deleted.
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
package com.fcl.plugin.mobileglues
2+
3+
import android.content.Context
4+
import android.content.Intent
5+
import android.net.Uri
6+
import android.view.LayoutInflater
7+
import android.view.View
8+
import android.widget.TextView
9+
import com.google.android.material.dialog.MaterialAlertDialogBuilder
10+
11+
class AppInfoDialogBuilder(context: Context) : MaterialAlertDialogBuilder(context) {
12+
13+
init {
14+
val view = LayoutInflater.from(context).inflate(R.layout.dialog_app_info, null)
15+
view.findViewById<TextView>(R.id.info_version).text = BuildConfig.VERSION_NAME
16+
17+
setTitle(R.string.dialog_info)
18+
setView(view)
19+
setPositiveButton(R.string.dialog_positive, null)
20+
setNeutralButton(R.string.dialog_github) { _, _ ->
21+
context.startActivity(
22+
Intent(Intent.ACTION_VIEW, Uri.parse("https://github.com/MobileGL-Dev/MobileGlues-release"))
23+
)
24+
}
25+
}
26+
}

0 commit comments

Comments
 (0)