Bladeren bron

Merge branch 'bota-adjustment'

Wayne 5 jaren geleden
bovenliggende
commit
ffc578e099

BIN
reader/src/main/res/drawable-hdpi/ic_pagelist_title_bookmk.png


BIN
reader/src/main/res/drawable-hdpi/ic_pagelist_title_outine.png


BIN
reader/src/main/res/drawable-hdpi/ic_pagelist_title_thumbnail.png


BIN
reader/src/main/res/drawable-xhdpi/ic_pagelist_title_thumbnail.png


+ 2 - 6
reader/src/main/res/layout/view_bookmark.xml

@@ -9,13 +9,9 @@
 
     <TextView
         android:id="@+id/tv_fragmentPdfReaderBookmark_"
+        style="@style/ReaderBotaTitleStyle"
         android:layout_width="wrap_content"
-        android:layout_height="30dp"
-        android:drawableLeft="@drawable/ic_pagelist_title_bookmk"
-        android:gravity="center_vertical"
-        android:text="@string/bookmark_title"
-        android:textColor="#afafaf"
-        android:textSize="12sp"/>
+        android:text="@string/bookmark_title" />
 
     <View
         android:layout_width="fill_parent"

+ 2 - 6
reader/src/main/res/layout/view_outline.xml

@@ -10,13 +10,9 @@
 
     <TextView
         android:id="@+id/textView1"
+        style="@style/ReaderBotaTitleStyle"
         android:layout_width="wrap_content"
-        android:layout_height="30dp"
-        android:drawableLeft="@drawable/ic_pagelist_title_outine"
-        android:gravity="center_vertical"
-        android:text="@string/outline_title"
-        android:textColor="#afafaf"
-        android:textSize="12sp"/>
+        android:text="@string/outline_title" />
 
     <View
         android:layout_width="fill_parent"

+ 2 - 5
reader/src/main/res/layout/view_thumbnail.xml

@@ -6,14 +6,11 @@
 
     <TextView
         android:id="@+id/id_km_thumb_title"
+        style="@style/ReaderBotaTitleStyle"
         android:layout_width="wrap_content"
-        android:layout_height="30dp"
         android:layout_centerHorizontal="true"
-        android:drawableLeft="@drawable/ic_pagelist_title_thumbnail"
-        android:gravity="center_vertical"
         android:text="@string/thumbnail_title"
-        android:textColor="#afafaf"
-        android:textSize="12sp"/>
+        />
 
     <View
         android:id="@+id/id_km_thumb_divider"

+ 2 - 0
reader/src/main/res/values/colors.xml

@@ -32,4 +32,6 @@
 
     <color name="reader_viewer_edit_tab_color_normal">#666666</color>
     <color name="reader_viewer_edit_tab_color_selected">#0077FD</color>
+
+    <color name="reader_bota_title_color">#99000000</color>
 </resources>

+ 6 - 0
reader/src/main/res/values/styles.xml

@@ -26,4 +26,10 @@
         <item name="android:layout_margin">8dp</item>
         <item name="android:src">@drawable/reader_annotation_property_color_border</item>
     </style>
+    <style name="ReaderBotaTitleStyle">
+        <item name="android:gravity">center</item>
+        <item name="android:textSize">14sp</item>
+        <item name="android:layout_height">48dp</item>
+        <item name="android:textColor">@color/reader_bota_title_color</item>
+    </style>
 </resources>