From 8f6efffc1fbd9b10359b56887d7d6693bdf77401 Mon Sep 17 00:00:00 2001 From: kunfei Date: Wed, 29 Jan 2020 20:28:57 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/io/legado/app/help/AppConfig.kt | 10 +++++++--- .../app/ui/importbook/ImportBookActivity.kt | 18 +++++++++++++++++- .../main/res/layout/activity_import_book.xml | 2 +- 3 files changed, 25 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/io/legado/app/help/AppConfig.kt b/app/src/main/java/io/legado/app/help/AppConfig.kt index f51d7b479..02f84a838 100644 --- a/app/src/main/java/io/legado/app/help/AppConfig.kt +++ b/app/src/main/java/io/legado/app/help/AppConfig.kt @@ -40,10 +40,14 @@ object AppConfig { App.INSTANCE.putPrefInt(PreferKey.threadCount, value) } - var autoDarkMode: Boolean - get() = App.INSTANCE.getPrefBoolean(PreferKey.autoDarkMode) + var importBookPath: String? + get() = App.INSTANCE.getPrefString("importBookPath") set(value) { - App.INSTANCE.putPrefBoolean(PreferKey.autoDarkMode, value) + if (value == null) { + App.INSTANCE.removePref("importBookPath") + } else { + App.INSTANCE.putPrefString("importBookPath", value) + } } val isEInkMode: Boolean diff --git a/app/src/main/java/io/legado/app/ui/importbook/ImportBookActivity.kt b/app/src/main/java/io/legado/app/ui/importbook/ImportBookActivity.kt index 81c2df2ea..697c57d14 100644 --- a/app/src/main/java/io/legado/app/ui/importbook/ImportBookActivity.kt +++ b/app/src/main/java/io/legado/app/ui/importbook/ImportBookActivity.kt @@ -2,23 +2,30 @@ package io.legado.app.ui.importbook import android.app.Activity import android.content.Intent +import android.net.Uri import android.os.Bundle import android.view.Menu import android.view.MenuItem +import androidx.documentfile.provider.DocumentFile +import androidx.recyclerview.widget.LinearLayoutManager import io.legado.app.R import io.legado.app.base.VMBaseActivity +import io.legado.app.help.AppConfig import io.legado.app.utils.getViewModel +import kotlinx.android.synthetic.main.activity_import_book.* class ImportBookActivity : VMBaseActivity(R.layout.activity_import_book) { private val requestCodeSelectFolder = 342 + private var rootDoc: DocumentFile? = null + private val subDirs = arrayListOf() override val viewModel: ImportBookViewModel get() = getViewModel(ImportBookViewModel::class.java) - override fun onActivityCreated(savedInstanceState: Bundle?) { initView() + upPath() } override fun onCompatCreateOptionsMenu(menu: Menu): Boolean { @@ -35,14 +42,23 @@ class ImportBookActivity : VMBaseActivity(R.layout.activity } private fun initView() { + recycler_view.layoutManager = LinearLayoutManager(this) + } + private fun upPath() { + AppConfig.importBookPath?.let { + val rootUri = Uri.parse(it) + rootDoc = DocumentFile.fromTreeUri(this, rootUri) + } } override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) { super.onActivityResult(requestCode, resultCode, data) when (requestCode) { requestCodeSelectFolder -> if (resultCode == Activity.RESULT_OK) { + data?.data?.let { + } } } } diff --git a/app/src/main/res/layout/activity_import_book.xml b/app/src/main/res/layout/activity_import_book.xml index a566d7a72..abccf0f01 100644 --- a/app/src/main/res/layout/activity_import_book.xml +++ b/app/src/main/res/layout/activity_import_book.xml @@ -49,7 +49,7 @@