From 4c8a1be4fba15e54ec082d5ff6cf1274c81d059a Mon Sep 17 00:00:00 2001
From: fengdai <toxic.dai@gmail.com>
Date: Fri, 21 Nov 2014 21:29:26 +0800
Subject: [PATCH] Rename and do refactor, also update README file.

---
 README.md                                     | 84 ++++++++++-------
 .../res/values-v11/adp_core_themes.xml        |  6 +-
 .../res/values/adp_core_attrs.xml             | 75 +++++++++++----
 .../res/values/adp_core_styles.xml            | 33 +++++++
 .../res/values/adp_core_themes.xml            | 10 +-
 .../res/layout/activity_my.xml                |  6 ++
 alertdialogpro-demo/res/values/styles.xml     |  6 +-
 .../com/alertdialogpro/demo/MainActivity.java | 35 ++++++-
 .../res/layout/adp_alert_dialog_holo.xml      |  2 +-
 .../layout/adp_select_dialog_item_holo.xml    |  2 +-
 .../adp_select_dialog_multichoice_holo.xml    |  2 +-
 .../adp_select_dialog_singlechoice_holo.xml   |  2 +-
 .../res/values/adp_holo_attrs.xml             |  5 +
 .../res/values/adp_holo_styles.xml            | 65 ++++++++-----
 .../res/values/adp_holo_themes.xml            | 38 ++++----
 .../res/layout/adp_alert_dialog_material.xml  |  1 +
 .../adp_select_dialog_item_material.xml       |  2 +-
 ...adp_select_dialog_multichoice_material.xml |  2 +-
 ...dp_select_dialog_singlechoice_material.xml |  2 +-
 .../res/values-v11/adp_mtrl_themes.xml        | 15 ---
 .../res/values-v14/adp_mtrl_styles.xml        | 13 ++-
 .../res/values-v21/adp_mtrl_styles.xml        | 10 +-
 .../res/values/adp_mtrl_styles.xml            | 91 ++++++++++---------
 .../res/values/adp_mtrl_themes.xml            | 50 +++++-----
 24 files changed, 347 insertions(+), 210 deletions(-)
 create mode 100644 alertdialogpro-core/res/values/adp_core_styles.xml
 delete mode 100644 alertdialogpro-theme-material/res/values-v11/adp_mtrl_themes.xml

diff --git a/README.md b/README.md
index aed7223..a4c9d92 100644
--- a/README.md
+++ b/README.md
@@ -55,50 +55,70 @@ Usage
 
    With AlertDialogPro, you can theme your dialog easily.
 
-   1. If one of the built-in themes can meet almost your requirements, but you want some slight changes. You can use following attributes:
+   1. If one of the built-in themes can meet almost your requirements, but you want to do some slight changes. You can use following attributes:
 
       ```xml
-      <!-- Specify the dialog's background -->
-      <item name="android:windowBackground">@drawable/dialog_background_material_dark</item>
-      <!-- Style the dialog's title -->
-      <item name="android:windowTitleStyle">@style/DialogWindowTitle.Material</item>
-      <!-- Style the dialog's message text -->
-      <item name="adpMessageTextAppearance">@style/TextAppearance.Material.Subhead</item>
-      <!-- Specify the item's height -->
-      <item name="adpListItemHeight">48dip</item>
-      <!-- Specify the item's text color -->
-      <item name="adpListItemTextColor">@color/primary_text_material_dark</item>
-      <!-- Specify the item's text appearance -->
-      <item name="adpListItemTextAppearance">@style/TextAppearance.Material.Subhead</item>
-      <!-- Specify the list selector -->
-      <item name="adpListItemBackground">@drawable/item_background_material_dark</item>
-      <!-- Specify the list divider -->
-      <item name="adpListDivider">@null</item>
-      <!-- Style the dialog's listView -->
-      <item name="android:listViewStyle">@style/Widget.Material.ListView</item>
-      <!-- Style the ButtonBar -->
-      <item name="adpButtonBarStyle">@style/Widget.Material.ButtonBar</item>
-      <!-- Style the Buttons -->
-      <item name="adpButtonBarButtonStyle">@style/Widget.Material.Button</item>
-      <!-- Style the Buttons respectively -->
-      <item name="adpButtonBarPositiveButtonStyle">?attr/adpButtonBarButtonStyle</item>
-      <item name="adpButtonBarNegativeButtonStyle">?attr/adpButtonBarButtonStyle</item>
-      <item name="adpButtonBarNeutralButtonStyle">?attr/adpButtonBarButtonStyle</item>
+      <!-- Minimum height of title panel-->
+      <attr name="adpTitleMinHeight" format="dimension" />
+
+      <!-- The text appearance for the dialog's message text -->
+      <attr name="adpMessageTextAppearance" format="reference" />
+
+      <!-- Minimum height of ListView's items -->
+      <attr name="adpListItemMinHeight" format="dimension" />
+
+      <!-- The text color for ListView's items -->
+      <attr name="adpListItemTextColor" format="reference|color" />
+
+      <!-- The text appearance for normal ListView's items -->
+      <attr name="adpListItemTextAppearance" format="reference" />
+
+      <!-- The text appearance for "multi-choice" ListView's items -->
+      <attr name="adpListMultiChoiceTextAppearance" format="reference" />
+
+      <!-- The text appearance for "single-choice" ListView's items -->
+      <attr name="adpListSingleChoiceTextAppearance" format="reference" />
+
+      <!-- Divider for the ListView -->
+      <attr name="adpListDivider" format="reference" />
+
+      <!-- Selector in a ListView -->
+      <attr name="adpListItemBackground" format="reference" />
+
+      <!-- Style for button bars -->
+      <attr name="adpButtonBarStyle" format="reference" />
+
+      <!-- Style for buttons within button bars -->
+      <attr name="adpButtonBarButtonStyle" format="reference" />
+
+      <!-- Style for the "positive" buttons within button bars -->
+      <attr name="adpButtonBarPositiveButtonStyle" format="reference" />
+
+      <!-- Style for the "negative" buttons within button bars -->
+      <attr name="adpButtonBarNegativeButtonStyle" format="reference" />
+
+      <!-- Style for the "neutral" buttons within button bars -->
+      <attr name="adpButtonBarNeutralButtonStyle" format="reference" />
       ```
    
    2. You can also specify your own layout to the AlertDialogPro. This can be very useful when you want to use custom view or you want a very special dialog style.
 
       ```xml
       <style name="AlertDialogPro.Material">
-        <!-- As HoneyComb's android:layout. Specify your AlertDialogPro's layout -->
+        <!-- As HoneyComb's android:layout.
+             Specify your AlertDialogPro's layout -->
         <item name="adpLayout">@layout/alert_dialog_material</item>
-        <!-- As HoneyComb's android:listLayout. Specify your AlertDialogPro's ListView layout. -->
+        <!-- As HoneyComb's android:listLayout.
+             Specify your AlertDialogPro's ListView layout. -->
         <item name="adpListLayout">@layout/select_dialog_material</item>
-        <!-- As HoneyComb's android:listItemLayout. Specify your AlertDialogPro's list item layout. -->
+        <!-- As HoneyComb's android:listItemLayout.
+             Specify your AlertDialogPro's list item layout. -->
         <item name="adpListItemLayout">@layout/select_dialog_item_material</item>
-        <!-- As HoneyComb's android:multiChoiceItemLayout. Specify your AlertDialogPro's multi choice list item layout. -->
+        <!-- As HoneyComb's android:multiChoiceItemLayout.
+             Specify your AlertDialogPro's multi choice list item layout. -->
         <item name="adpMultiChoiceItemLayout">@layout/select_dialog_multichoice_material</item>
-        <!-- As HoneyComb's android:singleChoiceItemLayout. Specify your AlertDialogPro's single choice list item layout. -->
+        <!-- As HoneyComb's android:singleChoiceItemLayout.
+             Specify your AlertDialogPro's single choice list item layout. -->
         <item name="adpSingleChoiceItemLayout">@layout/select_dialog_singlechoice_material</item>
       </style>
       ```
