Dbrant has uploaded a new change for review.
https://gerrit.wikimedia.org/r/277856
Change subject: Transition Wiktionary dialog to a bottom sheet.
......................................................................
Transition Wiktionary dialog to a bottom sheet.
Change-Id: Ic1a58ff8af65f9ca8be3bd957f23871b680465f4
---
M app/src/main/java/org/wikipedia/page/PageActivity.java
M app/src/main/java/org/wikipedia/page/snippet/ShareHandler.java
M app/src/main/java/org/wikipedia/wiktionary/WiktionaryDialog.java
M app/src/main/res/layout/dialog_wiktionary.xml
4 files changed, 15 insertions(+), 23 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia
refs/changes/56/277856/1
diff --git a/app/src/main/java/org/wikipedia/page/PageActivity.java
b/app/src/main/java/org/wikipedia/page/PageActivity.java
index c1368f6..6cb22e9 100644
--- a/app/src/main/java/org/wikipedia/page/PageActivity.java
+++ b/app/src/main/java/org/wikipedia/page/PageActivity.java
@@ -54,6 +54,7 @@
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.design.widget.BottomSheetDialog;
+import android.support.design.widget.BottomSheetDialogFragment;
import android.support.design.widget.NavigationView;
import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentManager;
@@ -691,6 +692,10 @@
bottomSheetPresenter.show(dialog);
}
+ public void showBottomSheet(BottomSheetDialogFragment dialog) {
+ bottomSheetPresenter.show(dialog);
+ }
+
// Note: back button first handled in {@link #onOptionsItemSelected()};
@Override
public void onBackPressed() {
diff --git a/app/src/main/java/org/wikipedia/page/snippet/ShareHandler.java
b/app/src/main/java/org/wikipedia/page/snippet/ShareHandler.java
index a796e81..e0453f2 100755
--- a/app/src/main/java/org/wikipedia/page/snippet/ShareHandler.java
+++ b/app/src/main/java/org/wikipedia/page/snippet/ShareHandler.java
@@ -55,7 +55,6 @@
private static final String PAYLOAD_PURPOSE_SHARE = "share";
private static final String PAYLOAD_PURPOSE_DEFINE = "define";
private static final String PAYLOAD_TEXT_KEY = "text";
- private static final String WIKTIONARY_DEFINITION_TAG =
"wiktionary_definition_dialog";
@ColorRes private static final int SHARE_TOOL_TIP_COLOR =
R.color.blue_liberal;
@@ -97,8 +96,7 @@
public void showWiktionaryDefinition(String text) {
PageTitle title = activity.getCurPageFragment().getTitle();
- WiktionaryDialog dialog = WiktionaryDialog.newInstance(title, text);
- dialog.show(activity.getSupportFragmentManager(),
WIKTIONARY_DEFINITION_TAG);
+ activity.showBottomSheet(WiktionaryDialog.newInstance(title, text));
}
private void onSharePayload(String text) {
diff --git a/app/src/main/java/org/wikipedia/wiktionary/WiktionaryDialog.java
b/app/src/main/java/org/wikipedia/wiktionary/WiktionaryDialog.java
index 8a8ec91..46a9338 100644
--- a/app/src/main/java/org/wikipedia/wiktionary/WiktionaryDialog.java
+++ b/app/src/main/java/org/wikipedia/wiktionary/WiktionaryDialog.java
@@ -3,6 +3,7 @@
import android.content.DialogInterface;
import android.os.Bundle;
import android.support.annotation.NonNull;
+import android.support.design.widget.BottomSheetDialogFragment;
import android.text.Html;
import android.view.LayoutInflater;
import android.view.View;
@@ -18,12 +19,10 @@
import org.wikipedia.page.LinkMovementMethodExt;
import org.wikipedia.page.PageActivity;
import org.wikipedia.page.PageTitle;
-import org.wikipedia.page.linkpreview.SwipeableBottomDialog;
import org.wikipedia.server.PageServiceFactory;
import org.wikipedia.server.PageService;
import org.wikipedia.server.restbase.RbPageService;
import org.wikipedia.server.restbase.RbDefinition;
-import org.wikipedia.util.DimenUtil;
import org.wikipedia.util.log.L;
import org.wikipedia.views.AppTextView;
@@ -36,12 +35,11 @@
import static org.wikipedia.util.StringUtil.hasSectionAnchor;
import static org.wikipedia.util.StringUtil.removeSectionAnchor;
-public class WiktionaryDialog extends SwipeableBottomDialog {
+public class WiktionaryDialog extends BottomSheetDialogFragment {
private static final String WIKTIONARY_DOMAIN = ".wiktionary.org";
private static final String TITLE = "title";
private static final String SELECTED_TEXT = "selected_text";
private static final String PATH_WIKI = "/wiki/";
- private static final int PEEK_HEIGHT_DIVISOR = 3;
private static String[] ENABLED_LANGUAGES = {
"en" // English
@@ -70,16 +68,13 @@
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
- setStyle(STYLE_NO_TITLE, R.style.LinkPreviewDialog);
- int peekHeight = DimenUtil.getDisplayHeightPx() / PEEK_HEIGHT_DIVISOR;
- setContentPeekHeight(peekHeight);
+ pageTitle = getArguments().getParcelable(TITLE);
+ selectedText = getArguments().getString(SELECTED_TEXT);
}
@Override
- protected View inflateDialogView(LayoutInflater inflater, ViewGroup
container) {
- pageTitle = getArguments().getParcelable(TITLE);
- selectedText = getArguments().getString(SELECTED_TEXT);
-
+ public View onCreateView(LayoutInflater inflater, ViewGroup container,
+ Bundle savedInstanceState) {
rootView = inflater.inflate(R.layout.dialog_wiktionary, container);
progressBar = (ProgressBar)
rootView.findViewById(R.id.dialog_wiktionary_progress);
diff --git a/app/src/main/res/layout/dialog_wiktionary.xml
b/app/src/main/res/layout/dialog_wiktionary.xml
index 6a46f3c..a059448 100644
--- a/app/src/main/res/layout/dialog_wiktionary.xml
+++ b/app/src/main/res/layout/dialog_wiktionary.xml
@@ -4,15 +4,9 @@
android:layout_width="match_parent"
android:layout_height="wrap_content">
- <LinearLayout
+ <android.support.v4.widget.NestedScrollView
android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="vertical">
-
- <View
- android:layout_width="match_parent"
- android:layout_height="8dp"
- android:background="@drawable/link_preview_top_shadow"/>
+ android:layout_height="wrap_content">
<LinearLayout
android:layout_width="match_parent"
@@ -78,7 +72,7 @@
</LinearLayout>
- </LinearLayout>
+ </android.support.v4.widget.NestedScrollView>
<ProgressBar
android:id="@+id/dialog_wiktionary_progress"
--
To view, visit https://gerrit.wikimedia.org/r/277856
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic1a58ff8af65f9ca8be3bd957f23871b680465f4
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Dbrant <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
