yutou/tachiyomi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Add an initial menu for the reader, and some minor changes.

Browse Source
This commit is contained in:
inorichi
2015-11-18 21:54:33 +01:00
parent b389db9773
commit 3c1b00435c
20 changed files with 214 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/res/layout/activity_reader.xml
View File

@@ -6,17 +6,19 @@
<FrameLayout
android:id="@+id/reader"
android:layout_width="match_parent"
android:layout_height="wrap_content">
android:layout_height="match_parent">
</FrameLayout>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="8dp"
android:padding="4dp"
android:layout_gravity="bottom|left"
android:background="@color/bg_light_grey"
android:background="@color/page_number_background"
android:textColor="@color/black_87pc"
android:textSize="12sp"
android:id="@+id/page_number"/>
<include layout="@layout/reader_menu"/>
</FrameLayout>

43
app/src/main/res/layout/reader_menu.xml Normal file
View File

@@ -0,0 +1,43 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:id="@+id/reader_menu"
android:visibility="gone">
<include layout="@layout/toolbar"/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/reader_menu_background"
android:layout_alignParentBottom="true">
<TextView
android:id="@+id/current_page"
android:layout_width="32dp"
android:layout_height="wrap_content"
android:layout_marginLeft="8dp"
android:layout_gravity="center_vertical"
android:textColor="@color/light_grey"
android:gravity="center_horizontal" />
<SeekBar
android:id="@+id/page_seeker"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_gravity="center_vertical" />
<TextView
android:id="@+id/total_pages"
android:layout_width="32dp"
android:layout_height="wrap_content"
android:layout_marginRight="8dp"
android:layout_gravity="center_vertical"
android:textColor="@color/light_grey"
android:gravity="center_horizontal" />
</LinearLayout>
</RelativeLayout>

2
app/src/main/res/values/colors.xml
View File

@@ -17,4 +17,6 @@
<color name="library_text_background">#E8E8E8</color>
<color name="chapter_read_text">#909090</color>
<color name="list_choice_pressed_bg_light">#607D8B</color>
<color name="page_number_background">#AAE9E9E9</color>
<color name="reader_menu_background">#333333</color>
</resources>

2
app/src/main/res/values/keys.xml
View File

@@ -3,7 +3,7 @@
<string name="pref_category_reader_key">pref_category_reader_key</string>
<string name="pref_category_accounts_key">pref_category_accounts_key</string>
<string name="pref_category_downloads_key">pref_category_downloads_key</string>
<string name="pref_fullscreen_key">pref_fullscreen_key</string>
<string name="pref_hide_status_bar_key">pref_hide_status_bar_key</string>
<string name="pref_default_viewer_key">pref_default_viewer_key</string>
<string name="pref_download_directory_key">pref_download_directory_key</string>
<string name="pref_download_threads_key">pref_download_threads_key</string>

3
app/src/main/res/values/strings.xml
View File

@@ -27,7 +27,7 @@
<string name="pref_category_downloads">Downloads</string>
<!-- Reader section -->
<string name="pref_fullscreen_mode">Read in fullscreen</string>
<string name="pref_hide_status_bar">Hide status bar</string>
<string name="pref_viewer_type">Default viewer</string>
<string name="left_to_right_viewer">Left to right</string>
<string name="right_to_left_viewer">Right to left</string>
@@ -75,6 +75,7 @@
<string name="download_progress">Downloaded %1$d%%</string>
<string name="chapter_progress">Page: %1$d</string>
<string name="page_list_error">Error fetching page list. Is network available?</string>
<string name="chapter_subtitle">Chapter %1$s</string>
<!-- Library update service notifications -->
<string name="notification_progress">Update progress: %1$d/%2$d</string>

4
app/src/main/res/xml/pref_reader.xml
View File

@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
<CheckBoxPreference android:title="@string/pref_fullscreen_mode"
android:key="@string/pref_fullscreen_key"
<CheckBoxPreference android:title="@string/pref_hide_status_bar"
android:key="@string/pref_hide_status_bar_key"
android:defaultValue="true" />
<ListPreference android:title="@string/pref_viewer_type"