gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-07-10 14:24:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4071 from nextcloud/renovate/com.github.nextcloud.android-common-ui-0.x

Browse Source 
fix(deps): update dependency com.github.nextcloud.android-common:ui to v0.23.0
This commit is contained in:
Andy Scherzinger 2024-08-17 23:42:07 +02:00 committed by GitHub
commit 1cc65618f7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/build.gradle
View File

@ -300,7 +300,7 @@ dependencies {
implementation 'androidx.core:core-ktx:1.13.1' implementation 'androidx.core:core-ktx:1.13.1'
implementation 'androidx.activity:activity-ktx:1.9.0' implementation 'androidx.activity:activity-ktx:1.9.0'
implementation 'com.github.nextcloud.android-common:ui:0.21.0' implementation 'com.github.nextcloud.android-common:ui:0.23.0'
implementation 'com.github.nextcloud-deps:android-talk-webrtc:121.6167.0' implementation 'com.github.nextcloud-deps:android-talk-webrtc:121.6167.0'
gplayImplementation 'com.google.android.gms:play-services-base:18.4.0' gplayImplementation 'com.google.android.gms:play-services-base:18.4.0'

9
app/src/main/java/com/nextcloud/talk/contacts/ContactsActivityCompose.kt
View File

@ -109,6 +109,7 @@ class ContactsActivityCompose : BaseActivity() {
) )
} }
} }
setupSystemColors()
} }
} }
@ -132,7 +133,7 @@ fun ContactsList(contactsUiState: ContactsUiState, contactsViewModel: ContactsVi
is ContactsUiState.Error -> { is ContactsUiState.Error -> {
val errorMessage = contactsUiState.message val errorMessage = contactsUiState.message
Box(modifier = Modifier.fillMaxSize(), contentAlignment = Alignment.Center) { Box(modifier = Modifier.fillMaxSize(), contentAlignment = Alignment.Center) {
Text(text = "Error: $errorMessage", color = Color.Red) Text(text = "Error: $errorMessage", color = MaterialTheme.colorScheme.error)
} }
} }
} }
@ -165,7 +166,7 @@ fun ContactsItem(contacts: List<AutocompleteUser>, contactsViewModel: ContactsVi
Surface(Modifier.fillParentMaxWidth()) { Surface(Modifier.fillParentMaxWidth()) {
Header(initial) Header(initial)
} }
HorizontalDivider(thickness = 0.1.dp, color = Color.Black) HorizontalDivider(thickness = 1.dp, color = MaterialTheme.colorScheme.outlineVariant)
} }
} }
items(contactsForInitial) { contact -> items(contactsForInitial) { contact ->
@ -184,7 +185,7 @@ fun Header(header: String) {
.fillMaxSize() .fillMaxSize()
.background(Color.Transparent) .background(Color.Transparent)
.padding(start = 60.dp), .padding(start = 60.dp),
color = Color.Blue, color = MaterialTheme.colorScheme.primary,
fontWeight = FontWeight.Bold fontWeight = FontWeight.Bold
) )
} }
@ -229,7 +230,7 @@ fun ContactItemRow(contact: AutocompleteUser, contactsViewModel: ContactsViewMod
is RoomUiState.Error -> { is RoomUiState.Error -> {
val errorMessage = (roomUiState as RoomUiState.Error).message val errorMessage = (roomUiState as RoomUiState.Error).message
Box(modifier = Modifier.fillMaxSize(), contentAlignment = Alignment.Center) { Box(modifier = Modifier.fillMaxSize(), contentAlignment = Alignment.Center) {
Text(text = "Error: $errorMessage", color = Color.Red) Text(text = "Error: $errorMessage", color = MaterialTheme.colorScheme.error)
} }
} }
is RoomUiState.None -> {} is RoomUiState.None -> {}

2
detekt.yml
View File

@ -1,7 +1,7 @@
# SPDX-FileCopyrightText: 2017-2024 Nextcloud GmbH and Nextcloud contributors # SPDX-FileCopyrightText: 2017-2024 Nextcloud GmbH and Nextcloud contributors
# SPDX-License-Identifier: GPL-3.0-or-later # SPDX-License-Identifier: GPL-3.0-or-later
build: build:
maxIssues: 166 maxIssues: 168
weights: weights:
# complexity: 2 # complexity: 2
# LongParameterList: 1 # LongParameterList: 1

8
gradle/verification-metadata.xml
View File

@ -1795,14 +1795,6 @@
<sha256 value="4cff0df04cae25831e821ef2f9129245783460e98d0fd67d8f6824065a134c4e" origin="Generated by Gradle" reason="Artifact is not signed"/> <sha256 value="4cff0df04cae25831e821ef2f9129245783460e98d0fd67d8f6824065a134c4e" origin="Generated by Gradle" reason="Artifact is not signed"/>
</artifact> </artifact>
</component> </component>
<component group="androidx.test.ext" name="junit" version="1.1.5">
<artifact name="junit-1.1.5.aar">
<sha256 value="4307c0e60f5d701db9c59bcd9115af705113c36a9132fa3dbad58db1294e9bfd" origin="Generated by Gradle" reason="Artifact is not signed"/>
</artifact>
<artifact name="junit-1.1.5.pom">
<sha256 value="4cff0df04cae25831e821ef2f9129245783460e98d0fd67d8f6824065a134c4e" origin="Generated by Gradle" reason="Artifact is not signed"/>
</artifact>
</component>
<component group="androidx.test.ext" name="junit-ktx" version="1.1.5"> <component group="androidx.test.ext" name="junit-ktx" version="1.1.5">
<artifact name="junit-ktx-1.1.5.aar"> <artifact name="junit-ktx-1.1.5.aar">
<sha256 value="3f32de8f372bc6300b6d2ff2f219269aefcf7bcea8e876b1e715d35aef0ccc6d" origin="Generated by Gradle" reason="Artifact is not signed"/> <sha256 value="3f32de8f372bc6300b6d2ff2f219269aefcf7bcea8e876b1e715d35aef0ccc6d" origin="Generated by Gradle" reason="Artifact is not signed"/>

2
scripts/analysis/lint-results.txt
View File

@ -1,2 +1,2 @@
DO NOT TOUCH; GENERATED BY DRONE DO NOT TOUCH; GENERATED BY DRONE
<span class="mdl-layout-title">Lint Report: 129 errors and 90 warnings</span> <span class="mdl-layout-title">Lint Report: 132 errors and 86 warnings</span>