Parcourir la source

Updates and fixes

Aidan Follestad il y a 10 ans
Parent
commit
548e7e94cf

+ 2 - 2
library/build.gradle

@@ -10,7 +10,7 @@ android {
         minSdkVersion 14
         targetSdkVersion 21
         versionCode 1
-        versionName "0.3.0"
+        versionName "0.3.1"
     }
     buildTypes {
         release {
@@ -33,7 +33,7 @@ publish {
     userOrg = 'drummer-aidan'
     groupId = 'com.afollestad'
     artifactId = 'material-dialogs'
-    version = '0.3.0'
+    version = '0.3.1'
     description = 'A library for implementing Material design styled dialogs across all versions of Android.'
     website = 'https://github.com/afollestad/material-dialogs'
     issueTracker = "${website}/issues"

+ 4 - 3
library/src/main/java/com/afollestad/materialdialogs/MaterialDialog.java

@@ -222,10 +222,11 @@ public class MaterialDialog extends DialogBase implements View.OnClickListener,
                 setMargin(view.findViewById(R.id.buttonDefaultFrame), -1, 0, -1, -1);
                 final int conPadding = (int) getContext().getResources().getDimension(R.dimen.md_main_frame_margin);
                 View con = view.findViewById(R.id.content);
-                con.setPadding(con.getPaddingLeft(), 0, con.getPaddingRight(), conPadding);
+                setMargin(con, 0, conPadding, -1, -1);
             } else {
                 View con = view.findViewById(R.id.content);
-                con.setPadding(con.getPaddingLeft(), 0, con.getPaddingRight(), 0);
+                setMargin(con, 0, 0, -1, -1);
+
             }
         }
     }
@@ -847,7 +848,7 @@ public class MaterialDialog extends DialogBase implements View.OnClickListener,
         public MaterialDialog build() {
             return new MaterialDialog(this);
         }
-        
+
         public MaterialDialog show() {
             MaterialDialog dialog = new MaterialDialog(this);
             dialog.show();

+ 4 - 2
library/src/main/res/layout/md_dialog.xml

@@ -43,7 +43,8 @@
         <com.afollestad.materialdialogs.views.MeasureCallbackScrollView
             android:id="@+id/contentScrollView"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content">
+            android:layout_height="wrap_content"
+            android:clipToPadding="false">
 
             <TextView
                 android:id="@+id/content"
@@ -67,7 +68,8 @@
         <com.afollestad.materialdialogs.views.MeasureCallbackScrollView
             android:id="@+id/customViewScroll"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content">
+            android:layout_height="wrap_content"
+            android:clipToPadding="false">
 
             <LinearLayout
                 android:id="@+id/customViewFrame"

+ 2 - 2
sample/build.gradle

@@ -8,8 +8,8 @@ android {
         applicationId "com.afollestad.materialdialogssample"
         minSdkVersion 14
         targetSdkVersion 21
-        versionCode 33
-        versionName "0.3.0"
+        versionCode 34
+        versionName "0.3.1"
     }
     buildTypes {
 //        release {

+ 20 - 0
sample/src/main/java/com/afollestad/materialdialogssample/MainActivity.java

@@ -86,6 +86,13 @@ public class MainActivity extends ActionBarActivity {
             }
         });
 
+        findViewById(R.id.listNoTitle).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                showListNoTitle();
+            }
+        });
+
         findViewById(R.id.longList).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -231,6 +238,19 @@ public class MainActivity extends ActionBarActivity {
                 .show();
     }
 
+    private void showListNoTitle() {
+        new MaterialDialog.Builder(this)
+                .items(R.array.states)
+                .itemsCallback(new MaterialDialog.ListCallback() {
+                    @Override
+                    public void onSelection(MaterialDialog dialog, View view, int which, CharSequence text) {
+                        Toast.makeText(getApplicationContext(), which + ": " + text, Toast.LENGTH_SHORT).show();
+                    }
+                })
+                .build()
+                .show();
+    }
+
     private void showLongList() {
         new MaterialDialog.Builder(this)
                 .title(R.string.states)

+ 8 - 1
sample/src/main/res/layout/activity_main.xml

@@ -69,7 +69,14 @@
             android:id="@+id/longList"
             android:layout_width="match_parent"
             android:layout_height="56dp"
-            android:text="@string/long_list"
+            android:text="@string/basic_list_long"
+            android:layout_marginTop="@dimen/sample_button_spacing" />
+
+        <Button
+            android:id="@+id/listNoTitle"
+            android:layout_width="match_parent"
+            android:layout_height="56dp"
+            android:text="@string/basic_list_notitle"
             android:layout_marginTop="@dimen/sample_button_spacing" />
 
         <Button

+ 2 - 1
sample/src/main/res/values/strings.xml

@@ -42,13 +42,14 @@
     <string name="dismiss">Dismiss</string>
     <string name="basic_notitle">Basic (No Title)</string>
     <string name="shareLocationPrompt">This app wants to access your location.</string>
-    <string name="long_list">Basic Long List</string>
+    <string name="basic_list_long">Basic Long List</string>
     <string name="states">States</string>
     <string name="custom_listitem_button">A button!</string>
     <string name="custom_list_items">Custom List Items</string>
     <string name="loremIpsum">Lorem ipsum dolor sit amet, consectetur adipiscing elit. Curabitur vitae metus nec sapien elementum interdum ac mollis tortor. Nunc porttitor metus placerat orci auctor, sed dictum magna dapibus. Morbi a lacus ante. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin posuere nisl imperdiet lectus elementum accumsan. Etiam lacinia nisi ut nulla fermentum tempus. Integer ornare lacinia diam non maximus. Vestibulum iaculis urna eu elementum scelerisque. Etiam nisl erat, bibendum vitae magna nec, convallis malesuada erat. Cras non porttitor nibh. Pellentesque rhoncus sem luctus felis tincidunt bibendum. Pellentesque vulputate eros at nulla sollicitudin volutpat. Pellentesque laoreet est sit amet erat laoreet, id molestie nulla efficitur. Interdum et malesuada fames ac ante ipsum primis in faucibus. Sed varius nisl at imperdiet facilisis.</string>
     <string name="basic_longContent">Basic (Long Content)</string>
     <string name="basic_icon">Basic (Icon)</string>
+    <string name="basic_list_notitle">Basic List (No Title)</string>
 
     <string-array name="socialNetworks">
         <item>Twitter</item>