Added KtLint checking.

Fixed issues found by KtLint and some other refactoring.

Author: kozmi55

.editorconfig

@@ -0,0 +1,5 @@
+[*.{kt,kts}]
+indent_size=4
+continuation_indent_size=8
+insert_final_newline=unset
+max_line_length=160

app/build.gradle

@@ -26,6 +26,29 @@ kapt {
  generateStubs = true
 }
 
+configurations {
+ ktlint
+}
+
+task ktlint(type: JavaExec, group: "verification") {
+ description = "Check Kotlin code style."
+ classpath = configurations.ktlint
+ main = "com.github.shyiko.ktlint.Main"
+ args "src/**/*.kt"
+ // to generate report in checkstyle format prepend following args:
+ // "--reporter=plain", "--reporter=checkstyle,output=${buildDir}/ktlint.xml"
+ // see https://github.com/shyiko/ktlint#usage for more
+}
+
+check.dependsOn ktlint
+
+task ktlintFormat(type: JavaExec, group: "formatting") {
+ description = "Fix Kotlin code style deviations."
+ classpath = configurations.ktlint
+ main = "com.github.shyiko.ktlint.Main"
+ args "-F", "src/**/*.kt"
+}
+
 dependencies {
  implementation fileTree(dir: 'libs', include: ['*.jar'])
  implementation"org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
@@ -49,6 +72,8 @@ dependencies {
  kapt "com.google.dagger:dagger-compiler:$DAGGER_VERSION"
  kapt "com.google.dagger:dagger-android-processor:$DAGGER_VERSION"
 
+ ktlint "com.github.shyiko:ktlint:0.27.0"
+
  testImplementation "com.nhaarman.mockitokotlin2:mockito-kotlin:$MOCKITO_KOTLIN_VERSION"
  testImplementation "junit:junit:$JUNIT_VERSION"
 

app/src/androidTest/java/com/example/tamaskozmer/kotlinrxexample/mocks/di/modules/TestApplicationModule.kt

@@ -12,8 +12,9 @@ import javax.inject.Singleton
 
 @Module
 class TestApplicationModule(
- private val userRepository: UserRepository = FakeUserRepository(),
- private val detailsRepository: DetailsRepository = FakeDetailsRepository()) {
+ private val userRepository: UserRepository = FakeUserRepository(),
+ private val detailsRepository: DetailsRepository = FakeDetailsRepository()
+) {
 
  @Provides
  @Singleton

app/src/androidTest/java/com/example/tamaskozmer/kotlinrxexample/testutil/CustomTestRunner.kt

@@ -4,7 +4,6 @@ import android.app.Application
 import android.content.Context
 import android.support.test.runner.AndroidJUnitRunner
 
-
 class CustomTestRunner : AndroidJUnitRunner() {
 
  override fun newApplication(cl: ClassLoader?, className: String?, context: Context?): Application {

app/src/androidTest/java/com/example/tamaskozmer/kotlinrxexample/testutil/TestApplication.kt

@@ -6,7 +6,6 @@ import dagger.android.DispatchingAndroidInjector
 import dagger.android.support.HasSupportFragmentInjector
 import javax.inject.Inject
 
-
 class TestApplication : Application(), HasSupportFragmentInjector {
 
  @Inject

app/src/androidTest/java/com/example/tamaskozmer/kotlinrxexample/view/fragments/UserListFragmentTest.kt

@@ -19,7 +19,7 @@ import com.example.tamaskozmer.kotlinrxexample.model.entities.UserListModel
 import com.example.tamaskozmer.kotlinrxexample.model.repositories.UserRepository
 import com.example.tamaskozmer.kotlinrxexample.testutil.RecyclerViewMatcher
 import com.example.tamaskozmer.kotlinrxexample.testutil.TestInjector
-import com.example.tamaskozmer.kotlinrxexample.view.activities.MainActivity
+import com.example.tamaskozmer.kotlinrxexample.presentation.view.activities.MainActivity
 import io.reactivex.Single
 import io.reactivex.SingleEmitter
 import org.hamcrest.Matchers
@@ -31,7 +31,6 @@ import org.mockito.Mock
 import org.mockito.MockitoAnnotations
 import org.mockito.Mockito.`when` as whenever
 
-
 @RunWith(AndroidJUnit4::class)
 class UserListFragmentTest {
 

app/src/main/AndroidManifest.xml

@@ -14,7 +14,7 @@
  android:supportsRtl="true"
  android:theme="@style/AppTheme">
  <activity
- android:name=".view.activities.MainActivity"
+ android:name=".presentation.view.activities.MainActivity"
  android:configChanges="orientation|screenSize">
  <intent-filter>
  <action android:name="android.intent.action.MAIN" />

app/src/main/java/com/example/tamaskozmer/kotlinrxexample/CustomApplication.kt

@@ -13,6 +13,6 @@ class CustomApplication : DaggerApplication() {
 
  override fun onCreate() {
  super.onCreate()
- Stetho.initializeWithDefaults(this);
+ Stetho.initializeWithDefaults(this)
  }
 }

app/src/main/java/com/example/tamaskozmer/kotlinrxexample/di/modules/ApplicationModule.kt

@@ -10,7 +10,11 @@ import com.example.tamaskozmer.kotlinrxexample.model.repositories.DetailsReposit
 import com.example.tamaskozmer.kotlinrxexample.model.repositories.UserRepository
 import com.example.tamaskozmer.kotlinrxexample.model.services.QuestionService
 import com.example.tamaskozmer.kotlinrxexample.model.services.UserService
-import com.example.tamaskozmer.kotlinrxexample.util.*
+import com.example.tamaskozmer.kotlinrxexample.util.AppSchedulerProvider
+import com.example.tamaskozmer.kotlinrxexample.util.CalendarWrapper
+import com.example.tamaskozmer.kotlinrxexample.util.ConnectionHelper
+import com.example.tamaskozmer.kotlinrxexample.util.PreferencesHelper
+import com.example.tamaskozmer.kotlinrxexample.util.SchedulerProvider
 import com.google.gson.Gson
 import dagger.Module
 import dagger.Provides
@@ -32,41 +36,54 @@ class ApplicationModule() {
  @Provides
  @Singleton
  fun provideRetrofit(): Retrofit = Retrofit.Builder()
-  .addCallAdapterFactory(RxJava2CallAdapterFactory.create())
-  .addConverterFactory(GsonConverterFactory.create(Gson()))
-  .baseUrl(BASE_URL)
-  .build()
+ .addCallAdapterFactory(RxJava2CallAdapterFactory.create())
+ .addConverterFactory(GsonConverterFactory.create(Gson()))
+ .baseUrl(BASE_URL)
+ .build()
 
  @Provides
  @Singleton
- fun provideUserRepository(retrofit: Retrofit, database: AppDatabase, connectionHelper: ConnectionHelper,
- preferencesHelper: PreferencesHelper, calendarWrapper: CalendarWrapper): UserRepository {
+ fun provideUserRepository(
+ retrofit: Retrofit,
+ database: AppDatabase,
+ connectionHelper: ConnectionHelper,
+ preferencesHelper: PreferencesHelper,
+ calendarWrapper: CalendarWrapper
+ ): UserRepository {
  return DefaultUserRepository(
- retrofit.create(UserService::class.java),
- database.userDao(),
- connectionHelper,
- preferencesHelper,
- calendarWrapper)
+ retrofit.create(UserService::class.java),
+ database.userDao(),
+ connectionHelper,
+ preferencesHelper,
+ calendarWrapper
+ )
  }
 
  @Provides
  @Singleton
- fun provideDetailsRepository(retrofit: Retrofit, database: AppDatabase, connectionHelper: ConnectionHelper,
- preferencesHelper: PreferencesHelper, calendarWrapper: CalendarWrapper): DetailsRepository {
+ fun provideDetailsRepository(
+ retrofit: Retrofit,
+ database: AppDatabase,
+ connectionHelper: ConnectionHelper,
+ preferencesHelper: PreferencesHelper,
+ calendarWrapper: CalendarWrapper
+ ): DetailsRepository {
  return DefaultDetailsRepository(
- retrofit.create(UserService::class.java),
- retrofit.create(QuestionService::class.java),
- database.questionDao(),
- database.answerDao(),
- database.favoritedByUserDao(),
- connectionHelper,
- preferencesHelper,
- calendarWrapper)
+ retrofit.create(UserService::class.java),
+ retrofit.create(QuestionService::class.java),
+ database.questionDao(),
+ database.answerDao(),
+ database.favoritedByUserDao(),
+ connectionHelper,
+ preferencesHelper,
+ calendarWrapper
+ )
  }
 
  @Provides
  @Singleton
- fun provideDatabase(context: Context) = Room.databaseBuilder(context, AppDatabase::class.java, DATABASE_NAME).build()
+ fun provideDatabase(context: Context) =
+ Room.databaseBuilder(context, AppDatabase::class.java, DATABASE_NAME).build()
 
  @Provides
  @Singleton

app/src/main/java/com/example/tamaskozmer/kotlinrxexample/domain/interactors/GetDetails.kt

@@ -12,7 +12,7 @@ import javax.inject.Inject
 
 class GetDetails @Inject constructor(private val detailsRepository: DetailsRepository) {
 
- fun execute(userId: Long, forced: Boolean) : Single<DetailsViewModel> {
+ fun execute(userId: Long, forced: Boolean): Single<DetailsViewModel> {
  return Single.zip(
  detailsRepository.getQuestionsByUser(userId, forced),
  getTitlesForAnswers(userId, forced),
@@ -22,7 +22,7 @@ class GetDetails @Inject constructor(private val detailsRepository: DetailsRepos
  createDetailsModel(questions, answers, favorites) })
  }
 
- private fun getTitlesForAnswers(userId: Long, forced: Boolean) : Single<List<AnswerViewModel>> {
+ private fun getTitlesForAnswers(userId: Long, forced: Boolean): Single<List<AnswerViewModel>> {
  return detailsRepository.getAnswersByUser(userId, forced)
  .flatMap { answers: List<Answer> ->
  mapAnswersToAnswerViewModels(answers, userId, forced) }
@@ -39,15 +39,18 @@ class GetDetails @Inject constructor(private val detailsRepository: DetailsRepos
  createAnswerViewModels(answers, questions) }
  }
 
- private fun createAnswerViewModels(answers: List<Answer>, questions: List<Question>) : List<AnswerViewModel> {
+ private fun createAnswerViewModels(answers: List<Answer>, questions: List<Question>): List<AnswerViewModel> {
  return answers.map { (answerId, questionId, score, accepted) ->
  val question = questions.find { it.questionId == questionId }
  AnswerViewModel(answerId, score, accepted, question?.title ?: "Unknown")
  }
  }
 
- private fun createDetailsModel(questions: List<Question>, answers: List<AnswerViewModel>,
- favorites: List<Question>): DetailsViewModel {
+ private fun createDetailsModel(
+ questions: List<Question>,
+ answers: List<AnswerViewModel>,
+ favorites: List<Question>
+ ): DetailsViewModel {
  val questionViewModels =
  questions.map { QuestionViewModel(it.viewCount, it.score, it.title, it.link, it.questionId) }
  val favoriteViewModels =