mirror of
https://github.com/kiwix/kiwix-android.git
synced 2025-09-20 10:23:30 -04:00
Convert CoreReaderFragment.java into kotlin
This commit is contained in:
MohitMali
Kelson
parent
8671578e82
commit
367d3ec695
@ -78,20 +78,20 @@ class KiwixReaderFragment : CoreReaderFragment() {
|
||||
super.onViewCreated(view, savedInstanceState)
|
||||
|
||||
val activity = activity as CoreMainActivity
|
||||
noOpenBookButton.setOnClickListener {
|
||||
noOpenBookButton?.setOnClickListener {
|
||||
activity.navigate(
|
||||
KiwixReaderFragmentDirections.actionNavigationReaderToNavigationLibrary()
|
||||
)
|
||||
}
|
||||
activity.supportActionBar!!.setDisplayHomeAsUpEnabled(true)
|
||||
activity.setupDrawerToggle(toolbar)
|
||||
activity.supportActionBar?.setDisplayHomeAsUpEnabled(true)
|
||||
toolbar?.let(activity::setupDrawerToggle)
|
||||
setFragmentContainerBottomMarginToSizeOfNavBar()
|
||||
openPageInBookFromNavigationArguments()
|
||||
|
||||
requireActivity().observeNavigationResult<String>(
|
||||
FIND_IN_PAGE_SEARCH_STRING,
|
||||
viewLifecycleOwner,
|
||||
Observer(this::findInPage)
|
||||
Observer(::findInPage)
|
||||
)
|
||||
requireActivity().observeNavigationResult<SearchItemToOpen>(
|
||||
TAG_FILE_SEARCHED,
|
||||
@ -101,11 +101,11 @@ class KiwixReaderFragment : CoreReaderFragment() {
|
||||
}
|
||||
|
||||
private fun openSearchItem(item: SearchItemToOpen) {
|
||||
zimReaderContainer.titleToUrl(item.pageTitle)?.let {
|
||||
zimReaderContainer?.titleToUrl(item.pageTitle)?.let {
|
||||
if (item.shouldOpenInNewTab) {
|
||||
createNewTab()
|
||||
}
|
||||
loadUrlWithCurrentWebview(zimReaderContainer.urlSuffixToParsableUrl(it))
|
||||
loadUrlWithCurrentWebview(zimReaderContainer?.urlSuffixToParsableUrl(it))
|
||||
}
|
||||
requireActivity().consumeObservable<SearchItemToOpen>(TAG_FILE_SEARCHED)
|
||||
}
|
||||
@ -147,15 +147,15 @@ class KiwixReaderFragment : CoreReaderFragment() {
|
||||
|
||||
private fun exitBook() {
|
||||
showNoBookOpenViews()
|
||||
bottomToolbar.visibility = GONE
|
||||
actionBar.title = getString(R.string.reader)
|
||||
contentFrame.visibility = GONE
|
||||
bottomToolbar?.visibility = GONE
|
||||
actionBar?.title = getString(R.string.reader)
|
||||
contentFrame?.visibility = GONE
|
||||
mainMenu?.hideBookSpecificMenuItems()
|
||||
closeZimBook()
|
||||
}
|
||||
|
||||
private fun closeZimBook() {
|
||||
zimReaderContainer.setZimFile(null)
|
||||
zimReaderContainer?.setZimFile(null)
|
||||
}
|
||||
|
||||
override fun openHomeScreen() {
|
||||
@ -167,23 +167,21 @@ class KiwixReaderFragment : CoreReaderFragment() {
|
||||
}
|
||||
|
||||
override fun hideTabSwitcher() {
|
||||
if (actionBar != null) {
|
||||
actionBar?.let { actionBar ->
|
||||
actionBar.setDisplayShowTitleEnabled(true)
|
||||
activity?.setupDrawerToggle(toolbar)
|
||||
toolbar?.let { activity?.setupDrawerToggle(it) }
|
||||
|
||||
setDrawerLockMode(DrawerLayout.LOCK_MODE_UNLOCKED)
|
||||
|
||||
closeAllTabsButton.setImageDrawableCompat(R.drawable.ic_close_black_24dp)
|
||||
if (tabSwitcherRoot.visibility == View.VISIBLE) {
|
||||
tabSwitcherRoot.visibility = GONE
|
||||
closeAllTabsButton?.setImageDrawableCompat(R.drawable.ic_close_black_24dp)
|
||||
if (tabSwitcherRoot?.visibility == View.VISIBLE) {
|
||||
tabSwitcherRoot?.visibility = GONE
|
||||
startAnimation(tabSwitcherRoot, anim.slide_up)
|
||||
progressBar.visibility = View.GONE
|
||||
progressBar.progress = 0
|
||||
contentFrame.visibility = View.VISIBLE
|
||||
}
|
||||
if (mainMenu != null) {
|
||||
mainMenu.showWebViewOptions(true)
|
||||
progressBar?.visibility = View.GONE
|
||||
progressBar?.progress = 0
|
||||
contentFrame?.visibility = View.VISIBLE
|
||||
}
|
||||
mainMenu?.showWebViewOptions(true)
|
||||
if (webViewList.isEmpty()) {
|
||||
exitBook()
|
||||
} else {
|
||||
@ -213,7 +211,7 @@ class KiwixReaderFragment : CoreReaderFragment() {
|
||||
|
||||
override fun onCreateOptionsMenu(menu: Menu, menuInflater: MenuInflater) {
|
||||
super.onCreateOptionsMenu(menu, menuInflater)
|
||||
if (zimReaderContainer.zimFileReader == null) {
|
||||
if (zimReaderContainer?.zimFileReader == null) {
|
||||
mainMenu?.hideBookSpecificMenuItems()
|
||||
}
|
||||
}
|
||||
@ -225,7 +223,7 @@ class KiwixReaderFragment : CoreReaderFragment() {
|
||||
|
||||
override fun onResume() {
|
||||
super.onResume()
|
||||
if (zimReaderContainer.zimFile == null) {
|
||||
if (zimReaderContainer?.zimFile == null) {
|
||||
exitBook()
|
||||
}
|
||||
if (isFullScreenVideo) {
|
||||
@ -239,15 +237,15 @@ class KiwixReaderFragment : CoreReaderFragment() {
|
||||
}
|
||||
|
||||
override fun restoreViewStateOnValidJSON(
|
||||
zimArticles: String,
|
||||
zimPositions: String,
|
||||
zimArticles: String?,
|
||||
zimPositions: String?,
|
||||
currentTab: Int
|
||||
) {
|
||||
val settings = requireActivity().getSharedPreferences(SharedPreferenceUtil.PREF_KIWIX_MOBILE, 0)
|
||||
val zimFile = settings.getString(TAG_CURRENT_FILE, null)
|
||||
|
||||
if (zimFile != null && File(zimFile).exists()) {
|
||||
if (zimReaderContainer.zimFile == null) {
|
||||
if (zimReaderContainer?.zimFile == null) {
|
||||
openZimFile(File(zimFile))
|
||||
Log.d(
|
||||
TAG_KIWIX,
|
||||
@ -255,16 +253,16 @@ class KiwixReaderFragment : CoreReaderFragment() {
|
||||
)
|
||||
}
|
||||
} else {
|
||||
getCurrentWebView().snack(R.string.zim_not_opened)
|
||||
getCurrentWebView()?.snack(R.string.zim_not_opened)
|
||||
}
|
||||
restoreTabs(zimArticles, zimPositions, currentTab)
|
||||
}
|
||||
|
||||
override fun createWebView(attrs: AttributeSet): ToolbarScrollingKiwixWebView {
|
||||
override fun createWebView(attrs: AttributeSet?): ToolbarScrollingKiwixWebView {
|
||||
return ToolbarScrollingKiwixWebView(
|
||||
requireContext(), this, attrs, activityMainRoot as ViewGroup, videoView,
|
||||
CoreWebViewClient(this, zimReaderContainer, sharedPreferenceUtil),
|
||||
toolbarContainer, bottomToolbar, sharedPreferenceUtil = sharedPreferenceUtil,
|
||||
requireContext(), this, attrs!!, activityMainRoot as ViewGroup, videoView!!,
|
||||
CoreWebViewClient(this, zimReaderContainer!!, sharedPreferenceUtil!!),
|
||||
toolbarContainer!!, bottomToolbar!!, sharedPreferenceUtil = sharedPreferenceUtil!!,
|
||||
parentNavigationBar = requireActivity().bottom_nav_view
|
||||
)
|
||||
}
|
||||
@ -292,7 +290,7 @@ class KiwixReaderFragment : CoreReaderFragment() {
|
||||
private fun hideNavBar() {
|
||||
requireActivity().bottom_nav_view.visibility = GONE
|
||||
setParentFragmentsBottomMarginTo(0)
|
||||
getCurrentWebView().translationY = 0f
|
||||
getCurrentWebView()?.translationY = 0f
|
||||
}
|
||||
|
||||
private fun showNavBar() {
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -64,8 +64,11 @@ class CustomReaderFragment : CoreReaderFragment() {
|
||||
baseActivity.customActivityComponent.inject(this)
|
||||
}
|
||||
|
||||
@Inject lateinit var customFileValidator: CustomFileValidator
|
||||
@Inject lateinit var dialogShower: DialogShower
|
||||
@Inject
|
||||
lateinit var customFileValidator: CustomFileValidator
|
||||
|
||||
@Inject
|
||||
lateinit var dialogShower: DialogShower
|
||||
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
|
||||
super.onViewCreated(view, savedInstanceState)
|
||||
if (enforcedLanguage()) {
|
||||
@ -80,14 +83,14 @@ class CustomReaderFragment : CoreReaderFragment() {
|
||||
}
|
||||
with(activity as AppCompatActivity) {
|
||||
supportActionBar!!.setDisplayHomeAsUpEnabled(true)
|
||||
setupDrawerToggle(toolbar)
|
||||
toolbar?.let { setupDrawerToggle(it) }
|
||||
}
|
||||
loadPageFromNavigationArguments()
|
||||
|
||||
requireActivity().observeNavigationResult<String>(
|
||||
FIND_IN_PAGE_SEARCH_STRING,
|
||||
viewLifecycleOwner,
|
||||
Observer(this::findInPage)
|
||||
Observer(::findInPage)
|
||||
)
|
||||
requireActivity().observeNavigationResult<SearchItemToOpen>(
|
||||
TAG_FILE_SEARCHED,
|
||||
@ -103,11 +106,11 @@ class CustomReaderFragment : CoreReaderFragment() {
|
||||
}
|
||||
|
||||
private fun openSearchItem(item: SearchItemToOpen) {
|
||||
zimReaderContainer.titleToUrl(item.pageTitle)?.apply {
|
||||
zimReaderContainer?.titleToUrl(item.pageTitle)?.apply {
|
||||
if (item.shouldOpenInNewTab) {
|
||||
createNewTab()
|
||||
}
|
||||
loadUrlWithCurrentWebview(zimReaderContainer.urlSuffixToParsableUrl(this))
|
||||
loadUrlWithCurrentWebview(zimReaderContainer?.urlSuffixToParsableUrl(this))
|
||||
}
|
||||
}
|
||||
|
||||
@ -127,8 +130,8 @@ class CustomReaderFragment : CoreReaderFragment() {
|
||||
}
|
||||
|
||||
override fun restoreViewStateOnValidJSON(
|
||||
zimArticles: String,
|
||||
zimPositions: String,
|
||||
zimArticles: String?,
|
||||
zimPositions: String?,
|
||||
currentTab: Int
|
||||
) {
|
||||
restoreTabs(zimArticles, zimPositions, currentTab)
|
||||
@ -159,7 +162,7 @@ class CustomReaderFragment : CoreReaderFragment() {
|
||||
requireActivity(),
|
||||
READ_EXTERNAL_STORAGE
|
||||
) == PERMISSION_DENIED &&
|
||||
!sharedPreferenceUtil.isPlayStoreBuildWithAndroid11OrAbove()
|
||||
sharedPreferenceUtil?.isPlayStoreBuildWithAndroid11OrAbove() == false
|
||||
) {
|
||||
requestPermissions(arrayOf(READ_EXTERNAL_STORAGE), REQUEST_READ_FOR_OBB)
|
||||
} else {
|
||||
@ -171,7 +174,7 @@ class CustomReaderFragment : CoreReaderFragment() {
|
||||
|
||||
override fun onRequestPermissionsResult(
|
||||
requestCode: Int,
|
||||
permissions: Array<out String>,
|
||||
permissions: Array<String>,
|
||||
grantResults: IntArray
|
||||
) {
|
||||
super.onRequestPermissionsResult(requestCode, permissions, grantResults)
|
||||
@ -209,7 +212,7 @@ class CustomReaderFragment : CoreReaderFragment() {
|
||||
val currentLocaleCode = Locale.getDefault().toString()
|
||||
if (BuildConfig.ENFORCED_LANG.isNotEmpty() && BuildConfig.ENFORCED_LANG != currentLocaleCode) {
|
||||
LanguageUtils.handleLocaleChange(requireActivity(), BuildConfig.ENFORCED_LANG)
|
||||
sharedPreferenceUtil.putPrefLanguage(BuildConfig.ENFORCED_LANG)
|
||||
sharedPreferenceUtil?.putPrefLanguage(BuildConfig.ENFORCED_LANG)
|
||||
activity?.recreate()
|
||||
return true
|
||||
}
|
||||
@ -221,8 +224,8 @@ class CustomReaderFragment : CoreReaderFragment() {
|
||||
tableDrawerRightContainer = requireActivity().findViewById(R.id.activity_main_nav_view)
|
||||
}
|
||||
|
||||
override fun createMainMenu(menu: Menu?): MainMenu {
|
||||
return menuFactory.create(
|
||||
override fun createMainMenu(menu: Menu?): MainMenu? {
|
||||
return menuFactory?.create(
|
||||
menu!!,
|
||||
webViewList,
|
||||
urlIsValid(),
|
||||
@ -232,7 +235,7 @@ class CustomReaderFragment : CoreReaderFragment() {
|
||||
)
|
||||
}
|
||||
|
||||
override fun showOpenInNewTabDialog(url: String?) {
|
||||
override fun showOpenInNewTabDialog(url: String) {
|
||||
if (BuildConfig.DISABLE_TABS) return
|
||||
super.showOpenInNewTabDialog(url)
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user