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

Commit f4e4275

Browse files
AndroidDeveloperLBAndroidDeveloperLB
committed
updated base library.
1 parent c82c44a commit f4e4275

30 files changed

+1500
-1425
lines changed

‎MaterialStuffLibrary/res/drawable/adp_btn_mtrl_sharp_dark.xml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,17 @@
33
<!-- Used as the canonical button shape. -->
44

55
<inset xmlns:android="http://schemas.android.com/apk/res/android"
6-
android:insetBottom="@dimen/button_inset_vertical_material"
7-
android:insetLeft="@dimen/button_inset_horizontal_material"
8-
android:insetRight="@dimen/button_inset_horizontal_material"
9-
android:insetTop="@dimen/button_inset_vertical_material">
6+
android:insetBottom="@dimen/adp_mtrl_button_inset_vertical"
7+
android:insetLeft="@dimen/adp_mtrl_button_inset_horizontal"
8+
android:insetRight="@dimen/adp_mtrl_button_inset_horizontal"
9+
android:insetTop="@dimen/adp_mtrl_button_inset_vertical">
1010
<shape android:shape="rectangle">
11-
<corners android:radius="@dimen/control_corner_material" />
12-
<solid android:color="@color/ripple_material_dark" />
11+
<corners android:radius="@dimen/adp_mtrl_control_corner" />
12+
<solid android:color="@color/adp_mtrl_ripple_dark" />
1313
<padding
14-
android:bottom="@dimen/button_padding_vertical_material"
15-
android:left="@dimen/button_padding_horizontal_material"
16-
android:right="@dimen/button_padding_horizontal_material"
17-
android:top="@dimen/button_padding_vertical_material" />
14+
android:bottom="@dimen/adp_mtrl_button_padding_vertical"
15+
android:left="@dimen/adp_mtrl_button_padding_horizontal"
16+
android:right="@dimen/adp_mtrl_button_padding_horizontal"
17+
android:top="@dimen/adp_mtrl_button_padding_vertical" />
1818
</shape>
1919
</inset>

‎MaterialStuffLibrary/res/drawable/adp_btn_mtrl_sharp_light.xml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,17 @@
33
<!-- Used as the canonical button shape. -->
44

55
<inset xmlns:android="http://schemas.android.com/apk/res/android"
6-
android:insetBottom="@dimen/button_inset_vertical_material"
7-
android:insetLeft="@dimen/button_inset_horizontal_material"
8-
android:insetRight="@dimen/button_inset_horizontal_material"
9-
android:insetTop="@dimen/button_inset_vertical_material">
6+
android:insetBottom="@dimen/adp_mtrl_button_inset_vertical"
7+
android:insetLeft="@dimen/adp_mtrl_button_inset_horizontal"
8+
android:insetRight="@dimen/adp_mtrl_button_inset_horizontal"
9+
android:insetTop="@dimen/adp_mtrl_button_inset_vertical">
1010
<shape android:shape="rectangle">
11-
<corners android:radius="@dimen/control_corner_material" />
12-
<solid android:color="@color/ripple_material_light" />
11+
<corners android:radius="@dimen/adp_mtrl_control_corner" />
12+
<solid android:color="@color/adp_mtrl_ripple_light" />
1313
<padding
14-
android:bottom="@dimen/button_padding_vertical_material"
15-
android:left="@dimen/button_padding_horizontal_material"
16-
android:right="@dimen/button_padding_horizontal_material"
17-
android:top="@dimen/button_padding_vertical_material" />
14+
android:bottom="@dimen/adp_mtrl_button_padding_vertical"
15+
android:left="@dimen/adp_mtrl_button_padding_horizontal"
16+
android:right="@dimen/adp_mtrl_button_padding_horizontal"
17+
android:top="@dimen/adp_mtrl_button_padding_vertical" />
1818
</shape>
1919
</inset>

‎MaterialStuffLibrary/res/drawable/adp_item_background_material_dark.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<selector xmlns:android="http://schemas.android.com/apk/res/android">
3-
<item android:drawable="@color/ripple_material_dark" android:state_pressed="true" />
3+
<item android:drawable="@color/adp_mtrl_ripple_dark" android:state_pressed="true" />
44
<item android:drawable="@android:color/transparent" />
55

66
</selector>

‎MaterialStuffLibrary/res/drawable/adp_item_background_material_light.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<selector xmlns:android="http://schemas.android.com/apk/res/android">
3-
<item android:drawable="@color/ripple_material_light" android:state_pressed="true" />
3+
<item android:drawable="@color/adp_mtrl_ripple_light" android:state_pressed="true" />
44
<item android:drawable="@android:color/transparent" />
55

66
</selector>

‎MaterialStuffLibrary/res/layout/adp_alert_dialog_material.xml‎

Lines changed: 20 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,36 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
3-
xmlns:tools="http://schemas.android.com/tools"
43
android:id="@id/adp_parentPanel"
54
android:layout_width="match_parent"
65
android:layout_height="wrap_content"
7-
android:orientation="vertical" >
6+
android:orientation="vertical">
87

98
<LinearLayout
109
android:id="@id/adp_topPanel"
1110
android:layout_width="match_parent"
1211
android:layout_height="wrap_content"
13-
android:orientation="vertical" >
12+
android:orientation="vertical">
1413

1514
<LinearLayout
1615
android:id="@id/adp_title_template"
1716
android:layout_width="match_parent"
1817
android:layout_height="wrap_content"
1918
android:gravity="center_vertical|start"
19+
android:minHeight="?attr/adpTitleMinHeight"
2020
android:orientation="horizontal"
21-
android:paddingEnd="@dimen/alert_dialog_padding_material"
22-
android:paddingLeft="@dimen/alert_dialog_padding_material"
23-
android:paddingRight="@dimen/alert_dialog_padding_material"
24-
android:paddingStart="@dimen/alert_dialog_padding_material"
25-
android:paddingTop="@dimen/alert_dialog_padding_top_material" >
21+
android:paddingEnd="@dimen/adp_mtrl_alert_dialog_padding"
22+
android:paddingLeft="@dimen/adp_mtrl_alert_dialog_padding"
23+
android:paddingRight="@dimen/adp_mtrl_alert_dialog_padding"
24+
android:paddingStart="@dimen/adp_mtrl_alert_dialog_padding"
25+
android:paddingTop="@dimen/adp_mtrl_alert_dialog_padding_top">
2626

2727
<ImageView
2828
android:id="@id/adp_icon"
2929
android:layout_width="32dip"
3030
android:layout_height="32dip"
31-
android:layout_marginEnd="8dip"
3231
android:layout_marginRight="8dip"
3332
android:scaleType="fitCenter"
34-
android:src="@null"
35-
tools:ignore="ContentDescription" />
33+
android:src="@null" />
3634

3735
<com.alertdialogpro.internal.DialogTitle
3836
android:id="@id/adp_alertTitle"
@@ -42,8 +40,7 @@
4240
android:ellipsize="end"
4341
android:gravity="start"
4442
android:singleLine="true"
45-
android:textAlignment="viewStart"
46-
tools:ignore="UnusedAttribute" />
43+
android:textAlignment="viewStart" />
4744
</LinearLayout>
4845
<!-- If the client uses a customTitle, it will be added here. -->
4946
</LinearLayout>
@@ -54,34 +51,32 @@
5451
android:layout_height="wrap_content"
5552
android:layout_weight="1"
5653
android:minHeight="48dp"
57-
android:orientation="vertical" >
54+
android:orientation="vertical">
5855

5956
<ScrollView
6057
android:id="@id/adp_scrollView"
6158
android:layout_width="match_parent"
6259
android:layout_height="wrap_content"
63-
android:clipToPadding="false"
64-
tools:ignore="UselessParent" >
60+
android:clipToPadding="false">
6561

6662
<LinearLayout
6763
android:layout_width="match_parent"
6864
android:layout_height="wrap_content"
69-
android:orientation="vertical" >
65+
android:orientation="vertical">
7066

7167
<TextView
7268
android:id="@id/adp_message"
7369
style="?attr/adpMessageTextAppearance"
7470
android:layout_width="match_parent"
7571
android:layout_height="wrap_content"
76-
android:paddingLeft="@dimen/alert_dialog_padding_material"
77-
android:paddingRight="@dimen/alert_dialog_padding_material"
78-
android:paddingTop="@dimen/alert_dialog_padding_top_material"
79-
android:textIsSelectable="@bool/msl__at_least_api21" />
72+
android:paddingLeft="@dimen/adp_mtrl_alert_dialog_padding"
73+
android:paddingRight="@dimen/adp_mtrl_alert_dialog_padding"
74+
android:paddingTop="@dimen/adp_mtrl_alert_dialog_padding_top" />
8075

8176
<View
8277
android:id="@id/adp_textSpacerNoButtons"
8378
android:layout_width="0dp"
84-
android:layout_height="@dimen/alert_dialog_padding_top_material"
79+
android:layout_height="@dimen/adp_mtrl_alert_dialog_padding_top"
8580
android:visibility="gone" />
8681
</LinearLayout>
8782
</ScrollView>
@@ -92,7 +87,7 @@
9287
android:layout_width="match_parent"
9388
android:layout_height="wrap_content"
9489
android:layout_weight="1"
95-
android:minHeight="48dp" >
90+
android:minHeight="48dp">
9691

9792
<FrameLayout
9893
android:id="@id/adp_custom"
@@ -112,8 +107,7 @@
112107
android:paddingLeft="12dp"
113108
android:paddingRight="12dp"
114109
android:paddingStart="12dp"
115-
android:paddingTop="8dp"
116-
tools:ignore="UnusedAttribute" >
110+
android:paddingTop="8dp">
117111

118112
<Button
119113
android:id="@id/adp_button3"
@@ -140,4 +134,4 @@
140134
android:layout_height="wrap_content" />
141135
</LinearLayout>
142136

143-
</LinearLayout>
137+
</LinearLayout>

‎MaterialStuffLibrary/res/layout/adp_select_dialog_item_material.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
android:layout_height="wrap_content"
66
android:ellipsize="marquee"
77
android:gravity="center_vertical"
8-
android:minHeight="?adpListItemHeight"
8+
android:minHeight="?attr/adpListItemMinHeight"
99
android:paddingLeft="16dip"
1010
android:paddingRight="16dip"
1111
android:textAppearance="?attr/adpListItemTextAppearance"

‎MaterialStuffLibrary/res/layout/adp_select_dialog_material.xml‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<view xmlns:android="http://schemas.android.com/apk/res/android"
3-
xmlns:tools="http://schemas.android.com/tools"
43
android:id="@id/adp_select_dialog_listview"
4+
class="com.alertdialogpro.internal.AlertController$RecycleListView"
55
android:layout_width="match_parent"
66
android:layout_height="match_parent"
7-
class="com.alertdialogpro.internal.AlertController$RecycleListView"
87
android:cacheColorHint="@null"
98
android:divider="?attr/adpListDivider"
109
android:gravity="start"
1110
android:overScrollMode="ifContentScrolls"
1211
android:scrollbars="vertical"
13-
android:textAlignment="viewStart"
14-
tools:ignore="UnusedAttribute" />
12+
android:textAlignment="viewStart" />

‎MaterialStuffLibrary/res/layout/adp_select_dialog_multichoice_material.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
android:checkMark="?android:attr/listChoiceIndicatorMultiple"
77
android:ellipsize="marquee"
88
android:gravity="center_vertical"
9-
android:minHeight="?attr/adpListItemHeight"
9+
android:minHeight="?attr/adpListItemMinHeight"
1010
android:paddingLeft="16dip"
1111
android:paddingRight="16dip"
1212
android:textAppearance="?attr/adpListSingleChoiceTextAppearance"

‎MaterialStuffLibrary/res/layout/adp_select_dialog_singlechoice_material.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
android:checkMark="?android:attr/listChoiceIndicatorSingle"
77
android:ellipsize="marquee"
88
android:gravity="center_vertical"
9-
android:minHeight="?attr/adpListItemHeight"
9+
android:minHeight="?attr/adpListItemMinHeight"
1010
android:paddingLeft="16dip"
1111
android:paddingRight="16dip"
1212
android:textAppearance="?attr/adpListMultiChoiceTextAppearance"

‎MaterialStuffLibrary/res/values-h720dp/adp_mtrl_dimens.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22

33
<resources>
44
<!-- Dialog button bar height -->
5-
<dimen name="alert_dialog_button_bar_height">54dip</dimen>
5+
<dimen name="adp_mtrl_alert_dialog_button_bar_height">54dip</dimen>
66
</resources>

0 commit comments

Comments
 (0)