diff --git a/alertdialogpro-core/res/values-v11/adp_core_themes.xml b/alertdialogpro-core/res/values-v11/adp_core_themes.xml
index a28da71..bfecf30 100644
--- a/alertdialogpro-core/res/values-v11/adp_core_themes.xml
+++ b/alertdialogpro-core/res/values-v11/adp_core_themes.xml
@@ -1,13 +1,11 @@
 <resources>
 
-    <style name="AlertDialogProTheme" parent="android:Theme.Holo.Dialog">
-        <item name="android:windowContentOverlay">@null</item>
+    <style name="BaseAdp" parent="Theme.AppCompat.Dialog">
         <item name="android:windowMinWidthMajor">@android:dimen/dialog_min_width_major</item>
         <item name="android:windowMinWidthMinor">@android:dimen/dialog_min_width_minor</item>
     </style>
 
-    <style name="AlertDialogProTheme.Light" parent="android:Theme.Holo.Light.Dialog">
-        <item name="android:windowContentOverlay">@null</item>
+    <style name="BaseAdp.Light" parent="Theme.AppCompat.Light.Dialog">
         <item name="android:windowMinWidthMajor">@android:dimen/dialog_min_width_major</item>
         <item name="android:windowMinWidthMinor">@android:dimen/dialog_min_width_minor</item>
     </style>
diff --git a/alertdialogpro-core/res/values/adp_core_attrs.xml b/alertdialogpro-core/res/values/adp_core_attrs.xml
index 6265537..791cf9b 100644
--- a/alertdialogpro-core/res/values/adp_core_attrs.xml
+++ b/alertdialogpro-core/res/values/adp_core_attrs.xml
@@ -1,32 +1,69 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <!-- Specify AlertDialogPro's theme -->
     <attr name="alertDialogProTheme" format="reference" />
+
+    <!-- Specify AlertDialogPro's style -->
     <attr name="alertDialogProStyle" format="reference" />
 
-    <declare-styleable name="AlertDialogPro">
-        <attr name="adpTitleDividerBackground" format="reference|color" />
-        <attr name="adpTitleDividerHeight" format="dimension" />
-        <attr name="adpTitleHeight" format="dimension" />
-        <attr name="adpMessageTextAppearance" format="reference" />
-        <attr name="adpListItemHeight" format="dimension" />
-        <attr name="adpListItemTextColor" format="reference|color" />
-        <attr name="adpListItemTextAppearance" format="reference" />
-        <attr name="adpListSingleChoiceTextAppearance" format="reference" />
-        <attr name="adpListMultiChoiceTextAppearance" format="reference" />
-        <attr name="adpListDivider" format="reference" />
-        <attr name="adpListItemBackground" format="reference" />
-        <attr name="adpButtonBarDividerHorizontal" format="reference" />
-        <attr name="adpButtonBarDividerVertical" format="reference" />
-        <attr name="adpButtonBarStyle" format="reference" />
-        <attr name="adpButtonBarPositiveButtonStyle" format="reference" />
-        <attr name="adpButtonBarNegativeButtonStyle" format="reference" />
-        <attr name="adpButtonBarNeutralButtonStyle" format="reference" />
-        <attr name="adpButtonBarButtonStyle" format="reference" />
+    <!-- Minimum height of title panel-->
+    <attr name="adpTitleMinHeight" format="dimension" />
+
+    <!-- The text appearance for the dialog's message text -->
+    <attr name="adpMessageTextAppearance" format="reference" />
+
+    <!-- Minimum height of ListView's items -->
+    <attr name="adpListItemMinHeight" format="dimension" />
+
+    <!-- The text color for ListView's items -->
+    <attr name="adpListItemTextColor" format="reference|color" />
+
+    <!-- The text appearance for normal ListView's items -->
+    <attr name="adpListItemTextAppearance" format="reference" />
+
+    <!-- The text appearance for "multi-choice" ListView's items -->
+    <attr name="adpListMultiChoiceTextAppearance" format="reference" />
+
+    <!-- The text appearance for "single-choice" ListView's items -->
+    <attr name="adpListSingleChoiceTextAppearance" format="reference" />
 
+    <!-- Divider for the ListView -->
+    <attr name="adpListDivider" format="reference" />
+
+    <!-- Selector in a ListView -->
+    <attr name="adpListItemBackground" format="reference" />
+
+    <!-- Style for button bars -->
+    <attr name="adpButtonBarStyle" format="reference" />
+
+    <!-- Style for buttons within button bars -->
+    <attr name="adpButtonBarButtonStyle" format="reference" />
+
+    <!-- Style for the "positive" buttons within button bars -->
+    <attr name="adpButtonBarPositiveButtonStyle" format="reference" />
+
+    <!-- Style for the "negative" buttons within button bars -->
+    <attr name="adpButtonBarNegativeButtonStyle" format="reference" />
+
+    <!-- Style for the "neutral" buttons within button bars -->
+    <attr name="adpButtonBarNeutralButtonStyle" format="reference" />
+
+    <!-- AlertDialogPro Styles -->
+    <declare-styleable name="AlertDialogPro">
+        <!-- As HoneyComb's android:layout.
+             Specify your AlertDialogPro's layout -->
         <attr name="adpLayout" format="reference" />
+        <!-- As HoneyComb's android:listLayout.
+             Specify your AlertDialogPro's ListView layout. -->
         <attr name="adpListLayout" format="reference" />
+        <!-- As HoneyComb's android:listItemLayout.
+             Specify your AlertDialogPro's list item layout. -->
         <attr name="adpListItemLayout" format="reference" />
+        <!-- As HoneyComb's android:multiChoiceItemLayout.
+             Specify your AlertDialogPro's multi choice list item layout. -->
         <attr name="adpMultiChoiceItemLayout" format="reference" />
+        <!-- As HoneyComb's android:singleChoiceItemLayout.
+             Specify your AlertDialogPro's single choice list item layout. -->
         <attr name="adpSingleChoiceItemLayout" format="reference" />
     </declare-styleable>
 
