diff --git a/app/src/main/java/com/all/pdfreader/pro/app/ui/dialog/BookmarksDialogFragment.kt b/app/src/main/java/com/all/pdfreader/pro/app/ui/dialog/BookmarksDialogFragment.kt
index eb11c9b..1f4508c 100644
--- a/app/src/main/java/com/all/pdfreader/pro/app/ui/dialog/BookmarksDialogFragment.kt
+++ b/app/src/main/java/com/all/pdfreader/pro/app/ui/dialog/BookmarksDialogFragment.kt
@@ -4,7 +4,6 @@ import android.os.Bundle
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
-import android.widget.Toast
import androidx.fragment.app.activityViewModels
import androidx.recyclerview.widget.LinearLayoutManager
import com.all.pdfreader.pro.app.R
@@ -105,9 +104,9 @@ class BookmarksDialogFragment(
binding.addBtn.isEnabled = !alreadyBookmarked
if (alreadyBookmarked) {
binding.addTv.text = getString(R.string.added)
- binding.addTv.setTextColor(requireActivity().getColor(R.color.grey_text_color))
+ binding.addTv.setTextColor(requireActivity().getColor(R.color.white))
binding.addBtn.setBackgroundResource(R.drawable.dr_btn_not_clickable_bg)
- binding.addIv.setImageResource(R.drawable.bookmark_icon_red)
+ binding.addIv.setImageResource(R.drawable.bookmark_icon_white)
} else {
binding.addTv.text = getString(R.string.add)
binding.addTv.setTextColor(requireActivity().getColor(R.color.white))
diff --git a/app/src/main/java/com/all/pdfreader/pro/app/ui/dialog/FileDetailsDialogFragment.kt b/app/src/main/java/com/all/pdfreader/pro/app/ui/dialog/FileDetailsDialogFragment.kt
index 0aa3b24..7e2e652 100644
--- a/app/src/main/java/com/all/pdfreader/pro/app/ui/dialog/FileDetailsDialogFragment.kt
+++ b/app/src/main/java/com/all/pdfreader/pro/app/ui/dialog/FileDetailsDialogFragment.kt
@@ -21,6 +21,12 @@ class FileDetailsDialogFragment() : BottomSheetDialogFragment() {
private val viewModel: PdfViewModel by activityViewModels()
private lateinit var pdfDocument: PdfDocumentEntity
+
+ override fun onCreate(savedInstanceState: Bundle?) {
+ super.onCreate(savedInstanceState)
+ setStyle(STYLE_NORMAL, R.style.CustomBottomSheetDialogTheme)
+ }
+
override fun onCreateView(
inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?
): View? {
diff --git a/app/src/main/java/com/all/pdfreader/pro/app/ui/dialog/GotoPageDialogFragment.kt b/app/src/main/java/com/all/pdfreader/pro/app/ui/dialog/GotoPageDialogFragment.kt
index 67ad691..206a838 100644
--- a/app/src/main/java/com/all/pdfreader/pro/app/ui/dialog/GotoPageDialogFragment.kt
+++ b/app/src/main/java/com/all/pdfreader/pro/app/ui/dialog/GotoPageDialogFragment.kt
@@ -69,10 +69,10 @@ class GotoPageDialogFragment(
}
private fun setupOnClick() {
- binding.tvCancel.setOnClickListener {
+ binding.cancelBtn.setOnClickListener {
dismiss()
}
- binding.tvConfirm.setOnClickListener {
+ binding.okBtn.setOnClickListener {
val text = binding.etName.text.toString()
if (validateEnter(text)) {
val pageNumber = text.trim().toInt()
diff --git a/app/src/main/java/com/all/pdfreader/pro/app/ui/dialog/ListMoreDialogFragment.kt b/app/src/main/java/com/all/pdfreader/pro/app/ui/dialog/ListMoreDialogFragment.kt
index ae06bba..851cc60 100644
--- a/app/src/main/java/com/all/pdfreader/pro/app/ui/dialog/ListMoreDialogFragment.kt
+++ b/app/src/main/java/com/all/pdfreader/pro/app/ui/dialog/ListMoreDialogFragment.kt
@@ -229,7 +229,7 @@ class ListMoreDialogFragment(val filePath: String) : BottomSheetDialogFragment()
if (b) {
binding.collectIv.setImageResource(R.drawable.collected)
} else {
- binding.collectIv.setImageResource(R.drawable.collect)
+ binding.collectIv.setImageResource(R.drawable.collect_red)
}
}
@@ -238,7 +238,7 @@ class ListMoreDialogFragment(val filePath: String) : BottomSheetDialogFragment()
binding.passwordIv.setImageResource(R.drawable.unlock)
binding.passwordTv.text = getString(R.string.remove_password)
} else {
- binding.passwordIv.setImageResource(R.drawable.lock)
+ binding.passwordIv.setImageResource(R.drawable.lock_red)
binding.passwordTv.text = getString(R.string.set_password)
}
}
diff --git a/app/src/main/java/com/all/pdfreader/pro/app/ui/dialog/PdfRemovePasswordDialog.kt b/app/src/main/java/com/all/pdfreader/pro/app/ui/dialog/PdfRemovePasswordDialog.kt
index 6b4f260..0bcffc2 100644
--- a/app/src/main/java/com/all/pdfreader/pro/app/ui/dialog/PdfRemovePasswordDialog.kt
+++ b/app/src/main/java/com/all/pdfreader/pro/app/ui/dialog/PdfRemovePasswordDialog.kt
@@ -48,11 +48,11 @@ class PdfRemovePasswordDialog(
}
private fun setupListeners() {
- binding.tvCancel.setOnClickListener {
+ binding.cancelBtn.setOnClickListener {
dismiss()
}
- binding.tvConfirm.setOnClickListener {
+ binding.okBtn.setOnClickListener {
val password = binding.etPassword.text.toString()
if (isPdfPasswordCorrect(requireActivity(), File(filePath), password)) {
onOkClick(password)
diff --git a/app/src/main/java/com/all/pdfreader/pro/app/ui/dialog/PdfSetPasswordDialog.kt b/app/src/main/java/com/all/pdfreader/pro/app/ui/dialog/PdfSetPasswordDialog.kt
index c6c5dba..f840ad7 100644
--- a/app/src/main/java/com/all/pdfreader/pro/app/ui/dialog/PdfSetPasswordDialog.kt
+++ b/app/src/main/java/com/all/pdfreader/pro/app/ui/dialog/PdfSetPasswordDialog.kt
@@ -47,11 +47,11 @@ class PdfSetPasswordDialog(
}
private fun setupListeners() {
- binding.tvCancel.setOnClickListener {
+ binding.cancelBtn.setOnClickListener {
dismiss()
}
- binding.tvConfirm.setOnClickListener {
+ binding.okBtn.setOnClickListener {
val password = binding.etPassword.text.toString()
val confirmPassword = binding.etConfirmPassword.text.toString()
if (validatePassword(password, confirmPassword)) {
diff --git a/app/src/main/java/com/all/pdfreader/pro/app/ui/dialog/RenameDialogFragment.kt b/app/src/main/java/com/all/pdfreader/pro/app/ui/dialog/RenameDialogFragment.kt
index e2c8bc9..debf8c0 100644
--- a/app/src/main/java/com/all/pdfreader/pro/app/ui/dialog/RenameDialogFragment.kt
+++ b/app/src/main/java/com/all/pdfreader/pro/app/ui/dialog/RenameDialogFragment.kt
@@ -94,10 +94,10 @@ class RenameDialogFragment(
}
private fun setupOnClick(oldName: String, filePath: String, bookmark: BookmarkEntity?) {
- binding.tvCancel.setOnClickListener {
+ binding.cancelBtn.setOnClickListener {
dismiss()
}
- binding.tvConfirm.setOnClickListener {
+ binding.okBtn.setOnClickListener {
when (type) {
RenameType.FILE -> {
val text = binding.etName.text.toString()
diff --git a/app/src/main/java/com/all/pdfreader/pro/app/ui/dialog/ViewModelDialogFragment.kt b/app/src/main/java/com/all/pdfreader/pro/app/ui/dialog/ViewModelDialogFragment.kt
index 9c42753..3d71f79 100644
--- a/app/src/main/java/com/all/pdfreader/pro/app/ui/dialog/ViewModelDialogFragment.kt
+++ b/app/src/main/java/com/all/pdfreader/pro/app/ui/dialog/ViewModelDialogFragment.kt
@@ -125,18 +125,18 @@ class ViewModelDialogFragment() : BottomSheetDialogFragment() {
horizontalTv,
horizontalIv,
if (isVertical) requireContext().getColor(R.color.white)
- else requireContext().getColor(R.color.icon_color),
- if (isVertical) requireContext().getColor(R.color.icon_color)
+ else requireContext().getColor(R.color.text_color_lv1),
+ if (isVertical) requireContext().getColor(R.color.text_color_lv1)
else requireContext().getColor(R.color.white)
)
// 垂直
animateIconAndTextColor(
verticalTv,
verticalIv,
- if (isVertical) requireContext().getColor(R.color.icon_color)
+ if (isVertical) requireContext().getColor(R.color.text_color_lv1)
else requireContext().getColor(R.color.white),
if (isVertical) requireContext().getColor(R.color.white)
- else requireContext().getColor(R.color.icon_color)
+ else requireContext().getColor(R.color.text_color_lv1)
)
}
}
diff --git a/app/src/main/res/drawable/add_bookmarks.xml b/app/src/main/res/drawable/add_bookmarks.xml
index be6c50e..1084f8e 100644
--- a/app/src/main/res/drawable/add_bookmarks.xml
+++ b/app/src/main/res/drawable/add_bookmarks.xml
@@ -4,9 +4,9 @@
android:viewportWidth="1024"
android:viewportHeight="1024">
diff --git a/app/src/main/res/drawable/bookmark_icon_red.xml b/app/src/main/res/drawable/bookmark_icon_white.xml
similarity index 82%
rename from app/src/main/res/drawable/bookmark_icon_red.xml
rename to app/src/main/res/drawable/bookmark_icon_white.xml
index fd6d6fa..60ddcb2 100644
--- a/app/src/main/res/drawable/bookmark_icon_red.xml
+++ b/app/src/main/res/drawable/bookmark_icon_white.xml
@@ -9,8 +9,8 @@
diff --git a/app/src/main/res/drawable/collect.xml b/app/src/main/res/drawable/collect.xml
index 2c5ccb1..07fe5e0 100644
--- a/app/src/main/res/drawable/collect.xml
+++ b/app/src/main/res/drawable/collect.xml
@@ -5,5 +5,5 @@
android:viewportHeight="24">
+ android:fillColor="@color/icon_off"/>
diff --git a/app/src/main/res/drawable/collect_red.xml b/app/src/main/res/drawable/collect_red.xml
new file mode 100644
index 0000000..ed4350b
--- /dev/null
+++ b/app/src/main/res/drawable/collect_red.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/app/src/main/res/drawable/color_inversion.xml b/app/src/main/res/drawable/color_inversion.xml
index c8da4fa..b31d43d 100644
--- a/app/src/main/res/drawable/color_inversion.xml
+++ b/app/src/main/res/drawable/color_inversion.xml
@@ -6,15 +6,15 @@
android:viewportHeight="24.0">
\ No newline at end of file
diff --git a/app/src/main/res/drawable/dashed_line.xml b/app/src/main/res/drawable/dashed_line.xml
new file mode 100644
index 0000000..51f9d38
--- /dev/null
+++ b/app/src/main/res/drawable/dashed_line.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
diff --git a/app/src/main/res/drawable/delete_red.xml b/app/src/main/res/drawable/delete_red.xml
new file mode 100644
index 0000000..156b3c6
--- /dev/null
+++ b/app/src/main/res/drawable/delete_red.xml
@@ -0,0 +1,21 @@
+
+
+
+
+
+
+
diff --git a/app/src/main/res/drawable/dr_bg_toggle_group.xml b/app/src/main/res/drawable/dr_bg_toggle_group.xml
index 8271f6e..ca34b36 100644
--- a/app/src/main/res/drawable/dr_bg_toggle_group.xml
+++ b/app/src/main/res/drawable/dr_bg_toggle_group.xml
@@ -1,5 +1,5 @@
-
+
diff --git a/app/src/main/res/drawable/dr_bg_toggle_indicator.xml b/app/src/main/res/drawable/dr_bg_toggle_indicator.xml
index c9580f9..757e559 100644
--- a/app/src/main/res/drawable/dr_bg_toggle_indicator.xml
+++ b/app/src/main/res/drawable/dr_bg_toggle_indicator.xml
@@ -1,5 +1,5 @@
-
+
diff --git a/app/src/main/res/drawable/dr_item_bookmark_page_bg.xml b/app/src/main/res/drawable/dr_item_bookmark_page_bg.xml
index cf7511f..a6b5ecd 100644
--- a/app/src/main/res/drawable/dr_item_bookmark_page_bg.xml
+++ b/app/src/main/res/drawable/dr_item_bookmark_page_bg.xml
@@ -1,6 +1,6 @@
-
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/drw_result_congratulations_bg.xml b/app/src/main/res/drawable/drw_result_congratulations_bg.xml
new file mode 100644
index 0000000..071dbd3
--- /dev/null
+++ b/app/src/main/res/drawable/drw_result_congratulations_bg.xml
@@ -0,0 +1,26 @@
+
+
+
+ -
+
+
+
+
+
+
+ -
+
+
+
+
+
+
+
diff --git a/app/src/main/res/drawable/duplicate.xml b/app/src/main/res/drawable/duplicate.xml
index e79bd83..1e3c56d 100644
--- a/app/src/main/res/drawable/duplicate.xml
+++ b/app/src/main/res/drawable/duplicate.xml
@@ -5,8 +5,8 @@
android:viewportHeight="1024">
+ android:fillColor="@color/icon_on"/>
+ android:fillColor="@color/icon_on"/>
diff --git a/app/src/main/res/drawable/eye_protect.xml b/app/src/main/res/drawable/eye_protect.xml
index 1db7e40..7c0cb07 100644
--- a/app/src/main/res/drawable/eye_protect.xml
+++ b/app/src/main/res/drawable/eye_protect.xml
@@ -8,14 +8,14 @@
android:fillColor="#00000000"
android:pathData="M3.047,12.953C2.984,12.781 2.984,12.595 3.047,12.423C4.293,8.968 7.831,6.476 12,6.476C16.168,6.476 19.704,8.966 20.953,12.419C21.016,12.591 21.016,12.776 20.953,12.948C19.707,16.404 16.17,18.896 12,18.896C7.832,18.896 4.296,16.406 3.047,12.953Z"
android:strokeWidth="1.8"
- android:strokeColor="#ff636366"
+ android:strokeColor="@color/black"
android:strokeLineCap="round"
android:strokeLineJoin="round" />
\ No newline at end of file
diff --git a/app/src/main/res/drawable/eye_protect_active.xml b/app/src/main/res/drawable/eye_protect_active.xml
index 27c902a..e0ef468 100644
--- a/app/src/main/res/drawable/eye_protect_active.xml
+++ b/app/src/main/res/drawable/eye_protect_active.xml
@@ -1,5 +1,11 @@
-
-
+
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/file_delete.xml b/app/src/main/res/drawable/file_delete.xml
index 883a77f..506907e 100644
--- a/app/src/main/res/drawable/file_delete.xml
+++ b/app/src/main/res/drawable/file_delete.xml
@@ -5,8 +5,8 @@
android:viewportHeight="1024">
+ android:fillColor="@color/icon_on"/>
+ android:fillColor="@color/icon_on"/>
diff --git a/app/src/main/res/drawable/file_document.xml b/app/src/main/res/drawable/file_document.xml
index b295851..b27b72d 100644
--- a/app/src/main/res/drawable/file_document.xml
+++ b/app/src/main/res/drawable/file_document.xml
@@ -5,5 +5,5 @@
android:viewportHeight="1024">
+ android:fillColor="@color/icon_off"/>
diff --git a/app/src/main/res/drawable/goto_page.xml b/app/src/main/res/drawable/goto_page.xml
index dbe1efb..7dbdb9d 100644
--- a/app/src/main/res/drawable/goto_page.xml
+++ b/app/src/main/res/drawable/goto_page.xml
@@ -1,12 +1,15 @@
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+ android:pathData="M17.48,22.09H6.48C5.72,22.087 4.992,21.784 4.454,21.247C3.916,20.709 3.613,19.98 3.61,19.22V15.34C3.634,15.116 3.739,14.909 3.906,14.759C4.074,14.608 4.291,14.525 4.515,14.525C4.74,14.525 4.957,14.608 5.124,14.759C5.291,14.909 5.397,15.116 5.42,15.34V19.22C5.42,19.502 5.532,19.773 5.73,19.973C5.929,20.173 6.198,20.287 6.48,20.29H17.48C17.764,20.29 18.036,20.177 18.237,19.977C18.438,19.776 18.55,19.504 18.55,19.22V7.47C18.553,7.332 18.526,7.195 18.473,7.068C18.42,6.94 18.34,6.825 18.24,6.73L15.5,4.01C15.406,3.911 15.293,3.833 15.167,3.78C15.042,3.726 14.907,3.699 14.77,3.7H6.52C6.238,3.703 5.969,3.816 5.77,4.017C5.572,4.217 5.46,4.488 5.46,4.77V9.02C5.437,9.244 5.331,9.451 5.164,9.601C4.997,9.752 4.78,9.835 4.555,9.835C4.331,9.835 4.114,9.752 3.947,9.601C3.779,9.451 3.674,9.244 3.65,9.02V4.77C3.653,4.01 3.956,3.281 4.494,2.744C5.032,2.206 5.76,1.903 6.52,1.9H14.77C15.521,1.901 16.24,2.199 16.77,2.73L19.51,5.45C20.039,5.982 20.341,6.7 20.35,7.45V19.2C20.352,19.578 20.278,19.953 20.135,20.303C19.991,20.653 19.78,20.971 19.514,21.239C19.247,21.508 18.931,21.721 18.582,21.867C18.233,22.013 17.859,22.089 17.48,22.09Z"
+ android:fillColor="#E43521"/>
+ android:pathData="M11.25,16.06C11.132,16.061 11.016,16.037 10.907,15.991C10.799,15.944 10.701,15.876 10.62,15.79C10.535,15.708 10.467,15.609 10.42,15.5C10.374,15.391 10.35,15.274 10.35,15.155C10.35,15.036 10.374,14.919 10.42,14.81C10.467,14.701 10.535,14.602 10.62,14.52L12.98,12.15L10.62,9.78C10.47,9.608 10.39,9.386 10.398,9.157C10.406,8.929 10.5,8.712 10.661,8.551C10.823,8.389 11.039,8.295 11.268,8.288C11.496,8.28 11.719,8.36 11.89,8.51L14.89,11.51C14.976,11.593 15.045,11.693 15.091,11.802C15.138,11.912 15.162,12.031 15.162,12.15C15.162,12.269 15.138,12.388 15.091,12.498C15.045,12.608 14.976,12.707 14.89,12.79L11.89,15.79C11.807,15.875 11.707,15.943 11.597,15.989C11.488,16.036 11.37,16.06 11.25,16.06Z"
+ android:fillColor="#E43521"/>
+
diff --git a/app/src/main/res/drawable/icon_split.xml b/app/src/main/res/drawable/icon_split.xml
index a3cdab0..43d3cd1 100644
--- a/app/src/main/res/drawable/icon_split.xml
+++ b/app/src/main/res/drawable/icon_split.xml
@@ -5,5 +5,5 @@
android:viewportHeight="1024">
+ android:fillColor="@color/icon_on"/>
diff --git a/app/src/main/res/drawable/lock.xml b/app/src/main/res/drawable/lock_red.xml
similarity index 91%
rename from app/src/main/res/drawable/lock.xml
rename to app/src/main/res/drawable/lock_red.xml
index 639d123..c7c6107 100644
--- a/app/src/main/res/drawable/lock.xml
+++ b/app/src/main/res/drawable/lock_red.xml
@@ -4,9 +4,9 @@
android:viewportWidth="1024"
android:viewportHeight="1024">
diff --git a/app/src/main/res/drawable/page_by_page.xml b/app/src/main/res/drawable/page_by_page.xml
index 79ad343..25dcbfa 100644
--- a/app/src/main/res/drawable/page_by_page.xml
+++ b/app/src/main/res/drawable/page_by_page.xml
@@ -9,12 +9,12 @@
android:fillType="evenOdd"
android:pathData="M5.5,4L18.5,4C18.7761,4 19,4.2239 19,4.5L19,15.7929C19,15.9255 18.9473,16.0527 18.8536,16.1464L15.1464,19.8536C15.0527,19.9473 14.9255,20 14.7929,20L5.5,20C5.2239,20 5,19.7761 5,19.5L5,4.5C5,4.2239 5.2239,4 5.5,4Z"
android:strokeWidth="2.0"
- android:strokeColor="@color/icon_color" />
+ android:strokeColor="@color/icon_on" />
\ No newline at end of file
diff --git a/app/src/main/res/drawable/page_icon.xml b/app/src/main/res/drawable/page_icon.xml
index ae3fceb..ca5284f 100644
--- a/app/src/main/res/drawable/page_icon.xml
+++ b/app/src/main/res/drawable/page_icon.xml
@@ -10,26 +10,26 @@
android:fillColor="@android:color/transparent"
android:pathData="M5,4h14v16h-14z"
android:strokeWidth="2"
- android:strokeColor="@color/icon_color"
+ android:strokeColor="@color/black"
android:strokeLineCap="round"
android:strokeLineJoin="round" />
diff --git a/app/src/main/res/drawable/pdf_view_mode.xml b/app/src/main/res/drawable/pdf_view_mode.xml
index bad5069..cb84059 100644
--- a/app/src/main/res/drawable/pdf_view_mode.xml
+++ b/app/src/main/res/drawable/pdf_view_mode.xml
@@ -1,12 +1,21 @@
-
-
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+
+
+
+
diff --git a/app/src/main/res/drawable/print.xml b/app/src/main/res/drawable/print.xml
index 9093a39..bb03d97 100644
--- a/app/src/main/res/drawable/print.xml
+++ b/app/src/main/res/drawable/print.xml
@@ -5,5 +5,5 @@
android:viewportHeight="1024">
+ android:fillColor="@color/icon_on"/>
diff --git a/app/src/main/res/drawable/prompt.xml b/app/src/main/res/drawable/prompt.xml
index 0d7d183..549835b 100644
--- a/app/src/main/res/drawable/prompt.xml
+++ b/app/src/main/res/drawable/prompt.xml
@@ -5,11 +5,11 @@
android:viewportHeight="1024">
+ android:fillColor="@color/icon_on"/>
+ android:fillColor="@color/icon_on"/>
+ android:fillColor="@color/icon_on"/>
diff --git a/app/src/main/res/drawable/read_horizontal.xml b/app/src/main/res/drawable/read_horizontal.xml
index 092c7c9..3b8776a 100644
--- a/app/src/main/res/drawable/read_horizontal.xml
+++ b/app/src/main/res/drawable/read_horizontal.xml
@@ -6,7 +6,7 @@
diff --git a/app/src/main/res/drawable/read_vertical.xml b/app/src/main/res/drawable/read_vertical.xml
index 8a333a3..d4bb701 100644
--- a/app/src/main/res/drawable/read_vertical.xml
+++ b/app/src/main/res/drawable/read_vertical.xml
@@ -6,7 +6,7 @@
diff --git a/app/src/main/res/drawable/rename_text.xml b/app/src/main/res/drawable/rename_text.xml
index c09332a..11e8748 100644
--- a/app/src/main/res/drawable/rename_text.xml
+++ b/app/src/main/res/drawable/rename_text.xml
@@ -1,9 +1,18 @@
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+ android:pathData="M7.34,21.39H5.34C4.962,21.39 4.587,21.315 4.238,21.171C3.888,21.026 3.571,20.814 3.303,20.546C3.036,20.279 2.824,19.961 2.679,19.612C2.534,19.263 2.46,18.888 2.46,18.51V5.51C2.46,4.746 2.763,4.013 3.303,3.473C3.844,2.933 4.576,2.63 5.34,2.63H7.34C7.579,2.63 7.808,2.725 7.976,2.893C8.145,3.062 8.24,3.291 8.24,3.53C8.24,3.768 8.145,3.997 7.976,4.166C7.808,4.335 7.579,4.43 7.34,4.43H5.34C5.054,4.432 4.781,4.547 4.579,4.749C4.377,4.951 4.263,5.224 4.26,5.51V18.51C4.26,18.796 4.374,19.071 4.576,19.274C4.779,19.476 5.054,19.59 5.34,19.59H7.34C7.579,19.59 7.808,19.685 7.976,19.853C8.145,20.022 8.24,20.251 8.24,20.49C8.24,20.729 8.145,20.957 7.976,21.126C7.808,21.295 7.579,21.39 7.34,21.39Z"
+ android:fillColor="#E43521"/>
+
+
+
diff --git a/app/src/main/res/drawable/share.xml b/app/src/main/res/drawable/share.xml
index 9565144..9f8a6aa 100644
--- a/app/src/main/res/drawable/share.xml
+++ b/app/src/main/res/drawable/share.xml
@@ -1,9 +1,12 @@
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+ android:pathData="M11.868,2.125C12.094,2.125 12.311,2.213 12.474,2.369C12.637,2.525 12.733,2.739 12.742,2.964C12.751,3.19 12.673,3.41 12.523,3.579C12.374,3.748 12.165,3.853 11.94,3.872L11.868,3.875H6.908C6.123,3.875 5.369,4.179 4.804,4.723C4.239,5.268 3.906,6.01 3.877,6.794L3.875,6.908V17.092C3.875,17.877 4.179,18.631 4.723,19.196C5.268,19.761 6.01,20.094 6.794,20.123L6.908,20.125H17.092C17.877,20.125 18.631,19.821 19.196,19.277C19.761,18.732 20.094,17.99 20.123,17.206L20.125,17.092V12.106C20.125,11.88 20.212,11.663 20.369,11.5C20.525,11.337 20.738,11.241 20.964,11.232C21.19,11.222 21.41,11.301 21.579,11.45C21.748,11.599 21.853,11.809 21.872,12.033L21.875,12.106V17.092C21.875,19.688 19.807,21.801 17.229,21.873L17.092,21.875H6.908C4.312,21.875 2.199,19.807 2.127,17.229L2.125,17.092V6.908C2.125,4.312 4.193,2.199 6.772,2.127L6.908,2.125H11.868H11.868Z"
+ android:fillColor="#000000"/>
+
diff --git a/app/src/main/res/drawable/share_red.xml b/app/src/main/res/drawable/share_red.xml
new file mode 100644
index 0000000..18ffc7a
--- /dev/null
+++ b/app/src/main/res/drawable/share_red.xml
@@ -0,0 +1,12 @@
+
+
+
+
diff --git a/app/src/main/res/drawable/unlock.xml b/app/src/main/res/drawable/unlock.xml
index fb37054..1c4cf97 100644
--- a/app/src/main/res/drawable/unlock.xml
+++ b/app/src/main/res/drawable/unlock.xml
@@ -5,8 +5,8 @@
android:viewportHeight="1024">
+ android:fillColor="@color/icon_on"/>
+ android:fillColor="@color/icon_on"/>
diff --git a/app/src/main/res/layout/activity_pdf_split_result.xml b/app/src/main/res/layout/activity_pdf_split_result.xml
index 0626a24..1801a07 100644
--- a/app/src/main/res/layout/activity_pdf_split_result.xml
+++ b/app/src/main/res/layout/activity_pdf_split_result.xml
@@ -3,7 +3,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="@color/bg_color"
+ android:background="@mipmap/result_bg_img"
android:orientation="vertical">
+ android:src="@drawable/delete_cha_icon" />
@@ -93,10 +93,11 @@
android:orientation="vertical">
+ android:background="@drawable/dashed_line" />
-
-
-
-
-
+ android:orientation="vertical"
+ android:padding="24dp">
@@ -180,6 +162,24 @@
android:textSize="16sp" />
+
+
+
+
+
diff --git a/app/src/main/res/layout/activity_pdf_view.xml b/app/src/main/res/layout/activity_pdf_view.xml
index 44e2413..186cf81 100644
--- a/app/src/main/res/layout/activity_pdf_view.xml
+++ b/app/src/main/res/layout/activity_pdf_view.xml
@@ -19,7 +19,7 @@
@@ -27,14 +27,12 @@
android:id="@+id/backBtn"
android:layout_width="40dp"
android:layout_height="40dp"
- android:layout_marginStart="8dp"
- android:layout_marginEnd="8dp"
android:background="@drawable/dr_click_effect_oval_transparent"
android:gravity="center">
@@ -80,7 +78,7 @@
android:id="@+id/searchIv"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:src="@drawable/icon_search" />
+ android:src="@drawable/icon_search_black" />
+ android:src="@drawable/icon_search_black" />
@@ -186,7 +184,7 @@
android:id="@+id/pdfview"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="@color/grey" />
+ android:background="@color/line_color" />
@@ -224,12 +222,12 @@
android:src="@drawable/pdf_view_mode" />
@@ -251,12 +249,12 @@
android:src="@drawable/eye_protect" />
@@ -297,12 +295,12 @@
@@ -322,12 +320,12 @@
android:src="@drawable/share" />
diff --git a/app/src/main/res/layout/adapter_item_bookmark_page.xml b/app/src/main/res/layout/adapter_item_bookmark_page.xml
index f26b8d8..2215ff5 100644
--- a/app/src/main/res/layout/adapter_item_bookmark_page.xml
+++ b/app/src/main/res/layout/adapter_item_bookmark_page.xml
@@ -31,7 +31,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Page 1"
- android:textColor="@color/icon_color"
+ android:textColor="@color/text_color_lv1"
android:textSize="16sp" />
@@ -65,8 +65,8 @@
android:gravity="center">
diff --git a/app/src/main/res/layout/adapter_selected_result_item.xml b/app/src/main/res/layout/adapter_selected_result_item.xml
index 0cb4341..7e2fb9b 100644
--- a/app/src/main/res/layout/adapter_selected_result_item.xml
+++ b/app/src/main/res/layout/adapter_selected_result_item.xml
@@ -70,7 +70,7 @@
android:ellipsize="middle"
android:maxLines="1"
android:text="@string/app_name"
- android:textColor="@color/icon_color"
+ android:textColor="@color/text_color_lv1"
android:textSize="16sp" />
diff --git a/app/src/main/res/layout/dialog_bookmarks.xml b/app/src/main/res/layout/dialog_bookmarks.xml
index 4b95cd7..735b647 100644
--- a/app/src/main/res/layout/dialog_bookmarks.xml
+++ b/app/src/main/res/layout/dialog_bookmarks.xml
@@ -105,7 +105,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:text="@string/no_bookmarks_page"
- android:textColor="@color/black"
+ android:textColor="@color/text_color_lv1"
android:textSize="16sp" />
@@ -164,14 +164,14 @@
+ android:src="@drawable/delete_red" />
diff --git a/app/src/main/res/layout/dialog_file_details.xml b/app/src/main/res/layout/dialog_file_details.xml
index 4308879..41071b5 100644
--- a/app/src/main/res/layout/dialog_file_details.xml
+++ b/app/src/main/res/layout/dialog_file_details.xml
@@ -26,7 +26,7 @@
@@ -34,7 +34,7 @@
@@ -49,10 +49,10 @@
+ android:textColor="@color/text_color_lv1"
+ android:textSize="14dp" />
+ android:textColor="@color/text_color_lv1"
+ android:textSize="14dp" />
+ android:textColor="@color/text_color_lv1"
+ android:textSize="14sp" />
+ android:textColor="@color/text_color_lv1"
+ android:textSize="14sp" />
+ android:textColor="@color/text_color_lv1"
+ android:textSize="14sp" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_goto_page.xml b/app/src/main/res/layout/dialog_goto_page.xml
index 6b619bf..e2460c5 100644
--- a/app/src/main/res/layout/dialog_goto_page.xml
+++ b/app/src/main/res/layout/dialog_goto_page.xml
@@ -14,7 +14,7 @@
android:layout_marginBottom="8dp"
style="@style/TextViewFont_PopMedium"
android:text="@string/go_to_page"
- android:textColor="@color/black"
+ android:textColor="@color/text_color_lv1"
android:textSize="20sp" />
-
+ android:layout_weight="1"
+ android:background="@drawable/dr_cancel_btn_bg"
+ android:gravity="center">
-
+
+
+
+
+
+
+
diff --git a/app/src/main/res/layout/dialog_list_more.xml b/app/src/main/res/layout/dialog_list_more.xml
index 2c36c29..efeb709 100644
--- a/app/src/main/res/layout/dialog_list_more.xml
+++ b/app/src/main/res/layout/dialog_list_more.xml
@@ -26,20 +26,20 @@
android:orientation="horizontal">
@@ -47,7 +47,7 @@
+ android:src="@drawable/icon_lock_item" />
@@ -68,8 +68,9 @@
android:layout_height="wrap_content"
android:ellipsize="middle"
android:maxLines="1"
+ android:layout_marginBottom="4dp"
android:text="@string/app_name"
- android:textColor="@color/grey_text_color"
+ android:textColor="@color/text_color_lv1"
android:textSize="16sp" />
+ android:textColor="@color/text_color_lv2"
+ android:textSize="12sp" />
+ android:textColor="@color/text_color_lv2"
+ android:textSize="12sp" />
@@ -112,7 +113,7 @@
android:id="@+id/collectIv"
android:layout_width="24dp"
android:layout_height="24dp"
- android:src="@drawable/collect" />
+ android:src="@drawable/collect_red" />
@@ -139,12 +140,12 @@
android:src="@drawable/goto_page" />
@@ -163,12 +164,12 @@
android:src="@drawable/rename_text" />
@@ -187,12 +188,12 @@
android:src="@drawable/prompt" />
@@ -208,15 +209,15 @@
+ android:src="@drawable/share_red" />
@@ -235,12 +236,12 @@
android:src="@drawable/print" />
@@ -277,8 +278,9 @@
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:text="@string/duplicate_file"
- android:textColor="@color/grey_text_color"
- android:textSize="16sp" />
+ style="@style/TextViewFont_PopMedium"
+ android:textColor="@color/text_color_lv1"
+ android:textSize="14sp" />
+ style="@style/TextViewFont_PopMedium"
+ android:textColor="@color/text_color_lv1"
+ android:textSize="14sp" />
@@ -316,16 +319,17 @@
android:id="@+id/passwordIv"
android:layout_width="24dp"
android:layout_height="24dp"
- android:src="@drawable/lock" />
+ android:src="@drawable/lock_red" />
+ android:textColor="@color/text_color_lv1"
+ android:textSize="14sp" />
+ style="@style/TextViewFont_PopMedium"
+ android:textColor="@color/text_color_lv1"
+ android:textSize="14sp" />
@@ -362,15 +367,16 @@
+ android:src="@drawable/delete_red" />
+ android:textColor="@color/text_color_lv1"
+ android:textSize="14sp" />
diff --git a/app/src/main/res/layout/dialog_pdf_remove_password.xml b/app/src/main/res/layout/dialog_pdf_remove_password.xml
index 9966e8e..96a42a3 100644
--- a/app/src/main/res/layout/dialog_pdf_remove_password.xml
+++ b/app/src/main/res/layout/dialog_pdf_remove_password.xml
@@ -56,29 +56,45 @@
-
+ android:layout_weight="1"
+ android:background="@drawable/dr_cancel_btn_bg"
+ android:gravity="center">
-
+
+
+
+
+
+
+
diff --git a/app/src/main/res/layout/dialog_pdf_set_password.xml b/app/src/main/res/layout/dialog_pdf_set_password.xml
index 486e70c..a7cbab8 100644
--- a/app/src/main/res/layout/dialog_pdf_set_password.xml
+++ b/app/src/main/res/layout/dialog_pdf_set_password.xml
@@ -82,29 +82,44 @@
-
+ android:layout_weight="1"
+ android:background="@drawable/dr_cancel_btn_bg"
+ android:gravity="center">
-
+
+
+
+
+
+
+
diff --git a/app/src/main/res/layout/dialog_rename_file.xml b/app/src/main/res/layout/dialog_rename_file.xml
index 15904a5..b59dffc 100644
--- a/app/src/main/res/layout/dialog_rename_file.xml
+++ b/app/src/main/res/layout/dialog_rename_file.xml
@@ -46,27 +46,45 @@
-
+ android:layout_weight="1"
+ android:background="@drawable/dr_cancel_btn_bg"
+ android:gravity="center">
-
+
+
+
+
+
+
+
diff --git a/app/src/main/res/layout/dialog_view_model.xml b/app/src/main/res/layout/dialog_view_model.xml
index 14061fd..8e5cc6f 100644
--- a/app/src/main/res/layout/dialog_view_model.xml
+++ b/app/src/main/res/layout/dialog_view_model.xml
@@ -79,7 +79,7 @@
android:layout_marginStart="8dp"
android:gravity="center"
android:text="@string/horizontal"
- android:textColor="@color/icon_color"
+ android:textColor="@color/text_color_lv1"
android:textSize="16sp" />
@@ -105,7 +105,7 @@
android:layout_marginStart="8dp"
android:gravity="center"
android:text="@string/vertical"
- android:textColor="@color/icon_color"
+ android:textColor="@color/text_color_lv1"
android:textSize="16sp" />
@@ -133,14 +133,15 @@
android:layout_marginEnd="8dp"
android:layout_weight="1"
android:text="@string/page_by_page"
- android:textColor="@color/icon_color"
+ android:textColor="@color/text_color_lv1"
android:textSize="16sp" />
@@ -164,14 +165,15 @@
android:layout_marginEnd="8dp"
android:layout_weight="1"
android:text="@string/color_inversion"
- android:textColor="@color/icon_color"
+ android:textColor="@color/text_color_lv1"
android:textSize="16sp" />
diff --git a/app/src/main/res/mipmap-xhdpi/result_bg_img.png b/app/src/main/res/mipmap-xhdpi/result_bg_img.png
new file mode 100644
index 0000000..6e81f84
Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/result_bg_img.png differ
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 28cbc7d..0ea02bb 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -14,10 +14,10 @@
#00000000
#E6E6E6
#F8F8F8
- #E0E0E0
+ #E5E5E5
#2c2c2c
#666666
- #80FFD699
+ #33987C0E
#636366
#F1494F
#E43521