pull/32/head
kunfei 5 years ago
parent 407fdf9dcf
commit c33f72b15c
  1. 7
      app/src/main/res/drawable-v21/bg_ib_pre.xml
  2. 3
      app/src/main/res/drawable-v21/bg_ib_pre_round.xml
  3. 5
      app/src/main/res/drawable/bg_ib_pre.xml
  4. 4
      app/src/main/res/drawable/bg_ib_pre_round.xml
  5. 4
      app/src/main/res/layout/activity_book_info.xml
  6. 4
      app/src/main/res/layout/fragment_chapter_list.xml
  7. 2
      app/src/main/res/layout/item_book_group.xml
  8. 6
      app/src/main/res/layout/item_book_source.xml
  9. 2
      app/src/main/res/layout/item_bookshelf_list_add.xml
  10. 4
      app/src/main/res/layout/item_relace_rule.xml
  11. 16
      app/src/main/res/layout/view_read_bottom_menu.xml

@ -1,7 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="@color/btn_bg_press_2">
<item
android:id="@android:id/mask"
android:drawable="@color/btn_bg_press_2" />
</ripple>

@ -1,3 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="@color/btn_bg_press" />

@ -1,5 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@android:color/transparent" android:state_pressed="false" />
<item android:drawable="@color/btn_bg_press" android:state_pressed="true" />
</selector>

@ -1,4 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@android:color/transparent" />
</selector>

@ -160,7 +160,7 @@
android:id="@+id/iv_chapter_top" android:id="@+id/iv_chapter_top"
android:layout_width="36dp" android:layout_width="36dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@drawable/bg_ib_pre_round" android:background="?android:attr/selectableItemBackgroundBorderless"
android:contentDescription="@string/go_to_top" android:contentDescription="@string/go_to_top"
android:src="@drawable/ic_arrow_drop_up" android:src="@drawable/ic_arrow_drop_up"
app:tint="@color/tv_text_default" /> app:tint="@color/tv_text_default" />
@ -169,7 +169,7 @@
android:id="@+id/iv_chapter_bottom" android:id="@+id/iv_chapter_bottom"
android:layout_width="36dp" android:layout_width="36dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@drawable/bg_ib_pre_round" android:background="?android:attr/selectableItemBackgroundBorderless"
android:contentDescription="@string/go_to_bottom" android:contentDescription="@string/go_to_bottom"
android:src="@drawable/ic_arrow_drop_down" android:src="@drawable/ic_arrow_drop_down"
app:tint="@color/tv_text_default" /> app:tint="@color/tv_text_default" />

@ -42,7 +42,7 @@
android:id="@+id/iv_chapter_top" android:id="@+id/iv_chapter_top"
android:layout_width="36dp" android:layout_width="36dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@drawable/bg_ib_pre_round" android:background="?android:attr/selectableItemBackgroundBorderless"
android:contentDescription="@string/go_to_top" android:contentDescription="@string/go_to_top"
android:src="@drawable/ic_arrow_drop_up" android:src="@drawable/ic_arrow_drop_up"
app:tint="@color/tv_text_default" /> app:tint="@color/tv_text_default" />
@ -51,7 +51,7 @@
android:id="@+id/iv_chapter_bottom" android:id="@+id/iv_chapter_bottom"
android:layout_width="36dp" android:layout_width="36dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@drawable/bg_ib_pre_round" android:background="?android:attr/selectableItemBackgroundBorderless"
android:contentDescription="@string/go_to_bottom" android:contentDescription="@string/go_to_bottom"
android:src="@drawable/ic_arrow_drop_down" android:src="@drawable/ic_arrow_drop_down"
app:tint="@color/tv_text_default" /> app:tint="@color/tv_text_default" />

@ -3,6 +3,6 @@
android:id="@+id/tv_group" android:id="@+id/tv_group"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@drawable/bg_ib_pre" android:background="?android:attr/selectableItemBackground"
android:layout_margin="5dp" android:layout_margin="5dp"
android:padding="5dp" /> android:padding="5dp" />

@ -23,7 +23,7 @@
android:layout_width="40dp" android:layout_width="40dp"
android:layout_height="40dp" android:layout_height="40dp"
android:layout_gravity="center" android:layout_gravity="center"
android:background="@drawable/bg_ib_pre_round" android:background="?android:attr/selectableItemBackgroundBorderless"
android:contentDescription="@string/edit" android:contentDescription="@string/edit"
android:padding="8dp" android:padding="8dp"
android:src="@drawable/ic_edit" android:src="@drawable/ic_edit"
@ -34,7 +34,7 @@
android:layout_width="40dp" android:layout_width="40dp"
android:layout_height="40dp" android:layout_height="40dp"
android:layout_gravity="center" android:layout_gravity="center"
android:background="@drawable/bg_ib_pre_round" android:background="?android:attr/selectableItemBackgroundBorderless"
android:contentDescription="@string/to_top" android:contentDescription="@string/to_top"
android:padding="8dp" android:padding="8dp"
android:src="@drawable/ic_top_source" android:src="@drawable/ic_top_source"
@ -45,7 +45,7 @@
android:layout_width="40dp" android:layout_width="40dp"
android:layout_height="40dp" android:layout_height="40dp"
android:layout_gravity="center" android:layout_gravity="center"
android:background="@drawable/bg_ib_pre_round" android:background="?android:attr/selectableItemBackgroundBorderless"
android:contentDescription="@string/delete" android:contentDescription="@string/delete"
android:padding="8dp" android:padding="8dp"
android:src="@drawable/ic_clear_all" android:src="@drawable/ic_clear_all"

