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 a4c7c58122e4bd24ff9cdad4d750ac0dae2ccb98..85eab327ccdaaef0f4b881415ef406f3ddcb5095 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 f8bb0c9b75627d95141f65280f5293f025331598..612aa5b9d3906f087bdeb673a2ad58ebfcaaf631 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 84e4af0f038f7230a732cfcadff7fc727437035b..780bbad2378f9270955103a82021193610e1103d 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 248baf48d5c1048ad36f42f252815ea01eaa0330..5131c4ecd3b2578b623d9d14f46a254e42d1e7ed 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"