Minor edits

(cherry picked from commit dd1b5c7ea7)

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

@@ -35,7 +35,7 @@ import eu.kanade.tachiyomi.ui.base.controller.withFadeTransaction
 import eu.kanade.tachiyomi.ui.browse.source.SourceController
 import eu.kanade.tachiyomi.ui.browse.source.browse.SourceFilterSheet.FilterNavigationView.Companion.MAX_SAVED_SEARCHES
 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.webview.WebViewActivity
 import eu.kanade.tachiyomi.util.system.connectivityManager
@@ -270,7 +270,7 @@ open class BrowseSourceController(bundle: Bundle) :
 
         binding.fabFilter.setOnClickListener { filterSheet?.show() }
 
-        binding.fabFilter.offsetFabAppbarHeight(activity!!)
+        binding.fabFilter.offsetAppbarHeight(activity!!)
         binding.fabFilter.visible()
     }
 

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

@@ -17,7 +17,7 @@ import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.data.database.models.Category
 import eu.kanade.tachiyomi.databinding.CategoriesControllerBinding
 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 kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
@@ -95,7 +95,7 @@ class CategoryController :
             }
             .launchIn(scope)
 
-        binding.fab.offsetFabAppbarHeight(activity!!)
+        binding.fab.offsetAppbarHeight(activity!!)
     }
 
     /**

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

@@ -13,7 +13,7 @@ import eu.kanade.tachiyomi.data.download.model.Download
 import eu.kanade.tachiyomi.databinding.DownloadControllerBinding
 import eu.kanade.tachiyomi.source.model.Page
 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.concurrent.TimeUnit
 import kotlinx.coroutines.flow.launchIn
@@ -93,7 +93,7 @@ class DownloadController :
             }
             .launchIn(scope)
 
-        binding.fab.offsetFabAppbarHeight(activity!!)
+        binding.fab.offsetAppbarHeight(activity!!)
 
         // Subscribe to changes
         DownloadService.runningRelay

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

@@ -35,7 +35,7 @@ import eu.kanade.tachiyomi.ui.base.controller.RootController
 import eu.kanade.tachiyomi.ui.base.controller.TabbedController
 import eu.kanade.tachiyomi.ui.base.controller.withFadeTransaction
 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.migration.MigrationController
 import eu.kanade.tachiyomi.ui.migration.manga.design.PreMigrationController
@@ -211,7 +211,7 @@ class LibraryController(
             binding.downloadedOnly.visible()
         }
 
-        binding.actionToolbar.offsetFabAppbarHeight(activity!!)
+        binding.actionToolbar.offsetAppbarHeight(activity!!)
     }
 
     override fun onChangeStarted(handler: ControllerChangeHandler, type: ControllerChangeType) {

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

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

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

@@ -24,7 +24,7 @@ import eu.kanade.tachiyomi.data.database.models.Manga
 import eu.kanade.tachiyomi.data.download.model.Download
 import eu.kanade.tachiyomi.databinding.ChaptersControllerBinding
 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.reader.ReaderActivity
 import eu.kanade.tachiyomi.util.system.getResourceColor
@@ -128,8 +128,8 @@ class ChaptersController :
 
         binding.fab.shrinkOnScroll(binding.recycler)
 
-        binding.actionToolbar.offsetFabAppbarHeight(activity!!)
-        binding.fab.offsetFabAppbarHeight(activity!!)
+        binding.actionToolbar.offsetAppbarHeight(activity!!)
+        binding.fab.offsetAppbarHeight(activity!!)
     }
 
     override fun onDestroyView(view: View) {

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

@@ -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.withFadeTransaction
 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.reader.ReaderActivity
 import eu.kanade.tachiyomi.util.system.notificationManager
@@ -112,7 +112,7 @@ class UpdatesController :
             }
             .launchIn(scope)
 
-        binding.actionToolbar.offsetFabAppbarHeight(activity!!)
+        binding.actionToolbar.offsetAppbarHeight(activity!!)
     }
 
     override fun onDestroyView(view: View) {

app/src/main/res/values/strings.xml

@@ -321,9 +321,9 @@
     <string name="pref_restore_backup">Restore backup</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_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_slots">Max automatic backups</string>
+    <string name="pref_backup_slots">Maximum backups</string>
     <string name="source_not_found">Source not found</string>
     <string name="backup_created">Backup created</string>
     <string name="restore_completed">Restore completed</string>