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

Clean up some companion object usages

Browse Source
This commit is contained in:
arkon 2021-09-05 14:34:29 -04:00
parent 02b430a5bf
commit ec4e631760
24 changed files with 87 additions and 138 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -178,8 +178,6 @@ open class App : Application(), LifecycleObserver, ImageLoaderFactory {
}
}
}
companion object {
private const val ACTION_DISABLE_INCOGNITO_MODE = "tachi.action.DISABLE_INCOGNITO_MODE"
}
}
private const val ACTION_DISABLE_INCOGNITO_MODE = "tachi.action.DISABLE_INCOGNITO_MODE"

6
app/src/main/java/eu/kanade/tachiyomi/extension/util/ExtensionInstallActivity.kt
View File

@ -45,8 +45,6 @@ class ExtensionInstallActivity : Activity() {
val extensionManager = Injekt.get<ExtensionManager>()
extensionManager.setInstallationResult(downloadId, success)
}
private companion object {
const val INSTALL_REQUEST_CODE = 500
}
}
private const val INSTALL_REQUEST_CODE = 500

8
app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/ExtensionTrustDialog.kt
View File

@ -33,13 +33,11 @@ class ExtensionTrustDialog<T>(bundle: Bundle? = null) : DialogController(bundle)
.create()
}
private companion object {
const val SIGNATURE_KEY = "signature_key"
const val PKGNAME_KEY = "pkgname_key"
}
interface Listener {
fun trustSignature(signatureHash: String)
fun uninstallExtension(pkgName: String)
}
}
private const val SIGNATURE_KEY = "signature_key"
private const val PKGNAME_KEY = "pkgname_key"

9
app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/details/ExtensionDetailsController.kt
View File

@ -235,10 +235,7 @@ class ExtensionDetailsController(bundle: Bundle? = null) :
activity!!.theme.resolveAttribute(R.attr.preferenceTheme, tv, true)
return ContextThemeWrapper(activity, tv.resourceId)
}
private companion object {
const val PKGNAME_KEY = "pkg_name"
private const val URL_EXTENSION_COMMITS = "https://github.com/tachiyomiorg/tachiyomi-extensions/commits/master"
}
}
private const val PKGNAME_KEY = "pkg_name"
private const val URL_EXTENSION_COMMITS = "https://github.com/tachiyomiorg/tachiyomi-extensions/commits/master"

8
app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/details/SourcePreferencesController.kt
View File

@ -167,9 +167,7 @@ class SourcePreferencesController(bundle: Bundle? = null) :
// [key] isn't useful since there may be duplicates
return preferenceScreen!!.getPreference(lastOpenPreferencePosition!!) as T
}
private companion object {
const val SOURCE_ID = "source_id"
const val LASTOPENPREFERENCE_KEY = "last_open_preference"
}
}
private const val SOURCE_ID = "source_id"
private const val LASTOPENPREFERENCE_KEY = "last_open_preference"

6
app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/SourceSearchController.kt
View File

@ -37,8 +37,6 @@ class SourceSearchController(
override fun onItemLongClick(position: Int) {
view?.let { super.onItemClick(it, position) }
}
private companion object {
const val MANGA_KEY = "oldManga"
}
}
private const val MANGA_KEY = "oldManga"

6
app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/globalsearch/GlobalSearchAdapter.kt
View File

@ -74,8 +74,6 @@ class GlobalSearchAdapter(val controller: GlobalSearchController) :
interface OnTitleClickListener {
fun onTitleClick(source: CatalogueSource)
}
private companion object {
const val HOLDER_BUNDLE_KEY = "holder_bundle"
}
}
private const val HOLDER_BUNDLE_KEY = "holder_bundle"

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

@ -78,8 +78,6 @@ class CategoryRenameDialog<T>(bundle: Bundle? = null) : DialogController(bundle)
interface Listener {
fun renameCategory(category: Category, name: String)
}
private companion object {
const val CATEGORY_KEY = "CategoryRenameDialog.category"
}
}
private const val CATEGORY_KEY = "CategoryRenameDialog.category"

8
app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/DownloadCustomChaptersDialog.kt
View File

@ -69,9 +69,7 @@ class DownloadCustomChaptersDialog<T> : DialogController
interface Listener {
fun downloadCustomChapters(amount: Int)
}
private companion object {
// Key to retrieve max chapters from bundle on process death.
const val KEY_ITEM_MAX = "DownloadCustomChaptersDialog.int.maxChapters"
}
}
// Key to retrieve max chapters from bundle on process death.
private const val KEY_ITEM_MAX = "DownloadCustomChaptersDialog.int.maxChapters"

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

@ -37,8 +37,6 @@ class SetChapterSettingsDialog(bundle: Bundle? = null) : DialogController(bundle
.setNegativeButton(android.R.string.cancel, null)
.create()
}
private companion object {
const val MANGA_KEY = "manga"
}
}
private const val MANGA_KEY = "manga"

6
app/src/main/java/eu/kanade/tachiyomi/ui/manga/track/SetTrackChaptersDialog.kt
View File

@ -65,8 +65,6 @@ class SetTrackChaptersDialog<T> : DialogController
interface Listener {
fun setChaptersRead(item: TrackItem, chaptersRead: Int)
}
private companion object {
const val KEY_ITEM_TRACK = "SetTrackChaptersDialog.item.track"
}
}
private const val KEY_ITEM_TRACK = "SetTrackChaptersDialog.item.track"

6
app/src/main/java/eu/kanade/tachiyomi/ui/manga/track/SetTrackScoreDialog.kt
View File

@ -65,8 +65,6 @@ class SetTrackScoreDialog<T> : DialogController
interface Listener {
fun setScore(item: TrackItem, score: Int)
}
private companion object {
const val KEY_ITEM_TRACK = "SetTrackScoreDialog.item.track"
}
}
private const val KEY_ITEM_TRACK = "SetTrackScoreDialog.item.track"

6
app/src/main/java/eu/kanade/tachiyomi/ui/manga/track/SetTrackStatusDialog.kt
View File

@ -54,8 +54,6 @@ class SetTrackStatusDialog<T> : DialogController
interface Listener {
fun setStatus(item: TrackItem, selection: Int)
}
private companion object {
const val KEY_ITEM_TRACK = "SetTrackStatusDialog.item.track"
}
}
private const val KEY_ITEM_TRACK = "SetTrackStatusDialog.item.track"

8
app/src/main/java/eu/kanade/tachiyomi/ui/manga/track/TrackSearchDialog.kt
View File

@ -189,9 +189,7 @@ class TrackSearchDialog : DialogController {
binding.message.text = message ?: binding.message.context.getString(R.string.unknown_error)
adapter?.items = emptyList()
}
private companion object {
const val KEY_SERVICE = "service_id"
const val KEY_CURRENT_URL = "current_url"
}
}
private const val KEY_SERVICE = "service_id"
private const val KEY_CURRENT_URL = "current_url"

6
app/src/main/java/eu/kanade/tachiyomi/ui/manga/track/TrackSheet.kt
View File

@ -226,8 +226,6 @@ class TrackSheet(
fun getSearchDialog(): TrackSearchDialog? {
return controller.router.getControllerWithTag(TAG_SEARCH_CONTROLLER) as? TrackSearchDialog
}
private companion object {
const val TAG_SEARCH_CONTROLLER = "track_search_controller"
}
}
private const val TAG_SEARCH_CONTROLLER = "track_search_controller"

8
app/src/main/java/eu/kanade/tachiyomi/ui/more/NewUpdateDialogController.kt
View File

@ -30,9 +30,7 @@ class NewUpdateDialogController(bundle: Bundle? = null) : DialogController(bundl
.setNegativeButton(R.string.update_check_ignore, null)
.create()
}
private companion object {
const val BODY_KEY = "NewUpdateDialogController.body"
const val URL_KEY = "NewUpdateDialogController.key"
}
}
private const val BODY_KEY = "NewUpdateDialogController.body"
private const val URL_KEY = "NewUpdateDialogController.key"

20
app/src/main/java/eu/kanade/tachiyomi/ui/reader/PageIndicatorTextView.kt
View File

@ -40,15 +40,13 @@ class PageIndicatorTextView(
super.setText(finalText, BufferType.SPANNABLE)
}
private companion object {
private val fillColor = Color.rgb(235, 235, 235)
private val strokeColor = Color.rgb(45, 45, 45)
// A span object with text outlining properties
val spanOutline = OutlineSpan(
strokeColor = strokeColor,
strokeWidth = 4f
)
}
}
private val fillColor = Color.rgb(235, 235, 235)
private val strokeColor = Color.rgb(45, 45, 45)
// A span object with text outlining properties
private val spanOutline = OutlineSpan(
strokeColor = strokeColor,
strokeWidth = 4f
)

26
app/src/main/java/eu/kanade/tachiyomi/ui/reader/setting/ReaderColorFilterSettings.kt
View File

@ -219,18 +219,16 @@ class ReaderColorFilterSettings @JvmOverloads constructor(context: Context, attr
val updatedColor = (color shl bitShift) or (currentColor and mask.inv().toInt())
preferences.colorFilterValue().set(updatedColor)
}
private companion object {
/** Integer mask of alpha value **/
const val ALPHA_MASK: Long = 0xFF000000
/** Integer mask of red value **/
const val RED_MASK: Long = 0x00FF0000
/** Integer mask of green value **/
const val GREEN_MASK: Long = 0x0000FF00
/** Integer mask of blue value **/
const val BLUE_MASK: Long = 0x000000FF
}
}
/** Integer mask of alpha value **/
private const val ALPHA_MASK: Long = 0xFF000000
/** Integer mask of red value **/
private const val RED_MASK: Long = 0x00FF0000
/** Integer mask of green value **/
private const val GREEN_MASK: Long = 0x0000FF00
/** Integer mask of blue value **/
private const val BLUE_MASK: Long = 0x000000FF

22
app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonAdapter.kt
View File

@ -183,16 +183,14 @@ class WebtoonAdapter(val viewer: WebtoonViewer) : RecyclerView.Adapter<RecyclerV
return newItems.size
}
}
private companion object {
/**
* View holder type of a chapter page view.
*/
const val PAGE_VIEW = 0
/**
* View holder type of a chapter transition view.
*/
const val TRANSITION_VIEW = 1
}
}
/**
* View holder type of a chapter page view.
*/
private const val PAGE_VIEW = 0
/**
* View holder type of a chapter transition view.
*/
private const val TRANSITION_VIEW = 1

12
app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonRecyclerView.kt
View File

@ -314,11 +314,9 @@ open class WebtoonRecyclerView @JvmOverloads constructor(
return super.onTouchEvent(ev)
}
}
private companion object {
const val ANIMATOR_DURATION_TIME = 200
const val MIN_RATE = 0.5f
const val DEFAULT_RATE = 1f
const val MAX_SCALE_RATE = 3f
}
}
private const val ANIMATOR_DURATION_TIME = 200
private const val MIN_RATE = 0.5f
private const val DEFAULT_RATE = 1f
private const val MAX_SCALE_RATE = 3f

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

@ -243,8 +243,6 @@ class SettingsAdvancedController : SettingsController() {
db.deleteHistoryNoLastRead().executeAsBlocking()
activity?.toast(R.string.clear_database_completed)
}
private companion object {
const val CLEAR_CACHE_KEY = "pref_clear_cache_key"
}
}
private const val CLEAR_CACHE_KEY = "pref_clear_cache_key"

18
app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsBackupController.kt
View File

@ -329,16 +329,12 @@ class SettingsBackupController : SettingsController() {
.create()
}
}
private companion object {
const val KEY_URI = "RestoreBackupDialog.uri"
const val KEY_TYPE = "RestoreBackupDialog.type"
}
}
private companion object {
const val CODE_BACKUP_DIR = 503
const val CODE_BACKUP_CREATE = 504
const val CODE_BACKUP_RESTORE = 505
}
}
private const val KEY_URI = "RestoreBackupDialog.uri"
private const val KEY_TYPE = "RestoreBackupDialog.type"
private const val CODE_BACKUP_DIR = 503
private const val CODE_BACKUP_CREATE = 504
private const val CODE_BACKUP_RESTORE = 505

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

@ -269,8 +269,6 @@ class SettingsDownloadController : SettingsController() {
.create()
}
}
private companion object {
const val DOWNLOAD_DIR = 104
}
}
private const val DOWNLOAD_DIR = 104

6
app/src/main/java/eu/kanade/tachiyomi/ui/setting/search/SettingsSearchAdapter.kt
View File

@ -77,8 +77,6 @@ class SettingsSearchAdapter(val controller: SettingsSearchController) :
interface OnTitleClickListener {
fun onTitleClick(ctrl: SettingsController)
}
private companion object {
const val HOLDER_BUNDLE_KEY = "holder_bundle"
}
}
private const val HOLDER_BUNDLE_KEY = "holder_bundle"