From 13e0977607834187257684fea3595505e0fd9770 Mon Sep 17 00:00:00 2001
From: kunfei <gekunfei@live.com>
Date: Mon, 2 Mar 2020 21:08:25 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/AndroidManifest.xml                          | 8 ++++----
 .../main/java/io/legado/app/ui/audio/AudioPlayActivity.kt | 4 ++--
 .../app/ui/{ => book}/changecover/ChangeCoverDialog.kt    | 2 +-
 .../app/ui/{ => book}/changecover/ChangeCoverViewModel.kt | 2 +-
 .../legado/app/ui/{ => book}/changecover/CoverAdapter.kt  | 2 +-
 .../app/ui/{ => book}/changesource/ChangeSourceAdapter.kt | 2 +-
 .../app/ui/{ => book}/changesource/ChangeSourceDialog.kt  | 2 +-
 .../ui/{ => book}/changesource/ChangeSourceViewModel.kt   | 2 +-
 .../legado/app/ui/{ => book}/changesource/DiffCallBack.kt | 2 +-
 .../app/ui/{ => book}/chapterlist/BookmarkAdapter.kt      | 2 +-
 .../app/ui/{ => book}/chapterlist/BookmarkFragment.kt     | 2 +-
 .../app/ui/{ => book}/chapterlist/ChapterListActivity.kt  | 2 +-
 .../app/ui/{ => book}/chapterlist/ChapterListAdapter.kt   | 2 +-
 .../app/ui/{ => book}/chapterlist/ChapterListFragment.kt  | 2 +-
 .../app/ui/{ => book}/chapterlist/ChapterListViewModel.kt | 2 +-
 .../legado/app/ui/{ => book}/download/DownloadActivity.kt | 2 +-
 .../legado/app/ui/{ => book}/download/DownloadAdapter.kt  | 2 +-
 .../app/ui/{ => book}/download/DownloadViewModel.kt       | 2 +-
 .../app/ui/{ => book}/explore/ExploreShowActivity.kt      | 2 +-
 .../app/ui/{ => book}/explore/ExploreShowAdapter.kt       | 2 +-
 .../app/ui/{ => book}/explore/ExploreShowViewModel.kt     | 2 +-
 .../java/io/legado/app/ui/book/info/BookInfoActivity.kt   | 6 +++---
 .../legado/app/ui/book/info/edit/BookInfoEditActivity.kt  | 2 +-
 .../ui/{importbook => book/local}/ImportBookActivity.kt   | 2 +-
 .../ui/{importbook => book/local}/ImportBookAdapter.kt    | 2 +-
 .../ui/{importbook => book/local}/ImportBookViewModel.kt  | 2 +-
 .../java/io/legado/app/ui/book/read/ReadBookActivity.kt   | 4 ++--
 .../io/legado/app/ui/main/bookshelf/BookshelfFragment.kt  | 4 ++--
 .../java/io/legado/app/ui/main/explore/ExploreFragment.kt | 2 +-
 29 files changed, 37 insertions(+), 37 deletions(-)
 rename app/src/main/java/io/legado/app/ui/{ => book}/changecover/ChangeCoverDialog.kt (98%)
 rename app/src/main/java/io/legado/app/ui/{ => book}/changecover/ChangeCoverViewModel.kt (98%)
 rename app/src/main/java/io/legado/app/ui/{ => book}/changecover/CoverAdapter.kt (96%)
 rename app/src/main/java/io/legado/app/ui/{ => book}/changesource/ChangeSourceAdapter.kt (97%)
 rename app/src/main/java/io/legado/app/ui/{ => book}/changesource/ChangeSourceDialog.kt (99%)
 rename app/src/main/java/io/legado/app/ui/{ => book}/changesource/ChangeSourceViewModel.kt (99%)
 rename app/src/main/java/io/legado/app/ui/{ => book}/changesource/DiffCallBack.kt (97%)
 rename app/src/main/java/io/legado/app/ui/{ => book}/chapterlist/BookmarkAdapter.kt (98%)
 rename app/src/main/java/io/legado/app/ui/{ => book}/chapterlist/BookmarkFragment.kt (98%)
 rename app/src/main/java/io/legado/app/ui/{ => book}/chapterlist/ChapterListActivity.kt (98%)
 rename app/src/main/java/io/legado/app/ui/{ => book}/chapterlist/ChapterListAdapter.kt (98%)
 rename app/src/main/java/io/legado/app/ui/{ => book}/chapterlist/ChapterListFragment.kt (99%)
 rename app/src/main/java/io/legado/app/ui/{ => book}/chapterlist/ChapterListViewModel.kt (94%)
 rename app/src/main/java/io/legado/app/ui/{ => book}/download/DownloadActivity.kt (99%)
 rename app/src/main/java/io/legado/app/ui/{ => book}/download/DownloadAdapter.kt (98%)
 rename app/src/main/java/io/legado/app/ui/{ => book}/download/DownloadViewModel.kt (98%)
 rename app/src/main/java/io/legado/app/ui/{ => book}/explore/ExploreShowActivity.kt (98%)
 rename app/src/main/java/io/legado/app/ui/{ => book}/explore/ExploreShowAdapter.kt (97%)
 rename app/src/main/java/io/legado/app/ui/{ => book}/explore/ExploreShowViewModel.kt (97%)
 rename app/src/main/java/io/legado/app/ui/{importbook => book/local}/ImportBookActivity.kt (99%)
 rename app/src/main/java/io/legado/app/ui/{importbook => book/local}/ImportBookAdapter.kt (99%)
 rename app/src/main/java/io/legado/app/ui/{importbook => book/local}/ImportBookViewModel.kt (96%)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 994e103c1..f4d3af897 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -182,16 +182,16 @@
             android:name=".ui.book.source.debug.BookSourceDebugActivity"
             android:launchMode="singleTop" />
         <activity
