diff options
| -rwxr-xr-x | gradle.properties | 2 | ||||
| -rw-r--r-- | org.fox.epube/src/main/java/org/fox/epube/MainActivity.java | 78 |
2 files changed, 39 insertions, 41 deletions
diff --git a/gradle.properties b/gradle.properties index 721f194..fb0d87d 100755 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ android.enableJetifier=true -android.nonFinalResIds=false +android.nonFinalResIds=true android.nonTransitiveRClass=false android.useAndroidX=true org.gradle.jvmargs=\ diff --git a/org.fox.epube/src/main/java/org/fox/epube/MainActivity.java b/org.fox.epube/src/main/java/org/fox/epube/MainActivity.java index 616263f..b4f0b28 100644 --- a/org.fox.epube/src/main/java/org/fox/epube/MainActivity.java +++ b/org.fox.epube/src/main/java/org/fox/epube/MainActivity.java @@ -260,47 +260,45 @@ public class MainActivity extends AppCompatActivity implements NetworkStateRecei @Override public boolean onOptionsItemSelected(MenuItem item) { - switch (item.getItemId()) { - case android.R.id.home: - m_web.evaluateJavascript("Reader.close();", null); - return true; - case R.id.library_favorites: - m_web.loadUrl(m_baseUrl + "/index.php?mode=favorites"); - return true; - case R.id.library_all: - m_web.loadUrl(m_baseUrl + "/index.php"); - return true; - case R.id.library_local: - case R.id.library_local_offline: - m_web.loadUrl(m_baseUrl + "/offline.html"); - return true; - case R.id.refresh_script_cache: - m_web.clearCache(true); - m_web.evaluateJavascript("App.refreshCache(true);", null); - return true; - case R.id.favorites_download_all: - m_web.evaluateJavascript("App.Offline.getAll();", null); - return true; - case R.id.offline_remove_all: - m_web.evaluateJavascript("App.Offline.removeAll();", null); - return true; - case R.id.reader_search: - getSupportActionBar().hide(); - m_web.evaluateJavascript("$(\"#search-modal\").modal()", null); - return true; - case R.id.reader_toggle_fullscreen: - toggleSystemUI(); - return true; - case R.id.reader_settings: - getSupportActionBar().hide(); - m_web.evaluateJavascript("$(\"#settings-modal\").modal()", null); - return true; - case R.id.logout: - m_web.evaluateJavascript("App.logout();", null); - return true; - default: - return super.onOptionsItemSelected(item); + int itemId = item.getItemId(); + if (itemId == android.R.id.home) { + m_web.evaluateJavascript("Reader.close();", null); + return true; + } else if (itemId == R.id.library_favorites) { + m_web.loadUrl(m_baseUrl + "/index.php?mode=favorites"); + return true; + } else if (itemId == R.id.library_all) { + m_web.loadUrl(m_baseUrl + "/index.php"); + return true; + } else if (itemId == R.id.library_local || itemId == R.id.library_local_offline) { + m_web.loadUrl(m_baseUrl + "/offline.html"); + return true; + } else if (itemId == R.id.refresh_script_cache) { + m_web.clearCache(true); + m_web.evaluateJavascript("App.refreshCache(true);", null); + return true; + } else if (itemId == R.id.favorites_download_all) { + m_web.evaluateJavascript("App.Offline.getAll();", null); + return true; + } else if (itemId == R.id.offline_remove_all) { + m_web.evaluateJavascript("App.Offline.removeAll();", null); + return true; + } else if (itemId == R.id.reader_search) { + getSupportActionBar().hide(); + m_web.evaluateJavascript("$(\"#search-modal\").modal()", null); + return true; + } else if (itemId == R.id.reader_toggle_fullscreen) { + toggleSystemUI(); + return true; + } else if (itemId == R.id.reader_settings) { + getSupportActionBar().hide(); + m_web.evaluateJavascript("$(\"#settings-modal\").modal()", null); + return true; + } else if (itemId == R.id.logout) { + m_web.evaluateJavascript("App.logout();", null); + return true; } + return super.onOptionsItemSelected(item); } private void toggleSystemUI() { |
