2-group-android/PDFReaderPro
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

暂时去掉immersionbar，寻找适配问题。

Browse Source
This commit is contained in:
ocean 2025-11-11 17:23:33 +08:00
parent 3fa8ea357c
commit 854c0debc1
18 changed files with 399 additions and 454 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle.kts
View File

@ -74,8 +74,8 @@ dependencies {
testImplementation(libs.junit) testImplementation(libs.junit)
androidTestImplementation(libs.androidx.junit) androidTestImplementation(libs.androidx.junit)
androidTestImplementation(libs.androidx.espresso.core) androidTestImplementation(libs.androidx.espresso.core)
implementation(libs.immersionbar) // implementation(libs.immersionbar)
implementation(libs.immersionbar.ktx) // implementation(libs.immersionbar.ktx)
implementation(libs.androidx.room.runtime) implementation(libs.androidx.room.runtime)
ksp(libs.androidx.room.compiler) ksp(libs.androidx.room.compiler)
implementation(libs.androidx.room.ktx) implementation(libs.androidx.room.ktx)

4
app/src/main/AndroidManifest.xml
View File

@ -36,9 +36,9 @@
android:label="@string/app_name" android:label="@string/app_name"
android:requestLegacyExternalStorage="true" android:requestLegacyExternalStorage="true"
android:roundIcon="@mipmap/app_logo" android:roundIcon="@mipmap/app_logo"
android:largeHeap="true"
android:supportsRtl="true" android:supportsRtl="true"
android:theme="@style/Theme.PDFReaderPro" android:theme="@style/Theme.PDFReaderPro">
tools:targetApi="36">
<meta-data <meta-data
android:name="android.max_aspect" android:name="android.max_aspect"
android:value="2.4" /> android:value="2.4" />

4
app/src/main/java/com/all/pdfreader/pro/app/ui/act/BaseActivity.kt
View File

@ -3,11 +3,10 @@ package com.all.pdfreader.pro.app.ui.act
import android.os.Bundle import android.os.Bundle
import android.util.Log import android.util.Log
import androidx.appcompat.app.AppCompatActivity import androidx.appcompat.app.AppCompatActivity
import com.all.pdfreader.pro.app.R import androidx.core.view.WindowCompat
import com.all.pdfreader.pro.app.room.repository.PdfRepository import com.all.pdfreader.pro.app.room.repository.PdfRepository
import com.all.pdfreader.pro.app.sp.AppStore import com.all.pdfreader.pro.app.sp.AppStore
import com.all.pdfreader.pro.app.util.ToastUtils import com.all.pdfreader.pro.app.util.ToastUtils
import com.gyf.immersionbar.ImmersionBar
abstract class BaseActivity : AppCompatActivity() { abstract class BaseActivity : AppCompatActivity() {
@ -15,6 +14,7 @@ abstract class BaseActivity : AppCompatActivity() {
protected val appStore by lazy { AppStore(this) } protected val appStore by lazy { AppStore(this) }
override fun onCreate(savedInstanceState: Bundle?) { override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState) super.onCreate(savedInstanceState)
WindowCompat.setDecorFitsSystemWindows(window, true)
Log.d("ocean", "🚀 ${javaClass.simpleName} onCreate") Log.d("ocean", "🚀 ${javaClass.simpleName} onCreate")
} }

3
app/src/main/java/com/all/pdfreader/pro/app/ui/act/FAQActivity.kt
View File

@ -7,7 +7,6 @@ import android.widget.TextView
import androidx.core.text.HtmlCompat import androidx.core.text.HtmlCompat
import com.all.pdfreader.pro.app.R import com.all.pdfreader.pro.app.R
import com.all.pdfreader.pro.app.databinding.ActivityFaqBinding import com.all.pdfreader.pro.app.databinding.ActivityFaqBinding
import com.gyf.immersionbar.ImmersionBar
class FAQActivity : BaseActivity() { class FAQActivity : BaseActivity() {
override val TAG: String = "FAQActivity" override val TAG: String = "FAQActivity"
@ -22,8 +21,6 @@ class FAQActivity : BaseActivity() {
super.onCreate(savedInstanceState) super.onCreate(savedInstanceState)
binding = ActivityFaqBinding.inflate(layoutInflater) binding = ActivityFaqBinding.inflate(layoutInflater)
setContentView(binding.root) setContentView(binding.root)
ImmersionBar.with(this).statusBarView(binding.view).statusBarDarkFont(true)
.navigationBarColor(R.color.white).init()
initView() initView()
} }

11
app/src/main/java/com/all/pdfreader/pro/app/ui/act/MainActivity.kt
View File

@ -32,9 +32,6 @@ import com.all.pdfreader.pro.app.util.PdfScanner
import com.all.pdfreader.pro.app.util.StoragePermissionHelper import com.all.pdfreader.pro.app.util.StoragePermissionHelper
import com.all.pdfreader.pro.app.viewmodel.PdfViewModel import com.all.pdfreader.pro.app.viewmodel.PdfViewModel
import com.all.pdfreader.pro.app.viewmodel.observeEvent import com.all.pdfreader.pro.app.viewmodel.observeEvent
import com.gyf.immersionbar.ImmersionBar
import com.gyf.immersionbar.NavigationBarType
import com.gyf.immersionbar.OnNavigationBarListener
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
import java.io.File import java.io.File
@ -59,18 +56,10 @@ class MainActivity : BaseActivity(), PermissionDialogFragment.PermissionCallback
override fun onCreate(savedInstanceState: Bundle?) { override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState) super.onCreate(savedInstanceState)
setTheme(R.style.Theme_PDFReaderPro)
binding = ActivityMainBinding.inflate(layoutInflater) binding = ActivityMainBinding.inflate(layoutInflater)
setContentView(binding.root) setContentView(binding.root)
setupDoubleBackExit() setupDoubleBackExit()
initObserve() initObserve()
ImmersionBar
.with(this)
.statusBarView(binding.view)
.statusBarDarkFont(false)
.navigationBarColor(R.color.red)
.init()
setupFragments() setupFragments()
setupNavigation() setupNavigation()
pdfScanner = PdfScanner(this, pdfRepository) pdfScanner = PdfScanner(this, pdfRepository)

6
app/src/main/java/com/all/pdfreader/pro/app/ui/act/MergePdfActivity.kt
View File

@ -19,12 +19,8 @@ import com.all.pdfreader.pro.app.ui.dialog.PdfPasswordProtectionDialogFragment
import com.all.pdfreader.pro.app.ui.dialog.PromptDialogFragment import com.all.pdfreader.pro.app.ui.dialog.PromptDialogFragment
import com.all.pdfreader.pro.app.util.AppUtils.setClickWithAnimation import com.all.pdfreader.pro.app.util.AppUtils.setClickWithAnimation
import com.all.pdfreader.pro.app.util.AppUtils.setOnSingleClickListener import com.all.pdfreader.pro.app.util.AppUtils.setOnSingleClickListener
import com.all.pdfreader.pro.app.util.FileUtils.isPdfEncrypted
import com.gyf.immersionbar.ImmersionBar
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
import kotlinx.coroutines.suspendCancellableCoroutine import kotlinx.coroutines.suspendCancellableCoroutine
import kotlinx.coroutines.withContext
import java.io.File import java.io.File
class MergePdfActivity : BaseActivity() { class MergePdfActivity : BaseActivity() {
@ -38,8 +34,6 @@ class MergePdfActivity : BaseActivity() {
binding = ActivityPdfMergeBinding.inflate(layoutInflater) binding = ActivityPdfMergeBinding.inflate(layoutInflater)
setContentView(binding.root) setContentView(binding.root)
setupBackPressedCallback() setupBackPressedCallback()
ImmersionBar.with(this).statusBarView(binding.view).statusBarDarkFont(true)
.navigationBarColor(R.color.white).init()
val list: ArrayList<PdfDocumentEntity> = requireParcelableArrayList(EXTRA_PDF_LIST) val list: ArrayList<PdfDocumentEntity> = requireParcelableArrayList(EXTRA_PDF_LIST)
updateContinueNowBtnState(list.size >= 2) updateContinueNowBtnState(list.size >= 2)
lifecycleScope.launch { lifecycleScope.launch {

4
app/src/main/java/com/all/pdfreader/pro/app/ui/act/PdfPickerActivity.kt
View File

@ -7,7 +7,6 @@ import android.os.Build
import android.os.Bundle import android.os.Bundle
import android.os.Parcelable import android.os.Parcelable
import android.view.View import android.view.View
import android.widget.Toast
import androidx.activity.result.contract.ActivityResultContracts import androidx.activity.result.contract.ActivityResultContracts
import androidx.lifecycle.lifecycleScope import androidx.lifecycle.lifecycleScope
import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.LinearLayoutManager
@ -25,7 +24,6 @@ import com.all.pdfreader.pro.app.util.AppUtils.printPdfFile
import com.all.pdfreader.pro.app.util.AppUtils.setClickWithAnimation import com.all.pdfreader.pro.app.util.AppUtils.setClickWithAnimation
import com.all.pdfreader.pro.app.util.AppUtils.setOnSingleClickListener import com.all.pdfreader.pro.app.util.AppUtils.setOnSingleClickListener
import com.all.pdfreader.pro.app.util.ToastUtils import com.all.pdfreader.pro.app.util.ToastUtils
import com.gyf.immersionbar.ImmersionBar
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
import java.io.File import java.io.File
import java.io.Serializable import java.io.Serializable
@ -51,8 +49,6 @@ class PdfPickerActivity : BaseActivity() {
} }
fromActivityResult = intent.getStringExtra(EXTRA_FROM) ?: "" fromActivityResult = intent.getStringExtra(EXTRA_FROM) ?: ""
historyList = requireParcelableArrayList(EXTRA_HISTORY_LIST) historyList = requireParcelableArrayList(EXTRA_HISTORY_LIST)
ImmersionBar.with(this).statusBarView(binding.view).statusBarDarkFont(true)
.navigationBarColor(R.color.white).init()
updateViewAndState() updateViewAndState()
initView() initView()
setupClick() setupClick()

3
app/src/main/java/com/all/pdfreader/pro/app/ui/act/PdfResultActivity.kt
View File

@ -34,7 +34,6 @@ import com.all.pdfreader.pro.app.util.ToastUtils
import com.bumptech.glide.Glide import com.bumptech.glide.Glide
import com.bumptech.glide.load.resource.bitmap.CenterCrop import com.bumptech.glide.load.resource.bitmap.CenterCrop
import com.bumptech.glide.load.resource.bitmap.RoundedCorners import com.bumptech.glide.load.resource.bitmap.RoundedCorners
import com.gyf.immersionbar.ImmersionBar
import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext import kotlinx.coroutines.withContext
@ -127,8 +126,6 @@ class PdfResultActivity : BaseActivity() {
binding = ActivityPdfSplitResultBinding.inflate(layoutInflater) binding = ActivityPdfSplitResultBinding.inflate(layoutInflater)
setContentView(binding.root) setContentView(binding.root)
setupBackPressedCallback() setupBackPressedCallback()
ImmersionBar.with(this).statusBarView(binding.view).statusBarDarkFont(true)
.navigationBarColor(R.color.bg_color).init()
source = getSerializableOrDefault(EXTRA_SOURCE, PdfPickerSource.NONE) source = getSerializableOrDefault(EXTRA_SOURCE, PdfPickerSource.NONE)
if (source == PdfPickerSource.NONE) { if (source == PdfPickerSource.NONE) {
showToast(getString(R.string.pdf_loading_failed)) showToast(getString(R.string.pdf_loading_failed))

3
app/src/main/java/com/all/pdfreader/pro/app/ui/act/PdfToImageActivity.kt
View File

@ -16,7 +16,6 @@ import com.all.pdfreader.pro.app.ui.dialog.PdfPasswordProtectionDialogFragment
import com.all.pdfreader.pro.app.util.AppUtils.setOnSingleClickListener import com.all.pdfreader.pro.app.util.AppUtils.setOnSingleClickListener
import com.all.pdfreader.pro.app.util.FileUtils.isPdfEncrypted import com.all.pdfreader.pro.app.util.FileUtils.isPdfEncrypted
import com.all.pdfreader.pro.app.util.PdfUtils import com.all.pdfreader.pro.app.util.PdfUtils
import com.gyf.immersionbar.ImmersionBar
import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext import kotlinx.coroutines.withContext
@ -50,8 +49,6 @@ class PdfToImageActivity : BaseActivity() {
super.onCreate(savedInstanceState) super.onCreate(savedInstanceState)
binding = ActivityPdfToImgBinding.inflate(layoutInflater) binding = ActivityPdfToImgBinding.inflate(layoutInflater)
setContentView(binding.root) setContentView(binding.root)
ImmersionBar.with(this).statusBarView(binding.view).statusBarDarkFont(true)
.navigationBarColor(R.color.bg_color).init()
filePath = intent.getStringExtra(EXTRA_PDF_PATH) filePath = intent.getStringExtra(EXTRA_PDF_PATH)
?: throw IllegalArgumentException("PDF file hash is required") ?: throw IllegalArgumentException("PDF file hash is required")
source = getSerializableOrDefault(EXTRA_SOURCE, PdfPickerSource.NONE) source = getSerializableOrDefault(EXTRA_SOURCE, PdfPickerSource.NONE)

17
app/src/main/java/com/all/pdfreader/pro/app/ui/act/PdfViewActivity.kt
View File

@ -8,14 +8,12 @@ import android.text.TextWatcher
import android.view.MotionEvent import android.view.MotionEvent
import android.view.View import android.view.View
import android.view.inputmethod.EditorInfo import android.view.inputmethod.EditorInfo
import android.widget.Toast
import androidx.activity.OnBackPressedCallback import androidx.activity.OnBackPressedCallback
import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.ViewModelProvider
import androidx.lifecycle.lifecycleScope import androidx.lifecycle.lifecycleScope
import com.all.pdfreader.pro.app.R import com.all.pdfreader.pro.app.R
import com.all.pdfreader.pro.app.databinding.ActivityPdfViewBinding import com.all.pdfreader.pro.app.databinding.ActivityPdfViewBinding
import com.all.pdfreader.pro.app.model.FileActionEvent import com.all.pdfreader.pro.app.model.FileActionEvent
import com.all.pdfreader.pro.app.model.PdfPickerSource
import com.all.pdfreader.pro.app.room.entity.PdfDocumentEntity import com.all.pdfreader.pro.app.room.entity.PdfDocumentEntity
import com.all.pdfreader.pro.app.ui.dialog.BookmarksDialogFragment import com.all.pdfreader.pro.app.ui.dialog.BookmarksDialogFragment
import com.all.pdfreader.pro.app.ui.dialog.ListMoreDialogFragment import com.all.pdfreader.pro.app.ui.dialog.ListMoreDialogFragment
@ -34,13 +32,10 @@ import com.github.barteksc.pdfviewer.listener.OnErrorListener
import com.github.barteksc.pdfviewer.listener.OnLoadCompleteListener import com.github.barteksc.pdfviewer.listener.OnLoadCompleteListener
import com.github.barteksc.pdfviewer.listener.OnPageChangeListener import com.github.barteksc.pdfviewer.listener.OnPageChangeListener
import com.github.barteksc.pdfviewer.listener.OnTapListener import com.github.barteksc.pdfviewer.listener.OnTapListener
import com.gyf.immersionbar.BarHide
import com.gyf.immersionbar.ImmersionBar
import com.tom_roush.pdfbox.pdmodel.PDDocument import com.tom_roush.pdfbox.pdmodel.PDDocument
import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.Job import kotlinx.coroutines.Job
import kotlinx.coroutines.delay import kotlinx.coroutines.delay
import kotlinx.coroutines.flow.collectLatest
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext import kotlinx.coroutines.withContext
import java.io.File import java.io.File
@ -77,8 +72,6 @@ class PdfViewActivity : BaseActivity(), OnLoadCompleteListener, OnPageChangeList
super.onCreate(savedInstanceState) super.onCreate(savedInstanceState)
binding = ActivityPdfViewBinding.inflate(layoutInflater) binding = ActivityPdfViewBinding.inflate(layoutInflater)
setContentView(binding.root) setContentView(binding.root)
ImmersionBar.with(this).statusBarView(binding.view).statusBarDarkFont(true)
.navigationBarColor(R.color.white).init()
setupDoubleBackExit() setupDoubleBackExit()
initObserve() initObserve()
val filePath = intent.getStringExtra(EXTRA_PDF_HASH) val filePath = intent.getStringExtra(EXTRA_PDF_HASH)
@ -391,12 +384,12 @@ class PdfViewActivity : BaseActivity(), OnLoadCompleteListener, OnPageChangeList
isFullScreen = !isFullScreen isFullScreen = !isFullScreen
updateStatusAndNavigationLayout(isFullScreen) updateStatusAndNavigationLayout(isFullScreen)
if (isFullScreen) { if (isFullScreen) {
ImmersionBar.with(this).hideBar(BarHide.FLAG_HIDE_BAR).init() // ImmersionBar.with(this).hideBar(BarHide.FLAG_HIDE_BAR).init()
} else { } else {
val navColor = val navColor =
if (appStore.isEyeCareMode) R.color.eye_protection_color else R.color.white if (appStore.isEyeCareMode) R.color.eye_protection_color else R.color.white
ImmersionBar.with(this).statusBarView(binding.view).statusBarDarkFont(true) // ImmersionBar.with(this).statusBarView(binding.view).statusBarDarkFont(true)
.navigationBarColor(navColor).hideBar(BarHide.FLAG_SHOW_BAR).init() // .navigationBarColor(navColor).hideBar(BarHide.FLAG_SHOW_BAR).init()
} }
} }
@ -423,8 +416,8 @@ class PdfViewActivity : BaseActivity(), OnLoadCompleteListener, OnPageChangeList
binding.eyeCareOverlay.visibility = View.GONE binding.eyeCareOverlay.visibility = View.GONE
binding.eyeProtectIv.setImageResource(R.drawable.eye_protect) binding.eyeProtectIv.setImageResource(R.drawable.eye_protect)
} }
ImmersionBar.with(this).statusBarView(binding.view).statusBarDarkFont(true) // ImmersionBar.with(this).statusBarView(binding.view).statusBarDarkFont(true)
.navigationBarColor(navColor).init() // .navigationBarColor(navColor).init()
} }
private fun setupDoubleBackExit() { private fun setupDoubleBackExit() {

3
app/src/main/java/com/all/pdfreader/pro/app/ui/act/PrivacyPolicyActivity.kt
View File

@ -8,7 +8,6 @@ import android.webkit.WebView
import android.webkit.WebViewClient import android.webkit.WebViewClient
import com.all.pdfreader.pro.app.R import com.all.pdfreader.pro.app.R
import com.all.pdfreader.pro.app.databinding.ActPrivacyPolicyBinding import com.all.pdfreader.pro.app.databinding.ActPrivacyPolicyBinding
import com.gyf.immersionbar.ImmersionBar
class PrivacyPolicyActivity : BaseActivity() { class PrivacyPolicyActivity : BaseActivity() {
private lateinit var binding: ActPrivacyPolicyBinding private lateinit var binding: ActPrivacyPolicyBinding
@ -18,8 +17,6 @@ class PrivacyPolicyActivity : BaseActivity() {
super.onCreate(savedInstanceState) super.onCreate(savedInstanceState)
binding = ActPrivacyPolicyBinding.inflate(layoutInflater) binding = ActPrivacyPolicyBinding.inflate(layoutInflater)
setContentView(binding.root) setContentView(binding.root)
ImmersionBar.with(this).statusBarView(binding.view).statusBarDarkFont(true)
.navigationBarColor(R.color.bg_color).init()
binding.backBtn.setOnClickListener { binding.backBtn.setOnClickListener {
finish() finish()
} }

3
app/src/main/java/com/all/pdfreader/pro/app/ui/act/SearchActivity.kt
View File

@ -26,7 +26,6 @@ import com.all.pdfreader.pro.app.ui.dialog.PromptDialogFragment
import com.all.pdfreader.pro.app.util.AppUtils.printPdfFile import com.all.pdfreader.pro.app.util.AppUtils.printPdfFile
import com.all.pdfreader.pro.app.util.AppUtils.showKeyboard import com.all.pdfreader.pro.app.util.AppUtils.showKeyboard
import com.all.pdfreader.pro.app.util.ToastUtils import com.all.pdfreader.pro.app.util.ToastUtils
import com.gyf.immersionbar.ImmersionBar
import kotlinx.coroutines.Job import kotlinx.coroutines.Job
import kotlinx.coroutines.delay import kotlinx.coroutines.delay
import kotlinx.coroutines.flow.collectLatest import kotlinx.coroutines.flow.collectLatest
@ -65,8 +64,6 @@ class SearchActivity : BaseActivity() {
super.onCreate(savedInstanceState) super.onCreate(savedInstanceState)
binding = ActivitySearchPdfBinding.inflate(layoutInflater) binding = ActivitySearchPdfBinding.inflate(layoutInflater)
setContentView(binding.root) setContentView(binding.root)
ImmersionBar.with(this).statusBarView(binding.view).statusBarDarkFont(true)
.navigationBarColor(R.color.bg_color).init()
source = getSerializableOrDefault(EXTRA_SOURCE, PdfPickerSource.NONE) source = getSerializableOrDefault(EXTRA_SOURCE, PdfPickerSource.NONE)
sp = getSharedPreferences(PREF_SEARCH_HISTORY, MODE_PRIVATE) sp = getSharedPreferences(PREF_SEARCH_HISTORY, MODE_PRIVATE)
loadHistory() loadHistory()

8
app/src/main/java/com/all/pdfreader/pro/app/ui/act/SplashActivity.kt
View File

@ -6,7 +6,6 @@ import android.os.Bundle
import android.os.Handler import android.os.Handler
import android.os.Looper import android.os.Looper
import com.all.pdfreader.pro.app.databinding.ActivitySplashBinding import com.all.pdfreader.pro.app.databinding.ActivitySplashBinding
import com.gyf.immersionbar.ImmersionBar
@SuppressLint("CustomSplashScreen") @SuppressLint("CustomSplashScreen")
class SplashActivity : BaseActivity() { class SplashActivity : BaseActivity() {
@ -22,13 +21,6 @@ class SplashActivity : BaseActivity() {
override fun onCreate(savedInstanceState: Bundle?) { override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState) super.onCreate(savedInstanceState)
binding = ActivitySplashBinding.inflate(layoutInflater) binding = ActivitySplashBinding.inflate(layoutInflater)
ImmersionBar
.with(this)
.fullScreen(true)
.statusBarDarkFont(true)
.transparentNavigationBar()
.init()
// 设置启动页布局 // 设置启动页布局
setContentView(binding.root) setContentView(binding.root)

3
app/src/main/java/com/all/pdfreader/pro/app/ui/act/SplitPdfActivity.kt
View File

@ -23,7 +23,6 @@ import com.all.pdfreader.pro.app.util.AppUtils.setOnSingleClickListener
import com.all.pdfreader.pro.app.util.FileUtils.isPdfEncrypted import com.all.pdfreader.pro.app.util.FileUtils.isPdfEncrypted
import com.all.pdfreader.pro.app.util.FileUtils.toUnderscoreDateTime import com.all.pdfreader.pro.app.util.FileUtils.toUnderscoreDateTime
import com.all.pdfreader.pro.app.util.PdfUtils import com.all.pdfreader.pro.app.util.PdfUtils
import com.gyf.immersionbar.ImmersionBar
import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext import kotlinx.coroutines.withContext
@ -64,8 +63,6 @@ class SplitPdfActivity : BaseActivity() {
binding = ActivityPdfSplitBinding.inflate(layoutInflater) binding = ActivityPdfSplitBinding.inflate(layoutInflater)
setContentView(binding.root) setContentView(binding.root)
setupBackPressedCallback() setupBackPressedCallback()
ImmersionBar.with(this).statusBarView(binding.view).statusBarDarkFont(true)
.navigationBarColor(R.color.bg_color).init()
filePath = intent.getStringExtra(EXTRA_PDF_PATH) filePath = intent.getStringExtra(EXTRA_PDF_PATH)
?: throw IllegalArgumentException("PDF file hash is required") ?: throw IllegalArgumentException("PDF file hash is required")
if (filePath.isEmpty()) { if (filePath.isEmpty()) {

2
app/src/main/java/com/all/pdfreader/pro/app/ui/dialog/ListMoreDialogFragment.kt
View File

@ -124,7 +124,7 @@ class ListMoreDialogFragment(val filePath: String) : BottomSheetDialogFragment()
binding.lockLayout.visibility = View.GONE binding.lockLayout.visibility = View.GONE
binding.tvFileImg.visibility = View.VISIBLE binding.tvFileImg.visibility = View.VISIBLE
Glide.with(binding.root).load(pdfDocument.thumbnailPath) Glide.with(binding.root).load(pdfDocument.thumbnailPath)
.transform(CenterCrop(), RoundedCorners(8.dpToPx(binding.root.context))) .transform(CenterCrop(), RoundedCorners(4.dpToPx(binding.root.context)))
.into(binding.tvFileImg) .into(binding.tvFileImg)
} }
updateCollectUi(isFavorite) updateCollectUi(isFavorite)

766
app/src/main/res/layout/activity_main.xml
View File

@ -3,458 +3,462 @@
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/drawer_layout" android:id="@+id/drawer_layout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent">
android:orientation="vertical">
<LinearLayout <FrameLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent">
android:background="#E43521"
android:orientation="vertical">
<View
android:id="@+id/view"
android:layout_width="match_parent"
android:layout_height="0dp" />
<LinearLayout
android:id="@+id/topLayout"
android:layout_width="match_parent"
android:layout_height="56dp"
android:gravity="center_vertical"
android:orientation="horizontal">
<LinearLayout
android:id="@+id/sidebarBtn"
android:layout_width="44dp"
android:layout_height="44dp"
android:layout_marginStart="6dp"
android:background="@drawable/dr_click_effect_oval_transparent"
android:gravity="center"
android:visibility="visible">
<ImageView
android:layout_width="24dp"
android:layout_height="24dp"
android:src="@drawable/icon_sidebar" />
</LinearLayout>
<TextView
style="@style/TextViewFont_PopSemiBold"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="6dp"
android:layout_marginEnd="6dp"
android:layout_weight="1"
android:text="@string/app_name"
android:textColor="@color/white"
android:textSize="18sp" />
<LinearLayout
android:id="@+id/topButtonLayout"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal">
<LinearLayout
android:id="@+id/searchBtn"
android:layout_width="44dp"
android:layout_height="44dp"
android:background="@drawable/dr_click_effect_oval_transparent"
android:gravity="center">
<ImageView
android:layout_width="24dp"
android:layout_height="24dp"
android:src="@drawable/icon_search" />
</LinearLayout>
<LinearLayout
android:id="@+id/multiSelectBtn"
android:layout_width="44dp"
android:layout_height="44dp"
android:layout_marginEnd="6dp"
android:background="@drawable/dr_click_effect_oval_transparent"
android:gravity="center">
<ImageView
android:layout_width="24dp"
android:layout_height="24dp"
android:src="@drawable/icon_multi_select" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
<LinearLayout
android:id="@+id/multiSelectTopLayout"
android:layout_width="match_parent"
android:layout_height="56dp"
android:gravity="center_vertical"
android:orientation="horizontal"
android:visibility="visible">
<LinearLayout
android:id="@+id/multiSelectBackBtn"
android:layout_width="44dp"
android:layout_height="44dp"
android:layout_marginStart="6dp"
android:background="@drawable/dr_click_effect_oval_transparent"
android:gravity="center">
<ImageView
android:layout_width="24dp"
android:layout_height="24dp"
android:src="@drawable/back_white" />
</LinearLayout>
<TextView
android:id="@+id/multiSelectNumberTv"
style="@style/TextViewFont_PopMedium"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="6dp"
android:layout_marginEnd="6dp"
android:layout_weight="1"
android:text="@string/selected_page"
android:textColor="@color/white"
android:textSize="18sp" />
<LinearLayout
android:id="@+id/multiSelectAllBtn"
android:layout_width="44dp"
android:layout_height="44dp"
android:layout_marginEnd="6dp"
android:gravity="center">
<ImageView
android:layout_width="24dp"
android:layout_height="24dp"
android:src="@drawable/icon_select_all" />
</LinearLayout>
</LinearLayout>
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginTop="24dp" android:background="#E43521"
android:background="@drawable/dr_top_left_radius_white_bg"
android:orientation="vertical"> android:orientation="vertical">
<LinearLayout <View
android:id="@+id/view"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0dp" android:layout_height="0dp" />
android:layout_weight="1"
android:orientation="vertical">
<FrameLayout
android:id="@+id/fragment_fl"
android:layout_width="match_parent"
android:layout_height="match_parent" />
</LinearLayout>
<LinearLayout <LinearLayout
android:id="@+id/tab_layout" android:id="@+id/topLayout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="56dp"
android:layout_gravity="bottom" android:gravity="center_vertical"
android:orientation="vertical"> android:orientation="horizontal">
<LinearLayout <LinearLayout
android:id="@+id/pnLayout" android:id="@+id/sidebarBtn"
android:layout_width="match_parent" android:layout_width="44dp"
android:layout_height="64dp" android:layout_height="44dp"
android:background="@drawable/dr_rounded_corner_top_bg_grey" android:layout_marginStart="6dp"
android:gravity="center_vertical" android:background="@drawable/dr_click_effect_oval_transparent"
android:orientation="horizontal" android:gravity="center"
android:paddingStart="16dp"
android:paddingEnd="16dp"
android:visibility="visible"> android:visibility="visible">
<ImageView <ImageView
android:layout_width="24dp" android:layout_width="24dp"
android:layout_height="24dp" android:layout_height="24dp"
android:src="@drawable/icon_notice" /> android:src="@drawable/icon_sidebar" />
<LinearLayout
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:layout_weight="1"
android:gravity="center_vertical"
android:orientation="vertical">
<TextView
style="@style/TextViewFont_PopMedium"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/notice"
android:textColor="@color/black"
android:textSize="14sp" />
<TextView
style="@style/TextViewFont_PopRegular"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="end"
android:maxLines="2"
android:text="@string/permission_notice"
android:textColor="@color/black_60"
android:textSize="12sp" />
</LinearLayout>
<LinearLayout
android:id="@+id/pnGoBtn"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:gravity="center">
<TextView
style="@style/TextViewFont_PopSemiBold"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/dr_click_btn_bg"
android:paddingStart="24dp"
android:paddingTop="4dp"
android:paddingEnd="24dp"
android:paddingBottom="4dp"
android:text="@string/go"
android:textColor="@color/white"
android:textSize="14sp" />
</LinearLayout>
</LinearLayout> </LinearLayout>
<View
android:layout_width="match_parent" <TextView
android:layout_height="0.5dp" style="@style/TextViewFont_PopSemiBold"
android:background="@color/line_color" /> android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="6dp"
android:layout_marginEnd="6dp"
android:layout_weight="1"
android:text="@string/app_name"
android:textColor="@color/white"
android:textSize="18sp" />
<LinearLayout <LinearLayout
android:id="@+id/navigationLayout" android:id="@+id/topButtonLayout"
android:layout_width="match_parent" android:layout_width="wrap_content"
android:layout_height="64dp" android:layout_height="wrap_content"
android:background="@color/white"
android:orientation="horizontal"> android:orientation="horizontal">
<LinearLayout <LinearLayout
android:id="@+id/home_ll_btn" android:id="@+id/searchBtn"
android:layout_width="0dp" android:layout_width="44dp"
android:layout_height="match_parent" android:layout_height="44dp"
android:layout_weight="1" android:background="@drawable/dr_click_effect_oval_transparent"
android:background="@drawable/dr_click_effect_rectangle_transparent" android:gravity="center">
android:gravity="center"
android:orientation="vertical">
<ImageView <ImageView
android:id="@+id/home_iv"
android:layout_width="24dp" android:layout_width="24dp"
android:layout_height="24dp" android:layout_height="24dp"
android:src="@drawable/icon_home_sel_on" /> android:src="@drawable/icon_search" />
<TextView
android:id="@+id/home_tv"
style="@style/TextViewFont_PopMedium"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/home"
android:textColor="@color/black"
android:textSize="12sp" />
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
android:id="@+id/recently_ll_btn" android:id="@+id/multiSelectBtn"
android:layout_width="0dp" android:layout_width="44dp"
android:layout_height="match_parent" android:layout_height="44dp"
android:layout_weight="1" android:layout_marginEnd="6dp"
android:background="@drawable/dr_click_effect_rectangle_transparent" android:background="@drawable/dr_click_effect_oval_transparent"
android:gravity="center" android:gravity="center">
android:orientation="vertical">
<ImageView <ImageView
android:id="@+id/recently_iv"
android:layout_width="24dp" android:layout_width="24dp"
android:layout_height="24dp" android:layout_height="24dp"
android:src="@drawable/icon_recently_sel_off" /> android:src="@drawable/icon_multi_select" />
<TextView
android:id="@+id/recently_tv"
style="@style/TextViewFont_PopMedium"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/recently"
android:textColor="@color/black"
android:textSize="12sp" />
</LinearLayout> </LinearLayout>
</LinearLayout>
</LinearLayout>
<LinearLayout <LinearLayout
android:id="@+id/favorite_ll_btn" android:id="@+id/multiSelectTopLayout"
android:layout_width="0dp" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="56dp"
android:layout_weight="1" android:gravity="center_vertical"
android:background="@drawable/dr_click_effect_rectangle_transparent" android:orientation="horizontal"
android:gravity="center" android:visibility="visible">
android:orientation="vertical">
<ImageView <LinearLayout
android:id="@+id/favorite_iv" android:id="@+id/multiSelectBackBtn"
android:layout_width="24dp" android:layout_width="44dp"
android:layout_height="24dp" android:layout_height="44dp"
android:src="@drawable/collect" /> android:layout_marginStart="6dp"
android:background="@drawable/dr_click_effect_oval_transparent"
android:gravity="center">
<TextView <ImageView
android:id="@+id/favorite_tv" android:layout_width="24dp"
style="@style/TextViewFont_PopMedium" android:layout_height="24dp"
android:layout_width="wrap_content" android:src="@drawable/back_white" />
android:layout_height="wrap_content" </LinearLayout>
android:text="@string/favorite"
android:textColor="@color/black"
android:textSize="12sp" />
</LinearLayout>
<LinearLayout
android:id="@+id/tools_layout_btn"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:background="@drawable/dr_click_effect_rectangle_transparent"
android:gravity="center"
android:orientation="vertical">
<ImageView <TextView
android:id="@+id/tools_iv" android:id="@+id/multiSelectNumberTv"
android:layout_width="24dp" style="@style/TextViewFont_PopMedium"
android:layout_height="24dp" android:layout_width="0dp"
android:src="@drawable/icon_tools_sel_off" /> android:layout_height="wrap_content"
android:layout_marginStart="6dp"
android:layout_marginEnd="6dp"
android:layout_weight="1"
android:text="@string/selected_page"
android:textColor="@color/white"
android:textSize="18sp" />
<TextView <LinearLayout
android:id="@+id/tools_tv" android:id="@+id/multiSelectAllBtn"
style="@style/TextViewFont_PopMedium" android:layout_width="44dp"
android:layout_width="wrap_content" android:layout_height="44dp"
android:layout_height="wrap_content" android:layout_marginEnd="6dp"
android:text="@string/tools" android:gravity="center">
android:textColor="@color/black"
android:textSize="12sp" /> <ImageView
</LinearLayout> android:layout_width="24dp"
android:layout_height="24dp"
android:src="@drawable/icon_select_all" />
</LinearLayout>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="24dp"
android:background="@drawable/dr_top_left_radius_white_bg"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
android:orientation="vertical">
<FrameLayout
android:id="@+id/fragment_fl"
android:layout_width="match_parent"
android:layout_height="match_parent" />
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
android:id="@+id/multiSelectBottomLayout" android:id="@+id/tab_layout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="64dp" android:layout_height="wrap_content"
android:background="@color/white" android:layout_gravity="bottom"
android:orientation="horizontal" android:orientation="vertical">
android:visibility="visible">
<LinearLayout <LinearLayout
android:id="@+id/multiSelectDeleteBtn" android:id="@+id/pnLayout"
android:layout_width="0dp" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="64dp"
android:layout_weight="1" android:background="@drawable/dr_rounded_corner_top_bg_grey"
android:background="@drawable/dr_click_effect_rectangle_transparent" android:gravity="center_vertical"
android:gravity="center" android:orientation="horizontal"
android:orientation="vertical"> android:paddingStart="16dp"
android:paddingEnd="16dp"
android:visibility="visible">
<ImageView <ImageView
android:id="@+id/multiSelectDeleteIv"
android:layout_width="24dp" android:layout_width="24dp"
android:layout_height="24dp" android:layout_height="24dp"
android:src="@drawable/icon_delete_sel_on" /> android:src="@drawable/icon_notice" />
<TextView <LinearLayout
android:id="@+id/multiSelectDeleteTv" android:layout_width="0dp"
style="@style/TextViewFont_PopMedium" android:layout_height="match_parent"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:layout_weight="1"
android:gravity="center_vertical"
android:orientation="vertical">
<TextView
style="@style/TextViewFont_PopMedium"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/notice"
android:textColor="@color/black"
android:textSize="14sp" />
<TextView
style="@style/TextViewFont_PopRegular"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="end"
android:maxLines="2"
android:text="@string/permission_notice"
android:textColor="@color/black_60"
android:textSize="12sp" />
</LinearLayout>
<LinearLayout
android:id="@+id/pnGoBtn"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="match_parent"
android:text="@string/delete" android:gravity="center">
android:textColor="@color/black"
android:textSize="12sp" /> <TextView
style="@style/TextViewFont_PopSemiBold"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/dr_click_btn_bg"
android:paddingStart="24dp"
android:paddingTop="4dp"
android:paddingEnd="24dp"
android:paddingBottom="4dp"
android:text="@string/go"
android:textColor="@color/white"
android:textSize="14sp" />
</LinearLayout>
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="0.5dp"
android:background="@color/line_color" />
<LinearLayout
android:id="@+id/navigationLayout"
android:layout_width="match_parent"
android:layout_height="64dp"
android:background="@color/white"
android:orientation="horizontal">
<LinearLayout
android:id="@+id/home_ll_btn"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:background="@drawable/dr_click_effect_rectangle_transparent"
android:gravity="center"
android:orientation="vertical">
<ImageView
android:id="@+id/home_iv"
android:layout_width="24dp"
android:layout_height="24dp"
android:src="@drawable/icon_home_sel_on" />
<TextView
android:id="@+id/home_tv"
style="@style/TextViewFont_PopMedium"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/home"
android:textColor="@color/black"
android:textSize="12sp" />
</LinearLayout>
<LinearLayout
android:id="@+id/recently_ll_btn"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:background="@drawable/dr_click_effect_rectangle_transparent"
android:gravity="center"
android:orientation="vertical">
<ImageView
android:id="@+id/recently_iv"
android:layout_width="24dp"
android:layout_height="24dp"
android:src="@drawable/icon_recently_sel_off" />
<TextView
android:id="@+id/recently_tv"
style="@style/TextViewFont_PopMedium"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/recently"
android:textColor="@color/black"
android:textSize="12sp" />
</LinearLayout>
<LinearLayout
android:id="@+id/favorite_ll_btn"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:background="@drawable/dr_click_effect_rectangle_transparent"
android:gravity="center"
android:orientation="vertical">
<ImageView
android:id="@+id/favorite_iv"
android:layout_width="24dp"
android:layout_height="24dp"
android:src="@drawable/collect" />
<TextView
android:id="@+id/favorite_tv"
style="@style/TextViewFont_PopMedium"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/favorite"
android:textColor="@color/black"
android:textSize="12sp" />
</LinearLayout>
<LinearLayout
android:id="@+id/tools_layout_btn"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:background="@drawable/dr_click_effect_rectangle_transparent"
android:gravity="center"
android:orientation="vertical">
<ImageView
android:id="@+id/tools_iv"
android:layout_width="24dp"
android:layout_height="24dp"
android:src="@drawable/icon_tools_sel_off" />
<TextView
android:id="@+id/tools_tv"
style="@style/TextViewFont_PopMedium"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/tools"
android:textColor="@color/black"
android:textSize="12sp" />
</LinearLayout>
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
android:id="@+id/multiSelectRemoveBtn" android:id="@+id/multiSelectBottomLayout"
android:layout_width="0dp" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="64dp"
android:layout_weight="1" android:background="@color/white"
android:background="@drawable/dr_click_effect_rectangle_transparent" android:orientation="horizontal"
android:gravity="center" android:visibility="visible">
android:orientation="vertical">
<ImageView <LinearLayout
android:id="@+id/multiSelectRemoveIv" android:id="@+id/multiSelectDeleteBtn"
android:layout_width="24dp" android:layout_width="0dp"
android:layout_height="24dp" android:layout_height="match_parent"
android:src="@drawable/icon_remove_sel_on" /> android:layout_weight="1"
android:background="@drawable/dr_click_effect_rectangle_transparent"
android:gravity="center"
android:orientation="vertical">
<TextView <ImageView
android:id="@+id/multiSelectRemoveTv" android:id="@+id/multiSelectDeleteIv"
style="@style/TextViewFont_PopMedium" android:layout_width="24dp"
android:layout_width="wrap_content" android:layout_height="24dp"
android:layout_height="wrap_content" android:src="@drawable/icon_delete_sel_on" />
android:text="@string/remove"
android:textColor="@color/black"
android:textSize="12sp" />
</LinearLayout>
<LinearLayout <TextView
android:id="@+id/multiSelectUnFavoriteBtn" android:id="@+id/multiSelectDeleteTv"
android:layout_width="0dp" style="@style/TextViewFont_PopMedium"
android:layout_height="match_parent" android:layout_width="wrap_content"
android:layout_weight="1" android:layout_height="wrap_content"
android:background="@drawable/dr_click_effect_rectangle_transparent" android:text="@string/delete"
android:gravity="center" android:textColor="@color/black"
android:orientation="vertical"> android:textSize="12sp" />
</LinearLayout>
<ImageView <LinearLayout
android:id="@+id/multiSelectUnFavoriteIv" android:id="@+id/multiSelectRemoveBtn"
android:layout_width="24dp" android:layout_width="0dp"
android:layout_height="24dp" android:layout_height="match_parent"
android:src="@drawable/icon_un_favorite_sel_on" /> android:layout_weight="1"
android:background="@drawable/dr_click_effect_rectangle_transparent"
android:gravity="center"
android:orientation="vertical">
<TextView <ImageView
android:id="@+id/multiSelectUnFavoriteTv" android:id="@+id/multiSelectRemoveIv"
style="@style/TextViewFont_PopMedium" android:layout_width="24dp"
android:layout_width="wrap_content" android:layout_height="24dp"
android:layout_height="wrap_content" android:src="@drawable/icon_remove_sel_on" />
android:text="@string/un_favorite"
android:textColor="@color/black"
android:textSize="12sp" />
</LinearLayout>
<LinearLayout <TextView
android:id="@+id/multiSelectMergeBtn" android:id="@+id/multiSelectRemoveTv"
android:layout_width="0dp" style="@style/TextViewFont_PopMedium"
android:layout_height="match_parent" android:layout_width="wrap_content"
android:layout_weight="1" android:layout_height="wrap_content"
android:background="@drawable/dr_click_effect_rectangle_transparent" android:text="@string/remove"
android:gravity="center" android:textColor="@color/black"
android:orientation="vertical"> android:textSize="12sp" />
</LinearLayout>
<ImageView <LinearLayout
android:id="@+id/multiSelectMergeIv" android:id="@+id/multiSelectUnFavoriteBtn"
android:layout_width="24dp" android:layout_width="0dp"
android:layout_height="24dp" android:layout_height="match_parent"
android:src="@drawable/icon_merge_sel_off" /> android:layout_weight="1"
android:background="@drawable/dr_click_effect_rectangle_transparent"
android:gravity="center"
android:orientation="vertical">
<TextView <ImageView
android:id="@+id/multiSelectMergeTv" android:id="@+id/multiSelectUnFavoriteIv"
style="@style/TextViewFont_PopMedium" android:layout_width="24dp"
android:layout_width="wrap_content" android:layout_height="24dp"
android:layout_height="wrap_content" android:src="@drawable/icon_un_favorite_sel_on" />
android:text="@string/merge"
android:textColor="@color/icon_sel_off_color" <TextView
android:textSize="12sp" /> android:id="@+id/multiSelectUnFavoriteTv"
style="@style/TextViewFont_PopMedium"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/un_favorite"
android:textColor="@color/black"
android:textSize="12sp" />
</LinearLayout>
<LinearLayout
android:id="@+id/multiSelectMergeBtn"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:background="@drawable/dr_click_effect_rectangle_transparent"
android:gravity="center"
android:orientation="vertical">
<ImageView
android:id="@+id/multiSelectMergeIv"
android:layout_width="24dp"
android:layout_height="24dp"
android:src="@drawable/icon_merge_sel_off" />
<TextView
android:id="@+id/multiSelectMergeTv"
style="@style/TextViewFont_PopMedium"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/merge"
android:textColor="@color/icon_sel_off_color"
android:textSize="12sp" />
</LinearLayout>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
</LinearLayout>
</FrameLayout>
<!-- android:layout_gravity="start" --> <!-- android:layout_gravity="start" -->
<LinearLayout <LinearLayout

1
app/src/main/res/layout/dialog_list_more.xml
View File

@ -28,6 +28,7 @@
<RelativeLayout <RelativeLayout
android:layout_width="60dp" android:layout_width="60dp"
android:layout_height="60dp" android:layout_height="60dp"
android:padding="1dp"
android:background="@drawable/dr_item_img_frame"> android:background="@drawable/dr_item_img_frame">
<ImageView <ImageView

6
app/src/main/res/values/themes.xml
View File

@ -9,12 +9,6 @@
<item name="android:windowContentOverlay">@null</item> <item name="android:windowContentOverlay">@null</item>
<item name="android:windowBackground">@android:color/white</item> <item name="android:windowBackground">@android:color/white</item>
</style> </style>
<!-- SplashActivity theme -->
<style name="Theme.PDFReaderPro.NoActionBar">
<item name="windowActionBar">false</item>
<item name="windowNoTitle">true</item>
<item name="android:windowFullscreen">true</item>
</style>
<!-- PermissionActivity Dialog theme --> <!-- PermissionActivity Dialog theme -->
<style name="Theme.PDFReaderPro.Dialog" parent="Theme.PDFReaderPro"> <style name="Theme.PDFReaderPro.Dialog" parent="Theme.PDFReaderPro">