From 0a073fe03c99ffc5e3da475a0892494ab6953fc3 Mon Sep 17 00:00:00 2001
From: Pranav Pandey <pranavpande92@gmail.com>
Date: Mon, 24 Sep 2018 12:51:19 +0530
Subject: [PATCH] Improve dialog layout

Remove dependency on private resources.
---
 .../src/main/res/layout/ads_alert_dialog.xml  |  6 +--
 .../layout/ads_alert_dialog_button_bar.xml    |  1 -
 .../res/layout/ads_alert_dialog_title.xml     | 11 +++---
 ...rt_dialog_list.xml => ads_dialog_list.xml} |  4 +-
 ...choice.xml => ads_dialog_multi_choice.xml} |  7 ++--
 .../res/layout/ads_dialog_select_item.xml     | 37 +++++++++++++++++++
 ...hoice.xml => ads_dialog_single_choice.xml} |  6 +--
 .../src/main/res/values/dimens.xml            |  5 +++
 .../src/main/res/values/styles.xml            |  8 ++--
 9 files changed, 63 insertions(+), 22 deletions(-)
 rename dynamic-support/src/main/res/layout/{ads_alert_dialog_list.xml => ads_dialog_list.xml} (91%)
 rename dynamic-support/src/main/res/layout/{ads_alert_dialog_multi_choice.xml => ads_dialog_multi_choice.xml} (85%)
 create mode 100644 dynamic-support/src/main/res/layout/ads_dialog_select_item.xml
 rename dynamic-support/src/main/res/layout/{ads_alert_dialog_single_choice.xml => ads_dialog_single_choice.xml} (87%)

diff --git a/dynamic-support/src/main/res/layout/ads_alert_dialog.xml b/dynamic-support/src/main/res/layout/ads_alert_dialog.xml
index cd3fcfa4ac..c97930dccf 100644
--- a/dynamic-support/src/main/res/layout/ads_alert_dialog.xml
+++ b/dynamic-support/src/main/res/layout/ads_alert_dialog.xml
@@ -21,7 +21,7 @@
     android:id="@+id/parentPanel"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:gravity="start|left|top"
+    android:gravity="start|top"
     android:orientation="vertical">
 
     <include layout="@layout/ads_alert_dialog_title" />
@@ -40,7 +40,7 @@
             <android.support.v4.widget.Space
                 android:id="@+id/textSpacerNoTitle"
                 android:layout_width="match_parent"
-                android:layout_height="@dimen/abc_dialog_padding_top_material"
+                android:layout_height="@dimen/add_dialog_margin_title_top"
                 android:visibility="gone" />
 
             <View
@@ -86,7 +86,7 @@
             <android.support.v4.widget.Space
                 android:id="@+id/textSpacerNoButtons"
                 android:layout_width="match_parent"
-                android:layout_height="@dimen/abc_dialog_padding_top_material"
+                android:layout_height="@dimen/add_dialog_margin_title_top"
                 android:visibility="gone" />
 
         </LinearLayout>
diff --git a/dynamic-support/src/main/res/layout/ads_alert_dialog_button_bar.xml b/dynamic-support/src/main/res/layout/ads_alert_dialog_button_bar.xml
index 87c30f9cbe..74ae6796e4 100644
--- a/dynamic-support/src/main/res/layout/ads_alert_dialog_button_bar.xml
+++ b/dynamic-support/src/main/res/layout/ads_alert_dialog_button_bar.xml
@@ -18,7 +18,6 @@
 
 <ScrollView
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/buttonPanel"
     style="?attr/buttonBarStyle"
     android:layout_width="match_parent"
diff --git a/dynamic-support/src/main/res/layout/ads_alert_dialog_title.xml b/dynamic-support/src/main/res/layout/ads_alert_dialog_title.xml
index d2f03eda28..32bcf15e44 100644
--- a/dynamic-support/src/main/res/layout/ads_alert_dialog_title.xml
+++ b/dynamic-support/src/main/res/layout/ads_alert_dialog_title.xml
@@ -29,11 +29,11 @@
         android:id="@+id/title_template"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:gravity="center_vertical|start|left"
+        android:gravity="center_vertical|start"
         android:orientation="horizontal"
         android:paddingLeft="?attr/dialogPreferredPadding"
         android:paddingRight="?attr/dialogPreferredPadding"
-        android:paddingTop="@dimen/abc_dialog_padding_top_material">
+        android:paddingTop="@dimen/add_dialog_margin_title_top">
 
         <ImageView
             android:id="@android:id/icon"
