Skip to content

Commit 67799dd

Browse files
author
wangmingshuo
committed
解决ActionSheetDialog CancelButton被 Theme.Material tint 的问题
1 parent c10cf24 commit 67799dd

4 files changed

Lines changed: 35 additions & 9 deletions

File tree

app/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ dependencies {
2727
implementation fileTree(dir: 'libs', include: ['*.jar'])
2828
implementation"org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
2929
implementation 'androidx.appcompat:appcompat:1.1.0'
30+
implementation 'com.google.android.material:material:1.1.0'
3031
implementation 'androidx.core:core-ktx:1.1.0'
3132
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
3233
testImplementation 'junit:junit:4.12'

cupertinodialog/src/main/res/layout/dialog_action_sheet.xml

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -69,19 +69,15 @@
6969

7070
</com.hanter.android.radwidget.cupertino.blur.BlurView>
7171

72-
<Button
72+
<androidx.appcompat.widget.AppCompatButton
7373
android:id="@+id/btnCancel"
74-
style="@style/Widget.AppCompat.Button.Borderless"
74+
style="@style/CupertinoActionSheetCancelButton"
7575
android:layout_width="match_parent"
7676
android:layout_height="56dp"
77+
android:layout_below="@id/blurView"
7778
android:layout_marginLeft="9dp"
7879
android:layout_marginTop="8dp"
7980
android:layout_marginRight="9dp"
80-
android:layout_below="@id/blurView"
81-
android:background="@drawable/btn_action_sheet_cancel"
82-
android:gravity="center"
83-
android:text="取消"
84-
android:textColor="#066cf8"
85-
android:textSize="20dp" />
81+
tools:text="Cancel" />
8682

8783
</RelativeLayout>
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<resources>
3+
<style name="CupertinoAlertDialogAction" >
4+
<item name="android:background">@drawable/btn_cupertino_alert</item>
5+
<item name="android:gravity">center</item>
6+
<item name="android:minWidth">0dp</item>
7+
<item name="android:minHeight">0dp</item>
8+
<item name="android:textAllCaps">false</item>
9+
<item name="android:textAppearance">@style/CupertinoAlertDialogAction.Text</item>
10+
<item name="android:stateListAnimator">@null</item>
11+
</style>
12+
13+
<style name="CupertinoActionSheetCancelButton" >
14+
<item name="android:gravity">center</item>
15+
<item name="android:textSize">20dp</item>
16+
<item name="android:textColor">#066cf8</item>
17+
<item name="android:background">@drawable/btn_action_sheet_cancel</item>
18+
<item name="backgroundTint">@null</item>
19+
<item name="android:stateListAnimator">@null</item>
20+
</style>
21+
</resources>

cupertinodialog/src/main/res/values/styles.xml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,15 @@
3333
<item name="android:windowMinWidthMajor">310dp</item>
3434
</style>
3535

36-
<style name="CupertinoAlertDialogAction" parent="Widget.AppCompat.Button.Borderless">
36+
<style name="CupertinoActionSheetCancelButton" >
37+
<item name="android:gravity">center</item>
38+
<item name="android:textSize">20dp</item>
39+
<item name="android:textColor">#066cf8</item>
40+
<item name="android:background">@drawable/btn_action_sheet_cancel</item>
41+
<item name="backgroundTint">@null</item>
42+
</style>
43+
44+
<style name="CupertinoAlertDialogAction" >
3745
<item name="android:background">@drawable/btn_cupertino_alert</item>
3846
<item name="android:gravity">center</item>
3947
<item name="android:minWidth">0dp</item>

0 commit comments

Comments
 (0)