From a321e9bfa5743a1431cacfb1977eda636409cfd7 Mon Sep 17 00:00:00 2001 From: LooKeR Date: Tue, 16 Nov 2021 01:12:52 +0530 Subject: [PATCH] Improve: Android Studio's Reformat --- README.md | 1 + .../com/looker/droidify/MainApplication.kt | 3 ++- .../com/looker/droidify/content/Cache.kt | 4 +-- .../looker/droidify/database/CursorOwner.kt | 8 +++--- .../com/looker/droidify/database/Database.kt | 6 ++--- .../droidify/database/ObservableCursor.kt | 7 ++--- .../looker/droidify/entity/InstalledItem.kt | 2 +- .../com/looker/droidify/entity/Product.kt | 4 +-- .../com/looker/droidify/entity/ProductItem.kt | 2 +- .../com/looker/droidify/entity/Release.kt | 2 +- .../com/looker/droidify/entity/Repository.kt | 8 +++--- .../com/looker/droidify/index/IndexHandler.kt | 4 +-- .../looker/droidify/index/IndexV1Parser.kt | 10 +++---- .../droidify/index/RepositoryUpdater.kt | 18 ++++++------- .../looker/droidify/network/CoilDownloader.kt | 6 ++--- .../com/looker/droidify/network/Downloader.kt | 2 +- .../looker/droidify/screen/MessageDialog.kt | 2 +- .../droidify/screen/RepositoriesAdapter.kt | 4 +-- .../droidify/screen/RepositoriesFragment.kt | 2 +- .../looker/droidify/screen/ScreenActivity.kt | 2 +- .../droidify/screen/ScreenshotsFragment.kt | 4 +-- .../looker/droidify/screen/TabsFragment.kt | 10 +++---- .../com/looker/droidify/service/Connection.kt | 2 +- .../droidify/service/DownloadService.kt | 4 +-- .../looker/droidify/service/SyncService.kt | 4 +-- .../droidify/ui/appsList/AppListAdapter.kt | 2 +- .../droidify/utility/PackageItemResolver.kt | 27 ++++++++++++------- .../droidify/utility/ProgressInputStream.kt | 2 +- .../com/looker/droidify/utility/RxUtils.kt | 2 +- .../looker/droidify/utility/extension/Json.kt | 2 +- .../droidify/widget/DividerItemDecoration.kt | 11 ++++---- .../droidify/widget/RecyclerFastScroller.kt | 4 +-- 32 files changed, 91 insertions(+), 80 deletions(-) diff --git a/README.md b/README.md index 7719830e..351836f2 100644 --- a/README.md +++ b/README.md @@ -58,6 +58,7 @@ Run `./gradlew assembleRelease` to build the package, which can be installed usi package manager. ## :scroll: License + Licensed GPLv3+. \ Direct Adaptation/Modification of [Foxy-Droid](https://github.com/kitsunyan/foxy-droid/) \ Copyright © 2020–2021 Iamlooker and contributors. diff --git a/src/main/kotlin/com/looker/droidify/MainApplication.kt b/src/main/kotlin/com/looker/droidify/MainApplication.kt index 0587011b..786d485a 100644 --- a/src/main/kotlin/com/looker/droidify/MainApplication.kt +++ b/src/main/kotlin/com/looker/droidify/MainApplication.kt @@ -53,7 +53,8 @@ class MainApplication : Application(), ImageLoaderFactory { if (packageName != null) { when (intent.action.orEmpty()) { Intent.ACTION_PACKAGE_ADDED, - Intent.ACTION_PACKAGE_REMOVED -> { + Intent.ACTION_PACKAGE_REMOVED, + -> { val packageInfo = try { packageManager.getPackageInfo( packageName, diff --git a/src/main/kotlin/com/looker/droidify/content/Cache.kt b/src/main/kotlin/com/looker/droidify/content/Cache.kt index cb4ee581..c2ecc86f 100644 --- a/src/main/kotlin/com/looker/droidify/content/Cache.kt +++ b/src/main/kotlin/com/looker/droidify/content/Cache.kt @@ -155,7 +155,7 @@ object Cache { override fun query( uri: Uri, projection: Array?, - selection: String?, selectionArgs: Array?, sortOrder: String? + selection: String?, selectionArgs: Array?, sortOrder: String?, ): Cursor { val file = getFileAndTypeForUri(uri).first val columns = (projection ?: defaultColumns).mapNotNull { @@ -179,7 +179,7 @@ object Cache { override fun update( uri: Uri, contentValues: ContentValues?, - selection: String?, selectionArgs: Array? + selection: String?, selectionArgs: Array?, ): Int = unsupported override fun openFile(uri: Uri, mode: String): ParcelFileDescriptor? { diff --git a/src/main/kotlin/com/looker/droidify/database/CursorOwner.kt b/src/main/kotlin/com/looker/droidify/database/CursorOwner.kt index b1e47842..24928f8e 100644 --- a/src/main/kotlin/com/looker/droidify/database/CursorOwner.kt +++ b/src/main/kotlin/com/looker/droidify/database/CursorOwner.kt @@ -13,7 +13,7 @@ class CursorOwner : Fragment(), LoaderManager.LoaderCallbacks { data class ProductsAvailable( val searchQuery: String, val section: ProductItem.Section, - val order: ProductItem.Order + val order: ProductItem.Order, ) : Request() { override val id: Int get() = 1 @@ -21,7 +21,7 @@ class CursorOwner : Fragment(), LoaderManager.LoaderCallbacks { data class ProductsInstalled( val searchQuery: String, val section: ProductItem.Section, - val order: ProductItem.Order + val order: ProductItem.Order, ) : Request() { override val id: Int get() = 2 @@ -29,7 +29,7 @@ class CursorOwner : Fragment(), LoaderManager.LoaderCallbacks { data class ProductsUpdates( val searchQuery: String, val section: ProductItem.Section, - val order: ProductItem.Order + val order: ProductItem.Order, ) : Request() { override val id: Int get() = 3 @@ -48,7 +48,7 @@ class CursorOwner : Fragment(), LoaderManager.LoaderCallbacks { private data class ActiveRequest( val request: Request, val callback: Callback?, - val cursor: Cursor? + val cursor: Cursor?, ) init { diff --git a/src/main/kotlin/com/looker/droidify/database/Database.kt b/src/main/kotlin/com/looker/droidify/database/Database.kt index 61aef765..68f0f965 100644 --- a/src/main/kotlin/com/looker/droidify/database/Database.kt +++ b/src/main/kotlin/com/looker/droidify/database/Database.kt @@ -308,7 +308,7 @@ object Database { private fun SQLiteDatabase.insertOrReplace( replace: Boolean, table: String, - contentValues: ContentValues + contentValues: ContentValues, ): Long { return if (replace) replace(table, null, contentValues) else insert( table, @@ -320,7 +320,7 @@ object Database { private fun SQLiteDatabase.query( table: String, columns: Array? = null, selection: Pair>? = null, orderBy: String? = null, - signal: CancellationSignal? = null + signal: CancellationSignal? = null, ): Cursor { return query( false, @@ -501,7 +501,7 @@ object Database { // Complex left to wiring phase fun query( installed: Boolean, updates: Boolean, searchQuery: String, - section: ProductItem.Section, order: ProductItem.Order, signal: CancellationSignal? + section: ProductItem.Section, order: ProductItem.Order, signal: CancellationSignal?, ): Cursor { val builder = QueryBuilder() diff --git a/src/main/kotlin/com/looker/droidify/database/ObservableCursor.kt b/src/main/kotlin/com/looker/droidify/database/ObservableCursor.kt index 67d55987..3ada2be4 100644 --- a/src/main/kotlin/com/looker/droidify/database/ObservableCursor.kt +++ b/src/main/kotlin/com/looker/droidify/database/ObservableCursor.kt @@ -6,10 +6,11 @@ import android.database.Cursor import android.database.CursorWrapper class ObservableCursor( - cursor: Cursor, private val observable: ( + cursor: Cursor, + private val observable: ( register: Boolean, - observer: () -> Unit - ) -> Unit + observer: () -> Unit, + ) -> Unit, ) : CursorWrapper(cursor) { private var registered = false private val contentObservable = ContentObservable() diff --git a/src/main/kotlin/com/looker/droidify/entity/InstalledItem.kt b/src/main/kotlin/com/looker/droidify/entity/InstalledItem.kt index a74d0668..3e9ecd1a 100644 --- a/src/main/kotlin/com/looker/droidify/entity/InstalledItem.kt +++ b/src/main/kotlin/com/looker/droidify/entity/InstalledItem.kt @@ -5,5 +5,5 @@ class InstalledItem( val packageName: String, val version: String, val versionCode: Long, - val signature: String + val signature: String, ) diff --git a/src/main/kotlin/com/looker/droidify/entity/Product.kt b/src/main/kotlin/com/looker/droidify/entity/Product.kt index 6000f1b6..e59453b3 100644 --- a/src/main/kotlin/com/looker/droidify/entity/Product.kt +++ b/src/main/kotlin/com/looker/droidify/entity/Product.kt @@ -28,7 +28,7 @@ data class Product( val licenses: List, val donates: List, val screenshots: List, - val releases: List + val releases: List, ) { data class Author(val name: String, val email: String, val web: String) @@ -163,7 +163,7 @@ data class Product( fun findSuggested( products: List, installedItem: InstalledItem?, - extract: (T) -> Product + extract: (T) -> Product, ): T? { return products.maxWithOrNull(compareBy({ extract(it).compatible && diff --git a/src/main/kotlin/com/looker/droidify/entity/ProductItem.kt b/src/main/kotlin/com/looker/droidify/entity/ProductItem.kt index a2361380..e23cf514 100644 --- a/src/main/kotlin/com/looker/droidify/entity/ProductItem.kt +++ b/src/main/kotlin/com/looker/droidify/entity/ProductItem.kt @@ -10,7 +10,7 @@ import com.looker.droidify.utility.extension.json.forEachKey data class ProductItem( var repositoryId: Long, var packageName: String, var name: String, var summary: String, val icon: String, val metadataIcon: String, val version: String, var installedVersion: String, - var compatible: Boolean, var canUpdate: Boolean, var matchRank: Int + var compatible: Boolean, var canUpdate: Boolean, var matchRank: Int, ) { sealed class Section : KParcelable { object All : Section() { diff --git a/src/main/kotlin/com/looker/droidify/entity/Release.kt b/src/main/kotlin/com/looker/droidify/entity/Release.kt index 3db89f1c..5eb8e628 100644 --- a/src/main/kotlin/com/looker/droidify/entity/Release.kt +++ b/src/main/kotlin/com/looker/droidify/entity/Release.kt @@ -29,7 +29,7 @@ data class Release( val permissions: List, val features: List, val platforms: List, - val incompatibilities: List + val incompatibilities: List, ) { sealed class Incompatibility { object MinSdk : Incompatibility() diff --git a/src/main/kotlin/com/looker/droidify/entity/Repository.kt b/src/main/kotlin/com/looker/droidify/entity/Repository.kt index 62f9280d..1f67d7e0 100644 --- a/src/main/kotlin/com/looker/droidify/entity/Repository.kt +++ b/src/main/kotlin/com/looker/droidify/entity/Repository.kt @@ -11,7 +11,7 @@ data class Repository( var id: Long, val address: String, val mirrors: List, val name: String, val description: String, val version: Int, val enabled: Boolean, val fingerprint: String, val lastModified: String, val entityTag: String, - val updated: Long, val timestamp: Long, val authentication: String + val updated: Long, val timestamp: Long, val authentication: String, ) { fun edit(address: String, fingerprint: String, authentication: String): Repository { val addressChanged = this.address != address @@ -28,7 +28,7 @@ data class Repository( fun update( mirrors: List, name: String, description: String, version: Int, - lastModified: String, entityTag: String, timestamp: Long + lastModified: String, entityTag: String, timestamp: Long, ): Repository { return copy( mirrors = mirrors, name = name, description = description, @@ -100,7 +100,7 @@ data class Repository( fun newRepository( address: String, fingerprint: String, - authentication: String + authentication: String, ): Repository { val name = try { URL(address).let { "${it.host}${it.path}" } @@ -112,7 +112,7 @@ data class Repository( private fun defaultRepository( address: String, name: String, description: String, - version: Int, enabled: Boolean, fingerprint: String, authentication: String + version: Int, enabled: Boolean, fingerprint: String, authentication: String, ): Repository { return Repository( -1, address, emptyList(), name, description, version, enabled, diff --git a/src/main/kotlin/com/looker/droidify/index/IndexHandler.kt b/src/main/kotlin/com/looker/droidify/index/IndexHandler.kt index e0cd0770..14c40020 100644 --- a/src/main/kotlin/com/looker/droidify/index/IndexHandler.kt +++ b/src/main/kotlin/com/looker/droidify/index/IndexHandler.kt @@ -30,7 +30,7 @@ class IndexHandler(private val repositoryId: Long, private val callback: Callbac interface Callback { fun onRepository( mirrors: List, name: String, description: String, - certificate: String, version: Int, timestamp: Long + certificate: String, version: Int, timestamp: Long, ) fun onProduct(product: Product) @@ -181,7 +181,7 @@ class IndexHandler(private val repositoryId: Long, private val callback: Callbac uri: String, localName: String, qName: String, - attributes: Attributes + attributes: Attributes, ) { super.startElement(uri, localName, qName, attributes) diff --git a/src/main/kotlin/com/looker/droidify/index/IndexV1Parser.kt b/src/main/kotlin/com/looker/droidify/index/IndexV1Parser.kt index 68705c83..0d718a63 100644 --- a/src/main/kotlin/com/looker/droidify/index/IndexV1Parser.kt +++ b/src/main/kotlin/com/looker/droidify/index/IndexV1Parser.kt @@ -16,7 +16,7 @@ object IndexV1Parser { name: String, description: String, version: Int, - timestamp: Long + timestamp: Long, ) fun onProduct(product: Product) @@ -26,17 +26,17 @@ object IndexV1Parser { private class Screenshots( val phone: List, val smallTablet: List, - val largeTablet: List + val largeTablet: List, ) private class Localized( val name: String, val summary: String, val description: String, - val whatsNew: String, val metadataIcon: String, val screenshots: Screenshots? + val whatsNew: String, val metadataIcon: String, val screenshots: Screenshots?, ) private fun Map.getAndCall( key: String, - callback: (String, Localized) -> T? + callback: (String, Localized) -> T?, ): T? { return this[key]?.let { callback(key, it) } } @@ -50,7 +50,7 @@ object IndexV1Parser { private fun Map.findString( fallback: String, - callback: (Localized) -> String + callback: (Localized) -> String, ): String { return (find { _, localized -> callback(localized).nullIfEmpty() } ?: fallback).trim() } diff --git a/src/main/kotlin/com/looker/droidify/index/RepositoryUpdater.kt b/src/main/kotlin/com/looker/droidify/index/RepositoryUpdater.kt index 20e63893..cc003092 100644 --- a/src/main/kotlin/com/looker/droidify/index/RepositoryUpdater.kt +++ b/src/main/kotlin/com/looker/droidify/index/RepositoryUpdater.kt @@ -32,7 +32,7 @@ object RepositoryUpdater { private enum class IndexType( val jarName: String, val contentName: String, - val certificateFromIndex: Boolean + val certificateFromIndex: Boolean, ) { INDEX("index.jar", "index.xml", true), INDEX_V1("index-v1.jar", "index-v1.json", false) @@ -93,7 +93,7 @@ object RepositoryUpdater { fun update( context: Context, repository: Repository, unstable: Boolean, - callback: (Stage, Long, Long?) -> Unit + callback: (Stage, Long, Long?) -> Unit, ): Single { return update( context, @@ -107,7 +107,7 @@ object RepositoryUpdater { private fun update( context: Context, repository: Repository, indexTypes: List, unstable: Boolean, - callback: (Stage, Long, Long?) -> Unit + callback: (Stage, Long, Long?) -> Unit, ): Single { val indexType = indexTypes[0] return downloadIndex(context, repository, indexType, callback) @@ -152,7 +152,7 @@ object RepositoryUpdater { private fun downloadIndex( context: Context, repository: Repository, indexType: IndexType, - callback: (Stage, Long, Long?) -> Unit + callback: (Stage, Long, Long?) -> Unit, ): Single> { return Single.just(Unit) .map { Cache.getTemporaryFile(context) } @@ -190,7 +190,7 @@ object RepositoryUpdater { private fun processFile( context: Context, repository: Repository, indexType: IndexType, unstable: Boolean, - file: File, lastModified: String, entityTag: String, callback: (Stage, Long, Long?) -> Unit + file: File, lastModified: String, entityTag: String, callback: (Stage, Long, Long?) -> Unit, ): Boolean { var rollback = true return synchronized(updaterLock) { @@ -216,7 +216,7 @@ object RepositoryUpdater { IndexHandler(repository.id, object : IndexHandler.Callback { override fun onRepository( mirrors: List, name: String, description: String, - certificate: String, version: Int, timestamp: Long + certificate: String, version: Int, timestamp: Long, ) { changedRepository = repository.update( mirrors, name, description, version, @@ -278,7 +278,7 @@ object RepositoryUpdater { name: String, description: String, version: Int, - timestamp: Long + timestamp: Long, ) { changedRepository = repository.update( mirrors, name, description, version, @@ -299,7 +299,7 @@ object RepositoryUpdater { override fun onReleases( packageName: String, - releases: List + releases: List, ) { if (Thread.interrupted()) { throw InterruptedException() @@ -432,7 +432,7 @@ object RepositoryUpdater { private fun transformProduct( product: Product, features: Set, - unstable: Boolean + unstable: Boolean, ): Product { val releasePairs = product.releases.distinctBy { it.identifier }.sortedByDescending { it.versionCode } diff --git a/src/main/kotlin/com/looker/droidify/network/CoilDownloader.kt b/src/main/kotlin/com/looker/droidify/network/CoilDownloader.kt index 1b15de12..fe4a971c 100644 --- a/src/main/kotlin/com/looker/droidify/network/CoilDownloader.kt +++ b/src/main/kotlin/com/looker/droidify/network/CoilDownloader.kt @@ -92,7 +92,7 @@ object CoilDownloader { fun createScreenshotUri( repository: Repository, packageName: String, - screenshot: Product.Screenshot + screenshot: Product.Screenshot, ): Uri { return Uri.Builder().scheme("https").authority(HOST_SCREENSHOT) .appendQueryParameter(QUERY_ADDRESS, repository.address) @@ -115,7 +115,7 @@ object CoilDownloader { packageName: String, icon: String, metadataIcon: String, - repository: Repository + repository: Repository, ): Uri { val size = (view.layoutParams.let { min(it.width, it.height) } / view.resources.displayMetrics.density).roundToInt() @@ -124,7 +124,7 @@ object CoilDownloader { private fun createIconUri( context: Context, packageName: String, icon: String, metadataIcon: String, - targetSizeDp: Int, repository: Repository + targetSizeDp: Int, repository: Repository, ): Uri { return Uri.Builder().scheme("https").authority(HOST_ICON) .appendQueryParameter(QUERY_ADDRESS, repository.address) diff --git a/src/main/kotlin/com/looker/droidify/network/Downloader.kt b/src/main/kotlin/com/looker/droidify/network/Downloader.kt index d40bc3d7..0ebec415 100644 --- a/src/main/kotlin/com/looker/droidify/network/Downloader.kt +++ b/src/main/kotlin/com/looker/droidify/network/Downloader.kt @@ -68,7 +68,7 @@ object Downloader { fun download( url: String, target: File, lastModified: String, entityTag: String, authentication: String, - callback: ((read: Long, total: Long?) -> Unit)? + callback: ((read: Long, total: Long?) -> Unit)?, ): Single { val start = if (target.exists()) target.length().let { if (it > 0L) it else null } else null val request = Request.Builder().url(url) diff --git a/src/main/kotlin/com/looker/droidify/screen/MessageDialog.kt b/src/main/kotlin/com/looker/droidify/screen/MessageDialog.kt index 4225788d..933f1e05 100644 --- a/src/main/kotlin/com/looker/droidify/screen/MessageDialog.kt +++ b/src/main/kotlin/com/looker/droidify/screen/MessageDialog.kt @@ -68,7 +68,7 @@ class MessageDialog() : DialogFragment() { class ReleaseIncompatible( val incompatibilities: List, - val platforms: List, val minSdkVersion: Int, val maxSdkVersion: Int + val platforms: List, val minSdkVersion: Int, val maxSdkVersion: Int, ) : Message() { override fun writeToParcel(dest: Parcel, flags: Int) { dest.writeInt(incompatibilities.size) diff --git a/src/main/kotlin/com/looker/droidify/screen/RepositoriesAdapter.kt b/src/main/kotlin/com/looker/droidify/screen/RepositoriesAdapter.kt index 245b6f58..66663d44 100644 --- a/src/main/kotlin/com/looker/droidify/screen/RepositoriesAdapter.kt +++ b/src/main/kotlin/com/looker/droidify/screen/RepositoriesAdapter.kt @@ -13,7 +13,7 @@ import com.looker.droidify.widget.CursorRecyclerAdapter class RepositoriesAdapter( private val onClick: (Repository) -> Unit, - private val onSwitch: (repository: Repository, isEnabled: Boolean) -> Boolean + private val onSwitch: (repository: Repository, isEnabled: Boolean) -> Boolean, ) : CursorRecyclerAdapter() { enum class ViewType { REPOSITORY } @@ -38,7 +38,7 @@ class RepositoriesAdapter( override fun onCreateViewHolder( parent: ViewGroup, - viewType: ViewType + viewType: ViewType, ): RecyclerView.ViewHolder { return ViewHolder(parent.inflate(R.layout.repository_item)).apply { itemView.setOnClickListener { onClick(getRepository(adapterPosition)) } diff --git a/src/main/kotlin/com/looker/droidify/screen/RepositoriesFragment.kt b/src/main/kotlin/com/looker/droidify/screen/RepositoriesFragment.kt index 8054893a..2a5146d5 100644 --- a/src/main/kotlin/com/looker/droidify/screen/RepositoriesFragment.kt +++ b/src/main/kotlin/com/looker/droidify/screen/RepositoriesFragment.kt @@ -22,7 +22,7 @@ class RepositoriesFragment : ScreenFragment(), CursorOwner.Callback { override fun onCreateView( inflater: LayoutInflater, container: ViewGroup?, - savedInstanceState: Bundle? + savedInstanceState: Bundle?, ): View { val view = fragmentBinding.root.apply { val content = fragmentBinding.fragmentContent diff --git a/src/main/kotlin/com/looker/droidify/screen/ScreenActivity.kt b/src/main/kotlin/com/looker/droidify/screen/ScreenActivity.kt index 518bb288..9032277e 100644 --- a/src/main/kotlin/com/looker/droidify/screen/ScreenActivity.kt +++ b/src/main/kotlin/com/looker/droidify/screen/ScreenActivity.kt @@ -32,7 +32,7 @@ abstract class ScreenActivity : AppCompatActivity() { private class FragmentStackItem( val className: String, val arguments: Bundle?, - val savedState: Fragment.SavedState? + val savedState: Fragment.SavedState?, ) : KParcelable { override fun writeToParcel(dest: Parcel, flags: Int) { dest.writeString(className) diff --git a/src/main/kotlin/com/looker/droidify/screen/ScreenshotsFragment.kt b/src/main/kotlin/com/looker/droidify/screen/ScreenshotsFragment.kt index b3d31eab..e921a28c 100644 --- a/src/main/kotlin/com/looker/droidify/screen/ScreenshotsFragment.kt +++ b/src/main/kotlin/com/looker/droidify/screen/ScreenshotsFragment.kt @@ -211,7 +211,7 @@ class ScreenshotsFragment() : DialogFragment() { fun update( viewPager: ViewPager2, repository: Repository?, - screenshots: List + screenshots: List, ) { this.repository = repository this.screenshots = screenshots @@ -239,7 +239,7 @@ class ScreenshotsFragment() : DialogFragment() { override fun onCreateViewHolder( parent: ViewGroup, - viewType: ViewType + viewType: ViewType, ): RecyclerView.ViewHolder { return ViewHolder(parent.context).apply { itemView.setOnClickListener { onClick() } diff --git a/src/main/kotlin/com/looker/droidify/screen/TabsFragment.kt b/src/main/kotlin/com/looker/droidify/screen/TabsFragment.kt index 2415daaf..c7626a56 100644 --- a/src/main/kotlin/com/looker/droidify/screen/TabsFragment.kt +++ b/src/main/kotlin/com/looker/droidify/screen/TabsFragment.kt @@ -402,7 +402,7 @@ class TabsFragment : ScreenFragment() { private fun setSectionsAndUpdate( categories: List?, - repositories: List? + repositories: List?, ) { val oldCategories = collectOldSections(categories) val oldRepositories = collectOldSections(repositories) @@ -468,7 +468,7 @@ class TabsFragment : ScreenFragment() { override fun onPageScrolled( position: Int, positionOffset: Float, - positionOffsetPixels: Int + positionOffsetPixels: Int, ) { val layout = layout!! val fromSections = AppListFragment.Source.values()[position].sections @@ -520,7 +520,7 @@ class TabsFragment : ScreenFragment() { private class SectionsAdapter( private val sections: () -> List, - private val onClick: (ProductItem.Section) -> Unit + private val onClick: (ProductItem.Section) -> Unit, ) : StableRecyclerAdapter() { enum class ViewType { SECTION } @@ -546,7 +546,7 @@ class TabsFragment : ScreenFragment() { fun configureDivider( context: Context, position: Int, - configuration: DividerItemDecoration.Configuration + configuration: DividerItemDecoration.Configuration, ) { val currentSection = sections()[position] val nextSection = sections().getOrNull(position + 1) @@ -580,7 +580,7 @@ class TabsFragment : ScreenFragment() { override fun onCreateViewHolder( parent: ViewGroup, - viewType: ViewType + viewType: ViewType, ): RecyclerView.ViewHolder { return SectionViewHolder(parent.context).apply { itemView.setOnClickListener { onClick(sections()[adapterPosition]) } diff --git a/src/main/kotlin/com/looker/droidify/service/Connection.kt b/src/main/kotlin/com/looker/droidify/service/Connection.kt index 9865e2d5..cd67c3a4 100644 --- a/src/main/kotlin/com/looker/droidify/service/Connection.kt +++ b/src/main/kotlin/com/looker/droidify/service/Connection.kt @@ -9,7 +9,7 @@ import android.os.IBinder class Connection>( private val serviceClass: Class, private val onBind: ((Connection, B) -> Unit)? = null, - private val onUnbind: ((Connection, B) -> Unit)? = null + private val onUnbind: ((Connection, B) -> Unit)? = null, ) : ServiceConnection { var binder: B? = null private set diff --git a/src/main/kotlin/com/looker/droidify/service/DownloadService.kt b/src/main/kotlin/com/looker/droidify/service/DownloadService.kt index f9dd05c0..12f6be96 100644 --- a/src/main/kotlin/com/looker/droidify/service/DownloadService.kt +++ b/src/main/kotlin/com/looker/droidify/service/DownloadService.kt @@ -78,7 +78,7 @@ class DownloadService : ConnectionService() { class Success( packageName: String, name: String, val release: Release, - val consume: () -> Unit + val consume: () -> Unit, ) : State(packageName, name) class Error(packageName: String, name: String) : State(packageName, name) @@ -89,7 +89,7 @@ class DownloadService : ConnectionService() { private class Task( val packageName: String, val name: String, val release: Release, - val url: String, val authentication: String + val url: String, val authentication: String, ) { val notificationTag: String get() = "download-$packageName" diff --git a/src/main/kotlin/com/looker/droidify/service/SyncService.kt b/src/main/kotlin/com/looker/droidify/service/SyncService.kt index 2306107d..82592c7e 100644 --- a/src/main/kotlin/com/looker/droidify/service/SyncService.kt +++ b/src/main/kotlin/com/looker/droidify/service/SyncService.kt @@ -49,7 +49,7 @@ class SyncService : ConnectionService() { data class Connecting(val name: String) : State() data class Syncing( val name: String, val stage: RepositoryUpdater.Stage, - val read: Long, val total: Long? + val read: Long, val total: Long?, ) : State() object Finishing : State() @@ -58,7 +58,7 @@ class SyncService : ConnectionService() { private class Task(val repositoryId: Long, val manual: Boolean) private data class CurrentTask( val task: Task?, val disposable: Disposable, - val hasUpdates: Boolean, val lastState: State + val hasUpdates: Boolean, val lastState: State, ) private enum class Started { NO, AUTO, MANUAL } diff --git a/src/main/kotlin/com/looker/droidify/ui/appsList/AppListAdapter.kt b/src/main/kotlin/com/looker/droidify/ui/appsList/AppListAdapter.kt index 1ee0e413..d7911d2c 100644 --- a/src/main/kotlin/com/looker/droidify/ui/appsList/AppListAdapter.kt +++ b/src/main/kotlin/com/looker/droidify/ui/appsList/AppListAdapter.kt @@ -118,7 +118,7 @@ class AppListAdapter(private val onClick: (ProductItem) -> Unit) : override fun onCreateViewHolder( parent: ViewGroup, - viewType: ViewType + viewType: ViewType, ): RecyclerView.ViewHolder { return when (viewType) { ViewType.PRODUCT -> ProductViewHolder(parent.inflate(R.layout.product_item)).apply { diff --git a/src/main/kotlin/com/looker/droidify/utility/PackageItemResolver.kt b/src/main/kotlin/com/looker/droidify/utility/PackageItemResolver.kt index 67692594..f0451949 100644 --- a/src/main/kotlin/com/looker/droidify/utility/PackageItemResolver.kt +++ b/src/main/kotlin/com/looker/droidify/utility/PackageItemResolver.kt @@ -18,7 +18,7 @@ object PackageItemResolver { private fun load( context: Context, localCache: LocalCache, packageName: String, - nonLocalized: CharSequence?, resId: Int + nonLocalized: CharSequence?, resId: Int, ): CharSequence? { return when { nonLocalized != null -> { @@ -63,7 +63,7 @@ object PackageItemResolver { fun loadLabel( context: Context, localCache: LocalCache, - packageItemInfo: PackageItemInfo + packageItemInfo: PackageItemInfo, ): CharSequence? { return load( context, localCache, packageItemInfo.packageName, @@ -74,7 +74,7 @@ object PackageItemResolver { fun loadDescription( context: Context, localCache: LocalCache, - permissionInfo: PermissionInfo + permissionInfo: PermissionInfo, ): CharSequence? { return load( context, localCache, permissionInfo.packageName, @@ -88,29 +88,35 @@ object PackageItemResolver { when (permissionInfo.name) { android.Manifest.permission.READ_CONTACTS, android.Manifest.permission.WRITE_CONTACTS, - android.Manifest.permission.GET_ACCOUNTS -> + android.Manifest.permission.GET_ACCOUNTS, + -> android.Manifest.permission_group.CONTACTS android.Manifest.permission.READ_CALENDAR, - android.Manifest.permission.WRITE_CALENDAR -> + android.Manifest.permission.WRITE_CALENDAR, + -> android.Manifest.permission_group.CALENDAR android.Manifest.permission.SEND_SMS, android.Manifest.permission.RECEIVE_SMS, android.Manifest.permission.READ_SMS, android.Manifest.permission.RECEIVE_MMS, android.Manifest.permission.RECEIVE_WAP_PUSH, - "android.permission.READ_CELL_BROADCASTS" -> + "android.permission.READ_CELL_BROADCASTS", + -> android.Manifest.permission_group.SMS android.Manifest.permission.READ_EXTERNAL_STORAGE, android.Manifest.permission.WRITE_EXTERNAL_STORAGE, - android.Manifest.permission.ACCESS_MEDIA_LOCATION -> + android.Manifest.permission.ACCESS_MEDIA_LOCATION, + -> android.Manifest.permission_group.STORAGE android.Manifest.permission.ACCESS_FINE_LOCATION, android.Manifest.permission.ACCESS_COARSE_LOCATION, - android.Manifest.permission.ACCESS_BACKGROUND_LOCATION -> + android.Manifest.permission.ACCESS_BACKGROUND_LOCATION, + -> android.Manifest.permission_group.LOCATION android.Manifest.permission.READ_CALL_LOG, android.Manifest.permission.WRITE_CALL_LOG, - @Suppress("DEPRECATION") android.Manifest.permission.PROCESS_OUTGOING_CALLS -> + @Suppress("DEPRECATION") android.Manifest.permission.PROCESS_OUTGOING_CALLS, + -> android.Manifest.permission_group.CALL_LOG android.Manifest.permission.READ_PHONE_STATE, android.Manifest.permission.READ_PHONE_NUMBERS, @@ -118,7 +124,8 @@ object PackageItemResolver { android.Manifest.permission.ADD_VOICEMAIL, android.Manifest.permission.USE_SIP, android.Manifest.permission.ANSWER_PHONE_CALLS, - android.Manifest.permission.ACCEPT_HANDOVER -> + android.Manifest.permission.ACCEPT_HANDOVER, + -> android.Manifest.permission_group.PHONE android.Manifest.permission.RECORD_AUDIO -> android.Manifest.permission_group.MICROPHONE diff --git a/src/main/kotlin/com/looker/droidify/utility/ProgressInputStream.kt b/src/main/kotlin/com/looker/droidify/utility/ProgressInputStream.kt index b4e06114..442a5e1c 100644 --- a/src/main/kotlin/com/looker/droidify/utility/ProgressInputStream.kt +++ b/src/main/kotlin/com/looker/droidify/utility/ProgressInputStream.kt @@ -4,7 +4,7 @@ import java.io.InputStream class ProgressInputStream( private val inputStream: InputStream, - private val callback: (Long) -> Unit + private val callback: (Long) -> Unit, ) : InputStream() { private var count = 0L diff --git a/src/main/kotlin/com/looker/droidify/utility/RxUtils.kt b/src/main/kotlin/com/looker/droidify/utility/RxUtils.kt index 50feb57d..5ccf2c07 100644 --- a/src/main/kotlin/com/looker/droidify/utility/RxUtils.kt +++ b/src/main/kotlin/com/looker/droidify/utility/RxUtils.kt @@ -25,7 +25,7 @@ object RxUtils { private fun managedSingle( create: () -> T, cancel: (T) -> Unit, - execute: (T) -> R + execute: (T) -> R, ): Single { return Single.create { val task = create() diff --git a/src/main/kotlin/com/looker/droidify/utility/extension/Json.kt b/src/main/kotlin/com/looker/droidify/utility/extension/Json.kt index 543d073f..fb1973e8 100644 --- a/src/main/kotlin/com/looker/droidify/utility/extension/Json.kt +++ b/src/main/kotlin/com/looker/droidify/utility/extension/Json.kt @@ -61,7 +61,7 @@ fun JsonParser.forEach(requiredToken: JsonToken, callback: JsonParser.() -> Unit fun JsonParser.collectNotNull( requiredToken: JsonToken, - callback: JsonParser.() -> T? + callback: JsonParser.() -> T?, ): List { val list = mutableListOf() forEach(requiredToken) { diff --git a/src/main/kotlin/com/looker/droidify/widget/DividerItemDecoration.kt b/src/main/kotlin/com/looker/droidify/widget/DividerItemDecoration.kt index 053268e6..546d0f11 100644 --- a/src/main/kotlin/com/looker/droidify/widget/DividerItemDecoration.kt +++ b/src/main/kotlin/com/looker/droidify/widget/DividerItemDecoration.kt @@ -10,10 +10,11 @@ import com.looker.droidify.utility.extension.resources.getDrawableFromAttr import kotlin.math.roundToInt class DividerItemDecoration( - context: Context, private val configure: ( + context: Context, + private val configure: ( context: Context, - position: Int, configuration: Configuration - ) -> Unit + position: Int, configuration: Configuration, + ) -> Unit, ) : RecyclerView.ItemDecoration() { interface Configuration { fun set(needDivider: Boolean, toTop: Boolean, paddingStart: Int, paddingEnd: Int) @@ -49,7 +50,7 @@ class DividerItemDecoration( view: View, top: Int, width: Int, - rtl: Boolean + rtl: Boolean, ) { val divider = divider val left = if (rtl) configuration.paddingEnd else configuration.paddingStart @@ -105,7 +106,7 @@ class DividerItemDecoration( outRect: Rect, view: View, parent: RecyclerView, - state: RecyclerView.State + state: RecyclerView.State, ) { val configuration = view.configuration val position = parent.getChildAdapterPosition(view) diff --git a/src/main/kotlin/com/looker/droidify/widget/RecyclerFastScroller.kt b/src/main/kotlin/com/looker/droidify/widget/RecyclerFastScroller.kt index 74cda3c9..34cdc4a6 100644 --- a/src/main/kotlin/com/looker/droidify/widget/RecyclerFastScroller.kt +++ b/src/main/kotlin/com/looker/droidify/widget/RecyclerFastScroller.kt @@ -33,7 +33,7 @@ class RecyclerFastScroller(private val recyclerView: RecyclerView) { private data class FastScrolling( val startAtThumbOffset: Float?, val startY: Float, - val currentY: Float + val currentY: Float, ) private var scrolling = false @@ -130,7 +130,7 @@ class RecyclerFastScroller(private val recyclerView: RecyclerView) { itemHeight: Int, thumbHeight: Int, range: Int, - fastScrolling: FastScrolling + fastScrolling: FastScrolling, ) { val offset = calculateOffset(thumbHeight, fastScrolling) val scrollPosition = ((range - recyclerView.height) * offset).roundToInt()