kiwix/kiwix-android
1
0
Fork 0
mirror of https://github.com/kiwix/kiwix-android.git synced 2025-08-03 18:56:44 -04:00
Code Issues Packages Projects Releases Wiki Activity

Bottom bar scrolls out of view when in scroll mode

Browse Source
This commit is contained in:
mhutti1 2017-08-09 15:21:00 -04:00
parent 662d3ce7ce
commit 9d8a8dc404
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -668,7 +668,7 @@ public class KiwixMobileActivity extends BaseActivity implements WebViewCallback
AttributeSet attrs = StyleUtils.getAttributes(this, R.xml.webview); AttributeSet attrs = StyleUtils.getAttributes(this, R.xml.webview);
KiwixWebView webView; KiwixWebView webView;
if (isHideToolbar) { if (isHideToolbar) {
webView = new ToolbarScrollingKiwixWebView(KiwixMobileActivity.this, this, toolbarContainer, attrs); webView = new ToolbarScrollingKiwixWebView(KiwixMobileActivity.this, this, toolbarContainer, pageBottomTabLayout , attrs);
((ToolbarScrollingKiwixWebView) webView).setOnToolbarVisibilityChangeListener( ((ToolbarScrollingKiwixWebView) webView).setOnToolbarVisibilityChangeListener(
new ToolbarScrollingKiwixWebView.OnToolbarVisibilityChangeListener() { new ToolbarScrollingKiwixWebView.OnToolbarVisibilityChangeListener() {
@Override @Override

5
app/src/main/java/org/kiwix/kiwixmobile/views/web/ToolbarScrollingKiwixWebView.java
View File

@ -33,12 +33,14 @@ public class ToolbarScrollingKiwixWebView extends KiwixWebView {
private final int statusBarHeight = DimenUtils.getTranslucentStatusBarHeight(getContext()); private final int statusBarHeight = DimenUtils.getTranslucentStatusBarHeight(getContext());
private final int toolbarHeight = DimenUtils.getToolbarHeight(getContext()); private final int toolbarHeight = DimenUtils.getToolbarHeight(getContext());
private View toolbarView; private View toolbarView;
private View bottombarView;
private OnToolbarVisibilityChangeListener listener; private OnToolbarVisibilityChangeListener listener;
private float startY; private float startY;
public ToolbarScrollingKiwixWebView(Context context, WebViewCallback callback, View toolbarView, AttributeSet attrs) { public ToolbarScrollingKiwixWebView(Context context, WebViewCallback callback, View toolbarView, View bottombarView, AttributeSet attrs) {
super(context, callback, attrs); super(context, callback, attrs);
this.toolbarView = toolbarView; this.toolbarView = toolbarView;
this.bottombarView = bottombarView;
} }
protected boolean moveToolbar(int scrollDelta) { protected boolean moveToolbar(int scrollDelta) {
@ -53,6 +55,7 @@ public class ToolbarScrollingKiwixWebView extends KiwixWebView {
} }
toolbarView.setTranslationY(newTranslation + statusBarHeight); toolbarView.setTranslationY(newTranslation + statusBarHeight);
bottombarView.setTranslationY(newTranslation * -1 * (bottombarView.getHeight() / (float) (statusBarHeight + toolbarHeight)));
this.setTranslationY(newTranslation + toolbarHeight + statusBarHeight); this.setTranslationY(newTranslation + toolbarHeight + statusBarHeight);
if (listener != null && newTranslation != originalTranslation) { if (listener != null && newTranslation != originalTranslation) {
if (newTranslation == -toolbarHeight -statusBarHeight) { if (newTranslation == -toolbarHeight -statusBarHeight) {