Merge branch 'master' of https://github.com/gedoor/legado
# Conflicts: # app/src/main/res/drawable/bg_img_border.xml # app/src/main/res/layout/item_rss_article_2.xmlpull/219/head
commit
8a5cdd223a
@ -1,8 +1,13 @@ |
||||
<?xml version="1.0" encoding="UTF-8"?> |
||||
<shape xmlns:android="http://schemas.android.com/apk/res/android"> |
||||
<solid android:color="@color/background" /> |
||||
<stroke android:width="1dp" android:color="@color/bg_divider_line" /> |
||||
<corners android:radius="1dp" /> |
||||
<padding android:left="0dp" android:top="0dp" |
||||
android:right="0dp" android:bottom="0dp" /> |
||||
<?xml version="1.0" encoding="UTF-8"?> |
||||
<shape xmlns:android="http://schemas.android.com/apk/res/android"> |
||||
<solid android:color="@color/background" /> |
||||
<stroke |
||||
android:width="1dp" |
||||
android:color="@color/bg_divider_line" /> |
||||
<corners android:radius="1dp" /> |
||||
<padding |
||||
android:left="0dp" |
||||
android:top="0dp" |
||||
android:right="0dp" |
||||
android:bottom="0dp" /> |
||||
</shape> |
Loading…
Reference in new issue