mirror/mihon
1
0
Fork 0
mirror of https://github.com/mihonapp/mihon.git synced 2024-11-07 19:27:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Minor edits

Browse Source
This commit is contained in:
arkon 2020-05-10 12:58:13 -04:00
parent 3cffc6890d
commit dd1b5c7ea7
8 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourceController.kt
View File

@ -31,7 +31,7 @@ import eu.kanade.tachiyomi.source.online.HttpSource
import eu.kanade.tachiyomi.ui.base.controller.NucleusController import eu.kanade.tachiyomi.ui.base.controller.NucleusController
import eu.kanade.tachiyomi.ui.base.controller.withFadeTransaction import eu.kanade.tachiyomi.ui.base.controller.withFadeTransaction
import eu.kanade.tachiyomi.ui.library.ChangeMangaCategoriesDialog import eu.kanade.tachiyomi.ui.library.ChangeMangaCategoriesDialog
import eu.kanade.tachiyomi.ui.main.offsetFabAppbarHeight import eu.kanade.tachiyomi.ui.main.offsetAppbarHeight
import eu.kanade.tachiyomi.ui.manga.MangaController import eu.kanade.tachiyomi.ui.manga.MangaController
import eu.kanade.tachiyomi.ui.webview.WebViewActivity import eu.kanade.tachiyomi.ui.webview.WebViewActivity
import eu.kanade.tachiyomi.util.system.connectivityManager import eu.kanade.tachiyomi.util.system.connectivityManager
@ -159,7 +159,7 @@ open class BrowseSourceController(bundle: Bundle) :
binding.fabFilter.setOnClickListener { filterSheet?.show() } binding.fabFilter.setOnClickListener { filterSheet?.show() }
binding.fabFilter.offsetFabAppbarHeight(activity!!) binding.fabFilter.offsetAppbarHeight(activity!!)
binding.fabFilter.visible() binding.fabFilter.visible()
} }

4
app/src/main/java/eu/kanade/tachiyomi/ui/category/CategoryController.kt
View File

