mirrors/vlc-android
0
0
Fork 0
mirror of https://github.com/videolan/vlc-android synced 2024-11-24 02:17:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

Improve the settings search by filling the string substitution in the summary

Browse Source
This commit is contained in:
Nicolas Pomepuy 2021-04-15 09:44:30 +02:00
parent 438a02b51d
commit 4aab43a776
1 changed files with 30 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
application/vlc-android/src/org/videolan/vlc/gui/preferences/search/PreferenceParser.kt
View File

@ -28,8 +28,11 @@ import android.content.Context
import android.content.ContextWrapper
import android.content.res.XmlResourceParser
import android.os.Parcelable
import android.util.Log
import kotlinx.android.parcel.Parcelize
import org.videolan.tools.Settings
import org.videolan.tools.wrap
import org.videolan.vlc.BuildConfig
import org.videolan.vlc.R
object PreferenceParser {
@ -61,11 +64,24 @@ object PreferenceParser {
categoryEng = getValue(englishContext, parser, namespace, "title")
}
if (element != "PreferenceCategory" && element != "Preference") {
val title = getValue(context, parser, namespace, "title")
val summary = getValue(context, parser, namespace, "summary")
val titleEng = getValue(englishContext, parser, namespace, "title")
val summaryEng = getValue(englishContext, parser, namespace, "summary")
val key = getValue(context, parser, namespace, "key")
val title = getValue(context, parser, namespace, "title")
val titleEng = getValue(englishContext, parser, namespace, "title")
var summary = getValue(context, parser, namespace, "summary")
var summaryEng = getValue(englishContext, parser, namespace, "summary")
if (summary.contains("%s") && element == "ListPreference") {
//get the current value for the string substitution
try {
val defaultValue = getValue(context, parser, namespace, "defaultValue")
val rawValue = Settings.getInstance(context).getString(key, defaultValue) ?: ""
val entriesId = parser.getAttributeResourceValue(namespace, "entries", -1)
val entryValuesId = parser.getAttributeResourceValue(namespace, "entryValues", -1)
val index = context.resources.getStringArray(entryValuesId).indexOf(rawValue)
summary = summary.replace("%s", context.resources.getStringArray(entriesId)[index])
summaryEng = summaryEng.replace("%s", englishContext.resources.getStringArray(entriesId)[index])
} catch (e: Exception) {
}
}
if (key.isNotBlank()) result.add(PreferenceItem(key, id, title, summary, titleEng, summaryEng, category, categoryEng))
}
}
@ -86,6 +102,16 @@ object PreferenceParser {
}
return ""
}
private fun getSummary (context: Context, parser: XmlResourceParser, namespace: String, node: String, defaultValue:String, key:String):String {
val value = getValue(context, parser, namespace, node)
if (value.contains("%s")) if (BuildConfig.DEBUG) Log.d(this::class.java.simpleName, "Found string replacement for $key")
return if (value.contains("%s"))
value.replace("%s", Settings.getInstance(context).getString(key, defaultValue) ?: "")
else value
}
}
@Parcelize