mirror/mihon
1
0
Fork 0
mirror of https://github.com/mihonapp/mihon.git synced 2025-11-08 10:08:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/inorichi/tachiyomi

Browse Source 
# Conflicts:
#	README.md
#	app/build.gradle
#	app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/NoResultsException.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/latest_updates/LatestUpdatesPresenter.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryCategoryView.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt
This commit is contained in:
NerdNumber9
2017-12-07 23:20:27 -05:00
parent 263cc1d97c 9ae6285eef
commit 9af552c15a
79 changed files with 1972 additions and 1941 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/res/layout/catalogue_controller.xml
View File

@@ -11,7 +11,7 @@
android:fitsSystemWindows="true"
android:orientation="vertical"
android:id="@+id/catalogue_view"
tools:context="eu.kanade.tachiyomi.ui.catalogue.CatalogueController">
tools:context="eu.kanade.tachiyomi.ui.catalogue.browse.BrowseCatalogueController">
<ProgressBar
android:id="@+id/progress"

2
app/src/main/res/layout/catalogue_drawer.xml
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<eu.kanade.tachiyomi.ui.catalogue.CatalogueNavigationView
<eu.kanade.tachiyomi.ui.catalogue.browse.CatalogueNavigationView
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/nav_view2"
android:layout_width="wrap_content"

2
app/src/main/res/layout/library_controller.xml
View File

@@ -8,7 +8,7 @@
<android.support.v4.view.ViewPager
android:layout_width="match_parent"
android:layout_height="match_parent"
android:id="@+id/view_pager"/>
android:id="@+id/library_pager"/>
<eu.kanade.tachiyomi.widget.EmptyView
android:id="@+id/empty_view"

5
app/src/main/res/layout/manga_controller.xml
View File

@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.v4.view.ViewPager
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/view_pager"
android:id="@+id/manga_pager"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?android:attr/colorBackground" />
android:layout_height="match_parent" />

2
app/src/main/res/layout/manga_info_controller.xml
View File

@@ -3,7 +3,7 @@
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"
tools:context="eu.kanade.tachiyomi.ui.catalogue.CatalogueController"
tools:context="eu.kanade.tachiyomi.ui.catalogue.browse.BrowseCatalogueController"
android:id="@id/swipe_refresh"
android:layout_width="match_parent"
android:layout_height="match_parent">