pull/2260/head
kunfei 2 years ago
parent 0adcffeb9b
commit 6e37f4b3f8
  1. 6
      app/build.gradle
  2. 2
      app/src/main/java/io/legado/app/ui/book/read/config/MoreConfigDialog.kt
  3. 15
      app/src/main/java/io/legado/app/utils/MenuExtensions.kt

@ -18,7 +18,7 @@ def version = "3." + releaseTime()
def gitCommits = Integer.parseInt('git rev-list HEAD --count'.execute().text.trim())
android {
compileSdkVersion 32
compileSdkVersion 33
buildToolsVersion "32.0.0"
namespace 'io.legado.app'
kotlinOptions {
@ -42,7 +42,7 @@ android {
defaultConfig {
applicationId "io.legado.app"
minSdkVersion 21
targetSdkVersion 32
targetSdkVersion 33
versionCode 10000 + gitCommits
versionName version
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@ -156,7 +156,7 @@ dependencies {
implementation('com.github.android:renderscript-intrinsics-replacement-toolkit:b6363490c3')
//androidX
implementation('androidx.core:core-ktx:1.8.0')
implementation('androidx.core:core-ktx:1.9.0')
implementation('androidx.appcompat:appcompat:1.5.1')
implementation('androidx.activity:activity-ktx:1.5.1')
implementation('androidx.fragment:fragment-ktx:1.5.2')

@ -72,7 +72,7 @@ class MoreConfigDialog : DialogFragment() {
class ReadPreferenceFragment : PreferenceFragment(),
SharedPreferences.OnSharedPreferenceChangeListener {
private val slopSquare by lazy { ViewConfiguration.get(context).scaledTouchSlop }
private val slopSquare by lazy { ViewConfiguration.get(requireContext()).scaledTouchSlop }
@SuppressLint("RestrictedApi")
override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {

@ -65,10 +65,17 @@ fun Menu.applyOpenTint(context: Context) {
fun Menu.iconItemOnLongClick(id: Int, function: (view: View) -> Unit) {
findItem(id)?.let { item ->
item.setActionView(R.layout.view_action_button)
item.actionView.contentDescription = item.title
item.actionView.findViewById<ImageButton>(R.id.item).setImageDrawable(item.icon)
item.actionView.setOnLongClickListener { function.invoke(item.actionView); true }
item.actionView.setOnClickListener { performIdentifierAction(id, 0) }
item.actionView?.run {
contentDescription = item.title
findViewById<ImageButton>(R.id.item).setImageDrawable(item.icon)
setOnLongClickListener {
function.invoke(this)
true
}
setOnClickListener {
performIdentifierAction(id, 0)
}
}
}
}

Loading…
Cancel
Save