Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 32f8472

Browse files
committedNov 28, 2020
Remove some dependency injection modules and MainActivity to let developer to configure by themselves
1 parent 5df3dff commit 32f8472

File tree

8 files changed

+2
-180
lines changed

8 files changed

+2
-180
lines changed
 

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

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎app/src/main/res/values/strings.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
<resources>
22
<string name="app_name">Base</string>
3+
<string name="error_network_fail">Looks like your are offline.</string>
34
</resources>

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

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
package com.enginebai.base
22

33
import android.app.Application
4-
import com.enginebai.base.di.errorHandleModule
5-
import com.enginebai.base.di.gsonModule
6-
import com.enginebai.base.di.loggingModule
7-
import com.enginebai.base.di.networkModule
84
import com.orhanobut.logger.AndroidLogAdapter
95
import com.orhanobut.logger.FormatStrategy
106
import com.orhanobut.logger.Logger
@@ -31,11 +27,7 @@ abstract class BaseApplication : Application() {
3127
startKoin {
3228
androidLogger(level = Level.INFO)
3329
androidContext(this@BaseApplication)
34-
val dependencies =
35-
mutableListOf(gsonModule, errorHandleModule, networkModule, loggingModule).apply {
36-
addAll(defineDependencies())
37-
}
38-
modules(dependencies)
30+
modules(defineDependencies())
3931
}
4032
}
4133

‎base/src/main/java/com/enginebai/base/di/NetworkModule.kt

Lines changed: 0 additions & 38 deletions
This file was deleted.

‎base/src/main/java/com/enginebai/base/di/UtilsModule.kt

Lines changed: 0 additions & 40 deletions
This file was deleted.

‎base/src/main/java/com/enginebai/base/utils/RxErrorHandler.kt

Lines changed: 0 additions & 52 deletions
This file was deleted.

‎base/src/main/java/com/enginebai/base/view/BaseActivity.kt

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,12 @@ package com.enginebai.base.view
33
import android.os.Bundle
44
import androidx.annotation.LayoutRes
55
import androidx.appcompat.app.AppCompatActivity
6-
import com.enginebai.base.utils.RxErrorHandler
7-
import io.reactivex.android.schedulers.AndroidSchedulers
86
import io.reactivex.disposables.CompositeDisposable
97
import io.reactivex.disposables.Disposable
10-
import org.koin.android.ext.android.inject
11-
import java.util.concurrent.TimeUnit
128

139
abstract class BaseActivity : AppCompatActivity() {
1410

1511
private val disposables = CompositeDisposable()
16-
private val rxErrorHandler: RxErrorHandler by inject()
17-
private var rxErrorDisposable: Disposable? = null
1812

1913
@LayoutRes
2014
abstract fun getLayoutId(): Int
@@ -26,25 +20,6 @@ abstract class BaseActivity : AppCompatActivity() {
2620
setContentView(getLayoutId())
2721
}
2822

29-
override fun onStart() {
30-
super.onStart()
31-
if (null == rxErrorDisposable || false == rxErrorDisposable?.isDisposed) {
32-
rxErrorDisposable = rxErrorHandler.errorMessageToDisplay
33-
.filter { it.isNotBlank() }
34-
.throttleFirst(2, TimeUnit.SECONDS)
35-
.observeOn(AndroidSchedulers.mainThread())
36-
.doOnNext { handleErrorMessage(it) }
37-
.subscribe()
38-
.disposeOnDestroy()
39-
}
40-
}
41-
42-
override fun onStop() {
43-
super.onStop()
44-
rxErrorDisposable?.dispose()
45-
}
46-
47-
4823
override fun onDestroy() {
4924
disposables.clear()
5025
super.onDestroy()

‎base/src/main/res/values/strings.xml

Lines changed: 0 additions & 4 deletions
This file was deleted.

0 commit comments

Comments
 (0)
Please sign in to comment.