Skip to content

Commit b4c1fb8

Browse files
nekocodenekocode
committed
Refactor: import dagger & viewmodel
1 parent 8c07bdc commit b4c1fb8

File tree

21 files changed

+723
-109
lines changed

21 files changed

+723
-109
lines changed

‎app/build.gradle.kts‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ dependencies {
5656
implementation("androidx.core:core-ktx:1.0.2")
5757
implementation("androidx.recyclerview:recyclerview:1.1.0-beta01")
5858
implementation("androidx.constraintlayout:constraintlayout:2.0.0-beta2")
59+
implementation("androidx.lifecycle:lifecycle-extensions:2.0.0")
5960

6061
// Navigation
6162
implementation("android.arch.navigation:navigation-fragment-ktx:1.0.0")
@@ -66,6 +67,10 @@ dependencies {
6667
implementation("com.uber.autodispose:autodispose-android:1.3.0")
6768
implementation("com.uber.autodispose:autodispose-android-archcomponents:1.3.0")
6869

70+
// Dependency injection
71+
implementation("com.google.dagger:dagger:2.24")
72+
kapt("com.google.dagger:dagger-compiler:2.24")
73+
6974
// Others
7075
implementation("com.squareup.picasso:picasso:2.71828")
7176
implementation("com.evernote:android-state:1.4.1")

‎app/src/debug/java/cn/nekocode/gank/di/module/FlipperModule.kt‎

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
package cn.nekocode.gank.di.module
2+
3+
import android.app.Application
4+
import cn.nekocode.gank.di.AppScope
5+
import com.facebook.flipper.android.AndroidFlipperClient
6+
import com.facebook.flipper.android.utils.FlipperUtils
7+
import com.facebook.flipper.core.FlipperClient
8+
import com.facebook.flipper.core.FlipperPlugin
9+
import com.facebook.flipper.core.FlipperStateUpdateListener
10+
import com.facebook.flipper.core.StateSummary
11+
import com.facebook.flipper.plugins.inspector.DescriptorMapping
12+
import com.facebook.flipper.plugins.inspector.InspectorFlipperPlugin
13+
import com.facebook.flipper.plugins.network.FlipperOkhttpInterceptor
14+
import com.facebook.flipper.plugins.network.NetworkFlipperPlugin
15+
import com.facebook.soloader.SoLoader
16+
import dagger.Module
17+
import dagger.Provides
18+
import okhttp3.OkHttpClient
19+
20+
/**
21+
* @author nekocode ([email protected])
22+
*/
23+
@Module
24+
class FlipperModule(
25+
private val app: Application,
26+
private val httpClientBuilder: OkHttpClient.Builder
27+
) {
28+
29+
@Provides
30+
@AppScope
31+
fun provideClient(): FlipperClient {
32+
return if (FlipperUtils.shouldEnableFlipper(app)) {
33+
SoLoader.init(app, false)
34+
35+
AndroidFlipperClient.getInstance(app).apply {
36+
// Layout inspecting
37+
addPlugin(
38+
InspectorFlipperPlugin(app, DescriptorMapping.withDefaults())
39+
)
40+
41+
// Network inspecting
42+
NetworkFlipperPlugin().let {
43+
addPlugin(it)
44+
httpClientBuilder.addNetworkInterceptor(FlipperOkhttpInterceptor(it))
45+
}
46+
}
47+
48+
} else {
49+
NO_OP_CLIENT
50+
}
51+
}
52+
53+
companion object {
54+
private val NO_OP_CLIENT = object : FlipperClient {
55+
override fun getState(): String? = null
56+
override fun getStateSummary(): StateSummary? = null
57+
override fun addPlugin(plugin: FlipperPlugin?) {}
58+
override fun <T : FlipperPlugin?> getPlugin(id: String?): T? = null
59+
override fun <T : FlipperPlugin?> getPluginByClass(cls: Class<T>?): T? = null
60+
override fun removePlugin(plugin: FlipperPlugin?) {}
61+
override fun start() {}
62+
override fun stop() {}
63+
override fun unsubscribe() {}
64+
override fun subscribeForUpdates(stateListener: FlipperStateUpdateListener?) {}
65+
}
66+
}
67+
}

‎app/src/main/java/cn/nekocode/gank/GankApplication.kt‎

Lines changed: 42 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -17,47 +17,60 @@
1717
package cn.nekocode.gank
1818

1919
import android.app.Application
20-
import cn.nekocode.gank.backend.Apis
21-
import com.facebook.flipper.android.AndroidFlipperClient
22-
import com.facebook.flipper.android.utils.FlipperUtils
23-
import com.facebook.flipper.plugins.inspector.DescriptorMapping
24-
import com.facebook.flipper.plugins.inspector.InspectorFlipperPlugin
25-
import com.facebook.flipper.plugins.network.FlipperOkhttpInterceptor
26-
import com.facebook.flipper.plugins.network.NetworkFlipperPlugin
27-
import com.facebook.soloader.SoLoader
20+
import android.util.Log
21+
import androidx.lifecycle.ViewModelProvider
22+
import cn.nekocode.gank.backend.di.module.ApiModule
23+
import cn.nekocode.gank.di.DaggerViewModelFactory
24+
import cn.nekocode.gank.di.component.AppComponent
25+
import cn.nekocode.gank.di.component.DaggerAppComponent
26+
import cn.nekocode.gank.di.module.AppModule
27+
import cn.nekocode.gank.di.module.FlipperModule
28+
import com.facebook.flipper.core.FlipperClient
2829
import com.google.gson.GsonBuilder
2930
import okhttp3.OkHttpClient
31+
import timber.log.Timber
32+
import javax.inject.Inject
3033

3134
/**
3235
* @author nekocode ([email protected])
3336
*/
34-
class GankApplication : Application() {
35-
lateinit var apis: Apis
37+
open class GankApplication : Application() {
38+
lateinit var component: AppComponent
39+
@Inject
40+
lateinit var flipperClient: FlipperClient
41+
@Inject
42+
lateinit var viewModelFactory: ViewModelProvider.Factory
3643

3744
override fun onCreate() {
3845
super.onCreate()
46+
component = createComponent()
47+
component.inject(this)
3948

49+
if (BuildConfig.DEBUG) {
50+
Timber.plant(Timber.DebugTree())
51+
} else {
52+
Timber.plant(CrashReportingTree())
53+
}
54+
flipperClient.start()
55+
}
56+
57+
protected open fun createComponent(): AppComponent {
4058
val httpClientBuilder = OkHttpClient.Builder()
59+
val gsonBuilder = GsonBuilder()
4160

42-
// Flipper https://fbflipper.com/docs/getting-started.html
43-
SoLoader.init(this, false)
44-
if (BuildConfig.DEBUG && FlipperUtils.shouldEnableFlipper(this)) {
45-
AndroidFlipperClient.getInstance(this).apply {
46-
// Layout inspecting
47-
addPlugin(
48-
InspectorFlipperPlugin(
49-
this@GankApplication, DescriptorMapping.withDefaults())
50-
)
51-
52-
// Network inspecting
53-
NetworkFlipperPlugin().let {
54-
addPlugin(it)
55-
httpClientBuilder.addNetworkInterceptor(FlipperOkhttpInterceptor(it))
56-
}
57-
}.start()
58-
}
61+
return DaggerAppComponent.builder()
62+
.appModule(AppModule(this))
63+
.flipperModule(FlipperModule(this, httpClientBuilder))
64+
.apiModule(ApiModule(httpClientBuilder, gsonBuilder))
65+
.build()
66+
}
5967

60-
// Components
61-
apis = Apis(httpClientBuilder, GsonBuilder())
68+
private class CrashReportingTree : Timber.Tree() {
69+
override fun log(priority: Int, tag: String?, message: String, t: Throwable?) {
70+
if (priority == Log.VERBOSE || priority == Log.DEBUG) {
71+
return
72+
}
73+
// Report
74+
}
6275
}
6376
}

‎app/src/main/java/cn/nekocode/gank/base/BaseActivity.kt‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,11 @@ package cn.nekocode.gank.base
1919
import android.annotation.SuppressLint
2020
import android.os.Bundle
2121
import androidx.appcompat.app.AppCompatActivity
22+
import androidx.fragment.app.Fragment
23+
import androidx.fragment.app.FragmentActivity
24+
import androidx.lifecycle.ViewModel
25+
import androidx.lifecycle.ViewModelProviders
26+
import cn.nekocode.gank.GankApplication
2227
import com.evernote.android.state.StateSaver
2328
import com.uber.autodispose.*
2429
import com.uber.autodispose.android.lifecycle.AndroidLifecycleScopeProvider
@@ -43,6 +48,18 @@ open class BaseActivity : AppCompatActivity() {
4348
StateSaver.saveInstanceState(this, outState)
4449
}
4550

51+
fun <T : ViewModel> getViewModel(key: String, modelClass: Class<T>) =
52+
getViewModelProvider(this).get(key, modelClass)
53+
54+
fun <T : ViewModel> getViewModel(modelClass: Class<T>) =
55+
getViewModelProvider(this).get(modelClass)
56+
57+
fun getViewModelProvider(fragment: Fragment) =
58+
ViewModelProviders.of(fragment, (application as GankApplication).viewModelFactory)
59+
60+
fun getViewModelProvider(activity: FragmentActivity) =
61+
ViewModelProviders.of(activity, (application as GankApplication).viewModelFactory)
62+
4663
/**
4764
* Modified from https://github.com/uber/AutoDispose
4865
*/

‎app/src/main/java/cn/nekocode/gank/base/BaseFragment.kt‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,27 @@
1+
/*
2+
* Copyright 2019. nekocode ([email protected])
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
117
package cn.nekocode.gank.base
218

319
import android.os.Bundle
420
import androidx.fragment.app.Fragment
21+
import androidx.fragment.app.FragmentActivity
22+
import androidx.lifecycle.ViewModel
23+
import androidx.lifecycle.ViewModelProviders
24+
import cn.nekocode.gank.GankApplication
525
import com.evernote.android.state.StateSaver
626
import com.uber.autodispose.*
727
import com.uber.autodispose.android.lifecycle.AndroidLifecycleScopeProvider
@@ -25,6 +45,18 @@ open class BaseFragment : Fragment() {
2545
StateSaver.saveInstanceState(this, outState)
2646
}
2747

48+
fun <T : ViewModel> getViewModel(key: String, modelClass: Class<T>) =
49+
getViewModelProvider(this).get(key, modelClass)
50+
51+
fun <T : ViewModel> getViewModel(modelClass: Class<T>) =
52+
getViewModelProvider(this).get(modelClass)
53+
54+
fun getViewModelProvider(fragment: Fragment) =
55+
ViewModelProviders.of(fragment, (requireActivity().application as GankApplication).viewModelFactory)
56+
57+
fun getViewModelProvider(activity: FragmentActivity) =
58+
ViewModelProviders.of(activity, (requireActivity().application as GankApplication).viewModelFactory)
59+
2860
/**
2961
* Modified from https://github.com/uber/AutoDispose
3062
*/

‎app/src/main/java/cn/nekocode/gank/base/BaseViewModel.kt‎

Lines changed: 98 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,98 @@
1+
/*
2+
* Copyright 2019. nekocode ([email protected])
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
17+
package cn.nekocode.gank.base
18+
19+
import androidx.lifecycle.ViewModel
20+
import com.uber.autodispose.*
21+
import com.uber.autodispose.lifecycle.CorrespondingEventsFunction
22+
import com.uber.autodispose.lifecycle.LifecycleEndedException
23+
import com.uber.autodispose.lifecycle.LifecycleScopeProvider
24+
import io.reactivex.*
25+
import io.reactivex.annotations.CheckReturnValue
26+
import io.reactivex.parallel.ParallelFlowable
27+
import io.reactivex.subjects.BehaviorSubject
28+
import timber.log.Timber
29+
30+
/**
31+
* Copied and modified from: https://github.com/uber/AutoDispose
32+
*
33+
* @author nekocode ([email protected])
34+
*/
35+
open class BaseViewModel : ViewModel(), LifecycleScopeProvider<BaseViewModel.ViewModelEvent> {
36+
private val lifecycleEventsDelegate = lazy { BehaviorSubject.createDefault(ViewModelEvent.CREATED) }
37+
private val lifecycleEvents by lifecycleEventsDelegate
38+
39+
enum class ViewModelEvent {
40+
CREATED, CLEARED
41+
}
42+
43+
companion object {
44+
private val CORRESPONDING_EVENTS = CorrespondingEventsFunction<ViewModelEvent> { event ->
45+
when (event) {
46+
ViewModelEvent.CREATED -> ViewModelEvent.CLEARED
47+
else -> throw LifecycleEndedException(
48+
"Cannot bind to ViewModel lifecycle after onCleared."
49+
)
50+
}
51+
}
52+
}
53+
54+
override fun lifecycle(): Observable<ViewModelEvent> {
55+
return lifecycleEvents.hide()
56+
}
57+
58+
override fun correspondingEvents(): CorrespondingEventsFunction<ViewModelEvent>? {
59+
return CORRESPONDING_EVENTS
60+
}
61+
62+
override fun peekLifecycle(): ViewModelEvent? {
63+
return lifecycleEvents.value
64+
}
65+
66+
override fun onCleared() {
67+
// Small optimization
68+
if (lifecycleEventsDelegate.isInitialized()) {
69+
lifecycleEvents.onNext(ViewModelEvent.CLEARED)
70+
}
71+
72+
super.onCleared()
73+
}
74+
75+
@CheckReturnValue
76+
fun <T> Flowable<T>.autoDisposable(): FlowableSubscribeProxy<T> =
77+
this.`as`(AutoDispose.autoDisposable(this@BaseViewModel))
78+
79+
@CheckReturnValue
80+
fun <T> Observable<T>.autoDisposable(): ObservableSubscribeProxy<T> =
81+
this.`as`(AutoDispose.autoDisposable(this@BaseViewModel))
82+
83+
@CheckReturnValue
84+
fun <T> Single<T>.autoDisposable(): SingleSubscribeProxy<T> =
85+
this.`as`(AutoDispose.autoDisposable(this@BaseViewModel))
86+
87+
@CheckReturnValue
88+
fun <T> Maybe<T>.autoDisposable(): MaybeSubscribeProxy<T> =
89+
this.`as`(AutoDispose.autoDisposable(this@BaseViewModel))
90+
91+
@CheckReturnValue
92+
fun Completable.autoDisposable(): CompletableSubscribeProxy =
93+
this.`as`(AutoDispose.autoDisposable<Any>(this@BaseViewModel))
94+
95+
@CheckReturnValue
96+
fun <T> ParallelFlowable<T>.autoDisposable(): ParallelFlowableSubscribeProxy<T> =
97+
this.`as`(AutoDispose.autoDisposable(this@BaseViewModel))
98+
}

‎app/src/main/java/cn/nekocode/gank/di/ActivityScope.kt‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
/*
2+
* Copyright 2019. nekocode ([email protected])
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
17+
package cn.nekocode.gank.di
18+
19+
import javax.inject.Scope
20+
21+
/**
22+
* @author nekocode ([email protected])
23+
*/
24+
@Scope
25+
@Retention(AnnotationRetention.RUNTIME)
26+
annotation class ActivityScope

0 commit comments

Comments
 (0)