Project cleanup and refactoring

Author: RznNike

app/src/main/java/ru/rznnike/eyehealthmanager/app/dispatcher/event/EventDispatcher.kt

@@ -36,13 +36,13 @@ class EventDispatcher(
     }
 
     fun removeEventListener(listener: EventListener) = eventListeners
-        .filter { it.value.size > 0 }
+        .filter { it.value.isNotEmpty() }
         .forEach { it.value.remove(listener) }
 
     fun sendEvent(appEvent: AppEvent) {
         val key = appEvent::class.java.name
         eventListeners
-            .filter { it.key == key && it.value.size > 0 }
+            .filter { it.key == key && it.value.isNotEmpty() }
             .forEach {
                 it.value.forEach { listener ->
                     coroutineScopeProvider.ui.launch {

app/src/main/java/ru/rznnike/eyehealthmanager/app/global/ui/fragment/BaseFragment.kt

@@ -16,10 +16,10 @@ import kotlin.concurrent.schedule
 
 abstract class BaseFragment(@LayoutRes layoutRes: Int) : MvpAppCompatFragment(layoutRes) {
     open var isLightStatusBar: Boolean = true
-        get() = !(context?.isNightModeEnabled ?: false)
+        get() = context?.isNightModeEnabled != true
         protected set
     open var isLightNavigationBar: Boolean = true
-        get() = !(context?.isNightModeEnabled ?: false)
+        get() = context?.isNightModeEnabled != true
         protected set
     open var progressDelayMs: Long = DEFAULT_PROGRESS_DELAY_MS
         protected set

app/src/main/java/ru/rznnike/eyehealthmanager/app/presentation/acuity/result/AcuityResultPresenter.kt

@@ -41,7 +41,7 @@ class AcuityResultPresenter(
     override fun onFirstViewAttach() {
         presenterScope.launch {
             viewState.setProgress(true)
-            applyDynamicCorrections = getApplyDynamicCorrectionsUseCase().data ?: false
+            applyDynamicCorrections = getApplyDynamicCorrectionsUseCase().data == true
             val dateNow = clock.millis().toLocalDate()
             val parameters = AnalysisParameters(
                 dateFrom = dateNow.minusMonths(1).atStartOfDay().millis(),

app/src/main/java/ru/rznnike/eyehealthmanager/app/presentation/analysis/parameters/AnalysisParametersPresenter.kt

@@ -42,7 +42,7 @@ class AnalysisParametersPresenter : BasePresenter<AnalysisParametersView>() {
             parameters.apply {
                 dateFrom = dateNow.minusDays(DataConstants.ANALYSIS_MAX_RANGE_DAYS - 1).atStartOfDay().millis()
                 dateTo = dateNow.atEndOfDay().millis()
-                applyDynamicCorrections = getApplyDynamicCorrectionsUseCase().data ?: false
+                applyDynamicCorrections = getApplyDynamicCorrectionsUseCase().data == true
             }
             viewState.populateData(parameters)
         }

app/src/main/java/ru/rznnike/eyehealthmanager/app/presentation/main/MainPresenter.kt

@@ -67,7 +67,7 @@ class MainPresenter : BasePresenter<MainView>(), EventDispatcher.EventListener {
 
     private fun checkWelcomeDialog() {
         presenterScope.launch {
-            val showed = getWelcomeDialogShowedUseCase().data ?: false
+            val showed = getWelcomeDialogShowedUseCase().data == true
             if (!showed) {
                 viewState.showWelcomeDialog()
                 setWelcomeDialogShowedUseCase(true)

app/src/main/java/ru/rznnike/eyehealthmanager/app/service/NotificationService.kt

@@ -86,12 +86,12 @@ class NotificationService : JobService() {
             val jobInfo = JobInfo.Builder(JOB_ID, serviceName)
                 .setRequiredNetworkType(JobInfo.NETWORK_TYPE_ANY)
                 .build()
-            val scheduler = context.getSystemService(Context.JOB_SCHEDULER_SERVICE) as JobScheduler
+            val scheduler = context.getSystemService(JOB_SCHEDULER_SERVICE) as JobScheduler
             scheduler.schedule(jobInfo)
         }
 
         fun stopAsJob(ctx: Context) {
-            val scheduler = ctx.getSystemService(Context.JOB_SCHEDULER_SERVICE) as JobScheduler
+            val scheduler = ctx.getSystemService(JOB_SCHEDULER_SERVICE) as JobScheduler
             scheduler.cancel(JOB_ID)
         }
     }

app/src/main/java/ru/rznnike/eyehealthmanager/app/ui/activity/AppActivity.kt

@@ -81,11 +81,9 @@ class AppActivity : BaseActivity(R.layout.activity), AppView {
                 ?.associate { it to (intent.getStringExtra(it) ?: "") }
                 ?.toNotification()
 
-    override fun onNewIntent(intent: Intent?) {
+    override fun onNewIntent(intent: Intent) {
         super.onNewIntent(intent)
-        intent?.let {
-            presenter.processNotificationIntent(getNotificationFromIntent(intent))
-        }
+        presenter.processNotificationIntent(getNotificationFromIntent(intent))
     }
 
     override fun onPause() {

app/src/main/java/ru/rznnike/eyehealthmanager/app/ui/fragment/acuity/result/AcuityResultFragment.kt

@@ -112,7 +112,7 @@ class AcuityResultFragment : BaseFragment(R.layout.fragment_acuity_result), Acui
 
             layoutNoiseProcessing.setVisible(analysisResult?.lastResultRecognizedAsNoise == true)
             checkBoxApplyDynamicCorrections.isChecked = applyDynamicCorrections
-            textViewMessage.setVisible(analysisResult?.showWarningAboutVision ?: false)
+            textViewMessage.setVisible(analysisResult?.showWarningAboutVision == true)
         }
     }
 

app/src/main/java/ru/rznnike/eyehealthmanager/app/ui/view/EmptyDividerDecoration.kt

@@ -43,7 +43,7 @@ class EmptyDividerDecoration(
         if (displayMode == -1) {
             displayMode = resolveDisplayMode(layoutManager)
         }
-        val reverseLayout = (layoutManager as? LinearLayoutManager)?.reverseLayout ?: false
+        val reverseLayout = (layoutManager as? LinearLayoutManager)?.reverseLayout == true
 
         when (displayMode) {
             HORIZONTAL -> {

app/src/main/java/ru/rznnike/eyehealthmanager/app/utils/extensions/ArgumentsUtils.kt

@@ -19,7 +19,7 @@ inline fun <reified T: Parcelable> Fragment.getParcelableListArg(key: String): L
     arguments?.getParcelableArrayList(key)
 } ?: emptyList()
 
-fun Fragment.getBooleanArg(key: String): Boolean = arguments?.getBoolean(key) ?: false
+fun Fragment.getBooleanArg(key: String): Boolean = arguments?.getBoolean(key) == true
 
 fun Fragment.getStringArg(key: String): String? = arguments?.getString(key)