更新包名等。

.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": []
   }

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
+        versionCode = 1
-        versionName = "1.0.2"
+        versionName = "1.0.1"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
 

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)
     }
 }

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

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.pdf.reader.room.repository.PdfRepository
-import com.all.pdfreader.pro.app.util.FileChangeObserver
+import com.all.pdfreader.pdf.reader.util.FileChangeObserver
 import com.tom_roush.pdfbox.android.PDFBoxResourceLoader
 
 class PRApp : Application() {

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
 
 /**
  * 文件删除结果封装类

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
 

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

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

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,         // 没有任何

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

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,

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()

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,      // 修改文件名

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,

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

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.*

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

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

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

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

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.pdf.reader.room.entity.PdfDocumentEntity
-import com.all.pdfreader.pro.app.room.entity.RecentReadEntity
+import com.all.pdfreader.pdf.reader.room.entity.RecentReadEntity
 import kotlinx.coroutines.flow.Flow
 
 @Dao

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.pdf.reader.room.converter.DateConverter
-import com.all.pdfreader.pro.app.room.converter.UriConverter
+import com.all.pdfreader.pdf.reader.room.converter.UriConverter
-import com.all.pdfreader.pro.app.room.dao.*
+import com.all.pdfreader.pdf.reader.room.dao.*
-import com.all.pdfreader.pro.app.room.entity.*
+import com.all.pdfreader.pdf.reader.room.entity.*
 
 @Database(
     entities = [

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

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

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

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

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.pdf.reader.room.database.PdfDatabase
-import com.all.pdfreader.pro.app.room.entity.*
+import com.all.pdfreader.pdf.reader.room.entity.*
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.combine
 import java.security.MessageDigest

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.pdf.reader.model.SortConfig
-import com.all.pdfreader.pro.app.sp.store.Store
+import com.all.pdfreader.pdf.reader.sp.store.Store
-import com.all.pdfreader.pro.app.sp.store.asStoreProvider
+import com.all.pdfreader.pdf.reader.sp.store.asStoreProvider
 
 class AppStore(context: Context) {
     private val store = Store(

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

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
 

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

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.pdf.reader.room.repository.PdfRepository
-import com.all.pdfreader.pro.app.sp.AppStore
+import com.all.pdfreader.pdf.reader.sp.AppStore
-import com.all.pdfreader.pro.app.util.ToastUtils
+import com.all.pdfreader.pdf.reader.util.ToastUtils
 import com.gyf.immersionbar.ImmersionBar
 import com.gyf.immersionbar.OnInsetsChangeListener
 

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.pdf.reader.R
-import com.all.pdfreader.pro.app.databinding.ActivityFaqBinding
+import com.all.pdfreader.pdf.reader.databinding.ActivityFaqBinding
 
 class FAQActivity : BaseActivity() {
     override val TAG: String = "FAQActivity"

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.pdf.reader.PRApp
-import com.all.pdfreader.pro.app.R
+import com.all.pdfreader.pdf.reader.R
-import com.all.pdfreader.pro.app.databinding.ActivityMainBinding
+import com.all.pdfreader.pdf.reader.databinding.ActivityMainBinding
-import com.all.pdfreader.pro.app.model.FileActionEvent
+import com.all.pdfreader.pdf.reader.model.FileActionEvent
-import com.all.pdfreader.pro.app.model.FragmentType
+import com.all.pdfreader.pdf.reader.model.FragmentType
-import com.all.pdfreader.pro.app.model.PdfPickerSource
+import com.all.pdfreader.pdf.reader.model.PdfPickerSource
-import com.all.pdfreader.pro.app.ui.dialog.PermissionDialogFragment
+import com.all.pdfreader.pdf.reader.ui.dialog.PermissionDialogFragment
-import com.all.pdfreader.pro.app.ui.dialog.ProgressDialogFragment
+import com.all.pdfreader.pdf.reader.ui.dialog.ProgressDialogFragment
-import com.all.pdfreader.pro.app.ui.dialog.PromptDialogFragment
+import com.all.pdfreader.pdf.reader.ui.dialog.PromptDialogFragment
-import com.all.pdfreader.pro.app.ui.fragment.FavoriteFrag
+import com.all.pdfreader.pdf.reader.ui.fragment.FavoriteFrag
-import com.all.pdfreader.pro.app.ui.fragment.HomeFrag
+import com.all.pdfreader.pdf.reader.ui.fragment.HomeFrag
-import com.all.pdfreader.pro.app.ui.fragment.RecentlyFrag
+import com.all.pdfreader.pdf.reader.ui.fragment.RecentlyFrag
-import com.all.pdfreader.pro.app.ui.fragment.ToolsFrag
+import com.all.pdfreader.pdf.reader.ui.fragment.ToolsFrag
-import com.all.pdfreader.pro.app.ui.view.CustomSwitchButton
+import com.all.pdfreader.pdf.reader.ui.view.CustomSwitchButton
-import com.all.pdfreader.pro.app.ui.view.CustomSwitchButton.OnCheckedChangeListener
+import com.all.pdfreader.pdf.reader.ui.view.CustomSwitchButton.OnCheckedChangeListener
-import com.all.pdfreader.pro.app.util.AppUtils
+import com.all.pdfreader.pdf.reader.util.AppUtils
-import com.all.pdfreader.pro.app.util.AppUtils.setClickWithAnimation
+import com.all.pdfreader.pdf.reader.util.AppUtils.setClickWithAnimation
-import com.all.pdfreader.pro.app.util.AppUtils.setOnSingleClickListener
+import com.all.pdfreader.pdf.reader.util.AppUtils.setOnSingleClickListener
-import com.all.pdfreader.pro.app.util.PdfScanner
+import com.all.pdfreader.pdf.reader.util.PdfScanner
-import com.all.pdfreader.pro.app.util.StoragePermissionHelper
+import com.all.pdfreader.pdf.reader.util.StoragePermissionHelper
-import com.all.pdfreader.pro.app.viewmodel.PdfViewModel
+import com.all.pdfreader.pdf.reader.viewmodel.PdfViewModel
-import com.all.pdfreader.pro.app.viewmodel.observeEvent
+import com.all.pdfreader.pdf.reader.viewmodel.observeEvent
 import kotlinx.coroutines.launch
 import java.io.File
 

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.pdf.reader.R
-import com.all.pdfreader.pro.app.databinding.ActivityPdfMergeBinding
+import com.all.pdfreader.pdf.reader.databinding.ActivityPdfMergeBinding
-import com.all.pdfreader.pro.app.model.PdfPickerSource
+import com.all.pdfreader.pdf.reader.model.PdfPickerSource
-import com.all.pdfreader.pro.app.room.entity.PdfDocumentEntity
+import com.all.pdfreader.pdf.reader.room.entity.PdfDocumentEntity
-import com.all.pdfreader.pro.app.ui.adapter.PdfAdapter
+import com.all.pdfreader.pdf.reader.ui.adapter.PdfAdapter
-import com.all.pdfreader.pro.app.ui.dialog.PdfPasswordProtectionDialogFragment
+import com.all.pdfreader.pdf.reader.ui.dialog.PdfPasswordProtectionDialogFragment
-import com.all.pdfreader.pro.app.ui.dialog.PromptDialogFragment
+import com.all.pdfreader.pdf.reader.ui.dialog.PromptDialogFragment
-import com.all.pdfreader.pro.app.util.AppUtils.setClickWithAnimation
+import com.all.pdfreader.pdf.reader.util.AppUtils.setClickWithAnimation
-import com.all.pdfreader.pro.app.util.AppUtils.setOnSingleClickListener
+import com.all.pdfreader.pdf.reader.util.AppUtils.setOnSingleClickListener
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.suspendCancellableCoroutine
 import java.io.File

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.pdf.reader.R
-import com.all.pdfreader.pro.app.databinding.ActivityPdfPickerBinding
+import com.all.pdfreader.pdf.reader.databinding.ActivityPdfPickerBinding
-import com.all.pdfreader.pro.app.model.PdfPickerSource
+import com.all.pdfreader.pdf.reader.model.PdfPickerSource
-import com.all.pdfreader.pro.app.model.PrintResult
+import com.all.pdfreader.pdf.reader.model.PrintResult
-import com.all.pdfreader.pro.app.model.SortConfig
+import com.all.pdfreader.pdf.reader.model.SortConfig
-import com.all.pdfreader.pro.app.room.entity.PdfDocumentEntity
+import com.all.pdfreader.pdf.reader.room.entity.PdfDocumentEntity
-import com.all.pdfreader.pro.app.room.repository.PdfRepository
+import com.all.pdfreader.pdf.reader.room.repository.PdfRepository
-import com.all.pdfreader.pro.app.ui.adapter.PdfAdapter
+import com.all.pdfreader.pdf.reader.ui.adapter.PdfAdapter
-import com.all.pdfreader.pro.app.ui.dialog.PdfRemovePasswordDialog
+import com.all.pdfreader.pdf.reader.ui.dialog.PdfRemovePasswordDialog
-import com.all.pdfreader.pro.app.ui.dialog.PdfSetPasswordDialog
+import com.all.pdfreader.pdf.reader.ui.dialog.PdfSetPasswordDialog
-import com.all.pdfreader.pro.app.util.AppUtils.printPdfFile
+import com.all.pdfreader.pdf.reader.util.AppUtils.printPdfFile
-import com.all.pdfreader.pro.app.util.AppUtils.setClickWithAnimation
+import com.all.pdfreader.pdf.reader.util.AppUtils.setClickWithAnimation
-import com.all.pdfreader.pro.app.util.AppUtils.setOnSingleClickListener
+import com.all.pdfreader.pdf.reader.util.AppUtils.setOnSingleClickListener
-import com.all.pdfreader.pro.app.util.ToastUtils
+import com.all.pdfreader.pdf.reader.util.ToastUtils
 import kotlinx.coroutines.launch
 import java.io.File
 import java.io.Serializable

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.pdf.reader.PRApp
-import com.all.pdfreader.pro.app.R
+import com.all.pdfreader.pdf.reader.R
-import com.all.pdfreader.pro.app.databinding.ActivityPdfSplitResultBinding
+import com.all.pdfreader.pdf.reader.databinding.ActivityPdfSplitResultBinding
-import com.all.pdfreader.pro.app.model.PdfPageItem
+import com.all.pdfreader.pdf.reader.model.PdfPageItem
-import com.all.pdfreader.pro.app.model.PdfPickerSource
+import com.all.pdfreader.pdf.reader.model.PdfPickerSource
-import com.all.pdfreader.pro.app.model.PdfSelectedPagesItem
+import com.all.pdfreader.pdf.reader.model.PdfSelectedPagesItem
-import com.all.pdfreader.pro.app.model.PdfSplitResultItem
+import com.all.pdfreader.pdf.reader.model.PdfSplitResultItem
-import com.all.pdfreader.pro.app.room.entity.PdfDocumentEntity
+import com.all.pdfreader.pdf.reader.room.entity.PdfDocumentEntity
-import com.all.pdfreader.pro.app.ui.adapter.PdfResultAdapter
+import com.all.pdfreader.pdf.reader.ui.adapter.PdfResultAdapter
-import com.all.pdfreader.pro.app.ui.dialog.PromptDialogFragment
+import com.all.pdfreader.pdf.reader.ui.dialog.PromptDialogFragment
-import com.all.pdfreader.pro.app.util.AppUtils
+import com.all.pdfreader.pdf.reader.util.AppUtils
-import com.all.pdfreader.pro.app.util.AppUtils.dpToPx
+import com.all.pdfreader.pdf.reader.util.AppUtils.dpToPx
-import com.all.pdfreader.pro.app.util.AppUtils.generateFastThumbnail
+import com.all.pdfreader.pdf.reader.util.AppUtils.generateFastThumbnail
-import com.all.pdfreader.pro.app.util.FileUtils.toUnderscoreDateTime
+import com.all.pdfreader.pdf.reader.util.FileUtils.toUnderscoreDateTime
-import com.all.pdfreader.pro.app.util.PdfScanner
+import com.all.pdfreader.pdf.reader.util.PdfScanner
-import com.all.pdfreader.pro.app.util.PdfSecurityUtils
+import com.all.pdfreader.pdf.reader.util.PdfSecurityUtils
-import com.all.pdfreader.pro.app.util.PdfUtils
+import com.all.pdfreader.pdf.reader.util.PdfUtils
-import com.all.pdfreader.pro.app.util.ToastUtils
+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

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.pdf.reader.R
-import com.all.pdfreader.pro.app.databinding.ActivityPdfToImgBinding
+import com.all.pdfreader.pdf.reader.databinding.ActivityPdfToImgBinding
-import com.all.pdfreader.pro.app.model.PdfPageItem
+import com.all.pdfreader.pdf.reader.model.PdfPageItem
-import com.all.pdfreader.pro.app.model.PdfPickerSource
+import com.all.pdfreader.pdf.reader.model.PdfPickerSource
-import com.all.pdfreader.pro.app.ui.adapter.SplitPdfAdapter
+import com.all.pdfreader.pdf.reader.ui.adapter.SplitPdfAdapter
-import com.all.pdfreader.pro.app.ui.dialog.PdfPasswordProtectionDialogFragment
+import com.all.pdfreader.pdf.reader.ui.dialog.PdfPasswordProtectionDialogFragment
-import com.all.pdfreader.pro.app.util.AppUtils.setOnSingleClickListener
+import com.all.pdfreader.pdf.reader.util.AppUtils.setOnSingleClickListener
-import com.all.pdfreader.pro.app.util.FileUtils.isPdfEncrypted
+import com.all.pdfreader.pdf.reader.util.FileUtils.isPdfEncrypted
-import com.all.pdfreader.pro.app.util.PdfUtils
+import com.all.pdfreader.pdf.reader.util.PdfUtils
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext

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.pdf.reader.R
-import com.all.pdfreader.pro.app.databinding.ActivityPdfViewBinding
+import com.all.pdfreader.pdf.reader.databinding.ActivityPdfViewBinding
-import com.all.pdfreader.pro.app.model.FileActionEvent
+import com.all.pdfreader.pdf.reader.model.FileActionEvent
-import com.all.pdfreader.pro.app.room.entity.PdfDocumentEntity
+import com.all.pdfreader.pdf.reader.room.entity.PdfDocumentEntity
-import com.all.pdfreader.pro.app.ui.dialog.BookmarksDialogFragment
+import com.all.pdfreader.pdf.reader.ui.dialog.BookmarksDialogFragment
-import com.all.pdfreader.pro.app.ui.dialog.ListMoreDialogFragment
+import com.all.pdfreader.pdf.reader.ui.dialog.ListMoreDialogFragment
-import com.all.pdfreader.pro.app.ui.dialog.PdfPasswordProtectionDialogFragment
+import com.all.pdfreader.pdf.reader.ui.dialog.PdfPasswordProtectionDialogFragment
-import com.all.pdfreader.pro.app.ui.dialog.ViewModelDialogFragment
+import com.all.pdfreader.pdf.reader.ui.dialog.ViewModelDialogFragment
-import com.all.pdfreader.pro.app.ui.view.CustomScrollHandle
+import com.all.pdfreader.pdf.reader.ui.view.CustomScrollHandle
-import com.all.pdfreader.pro.app.util.AppUtils
+import com.all.pdfreader.pdf.reader.util.AppUtils
-import com.all.pdfreader.pro.app.util.AppUtils.hideKeyboard
+import com.all.pdfreader.pdf.reader.util.AppUtils.hideKeyboard
-import com.all.pdfreader.pro.app.util.AppUtils.showKeyboard
+import com.all.pdfreader.pdf.reader.util.AppUtils.showKeyboard
-import com.all.pdfreader.pro.app.util.FileUtils
+import com.all.pdfreader.pdf.reader.util.FileUtils
-import com.all.pdfreader.pro.app.util.PDFHighlighter
+import com.all.pdfreader.pdf.reader.util.PDFHighlighter
-import com.all.pdfreader.pro.app.util.PDFSearchManager
+import com.all.pdfreader.pdf.reader.util.PDFSearchManager
-import com.all.pdfreader.pro.app.viewmodel.PdfViewModel
+import com.all.pdfreader.pdf.reader.viewmodel.PdfViewModel
-import com.all.pdfreader.pro.app.viewmodel.observeEvent
+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

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.pdf.reader.PRApp
-import com.all.pdfreader.pro.app.R
+import com.all.pdfreader.pdf.reader.R
-import com.all.pdfreader.pro.app.databinding.ActPictureSelectorBinding
+import com.all.pdfreader.pdf.reader.databinding.ActPictureSelectorBinding
-import com.all.pdfreader.pro.app.model.PdfPickerSource
+import com.all.pdfreader.pdf.reader.model.PdfPickerSource
-import com.all.pdfreader.pro.app.util.GlideEngine
+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

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.pdf.reader.R
-import com.all.pdfreader.pro.app.databinding.ActPrivacyPolicyBinding
+import com.all.pdfreader.pdf.reader.databinding.ActPrivacyPolicyBinding
 
 class PrivacyPolicyActivity : BaseActivity() {
     private lateinit var binding: ActPrivacyPolicyBinding

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.pdf.reader.R
-import com.all.pdfreader.pro.app.databinding.ActivitySearchPdfBinding
+import com.all.pdfreader.pdf.reader.databinding.ActivitySearchPdfBinding
-import com.all.pdfreader.pro.app.model.PdfPickerSource
+import com.all.pdfreader.pdf.reader.model.PdfPickerSource
-import com.all.pdfreader.pro.app.model.PrintResult
+import com.all.pdfreader.pdf.reader.model.PrintResult
-import com.all.pdfreader.pro.app.ui.adapter.SearchPdfAdapter
+import com.all.pdfreader.pdf.reader.ui.adapter.SearchPdfAdapter
-import com.all.pdfreader.pro.app.ui.dialog.ListMoreDialogFragment
+import com.all.pdfreader.pdf.reader.ui.dialog.ListMoreDialogFragment
-import com.all.pdfreader.pro.app.ui.dialog.PdfRemovePasswordDialog
+import com.all.pdfreader.pdf.reader.ui.dialog.PdfRemovePasswordDialog
-import com.all.pdfreader.pro.app.ui.dialog.PdfSetPasswordDialog
+import com.all.pdfreader.pdf.reader.ui.dialog.PdfSetPasswordDialog
-import com.all.pdfreader.pro.app.ui.dialog.PromptDialogFragment
+import com.all.pdfreader.pdf.reader.ui.dialog.PromptDialogFragment
-import com.all.pdfreader.pro.app.util.AppUtils.printPdfFile
+import com.all.pdfreader.pdf.reader.util.AppUtils.printPdfFile
-import com.all.pdfreader.pro.app.util.AppUtils.showKeyboard
+import com.all.pdfreader.pdf.reader.util.AppUtils.showKeyboard
-import com.all.pdfreader.pro.app.util.ToastUtils
+import com.all.pdfreader.pdf.reader.util.ToastUtils
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.collectLatest

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.pdf.reader.R
-import com.all.pdfreader.pro.app.databinding.ActivitySplashBinding
+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()
     }

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.pdf.reader.R
-import com.all.pdfreader.pro.app.databinding.ActivityPdfSplitBinding
+import com.all.pdfreader.pdf.reader.databinding.ActivityPdfSplitBinding
-import com.all.pdfreader.pro.app.model.PdfPageItem
+import com.all.pdfreader.pdf.reader.model.PdfPageItem
-import com.all.pdfreader.pro.app.model.PdfPickerSource
+import com.all.pdfreader.pdf.reader.model.PdfPickerSource
-import com.all.pdfreader.pro.app.model.PdfSelectedPagesItem
+import com.all.pdfreader.pdf.reader.model.PdfSelectedPagesItem
-import com.all.pdfreader.pro.app.model.RenameType
+import com.all.pdfreader.pdf.reader.model.RenameType
-import com.all.pdfreader.pro.app.ui.adapter.SplitPdfAdapter
+import com.all.pdfreader.pdf.reader.ui.adapter.SplitPdfAdapter
-import com.all.pdfreader.pro.app.ui.adapter.SplitSelectedPdfAdapter
+import com.all.pdfreader.pdf.reader.ui.adapter.SplitSelectedPdfAdapter
-import com.all.pdfreader.pro.app.ui.dialog.PdfPasswordProtectionDialogFragment
+import com.all.pdfreader.pdf.reader.ui.dialog.PdfPasswordProtectionDialogFragment
-import com.all.pdfreader.pro.app.ui.dialog.PromptDialogFragment
+import com.all.pdfreader.pdf.reader.ui.dialog.PromptDialogFragment
-import com.all.pdfreader.pro.app.ui.dialog.RenameDialogFragment
+import com.all.pdfreader.pdf.reader.ui.dialog.RenameDialogFragment
-import com.all.pdfreader.pro.app.util.AppUtils.setOnSingleClickListener
+import com.all.pdfreader.pdf.reader.util.AppUtils.setOnSingleClickListener
-import com.all.pdfreader.pro.app.util.FileUtils.isPdfEncrypted
+import com.all.pdfreader.pdf.reader.util.FileUtils.isPdfEncrypted
-import com.all.pdfreader.pro.app.util.FileUtils.toUnderscoreDateTime
+import com.all.pdfreader.pdf.reader.util.FileUtils.toUnderscoreDateTime
-import com.all.pdfreader.pro.app.util.PdfUtils
+import com.all.pdfreader.pdf.reader.util.PdfUtils
 import com.gyf.immersionbar.ImmersionBar
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch

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.pdf.reader.databinding.AdapterItemBookmarkPageBinding
-import com.all.pdfreader.pro.app.room.entity.BookmarkEntity
+import com.all.pdfreader.pdf.reader.room.entity.BookmarkEntity
 
 class BookmarkAdapter(
     private var list: MutableList<BookmarkEntity>,

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.pdf.reader.databinding.AdapterPdfItemBinding
-import com.all.pdfreader.pro.app.room.entity.PdfDocumentEntity
+import com.all.pdfreader.pdf.reader.room.entity.PdfDocumentEntity
-import com.all.pdfreader.pro.app.ui.act.MainActivity
+import com.all.pdfreader.pdf.reader.ui.act.MainActivity
-import com.all.pdfreader.pro.app.util.AppUtils.dpToPx
+import com.all.pdfreader.pdf.reader.util.AppUtils.dpToPx
-import com.all.pdfreader.pro.app.util.FileUtils
+import com.all.pdfreader.pdf.reader.util.FileUtils
-import com.all.pdfreader.pro.app.util.FileUtils.toFormatFileSize
+import com.all.pdfreader.pdf.reader.util.FileUtils.toFormatFileSize
-import com.all.pdfreader.pro.app.util.FileUtils.toSlashDate
+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

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.pdf.reader.R
-import com.all.pdfreader.pro.app.databinding.AdapterSelectedResultItemBinding
+import com.all.pdfreader.pdf.reader.databinding.AdapterSelectedResultItemBinding
-import com.all.pdfreader.pro.app.model.PdfSplitResultItem
+import com.all.pdfreader.pdf.reader.model.PdfSplitResultItem
-import com.all.pdfreader.pro.app.util.AppUtils.dpToPx
+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

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

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.pdf.reader.R
-import com.all.pdfreader.pro.app.databinding.AdapterPdfItemBinding
+import com.all.pdfreader.pdf.reader.databinding.AdapterPdfItemBinding
-import com.all.pdfreader.pro.app.room.entity.PdfDocumentEntity
+import com.all.pdfreader.pdf.reader.room.entity.PdfDocumentEntity
-import com.all.pdfreader.pro.app.util.AppUtils.dpToPx
+import com.all.pdfreader.pdf.reader.util.AppUtils.dpToPx
-import com.all.pdfreader.pro.app.util.AppUtils.toHighlightedSpannable
+import com.all.pdfreader.pdf.reader.util.AppUtils.toHighlightedSpannable
-import com.all.pdfreader.pro.app.util.FileUtils.toFormatFileSize
+import com.all.pdfreader.pdf.reader.util.FileUtils.toFormatFileSize
-import com.all.pdfreader.pro.app.util.FileUtils.toSlashDate
+import com.all.pdfreader.pdf.reader.util.FileUtils.toSlashDate
-import com.all.pdfreader.pro.app.util.PdfDiffCallback
+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

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.pdf.reader.R
-import com.all.pdfreader.pro.app.databinding.AdapterSplitPageItemBinding
+import com.all.pdfreader.pdf.reader.databinding.AdapterSplitPageItemBinding
-import com.all.pdfreader.pro.app.model.PdfPageItem
+import com.all.pdfreader.pdf.reader.model.PdfPageItem
-import com.all.pdfreader.pro.app.util.AppUtils.dpToPx
+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

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.pdf.reader.databinding.AdapterSplitSelectedPageItemBinding
-import com.all.pdfreader.pro.app.model.PdfSelectedPagesItem
+import com.all.pdfreader.pdf.reader.model.PdfSelectedPagesItem
-import com.all.pdfreader.pro.app.util.AppUtils.dpToPx
+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

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.pdf.reader.R
-import com.all.pdfreader.pro.app.databinding.DialogBookmarksBinding
+import com.all.pdfreader.pdf.reader.databinding.DialogBookmarksBinding
-import com.all.pdfreader.pro.app.model.RenameType
+import com.all.pdfreader.pdf.reader.model.RenameType
-import com.all.pdfreader.pro.app.room.entity.BookmarkEntity
+import com.all.pdfreader.pdf.reader.room.entity.BookmarkEntity
-import com.all.pdfreader.pro.app.room.entity.PdfDocumentEntity
+import com.all.pdfreader.pdf.reader.room.entity.PdfDocumentEntity
-import com.all.pdfreader.pro.app.ui.adapter.BookmarkAdapter
+import com.all.pdfreader.pdf.reader.ui.adapter.BookmarkAdapter
-import com.all.pdfreader.pro.app.util.ToastUtils
+import com.all.pdfreader.pdf.reader.util.ToastUtils
-import com.all.pdfreader.pro.app.viewmodel.PdfViewModel
+import com.all.pdfreader.pdf.reader.viewmodel.PdfViewModel
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment
 
 class BookmarksDialogFragment(

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.pdf.reader.R
-import com.all.pdfreader.pro.app.databinding.DialogFileDetailsBinding
+import com.all.pdfreader.pdf.reader.databinding.DialogFileDetailsBinding
-import com.all.pdfreader.pro.app.room.entity.PdfDocumentEntity
+import com.all.pdfreader.pdf.reader.room.entity.PdfDocumentEntity
-import com.all.pdfreader.pro.app.util.FileUtils.toFormatFileSize
+import com.all.pdfreader.pdf.reader.util.FileUtils.toFormatFileSize
-import com.all.pdfreader.pro.app.util.FileUtils.toSlashDateTime
+import com.all.pdfreader.pdf.reader.util.FileUtils.toSlashDateTime
-import com.all.pdfreader.pro.app.util.ToastUtils
+import com.all.pdfreader.pdf.reader.util.ToastUtils
-import com.all.pdfreader.pro.app.viewmodel.PdfViewModel
+import com.all.pdfreader.pdf.reader.viewmodel.PdfViewModel
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment
 
 class FileDetailsDialogFragment() : BottomSheetDialogFragment() {

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.pdf.reader.R
-import com.all.pdfreader.pro.app.databinding.DialogGotoPageBinding
+import com.all.pdfreader.pdf.reader.databinding.DialogGotoPageBinding
-import com.all.pdfreader.pro.app.databinding.DialogRenameFileBinding
+import com.all.pdfreader.pdf.reader.databinding.DialogRenameFileBinding
-import com.all.pdfreader.pro.app.model.RenameType
+import com.all.pdfreader.pdf.reader.model.RenameType
-import com.all.pdfreader.pro.app.room.entity.BookmarkEntity
+import com.all.pdfreader.pdf.reader.room.entity.BookmarkEntity
-import com.all.pdfreader.pro.app.room.entity.PdfDocumentEntity
+import com.all.pdfreader.pdf.reader.room.entity.PdfDocumentEntity
-import com.all.pdfreader.pro.app.util.AppUtils.showKeyboard
+import com.all.pdfreader.pdf.reader.util.AppUtils.showKeyboard
-import com.all.pdfreader.pro.app.util.FileUtils
+import com.all.pdfreader.pdf.reader.util.FileUtils
-import com.all.pdfreader.pro.app.util.ToastUtils
+import com.all.pdfreader.pdf.reader.util.ToastUtils
-import com.all.pdfreader.pro.app.viewmodel.PdfViewModel
+import com.all.pdfreader.pdf.reader.viewmodel.PdfViewModel
 import java.io.File
 
 class GotoPageDialogFragment(

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.pdf.reader.R
-import com.all.pdfreader.pro.app.databinding.DialogListMoreBinding
+import com.all.pdfreader.pdf.reader.databinding.DialogListMoreBinding
-import com.all.pdfreader.pro.app.model.PdfPickerSource
+import com.all.pdfreader.pdf.reader.model.PdfPickerSource
-import com.all.pdfreader.pro.app.model.PrintResult
+import com.all.pdfreader.pdf.reader.model.PrintResult
-import com.all.pdfreader.pro.app.model.RenameType
+import com.all.pdfreader.pdf.reader.model.RenameType
-import com.all.pdfreader.pro.app.room.entity.PdfDocumentEntity
+import com.all.pdfreader.pdf.reader.room.entity.PdfDocumentEntity
-import com.all.pdfreader.pro.app.ui.act.MergePdfActivity
+import com.all.pdfreader.pdf.reader.ui.act.MergePdfActivity
-import com.all.pdfreader.pro.app.ui.act.PdfPickerActivity
+import com.all.pdfreader.pdf.reader.ui.act.PdfPickerActivity
-import com.all.pdfreader.pro.app.ui.act.PdfToImageActivity
+import com.all.pdfreader.pdf.reader.ui.act.PdfToImageActivity
-import com.all.pdfreader.pro.app.ui.act.PdfViewActivity
+import com.all.pdfreader.pdf.reader.ui.act.PdfViewActivity
-import com.all.pdfreader.pro.app.ui.act.SplitPdfActivity
+import com.all.pdfreader.pdf.reader.ui.act.SplitPdfActivity
-import com.all.pdfreader.pro.app.ui.fragment.FavoriteFrag
+import com.all.pdfreader.pdf.reader.ui.fragment.FavoriteFrag
-import com.all.pdfreader.pro.app.ui.fragment.HomeFrag
+import com.all.pdfreader.pdf.reader.ui.fragment.HomeFrag
-import com.all.pdfreader.pro.app.ui.fragment.RecentlyFrag
+import com.all.pdfreader.pdf.reader.ui.fragment.RecentlyFrag
-import com.all.pdfreader.pro.app.util.AppUtils.dpToPx
+import com.all.pdfreader.pdf.reader.util.AppUtils.dpToPx
-import com.all.pdfreader.pro.app.util.AppUtils.printPdfFile
+import com.all.pdfreader.pdf.reader.util.AppUtils.printPdfFile
-import com.all.pdfreader.pro.app.util.AppUtils.setClickWithAnimation
+import com.all.pdfreader.pdf.reader.util.AppUtils.setClickWithAnimation
-import com.all.pdfreader.pro.app.util.AppUtils.shareFile
+import com.all.pdfreader.pdf.reader.util.AppUtils.shareFile
-import com.all.pdfreader.pro.app.util.FileUtils.toFormatFileSize
+import com.all.pdfreader.pdf.reader.util.FileUtils.toFormatFileSize
-import com.all.pdfreader.pro.app.util.FileUtils.toSlashDate
+import com.all.pdfreader.pdf.reader.util.FileUtils.toSlashDate
-import com.all.pdfreader.pro.app.util.ToastUtils
+import com.all.pdfreader.pdf.reader.util.ToastUtils
-import com.all.pdfreader.pro.app.viewmodel.PdfViewModel
+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

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.pdf.reader.R
-import com.all.pdfreader.pro.app.databinding.DialogPdfPasswordProtectionBinding
+import com.all.pdfreader.pdf.reader.databinding.DialogPdfPasswordProtectionBinding
-import com.all.pdfreader.pro.app.util.AppUtils.showKeyboard
+import com.all.pdfreader.pdf.reader.util.AppUtils.showKeyboard
-import com.all.pdfreader.pro.app.util.FileUtils.isPdfPasswordCorrect
+import com.all.pdfreader.pdf.reader.util.FileUtils.isPdfPasswordCorrect
 import java.io.File
 
 class PdfPasswordProtectionDialogFragment(

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.pdf.reader.R
-import com.all.pdfreader.pro.app.databinding.DialogPdfRemovePasswordBinding
+import com.all.pdfreader.pdf.reader.databinding.DialogPdfRemovePasswordBinding
-import com.all.pdfreader.pro.app.util.AppUtils.showKeyboard
+import com.all.pdfreader.pdf.reader.util.AppUtils.showKeyboard
-import com.all.pdfreader.pro.app.util.FileUtils.isPdfPasswordCorrect
+import com.all.pdfreader.pdf.reader.util.FileUtils.isPdfPasswordCorrect
-import com.all.pdfreader.pro.app.util.ToastUtils
+import com.all.pdfreader.pdf.reader.util.ToastUtils
 import java.io.File
 
 class PdfRemovePasswordDialog(

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.pdf.reader.R
-import com.all.pdfreader.pro.app.databinding.DialogPdfSetPasswordBinding
+import com.all.pdfreader.pdf.reader.databinding.DialogPdfSetPasswordBinding
-import com.all.pdfreader.pro.app.util.AppUtils.showKeyboard
+import com.all.pdfreader.pdf.reader.util.AppUtils.showKeyboard
-import com.all.pdfreader.pro.app.util.ToastUtils
+import com.all.pdfreader.pdf.reader.util.ToastUtils
 
 class PdfSetPasswordDialog(
     private val onOkClick: (password: String) -> Unit = {}

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.pdf.reader.R
-import com.all.pdfreader.pro.app.databinding.DialogPermissionBinding
+import com.all.pdfreader.pdf.reader.databinding.DialogPermissionBinding
-import com.all.pdfreader.pro.app.sp.AppStore
+import com.all.pdfreader.pdf.reader.sp.AppStore
-import com.all.pdfreader.pro.app.util.StoragePermissionHelper
+import com.all.pdfreader.pdf.reader.util.StoragePermissionHelper
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment
 
 class PermissionDialogFragment : BottomSheetDialogFragment() {

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.pdf.reader.R
-import com.all.pdfreader.pro.app.databinding.DialogProgressBinding
+import com.all.pdfreader.pdf.reader.databinding.DialogProgressBinding
 
 class ProgressDialogFragment : DialogFragment() {
 

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.pdf.reader.R
-import com.all.pdfreader.pro.app.databinding.DialogDeleteBinding
+import com.all.pdfreader.pdf.reader.databinding.DialogDeleteBinding
-import com.all.pdfreader.pro.app.util.ToastUtils
+import com.all.pdfreader.pdf.reader.util.ToastUtils
 
 class PromptDialogFragment(
     private val title: String,

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.pdf.reader.R
-import com.all.pdfreader.pro.app.databinding.DialogRenameFileBinding
+import com.all.pdfreader.pdf.reader.databinding.DialogRenameFileBinding
-import com.all.pdfreader.pro.app.model.RenameType
+import com.all.pdfreader.pdf.reader.model.RenameType
-import com.all.pdfreader.pro.app.room.entity.BookmarkEntity
+import com.all.pdfreader.pdf.reader.room.entity.BookmarkEntity
-import com.all.pdfreader.pro.app.util.AppUtils.showKeyboard
+import com.all.pdfreader.pdf.reader.util.AppUtils.showKeyboard
-import com.all.pdfreader.pro.app.util.FileUtils
+import com.all.pdfreader.pdf.reader.util.FileUtils
-import com.all.pdfreader.pro.app.util.ToastUtils
+import com.all.pdfreader.pdf.reader.util.ToastUtils
-import com.all.pdfreader.pro.app.viewmodel.PdfViewModel
+import com.all.pdfreader.pdf.reader.viewmodel.PdfViewModel
 import java.io.File
 
 class RenameDialogFragment(

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.pdf.reader.R
-import com.all.pdfreader.pro.app.databinding.DialogSortBinding
+import com.all.pdfreader.pdf.reader.databinding.DialogSortBinding
-import com.all.pdfreader.pro.app.model.SortConfig
+import com.all.pdfreader.pdf.reader.model.SortConfig
-import com.all.pdfreader.pro.app.model.SortDirection
+import com.all.pdfreader.pdf.reader.model.SortDirection
-import com.all.pdfreader.pro.app.model.SortField
+import com.all.pdfreader.pdf.reader.model.SortField
-import com.all.pdfreader.pro.app.sp.AppStore
+import com.all.pdfreader.pdf.reader.sp.AppStore
-import com.all.pdfreader.pro.app.ui.fragment.FavoriteFrag
+import com.all.pdfreader.pdf.reader.ui.fragment.FavoriteFrag
-import com.all.pdfreader.pro.app.ui.fragment.HomeFrag
+import com.all.pdfreader.pdf.reader.ui.fragment.HomeFrag
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment
 
 class SortDialogFragment(

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.pdf.reader.R
-import com.all.pdfreader.pro.app.databinding.DialogViewModelBinding
+import com.all.pdfreader.pdf.reader.databinding.DialogViewModelBinding
-import com.all.pdfreader.pro.app.room.entity.PdfDocumentEntity
+import com.all.pdfreader.pdf.reader.room.entity.PdfDocumentEntity
-import com.all.pdfreader.pro.app.sp.AppStore
+import com.all.pdfreader.pdf.reader.sp.AppStore
-import com.all.pdfreader.pro.app.ui.view.CustomSwitchButton
+import com.all.pdfreader.pdf.reader.ui.view.CustomSwitchButton
-import com.all.pdfreader.pro.app.ui.view.CustomSwitchButton.OnCheckedChangeListener
+import com.all.pdfreader.pdf.reader.ui.view.CustomSwitchButton.OnCheckedChangeListener
-import com.all.pdfreader.pro.app.util.ToastUtils
+import com.all.pdfreader.pdf.reader.util.ToastUtils
-import com.all.pdfreader.pro.app.viewmodel.PdfViewModel
+import com.all.pdfreader.pdf.reader.viewmodel.PdfViewModel
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment
 
 class ViewModelDialogFragment() : BottomSheetDialogFragment() {

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.pdf.reader.databinding.FragmentFavoriteBinding
-import com.all.pdfreader.pro.app.room.repository.PdfRepository
+import com.all.pdfreader.pdf.reader.room.repository.PdfRepository
-import com.all.pdfreader.pro.app.sp.AppStore
+import com.all.pdfreader.pdf.reader.sp.AppStore
-import com.all.pdfreader.pro.app.util.ToastUtils
+import com.all.pdfreader.pdf.reader.util.ToastUtils
 
 abstract class BaseFrag : Fragment() {
     protected abstract val TAG: String

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.pdf.reader.R
-import com.all.pdfreader.pro.app.databinding.FragmentFavoriteBinding
+import com.all.pdfreader.pdf.reader.databinding.FragmentFavoriteBinding
-import com.all.pdfreader.pro.app.model.FragmentType
+import com.all.pdfreader.pdf.reader.model.FragmentType
-import com.all.pdfreader.pro.app.model.SortConfig
+import com.all.pdfreader.pdf.reader.model.SortConfig
-import com.all.pdfreader.pro.app.model.SortField
+import com.all.pdfreader.pdf.reader.model.SortField
-import com.all.pdfreader.pro.app.room.entity.PdfDocumentEntity
+import com.all.pdfreader.pdf.reader.room.entity.PdfDocumentEntity
-import com.all.pdfreader.pro.app.room.repository.PdfRepository
+import com.all.pdfreader.pdf.reader.room.repository.PdfRepository
-import com.all.pdfreader.pro.app.ui.act.MainActivity
+import com.all.pdfreader.pdf.reader.ui.act.MainActivity
-import com.all.pdfreader.pro.app.ui.act.PdfViewActivity
+import com.all.pdfreader.pdf.reader.ui.act.PdfViewActivity
-import com.all.pdfreader.pro.app.ui.adapter.PdfAdapter
+import com.all.pdfreader.pdf.reader.ui.adapter.PdfAdapter
-import com.all.pdfreader.pro.app.ui.dialog.ListMoreDialogFragment
+import com.all.pdfreader.pdf.reader.ui.dialog.ListMoreDialogFragment
-import com.all.pdfreader.pro.app.ui.dialog.SortDialogFragment
+import com.all.pdfreader.pdf.reader.ui.dialog.SortDialogFragment
-import com.all.pdfreader.pro.app.util.AppUtils.setOnSingleClickListener
+import com.all.pdfreader.pdf.reader.util.AppUtils.setOnSingleClickListener
 import kotlinx.coroutines.launch
 
 class FavoriteFrag : BaseFrag(){

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.pdf.reader.R
-import com.all.pdfreader.pro.app.databinding.FragmentHomeBinding
+import com.all.pdfreader.pdf.reader.databinding.FragmentHomeBinding
-import com.all.pdfreader.pro.app.model.FragmentType
+import com.all.pdfreader.pdf.reader.model.FragmentType
-import com.all.pdfreader.pro.app.model.SortConfig
+import com.all.pdfreader.pdf.reader.model.SortConfig
-import com.all.pdfreader.pro.app.model.SortField
+import com.all.pdfreader.pdf.reader.model.SortField
-import com.all.pdfreader.pro.app.room.entity.PdfDocumentEntity
+import com.all.pdfreader.pdf.reader.room.entity.PdfDocumentEntity
-import com.all.pdfreader.pro.app.room.repository.PdfRepository
+import com.all.pdfreader.pdf.reader.room.repository.PdfRepository
-import com.all.pdfreader.pro.app.ui.act.MainActivity
+import com.all.pdfreader.pdf.reader.ui.act.MainActivity
-import com.all.pdfreader.pro.app.ui.act.PdfViewActivity
+import com.all.pdfreader.pdf.reader.ui.act.PdfViewActivity
-import com.all.pdfreader.pro.app.ui.adapter.PdfAdapter
+import com.all.pdfreader.pdf.reader.ui.adapter.PdfAdapter
-import com.all.pdfreader.pro.app.ui.dialog.ListMoreDialogFragment
+import com.all.pdfreader.pdf.reader.ui.dialog.ListMoreDialogFragment
-import com.all.pdfreader.pro.app.ui.dialog.SortDialogFragment
+import com.all.pdfreader.pdf.reader.ui.dialog.SortDialogFragment
-import com.all.pdfreader.pro.app.util.AppUtils.setOnSingleClickListener
+import com.all.pdfreader.pdf.reader.util.AppUtils.setOnSingleClickListener
-import com.all.pdfreader.pro.app.util.PdfScanner
+import com.all.pdfreader.pdf.reader.util.PdfScanner
 import kotlinx.coroutines.launch
 
 class HomeFrag : BaseFrag(){

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.pdf.reader.databinding.FragmentRecentlyBinding
-import com.all.pdfreader.pro.app.model.FragmentType
+import com.all.pdfreader.pdf.reader.model.FragmentType
-import com.all.pdfreader.pro.app.room.entity.PdfDocumentEntity
+import com.all.pdfreader.pdf.reader.room.entity.PdfDocumentEntity
-import com.all.pdfreader.pro.app.room.repository.PdfRepository
+import com.all.pdfreader.pdf.reader.room.repository.PdfRepository
-import com.all.pdfreader.pro.app.ui.act.MainActivity
+import com.all.pdfreader.pdf.reader.ui.act.MainActivity
-import com.all.pdfreader.pro.app.ui.act.PdfViewActivity
+import com.all.pdfreader.pdf.reader.ui.act.PdfViewActivity
-import com.all.pdfreader.pro.app.ui.adapter.PdfAdapter
+import com.all.pdfreader.pdf.reader.ui.adapter.PdfAdapter
-import com.all.pdfreader.pro.app.ui.dialog.ListMoreDialogFragment
+import com.all.pdfreader.pdf.reader.ui.dialog.ListMoreDialogFragment
 import kotlinx.coroutines.launch
 
 class RecentlyFrag : BaseFrag() {

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.pdf.reader.PRApp
-import com.all.pdfreader.pro.app.R
+import com.all.pdfreader.pdf.reader.R
-import com.all.pdfreader.pro.app.databinding.FragmentToolsBinding
+import com.all.pdfreader.pdf.reader.databinding.FragmentToolsBinding
-import com.all.pdfreader.pro.app.model.PdfPickerSource
+import com.all.pdfreader.pdf.reader.model.PdfPickerSource
-import com.all.pdfreader.pro.app.ui.act.PdfPickerActivity
+import com.all.pdfreader.pdf.reader.ui.act.PdfPickerActivity
-import com.all.pdfreader.pro.app.ui.act.PdfResultActivity
+import com.all.pdfreader.pdf.reader.ui.act.PdfResultActivity
-import com.all.pdfreader.pro.app.ui.act.PictureSelectorActivity
+import com.all.pdfreader.pdf.reader.ui.act.PictureSelectorActivity
-import com.all.pdfreader.pro.app.util.GlideEngine
+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

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;

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
 

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.pdf.reader.R
-import com.all.pdfreader.pro.app.model.PrintResult
+import com.all.pdfreader.pdf.reader.model.PrintResult
-import com.all.pdfreader.pro.app.ui.adapter.PrintPdfAdapter
+import com.all.pdfreader.pdf.reader.ui.adapter.PrintPdfAdapter
 import com.shockwave.pdfium.PdfDocument
 import com.shockwave.pdfium.PdfPasswordException
 import com.shockwave.pdfium.PdfiumCore

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.pdf.reader.room.repository.PdfRepository
-import com.all.pdfreader.pro.app.util.FileUtils.getFileFromUri
+import com.all.pdfreader.pdf.reader.util.FileUtils.getFileFromUri
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.SupervisorJob

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.pdf.reader.PRApp
-import com.all.pdfreader.pro.app.R
+import com.all.pdfreader.pdf.reader.R
-import com.all.pdfreader.pro.app.model.DeleteResult
+import com.all.pdfreader.pdf.reader.model.DeleteResult
-import com.all.pdfreader.pro.app.util.FileUtils.formatFileSize
+import com.all.pdfreader.pdf.reader.util.FileUtils.formatFileSize
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import java.io.File

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.pdf.reader.PRApp
-import com.all.pdfreader.pro.app.R
+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 {

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

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
 

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
 

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

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

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

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.pdf.reader.PRApp
-import com.all.pdfreader.pro.app.room.entity.PdfDocumentEntity
+import com.all.pdfreader.pdf.reader.room.entity.PdfDocumentEntity
-import com.all.pdfreader.pro.app.room.repository.PdfRepository
+import com.all.pdfreader.pdf.reader.room.repository.PdfRepository
-import com.all.pdfreader.pro.app.util.AppUtils.generateFastThumbnail
+import com.all.pdfreader.pdf.reader.util.AppUtils.generateFastThumbnail
-import com.all.pdfreader.pro.app.util.FileUtils.isPdfEncrypted
+import com.all.pdfreader.pdf.reader.util.FileUtils.isPdfEncrypted
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.sync.Mutex

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.pdf.reader.PRApp
-import com.all.pdfreader.pro.app.room.repository.PdfRepository
+import com.all.pdfreader.pdf.reader.room.repository.PdfRepository
-import com.all.pdfreader.pro.app.util.AppUtils.generateFastThumbnail
+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

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

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

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

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

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事件函数，只观察需要观察的响应

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.pdf.reader.PRApp
-import com.all.pdfreader.pro.app.model.DeleteResult
+import com.all.pdfreader.pdf.reader.model.DeleteResult
-import com.all.pdfreader.pro.app.model.FileActionEvent
+import com.all.pdfreader.pdf.reader.model.FileActionEvent
-import com.all.pdfreader.pro.app.room.entity.BookmarkEntity
+import com.all.pdfreader.pdf.reader.room.entity.BookmarkEntity
-import com.all.pdfreader.pro.app.room.entity.PdfDocumentEntity
+import com.all.pdfreader.pdf.reader.room.entity.PdfDocumentEntity
-import com.all.pdfreader.pro.app.room.repository.PdfRepository
+import com.all.pdfreader.pdf.reader.room.repository.PdfRepository
-import com.all.pdfreader.pro.app.util.AppUtils.generateFastThumbnail
+import com.all.pdfreader.pdf.reader.util.AppUtils.generateFastThumbnail
-import com.all.pdfreader.pro.app.util.FileDeleteUtil
+import com.all.pdfreader.pdf.reader.util.FileDeleteUtil
-import com.all.pdfreader.pro.app.util.FileUtils
+import com.all.pdfreader.pdf.reader.util.FileUtils
-import com.all.pdfreader.pro.app.util.FileUtils.isPdfEncrypted
+import com.all.pdfreader.pdf.reader.util.FileUtils.isPdfEncrypted
-import com.all.pdfreader.pro.app.util.PdfMetadataExtractor
+import com.all.pdfreader.pdf.reader.util.PdfMetadataExtractor
-import com.all.pdfreader.pro.app.util.PdfSecurityUtils
+import com.all.pdfreader.pdf.reader.util.PdfSecurityUtils
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.launch

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"
+<vector
-    android:width="108dp"
     android:height="108dp"
+    android:width="108dp"
+    android:viewportHeight="108"
     android:viewportWidth="108"
-    android:viewportHeight="108">
+    xmlns:android="http://schemas.android.com/apk/res/android">
-    <path
+    <path android:fillColor="#3DDC84"
-        android:fillColor="#3DDC84"
           android:pathData="M0,0h108v108h-108z"/>
-    <path
+    <path android:fillColor="#00000000" android:pathData="M9,0L9,108"
-        android:fillColor="#00000000"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-        android:pathData="M9,0L9,108"
+    <path android:fillColor="#00000000" android:pathData="M19,0L19,108"
-        android:strokeWidth="0.8"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-        android:strokeColor="#33FFFFFF" />
+    <path android:fillColor="#00000000" android:pathData="M29,0L29,108"
-    <path
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-        android:fillColor="#00000000"
+    <path android:fillColor="#00000000" android:pathData="M39,0L39,108"
-        android:pathData="M19,0L19,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-        android:strokeWidth="0.8"
+    <path android:fillColor="#00000000" android:pathData="M49,0L49,108"
-        android:strokeColor="#33FFFFFF" />
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path
+    <path android:fillColor="#00000000" android:pathData="M59,0L59,108"
-        android:fillColor="#00000000"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-        android:pathData="M29,0L29,108"
+    <path android:fillColor="#00000000" android:pathData="M69,0L69,108"
-        android:strokeWidth="0.8"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-        android:strokeColor="#33FFFFFF" />
+    <path android:fillColor="#00000000" android:pathData="M79,0L79,108"
-    <path
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-        android:fillColor="#00000000"
+    <path android:fillColor="#00000000" android:pathData="M89,0L89,108"
-        android:pathData="M39,0L39,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-        android:strokeWidth="0.8"
+    <path android:fillColor="#00000000" android:pathData="M99,0L99,108"
-        android:strokeColor="#33FFFFFF" />
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path
+    <path android:fillColor="#00000000" android:pathData="M0,9L108,9"
-        android:fillColor="#00000000"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-        android:pathData="M49,0L49,108"
+    <path android:fillColor="#00000000" android:pathData="M0,19L108,19"
-        android:strokeWidth="0.8"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-        android:strokeColor="#33FFFFFF" />
+    <path android:fillColor="#00000000" android:pathData="M0,29L108,29"
-    <path
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-        android:fillColor="#00000000"
+    <path android:fillColor="#00000000" android:pathData="M0,39L108,39"
-        android:pathData="M59,0L59,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-        android:strokeWidth="0.8"
+    <path android:fillColor="#00000000" android:pathData="M0,49L108,49"
-        android:strokeColor="#33FFFFFF" />
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path
+    <path android:fillColor="#00000000" android:pathData="M0,59L108,59"
-        android:fillColor="#00000000"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-        android:pathData="M69,0L69,108"
+    <path android:fillColor="#00000000" android:pathData="M0,69L108,69"
-        android:strokeWidth="0.8"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-        android:strokeColor="#33FFFFFF" />
+    <path android:fillColor="#00000000" android:pathData="M0,79L108,79"
-    <path
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-        android:fillColor="#00000000"
+    <path android:fillColor="#00000000" android:pathData="M0,89L108,89"
-        android:pathData="M79,0L79,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-        android:strokeWidth="0.8"
+    <path android:fillColor="#00000000" android:pathData="M0,99L108,99"
-        android:strokeColor="#33FFFFFF" />
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path
+    <path android:fillColor="#00000000" android:pathData="M19,29L89,29"
-        android:fillColor="#00000000"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-        android:pathData="M89,0L89,108"
+    <path android:fillColor="#00000000" android:pathData="M19,39L89,39"
-        android:strokeWidth="0.8"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-        android:strokeColor="#33FFFFFF" />
+    <path android:fillColor="#00000000" android:pathData="M19,49L89,49"
-    <path
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-        android:fillColor="#00000000"
+    <path android:fillColor="#00000000" android:pathData="M19,59L89,59"
-        android:pathData="M99,0L99,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-        android:strokeWidth="0.8"
+    <path android:fillColor="#00000000" android:pathData="M19,69L89,69"
-        android:strokeColor="#33FFFFFF" />
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path
+    <path android:fillColor="#00000000" android:pathData="M19,79L89,79"
-        android:fillColor="#00000000"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-        android:pathData="M0,9L108,9"
+    <path android:fillColor="#00000000" android:pathData="M29,19L29,89"
-        android:strokeWidth="0.8"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-        android:strokeColor="#33FFFFFF" />
+    <path android:fillColor="#00000000" android:pathData="M39,19L39,89"
-    <path
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-        android:fillColor="#00000000"
+    <path android:fillColor="#00000000" android:pathData="M49,19L49,89"
-        android:pathData="M0,19L108,19"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-        android:strokeWidth="0.8"
+    <path android:fillColor="#00000000" android:pathData="M59,19L59,89"
-        android:strokeColor="#33FFFFFF" />
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path
+    <path android:fillColor="#00000000" android:pathData="M69,19L69,89"
-        android:fillColor="#00000000"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-        android:pathData="M0,29L108,29"
+    <path android:fillColor="#00000000" android:pathData="M79,19L79,89"
-        android:strokeWidth="0.8"
+          android:strokeColor="#33FFFFFF" 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" />
 </vector>

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"

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 -->
+    <androidx.constraintlayout.widget.ConstraintLayout
-    <TextView
+        android:layout_marginBottom="24dp"
-        android:id="@+id/app_name"
+        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:layout_marginTop="24dp"
+            android:src="@mipmap/splash_logo_shadow"
-        style="@style/TextViewFont_PopSemiBold"
+            app:layout_constraintLeft_toLeftOf="parent"
-        android:text="@string/app_name"
+            app:layout_constraintRight_toRightOf="parent"
-        android:textColor="@color/black"
+            app:layout_constraintTop_toBottomOf="@+id/splash_logo" />
-        android:textSize="28sp" />
 
+        <!-- 右下角设置图标 -->
+        <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:gravity="center"
+        android:orientation="vertical">
+
+        <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"
-        style="@style/TextViewFont_PopMedium"
             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>

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"

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

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"

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" />
+    <background android:drawable="@mipmap/ic_launcher_background"/>
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
-    <monochrome android:drawable="@drawable/ic_launcher_foreground" />
 </adaptive-icon>

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" />
+    <background android:drawable="@mipmap/ic_launcher_background"/>
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
-    <monochrome android:drawable="@drawable/ic_launcher_foreground" />
 </adaptive-icon>