-            android:name=".ui.chapterlist.ChapterListActivity"
+            android:name="io.legado.app.ui.book.chapterlist.ChapterListActivity"
             android:launchMode="singleTop" />
         <activity
             android:name=".ui.rss.read.ReadRssActivity"
             android:launchMode="singleTop" />
         <activity
-            android:name=".ui.importbook.ImportBookActivity"
+            android:name="io.legado.app.ui.book.local.ImportBookActivity"
             android:launchMode="singleTop" />
         <activity
-            android:name=".ui.explore.ExploreShowActivity"
+            android:name="io.legado.app.ui.book.explore.ExploreShowActivity"
             android:launchMode="singleTop" />
         <activity
             android:name=".ui.rss.source.debug.RssSourceDebugActivity"
@@ -203,7 +203,7 @@
             android:name=".ui.rss.favorites.RssFavoritesActivity"
             android:launchMode="singleTop" />
         <activity
-            android:name=".ui.download.DownloadActivity"
+            android:name="io.legado.app.ui.book.download.DownloadActivity"
             android:launchMode="singleTop" />
         <activity
             android:name=".receiver.SharedReceiverActivity"
diff --git a/app/src/main/java/io/legado/app/ui/audio/AudioPlayActivity.kt b/app/src/main/java/io/legado/app/ui/audio/AudioPlayActivity.kt
index dffd6a50f..adc7e0662 100644
--- a/app/src/main/java/io/legado/app/ui/audio/AudioPlayActivity.kt
+++ b/app/src/main/java/io/legado/app/ui/audio/AudioPlayActivity.kt
@@ -25,8 +25,8 @@ import io.legado.app.lib.dialogs.noButton
 import io.legado.app.lib.dialogs.okButton
 import io.legado.app.service.AudioPlayService
 import io.legado.app.service.help.AudioPlay
-import io.legado.app.ui.changesource.ChangeSourceDialog
-import io.legado.app.ui.chapterlist.ChapterListActivity
+import io.legado.app.ui.book.changesource.ChangeSourceDialog
+import io.legado.app.ui.book.chapterlist.ChapterListActivity
 import io.legado.app.utils.*
 import kotlinx.android.synthetic.main.activity_audio_play.*
 import org.apache.commons.lang3.time.DateFormatUtils
