From 5d1f604460be56ad94e0fdae7170d0c1ba200a68 Mon Sep 17 00:00:00 2001 From: Aayush Gupta Date: Tue, 30 Dec 2025 14:52:12 +0800 Subject: [PATCH] ktlint: Address property and variable name violations Signed-off-by: Aayush Gupta --- .../main/java/com/aurora/store/data/network/HttpClient.kt | 6 ++++-- .../com/aurora/store/data/providers/BlacklistProvider.kt | 4 +++- .../store/data/providers/NativeGsfVersionProvider.kt | 7 +++++-- .../com/aurora/store/data/providers/SpoofDeviceProvider.kt | 4 +++- .../main/java/com/aurora/store/data/work/DownloadWorker.kt | 6 ++++-- .../main/java/com/aurora/store/data/work/ExportWorker.kt | 5 +++-- .../store/viewmodel/preferences/InstallerViewModel.kt | 4 ++-- .../com/aurora/store/viewmodel/search/SearchViewModel.kt | 6 +++--- 8 files changed, 27 insertions(+), 15 deletions(-) diff --git a/app/src/main/java/com/aurora/store/data/network/HttpClient.kt b/app/src/main/java/com/aurora/store/data/network/HttpClient.kt index 6b83e8a92..5b7646635 100644 --- a/app/src/main/java/com/aurora/store/data/network/HttpClient.kt +++ b/app/src/main/java/com/aurora/store/data/network/HttpClient.kt @@ -45,8 +45,10 @@ import javax.inject.Singleton @Singleton class HttpClient @Inject constructor(private val okHttpClient: OkHttpClient): IHttpClient { - private val POST = "POST" - private val GET = "GET" + companion object { + private const val POST = "POST" + private const val GET = "GET" + } private val _responseCode = MutableStateFlow(100) override val responseCode: StateFlow diff --git a/app/src/main/java/com/aurora/store/data/providers/BlacklistProvider.kt b/app/src/main/java/com/aurora/store/data/providers/BlacklistProvider.kt index d483d02f6..1b834193c 100644 --- a/app/src/main/java/com/aurora/store/data/providers/BlacklistProvider.kt +++ b/app/src/main/java/com/aurora/store/data/providers/BlacklistProvider.kt @@ -35,7 +35,9 @@ class BlacklistProvider @Inject constructor( @ApplicationContext val context: Context, ) { - private val PREFERENCE_BLACKLIST = "PREFERENCE_BLACKLIST" + companion object { + private const val PREFERENCE_BLACKLIST = "PREFERENCE_BLACKLIST" + } var blacklist: MutableSet set(value) = Preferences.putString( diff --git a/app/src/main/java/com/aurora/store/data/providers/NativeGsfVersionProvider.kt b/app/src/main/java/com/aurora/store/data/providers/NativeGsfVersionProvider.kt index b0ca23a6f..b405f7a06 100644 --- a/app/src/main/java/com/aurora/store/data/providers/NativeGsfVersionProvider.kt +++ b/app/src/main/java/com/aurora/store/data/providers/NativeGsfVersionProvider.kt @@ -25,8 +25,11 @@ import androidx.core.content.pm.PackageInfoCompat import com.aurora.store.util.PackageUtil.getPackageInfo class NativeGsfVersionProvider(context: Context, isExport: Boolean = false) { - private val GOOGLE_SERVICES_PACKAGE_ID = "com.google.android.gms" - private val GOOGLE_VENDING_PACKAGE_ID = "com.android.vending" + + companion object { + private const val GOOGLE_SERVICES_PACKAGE_ID = "com.google.android.gms" + private const val GOOGLE_VENDING_PACKAGE_ID = "com.android.vending" + } // Preferred defaults, not any specific reason they just work fine. var gsfVersionCode = 203019037L diff --git a/app/src/main/java/com/aurora/store/data/providers/SpoofDeviceProvider.kt b/app/src/main/java/com/aurora/store/data/providers/SpoofDeviceProvider.kt index 58314a5be..008cd8319 100644 --- a/app/src/main/java/com/aurora/store/data/providers/SpoofDeviceProvider.kt +++ b/app/src/main/java/com/aurora/store/data/providers/SpoofDeviceProvider.kt @@ -41,7 +41,9 @@ import javax.inject.Singleton @Singleton open class SpoofDeviceProvider(private val context: Context) { - private val SUFFIX = ".properties" + companion object { + private const val SUFFIX = ".properties" + } val availableDeviceProperties: List get() { diff --git a/app/src/main/java/com/aurora/store/data/work/DownloadWorker.kt b/app/src/main/java/com/aurora/store/data/work/DownloadWorker.kt index 7d8bb37d4..5562c887c 100644 --- a/app/src/main/java/com/aurora/store/data/work/DownloadWorker.kt +++ b/app/src/main/java/com/aurora/store/data/work/DownloadWorker.kt @@ -77,6 +77,10 @@ class DownloadWorker @AssistedInject constructor( @Assisted workerParams: WorkerParameters ) : AuthWorker(authProvider, context, workerParams) { + companion object { + private const val NOTIFICATION_ID: Int = 200 + } + private lateinit var download: Download private val notificationManager = context.getSystemService()!! @@ -86,8 +90,6 @@ class DownloadWorker @AssistedInject constructor( private var totalProgress = 0 private var downloadedBytes = 0L - private val NOTIFICATION_ID: Int = 200 - inner class NoNetworkException : Exception(context.getString(R.string.title_no_network)) inner class NothingToDownloadException : Exception(context.getString(R.string.purchase_no_file)) inner class DownloadFailedException : Exception(context.getString(R.string.download_failed)) diff --git a/app/src/main/java/com/aurora/store/data/work/ExportWorker.kt b/app/src/main/java/com/aurora/store/data/work/ExportWorker.kt index 55b6d3f7b..d4a0706c0 100644 --- a/app/src/main/java/com/aurora/store/data/work/ExportWorker.kt +++ b/app/src/main/java/com/aurora/store/data/work/ExportWorker.kt @@ -44,6 +44,9 @@ class ExportWorker @AssistedInject constructor( private const val VERSION_CODE = "VERSION_CODE" private const val DISPLAY_NAME = "DISPLAY_NAME" + private const val NOTIFICATION_ID = 500 + private const val NOTIFICATION_ID_FGS = 501 + /** * Exports the installed package to the given URI * @param app App to export @@ -91,8 +94,6 @@ class ExportWorker @AssistedInject constructor( } private lateinit var notificationManager: NotificationManager - private val NOTIFICATION_ID = 500 - private val NOTIFICATION_ID_FGS = 501 override suspend fun doWork(): Result { val isDownload = inputData.getBoolean(IS_DOWNLOAD, false) diff --git a/app/src/main/java/com/aurora/store/viewmodel/preferences/InstallerViewModel.kt b/app/src/main/java/com/aurora/store/viewmodel/preferences/InstallerViewModel.kt index e7df3e962..70a410a92 100644 --- a/app/src/main/java/com/aurora/store/viewmodel/preferences/InstallerViewModel.kt +++ b/app/src/main/java/com/aurora/store/viewmodel/preferences/InstallerViewModel.kt @@ -42,7 +42,7 @@ class InstallerViewModel @Inject constructor( private val _error = MutableSharedFlow() val error = _error.asSharedFlow() - private var _installerId: Int + private var installerId: Int get() = sharedPreferences.getInt(PREFERENCE_INSTALLER_ID, 0) set(value) = sharedPreferences.edit { putInt(PREFERENCE_INSTALLER_ID, value) } @@ -50,7 +50,7 @@ class InstallerViewModel @Inject constructor( key = PREFERENCE_INSTALLER_ID, scope = viewModelScope, initial = AppInstaller.getCurrentInstaller(context).ordinal, - valueProvider = { _installerId } + valueProvider = { installerId } ) init { diff --git a/app/src/main/java/com/aurora/store/viewmodel/search/SearchViewModel.kt b/app/src/main/java/com/aurora/store/viewmodel/search/SearchViewModel.kt index a80a29a22..55dbfdb75 100644 --- a/app/src/main/java/com/aurora/store/viewmodel/search/SearchViewModel.kt +++ b/app/src/main/java/com/aurora/store/viewmodel/search/SearchViewModel.kt @@ -49,9 +49,9 @@ class SearchViewModel @Inject constructor( private val _suggestions = MutableStateFlow>(emptyList()) val suggestions = _suggestions.asStateFlow() - private val _filter = MutableStateFlow(SearchFilter()) + private val searchFilter = MutableStateFlow(SearchFilter()) private val _apps = MutableStateFlow>(PagingData.empty()) - val apps = combine(_filter, _apps) { filter, pagingData -> + val apps = combine(searchFilter, _apps) { filter, pagingData -> pagingData.filter { app -> when { filter.noAds && app.containsAds -> false @@ -65,7 +65,7 @@ class SearchViewModel @Inject constructor( }.stateIn(viewModelScope, SharingStarted.WhileSubscribed(), PagingData.empty()) fun filterResults(filter: SearchFilter) { - _filter.value = filter + searchFilter.value = filter } fun search(query: String) {