From 2b05f7cf4ee1fdbb9f3871b66bb5dd750561fec8 Mon Sep 17 00:00:00 2001 From: Konrad Pozniak Date: Tue, 29 Sep 2020 20:42:01 +0200 Subject: [PATCH] enable all ktlint rules --- app/build.gradle.kts | 4 ---- .../at/connyduck/pixelcat/components/login/LoginActivity.kt | 2 +- .../pixelcat/components/login/LoginWebViewActivity.kt | 2 +- .../connyduck/pixelcat/components/profile/ProfileFragment.kt | 2 +- .../pixelcat/components/timeline/detail/DetailViewModel.kt | 2 +- .../kotlin/at/connyduck/pixelcat/dagger/ActivityModule.kt | 4 ++-- .../kotlin/at/connyduck/pixelcat/dagger/ViewModelFactory.kt | 2 +- .../at/connyduck/pixelcat/network/calladapter/TestCall.kt | 2 +- 8 files changed, 8 insertions(+), 12 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index ce019e8..e4bdfed 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -55,10 +55,6 @@ tasks { } } -ktlint { - disabledRules.set(setOf("import-ordering")) -} - dependencies { val lifecycleVersion = "2.3.0-alpha07" diff --git a/app/src/main/kotlin/at/connyduck/pixelcat/components/login/LoginActivity.kt b/app/src/main/kotlin/at/connyduck/pixelcat/components/login/LoginActivity.kt index 0227df2..9bf273a 100644 --- a/app/src/main/kotlin/at/connyduck/pixelcat/components/login/LoginActivity.kt +++ b/app/src/main/kotlin/at/connyduck/pixelcat/components/login/LoginActivity.kt @@ -31,10 +31,10 @@ import androidx.core.view.ViewCompat import androidx.core.view.WindowInsetsCompat import androidx.core.view.WindowInsetsCompat.Type.systemBars import androidx.lifecycle.lifecycleScope -import at.connyduck.pixelcat.components.main.MainActivity import at.connyduck.pixelcat.R import at.connyduck.pixelcat.components.about.AboutActivity import at.connyduck.pixelcat.components.general.BaseActivity +import at.connyduck.pixelcat.components.main.MainActivity import at.connyduck.pixelcat.components.settings.SettingsActivity import at.connyduck.pixelcat.components.util.extension.visible import at.connyduck.pixelcat.dagger.ViewModelFactory diff --git a/app/src/main/kotlin/at/connyduck/pixelcat/components/login/LoginWebViewActivity.kt b/app/src/main/kotlin/at/connyduck/pixelcat/components/login/LoginWebViewActivity.kt index c8e7968..dca919d 100644 --- a/app/src/main/kotlin/at/connyduck/pixelcat/components/login/LoginWebViewActivity.kt +++ b/app/src/main/kotlin/at/connyduck/pixelcat/components/login/LoginWebViewActivity.kt @@ -27,11 +27,11 @@ import android.os.Bundle import android.view.ViewGroup import android.webkit.WebResourceRequest import android.webkit.WebView -import at.connyduck.pixelcat.config.Config import android.webkit.WebViewClient import androidx.core.view.ViewCompat import androidx.core.view.WindowInsetsCompat import at.connyduck.pixelcat.components.general.BaseActivity +import at.connyduck.pixelcat.config.Config import at.connyduck.pixelcat.databinding.ActivityLoginWebViewBinding class LoginWebViewActivity : BaseActivity() { diff --git a/app/src/main/kotlin/at/connyduck/pixelcat/components/profile/ProfileFragment.kt b/app/src/main/kotlin/at/connyduck/pixelcat/components/profile/ProfileFragment.kt index 565bd89..5a1ac05 100644 --- a/app/src/main/kotlin/at/connyduck/pixelcat/components/profile/ProfileFragment.kt +++ b/app/src/main/kotlin/at/connyduck/pixelcat/components/profile/ProfileFragment.kt @@ -24,8 +24,8 @@ import android.view.View import androidx.fragment.app.viewModels import androidx.lifecycle.lifecycleScope import androidx.paging.ExperimentalPagingApi -import androidx.recyclerview.widget.GridLayoutManager import androidx.recyclerview.widget.ConcatAdapter +import androidx.recyclerview.widget.GridLayoutManager import at.connyduck.pixelcat.R import at.connyduck.pixelcat.components.bottomsheet.accountselection.AccountSelectionBottomSheet import at.connyduck.pixelcat.components.bottomsheet.menu.MenuBottomSheet diff --git a/app/src/main/kotlin/at/connyduck/pixelcat/components/timeline/detail/DetailViewModel.kt b/app/src/main/kotlin/at/connyduck/pixelcat/components/timeline/detail/DetailViewModel.kt index bd5b2b6..7af3271 100644 --- a/app/src/main/kotlin/at/connyduck/pixelcat/components/timeline/detail/DetailViewModel.kt +++ b/app/src/main/kotlin/at/connyduck/pixelcat/components/timeline/detail/DetailViewModel.kt @@ -23,10 +23,10 @@ import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import at.connyduck.pixelcat.components.timeline.TimelineUseCases +import at.connyduck.pixelcat.components.util.Error import at.connyduck.pixelcat.components.util.Loading import at.connyduck.pixelcat.components.util.Success import at.connyduck.pixelcat.components.util.UiState -import at.connyduck.pixelcat.components.util.Error import at.connyduck.pixelcat.db.AccountManager import at.connyduck.pixelcat.db.AppDatabase import at.connyduck.pixelcat.db.entitity.StatusEntity diff --git a/app/src/main/kotlin/at/connyduck/pixelcat/dagger/ActivityModule.kt b/app/src/main/kotlin/at/connyduck/pixelcat/dagger/ActivityModule.kt index 4b023bb..6b8e25f 100644 --- a/app/src/main/kotlin/at/connyduck/pixelcat/dagger/ActivityModule.kt +++ b/app/src/main/kotlin/at/connyduck/pixelcat/dagger/ActivityModule.kt @@ -19,16 +19,16 @@ package at.connyduck.pixelcat.dagger -import at.connyduck.pixelcat.components.main.MainActivity import at.connyduck.pixelcat.components.about.AboutActivity import at.connyduck.pixelcat.components.about.licenses.LicenseActivity import at.connyduck.pixelcat.components.compose.ComposeActivity -import at.connyduck.pixelcat.components.timeline.detail.DetailActivity import at.connyduck.pixelcat.components.login.LoginActivity import at.connyduck.pixelcat.components.login.LoginWebViewActivity +import at.connyduck.pixelcat.components.main.MainActivity import at.connyduck.pixelcat.components.profile.ProfileActivity import at.connyduck.pixelcat.components.settings.SettingsActivity import at.connyduck.pixelcat.components.splash.SplashActivity +import at.connyduck.pixelcat.components.timeline.detail.DetailActivity import dagger.Module import dagger.android.ContributesAndroidInjector diff --git a/app/src/main/kotlin/at/connyduck/pixelcat/dagger/ViewModelFactory.kt b/app/src/main/kotlin/at/connyduck/pixelcat/dagger/ViewModelFactory.kt index 9a0f565..0a94dc8 100644 --- a/app/src/main/kotlin/at/connyduck/pixelcat/dagger/ViewModelFactory.kt +++ b/app/src/main/kotlin/at/connyduck/pixelcat/dagger/ViewModelFactory.kt @@ -22,13 +22,13 @@ package at.connyduck.pixelcat.dagger import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModelProvider import at.connyduck.pixelcat.components.compose.ComposeViewModel -import at.connyduck.pixelcat.components.timeline.detail.DetailViewModel import at.connyduck.pixelcat.components.login.LoginViewModel import at.connyduck.pixelcat.components.main.MainViewModel import at.connyduck.pixelcat.components.notifications.NotificationsViewModel import at.connyduck.pixelcat.components.profile.ProfileViewModel import at.connyduck.pixelcat.components.search.SearchViewModel import at.connyduck.pixelcat.components.timeline.TimelineViewModel +import at.connyduck.pixelcat.components.timeline.detail.DetailViewModel import dagger.Binds import dagger.MapKey import dagger.Module diff --git a/app/src/test/kotlin/at/connyduck/pixelcat/network/calladapter/TestCall.kt b/app/src/test/kotlin/at/connyduck/pixelcat/network/calladapter/TestCall.kt index 46fd5cd..44e399e 100644 --- a/app/src/test/kotlin/at/connyduck/pixelcat/network/calladapter/TestCall.kt +++ b/app/src/test/kotlin/at/connyduck/pixelcat/network/calladapter/TestCall.kt @@ -19,12 +19,12 @@ package at.connyduck.pixelcat.network.calladapter -import java.io.InterruptedIOException import okhttp3.Request import okio.Timeout import retrofit2.Call import retrofit2.Callback import retrofit2.Response +import java.io.InterruptedIOException class TestCall : Call { private var executed = false