Cooltey has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/401769 )
Change subject: Follow up: snackbar should be shown above actions tab
......................................................................
Follow up: snackbar should be shown above actions tab
Bug: T146091
Change-Id: Ibf338c51115cfd20241a033682a36c665e1084d9
---
M app/src/main/java/org/wikipedia/page/PageFragment.java
R app/src/main/java/org/wikipedia/page/action/PageActionToolbarHideHandler.java
M app/src/main/java/org/wikipedia/util/FeedbackUtil.java
M app/src/main/res/layout/fragment_page.xml
4 files changed, 14 insertions(+), 12 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia
refs/changes/69/401769/1
diff --git a/app/src/main/java/org/wikipedia/page/PageFragment.java
b/app/src/main/java/org/wikipedia/page/PageFragment.java
index 7880ebd..a2455ec 100755
--- a/app/src/main/java/org/wikipedia/page/PageFragment.java
+++ b/app/src/main/java/org/wikipedia/page/PageFragment.java
@@ -55,7 +55,7 @@
import org.wikipedia.offline.OfflineManager;
import org.wikipedia.onboarding.PrefsOnboardingStateMachine;
import org.wikipedia.page.action.PageActionTab;
-import org.wikipedia.page.action.ViewHideHandlerWithBottomGravity;
+import org.wikipedia.page.action.PageActionToolbarHideHandler;
import org.wikipedia.page.bottomcontent.BottomContentView;
import org.wikipedia.page.leadimages.LeadImagesHandler;
import org.wikipedia.page.shareafact.ShareHandler;
@@ -323,11 +323,12 @@
bottomContentView = rootView.findViewById(R.id.page_bottom_view);
- ViewHideHandlerWithBottomGravity pageActionToolbarHideHandler
- = new ViewHideHandlerWithBottomGravity(tabLayout, null);
+ PageActionToolbarHideHandler pageActionToolbarHideHandler
+ = new PageActionToolbarHideHandler(tabLayout, null);
pageActionToolbarHideHandler.setScrollView(webView);
- ViewHideHandlerWithBottomGravity snackbarHideHandler =
- new
ViewHideHandlerWithBottomGravity(rootView.findViewById(R.id.fragment_page_coordinator),
null);
+
+ PageActionToolbarHideHandler snackbarHideHandler =
+ new
PageActionToolbarHideHandler(rootView.findViewById(R.id.fragment_page_coordinator),
null);
snackbarHideHandler.setScrollView(webView);
return rootView;
diff --git
a/app/src/main/java/org/wikipedia/page/action/ViewHideHandlerWithBottomGravity.java
b/app/src/main/java/org/wikipedia/page/action/PageActionToolbarHideHandler.java
similarity index 67%
rename from
app/src/main/java/org/wikipedia/page/action/ViewHideHandlerWithBottomGravity.java
rename to
app/src/main/java/org/wikipedia/page/action/PageActionToolbarHideHandler.java
index fdeb552..bb75238 100644
---
a/app/src/main/java/org/wikipedia/page/action/ViewHideHandlerWithBottomGravity.java
+++
b/app/src/main/java/org/wikipedia/page/action/PageActionToolbarHideHandler.java
@@ -7,8 +7,8 @@
import org.wikipedia.page.ViewHideHandler;
-public class ViewHideHandlerWithBottomGravity extends ViewHideHandler {
- public ViewHideHandlerWithBottomGravity(@NonNull View hideableView,
@Nullable View anchoredView) {
+public class PageActionToolbarHideHandler extends ViewHideHandler {
+ public PageActionToolbarHideHandler(@NonNull View hideableView, @Nullable
View anchoredView) {
super(hideableView, anchoredView, Gravity.BOTTOM);
}
diff --git a/app/src/main/java/org/wikipedia/util/FeedbackUtil.java
b/app/src/main/java/org/wikipedia/util/FeedbackUtil.java
index 76fcc94..7fda8a7 100644
--- a/app/src/main/java/org/wikipedia/util/FeedbackUtil.java
+++ b/app/src/main/java/org/wikipedia/util/FeedbackUtil.java
@@ -117,12 +117,13 @@
}
private static void adjustLayoutParamsIfRequired(Snackbar snackbar,
Activity activity) {
- CoordinatorLayout.LayoutParams params =
(CoordinatorLayout.LayoutParams) snackbar.getView().getLayoutParams();
if (activity instanceof PageActivity) {
+ // TODO: move getLayoutParams() out of this logic if there has
more special cases
+ CoordinatorLayout.LayoutParams params =
(CoordinatorLayout.LayoutParams) snackbar.getView().getLayoutParams();
int tabLayoutHeight = ((PageActivity)
activity).getTabLayout().getHeight();
params.setMargins(params.leftMargin, params.topMargin,
params.rightMargin, params.bottomMargin + tabLayoutHeight);
+ snackbar.getView().setLayoutParams(params);
}
- snackbar.getView().setLayoutParams(params);
}
private static void showToolbarButtonToast(View view) {
diff --git a/app/src/main/res/layout/fragment_page.xml
b/app/src/main/res/layout/fragment_page.xml
index e9058cb..12b932c 100644
--- a/app/src/main/res/layout/fragment_page.xml
+++ b/app/src/main/res/layout/fragment_page.xml
@@ -52,10 +52,10 @@
android:visibility="gone"/>
<android.support.design.widget.CoordinatorLayout
- android:layout_width="match_parent"
- android:layout_gravity="bottom"
android:id="@+id/fragment_page_coordinator"
- android:layout_height="wrap_content" />
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_gravity="bottom" />
<org.wikipedia.page.PageActionTabLayout
android:id="@+id/page_actions_tab_layout"
--
To view, visit https://gerrit.wikimedia.org/r/401769
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibf338c51115cfd20241a033682a36c665e1084d9
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Cooltey <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
