Commit 3fc5c003 authored by wanglei's avatar wanglei

...

parent bf517a8e
...@@ -22,6 +22,7 @@ import com.base.pdfreaderallpdfreader.utils.BarUtils ...@@ -22,6 +22,7 @@ import com.base.pdfreaderallpdfreader.utils.BarUtils
class DocumentActivity : BaseActivity<ActivityDocumentBinding>() { class DocumentActivity : BaseActivity<ActivityDocumentBinding>() {
private lateinit var documentViewModel: DocumentViewModel private lateinit var documentViewModel: DocumentViewModel
private var tittle: String? = null
override val binding: ActivityDocumentBinding by lazy { override val binding: ActivityDocumentBinding by lazy {
ActivityDocumentBinding.inflate(layoutInflater) ActivityDocumentBinding.inflate(layoutInflater)
...@@ -55,13 +56,17 @@ class DocumentActivity : BaseActivity<ActivityDocumentBinding>() { ...@@ -55,13 +56,17 @@ class DocumentActivity : BaseActivity<ActivityDocumentBinding>() {
binding.root.updatePadding(top = BarUtils.getStatusBarHeight()) binding.root.updatePadding(top = BarUtils.getStatusBarHeight())
initTab = intent.extras?.getInt("initTab") initTab = intent.extras?.getInt("initTab")
tittle = intent.extras?.getString("tittle")
documentViewModel = ViewModelProvider(this)[DocumentViewModel::class.java] documentViewModel = ViewModelProvider(this)[DocumentViewModel::class.java]
if (tittle != null) {
val spannableString = SpannableString(this.getString(R.string.pdf_reader)) binding.tvTittle.text = tittle
spannableString.setSpan(ForegroundColorSpan(Color.parseColor("#E20001")), 0, 3, Spannable.SPAN_INCLUSIVE_INCLUSIVE) } else {
binding.tvTittle.text = spannableString val spannableString = SpannableString(this.getString(R.string.pdf_reader))
spannableString.setSpan(ForegroundColorSpan(Color.parseColor("#E20001")), 0, 3, Spannable.SPAN_INCLUSIVE_INCLUSIVE)
binding.tvTittle.text = spannableString
}
initViewPager2() initViewPager2()
initTabLayout() initTabLayout()
......
...@@ -4,6 +4,7 @@ import android.Manifest ...@@ -4,6 +4,7 @@ import android.Manifest
import android.content.Intent import android.content.Intent
import android.graphics.Color import android.graphics.Color
import android.net.Uri import android.net.Uri
import android.os.Build
import android.text.Spannable import android.text.Spannable
import android.text.SpannableString import android.text.SpannableString
import android.text.style.ForegroundColorSpan import android.text.style.ForegroundColorSpan
...@@ -38,6 +39,7 @@ import com.base.pdfreaderallpdfreader.utils.PdfBoxUtils.checkPdfEncryption ...@@ -38,6 +39,7 @@ import com.base.pdfreaderallpdfreader.utils.PdfBoxUtils.checkPdfEncryption
import com.base.pdfreaderallpdfreader.utils.PermissionUtils.checkNotificationPermission import com.base.pdfreaderallpdfreader.utils.PermissionUtils.checkNotificationPermission
import com.base.pdfreaderallpdfreader.utils.PermissionUtils.checkStorePermission import com.base.pdfreaderallpdfreader.utils.PermissionUtils.checkStorePermission
import com.base.pdfreaderallpdfreader.utils.ShortcutUtils.addDeskShortCut import com.base.pdfreaderallpdfreader.utils.ShortcutUtils.addDeskShortCut
import com.base.pdfreaderallpdfreader.utils.ToastUtils.toast
import com.base.pdfreaderallpdfreader.utils.updateMediaStore import com.base.pdfreaderallpdfreader.utils.updateMediaStore
import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
...@@ -78,7 +80,7 @@ class MainActivity : BaseActivity<ActivityMainBinding>() { ...@@ -78,7 +80,7 @@ class MainActivity : BaseActivity<ActivityMainBinding>() {
}) })
} else { } else {
toast("can't get file")
} }
} }
...@@ -100,7 +102,9 @@ class MainActivity : BaseActivity<ActivityMainBinding>() { ...@@ -100,7 +102,9 @@ class MainActivity : BaseActivity<ActivityMainBinding>() {
if (!flag) { if (!flag) {
showNotificationDialog(launcher) showNotificationDialog(launcher)
} else { } else {
launcher.launch(arrayOf(Manifest.permission.POST_NOTIFICATIONS)) {} if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
launcher.launch(arrayOf(Manifest.permission.POST_NOTIFICATIONS)) {}
}
} }
} }
......
...@@ -9,6 +9,7 @@ import android.view.ViewGroup ...@@ -9,6 +9,7 @@ import android.view.ViewGroup
import androidx.fragment.app.Fragment import androidx.fragment.app.Fragment
import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.ViewModelProvider
import androidx.lifecycle.lifecycleScope import androidx.lifecycle.lifecycleScope
import com.base.pdfreaderallpdfreader.R
import com.base.pdfreaderallpdfreader.bean.ConstObject.DO_LOCK_PDF import com.base.pdfreaderallpdfreader.bean.ConstObject.DO_LOCK_PDF
import com.base.pdfreaderallpdfreader.bean.ConstObject.DO_SPLIT_PDF import com.base.pdfreaderallpdfreader.bean.ConstObject.DO_SPLIT_PDF
import com.base.pdfreaderallpdfreader.databinding.FragmentHomeBinding import com.base.pdfreaderallpdfreader.databinding.FragmentHomeBinding
...@@ -17,7 +18,6 @@ import com.base.pdfreaderallpdfreader.ui.main.MainActivity ...@@ -17,7 +18,6 @@ import com.base.pdfreaderallpdfreader.ui.main.MainActivity
import com.base.pdfreaderallpdfreader.ui.main.getPdfFastSize import com.base.pdfreaderallpdfreader.ui.main.getPdfFastSize
import com.base.pdfreaderallpdfreader.ui.pdf.PdfActivity import com.base.pdfreaderallpdfreader.ui.pdf.PdfActivity
import com.base.pdfreaderallpdfreader.ui.pdf.PdfSelectActivity import com.base.pdfreaderallpdfreader.ui.pdf.PdfSelectActivity
import com.base.pdfreaderallpdfreader.ui.view.MainDialog.showStoragePermission
import com.base.pdfreaderallpdfreader.utils.PermissionUtils.checkStorePermission import com.base.pdfreaderallpdfreader.utils.PermissionUtils.checkStorePermission
import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
...@@ -56,6 +56,7 @@ class HomeFragment : Fragment() { ...@@ -56,6 +56,7 @@ class HomeFragment : Fragment() {
binding.llEditPdf.setOnClickListener { binding.llEditPdf.setOnClickListener {
startActivity(Intent(requireContext(), DocumentActivity::class.java).apply { startActivity(Intent(requireContext(), DocumentActivity::class.java).apply {
putExtra("initTab", 1) putExtra("initTab", 1)
putExtra("tittle", getString(R.string.select_for_edit_pdf))
}) })
} }
binding.llMergePdf.setOnClickListener { binding.llMergePdf.setOnClickListener {
......
...@@ -67,25 +67,24 @@ class PdfSelectActivity : BaseActivity<ActivityPdfSelectBinding>() { ...@@ -67,25 +67,24 @@ class PdfSelectActivity : BaseActivity<ActivityPdfSelectBinding>() {
when (doWhat) { when (doWhat) {
DO_SPLIT_PDF -> { DO_SPLIT_PDF -> {
binding.tvBtnNext.visibility = View.GONE binding.tvBtnNext.visibility = View.GONE
binding.tvSelectTip.text = getString(R.string.select_a_project) binding.tvSelectTip.text = getString(R.string.select_a_project_split)
getPdfData(2) getPdfData(2)
} }
DO_MERGE_PDF -> { DO_MERGE_PDF -> {
binding.tvSelectTip.text = getString(R.string.select_a_project) binding.tvSelectTip.text = getString(R.string.select_a_project_merge)
getPdfData(1) getPdfData(1)
} }
DO_LOCK_PDF -> { DO_LOCK_PDF -> {
binding.tvBtnNext.visibility = View.GONE binding.tvBtnNext.visibility = View.GONE
binding.tvSelectTip.text = getString(R.string.select_a_project) binding.tvSelectTip.text = getString(R.string.select_a_project_lock)
getPdfData(3) getPdfData(3)
} }
DO_UNLOCK_PDF -> { DO_UNLOCK_PDF -> {
binding.tvBtnNext.visibility = View.GONE binding.tvBtnNext.visibility = View.GONE
binding.tvSelectTip.text = getString(R.string.select_a_project) binding.tvSelectTip.text = getString(R.string.select_a_project_unlock)
getPdfData(3) getPdfData(3)
} }
......
...@@ -108,6 +108,11 @@ ...@@ -108,6 +108,11 @@
<string name="notification_enable_tips">Enabling notification permissions will allow you to receive future notification promptly and display unique message banners</string> <string name="notification_enable_tips">Enabling notification permissions will allow you to receive future notification promptly and display unique message banners</string>
<string name="enable_notifications">Enable notifications</string> <string name="enable_notifications">Enable notifications</string>
<string name="not_open">Not open</string> <string name="not_open">Not open</string>
<string name="select_for_edit_pdf">Select PDF for edite</string>
<string name="select_a_project_split">Select a project for split</string>
<string name="select_a_project_merge">Select projects for merge</string>
<string name="select_a_project_lock">Select a project to lock</string>
<string name="select_a_project_unlock">Select a project to unlock</string>
</resources> </resources>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment