Skip to content
This repository was archived by the owner on May 1, 2021. It is now read-only.

Commit d9ab8b6

Browse files
updated ADP library.
1 parent 3949751 commit d9ab8b6

14 files changed

+139
-53
lines changed

MaterialStuffLibrary/res/drawable/msl__action_bar_shadow.xml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,13 @@
55
<shape android:shape="rectangle" >
66
<size android:height="1dp" />
77

8-
<solid android:color="#43000000" />
9-
8+
<solid android:color="#43000000" />
109
</shape>
1110
</item>
1211
<item android:top="1dp">
13-
<shape android:shape="rectangle" android:dither="true">
12+
<shape
13+
android:dither="true"
14+
android:shape="rectangle" >
1415
<gradient
1516
android:angle="270"
1617
android:endColor="#00000000"

MaterialStuffLibrary/res/layout/adp_alert_dialog_material.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@
4444
android:singleLine="true"
4545
android:textAlignment="viewStart"
4646
tools:ignore="UnusedAttribute" />
47-
4847
</LinearLayout>
4948
<!-- If the client uses a customTitle, it will be added here. -->
5049
</LinearLayout>
@@ -72,11 +71,12 @@
7271
<TextView
7372
android:id="@id/adp_message"
7473
style="?attr/adpMessageTextAppearance"
75-
android:layout_width="match_parent" android:textIsSelectable="true"
74+
android:layout_width="match_parent"
7675
android:layout_height="wrap_content"
7776
android:paddingLeft="@dimen/adp_mtrl_alert_dialog_padding"
7877
android:paddingRight="@dimen/adp_mtrl_alert_dialog_padding"
79-
android:paddingTop="@dimen/adp_mtrl_alert_dialog_padding_top" />
78+
android:paddingTop="@dimen/adp_mtrl_alert_dialog_padding_top"
79+
android:textIsSelectable="true" />
8080

8181
<View
8282
android:id="@id/adp_textSpacerNoButtons"

MaterialStuffLibrary/res/layout/adp_select_dialog_material.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
android:id="@id/adp_select_dialog_listview"
55
android:layout_width="match_parent"
66
android:layout_height="match_parent"
7+
android:layout_gravity="start"
78
class="com.alertdialogpro.internal.AlertController$RecycleListView"
89
android:cacheColorHint="@null"
910
android:divider="?attr/adpListDivider"
10-
android:gravity="start"
1111
android:overScrollMode="ifContentScrolls"
1212
android:scrollbars="vertical"
1313
android:textAlignment="viewStart"

MaterialStuffLibrary/res/layout/adp_select_dialog_multichoice_material.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
android:ellipsize="marquee"
88
android:gravity="center_vertical"
99
android:minHeight="?attr/adpListItemMinHeight"
10-
android:paddingLeft="16dip"
11-
android:paddingRight="16dip"
10+
android:paddingLeft="24dip"
11+
android:paddingRight="24dip"
1212
android:textAppearance="?attr/adpListSingleChoiceTextAppearance"
1313
android:textColor="?attr/adpListItemTextColor" />

MaterialStuffLibrary/res/layout/adp_select_dialog_singlechoice_material.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
android:ellipsize="marquee"
88
android:gravity="center_vertical"
99
android:minHeight="?attr/adpListItemMinHeight"
10-
android:paddingLeft="16dip"
11-
android:paddingRight="16dip"
10+
android:paddingLeft="24dip"
11+
android:paddingRight="24dip"
1212
android:textAppearance="?attr/adpListMultiChoiceTextAppearance"
1313
android:textColor="?attr/adpListItemTextColor" />

MaterialStuffLibrary/res/layout/msl__activity_preference.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
android:src="@drawable/msl__action_bar_shadow"
3131
android:visibility="gone"
3232
tools:ignore="ContentDescription" />
33-
3433
</FrameLayout>
3534

3635
</LinearLayout>

MaterialStuffLibrary/res/values-v11/adp_core_themes.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<resources>
22

3-
<style name="BaseAdp" parent="Theme.AppCompat.Dialog">
3+
<style name="Base.Theme.AlertDialogPro" parent="Theme.AppCompat.Dialog">
44
<item name="android:windowMinWidthMajor">@android:dimen/dialog_min_width_major</item>
55
<item name="android:windowMinWidthMinor">@android:dimen/dialog_min_width_minor</item>
66
</style>
77

