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

Remove clickable attributes from unclickable text in reader

Browse Source 
(cherry picked from commit d4c25359bd)
This commit is contained in:
arkon 2020-01-11 22:13:46 -05:00
parent 005ac9e732
commit ad664dfb9f
1 changed files with 14 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
app/src/main/res/layout/reader_activity.xml
View File

@ -1,8 +1,8 @@
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:gravity="center"> android:gravity="center">
<FrameLayout <FrameLayout
@ -13,8 +13,7 @@
<FrameLayout <FrameLayout
android:id="@+id/viewer_container" android:id="@+id/viewer_container"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent" />
</FrameLayout>
<ProgressBar <ProgressBar
android:id="@+id/please_wait" android:id="@+id/please_wait"
@ -22,7 +21,7 @@
android:layout_height="56dp" android:layout_height="56dp"
android:layout_gravity="center" android:layout_gravity="center"
android:visibility="gone" android:visibility="gone"
tools:visibility="visible"/> tools:visibility="visible" />
<eu.kanade.tachiyomi.ui.reader.PageIndicatorTextView <eu.kanade.tachiyomi.ui.reader.PageIndicatorTextView
android:id="@+id/page_number" android:id="@+id/page_number"
@ -56,18 +55,18 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize" android:layout_height="?attr/actionBarSize"
android:layout_gravity="bottom" android:layout_gravity="bottom"
android:gravity="center"
android:background="?colorPrimary" android:background="?colorPrimary"
android:orientation="horizontal" android:descendantFocusability="blocksDescendants"
android:descendantFocusability="blocksDescendants"> android:gravity="center"
android:orientation="horizontal">
<ImageButton <ImageButton
android:id="@+id/left_chapter" android:id="@+id/left_chapter"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:padding="@dimen/material_layout_keylines_screen_edge_margin"
android:background="?selectableItemBackgroundBorderless" android:background="?selectableItemBackgroundBorderless"
app:srcCompat="@drawable/ic_skip_previous_white_24dp"/> android:padding="@dimen/material_layout_keylines_screen_edge_margin"
app:srcCompat="@drawable/ic_skip_previous_white_24dp" />
<TextView <TextView
android:id="@+id/left_page_text" android:id="@+id/left_page_text"
@ -75,8 +74,7 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:gravity="center" android:gravity="center"
android:textSize="15sp" android:textSize="15sp"
android:clickable="true" tools:text="1" />
tools:text="1"/>
<eu.kanade.tachiyomi.ui.reader.ReaderSeekBar <eu.kanade.tachiyomi.ui.reader.ReaderSeekBar
android:id="@+id/page_seekbar" android:id="@+id/page_seekbar"
@ -90,16 +88,15 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:gravity="center" android:gravity="center"
android:textSize="15sp" android:textSize="15sp"
android:clickable="true" tools:text="15" />
tools:text="15"/>
<ImageButton <ImageButton
android:id="@+id/right_chapter" android:id="@+id/right_chapter"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:padding="@dimen/material_layout_keylines_screen_edge_margin"
android:background="?selectableItemBackgroundBorderless" android:background="?selectableItemBackgroundBorderless"
app:srcCompat="@drawable/ic_skip_next_white_24dp"/> android:padding="@dimen/material_layout_keylines_screen_edge_margin"
app:srcCompat="@drawable/ic_skip_next_white_24dp" />
</LinearLayout> </LinearLayout>
@ -109,12 +106,12 @@
android:id="@+id/brightness_overlay" android:id="@+id/brightness_overlay"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:visibility="gone"/> android:visibility="gone" />
<eu.kanade.tachiyomi.ui.reader.ReaderColorFilterView <eu.kanade.tachiyomi.ui.reader.ReaderColorFilterView
android:id="@+id/color_overlay" android:id="@+id/color_overlay"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:visibility="gone"/> android:visibility="gone" />
</FrameLayout> </FrameLayout>