diff --git a/app/src/main/java/io/legado/app/ui/changecover/ChangeCoverDialog.kt b/app/src/main/java/io/legado/app/ui/book/changecover/ChangeCoverDialog.kt
similarity index 98%
rename from app/src/main/java/io/legado/app/ui/changecover/ChangeCoverDialog.kt
rename to app/src/main/java/io/legado/app/ui/book/changecover/ChangeCoverDialog.kt
index d1c081f76..0576f68f2 100644
--- a/app/src/main/java/io/legado/app/ui/changecover/ChangeCoverDialog.kt
+++ b/app/src/main/java/io/legado/app/ui/book/changecover/ChangeCoverDialog.kt
@@ -1,4 +1,4 @@
-package io.legado.app.ui.changecover
+package io.legado.app.ui.book.changecover
 
 import android.os.Bundle
 import android.util.DisplayMetrics
diff --git a/app/src/main/java/io/legado/app/ui/changecover/ChangeCoverViewModel.kt b/app/src/main/java/io/legado/app/ui/book/changecover/ChangeCoverViewModel.kt
similarity index 98%
rename from app/src/main/java/io/legado/app/ui/changecover/ChangeCoverViewModel.kt
rename to app/src/main/java/io/legado/app/ui/book/changecover/ChangeCoverViewModel.kt
index d8ed01d9f..3ef77e076 100644
--- a/app/src/main/java/io/legado/app/ui/changecover/ChangeCoverViewModel.kt
+++ b/app/src/main/java/io/legado/app/ui/book/changecover/ChangeCoverViewModel.kt
@@ -1,4 +1,4 @@
-package io.legado.app.ui.changecover
+package io.legado.app.ui.book.changecover
 
 import android.app.Application
 import androidx.lifecycle.MutableLiveData
diff --git a/app/src/main/java/io/legado/app/ui/changecover/CoverAdapter.kt b/app/src/main/java/io/legado/app/ui/book/changecover/CoverAdapter.kt
similarity index 96%
rename from app/src/main/java/io/legado/app/ui/changecover/CoverAdapter.kt
rename to app/src/main/java/io/legado/app/ui/book/changecover/CoverAdapter.kt
index eae791b2c..55a841fcd 100644
--- a/app/src/main/java/io/legado/app/ui/changecover/CoverAdapter.kt
+++ b/app/src/main/java/io/legado/app/ui/book/changecover/CoverAdapter.kt
@@ -1,4 +1,4 @@
-package io.legado.app.ui.changecover
+package io.legado.app.ui.book.changecover
 
 import android.content.Context
 import io.legado.app.R
diff --git a/app/src/main/java/io/legado/app/ui/changesource/ChangeSourceAdapter.kt b/app/src/main/java/io/legado/app/ui/book/changesource/ChangeSourceAdapter.kt
similarity index 97%
rename from app/src/main/java/io/legado/app/ui/changesource/ChangeSourceAdapter.kt
rename to app/src/main/java/io/legado/app/ui/book/changesource/ChangeSourceAdapter.kt
index 1fa9284c1..132858e0f 100644
--- a/app/src/main/java/io/legado/app/ui/changesource/ChangeSourceAdapter.kt
+++ b/app/src/main/java/io/legado/app/ui/book/changesource/ChangeSourceAdapter.kt
@@ -1,4 +1,4 @@
-package io.legado.app.ui.changesource
+package io.legado.app.ui.book.changesource
 
 import android.content.Context
 import android.os.Bundle
diff --git a/app/src/main/java/io/legado/app/ui/changesource/ChangeSourceDialog.kt b/app/src/main/java/io/legado/app/ui/book/changesource/ChangeSourceDialog.kt
similarity index 99%
rename from app/src/main/java/io/legado/app/ui/changesource/ChangeSourceDialog.kt
rename to app/src/main/java/io/legado/app/ui/book/changesource/ChangeSourceDialog.kt
index d1ce27f2e..8edcae4b4 100644
--- a/app/src/main/java/io/legado/app/ui/changesource/ChangeSourceDialog.kt
+++ b/app/src/main/java/io/legado/app/ui/book/changesource/ChangeSourceDialog.kt
@@ -1,4 +1,4 @@
-package io.legado.app.ui.changesource
+package io.legado.app.ui.book.changesource
 
 import android.os.Bundle
 import android.util.DisplayMetrics
