From b08b36a757abdc0d52c78ddddc0f6d070abc86a0 Mon Sep 17 00:00:00 2001 From: Sean Mac Gillicuddy Date: Tue, 3 Sep 2019 12:13:30 +0100 Subject: [PATCH] Resolve lint errors and reduce inspection severity to info --- .../kiwixAndroidInspections.xml | 2 +- .../org/kiwix/kiwixmobile/di/ServiceScope.kt | 2 +- .../kiwixmobile/di/modules/ServiceModule.kt | 1 - .../kiwix/kiwixmobile/utils/KiwixDialog.kt | 21 +++++++++++-------- 4 files changed, 14 insertions(+), 12 deletions(-) diff --git a/.idea/inspectionProfiles/kiwixAndroidInspections.xml b/.idea/inspectionProfiles/kiwixAndroidInspections.xml index bdb077f72..080779a6c 100644 --- a/.idea/inspectionProfiles/kiwixAndroidInspections.xml +++ b/.idea/inspectionProfiles/kiwixAndroidInspections.xml @@ -343,7 +343,7 @@ - + diff --git a/app/src/main/java/org/kiwix/kiwixmobile/di/ServiceScope.kt b/app/src/main/java/org/kiwix/kiwixmobile/di/ServiceScope.kt index 70f20d034..38af39c69 100644 --- a/app/src/main/java/org/kiwix/kiwixmobile/di/ServiceScope.kt +++ b/app/src/main/java/org/kiwix/kiwixmobile/di/ServiceScope.kt @@ -22,4 +22,4 @@ import kotlin.annotation.AnnotationRetention.RUNTIME @Scope @Retention(RUNTIME) -annotation class ServiceScope \ No newline at end of file +annotation class ServiceScope diff --git a/app/src/main/java/org/kiwix/kiwixmobile/di/modules/ServiceModule.kt b/app/src/main/java/org/kiwix/kiwixmobile/di/modules/ServiceModule.kt index 91905e0b7..7de0f52af 100644 --- a/app/src/main/java/org/kiwix/kiwixmobile/di/modules/ServiceModule.kt +++ b/app/src/main/java/org/kiwix/kiwixmobile/di/modules/ServiceModule.kt @@ -67,4 +67,3 @@ class ServiceModule { ): HotspotNotificationManager = HotspotNotificationManager(notificationManager, context) } - diff --git a/app/src/main/java/org/kiwix/kiwixmobile/utils/KiwixDialog.kt b/app/src/main/java/org/kiwix/kiwixmobile/utils/KiwixDialog.kt index 568f88435..671eca9eb 100644 --- a/app/src/main/java/org/kiwix/kiwixmobile/utils/KiwixDialog.kt +++ b/app/src/main/java/org/kiwix/kiwixmobile/utils/KiwixDialog.kt @@ -2,7 +2,6 @@ package org.kiwix.kiwixmobile.utils import android.net.wifi.WifiConfiguration import org.kiwix.kiwixmobile.R -import org.kiwix.kiwixmobile.R.string import org.kiwix.kiwixmobile.zim_manager.fileselect_view.adapter.BooksOnDiskListItem.BookOnDisk sealed class KiwixDialog( @@ -39,7 +38,10 @@ sealed class KiwixDialog( ) object StoragePermissionRationale : KiwixDialog( - null, R.string.request_storage, android.R.string.yes, android.R.string.cancel + null, + R.string.request_storage, + android.R.string.yes, + android.R.string.cancel ) object EnableWifiP2pServices : KiwixDialog( @@ -71,13 +73,14 @@ sealed class KiwixDialog( ) } - data class StartHotspotManually(val neutralMessage: Int = string.hotspot_dialog_neutral_button) : - KiwixDialog( - string.hotspot_dialog_title, - string.hotspot_dialog_message, - string.go_to_settings_label, - null - ) + data class StartHotspotManually( + val neutralMessage: Int = R.string.hotspot_dialog_neutral_button + ) : KiwixDialog( + R.string.hotspot_dialog_title, + R.string.hotspot_dialog_message, + R.string.go_to_settings_label, + null + ) data class FileTransferConfirmation(override val args: Array) : KiwixDialog( null, R.string.transfer_to, R.string.yes, android.R.string.cancel