diff --git a/.claude/settings.local.json b/.claude/settings.local.json
index f50d242..b914bdb 100644
--- a/.claude/settings.local.json
+++ b/.claude/settings.local.json
@@ -1,7 +1,12 @@
 {
   "permissions": {
     "allow": [
-      "Bash(./gradlew:*)"
+      "Bash(./gradlew:*)",
+      "Bash(mkdir:*)",
+      "Bash(cp:*)",
+      "Bash(rm:*)",
+      "Bash(find:*)",
+      "Bash(grep:*)"
     ],
     "deny": []
   }
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index fec5139..a9f4dd0 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -27,15 +27,15 @@ fun getAppNameFromStringsFile(): String {
         ?.text() ?: "UnknownApp"
 }
 android {
-    namespace = "com.all.pdfreader.pro.app"
+    namespace = "com.all.pdfreader.pdf.reader"
     compileSdk = 36
 
     defaultConfig {
-        applicationId = "com.all.pdfreader.pro.app"
+        applicationId = "com.all.pdfreader.pdf.reader"
         minSdk = 24
         targetSdk = 36
-        versionCode = 2
-        versionName = "1.0.2"
+        versionCode = 1
+        versionName = "1.0.1"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
 
diff --git a/app/src/androidTest/java/com/all/pdfreader/pro/app/ExampleInstrumentedTest.kt b/app/src/androidTest/java/com/all/pdfreader/pdf/reader/ExampleInstrumentedTest.kt
similarity index 83%
rename from app/src/androidTest/java/com/all/pdfreader/pro/app/ExampleInstrumentedTest.kt
rename to app/src/androidTest/java/com/all/pdfreader/pdf/reader/ExampleInstrumentedTest.kt
index 5d5bd74..2b4f682 100644
--- a/app/src/androidTest/java/com/all/pdfreader/pro/app/ExampleInstrumentedTest.kt
+++ b/app/src/androidTest/java/com/all/pdfreader/pdf/reader/ExampleInstrumentedTest.kt
@@ -1,4 +1,4 @@
-package com.all.pdfreader.pro.app
+package com.all.pdfreader.pdf.reader
 
 import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.ext.junit.runners.AndroidJUnit4
@@ -19,6 +19,6 @@ class ExampleInstrumentedTest {
     fun useAppContext() {
         // Context of the app under test.
         val appContext = InstrumentationRegistry.getInstrumentation().targetContext
-        assertEquals("com.all.pdfreader.pro.app", appContext.packageName)
+        assertEquals("com.all.pdfreader.pdf.reader", appContext.packageName)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 3b2c482..49d074d 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -32,11 +32,11 @@
         android:allowBackup="true"
         android:dataExtractionRules="@xml/data_extraction_rules"
         android:fullBackupContent="@xml/backup_rules"
-        android:icon="@mipmap/app_logo"
+        android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:largeHeap="true"
         android:requestLegacyExternalStorage="true"
-        android:roundIcon="@mipmap/app_logo"
+        android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/Theme.PDFReaderPro">
         <meta-data
diff --git a/app/src/main/ic_launcher-playstore.png b/app/src/main/ic_launcher-playstore.png
new file mode 100644
index 0000000..ae46a89
Binary files /dev/null and b/app/src/main/ic_launcher-playstore.png differ
diff --git a/app/src/main/java/com/all/pdfreader/pro/app/PRApp.kt b/app/src/main/java/com/all/pdfreader/pdf/reader/PRApp.kt
similarity index 88%
rename from app/src/main/java/com/all/pdfreader/pro/app/PRApp.kt
rename to app/src/main/java/com/all/pdfreader/pdf/reader/PRApp.kt
index 2d477da..89be58d 100644
--- a/app/src/main/java/com/all/pdfreader/pro/app/PRApp.kt
+++ b/app/src/main/java/com/all/pdfreader/pdf/reader/PRApp.kt
@@ -1,10 +1,10 @@
-package com.all.pdfreader.pro.app
+package com.all.pdfreader.pdf.reader
 
 import android.app.Application
 import android.content.Context
 import androidx.annotation.StringRes
-import com.all.pdfreader.pro.app.room.repository.PdfRepository
-import com.all.pdfreader.pro.app.util.FileChangeObserver
+import com.all.pdfreader.pdf.reader.room.repository.PdfRepository
+import com.all.pdfreader.pdf.reader.util.FileChangeObserver
 import com.tom_roush.pdfbox.android.PDFBoxResourceLoader
 
 class PRApp : Application() {
diff --git a/app/src/main/java/com/all/pdfreader/pro/app/model/DeleteResult.kt b/app/src/main/java/com/all/pdfreader/pdf/reader/model/DeleteResult.kt
similarity index 90%
rename from app/src/main/java/com/all/pdfreader/pro/app/model/DeleteResult.kt
rename to app/src/main/java/com/all/pdfreader/pdf/reader/model/DeleteResult.kt
index 0bb994f..9e99b56 100644
--- a/app/src/main/java/com/all/pdfreader/pro/app/model/DeleteResult.kt
+++ b/app/src/main/java/com/all/pdfreader/pdf/reader/model/DeleteResult.kt
@@ -1,4 +1,4 @@
-package com.all.pdfreader.pro.app.model
+package com.all.pdfreader.pdf.reader.model
 
 /**
  * 文件删除结果封装类
diff --git a/app/src/main/java/com/all/pdfreader/pro/app/model/FileActionEvent.kt b/app/src/main/java/com/all/pdfreader/pdf/reader/model/FileActionEvent.kt
similarity index 97%
rename from app/src/main/java/com/all/pdfreader/pro/app/model/FileActionEvent.kt
rename to app/src/main/java/com/all/pdfreader/pdf/reader/model/FileActionEvent.kt
index a6b0db5..7f5e2b6 100644
--- a/app/src/main/java/com/all/pdfreader/pro/app/model/FileActionEvent.kt
+++ b/app/src/main/java/com/all/pdfreader/pdf/reader/model/FileActionEvent.kt
@@ -1,4 +1,4 @@
-package com.all.pdfreader.pro.app.model
+package com.all.pdfreader.pdf.reader.model
 
 import java.io.File
 
diff --git a/app/src/main/java/com/all/pdfreader/pro/app/model/FragmentConfig.kt b/app/src/main/java/com/all/pdfreader/pdf/reader/model/FragmentConfig.kt
similarity index 57%
rename from app/src/main/java/com/all/pdfreader/pro/app/model/FragmentConfig.kt
rename to app/src/main/java/com/all/pdfreader/pdf/reader/model/FragmentConfig.kt
index aa0542a..3aa1385 100644
--- a/app/src/main/java/com/all/pdfreader/pro/app/model/FragmentConfig.kt
+++ b/app/src/main/java/com/all/pdfreader/pdf/reader/model/FragmentConfig.kt
@@ -1,4 +1,4 @@
-package com.all.pdfreader.pro.app.model
+package com.all.pdfreader.pdf.reader.model
 
 enum class FragmentType {
     HOME, RECENTLY, FAVORITE
diff --git a/app/src/main/java/com/all/pdfreader/pro/app/model/PdfPageItem.kt b/app/src/main/java/com/all/pdfreader/pdf/reader/model/PdfPageItem.kt
similarity index 86%
rename from app/src/main/java/com/all/pdfreader/pro/app/model/PdfPageItem.kt
rename to app/src/main/java/com/all/pdfreader/pdf/reader/model/PdfPageItem.kt
index a955bf4..4bb6ead 100644
--- a/app/src/main/java/com/all/pdfreader/pro/app/model/PdfPageItem.kt
+++ b/app/src/main/java/com/all/pdfreader/pdf/reader/model/PdfPageItem.kt
@@ -1,4 +1,4 @@
-package com.all.pdfreader.pro.app.model
+package com.all.pdfreader.pdf.reader.model
 
 import android.os.Parcelable
 import kotlinx.parcelize.Parcelize
diff --git a/app/src/main/java/com/all/pdfreader/pro/app/model/PdfPickerSource.kt b/app/src/main/java/com/all/pdfreader/pdf/reader/model/PdfPickerSource.kt
similarity index 87%
rename from app/src/main/java/com/all/pdfreader/pro/app/model/PdfPickerSource.kt
rename to app/src/main/java/com/all/pdfreader/pdf/reader/model/PdfPickerSource.kt
index c033ebb..541049f 100644
--- a/app/src/main/java/com/all/pdfreader/pro/app/model/PdfPickerSource.kt
+++ b/app/src/main/java/com/all/pdfreader/pdf/reader/model/PdfPickerSource.kt
@@ -1,4 +1,4 @@
-package com.all.pdfreader.pro.app.model
+package com.all.pdfreader.pdf.reader.model
 
 enum class PdfPickerSource {
     NONE,         // 没有任何
diff --git a/app/src/main/java/com/all/pdfreader/pro/app/model/PdfSelectedPagesItem.kt b/app/src/main/java/com/all/pdfreader/pdf/reader/model/PdfSelectedPagesItem.kt
similarity index 95%
rename from app/src/main/java/com/all/pdfreader/pro/app/model/PdfSelectedPagesItem.kt
rename to app/src/main/java/com/all/pdfreader/pdf/reader/model/PdfSelectedPagesItem.kt
index d2d6841..eea3b12 100644
--- a/app/src/main/java/com/all/pdfreader/pro/app/model/PdfSelectedPagesItem.kt
+++ b/app/src/main/java/com/all/pdfreader/pdf/reader/model/PdfSelectedPagesItem.kt
@@ -1,4 +1,4 @@
-package com.all.pdfreader.pro.app.model
+package com.all.pdfreader.pdf.reader.model
 
 import android.os.Parcelable
 import kotlinx.parcelize.Parcelize
diff --git a/app/src/main/java/com/all/pdfreader/pro/app/model/PdfSplitResultItem.kt b/app/src/main/java/com/all/pdfreader/pdf/reader/model/PdfSplitResultItem.kt
similarity index 79%
rename from app/src/main/java/com/all/pdfreader/pro/app/model/PdfSplitResultItem.kt
rename to app/src/main/java/com/all/pdfreader/pdf/reader/model/PdfSplitResultItem.kt
index e17e3ac..fac4159 100644
--- a/app/src/main/java/com/all/pdfreader/pro/app/model/PdfSplitResultItem.kt
+++ b/app/src/main/java/com/all/pdfreader/pdf/reader/model/PdfSplitResultItem.kt
@@ -1,4 +1,4 @@
-package com.all.pdfreader.pro.app.model
+package com.all.pdfreader.pdf.reader.model
 
 data class PdfSplitResultItem(
     val filePath: String,
diff --git a/app/src/main/java/com/all/pdfreader/pro/app/model/PrintResult.kt b/app/src/main/java/com/all/pdfreader/pdf/reader/model/PrintResult.kt
similarity index 85%
rename from app/src/main/java/com/all/pdfreader/pro/app/model/PrintResult.kt
rename to app/src/main/java/com/all/pdfreader/pdf/reader/model/PrintResult.kt
index 49f0c27..f4026a9 100644
--- a/app/src/main/java/com/all/pdfreader/pro/app/model/PrintResult.kt
+++ b/app/src/main/java/com/all/pdfreader/pdf/reader/model/PrintResult.kt
@@ -1,4 +1,4 @@
-package com.all.pdfreader.pro.app.model
+package com.all.pdfreader.pdf.reader.model
 
 sealed class PrintResult {
     object Success : PrintResult()
diff --git a/app/src/main/java/com/all/pdfreader/pro/app/model/RenameConfig.kt b/app/src/main/java/com/all/pdfreader/pdf/reader/model/RenameConfig.kt
similarity index 76%
rename from app/src/main/java/com/all/pdfreader/pro/app/model/RenameConfig.kt
rename to app/src/main/java/com/all/pdfreader/pdf/reader/model/RenameConfig.kt
index 7be16c3..dda5ca9 100644
--- a/app/src/main/java/com/all/pdfreader/pro/app/model/RenameConfig.kt
+++ b/app/src/main/java/com/all/pdfreader/pdf/reader/model/RenameConfig.kt
@@ -1,4 +1,4 @@
-package com.all.pdfreader.pro.app.model
+package com.all.pdfreader.pdf.reader.model
 
 enum class RenameType {
     FILE,      // 修改文件名
diff --git a/app/src/main/java/com/all/pdfreader/pro/app/model/RenameResult.kt b/app/src/main/java/com/all/pdfreader/pdf/reader/model/RenameResult.kt
similarity index 87%
rename from app/src/main/java/com/all/pdfreader/pro/app/model/RenameResult.kt
rename to app/src/main/java/com/all/pdfreader/pdf/reader/model/RenameResult.kt
index fcbe64b..8549d5d 100644
--- a/app/src/main/java/com/all/pdfreader/pro/app/model/RenameResult.kt
+++ b/app/src/main/java/com/all/pdfreader/pdf/reader/model/RenameResult.kt
@@ -1,4 +1,4 @@
-package com.all.pdfreader.pro.app.model
+package com.all.pdfreader.pdf.reader.model
 
 data class RenameResult(
     val success: Boolean,
diff --git a/app/src/main/java/com/all/pdfreader/pro/app/model/SortConfig.kt b/app/src/main/java/com/all/pdfreader/pdf/reader/model/SortConfig.kt
similarity index 95%
rename from app/src/main/java/com/all/pdfreader/pro/app/model/SortConfig.kt
rename to app/src/main/java/com/all/pdfreader/pdf/reader/model/SortConfig.kt
index 4e4a028..705a998 100644
--- a/app/src/main/java/com/all/pdfreader/pro/app/model/SortConfig.kt
+++ b/app/src/main/java/com/all/pdfreader/pdf/reader/model/SortConfig.kt
@@ -1,6 +1,6 @@
-package com.all.pdfreader.pro.app.model
+package com.all.pdfreader.pdf.reader.model
 
-import com.all.pdfreader.pro.app.room.entity.PdfDocumentEntity
+import com.all.pdfreader.pdf.reader.room.entity.PdfDocumentEntity
 
 enum class SortField {
     NAME, DATE, SIZE
diff --git a/app/src/main/java/com/all/pdfreader/pro/app/room/converter/DateConverter.kt b/app/src/main/java/com/all/pdfreader/pdf/reader/room/converter/DateConverter.kt
similarity index 85%
rename from app/src/main/java/com/all/pdfreader/pro/app/room/converter/DateConverter.kt
rename to app/src/main/java/com/all/pdfreader/pdf/reader/room/converter/DateConverter.kt
index 9069dfc..3a61412 100644
--- a/app/src/main/java/com/all/pdfreader/pro/app/room/converter/DateConverter.kt
+++ b/app/src/main/java/com/all/pdfreader/pdf/reader/room/converter/DateConverter.kt
@@ -1,4 +1,4 @@
-package com.all.pdfreader.pro.app.room.converter
+package com.all.pdfreader.pdf.reader.room.converter
 
 import androidx.room.TypeConverter
 import java.util.*
diff --git a/app/src/main/java/com/all/pdfreader/pro/app/room/converter/UriConverter.kt b/app/src/main/java/com/all/pdfreader/pdf/reader/room/converter/UriConverter.kt
similarity index 85%
rename from app/src/main/java/com/all/pdfreader/pro/app/room/converter/UriConverter.kt
rename to app/src/main/java/com/all/pdfreader/pdf/reader/room/converter/UriConverter.kt
index ff01954..ed88b19 100644
--- a/app/src/main/java/com/all/pdfreader/pro/app/room/converter/UriConverter.kt
+++ b/app/src/main/java/com/all/pdfreader/pdf/reader/room/converter/UriConverter.kt
@@ -1,4 +1,4 @@
-package com.all.pdfreader.pro.app.room.converter
+package com.all.pdfreader.pdf.reader.room.converter
 
 import android.net.Uri
 import androidx.room.TypeConverter
diff --git a/app/src/main/java/com/all/pdfreader/pro/app/room/dao/BookmarkDao.kt b/app/src/main/java/com/all/pdfreader/pdf/reader/room/dao/BookmarkDao.kt
similarity index 93%
rename from app/src/main/java/com/all/pdfreader/pro/app/room/dao/BookmarkDao.kt
rename to app/src/main/java/com/all/pdfreader/pdf/reader/room/dao/BookmarkDao.kt
index 21583de..00f5659 100644
--- a/app/src/main/java/com/all/pdfreader/pro/app/room/dao/BookmarkDao.kt
+++ b/app/src/main/java/com/all/pdfreader/pdf/reader/room/dao/BookmarkDao.kt
@@ -1,7 +1,7 @@
-package com.all.pdfreader.pro.app.room.dao
+package com.all.pdfreader.pdf.reader.room.dao
 
 import androidx.room.*
-import com.all.pdfreader.pro.app.room.entity.BookmarkEntity
+import com.all.pdfreader.pdf.reader.room.entity.BookmarkEntity
 import kotlinx.coroutines.flow.Flow
 
 @Dao
diff --git a/app/src/main/java/com/all/pdfreader/pro/app/room/dao/NoteDao.kt b/app/src/main/java/com/all/pdfreader/pdf/reader/room/dao/NoteDao.kt
similarity index 93%
rename from app/src/main/java/com/all/pdfreader/pro/app/room/dao/NoteDao.kt
rename to app/src/main/java/com/all/pdfreader/pdf/reader/room/dao/NoteDao.kt
index 4063e22..4681d95 100644
--- a/app/src/main/java/com/all/pdfreader/pro/app/room/dao/NoteDao.kt
+++ b/app/src/main/java/com/all/pdfreader/pdf/reader/room/dao/NoteDao.kt
@@ -1,7 +1,7 @@
-package com.all.pdfreader.pro.app.room.dao
+package com.all.pdfreader.pdf.reader.room.dao
 
 import androidx.room.*
-import com.all.pdfreader.pro.app.room.entity.NoteEntity
+import com.all.pdfreader.pdf.reader.room.entity.NoteEntity
 import kotlinx.coroutines.flow.Flow
 
 @Dao
diff --git a/app/src/main/java/com/all/pdfreader/pro/app/room/dao/PdfDocumentDao.kt b/app/src/main/java/com/all/pdfreader/pdf/reader/room/dao/PdfDocumentDao.kt
similarity index 95%
rename from app/src/main/java/com/all/pdfreader/pro/app/room/dao/PdfDocumentDao.kt
rename to app/src/main/java/com/all/pdfreader/pdf/reader/room/dao/PdfDocumentDao.kt
index 40f361f..ba36e22 100644
--- a/app/src/main/java/com/all/pdfreader/pro/app/room/dao/PdfDocumentDao.kt
+++ b/app/src/main/java/com/all/pdfreader/pdf/reader/room/dao/PdfDocumentDao.kt
@@ -1,7 +1,7 @@
-package com.all.pdfreader.pro.app.room.dao
+package com.all.pdfreader.pdf.reader.room.dao
 
 import androidx.room.*
-import com.all.pdfreader.pro.app.room.entity.PdfDocumentEntity
+import com.all.pdfreader.pdf.reader.room.entity.PdfDocumentEntity
 import kotlinx.coroutines.flow.Flow
 
 @Dao
diff --git a/app/src/main/java/com/all/pdfreader/pro/app/room/dao/RecentReadDao.kt b/app/src/main/java/com/all/pdfreader/pdf/reader/room/dao/RecentReadDao.kt
similarity index 88%
rename from app/src/main/java/com/all/pdfreader/pro/app/room/dao/RecentReadDao.kt
rename to app/src/main/java/com/all/pdfreader/pdf/reader/room/dao/RecentReadDao.kt
index 4860a3c..e14968d 100644
--- a/app/src/main/java/com/all/pdfreader/pro/app/room/dao/RecentReadDao.kt
+++ b/app/src/main/java/com/all/pdfreader/pdf/reader/room/dao/RecentReadDao.kt
@@ -1,8 +1,8 @@
-package com.all.pdfreader.pro.app.room.dao
+package com.all.pdfreader.pdf.reader.room.dao
 
 import androidx.room.*
-import com.all.pdfreader.pro.app.room.entity.PdfDocumentEntity
-import com.all.pdfreader.pro.app.room.entity.RecentReadEntity
+import com.all.pdfreader.pdf.reader.room.entity.PdfDocumentEntity
+import com.all.pdfreader.pdf.reader.room.entity.RecentReadEntity
 import kotlinx.coroutines.flow.Flow
 
 @Dao
diff --git a/app/src/main/java/com/all/pdfreader/pro/app/room/database/PdfDatabase.kt b/app/src/main/java/com/all/pdfreader/pdf/reader/room/database/PdfDatabase.kt
similarity index 70%
rename from app/src/main/java/com/all/pdfreader/pro/app/room/database/PdfDatabase.kt
rename to app/src/main/java/com/all/pdfreader/pdf/reader/room/database/PdfDatabase.kt
index a2a228e..96285f9 100644
--- a/app/src/main/java/com/all/pdfreader/pro/app/room/database/PdfDatabase.kt
+++ b/app/src/main/java/com/all/pdfreader/pdf/reader/room/database/PdfDatabase.kt
@@ -1,12 +1,12 @@
-package com.all.pdfreader.pro.app.room.database
+package com.all.pdfreader.pdf.reader.room.database
 
 import androidx.room.Database
 import androidx.room.RoomDatabase
 import androidx.room.TypeConverters
-import com.all.pdfreader.pro.app.room.converter.DateConverter
-import com.all.pdfreader.pro.app.room.converter.UriConverter
-import com.all.pdfreader.pro.app.room.dao.*
-import com.all.pdfreader.pro.app.room.entity.*
+import com.all.pdfreader.pdf.reader.room.converter.DateConverter
+import com.all.pdfreader.pdf.reader.room.converter.UriConverter
+import com.all.pdfreader.pdf.reader.room.dao.*
+import com.all.pdfreader.pdf.reader.room.entity.*
 
 @Database(
     entities = [
diff --git a/app/src/main/java/com/all/pdfreader/pro/app/room/entity/BookmarkEntity.kt b/app/src/main/java/com/all/pdfreader/pdf/reader/room/entity/BookmarkEntity.kt
similarity index 94%
rename from app/src/main/java/com/all/pdfreader/pro/app/room/entity/BookmarkEntity.kt
rename to app/src/main/java/com/all/pdfreader/pdf/reader/room/entity/BookmarkEntity.kt
index c42c7c7..7ddeed2 100644
--- a/app/src/main/java/com/all/pdfreader/pro/app/room/entity/BookmarkEntity.kt
+++ b/app/src/main/java/com/all/pdfreader/pdf/reader/room/entity/BookmarkEntity.kt
@@ -1,4 +1,4 @@
-package com.all.pdfreader.pro.app.room.entity
+package com.all.pdfreader.pdf.reader.room.entity
 
 import androidx.room.Entity
 import androidx.room.ForeignKey
diff --git a/app/src/main/java/com/all/pdfreader/pro/app/room/entity/NoteEntity.kt b/app/src/main/java/com/all/pdfreader/pdf/reader/room/entity/NoteEntity.kt
similarity index 96%
rename from app/src/main/java/com/all/pdfreader/pro/app/room/entity/NoteEntity.kt
rename to app/src/main/java/com/all/pdfreader/pdf/reader/room/entity/NoteEntity.kt
index d3139ff..42adde2 100644
--- a/app/src/main/java/com/all/pdfreader/pro/app/room/entity/NoteEntity.kt
+++ b/app/src/main/java/com/all/pdfreader/pdf/reader/room/entity/NoteEntity.kt
@@ -1,4 +1,4 @@
-package com.all.pdfreader.pro.app.room.entity
+package com.all.pdfreader.pdf.reader.room.entity
 
 import androidx.room.Entity
 import androidx.room.ForeignKey
diff --git a/app/src/main/java/com/all/pdfreader/pro/app/room/entity/PdfDocumentEntity.kt b/app/src/main/java/com/all/pdfreader/pdf/reader/room/entity/PdfDocumentEntity.kt
similarity index 96%
rename from app/src/main/java/com/all/pdfreader/pro/app/room/entity/PdfDocumentEntity.kt
rename to app/src/main/java/com/all/pdfreader/pdf/reader/room/entity/PdfDocumentEntity.kt
index 772ea74..ea2e54b 100644
--- a/app/src/main/java/com/all/pdfreader/pro/app/room/entity/PdfDocumentEntity.kt
+++ b/app/src/main/java/com/all/pdfreader/pdf/reader/room/entity/PdfDocumentEntity.kt
@@ -1,4 +1,4 @@
-package com.all.pdfreader.pro.app.room.entity
+package com.all.pdfreader.pdf.reader.room.entity
 
 import android.os.Parcelable
 import androidx.room.Entity
diff --git a/app/src/main/java/com/all/pdfreader/pro/app/room/entity/RecentReadEntity.kt b/app/src/main/java/com/all/pdfreader/pdf/reader/room/entity/RecentReadEntity.kt
similarity index 94%
rename from app/src/main/java/com/all/pdfreader/pro/app/room/entity/RecentReadEntity.kt
rename to app/src/main/java/com/all/pdfreader/pdf/reader/room/entity/RecentReadEntity.kt
index 7b4127d..391612f 100644
--- a/app/src/main/java/com/all/pdfreader/pro/app/room/entity/RecentReadEntity.kt
+++ b/app/src/main/java/com/all/pdfreader/pdf/reader/room/entity/RecentReadEntity.kt
@@ -1,4 +1,4 @@
-package com.all.pdfreader.pro.app.room.entity
+package com.all.pdfreader.pdf.reader.room.entity
 
 import androidx.room.Entity
 import androidx.room.ForeignKey
diff --git a/app/src/main/java/com/all/pdfreader/pro/app/room/repository/PdfRepository.kt b/app/src/main/java/com/all/pdfreader/pdf/reader/room/repository/PdfRepository.kt
similarity index 98%
rename from app/src/main/java/com/all/pdfreader/pro/app/room/repository/PdfRepository.kt
rename to app/src/main/java/com/all/pdfreader/pdf/reader/room/repository/PdfRepository.kt
index d57f8d4..56b5a27 100644
--- a/app/src/main/java/com/all/pdfreader/pro/app/room/repository/PdfRepository.kt
+++ b/app/src/main/java/com/all/pdfreader/pdf/reader/room/repository/PdfRepository.kt
@@ -1,9 +1,9 @@
-package com.all.pdfreader.pro.app.room.repository
+package com.all.pdfreader.pdf.reader.room.repository
 
 import android.content.Context
 import androidx.room.Room
-import com.all.pdfreader.pro.app.room.database.PdfDatabase
-import com.all.pdfreader.pro.app.room.entity.*
+import com.all.pdfreader.pdf.reader.room.database.PdfDatabase
+import com.all.pdfreader.pdf.reader.room.entity.*
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.combine
 import java.security.MessageDigest
diff --git a/app/src/main/java/com/all/pdfreader/pro/app/sp/AppStore.kt b/app/src/main/java/com/all/pdfreader/pdf/reader/sp/AppStore.kt
similarity index 90%
rename from app/src/main/java/com/all/pdfreader/pro/app/sp/AppStore.kt
rename to app/src/main/java/com/all/pdfreader/pdf/reader/sp/AppStore.kt
index b652593..28f73ab 100644
--- a/app/src/main/java/com/all/pdfreader/pro/app/sp/AppStore.kt
+++ b/app/src/main/java/com/all/pdfreader/pdf/reader/sp/AppStore.kt
@@ -1,9 +1,9 @@
-package com.all.pdfreader.pro.app.sp
+package com.all.pdfreader.pdf.reader.sp
 
 import android.content.Context
-import com.all.pdfreader.pro.app.model.SortConfig
-import com.all.pdfreader.pro.app.sp.store.Store
-import com.all.pdfreader.pro.app.sp.store.asStoreProvider
+import com.all.pdfreader.pdf.reader.model.SortConfig
+import com.all.pdfreader.pdf.reader.sp.store.Store
+import com.all.pdfreader.pdf.reader.sp.store.asStoreProvider
 
 class AppStore(context: Context) {
     private val store = Store(
diff --git a/app/src/main/java/com/all/pdfreader/pro/app/sp/store/Providers.kt b/app/src/main/java/com/all/pdfreader/pdf/reader/sp/store/Providers.kt
similarity index 97%
rename from app/src/main/java/com/all/pdfreader/pro/app/sp/store/Providers.kt
rename to app/src/main/java/com/all/pdfreader/pdf/reader/sp/store/Providers.kt
index 4972470..1050bba 100644
--- a/app/src/main/java/com/all/pdfreader/pro/app/sp/store/Providers.kt
+++ b/app/src/main/java/com/all/pdfreader/pdf/reader/sp/store/Providers.kt
@@ -1,4 +1,4 @@
-package com.all.pdfreader.pro.app.sp.store
+package com.all.pdfreader.pdf.reader.sp.store
 
 import android.content.SharedPreferences
 import androidx.core.content.edit
diff --git a/app/src/main/java/com/all/pdfreader/pro/app/sp/store/Store.kt b/app/src/main/java/com/all/pdfreader/pdf/reader/sp/store/Store.kt
similarity index 98%
rename from app/src/main/java/com/all/pdfreader/pro/app/sp/store/Store.kt
rename to app/src/main/java/com/all/pdfreader/pdf/reader/sp/store/Store.kt
index 7b28a33..ead47c9 100644
--- a/app/src/main/java/com/all/pdfreader/pro/app/sp/store/Store.kt
+++ b/app/src/main/java/com/all/pdfreader/pdf/reader/sp/store/Store.kt
@@ -1,4 +1,4 @@
-package com.all.pdfreader.pro.app.sp.store
+package com.all.pdfreader.pdf.reader.sp.store
 
 import kotlin.reflect.KProperty
 
diff --git a/app/src/main/java/com/all/pdfreader/pro/app/sp/store/StoreProvider.kt b/app/src/main/java/com/all/pdfreader/pdf/reader/sp/store/StoreProvider.kt
similarity index 92%
rename from app/src/main/java/com/all/pdfreader/pro/app/sp/store/StoreProvider.kt
rename to app/src/main/java/com/all/pdfreader/pdf/reader/sp/store/StoreProvider.kt
index bdeff99..5d42929 100644
--- a/app/src/main/java/com/all/pdfreader/pro/app/sp/store/StoreProvider.kt
+++ b/app/src/main/java/com/all/pdfreader/pdf/reader/sp/store/StoreProvider.kt
@@ -1,4 +1,4 @@
-package com.all.pdfreader.pro.app.sp.store
+package com.all.pdfreader.pdf.reader.sp.store
 
 interface StoreProvider {
     fun getInt(key: String, defaultValue: Int): Int
diff --git a/app/src/main/java/com/all/pdfreader/pro/app/ui/act/BaseActivity.kt b/app/src/main/java/com/all/pdfreader/pdf/reader/ui/act/BaseActivity.kt
similarity index 91%
rename from app/src/main/java/com/all/pdfreader/pro/app/ui/act/BaseActivity.kt
rename to app/src/main/java/com/all/pdfreader/pdf/reader/ui/act/BaseActivity.kt
index 41dc968..6a925b6 100644
--- a/app/src/main/java/com/all/pdfreader/pro/app/ui/act/BaseActivity.kt
+++ b/app/src/main/java/com/all/pdfreader/pdf/reader/ui/act/BaseActivity.kt
@@ -1,12 +1,12 @@
-package com.all.pdfreader.pro.app.ui.act
+package com.all.pdfreader.pdf.reader.ui.act
 
 import android.os.Bundle
 import android.util.Log
 import android.view.View
 import androidx.appcompat.app.AppCompatActivity
-import com.all.pdfreader.pro.app.room.repository.PdfRepository
-import com.all.pdfreader.pro.app.sp.AppStore
-import com.all.pdfreader.pro.app.util.ToastUtils
+import com.all.pdfreader.pdf.reader.room.repository.PdfRepository
+import com.all.pdfreader.pdf.reader.sp.AppStore
+import com.all.pdfreader.pdf.reader.util.ToastUtils
 import com.gyf.immersionbar.ImmersionBar
 import com.gyf.immersionbar.OnInsetsChangeListener
 
diff --git a/app/src/main/java/com/all/pdfreader/pro/app/ui/act/FAQActivity.kt b/app/src/main/java/com/all/pdfreader/pdf/reader/ui/act/FAQActivity.kt
similarity index 95%
rename from app/src/main/java/com/all/pdfreader/pro/app/ui/act/FAQActivity.kt
rename to app/src/main/java/com/all/pdfreader/pdf/reader/ui/act/FAQActivity.kt
index 2f3e37b..738bda6 100644
--- a/app/src/main/java/com/all/pdfreader/pro/app/ui/act/FAQActivity.kt
+++ b/app/src/main/java/com/all/pdfreader/pdf/reader/ui/act/FAQActivity.kt
@@ -1,12 +1,12 @@
-package com.all.pdfreader.pro.app.ui.act
+package com.all.pdfreader.pdf.reader.ui.act
 
 import android.os.Bundle
 import android.view.View
 import android.widget.ImageView
 import android.widget.TextView
 import androidx.core.text.HtmlCompat
-import com.all.pdfreader.pro.app.R
-import com.all.pdfreader.pro.app.databinding.ActivityFaqBinding
+import com.all.pdfreader.pdf.reader.R
+import com.all.pdfreader.pdf.reader.databinding.ActivityFaqBinding
 
 class FAQActivity : BaseActivity() {
     override val TAG: String = "FAQActivity"
diff --git a/app/src/main/java/com/all/pdfreader/pro/app/ui/act/MainActivity.kt b/app/src/main/java/com/all/pdfreader/pdf/reader/ui/act/MainActivity.kt
similarity index 94%
rename from app/src/main/java/com/all/pdfreader/pro/app/ui/act/MainActivity.kt
rename to app/src/main/java/com/all/pdfreader/pdf/reader/ui/act/MainActivity.kt
index 64288bd..2ccc5c3 100644
--- a/app/src/main/java/com/all/pdfreader/pro/app/ui/act/MainActivity.kt
+++ b/app/src/main/java/com/all/pdfreader/pdf/reader/ui/act/MainActivity.kt
@@ -1,4 +1,4 @@
-package com.all.pdfreader.pro.app.ui.act
+package com.all.pdfreader.pdf.reader.ui.act
 
 import android.content.Intent
 import android.os.Build
@@ -10,28 +10,28 @@ import androidx.activity.result.contract.ActivityResultContracts
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.lifecycleScope
-import com.all.pdfreader.pro.app.PRApp
-import com.all.pdfreader.pro.app.R
-import com.all.pdfreader.pro.app.databinding.ActivityMainBinding
-import com.all.pdfreader.pro.app.model.FileActionEvent
-import com.all.pdfreader.pro.app.model.FragmentType
-import com.all.pdfreader.pro.app.model.PdfPickerSource
-import com.all.pdfreader.pro.app.ui.dialog.PermissionDialogFragment
-import com.all.pdfreader.pro.app.ui.dialog.ProgressDialogFragment
-import com.all.pdfreader.pro.app.ui.dialog.PromptDialogFragment
-import com.all.pdfreader.pro.app.ui.fragment.FavoriteFrag
-import com.all.pdfreader.pro.app.ui.fragment.HomeFrag
-import com.all.pdfreader.pro.app.ui.fragment.RecentlyFrag
-import com.all.pdfreader.pro.app.ui.fragment.ToolsFrag
-import com.all.pdfreader.pro.app.ui.view.CustomSwitchButton
-import com.all.pdfreader.pro.app.ui.view.CustomSwitchButton.OnCheckedChangeListener
-import com.all.pdfreader.pro.app.util.AppUtils
-import com.all.pdfreader.pro.app.util.AppUtils.setClickWithAnimation
-import com.all.pdfreader.pro.app.util.AppUtils.setOnSingleClickListener
-import com.all.pdfreader.pro.app.util.PdfScanner
-import com.all.pdfreader.pro.app.util.StoragePermissionHelper
-import com.all.pdfreader.pro.app.viewmodel.PdfViewModel
-import com.all.pdfreader.pro.app.viewmodel.observeEvent
+import com.all.pdfreader.pdf.reader.PRApp
+import com.all.pdfreader.pdf.reader.R
+import com.all.pdfreader.pdf.reader.databinding.ActivityMainBinding
+import com.all.pdfreader.pdf.reader.model.FileActionEvent
+import com.all.pdfreader.pdf.reader.model.FragmentType
+import com.all.pdfreader.pdf.reader.model.PdfPickerSource
+import com.all.pdfreader.pdf.reader.ui.dialog.PermissionDialogFragment
+import com.all.pdfreader.pdf.reader.ui.dialog.ProgressDialogFragment
+import com.all.pdfreader.pdf.reader.ui.dialog.PromptDialogFragment
+import com.all.pdfreader.pdf.reader.ui.fragment.FavoriteFrag
+import com.all.pdfreader.pdf.reader.ui.fragment.HomeFrag
+import com.all.pdfreader.pdf.reader.ui.fragment.RecentlyFrag
+import com.all.pdfreader.pdf.reader.ui.fragment.ToolsFrag
+import com.all.pdfreader.pdf.reader.ui.view.CustomSwitchButton
+import com.all.pdfreader.pdf.reader.ui.view.CustomSwitchButton.OnCheckedChangeListener
+import com.all.pdfreader.pdf.reader.util.AppUtils
+import com.all.pdfreader.pdf.reader.util.AppUtils.setClickWithAnimation
+import com.all.pdfreader.pdf.reader.util.AppUtils.setOnSingleClickListener
+import com.all.pdfreader.pdf.reader.util.PdfScanner
+import com.all.pdfreader.pdf.reader.util.StoragePermissionHelper
+import com.all.pdfreader.pdf.reader.viewmodel.PdfViewModel
+import com.all.pdfreader.pdf.reader.viewmodel.observeEvent
 import kotlinx.coroutines.launch
 import java.io.File
 
diff --git a/app/src/main/java/com/all/pdfreader/pro/app/ui/act/MergePdfActivity.kt b/app/src/main/java/com/all/pdfreader/pdf/reader/ui/act/MergePdfActivity.kt
similarity index 93%
rename from app/src/main/java/com/all/pdfreader/pro/app/ui/act/MergePdfActivity.kt
rename to app/src/main/java/com/all/pdfreader/pdf/reader/ui/act/MergePdfActivity.kt
index d1b968f..5cb2c8c 100644
--- a/app/src/main/java/com/all/pdfreader/pro/app/ui/act/MergePdfActivity.kt
+++ b/app/src/main/java/com/all/pdfreader/pdf/reader/ui/act/MergePdfActivity.kt
@@ -1,4 +1,4 @@
-package com.all.pdfreader.pro.app.ui.act
+package com.all.pdfreader.pdf.reader.ui.act
 
 import android.annotation.SuppressLint
 import android.content.Context
@@ -11,15 +11,15 @@ import androidx.activity.OnBackPressedCallback
 import androidx.activity.result.contract.ActivityResultContract
 import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.LinearLayoutManager
-import com.all.pdfreader.pro.app.R
-import com.all.pdfreader.pro.app.databinding.ActivityPdfMergeBinding
-import com.all.pdfreader.pro.app.model.PdfPickerSource
-import com.all.pdfreader.pro.app.room.entity.PdfDocumentEntity
-import com.all.pdfreader.pro.app.ui.adapter.PdfAdapter
-import com.all.pdfreader.pro.app.ui.dialog.PdfPasswordProtectionDialogFragment
-import com.all.pdfreader.pro.app.ui.dialog.PromptDialogFragment
-import com.all.pdfreader.pro.app.util.AppUtils.setClickWithAnimation
-import com.all.pdfreader.pro.app.util.AppUtils.setOnSingleClickListener
+import com.all.pdfreader.pdf.reader.R
+import com.all.pdfreader.pdf.reader.databinding.ActivityPdfMergeBinding
+import com.all.pdfreader.pdf.reader.model.PdfPickerSource
+import com.all.pdfreader.pdf.reader.room.entity.PdfDocumentEntity
+import com.all.pdfreader.pdf.reader.ui.adapter.PdfAdapter
+import com.all.pdfreader.pdf.reader.ui.dialog.PdfPasswordProtectionDialogFragment
+import com.all.pdfreader.pdf.reader.ui.dialog.PromptDialogFragment
+import com.all.pdfreader.pdf.reader.util.AppUtils.setClickWithAnimation
+import com.all.pdfreader.pdf.reader.util.AppUtils.setOnSingleClickListener
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.suspendCancellableCoroutine
 import java.io.File
diff --git a/app/src/main/java/com/all/pdfreader/pro/app/ui/act/PdfPickerActivity.kt b/app/src/main/java/com/all/pdfreader/pdf/reader/ui/act/PdfPickerActivity.kt
similarity index 93%
rename from app/src/main/java/com/all/pdfreader/pro/app/ui/act/PdfPickerActivity.kt
rename to app/src/main/java/com/all/pdfreader/pdf/reader/ui/act/PdfPickerActivity.kt
index b159d7f..bf48f06 100644
--- a/app/src/main/java/com/all/pdfreader/pro/app/ui/act/PdfPickerActivity.kt
+++ b/app/src/main/java/com/all/pdfreader/pdf/reader/ui/act/PdfPickerActivity.kt
@@ -1,4 +1,4 @@
-package com.all.pdfreader.pro.app.ui.act
+package com.all.pdfreader.pdf.reader.ui.act
 
 import android.content.Context
 import android.content.Intent
@@ -10,20 +10,20 @@ import android.view.View
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.LinearLayoutManager
-import com.all.pdfreader.pro.app.R
-import com.all.pdfreader.pro.app.databinding.ActivityPdfPickerBinding
-import com.all.pdfreader.pro.app.model.PdfPickerSource
-import com.all.pdfreader.pro.app.model.PrintResult
-import com.all.pdfreader.pro.app.model.SortConfig
-import com.all.pdfreader.pro.app.room.entity.PdfDocumentEntity
-import com.all.pdfreader.pro.app.room.repository.PdfRepository
-import com.all.pdfreader.pro.app.ui.adapter.PdfAdapter
-import com.all.pdfreader.pro.app.ui.dialog.PdfRemovePasswordDialog
-import com.all.pdfreader.pro.app.ui.dialog.PdfSetPasswordDialog
-import com.all.pdfreader.pro.app.util.AppUtils.printPdfFile
-import com.all.pdfreader.pro.app.util.AppUtils.setClickWithAnimation
-import com.all.pdfreader.pro.app.util.AppUtils.setOnSingleClickListener
-import com.all.pdfreader.pro.app.util.ToastUtils
+import com.all.pdfreader.pdf.reader.R
+import com.all.pdfreader.pdf.reader.databinding.ActivityPdfPickerBinding
+import com.all.pdfreader.pdf.reader.model.PdfPickerSource
+import com.all.pdfreader.pdf.reader.model.PrintResult
+import com.all.pdfreader.pdf.reader.model.SortConfig
+import com.all.pdfreader.pdf.reader.room.entity.PdfDocumentEntity
+import com.all.pdfreader.pdf.reader.room.repository.PdfRepository
+import com.all.pdfreader.pdf.reader.ui.adapter.PdfAdapter
+import com.all.pdfreader.pdf.reader.ui.dialog.PdfRemovePasswordDialog
+import com.all.pdfreader.pdf.reader.ui.dialog.PdfSetPasswordDialog
+import com.all.pdfreader.pdf.reader.util.AppUtils.printPdfFile
+import com.all.pdfreader.pdf.reader.util.AppUtils.setClickWithAnimation
+import com.all.pdfreader.pdf.reader.util.AppUtils.setOnSingleClickListener
+import com.all.pdfreader.pdf.reader.util.ToastUtils
 import kotlinx.coroutines.launch
 import java.io.File
 import java.io.Serializable
diff --git a/app/src/main/java/com/all/pdfreader/pro/app/ui/act/PdfResultActivity.kt b/app/src/main/java/com/all/pdfreader/pdf/reader/ui/act/PdfResultActivity.kt
similarity index 96%
rename from app/src/main/java/com/all/pdfreader/pro/app/ui/act/PdfResultActivity.kt
rename to app/src/main/java/com/all/pdfreader/pdf/reader/ui/act/PdfResultActivity.kt
index 8af44cf..1e4281d 100644
--- a/app/src/main/java/com/all/pdfreader/pro/app/ui/act/PdfResultActivity.kt
+++ b/app/src/main/java/com/all/pdfreader/pdf/reader/ui/act/PdfResultActivity.kt
@@ -1,4 +1,4 @@
-package com.all.pdfreader.pro.app.ui.act
+package com.all.pdfreader.pdf.reader.ui.act
 
 import android.content.Context
 import android.content.Intent
@@ -13,24 +13,24 @@ import android.widget.Toast
 import androidx.activity.OnBackPressedCallback
 import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.LinearLayoutManager
-import com.all.pdfreader.pro.app.PRApp
-import com.all.pdfreader.pro.app.R
-import com.all.pdfreader.pro.app.databinding.ActivityPdfSplitResultBinding
-import com.all.pdfreader.pro.app.model.PdfPageItem
-import com.all.pdfreader.pro.app.model.PdfPickerSource
-import com.all.pdfreader.pro.app.model.PdfSelectedPagesItem
-import com.all.pdfreader.pro.app.model.PdfSplitResultItem
-import com.all.pdfreader.pro.app.room.entity.PdfDocumentEntity
-import com.all.pdfreader.pro.app.ui.adapter.PdfResultAdapter
-import com.all.pdfreader.pro.app.ui.dialog.PromptDialogFragment
-import com.all.pdfreader.pro.app.util.AppUtils
-import com.all.pdfreader.pro.app.util.AppUtils.dpToPx
-import com.all.pdfreader.pro.app.util.AppUtils.generateFastThumbnail
-import com.all.pdfreader.pro.app.util.FileUtils.toUnderscoreDateTime
-import com.all.pdfreader.pro.app.util.PdfScanner
-import com.all.pdfreader.pro.app.util.PdfSecurityUtils
-import com.all.pdfreader.pro.app.util.PdfUtils
-import com.all.pdfreader.pro.app.util.ToastUtils
+import com.all.pdfreader.pdf.reader.PRApp
+import com.all.pdfreader.pdf.reader.R
+import com.all.pdfreader.pdf.reader.databinding.ActivityPdfSplitResultBinding
+import com.all.pdfreader.pdf.reader.model.PdfPageItem
+import com.all.pdfreader.pdf.reader.model.PdfPickerSource
+import com.all.pdfreader.pdf.reader.model.PdfSelectedPagesItem
+import com.all.pdfreader.pdf.reader.model.PdfSplitResultItem
+import com.all.pdfreader.pdf.reader.room.entity.PdfDocumentEntity
+import com.all.pdfreader.pdf.reader.ui.adapter.PdfResultAdapter
+import com.all.pdfreader.pdf.reader.ui.dialog.PromptDialogFragment
+import com.all.pdfreader.pdf.reader.util.AppUtils
+import com.all.pdfreader.pdf.reader.util.AppUtils.dpToPx
+import com.all.pdfreader.pdf.reader.util.AppUtils.generateFastThumbnail
+import com.all.pdfreader.pdf.reader.util.FileUtils.toUnderscoreDateTime
+import com.all.pdfreader.pdf.reader.util.PdfScanner
+import com.all.pdfreader.pdf.reader.util.PdfSecurityUtils
+import com.all.pdfreader.pdf.reader.util.PdfUtils
+import com.all.pdfreader.pdf.reader.util.ToastUtils
 import com.bumptech.glide.Glide
 import com.bumptech.glide.load.resource.bitmap.CenterCrop
 import com.bumptech.glide.load.resource.bitmap.RoundedCorners
diff --git a/app/src/main/java/com/all/pdfreader/pro/app/ui/act/PdfToImageActivity.kt b/app/src/main/java/com/all/pdfreader/pdf/reader/ui/act/PdfToImageActivity.kt
similarity index 92%
rename from app/src/main/java/com/all/pdfreader/pro/app/ui/act/PdfToImageActivity.kt
rename to app/src/main/java/com/all/pdfreader/pdf/reader/ui/act/PdfToImageActivity.kt
index 9a26ed3..efab259 100644
--- a/app/src/main/java/com/all/pdfreader/pro/app/ui/act/PdfToImageActivity.kt
+++ b/app/src/main/java/com/all/pdfreader/pdf/reader/ui/act/PdfToImageActivity.kt
@@ -1,4 +1,4 @@
-package com.all.pdfreader.pro.app.ui.act
+package com.all.pdfreader.pdf.reader.ui.act
 
 import android.content.Context
 import android.content.Intent
@@ -7,15 +7,15 @@ import android.os.Bundle
 import android.view.View
 import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.GridLayoutManager
-import com.all.pdfreader.pro.app.R
-import com.all.pdfreader.pro.app.databinding.ActivityPdfToImgBinding
-import com.all.pdfreader.pro.app.model.PdfPageItem
-import com.all.pdfreader.pro.app.model.PdfPickerSource
-import com.all.pdfreader.pro.app.ui.adapter.SplitPdfAdapter
-import com.all.pdfreader.pro.app.ui.dialog.PdfPasswordProtectionDialogFragment
-import com.all.pdfreader.pro.app.util.AppUtils.setOnSingleClickListener
-import com.all.pdfreader.pro.app.util.FileUtils.isPdfEncrypted
-import com.all.pdfreader.pro.app.util.PdfUtils
+import com.all.pdfreader.pdf.reader.R
+import com.all.pdfreader.pdf.reader.databinding.ActivityPdfToImgBinding
+import com.all.pdfreader.pdf.reader.model.PdfPageItem
+import com.all.pdfreader.pdf.reader.model.PdfPickerSource
+import com.all.pdfreader.pdf.reader.ui.adapter.SplitPdfAdapter
+import com.all.pdfreader.pdf.reader.ui.dialog.PdfPasswordProtectionDialogFragment
+import com.all.pdfreader.pdf.reader.util.AppUtils.setOnSingleClickListener
+import com.all.pdfreader.pdf.reader.util.FileUtils.isPdfEncrypted
+import com.all.pdfreader.pdf.reader.util.PdfUtils
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
diff --git a/app/src/main/java/com/all/pdfreader/pro/app/ui/act/PdfViewActivity.kt b/app/src/main/java/com/all/pdfreader/pdf/reader/ui/act/PdfViewActivity.kt
similarity index 95%
rename from app/src/main/java/com/all/pdfreader/pro/app/ui/act/PdfViewActivity.kt
rename to app/src/main/java/com/all/pdfreader/pdf/reader/ui/act/PdfViewActivity.kt
index 39e0724..bc55389 100644
--- a/app/src/main/java/com/all/pdfreader/pro/app/ui/act/PdfViewActivity.kt
+++ b/app/src/main/java/com/all/pdfreader/pdf/reader/ui/act/PdfViewActivity.kt
@@ -1,4 +1,4 @@
-package com.all.pdfreader.pro.app.ui.act
+package com.all.pdfreader.pdf.reader.ui.act
 
 import android.content.Context
 import android.content.Intent
@@ -11,23 +11,23 @@ import android.view.inputmethod.EditorInfo
 import androidx.activity.OnBackPressedCallback
 import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.lifecycleScope
-import com.all.pdfreader.pro.app.R
-import com.all.pdfreader.pro.app.databinding.ActivityPdfViewBinding
-import com.all.pdfreader.pro.app.model.FileActionEvent
-import com.all.pdfreader.pro.app.room.entity.PdfDocumentEntity
-import com.all.pdfreader.pro.app.ui.dialog.BookmarksDialogFragment
-import com.all.pdfreader.pro.app.ui.dialog.ListMoreDialogFragment
-import com.all.pdfreader.pro.app.ui.dialog.PdfPasswordProtectionDialogFragment
-import com.all.pdfreader.pro.app.ui.dialog.ViewModelDialogFragment
-import com.all.pdfreader.pro.app.ui.view.CustomScrollHandle
-import com.all.pdfreader.pro.app.util.AppUtils
-import com.all.pdfreader.pro.app.util.AppUtils.hideKeyboard
-import com.all.pdfreader.pro.app.util.AppUtils.showKeyboard
-import com.all.pdfreader.pro.app.util.FileUtils
-import com.all.pdfreader.pro.app.util.PDFHighlighter
-import com.all.pdfreader.pro.app.util.PDFSearchManager
-import com.all.pdfreader.pro.app.viewmodel.PdfViewModel
-import com.all.pdfreader.pro.app.viewmodel.observeEvent
+import com.all.pdfreader.pdf.reader.R
+import com.all.pdfreader.pdf.reader.databinding.ActivityPdfViewBinding
+import com.all.pdfreader.pdf.reader.model.FileActionEvent
+import com.all.pdfreader.pdf.reader.room.entity.PdfDocumentEntity
+import com.all.pdfreader.pdf.reader.ui.dialog.BookmarksDialogFragment
+import com.all.pdfreader.pdf.reader.ui.dialog.ListMoreDialogFragment
+import com.all.pdfreader.pdf.reader.ui.dialog.PdfPasswordProtectionDialogFragment
+import com.all.pdfreader.pdf.reader.ui.dialog.ViewModelDialogFragment
+import com.all.pdfreader.pdf.reader.ui.view.CustomScrollHandle
+import com.all.pdfreader.pdf.reader.util.AppUtils
+import com.all.pdfreader.pdf.reader.util.AppUtils.hideKeyboard
+import com.all.pdfreader.pdf.reader.util.AppUtils.showKeyboard
+import com.all.pdfreader.pdf.reader.util.FileUtils
+import com.all.pdfreader.pdf.reader.util.PDFHighlighter
+import com.all.pdfreader.pdf.reader.util.PDFSearchManager
+import com.all.pdfreader.pdf.reader.viewmodel.PdfViewModel
+import com.all.pdfreader.pdf.reader.viewmodel.observeEvent
 import com.github.barteksc.pdfviewer.listener.OnErrorListener
 import com.github.barteksc.pdfviewer.listener.OnLoadCompleteListener
 import com.github.barteksc.pdfviewer.listener.OnPageChangeListener
diff --git a/app/src/main/java/com/all/pdfreader/pro/app/ui/act/PictureSelectorActivity.kt b/app/src/main/java/com/all/pdfreader/pdf/reader/ui/act/PictureSelectorActivity.kt
similarity index 95%
rename from app/src/main/java/com/all/pdfreader/pro/app/ui/act/PictureSelectorActivity.kt
rename to app/src/main/java/com/all/pdfreader/pdf/reader/ui/act/PictureSelectorActivity.kt
index dcfc843..e60da0b 100644
--- a/app/src/main/java/com/all/pdfreader/pro/app/ui/act/PictureSelectorActivity.kt
+++ b/app/src/main/java/com/all/pdfreader/pdf/reader/ui/act/PictureSelectorActivity.kt
@@ -1,4 +1,4 @@
-package com.all.pdfreader.pro.app.ui.act
+package com.all.pdfreader.pdf.reader.ui.act
 
 import android.content.Context
 import android.net.Uri
@@ -6,11 +6,11 @@ import android.os.Bundle
 import android.view.View
 import androidx.core.net.toUri
 import androidx.fragment.app.Fragment
-import com.all.pdfreader.pro.app.PRApp
-import com.all.pdfreader.pro.app.R
-import com.all.pdfreader.pro.app.databinding.ActPictureSelectorBinding
-import com.all.pdfreader.pro.app.model.PdfPickerSource
-import com.all.pdfreader.pro.app.util.GlideEngine
+import com.all.pdfreader.pdf.reader.PRApp
+import com.all.pdfreader.pdf.reader.R
+import com.all.pdfreader.pdf.reader.databinding.ActPictureSelectorBinding
+import com.all.pdfreader.pdf.reader.model.PdfPickerSource
+import com.all.pdfreader.pdf.reader.util.GlideEngine
 import com.luck.picture.lib.basic.PictureSelector
 import com.luck.picture.lib.config.PictureMimeType
 import com.luck.picture.lib.config.SelectMimeType
diff --git a/app/src/main/java/com/all/pdfreader/pro/app/ui/act/PrivacyPolicyActivity.kt b/app/src/main/java/com/all/pdfreader/pdf/reader/ui/act/PrivacyPolicyActivity.kt
similarity index 96%
rename from app/src/main/java/com/all/pdfreader/pro/app/ui/act/PrivacyPolicyActivity.kt
rename to app/src/main/java/com/all/pdfreader/pdf/reader/ui/act/PrivacyPolicyActivity.kt
index 8719660..f85e543 100644
--- a/app/src/main/java/com/all/pdfreader/pro/app/ui/act/PrivacyPolicyActivity.kt
+++ b/app/src/main/java/com/all/pdfreader/pdf/reader/ui/act/PrivacyPolicyActivity.kt
@@ -1,4 +1,4 @@
-package com.all.pdfreader.pro.app.ui.act
+package com.all.pdfreader.pdf.reader.ui.act
 
 import android.os.Bundle
 import android.view.View
@@ -7,8 +7,8 @@ import android.webkit.WebResourceError
 import android.webkit.WebResourceRequest
 import android.webkit.WebView
 import android.webkit.WebViewClient
-import com.all.pdfreader.pro.app.R
-import com.all.pdfreader.pro.app.databinding.ActPrivacyPolicyBinding
+import com.all.pdfreader.pdf.reader.R
+import com.all.pdfreader.pdf.reader.databinding.ActPrivacyPolicyBinding
 
 class PrivacyPolicyActivity : BaseActivity() {
     private lateinit var binding: ActPrivacyPolicyBinding
diff --git a/app/src/main/java/com/all/pdfreader/pro/app/ui/act/SearchActivity.kt b/app/src/main/java/com/all/pdfreader/pdf/reader/ui/act/SearchActivity.kt
similarity index 93%
rename from app/src/main/java/com/all/pdfreader/pro/app/ui/act/SearchActivity.kt
rename to app/src/main/java/com/all/pdfreader/pdf/reader/ui/act/SearchActivity.kt
index f9b32a7..c1e3d2f 100644
--- a/app/src/main/java/com/all/pdfreader/pro/app/ui/act/SearchActivity.kt
+++ b/app/src/main/java/com/all/pdfreader/pdf/reader/ui/act/SearchActivity.kt
@@ -1,4 +1,4 @@
-package com.all.pdfreader.pro.app.ui.act
+package com.all.pdfreader.pdf.reader.ui.act
 
 import android.content.Context
 import android.content.Intent
@@ -14,18 +14,18 @@ import android.widget.TextView
 import androidx.core.content.edit
 import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.LinearLayoutManager
-import com.all.pdfreader.pro.app.R
-import com.all.pdfreader.pro.app.databinding.ActivitySearchPdfBinding
-import com.all.pdfreader.pro.app.model.PdfPickerSource
-import com.all.pdfreader.pro.app.model.PrintResult
-import com.all.pdfreader.pro.app.ui.adapter.SearchPdfAdapter
-import com.all.pdfreader.pro.app.ui.dialog.ListMoreDialogFragment
-import com.all.pdfreader.pro.app.ui.dialog.PdfRemovePasswordDialog
-import com.all.pdfreader.pro.app.ui.dialog.PdfSetPasswordDialog
-import com.all.pdfreader.pro.app.ui.dialog.PromptDialogFragment
-import com.all.pdfreader.pro.app.util.AppUtils.printPdfFile
-import com.all.pdfreader.pro.app.util.AppUtils.showKeyboard
-import com.all.pdfreader.pro.app.util.ToastUtils
+import com.all.pdfreader.pdf.reader.R
+import com.all.pdfreader.pdf.reader.databinding.ActivitySearchPdfBinding
+import com.all.pdfreader.pdf.reader.model.PdfPickerSource
+import com.all.pdfreader.pdf.reader.model.PrintResult
+import com.all.pdfreader.pdf.reader.ui.adapter.SearchPdfAdapter
+import com.all.pdfreader.pdf.reader.ui.dialog.ListMoreDialogFragment
+import com.all.pdfreader.pdf.reader.ui.dialog.PdfRemovePasswordDialog
+import com.all.pdfreader.pdf.reader.ui.dialog.PdfSetPasswordDialog
+import com.all.pdfreader.pdf.reader.ui.dialog.PromptDialogFragment
+import com.all.pdfreader.pdf.reader.util.AppUtils.printPdfFile
+import com.all.pdfreader.pdf.reader.util.AppUtils.showKeyboard
+import com.all.pdfreader.pdf.reader.util.ToastUtils
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.collectLatest
diff --git a/app/src/main/java/com/all/pdfreader/pro/app/ui/act/SplashActivity.kt b/app/src/main/java/com/all/pdfreader/pdf/reader/ui/act/SplashActivity.kt
similarity index 78%
rename from app/src/main/java/com/all/pdfreader/pro/app/ui/act/SplashActivity.kt
rename to app/src/main/java/com/all/pdfreader/pdf/reader/ui/act/SplashActivity.kt
index 4d139c2..95c0579 100644
--- a/app/src/main/java/com/all/pdfreader/pro/app/ui/act/SplashActivity.kt
+++ b/app/src/main/java/com/all/pdfreader/pdf/reader/ui/act/SplashActivity.kt
@@ -1,12 +1,12 @@
-package com.all.pdfreader.pro.app.ui.act
+package com.all.pdfreader.pdf.reader.ui.act
 
 import android.annotation.SuppressLint
 import android.content.Intent
 import android.os.Bundle
 import android.os.Handler
 import android.os.Looper
-import com.all.pdfreader.pro.app.R
-import com.all.pdfreader.pro.app.databinding.ActivitySplashBinding
+import com.all.pdfreader.pdf.reader.R
+import com.all.pdfreader.pdf.reader.databinding.ActivitySplashBinding
 import com.gyf.immersionbar.BarHide
 import com.gyf.immersionbar.ImmersionBar
 
@@ -40,11 +40,6 @@ class SplashActivity : BaseActivity() {
     
     private fun navigateToNext() {
         val intent =  Intent(this, MainActivity::class.java)
-//        val intent = if (StoragePermissionHelper.hasBasicStoragePermission(this)) {
-//            Intent(this, MainActivity::class.java)
-//        } else {
-//            Intent(this, PermissionActivity::class.java)
-//        }
         startActivity(intent)
         finish()
     }
diff --git a/app/src/main/java/com/all/pdfreader/pro/app/ui/act/SplitPdfActivity.kt b/app/src/main/java/com/all/pdfreader/pdf/reader/ui/act/SplitPdfActivity.kt
similarity index 92%
rename from app/src/main/java/com/all/pdfreader/pro/app/ui/act/SplitPdfActivity.kt
rename to app/src/main/java/com/all/pdfreader/pdf/reader/ui/act/SplitPdfActivity.kt
index 53db126..2c17369 100644
--- a/app/src/main/java/com/all/pdfreader/pro/app/ui/act/SplitPdfActivity.kt
+++ b/app/src/main/java/com/all/pdfreader/pdf/reader/ui/act/SplitPdfActivity.kt
@@ -1,4 +1,4 @@
-package com.all.pdfreader.pro.app.ui.act
+package com.all.pdfreader.pdf.reader.ui.act
 
 import android.content.Context
 import android.content.Intent
@@ -8,21 +8,21 @@ import androidx.activity.OnBackPressedCallback
 import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.LinearLayoutManager
-import com.all.pdfreader.pro.app.R
-import com.all.pdfreader.pro.app.databinding.ActivityPdfSplitBinding
-import com.all.pdfreader.pro.app.model.PdfPageItem
-import com.all.pdfreader.pro.app.model.PdfPickerSource
-import com.all.pdfreader.pro.app.model.PdfSelectedPagesItem
-import com.all.pdfreader.pro.app.model.RenameType
-import com.all.pdfreader.pro.app.ui.adapter.SplitPdfAdapter
-import com.all.pdfreader.pro.app.ui.adapter.SplitSelectedPdfAdapter
-import com.all.pdfreader.pro.app.ui.dialog.PdfPasswordProtectionDialogFragment
-import com.all.pdfreader.pro.app.ui.dialog.PromptDialogFragment
-import com.all.pdfreader.pro.app.ui.dialog.RenameDialogFragment
-import com.all.pdfreader.pro.app.util.AppUtils.setOnSingleClickListener
-import com.all.pdfreader.pro.app.util.FileUtils.isPdfEncrypted
-import com.all.pdfreader.pro.app.util.FileUtils.toUnderscoreDateTime
-import com.all.pdfreader.pro.app.util.PdfUtils
+import com.all.pdfreader.pdf.reader.R
+import com.all.pdfreader.pdf.reader.databinding.ActivityPdfSplitBinding
+import com.all.pdfreader.pdf.reader.model.PdfPageItem
+import com.all.pdfreader.pdf.reader.model.PdfPickerSource
+import com.all.pdfreader.pdf.reader.model.PdfSelectedPagesItem
+import com.all.pdfreader.pdf.reader.model.RenameType
+import com.all.pdfreader.pdf.reader.ui.adapter.SplitPdfAdapter
+import com.all.pdfreader.pdf.reader.ui.adapter.SplitSelectedPdfAdapter
+import com.all.pdfreader.pdf.reader.ui.dialog.PdfPasswordProtectionDialogFragment
+import com.all.pdfreader.pdf.reader.ui.dialog.PromptDialogFragment
+import com.all.pdfreader.pdf.reader.ui.dialog.RenameDialogFragment
+import com.all.pdfreader.pdf.reader.util.AppUtils.setOnSingleClickListener
+import com.all.pdfreader.pdf.reader.util.FileUtils.isPdfEncrypted
+import com.all.pdfreader.pdf.reader.util.FileUtils.toUnderscoreDateTime
+import com.all.pdfreader.pdf.reader.util.PdfUtils
 import com.gyf.immersionbar.ImmersionBar
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
diff --git a/app/src/main/java/com/all/pdfreader/pro/app/ui/adapter/BookmarkAdapter.kt b/app/src/main/java/com/all/pdfreader/pdf/reader/ui/adapter/BookmarkAdapter.kt
similarity index 92%
rename from app/src/main/java/com/all/pdfreader/pro/app/ui/adapter/BookmarkAdapter.kt
rename to app/src/main/java/com/all/pdfreader/pdf/reader/ui/adapter/BookmarkAdapter.kt
index 1282b55..8522e1f 100644
--- a/app/src/main/java/com/all/pdfreader/pro/app/ui/adapter/BookmarkAdapter.kt
+++ b/app/src/main/java/com/all/pdfreader/pdf/reader/ui/adapter/BookmarkAdapter.kt
@@ -1,11 +1,11 @@
-package com.all.pdfreader.pro.app.ui.adapter
+package com.all.pdfreader.pdf.reader.ui.adapter
 
 import android.annotation.SuppressLint
 import android.view.LayoutInflater
 import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
-import com.all.pdfreader.pro.app.databinding.AdapterItemBookmarkPageBinding
-import com.all.pdfreader.pro.app.room.entity.BookmarkEntity
+import com.all.pdfreader.pdf.reader.databinding.AdapterItemBookmarkPageBinding
+import com.all.pdfreader.pdf.reader.room.entity.BookmarkEntity
 
 class BookmarkAdapter(
     private var list: MutableList<BookmarkEntity>,
diff --git a/app/src/main/java/com/all/pdfreader/pro/app/ui/adapter/PdfAdapter.kt b/app/src/main/java/com/all/pdfreader/pdf/reader/ui/adapter/PdfAdapter.kt
similarity index 92%
rename from app/src/main/java/com/all/pdfreader/pro/app/ui/adapter/PdfAdapter.kt
rename to app/src/main/java/com/all/pdfreader/pdf/reader/ui/adapter/PdfAdapter.kt
index a29dbbd..689c92d 100644
--- a/app/src/main/java/com/all/pdfreader/pro/app/ui/adapter/PdfAdapter.kt
+++ b/app/src/main/java/com/all/pdfreader/pdf/reader/ui/adapter/PdfAdapter.kt
@@ -1,17 +1,17 @@
-package com.all.pdfreader.pro.app.ui.adapter
+package com.all.pdfreader.pdf.reader.ui.adapter
 
 import android.annotation.SuppressLint
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
-import com.all.pdfreader.pro.app.databinding.AdapterPdfItemBinding
-import com.all.pdfreader.pro.app.room.entity.PdfDocumentEntity
-import com.all.pdfreader.pro.app.ui.act.MainActivity
-import com.all.pdfreader.pro.app.util.AppUtils.dpToPx
-import com.all.pdfreader.pro.app.util.FileUtils
-import com.all.pdfreader.pro.app.util.FileUtils.toFormatFileSize
-import com.all.pdfreader.pro.app.util.FileUtils.toSlashDate
+import com.all.pdfreader.pdf.reader.databinding.AdapterPdfItemBinding
+import com.all.pdfreader.pdf.reader.room.entity.PdfDocumentEntity
+import com.all.pdfreader.pdf.reader.ui.act.MainActivity
+import com.all.pdfreader.pdf.reader.util.AppUtils.dpToPx
+import com.all.pdfreader.pdf.reader.util.FileUtils
+import com.all.pdfreader.pdf.reader.util.FileUtils.toFormatFileSize
+import com.all.pdfreader.pdf.reader.util.FileUtils.toSlashDate
 import com.bumptech.glide.Glide
 import com.bumptech.glide.load.resource.bitmap.CenterCrop
 import com.bumptech.glide.load.resource.bitmap.RoundedCorners
diff --git a/app/src/main/java/com/all/pdfreader/pro/app/ui/adapter/PdfResultAdapter.kt b/app/src/main/java/com/all/pdfreader/pdf/reader/ui/adapter/PdfResultAdapter.kt
similarity index 91%
rename from app/src/main/java/com/all/pdfreader/pro/app/ui/adapter/PdfResultAdapter.kt
rename to app/src/main/java/com/all/pdfreader/pdf/reader/ui/adapter/PdfResultAdapter.kt
index 1cdfe6b..a9f59f2 100644
--- a/app/src/main/java/com/all/pdfreader/pro/app/ui/adapter/PdfResultAdapter.kt
+++ b/app/src/main/java/com/all/pdfreader/pdf/reader/ui/adapter/PdfResultAdapter.kt
@@ -1,14 +1,14 @@
-package com.all.pdfreader.pro.app.ui.adapter
+package com.all.pdfreader.pdf.reader.ui.adapter
 
 import android.annotation.SuppressLint
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
-import com.all.pdfreader.pro.app.R
-import com.all.pdfreader.pro.app.databinding.AdapterSelectedResultItemBinding
-import com.all.pdfreader.pro.app.model.PdfSplitResultItem
-import com.all.pdfreader.pro.app.util.AppUtils.dpToPx
+import com.all.pdfreader.pdf.reader.R
+import com.all.pdfreader.pdf.reader.databinding.AdapterSelectedResultItemBinding
+import com.all.pdfreader.pdf.reader.model.PdfSplitResultItem
+import com.all.pdfreader.pdf.reader.util.AppUtils.dpToPx
 import com.bumptech.glide.Glide
 import com.bumptech.glide.load.resource.bitmap.CenterCrop
 import com.bumptech.glide.load.resource.bitmap.RoundedCorners
diff --git a/app/src/main/java/com/all/pdfreader/pro/app/ui/adapter/PrintPdfAdapter.kt b/app/src/main/java/com/all/pdfreader/pdf/reader/ui/adapter/PrintPdfAdapter.kt
similarity index 98%
rename from app/src/main/java/com/all/pdfreader/pro/app/ui/adapter/PrintPdfAdapter.kt
rename to app/src/main/java/com/all/pdfreader/pdf/reader/ui/adapter/PrintPdfAdapter.kt
index a81cb48..9d604ca 100644
--- a/app/src/main/java/com/all/pdfreader/pro/app/ui/adapter/PrintPdfAdapter.kt
+++ b/app/src/main/java/com/all/pdfreader/pdf/reader/ui/adapter/PrintPdfAdapter.kt
@@ -1,4 +1,4 @@
-package com.all.pdfreader.pro.app.ui.adapter
+package com.all.pdfreader.pdf.reader.ui.adapter
 
 import android.content.Context
 import android.net.Uri
diff --git a/app/src/main/java/com/all/pdfreader/pro/app/ui/adapter/SearchPdfAdapter.kt b/app/src/main/java/com/all/pdfreader/pdf/reader/ui/adapter/SearchPdfAdapter.kt
similarity index 87%
rename from app/src/main/java/com/all/pdfreader/pro/app/ui/adapter/SearchPdfAdapter.kt
rename to app/src/main/java/com/all/pdfreader/pdf/reader/ui/adapter/SearchPdfAdapter.kt
index 5ee7e92..daf7f41 100644
--- a/app/src/main/java/com/all/pdfreader/pro/app/ui/adapter/SearchPdfAdapter.kt
+++ b/app/src/main/java/com/all/pdfreader/pdf/reader/ui/adapter/SearchPdfAdapter.kt
@@ -1,4 +1,4 @@
-package com.all.pdfreader.pro.app.ui.adapter
+package com.all.pdfreader.pdf.reader.ui.adapter
 
 import android.annotation.SuppressLint
 import android.util.Log
@@ -7,14 +7,14 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.recyclerview.widget.ListAdapter
 import androidx.recyclerview.widget.RecyclerView
-import com.all.pdfreader.pro.app.R
-import com.all.pdfreader.pro.app.databinding.AdapterPdfItemBinding
-import com.all.pdfreader.pro.app.room.entity.PdfDocumentEntity
-import com.all.pdfreader.pro.app.util.AppUtils.dpToPx
-import com.all.pdfreader.pro.app.util.AppUtils.toHighlightedSpannable
-import com.all.pdfreader.pro.app.util.FileUtils.toFormatFileSize
-import com.all.pdfreader.pro.app.util.FileUtils.toSlashDate
-import com.all.pdfreader.pro.app.util.PdfDiffCallback
+import com.all.pdfreader.pdf.reader.R
+import com.all.pdfreader.pdf.reader.databinding.AdapterPdfItemBinding
+import com.all.pdfreader.pdf.reader.room.entity.PdfDocumentEntity
+import com.all.pdfreader.pdf.reader.util.AppUtils.dpToPx
+import com.all.pdfreader.pdf.reader.util.AppUtils.toHighlightedSpannable
+import com.all.pdfreader.pdf.reader.util.FileUtils.toFormatFileSize
+import com.all.pdfreader.pdf.reader.util.FileUtils.toSlashDate
+import com.all.pdfreader.pdf.reader.util.PdfDiffCallback
 import com.bumptech.glide.Glide
 import com.bumptech.glide.load.resource.bitmap.CenterCrop
 import com.bumptech.glide.load.resource.bitmap.RoundedCorners
diff --git a/app/src/main/java/com/all/pdfreader/pro/app/ui/adapter/SplitPdfAdapter.kt b/app/src/main/java/com/all/pdfreader/pdf/reader/ui/adapter/SplitPdfAdapter.kt
similarity index 93%
rename from app/src/main/java/com/all/pdfreader/pro/app/ui/adapter/SplitPdfAdapter.kt
rename to app/src/main/java/com/all/pdfreader/pdf/reader/ui/adapter/SplitPdfAdapter.kt
index f7bd090..d9b236d 100644
--- a/app/src/main/java/com/all/pdfreader/pro/app/ui/adapter/SplitPdfAdapter.kt
+++ b/app/src/main/java/com/all/pdfreader/pdf/reader/ui/adapter/SplitPdfAdapter.kt
@@ -1,13 +1,13 @@
-package com.all.pdfreader.pro.app.ui.adapter
+package com.all.pdfreader.pdf.reader.ui.adapter
 
 import android.annotation.SuppressLint
 import android.view.LayoutInflater
 import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
-import com.all.pdfreader.pro.app.R
-import com.all.pdfreader.pro.app.databinding.AdapterSplitPageItemBinding
-import com.all.pdfreader.pro.app.model.PdfPageItem
-import com.all.pdfreader.pro.app.util.AppUtils.dpToPx
+import com.all.pdfreader.pdf.reader.R
+import com.all.pdfreader.pdf.reader.databinding.AdapterSplitPageItemBinding
+import com.all.pdfreader.pdf.reader.model.PdfPageItem
+import com.all.pdfreader.pdf.reader.util.AppUtils.dpToPx
 import com.bumptech.glide.Glide
 import com.bumptech.glide.load.resource.bitmap.CenterCrop
 import com.bumptech.glide.load.resource.bitmap.RoundedCorners
diff --git a/app/src/main/java/com/all/pdfreader/pro/app/ui/adapter/SplitSelectedPdfAdapter.kt b/app/src/main/java/com/all/pdfreader/pdf/reader/ui/adapter/SplitSelectedPdfAdapter.kt
similarity index 89%
rename from app/src/main/java/com/all/pdfreader/pro/app/ui/adapter/SplitSelectedPdfAdapter.kt
rename to app/src/main/java/com/all/pdfreader/pdf/reader/ui/adapter/SplitSelectedPdfAdapter.kt
index dc8501c..8b9ba7c 100644
--- a/app/src/main/java/com/all/pdfreader/pro/app/ui/adapter/SplitSelectedPdfAdapter.kt
+++ b/app/src/main/java/com/all/pdfreader/pdf/reader/ui/adapter/SplitSelectedPdfAdapter.kt
@@ -1,12 +1,12 @@
-package com.all.pdfreader.pro.app.ui.adapter
+package com.all.pdfreader.pdf.reader.ui.adapter
 
 import android.annotation.SuppressLint
 import android.view.LayoutInflater
 import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
-import com.all.pdfreader.pro.app.databinding.AdapterSplitSelectedPageItemBinding
-import com.all.pdfreader.pro.app.model.PdfSelectedPagesItem
-import com.all.pdfreader.pro.app.util.AppUtils.dpToPx
+import com.all.pdfreader.pdf.reader.databinding.AdapterSplitSelectedPageItemBinding
+import com.all.pdfreader.pdf.reader.model.PdfSelectedPagesItem
+import com.all.pdfreader.pdf.reader.util.AppUtils.dpToPx
 import com.bumptech.glide.Glide
 import com.bumptech.glide.load.resource.bitmap.CenterCrop
 import com.bumptech.glide.load.resource.bitmap.RoundedCorners
diff --git a/app/src/main/java/com/all/pdfreader/pro/app/ui/dialog/BookmarksDialogFragment.kt b/app/src/main/java/com/all/pdfreader/pdf/reader/ui/dialog/BookmarksDialogFragment.kt
similarity index 92%
rename from app/src/main/java/com/all/pdfreader/pro/app/ui/dialog/BookmarksDialogFragment.kt
rename to app/src/main/java/com/all/pdfreader/pdf/reader/ui/dialog/BookmarksDialogFragment.kt
index 1f4508c..9af46e3 100644
--- a/app/src/main/java/com/all/pdfreader/pro/app/ui/dialog/BookmarksDialogFragment.kt
+++ b/app/src/main/java/com/all/pdfreader/pdf/reader/ui/dialog/BookmarksDialogFragment.kt
@@ -1,4 +1,4 @@
-package com.all.pdfreader.pro.app.ui.dialog
+package com.all.pdfreader.pdf.reader.ui.dialog
 
 import android.os.Bundle
 import android.view.LayoutInflater
@@ -6,14 +6,14 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.activityViewModels
 import androidx.recyclerview.widget.LinearLayoutManager
-import com.all.pdfreader.pro.app.R
-import com.all.pdfreader.pro.app.databinding.DialogBookmarksBinding
-import com.all.pdfreader.pro.app.model.RenameType
-import com.all.pdfreader.pro.app.room.entity.BookmarkEntity
-import com.all.pdfreader.pro.app.room.entity.PdfDocumentEntity
-import com.all.pdfreader.pro.app.ui.adapter.BookmarkAdapter
-import com.all.pdfreader.pro.app.util.ToastUtils
-import com.all.pdfreader.pro.app.viewmodel.PdfViewModel
+import com.all.pdfreader.pdf.reader.R
+import com.all.pdfreader.pdf.reader.databinding.DialogBookmarksBinding
+import com.all.pdfreader.pdf.reader.model.RenameType
+import com.all.pdfreader.pdf.reader.room.entity.BookmarkEntity
+import com.all.pdfreader.pdf.reader.room.entity.PdfDocumentEntity
+import com.all.pdfreader.pdf.reader.ui.adapter.BookmarkAdapter
+import com.all.pdfreader.pdf.reader.util.ToastUtils
+import com.all.pdfreader.pdf.reader.viewmodel.PdfViewModel
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment
 
 class BookmarksDialogFragment(
diff --git a/app/src/main/java/com/all/pdfreader/pro/app/ui/dialog/FileDetailsDialogFragment.kt b/app/src/main/java/com/all/pdfreader/pdf/reader/ui/dialog/FileDetailsDialogFragment.kt
similarity index 80%
rename from app/src/main/java/com/all/pdfreader/pro/app/ui/dialog/FileDetailsDialogFragment.kt
rename to app/src/main/java/com/all/pdfreader/pdf/reader/ui/dialog/FileDetailsDialogFragment.kt
index 7e2e652..d672f57 100644
--- a/app/src/main/java/com/all/pdfreader/pro/app/ui/dialog/FileDetailsDialogFragment.kt
+++ b/app/src/main/java/com/all/pdfreader/pdf/reader/ui/dialog/FileDetailsDialogFragment.kt
@@ -1,4 +1,4 @@
-package com.all.pdfreader.pro.app.ui.dialog
+package com.all.pdfreader.pdf.reader.ui.dialog
 
 import android.os.Bundle
 import android.view.LayoutInflater
@@ -6,13 +6,13 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.Toast
 import androidx.fragment.app.activityViewModels
-import com.all.pdfreader.pro.app.R
-import com.all.pdfreader.pro.app.databinding.DialogFileDetailsBinding
-import com.all.pdfreader.pro.app.room.entity.PdfDocumentEntity
-import com.all.pdfreader.pro.app.util.FileUtils.toFormatFileSize
-import com.all.pdfreader.pro.app.util.FileUtils.toSlashDateTime
-import com.all.pdfreader.pro.app.util.ToastUtils
-import com.all.pdfreader.pro.app.viewmodel.PdfViewModel
+import com.all.pdfreader.pdf.reader.R
+import com.all.pdfreader.pdf.reader.databinding.DialogFileDetailsBinding
+import com.all.pdfreader.pdf.reader.room.entity.PdfDocumentEntity
+import com.all.pdfreader.pdf.reader.util.FileUtils.toFormatFileSize
+import com.all.pdfreader.pdf.reader.util.FileUtils.toSlashDateTime
+import com.all.pdfreader.pdf.reader.util.ToastUtils
+import com.all.pdfreader.pdf.reader.viewmodel.PdfViewModel
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment
 
 class FileDetailsDialogFragment() : BottomSheetDialogFragment() {
diff --git a/app/src/main/java/com/all/pdfreader/pro/app/ui/dialog/GotoPageDialogFragment.kt b/app/src/main/java/com/all/pdfreader/pdf/reader/ui/dialog/GotoPageDialogFragment.kt
similarity index 84%
rename from app/src/main/java/com/all/pdfreader/pro/app/ui/dialog/GotoPageDialogFragment.kt
rename to app/src/main/java/com/all/pdfreader/pdf/reader/ui/dialog/GotoPageDialogFragment.kt
index 206a838..d7d7cf0 100644
--- a/app/src/main/java/com/all/pdfreader/pro/app/ui/dialog/GotoPageDialogFragment.kt
+++ b/app/src/main/java/com/all/pdfreader/pdf/reader/ui/dialog/GotoPageDialogFragment.kt
@@ -1,4 +1,4 @@
-package com.all.pdfreader.pro.app.ui.dialog
+package com.all.pdfreader.pdf.reader.ui.dialog
 
 import android.graphics.Color
 import android.os.Bundle
@@ -11,16 +11,16 @@ import android.widget.Toast
 import androidx.core.graphics.drawable.toDrawable
 import androidx.fragment.app.DialogFragment
 import androidx.fragment.app.activityViewModels
-import com.all.pdfreader.pro.app.R
-import com.all.pdfreader.pro.app.databinding.DialogGotoPageBinding
-import com.all.pdfreader.pro.app.databinding.DialogRenameFileBinding
-import com.all.pdfreader.pro.app.model.RenameType
-import com.all.pdfreader.pro.app.room.entity.BookmarkEntity
-import com.all.pdfreader.pro.app.room.entity.PdfDocumentEntity
-import com.all.pdfreader.pro.app.util.AppUtils.showKeyboard
-import com.all.pdfreader.pro.app.util.FileUtils
-import com.all.pdfreader.pro.app.util.ToastUtils
-import com.all.pdfreader.pro.app.viewmodel.PdfViewModel
+import com.all.pdfreader.pdf.reader.R
+import com.all.pdfreader.pdf.reader.databinding.DialogGotoPageBinding
+import com.all.pdfreader.pdf.reader.databinding.DialogRenameFileBinding
+import com.all.pdfreader.pdf.reader.model.RenameType
+import com.all.pdfreader.pdf.reader.room.entity.BookmarkEntity
+import com.all.pdfreader.pdf.reader.room.entity.PdfDocumentEntity
+import com.all.pdfreader.pdf.reader.util.AppUtils.showKeyboard
+import com.all.pdfreader.pdf.reader.util.FileUtils
+import com.all.pdfreader.pdf.reader.util.ToastUtils
+import com.all.pdfreader.pdf.reader.viewmodel.PdfViewModel
 import java.io.File
 
 class GotoPageDialogFragment(
diff --git a/app/src/main/java/com/all/pdfreader/pro/app/ui/dialog/ListMoreDialogFragment.kt b/app/src/main/java/com/all/pdfreader/pdf/reader/ui/dialog/ListMoreDialogFragment.kt
similarity index 87%
rename from app/src/main/java/com/all/pdfreader/pro/app/ui/dialog/ListMoreDialogFragment.kt
rename to app/src/main/java/com/all/pdfreader/pdf/reader/ui/dialog/ListMoreDialogFragment.kt
index b4a41a1..802b534 100644
--- a/app/src/main/java/com/all/pdfreader/pro/app/ui/dialog/ListMoreDialogFragment.kt
+++ b/app/src/main/java/com/all/pdfreader/pdf/reader/ui/dialog/ListMoreDialogFragment.kt
@@ -1,4 +1,4 @@
-package com.all.pdfreader.pro.app.ui.dialog
+package com.all.pdfreader.pdf.reader.ui.dialog
 
 import android.net.Uri
 import android.os.Bundle
@@ -7,28 +7,28 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.Toast
 import androidx.fragment.app.activityViewModels
-import com.all.pdfreader.pro.app.R
-import com.all.pdfreader.pro.app.databinding.DialogListMoreBinding
-import com.all.pdfreader.pro.app.model.PdfPickerSource
-import com.all.pdfreader.pro.app.model.PrintResult
-import com.all.pdfreader.pro.app.model.RenameType
-import com.all.pdfreader.pro.app.room.entity.PdfDocumentEntity
-import com.all.pdfreader.pro.app.ui.act.MergePdfActivity
-import com.all.pdfreader.pro.app.ui.act.PdfPickerActivity
-import com.all.pdfreader.pro.app.ui.act.PdfToImageActivity
-import com.all.pdfreader.pro.app.ui.act.PdfViewActivity
-import com.all.pdfreader.pro.app.ui.act.SplitPdfActivity
-import com.all.pdfreader.pro.app.ui.fragment.FavoriteFrag
-import com.all.pdfreader.pro.app.ui.fragment.HomeFrag
-import com.all.pdfreader.pro.app.ui.fragment.RecentlyFrag
-import com.all.pdfreader.pro.app.util.AppUtils.dpToPx
-import com.all.pdfreader.pro.app.util.AppUtils.printPdfFile
-import com.all.pdfreader.pro.app.util.AppUtils.setClickWithAnimation
-import com.all.pdfreader.pro.app.util.AppUtils.shareFile
-import com.all.pdfreader.pro.app.util.FileUtils.toFormatFileSize
-import com.all.pdfreader.pro.app.util.FileUtils.toSlashDate
-import com.all.pdfreader.pro.app.util.ToastUtils
-import com.all.pdfreader.pro.app.viewmodel.PdfViewModel
+import com.all.pdfreader.pdf.reader.R
+import com.all.pdfreader.pdf.reader.databinding.DialogListMoreBinding
+import com.all.pdfreader.pdf.reader.model.PdfPickerSource
+import com.all.pdfreader.pdf.reader.model.PrintResult
+import com.all.pdfreader.pdf.reader.model.RenameType
+import com.all.pdfreader.pdf.reader.room.entity.PdfDocumentEntity
+import com.all.pdfreader.pdf.reader.ui.act.MergePdfActivity
+import com.all.pdfreader.pdf.reader.ui.act.PdfPickerActivity
+import com.all.pdfreader.pdf.reader.ui.act.PdfToImageActivity
+import com.all.pdfreader.pdf.reader.ui.act.PdfViewActivity
+import com.all.pdfreader.pdf.reader.ui.act.SplitPdfActivity
+import com.all.pdfreader.pdf.reader.ui.fragment.FavoriteFrag
+import com.all.pdfreader.pdf.reader.ui.fragment.HomeFrag
+import com.all.pdfreader.pdf.reader.ui.fragment.RecentlyFrag
+import com.all.pdfreader.pdf.reader.util.AppUtils.dpToPx
+import com.all.pdfreader.pdf.reader.util.AppUtils.printPdfFile
+import com.all.pdfreader.pdf.reader.util.AppUtils.setClickWithAnimation
+import com.all.pdfreader.pdf.reader.util.AppUtils.shareFile
+import com.all.pdfreader.pdf.reader.util.FileUtils.toFormatFileSize
+import com.all.pdfreader.pdf.reader.util.FileUtils.toSlashDate
+import com.all.pdfreader.pdf.reader.util.ToastUtils
+import com.all.pdfreader.pdf.reader.viewmodel.PdfViewModel
 import com.bumptech.glide.Glide
 import com.bumptech.glide.load.resource.bitmap.CenterCrop
 import com.bumptech.glide.load.resource.bitmap.RoundedCorners
diff --git a/app/src/main/java/com/all/pdfreader/pro/app/ui/dialog/PdfPasswordProtectionDialogFragment.kt b/app/src/main/java/com/all/pdfreader/pdf/reader/ui/dialog/PdfPasswordProtectionDialogFragment.kt
similarity index 91%
rename from app/src/main/java/com/all/pdfreader/pro/app/ui/dialog/PdfPasswordProtectionDialogFragment.kt
rename to app/src/main/java/com/all/pdfreader/pdf/reader/ui/dialog/PdfPasswordProtectionDialogFragment.kt
index 78e7f45..e26228f 100644
--- a/app/src/main/java/com/all/pdfreader/pro/app/ui/dialog/PdfPasswordProtectionDialogFragment.kt
+++ b/app/src/main/java/com/all/pdfreader/pdf/reader/ui/dialog/PdfPasswordProtectionDialogFragment.kt
@@ -1,4 +1,4 @@
-package com.all.pdfreader.pro.app.ui.dialog
+package com.all.pdfreader.pdf.reader.ui.dialog
 
 import android.graphics.Color
 import android.os.Bundle
@@ -15,10 +15,10 @@ import androidx.annotation.StringRes
 import androidx.core.content.ContextCompat
 import androidx.core.graphics.drawable.toDrawable
 import androidx.fragment.app.DialogFragment
-import com.all.pdfreader.pro.app.R
-import com.all.pdfreader.pro.app.databinding.DialogPdfPasswordProtectionBinding
-import com.all.pdfreader.pro.app.util.AppUtils.showKeyboard
-import com.all.pdfreader.pro.app.util.FileUtils.isPdfPasswordCorrect
+import com.all.pdfreader.pdf.reader.R
+import com.all.pdfreader.pdf.reader.databinding.DialogPdfPasswordProtectionBinding
+import com.all.pdfreader.pdf.reader.util.AppUtils.showKeyboard
+import com.all.pdfreader.pdf.reader.util.FileUtils.isPdfPasswordCorrect
 import java.io.File
 
 class PdfPasswordProtectionDialogFragment(
diff --git a/app/src/main/java/com/all/pdfreader/pro/app/ui/dialog/PdfRemovePasswordDialog.kt b/app/src/main/java/com/all/pdfreader/pdf/reader/ui/dialog/PdfRemovePasswordDialog.kt
similarity index 85%
rename from app/src/main/java/com/all/pdfreader/pro/app/ui/dialog/PdfRemovePasswordDialog.kt
rename to app/src/main/java/com/all/pdfreader/pdf/reader/ui/dialog/PdfRemovePasswordDialog.kt
index 0bcffc2..f17caed 100644
--- a/app/src/main/java/com/all/pdfreader/pro/app/ui/dialog/PdfRemovePasswordDialog.kt
+++ b/app/src/main/java/com/all/pdfreader/pdf/reader/ui/dialog/PdfRemovePasswordDialog.kt
@@ -1,4 +1,4 @@
-package com.all.pdfreader.pro.app.ui.dialog
+package com.all.pdfreader.pdf.reader.ui.dialog
 
 import android.graphics.Color
 import android.os.Bundle
@@ -7,11 +7,11 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.core.graphics.drawable.toDrawable
 import androidx.fragment.app.DialogFragment
-import com.all.pdfreader.pro.app.R
-import com.all.pdfreader.pro.app.databinding.DialogPdfRemovePasswordBinding
-import com.all.pdfreader.pro.app.util.AppUtils.showKeyboard
-import com.all.pdfreader.pro.app.util.FileUtils.isPdfPasswordCorrect
-import com.all.pdfreader.pro.app.util.ToastUtils
+import com.all.pdfreader.pdf.reader.R
+import com.all.pdfreader.pdf.reader.databinding.DialogPdfRemovePasswordBinding
+import com.all.pdfreader.pdf.reader.util.AppUtils.showKeyboard
+import com.all.pdfreader.pdf.reader.util.FileUtils.isPdfPasswordCorrect
+import com.all.pdfreader.pdf.reader.util.ToastUtils
 import java.io.File
 
 class PdfRemovePasswordDialog(
diff --git a/app/src/main/java/com/all/pdfreader/pro/app/ui/dialog/PdfSetPasswordDialog.kt b/app/src/main/java/com/all/pdfreader/pdf/reader/ui/dialog/PdfSetPasswordDialog.kt
similarity index 93%
rename from app/src/main/java/com/all/pdfreader/pro/app/ui/dialog/PdfSetPasswordDialog.kt
rename to app/src/main/java/com/all/pdfreader/pdf/reader/ui/dialog/PdfSetPasswordDialog.kt
index f840ad7..49859a8 100644
--- a/app/src/main/java/com/all/pdfreader/pro/app/ui/dialog/PdfSetPasswordDialog.kt
+++ b/app/src/main/java/com/all/pdfreader/pdf/reader/ui/dialog/PdfSetPasswordDialog.kt
@@ -1,4 +1,4 @@
-package com.all.pdfreader.pro.app.ui.dialog
+package com.all.pdfreader.pdf.reader.ui.dialog
 
 import android.graphics.Color
 import android.os.Bundle
@@ -9,10 +9,10 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.core.graphics.drawable.toDrawable
 import androidx.fragment.app.DialogFragment
-import com.all.pdfreader.pro.app.R
-import com.all.pdfreader.pro.app.databinding.DialogPdfSetPasswordBinding
-import com.all.pdfreader.pro.app.util.AppUtils.showKeyboard
-import com.all.pdfreader.pro.app.util.ToastUtils
+import com.all.pdfreader.pdf.reader.R
+import com.all.pdfreader.pdf.reader.databinding.DialogPdfSetPasswordBinding
+import com.all.pdfreader.pdf.reader.util.AppUtils.showKeyboard
+import com.all.pdfreader.pdf.reader.util.ToastUtils
 
 class PdfSetPasswordDialog(
     private val onOkClick: (password: String) -> Unit = {}
diff --git a/app/src/main/java/com/all/pdfreader/pro/app/ui/dialog/PermissionDialogFragment.kt b/app/src/main/java/com/all/pdfreader/pdf/reader/ui/dialog/PermissionDialogFragment.kt
similarity index 94%
rename from app/src/main/java/com/all/pdfreader/pro/app/ui/dialog/PermissionDialogFragment.kt
rename to app/src/main/java/com/all/pdfreader/pdf/reader/ui/dialog/PermissionDialogFragment.kt
index 5031a85..4223c93 100644
--- a/app/src/main/java/com/all/pdfreader/pro/app/ui/dialog/PermissionDialogFragment.kt
+++ b/app/src/main/java/com/all/pdfreader/pdf/reader/ui/dialog/PermissionDialogFragment.kt
@@ -1,4 +1,4 @@
-package com.all.pdfreader.pro.app.ui.dialog
+package com.all.pdfreader.pdf.reader.ui.dialog
 
 import android.app.Activity
 import android.app.Dialog
@@ -16,10 +16,10 @@ import androidx.appcompat.app.AlertDialog
 import androidx.core.graphics.drawable.toDrawable
 import androidx.core.net.toUri
 import androidx.fragment.app.DialogFragment
-import com.all.pdfreader.pro.app.R
-import com.all.pdfreader.pro.app.databinding.DialogPermissionBinding
-import com.all.pdfreader.pro.app.sp.AppStore
-import com.all.pdfreader.pro.app.util.StoragePermissionHelper
+import com.all.pdfreader.pdf.reader.R
+import com.all.pdfreader.pdf.reader.databinding.DialogPermissionBinding
+import com.all.pdfreader.pdf.reader.sp.AppStore
+import com.all.pdfreader.pdf.reader.util.StoragePermissionHelper
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment
 
 class PermissionDialogFragment : BottomSheetDialogFragment() {
diff --git a/app/src/main/java/com/all/pdfreader/pro/app/ui/dialog/ProgressDialogFragment.kt b/app/src/main/java/com/all/pdfreader/pdf/reader/ui/dialog/ProgressDialogFragment.kt
similarity index 88%
rename from app/src/main/java/com/all/pdfreader/pro/app/ui/dialog/ProgressDialogFragment.kt
rename to app/src/main/java/com/all/pdfreader/pdf/reader/ui/dialog/ProgressDialogFragment.kt
index bfd4644..9924941 100644
--- a/app/src/main/java/com/all/pdfreader/pro/app/ui/dialog/ProgressDialogFragment.kt
+++ b/app/src/main/java/com/all/pdfreader/pdf/reader/ui/dialog/ProgressDialogFragment.kt
@@ -1,4 +1,4 @@
-package com.all.pdfreader.pro.app.ui.dialog
+package com.all.pdfreader.pdf.reader.ui.dialog
 
 import android.graphics.Color
 import android.os.Bundle
@@ -7,8 +7,8 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.core.graphics.drawable.toDrawable
 import androidx.fragment.app.DialogFragment
-import com.all.pdfreader.pro.app.R
-import com.all.pdfreader.pro.app.databinding.DialogProgressBinding
+import com.all.pdfreader.pdf.reader.R
+import com.all.pdfreader.pdf.reader.databinding.DialogProgressBinding
 
 class ProgressDialogFragment : DialogFragment() {
 
diff --git a/app/src/main/java/com/all/pdfreader/pro/app/ui/dialog/PromptDialogFragment.kt b/app/src/main/java/com/all/pdfreader/pdf/reader/ui/dialog/PromptDialogFragment.kt
similarity index 90%
rename from app/src/main/java/com/all/pdfreader/pro/app/ui/dialog/PromptDialogFragment.kt
rename to app/src/main/java/com/all/pdfreader/pdf/reader/ui/dialog/PromptDialogFragment.kt
index 6319a3b..ad37f43 100644
--- a/app/src/main/java/com/all/pdfreader/pro/app/ui/dialog/PromptDialogFragment.kt
+++ b/app/src/main/java/com/all/pdfreader/pdf/reader/ui/dialog/PromptDialogFragment.kt
@@ -1,4 +1,4 @@
-package com.all.pdfreader.pro.app.ui.dialog
+package com.all.pdfreader.pdf.reader.ui.dialog
 
 import android.graphics.Color
 import android.os.Bundle
@@ -8,9 +8,9 @@ import android.view.ViewGroup
 import android.widget.Toast
 import androidx.core.graphics.drawable.toDrawable
 import androidx.fragment.app.DialogFragment
-import com.all.pdfreader.pro.app.R
-import com.all.pdfreader.pro.app.databinding.DialogDeleteBinding
-import com.all.pdfreader.pro.app.util.ToastUtils
+import com.all.pdfreader.pdf.reader.R
+import com.all.pdfreader.pdf.reader.databinding.DialogDeleteBinding
+import com.all.pdfreader.pdf.reader.util.ToastUtils
 
 class PromptDialogFragment(
     private val title: String,
diff --git a/app/src/main/java/com/all/pdfreader/pro/app/ui/dialog/RenameDialogFragment.kt b/app/src/main/java/com/all/pdfreader/pdf/reader/ui/dialog/RenameDialogFragment.kt
similarity index 93%
rename from app/src/main/java/com/all/pdfreader/pro/app/ui/dialog/RenameDialogFragment.kt
rename to app/src/main/java/com/all/pdfreader/pdf/reader/ui/dialog/RenameDialogFragment.kt
index debf8c0..6c4be26 100644
--- a/app/src/main/java/com/all/pdfreader/pro/app/ui/dialog/RenameDialogFragment.kt
+++ b/app/src/main/java/com/all/pdfreader/pdf/reader/ui/dialog/RenameDialogFragment.kt
@@ -1,4 +1,4 @@
-package com.all.pdfreader.pro.app.ui.dialog
+package com.all.pdfreader.pdf.reader.ui.dialog
 
 import android.graphics.Color
 import android.os.Bundle
@@ -11,14 +11,14 @@ import android.widget.Toast
 import androidx.core.graphics.drawable.toDrawable
 import androidx.fragment.app.DialogFragment
 import androidx.fragment.app.activityViewModels
-import com.all.pdfreader.pro.app.R
-import com.all.pdfreader.pro.app.databinding.DialogRenameFileBinding
-import com.all.pdfreader.pro.app.model.RenameType
-import com.all.pdfreader.pro.app.room.entity.BookmarkEntity
-import com.all.pdfreader.pro.app.util.AppUtils.showKeyboard
-import com.all.pdfreader.pro.app.util.FileUtils
-import com.all.pdfreader.pro.app.util.ToastUtils
-import com.all.pdfreader.pro.app.viewmodel.PdfViewModel
+import com.all.pdfreader.pdf.reader.R
+import com.all.pdfreader.pdf.reader.databinding.DialogRenameFileBinding
+import com.all.pdfreader.pdf.reader.model.RenameType
+import com.all.pdfreader.pdf.reader.room.entity.BookmarkEntity
+import com.all.pdfreader.pdf.reader.util.AppUtils.showKeyboard
+import com.all.pdfreader.pdf.reader.util.FileUtils
+import com.all.pdfreader.pdf.reader.util.ToastUtils
+import com.all.pdfreader.pdf.reader.viewmodel.PdfViewModel
 import java.io.File
 
 class RenameDialogFragment(
diff --git a/app/src/main/java/com/all/pdfreader/pro/app/ui/dialog/SortDialogFragment.kt b/app/src/main/java/com/all/pdfreader/pdf/reader/ui/dialog/SortDialogFragment.kt
similarity index 93%
rename from app/src/main/java/com/all/pdfreader/pro/app/ui/dialog/SortDialogFragment.kt
rename to app/src/main/java/com/all/pdfreader/pdf/reader/ui/dialog/SortDialogFragment.kt
index 36c1c10..792e467 100644
--- a/app/src/main/java/com/all/pdfreader/pro/app/ui/dialog/SortDialogFragment.kt
+++ b/app/src/main/java/com/all/pdfreader/pdf/reader/ui/dialog/SortDialogFragment.kt
@@ -1,18 +1,18 @@
-package com.all.pdfreader.pro.app.ui.dialog
+package com.all.pdfreader.pdf.reader.ui.dialog
 
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.Fragment
-import com.all.pdfreader.pro.app.R
-import com.all.pdfreader.pro.app.databinding.DialogSortBinding
-import com.all.pdfreader.pro.app.model.SortConfig
-import com.all.pdfreader.pro.app.model.SortDirection
-import com.all.pdfreader.pro.app.model.SortField
-import com.all.pdfreader.pro.app.sp.AppStore
-import com.all.pdfreader.pro.app.ui.fragment.FavoriteFrag
-import com.all.pdfreader.pro.app.ui.fragment.HomeFrag
+import com.all.pdfreader.pdf.reader.R
+import com.all.pdfreader.pdf.reader.databinding.DialogSortBinding
+import com.all.pdfreader.pdf.reader.model.SortConfig
+import com.all.pdfreader.pdf.reader.model.SortDirection
+import com.all.pdfreader.pdf.reader.model.SortField
+import com.all.pdfreader.pdf.reader.sp.AppStore
+import com.all.pdfreader.pdf.reader.ui.fragment.FavoriteFrag
+import com.all.pdfreader.pdf.reader.ui.fragment.HomeFrag
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment
 
 class SortDialogFragment(
diff --git a/app/src/main/java/com/all/pdfreader/pro/app/ui/dialog/ViewModelDialogFragment.kt b/app/src/main/java/com/all/pdfreader/pdf/reader/ui/dialog/ViewModelDialogFragment.kt
similarity index 91%
rename from app/src/main/java/com/all/pdfreader/pro/app/ui/dialog/ViewModelDialogFragment.kt
rename to app/src/main/java/com/all/pdfreader/pdf/reader/ui/dialog/ViewModelDialogFragment.kt
index 3d71f79..69b0d7b 100644
--- a/app/src/main/java/com/all/pdfreader/pro/app/ui/dialog/ViewModelDialogFragment.kt
+++ b/app/src/main/java/com/all/pdfreader/pdf/reader/ui/dialog/ViewModelDialogFragment.kt
@@ -1,4 +1,4 @@
-package com.all.pdfreader.pro.app.ui.dialog
+package com.all.pdfreader.pdf.reader.ui.dialog
 
 import android.animation.ValueAnimator
 import android.graphics.PorterDuff
@@ -11,14 +11,14 @@ import android.widget.ImageView
 import android.widget.TextView
 import android.widget.Toast
 import androidx.fragment.app.activityViewModels
-import com.all.pdfreader.pro.app.R
-import com.all.pdfreader.pro.app.databinding.DialogViewModelBinding
-import com.all.pdfreader.pro.app.room.entity.PdfDocumentEntity
-import com.all.pdfreader.pro.app.sp.AppStore
-import com.all.pdfreader.pro.app.ui.view.CustomSwitchButton
-import com.all.pdfreader.pro.app.ui.view.CustomSwitchButton.OnCheckedChangeListener
-import com.all.pdfreader.pro.app.util.ToastUtils
-import com.all.pdfreader.pro.app.viewmodel.PdfViewModel
+import com.all.pdfreader.pdf.reader.R
+import com.all.pdfreader.pdf.reader.databinding.DialogViewModelBinding
+import com.all.pdfreader.pdf.reader.room.entity.PdfDocumentEntity
+import com.all.pdfreader.pdf.reader.sp.AppStore
+import com.all.pdfreader.pdf.reader.ui.view.CustomSwitchButton
+import com.all.pdfreader.pdf.reader.ui.view.CustomSwitchButton.OnCheckedChangeListener
+import com.all.pdfreader.pdf.reader.util.ToastUtils
+import com.all.pdfreader.pdf.reader.viewmodel.PdfViewModel
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment
 
 class ViewModelDialogFragment() : BottomSheetDialogFragment() {
diff --git a/app/src/main/java/com/all/pdfreader/pro/app/ui/fragment/BaseFrag.kt b/app/src/main/java/com/all/pdfreader/pdf/reader/ui/fragment/BaseFrag.kt
similarity index 86%
rename from app/src/main/java/com/all/pdfreader/pro/app/ui/fragment/BaseFrag.kt
rename to app/src/main/java/com/all/pdfreader/pdf/reader/ui/fragment/BaseFrag.kt
index 2cd2a42..1b33456 100644
--- a/app/src/main/java/com/all/pdfreader/pro/app/ui/fragment/BaseFrag.kt
+++ b/app/src/main/java/com/all/pdfreader/pdf/reader/ui/fragment/BaseFrag.kt
@@ -1,4 +1,4 @@
-package com.all.pdfreader.pro.app.ui.fragment
+package com.all.pdfreader.pdf.reader.ui.fragment
 
 import android.os.Bundle
 import android.util.Log
@@ -6,10 +6,10 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.Fragment
-import com.all.pdfreader.pro.app.databinding.FragmentFavoriteBinding
-import com.all.pdfreader.pro.app.room.repository.PdfRepository
-import com.all.pdfreader.pro.app.sp.AppStore
-import com.all.pdfreader.pro.app.util.ToastUtils
+import com.all.pdfreader.pdf.reader.databinding.FragmentFavoriteBinding
+import com.all.pdfreader.pdf.reader.room.repository.PdfRepository
+import com.all.pdfreader.pdf.reader.sp.AppStore
+import com.all.pdfreader.pdf.reader.util.ToastUtils
 
 abstract class BaseFrag : Fragment() {
     protected abstract val TAG: String
diff --git a/app/src/main/java/com/all/pdfreader/pro/app/ui/fragment/FavoriteFrag.kt b/app/src/main/java/com/all/pdfreader/pdf/reader/ui/fragment/FavoriteFrag.kt
similarity index 84%
rename from app/src/main/java/com/all/pdfreader/pro/app/ui/fragment/FavoriteFrag.kt
rename to app/src/main/java/com/all/pdfreader/pdf/reader/ui/fragment/FavoriteFrag.kt
index 2214607..1d571f4 100644
--- a/app/src/main/java/com/all/pdfreader/pro/app/ui/fragment/FavoriteFrag.kt
+++ b/app/src/main/java/com/all/pdfreader/pdf/reader/ui/fragment/FavoriteFrag.kt
@@ -1,4 +1,4 @@
-package com.all.pdfreader.pro.app.ui.fragment
+package com.all.pdfreader.pdf.reader.ui.fragment
 
 import android.content.Context
 import android.os.Bundle
@@ -9,19 +9,19 @@ import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.lifecycleScope
 import androidx.lifecycle.repeatOnLifecycle
 import androidx.recyclerview.widget.LinearLayoutManager
-import com.all.pdfreader.pro.app.R
-import com.all.pdfreader.pro.app.databinding.FragmentFavoriteBinding
-import com.all.pdfreader.pro.app.model.FragmentType
-import com.all.pdfreader.pro.app.model.SortConfig
-import com.all.pdfreader.pro.app.model.SortField
-import com.all.pdfreader.pro.app.room.entity.PdfDocumentEntity
-import com.all.pdfreader.pro.app.room.repository.PdfRepository
-import com.all.pdfreader.pro.app.ui.act.MainActivity
-import com.all.pdfreader.pro.app.ui.act.PdfViewActivity
-import com.all.pdfreader.pro.app.ui.adapter.PdfAdapter
-import com.all.pdfreader.pro.app.ui.dialog.ListMoreDialogFragment
-import com.all.pdfreader.pro.app.ui.dialog.SortDialogFragment
-import com.all.pdfreader.pro.app.util.AppUtils.setOnSingleClickListener
+import com.all.pdfreader.pdf.reader.R
+import com.all.pdfreader.pdf.reader.databinding.FragmentFavoriteBinding
+import com.all.pdfreader.pdf.reader.model.FragmentType
+import com.all.pdfreader.pdf.reader.model.SortConfig
+import com.all.pdfreader.pdf.reader.model.SortField
+import com.all.pdfreader.pdf.reader.room.entity.PdfDocumentEntity
+import com.all.pdfreader.pdf.reader.room.repository.PdfRepository
+import com.all.pdfreader.pdf.reader.ui.act.MainActivity
+import com.all.pdfreader.pdf.reader.ui.act.PdfViewActivity
+import com.all.pdfreader.pdf.reader.ui.adapter.PdfAdapter
+import com.all.pdfreader.pdf.reader.ui.dialog.ListMoreDialogFragment
+import com.all.pdfreader.pdf.reader.ui.dialog.SortDialogFragment
+import com.all.pdfreader.pdf.reader.util.AppUtils.setOnSingleClickListener
 import kotlinx.coroutines.launch
 
 class FavoriteFrag : BaseFrag(){
diff --git a/app/src/main/java/com/all/pdfreader/pro/app/ui/fragment/HomeFrag.kt b/app/src/main/java/com/all/pdfreader/pdf/reader/ui/fragment/HomeFrag.kt
similarity index 84%
rename from app/src/main/java/com/all/pdfreader/pro/app/ui/fragment/HomeFrag.kt
rename to app/src/main/java/com/all/pdfreader/pdf/reader/ui/fragment/HomeFrag.kt
index a34f1b4..1c73641 100644
--- a/app/src/main/java/com/all/pdfreader/pro/app/ui/fragment/HomeFrag.kt
+++ b/app/src/main/java/com/all/pdfreader/pdf/reader/ui/fragment/HomeFrag.kt
@@ -1,4 +1,4 @@
-package com.all.pdfreader.pro.app.ui.fragment
+package com.all.pdfreader.pdf.reader.ui.fragment
 
 import android.content.Context
 import android.os.Bundle
@@ -7,20 +7,20 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.LinearLayoutManager
-import com.all.pdfreader.pro.app.R
-import com.all.pdfreader.pro.app.databinding.FragmentHomeBinding
-import com.all.pdfreader.pro.app.model.FragmentType
-import com.all.pdfreader.pro.app.model.SortConfig
-import com.all.pdfreader.pro.app.model.SortField
-import com.all.pdfreader.pro.app.room.entity.PdfDocumentEntity
-import com.all.pdfreader.pro.app.room.repository.PdfRepository
-import com.all.pdfreader.pro.app.ui.act.MainActivity
-import com.all.pdfreader.pro.app.ui.act.PdfViewActivity
-import com.all.pdfreader.pro.app.ui.adapter.PdfAdapter
-import com.all.pdfreader.pro.app.ui.dialog.ListMoreDialogFragment
-import com.all.pdfreader.pro.app.ui.dialog.SortDialogFragment
-import com.all.pdfreader.pro.app.util.AppUtils.setOnSingleClickListener
-import com.all.pdfreader.pro.app.util.PdfScanner
+import com.all.pdfreader.pdf.reader.R
+import com.all.pdfreader.pdf.reader.databinding.FragmentHomeBinding
+import com.all.pdfreader.pdf.reader.model.FragmentType
+import com.all.pdfreader.pdf.reader.model.SortConfig
+import com.all.pdfreader.pdf.reader.model.SortField
+import com.all.pdfreader.pdf.reader.room.entity.PdfDocumentEntity
+import com.all.pdfreader.pdf.reader.room.repository.PdfRepository
+import com.all.pdfreader.pdf.reader.ui.act.MainActivity
+import com.all.pdfreader.pdf.reader.ui.act.PdfViewActivity
+import com.all.pdfreader.pdf.reader.ui.adapter.PdfAdapter
+import com.all.pdfreader.pdf.reader.ui.dialog.ListMoreDialogFragment
+import com.all.pdfreader.pdf.reader.ui.dialog.SortDialogFragment
+import com.all.pdfreader.pdf.reader.util.AppUtils.setOnSingleClickListener
+import com.all.pdfreader.pdf.reader.util.PdfScanner
 import kotlinx.coroutines.launch
 
 class HomeFrag : BaseFrag(){
diff --git a/app/src/main/java/com/all/pdfreader/pro/app/ui/fragment/RecentlyFrag.kt b/app/src/main/java/com/all/pdfreader/pdf/reader/ui/fragment/RecentlyFrag.kt
similarity index 85%
rename from app/src/main/java/com/all/pdfreader/pro/app/ui/fragment/RecentlyFrag.kt
rename to app/src/main/java/com/all/pdfreader/pdf/reader/ui/fragment/RecentlyFrag.kt
index 1370824..14dc5bd 100644
--- a/app/src/main/java/com/all/pdfreader/pro/app/ui/fragment/RecentlyFrag.kt
+++ b/app/src/main/java/com/all/pdfreader/pdf/reader/ui/fragment/RecentlyFrag.kt
@@ -1,4 +1,4 @@
-package com.all.pdfreader.pro.app.ui.fragment
+package com.all.pdfreader.pdf.reader.ui.fragment
 
 import android.content.Context
 import android.os.Bundle
@@ -9,14 +9,14 @@ import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.lifecycleScope
 import androidx.lifecycle.repeatOnLifecycle
 import androidx.recyclerview.widget.LinearLayoutManager
-import com.all.pdfreader.pro.app.databinding.FragmentRecentlyBinding
-import com.all.pdfreader.pro.app.model.FragmentType
-import com.all.pdfreader.pro.app.room.entity.PdfDocumentEntity
-import com.all.pdfreader.pro.app.room.repository.PdfRepository
-import com.all.pdfreader.pro.app.ui.act.MainActivity
-import com.all.pdfreader.pro.app.ui.act.PdfViewActivity
-import com.all.pdfreader.pro.app.ui.adapter.PdfAdapter
-import com.all.pdfreader.pro.app.ui.dialog.ListMoreDialogFragment
+import com.all.pdfreader.pdf.reader.databinding.FragmentRecentlyBinding
+import com.all.pdfreader.pdf.reader.model.FragmentType
+import com.all.pdfreader.pdf.reader.room.entity.PdfDocumentEntity
+import com.all.pdfreader.pdf.reader.room.repository.PdfRepository
+import com.all.pdfreader.pdf.reader.ui.act.MainActivity
+import com.all.pdfreader.pdf.reader.ui.act.PdfViewActivity
+import com.all.pdfreader.pdf.reader.ui.adapter.PdfAdapter
+import com.all.pdfreader.pdf.reader.ui.dialog.ListMoreDialogFragment
 import kotlinx.coroutines.launch
 
 class RecentlyFrag : BaseFrag() {
diff --git a/app/src/main/java/com/all/pdfreader/pro/app/ui/fragment/ToolsFrag.kt b/app/src/main/java/com/all/pdfreader/pdf/reader/ui/fragment/ToolsFrag.kt
similarity index 86%
rename from app/src/main/java/com/all/pdfreader/pro/app/ui/fragment/ToolsFrag.kt
rename to app/src/main/java/com/all/pdfreader/pdf/reader/ui/fragment/ToolsFrag.kt
index 5192efc..ff1bc00 100644
--- a/app/src/main/java/com/all/pdfreader/pro/app/ui/fragment/ToolsFrag.kt
+++ b/app/src/main/java/com/all/pdfreader/pdf/reader/ui/fragment/ToolsFrag.kt
@@ -1,4 +1,4 @@
-package com.all.pdfreader.pro.app.ui.fragment
+package com.all.pdfreader.pdf.reader.ui.fragment
 
 import android.content.Context
 import android.content.Intent
@@ -9,14 +9,14 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.core.net.toUri
 import androidx.fragment.app.Fragment
-import com.all.pdfreader.pro.app.PRApp
-import com.all.pdfreader.pro.app.R
-import com.all.pdfreader.pro.app.databinding.FragmentToolsBinding
-import com.all.pdfreader.pro.app.model.PdfPickerSource
-import com.all.pdfreader.pro.app.ui.act.PdfPickerActivity
-import com.all.pdfreader.pro.app.ui.act.PdfResultActivity
-import com.all.pdfreader.pro.app.ui.act.PictureSelectorActivity
-import com.all.pdfreader.pro.app.util.GlideEngine
+import com.all.pdfreader.pdf.reader.PRApp
+import com.all.pdfreader.pdf.reader.R
+import com.all.pdfreader.pdf.reader.databinding.FragmentToolsBinding
+import com.all.pdfreader.pdf.reader.model.PdfPickerSource
+import com.all.pdfreader.pdf.reader.ui.act.PdfPickerActivity
+import com.all.pdfreader.pdf.reader.ui.act.PdfResultActivity
+import com.all.pdfreader.pdf.reader.ui.act.PictureSelectorActivity
+import com.all.pdfreader.pdf.reader.util.GlideEngine
 import com.luck.picture.lib.basic.PictureSelector
 import com.luck.picture.lib.config.PictureMimeType
 import com.luck.picture.lib.config.SelectMimeType
diff --git a/app/src/main/java/com/all/pdfreader/pro/app/ui/view/CustomScrollHandle.java b/app/src/main/java/com/all/pdfreader/pdf/reader/ui/view/CustomScrollHandle.java
similarity index 99%
rename from app/src/main/java/com/all/pdfreader/pro/app/ui/view/CustomScrollHandle.java
rename to app/src/main/java/com/all/pdfreader/pdf/reader/ui/view/CustomScrollHandle.java
index 0263c95..f86456d 100644
--- a/app/src/main/java/com/all/pdfreader/pro/app/ui/view/CustomScrollHandle.java
+++ b/app/src/main/java/com/all/pdfreader/pdf/reader/ui/view/CustomScrollHandle.java
@@ -1,4 +1,4 @@
-package com.all.pdfreader.pro.app.ui.view;
+package com.all.pdfreader.pdf.reader.ui.view;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
@@ -12,7 +12,7 @@ import android.view.ViewGroup;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
-import com.all.pdfreader.pro.app.R;
+import com.all.pdfreader.pdf.reader.R;
 import com.github.barteksc.pdfviewer.PDFView;
 import com.github.barteksc.pdfviewer.scroll.ScrollHandle;
 import com.github.barteksc.pdfviewer.util.Util;
diff --git a/app/src/main/java/com/all/pdfreader/pro/app/ui/view/CustomSwitchButton.kt b/app/src/main/java/com/all/pdfreader/pdf/reader/ui/view/CustomSwitchButton.kt
similarity index 99%
rename from app/src/main/java/com/all/pdfreader/pro/app/ui/view/CustomSwitchButton.kt
rename to app/src/main/java/com/all/pdfreader/pdf/reader/ui/view/CustomSwitchButton.kt
index e740bf1..43bdb6e 100644
--- a/app/src/main/java/com/all/pdfreader/pro/app/ui/view/CustomSwitchButton.kt
+++ b/app/src/main/java/com/all/pdfreader/pdf/reader/ui/view/CustomSwitchButton.kt
@@ -1,4 +1,4 @@
-package com.all.pdfreader.pro.app.ui.view
+package com.all.pdfreader.pdf.reader.ui.view
 
 import android.animation.Animator
 import android.animation.Animator.AnimatorListener
@@ -18,7 +18,7 @@ import android.util.TypedValue
 import android.view.MotionEvent
 import android.view.View
 import android.widget.Checkable
-import com.all.pdfreader.pro.app.R
+import com.all.pdfreader.pdf.reader.R
 import kotlin.math.max
 import kotlin.math.min
 
diff --git a/app/src/main/java/com/all/pdfreader/pro/app/util/AppUtils.kt b/app/src/main/java/com/all/pdfreader/pdf/reader/util/AppUtils.kt
similarity index 98%
rename from app/src/main/java/com/all/pdfreader/pro/app/util/AppUtils.kt
rename to app/src/main/java/com/all/pdfreader/pdf/reader/util/AppUtils.kt
index bab2b2b..ebe4ef9 100644
--- a/app/src/main/java/com/all/pdfreader/pro/app/util/AppUtils.kt
+++ b/app/src/main/java/com/all/pdfreader/pdf/reader/util/AppUtils.kt
@@ -1,4 +1,4 @@
-package com.all.pdfreader.pro.app.util
+package com.all.pdfreader.pdf.reader.util
 
 import android.app.Activity
 import android.content.ActivityNotFoundException
@@ -23,9 +23,9 @@ import android.widget.Toast
 import androidx.core.content.FileProvider
 import androidx.core.graphics.createBitmap
 import androidx.print.PrintHelper
-import com.all.pdfreader.pro.app.R
-import com.all.pdfreader.pro.app.model.PrintResult
-import com.all.pdfreader.pro.app.ui.adapter.PrintPdfAdapter
+import com.all.pdfreader.pdf.reader.R
+import com.all.pdfreader.pdf.reader.model.PrintResult
+import com.all.pdfreader.pdf.reader.ui.adapter.PrintPdfAdapter
 import com.shockwave.pdfium.PdfDocument
 import com.shockwave.pdfium.PdfPasswordException
 import com.shockwave.pdfium.PdfiumCore
diff --git a/app/src/main/java/com/all/pdfreader/pro/app/util/FileChangeObserver.kt b/app/src/main/java/com/all/pdfreader/pdf/reader/util/FileChangeObserver.kt
similarity index 95%
rename from app/src/main/java/com/all/pdfreader/pro/app/util/FileChangeObserver.kt
rename to app/src/main/java/com/all/pdfreader/pdf/reader/util/FileChangeObserver.kt
index 327dbe5..328154b 100644
--- a/app/src/main/java/com/all/pdfreader/pro/app/util/FileChangeObserver.kt
+++ b/app/src/main/java/com/all/pdfreader/pdf/reader/util/FileChangeObserver.kt
@@ -1,4 +1,4 @@
-package com.all.pdfreader.pro.app.util
+package com.all.pdfreader.pdf.reader.util
 
 import android.content.Context
 import android.database.ContentObserver
@@ -8,8 +8,8 @@ import android.os.Looper
 import android.provider.MediaStore
 import android.util.Log
 import androidx.lifecycle.LifecycleObserver
-import com.all.pdfreader.pro.app.room.repository.PdfRepository
-import com.all.pdfreader.pro.app.util.FileUtils.getFileFromUri
+import com.all.pdfreader.pdf.reader.room.repository.PdfRepository
+import com.all.pdfreader.pdf.reader.util.FileUtils.getFileFromUri
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.SupervisorJob
diff --git a/app/src/main/java/com/all/pdfreader/pro/app/util/FileDeleteUtil.kt b/app/src/main/java/com/all/pdfreader/pdf/reader/util/FileDeleteUtil.kt
similarity index 97%
rename from app/src/main/java/com/all/pdfreader/pro/app/util/FileDeleteUtil.kt
rename to app/src/main/java/com/all/pdfreader/pdf/reader/util/FileDeleteUtil.kt
index f5477a8..d211366 100644
--- a/app/src/main/java/com/all/pdfreader/pro/app/util/FileDeleteUtil.kt
+++ b/app/src/main/java/com/all/pdfreader/pdf/reader/util/FileDeleteUtil.kt
@@ -1,13 +1,13 @@
-package com.all.pdfreader.pro.app.util
+package com.all.pdfreader.pdf.reader.util
 
 import android.content.Context
 import android.net.Uri
 import android.provider.MediaStore
 import android.util.Log
-import com.all.pdfreader.pro.app.PRApp
-import com.all.pdfreader.pro.app.R
-import com.all.pdfreader.pro.app.model.DeleteResult
-import com.all.pdfreader.pro.app.util.FileUtils.formatFileSize
+import com.all.pdfreader.pdf.reader.PRApp
+import com.all.pdfreader.pdf.reader.R
+import com.all.pdfreader.pdf.reader.model.DeleteResult
+import com.all.pdfreader.pdf.reader.util.FileUtils.formatFileSize
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import java.io.File
diff --git a/app/src/main/java/com/all/pdfreader/pro/app/util/FileUtils.kt b/app/src/main/java/com/all/pdfreader/pdf/reader/util/FileUtils.kt
similarity index 99%
rename from app/src/main/java/com/all/pdfreader/pro/app/util/FileUtils.kt
rename to app/src/main/java/com/all/pdfreader/pdf/reader/util/FileUtils.kt
index 05fdbdd..a2a9438 100644
--- a/app/src/main/java/com/all/pdfreader/pro/app/util/FileUtils.kt
+++ b/app/src/main/java/com/all/pdfreader/pdf/reader/util/FileUtils.kt
@@ -1,4 +1,4 @@
-package com.all.pdfreader.pro.app.util
+package com.all.pdfreader.pdf.reader.util
 
 import android.annotation.SuppressLint
 import android.content.Context
@@ -9,8 +9,8 @@ import android.os.ParcelFileDescriptor
 import android.provider.MediaStore
 import android.provider.OpenableColumns
 import android.util.Log
-import com.all.pdfreader.pro.app.PRApp
-import com.all.pdfreader.pro.app.R
+import com.all.pdfreader.pdf.reader.PRApp
+import com.all.pdfreader.pdf.reader.R
 import com.shockwave.pdfium.PdfiumCore
 import java.io.File
 import java.io.IOException
@@ -21,7 +21,7 @@ import java.security.MessageDigest
 import java.text.SimpleDateFormat
 import java.util.Date
 import java.util.Locale
-import com.all.pdfreader.pro.app.model.RenameResult
+import com.all.pdfreader.pdf.reader.model.RenameResult
 import androidx.core.net.toUri
 
 object FileUtils {
diff --git a/app/src/main/java/com/all/pdfreader/pro/app/util/GlideEngine.kt b/app/src/main/java/com/all/pdfreader/pdf/reader/util/GlideEngine.kt
similarity index 96%
rename from app/src/main/java/com/all/pdfreader/pro/app/util/GlideEngine.kt
rename to app/src/main/java/com/all/pdfreader/pdf/reader/util/GlideEngine.kt
index 5ecc988..6234a4b 100644
--- a/app/src/main/java/com/all/pdfreader/pro/app/util/GlideEngine.kt
+++ b/app/src/main/java/com/all/pdfreader/pdf/reader/util/GlideEngine.kt
@@ -1,8 +1,8 @@
-package com.all.pdfreader.pro.app.util
+package com.all.pdfreader.pdf.reader.util
 
 import android.content.Context
 import android.widget.ImageView
-import com.all.pdfreader.pro.app.R
+import com.all.pdfreader.pdf.reader.R
 import com.bumptech.glide.Glide
 import com.bumptech.glide.load.resource.bitmap.CenterCrop
 import com.bumptech.glide.load.resource.bitmap.RoundedCorners
diff --git a/app/src/main/java/com/all/pdfreader/pro/app/util/LogUtil.kt b/app/src/main/java/com/all/pdfreader/pdf/reader/util/LogUtil.kt
similarity index 90%
rename from app/src/main/java/com/all/pdfreader/pro/app/util/LogUtil.kt
rename to app/src/main/java/com/all/pdfreader/pdf/reader/util/LogUtil.kt
index e2a86d8..332397a 100644
--- a/app/src/main/java/com/all/pdfreader/pro/app/util/LogUtil.kt
+++ b/app/src/main/java/com/all/pdfreader/pdf/reader/util/LogUtil.kt
@@ -1,4 +1,4 @@
-package com.all.pdfreader.pro.app.util
+package com.all.pdfreader.pdf.reader.util
 
 import android.util.Log
 
diff --git a/app/src/main/java/com/all/pdfreader/pro/app/util/PDFHighlighter.kt b/app/src/main/java/com/all/pdfreader/pdf/reader/util/PDFHighlighter.kt
similarity index 98%
rename from app/src/main/java/com/all/pdfreader/pro/app/util/PDFHighlighter.kt
rename to app/src/main/java/com/all/pdfreader/pdf/reader/util/PDFHighlighter.kt
index ca9e9f2..22b3b01 100644
--- a/app/src/main/java/com/all/pdfreader/pro/app/util/PDFHighlighter.kt
+++ b/app/src/main/java/com/all/pdfreader/pdf/reader/util/PDFHighlighter.kt
@@ -1,9 +1,9 @@
-package com.all.pdfreader.pro.app.util
+package com.all.pdfreader.pdf.reader.util
 
 import android.graphics.Canvas
 import android.graphics.Paint
 import android.graphics.RectF
-import com.all.pdfreader.pro.app.R
+import com.all.pdfreader.pdf.reader.R
 import com.github.barteksc.pdfviewer.PDFView
 import com.github.barteksc.pdfviewer.listener.OnDrawListener
 
diff --git a/app/src/main/java/com/all/pdfreader/pro/app/util/PDFSearchManager.kt b/app/src/main/java/com/all/pdfreader/pdf/reader/util/PDFSearchManager.kt
similarity index 99%
rename from app/src/main/java/com/all/pdfreader/pro/app/util/PDFSearchManager.kt
rename to app/src/main/java/com/all/pdfreader/pdf/reader/util/PDFSearchManager.kt
index 0e39b20..3c2c3fd 100644
--- a/app/src/main/java/com/all/pdfreader/pro/app/util/PDFSearchManager.kt
+++ b/app/src/main/java/com/all/pdfreader/pdf/reader/util/PDFSearchManager.kt
@@ -1,4 +1,4 @@
-package com.all.pdfreader.pro.app.util
+package com.all.pdfreader.pdf.reader.util
 
 import android.util.Log
 import com.github.barteksc.pdfviewer.PDFView
diff --git a/app/src/main/java/com/all/pdfreader/pro/app/util/PdfDiffCallback.kt b/app/src/main/java/com/all/pdfreader/pdf/reader/util/PdfDiffCallback.kt
similarity index 82%
rename from app/src/main/java/com/all/pdfreader/pro/app/util/PdfDiffCallback.kt
rename to app/src/main/java/com/all/pdfreader/pdf/reader/util/PdfDiffCallback.kt
index d289d96..5cc75cc 100644
--- a/app/src/main/java/com/all/pdfreader/pro/app/util/PdfDiffCallback.kt
+++ b/app/src/main/java/com/all/pdfreader/pdf/reader/util/PdfDiffCallback.kt
@@ -1,7 +1,7 @@
-package com.all.pdfreader.pro.app.util
+package com.all.pdfreader.pdf.reader.util
 
 import androidx.recyclerview.widget.DiffUtil
-import com.all.pdfreader.pro.app.room.entity.PdfDocumentEntity
+import com.all.pdfreader.pdf.reader.room.entity.PdfDocumentEntity
 
 /**
  * 用于PdfDocumentEntity数据类的PdfDiff
diff --git a/app/src/main/java/com/all/pdfreader/pro/app/util/PdfMetadataExtractor.kt b/app/src/main/java/com/all/pdfreader/pdf/reader/util/PdfMetadataExtractor.kt
similarity index 99%
rename from app/src/main/java/com/all/pdfreader/pro/app/util/PdfMetadataExtractor.kt
rename to app/src/main/java/com/all/pdfreader/pdf/reader/util/PdfMetadataExtractor.kt
index 9a499f7..b216f87 100644
--- a/app/src/main/java/com/all/pdfreader/pro/app/util/PdfMetadataExtractor.kt
+++ b/app/src/main/java/com/all/pdfreader/pdf/reader/util/PdfMetadataExtractor.kt
@@ -1,4 +1,4 @@
-package com.all.pdfreader.pro.app.util
+package com.all.pdfreader.pdf.reader.util
 
 import android.content.Context
 import android.net.Uri
diff --git a/app/src/main/java/com/all/pdfreader/pro/app/util/PdfScanner.kt b/app/src/main/java/com/all/pdfreader/pdf/reader/util/PdfScanner.kt
similarity index 97%
rename from app/src/main/java/com/all/pdfreader/pro/app/util/PdfScanner.kt
rename to app/src/main/java/com/all/pdfreader/pdf/reader/util/PdfScanner.kt
index cc535ff..2e76f94 100644
--- a/app/src/main/java/com/all/pdfreader/pro/app/util/PdfScanner.kt
+++ b/app/src/main/java/com/all/pdfreader/pdf/reader/util/PdfScanner.kt
@@ -1,12 +1,12 @@
-package com.all.pdfreader.pro.app.util
+package com.all.pdfreader.pdf.reader.util
 
 import android.content.Context
 import android.util.Log
-import com.all.pdfreader.pro.app.PRApp
-import com.all.pdfreader.pro.app.room.entity.PdfDocumentEntity
-import com.all.pdfreader.pro.app.room.repository.PdfRepository
-import com.all.pdfreader.pro.app.util.AppUtils.generateFastThumbnail
-import com.all.pdfreader.pro.app.util.FileUtils.isPdfEncrypted
+import com.all.pdfreader.pdf.reader.PRApp
+import com.all.pdfreader.pdf.reader.room.entity.PdfDocumentEntity
+import com.all.pdfreader.pdf.reader.room.repository.PdfRepository
+import com.all.pdfreader.pdf.reader.util.AppUtils.generateFastThumbnail
+import com.all.pdfreader.pdf.reader.util.FileUtils.isPdfEncrypted
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.sync.Mutex
diff --git a/app/src/main/java/com/all/pdfreader/pro/app/util/PdfSecurityUtils.kt b/app/src/main/java/com/all/pdfreader/pdf/reader/util/PdfSecurityUtils.kt
similarity index 95%
rename from app/src/main/java/com/all/pdfreader/pro/app/util/PdfSecurityUtils.kt
rename to app/src/main/java/com/all/pdfreader/pdf/reader/util/PdfSecurityUtils.kt
index c6d23ad..946d203 100644
--- a/app/src/main/java/com/all/pdfreader/pro/app/util/PdfSecurityUtils.kt
+++ b/app/src/main/java/com/all/pdfreader/pdf/reader/util/PdfSecurityUtils.kt
@@ -1,9 +1,9 @@
-package com.all.pdfreader.pro.app.util
+package com.all.pdfreader.pdf.reader.util
 
 import android.graphics.pdf.PdfDocument
-import com.all.pdfreader.pro.app.PRApp
-import com.all.pdfreader.pro.app.room.repository.PdfRepository
-import com.all.pdfreader.pro.app.util.AppUtils.generateFastThumbnail
+import com.all.pdfreader.pdf.reader.PRApp
+import com.all.pdfreader.pdf.reader.room.repository.PdfRepository
+import com.all.pdfreader.pdf.reader.util.AppUtils.generateFastThumbnail
 import com.tom_roush.pdfbox.pdmodel.PDDocument
 import com.tom_roush.pdfbox.pdmodel.encryption.AccessPermission
 import com.tom_roush.pdfbox.pdmodel.encryption.StandardProtectionPolicy
diff --git a/app/src/main/java/com/all/pdfreader/pro/app/util/PdfUtils.kt b/app/src/main/java/com/all/pdfreader/pdf/reader/util/PdfUtils.kt
similarity index 99%
rename from app/src/main/java/com/all/pdfreader/pro/app/util/PdfUtils.kt
rename to app/src/main/java/com/all/pdfreader/pdf/reader/util/PdfUtils.kt
index 56ce28a..8d16f97 100644
--- a/app/src/main/java/com/all/pdfreader/pro/app/util/PdfUtils.kt
+++ b/app/src/main/java/com/all/pdfreader/pdf/reader/util/PdfUtils.kt
@@ -1,4 +1,4 @@
-package com.all.pdfreader.pro.app.util
+package com.all.pdfreader.pdf.reader.util
 
 import android.content.Context
 import android.graphics.Bitmap
@@ -7,7 +7,7 @@ import android.graphics.Canvas
 import android.os.ParcelFileDescriptor
 import android.util.Log
 import androidx.core.graphics.createBitmap
-import com.all.pdfreader.pro.app.model.PdfPageItem
+import com.all.pdfreader.pdf.reader.model.PdfPageItem
 import com.shockwave.pdfium.PdfiumCore
 import com.tom_roush.pdfbox.io.MemoryUsageSetting
 import com.tom_roush.pdfbox.multipdf.PDFMergerUtility
diff --git a/app/src/main/java/com/all/pdfreader/pro/app/util/ScanManager.kt b/app/src/main/java/com/all/pdfreader/pdf/reader/util/ScanManager.kt
similarity index 97%
rename from app/src/main/java/com/all/pdfreader/pro/app/util/ScanManager.kt
rename to app/src/main/java/com/all/pdfreader/pdf/reader/util/ScanManager.kt
index 66dcea3..ac507b3 100644
--- a/app/src/main/java/com/all/pdfreader/pro/app/util/ScanManager.kt
+++ b/app/src/main/java/com/all/pdfreader/pdf/reader/util/ScanManager.kt
@@ -1,4 +1,4 @@
-package com.all.pdfreader.pro.app.util
+package com.all.pdfreader.pdf.reader.util
 
 import android.content.Context
 import android.content.SharedPreferences
diff --git a/app/src/main/java/com/all/pdfreader/pro/app/util/StoragePermissionHelper.kt b/app/src/main/java/com/all/pdfreader/pdf/reader/util/StoragePermissionHelper.kt
similarity index 98%
rename from app/src/main/java/com/all/pdfreader/pro/app/util/StoragePermissionHelper.kt
rename to app/src/main/java/com/all/pdfreader/pdf/reader/util/StoragePermissionHelper.kt
index afdcaf3..6a2cc71 100644
--- a/app/src/main/java/com/all/pdfreader/pro/app/util/StoragePermissionHelper.kt
+++ b/app/src/main/java/com/all/pdfreader/pdf/reader/util/StoragePermissionHelper.kt
@@ -1,4 +1,4 @@
-package com.all.pdfreader.pro.app.util
+package com.all.pdfreader.pdf.reader.util
 
 import android.Manifest
 import android.app.Activity
diff --git a/app/src/main/java/com/all/pdfreader/pro/app/util/ToastUtils.kt b/app/src/main/java/com/all/pdfreader/pdf/reader/util/ToastUtils.kt
similarity index 89%
rename from app/src/main/java/com/all/pdfreader/pro/app/util/ToastUtils.kt
rename to app/src/main/java/com/all/pdfreader/pdf/reader/util/ToastUtils.kt
index b13adc0..620274f 100644
--- a/app/src/main/java/com/all/pdfreader/pro/app/util/ToastUtils.kt
+++ b/app/src/main/java/com/all/pdfreader/pdf/reader/util/ToastUtils.kt
@@ -1,10 +1,10 @@
-package com.all.pdfreader.pro.app.util
+package com.all.pdfreader.pdf.reader.util
 
 import android.content.Context
 import android.view.LayoutInflater
 import android.widget.TextView
 import android.widget.Toast
-import com.all.pdfreader.pro.app.R
+import com.all.pdfreader.pdf.reader.R
 
 object ToastUtils {
     private var toast: Toast? = null
diff --git a/app/src/main/java/com/all/pdfreader/pro/app/viewmodel/LiveDataExtensions.kt b/app/src/main/java/com/all/pdfreader/pdf/reader/viewmodel/LiveDataExtensions.kt
similarity index 79%
rename from app/src/main/java/com/all/pdfreader/pro/app/viewmodel/LiveDataExtensions.kt
rename to app/src/main/java/com/all/pdfreader/pdf/reader/viewmodel/LiveDataExtensions.kt
index b47d95f..d27d5ae 100644
--- a/app/src/main/java/com/all/pdfreader/pro/app/viewmodel/LiveDataExtensions.kt
+++ b/app/src/main/java/com/all/pdfreader/pdf/reader/viewmodel/LiveDataExtensions.kt
@@ -1,8 +1,8 @@
-package com.all.pdfreader.pro.app.viewmodel
+package com.all.pdfreader.pdf.reader.viewmodel
 
 import androidx.lifecycle.LifecycleOwner
 import androidx.lifecycle.LiveData
-import com.all.pdfreader.pro.app.model.FileActionEvent
+import com.all.pdfreader.pdf.reader.model.FileActionEvent
 
 /**
  * 公用观察FileActionEvent事件函数，只观察需要观察的响应
diff --git a/app/src/main/java/com/all/pdfreader/pro/app/viewmodel/PdfViewModel.kt b/app/src/main/java/com/all/pdfreader/pdf/reader/viewmodel/PdfViewModel.kt
similarity index 94%
rename from app/src/main/java/com/all/pdfreader/pro/app/viewmodel/PdfViewModel.kt
rename to app/src/main/java/com/all/pdfreader/pdf/reader/viewmodel/PdfViewModel.kt
index 94ab186..146ba37 100644
--- a/app/src/main/java/com/all/pdfreader/pro/app/viewmodel/PdfViewModel.kt
+++ b/app/src/main/java/com/all/pdfreader/pdf/reader/viewmodel/PdfViewModel.kt
@@ -1,4 +1,4 @@
-package com.all.pdfreader.pro.app.viewmodel
+package com.all.pdfreader.pdf.reader.viewmodel
 
 import android.content.Context
 import android.util.Log
@@ -6,18 +6,18 @@ import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import com.all.pdfreader.pro.app.PRApp
-import com.all.pdfreader.pro.app.model.DeleteResult
-import com.all.pdfreader.pro.app.model.FileActionEvent
-import com.all.pdfreader.pro.app.room.entity.BookmarkEntity
-import com.all.pdfreader.pro.app.room.entity.PdfDocumentEntity
-import com.all.pdfreader.pro.app.room.repository.PdfRepository
-import com.all.pdfreader.pro.app.util.AppUtils.generateFastThumbnail
-import com.all.pdfreader.pro.app.util.FileDeleteUtil
-import com.all.pdfreader.pro.app.util.FileUtils
-import com.all.pdfreader.pro.app.util.FileUtils.isPdfEncrypted
-import com.all.pdfreader.pro.app.util.PdfMetadataExtractor
-import com.all.pdfreader.pro.app.util.PdfSecurityUtils
+import com.all.pdfreader.pdf.reader.PRApp
+import com.all.pdfreader.pdf.reader.model.DeleteResult
+import com.all.pdfreader.pdf.reader.model.FileActionEvent
+import com.all.pdfreader.pdf.reader.room.entity.BookmarkEntity
+import com.all.pdfreader.pdf.reader.room.entity.PdfDocumentEntity
+import com.all.pdfreader.pdf.reader.room.repository.PdfRepository
+import com.all.pdfreader.pdf.reader.util.AppUtils.generateFastThumbnail
+import com.all.pdfreader.pdf.reader.util.FileDeleteUtil
+import com.all.pdfreader.pdf.reader.util.FileUtils
+import com.all.pdfreader.pdf.reader.util.FileUtils.isPdfEncrypted
+import com.all.pdfreader.pdf.reader.util.PdfMetadataExtractor
+import com.all.pdfreader.pdf.reader.util.PdfSecurityUtils
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.launch
diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml
index 07d5da9..ca3826a 100644
--- a/app/src/main/res/drawable/ic_launcher_background.xml
+++ b/app/src/main/res/drawable/ic_launcher_background.xml
@@ -1,170 +1,74 @@
 <?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="108dp"
+<vector
     android:height="108dp"
+    android:width="108dp"
+    android:viewportHeight="108"
     android:viewportWidth="108"
-    android:viewportHeight="108">
-    <path
-        android:fillColor="#3DDC84"
-        android:pathData="M0,0h108v108h-108z" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M9,0L9,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,0L19,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,0L29,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,0L39,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,0L49,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,0L59,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,0L69,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,0L79,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M89,0L89,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M99,0L99,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,9L108,9"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,19L108,19"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,29L108,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,39L108,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,49L108,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,59L108,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,69L108,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,79L108,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,89L108,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,99L108,99"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,29L89,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,39L89,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,49L89,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,59L89,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,69L89,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,79L89,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,19L29,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,19L39,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,19L49,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,19L59,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,19L69,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,19L79,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#3DDC84"
+          android:pathData="M0,0h108v108h-108z"/>
+    <path android:fillColor="#00000000" android:pathData="M9,0L9,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M19,0L19,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M29,0L29,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M39,0L39,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M49,0L49,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M59,0L59,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M69,0L69,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M79,0L79,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M89,0L89,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M99,0L99,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,9L108,9"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,19L108,19"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,29L108,29"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,39L108,39"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,49L108,49"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,59L108,59"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,69L108,69"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,79L108,79"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,89L108,89"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,99L108,99"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M19,29L89,29"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M19,39L89,39"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M19,49L89,49"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M19,59L89,59"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M19,69L89,69"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M19,79L89,79"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M29,19L29,89"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M39,19L39,89"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M49,19L49,89"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M59,19L59,89"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M69,19L69,89"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M79,19L79,89"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
 </vector>
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index a4425bf..397bab5 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -489,7 +489,7 @@
                 android:layout_width="54dp"
                 android:layout_height="54dp"
                 android:layout_marginStart="16dp"
-                android:src="@mipmap/app_logo" />
+                android:src="@mipmap/ic_launcher" />
 
             <LinearLayout
                 android:layout_width="match_parent"
@@ -575,7 +575,7 @@
                         android:textColor="@color/text_color_lv1"
                         android:textSize="14sp" />
 
-                    <com.all.pdfreader.pro.app.ui.view.CustomSwitchButton
+                    <com.all.pdfreader.pdf.reader.ui.view.CustomSwitchButton
                         android:id="@+id/switchScreenOn"
                         android:layout_width="wrap_content"
                         android:layout_height="32dp"
diff --git a/app/src/main/res/layout/activity_splash.xml b/app/src/main/res/layout/activity_splash.xml
index 8e028ca..9475760 100644
--- a/app/src/main/res/layout/activity_splash.xml
+++ b/app/src/main/res/layout/activity_splash.xml
@@ -1,48 +1,97 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/bg_color"
+    android:background="@mipmap/splash_img_bg"
     android:gravity="center"
     android:orientation="vertical">
 
     <!-- App Logo -->
-    <ImageView
-        android:id="@+id/app_logo"
-        android:layout_width="120dp"
-        android:layout_height="120dp"
-        android:src="@mipmap/app_logo" />
 
-    <!-- App Name -->
-    <TextView
-        android:id="@+id/app_name"
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_marginBottom="24dp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content">
+
+        <ImageView
+            android:id="@+id/splash_logo"
+            android:layout_width="94dp"
+            android:layout_height="94dp"
+            android:src="@mipmap/splash_logo"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:src="@mipmap/splash_logo_shadow"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/splash_logo" />
+
+        <!-- 右下角设置图标 -->
+        <ImageView
+            android:id="@+id/icon_settings"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="-8dp"
+            android:src="@mipmap/icon_red_settings"
+            app:layout_constraintRight_toRightOf="@+id/splash_logo"
+            app:layout_constraintTop_toTopOf="@id/splash_logo" />
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+    <LinearLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="24dp"
-        style="@style/TextViewFont_PopSemiBold"
-        android:text="@string/app_name"
-        android:textColor="@color/black"
-        android:textSize="28sp" />
+        android:gravity="center"
+        android:orientation="vertical">
 
-    <!-- App Description -->
-    <TextView
-        android:id="@+id/app_description"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="8dp"
-        android:alpha="0.8"
-        style="@style/TextViewFont_PopMedium"
-        android:text="@string/splash_desc"
-        android:textColor="@color/black"
-        android:textSize="16sp" />
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:orientation="horizontal">
+
+            <TextView
+                style="@style/TextViewFont_PopSemiBold"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/app_name_pdf"
+                android:textColor="@color/black"
+                android:textSize="24sp" />
+
+            <TextView
+                style="@style/TextViewFont_PopSemiBold"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/reader_pro"
+                android:layout_marginStart="6dp"
+                android:textColor="@color/icon_on"
+                android:textSize="24sp" />
+
+        </LinearLayout>
+        <!-- App Description -->
+        <TextView
+            android:id="@+id/app_description"
+            style="@style/TextViewFont_PopMedium"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
+            android:alpha="0.8"
+            android:text="@string/splash_desc"
+            android:textColor="@color/black"
+            android:textSize="16sp" />
+    </LinearLayout>
 
-    <!-- Loading Indicator -->
     <ProgressBar
         android:id="@+id/loading_indicator"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="48dp"
         android:indeterminate="true"
-        android:indeterminateTint="@android:color/black" />
+        android:indeterminateTint="@color/icon_on" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_list_more.xml b/app/src/main/res/layout/dialog_list_more.xml
index ab534b8..0c5eabd 100644
--- a/app/src/main/res/layout/dialog_list_more.xml
+++ b/app/src/main/res/layout/dialog_list_more.xml
@@ -35,7 +35,7 @@
                 android:id="@+id/tvFileImg"
                 android:layout_width="60dp"
                 android:layout_height="60dp"
-                android:src="@mipmap/ic_launcher_round" />
+                android:src="@mipmap/ic_launcher" />
 
             <LinearLayout
                 android:id="@+id/lock_layout"
diff --git a/app/src/main/res/layout/dialog_permission.xml b/app/src/main/res/layout/dialog_permission.xml
index 354450e..15e44d0 100644
--- a/app/src/main/res/layout/dialog_permission.xml
+++ b/app/src/main/res/layout/dialog_permission.xml
@@ -33,7 +33,7 @@
             android:layout_height="80dp"
             android:layout_gravity="center_horizontal"
             android:layout_marginBottom="16dp"
-            android:src="@mipmap/app_logo"
+            android:src="@mipmap/ic_launcher"
             tools:ignore="ContentDescription" />
 
         <TextView
diff --git a/app/src/main/res/layout/dialog_view_model.xml b/app/src/main/res/layout/dialog_view_model.xml
index 648ca80..b92cc3d 100644
--- a/app/src/main/res/layout/dialog_view_model.xml
+++ b/app/src/main/res/layout/dialog_view_model.xml
@@ -136,7 +136,7 @@
                 android:textColor="@color/text_color_lv1"
                 android:textSize="16sp" />
 
-            <com.all.pdfreader.pro.app.ui.view.CustomSwitchButton
+            <com.all.pdfreader.pdf.reader.ui.view.CustomSwitchButton
                 android:id="@+id/switchPageByPage"
                 android:layout_width="wrap_content"
                 android:layout_height="32dp"
@@ -168,7 +168,7 @@
                 android:textColor="@color/text_color_lv1"
                 android:textSize="16sp" />
 
-            <com.all.pdfreader.pro.app.ui.view.CustomSwitchButton
+            <com.all.pdfreader.pdf.reader.ui.view.CustomSwitchButton
                 android:id="@+id/switchColorInversion"
                 android:layout_width="wrap_content"
                 android:layout_height="32dp"
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
index 6f3b755..4ae7d12 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
-    <monochrome android:drawable="@drawable/ic_launcher_foreground" />
+    <background android:drawable="@mipmap/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
 </adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
index 6f3b755..4ae7d12 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
-    <monochrome android:drawable="@drawable/ic_launcher_foreground" />
+    <background android:drawable="@mipmap/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
 </adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/app/src/main/res/mipmap-hdpi/ic_launcher.webp
index c209e78..271ca0f 100644
Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher.webp and b/app/src/main/res/mipmap-hdpi/ic_launcher.webp differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_background.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_background.webp
new file mode 100644
index 0000000..68a739b
Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_background.webp differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.webp
new file mode 100644
index 0000000..49a121b
Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.webp differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp
index b2dfe3d..fe3a3ca 100644
Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp and b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/app/src/main/res/mipmap-mdpi/ic_launcher.webp
index 4f0f1d6..e7bea48 100644
Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher.webp and b/app/src/main/res/mipmap-mdpi/ic_launcher.webp differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_background.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_background.webp
new file mode 100644
index 0000000..c326c95
Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_background.webp differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.webp
new file mode 100644
index 0000000..1a7e2d0
Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.webp differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp
index 62b611d..6f5ac10 100644
Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp and b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp
index 948a307..89399fd 100644
Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp and b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_background.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_background.webp
new file mode 100644
index 0000000..592138b
Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_background.webp differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.webp
new file mode 100644
index 0000000..f48e8a1
Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.webp differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp
index 1b9a695..c2c5767 100644
Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp and b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp differ
diff --git a/app/src/main/res/mipmap-xxhdpi/app_logo.png b/app/src/main/res/mipmap-xxhdpi/app_logo.png
deleted file mode 100644
index 26d68ab..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/app_logo.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp
index 28d4b77..0c14b75 100644
Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp and b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_background.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_background.webp
new file mode 100644
index 0000000..145f61c
Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_background.webp differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.webp
new file mode 100644
index 0000000..04ac643
Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.webp differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp
index 9287f50..e162770 100644
Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp differ
diff --git a/app/src/main/res/mipmap-xxhdpi/icon_red_settings.png b/app/src/main/res/mipmap-xxhdpi/icon_red_settings.png
new file mode 100644
index 0000000..371a008
Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/icon_red_settings.png differ
diff --git a/app/src/main/res/mipmap-xxhdpi/splash_img_bg.png b/app/src/main/res/mipmap-xxhdpi/splash_img_bg.png
new file mode 100644
index 0000000..3257fa0
Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/splash_img_bg.png differ
diff --git a/app/src/main/res/mipmap-xxhdpi/splash_logo.png b/app/src/main/res/mipmap-xxhdpi/splash_logo.png
new file mode 100644
index 0000000..2702a41
Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/splash_logo.png differ
diff --git a/app/src/main/res/mipmap-xxhdpi/splash_logo_shadow.png b/app/src/main/res/mipmap-xxhdpi/splash_logo_shadow.png
new file mode 100644
index 0000000..b5361a8
Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/splash_logo_shadow.png differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp
index aa7d642..31ac1a5 100644
Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_background.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_background.webp
new file mode 100644
index 0000000..639c2ca
Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_background.webp differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.webp
new file mode 100644
index 0000000..3e2042f
Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.webp differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp
index 9126ae3..67eb73b 100644
Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp differ
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index cc1d5ac..fa449ab 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,5 +1,7 @@
 <resources>
     <string name="app_name">PDF Reader Pro</string>
+    <string name="app_name_pdf">PDF</string>
+    <string name="reader_pro">Reader Pro</string>
     <string name="home">Home</string>
     <string name="recently">Recently</string>
     <string name="favorite">Favorite</string>
diff --git a/app/src/test/java/com/all/pdfreader/pro/app/ExampleUnitTest.kt b/app/src/test/java/com/all/pdfreader/pdf/reader/ExampleUnitTest.kt
similarity index 89%
rename from app/src/test/java/com/all/pdfreader/pro/app/ExampleUnitTest.kt
rename to app/src/test/java/com/all/pdfreader/pdf/reader/ExampleUnitTest.kt
index e199701..1a81ee7 100644
--- a/app/src/test/java/com/all/pdfreader/pro/app/ExampleUnitTest.kt
+++ b/app/src/test/java/com/all/pdfreader/pdf/reader/ExampleUnitTest.kt
@@ -1,4 +1,4 @@
-package com.all.pdfreader.pro.app
+package com.all.pdfreader.pdf.reader
 
 import org.junit.Test
 
diff --git a/keyinfo/info.txt b/keyinfo/info.txt
index f63284c..c364bc7 100644
--- a/keyinfo/info.txt
+++ b/keyinfo/info.txt
@@ -1,3 +1,3 @@
-文件：keyinfo/pdf
-别名：pdf_key0
+文件：keyinfo/pdf_new_key
+别名：pdf_new_key_key0
 密码：123456
\ No newline at end of file
diff --git a/keyinfo/pdf b/keyinfo/pdf
deleted file mode 100644
index e7f29a7..0000000
Binary files a/keyinfo/pdf and /dev/null differ
diff --git a/keyinfo/pdf_new_key b/keyinfo/pdf_new_key
new file mode 100644
index 0000000..51d8860
Binary files /dev/null and b/keyinfo/pdf_new_key differ