Browse Source

Tweaks to list dialog padding, default custom preference layout is used for Material preferences, new README art, correct dialog widths, etc.

Aidan Follestad 9 years ago
parent
commit
94720b9ab5

+ 2 - 2
README.md

@@ -1,6 +1,6 @@
 # Material Dialogs
 
-![Screenshots](https://raw.githubusercontent.com/afollestad/material-dialogs/master/art/mdshowcase.png)
+![Screenshots](https://raw.githubusercontent.com/afollestad/material-dialogs/master/art/mdart.jpg)
 
 # Table of Contents (Core)
 
@@ -97,7 +97,7 @@ You can create basic, list, single/multi choice, progress, input, etc. dialogs w
 
 ```gradle
 dependencies {
-    compile('com.afollestad.material-dialogs:core:0.8.3.0@aar') {
+    compile('com.afollestad.material-dialogs:core:0.8.4.0@aar') {
         transitive = true
     }
 }

BIN
art/mdart.jpg


BIN
art/mdshowcase.png


+ 1 - 1
commons/build.gradle

@@ -11,7 +11,7 @@ android {
         minSdkVersion 8
         targetSdkVersion 23
         versionCode 1
-        versionName "0.8.3.0"
+        versionName "0.8.4.0"
     }
     lintOptions {
         abortOnError false

+ 2 - 0
commons/src/main/java/com/afollestad/materialdialogs/prefs/MaterialDialogPreference.java

@@ -15,6 +15,7 @@ import android.util.AttributeSet;
 import android.view.View;
 
 import com.afollestad.materialdialogs.MaterialDialog;
+import com.afollestad.materialdialogs.commons.R;
 
 import java.lang.reflect.Method;
 
@@ -39,6 +40,7 @@ public class MaterialDialogPreference extends DialogPreference {
 
     private void init(Context context) {
         this.context = context;
+        setLayoutResource(R.layout.md_preference_custom);
     }
 
     @Override

+ 2 - 0
commons/src/main/java/com/afollestad/materialdialogs/prefs/MaterialEditTextPreference.java

@@ -43,6 +43,8 @@ public class MaterialEditTextPreference extends EditTextPreference {
 
     public MaterialEditTextPreference(Context context, AttributeSet attrs) {
         super(context, attrs);
+        setLayoutResource(R.layout.md_preference_custom);
+
         int fallback;
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP)
             fallback = DialogUtils.resolveColor(context, android.R.attr.colorAccent);

+ 2 - 0
commons/src/main/java/com/afollestad/materialdialogs/prefs/MaterialListPreference.java

@@ -15,6 +15,7 @@ import android.view.View;
 
 import com.afollestad.materialdialogs.DialogAction;
 import com.afollestad.materialdialogs.MaterialDialog;
+import com.afollestad.materialdialogs.commons.R;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
@@ -39,6 +40,7 @@ public class MaterialListPreference extends ListPreference {
 
     private void init(Context context) {
         this.context = context;
+        setLayoutResource(R.layout.md_preference_custom);
         if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.GINGERBREAD_MR1)
             setWidgetLayoutResource(0);
     }

+ 2 - 0
commons/src/main/java/com/afollestad/materialdialogs/prefs/MaterialMultiSelectListPreference.java

@@ -16,6 +16,7 @@ import android.view.View;
 
 import com.afollestad.materialdialogs.DialogAction;
 import com.afollestad.materialdialogs.MaterialDialog;
+import com.afollestad.materialdialogs.commons.R;
 
 import java.lang.reflect.Method;
 import java.util.ArrayList;
@@ -52,6 +53,7 @@ public class MaterialMultiSelectListPreference extends MultiSelectListPreference
 
     private void init(Context context) {
         this.context = context;
+        setLayoutResource(R.layout.md_preference_custom);
         if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.GINGERBREAD_MR1)
             setWidgetLayoutResource(0);
     }

+ 4 - 4
sample/src/main/res/layout/preference_custom.xml → commons/src/main/res/layout/md_preference_custom.xml

@@ -3,21 +3,21 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:baselineAligned="false"
     android:gravity="center_vertical"
     android:minHeight="?android:attr/listPreferredItemHeight"
     android:paddingEnd="?android:attr/scrollbarSize"
     android:paddingRight="?android:attr/scrollbarSize"
-    tools:ignore="RtlSymmetry,UnusedAttribute"
-    android:baselineAligned="false">
+    tools:ignore="RtlSymmetry,UnusedAttribute">
 
     <RelativeLayout
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginBottom="12dip"
         android:layout_marginEnd="6dip"
-        android:layout_marginLeft="16dip"
+        android:layout_marginLeft="@dimen/md_preference_content_inset"
         android:layout_marginRight="6dip"
-        android:layout_marginStart="16dip"
+        android:layout_marginStart="@dimen/md_preference_content_inset"
         android:layout_marginTop="12dip"
         android:layout_weight="1">
 

+ 6 - 0
commons/src/main/res/values-large/dimens.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <dimen name="md_preference_content_inset">28dp</dimen>
+
+</resources>

+ 2 - 0
commons/src/main/res/values/dimens.xml

@@ -6,4 +6,6 @@
     <dimen name="md_simplelist_icon_margin">16dp</dimen>
     <dimen name="md_simplelist_textsize">18sp</dimen>
 
+    <dimen name="md_preference_content_inset">20dp</dimen>
+
 </resources>

+ 1 - 1
core/build.gradle

@@ -11,7 +11,7 @@ android {
         minSdkVersion 8
         targetSdkVersion 23
         versionCode 1
-        versionName "0.8.3.0"
+        versionName "0.8.4.0"
         consumerProguardFiles 'progress-proguard.txt'
     }
     lintOptions {

+ 1 - 1
core/src/main/res/layout/md_dialog_list.xml

@@ -5,7 +5,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools">
 
-    <include layout="@layout/md_stub_titleframe" />
+    <include layout="@layout/md_stub_titleframe_lesspadding" />
 
     <LinearLayout
         android:orientation="vertical"

+ 29 - 0
core/src/main/res/layout/md_stub_titleframe_lesspadding.xml

@@ -0,0 +1,29 @@
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/titleFrame"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:gravity="center_vertical"
+    android:orientation="horizontal"
+    android:paddingBottom="@dimen/md_title_frame_margin_bottom_less"
+    android:paddingLeft="@dimen/md_dialog_frame_margin"
+    android:paddingRight="@dimen/md_dialog_frame_margin"
+    android:paddingTop="@dimen/md_dialog_frame_margin">
+
+    <ImageView
+        android:id="@+id/icon"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="@dimen/md_icon_margin"
+        android:layout_marginRight="@dimen/md_icon_margin"
+        android:scaleType="fitXY"
+        tools:ignore="ContentDescription" />
+
+    <TextView
+        android:id="@+id/title"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:textSize="@dimen/md_title_textsize"
+        tools:text="Title" />
+
+</LinearLayout>

+ 1 - 0
core/src/main/res/values/dimens.xml

@@ -33,6 +33,7 @@
     <dimen name="md_dialog_frame_margin">24dp</dimen>
     <!-- Total title margin bottom is 16, but we split this between content and title -->
     <dimen name="md_title_frame_margin_bottom">12dp</dimen>
+    <dimen name="md_title_frame_margin_bottom_less">6dp</dimen>
     <!-- The desired padding when no title is visible,
          This plus md_content_padding_top should equals md_dialog_frame_margin -->
     <dimen name="md_notitle_vertical_padding">16dp</dimen>

+ 2 - 2
sample/build.gradle

@@ -17,8 +17,8 @@ android {
         applicationId "com.afollestad.materialdialogssample"
         minSdkVersion 9
         targetSdkVersion 23
-        versionCode 145
-        versionName "0.8.3.0"
+        versionCode 146
+        versionName "0.8.4.0"
     }
     lintOptions {
         abortOnError false

+ 0 - 3
sample/src/main/res/xml-v11/preferences.xml

@@ -15,7 +15,6 @@
         android:entries="@array/preference_values"
         android:entryValues="@array/preference_values"
         android:key="unused_key01"
-        android:layout="@layout/preference_custom"
         android:persistent="true"
         android:summary="@string/list_pref_desc"
         android:title="@string/list_pref_title" />
@@ -24,7 +23,6 @@
         android:entries="@array/preference_values"
         android:entryValues="@array/preference_values"
         android:key="unused_key02"
-        android:layout="@layout/preference_custom"
         android:persistent="true"
         android:summary="@string/multilist_pref_desc"
         android:title="@string/multilist_pref_title" />
@@ -35,7 +33,6 @@
         android:dialogTitle="@string/edittext_pref_dialogtitle"
         android:inputType="textPersonName"
         android:key="unused_key03"
-        android:layout="@layout/preference_custom"
         android:persistent="true"
         android:summary="@string/edittext_pref_desc"
         android:title="@string/edittext_pref_title" />

+ 0 - 2
sample/src/main/res/xml/preferences.xml

@@ -15,7 +15,6 @@
         android:entries="@array/preference_values"
         android:entryValues="@array/preference_values"
         android:key="unused_key01"
-        android:layout="@layout/preference_custom"
         android:persistent="true"
         android:summary="@string/list_pref_desc"
         android:title="@string/list_pref_title" />
@@ -26,7 +25,6 @@
         android:dialogTitle="@string/edittext_pref_dialogtitle"
         android:inputType="textPersonName"
         android:key="unused_key03"
-        android:layout="@layout/preference_custom"
         android:persistent="true"
         android:summary="@string/edittext_pref_desc"
         android:title="@string/edittext_pref_title" />