From 2b2e1e8100f73db50ef3e3ab93f5e1aa6385b72e Mon Sep 17 00:00:00 2001
From: Janne Koschinski <janne@kuschku.de>
Date: Wed, 2 Jan 2019 14:07:47 +0100
Subject: [PATCH] Fixes #173
---
.../quasseldroid/ui/chat/buffers/BufferViewConfigFragment.kt | 4 ++--
.../quasseldroid/ui/coresettings/CoreSettingsFragment.kt | 2 +-
.../ui/coresettings/chatlist/ChatListBaseFragment.kt | 2 +-
app/src/main/res/layout/dialog_missing_features.xml | 3 +--
4 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/chat/buffers/BufferViewConfigFragment.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/buffers/BufferViewConfigFragment.kt
index a4c7c5812..85eab327c 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/chat/buffers/BufferViewConfigFragment.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/buffers/BufferViewConfigFragment.kt
@@ -307,9 +307,9 @@ class BufferViewConfigFragment : ServiceBoundFragment() {
val activities = activityList.associate { it.bufferId to it.filtered }
val processedList = list.asSequence().sortedBy { props ->
!props.info.type.hasFlag(Buffer_Type.StatusBuffer)
- }.sortedBy { props ->
+ }.sortedWith(compareBy(String.CASE_INSENSITIVE_ORDER) { props ->
props.network.networkName
- }.map { props ->
+ }).map { props ->
val activity = props.activity - (activities[props.info.bufferId]
?: account?.defaultFiltered
?: 0)
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/CoreSettingsFragment.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/CoreSettingsFragment.kt
index f8bb0c9b7..612aa5b9d 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/CoreSettingsFragment.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/CoreSettingsFragment.kt
@@ -128,7 +128,7 @@ class CoreSettingsFragment : ServiceBoundFragment() {
combineLatest(it.values.map(Network::liveNetworkInfo)).map {
it.map {
SettingsItem(it.networkId, it.networkName)
- }.sortedBy(SettingsItem::name)
+ }.sortedWith(compareBy(String.CASE_INSENSITIVE_ORDER, SettingsItem::name))
}
}
}.toLiveData().observe(this, Observer {
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/chatlist/ChatListBaseFragment.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/chatlist/ChatListBaseFragment.kt
index 84e4af0f0..780bbad23 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/chatlist/ChatListBaseFragment.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/chatlist/ChatListBaseFragment.kt
@@ -115,7 +115,7 @@ abstract class ChatListBaseFragment(private val initDefault: Boolean) :
viewModel.networks.switchMap {
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 {
if (it != null) {
diff --git a/app/src/main/res/layout/dialog_missing_features.xml b/app/src/main/res/layout/dialog_missing_features.xml
index 248baf48d..5131c4ecd 100644
--- a/app/src/main/res/layout/dialog_missing_features.xml
+++ b/app/src/main/res/layout/dialog_missing_features.xml
@@ -22,8 +22,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
- <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:tools="http://schemas.android.com/tools"
+ <LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
--
GitLab