Skip to content

Commit 33aa468

Browse files
committed
Apply official Kotlin code style.
1 parent 656a8b2 commit 33aa468

36 files changed

+262
-160
lines changed

README.md

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -60,13 +60,9 @@ Here are some useful Gradle/adb commands for executing this example:
6060
## Discussions
6161
Refer to the issues section: https://github.com/android10/Android-CleanArchitecture-Kotlin/issues
6262

63-
## Code style
64-
Here you can download and install the java codestyle.
65-
https://github.com/android10/java-code-styles
66-
6763
## License
6864

69-
Copyright 2018 Fernando Cejas
65+
Copyright 2021 Fernando Cejas
7066

7167
Licensed under the Apache License, Version 2.0 (the "License");
7268
you may not use this file except in compliance with the License.

app/src/main/kotlin/com/fernandocejas/sample/core/di/ApplicationModule.kt

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,22 +31,27 @@ import javax.inject.Singleton
3131
@InstallIn(SingletonComponent::class)
3232
class ApplicationModule {
3333

34-
@Provides @Singleton fun provideRetrofit(): Retrofit {
34+
@Provides
35+
@Singleton
36+
fun provideRetrofit(): Retrofit {
3537
return Retrofit.Builder()
36-
.baseUrl("https://raw.githubusercontent.com/android10/Sample-Data/master/Android-CleanArchitecture-Kotlin/")
37-
.client(createClient())
38-
.addConverterFactory(GsonConverterFactory.create())
39-
.build()
38+
.baseUrl("https://raw.githubusercontent.com/android10/Sample-Data/master/Android-CleanArchitecture-Kotlin/")
39+
.client(createClient())
40+
.addConverterFactory(GsonConverterFactory.create())
41+
.build()
4042
}
4143

4244
private fun createClient(): OkHttpClient {
4345
val okHttpClientBuilder: OkHttpClient.Builder = OkHttpClient.Builder()
4446
if (BuildConfig.DEBUG) {
45-
val loggingInterceptor = HttpLoggingInterceptor().setLevel(HttpLoggingInterceptor.Level.BASIC)
47+
val loggingInterceptor =
48+
HttpLoggingInterceptor().setLevel(HttpLoggingInterceptor.Level.BASIC)
4649
okHttpClientBuilder.addInterceptor(loggingInterceptor)
4750
}
4851
return okHttpClientBuilder.build()
4952
}
5053

51-
@Provides @Singleton fun provideMoviesRepository(dataSource: MoviesRepository.Network): MoviesRepository = dataSource
54+
@Provides
55+
@Singleton
56+
fun provideMoviesRepository(dataSource: MoviesRepository.Network): MoviesRepository = dataSource
5257
}

app/src/main/kotlin/com/fernandocejas/sample/core/exception/Failure.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,5 +24,5 @@ sealed class Failure {
2424
object ServerError : Failure()
2525

2626
/** * Extend this class for feature specific failures.*/
27-
abstract class FeatureFailure: Failure()
27+
abstract class FeatureFailure : Failure()
2828
}

app/src/main/kotlin/com/fernandocejas/sample/core/extension/Context.kt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,6 @@ package com.fernandocejas.sample.core.extension
1818
import android.content.Context
1919
import android.net.ConnectivityManager
2020

21-
val Context.connectivityManager: ConnectivityManager get() =
22-
this.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
21+
val Context.connectivityManager: ConnectivityManager
22+
get() =
23+
this.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager

app/src/main/kotlin/com/fernandocejas/sample/core/extension/Fragment.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import com.fernandocejas.sample.core.platform.BaseFragment
2424
import kotlinx.android.synthetic.main.activity_layout.*
2525

2626
inline fun FragmentManager.inTransaction(func: FragmentTransaction.() -> FragmentTransaction) =
27-
beginTransaction().func().commit()
27+
beginTransaction().func().commit()
2828

2929
fun BaseFragment.close() = fragmentManager?.popBackStack()
3030

app/src/main/kotlin/com/fernandocejas/sample/core/extension/Lifecycle.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import androidx.lifecycle.Observer
2121
import com.fernandocejas.sample.core.exception.Failure
2222

2323
fun <T : Any, L : LiveData<T>> LifecycleOwner.observe(liveData: L, body: (T?) -> Unit) =
24-
liveData.observe(this, Observer(body))
24+
liveData.observe(this, Observer(body))
2525

2626
fun <L : LiveData<Failure>> LifecycleOwner.failure(liveData: L, body: (Failure?) -> Unit) =
27-
liveData.observe(this, Observer(body))
27+
liveData.observe(this, Observer(body))

app/src/main/kotlin/com/fernandocejas/sample/core/extension/View.kt

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,16 @@ fun View.cancelTransition() {
3535

3636
fun View.isVisible() = this.visibility == View.VISIBLE
3737

38-
fun View.visible() { this.visibility = View.VISIBLE }
38+
fun View.visible() {
39+
this.visibility = View.VISIBLE
40+
}
3941

40-
fun View.invisible() { this.visibility = View.GONE }
42+
fun View.invisible() {
43+
this.visibility = View.GONE
44+
}
4145

4246
fun ViewGroup.inflate(@LayoutRes layoutRes: Int): View =
43-
LayoutInflater.from(context).inflate(layoutRes, this, false)
47+
LayoutInflater.from(context).inflate(layoutRes, this, false)
4448

4549
fun ImageView.loadFromUrl(url: String) =
4650
Glide.with(this.context.applicationContext)
@@ -53,7 +57,8 @@ fun ImageView.loadUrlAndPostponeEnterTransition(url: String, activity: FragmentA
5357
Glide.with(context.applicationContext).load(url).into(target)
5458
}
5559

56-
private class ImageViewBaseTarget (var imageView: ImageView?, var activity: FragmentActivity?) : BaseTarget<Drawable>() {
60+
private class ImageViewBaseTarget(var imageView: ImageView?, var activity: FragmentActivity?) :
61+
BaseTarget<Drawable>() {
5762
override fun onLoadFailed(errorDrawable: Drawable?) {
5863
super.onLoadFailed(errorDrawable)
5964
activity?.supportStartPostponedEnterTransition()

app/src/main/kotlin/com/fernandocejas/sample/core/functional/Either.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ sealed class Either<out L, out R> {
4949
*/
5050
fun <L> left(a: L) = Either.Left(a)
5151

52-
52+
5353
/**
5454
* Creates a Left type.
5555
* @see Right

app/src/main/kotlin/com/fernandocejas/sample/core/interactor/UseCase.kt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,11 @@ abstract class UseCase<out Type, in Params> where Type : Any {
3131

3232
abstract suspend fun run(params: Params): Either<Failure, Type>
3333

34-
operator fun invoke(params: Params, scope: CoroutineScope = GlobalScope, onResult: (Either<Failure, Type>) -> Unit = {}) {
34+
operator fun invoke(
35+
params: Params,
36+
scope: CoroutineScope = GlobalScope,
37+
onResult: (Either<Failure, Type>) -> Unit = {}
38+
) {
3539
scope.launch(Dispatchers.Main) {
3640
val deferred = async(Dispatchers.IO) {
3741
run(params)

app/src/main/kotlin/com/fernandocejas/sample/core/navigation/Navigator.kt

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@ import android.view.View
2323
import android.widget.ImageView
2424
import androidx.core.app.ActivityOptionsCompat
2525
import androidx.fragment.app.FragmentActivity
26+
import com.fernandocejas.sample.core.extension.empty
2627
import com.fernandocejas.sample.features.login.Authenticator
2728
import com.fernandocejas.sample.features.login.LoginActivity
2829
import com.fernandocejas.sample.features.movies.MovieDetailsActivity
2930
import com.fernandocejas.sample.features.movies.MovieView
3031
import com.fernandocejas.sample.features.movies.MoviesActivity
31-
import com.fernandocejas.sample.core.extension.empty
3232
import javax.inject.Inject
3333
import javax.inject.Singleton
3434

@@ -37,7 +37,8 @@ import javax.inject.Singleton
3737
class Navigator
3838
@Inject constructor(private val authenticator: Authenticator) {
3939

40-
private fun showLogin(context: Context) = context.startActivity(LoginActivity.callingIntent(context))
40+
private fun showLogin(context: Context) =
41+
context.startActivity(LoginActivity.callingIntent(context))
4142

4243
fun showMain(context: Context) {
4344
when (authenticator.userLoggedIn()) {
@@ -46,13 +47,14 @@ class Navigator
4647
}
4748
}
4849

49-
private fun showMovies(context: Context) = context.startActivity(MoviesActivity.callingIntent(context))
50+
private fun showMovies(context: Context) =
51+
context.startActivity(MoviesActivity.callingIntent(context))
5052

5153
fun showMovieDetails(activity: FragmentActivity, movie: MovieView, navigationExtras: Extras) {
5254
val intent = MovieDetailsActivity.callingIntent(activity, movie)
5355
val sharedView = navigationExtras.transitionSharedElement as ImageView
5456
val activityOptions = ActivityOptionsCompat
55-
.makeSceneTransitionAnimation(activity, sharedView, sharedView.transitionName)
57+
.makeSceneTransitionAnimation(activity, sharedView, sharedView.transitionName)
5658
activity.startActivity(intent, activityOptions.toBundle())
5759
}
5860

@@ -70,7 +72,10 @@ class Navigator
7072
private fun createYoutubeIntent(videoUrl: String): Intent {
7173
val videoId = when {
7274
videoUrl.startsWith(VIDEO_URL_HTTP) -> videoUrl.replace(VIDEO_URL_HTTP, String.empty())
73-
videoUrl.startsWith(VIDEO_URL_HTTPS) -> videoUrl.replace(VIDEO_URL_HTTPS, String.empty())
75+
videoUrl.startsWith(VIDEO_URL_HTTPS) -> videoUrl.replace(
76+
VIDEO_URL_HTTPS,
77+
String.empty()
78+
)
7479
else -> videoUrl
7580
}
7681

0 commit comments

Comments
 (0)