diff --git a/alertdialogpro-core/res/values/adp_core_styles.xml b/alertdialogpro-core/res/values/adp_core_styles.xml
new file mode 100644
index 0000000..5416743
--- /dev/null
+++ b/alertdialogpro-core/res/values/adp_core_styles.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <!-- Base text appearance for AlertDialogPro -->
+    <style name="TextAppearance.AlertDialogPro" parent="android:TextAppearance" />
+
+    <!-- Base text appearance for title of AlertDialogPro -->
+    <style name="TextAppearance.AlertDialogPro.DialogWindowTitle">
+        <item name="android:textSize">18sp</item>
+    </style>
+
+    <!-- Base style for widget of AlertDialogPro -->
+    <style name="Widget.AlertDialogPro" parent="android:Widget" />
+
+    <!-- Base style for AlertDialogPro -->
+    <style name="AlertDialogPro">
+        <!-- The core library has no default style -->
+        <item name="adpLayout">@null</item>
+        <item name="adpListLayout">@null</item>
+        <item name="adpListItemLayout">@null</item>
+        <item name="adpMultiChoiceItemLayout">@null</item>
+        <item name="adpSingleChoiceItemLayout">@null</item>
+    </style>
+
+    <!-- Base style for title of AlertDialogPro -->
+    <style name="DialogWindowTitle.AlertDialogPro" parent="">
+        <item name="android:maxLines">1</item>
+        <item name="android:scrollHorizontally">true</item>
+        <item name="android:textAppearance">@style/TextAppearance.AlertDialogPro.DialogWindowTitle
+        </item>
+    </style>
+
+</resources>
\ No newline at end of file
diff --git a/alertdialogpro-core/res/values/adp_core_themes.xml b/alertdialogpro-core/res/values/adp_core_themes.xml
index d9e088c..525e381 100644
--- a/alertdialogpro-core/res/values/adp_core_themes.xml
+++ b/alertdialogpro-core/res/values/adp_core_themes.xml
@@ -1,19 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <style name="AlertDialogProTheme" parent="android:Theme.Dialog"></style>
+    <style name="BaseAdp" parent="Theme.AppCompat.Dialog"></style>
 
-    <style name="AlertDialogProTheme.Light" parent="android:Theme.Dialog"></style>
+    <style name="BaseAdp.Light" parent="Theme.AppCompat.Light.Dialog"></style>
 
-    <style name="AlertDialogProTheme.Base" parent="AlertDialogProTheme">
-        <item name="android:windowContentOverlay">@null</item>
+    <style name="Theme.AlertDialogPro" parent="BaseAdp">
         <item name="adpButtonBarPositiveButtonStyle">?attr/adpButtonBarButtonStyle</item>
         <item name="adpButtonBarNegativeButtonStyle">?attr/adpButtonBarButtonStyle</item>
         <item name="adpButtonBarNeutralButtonStyle">?attr/adpButtonBarButtonStyle</item>
     </style>
 
-    <style name="AlertDialogProTheme.Base.Light" parent="AlertDialogProTheme.Light">
-        <item name="android:windowContentOverlay">@null</item>
+    <style name="Theme.AlertDialogPro.Light" parent="BaseAdp.Light">
         <item name="adpButtonBarPositiveButtonStyle">?attr/adpButtonBarButtonStyle</item>
         <item name="adpButtonBarNegativeButtonStyle">?attr/adpButtonBarButtonStyle</item>
         <item name="adpButtonBarNeutralButtonStyle">?attr/adpButtonBarButtonStyle</item>
diff --git a/alertdialogpro-demo/res/layout/activity_my.xml b/alertdialogpro-demo/res/layout/activity_my.xml
index a18fc1d..2a91b32 100644
--- a/alertdialogpro-demo/res/layout/activity_my.xml
+++ b/alertdialogpro-demo/res/layout/activity_my.xml
@@ -90,5 +90,11 @@
             android:layout_below="@id/showSingleChoiceList"
             android:text="Show Custom View" />
 
+        <Button
+            android:id="@+id/showNativeAlert"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/showCustomView"
+            android:text="Show Native Alert" />
     </RelativeLayout>
 </ScrollView>
\ No newline at end of file
diff --git a/alertdialogpro-demo/res/values/styles.xml b/alertdialogpro-demo/res/values/styles.xml
index 68cea6e..236eb29 100644
--- a/alertdialogpro-demo/res/values/styles.xml
+++ b/alertdialogpro-demo/res/values/styles.xml
@@ -10,7 +10,7 @@
         <item name="alertDialogProTheme">@style/AppTheme.FlavoredMaterialLight</item>
     </style>
 
-    <style name="AppTheme.FlavoredMaterialLight" parent="AlertDialogProTheme.Material.Light">
+    <style name="AppTheme.FlavoredMaterialLight" parent="Theme.AlertDialogPro.Material.Light">
         <item name="colorPrimary">#3F51B5</item>
         <item name="colorPrimaryDark">#303F9F</item>
         <item name="colorAccent">#FF4081</item>
@@ -19,11 +19,11 @@
         <item name="adpButtonBarNeutralButtonStyle">@style/AdpNormalButtonStyle</item>
     </style>
 
-    <style name="AdpTitleStyle" parent="DialogWindowTitle.Material.Light">
+    <style name="AdpTitleStyle" parent="DialogWindowTitle.AlertDialogPro.Material.Light">
         <item name="android:textColor">?attr/colorPrimary</item>
     </style>
 
-    <style name="AdpNormalButtonStyle" parent="Widget.Material.Button.Light">
+    <style name="AdpNormalButtonStyle" parent="Widget.AlertDialogPro.Material.Light.Button">
         <item name="android:textColor">?android:attr/textColorPrimary</item>
     </style>
 
diff --git a/alertdialogpro-demo/src/com/alertdialogpro/demo/MainActivity.java b/alertdialogpro-demo/src/com/alertdialogpro/demo/MainActivity.java
index 43d5d11..bda189e 100644
--- a/alertdialogpro-demo/src/com/alertdialogpro/demo/MainActivity.java
+++ b/alertdialogpro-demo/src/com/alertdialogpro/demo/MainActivity.java
@@ -1,5 +1,6 @@
 package com.alertdialogpro.demo;
 
+import android.app.AlertDialog;
 import android.content.DialogInterface;
 import android.os.Bundle;
 import android.support.v7.app.ActionBarActivity;
@@ -32,16 +33,16 @@ public void onCheckedChanged(RadioGroup group, int checkedId) {
                         mTheme = -1;
                         break;
                     case R.id.theme_material:
-                        mTheme = R.style.AlertDialogProTheme_Material;
+                        mTheme = R.style.Theme_AlertDialogPro_Material;
                         break;
                     case R.id.theme_material_light:
-                        mTheme = R.style.AlertDialogProTheme_Material_Light;
+                        mTheme = R.style.Theme_AlertDialogPro_Material_Light;
                         break;
                     case R.id.theme_holo:
-                        mTheme = R.style.AlertDialogProTheme_Holo;
+                        mTheme = R.style.Theme_AlertDialogPro_Holo;
                         break;
                     case R.id.theme_holo_light:
-                        mTheme = R.style.AlertDialogProTheme_Holo_Light;
+                        mTheme = R.style.Theme_AlertDialogPro_Holo_Light;
                         break;
                     default:
                         break;
@@ -54,6 +55,7 @@ public void onCheckedChanged(RadioGroup group, int checkedId) {
         findViewById(R.id.showMultiChoiceList).setOnClickListener(this);
         findViewById(R.id.showSingleChoiceList).setOnClickListener(this);
         findViewById(R.id.showCustomView).setOnClickListener(this);
+        findViewById(R.id.showNativeAlert).setOnClickListener(this);
     }
 
     @Override
@@ -74,9 +76,34 @@ public void onClick(View v) {
             case R.id.showCustomView:
                 showCustomViewDialog();
                 break;
+            case R.id.showNativeAlert:
+                showNativeAlert();
+                break;
         }
     }
 
