feat: 优化代码

pull/120/head
kunfei 5 years ago
parent f876dbce20
commit 85f9fe59f6
  1. 4
      app/src/main/java/io/legado/app/ui/widget/font/FontAdapter.kt
  2. 10
      app/src/main/java/io/legado/app/ui/widget/font/FontSelectDialog.kt

@ -20,7 +20,7 @@ class FontAdapter(context: Context, val callBack: CallBack) :
tv_font.typeface = typeface tv_font.typeface = typeface
tv_font.text = item.name tv_font.text = item.name
this.onClick { callBack.onClick(item) } this.onClick { callBack.onClick(item) }
if (item.name == callBack.curFilePath().substringAfterLast(File.separator)) { if (item.name == callBack.curFilePath.substringAfterLast(File.separator)) {
iv_checked.visible() iv_checked.visible()
} else { } else {
iv_checked.invisible() iv_checked.invisible()
@ -38,6 +38,6 @@ class FontAdapter(context: Context, val callBack: CallBack) :
interface CallBack { interface CallBack {
fun onClick(file: File) fun onClick(file: File)
fun curFilePath(): String val curFilePath: String
} }
} }

@ -209,7 +209,7 @@ class FontSelectDialog : BaseDialogFragment(),
launch(IO) { launch(IO) {
file.copyTo(FileUtils.createFileIfNotExist(fontFolder, file.name), true) file.copyTo(FileUtils.createFileIfNotExist(fontFolder, file.name), true)
.absolutePath.let { path -> .absolutePath.let { path ->
if (callBack?.curFontPath != path) { if (curFilePath != path) {
withContext(Main) { withContext(Main) {
callBack?.selectFile(path) callBack?.selectFile(path)
} }
@ -219,10 +219,6 @@ class FontSelectDialog : BaseDialogFragment(),
} }
} }
override fun curFilePath(): String {
return callBack?.curFontPath ?: ""
}
override fun onFilePicked(requestCode: Int, currentPath: String) { override fun onFilePicked(requestCode: Int, currentPath: String) {
when (requestCode) { when (requestCode) {
fontFolderRequestCode -> { fontFolderRequestCode -> {
@ -256,13 +252,15 @@ class FontSelectDialog : BaseDialogFragment(),
} }
private fun onDefaultFontChange() { private fun onDefaultFontChange() {
if (curFilePath() == "") { if (curFilePath == "") {
postEvent(EventBus.UP_CONFIG, true) postEvent(EventBus.UP_CONFIG, true)
} else { } else {
callBack?.selectFile("") callBack?.selectFile("")
} }
} }
override val curFilePath: String get() = callBack?.curFontPath ?: ""
private val callBack: CallBack? private val callBack: CallBack?
get() = (parentFragment as? CallBack) ?: (activity as? CallBack) get() = (parentFragment as? CallBack) ?: (activity as? CallBack)

Loading…
Cancel
Save