[MediaWiki-commits] [Gerrit] Make ThemeChooser dialog inherit from BottomDialog. - change (apps...wikipedia)

[Dbrant (Code Review)]

Dbrant has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/173047

Change subject: Make ThemeChooser dialog inherit from BottomDialog.
......................................................................

Make ThemeChooser dialog inherit from BottomDialog.

Change-Id: I78bcd14e181d7c1ea736f3f5b84dcfdb9804b5ab
---
M wikipedia/src/main/java/org/wikipedia/theme/ThemeChooserDialog.java
1 file changed, 10 insertions(+), 27 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia 
refs/changes/47/173047/1

diff --git 
a/wikipedia/src/main/java/org/wikipedia/theme/ThemeChooserDialog.java 
b/wikipedia/src/main/java/org/wikipedia/theme/ThemeChooserDialog.java
index 00d679d..9ee434a 100644
--- a/wikipedia/src/main/java/org/wikipedia/theme/ThemeChooserDialog.java
+++ b/wikipedia/src/main/java/org/wikipedia/theme/ThemeChooserDialog.java
@@ -1,9 +1,8 @@
 package org.wikipedia.theme;
 
-import android.app.Dialog;
 import android.content.Context;
 import android.os.Build;
-import android.view.*;
+import android.view.View;
 import android.widget.Button;
 import android.widget.ProgressBar;
 import com.squareup.otto.Subscribe;
@@ -11,8 +10,9 @@
 import org.wikipedia.WikipediaApp;
 import org.wikipedia.analytics.AppearanceChangeFunnel;
 import org.wikipedia.events.WebViewInvalidateEvent;
+import org.wikipedia.page.BottomDialog;
 
-public class ThemeChooserDialog extends Dialog {
+public class ThemeChooserDialog extends BottomDialog {
     private WikipediaApp app;
     private Button buttonDefaultTextSize;
     private Button buttonDecreaseTextSize;
@@ -24,28 +24,11 @@
     private AppearanceChangeFunnel funnel;
 
     public ThemeChooserDialog(Context context) {
-        super(context);
+        super(context, R.layout.dialog_themechooser);
         app = WikipediaApp.getInstance();
-
-        LayoutInflater inflater = (LayoutInflater) 
context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
-        View dlgLayout = inflater.inflate(R.layout.dialog_themechooser, null);
-
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.ICE_CREAM_SANDWICH) {
-            getWindow().setDimAmount(0.0f);
-        }
-        requestWindowFeature(Window.FEATURE_NO_TITLE);
-        setContentView(dlgLayout);
         funnel = new AppearanceChangeFunnel(app, app.getPrimarySite());
 
-        getWindow().setBackgroundDrawable(null);
-        WindowManager.LayoutParams lp = new WindowManager.LayoutParams();
-        lp.copyFrom(getWindow().getAttributes());
-        lp.width = WindowManager.LayoutParams.MATCH_PARENT;
-        lp.height = WindowManager.LayoutParams.WRAP_CONTENT;
-        lp.gravity = Gravity.BOTTOM;
-        getWindow().setAttributes(lp);
-
-        buttonDecreaseTextSize = (Button) 
dlgLayout.findViewById(R.id.buttonDecreaseTextSize);
+        buttonDecreaseTextSize = (Button) 
getDialogLayout().findViewById(R.id.buttonDecreaseTextSize);
         buttonDecreaseTextSize.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
@@ -57,7 +40,7 @@
             }
         });
 
-        buttonDefaultTextSize = (Button) 
dlgLayout.findViewById(R.id.buttonDefaultTextSize);
+        buttonDefaultTextSize = (Button) 
getDialogLayout().findViewById(R.id.buttonDefaultTextSize);
         buttonDefaultTextSize.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
@@ -69,7 +52,7 @@
             }
         });
 
-        buttonIncreaseTextSize = (Button) 
dlgLayout.findViewById(R.id.buttonIncreaseTextSize);
+        buttonIncreaseTextSize = (Button) 
getDialogLayout().findViewById(R.id.buttonIncreaseTextSize);
         buttonIncreaseTextSize.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
@@ -81,7 +64,7 @@
             }
         });
 
-        buttonThemeLight = (Button) 
dlgLayout.findViewById(R.id.buttonColorsLight);
+        buttonThemeLight = (Button) 
getDialogLayout().findViewById(R.id.buttonColorsLight);
         buttonThemeLight.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
@@ -93,7 +76,7 @@
             }
         });
 
-        buttonThemeDark = (Button) 
dlgLayout.findViewById(R.id.buttonColorsDark);
+        buttonThemeDark = (Button) 
getDialogLayout().findViewById(R.id.buttonColorsDark);
         buttonThemeDark.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
@@ -105,7 +88,7 @@
             }
         });
 
-        fontChangeProgressBar = (ProgressBar) 
dlgLayout.findViewById(R.id.font_change_progress_bar);
+        fontChangeProgressBar = (ProgressBar) 
getDialogLayout().findViewById(R.id.font_change_progress_bar);
 
         updateButtonState();
     }

-- 
To view, visit https://gerrit.wikimedia.org/r/173047
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I78bcd14e181d7c1ea736f3f5b84dcfdb9804b5ab
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Dbrant <dbr...@wikimedia.org>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits