Skip to content

Commit 64e34b7

Browse files
committed
1 parent 2f1513d commit 64e34b7

File tree

4 files changed

+50
-44
lines changed

4 files changed

+50
-44
lines changed

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

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ import okhttp3.OkHttpClient
3434
/**
3535
* @author nekocode ([email protected])
3636
*/
37-
class GankApplication: Application() {
37+
class GankApplication : Application() {
3838
lateinit var activityRouter: ActivityRouter
3939
lateinit var broadcastRouter: BroadcastRouter
4040
lateinit var gankIoService: GankIoService
@@ -43,11 +43,11 @@ class GankApplication: Application() {
4343
super.onCreate()
4444

4545
activityRouter = Meepo.Builder()
46-
.config(UriConfig().scheme(BuildConfig.SCHEME).host(BuildConfig.APPLICATION_ID))
47-
.build().create(ActivityRouter::class.java)
46+
.config(UriConfig().scheme(BuildConfig.SCHEME).host(BuildConfig.APPLICATION_ID))
47+
.build().create(ActivityRouter::class.java)
4848
broadcastRouter = Meepo.Builder()
49-
.config(BroadcastConfig()).adapter(BroadcastCallAdapter())
50-
.build().create(BroadcastRouter::class.java)
49+
.config(BroadcastConfig()).adapter(BroadcastCallAdapter())
50+
.build().create(BroadcastRouter::class.java)
5151
gankIoService = GankIoService(OkHttpClient(), Gson())
5252
}
5353
}
@@ -57,19 +57,20 @@ fun Context.broadcastRouter() = (this.applicationContext as GankApplication).bro
5757
fun Context.gankIoService() = (this.applicationContext as GankApplication).gankIoService
5858

5959
fun Context.registerLocalReceiver(
60-
receiver: (Context?, Intent?) -> Unit, intentFilter: IntentFilter) {
60+
receiver: (Context?, Intent?) -> Unit, intentFilter: IntentFilter) {
6161

6262
LocalBroadcastManager.getInstance(this)
63-
.registerReceiver(object : BroadcastReceiver() {
64-
override fun onReceive(context: Context?, intent: Intent?) {
65-
receiver.invoke(context, intent)
66-
}
67-
}, intentFilter)
63+
.registerReceiver(object : BroadcastReceiver() {
64+
override fun onReceive(context: Context?, intent: Intent?) {
65+
receiver.invoke(context, intent)
66+
}
67+
}, intentFilter)
6868
}
69+
6970
fun Context.registerLocalReceiver(receiver: (Context?, Intent?) -> Unit, vararg actions: String) {
7071
val intentFilter = IntentFilter()
7172
actions.forEach {
7273
intentFilter.addAction(it)
7374
}
7475
registerLocalReceiver(receiver, intentFilter)
75-
}
76+
}

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