diff --git a/app/src/main/java/io/legado/app/ui/changesource/ChangeSourceViewModel.kt b/app/src/main/java/io/legado/app/ui/book/changesource/ChangeSourceViewModel.kt
similarity index 99%
rename from app/src/main/java/io/legado/app/ui/changesource/ChangeSourceViewModel.kt
rename to app/src/main/java/io/legado/app/ui/book/changesource/ChangeSourceViewModel.kt
index 1a683427f..548038e59 100644
--- a/app/src/main/java/io/legado/app/ui/changesource/ChangeSourceViewModel.kt
+++ b/app/src/main/java/io/legado/app/ui/book/changesource/ChangeSourceViewModel.kt
@@ -1,4 +1,4 @@
-package io.legado.app.ui.changesource
+package io.legado.app.ui.book.changesource
 
 import android.app.Application
 import android.os.Bundle
diff --git a/app/src/main/java/io/legado/app/ui/changesource/DiffCallBack.kt b/app/src/main/java/io/legado/app/ui/book/changesource/DiffCallBack.kt
similarity index 97%
rename from app/src/main/java/io/legado/app/ui/changesource/DiffCallBack.kt
rename to app/src/main/java/io/legado/app/ui/book/changesource/DiffCallBack.kt
index 91e640ac3..b0a8f19ef 100644
--- a/app/src/main/java/io/legado/app/ui/changesource/DiffCallBack.kt
+++ b/app/src/main/java/io/legado/app/ui/book/changesource/DiffCallBack.kt
@@ -1,4 +1,4 @@
-package io.legado.app.ui.changesource
+package io.legado.app.ui.book.changesource
 
 import android.os.Bundle
 import androidx.recyclerview.widget.DiffUtil
diff --git a/app/src/main/java/io/legado/app/ui/chapterlist/BookmarkAdapter.kt b/app/src/main/java/io/legado/app/ui/book/chapterlist/BookmarkAdapter.kt
similarity index 98%
rename from app/src/main/java/io/legado/app/ui/chapterlist/BookmarkAdapter.kt
rename to app/src/main/java/io/legado/app/ui/book/chapterlist/BookmarkAdapter.kt
index ea3f41801..05e3751c9 100644
--- a/app/src/main/java/io/legado/app/ui/chapterlist/BookmarkAdapter.kt
+++ b/app/src/main/java/io/legado/app/ui/book/chapterlist/BookmarkAdapter.kt
@@ -1,4 +1,4 @@
-package io.legado.app.ui.chapterlist
+package io.legado.app.ui.book.chapterlist
 
 import android.os.AsyncTask.execute
 import android.view.LayoutInflater
diff --git a/app/src/main/java/io/legado/app/ui/chapterlist/BookmarkFragment.kt b/app/src/main/java/io/legado/app/ui/book/chapterlist/BookmarkFragment.kt
similarity index 98%
rename from app/src/main/java/io/legado/app/ui/chapterlist/BookmarkFragment.kt
rename to app/src/main/java/io/legado/app/ui/book/chapterlist/BookmarkFragment.kt
index b2337d0d9..6aa36d62e 100644
--- a/app/src/main/java/io/legado/app/ui/chapterlist/BookmarkFragment.kt
+++ b/app/src/main/java/io/legado/app/ui/book/chapterlist/BookmarkFragment.kt
@@ -1,4 +1,4 @@
-package io.legado.app.ui.chapterlist
+package io.legado.app.ui.book.chapterlist
 
 import android.app.Activity
 import android.content.Intent
