Skip to content
Snippets Groups Projects
Verified Commit 2b2e1e81 authored by Janne Mareike Koschinski's avatar Janne Mareike Koschinski
Browse files

Fixes #173

parent f6566eae
No related branches found
No related tags found
No related merge requests found
Pipeline #321 passed
...@@ -307,9 +307,9 @@ class BufferViewConfigFragment : ServiceBoundFragment() { ...@@ -307,9 +307,9 @@ class BufferViewConfigFragment : ServiceBoundFragment() {
val activities = activityList.associate { it.bufferId to it.filtered } val activities = activityList.associate { it.bufferId to it.filtered }
val processedList = list.asSequence().sortedBy { props -> val processedList = list.asSequence().sortedBy { props ->
!props.info.type.hasFlag(Buffer_Type.StatusBuffer) !props.info.type.hasFlag(Buffer_Type.StatusBuffer)
}.sortedBy { props -> }.sortedWith(compareBy(String.CASE_INSENSITIVE_ORDER) { props ->
props.network.networkName props.network.networkName
}.map { props -> }).map { props ->
val activity = props.activity - (activities[props.info.bufferId] val activity = props.activity - (activities[props.info.bufferId]
?: account?.defaultFiltered ?: account?.defaultFiltered
?: 0) ?: 0)
......
...@@ -128,7 +128,7 @@ class CoreSettingsFragment : ServiceBoundFragment() { ...@@ -128,7 +128,7 @@ class CoreSettingsFragment : ServiceBoundFragment() {
combineLatest(it.values.map(Network::liveNetworkInfo)).map { combineLatest(it.values.map(Network::liveNetworkInfo)).map {
it.map { it.map {
SettingsItem(it.networkId, it.networkName) SettingsItem(it.networkId, it.networkName)
}.sortedBy(SettingsItem::name) }.sortedWith(compareBy(String.CASE_INSENSITIVE_ORDER, SettingsItem::name))
} }
} }
}.toLiveData().observe(this, Observer { }.toLiveData().observe(this, Observer {
......
...@@ -115,7 +115,7 @@ abstract class ChatListBaseFragment(private val initDefault: Boolean) : ...@@ -115,7 +115,7 @@ abstract class ChatListBaseFragment(private val initDefault: Boolean) :
viewModel.networks.switchMap { viewModel.networks.switchMap {
combineLatest(it.values.map(Network::liveNetworkInfo)).map { combineLatest(it.values.map(Network::liveNetworkInfo)).map {
it.sortedBy(INetwork.NetworkInfo::networkName) it.sortedWith(compareBy(String.CASE_INSENSITIVE_ORDER, INetwork.NetworkInfo::networkName))
} }
}.toLiveData().observe(this, Observer { }.toLiveData().observe(this, Observer {
if (it != null) { if (it != null) {
......
...@@ -22,8 +22,7 @@ ...@@ -22,8 +22,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent">
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" android:orientation="vertical"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment