diff --git a/app/src/main/res/raw/credits.html b/app/src/main/assets/credits.html similarity index 100% rename from app/src/main/res/raw/credits.html rename to app/src/main/assets/credits.html diff --git a/app/src/main/res/raw/help.html b/app/src/main/assets/help.html similarity index 100% rename from app/src/main/res/raw/help.html rename to app/src/main/assets/help.html diff --git a/app/src/main/java/org/kiwix/kiwixmobile/KiwixMobileActivity.java b/app/src/main/java/org/kiwix/kiwixmobile/KiwixMobileActivity.java index c29e18529..2d23047f9 100644 --- a/app/src/main/java/org/kiwix/kiwixmobile/KiwixMobileActivity.java +++ b/app/src/main/java/org/kiwix/kiwixmobile/KiwixMobileActivity.java @@ -850,7 +850,7 @@ public class KiwixMobileActivity extends BaseActivity implements WebViewCallback } public void showHelpPage() { - getCurrentWebView().loadUrl("file:///android_res/raw/help.html"); + getCurrentWebView().loadUrl("file:///android_asset/help.html"); } public void sendContactEmail() { @@ -1433,7 +1433,7 @@ public class KiwixMobileActivity extends BaseActivity implements WebViewCallback refreshBookmarkSymbol(menu); refreshNavigationButtons(); - if (getCurrentWebView().getUrl() == null || getCurrentWebView().getUrl().equals("file:///android_res/raw/help.html")) { + if (getCurrentWebView().getUrl() == null || getCurrentWebView().getUrl().equals("file:///android_asset/help.html")) { menu.findItem(R.id.menu_read_aloud).setVisible(false); } else { menu.findItem(R.id.menu_read_aloud).setVisible(true); @@ -1450,7 +1450,7 @@ public class KiwixMobileActivity extends BaseActivity implements WebViewCallback if (menu.findItem(R.id.menu_bookmarks) != null && getCurrentWebView().getUrl() != null && ZimContentProvider.getId() != null && - !getCurrentWebView().getUrl().equals("file:///android_res/raw/help.html")) { + !getCurrentWebView().getUrl().equals("file:///android_asset/help.html")) { menu.findItem(R.id.menu_bookmarks) .setEnabled(true) .setIcon(bookmarks.contains(getCurrentWebView().getUrl()) ? R.drawable.action_bookmark_active : R.drawable.action_bookmark) diff --git a/app/src/main/java/org/kiwix/kiwixmobile/KiwixWebViewClient.java b/app/src/main/java/org/kiwix/kiwixmobile/KiwixWebViewClient.java index c64b24c38..b33672e41 100644 --- a/app/src/main/java/org/kiwix/kiwixmobile/KiwixWebViewClient.java +++ b/app/src/main/java/org/kiwix/kiwixmobile/KiwixWebViewClient.java @@ -70,7 +70,7 @@ public class KiwixWebViewClient extends WebViewClient { callback.showHelpPage(); return; } - if (!url.equals("file:///android_res/raw/help.html")) { + if (!url.equals("file:///android_asset/help.html")) { view.removeView(help); } else if (!BuildConfig.IS_CUSTOM_APP) { if (view.findViewById(R.id.get_content_card) == null) { diff --git a/app/src/main/java/org/kiwix/kiwixmobile/settings/KiwixSettingsActivity.java b/app/src/main/java/org/kiwix/kiwixmobile/settings/KiwixSettingsActivity.java index cd968c7a2..323eae6d7 100644 --- a/app/src/main/java/org/kiwix/kiwixmobile/settings/KiwixSettingsActivity.java +++ b/app/src/main/java/org/kiwix/kiwixmobile/settings/KiwixSettingsActivity.java @@ -313,7 +313,7 @@ public class KiwixSettingsActivity extends AppCompatActivity { public void openCredits(){ WebView view = (WebView) LayoutInflater.from(getActivity()).inflate(R.layout.credits_webview, null); - view.loadUrl("file:///android_res/raw/credits.html"); + view.loadUrl("file:///android_asset/credits.html"); new AlertDialog.Builder(getActivity(), dialogStyle()) .setView(view) .setPositiveButton(android.R.string.ok, null)