update
This commit is contained in:
parent
b3001a61a7
commit
cecdb8d187
@ -60,7 +60,6 @@ class MainActivity : BaseActivity(), PermissionDialogFragment.PermissionCallback
|
|||||||
super.onCreate(savedInstanceState)
|
super.onCreate(savedInstanceState)
|
||||||
binding = ActivityMainBinding.inflate(layoutInflater)
|
binding = ActivityMainBinding.inflate(layoutInflater)
|
||||||
setContentView(binding.root)
|
setContentView(binding.root)
|
||||||
AnalyticsUtils.logEvent(AnalyticsUtils.Event.HOME_ACTIVITY_VISIBLE)
|
|
||||||
setupDoubleBackExit()
|
setupDoubleBackExit()
|
||||||
initObserve()
|
initObserve()
|
||||||
setupImmersionBar {
|
setupImmersionBar {
|
||||||
@ -162,7 +161,6 @@ class MainActivity : BaseActivity(), PermissionDialogFragment.PermissionCallback
|
|||||||
event.deleteResult?.let {
|
event.deleteResult?.let {
|
||||||
if (event.deleteResult.success) {
|
if (event.deleteResult.success) {
|
||||||
showToast(getString(R.string.delete_successfully))
|
showToast(getString(R.string.delete_successfully))
|
||||||
AnalyticsUtils.logEvent(AnalyticsUtils.Event.HOME_SEL_DEL_SUC)
|
|
||||||
} else {
|
} else {
|
||||||
showToast(event.deleteResult.errorMessage.toString())
|
showToast(event.deleteResult.errorMessage.toString())
|
||||||
}
|
}
|
||||||
@ -184,7 +182,6 @@ class MainActivity : BaseActivity(), PermissionDialogFragment.PermissionCallback
|
|||||||
binding.switchScreenOn.setChecked(appStore.keepScreenOn)
|
binding.switchScreenOn.setChecked(appStore.keepScreenOn)
|
||||||
|
|
||||||
binding.homeLlBtn.setOnSingleClickListener {
|
binding.homeLlBtn.setOnSingleClickListener {
|
||||||
AnalyticsUtils.logEvent(AnalyticsUtils.Event.HOME_CK)
|
|
||||||
switchFragment(homeFragment)
|
switchFragment(homeFragment)
|
||||||
}
|
}
|
||||||
binding.recentlyLlBtn.setOnSingleClickListener { switchFragment(recentlyFragment) }
|
binding.recentlyLlBtn.setOnSingleClickListener { switchFragment(recentlyFragment) }
|
||||||
@ -212,7 +209,6 @@ class MainActivity : BaseActivity(), PermissionDialogFragment.PermissionCallback
|
|||||||
binding.multiSelectBtn.setOnClickListener {
|
binding.multiSelectBtn.setOnClickListener {
|
||||||
when (activeFragment) {
|
when (activeFragment) {
|
||||||
is HomeFrag -> {
|
is HomeFrag -> {
|
||||||
AnalyticsUtils.logEvent(AnalyticsUtils.Event.HOME_SEL)
|
|
||||||
(activeFragment as HomeFrag).setupMultiSelect()
|
(activeFragment as HomeFrag).setupMultiSelect()
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -245,7 +241,6 @@ class MainActivity : BaseActivity(), PermissionDialogFragment.PermissionCallback
|
|||||||
|
|
||||||
}
|
}
|
||||||
binding.multiSelectDeleteBtn.setOnSingleClickListener {
|
binding.multiSelectDeleteBtn.setOnSingleClickListener {
|
||||||
AnalyticsUtils.logEvent(AnalyticsUtils.Event.HOME_SELL_CK)
|
|
||||||
val selectedItems = homeFragment.adapter.getSelectedItems()
|
val selectedItems = homeFragment.adapter.getSelectedItems()
|
||||||
if (selectedItems.isNotEmpty()) {
|
if (selectedItems.isNotEmpty()) {
|
||||||
val filesToDelete = selectedItems.map { File(it.filePath) }
|
val filesToDelete = selectedItems.map { File(it.filePath) }
|
||||||
@ -257,11 +252,9 @@ class MainActivity : BaseActivity(), PermissionDialogFragment.PermissionCallback
|
|||||||
}
|
}
|
||||||
PromptDialogFragment(
|
PromptDialogFragment(
|
||||||
title, desc, onOkClick = {
|
title, desc, onOkClick = {
|
||||||
AnalyticsUtils.logEvent(AnalyticsUtils.Event.HOME_SEL_DEL_CONF)
|
|
||||||
viewModel.deleteFiles(filesToDelete)
|
viewModel.deleteFiles(filesToDelete)
|
||||||
exitAllMultiSelect()
|
exitAllMultiSelect()
|
||||||
}, onCancelClick = {
|
}, onCancelClick = {
|
||||||
AnalyticsUtils.logEvent(AnalyticsUtils.Event.HOME_SEL_DEL_CANC)
|
|
||||||
}).show(supportFragmentManager, "deleteFiles")
|
}).show(supportFragmentManager, "deleteFiles")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -273,17 +266,7 @@ class MainActivity : BaseActivity(), PermissionDialogFragment.PermissionCallback
|
|||||||
else -> emptyList()
|
else -> emptyList()
|
||||||
}
|
}
|
||||||
if (selectedItems.isNotEmpty()) {
|
if (selectedItems.isNotEmpty()) {
|
||||||
var from = ""
|
val intent = MergePdfActivity.createIntent(this, ArrayList(selectedItems))
|
||||||
when (activeFragment) {
|
|
||||||
is HomeFrag -> {
|
|
||||||
from = HomeFrag.FRAG_TAG
|
|
||||||
AnalyticsUtils.logEvent(AnalyticsUtils.Event.HOME_SEL_MER_CK)
|
|
||||||
}
|
|
||||||
|
|
||||||
is FavoriteFrag -> {}
|
|
||||||
is RecentlyFrag -> {}
|
|
||||||
}
|
|
||||||
val intent = MergePdfActivity.createIntent(this, ArrayList(selectedItems), from)
|
|
||||||
startActivity(intent)
|
startActivity(intent)
|
||||||
exitAllMultiSelect()
|
exitAllMultiSelect()
|
||||||
}
|
}
|
||||||
|
|||||||
@ -17,7 +17,9 @@ import com.all.pdfreader.pdf.reader.room.entity.PdfDocumentEntity
|
|||||||
import com.all.pdfreader.pdf.reader.ui.adapter.PdfAdapter
|
import com.all.pdfreader.pdf.reader.ui.adapter.PdfAdapter
|
||||||
import com.all.pdfreader.pdf.reader.ui.dialog.PdfPasswordProtectionDialogFragment
|
import com.all.pdfreader.pdf.reader.ui.dialog.PdfPasswordProtectionDialogFragment
|
||||||
import com.all.pdfreader.pdf.reader.ui.dialog.PromptDialogFragment
|
import com.all.pdfreader.pdf.reader.ui.dialog.PromptDialogFragment
|
||||||
|
import com.all.pdfreader.pdf.reader.ui.fragment.FavoriteFrag
|
||||||
import com.all.pdfreader.pdf.reader.ui.fragment.HomeFrag
|
import com.all.pdfreader.pdf.reader.ui.fragment.HomeFrag
|
||||||
|
import com.all.pdfreader.pdf.reader.ui.fragment.RecentlyFrag
|
||||||
import com.all.pdfreader.pdf.reader.util.AnalyticsUtils
|
import com.all.pdfreader.pdf.reader.util.AnalyticsUtils
|
||||||
import com.all.pdfreader.pdf.reader.util.AppUtils.setClickWithAnimation
|
import com.all.pdfreader.pdf.reader.util.AppUtils.setClickWithAnimation
|
||||||
import com.all.pdfreader.pdf.reader.util.AppUtils.setOnSingleClickListener
|
import com.all.pdfreader.pdf.reader.util.AppUtils.setOnSingleClickListener
|
||||||
@ -166,30 +168,14 @@ class MergePdfActivity : BaseActivity() {
|
|||||||
|
|
||||||
override fun shouldInterceptBackPress(): Boolean = true
|
override fun shouldInterceptBackPress(): Boolean = true
|
||||||
override fun onInterceptBackPressed() {
|
override fun onInterceptBackPressed() {
|
||||||
when(from){
|
|
||||||
HomeFrag.FRAG_TAG->{
|
|
||||||
AnalyticsUtils.logEvent(AnalyticsUtils.Event.HOME_SEL_MER_EDIT_BACK_CK)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
PromptDialogFragment(
|
PromptDialogFragment(
|
||||||
getString(R.string.exit_merge),
|
getString(R.string.exit_merge),
|
||||||
getString(R.string.confirm_discard_changes),
|
getString(R.string.confirm_discard_changes),
|
||||||
getString(R.string.discard),
|
getString(R.string.discard),
|
||||||
onOkClick = {
|
onOkClick = {
|
||||||
when(from){
|
|
||||||
HomeFrag.FRAG_TAG->{
|
|
||||||
AnalyticsUtils.logEvent(AnalyticsUtils.Event.HOME_SEL_MER_EDIT_LEA_CONF)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
backPressedCallback?.isEnabled = false
|
backPressedCallback?.isEnabled = false
|
||||||
onBackPressedDispatcher.onBackPressed()
|
onBackPressedDispatcher.onBackPressed()
|
||||||
}, onCancelClick = {
|
}, onCancelClick = {
|
||||||
when(from){
|
|
||||||
HomeFrag.FRAG_TAG->{
|
|
||||||
AnalyticsUtils.logEvent(AnalyticsUtils.Event.HOME_SEL_MER_EDIT_LEA_CANC)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}).show(supportFragmentManager, getString(R.string.exit_merge))
|
}).show(supportFragmentManager, getString(R.string.exit_merge))
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -203,7 +189,7 @@ class MergePdfActivity : BaseActivity() {
|
|||||||
fun createIntent(
|
fun createIntent(
|
||||||
context: Context,
|
context: Context,
|
||||||
list: ArrayList<PdfDocumentEntity>,
|
list: ArrayList<PdfDocumentEntity>,
|
||||||
from: String
|
from: String? = null
|
||||||
): Intent {
|
): Intent {
|
||||||
return Intent(context, MergePdfActivity::class.java).apply {
|
return Intent(context, MergePdfActivity::class.java).apply {
|
||||||
putParcelableArrayListExtra(EXTRA_PDF_LIST, list)
|
putParcelableArrayListExtra(EXTRA_PDF_LIST, list)
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user