Merge remote-tracking branch 'origin/master'

app/src/main/java/io/legado/app/lib/theme/prefs/IconListPreference.kt

@@ -1,96 +0,0 @@
-package io.legado.app.lib.theme.prefs
-
-import android.annotation.SuppressLint
-import android.app.Activity
-import android.app.AlertDialog.Builder
-import android.content.Context
-import android.graphics.drawable.Drawable
-import android.preference.ListPreference
-import android.util.AttributeSet
-import android.view.View
-import android.view.ViewGroup
-import android.widget.ArrayAdapter
-import android.widget.CheckedTextView
-import android.widget.ImageView
-import android.widget.ListAdapter
-import io.legado.app.R
-import java.util.*
-
-
-class IconListPreference(context: Context, attrs: AttributeSet) : ListPreference(context, attrs) {
-
-    private val mEntryDrawables = ArrayList<Drawable>()
-
-    init {
-
-        val a = context.theme.obtainStyledAttributes(attrs, R.styleable.IconListPreference, 0, 0)
-
-        val drawables: Array<CharSequence>
-
-        try {
-            drawables = a.getTextArray(R.styleable.IconListPreference_icons)
-        } finally {
-            a.recycle()
-        }
-
-        for (drawable in drawables) {
-            val resId = context.resources.getIdentifier(drawable.toString(), "mipmap", context.packageName)
-
-            @Suppress("DEPRECATION")
-            val d = context.resources.getDrawable(resId)
-
-            mEntryDrawables.add(d)
-        }
-
-        widgetLayoutResource = R.layout.view_icon
-    }
-
-    protected fun createListAdapter(): ListAdapter {
-        val selectedValue = value
-        val selectedIndex = findIndexOfValue(selectedValue)
-        return AppArrayAdapter(context, R.layout.item_icon_preference, entries, mEntryDrawables, selectedIndex)
-    }
-
-    override fun onBindView(view: View) {
-        super.onBindView(view)
-
-        val selectedValue = value
-        val selectedIndex = findIndexOfValue(selectedValue)
-
-        val drawable = mEntryDrawables[selectedIndex]
-
-        (view.findViewById<View>(R.id.preview) as ImageView).setImageDrawable(drawable)
-    }
-
-    override fun onPrepareDialogBuilder(builder: Builder) {
-        builder.setAdapter(createListAdapter(), this)
-        super.onPrepareDialogBuilder(builder)
-    }
-
-    inner class AppArrayAdapter(
-        context: Context, textViewResourceId: Int,
-        objects: Array<CharSequence>, imageDrawables: List<Drawable>,
-        selectedIndex: Int
-    ) : ArrayAdapter<CharSequence>(context, textViewResourceId, objects) {
-        private var mImageDrawables: List<Drawable>? = null
-        private var mSelectedIndex = 0
-
-        init {
-            mSelectedIndex = selectedIndex
-            mImageDrawables = imageDrawables
-        }
-
-        @SuppressLint("ViewHolder")
-        override fun getView(position: Int, convertView: View?, parent: ViewGroup): View {
-            val inflater = (context as Activity).layoutInflater
-            val view = inflater.inflate(R.layout.item_icon_preference, parent, false)
-            val textView = view.findViewById<View>(R.id.label) as CheckedTextView
-            textView.text = getItem(position)
-            textView.isChecked = position == mSelectedIndex
-
-            val imageView = view.findViewById<View>(R.id.icon) as ImageView
-            imageView.setImageDrawable(mImageDrawables!![position])
-            return view
-        }
-    }
-}

app/src/main/res/xml/pref_config.xml

@@ -17,4 +17,11 @@
         app:iconSpaceReserved="false" />
 
 
+    <io.legado.app.lib.theme.prefs.ATESwitchPreference
+        android:defaultValue="true"
+        android:key="process_text"
+        android:summary="长按文字在操作菜单中显示阅读·搜索"
+        android:title="文字操作显示搜索"
+        app:iconSpaceReserved="false" />
+
 </androidx.preference.PreferenceScreen>

app/src/main/res/xml/pref_config_read.xml

@@ -8,5 +8,10 @@
         android:key="hideStatusBar"
         app:iconSpaceReserved="false" />
 
+    <io.legado.app.lib.theme.prefs.ATESwitchPreference
+        android:defaultValue="false"
+        android:title="@string/pt_hide_navigation_bar"
+        android:key="hideNavigationBar"
+        app:iconSpaceReserved="false" />
 
 </androidx.preference.PreferenceScreen>