-
Notifications
You must be signed in to change notification settings - Fork 27
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Decorating feature showing and updating offline snackbar (#189)
* Add network status feature * Add observable network status implementation * Add proper string for offline state * Update dependency and use default callbacks to avoid boilerplate * Remove exra empty lines
- Loading branch information
Showing
10 changed files
with
177 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
/build |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,27 @@ | ||
apply plugin: 'com.android.library' | ||
apply plugin: 'kotlin-android' | ||
apply plugin: 'kotlin-kapt' | ||
|
||
android { | ||
compileSdkVersion 28 | ||
defaultConfig { | ||
minSdkVersion 21 | ||
} | ||
|
||
compileOptions { | ||
sourceCompatibility JavaVersion.VERSION_1_8 | ||
targetCompatibility JavaVersion.VERSION_1_8 | ||
} | ||
} | ||
|
||
dependencies { | ||
api project(':core') | ||
api project(':core-android') | ||
|
||
kapt 'com.google.dagger:dagger-compiler:2.24' | ||
api 'com.google.dagger:dagger:2.24' | ||
|
||
implementation 'com.google.android.material:material:1.1.0-beta01' | ||
|
||
testImplementation 'junit:junit:4.12' | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
<manifest xmlns:android="http://schemas.android.com/apk/res/android" | ||
package="com.jraska.github.client.networkstatus"> | ||
|
||
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> | ||
</manifest> |
23 changes: 23 additions & 0 deletions
23
...etwork-status/src/main/java/com/jraska/github/client/networkstatus/NetworkStatusModule.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,23 @@ | ||
package com.jraska.github.client.networkstatus | ||
|
||
import android.app.Application | ||
import com.jraska.github.client.core.android.OnAppCreate | ||
import com.jraska.github.client.networkstatus.internal.NetworkStatusDisplayer | ||
import dagger.Module | ||
import dagger.Provides | ||
import dagger.multibindings.IntoSet | ||
|
||
@Module | ||
object NetworkStatusModule { | ||
@JvmStatic | ||
@Provides | ||
@IntoSet | ||
internal fun addNetworkStatusDisplayer(networkStatusDisplayer: NetworkStatusDisplayer): OnAppCreate { | ||
return object : OnAppCreate { | ||
override fun onCreate(app: Application) { | ||
val callbacks = NetworkStatusDisplayer.Callbacks(networkStatusDisplayer) | ||
app.registerActivityLifecycleCallbacks(callbacks) | ||
} | ||
} | ||
} | ||
} |
47 changes: 47 additions & 0 deletions
47
...status/src/main/java/com/jraska/github/client/networkstatus/internal/NetworkObservable.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,47 @@ | ||
package com.jraska.github.client.networkstatus.internal | ||
|
||
import android.content.Context | ||
import android.net.ConnectivityManager | ||
import android.net.Network | ||
import android.net.NetworkRequest | ||
import io.reactivex.Observable | ||
import io.reactivex.subjects.BehaviorSubject | ||
import javax.inject.Inject | ||
|
||
internal class NetworkObservable @Inject constructor( | ||
private val context: Context | ||
) { | ||
private val networkObservable: Observable<Boolean> by lazy { | ||
setupNetworkObservable() | ||
} | ||
|
||
fun connectedObservable(): Observable<Boolean> { | ||
return networkObservable | ||
} | ||
|
||
private val connectivityManager | ||
get() = context.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager | ||
|
||
private fun setupNetworkObservable(): Observable<Boolean> { | ||
val behaviorSubject = BehaviorSubject.createDefault(isConnected()) | ||
|
||
connectivityManager.registerNetworkCallback(allChangesRequest(), object : ConnectivityManager.NetworkCallback() { | ||
override fun onAvailable(network: Network) { | ||
behaviorSubject.onNext(isConnected()) | ||
} | ||
|
||
override fun onLost(network: Network) { | ||
behaviorSubject.onNext(isConnected()) | ||
} | ||
}) | ||
|
||
return behaviorSubject.distinctUntilChanged() | ||
} | ||
|
||
private fun allChangesRequest() = NetworkRequest.Builder().build() | ||
|
||
private fun isConnected(): Boolean { | ||
val activeNetwork = connectivityManager.activeNetworkInfo | ||
return activeNetwork != null && activeNetwork.isConnected | ||
} | ||
} |
67 changes: 67 additions & 0 deletions
67
...s/src/main/java/com/jraska/github/client/networkstatus/internal/NetworkStatusDisplayer.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,67 @@ | ||
package com.jraska.github.client.networkstatus.internal | ||
|
||
import android.app.Activity | ||
import android.view.View | ||
import com.google.android.material.snackbar.Snackbar | ||
import com.jraska.github.client.core.android.DefaultActivityCallbacks | ||
import com.jraska.github.client.networkstatus.R | ||
import com.jraska.github.client.rx.AppSchedulers | ||
import io.reactivex.disposables.CompositeDisposable | ||
import javax.inject.Inject | ||
|
||
internal class NetworkStatusDisplayer @Inject constructor( | ||
private val networkObservable: NetworkObservable, | ||
private val appSchedulers: AppSchedulers | ||
) { | ||
|
||
private val compositeDisposable = CompositeDisposable() | ||
private var offlineSnackbar: Snackbar? = null | ||
|
||
fun onActivityResumed(activity: Activity) { | ||
networkObservable.connectedObservable() | ||
.observeOn(appSchedulers.mainThread) | ||
.subscribe { showState(activity, it) } | ||
.also { compositeDisposable.add(it) } | ||
} | ||
|
||
fun onActivityPaused() { | ||
dismissAnySnackbar() | ||
compositeDisposable.clear() | ||
} | ||
|
||
private fun dismissAnySnackbar() { | ||
offlineSnackbar?.dismiss() | ||
offlineSnackbar = null | ||
} | ||
|
||
private fun showState(activity: Activity, isOnline: Boolean) { | ||
if (isOnline) { | ||
dismissAnySnackbar() | ||
} else { | ||
showOfflineSnackbar(activity) | ||
} | ||
} | ||
|
||
private fun showOfflineSnackbar(activity: Activity) { | ||
dismissAnySnackbar() | ||
|
||
val view = activity.findViewById<View>(android.R.id.content) | ||
|
||
val snackbar = Snackbar.make(view, R.string.status_is_offline, Snackbar.LENGTH_INDEFINITE) | ||
snackbar.show() | ||
offlineSnackbar = snackbar | ||
} | ||
|
||
internal class Callbacks( | ||
private val displayer: NetworkStatusDisplayer | ||
) : DefaultActivityCallbacks() { | ||
|
||
override fun onActivityResumed(activity: Activity) { | ||
displayer.onActivityResumed(activity) | ||
} | ||
|
||
override fun onActivityPaused(activity: Activity) { | ||
displayer.onActivityPaused() | ||
} | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
<resources> | ||
<string name="status_is_offline">You\'re offline</string> | ||
</resources> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters