From 381e29b2d14b48bfa22d59a1592235227d7176d0 Mon Sep 17 00:00:00 2001 From: Nite Date: Sun, 10 Oct 2021 14:15:03 +0200 Subject: [PATCH] Fixed lint issues --- .../ultrasonic/activity/NavigationActivity.kt | 15 +++++++++------ .../moire/ultrasonic/data/ActiveServerProvider.kt | 1 - 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/activity/NavigationActivity.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/activity/NavigationActivity.kt index ce29e4f2..a640ba1e 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/activity/NavigationActivity.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/activity/NavigationActivity.kt @@ -19,7 +19,6 @@ import androidx.core.view.GravityCompat import androidx.drawerlayout.widget.DrawerLayout import androidx.fragment.app.FragmentContainerView import androidx.navigation.NavController -import androidx.navigation.Navigation import androidx.navigation.findNavController import androidx.navigation.fragment.NavHostFragment import androidx.navigation.ui.AppBarConfiguration @@ -186,10 +185,13 @@ class NavigationActivity : AppCompatActivity() { nowPlayingEventDistributor.subscribe(nowPlayingEventListener) themeChangedEventDistributor.subscribe(themeChangedEventListener) - serverRepository.liveServerCount().observe(this, { count -> - cachedServerCount = count ?: 0 - setSelectServerButtonText() - }) + serverRepository.liveServerCount().observe( + this, + { count -> + cachedServerCount = count ?: 0 + setSelectServerButtonText() + } + ) ActiveServerProvider.liveActiveServerId.observe(this, { setSelectServerButtonText() }) } @@ -251,7 +253,8 @@ class NavigationActivity : AppCompatActivity() { bookmarksMenuItem = navigationView?.menu?.findItem(R.id.bookmarksFragment) sharesMenuItem = navigationView?.menu?.findItem(R.id.sharesFragment) podcastsMenuItem = navigationView?.menu?.findItem(R.id.podcastFragment) - selectServerButton = navigationView?.getHeaderView(0)?.findViewById(R.id.header_select_server) + selectServerButton = + navigationView?.getHeaderView(0)?.findViewById(R.id.header_select_server) selectServerButton?.setOnClickListener { if (drawerLayout?.isDrawerVisible(GravityCompat.START) == true) this.drawerLayout?.closeDrawer(GravityCompat.START) diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/data/ActiveServerProvider.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/data/ActiveServerProvider.kt index 75ee4fbe..1d768071 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/data/ActiveServerProvider.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/data/ActiveServerProvider.kt @@ -1,6 +1,5 @@ package org.moire.ultrasonic.data -import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData import androidx.room.Room import kotlinx.coroutines.Dispatchers