Cleanup generic functions & classes (#58)

* Make some generic types extend Any instead of Any?

* Merge custom observers

* Cleanup observableFields

* Prevent unsafeLazy return nullable value

Author: Goooler

base/src/main/kotlin/io/goooler/demoapp/base/util/BaseExtensions.kt

@@ -32,7 +32,6 @@ import androidx.core.os.bundleOf
 import androidx.core.text.parseAsHtml
 import androidx.core.text.toSpannable
 import androidx.databinding.DataBindingUtil
-import androidx.databinding.ObservableField
 import androidx.databinding.ViewDataBinding
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentActivity
@@ -91,10 +90,6 @@ typealias MutableStringLiveData = MutableLiveData<String?>
 
 typealias MutableListLiveData<T> = MutableLiveData<List<T>>
 
-typealias ObservableString = ObservableField<String?>
-
-typealias ObservableList<T> = ObservableField<List<T>>
-
 typealias ParamMap = HashMap<String, Any>
 
 // ---------------------Any-------------------------------//
@@ -107,7 +102,8 @@ inline val currentThreadName: String get() = Thread.currentThread().name
 
 inline val isMainThread: Boolean get() = Looper.getMainLooper() == Looper.myLooper()
 
-fun <T> unsafeLazy(initializer: () -> T): Lazy<T> = lazy(LazyThreadSafetyMode.NONE, initializer)
+fun <T : Any> unsafeLazy(initializer: () -> T): Lazy<T> =
+  lazy(LazyThreadSafetyMode.NONE, initializer)
 
 fun <T> MutableLiveData<T>.asLiveData(): LiveData<T> = this
 

common/src/main/kotlin/io/goooler/demoapp/common/util/CommonExtensions.kt

@@ -183,19 +183,19 @@ fun Number.formatMoney(isYuan: Boolean = false, trans2W: Boolean = false, scale:
 
 // ---------------------Rx-------------------------------//
 
-fun <T> Single<T>.subscribeOnIoThread(): Single<T> = subscribeOn(Schedulers.io())
+fun <T : Any> Single<T>.subscribeOnIoThread(): Single<T> = subscribeOn(Schedulers.io())
 
-fun <T> Single<T>.observeOnMainThread(): Single<T> = observeOn(AndroidSchedulers.mainThread())
+fun <T : Any> Single<T>.observeOnMainThread(): Single<T> = observeOn(AndroidSchedulers.mainThread())
 
-fun <T> Single<T>.subscribeAndObserve(): Single<T> =
+fun <T : Any> Single<T>.subscribeAndObserve(): Single<T> =
   subscribeOnIoThread().observeOnMainThread()
 
-fun <T> Observable<T>.subscribeOnIoThread(): Observable<T> = subscribeOn(Schedulers.io())
+fun <T : Any> Observable<T>.subscribeOnIoThread(): Observable<T> = subscribeOn(Schedulers.io())
 
-fun <T> Observable<T>.observeOnMainThread(): Observable<T> =
+fun <T : Any> Observable<T>.observeOnMainThread(): Observable<T> =
   observeOn(AndroidSchedulers.mainThread())
 
-fun <T> Observable<T>.subscribeAndObserve(): Observable<T> =
+fun <T : Any> Observable<T>.subscribeAndObserve(): Observable<T> =
   subscribeOnIoThread().observeOnMainThread()
 
 // ---------------------Res-------------------------------//

test/src/main/kotlin/io/goooler/demoapp/test/network/exception/CustomObservableObserver.kt

@@ -1,13 +1,21 @@
 package io.goooler.demoapp.test.network.exception
 
 import io.goooler.demoapp.common.network.BaseResponse
+import io.reactivex.rxjava3.observers.DisposableObserver
 import io.reactivex.rxjava3.observers.DisposableSingleObserver
 
-abstract class CustomSingleObserver<T : BaseResponse> :
-  DisposableSingleObserver<T>(),
+sealed interface CustomObserver<T : Any> {
+
+  fun onCustomSuccess(t: T)
+
+  fun onCustomError(e: ResponseException)
+}
+
+abstract class CustomObservableObserver<T : BaseResponse> :
+  DisposableObserver<T>(),
   CustomObserver<T> {
 
-  override fun onSuccess(t: T) {
+  override fun onNext(t: T) {
     if (t.code == 200)
       onCustomSuccess(t)
     else
@@ -17,11 +25,22 @@ abstract class CustomSingleObserver<T : BaseResponse> :
   override fun onError(e: Throwable) {
     onCustomError(e.toResponseException())
   }
+
+  override fun onComplete() {}
 }
 
-sealed interface CustomObserver<T> {
+abstract class CustomSingleObserver<T : BaseResponse> :
+  DisposableSingleObserver<T>(),
+  CustomObserver<T> {
 
-  fun onCustomSuccess(t: T)
+  override fun onSuccess(t: T) {
+    if (t.code == 200)
+      onCustomSuccess(t)
+    else
+      onCustomError((t.message ?: t.code.toString()).toResponseException())
+  }
 
-  fun onCustomError(e: ResponseException)
+  override fun onError(e: Throwable) {
+    onCustomError(e.toResponseException())
+  }
 }