+    private void showNativeAlert() {
+        final String[] list = new String[]{"Holo theme", "Material theme", "Custom theme"};
+        new AlertDialog.Builder(this).setTitle(R.string.app_name).
+                setMultiChoiceItems(list,
+                        new boolean[]{false, false, false},
+                        new DialogInterface.OnMultiChoiceClickListener() {
+                            @Override
+                            public void onClick(DialogInterface dialog, int which, boolean isChecked) {
+                                if (isChecked) {
+                                    mCheckedItems.add(list[which]);
+                                } else {
+                                    mCheckedItems.remove(list[which]);
+                                }
+                                showToast(list[which] + " is " + (isChecked ? "checked" : "unchecked" + "."));
+                            }
+                        }).
+                setNeutralButton("More info", new ButtonClickedListener("More info")).
+                setNegativeButton("Cancel", new ButtonClickedListener("Cancel")).
+                setPositiveButton("Choose", new ButtonClickedListener("Chose " + mCheckedItems.toString())).show();
+
+    }
+
     // Show a message dialog
     private void showMessageAlertDialog() {
         new AlertDialogPro.Builder(this, mTheme).setTitle(R.string.app_name).
diff --git a/alertdialogpro-theme-holo/res/layout/adp_alert_dialog_holo.xml b/alertdialogpro-theme-holo/res/layout/adp_alert_dialog_holo.xml
index 57790c5..fe2f875 100644
--- a/alertdialogpro-theme-holo/res/layout/adp_alert_dialog_holo.xml
+++ b/alertdialogpro-theme-holo/res/layout/adp_alert_dialog_holo.xml
@@ -26,7 +26,7 @@
             android:layout_marginLeft="16dip"
             android:layout_marginRight="16dip"
             android:gravity="center_vertical|start"
-            android:minHeight="?attr/adpTitleHeight"
+            android:minHeight="?attr/adpTitleMinHeight"
             android:orientation="horizontal">
 
             <ImageView
diff --git a/alertdialogpro-theme-holo/res/layout/adp_select_dialog_item_holo.xml b/alertdialogpro-theme-holo/res/layout/adp_select_dialog_item_holo.xml
index 23b6095..9ed1229 100644
--- a/alertdialogpro-theme-holo/res/layout/adp_select_dialog_item_holo.xml
+++ b/alertdialogpro-theme-holo/res/layout/adp_select_dialog_item_holo.xml
@@ -5,7 +5,7 @@
     android:layout_height="wrap_content"
     android:ellipsize="marquee"
     android:gravity="center_vertical"
-    android:minHeight="?attr/adpListItemHeight"
+    android:minHeight="?attr/adpListItemMinHeight"
     android:paddingLeft="16dip"
     android:paddingRight="16dip"
     android:textAppearance="?attr/adpListItemTextAppearance"
diff --git a/alertdialogpro-theme-holo/res/layout/adp_select_dialog_multichoice_holo.xml b/alertdialogpro-theme-holo/res/layout/adp_select_dialog_multichoice_holo.xml
index ba327b4..e53c1c9 100644
--- a/alertdialogpro-theme-holo/res/layout/adp_select_dialog_multichoice_holo.xml
+++ b/alertdialogpro-theme-holo/res/layout/adp_select_dialog_multichoice_holo.xml
@@ -6,7 +6,7 @@
     android:checkMark="?android:attr/listChoiceIndicatorMultiple"
     android:ellipsize="marquee"
     android:gravity="center_vertical"
-    android:minHeight="?attr/adpListItemHeight"
+    android:minHeight="?attr/adpListItemMinHeight"
     android:paddingLeft="16dip"
     android:paddingRight="16dip"
     android:textAppearance="?attr/adpListMultiChoiceTextAppearance"
diff --git a/alertdialogpro-theme-holo/res/layout/adp_select_dialog_singlechoice_holo.xml b/alertdialogpro-theme-holo/res/layout/adp_select_dialog_singlechoice_holo.xml
index dd4b383..303ba2f 100644
--- a/alertdialogpro-theme-holo/res/layout/adp_select_dialog_singlechoice_holo.xml
+++ b/alertdialogpro-theme-holo/res/layout/adp_select_dialog_singlechoice_holo.xml
@@ -6,7 +6,7 @@
     android:checkMark="?android:attr/listChoiceIndicatorSingle"
     android:ellipsize="marquee"
     android:gravity="center_vertical"
-    android:minHeight="?attr/adpListItemHeight"
+    android:minHeight="?attr/adpListItemMinHeight"
     android:paddingLeft="16dip"
     android:paddingRight="16dip"
     android:textAppearance="?attr/adpListSingleChoiceTextAppearance"
diff --git a/alertdialogpro-theme-holo/res/values/adp_holo_attrs.xml b/alertdialogpro-theme-holo/res/values/adp_holo_attrs.xml
index f1f8ec9..083a4d7 100644
--- a/alertdialogpro-theme-holo/res/values/adp_holo_attrs.xml
+++ b/alertdialogpro-theme-holo/res/values/adp_holo_attrs.xml
@@ -13,4 +13,9 @@
         <!-- Size of padding on either end of a divider. -->
         <attr name="llDividerPadding" format="dimension" />
     </declare-styleable>
+
+    <attr name="adpTitleDividerBackground" format="reference|color" />
+    <attr name="adpTitleDividerHeight" format="dimension" />
+    <attr name="adpButtonBarDividerHorizontal" format="reference" />
+    <attr name="adpButtonBarDividerVertical" format="reference" />
 </resources>
diff --git a/alertdialogpro-theme-holo/res/values/adp_holo_styles.xml b/alertdialogpro-theme-holo/res/values/adp_holo_styles.xml
index 41a9f13..5aaa66f 100644
--- a/alertdialogpro-theme-holo/res/values/adp_holo_styles.xml
+++ b/alertdialogpro-theme-holo/res/values/adp_holo_styles.xml
@@ -1,9 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <style name="Widget.Holo" parent="android:Widget" />
+    <!-- Text styles -->
 
-    <style name="Widget.Holo.ButtonBar">
+    <style name="TextAppearance.AlertDialogPro.Holo" />
+
+    <style name="TextAppearance.AlertDialogPro.Holo.DialogWindowTitle">
+        <item name="android:textSize">22sp</item>
+        <item name="android:textColor">@color/adp_holo_blue_light</item>
+    </style>
+
+    <!-- Widget Styles -->
+
+    <style name="Widget.AlertDialogPro.Holo" />
+
+    <style name="Widget.AlertDialogPro.Holo.ButtonBar">
         <!-- Use own attrs -->
         <item name="llDivider">?attr/adpButtonBarDividerVertical</item>
         <item name="llShowDividers">middle</item>
@@ -11,7 +22,7 @@
         <item name="android:background">@null</item>
     </style>
 
-    <style name="Widget.Holo.Button">
+    <style name="Widget.AlertDialogPro.Holo.Button">
         <item name="android:background">@drawable/adp_item_background_holo_dark</item>
         <item name="android:paddingLeft">4dip</item>
         <item name="android:paddingRight">4dip</item>
@@ -21,34 +32,27 @@
         <item name="android:minWidth">64dip</item>
     </style>
 
-    <style name="Widget.Holo.Button.Light">
-        <item name="android:background">@drawable/adp_item_background_holo_light</item>
-        <item name="android:textColor">?android:attr/textColorPrimary</item>
-    </style>
-
-    <style name="Widget.Holo.ListView" parent="android:Widget.ListView">
+    <style name="Widget.AlertDialogPro.Holo.ListView" parent="android:Widget.ListView">
         <item name="android:listSelector">?attr/adpListItemBackground</item>
     </style>
 
-    <style name="DialogWindowTitle">
-        <item name="android:maxLines">1</item>
-        <item name="android:scrollHorizontally">true</item>
-    </style>
+    <style name="Widget.AlertDialogPro.Holo.Light" />
 
-    <style name="DialogWindowTitle.Holo">
-        <item name="android:textAppearance">@style/TextAppearanceTitle.Holo</item>
-    </style>
-
-    <style name="DialogWindowTitle.Holo.Light">
-        <item name="android:textAppearance">@style/TextAppearanceTitle.Holo</item>
+    <style name="Widget.AlertDialogPro.Holo.Light.Button">
+        <item name="android:background">@drawable/adp_item_background_holo_light</item>
+        <item name="android:paddingLeft">4dip</item>
+        <item name="android:paddingRight">4dip</item>
+        <item name="android:textColor">?android:attr/textColorPrimary</item>
+        <item name="android:textSize">14sp</item>
+        <item name="android:minHeight">48dip</item>
+        <item name="android:minWidth">64dip</item>
     </style>
 
-    <style name="TextAppearanceTitle.Holo" parent="android:TextAppearance">
-        <item name="android:textSize">22sp</item>
-        <item name="android:textColor">@color/adp_holo_blue_light</item>
+    <style name="Widget.AlertDialogPro.Holo.Light.ListView" parent="android:Widget.ListView">
+        <item name="android:listSelector">?attr/adpListItemBackground</item>
     </style>
 
-    <style name="AlertDialogPro" />
+    <!-- Dialog styles -->
 
     <style name="AlertDialogPro.Holo">
         <item name="adpLayout">@layout/adp_alert_dialog_holo</item>
@@ -59,4 +63,19 @@
     </style>
 
     <style name="AlertDialogPro.Holo.Light" />
+
+    <!-- Window title -->
+
+    <style name="DialogWindowTitle.AlertDialogPro.Holo">
+        <item name="android:maxLines">1</item>
+        <item name="android:scrollHorizontally">true</item>
+        <item name="android:textAppearance">@style/TextAppearance.AlertDialogPro.Holo.DialogWindowTitle</item>
+    </style>
+
+    <style name="DialogWindowTitle.AlertDialogPro.Holo.Light">
+        <item name="android:maxLines">1</item>
+        <item name="android:scrollHorizontally">true</item>
+        <item name="android:textAppearance">@style/TextAppearance.AlertDialogPro.Holo.DialogWindowTitle</item>
+    </style>
+
 </resources>
diff --git a/alertdialogpro-theme-holo/res/values/adp_holo_themes.xml b/alertdialogpro-theme-holo/res/values/adp_holo_themes.xml
index b4ef609..bda3f55 100644
--- a/alertdialogpro-theme-holo/res/values/adp_holo_themes.xml
+++ b/alertdialogpro-theme-holo/res/values/adp_holo_themes.xml
@@ -1,65 +1,63 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <style name="AlertDialogProTheme.Holo" parent="AlertDialogProTheme.Base">
+    <style name="Theme.AlertDialogPro.Holo" parent="Theme.AlertDialogPro">
         <!-- Background -->
         <item name="android:windowBackground">@drawable/adp_dialog_full_holo_dark</item>
         <item name="android:textColorPrimary">@color/adp_primary_text_holo_dark</item>
         <!-- Title -->
-        <item name="android:windowTitleStyle">@style/DialogWindowTitle.Holo</item>
+        <item name="android:windowTitleStyle">@style/DialogWindowTitle.AlertDialogPro.Holo</item>
+        <item name="adpTitleDividerBackground">@color/adp_holo_blue_light</item>
+        <item name="adpTitleDividerHeight">@dimen/adp_holo_title_divider_height</item>
+        <item name="adpTitleMinHeight">@dimen/adp_holo_title_height</item>
         <!-- Message -->
         <item name="adpMessageTextAppearance">?android:attr/textAppearanceMedium</item>
         <!-- ListView -->
-        <item name="adpListItemHeight">48dip</item>
+        <item name="adpListItemMinHeight">48dip</item>
         <item name="adpListItemTextColor">@color/adp_primary_text_holo_dark</item>
         <item name="adpListItemTextAppearance">?android:attr/textAppearanceMedium</item>
         <item name="adpListSingleChoiceTextAppearance">?android:attr/textAppearanceMedium</item>
         <item name="adpListMultiChoiceTextAppearance">?android:attr/textAppearanceMedium</item>
         <item name="adpListItemBackground">@drawable/adp_item_background_holo_dark</item>
         <item name="adpListDivider">@drawable/adp_list_divider_holo_dark</item>
-        <item name="android:listViewStyle">@style/Widget.Holo.ListView</item>
+        <item name="android:listViewStyle">@style/Widget.AlertDialogPro.Holo.ListView</item>
         <item name="android:listChoiceIndicatorSingle">@drawable/adp_btn_radio_holo_dark</item>
         <item name="android:listChoiceIndicatorMultiple">@drawable/adp_btn_check_holo_dark</item>
-        <!-- Title -->
-        <item name="adpTitleDividerBackground">@color/adp_holo_blue_light</item>
-        <item name="adpTitleDividerHeight">@dimen/adp_holo_title_divider_height</item>
-        <item name="adpTitleHeight">@dimen/adp_holo_title_height</item>
         <!-- ButtonBar-->
-        <item name="adpButtonBarStyle">@style/Widget.Holo.ButtonBar</item>
+        <item name="adpButtonBarStyle">@style/Widget.AlertDialogPro.Holo.ButtonBar</item>
         <item name="adpButtonBarDividerHorizontal">@drawable/adp_list_divider_holo_dark</item>
         <item name="adpButtonBarDividerVertical">@drawable/adp_list_divider_holo_dark</item>
-        <item name="adpButtonBarButtonStyle">@style/Widget.Holo.Button</item>
+        <item name="adpButtonBarButtonStyle">@style/Widget.AlertDialogPro.Holo.Button</item>
         <item name="alertDialogProStyle">@style/AlertDialogPro.Holo</item>
     </style>
 
-    <style name="AlertDialogProTheme.Holo.Light" parent="AlertDialogProTheme.Base.Light">
+    <style name="Theme.AlertDialogPro.Holo.Light" parent="Theme.AlertDialogPro.Light">
         <!-- Background -->
         <item name="android:windowBackground">@drawable/adp_dialog_full_holo_light</item>
         <item name="android:textColorPrimary">@color/adp_primary_text_holo_light</item>
         <!-- Title -->
-        <item name="android:windowTitleStyle">@style/DialogWindowTitle.Holo.Light</item>
+        <item name="android:windowTitleStyle">@style/DialogWindowTitle.AlertDialogPro.Holo.Light</item>
+        <item name="adpTitleDividerBackground">@color/adp_holo_blue_light</item>
+        <item name="adpTitleDividerHeight">@dimen/adp_holo_title_divider_height</item>
+        <item name="adpTitleMinHeight">@dimen/adp_holo_title_height</item>
         <!-- Message -->
         <item name="adpMessageTextAppearance">?android:attr/textAppearanceMedium</item>
         <!-- ListView -->
-        <item name="adpListItemHeight">48dip</item>
+        <item name="adpListItemMinHeight">48dip</item>
         <item name="adpListItemTextColor">@color/adp_primary_text_holo_light</item>
         <item name="adpListItemTextAppearance">?android:attr/textAppearanceMedium</item>
         <item name="adpListSingleChoiceTextAppearance">?android:attr/textAppearanceMedium</item>
         <item name="adpListMultiChoiceTextAppearance">?android:attr/textAppearanceMedium</item>
         <item name="adpListItemBackground">@drawable/adp_item_background_holo_light</item>
         <item name="adpListDivider">@drawable/adp_list_divider_holo_light</item>
-        <item name="android:listViewStyle">@style/Widget.Holo.ListView</item>
+        <item name="android:listViewStyle">@style/Widget.AlertDialogPro.Holo.ListView</item>
         <item name="android:listChoiceIndicatorSingle">@drawable/adp_btn_radio_holo_light</item>
         <item name="android:listChoiceIndicatorMultiple">@drawable/adp_btn_check_holo_light</item>
-        <!-- Title -->
-        <item name="adpTitleDividerBackground">@color/adp_holo_blue_light</item>
-        <item name="adpTitleDividerHeight">@dimen/adp_holo_title_divider_height</item>
-        <item name="adpTitleHeight">@dimen/adp_holo_title_height</item>
         <!-- ButtonBar-->
-        <item name="adpButtonBarStyle">@style/Widget.Holo.ButtonBar</item>
+        <item name="adpButtonBarStyle">@style/Widget.AlertDialogPro.Holo.ButtonBar</item>
         <item name="adpButtonBarDividerHorizontal">@drawable/adp_list_divider_holo_light</item>
         <item name="adpButtonBarDividerVertical">@drawable/adp_list_divider_holo_light</item>
-        <item name="adpButtonBarButtonStyle">@style/Widget.Holo.Button.Light</item>
+        <item name="adpButtonBarButtonStyle">@style/Widget.AlertDialogPro.Holo.Light.Button</item>
         <item name="alertDialogProStyle">@style/AlertDialogPro.Holo.Light</item>
     </style>
 
diff --git a/alertdialogpro-theme-material/res/layout/adp_alert_dialog_material.xml b/alertdialogpro-theme-material/res/layout/adp_alert_dialog_material.xml
index b292804..6ba7062 100644
--- a/alertdialogpro-theme-material/res/layout/adp_alert_dialog_material.xml
+++ b/alertdialogpro-theme-material/res/layout/adp_alert_dialog_material.xml
@@ -16,6 +16,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:gravity="center_vertical|start"
+            android:minHeight="?attr/adpTitleMinHeight"
             android:orientation="horizontal"
             android:paddingEnd="@dimen/adp_mtrl_alert_dialog_padding"
             android:paddingLeft="@dimen/adp_mtrl_alert_dialog_padding"
diff --git a/alertdialogpro-theme-material/res/layout/adp_select_dialog_item_material.xml b/alertdialogpro-theme-material/res/layout/adp_select_dialog_item_material.xml
index 1367ab2..1cfce94 100644
--- a/alertdialogpro-theme-material/res/layout/adp_select_dialog_item_material.xml
+++ b/alertdialogpro-theme-material/res/layout/adp_select_dialog_item_material.xml
@@ -5,7 +5,7 @@
     android:layout_height="wrap_content"
     android:ellipsize="marquee"
     android:gravity="center_vertical"
-    android:minHeight="?adpListItemHeight"
+    android:minHeight="?attr/adpListItemMinHeight"
     android:paddingLeft="16dip"
     android:paddingRight="16dip"
     android:textAppearance="?attr/adpListItemTextAppearance"
diff --git a/alertdialogpro-theme-material/res/layout/adp_select_dialog_multichoice_material.xml b/alertdialogpro-theme-material/res/layout/adp_select_dialog_multichoice_material.xml
index 24ab209..82bc4e8 100644
--- a/alertdialogpro-theme-material/res/layout/adp_select_dialog_multichoice_material.xml
+++ b/alertdialogpro-theme-material/res/layout/adp_select_dialog_multichoice_material.xml
@@ -6,7 +6,7 @@
     android:checkMark="?android:attr/listChoiceIndicatorMultiple"
     android:ellipsize="marquee"
     android:gravity="center_vertical"
-    android:minHeight="?attr/adpListItemHeight"
+    android:minHeight="?attr/adpListItemMinHeight"
     android:paddingLeft="16dip"
     android:paddingRight="16dip"
     android:textAppearance="?attr/adpListSingleChoiceTextAppearance"
diff --git a/alertdialogpro-theme-material/res/layout/adp_select_dialog_singlechoice_material.xml b/alertdialogpro-theme-material/res/layout/adp_select_dialog_singlechoice_material.xml
index fbeb2ad..5a3bb25 100644
--- a/alertdialogpro-theme-material/res/layout/adp_select_dialog_singlechoice_material.xml
+++ b/alertdialogpro-theme-material/res/layout/adp_select_dialog_singlechoice_material.xml
@@ -6,7 +6,7 @@
     android:checkMark="?android:attr/listChoiceIndicatorSingle"
     android:ellipsize="marquee"
     android:gravity="center_vertical"
-    android:minHeight="?attr/adpListItemHeight"
+    android:minHeight="?attr/adpListItemMinHeight"
     android:paddingLeft="16dip"
     android:paddingRight="16dip"
     android:textAppearance="?attr/adpListMultiChoiceTextAppearance"
diff --git a/alertdialogpro-theme-material/res/values-v11/adp_mtrl_themes.xml b/alertdialogpro-theme-material/res/values-v11/adp_mtrl_themes.xml
deleted file mode 100644
index c5df39d..0000000
--- a/alertdialogpro-theme-material/res/values-v11/adp_mtrl_themes.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<resources>
-
-    <style name="AlertDialogProTheme" parent="Theme.AppCompat.Dialog">
-        <item name="android:windowContentOverlay">@null</item>
-        <item name="android:windowMinWidthMajor">@android:dimen/dialog_min_width_major</item>
-        <item name="android:windowMinWidthMinor">@android:dimen/dialog_min_width_minor</item>
-    </style>
-
-    <style name="AlertDialogProTheme.Light" parent="Theme.AppCompat.Light.Dialog">
-        <item name="android:windowContentOverlay">@null</item>
-        <item name="android:windowMinWidthMajor">@android:dimen/dialog_min_width_major</item>
-        <item name="android:windowMinWidthMinor">@android:dimen/dialog_min_width_minor</item>
-    </style>
-
-</resources>
\ No newline at end of file
diff --git a/alertdialogpro-theme-material/res/values-v14/adp_mtrl_styles.xml b/alertdialogpro-theme-material/res/values-v14/adp_mtrl_styles.xml
index f5a9664..d3c8011 100644
--- a/alertdialogpro-theme-material/res/values-v14/adp_mtrl_styles.xml
+++ b/alertdialogpro-theme-material/res/values-v14/adp_mtrl_styles.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <style name="Widget.Material.Button">
+    <style name="Base.Widget.AlertDialogPro.Material.Button" parent="android:Widget.Button">
         <item name="android:background">@drawable/adp_btn_mtrl_dark</item>
         <item name="android:textColor">?attr/colorAccent</item>
         <item name="android:textSize">14sp</item>
@@ -10,4 +10,15 @@
         <item name="android:maxLines">2</item>
         <item name="android:textAllCaps">true</item>
     </style>
+
+    <style name="Base.Widget.AlertDialogPro.Material.Light.Button" parent="android:Widget.Button">
+        <item name="android:background">@drawable/adp_btn_mtrl_light</item>
+        <item name="android:textColor">?attr/colorAccent</item>
+        <item name="android:textSize">14sp</item>
+        <item name="android:minHeight">@dimen/adp_mtrl_alert_dialog_button_bar_height</item>
+        <item name="android:minWidth">64dip</item>
+        <item name="android:maxLines">2</item>
+        <item name="android:textAllCaps">true</item>
+    </style>
+
 </resources>
\ No newline at end of file
diff --git a/alertdialogpro-theme-material/res/values-v21/adp_mtrl_styles.xml b/alertdialogpro-theme-material/res/values-v21/adp_mtrl_styles.xml
index e8c7c20..033fd5f 100644
--- a/alertdialogpro-theme-material/res/values-v21/adp_mtrl_styles.xml
+++ b/alertdialogpro-theme-material/res/values-v21/adp_mtrl_styles.xml
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <style name="Widget.Material.Button" parent="android:Widget.Material.Button.Borderless.Colored">
+    <style name="Base.Widget.AlertDialogPro.Material.Button" parent="android:Widget.Material.Button.Borderless.Colored">
         <item name="android:minHeight">@dimen/adp_mtrl_alert_dialog_button_bar_height</item>
         <item name="android:minWidth">64dip</item>
         <item name="android:maxLines">2</item>
     </style>
 
-    <style name="Widget.Material.Button.Light" parent="android:Widget.Material.Light.Button.Borderless.Colored">
+    <style name="Base.Widget.AlertDialogPro.ListView" parent="android:Widget.Material.ListView"></style>
+
+    <style name="Base.Widget.AlertDialogPro.Material.Light.Button" parent="android:Widget.Material.Light.Button.Borderless.Colored">
         <item name="android:minHeight">@dimen/adp_mtrl_alert_dialog_button_bar_height</item>
         <item name="android:minWidth">64dip</item>
         <item name="android:maxLines">2</item>
     </style>
 
-    <style name="Widget.Material.ListView" parent="android:Widget.Material.ListView"></style>
-
-    <style name="Widget.Material.ListView.Light" parent="android:Widget.Material.Light.ListView"></style>
+    <style name="Base.Widget.AlertDialogPro.Light.ListView" parent="android:Widget.Material.Light.ListView"></style>
 
 </resources>
\ No newline at end of file
diff --git a/alertdialogpro-theme-material/res/values/adp_mtrl_styles.xml b/alertdialogpro-theme-material/res/values/adp_mtrl_styles.xml
index 90a3819..d03bbb6 100644
--- a/alertdialogpro-theme-material/res/values/adp_mtrl_styles.xml
+++ b/alertdialogpro-theme-material/res/values/adp_mtrl_styles.xml
@@ -1,23 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <style name="TextAppearance.Material.Subhead" parent="android:TextAppearance">
-        <item name="android:textSize">16sp</item>
-        <item name="android:textColor">?android:attr/textColorPrimary</item>
-    </style>
-
-    <style name="TextAppearance.Material.ListChoice" parent="android:TextAppearance">
-        <item name="android:textSize">18sp</item>
-        <item name="android:textColor">?android:attr/textColorSecondary</item>
-    </style>
-
-    <style name="Widget.Material" parent="android:Widget" />
-
-    <style name="Widget.Material.ButtonBar">
-        <item name="android:background">@null</item>
-    </style>
-
-    <style name="Widget.Material.Button">
+    <style name="Base.Widget.AlertDialogPro.Material.Button" parent="android:Widget.Button">
         <item name="android:background">@drawable/adp_btn_mtrl_dark</item>
         <item name="android:textColor">?attr/colorAccent</item>
         <item name="android:textSize">14sp</item>
@@ -26,56 +10,77 @@
         <item name="android:maxLines">2</item>
     </style>
 
-    <style name="Widget.Material.Button.Light">
-        <item name="android:background">@drawable/adp_btn_mtrl_light</item>
+    <style name="Base.Widget.AlertDialogPro.ListView" parent="android:Widget.ListView">
+        <item name="android:listSelector">?attr/adpListItemBackground</item>
     </style>
 
-    <style name="Widget.Material.ListView" parent="android:Widget.ListView">
-        <item name="android:listSelector">?attr/adpListItemBackground</item>
+    <style name="Base.Widget.AlertDialogPro.Material.Light.Button" parent="android:Widget.Button">
+        <item name="android:background">@drawable/adp_btn_mtrl_light</item>
+        <item name="android:textColor">?attr/colorAccent</item>
+        <item name="android:textSize">14sp</item>
+        <item name="android:minHeight">@dimen/adp_mtrl_alert_dialog_button_bar_height</item>
+        <item name="android:minWidth">64dip</item>
+        <item name="android:maxLines">2</item>
     </style>
 
-    <style name="Widget.Material.ListView.Light" parent="android:Widget.ListView">
+    <style name="Base.Widget.AlertDialogPro.Light.ListView" parent="android:Widget.ListView">
         <item name="android:listSelector">?attr/adpListItemBackground</item>
     </style>
 
-    <style name="DialogWindowTitle">
-        <item name="android:maxLines">1</item>
-        <item name="android:scrollHorizontally">true</item>
-    </style>
+    <!-- Text styles -->
 
-    <style name="DialogWindowTitle.Material">
-        <item name="android:textAppearance">@style/TextAppearanceTitle.Material</item>
-    </style>
+    <style name="TextAppearance.AlertDialogPro.Material.DialogWindowTitle" parent="TextAppearance.AppCompat.Title"></style>
+
+    <style name="TextAppearance.AlertDialogPro.Material.Subhead" parent="TextAppearance.AppCompat.Subhead"></style>
+
+    <style name="TextAppearance.AlertDialogPro.Material.ListChoice" parent="TextAppearance.AppCompat.Medium"></style>
 
-    <style name="DialogWindowTitle.Material.Light">
-        <item name="android:textAppearance">@style/TextAppearanceTitle.Material</item>
+    <!-- Widget Styles -->
+
+    <style name="Widget.AlertDialogPro.Material.ButtonBar" parent="">
+        <item name="android:background">@null</item>
     </style>
 
-    <style name="TextAppearanceTitle.Material" parent="android:TextAppearance">
-        <item name="android:textStyle">bold</item>
-        <item name="android:textSize">20sp</item>
-        <item name="android:textColor">?android:attr/textColorPrimary</item>
+    <style name="Widget.AlertDialogPro.Material.Button" parent="Base.Widget.AlertDialogPro.Material.Button"></style>
+
+    <style name="Widget.AlertDialogPro.Material.ListView" parent="Base.Widget.AlertDialogPro.ListView"></style>
+
+    <style name="Widget.AlertDialogPro.Material.Light.Button" parent="Base.Widget.AlertDialogPro.Material.Light.Button"></style>
+
+    <style name="Widget.AlertDialogPro.Material.Light.ListView" parent="Base.Widget.AlertDialogPro.Light.ListView"></style>
+
+    <!-- Animation Styles -->
+
+    <style name="Animation.Material" parent="android:Animation" />
+
+    <style name="Animation.Material.Dialog">
+        <item name="android:windowEnterAnimation">@anim/adp_popup_enter_material</item>
+        <item name="android:windowExitAnimation">@anim/adp_popup_exit_material</item>
     </style>
 
-    <style name="AlertDialogPro" />
+    <!-- Dialog styles -->
 
     <style name="AlertDialogPro.Material">
         <item name="adpLayout">@layout/adp_alert_dialog_material</item>
         <item name="adpListLayout">@layout/adp_select_dialog_material</item>
         <item name="adpListItemLayout">@layout/adp_select_dialog_item_material</item>
         <item name="adpMultiChoiceItemLayout">@layout/adp_select_dialog_multichoice_material</item>
-        <item name="adpSingleChoiceItemLayout">@layout/adp_select_dialog_singlechoice_material</item>
+        <item name="adpSingleChoiceItemLayout">@layout/adp_select_dialog_singlechoice_material
+        </item>
     </style>
 
     <style name="AlertDialogPro.Material.Light" />
 
-    <!-- Animation Styles -->
-
-    <style name="Animation.Material" parent="android:Animation" />
+    <!-- Window title -->
 
-    <style name="Animation.Material.Dialog">
-        <item name="android:windowEnterAnimation">@anim/adp_popup_enter_material</item>
-        <item name="android:windowExitAnimation">@anim/adp_popup_exit_material</item>
+    <style name="DialogWindowTitle.AlertDialogPro.Material">
+        <item name="android:maxLines">1</item>
+        <item name="android:scrollHorizontally">true</item>
+        <item name="android:textAppearance">
+            @style/TextAppearance.AlertDialogPro.Material.DialogWindowTitle
+        </item>
     </style>
 
+    <style name="DialogWindowTitle.AlertDialogPro.Material.Light"></style>
+
 </resources>
diff --git a/alertdialogpro-theme-material/res/values/adp_mtrl_themes.xml b/alertdialogpro-theme-material/res/values/adp_mtrl_themes.xml
index 6fcdbd3..58732d6 100644
--- a/alertdialogpro-theme-material/res/values/adp_mtrl_themes.xml
+++ b/alertdialogpro-theme-material/res/values/adp_mtrl_themes.xml
@@ -1,61 +1,55 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <style name="AlertDialogProTheme" parent="Theme.AppCompat.Dialog"></style>
-
-    <style name="AlertDialogProTheme.Light" parent="Theme.AppCompat.Light.Dialog"></style>
-
-    <style name="AlertDialogProTheme.Material" parent="AlertDialogProTheme.Base">
+    <style name="Theme.AlertDialogPro.Material" parent="Theme.AlertDialogPro">
         <item name="android:windowAnimationStyle">@style/Animation.Material.Dialog</item>
         <!-- Background -->
         <item name="android:windowBackground">@drawable/adp_dialog_background_material_dark</item>
         <!-- Title -->
-        <item name="android:windowTitleStyle">@style/DialogWindowTitle.Material</item>
+        <item name="android:windowTitleStyle">@style/DialogWindowTitle.AlertDialogPro.Material</item>
+        <item name="adpTitleMinHeight">0dp</item>
         <!-- Message -->
-        <item name="adpMessageTextAppearance">@style/TextAppearance.Material.Subhead</item>
+        <item name="adpMessageTextAppearance">@style/TextAppearance.AlertDialogPro.Material.Subhead</item>
         <!-- ListView -->
-        <item name="adpListItemHeight">48dip</item>
+        <item name="adpListItemMinHeight">48dip</item>
         <item name="adpListItemTextColor">?android:attr/textColorPrimary</item>
-        <item name="adpListItemTextAppearance">@style/TextAppearance.Material.Subhead</item>
-        <item name="adpListSingleChoiceTextAppearance">@style/TextAppearance.Material.ListChoice
-        </item>
-        <item name="adpListMultiChoiceTextAppearance">@style/TextAppearance.Material.ListChoice
-        </item>
+        <item name="adpListItemTextAppearance">@style/TextAppearance.AlertDialogPro.Material.Subhead</item>
+        <item name="adpListSingleChoiceTextAppearance">@style/TextAppearance.AlertDialogPro.Material.ListChoice</item>
+        <item name="adpListMultiChoiceTextAppearance">@style/TextAppearance.AlertDialogPro.Material.ListChoice</item>
         <item name="adpListItemBackground">@drawable/adp_item_background_material_dark</item>
         <item name="adpListDivider">@null</item>
+        <item name="android:listViewStyle">@style/Widget.AlertDialogPro.Material.ListView</item>
         <item name="android:listChoiceIndicatorSingle">@drawable/abc_btn_radio_material</item>
         <item name="android:listChoiceIndicatorMultiple">@drawable/abc_btn_check_material</item>
-        <item name="android:listViewStyle">@style/Widget.Material.ListView</item>
         <!-- ButtonBar-->
-        <item name="adpButtonBarStyle">@style/Widget.Material.ButtonBar</item>
-        <item name="adpButtonBarButtonStyle">@style/Widget.Material.Button</item>
+        <item name="adpButtonBarStyle">@style/Widget.AlertDialogPro.Material.ButtonBar</item>
+        <item name="adpButtonBarButtonStyle">@style/Widget.AlertDialogPro.Material.Button</item>
         <item name="alertDialogProStyle">@style/AlertDialogPro.Material</item>
     </style>
 
-    <style name="AlertDialogProTheme.Material.Light" parent="AlertDialogProTheme.Base.Light">
+    <style name="Theme.AlertDialogPro.Material.Light" parent="Theme.AlertDialogPro.Light">
         <item name="android:windowAnimationStyle">@style/Animation.Material.Dialog</item>
         <!-- Background -->
         <item name="android:windowBackground">@drawable/adp_dialog_background_material_light</item>
         <!-- Title -->
-        <item name="android:windowTitleStyle">@style/DialogWindowTitle.Material.Light</item>
+        <item name="android:windowTitleStyle">@style/DialogWindowTitle.AlertDialogPro.Material.Light</item>
+        <item name="adpTitleMinHeight">0dp</item>
         <!-- Message -->
-        <item name="adpMessageTextAppearance">@style/TextAppearance.Material.Subhead</item>
+        <item name="adpMessageTextAppearance">@style/TextAppearance.AlertDialogPro.Material.Subhead</item>
         <!-- ListView -->
-        <item name="adpListItemHeight">48dip</item>
+        <item name="adpListItemMinHeight">48dip</item>
         <item name="adpListItemTextColor">?android:attr/textColorPrimary</item>
-        <item name="adpListItemTextAppearance">@style/TextAppearance.Material.Subhead</item>
-        <item name="adpListSingleChoiceTextAppearance">@style/TextAppearance.Material.ListChoice
-        </item>
-        <item name="adpListMultiChoiceTextAppearance">@style/TextAppearance.Material.ListChoice
-        </item>
+        <item name="adpListItemTextAppearance">@style/TextAppearance.AlertDialogPro.Material.Subhead</item>
+        <item name="adpListSingleChoiceTextAppearance">@style/TextAppearance.AlertDialogPro.Material.ListChoice</item>
+        <item name="adpListMultiChoiceTextAppearance">@style/TextAppearance.AlertDialogPro.Material.ListChoice</item>
         <item name="adpListItemBackground">@drawable/adp_item_background_material_light</item>
         <item name="adpListDivider">@null</item>
+        <item name="android:listViewStyle">@style/Widget.AlertDialogPro.Material.Light.ListView</item>
         <item name="android:listChoiceIndicatorSingle">@drawable/abc_btn_radio_material</item>
         <item name="android:listChoiceIndicatorMultiple">@drawable/abc_btn_check_material</item>
-        <item name="android:listViewStyle">@style/Widget.Material.ListView.Light</item>
         <!-- ButtonBar-->
-        <item name="adpButtonBarStyle">@style/Widget.Material.ButtonBar</item>
-        <item name="adpButtonBarButtonStyle">@style/Widget.Material.Button.Light</item>
+        <item name="adpButtonBarStyle">@style/Widget.AlertDialogPro.Material.ButtonBar</item>
+        <item name="adpButtonBarButtonStyle">@style/Widget.AlertDialogPro.Material.Light.Button</item>
         <item name="alertDialogProStyle">@style/AlertDialogPro.Material.Light</item>
     </style>