pull/1434/head
gedoor 4 years ago
parent 4f465fcb69
commit 82d4c0de03
  1. 8
      app/build.gradle
  2. 6
      app/src/main/java/io/legado/app/base/BaseActivity.kt
  3. 2
      app/src/main/java/io/legado/app/ui/book/toc/TocActivityResult.kt
  4. 6
      app/src/main/java/io/legado/app/ui/document/HandleFileContract.kt
  5. 8
      app/src/main/java/io/legado/app/ui/main/bookshelf/BaseBookshelfFragment.kt
  6. 2
      app/src/main/java/io/legado/app/ui/qrcode/QrCodeResult.kt
  7. 2
      app/src/main/java/io/legado/app/utils/ActivityResultContracts.kt

@ -137,12 +137,12 @@ dependencies {
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutines_version") implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutines_version")
//androidX //androidX
implementation('androidx.core:core-ktx:1.7.0')
implementation('androidx.appcompat:appcompat:1.3.1') implementation('androidx.appcompat:appcompat:1.3.1')
implementation('androidx.core:core-ktx:1.6.0') implementation('androidx.activity:activity-ktx:1.4.0')
implementation("androidx.activity:activity-ktx:1.3.1") implementation('androidx.fragment:fragment-ktx:1.3.6')
implementation("androidx.fragment:fragment-ktx:1.3.6")
implementation('androidx.preference:preference-ktx:1.1.1') implementation('androidx.preference:preference-ktx:1.1.1')
implementation('androidx.constraintlayout:constraintlayout:2.1.0') implementation('androidx.constraintlayout:constraintlayout:2.1.1')
implementation('androidx.swiperefreshlayout:swiperefreshlayout:1.1.0') implementation('androidx.swiperefreshlayout:swiperefreshlayout:1.1.0')
implementation('androidx.viewpager2:viewpager2:1.0.0') implementation('androidx.viewpager2:viewpager2:1.0.0')
implementation('com.google.android.material:material:1.4.0') implementation('com.google.android.material:material:1.4.0')

@ -98,12 +98,12 @@ abstract class BaseActivity<VB : ViewBinding>(
abstract fun onActivityCreated(savedInstanceState: Bundle?) abstract fun onActivityCreated(savedInstanceState: Bundle?)
final override fun onCreateOptionsMenu(menu: Menu?): Boolean { final override fun onCreateOptionsMenu(menu: Menu): Boolean {
return menu?.let { return menu.let {
val bool = onCompatCreateOptionsMenu(it) val bool = onCompatCreateOptionsMenu(it)
it.applyTint(this, toolBarTheme) it.applyTint(this, toolBarTheme)
bool bool
} ?: super.onCreateOptionsMenu(menu) }
} }
override fun onMenuOpened(featureId: Int, menu: Menu): Boolean { override fun onMenuOpened(featureId: Int, menu: Menu): Boolean {

@ -7,7 +7,7 @@ import androidx.activity.result.contract.ActivityResultContract
class TocActivityResult : ActivityResultContract<String, Pair<Int, Int>?>() { class TocActivityResult : ActivityResultContract<String, Pair<Int, Int>?>() {
override fun createIntent(context: Context, input: String?): Intent { override fun createIntent(context: Context, input: String): Intent {
return Intent(context, TocActivity::class.java) return Intent(context, TocActivity::class.java)
.putExtra("bookUrl", input) .putExtra("bookUrl", input)
} }

@ -15,12 +15,10 @@ class HandleFileContract :
private var requestCode: Int = 0 private var requestCode: Int = 0
override fun createIntent(context: Context, input: (HandleFileParam.() -> Unit)?): Intent { override fun createIntent(context: Context, input: (HandleFileParam.() -> Unit)): Intent {
val intent = Intent(context, HandleFileActivity::class.java) val intent = Intent(context, HandleFileActivity::class.java)
val handleFileParam = HandleFileParam() val handleFileParam = HandleFileParam()
input?.let { handleFileParam.apply(input)
handleFileParam.apply(input)
}
handleFileParam.let { handleFileParam.let {
requestCode = it.requestCode requestCode = it.requestCode
intent.putExtra("mode", it.mode) intent.putExtra("mode", it.mode)

@ -82,14 +82,10 @@ abstract class BaseBookshelfFragment(layoutId: Int) : VMBaseFragment<BookshelfVi
R.id.menu_download -> startActivity<CacheActivity> { R.id.menu_download -> startActivity<CacheActivity> {
putExtra("groupId", groupId) putExtra("groupId", groupId)
} }
R.id.menu_export_bookshelf -> viewModel.exportBookshelf(books) { R.id.menu_export_bookshelf -> viewModel.exportBookshelf(books) { file ->
exportResult.launch { exportResult.launch {
mode = HandleFileContract.EXPORT mode = HandleFileContract.EXPORT
fileData = Triple( fileData = Triple("bookshelf.json", file, "application/json")
"bookshelf.json",
it.toByteArray(),
"application/json"
)
} }
} }
R.id.menu_import_bookshelf -> importBookshelfAlert(groupId) R.id.menu_import_bookshelf -> importBookshelfAlert(groupId)

@ -7,7 +7,7 @@ import androidx.activity.result.contract.ActivityResultContract
class QrCodeResult : ActivityResultContract<Unit, String?>() { class QrCodeResult : ActivityResultContract<Unit, String?>() {
override fun createIntent(context: Context, input: Unit?): Intent { override fun createIntent(context: Context, input: Unit): Intent {
return Intent(context, QrCodeActivity::class.java) return Intent(context, QrCodeActivity::class.java)
} }

@ -11,7 +11,7 @@ class SelectImageContract : ActivityResultContract<Int, SelectImageContract.Resu
var requestCode: Int? = null var requestCode: Int? = null
override fun createIntent(context: Context, input: Int?): Intent { override fun createIntent(context: Context, input: Int): Intent {
requestCode = input requestCode = input
return Intent(Intent.ACTION_GET_CONTENT) return Intent(Intent.ACTION_GET_CONTENT)
.addCategory(Intent.CATEGORY_OPENABLE) .addCategory(Intent.CATEGORY_OPENABLE)

Loading…
Cancel
Save