Browse Source

Release 0.4.9

Aidan Follestad 10 years ago
parent
commit
7b1a6b36ce

+ 16 - 15
library/src/main/java/com/afollestad/materialdialogs/MaterialDialog.java

@@ -255,6 +255,17 @@ public class MaterialDialog extends DialogBase implements View.OnClickListener,
             }
         }
 
+        if (builder.showListener != null) {
+            setOnShowListener(builder.showListener);
+        }
+        if (builder.cancelListener != null) {
+            setOnCancelListener(builder.cancelListener);
+        }
+        if (builder.dismissListener != null) {
+            setOnDismissListener(builder.dismissListener);
+        }
+
+
         invalidateActions();
         setOnShowListenerInternal();
         setViewInternal(view);
@@ -558,7 +569,7 @@ public class MaterialDialog extends DialogBase implements View.OnClickListener,
     }
 
     private void sendMultichoiceCallback() {
-        List<CharSequence> selectedTitles = new ArrayList<CharSequence>();
+        List<CharSequence> selectedTitles = new ArrayList<>();
         for (Integer i : selectedIndicesList) {
             selectedTitles.add(items[i]);
         }
@@ -666,9 +677,9 @@ public class MaterialDialog extends DialogBase implements View.OnClickListener,
         protected Typeface mediumFont;
         protected Drawable icon;
         protected ListAdapter adapter;
-        private OnDismissListener dismissListener;
-        private OnCancelListener cancelListener;
-        private OnShowListener showListener;
+        protected OnDismissListener dismissListener;
+        protected OnCancelListener cancelListener;
+        protected OnShowListener showListener;
         protected boolean forceStacking;
 
         public Builder(@NonNull Context context) {
@@ -970,17 +981,7 @@ public class MaterialDialog extends DialogBase implements View.OnClickListener,
         }
 
         public MaterialDialog build() {
-            MaterialDialog dialog = new MaterialDialog(this);
-            if (this.showListener != null) {
-                dialog.setOnShowListener(this.showListener);
-            }
-            if (this.cancelListener != null) {
-                dialog.setOnCancelListener(this.cancelListener);
-            }
-            if (this.dismissListener != null) {
-                dialog.setOnDismissListener(this.dismissListener);
-            }
-            return dialog;
+            return new MaterialDialog(this);
         }
 
         public MaterialDialog show() {

+ 8 - 25
library/src/main/res/layout/md_dialog.xml

@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
+<LinearLayout
     android:orientation="vertical"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools">
 
     <LinearLayout
         android:id="@+id/mainFrame"
@@ -33,8 +33,7 @@
                 android:layout_height="wrap_content"
                 android:scaleType="fitXY"
                 android:layout_marginRight="@dimen/md_icon_margin"
-                android:layout_marginEnd="@dimen/md_icon_margin"
-                />
+                android:layout_marginEnd="@dimen/md_icon_margin" />
 
             <TextView
                 android:id="@+id/title"
@@ -42,7 +41,6 @@
                 android:layout_height="wrap_content"
                 android:textSize="@dimen/md_title_textsize"
                 tools:text="Title" />
-
         </LinearLayout>
 
         <com.afollestad.materialdialogs.views.MeasureCallbackScrollView
@@ -57,9 +55,7 @@
                 android:layout_height="wrap_content"
                 android:textSize="@dimen/md_content_textsize"
                 tools:text="Content" />
-
         </com.afollestad.materialdialogs.views.MeasureCallbackScrollView>
-
     </LinearLayout>
 
     <LinearLayout
@@ -102,8 +98,7 @@
                         android:layout_height="wrap_content"
                         android:scaleType="fitXY"
                         android:layout_marginRight="@dimen/md_icon_margin"
-                        android:layout_marginEnd="@dimen/md_icon_margin"
-                        />
+                        android:layout_marginEnd="@dimen/md_icon_margin" />
 
                     <TextView
                         android:id="@+id/titleCustomView"
@@ -111,11 +106,8 @@
                         android:layout_height="wrap_content"
                         android:textSize="@dimen/md_title_textsize"
                         tools:text="Title" />
-
                 </LinearLayout>
-
             </LinearLayout>
-
         </com.afollestad.materialdialogs.views.MeasureCallbackScrollView>
 
         <LinearLayout
@@ -130,12 +122,9 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:scrollbarStyle="outsideOverlay"
-
                 android:divider="@null"
                 android:dividerHeight="0dp" />
-
         </LinearLayout>
-
     </LinearLayout>
 
     <View
@@ -158,9 +147,7 @@
             android:layout_alignParentLeft="true"
             android:layout_alignParentStart="true"
             android:layout_marginLeft="@dimen/md_neutral_button_margin"
-            android:layout_marginStart="@dimen/md_neutral_button_margin"
-            />
-
+            android:layout_marginStart="@dimen/md_neutral_button_margin" />
         <!-- toLeftOf rule added from invalidateActions() -->
         <Button
             android:id="@+id/buttonDefaultNegative"
@@ -170,9 +157,7 @@
             android:id="@+id/buttonDefaultPositive"
             style="@style/MD_ActionButton"
             android:layout_alignParentRight="true"
-            android:layout_alignParentEnd="true"
-            />
-
+            android:layout_alignParentEnd="true" />
     </RelativeLayout>
 
     <LinearLayout
@@ -193,7 +178,5 @@
         <Button
             android:id="@+id/buttonStackedNeutral"
             style="@style/MD_ActionButtonStacked" />
-
     </LinearLayout>
-
 </LinearLayout>

+ 5 - 6
library/src/main/res/layout/md_listitem.xml

@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
+<LinearLayout
     android:orientation="horizontal"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:gravity="center_vertical">
+    android:gravity="center_vertical"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools">
 
     <TextView
         android:id="@+id/title"
@@ -17,7 +17,6 @@
         android:layout_marginLeft="@dimen/md_listitem_margin_left"
         android:layout_marginStart="@dimen/md_listitem_margin_left"
         android:layout_marginRight="@dimen/md_dialog_frame_margin"
-        android:layout_marginEnd="@dimen/md_dialog_frame_margin"
-        />
+        android:layout_marginEnd="@dimen/md_dialog_frame_margin" />
 
 </LinearLayout>

+ 5 - 6
library/src/main/res/layout/md_listitem_multichoice.xml

@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
+<LinearLayout
     android:orientation="horizontal"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:gravity="center_vertical"
-    android:descendantFocusability="blocksDescendants">
+    android:descendantFocusability="blocksDescendants"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools">
 
     <CheckBox
         android:id="@+id/control"
@@ -30,7 +30,6 @@
         android:textSize="@dimen/md_listitem_textsize"
         android:gravity="center_vertical"
         android:layout_marginRight="@dimen/md_dialog_frame_margin"
-        android:layout_marginEnd="@dimen/md_dialog_frame_margin"
-        />
+        android:layout_marginEnd="@dimen/md_dialog_frame_margin" />
 
 </LinearLayout>

+ 5 - 6
library/src/main/res/layout/md_listitem_singlechoice.xml

@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
+<LinearLayout
     android:orientation="horizontal"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:gravity="center_vertical"
-    android:descendantFocusability="blocksDescendants">
+    android:descendantFocusability="blocksDescendants"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools">
 
     <RadioButton
         android:id="@+id/control"
@@ -30,7 +30,6 @@
         android:textSize="@dimen/md_listitem_textsize"
         android:gravity="center_vertical"
         android:layout_marginRight="@dimen/md_dialog_frame_margin"
-        android:layout_marginEnd="@dimen/md_dialog_frame_margin"
-        />
+        android:layout_marginEnd="@dimen/md_dialog_frame_margin" />
 
 </LinearLayout>

+ 4 - 8
library/src/main/res/values/styles.xml

@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
 <resources>
 
     <style name="MD_Light" parent="Theme_Light_Dialog">
@@ -11,7 +10,6 @@
         <item name="md_divider">@color/md_divider_white</item>
         <item name="md_selector">@drawable/md_selector_dark</item>
         <item name="md_btn_selector">@drawable/md_btn_selector_dark</item>
-
         <item name="android:windowFrame">@null</item>
         <item name="android:windowBackground">@android:color/transparent</item>
         <item name="android:windowContentOverlay">@null</item>
@@ -20,12 +18,12 @@
     <style name="MD_ActionButtonStacked" parent="@style/MD_ActionButton">
         <item name="android:layout_width">match_parent</item>
         <item name="android:gravity">end|center_vertical</item>
-
         <item name="android:paddingLeft">@dimen/md_button_padding_horizontal_internalexternal</item>
-        <item name="android:paddingStart">@dimen/md_button_padding_horizontal_internalexternal</item>
-        <item name="android:paddingRight">@dimen/md_button_padding_horizontal_internalexternal</item>
+        <item name="android:paddingStart">@dimen/md_button_padding_horizontal_internalexternal
+        </item>
+        <item name="android:paddingRight">@dimen/md_button_padding_horizontal_internalexternal
+        </item>
         <item name="android:paddingEnd">@dimen/md_button_padding_horizontal_internalexternal</item>
-
         <item name="android:layout_marginLeft">0dp</item>
         <item name="android:layout_marginStart">0dp</item>
     </style>
@@ -38,10 +36,8 @@
         <item name="android:textAllCaps">true</item>
         <item name="android:gravity">center</item>
         <item name="android:singleLine">true</item>
-
         <item name="android:layout_height">@dimen/md_button_height</item>
         <item name="android:minWidth">@dimen/md_button_min_width</item>
-
     </style>
 
     <!-- Light dialog theme for devices prior Honeycomb -->

+ 1 - 1
sample/build.gradle

@@ -8,7 +8,7 @@ android {
         applicationId "com.afollestad.materialdialogssample"
         minSdkVersion 10
         targetSdkVersion 21
-        versionCode 54
+        versionCode 55
         versionName "0.4.9"
     }
     lintOptions {

BIN
sample/sample.apk


+ 3 - 3
sample/src/main/res/layout/dialog_customlistitem.xml

@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:descendantFocusability="blocksDescendants"
-    android:background="@drawable/md_selector">
+    android:background="@drawable/md_selector"
+    xmlns:android="http://schemas.android.com/apk/res/android">
 
     <TextView
         android:id="@+id/title"