Lines changed: 19 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import io.reactivex.parallel.ParallelFlowable
2828
/**
2929
* @author nekocode ([email protected])
3030
*/
31-
open class BaseActivity: AppCompatActivity() {
31+
open class BaseActivity : AppCompatActivity() {
3232
override fun onOptionsItemSelected(item: MenuItem): Boolean {
3333
return when (item.itemId) {
3434
android.R.id.home -> {
@@ -52,21 +52,26 @@ open class BaseActivity: AppCompatActivity() {
5252
* Modified from https://github.com/uber/AutoDispose
5353
*/
5454
@CheckReturnValue
55-
fun <T> Flowable<T>.autoDisposable(): FlowableSubscribeProxy<T>
56-
= this.`as`(AutoDispose.autoDisposable(scopeProvider))
55+
fun <T> Flowable<T>.autoDisposable(): FlowableSubscribeProxy<T> =
56+
this.`as`(AutoDispose.autoDisposable(scopeProvider))
57+
5758
@CheckReturnValue
58-
fun <T> Observable<T>.autoDisposable(): ObservableSubscribeProxy<T>
59-
= this.`as`(AutoDispose.autoDisposable(scopeProvider))
59+
fun <T> Observable<T>.autoDisposable(): ObservableSubscribeProxy<T> =
60+
this.`as`(AutoDispose.autoDisposable(scopeProvider))
61+
6062
@CheckReturnValue
61-
fun <T> Single<T>.autoDisposable(): SingleSubscribeProxy<T>
62-
= this.`as`(AutoDispose.autoDisposable(scopeProvider))
63+
fun <T> Single<T>.autoDisposable(): SingleSubscribeProxy<T> =
64+
this.`as`(AutoDispose.autoDisposable(scopeProvider))
65+
6366
@CheckReturnValue
64-
fun <T> Maybe<T>.autoDisposable(): MaybeSubscribeProxy<T>
65-
= this.`as`(AutoDispose.autoDisposable(scopeProvider))
67+
fun <T> Maybe<T>.autoDisposable(): MaybeSubscribeProxy<T> =
68+
this.`as`(AutoDispose.autoDisposable(scopeProvider))
69+
6670
@CheckReturnValue
67-
fun Completable.autoDisposable(): CompletableSubscribeProxy
68-
= this.`as`(AutoDispose.autoDisposable<Any>(scopeProvider))
71+
fun Completable.autoDisposable(): CompletableSubscribeProxy =
72+
this.`as`(AutoDispose.autoDisposable<Any>(scopeProvider))
73+
6974
@CheckReturnValue
70-
fun <T> ParallelFlowable<T>.autoDisposable(): ParallelFlowableSubscribeProxy<T>
71-
= this.`as`(AutoDispose.autoDisposable(scopeProvider))
72-
}
75+
fun <T> ParallelFlowable<T>.autoDisposable(): ParallelFlowableSubscribeProxy<T> =
76+
this.`as`(AutoDispose.autoDisposable(scopeProvider))
77+
}

app/src/main/java/cn/nekocode/gank/ui/home/MainActivity.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ class MainActivity : BaseActivity() {
4343
// Register local broadcast receiver
4444
registerLocalReceiver({ _, intent ->
4545
val action = (intent ?: return@registerLocalReceiver).action
46-
?: return@registerLocalReceiver
46+
?: return@registerLocalReceiver
4747
when (action) {
4848
BroadcastRouter.FETCH_SUC -> {
4949
fetchBtn.text = getString(R.string.fetch_suc)
@@ -58,4 +58,4 @@ class MainActivity : BaseActivity() {
5858
super.onSaveInstanceState(outState)
5959
outState?.let { StateSaver.saveInstanceState(this, it) }
6060
}
61-
}
61+
}

app/src/main/java/cn/nekocode/gank/ui/pic/PicActivity.kt

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -53,27 +53,27 @@ class PicActivity : BaseActivity() {
5353
Single.just(pic!!)
5454
} else {
5555
gankIoService().picApi.getMeiziPics(1, 0)
56-
.subscribeOn(Schedulers.io())
57-
.firstOrError()
58-
.map { response ->
59-
pic = response.results[0]
60-
pic
61-
}
56+
.subscribeOn(Schedulers.io())
57+
.firstOrError()
58+
.map { response ->
59+
pic = response.results[0]
60+
pic
61+
}
6262
}
63-
.observeOn(AndroidSchedulers.mainThread())
64-
.autoDisposable()
65-
.subscribe({ pic ->
66-
title = pic.id
67-
Picasso.with(this).load(pic.url).centerCrop().fit().into(imageView)
68-
broadcastRouter().tellFetchSuc(this)
63+
.observeOn(AndroidSchedulers.mainThread())
64+
.autoDisposable()
65+
.subscribe({ pic ->
66+
title = pic.id
67+
Picasso.with(this).load(pic.url).centerCrop().fit().into(imageView)
68+
broadcastRouter().tellFetchSuc(this)
6969

70-
}, { _ ->
71-
Toast.makeText(this, R.string.sth_went_wrong, Toast.LENGTH_SHORT).show()
72-
})
70+
}, { _ ->
71+
Toast.makeText(this, R.string.sth_went_wrong, Toast.LENGTH_SHORT).show()
72+
})
7373
}
7474

7575
override fun onSaveInstanceState(outState: Bundle?) {
7676
super.onSaveInstanceState(outState)
7777
outState?.let { StateSaver.saveInstanceState(this, it) }
7878
}
79-
}
79+
}

0 commit comments

Comments
 (0)