Merge upstream changes

This commit is contained in:
NerdNumber9
2017-11-23 21:03:49 -05:00
committed by NerdNumber9
210 changed files with 6140 additions and 1779 deletions

View File

@@ -23,14 +23,14 @@
android:layout_height="wrap_content"
android:layout_gravity="center"/>
<TextView
<eu.kanade.tachiyomi.ui.reader.PageIndicatorTextView
android:id="@+id/page_number"
style="@style/TextAppearance.Regular.Caption"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="bottom|start"
android:background="?android:attr/colorBackground"
android:padding="4dp"/>
android:layout_gravity="bottom|center_horizontal"
android:padding="4dp"
android:textStyle="bold" />
</FrameLayout>