From 9526825da7fb9d94e510781bcb11c019b68dd0ae Mon Sep 17 00:00:00 2001 From: sowjanyakch Date: Thu, 18 Jul 2024 21:58:28 +0200 Subject: [PATCH] Refactor - use Icons Signed-off-by: sowjanyakch --- .../talk/contacts/ContactsActivityCompose.kt | 22 +++-- .../talk/contacts/SearchComponent.kt | 86 ++++++++----------- .../talk/contacts/apiService/FakeItem.kt | 3 +- 3 files changed, 47 insertions(+), 64 deletions(-) diff --git a/app/src/main/java/com/nextcloud/talk/contacts/ContactsActivityCompose.kt b/app/src/main/java/com/nextcloud/talk/contacts/ContactsActivityCompose.kt index e0d5d0a43..a5b111952 100644 --- a/app/src/main/java/com/nextcloud/talk/contacts/ContactsActivityCompose.kt +++ b/app/src/main/java/com/nextcloud/talk/contacts/ContactsActivityCompose.kt @@ -15,7 +15,6 @@ import android.os.Bundle import android.util.Log import androidx.activity.compose.setContent import androidx.compose.foundation.ExperimentalFoundationApi -import androidx.compose.foundation.Image import androidx.compose.foundation.background import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Arrangement @@ -34,6 +33,7 @@ import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.items import androidx.compose.material.icons.Icons import androidx.compose.material.icons.automirrored.filled.ArrowBack +import androidx.compose.material.icons.automirrored.filled.List import androidx.compose.material.icons.filled.Search import androidx.compose.material3.CircularProgressIndicator import androidx.compose.material3.ExperimentalMaterial3Api @@ -81,9 +81,9 @@ class ContactsActivityCompose : BaseActivity() { super.onCreate(savedInstanceState) NextcloudTalkApplication.sharedApplication!!.componentApplication.inject(this) contactsViewModel = ViewModelProvider(this, viewModelFactory)[ContactsViewModel::class.java] - setContent { val colorScheme = viewThemeUtils.getColorScheme(this) + val uiState = contactsViewModel.contactsViewState.collectAsState() MaterialTheme( colorScheme = colorScheme ) { @@ -97,7 +97,6 @@ class ContactsActivityCompose : BaseActivity() { ) }, content = { - val uiState = contactsViewModel.contactsViewState.collectAsState() Column(Modifier.padding(it)) { ConversationCreationOptions(context = context) ContactsList( @@ -242,8 +241,10 @@ fun ContactItemRow(contact: AutocompleteUser, contactsViewModel: ContactsViewMod fun AppBar(title: String, context: Context, contactsViewModel: ContactsViewModel) { val searchQuery by contactsViewModel.searchQuery.collectAsState() val searchState = contactsViewModel.searchState.collectAsState() + TopAppBar( title = { Text(text = title) }, + navigationIcon = { IconButton(onClick = { (context as? Activity)?.finish() @@ -278,14 +279,13 @@ fun ConversationCreationOptions(context: Context) { modifier = Modifier.padding(start = 16.dp, end = 16.dp, top = 16.dp, bottom = 8.dp), verticalAlignment = Alignment.CenterVertically ) { - Image( + Icon( + painter = painterResource(id = R.drawable.baseline_chat_bubble_outline_24), modifier = Modifier .width(40.dp) .height(40.dp) .padding(8.dp), - painter = painterResource(R.drawable.baseline_chat_bubble_outline_24), - contentDescription = stringResource(R.string.new_conversation_creation_icon) - // colorFilter = ColorFilter.tint(MaterialTheme.colorScheme.onSurface) + contentDescription = null ) Text( modifier = Modifier @@ -294,7 +294,6 @@ fun ConversationCreationOptions(context: Context) { text = stringResource(R.string.nc_create_new_conversation), maxLines = 1, fontSize = 16.sp - // color = MaterialTheme.colorScheme.onSurface ) } Row( @@ -306,14 +305,13 @@ fun ConversationCreationOptions(context: Context) { }, verticalAlignment = Alignment.CenterVertically ) { - Image( + Icon( + Icons.AutoMirrored.Filled.List, modifier = Modifier .width(40.dp) .height(40.dp) .padding(8.dp), - painter = painterResource(R.drawable.baseline_format_list_bulleted_24), - contentDescription = stringResource(R.string.join_open_conversations_icon) - // colorFilter = ColorFilter.tint(MaterialTheme.colorScheme.onSurface) + contentDescription = null ) Text( modifier = Modifier diff --git a/app/src/main/java/com/nextcloud/talk/contacts/SearchComponent.kt b/app/src/main/java/com/nextcloud/talk/contacts/SearchComponent.kt index f8f2f87c3..d8daf8ed4 100644 --- a/app/src/main/java/com/nextcloud/talk/contacts/SearchComponent.kt +++ b/app/src/main/java/com/nextcloud/talk/contacts/SearchComponent.kt @@ -16,7 +16,6 @@ import androidx.compose.material.icons.automirrored.filled.ArrowBack import androidx.compose.material.icons.filled.Close import androidx.compose.material3.Icon import androidx.compose.material3.IconButton -import androidx.compose.material3.Surface import androidx.compose.material3.Text import androidx.compose.material3.TextField import androidx.compose.runtime.Composable @@ -31,45 +30,36 @@ import com.nextcloud.talk.R @Composable fun DisplaySearch(text: String, onTextChange: (String) -> Unit, contactsViewModel: ContactsViewModel) { - Surface( + val keyboardController = LocalSoftwareKeyboardController.current + TextField( modifier = Modifier .fillMaxWidth() - .height(60.dp) + .height(60.dp), + value = text, + onValueChange = { onTextChange(it) }, + placeholder = { + Text( + text = stringResource(R.string.nc_search) + ) + }, - ) { - val keyboardController = LocalSoftwareKeyboardController.current - TextField( - modifier = Modifier - .fillMaxWidth(), - // .background(MaterialTheme.colorScheme.surface), - value = text, - onValueChange = { onTextChange(it) }, - placeholder = { - Text( - text = stringResource(R.string.nc_search) - // color = MaterialTheme.colorScheme.onSurfaceVariant - ) - }, - - textStyle = TextStyle( - // color = MaterialTheme.colorScheme.onSurface, - fontSize = 16.sp - ), - singleLine = true, - leadingIcon = { - IconButton( - onClick = { - onTextChange("") - contactsViewModel.updateSearchState(false) - } - ) { - Icon( - imageVector = Icons.AutoMirrored.Default.ArrowBack, - contentDescription = stringResource(R.string.back_button) - // tint = MaterialTheme.colorScheme.onSurface - ) + textStyle = TextStyle( + fontSize = 16.sp + ), + singleLine = true, + leadingIcon = { + IconButton( + onClick = { + onTextChange("") + contactsViewModel.updateSearchState(false) } - }, + ) { + Icon( + imageVector = Icons.AutoMirrored.Default.ArrowBack, + contentDescription = stringResource(R.string.back_button) + ) + } + }, trailingIcon = { if (text.isNotEmpty()) { @@ -91,19 +81,15 @@ fun DisplaySearch(text: String, onTextChange: (String) -> Unit, contactsViewMode imeAction = ImeAction.Search ), - keyboardActions = KeyboardActions( - onSearch = { - if (text.trim().isNotEmpty()) { - keyboardController?.hide() - } else { - return@KeyboardActions - } + keyboardActions = KeyboardActions( + onSearch = { + if (text.trim().isNotEmpty()) { + keyboardController?.hide() + } else { + return@KeyboardActions } - ), - maxLines = 1 - // colors = TextFieldDefaults.colors( - // cursorColor = Color.Blue - // ) - ) - } + } + ), + maxLines = 1 + ) } diff --git a/app/src/test/java/com/nextcloud/talk/contacts/apiService/FakeItem.kt b/app/src/test/java/com/nextcloud/talk/contacts/apiService/FakeItem.kt index bce9c4d6f..95431275b 100644 --- a/app/src/test/java/com/nextcloud/talk/contacts/apiService/FakeItem.kt +++ b/app/src/test/java/com/nextcloud/talk/contacts/apiService/FakeItem.kt @@ -7,5 +7,4 @@ package com.nextcloud.talk.contacts.apiService -object FakeItem { -} +object FakeItem