kiwix/kiwix-android
1
0
Fork 0
mirror of https://github.com/kiwix/kiwix-android.git synced 2025-09-23 04:33:54 -04:00
Code Issues Packages Projects Releases Wiki Activity

#1464 Impossible to filter by author with Gutenberg

Browse Source
This commit is contained in:
Sean Mac Gillicuddy 2019-09-13 09:53:57 +01:00
parent b37ca840e8
commit afa70ee42d
1 changed files with 17 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
app/src/main/java/org/kiwix/kiwixmobile/main/MainActivity.java
View File

@ -44,7 +44,6 @@ import android.text.style.ForegroundColorSpan;
import android.util.AttributeSet; import android.util.AttributeSet;
import android.util.Log; import android.util.Log;
import android.view.ActionMode; import android.view.ActionMode;
import android.view.KeyEvent;
import android.view.Menu; import android.view.Menu;
import android.view.MenuInflater; import android.view.MenuInflater;
import android.view.MenuItem; import android.view.MenuItem;
@ -398,7 +397,6 @@ public class MainActivity extends BaseActivity implements WebViewCallback,
searchFiles(); searchFiles();
tabRecyclerView.setAdapter(tabsAdapter); tabRecyclerView.setAdapter(tabsAdapter);
new ItemTouchHelper(tabCallback).attachToRecyclerView(tabRecyclerView); new ItemTouchHelper(tabCallback).attachToRecyclerView(tabRecyclerView);
drawerLayout.setDescendantFocusability(ViewGroup.FOCUS_BLOCK_DESCENDANTS);
} }
//End of onCreate //End of onCreate
@ -587,6 +585,23 @@ public class MainActivity extends BaseActivity implements WebViewCallback,
drawerLayout.openDrawer(GravityCompat.END); drawerLayout.openDrawer(GravityCompat.END);
} }
@Override public void onBackPressed() {
if (tabSwitcherRoot.getVisibility() == View.VISIBLE) {
selectTab(currentWebViewIndex);
hideTabSwitcher();
} else if (getCurrentWebView().canGoBack()) {
getCurrentWebView().goBack();
} else if (isFullscreenOpened) {
closeFullScreen();
} else if (compatCallback.mIsActive) {
compatCallback.finish();
} else if (drawerLayout.isDrawerOpen(GravityCompat.END)) {
drawerLayout.closeDrawers();
} else {
super.onBackPressed();
}
}
private void checkForRateDialog() { private void checkForRateDialog() {
isFirstRun = sharedPreferenceUtil.getPrefIsFirstRun(); isFirstRun = sharedPreferenceUtil.getPrefIsFirstRun();
visitCounterPref = new RateAppCounter(this); visitCounterPref = new RateAppCounter(this);
@ -1223,31 +1238,6 @@ public class MainActivity extends BaseActivity implements WebViewCallback,
} }
} }
public boolean onKeyDown(int keyCode, KeyEvent event) {
if (event.getAction() == KeyEvent.ACTION_DOWN) {
switch (keyCode) {
case KeyEvent.KEYCODE_BACK:
if (tabSwitcherRoot.getVisibility() == View.VISIBLE) {
selectTab(currentWebViewIndex);
hideTabSwitcher();
} else if (getCurrentWebView().canGoBack()) {
getCurrentWebView().goBack();
} else if (isFullscreenOpened) {
closeFullScreen();
} else if (compatCallback.mIsActive) {
compatCallback.finish();
} else {
finish();
}
return true;
case KeyEvent.KEYCODE_MENU:
openOptionsMenu();
return true;
}
}
return false;
}
@OnClick(R.id.tab_switcher_close_all_tabs) @OnClick(R.id.tab_switcher_close_all_tabs)
void closeAllTabs() { void closeAllTabs() {
rotate(closeAllTabsButton); rotate(closeAllTabsButton);