kiwix/kiwix-android
1
0
Fork 0
mirror of https://github.com/kiwix/kiwix-android.git synced 2025-09-11 16:37:18 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2179-remove-home-webview-library' of https://github.com/Frans-Lukas/kiwix-android into 2199-replace-old-navigation

Browse Source
This commit is contained in:
HissPirat 2020-07-14 15:24:14 +02:00
commit c4cbcb8080
2 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/src/main/java/org/kiwix/kiwixmobile/core/main/CoreReaderFragment.java
View File

@ -901,6 +901,7 @@ public abstract class CoreReaderFragment extends BaseFragment
Snackbar.make(snackbarRoot, "Tab restored", Snackbar.LENGTH_SHORT).show(); Snackbar.make(snackbarRoot, "Tab restored", Snackbar.LENGTH_SHORT).show();
setUpWebViewWithTextToSpeech(); setUpWebViewWithTextToSpeech();
updateBottomToolbarVisibility();
contentFrame.addView(tempWebViewForUndo); contentFrame.addView(tempWebViewForUndo);
} }

15
custom/src/main/java/org/kiwix/kiwixmobile/custom/main/CustomReaderFragment.kt
View File

@ -29,11 +29,8 @@ import android.os.Build
import android.os.Bundle import android.os.Bundle
import android.provider.Settings import android.provider.Settings
import android.util.Log import android.util.Log
import android.view.LayoutInflater
import android.view.Menu import android.view.Menu
import android.view.MenuInflater import android.view.MenuInflater
import android.view.View
import android.view.ViewGroup
import android.widget.ImageView import android.widget.ImageView
import androidx.appcompat.app.AppCompatActivity import androidx.appcompat.app.AppCompatActivity
import androidx.core.app.ActivityCompat import androidx.core.app.ActivityCompat
@ -69,15 +66,10 @@ class CustomReaderFragment : CoreReaderFragment() {
@Inject lateinit var sharedPreferenceUtil: SharedPreferenceUtil @Inject lateinit var sharedPreferenceUtil: SharedPreferenceUtil
@Inject lateinit var dialogShower: DialogShower @Inject lateinit var dialogShower: DialogShower
override fun onCreateView( override fun onActivityCreated(savedInstanceState: Bundle?) {
inflater: LayoutInflater, super.onActivityCreated(savedInstanceState)
container: ViewGroup?,
savedInstanceState: Bundle?
): View? {
val view = super.onCreateView(inflater, container, savedInstanceState)
if (enforcedLanguage()) { if (enforcedLanguage()) {
return view return
} }
openObbOrZim() openObbOrZim()
setDrawerLockMode(DrawerLayout.LOCK_MODE_UNLOCKED) setDrawerLockMode(DrawerLayout.LOCK_MODE_UNLOCKED)
@ -85,7 +77,6 @@ class CustomReaderFragment : CoreReaderFragment() {
val toolbarToc = activity?.findViewById<ImageView>(R.id.bottom_toolbar_toc) val toolbarToc = activity?.findViewById<ImageView>(R.id.bottom_toolbar_toc)
toolbarToc?.isEnabled = false toolbarToc?.isEnabled = false
} }
return view
} }
override fun setDrawerLockMode(lockMode: Int) { override fun setDrawerLockMode(lockMode: Int) {