Skip to content
Snippets Groups Projects
Commit 17e28987 authored by Janne Mareike Koschinski's avatar Janne Mareike Koschinski
Browse files

Fixed an issue with the AMOLED theme, removed debug info

parent 0ed94668
No related branches found
No related tags found
No related merge requests found
......@@ -126,14 +126,6 @@ class ChatActivity : ServiceBoundActivity() {
progressBar.toggle(
status != ConnectionState.CONNECTED && status != ConnectionState.DISCONNECTED
)
snackbar?.dismiss()
snackbar = Snackbar.make(
findViewById(R.id.toolbar),
status.name,
Snackbar.LENGTH_SHORT
)
snackbar?.show()
}
)
......
......@@ -94,18 +94,8 @@ class QuasselViewModel : ViewModel() {
bufferSyncer.liveBufferInfos().switchMap {
val info = bufferSyncer.bufferInfo(id)
val network = session.networks[info?.networkId]
if (info == null) {
Observable.just(
ToolbarFragment.BufferData(
description = "Info was null"
)
)
} else if (network == null) {
Observable.just(
ToolbarFragment.BufferData(
description = "Network was null"
)
)
if (info == null || network == null) {
Observable.just(ToolbarFragment.BufferData())
} else {
when (info.type.toInt()) {
BufferInfo.Type.QueryBuffer.toInt() -> {
......@@ -149,11 +139,7 @@ class QuasselViewModel : ViewModel() {
}
}
} else {
Observable.just(
ToolbarFragment.BufferData(
description = "buffersyncer was null"
)
)
Observable.just(ToolbarFragment.BufferData())
}
}
......
......@@ -37,7 +37,7 @@
<item name="android:windowBackground">@color/amoled_background</item>
<item name="colorBackgroundHighlight">#FFA726</item>
<item name="colorBackgroundSecondary">@null</item>
<item name="colorBackgroundCard">#303030</item>
<item name="colorBackgroundCard">#000000</item>
<item name="colorBackgroundDialog">#000000</item>
<item name="colorMarkerLine">#800000</item>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment