Skip to content

Commit d6d571d

Browse files
enginebaienginebai
authored
Reformat the whole project
* Apple Kotlin style guideline. * Use 4 spaces as indents (not tab character)
1 parent 9d93191 commit d6d571d

File tree

13 files changed

+177
-169
lines changed

13 files changed

+177
-169
lines changed

‎app/src/main/java/com/enginebai/project/MainActivity.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ import com.enginebai.base.view.BaseActivity
44

55
// TODO: 3. rename the package for your project
66
class MainActivity : BaseActivity() {
7-
override fun getLayoutId() = R.layout.activity_main
7+
override fun getLayoutId() = R.layout.activity_main
88

9-
override fun handleErrorMessage(message: String) {
10-
TODO("Not yet implemented")
11-
}
9+
override fun handleErrorMessage(message: String) {
10+
TODO("Not yet implemented")
11+
}
1212
}

‎base/src/main/java/com/enginebai/base/BaseApplication.kt

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -19,30 +19,30 @@ import timber.log.Timber
1919

2020
abstract class BaseApplication : Application() {
2121

22-
abstract fun defineDependencies(): List<Module>
22+
abstract fun defineDependencies(): List<Module>
2323

24-
override fun onCreate() {
25-
super.onCreate()
26-
dependenciesInjection()
27-
initLogging()
28-
}
24+
override fun onCreate() {
25+
super.onCreate()
26+
dependenciesInjection()
27+
initLogging()
28+
}
2929

30-
private fun dependenciesInjection() {
31-
startKoin {
32-
androidLogger(level = Level.INFO)
33-
androidContext(this@BaseApplication)
34-
val dependencies =
35-
mutableListOf(gsonModule, errorHandleModule, networkModule, loggingModule).apply {
36-
addAll(defineDependencies())
37-
}
38-
modules(dependencies)
39-
}
40-
}
30+
private fun dependenciesInjection() {
31+
startKoin {
32+
androidLogger(level = Level.INFO)
33+
androidContext(this@BaseApplication)
34+
val dependencies =
35+
mutableListOf(gsonModule, errorHandleModule, networkModule, loggingModule).apply {
36+
addAll(defineDependencies())
37+
}
38+
modules(dependencies)
39+
}
40+
}
4141

42-
private fun initLogging() {
43-
val formatStrategy: FormatStrategy = get()
44-
val logAdapter: AndroidLogAdapter = get { parametersOf(formatStrategy) }
45-
Logger.addLogAdapter(logAdapter)
46-
Timber.plant(get())
47-
}
42+
private fun initLogging() {
43+
val formatStrategy: FormatStrategy = get()
44+
val logAdapter: AndroidLogAdapter = get { parametersOf(formatStrategy) }
45+
Logger.addLogAdapter(logAdapter)
46+
Timber.plant(get())
47+
}
4848
}

‎base/src/main/java/com/enginebai/base/extensions/EditTextExt.kt

Lines changed: 48 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package com.enginebai.base.extensions
22

33
import android.text.Editable
4-
import android.text.InputFilter
54
import android.text.TextWatcher
65
import android.text.method.HideReturnsTransformationMethod
76
import android.text.method.PasswordTransformationMethod
@@ -16,41 +15,41 @@ import io.reactivex.subjects.PublishSubject
1615
* @return TextWatcher remember to remove when no longer use it anymore.
1716
*/
1817
fun EditText.textChanged(listener: (String) -> Unit): TextWatcher {
19-
val textWatcher = object : TextWatcher {
20-
override fun afterTextChanged(s: Editable?) {
21-
listener.invoke(s?.toString() ?: "")
22-
}
18+
val textWatcher = object : TextWatcher {
19+
override fun afterTextChanged(s: Editable?) {
20+
listener.invoke(s?.toString() ?: "")
21+
}
2322

24-
override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {}
25-
override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {}
26-
}
27-
this.addTextChangedListener(textWatcher)
28-
return textWatcher
23+
override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {}
24+
override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {}
25+
}
26+
this.addTextChangedListener(textWatcher)
27+
return textWatcher
2928
}
3029

3130
fun EditText.textChanged(): Observable<out CharSequence> {
32-
val source: PublishSubject<String> = PublishSubject.create()
33-
val textWatcher = TextChangeWatcher(source)
34-
addTextChangedListener(textWatcher)
35-
return source.doOnDispose {
36-
textWatcher.unsubscribe()
37-
removeTextChangedListener(textWatcher)
38-
}
31+
val source: PublishSubject<String> = PublishSubject.create()
32+
val textWatcher = TextChangeWatcher(source)
33+
addTextChangedListener(textWatcher)
34+
return source.doOnDispose {
35+
textWatcher.unsubscribe()
36+
removeTextChangedListener(textWatcher)
37+
}
3938
}
4039

4140
private class TextChangeWatcher(private var publisher: PublishSubject<String>? = null) :
42-
TextWatcher {
41+
TextWatcher {
4342

44-
override fun afterTextChanged(s: Editable?) {
45-
publisher?.onNext(s?.toString() ?: "")
46-
}
43+
override fun afterTextChanged(s: Editable?) {
44+
publisher?.onNext(s?.toString() ?: "")
45+
}
4746

48-
override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {}
49-
override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {}
47+
override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {}
48+
override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {}
5049

51-
fun unsubscribe() {
52-
publisher = null
53-
}
50+
fun unsubscribe() {
51+
publisher = null
52+
}
5453
}
5554

5655
/**
@@ -60,49 +59,52 @@ private class TextChangeWatcher(private var publisher: PublishSubject<String>? =
6059
* @return TextWatcher remember to remove when no longer use it anymore.
6160
*/
6261
fun EditText.validate(errorMessage: String, validator: (String) -> Boolean): TextWatcher {
63-
fun showErrorIfInvalid(s: String) {
64-
this.error = if (validator(s)) null else errorMessage
65-
}
66-
// validate original text
67-
showErrorIfInvalid(this.text.toString())
68-
// validate changed text
69-
return this.textChanged { showErrorIfInvalid(it) }
62+
fun showErrorIfInvalid(s: String) {
63+
this.error = if (validator(s)) null else errorMessage
64+
}
65+
// validate original text
66+
showErrorIfInvalid(this.text.toString())
67+
// validate changed text
68+
return this.textChanged { showErrorIfInvalid(it) }
7069
}
7170

7271
/**
7372
* Validate if input is valid email, and invoke either valid or invalid listener.
7473
* @return TextWatcher remember to remove when no longer use it anymore.
7574
*/
76-
fun EditText.validateEmail(validListener: (String) -> Unit, invalidListener: (String) -> Unit = {}): TextWatcher {
77-
return this.textChanged {
78-
if (it.isValidEmail()) validListener(it)
79-
else invalidListener(it)
80-
}
75+
fun EditText.validateEmail(
76+
validListener: (String) -> Unit,
77+
invalidListener: (String) -> Unit = {}
78+
): TextWatcher {
79+
return this.textChanged {
80+
if (it.isValidEmail()) validListener(it)
81+
else invalidListener(it)
82+
}
8183
}
8284

8385
/**
8486
* Validate if input is valid email, and display error if invalid. * @return TextWatcher remember to remove when no longer use it anymore.
8587
* @return TextWatcher remember to remove when no longer use it anymore.
8688
*/
8789
fun EditText.validateEmail(errorMessage: String): TextWatcher {
88-
return validate(errorMessage) { it.isValidEmail() }
90+
return validate(errorMessage) { it.isValidEmail() }
8991
}
9092

9193
/**
9294
* Validate if input is valid email and return result as stream.
9395
*/
9496
fun EditText.validateEmail(): Single<Boolean> {
95-
return Single.fromObservable(this.textChanged()).flatMap {
96-
Single.just(it.toString().isValidEmail())
97-
}
97+
return Single.fromObservable(this.textChanged()).flatMap {
98+
Single.just(it.toString().isValidEmail())
99+
}
98100
}
99101

100102
fun EditText.showPassword() {
101-
transformationMethod = HideReturnsTransformationMethod.getInstance()
102-
selectAll()
103+
transformationMethod = HideReturnsTransformationMethod.getInstance()
104+
selectAll()
103105
}
104106

105107
fun EditText.hidePassword() {
106-
transformationMethod = PasswordTransformationMethod.getInstance()
107-
selectAll()
108+
transformationMethod = PasswordTransformationMethod.getInstance()
109+
selectAll()
108110
}

‎base/src/main/java/com/enginebai/base/extensions/StringExt.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
package com.enginebai.base.extensions
22

3-
import android.util.Patterns
43
import androidx.core.util.PatternsCompat
54

65
fun String?.isValidEmail(): Boolean {
7-
return PatternsCompat.EMAIL_ADDRESS.matcher(this ?: "").matches()
6+
return PatternsCompat.EMAIL_ADDRESS.matcher(this ?: "").matches()
87
}

‎base/src/main/java/com/enginebai/base/extensions/TextViewExt.kt

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,19 @@
11
package com.enginebai.base.extensions
22

3-
import android.view.View
43
import android.widget.TextView
54

65
/**
76
* Set view visible when text is not null or blank, else set view gone.
87
*/
98
fun TextView.setTextWithExistence(s: String?) {
10-
s?.let { this.text = it }
11-
setExistence(!s.isNullOrBlank())
9+
s?.let { this.text = it }
10+
setExistence(!s.isNullOrBlank())
1211
}
1312

1413
/**
1514
* Set view visible when text is not null or blank, else set view invisible.
1615
*/
1716
fun TextView.setTextWithVisibility(s: String?) {
18-
s?.let { this.text = it }
19-
setVisible(!s.isNullOrBlank())
17+
s?.let { this.text = it }
18+
setVisible(!s.isNullOrBlank())
2019
}

0 commit comments

Comments
 (0)