diff --git a/app/src/main/java/io/legado/app/ui/chapterlist/ChapterListActivity.kt b/app/src/main/java/io/legado/app/ui/book/chapterlist/ChapterListActivity.kt
similarity index 98%
rename from app/src/main/java/io/legado/app/ui/chapterlist/ChapterListActivity.kt
rename to app/src/main/java/io/legado/app/ui/book/chapterlist/ChapterListActivity.kt
index a0d401a5e..7420fc047 100644
--- a/app/src/main/java/io/legado/app/ui/chapterlist/ChapterListActivity.kt
+++ b/app/src/main/java/io/legado/app/ui/book/chapterlist/ChapterListActivity.kt
@@ -1,4 +1,4 @@
-package io.legado.app.ui.chapterlist
+package io.legado.app.ui.book.chapterlist
 
 import android.os.Bundle
 import android.view.Menu
diff --git a/app/src/main/java/io/legado/app/ui/chapterlist/ChapterListAdapter.kt b/app/src/main/java/io/legado/app/ui/book/chapterlist/ChapterListAdapter.kt
similarity index 98%
rename from app/src/main/java/io/legado/app/ui/chapterlist/ChapterListAdapter.kt
rename to app/src/main/java/io/legado/app/ui/book/chapterlist/ChapterListAdapter.kt
index 08b222970..b9d20920b 100644
--- a/app/src/main/java/io/legado/app/ui/chapterlist/ChapterListAdapter.kt
+++ b/app/src/main/java/io/legado/app/ui/book/chapterlist/ChapterListAdapter.kt
@@ -1,4 +1,4 @@
-package io.legado.app.ui.chapterlist
+package io.legado.app.ui.book.chapterlist
 
 import android.content.Context
 import android.widget.TextView
diff --git a/app/src/main/java/io/legado/app/ui/chapterlist/ChapterListFragment.kt b/app/src/main/java/io/legado/app/ui/book/chapterlist/ChapterListFragment.kt
similarity index 99%
rename from app/src/main/java/io/legado/app/ui/chapterlist/ChapterListFragment.kt
rename to app/src/main/java/io/legado/app/ui/book/chapterlist/ChapterListFragment.kt
index 0bfc9a765..9e9b5c813 100644
--- a/app/src/main/java/io/legado/app/ui/chapterlist/ChapterListFragment.kt
+++ b/app/src/main/java/io/legado/app/ui/book/chapterlist/ChapterListFragment.kt
@@ -1,4 +1,4 @@
-package io.legado.app.ui.chapterlist
+package io.legado.app.ui.book.chapterlist
 
 import android.app.Activity.RESULT_OK
 import android.content.Intent
diff --git a/app/src/main/java/io/legado/app/ui/chapterlist/ChapterListViewModel.kt b/app/src/main/java/io/legado/app/ui/book/chapterlist/ChapterListViewModel.kt
similarity index 94%
rename from app/src/main/java/io/legado/app/ui/chapterlist/ChapterListViewModel.kt
rename to app/src/main/java/io/legado/app/ui/book/chapterlist/ChapterListViewModel.kt
index 4156c4ac9..ad3361fd1 100644
--- a/app/src/main/java/io/legado/app/ui/chapterlist/ChapterListViewModel.kt
+++ b/app/src/main/java/io/legado/app/ui/book/chapterlist/ChapterListViewModel.kt
@@ -1,4 +1,4 @@
-package io.legado.app.ui.chapterlist
+package io.legado.app.ui.book.chapterlist
 
 
 import android.app.Application
diff --git a/app/src/main/java/io/legado/app/ui/download/DownloadActivity.kt b/app/src/main/java/io/legado/app/ui/book/download/DownloadActivity.kt
similarity index 99%
rename from app/src/main/java/io/legado/app/ui/download/DownloadActivity.kt
rename to app/src/main/java/io/legado/app/ui/book/download/DownloadActivity.kt
index cdcbf9746..f731806a7 100644
--- a/app/src/main/java/io/legado/app/ui/download/DownloadActivity.kt
+++ b/app/src/main/java/io/legado/app/ui/book/download/DownloadActivity.kt
@@ -1,4 +1,4 @@
-package io.legado.app.ui.download
+package io.legado.app.ui.book.download
 
 import android.app.Activity
 import android.content.Intent
