修改弃用方法

pull/921/head
gedoor 4 years ago
parent fa92195933
commit 4e28806c2b
  1. 8
      app/src/main/java/io/legado/app/ui/book/read/ReadBookActivity.kt
  2. 1
      app/src/main/java/io/legado/app/ui/config/OtherConfigFragment.kt
  3. 2
      app/src/main/java/io/legado/app/ui/config/ThemeConfigFragment.kt
  4. 4
      app/src/main/java/io/legado/app/ui/replace/ReplaceRuleActivity.kt

@ -83,11 +83,15 @@ class ReadBookActivity : ReadBookBaseActivity(),
} }
private val sourceEditActivity = private val sourceEditActivity =
registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {
upView() if (it.resultCode == RESULT_OK) {
upView()
}
} }
private val replaceActivity = private val replaceActivity =
registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {
viewModel.replaceRuleChanged() if (it.resultCode == RESULT_OK) {
viewModel.replaceRuleChanged()
}
} }
private val searchContentActivity = private val searchContentActivity =
registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {

@ -45,6 +45,7 @@ class OtherConfigFragment : BasePreferenceFragment(),
) )
private val webPort get() = getPrefInt(PreferKey.webPort, 1122) private val webPort get() = getPrefInt(PreferKey.webPort, 1122)
private val selectCoverImage = registerForActivityResult(ActivityResultContracts.GetContent()) { private val selectCoverImage = registerForActivityResult(ActivityResultContracts.GetContent()) {
it ?: return@registerForActivityResult
setCoverFromUri(it) setCoverFromUri(it)
} }

@ -38,11 +38,13 @@ class ThemeConfigFragment : BasePreferenceFragment(),
SharedPreferences.OnSharedPreferenceChangeListener { SharedPreferences.OnSharedPreferenceChangeListener {
private val selectLightBg = registerForActivityResult(ActivityResultContracts.GetContent()) { private val selectLightBg = registerForActivityResult(ActivityResultContracts.GetContent()) {
it ?: return@registerForActivityResult
setBgFromUri(it, PreferKey.bgImage) { setBgFromUri(it, PreferKey.bgImage) {
upTheme(false) upTheme(false)
} }
} }
private val selectDarkBg = registerForActivityResult(ActivityResultContracts.GetContent()) { private val selectDarkBg = registerForActivityResult(ActivityResultContracts.GetContent()) {
it ?: return@registerForActivityResult
setBgFromUri(it, PreferKey.bgImageN) { setBgFromUri(it, PreferKey.bgImageN) {
upTheme(true) upTheme(true)
} }

@ -64,7 +64,9 @@ class ReplaceRuleActivity : VMBaseActivity<ActivityReplaceRuleBinding, ReplaceRu
} }
private val editActivity = private val editActivity =
registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {
setResult(RESULT_OK) if (it.resultCode == RESULT_OK) {
setResult(RESULT_OK)
}
} }
private val importDoc = registerForActivityResult(FilePicker()) { uri -> private val importDoc = registerForActivityResult(FilePicker()) { uri ->
kotlin.runCatching { kotlin.runCatching {

Loading…
Cancel
Save