diff --git a/app/src/main/java/io/legado/app/help/storage/WebDavHelp.kt b/app/src/main/java/io/legado/app/help/storage/WebDavHelp.kt index c19c3b46f..d99141606 100644 --- a/app/src/main/java/io/legado/app/help/storage/WebDavHelp.kt +++ b/app/src/main/java/io/legado/app/help/storage/WebDavHelp.kt @@ -88,10 +88,9 @@ object WebDavHelp { FileHelp.deleteFile(zipFilePath) if (ZipUtils.zipFiles(paths, zipFilePath)) { WebDav(getWebDavUrl() + "legado").makeAsDir() - val putUrl = getWebDavUrl() + "legado/backup" + SimpleDateFormat( - "yyyy-MM-dd", - Locale.getDefault() - ).format(Date(System.currentTimeMillis())) + ".zip" + val putUrl = getWebDavUrl() + "legado/backup" + + SimpleDateFormat("yyyy-MM-dd", Locale.getDefault()) + .format(Date(System.currentTimeMillis())) + ".zip" WebDav(putUrl).upload(zipFilePath) } } diff --git a/app/src/main/java/io/legado/app/ui/book/source/debug/SourceDebugActivity.kt b/app/src/main/java/io/legado/app/ui/book/source/debug/SourceDebugActivity.kt index de2ef20e7..b180f6b17 100644 --- a/app/src/main/java/io/legado/app/ui/book/source/debug/SourceDebugActivity.kt +++ b/app/src/main/java/io/legado/app/ui/book/source/debug/SourceDebugActivity.kt @@ -12,13 +12,13 @@ import io.legado.app.lib.theme.ATH import io.legado.app.lib.theme.accentColor import io.legado.app.ui.qrcode.QrCodeActivity import io.legado.app.utils.getViewModel -import kotlinx.android.synthetic.main.activity_source_debug.* +import kotlinx.android.synthetic.main.activity_book_source_debug.* import kotlinx.android.synthetic.main.view_search.* import kotlinx.coroutines.launch import org.jetbrains.anko.startActivityForResult import org.jetbrains.anko.toast -class SourceDebugActivity : VMBaseActivity(R.layout.activity_source_debug) { +class SourceDebugActivity : VMBaseActivity(R.layout.activity_book_source_debug) { override val viewModel: SourceDebugModel get() = getViewModel(SourceDebugModel::class.java) diff --git a/app/src/main/java/io/legado/app/ui/book/source/debug/SourceDebugAdapter.kt b/app/src/main/java/io/legado/app/ui/book/source/debug/SourceDebugAdapter.kt index 0c057fda0..94147a5f1 100644 --- a/app/src/main/java/io/legado/app/ui/book/source/debug/SourceDebugAdapter.kt +++ b/app/src/main/java/io/legado/app/ui/book/source/debug/SourceDebugAdapter.kt @@ -4,9 +4,10 @@ import android.content.Context import io.legado.app.R import io.legado.app.base.adapter.ItemViewHolder import io.legado.app.base.adapter.SimpleRecyclerAdapter -import kotlinx.android.synthetic.main.item_source_debug.view.* +import kotlinx.android.synthetic.main.item_log.view.* -class SourceDebugAdapter(context: Context) : SimpleRecyclerAdapter(context, R.layout.item_source_debug) { +class SourceDebugAdapter(context: Context) : + SimpleRecyclerAdapter(context, R.layout.item_log) { override fun convert(holder: ItemViewHolder, item: String, payloads: MutableList) { holder.itemView.apply { text_view.text = item diff --git a/app/src/main/java/io/legado/app/ui/book/source/edit/SourceEditActivity.kt b/app/src/main/java/io/legado/app/ui/book/source/edit/SourceEditActivity.kt index faaf38ff6..b49db48bc 100644 --- a/app/src/main/java/io/legado/app/ui/book/source/edit/SourceEditActivity.kt +++ b/app/src/main/java/io/legado/app/ui/book/source/edit/SourceEditActivity.kt @@ -24,14 +24,14 @@ import io.legado.app.ui.book.source.debug.SourceDebugActivity import io.legado.app.ui.widget.KeyboardToolPop import io.legado.app.utils.GSON import io.legado.app.utils.getViewModel -import kotlinx.android.synthetic.main.activity_source_edit.* +import kotlinx.android.synthetic.main.activity_book_source_edit.* import org.jetbrains.anko.displayMetrics import org.jetbrains.anko.startActivity import org.jetbrains.anko.toast import kotlin.math.abs class SourceEditActivity : - VMBaseActivity(R.layout.activity_source_edit, false), + VMBaseActivity(R.layout.activity_book_source_edit, false), KeyboardToolPop.OnClickListener { override val viewModel: SourceEditViewModel get() = getViewModel(SourceEditViewModel::class.java) diff --git a/app/src/main/res/layout/activity_source_debug.xml b/app/src/main/res/layout/activity_book_source_debug.xml similarity index 100% rename from app/src/main/res/layout/activity_source_debug.xml rename to app/src/main/res/layout/activity_book_source_debug.xml diff --git a/app/src/main/res/layout/activity_source_edit.xml b/app/src/main/res/layout/activity_book_source_edit.xml similarity index 100% rename from app/src/main/res/layout/activity_source_edit.xml rename to app/src/main/res/layout/activity_book_source_edit.xml diff --git a/app/src/main/res/layout/item_source_debug.xml b/app/src/main/res/layout/item_log.xml similarity index 100% rename from app/src/main/res/layout/item_source_debug.xml rename to app/src/main/res/layout/item_log.xml