@ -17,7 +17,7 @@ import eu.kanade.tachiyomi.R
import eu.kanade.tachiyomi.data.database.models.Category import eu.kanade.tachiyomi.data.database.models.Category
import eu.kanade.tachiyomi.databinding.CategoriesControllerBinding import eu.kanade.tachiyomi.databinding.CategoriesControllerBinding
import eu.kanade.tachiyomi.ui.base.controller.NucleusController import eu.kanade.tachiyomi.ui.base.controller.NucleusController
import eu.kanade.tachiyomi.ui.main.offsetFabAppbarHeight import eu.kanade.tachiyomi.ui.main.offsetAppbarHeight
import eu.kanade.tachiyomi.util.system.toast import eu.kanade.tachiyomi.util.system.toast
import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.launchIn
import kotlinx.coroutines.flow.onEach import kotlinx.coroutines.flow.onEach
@ -95,7 +95,7 @@ class CategoryController :
} }
.launchIn(scope) .launchIn(scope)
binding.fab.offsetFabAppbarHeight(activity!!) binding.fab.offsetAppbarHeight(activity!!)
} }
/** /**

4
app/src/main/java/eu/kanade/tachiyomi/ui/download/DownloadController.kt
View File

@ -13,7 +13,7 @@ import eu.kanade.tachiyomi.data.download.model.Download
import eu.kanade.tachiyomi.databinding.DownloadControllerBinding import eu.kanade.tachiyomi.databinding.DownloadControllerBinding
import eu.kanade.tachiyomi.source.model.Page import eu.kanade.tachiyomi.source.model.Page
import eu.kanade.tachiyomi.ui.base.controller.NucleusController import eu.kanade.tachiyomi.ui.base.controller.NucleusController
import eu.kanade.tachiyomi.ui.main.offsetFabAppbarHeight import eu.kanade.tachiyomi.ui.main.offsetAppbarHeight
import java.util.HashMap import java.util.HashMap
import java.util.concurrent.TimeUnit import java.util.concurrent.TimeUnit
import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.launchIn
@ -93,7 +93,7 @@ class DownloadController :
} }
.launchIn(scope) .launchIn(scope)
binding.fab.offsetFabAppbarHeight(activity!!) binding.fab.offsetAppbarHeight(activity!!)
// Subscribe to changes // Subscribe to changes
DownloadService.runningRelay DownloadService.runningRelay

4
app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt
View File

@ -32,7 +32,7 @@ import eu.kanade.tachiyomi.ui.base.controller.RootController
import eu.kanade.tachiyomi.ui.base.controller.TabbedController import eu.kanade.tachiyomi.ui.base.controller.TabbedController
import eu.kanade.tachiyomi.ui.base.controller.withFadeTransaction import eu.kanade.tachiyomi.ui.base.controller.withFadeTransaction
import eu.kanade.tachiyomi.ui.main.MainActivity import eu.kanade.tachiyomi.ui.main.MainActivity
import eu.kanade.tachiyomi.ui.main.offsetFabAppbarHeight import eu.kanade.tachiyomi.ui.main.offsetAppbarHeight
import eu.kanade.tachiyomi.ui.manga.MangaController import eu.kanade.tachiyomi.ui.manga.MangaController
import eu.kanade.tachiyomi.util.system.getResourceColor import eu.kanade.tachiyomi.util.system.getResourceColor
import eu.kanade.tachiyomi.util.system.toast import eu.kanade.tachiyomi.util.system.toast
@ -180,7 +180,7 @@ class LibraryController(
binding.downloadedOnly.visible() binding.downloadedOnly.visible()
} }
binding.actionToolbar.offsetFabAppbarHeight(activity!!) binding.actionToolbar.offsetAppbarHeight(activity!!)
} }
override fun onChangeStarted(handler: ControllerChangeHandler, type: ControllerChangeType) { override fun onChangeStarted(handler: ControllerChangeHandler, type: ControllerChangeType) {

6
app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt
View File

@ -383,10 +383,10 @@ class MainActivity : BaseActivity<MainActivityBinding>() {
} }
/** /**
* Used to manually offset a FAB within child views that might be cut off due to the collapsing * Used to manually offset a view within the activity's child views that might be cut off due to the
* AppBarLayout. * collapsing AppBarLayout.
*/ */
fun View.offsetFabAppbarHeight(activity: Activity) { fun View.offsetAppbarHeight(activity: Activity) {
val appbar: AppBarLayout = activity.findViewById(R.id.appbar) val appbar: AppBarLayout = activity.findViewById(R.id.appbar)
val tabs: TabLayout = activity.findViewById(R.id.tabs) val tabs: TabLayout = activity.findViewById(R.id.tabs)
appbar.addOnOffsetChangedListener( appbar.addOnOffsetChangedListener(

6
app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/ChaptersController.kt
View File

@ -24,7 +24,7 @@ import eu.kanade.tachiyomi.data.database.models.Manga
import eu.kanade.tachiyomi.data.download.model.Download import eu.kanade.tachiyomi.data.download.model.Download
import eu.kanade.tachiyomi.databinding.ChaptersControllerBinding import eu.kanade.tachiyomi.databinding.ChaptersControllerBinding
import eu.kanade.tachiyomi.ui.base.controller.NucleusController import eu.kanade.tachiyomi.ui.base.controller.NucleusController
import eu.kanade.tachiyomi.ui.main.offsetFabAppbarHeight import eu.kanade.tachiyomi.ui.main.offsetAppbarHeight
import eu.kanade.tachiyomi.ui.manga.MangaController import eu.kanade.tachiyomi.ui.manga.MangaController
import eu.kanade.tachiyomi.ui.reader.ReaderActivity import eu.kanade.tachiyomi.ui.reader.ReaderActivity
import eu.kanade.tachiyomi.util.system.getResourceColor import eu.kanade.tachiyomi.util.system.getResourceColor
@ -126,8 +126,8 @@ class ChaptersController :
binding.fab.shrinkOnScroll(binding.recycler) binding.fab.shrinkOnScroll(binding.recycler)
binding.actionToolbar.offsetFabAppbarHeight(activity!!) binding.actionToolbar.offsetAppbarHeight(activity!!)
binding.fab.offsetFabAppbarHeight(activity!!) binding.fab.offsetAppbarHeight(activity!!)
} }
override fun onDestroyView(view: View) { override fun onDestroyView(view: View) {

4
app/src/main/java/eu/kanade/tachiyomi/ui/recent/updates/UpdatesController.kt
View File

@ -23,7 +23,7 @@ import eu.kanade.tachiyomi.ui.base.controller.NucleusController
import eu.kanade.tachiyomi.ui.base.controller.RootController import eu.kanade.tachiyomi.ui.base.controller.RootController
import eu.kanade.tachiyomi.ui.base.controller.withFadeTransaction import eu.kanade.tachiyomi.ui.base.controller.withFadeTransaction
import eu.kanade.tachiyomi.ui.main.MainActivity import eu.kanade.tachiyomi.ui.main.MainActivity
import eu.kanade.tachiyomi.ui.main.offsetFabAppbarHeight import eu.kanade.tachiyomi.ui.main.offsetAppbarHeight
import eu.kanade.tachiyomi.ui.manga.MangaController import eu.kanade.tachiyomi.ui.manga.MangaController
import eu.kanade.tachiyomi.ui.reader.ReaderActivity import eu.kanade.tachiyomi.ui.reader.ReaderActivity
import eu.kanade.tachiyomi.util.system.notificationManager import eu.kanade.tachiyomi.util.system.notificationManager
@ -112,7 +112,7 @@ class UpdatesController :
} }
.launchIn(scope) .launchIn(scope)
binding.actionToolbar.offsetFabAppbarHeight(activity!!) binding.actionToolbar.offsetAppbarHeight(activity!!)
} }
override fun onDestroyView(view: View) { override fun onDestroyView(view: View) {

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

@ -321,9 +321,9 @@
<string name="pref_restore_backup">Restore backup</string> <string name="pref_restore_backup">Restore backup</string>
<string name="pref_restore_backup_summ">Restore library from backup file</string> <string name="pref_restore_backup_summ">Restore library from backup file</string>
<string name="pref_backup_directory">Backup location</string> <string name="pref_backup_directory">Backup location</string>
<string name="pref_backup_service_category">Service</string> <string name="pref_backup_service_category">Automatic backups</string>
<string name="pref_backup_interval">Backup frequency</string> <string name="pref_backup_interval">Backup frequency</string>
<string name="pref_backup_slots">Max automatic backups</string> <string name="pref_backup_slots">Maximum backups</string>
<string name="source_not_found">Source not found</string> <string name="source_not_found">Source not found</string>
<string name="backup_created">Backup created</string> <string name="backup_created">Backup created</string>
<string name="restore_completed">Restore completed</string> <string name="restore_completed">Restore completed</string>