From 17e28987020a69a74f040109ddf80f63bb3d2ec2 Mon Sep 17 00:00:00 2001 From: Janne Koschinski <janne@kuschku.de> Date: Thu, 22 Feb 2018 13:07:21 +0100 Subject: [PATCH] Fixed an issue with the AMOLED theme, removed debug info --- .../quasseldroid_ng/ui/chat/ChatActivity.kt | 8 -------- .../ui/viewmodel/QuasselViewModel.kt | 20 +++---------------- app/src/main/res/values/themes_amoled.xml | 2 +- 3 files changed, 4 insertions(+), 26 deletions(-) diff --git a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/chat/ChatActivity.kt b/app/src/main/java/de/kuschku/quasseldroid_ng/ui/chat/ChatActivity.kt index b624fcdff..be0cc53d9 100644 --- a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/chat/ChatActivity.kt +++ b/app/src/main/java/de/kuschku/quasseldroid_ng/ui/chat/ChatActivity.kt @@ -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() } ) diff --git a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/viewmodel/QuasselViewModel.kt b/app/src/main/java/de/kuschku/quasseldroid_ng/ui/viewmodel/QuasselViewModel.kt index 7bedb147c..954983940 100644 --- a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/viewmodel/QuasselViewModel.kt +++ b/app/src/main/java/de/kuschku/quasseldroid_ng/ui/viewmodel/QuasselViewModel.kt @@ -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()) } } diff --git a/app/src/main/res/values/themes_amoled.xml b/app/src/main/res/values/themes_amoled.xml index 378dccbf5..ac7aebf6b 100644 --- a/app/src/main/res/values/themes_amoled.xml +++ b/app/src/main/res/values/themes_amoled.xml @@ -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> -- GitLab