8-
<style name="BaseAdp.Light" parent="Theme.AppCompat.Light.Dialog">
8+
<style name="Base.Theme.AlertDialogPro.Light" parent="Theme.AppCompat.Light.Dialog">
99
<item name="android:windowMinWidthMajor">@android:dimen/dialog_min_width_major</item>
1010
<item name="android:windowMinWidthMinor">@android:dimen/dialog_min_width_minor</item>
1111
</style>
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<resources>
3+
4+
<style name="Theme.AlertDialogPro.Material" parent="Base.Theme.AlertDialogPro.Material"></style>
5+
6+
<style name="Theme.AlertDialogPro.Material.Light" parent="Base.Theme.AlertDialogPro.Material.Light"></style>
7+
8+
</resources>

MaterialStuffLibrary/res/values/adp_core_attrs.xml

Lines changed: 13 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<resources>
3-
43
<!-- Specify AlertDialogPro's theme -->
54
<attr name="alertDialogProTheme" format="reference" />
65

76
<!-- Specify AlertDialogPro's style -->
87
<attr name="alertDialogProStyle" format="reference" />
98

10-
<!-- Minimum height of title panel -->
9+
<!-- Minimum height of title panel-->
1110
<attr name="adpTitleMinHeight" format="dimension" />
1211

1312
<!-- The text appearance for the dialog's message text -->
@@ -18,7 +17,7 @@
1817

1918
<!-- The text color for ListView's items -->
2019
<attr name="adpListItemTextColor" format="reference|color" />
21-
<attr name="adpListItemHeight" format="dimension"></attr>
20+
2221
<!-- The text appearance for normal ListView's items -->
2322
<attr name="adpListItemTextAppearance" format="reference" />
2423

@@ -51,32 +50,21 @@
5150

5251
<!-- AlertDialogPro Styles -->
5352
<declare-styleable name="AlertDialogPro">
54-
55-
<!--
56-
As HoneyComb's android:layout.
57-
Specify your AlertDialogPro's layout
58-
-->
53+
<!-- As HoneyComb's android:layout.
54+
Specify your AlertDialogPro's layout -->
5955
<attr name="adpLayout" format="reference" />
60-
<!--
61-
As HoneyComb's android:listLayout.
62-
Specify your AlertDialogPro's ListView layout.
63-
-->
56+
<!-- As HoneyComb's android:listLayout.
57+
Specify your AlertDialogPro's ListView layout. -->
6458
<attr name="adpListLayout" format="reference" />
65-
<!--
66-
As HoneyComb's android:listItemLayout.
67-
Specify your AlertDialogPro's list item layout.
68-
-->
59+
<!-- As HoneyComb's android:listItemLayout.
60+
Specify your AlertDialogPro's list item layout. -->
6961
<attr name="adpListItemLayout" format="reference" />
70-
<!--
71-
As HoneyComb's android:multiChoiceItemLayout.
72-
Specify your AlertDialogPro's multi choice list item layout.
73-
-->
62+
<!-- As HoneyComb's android:multiChoiceItemLayout.
63+
Specify your AlertDialogPro's multi choice list item layout. -->
7464
<attr name="adpMultiChoiceItemLayout" format="reference" />
75-
<!--
76-
As HoneyComb's android:singleChoiceItemLayout.
77-
Specify your AlertDialogPro's single choice list item layout.
78-
-->
65+
<!-- As HoneyComb's android:singleChoiceItemLayout.
66+
Specify your AlertDialogPro's single choice list item layout. -->
7967
<attr name="adpSingleChoiceItemLayout" format="reference" />
8068
</declare-styleable>
8169

82-
</resources>
70+
</resources>

MaterialStuffLibrary/res/values/adp_core_styles.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@
1212
<!-- Base style for widget of AlertDialogPro -->
1313
<style name="Widget.AlertDialogPro" parent="android:Widget" />
1414

15+
<!-- Base Animation Styles -->
16+
<style name="Animation.AlertDialogPro" parent="android:Animation" />
17+
1518
<!-- Base style for AlertDialogPro -->
1619
<style name="AlertDialogPro">
1720
<!-- The core library has no default style -->

0 commit comments

Comments
 (0)