This commit is contained in:
ocean 2025-11-06 16:26:11 +08:00
parent a636cdacc0
commit 6d3b6261ce
52 changed files with 475 additions and 286 deletions

View File

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

View File

@ -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? {

View File

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

View File

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

View File

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

View File

@ -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)) {

View File

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

View File

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

View File

@ -4,9 +4,9 @@
android:viewportWidth="1024"
android:viewportHeight="1024">
<path
android:fillColor="#636366"
android:fillColor="@color/black"
android:pathData="M34.5,511.3c0,-79.5 -0.3,-159.4 0,-238.9 0.3,-42.7 8.5,-84 27.3,-122.5 32.4,-66.9 87.7,-105.1 159.1,-118.8 33.8,-6.5 108.9,-8.2 143.7,-8.5 102.4,-1 233.1,-0.7 335.5,-0.3 44,0.3 88.1,1 130.4,15 85.7,28.3 135.2,88.4 152.2,175.4 4.8,23.9 6.5,48.5 6.5,73 0.7,155 0.3,309.9 0,464.9 0,42.7 -8.2,84 -26.6,122.9 -32.4,67.9 -88.1,106.2 -160.4,120.8 -23.6,4.8 -47.8,7.2 -71.7,7.5 -125.3,0.7 -319.1,0.3 -444.8,0 -43.7,0 -86,-8.2 -125.6,-27.6 -67.9,-33.5 -105.5,-89.8 -119.5,-162.5 -4.4,-23.9 -6.1,-48.5 -6.5,-73 -0.3,-75.8 0,-151.6 0.3,-227.3zM518.1,367.3c-3.1,2.7 -5.8,5.1 -8.5,7.2 -29,26.6 -58,53.2 -87,80.2 -15.7,14.7 -33.8,20.5 -55,15.4 -27.3,-6.5 -43.7,-29 -43.7,-59.1L323.9,104.8v-14c-16,2 -70.3,2.7 -84.3,5.5 -65.2,11.6 -110.6,47.1 -127.3,112.6 -6.1,24.9 -9.2,51.2 -9.6,76.8 -0.7,150.9 -0.7,301.4 0,452.3 0,21.5 2.4,43.3 6.5,64.5 11.3,58 43.3,100.4 101.4,117.8 24.6,7.5 50.9,11.6 76.1,11.9 125.6,1.4 319.1,0.7 444.8,0.3 17.7,0 35.5,-1.4 52.9,-4.4 65.2,-11.3 110.6,-46.8 127.3,-112.3 6.5,-25.3 9.2,-51.9 9.6,-77.8 1,-150.5 0.7,-300.7 0,-451.2 0,-24.9 -2.7,-50.5 -8.5,-74.8 -19.8,-83.3 -116.4,-119.8 -201,-118.8L711.7,411.6c0,36.5 -26.3,62.1 -61.1,60.1 -16,-1 -28.7,-9.2 -40.3,-19.8 -30.7,-28 -61.4,-56 -92.2,-84.7zM642,92.5h-247.8v294.9c28.7,-26.3 55.6,-51.5 82.9,-76.5 24.6,-22.5 56.7,-22.9 81.6,0 19.8,18.1 39.3,36.2 58.7,54.3 7.9,7.2 15.4,14 24.6,22.2L642,92.5z" />
<path
android:fillColor="#636366"
android:fillColor="@color/black"
android:pathData="M795.3,661.2h-58.7c0,-19.5 0,-39.3 -0.3,-58.7 0,-6.8 -1.7,-14.3 -4.8,-20.1 -7.2,-14 -22.9,-20.1 -38.2,-16.4 -14.3,3.4 -25.6,17.7 -25.6,34.1 -0.3,20.5 0,41 0,61.4 -19.5,0 -39.3,0 -58.7,0.3 -6.8,0 -14.3,1.7 -20.1,4.8 -14,7.2 -20.1,22.9 -16.4,38.2 3.4,14.3 17.7,25.6 34.1,25.6 20.5,0.3 41,0 61.4,0v58c0,22.2 14.3,37.9 34.1,38.2 20.1,0.3 34.5,-15 34.5,-37.5V730.5h58.4c22.2,0 37.9,-14.3 38.2,-34.1 0,-20.5 -15.4,-34.8 -37.9,-35.2z" />
</vector>

View File

@ -9,8 +9,8 @@
<path
android:pathData="M6,4h12v16l-6,-4l-6,4z"
android:strokeWidth="2"
android:strokeColor="@color/icon_color"
android:fillColor="@color/icon_color"
android:strokeColor="@color/white"
android:fillColor="@color/white"
android:strokeLineJoin="round"
android:strokeLineCap="round" />

View File

@ -5,5 +5,5 @@
android:viewportHeight="24">
<path
android:pathData="M12,23C11.878,22.99 11.759,22.956 11.65,22.9C11.2,22.7 0,17 0,8.45C0.003,6.621 0.73,4.867 2.024,3.574C3.317,2.28 5.071,1.553 6.9,1.55C7.859,1.556 8.806,1.758 9.684,2.145C10.561,2.532 11.349,3.096 12,3.8C12.644,3.087 13.431,2.518 14.31,2.13C15.189,1.742 16.139,1.545 17.1,1.55C18.929,1.553 20.683,2.28 21.976,3.574C23.27,4.867 23.997,6.621 24,8.45C24,17 12.8,22.7 12.35,22.9C12.241,22.956 12.122,22.99 12,23ZM6.9,3.1C5.482,3.103 4.123,3.667 3.12,4.67C2.117,5.673 1.553,7.032 1.55,8.45C1.55,15.25 10.15,20.35 12,21.35C13.85,20.35 22.45,15.25 22.45,8.45C22.464,7.296 22.103,6.168 21.423,5.236C20.742,4.304 19.777,3.618 18.674,3.28C17.57,2.942 16.386,2.971 15.3,3.362C14.215,3.753 13.285,4.486 12.65,5.45C12.577,5.555 12.48,5.641 12.367,5.701C12.254,5.76 12.128,5.791 12,5.791C11.872,5.791 11.746,5.76 11.633,5.701C11.52,5.641 11.423,5.555 11.35,5.45C10.859,4.722 10.196,4.127 9.42,3.717C8.643,3.307 7.778,3.095 6.9,3.1Z"
android:fillColor="#A9A4A4"/>
android:fillColor="@color/icon_off"/>
</vector>

View File

@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:pathData="M12,23C11.878,22.99 11.759,22.956 11.65,22.9C11.2,22.7 0,17 0,8.45C0.003,6.621 0.73,4.867 2.024,3.574C3.317,2.28 5.071,1.553 6.9,1.55C7.859,1.556 8.806,1.758 9.684,2.145C10.561,2.532 11.349,3.096 12,3.8C12.644,3.087 13.431,2.518 14.31,2.13C15.189,1.742 16.139,1.545 17.1,1.55C18.929,1.553 20.683,2.28 21.976,3.574C23.27,4.867 23.997,6.621 24,8.45C24,17 12.8,22.7 12.35,22.9C12.241,22.956 12.122,22.99 12,23ZM6.9,3.1C5.482,3.103 4.123,3.667 3.12,4.67C2.117,5.673 1.553,7.032 1.55,8.45C1.55,15.25 10.15,20.35 12,21.35C13.85,20.35 22.45,15.25 22.45,8.45C22.464,7.296 22.103,6.168 21.423,5.236C20.742,4.304 19.777,3.618 18.674,3.28C17.57,2.942 16.386,2.971 15.3,3.362C14.215,3.753 13.285,4.486 12.65,5.45C12.577,5.555 12.48,5.641 12.367,5.701C12.254,5.76 12.128,5.791 12,5.791C11.872,5.791 11.746,5.76 11.633,5.701C11.52,5.641 11.423,5.555 11.35,5.45C10.859,4.722 10.196,4.127 9.42,3.717C8.643,3.307 7.778,3.095 6.9,3.1Z"
android:fillColor="@color/icon_on"/>
</vector>

View File

@ -6,15 +6,15 @@
android:viewportHeight="24.0">
<path
android:fillAlpha="0.01"
android:fillColor="@color/icon_color"
android:fillColor="@color/icon_on"
android:pathData="M0,0h24v24h-24z"
android:strokeAlpha="0.01" />
<path
android:fillColor="@color/icon_color"
android:fillColor="@color/icon_on"
android:fillType="evenOdd"
android:pathData="M2,12C2,6.477 6.477,2 12,2C17.523,2 22,6.477 22,12C22,17.523 17.523,22 12,22C6.477,22 2,17.523 2,12ZM20,12C20,7.582 16.418,4 12,4C7.582,4 4,7.582 4,12C4,16.418 7.582,20 12,20C16.418,20 20,16.418 20,12Z" />
<path
android:fillColor="@color/icon_color"
android:fillColor="@color/icon_on"
android:fillType="evenOdd"
android:pathData="M12,18C15.314,18 18,15.314 18,12C18,8.686 15.314,6 12,6V18Z" />
</vector>

View File

@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="line">
<!-- 控制虚线高度(用于水平分割线) -->
<size android:height="1dp" />
<!-- 虚线样式 -->
<stroke
android:width="1dp"
android:color="@color/line_color"
android:dashWidth="6dp"
android:dashGap="4dp" />
</shape>

View File

@ -0,0 +1,21 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:pathData="M20.72,6.76H3.28C3.041,6.76 2.812,6.665 2.644,6.496C2.475,6.328 2.38,6.099 2.38,5.86C2.38,5.621 2.475,5.392 2.644,5.224C2.812,5.055 3.041,4.96 3.28,4.96H20.72C20.959,4.96 21.188,5.055 21.356,5.224C21.525,5.392 21.62,5.621 21.62,5.86C21.62,6.099 21.525,6.328 21.356,6.496C21.188,6.665 20.959,6.76 20.72,6.76Z"
android:fillColor="@color/icon_on"/>
<path
android:pathData="M16.11,22.07H7.82C6.916,22.089 6.042,21.749 5.388,21.125C4.734,20.501 4.354,19.643 4.33,18.74V5.86C4.33,5.621 4.425,5.392 4.594,5.224C4.762,5.055 4.991,4.96 5.23,4.96C5.469,4.96 5.698,5.055 5.866,5.224C6.035,5.392 6.13,5.621 6.13,5.86V18.74C6.153,19.166 6.344,19.566 6.66,19.853C6.977,20.139 7.394,20.289 7.82,20.27H16.11C16.535,20.286 16.949,20.135 17.263,19.849C17.577,19.563 17.767,19.164 17.79,18.74V5.86C17.79,5.742 17.813,5.625 17.858,5.516C17.904,5.406 17.97,5.307 18.054,5.224C18.137,5.14 18.236,5.074 18.346,5.028C18.455,4.983 18.572,4.96 18.69,4.96C18.808,4.96 18.925,4.983 19.034,5.028C19.144,5.074 19.243,5.14 19.326,5.224C19.41,5.307 19.476,5.406 19.521,5.516C19.567,5.625 19.59,5.742 19.59,5.86V18.74C19.569,19.643 19.191,20.5 18.538,21.125C17.886,21.749 17.013,22.089 16.11,22.07Z"
android:fillColor="@color/icon_on"/>
<path
android:pathData="M10.01,18.14C9.772,18.137 9.545,18.042 9.376,17.874C9.208,17.705 9.113,17.478 9.11,17.24V9.76C9.11,9.521 9.205,9.292 9.374,9.124C9.542,8.955 9.771,8.86 10.01,8.86C10.249,8.86 10.478,8.955 10.646,9.124C10.815,9.292 10.91,9.521 10.91,9.76V17.24C10.91,17.479 10.815,17.708 10.646,17.876C10.478,18.045 10.249,18.14 10.01,18.14Z"
android:fillColor="@color/icon_on"/>
<path
android:pathData="M13.99,18.14C13.751,18.14 13.522,18.045 13.354,17.876C13.185,17.708 13.09,17.479 13.09,17.24V9.76C13.09,9.521 13.185,9.292 13.354,9.124C13.522,8.955 13.751,8.86 13.99,8.86C14.229,8.86 14.458,8.955 14.626,9.124C14.795,9.292 14.89,9.521 14.89,9.76V17.24C14.89,17.479 14.795,17.708 14.626,17.876C14.458,18.045 14.229,18.14 13.99,18.14Z"
android:fillColor="@color/icon_on"/>
<path
android:pathData="M17.53,6.76H6.38V5.04C6.383,4.216 6.711,3.426 7.294,2.844C7.877,2.261 8.666,1.933 9.49,1.93H14.41C15.236,1.93 16.028,2.257 16.613,2.84C17.198,3.423 17.527,4.214 17.53,5.04V6.76ZM8.18,4.96H15.73C15.707,4.626 15.558,4.313 15.313,4.084C15.068,3.856 14.745,3.729 14.41,3.73H9.49C9.156,3.729 8.834,3.856 8.591,4.085C8.347,4.314 8.2,4.627 8.18,4.96Z"
android:fillColor="@color/icon_on"/>
</vector>

View File

@ -1,5 +1,5 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="@color/grey"/>
<solid android:color="@color/cancel_btn_bg_color"/>
<corners android:radius="24dp"/>
</shape>

View File

@ -1,5 +1,5 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="@color/black"/>
<solid android:color="@color/ok_btn_bg_lv1_color"/>
<corners android:radius="24dp"/>
</shape>

View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="#B3E6E6E6"/>
<solid android:color="@color/placeholder_bg_color"/>
<corners android:radius="12dp" />
</shape>

View File

@ -0,0 +1,26 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item>
<shape android:shape="oval">
<size
android:width="100dp"
android:height="100dp" />
<solid android:color="#C7F4E2" />
</shape>
</item>
<item
android:bottom="4dp"
android:left="4dp"
android:right="4dp"
android:top="4dp">
<shape android:shape="oval">
<size
android:width="80dp"
android:height="80dp" />
<solid android:color="#0FC07B" />
</shape>
</item>
</layer-list>

View File

@ -5,8 +5,8 @@
android:viewportHeight="1024">
<path
android:pathData="M853.3,224h-53.3L800,170.7c0,-40.5 -34.1,-74.7 -74.7,-74.7L170.7,96C130.1,96 96,130.1 96,170.7v554.7c0,40.5 34.1,74.7 74.7,74.7h53.3L224,853.3c0,40.5 34.1,74.7 74.7,74.7h554.7c40.5,0 74.7,-34.1 74.7,-74.7L928,298.7c0,-40.5 -34.1,-74.7 -74.7,-74.7zM160,725.3L160,170.7c0,-6.4 4.3,-10.7 10.7,-10.7h554.7c6.4,0 10.7,4.3 10.7,10.7v554.7c0,6.4 -4.3,10.7 -10.7,10.7L170.7,736c-6.4,0 -10.7,-4.3 -10.7,-10.7zM864,853.3c0,6.4 -4.3,10.7 -10.7,10.7L298.7,864c-6.4,0 -10.7,-4.3 -10.7,-10.7v-53.3L725.3,800c40.5,0 74.7,-34.1 74.7,-74.7L800,288L853.3,288c6.4,0 10.7,4.3 10.7,10.7v554.7z"
android:fillColor="#666666"/>
android:fillColor="@color/icon_on"/>
<path
android:pathData="M576,416h-96V320c0,-17.1 -14.9,-32 -32,-32s-32,14.9 -32,32v96H320c-17.1,0 -32,14.9 -32,32s14.9,32 32,32h96V576c0,17.1 14.9,32 32,32s32,-14.9 32,-32v-96H576c17.1,0 32,-14.9 32,-32s-14.9,-32 -32,-32z"
android:fillColor="#666666"/>
android:fillColor="@color/icon_on"/>
</vector>

View File

@ -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" />
<path
android:fillColor="#00000000"
android:pathData="M14.696,12.686C14.696,13.401 14.412,14.087 13.907,14.592C13.401,15.098 12.715,15.382 12,15.382C11.285,15.382 10.6,15.098 10.094,14.592C9.589,14.087 9.305,13.401 9.305,12.686C9.305,11.971 9.589,11.285 10.094,10.78C10.6,10.274 11.285,9.99 12,9.99C12.715,9.99 13.401,10.274 13.907,10.78C14.412,11.285 14.696,11.971 14.696,12.686Z"
android:strokeWidth="1.8"
android:strokeColor="#ff636366"
android:strokeColor="@color/black"
android:strokeLineCap="round"
android:strokeLineJoin="round" />
</vector>

View File

@ -1,5 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<vector android:height="24.0dip" android:width="24.0dip" android:viewportWidth="24.0" android:viewportHeight="24.0"
xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="#ff1c1c1c" android:pathData="M2.2,11.432C3.584,7.595 7.478,4.89 12,4.89C16.52,4.89 20.412,7.593 21.799,11.427C21.934,11.798 21.933,12.2 21.799,12.569C20.415,16.406 16.521,19.11 12,19.11C7.48,19.11 3.587,16.407 2.2,12.573L2.2,12.572C2.066,12.203 2.066,11.801 2.2,11.432L2.2,11.432ZM9.74,9.74C10.339,9.141 11.152,8.804 12,8.804C12.847,8.804 13.66,9.141 14.259,9.74C14.859,10.34 15.196,11.152 15.196,12C15.196,12.848 14.859,13.66 14.259,14.26C13.66,14.859 12.847,15.196 12,15.196C11.152,15.196 10.339,14.859 9.74,14.26C9.141,13.66 8.804,12.848 8.804,12C8.804,11.152 9.141,10.34 9.74,9.74Z" android:fillType="evenOdd" />
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24.0dip"
android:height="24.0dip"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="@color/black"
android:fillType="evenOdd"
android:pathData="M2.2,11.432C3.584,7.595 7.478,4.89 12,4.89C16.52,4.89 20.412,7.593 21.799,11.427C21.934,11.798 21.933,12.2 21.799,12.569C20.415,16.406 16.521,19.11 12,19.11C7.48,19.11 3.587,16.407 2.2,12.573L2.2,12.572C2.066,12.203 2.066,11.801 2.2,11.432L2.2,11.432ZM9.74,9.74C10.339,9.141 11.152,8.804 12,8.804C12.847,8.804 13.66,9.141 14.259,9.74C14.859,10.34 15.196,11.152 15.196,12C15.196,12.848 14.859,13.66 14.259,14.26C13.66,14.859 12.847,15.196 12,15.196C11.152,15.196 10.339,14.859 9.74,14.26C9.141,13.66 8.804,12.848 8.804,12C8.804,11.152 9.141,10.34 9.74,9.74Z" />
</vector>

View File

@ -5,8 +5,8 @@
android:viewportHeight="1024">
<path
android:pathData="M842.7,285.9l-187.7,-187.7c-14.9,-14.9 -32,-21.3 -53.3,-21.3L234.7,76.8C194.1,74.7 160,108.8 160,149.3v725.3c0,40.5 34.1,74.7 74.7,74.7h554.7c40.5,0 74.7,-34.1 74.7,-74.7L864,337.1c0,-19.2 -8.5,-38.4 -21.3,-51.2zM797.9,330.7c-2.1,2.1 -4.3,0 -8.5,0h-170.7c-6.4,0 -10.7,-4.3 -10.7,-10.7L608,149.3c0,-2.1 0,-6.4 -2.1,-8.5 0,0 2.1,0 2.1,2.1l189.9,187.7zM789.3,885.3L234.7,885.3c-6.4,0 -10.7,-4.3 -10.7,-10.7L224,149.3c0,-6.4 4.3,-10.7 10.7,-10.7h311.5c-2.1,4.3 -2.1,6.4 -2.1,10.7v170.7c0,40.5 34.1,74.7 74.7,74.7h170.7c4.3,0 6.4,0 10.7,-2.1L800,874.7c0,6.4 -4.3,10.7 -10.7,10.7z"
android:fillColor="#666666"/>
android:fillColor="@color/icon_on"/>
<path
android:pathData="M640,586.7H384c-17.1,0 -32,14.9 -32,32s14.9,32 32,32h256c17.1,0 32,-14.9 32,-32s-14.9,-32 -32,-32z"
android:fillColor="#666666"/>
android:fillColor="@color/icon_on"/>
</vector>

View File

@ -5,5 +5,5 @@
android:viewportHeight="1024">
<path
android:pathData="M842.7,285.9l-187.7,-187.7c-14.9,-14.9 -32,-21.3 -53.3,-21.3L234.7,76.8C194.1,74.7 160,108.8 160,149.3v725.3c0,40.5 34.1,74.7 74.7,74.7h554.7c40.5,0 74.7,-34.1 74.7,-74.7L864,337.1c0,-19.2 -8.5,-38.4 -21.3,-51.2zM797.9,330.7c-2.1,2.1 -4.3,0 -8.5,0h-170.7c-6.4,0 -10.7,-4.3 -10.7,-10.7L608,149.3c0,-2.1 0,-6.4 -2.1,-8.5 0,0 2.1,0 2.1,2.1l189.9,187.7zM789.3,885.3L234.7,885.3c-6.4,0 -10.7,-4.3 -10.7,-10.7L224,149.3c0,-6.4 4.3,-10.7 10.7,-10.7h311.5c-2.1,4.3 -2.1,6.4 -2.1,10.7v170.7c0,40.5 34.1,74.7 74.7,74.7h170.7c4.3,0 6.4,0 10.7,-2.1L800,874.7c0,6.4 -4.3,10.7 -10.7,10.7z"
android:fillColor="#cccccc"/>
android:fillColor="@color/icon_off"/>
</vector>

View File

@ -1,12 +1,15 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="256dp"
android:height="256dp"
android:viewportWidth="1024"
android:viewportHeight="1024">
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:pathData="M874.7,544c-17.1,0 -32,14.9 -32,32v256c0,6.4 -4.3,10.7 -10.7,10.7H192c-6.4,0 -10.7,-4.3 -10.7,-10.7V192c0,-6.4 4.3,-10.7 10.7,-10.7h256c17.1,0 32,-14.9 32,-32s-14.9,-32 -32,-32H192C151.5,117.3 117.3,151.5 117.3,192v640c0,40.5 34.1,74.7 74.7,74.7h640c40.5,0 74.7,-34.1 74.7,-74.7V576c0,-17.1 -14.9,-32 -32,-32z"
android:fillColor="#666666"/>
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"/>
<path
android:pathData="M874.7,117.3H640c-17.1,0 -32,14.9 -32,32s14.9,32 32,32h157.9L509.9,467.2c-12.8,12.8 -12.8,32 0,44.8 6.4,6.4 14.9,8.5 23.5,8.5s17.1,-2.1 23.5,-8.5l285.9,-285.9V384c0,17.1 14.9,32 32,32s32,-14.9 32,-32V149.3c0,-17.1 -14.9,-32 -32,-32z"
android:fillColor="#666666"/>
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"/>
<path
android:pathData="M14.26,13.05H4.56C4.442,13.05 4.325,13.027 4.216,12.981C4.107,12.936 4.007,12.87 3.924,12.786C3.84,12.703 3.774,12.604 3.729,12.494C3.683,12.385 3.66,12.268 3.66,12.15C3.66,12.032 3.683,11.915 3.729,11.806C3.774,11.696 3.84,11.597 3.924,11.514C4.007,11.43 4.107,11.364 4.216,11.318C4.325,11.273 4.442,11.25 4.56,11.25H14.26C14.378,11.25 14.495,11.273 14.605,11.318C14.714,11.364 14.813,11.43 14.897,11.514C14.98,11.597 15.046,11.696 15.092,11.806C15.137,11.915 15.16,12.032 15.16,12.15C15.16,12.268 15.137,12.385 15.092,12.494C15.046,12.604 14.98,12.703 14.897,12.786C14.813,12.87 14.714,12.936 14.605,12.981C14.495,13.027 14.378,13.05 14.26,13.05Z"
android:fillColor="#E43521"/>
</vector>

View File

@ -5,5 +5,5 @@
android:viewportHeight="1024">
<path
android:pathData="M255.9,255.9v511.7h511.7v-511.7h-511.7zM703.6,703.6h-383.8v-383.8h383.8v383.8zM895.5,575.7v319.8h-319.8v64h383.8v-383.8zM127.9,447.8v-319.8h319.8v-64h-383.8v383.8z"
android:fillColor="#666666"/>
android:fillColor="@color/icon_on"/>
</vector>

View File

@ -4,9 +4,9 @@
android:viewportWidth="1024"
android:viewportHeight="1024">
<path
android:fillColor="#666666"
android:fillColor="@color/icon_on"
android:pathData="M785.1,416h-61.9v-121.6c0,-108.8 -91.7,-198.4 -202.7,-198.4s-202.7,89.6 -202.7,198.4v121.6h-78.9c-55.5,0 -100.3,44.8 -100.3,100.3v311.5c0,55.5 44.8,100.3 100.3,100.3h546.1c55.5,0 100.3,-44.8 100.3,-100.3L885.3,516.3c0,-55.5 -44.8,-100.3 -100.3,-100.3zM381.9,294.4c0,-74.7 61.9,-134.4 138.7,-134.4s138.7,59.7 138.7,134.4v121.6h-277.3v-121.6zM821.3,827.7c0,19.2 -17.1,36.3 -36.3,36.3L238.9,864c-19.2,0 -36.3,-17.1 -36.3,-36.3L202.7,516.3c0,-19.2 17.1,-36.3 36.3,-36.3h546.1c19.2,0 36.3,17.1 36.3,36.3v311.5z" />
<path
android:fillColor="#666666"
android:fillColor="@color/icon_on"
android:pathData="M512,544c-17.1,0 -32,14.9 -32,32v106.7c0,17.1 14.9,32 32,32s32,-14.9 32,-32v-106.7c0,-17.1 -14.9,-32 -32,-32z" />
</vector>

View File

@ -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" />
<path
android:fillColor="#00000000"
android:fillType="evenOdd"
android:pathData="M18,15L14.5,15C14.2239,15 14,15.2239 14,15.5L14,20L14,20"
android:strokeWidth="2.0"
android:strokeColor="@color/icon_color"
android:strokeColor="@color/icon_on"
android:strokeLineCap="square" />
</vector>

View File

@ -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" />
<path
android:pathData="M8,8h8"
android:strokeWidth="2"
android:strokeColor="@color/icon_color"
android:strokeColor="@color/black"
android:strokeLineCap="round" />
<path
android:pathData="M8,12h8"
android:strokeWidth="2"
android:strokeColor="@color/icon_color"
android:strokeColor="@color/black"
android:strokeLineCap="round" />
<path
android:pathData="M8,16h5"
android:strokeWidth="2"
android:strokeColor="@color/icon_color"
android:strokeColor="@color/black"
android:strokeLineCap="round" />
</vector>

View File

@ -1,12 +1,21 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="32dp"
android:height="32dp"
android:viewportWidth="1024"
android:viewportHeight="1024">
<path
android:fillColor="#636366"
android:pathData="M512,928a32,32 0,0 1,-32 -32V192a32,32 0,1 1,64 0v704a32,32 0,0 1,-32 32z" />
<path
android:fillColor="#636366"
android:pathData="M918.6,967.1H105.4C47.2,967.1 0,918.7 0,859V165C0,105.3 47.2,56.8 105.4,56.8h264c58.4,0 110.4,29.4 142.6,74.4A175.5,175.5 0,0 1,654.6 56.9h264c58.2,0 105.4,48.4 105.4,108.1V858.9c0,59.8 -47.2,108.2 -105.4,108.2zM105.4,126.9c-20.5,0 -37.1,17.1 -37.1,38.1V858.9c0,21.1 16.6,38.1 37.1,38.1h813.1c20.5,0 37.1,-17 37.1,-38.1V165.1a37.6,37.6 0,0 0,-37.1 -38.1h-263.9c-59.8,0 -108.5,49.9 -108.5,111.2A34.6,34.6 0,0 1,512 273.2a34.6,34.6 0,0 1,-34.1 -35c0,-61.4 -48.6,-111.2 -108.5,-111.2H105.4z" />
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:pathData="M16.38,20.98C15.54,20.982 14.719,20.735 14.021,20.27C13.322,19.805 12.777,19.142 12.455,18.367C12.132,17.592 12.048,16.739 12.211,15.915C12.374,15.092 12.778,14.335 13.372,13.742C13.965,13.148 14.722,12.744 15.545,12.581C16.369,12.418 17.222,12.502 17.997,12.825C18.772,13.147 19.434,13.692 19.899,14.391C20.365,15.089 20.612,15.911 20.61,16.75C20.607,17.871 20.161,18.945 19.368,19.738C18.575,20.531 17.501,20.977 16.38,20.98ZM16.38,13.98C15.837,13.978 15.307,14.137 14.855,14.437C14.403,14.737 14.05,15.164 13.841,15.665C13.632,16.165 13.577,16.716 13.681,17.248C13.786,17.781 14.046,18.27 14.429,18.654C14.812,19.038 15.3,19.3 15.832,19.407C16.363,19.513 16.915,19.459 17.416,19.252C17.917,19.045 18.346,18.694 18.647,18.243C18.949,17.792 19.11,17.262 19.11,16.72C19.102,16 18.811,15.313 18.3,14.805C17.789,14.298 17.1,14.012 16.38,14.01V13.98Z"
android:fillColor="#000000"/>
<path
android:pathData="M20.05,21.17C19.951,21.17 19.854,21.151 19.763,21.114C19.672,21.076 19.589,21.02 19.52,20.95L18.42,19.85C18.28,19.709 18.201,19.519 18.201,19.32C18.201,19.121 18.28,18.931 18.42,18.79C18.564,18.651 18.755,18.574 18.955,18.574C19.155,18.574 19.347,18.651 19.49,18.79L20.58,19.89C20.651,19.959 20.707,20.041 20.745,20.132C20.784,20.223 20.804,20.321 20.804,20.42C20.804,20.519 20.784,20.617 20.745,20.708C20.707,20.799 20.651,20.881 20.58,20.95C20.512,21.021 20.43,21.078 20.338,21.116C20.247,21.154 20.149,21.172 20.05,21.17Z"
android:fillColor="#000000"/>
<path
android:pathData="M12.2,22H5.58C4.838,21.997 4.127,21.701 3.603,21.177C3.078,20.652 2.782,19.942 2.78,19.2V4.6C2.782,3.858 3.078,3.148 3.603,2.623C4.127,2.098 4.838,1.803 5.58,1.8H18.16C18.902,1.803 19.612,2.098 20.137,2.623C20.661,3.148 20.957,3.858 20.96,4.6V11.66C20.936,11.884 20.831,12.091 20.664,12.241C20.497,12.392 20.28,12.475 20.055,12.475C19.83,12.475 19.613,12.392 19.446,12.241C19.279,12.091 19.173,11.884 19.15,11.66V4.6C19.15,4.335 19.044,4.08 18.857,3.893C18.669,3.705 18.415,3.6 18.15,3.6H5.58C5.315,3.6 5.06,3.705 4.873,3.893C4.685,4.08 4.58,4.335 4.58,4.6V19.2C4.58,19.465 4.685,19.72 4.873,19.907C5.06,20.095 5.315,20.2 5.58,20.2H12.2C12.439,20.2 12.667,20.295 12.836,20.464C13.005,20.632 13.1,20.861 13.1,21.1C13.1,21.339 13.005,21.568 12.836,21.736C12.667,21.905 12.439,22 12.2,22Z"
android:fillColor="#000000"/>
<path
android:pathData="M16.38,7.98H7.38C7.262,7.98 7.145,7.957 7.036,7.911C6.926,7.866 6.827,7.8 6.744,7.716C6.66,7.633 6.594,7.534 6.548,7.424C6.503,7.315 6.48,7.198 6.48,7.08C6.48,6.962 6.503,6.845 6.548,6.736C6.594,6.626 6.66,6.527 6.744,6.444C6.827,6.36 6.926,6.294 7.036,6.248C7.145,6.203 7.262,6.18 7.38,6.18H16.38C16.619,6.18 16.848,6.275 17.016,6.444C17.185,6.612 17.28,6.841 17.28,7.08C17.28,7.319 17.185,7.548 17.016,7.716C16.848,7.885 16.619,7.98 16.38,7.98Z"
android:fillColor="#000000"/>
<path
android:pathData="M11.64,12.21H7.35C7.111,12.21 6.883,12.115 6.714,11.946C6.545,11.778 6.45,11.549 6.45,11.31C6.45,11.071 6.545,10.842 6.714,10.674C6.883,10.505 7.111,10.41 7.35,10.41H11.64C11.879,10.41 12.108,10.505 12.277,10.674C12.445,10.842 12.54,11.071 12.54,11.31C12.54,11.549 12.445,11.778 12.277,11.946C12.108,12.115 11.879,12.21 11.64,12.21Z"
android:fillColor="#000000"/>
</vector>

View File

@ -5,5 +5,5 @@
android:viewportHeight="1024">
<path
android:pathData="M819.2,364.8h-44.8L774.4,128c0,-17.1 -14.9,-32 -32,-32L281.6,96c-17.1,0 -32,14.9 -32,32v236.8L204.8,364.8c-59.7,0 -108.8,49.1 -108.8,108.8v192c0,59.7 49.1,108.8 108.8,108.8h44.8L249.6,896c0,17.1 14.9,32 32,32h460.8c17.1,0 32,-14.9 32,-32v-121.6h44.8c59.7,0 108.8,-49.1 108.8,-108.8v-192c0,-59.7 -49.1,-108.8 -108.8,-108.8zM313.6,160h396.8v204.8L313.6,364.8L313.6,160zM710.4,864L313.6,864L313.6,620.8h396.8v243.2zM864,665.6c0,25.6 -19.2,44.8 -44.8,44.8h-44.8v-121.6c0,-17.1 -14.9,-32 -32,-32L281.6,556.8c-17.1,0 -32,14.9 -32,32v121.6L204.8,710.4c-25.6,0 -44.8,-19.2 -44.8,-44.8v-192c0,-25.6 19.2,-44.8 44.8,-44.8h614.4c25.6,0 44.8,19.2 44.8,44.8v192z"
android:fillColor="#666666"/>
android:fillColor="@color/icon_on"/>
</vector>

View File

@ -5,11 +5,11 @@
android:viewportHeight="1024">
<path
android:pathData="M512,74.7C270.9,74.7 74.7,270.9 74.7,512S270.9,949.3 512,949.3 949.3,753.1 949.3,512 753.1,74.7 512,74.7zM512,885.3c-204.8,0 -373.3,-168.5 -373.3,-373.3S307.2,138.7 512,138.7 885.3,307.2 885.3,512 716.8,885.3 512,885.3z"
android:fillColor="#666666"/>
android:fillColor="@color/icon_on"/>
<path
android:pathData="M512,320m-42.7,0a42.7,42.7 0,1 0,85.3 0,42.7 42.7,0 1,0 -85.3,0Z"
android:fillColor="#666666"/>
android:fillColor="@color/icon_on"/>
<path
android:pathData="M512,437.3c-17.1,0 -32,14.9 -32,32v234.7c0,17.1 14.9,32 32,32s32,-14.9 32,-32V469.3c0,-17.1 -14.9,-32 -32,-32z"
android:fillColor="#666666"/>
android:fillColor="@color/icon_on"/>
</vector>

View File

@ -6,7 +6,7 @@
<path
android:pathData="M4,7h16v10h-16z"
android:strokeWidth="2"
android:strokeColor="@color/icon_color"
android:strokeColor="@color/black"
android:fillColor="@android:color/transparent"
android:strokeLineJoin="round"
android:strokeLineCap="round" />

View File

@ -6,7 +6,7 @@
<path
android:pathData="M7,4h10v16h-10z"
android:strokeWidth="2"
android:strokeColor="@color/icon_color"
android:strokeColor="@color/black"
android:fillColor="@android:color/transparent"
android:strokeLineJoin="round"
android:strokeLineCap="round" />

View File

@ -1,9 +1,18 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="256dp"
android:height="256dp"
android:viewportWidth="1024"
android:viewportHeight="1024">
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:pathData="M853.3,138.7H170.7c-17.1,0 -32,14.9 -32,32v128c0,17.1 14.9,32 32,32s32,-14.9 32,-32V202.7h277.3v618.7H384c-17.1,0 -32,14.9 -32,32s14.9,32 32,32h256c17.1,0 32,-14.9 32,-32s-14.9,-32 -32,-32h-96v-618.7h277.3V298.7c0,17.1 14.9,32 32,32s32,-14.9 32,-32V170.7c0,-17.1 -14.9,-32 -32,-32z"
android:fillColor="#666666"/>
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"/>
<path
android:pathData="M18.64,21.39H16.64C16.402,21.39 16.173,21.295 16.004,21.126C15.835,20.957 15.74,20.729 15.74,20.49C15.74,20.251 15.835,20.022 16.004,19.853C16.173,19.685 16.402,19.59 16.64,19.59H18.64C18.927,19.59 19.201,19.476 19.404,19.274C19.606,19.071 19.72,18.796 19.72,18.51V5.51C19.718,5.224 19.603,4.951 19.401,4.749C19.199,4.547 18.926,4.432 18.64,4.43H16.64C16.402,4.43 16.173,4.335 16.004,4.166C15.835,3.997 15.74,3.768 15.74,3.53C15.74,3.291 15.835,3.062 16.004,2.893C16.173,2.725 16.402,2.63 16.64,2.63H18.64C19.403,2.633 20.134,2.937 20.674,3.476C21.213,4.016 21.518,4.747 21.52,5.51V18.51C21.518,19.273 21.213,20.004 20.674,20.543C20.134,21.083 19.403,21.387 18.64,21.39Z"
android:fillColor="#E43521"/>
<path
android:pathData="M15.73,9.07H8.35C8.111,9.07 7.883,8.975 7.714,8.807C7.545,8.638 7.45,8.409 7.45,8.17C7.45,7.931 7.545,7.702 7.714,7.534C7.883,7.365 8.111,7.27 8.35,7.27H15.73C15.969,7.27 16.198,7.365 16.367,7.534C16.535,7.702 16.63,7.931 16.63,8.17C16.63,8.409 16.535,8.638 16.367,8.807C16.198,8.975 15.969,9.07 15.73,9.07Z"
android:fillColor="#E43521"/>
<path
android:pathData="M12,17.38C11.761,17.38 11.532,17.285 11.363,17.117C11.194,16.948 11.1,16.719 11.1,16.48V8.17C11.1,7.931 11.194,7.702 11.363,7.534C11.532,7.365 11.761,7.27 12,7.27C12.238,7.27 12.467,7.365 12.636,7.534C12.805,7.702 12.9,7.931 12.9,8.17V16.48C12.9,16.719 12.805,16.948 12.636,17.117C12.467,17.285 12.238,17.38 12,17.38Z"
android:fillColor="#E43521"/>
</vector>

View File

@ -1,9 +1,12 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="256dp"
android:height="256dp"
android:viewportWidth="1024"
android:viewportHeight="1024">
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:pathData="M768.7,703.5c-35.6,0 -67.9,14.8 -91.2,38.4l-309.1,-171.7c9.1,-17.5 14.6,-37.2 14.6,-58.3 0,-12.6 -2.4,-24.4 -5.7,-36l304.6,-189.2c22.7,20.5 52.5,33.2 85.1,33.2 70.5,0 128,-57.5 128,-128S837.7,64 767.2,64s-128,57.5 -128,128c0,14.6 2.9,28.4 7.4,41.5L344.7,420.7c-23,-22.7 -54.7,-37 -89.8,-37 -70.5,0 -128,57.5 -128,128s57.5,128 128,128c25.6,0 49.5,-7.7 69.5,-20.8l321.2,178.4c-3.1,11 -5.2,22.2 -5.2,34.1 0,70.5 57.5,128 128,128s128,-57.5 128,-128S839.3,703.5 768.7,703.5zM767.2,128c35.3,0 64,28.7 64,64s-28.7,64 -64,64 -64,-28.7 -64,-64S731.9,128 767.2,128zM191.1,511.9c0,-35.3 28.7,-64 64,-64s64,28.7 64,64 -28.7,64 -64,64S191.1,547.2 191.1,511.9zM768.7,895.5c-35.3,0 -64,-28.7 -64,-64s28.7,-64 64,-64 64,28.7 64,64C832.7,867 804,895.5 768.7,895.5z"
android:fillColor="#666666"/>
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"/>
<path
android:pathData="M16.754,2.543C16.868,2.357 17.048,2.22 17.257,2.16C17.467,2.099 17.691,2.119 17.887,2.215L17.957,2.254L21.523,4.438C22.237,4.875 21.988,5.968 21.156,6.054C19.281,6.247 17.584,6.954 16.061,8.172C14.837,9.192 13.97,10.275 13.397,11.349C13.223,11.672 13.074,12.008 12.953,12.354L12.894,12.536L12.863,12.65L12.858,12.672C12.811,12.898 12.677,13.096 12.484,13.223C12.291,13.35 12.056,13.396 11.83,13.351C11.604,13.306 11.404,13.173 11.275,12.981C11.147,12.79 11.099,12.555 11.142,12.328C11.221,11.936 11.436,11.309 11.853,10.526C12.53,9.256 13.539,7.995 14.953,6.816C16.085,5.911 17.302,5.244 18.601,4.817L18.727,4.777L17.043,3.746C16.857,3.632 16.72,3.453 16.66,3.243C16.599,3.033 16.619,2.809 16.716,2.613L16.754,2.543Z"
android:fillColor="#000000"/>
</vector>

View File

@ -0,0 +1,12 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
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="@color/icon_on"/>
<path
android:pathData="M16.754,2.543C16.868,2.357 17.048,2.22 17.257,2.16C17.467,2.099 17.691,2.119 17.887,2.215L17.957,2.254L21.523,4.438C22.237,4.875 21.988,5.968 21.156,6.054C19.281,6.247 17.584,6.954 16.061,8.172C14.837,9.192 13.97,10.275 13.397,11.349C13.223,11.672 13.074,12.008 12.953,12.354L12.894,12.536L12.863,12.65L12.858,12.672C12.811,12.898 12.677,13.096 12.484,13.223C12.291,13.35 12.056,13.396 11.83,13.351C11.604,13.306 11.404,13.173 11.275,12.981C11.147,12.79 11.099,12.555 11.142,12.328C11.221,11.936 11.436,11.309 11.853,10.526C12.53,9.256 13.539,7.995 14.953,6.816C16.085,5.911 17.302,5.244 18.601,4.817L18.727,4.777L17.043,3.746C16.857,3.632 16.72,3.453 16.66,3.243C16.599,3.033 16.619,2.809 16.716,2.613L16.754,2.543Z"
android:fillColor="@color/icon_on"/>
</vector>

View File

@ -5,8 +5,8 @@
android:viewportHeight="1024">
<path
android:pathData="M785.1,416L381.9,416v-121.6c0,-74.7 61.9,-134.4 138.7,-134.4 59.7,0 113.1,36.3 132.3,91.7 6.4,17.1 23.5,25.6 40.5,19.2 17.1,-6.4 25.6,-23.5 19.2,-40.5 -27.7,-81.1 -104.5,-134.4 -192,-134.4 -110.9,0 -202.7,89.6 -202.7,198.4v121.6h-78.9c-55.5,0 -100.3,44.8 -100.3,100.3v311.5c0,55.5 44.8,100.3 100.3,100.3h546.1c55.5,0 100.3,-44.8 100.3,-100.3L885.3,516.3c0,-55.5 -44.8,-100.3 -100.3,-100.3zM821.3,827.7c0,19.2 -17.1,36.3 -36.3,36.3L238.9,864c-19.2,0 -36.3,-17.1 -36.3,-36.3L202.7,516.3c0,-19.2 17.1,-36.3 36.3,-36.3h546.1c19.2,0 36.3,17.1 36.3,36.3v311.5z"
android:fillColor="#666666"/>
android:fillColor="@color/icon_on"/>
<path
android:pathData="M512,544c-17.1,0 -32,14.9 -32,32v106.7c0,17.1 14.9,32 32,32s32,-14.9 32,-32v-106.7c0,-17.1 -14.9,-32 -32,-32z"
android:fillColor="#666666"/>
android:fillColor="@color/icon_on"/>
</vector>

View File

@ -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">
<View
@ -66,7 +66,7 @@
android:id="@+id/statusLayout"
android:layout_width="match_parent"
android:layout_height="48dp"
android:gravity="center_vertical"
android:gravity="center_vertical|end"
android:orientation="horizontal">
<LinearLayout
@ -81,7 +81,7 @@
<ImageView
android:layout_width="24dp"
android:layout_height="24dp"
android:src="@drawable/back_black" />
android:src="@drawable/delete_cha_icon" />
</LinearLayout>
</LinearLayout>
@ -93,10 +93,11 @@
android:orientation="vertical">
<ImageView
android:layout_width="56dp"
android:layout_height="56dp"
android:layout_marginTop="16dp"
android:background="@drawable/dr_circular_sel_on_bg"
android:layout_width="60dp"
android:layout_height="60dp"
android:layout_marginTop="58dp"
android:background="@drawable/drw_result_congratulations_bg"
android:padding="10dp"
android:src="@drawable/gou_white" />
<TextView
@ -105,7 +106,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:text="@string/congratulations"
android:textColor="@color/black"
android:textColor="@color/text_color_lv1"
android:textSize="20sp" />
<TextView
@ -119,14 +120,14 @@
android:layout_marginBottom="16dp"
android:gravity="center"
android:text="@string/file_created_success"
android:textColor="@color/black_60"
android:textColor="@color/text_color_lv2"
android:textSize="16sp" />
<View
android:layout_width="match_parent"
android:layout_height="0.5dp"
android:layout_height="2dp"
android:layout_margin="16dp"
android:background="@color/line_color" />
android:background="@drawable/dashed_line" />
<androidx.recyclerview.widget.RecyclerView
@ -140,32 +141,13 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:padding="16dp">
<LinearLayout
android:id="@+id/shareBtn"
android:layout_width="0dp"
android:layout_height="48dp"
android:layout_marginEnd="8dp"
android:layout_weight="1"
android:background="@drawable/dr_cancel_btn_bg"
android:gravity="center">
<TextView
style="@style/TextViewFont_PopSemiBold"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/share_file"
android:textColor="@color/black_60"
android:textSize="16sp" />
</LinearLayout>
android:orientation="vertical"
android:padding="24dp">
<LinearLayout
android:id="@+id/okBtn"
android:layout_width="0dp"
android:layout_width="match_parent"
android:layout_height="48dp"
android:layout_marginStart="8dp"
android:layout_weight="1"
android:background="@drawable/dr_click_btn_bg"
android:gravity="center">
@ -180,6 +162,24 @@
android:textSize="16sp" />
</LinearLayout>
<LinearLayout
android:id="@+id/shareBtn"
android:layout_width="match_parent"
android:layout_height="48dp"
android:layout_marginTop="20dp"
android:layout_weight="1"
android:background="@drawable/dr_cancel_btn_bg"
android:gravity="center">
<TextView
style="@style/TextViewFont_PopSemiBold"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/share_file"
android:textColor="@color/black_60"
android:textSize="16sp" />
</LinearLayout>
</LinearLayout>
</LinearLayout>

View File

@ -19,7 +19,7 @@
<LinearLayout
android:id="@+id/statusLayout"
android:layout_width="match_parent"
android:layout_height="48dp"
android:layout_height="44dp"
android:gravity="center_vertical"
android:orientation="horizontal">
@ -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">
<ImageView
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_width="8dp"
android:layout_height="14dp"
android:src="@drawable/back_black" />
</LinearLayout>
@ -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" />
<ImageView
android:id="@+id/deleteIv"
@ -154,7 +152,7 @@
<ImageView
android:layout_width="24dp"
android:layout_height="24dp"
android:src="@drawable/icon_search" />
android:src="@drawable/icon_search_black" />
</LinearLayout>
@ -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" />
</RelativeLayout>
@ -224,12 +222,12 @@
android:src="@drawable/pdf_view_mode" />
<TextView
style="@style/TextViewFont_PopRegular"
style="@style/TextViewFont_PopMedium"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="2dp"
android:text="@string/view_model"
android:textColor="@color/black"
android:textColor="@color/text_color_lv1"
android:textSize="12sp" />
</LinearLayout>
@ -251,12 +249,12 @@
android:src="@drawable/eye_protect" />
<TextView
style="@style/TextViewFont_PopRegular"
style="@style/TextViewFont_PopMedium"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="2dp"
android:text="@string/eye_protect"
android:textColor="@color/black"
android:textColor="@color/text_color_lv1"
android:textSize="12sp" />
</LinearLayout>
@ -297,12 +295,12 @@
</RelativeLayout>
<TextView
style="@style/TextViewFont_PopRegular"
style="@style/TextViewFont_PopMedium"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="2dp"
android:text="@string/bookmarks"
android:textColor="@color/black"
android:textColor="@color/text_color_lv1"
android:textSize="12sp" />
</LinearLayout>
@ -322,12 +320,12 @@
android:src="@drawable/share" />
<TextView
style="@style/TextViewFont_PopRegular"
style="@style/TextViewFont_PopMedium"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="2dp"
android:text="@string/share_file"
android:textColor="@color/black"
android:textColor="@color/text_color_lv1"
android:textSize="12sp" />
</LinearLayout>

View File

@ -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" />
<TextView
@ -41,7 +41,7 @@
android:layout_height="wrap_content"
android:layout_marginStart="4dp"
android:text="(#1)"
android:textColor="@color/grey_text_color"
android:textColor="@color/text_color_lv2"
android:textSize="12sp" />
</LinearLayout>
@ -65,8 +65,8 @@
android:gravity="center">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_width="24dp"
android:layout_height="24dp"
android:src="@drawable/delete_cha_icon" />
</LinearLayout>

View File

@ -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" />
<TextView
@ -81,7 +81,7 @@
android:ellipsize="end"
android:maxLines="2"
android:text="@string/path_details"
android:textColor="@color/black_60"
android:textColor="@color/text_color_lv2"
android:textSize="12sp" />
</LinearLayout>

View File

@ -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" />
<TextView
@ -115,7 +115,7 @@
android:layout_marginTop="8dp"
android:gravity="center"
android:text="@string/no_bookmarks_page_desc"
android:textColor="@color/grey_text_color"
android:textColor="@color/text_color_lv2"
android:textSize="14sp" />
@ -164,14 +164,14 @@
<ImageView
android:layout_width="24dp"
android:layout_height="24dp"
android:src="@drawable/file_delete" />
android:src="@drawable/delete_red" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="12dp"
android:text="@string/delete_all_pages"
android:textColor="@color/grey_text_color"
android:textColor="@color/text_color_lv1"
android:textSize="16sp" />
</LinearLayout>
</LinearLayout>

View File

@ -26,7 +26,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
style="@style/TextViewFont_PopMedium"
style="@style/TextViewFont_PopSemiBold"
android:text="@string/file_information"
android:textColor="@color/black"
android:textSize="18sp" />
@ -34,7 +34,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
style="@style/TextViewFont_PopRegular"
style="@style/TextViewFont_PopMedium"
android:text="@string/file_information_desc"
android:textColor="@color/black_60"
android:textSize="14sp" />
@ -49,10 +49,10 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
style="@style/TextViewFont_PopRegular"
style="@style/TextViewFont_PopMedium"
android:text="@string/file_name"
android:textColor="@color/black_60"
android:textSize="12sp" />
android:textColor="@color/text_color_lv1"
android:textSize="14dp" />
<TextView
android:id="@+id/fileNameTv"
@ -61,16 +61,16 @@
android:layout_marginBottom="12dp"
style="@style/TextViewFont_PopMedium"
android:text="@string/file_name"
android:textColor="@color/black"
android:textColor="@color/text_color_lv2"
android:textSize="14sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
style="@style/TextViewFont_PopRegular"
style="@style/TextViewFont_PopMedium"
android:text="@string/path"
android:textColor="@color/black_60"
android:textSize="12sp" />
android:textColor="@color/text_color_lv1"
android:textSize="14dp" />
<TextView
android:id="@+id/pathTv"
@ -79,16 +79,16 @@
android:layout_marginBottom="12dp"
style="@style/TextViewFont_PopMedium"
android:text="@string/path"
android:textColor="@color/black"
android:textColor="@color/text_color_lv2"
android:textSize="14sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
style="@style/TextViewFont_PopRegular"
style="@style/TextViewFont_PopMedium"
android:text="@string/last_modified"
android:textColor="@color/black_60"
android:textSize="12sp" />
android:textColor="@color/text_color_lv1"
android:textSize="14sp" />
<TextView
android:id="@+id/lastModifiedTv"
@ -97,16 +97,16 @@
android:layout_marginBottom="12dp"
style="@style/TextViewFont_PopMedium"
android:text="@string/last_modified"
android:textColor="@color/black"
android:textColor="@color/text_color_lv2"
android:textSize="14sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
style="@style/TextViewFont_PopRegular"
style="@style/TextViewFont_PopMedium"
android:text="@string/last_viewed"
android:textColor="@color/black_60"
android:textSize="12sp" />
android:textColor="@color/text_color_lv1"
android:textSize="14sp" />
<TextView
android:id="@+id/lastViewedTv"
@ -115,16 +115,16 @@
android:layout_marginBottom="12dp"
style="@style/TextViewFont_PopMedium"
android:text="@string/last_viewed"
android:textColor="@color/black"
android:textColor="@color/text_color_lv2"
android:textSize="14sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
style="@style/TextViewFont_PopRegular"
style="@style/TextViewFont_PopMedium"
android:text="@string/size"
android:textColor="@color/black_60"
android:textSize="12sp" />
android:textColor="@color/text_color_lv1"
android:textSize="14sp" />
<TextView
android:id="@+id/sizeTv"
@ -133,7 +133,7 @@
android:layout_marginBottom="16dp"
style="@style/TextViewFont_PopMedium"
android:text="@string/size"
android:textColor="@color/black"
android:textColor="@color/text_color_lv2"
android:textSize="14sp" />
</LinearLayout>
</LinearLayout>

View File

@ -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" />
<TextView
@ -23,7 +23,7 @@
style="@style/TextViewFont_PopRegular"
android:layout_marginBottom="16dp"
android:text="@string/go_to_page_desc"
android:textColor="@color/black_60"
android:textColor="@color/text_color_lv2"
android:textSize="16sp" />
<RelativeLayout
@ -55,27 +55,45 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="end"
android:layout_marginTop="24dp"
android:orientation="horizontal">
<TextView
android:id="@+id/tvCancel"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
<LinearLayout
android:id="@+id/cancelBtn"
android:layout_width="0dp"
android:layout_height="48dp"
android:layout_marginEnd="8dp"
style="@style/TextViewFont_PopRegular"
android:padding="12dp"
android:text="@string/cancel"
android:textColor="@color/black_80" />
android:layout_weight="1"
android:background="@drawable/dr_cancel_btn_bg"
android:gravity="center">
<TextView
android:id="@+id/tvConfirm"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
style="@style/TextViewFont_PopSemiBold"
android:padding="12dp"
android:text="@string/go_to_page"
android:textColor="@color/black" />
<TextView
style="@style/TextViewFont_PopSemiBold"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/cancel"
android:textColor="@color/black_60"
android:textSize="16sp" />
</LinearLayout>
<LinearLayout
android:id="@+id/okBtn"
android:layout_width="0dp"
android:layout_height="48dp"
android:layout_marginStart="8dp"
android:layout_weight="1"
android:background="@drawable/dr_click_btn_bg"
android:gravity="center">
<TextView
android:id="@+id/okBtnTv"
style="@style/TextViewFont_PopSemiBold"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/go_to_page"
android:textColor="@color/white"
android:textSize="16sp" />
</LinearLayout>
</LinearLayout>

View File

@ -26,20 +26,20 @@
android:orientation="horizontal">
<RelativeLayout
android:layout_width="48dp"
android:layout_height="48dp"
android:layout_width="60dp"
android:layout_height="60dp"
android:background="@drawable/dr_item_img_frame">
<ImageView
android:id="@+id/tvFileImg"
android:layout_width="48dp"
android:layout_height="48dp"
android:layout_width="60dp"
android:layout_height="60dp"
android:src="@mipmap/ic_launcher_round" />
<LinearLayout
android:id="@+id/lock_layout"
android:layout_width="48dp"
android:layout_height="48dp"
android:layout_width="60dp"
android:layout_height="60dp"
android:background="@drawable/dr_item_lock_bg"
android:gravity="center"
android:visibility="gone">
@ -47,7 +47,7 @@
<ImageView
android:layout_width="24dp"
android:layout_height="24dp"
android:src="@drawable/lock" />
android:src="@drawable/icon_lock_item" />
</LinearLayout>
</RelativeLayout>
@ -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" />
<LinearLayout
@ -80,22 +81,22 @@
<TextView
android:id="@+id/tvFileDate"
style="@style/TextViewFont_PopRegular"
style="@style/TextViewFont_PopMedium"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/app_name"
android:textColor="@color/black_60"
android:textSize="14sp" />
android:textColor="@color/text_color_lv2"
android:textSize="12sp" />
<TextView
android:id="@+id/tvFileSize"
style="@style/TextViewFont_PopRegular"
style="@style/TextViewFont_PopMedium"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:text="@string/app_name"
android:textColor="@color/black_60"
android:textSize="14sp" />
android:textColor="@color/text_color_lv2"
android:textSize="12sp" />
</LinearLayout>
@ -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" />
</LinearLayout>
</LinearLayout>
@ -139,12 +140,12 @@
android:src="@drawable/goto_page" />
<TextView
style="@style/TextViewFont_PopRegular"
style="@style/TextViewFont_PopMedium"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:text="@string/go_to_page"
android:textColor="@color/grey_text_color"
android:textColor="@color/text_color_lv1"
android:textSize="14sp" />
</LinearLayout>
@ -163,12 +164,12 @@
android:src="@drawable/rename_text" />
<TextView
style="@style/TextViewFont_PopRegular"
style="@style/TextViewFont_PopMedium"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:text="@string/rename_file"
android:textColor="@color/grey_text_color"
android:textColor="@color/text_color_lv1"
android:textSize="14sp" />
</LinearLayout>
@ -187,12 +188,12 @@
android:src="@drawable/prompt" />
<TextView
style="@style/TextViewFont_PopRegular"
style="@style/TextViewFont_PopMedium"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:text="@string/file_details"
android:textColor="@color/grey_text_color"
android:textColor="@color/text_color_lv1"
android:textSize="14sp" />
</LinearLayout>
@ -208,15 +209,15 @@
<ImageView
android:layout_width="24dp"
android:layout_height="24dp"
android:src="@drawable/share" />
android:src="@drawable/share_red" />
<TextView
style="@style/TextViewFont_PopRegular"
style="@style/TextViewFont_PopMedium"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:text="@string/share_file"
android:textColor="@color/grey_text_color"
android:textColor="@color/text_color_lv1"
android:textSize="14sp" />
</LinearLayout>
@ -235,12 +236,12 @@
android:src="@drawable/print" />
<TextView
style="@style/TextViewFont_PopRegular"
style="@style/TextViewFont_PopMedium"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:text="@string/print_pdf"
android:textColor="@color/grey_text_color"
android:textColor="@color/text_color_lv1"
android:textSize="14sp" />
</LinearLayout>
@ -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" />
</LinearLayout>
<LinearLayout
@ -299,8 +301,9 @@
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:text="@string/split_pdf"
android:textColor="@color/grey_text_color"
android:textSize="16sp" />
style="@style/TextViewFont_PopMedium"
android:textColor="@color/text_color_lv1"
android:textSize="14sp" />
</LinearLayout>
@ -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" />
<TextView
android:id="@+id/passwordTv"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
style="@style/TextViewFont_PopMedium"
android:text="@string/set_password"
android:textColor="@color/grey_text_color"
android:textSize="16sp" />
android:textColor="@color/text_color_lv1"
android:textSize="14sp" />
</LinearLayout>
<LinearLayout
@ -346,8 +350,9 @@
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:text="@string/remove_recent"
android:textColor="@color/grey_text_color"
android:textSize="16sp" />
style="@style/TextViewFont_PopMedium"
android:textColor="@color/text_color_lv1"
android:textSize="14sp" />
</LinearLayout>
@ -362,15 +367,16 @@
<ImageView
android:layout_width="24dp"
android:layout_height="24dp"
android:src="@drawable/delete" />
android:src="@drawable/delete_red" />
<TextView
android:layout_width="match_parent"
style="@style/TextViewFont_PopMedium"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:text="@string/delete_file"
android:textColor="@color/grey_text_color"
android:textSize="16sp" />
android:textColor="@color/text_color_lv1"
android:textSize="14sp" />
</LinearLayout>
</LinearLayout>

View File

@ -56,29 +56,45 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="end"
android:layout_marginTop="24dp"
android:orientation="horizontal">
<TextView
android:id="@+id/tvCancel"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
<LinearLayout
android:id="@+id/cancelBtn"
android:layout_width="0dp"
android:layout_height="48dp"
android:layout_marginEnd="8dp"
style="@style/TextViewFont_PopRegular"
android:padding="12dp"
android:text="@string/cancel"
android:textColor="@color/black_80"
android:textSize="16sp" />
android:layout_weight="1"
android:background="@drawable/dr_cancel_btn_bg"
android:gravity="center">
<TextView
android:id="@+id/tvConfirm"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
style="@style/TextViewFont_PopMedium"
android:padding="12dp"
android:text="@string/ok"
android:textColor="@color/black"
android:textSize="16sp" />
<TextView
style="@style/TextViewFont_PopSemiBold"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/cancel"
android:textColor="@color/black_60"
android:textSize="16sp" />
</LinearLayout>
<LinearLayout
android:id="@+id/okBtn"
android:layout_width="0dp"
android:layout_height="48dp"
android:layout_marginStart="8dp"
android:layout_weight="1"
android:background="@drawable/dr_click_btn_bg"
android:gravity="center">
<TextView
android:id="@+id/okBtnTv"
style="@style/TextViewFont_PopSemiBold"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/go_to_page"
android:textColor="@color/white"
android:textSize="16sp" />
</LinearLayout>
</LinearLayout>

View File

@ -82,29 +82,44 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="end"
android:orientation="horizontal">
<TextView
android:id="@+id/tvCancel"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
<LinearLayout
android:id="@+id/cancelBtn"
android:layout_width="0dp"
android:layout_height="48dp"
android:layout_marginEnd="8dp"
style="@style/TextViewFont_PopRegular"
android:padding="12dp"
android:text="@string/cancel"
android:textColor="@color/black_80"
android:textSize="16sp" />
android:layout_weight="1"
android:background="@drawable/dr_cancel_btn_bg"
android:gravity="center">
<TextView
android:id="@+id/tvConfirm"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
style="@style/TextViewFont_PopMedium"
android:padding="12dp"
android:text="@string/ok"
android:textColor="@color/black"
android:textSize="16sp" />
<TextView
style="@style/TextViewFont_PopSemiBold"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/cancel"
android:textColor="@color/black_60"
android:textSize="16sp" />
</LinearLayout>
<LinearLayout
android:id="@+id/okBtn"
android:layout_width="0dp"
android:layout_height="48dp"
android:layout_marginStart="8dp"
android:layout_weight="1"
android:background="@drawable/dr_click_btn_bg"
android:gravity="center">
<TextView
android:id="@+id/okBtnTv"
style="@style/TextViewFont_PopSemiBold"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/ok"
android:textColor="@color/white"
android:textSize="16sp" />
</LinearLayout>
</LinearLayout>

View File

@ -46,27 +46,45 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="end"
android:layout_marginTop="24dp"
android:orientation="horizontal">
<TextView
android:id="@+id/tvCancel"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
<LinearLayout
android:id="@+id/cancelBtn"
android:layout_width="0dp"
android:layout_height="48dp"
android:layout_marginEnd="8dp"
style="@style/TextViewFont_PopRegular"
android:padding="12dp"
android:text="@string/cancel"
android:textColor="@color/black_80" />
android:layout_weight="1"
android:background="@drawable/dr_cancel_btn_bg"
android:gravity="center">
<TextView
android:id="@+id/tvConfirm"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
style="@style/TextViewFont_PopMedium"
android:padding="12dp"
android:text="@string/ok"
android:textColor="@color/black" />
<TextView
style="@style/TextViewFont_PopSemiBold"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/cancel"
android:textColor="@color/black_60"
android:textSize="16sp" />
</LinearLayout>
<LinearLayout
android:id="@+id/okBtn"
android:layout_width="0dp"
android:layout_height="48dp"
android:layout_marginStart="8dp"
android:layout_weight="1"
android:background="@drawable/dr_click_btn_bg"
android:gravity="center">
<TextView
android:id="@+id/okBtnTv"
style="@style/TextViewFont_PopSemiBold"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/ok"
android:textColor="@color/white"
android:textSize="16sp" />
</LinearLayout>
</LinearLayout>

View File

@ -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" />
</LinearLayout>
@ -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" />
</LinearLayout>
@ -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" />
<com.all.pdfreader.pro.app.ui.view.CustomSwitchButton
android:id="@+id/switchPageByPage"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:sb_background="@color/grey"
app:sb_background="@color/line_color"
app:sb_checked_color="@color/icon_on"
app:sb_show_indicator="false" />
</LinearLayout>
@ -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" />
<com.all.pdfreader.pro.app.ui.view.CustomSwitchButton
android:id="@+id/switchColorInversion"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:sb_background="@color/grey"
app:sb_background="@color/line_color"
app:sb_checked_color="@color/icon_on"
app:sb_show_indicator="false" />
</LinearLayout>

Binary file not shown.

After

Width:  |  Height:  |  Size: 198 KiB

View File

@ -14,10 +14,10 @@
<color name="transparent">#00000000</color>
<color name="grey">#E6E6E6</color>
<color name="bg_color">#F8F8F8</color>
<color name="line_color">#E0E0E0</color>
<color name="line_color">#E5E5E5</color>
<color name="black_img_color">#2c2c2c</color>
<color name="grey_text_color">#666666</color>
<color name="eye_protection_color">#80FFD699</color>
<color name="eye_protection_color">#33987C0E</color>
<color name="icon_color">#636366</color>
<color name="red">#F1494F</color>
<color name="icon_sel_on_color">#E43521</color>