@@ -41,8 +41,9 @@
             android:layout_height="32dip"
             android:layout_marginEnd="8dip"
             android:layout_marginRight="8dip"
+            android:contentDescription="@null"
             android:scaleType="fitCenter"
-            android:src="@null"/>
+            android:src="@null" />
 
         <android.support.v7.widget.DialogTitle
             android:id="@+id/alertTitle"
@@ -60,7 +61,7 @@
     <android.support.v4.widget.Space
         android:id="@+id/titleDividerNoCustom"
         android:layout_width="match_parent"
-        android:layout_height="@dimen/abc_dialog_title_divider_material"
-        android:visibility="gone"/>
+        android:layout_height="@dimen/add_dialog_margin_title_bottom"
+        android:visibility="gone" />
 
 </LinearLayout>
diff --git a/dynamic-support/src/main/res/layout/ads_alert_dialog_list.xml b/dynamic-support/src/main/res/layout/ads_dialog_list.xml
similarity index 91%
rename from dynamic-support/src/main/res/layout/ads_alert_dialog_list.xml
rename to dynamic-support/src/main/res/layout/ads_dialog_list.xml
index 2146ee4822..9181bb709f 100644
--- a/dynamic-support/src/main/res/layout/ads_alert_dialog_list.xml
+++ b/dynamic-support/src/main/res/layout/ads_dialog_list.xml
@@ -37,5 +37,5 @@
     android:scrollbars="vertical"
     android:textAlignment="viewStart"
     android:gravity="start"
-    app:paddingBottomNoButtons="@dimen/abc_dialog_list_padding_bottom_no_buttons"
-    app:paddingTopNoTitle="@dimen/abc_dialog_list_padding_top_no_title"/>
\ No newline at end of file
+    app:paddingBottomNoButtons="@dimen/ads_dialog_list_margin_no_buttons_button"
+    app:paddingTopNoTitle="@dimen/ads_dialog_list_margin_no_title_top" />
\ No newline at end of file
diff --git a/dynamic-support/src/main/res/layout/ads_alert_dialog_multi_choice.xml b/dynamic-support/src/main/res/layout/ads_dialog_multi_choice.xml
similarity index 85%
rename from dynamic-support/src/main/res/layout/ads_alert_dialog_multi_choice.xml
rename to dynamic-support/src/main/res/layout/ads_dialog_multi_choice.xml
index ae77b824ed..faf1a24b4e 100644
--- a/dynamic-support/src/main/res/layout/ads_alert_dialog_multi_choice.xml
+++ b/dynamic-support/src/main/res/layout/ads_dialog_multi_choice.xml
@@ -18,7 +18,6 @@
 
 <com.pranavpandey.android.dynamic.support.widget.DynamicCheckedTextView
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@android:id/text1"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -26,11 +25,11 @@
     android:textAppearance="?android:attr/textAppearanceMedium"
     android:textColor="?attr/textColorAlertDialogListItem"
     android:gravity="center_vertical"
-    android:paddingLeft="@dimen/abc_select_dialog_padding_start_material"
+    android:paddingLeft="@dimen/ads_dialog_margin_select_start"
     android:paddingRight="?attr/dialogPreferredPadding"
-    android:paddingStart="@dimen/abc_select_dialog_padding_start_material"
+    android:paddingStart="@dimen/ads_dialog_margin_select_start"
     android:paddingEnd="?attr/dialogPreferredPadding"
     android:drawableLeft="?android:attr/listChoiceIndicatorMultiple"
     android:drawableStart="?android:attr/listChoiceIndicatorMultiple"
-    android:drawablePadding="20dp"
+    android:drawablePadding="@dimen/ads_dialog_margin_select_start"
     android:ellipsize="marquee" />
\ No newline at end of file
diff --git a/dynamic-support/src/main/res/layout/ads_dialog_select_item.xml b/dynamic-support/src/main/res/layout/ads_dialog_select_item.xml
new file mode 100644
index 0000000000..a62cba783f
--- /dev/null
+++ b/dynamic-support/src/main/res/layout/ads_dialog_select_item.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+
+     Copyright 2018 Pranav Pandey
+     Copyright 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<!--
+    This layout file is used by the AlertDialog when displaying a list of items.
+    This layout file is inflated and used as the TextView to display individual
+    items.
+-->
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@android:id/text1"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:minHeight="?attr/listPreferredItemHeightSmall"
+    android:textAppearance="?attr/textAppearanceListItemSmall"
+    android:textColor="?attr/textColorAlertDialogListItem"
+    android:gravity="center_vertical"
+    android:paddingLeft="?attr/listPreferredItemPaddingLeft"
+    android:paddingRight="?attr/listPreferredItemPaddingRight"
+    android:paddingStart="?attr/listPreferredItemPaddingLeft"
+    android:paddingEnd="?attr/listPreferredItemPaddingRight"
+    android:ellipsize="marquee" />
\ No newline at end of file
diff --git a/dynamic-support/src/main/res/layout/ads_alert_dialog_single_choice.xml b/dynamic-support/src/main/res/layout/ads_dialog_single_choice.xml
similarity index 87%
rename from dynamic-support/src/main/res/layout/ads_alert_dialog_single_choice.xml
rename to dynamic-support/src/main/res/layout/ads_dialog_single_choice.xml
index 7404aee062..b3a749302b 100644
--- a/dynamic-support/src/main/res/layout/ads_alert_dialog_single_choice.xml
+++ b/dynamic-support/src/main/res/layout/ads_dialog_single_choice.xml
@@ -25,11 +25,11 @@
     android:textAppearance="?android:attr/textAppearanceMedium"
     android:textColor="?attr/textColorAlertDialogListItem"
     android:gravity="center_vertical"
-    android:paddingLeft="@dimen/abc_select_dialog_padding_start_material"
+    android:paddingLeft="@dimen/ads_dialog_margin_select_start"
     android:paddingRight="?attr/dialogPreferredPadding"
-    android:paddingStart="@dimen/abc_select_dialog_padding_start_material"
+    android:paddingStart="@dimen/ads_dialog_margin_select_start"
     android:paddingEnd="?attr/dialogPreferredPadding"
     android:drawableLeft="?android:attr/listChoiceIndicatorSingle"
     android:drawableStart="?android:attr/listChoiceIndicatorSingle"
-    android:drawablePadding="20dp"
+    android:drawablePadding="@dimen/ads_dialog_margin_select_start"
     android:ellipsize="marquee" />
\ No newline at end of file
diff --git a/dynamic-support/src/main/res/values/dimens.xml b/dynamic-support/src/main/res/values/dimens.xml
index 9b1874ebc4..dec0ba864f 100644
--- a/dynamic-support/src/main/res/values/dimens.xml
+++ b/dynamic-support/src/main/res/values/dimens.xml
@@ -137,8 +137,13 @@
     <!-- Dialog -->
     <dimen name="ads_dialog_margin_start_end">24dp</dimen>
     <dimen name="ads_dialog_margin_start_end_small">22dp</dimen>
+    <dimen name="ads_dialog_margin_select_start">20dp</dimen>
+    <dimen name="add_dialog_margin_title_top">18dp</dimen>
+    <dimen name="add_dialog_margin_title_bottom">12dp</dimen>
     <dimen name="ads_dialog_margin_input">20dp</dimen>
     <dimen name="ads_dialog_margin_small">10dp</dimen>
+    <dimen name="ads_dialog_list_margin_no_title_top">8dp</dimen>
+    <dimen name="ads_dialog_list_margin_no_buttons_button">8dp</dimen>
     <dimen name="ads_dialog_font_size">@dimen/ads_font_size_small</dimen>
     <dimen name="ads_dialog_font_size_title">@dimen/ads_font_size_medium</dimen>
     <dimen name="ads_dialog_font_size_large_fixed">12dp</dimen>
diff --git a/dynamic-support/src/main/res/values/styles.xml b/dynamic-support/src/main/res/values/styles.xml
index 262b51763d..6023608040 100644
--- a/dynamic-support/src/main/res/values/styles.xml
+++ b/dynamic-support/src/main/res/values/styles.xml
@@ -121,10 +121,10 @@
 
     <style name="Base.DynamicApp.AlertDialog" parent="android:Widget">
         <item name="android:layout">@layout/ads_alert_dialog</item>
-        <item name="listLayout">@layout/ads_alert_dialog_list</item>
-        <item name="listItemLayout">@layout/select_dialog_item_material</item>
-        <item name="multiChoiceItemLayout">@layout/ads_alert_dialog_multi_choice</item>
-        <item name="singleChoiceItemLayout">@layout/ads_alert_dialog_single_choice</item>
+        <item name="listLayout">@layout/ads_dialog_list</item>
+        <item name="listItemLayout">@layout/ads_dialog_select_item</item>
+        <item name="multiChoiceItemLayout">@layout/ads_dialog_multi_choice</item>
+        <item name="singleChoiceItemLayout">@layout/ads_dialog_single_choice</item>
     </style>
 
     <style name="Theme.DynamicApp" parent="Base.DynamicApp.NoActionBar" />