@ -2,7 +2,7 @@
<TextView xmlns:android="http://schemas.android.com/apk/res/android" <TextView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="60dp" android:layout_height="60dp"
android:background="@drawable/bg_ib_pre" android:background="?android:attr/selectableItemBackground"
android:gravity="center" android:gravity="center"
android:text="@string/add" android:text="@string/add"
android:textSize="24sp" /> android:textSize="24sp" />

@ -9,7 +9,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:padding="8dp" android:padding="8dp"
android:background="@drawable/bg_ib_pre_round" android:background="?android:attr/selectableItemBackgroundBorderless"
android:contentDescription="@string/edit" android:contentDescription="@string/edit"
android:src="@drawable/ic_edit" android:src="@drawable/ic_edit"
android:visibility="gone" android:visibility="gone"
@ -23,7 +23,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:padding="8dp" android:padding="8dp"
android:background="@drawable/bg_ib_pre_round" android:background="?android:attr/selectableItemBackgroundBorderless"
android:contentDescription="@string/delete" android:contentDescription="@string/delete"
android:src="@drawable/ic_clear_all" android:src="@drawable/ic_clear_all"
android:visibility="gone" android:visibility="gone"

@ -133,13 +133,13 @@
<View <View
android:id="@+id/vw_bg" android:id="@+id/vw_bg"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent" />
android:background="@color/background_menu" />
<LinearLayout <LinearLayout
android:id="@+id/llNavigationBar" android:id="@+id/llNavigationBar"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@color/background_menu"
android:orientation="vertical"> android:orientation="vertical">
<!--章节设置--> <!--章节设置-->
<LinearLayout <LinearLayout
@ -157,7 +157,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="10dp" android:layout_marginStart="10dp"
android:layout_marginEnd="10dp" android:layout_marginEnd="10dp"
android:background="@drawable/bg_ib_pre_round" android:background="?android:attr/selectableItemBackgroundBorderless"
android:clickable="true" android:clickable="true"
android:enabled="false" android:enabled="false"
android:focusable="true" android:focusable="true"
@ -180,7 +180,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="10dp" android:layout_marginStart="10dp"
android:layout_marginEnd="10dp" android:layout_marginEnd="10dp"
android:background="@drawable/bg_ib_pre_round" android:background="?android:attr/selectableItemBackgroundBorderless"
android:clickable="true" android:clickable="true"
android:enabled="false" android:enabled="false"
android:focusable="true" android:focusable="true"
@ -207,7 +207,7 @@
android:id="@+id/ll_catalog" android:id="@+id/ll_catalog"
android:layout_width="50dp" android:layout_width="50dp"
android:layout_height="50dp" android:layout_height="50dp"
android:background="@drawable/bg_ib_pre_round" android:background="?android:attr/selectableItemBackgroundBorderless"
android:clickable="true" android:clickable="true"
android:contentDescription="@string/chapter_list" android:contentDescription="@string/chapter_list"
android:focusable="true" android:focusable="true"
@ -242,7 +242,7 @@
android:id="@+id/ll_adjust" android:id="@+id/ll_adjust"
android:layout_width="50dp" android:layout_width="50dp"
android:layout_height="50dp" android:layout_height="50dp"
android:background="@drawable/bg_ib_pre_round" android:background="?android:attr/selectableItemBackgroundBorderless"
android:clickable="true" android:clickable="true"
android:contentDescription="@string/adjust" android:contentDescription="@string/adjust"
android:focusable="true" android:focusable="true"
@ -277,7 +277,7 @@
android:id="@+id/ll_font" android:id="@+id/ll_font"
android:layout_width="50dp" android:layout_width="50dp"
android:layout_height="50dp" android:layout_height="50dp"
android:background="@drawable/bg_ib_pre_round" android:background="?android:attr/selectableItemBackgroundBorderless"
android:clickable="true" android:clickable="true"
android:contentDescription="@string/interface_setting" android:contentDescription="@string/interface_setting"
android:focusable="true" android:focusable="true"
@ -312,7 +312,7 @@
android:id="@+id/ll_setting" android:id="@+id/ll_setting"
android:layout_width="50dp" android:layout_width="50dp"
android:layout_height="50dp" android:layout_height="50dp"
android:background="@drawable/bg_ib_pre_round" android:background="?android:attr/selectableItemBackgroundBorderless"
android:clickable="true" android:clickable="true"
android:contentDescription="@string/setting" android:contentDescription="@string/setting"
android:focusable="true" android:focusable="true"

Loading…
Cancel
Save