diff --git a/app/src/main/java/io/legado/app/ui/widget/text/AccentBgTextView.kt b/app/src/main/java/io/legado/app/ui/widget/text/AccentBgTextView.kt index 58c914143..846f34204 100644 --- a/app/src/main/java/io/legado/app/ui/widget/text/AccentBgTextView.kt +++ b/app/src/main/java/io/legado/app/ui/widget/text/AccentBgTextView.kt @@ -15,7 +15,7 @@ class AccentBgTextView(context: Context, attrs: AttributeSet) : init { val typedArray = context.obtainStyledAttributes(attrs, R.styleable.AccentBgTextView) val radios = - typedArray.getDimensionPixelOffset(R.styleable.AccentBgTextView_bg_radius, 0) + typedArray.getDimensionPixelOffset(R.styleable.AccentBgTextView_radius, 0) typedArray.recycle() background = Selector.shapeBuild() .setCornerRadius(radios) diff --git a/app/src/main/java/io/legado/app/ui/widget/text/BadgeView.kt b/app/src/main/java/io/legado/app/ui/widget/text/BadgeView.kt index bcade49c7..33fc8b3a2 100644 --- a/app/src/main/java/io/legado/app/ui/widget/text/BadgeView.kt +++ b/app/src/main/java/io/legado/app/ui/widget/text/BadgeView.kt @@ -77,7 +77,7 @@ class BadgeView @JvmOverloads constructor( init { val typedArray = context.obtainStyledAttributes(attrs, R.styleable.BadgeView) val radios = - typedArray.getDimensionPixelOffset(R.styleable.BadgeView_bv_radius, 8) + typedArray.getDimensionPixelOffset(R.styleable.BadgeView_radius, 8) flatangle = typedArray.getBoolean(R.styleable.BadgeView_up_flat_angle, false) typedArray.recycle() diff --git a/app/src/main/res/layout/activity_book_info.xml b/app/src/main/res/layout/activity_book_info.xml index 727e29ae9..0c98f4cda 100644 --- a/app/src/main/res/layout/activity_book_info.xml +++ b/app/src/main/res/layout/activity_book_info.xml @@ -96,7 +96,7 @@ android:paddingRight="5dp" android:text="@string/change_origin" android:textSize="16sp" - app:bg_radius="2dp" /> + app:radius="2dp" /> @@ -118,7 +118,7 @@ android:singleLine="true" android:text="@string/app_name" android:textSize="14sp" - app:bg_radius="2dp" /> + app:radius="2dp" /> + app:radius="2dp" /> + app:radius="2dp" /> diff --git a/app/src/main/res/layout/item_bookshelf_grid.xml b/app/src/main/res/layout/item_bookshelf_grid.xml index b99bd4aa2..666d67098 100644 --- a/app/src/main/res/layout/item_bookshelf_grid.xml +++ b/app/src/main/res/layout/item_bookshelf_grid.xml @@ -55,7 +55,7 @@ android:layout_gravity="center" android:includeFontPadding="false" android:singleLine="true" - app:bv_radius="1dp" + app:radius="1dp" app:up_flat_angle="true" app:layout_constraintLeft_toLeftOf="@id/iv_cover" app:layout_constraintBottom_toBottomOf="@id/iv_cover" diff --git a/app/src/main/res/layout/item_import_book.xml b/app/src/main/res/layout/item_import_book.xml index 6d360e666..1ad9742bd 100644 --- a/app/src/main/res/layout/item_import_book.xml +++ b/app/src/main/res/layout/item_import_book.xml @@ -68,7 +68,7 @@ android:text="TXT" android:maxLines="1" android:maxWidth="50dp" - app:bg_radius="2dp" + app:radius="2dp" tools:ignore="HardcodedText,RtlHardcoded" /> + app:radius="2dp" /> + app:radius="2dp" /> + app:radius="2dp" /> diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml index 1589ee99c..e42a82a0d 100644 --- a/app/src/main/res/values/attrs.xml +++ b/app/src/main/res/values/attrs.xml @@ -1,6 +1,8 @@ + + @@ -102,7 +104,7 @@ - + @@ -145,11 +147,11 @@ - + - + \ No newline at end of file