From 36b5a9eefbffe21234f46e810c02262530b1bb15 Mon Sep 17 00:00:00 2001 From: Douile <25043847+Douile@users.noreply.github.com> Date: Tue, 16 Aug 2022 12:25:40 +0100 Subject: [PATCH] Fix iterating items in repositionItems --- app/src/main/java/com/geeksville/mesh/model/UIState.kt | 2 +- app/src/main/java/com/geeksville/mesh/ui/MessagesFragment.kt | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/geeksville/mesh/model/UIState.kt b/app/src/main/java/com/geeksville/mesh/model/UIState.kt index e60170e11..daf27fa2d 100644 --- a/app/src/main/java/com/geeksville/mesh/model/UIState.kt +++ b/app/src/main/java/com/geeksville/mesh/model/UIState.kt @@ -493,7 +493,7 @@ class UIViewModel @Inject constructor( fun updateActionPositions(actions: List) { viewModelScope.launch(Dispatchers.Main) { - for (position in 0..actions.size) { + for (position in actions.indices) { quickChatActionRepository.setItemPosition(actions[position].uuid, position) } } diff --git a/app/src/main/java/com/geeksville/mesh/ui/MessagesFragment.kt b/app/src/main/java/com/geeksville/mesh/ui/MessagesFragment.kt index fb44c3a85..a6566ca72 100644 --- a/app/src/main/java/com/geeksville/mesh/ui/MessagesFragment.kt +++ b/app/src/main/java/com/geeksville/mesh/ui/MessagesFragment.kt @@ -307,15 +307,14 @@ class MessagesFragment : Fragment(), Logging { model.quickChatActions.asLiveData().observe(viewLifecycleOwner) { actions -> actions?.let { + // This seems kinda hacky it might be better to replace with a recycler view binding.quickChatLayout.removeAllViews() for (action in actions) { val button = Button(context) button.setText(action.name) button.isEnabled = isConnected if (action.mode == QuickChatAction.Mode.Instant) { - //button.setBackgroundColor(Color.rgb(200, 200, 200)) button.backgroundTintList = ContextCompat.getColorStateList(requireActivity(), R.color.colorMyMsg) - } button.setOnClickListener { if (action.mode == QuickChatAction.Mode.Append) {