|
@@ -52,6 +52,7 @@ import androidx.compose.runtime.getValue
|
|
|
import androidx.compose.ui.Alignment
|
|
|
import androidx.compose.ui.Modifier
|
|
|
import androidx.compose.ui.graphics.Color
|
|
|
+import androidx.compose.ui.graphics.ColorFilter
|
|
|
import androidx.compose.ui.platform.LocalContext
|
|
|
import androidx.compose.ui.res.painterResource
|
|
|
import androidx.compose.ui.res.stringResource
|
|
@@ -61,13 +62,12 @@ import androidx.compose.ui.unit.sp
|
|
|
import androidx.lifecycle.ViewModelProvider
|
|
|
import autodagger.AutoInjector
|
|
|
import coil.compose.AsyncImage
|
|
|
-import coil.request.ImageRequest
|
|
|
-import coil.transform.CircleCropTransformation
|
|
|
import com.nextcloud.talk.R
|
|
|
import com.nextcloud.talk.application.NextcloudTalkApplication
|
|
|
import com.nextcloud.talk.chat.ChatActivity
|
|
|
import com.nextcloud.talk.models.json.autocomplete.AutocompleteUser
|
|
|
import com.nextcloud.talk.openconversations.ListOpenConversationsActivity
|
|
|
+import com.nextcloud.talk.ui.theme.ViewThemeUtils
|
|
|
import com.nextcloud.talk.utils.bundle.BundleKeys
|
|
|
import javax.inject.Inject
|
|
|
|
|
@@ -78,6 +78,9 @@ class ContactsActivityCompose : ComponentActivity() {
|
|
|
lateinit var viewModelFactory: ViewModelProvider.Factory
|
|
|
private lateinit var contactsViewModel: ContactsViewModel
|
|
|
|
|
|
+ @Inject
|
|
|
+ lateinit var viewThemeUtils: ViewThemeUtils
|
|
|
+
|
|
|
@SuppressLint("UnrememberedMutableState")
|
|
|
override fun onCreate(savedInstanceState: Bundle?) {
|
|
|
super.onCreate(savedInstanceState)
|
|
@@ -85,7 +88,9 @@ class ContactsActivityCompose : ComponentActivity() {
|
|
|
contactsViewModel = ViewModelProvider(this, viewModelFactory)[ContactsViewModel::class.java]
|
|
|
|
|
|
setContent {
|
|
|
- MaterialTheme {
|
|
|
+ MaterialTheme(
|
|
|
+ colorScheme = viewThemeUtils.getColorScheme(this)
|
|
|
+ ) {
|
|
|
val context = LocalContext.current
|
|
|
Scaffold(
|
|
|
topBar = {
|
|
@@ -205,15 +210,10 @@ fun ContactItemRow(contact: AutocompleteUser, contactsViewModel: ContactsViewMod
|
|
|
verticalAlignment = Alignment.CenterVertically
|
|
|
) {
|
|
|
val imageUri = contact.id?.let { contactsViewModel.getImageUri(it, true) }
|
|
|
- val imageRequest = ImageRequest.Builder(context)
|
|
|
- .data(imageUri)
|
|
|
- .transformations(CircleCropTransformation())
|
|
|
- .error(R.drawable.account_circle_96dp)
|
|
|
- .placeholder(R.drawable.account_circle_96dp)
|
|
|
- .build()
|
|
|
-
|
|
|
+ val errorPlaceholderImage: Int = R.drawable.account_circle_96dp
|
|
|
+ val loadedImage = loadImage(imageUri, context, errorPlaceholderImage)
|
|
|
AsyncImage(
|
|
|
- model = imageRequest,
|
|
|
+ model = loadedImage,
|
|
|
contentDescription = stringResource(R.string.user_avatar),
|
|
|
modifier = Modifier.size(width = 45.dp, height = 45.dp)
|
|
|
)
|
|
@@ -288,7 +288,8 @@ fun ConversationCreationOptions(context: Context) {
|
|
|
.height(40.dp)
|
|
|
.padding(8.dp),
|
|
|
painter = painterResource(R.drawable.baseline_chat_bubble_outline_24),
|
|
|
- contentDescription = stringResource(R.string.new_conversation_creation_icon)
|
|
|
+ contentDescription = stringResource(R.string.new_conversation_creation_icon),
|
|
|
+ colorFilter = ColorFilter.tint(MaterialTheme.colorScheme.onSurface)
|
|
|
)
|
|
|
Text(
|
|
|
modifier = Modifier
|
|
@@ -296,7 +297,8 @@ fun ConversationCreationOptions(context: Context) {
|
|
|
.wrapContentHeight(),
|
|
|
text = stringResource(R.string.nc_create_new_conversation),
|
|
|
maxLines = 1,
|
|
|
- fontSize = 16.sp
|
|
|
+ fontSize = 16.sp,
|
|
|
+ color = MaterialTheme.colorScheme.onSurface
|
|
|
)
|
|
|
}
|
|
|
Row(
|
|
@@ -314,7 +316,8 @@ fun ConversationCreationOptions(context: Context) {
|
|
|
.height(40.dp)
|
|
|
.padding(8.dp),
|
|
|
painter = painterResource(R.drawable.baseline_format_list_bulleted_24),
|
|
|
- contentDescription = stringResource(R.string.join_open_conversations_icon)
|
|
|
+ contentDescription = stringResource(R.string.join_open_conversations_icon),
|
|
|
+ colorFilter = ColorFilter.tint(MaterialTheme.colorScheme.onSurface)
|
|
|
)
|
|
|
Text(
|
|
|
modifier = Modifier
|