diff --git a/app/src/main/java/io/legado/app/ui/download/DownloadAdapter.kt b/app/src/main/java/io/legado/app/ui/book/download/DownloadAdapter.kt
similarity index 98%
rename from app/src/main/java/io/legado/app/ui/download/DownloadAdapter.kt
rename to app/src/main/java/io/legado/app/ui/book/download/DownloadAdapter.kt
index 57cafc78a..082e5aecc 100644
--- a/app/src/main/java/io/legado/app/ui/download/DownloadAdapter.kt
+++ b/app/src/main/java/io/legado/app/ui/book/download/DownloadAdapter.kt
@@ -1,4 +1,4 @@
-package io.legado.app.ui.download
+package io.legado.app.ui.book.download
 
 import android.content.Context
 import android.widget.ImageView
diff --git a/app/src/main/java/io/legado/app/ui/download/DownloadViewModel.kt b/app/src/main/java/io/legado/app/ui/book/download/DownloadViewModel.kt
similarity index 98%
rename from app/src/main/java/io/legado/app/ui/download/DownloadViewModel.kt
rename to app/src/main/java/io/legado/app/ui/book/download/DownloadViewModel.kt
index da12d3d53..e5886d100 100644
--- a/app/src/main/java/io/legado/app/ui/download/DownloadViewModel.kt
+++ b/app/src/main/java/io/legado/app/ui/book/download/DownloadViewModel.kt
@@ -1,4 +1,4 @@
-package io.legado.app.ui.download
+package io.legado.app.ui.book.download
 
 import android.app.Application
 import android.net.Uri
diff --git a/app/src/main/java/io/legado/app/ui/explore/ExploreShowActivity.kt b/app/src/main/java/io/legado/app/ui/book/explore/ExploreShowActivity.kt
similarity index 98%
rename from app/src/main/java/io/legado/app/ui/explore/ExploreShowActivity.kt
rename to app/src/main/java/io/legado/app/ui/book/explore/ExploreShowActivity.kt
index 08a96a340..04bf86188 100644
--- a/app/src/main/java/io/legado/app/ui/explore/ExploreShowActivity.kt
+++ b/app/src/main/java/io/legado/app/ui/book/explore/ExploreShowActivity.kt
@@ -1,4 +1,4 @@
-package io.legado.app.ui.explore
+package io.legado.app.ui.book.explore
 
 import android.os.Bundle
 import androidx.lifecycle.Observer
diff --git a/app/src/main/java/io/legado/app/ui/explore/ExploreShowAdapter.kt b/app/src/main/java/io/legado/app/ui/book/explore/ExploreShowAdapter.kt
similarity index 97%
rename from app/src/main/java/io/legado/app/ui/explore/ExploreShowAdapter.kt
rename to app/src/main/java/io/legado/app/ui/book/explore/ExploreShowAdapter.kt
index 2204dae03..322e4a7a3 100644
--- a/app/src/main/java/io/legado/app/ui/explore/ExploreShowAdapter.kt
+++ b/app/src/main/java/io/legado/app/ui/book/explore/ExploreShowAdapter.kt
@@ -1,4 +1,4 @@
-package io.legado.app.ui.explore
+package io.legado.app.ui.book.explore
 
 import android.content.Context
 import io.legado.app.R
diff --git a/app/src/main/java/io/legado/app/ui/explore/ExploreShowViewModel.kt b/app/src/main/java/io/legado/app/ui/book/explore/ExploreShowViewModel.kt
similarity index 97%
rename from app/src/main/java/io/legado/app/ui/explore/ExploreShowViewModel.kt
rename to app/src/main/java/io/legado/app/ui/book/explore/ExploreShowViewModel.kt
index 849b1ca87..d34e21916 100644
--- a/app/src/main/java/io/legado/app/ui/explore/ExploreShowViewModel.kt
+++ b/app/src/main/java/io/legado/app/ui/book/explore/ExploreShowViewModel.kt
@@ -1,4 +1,4 @@
-package io.legado.app.ui.explore
+package io.legado.app.ui.book.explore
 
 import android.app.Application
 import android.content.Intent
