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

Moved res/raw to assets

Browse Source
This commit is contained in:
mhutti1 2017-07-18 19:59:07 +01:00
parent 4782cb3172
commit e56ee29cd0
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
app/src/main/res/raw/credits.html → app/src/main/assets/credits.html
View File

0
app/src/main/res/raw/help.html → app/src/main/assets/help.html
View File

6
app/src/main/java/org/kiwix/kiwixmobile/KiwixMobileActivity.java
View File

@ -850,7 +850,7 @@ public class KiwixMobileActivity extends BaseActivity implements WebViewCallback
} }
public void showHelpPage() { public void showHelpPage() {
getCurrentWebView().loadUrl("file:///android_res/raw/help.html"); getCurrentWebView().loadUrl("file:///android_asset/help.html");
} }
public void sendContactEmail() { public void sendContactEmail() {
@ -1433,7 +1433,7 @@ public class KiwixMobileActivity extends BaseActivity implements WebViewCallback
refreshBookmarkSymbol(menu); refreshBookmarkSymbol(menu);
refreshNavigationButtons(); 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); menu.findItem(R.id.menu_read_aloud).setVisible(false);
} else { } else {
menu.findItem(R.id.menu_read_aloud).setVisible(true); 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 && if (menu.findItem(R.id.menu_bookmarks) != null &&
getCurrentWebView().getUrl() != null && getCurrentWebView().getUrl() != null &&
ZimContentProvider.getId() != 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) menu.findItem(R.id.menu_bookmarks)
.setEnabled(true) .setEnabled(true)
.setIcon(bookmarks.contains(getCurrentWebView().getUrl()) ? R.drawable.action_bookmark_active : R.drawable.action_bookmark) .setIcon(bookmarks.contains(getCurrentWebView().getUrl()) ? R.drawable.action_bookmark_active : R.drawable.action_bookmark)

2
app/src/main/java/org/kiwix/kiwixmobile/KiwixWebViewClient.java
View File

@ -70,7 +70,7 @@ public class KiwixWebViewClient extends WebViewClient {
callback.showHelpPage(); callback.showHelpPage();
return; return;
} }
if (!url.equals("file:///android_res/raw/help.html")) { if (!url.equals("file:///android_asset/help.html")) {
view.removeView(help); view.removeView(help);
} else if (!BuildConfig.IS_CUSTOM_APP) { } else if (!BuildConfig.IS_CUSTOM_APP) {
if (view.findViewById(R.id.get_content_card) == null) { if (view.findViewById(R.id.get_content_card) == null) {

2
app/src/main/java/org/kiwix/kiwixmobile/settings/KiwixSettingsActivity.java
View File

@ -313,7 +313,7 @@ public class KiwixSettingsActivity extends AppCompatActivity {
public void openCredits(){ public void openCredits(){
WebView view = (WebView) LayoutInflater.from(getActivity()).inflate(R.layout.credits_webview, null); 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()) new AlertDialog.Builder(getActivity(), dialogStyle())
.setView(view) .setView(view)
.setPositiveButton(android.R.string.ok, null) .setPositiveButton(android.R.string.ok, null)