From 4ae1710c6179e8ff5c5077abadc5813779e5b45f Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 12 Aug 2024 16:24:37 +0000 Subject: [PATCH 1/7] Update dependency com.github.nextcloud.android-common:ui to v0.23.0 Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- app/build.gradle | 2 +- gradle/verification-metadata.xml | 8 -------- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 1934dc2df..5a3f56e26 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -300,7 +300,7 @@ dependencies { implementation 'androidx.core:core-ktx:1.13.1' 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' gplayImplementation 'com.google.android.gms:play-services-base:18.4.0' diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index e89bbbfc8..9822a78b0 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -1795,14 +1795,6 @@ - - - - - - - - From d85890c8ee39067971f608f66513a3539f12622b Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Sat, 17 Aug 2024 22:29:36 +0200 Subject: [PATCH 2/7] chore: Bump lint scores Signed-off-by: Andy Scherzinger --- scripts/analysis/lint-results.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/analysis/lint-results.txt b/scripts/analysis/lint-results.txt index 307e43429..beedb7bb1 100644 --- a/scripts/analysis/lint-results.txt +++ b/scripts/analysis/lint-results.txt @@ -1,2 +1,2 @@ DO NOT TOUCH; GENERATED BY DRONE - Lint Report: 129 errors and 90 warnings + Lint Report: 132 errors and 86 warnings From 31aacadf6f47c1655a5ab84c1209d106a6149732 Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Sat, 17 Aug 2024 23:09:57 +0200 Subject: [PATCH 3/7] fix: status bar color is themed now Signed-off-by: Andy Scherzinger --- .../java/com/nextcloud/talk/contacts/ContactsActivityCompose.kt | 1 + 1 file changed, 1 insertion(+) 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 ec229ee07..6f8f31552 100644 --- a/app/src/main/java/com/nextcloud/talk/contacts/ContactsActivityCompose.kt +++ b/app/src/main/java/com/nextcloud/talk/contacts/ContactsActivityCompose.kt @@ -109,6 +109,7 @@ class ContactsActivityCompose : BaseActivity() { ) } } + setupSystemColors() } } From 42207a8c107ff4f2328486d24036135569fbf32c Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Sat, 17 Aug 2024 23:15:07 +0200 Subject: [PATCH 4/7] fix: use theme primary color for stick headers Signed-off-by: Andy Scherzinger --- .../java/com/nextcloud/talk/contacts/ContactsActivityCompose.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 6f8f31552..707cb9650 100644 --- a/app/src/main/java/com/nextcloud/talk/contacts/ContactsActivityCompose.kt +++ b/app/src/main/java/com/nextcloud/talk/contacts/ContactsActivityCompose.kt @@ -185,7 +185,7 @@ fun Header(header: String) { .fillMaxSize() .background(Color.Transparent) .padding(start = 60.dp), - color = Color.Blue, + color = MaterialTheme.colorScheme.primary, fontWeight = FontWeight.Bold ) } From 31d3c83abbb33b80d18a900dd7726d95a09e0c68 Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Sat, 17 Aug 2024 23:20:50 +0200 Subject: [PATCH 5/7] style: M3 divider specs implemented Signed-off-by: Andy Scherzinger --- .../java/com/nextcloud/talk/contacts/ContactsActivityCompose.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 707cb9650..fdb3c8389 100644 --- a/app/src/main/java/com/nextcloud/talk/contacts/ContactsActivityCompose.kt +++ b/app/src/main/java/com/nextcloud/talk/contacts/ContactsActivityCompose.kt @@ -166,7 +166,7 @@ fun ContactsItem(contacts: List, contactsViewModel: ContactsVi Surface(Modifier.fillParentMaxWidth()) { Header(initial) } - HorizontalDivider(thickness = 0.1.dp, color = Color.Black) + HorizontalDivider(thickness = 1.dp, color = MaterialTheme.colorScheme.outlineVariant) } } items(contactsForInitial) { contact -> From b40a1ea438b80528c0600821ed7ff2508ad4dd5f Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Sat, 17 Aug 2024 23:23:11 +0200 Subject: [PATCH 6/7] ci: bump detekt score Signed-off-by: Andy Scherzinger --- detekt.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/detekt.yml b/detekt.yml index af081fade..164d9ca8e 100644 --- a/detekt.yml +++ b/detekt.yml @@ -1,7 +1,7 @@ # SPDX-FileCopyrightText: 2017-2024 Nextcloud GmbH and Nextcloud contributors # SPDX-License-Identifier: GPL-3.0-or-later build: - maxIssues: 166 + maxIssues: 168 weights: # complexity: 2 # LongParameterList: 1 From b0351f016e548dd45a53006f02264b5b1d9d46ee Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Sat, 17 Aug 2024 23:27:21 +0200 Subject: [PATCH 7/7] style: move error color to M3 theme code Signed-off-by: Andy Scherzinger --- .../com/nextcloud/talk/contacts/ContactsActivityCompose.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 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 fdb3c8389..fe828a4b7 100644 --- a/app/src/main/java/com/nextcloud/talk/contacts/ContactsActivityCompose.kt +++ b/app/src/main/java/com/nextcloud/talk/contacts/ContactsActivityCompose.kt @@ -133,7 +133,7 @@ fun ContactsList(contactsUiState: ContactsUiState, contactsViewModel: ContactsVi is ContactsUiState.Error -> { val errorMessage = contactsUiState.message Box(modifier = Modifier.fillMaxSize(), contentAlignment = Alignment.Center) { - Text(text = "Error: $errorMessage", color = Color.Red) + Text(text = "Error: $errorMessage", color = MaterialTheme.colorScheme.error) } } } @@ -230,7 +230,7 @@ fun ContactItemRow(contact: AutocompleteUser, contactsViewModel: ContactsViewMod is RoomUiState.Error -> { val errorMessage = (roomUiState as RoomUiState.Error).message 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 -> {}