diff --git a/app/src/main/java/io/legado/app/ui/book/info/BookInfoActivity.kt b/app/src/main/java/io/legado/app/ui/book/info/BookInfoActivity.kt
index 7db4032aa..2aa6f1848 100644
--- a/app/src/main/java/io/legado/app/ui/book/info/BookInfoActivity.kt
+++ b/app/src/main/java/io/legado/app/ui/book/info/BookInfoActivity.kt
@@ -28,9 +28,9 @@ import io.legado.app.ui.book.group.GroupSelectDialog
 import io.legado.app.ui.book.info.edit.BookInfoEditActivity
 import io.legado.app.ui.book.read.ReadBookActivity
 import io.legado.app.ui.book.source.edit.BookSourceEditActivity
-import io.legado.app.ui.changecover.ChangeCoverDialog
-import io.legado.app.ui.changesource.ChangeSourceDialog
-import io.legado.app.ui.chapterlist.ChapterListActivity
+import io.legado.app.ui.book.changecover.ChangeCoverDialog
+import io.legado.app.ui.book.changesource.ChangeSourceDialog
+import io.legado.app.ui.book.chapterlist.ChapterListActivity
 import io.legado.app.utils.getViewModel
 import io.legado.app.utils.gone
 import io.legado.app.utils.visible
diff --git a/app/src/main/java/io/legado/app/ui/book/info/edit/BookInfoEditActivity.kt b/app/src/main/java/io/legado/app/ui/book/info/edit/BookInfoEditActivity.kt
index 6bcae9257..969b1ee45 100644
--- a/app/src/main/java/io/legado/app/ui/book/info/edit/BookInfoEditActivity.kt
+++ b/app/src/main/java/io/legado/app/ui/book/info/edit/BookInfoEditActivity.kt
@@ -8,7 +8,7 @@ import androidx.lifecycle.Observer
 import io.legado.app.R
 import io.legado.app.base.VMBaseActivity
 import io.legado.app.data.entities.Book
-import io.legado.app.ui.changecover.ChangeCoverDialog
+import io.legado.app.ui.book.changecover.ChangeCoverDialog
 import io.legado.app.utils.getViewModel
 import kotlinx.android.synthetic.main.activity_book_info_edit.*
 import org.jetbrains.anko.sdk27.listeners.onClick
diff --git a/app/src/main/java/io/legado/app/ui/importbook/ImportBookActivity.kt b/app/src/main/java/io/legado/app/ui/book/local/ImportBookActivity.kt
similarity index 99%
rename from app/src/main/java/io/legado/app/ui/importbook/ImportBookActivity.kt
rename to app/src/main/java/io/legado/app/ui/book/local/ImportBookActivity.kt
index 8afa2793b..ed6bd4c74 100644
--- a/app/src/main/java/io/legado/app/ui/importbook/ImportBookActivity.kt
+++ b/app/src/main/java/io/legado/app/ui/book/local/ImportBookActivity.kt
@@ -1,4 +1,4 @@
-package io.legado.app.ui.importbook
+package io.legado.app.ui.book.local
 
 import android.annotation.SuppressLint
 import android.app.Activity
diff --git a/app/src/main/java/io/legado/app/ui/importbook/ImportBookAdapter.kt b/app/src/main/java/io/legado/app/ui/book/local/ImportBookAdapter.kt
similarity index 99%
rename from app/src/main/java/io/legado/app/ui/importbook/ImportBookAdapter.kt
rename to app/src/main/java/io/legado/app/ui/book/local/ImportBookAdapter.kt
index 6cb49d10f..acc3b7265 100644
--- a/app/src/main/java/io/legado/app/ui/importbook/ImportBookAdapter.kt
+++ b/app/src/main/java/io/legado/app/ui/book/local/ImportBookAdapter.kt
@@ -1,4 +1,4 @@
-package io.legado.app.ui.importbook
+package io.legado.app.ui.book.local
 
 import android.content.Context
 import androidx.documentfile.provider.DocumentFile
diff --git a/app/src/main/java/io/legado/app/ui/importbook/ImportBookViewModel.kt b/app/src/main/java/io/legado/app/ui/book/local/ImportBookViewModel.kt
similarity index 96%
rename from app/src/main/java/io/legado/app/ui/importbook/ImportBookViewModel.kt
rename to app/src/main/java/io/legado/app/ui/book/local/ImportBookViewModel.kt
index 1250da682..847a692bd 100644
--- a/app/src/main/java/io/legado/app/ui/importbook/ImportBookViewModel.kt
+++ b/app/src/main/java/io/legado/app/ui/book/local/ImportBookViewModel.kt
@@ -1,4 +1,4 @@
-package io.legado.app.ui.importbook
+package io.legado.app.ui.book.local
 
 import android.app.Application
 import android.net.Uri
diff --git a/app/src/main/java/io/legado/app/ui/book/read/ReadBookActivity.kt b/app/src/main/java/io/legado/app/ui/book/read/ReadBookActivity.kt
index e8e64d16a..447a030b8 100644
--- a/app/src/main/java/io/legado/app/ui/book/read/ReadBookActivity.kt
+++ b/app/src/main/java/io/legado/app/ui/book/read/ReadBookActivity.kt
@@ -40,8 +40,8 @@ import io.legado.app.ui.book.read.page.PageView
 import io.legado.app.ui.book.read.page.TextPageFactory
 import io.legado.app.ui.book.read.page.delegate.PageDelegate
 import io.legado.app.ui.book.source.edit.BookSourceEditActivity
-import io.legado.app.ui.changesource.ChangeSourceDialog
-import io.legado.app.ui.chapterlist.ChapterListActivity
+import io.legado.app.ui.book.changesource.ChangeSourceDialog
+import io.legado.app.ui.book.chapterlist.ChapterListActivity
 import io.legado.app.ui.login.SourceLogin
 import io.legado.app.ui.replacerule.ReplaceRuleActivity
 import io.legado.app.ui.replacerule.edit.ReplaceEditDialog
diff --git a/app/src/main/java/io/legado/app/ui/main/bookshelf/BookshelfFragment.kt b/app/src/main/java/io/legado/app/ui/main/bookshelf/BookshelfFragment.kt
index f49cf2ea6..a3a228dd7 100644
--- a/app/src/main/java/io/legado/app/ui/main/bookshelf/BookshelfFragment.kt
+++ b/app/src/main/java/io/legado/app/ui/main/bookshelf/BookshelfFragment.kt
@@ -27,8 +27,8 @@ import io.legado.app.lib.theme.accentColor
 import io.legado.app.ui.book.arrange.ArrangeBookActivity
 import io.legado.app.ui.book.group.GroupManageDialog
 import io.legado.app.ui.book.search.SearchActivity
-import io.legado.app.ui.download.DownloadActivity
-import io.legado.app.ui.importbook.ImportBookActivity
+import io.legado.app.ui.book.download.DownloadActivity
+import io.legado.app.ui.book.local.ImportBookActivity
 import io.legado.app.ui.widget.text.AutoCompleteTextView
 import io.legado.app.utils.*
 import kotlinx.android.synthetic.main.dialog_bookshelf_config.view.*
diff --git a/app/src/main/java/io/legado/app/ui/main/explore/ExploreFragment.kt b/app/src/main/java/io/legado/app/ui/main/explore/ExploreFragment.kt
index 78cdd141a..f4257732c 100644
--- a/app/src/main/java/io/legado/app/ui/main/explore/ExploreFragment.kt
+++ b/app/src/main/java/io/legado/app/ui/main/explore/ExploreFragment.kt
@@ -18,7 +18,7 @@ import io.legado.app.data.entities.BookSource
 import io.legado.app.lib.theme.ATH
 import io.legado.app.lib.theme.primaryTextColor
 import io.legado.app.ui.book.source.edit.BookSourceEditActivity
-import io.legado.app.ui.explore.ExploreShowActivity
+import io.legado.app.ui.book.explore.ExploreShowActivity
 import io.legado.app.utils.getViewModel
 import io.legado.app.utils.splitNotBlank
 import io.legado.app.utils.startActivity