From 32101fc9eef98cdeb5dc5d95bfaf6aa20d941964 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 6 Sep 2025 20:31:50 +0000 Subject: [PATCH 1/2] fix(deps): update dependency com.github.nextcloud.android-common:ui to v0.28.0 --- app/build.gradle | 2 +- gradle/verification-metadata.xml | 55 ++++++++++++++++++++++++++++++++ 2 files changed, 56 insertions(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index 542e672d1..59e1eb886 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -119,7 +119,7 @@ dependencies { } // Nextcloud SSO - implementation 'com.github.nextcloud.android-common:ui:0.27.2' + implementation 'com.github.nextcloud.android-common:ui:0.28.0' implementation 'com.github.nextcloud:Android-SingleSignOn:1.3.2' implementation "com.github.stefan-niedermann.android-commons:shared-preferences:$androidCommonsVersion" implementation "com.github.stefan-niedermann.android-commons:reactive-livedata:$androidCommonsVersion" diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index 9350779f5..1cd99ed90 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -26,6 +26,7 @@ + @@ -167,6 +168,7 @@ + @@ -746,6 +748,11 @@ + + + + + @@ -1519,6 +1526,22 @@ + + + + + + + + + + + + + + + + @@ -9438,6 +9461,14 @@ + + + + + + + + @@ -9566,6 +9597,14 @@ + + + + + + + + @@ -9698,6 +9737,14 @@ + + + + + + + + @@ -10119,6 +10166,14 @@ + + + + + + + + From ca479cf854a0c6e6b976584d5daa823bf99248f6 Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Mon, 8 Sep 2025 00:18:50 +0200 Subject: [PATCH 2/2] fix(m3): Update to M3 design tokens Signed-off-by: Andy Scherzinger --- .../notes/branding/BrandedActivity.java | 2 +- .../notes/branding/BrandedFragment.kt | 17 +++++++----- .../main/MultiSelectedActionModeCallback.java | 2 +- .../notes/shared/util/ExtendedFabUtil.kt | 26 +++++++++++-------- 4 files changed, 28 insertions(+), 19 deletions(-) diff --git a/app/src/main/java/it/niedermann/owncloud/notes/branding/BrandedActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/branding/BrandedActivity.java index 7eb17efbc..ec1bf06aa 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/branding/BrandedActivity.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/branding/BrandedActivity.java @@ -36,7 +36,7 @@ protected void onStart() { super.onStart(); final var typedValue = new TypedValue(); - getTheme().resolveAttribute(R.attr.colorAccent, typedValue, true); + getTheme().resolveAttribute(R.attr.colorSecondary, typedValue, true); colorAccent = typedValue.data; readBrandMainColorLiveData(this).observe(this, this::applyBrand); diff --git a/app/src/main/java/it/niedermann/owncloud/notes/branding/BrandedFragment.kt b/app/src/main/java/it/niedermann/owncloud/notes/branding/BrandedFragment.kt index 606681588..fe26a72da 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/branding/BrandedFragment.kt +++ b/app/src/main/java/it/niedermann/owncloud/notes/branding/BrandedFragment.kt @@ -31,7 +31,9 @@ import kotlinx.coroutines.launch * @see BrandingUtil for brand color resolution and application. * @see Branded for the interface definition related to branding behavior. */ -abstract class BrandedFragment : Fragment(), Branded { +abstract class BrandedFragment : + Fragment(), + Branded { @JvmField @ColorInt protected var colorAccent: Int = 0 @@ -55,16 +57,16 @@ abstract class BrandedFragment : Fragment(), Branded { val typedValue = TypedValue() context.theme.resolveAttribute( - com.google.android.material.R.attr.colorAccent, + com.google.android.material.R.attr.colorSecondary, typedValue, - true + true, ) colorAccent = typedValue.data context.theme.resolveAttribute( - com.google.android.material.R.attr.colorPrimary, + com.google.android.material.R.attr.colorPrimaryContainer, typedValue, - true + true, ) colorPrimary = typedValue.data @@ -75,7 +77,10 @@ abstract class BrandedFragment : Fragment(), Branded { @Suppress("DEPRECATION") @Deprecated("Deprecated in Java") - override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) { + override fun onCreateOptionsMenu( + menu: Menu, + inflater: MenuInflater, + ) { super.onCreateOptionsMenu(menu, inflater) val utils = BrandingUtil.of(colorAccent, requireContext()) diff --git a/app/src/main/java/it/niedermann/owncloud/notes/main/MultiSelectedActionModeCallback.java b/app/src/main/java/it/niedermann/owncloud/notes/main/MultiSelectedActionModeCallback.java index 929ad1319..1f3d33d80 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/main/MultiSelectedActionModeCallback.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/main/MultiSelectedActionModeCallback.java @@ -80,7 +80,7 @@ public MultiSelectedActionModeCallback( this.fragmentManager = fragmentManager; final TypedValue typedValue = new TypedValue(); - context.getTheme().resolveAttribute(com.google.android.material.R.attr.colorAccent, typedValue, true); + context.getTheme().resolveAttribute(com.google.android.material.R.attr.colorSecondary, typedValue, true); colorAccent = typedValue.data; } diff --git a/app/src/main/java/it/niedermann/owncloud/notes/shared/util/ExtendedFabUtil.kt b/app/src/main/java/it/niedermann/owncloud/notes/shared/util/ExtendedFabUtil.kt index 49d33694a..895443fc6 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/shared/util/ExtendedFabUtil.kt +++ b/app/src/main/java/it/niedermann/owncloud/notes/shared/util/ExtendedFabUtil.kt @@ -25,18 +25,22 @@ object ExtendedFabUtil { extendedFab.hide() } else { if (extendedFab.animation == null) { - val animation = AnimationUtils.loadAnimation( - extendedFab.context, - R.anim.abc_shrink_fade_out_from_bottom, - ) - animation.setAnimationListener(object : Animation.AnimationListener { - override fun onAnimationStart(animation: Animation) {} - override fun onAnimationEnd(animation: Animation) { - extendedFab.visibility = View.GONE - } + val animation = + AnimationUtils.loadAnimation( + extendedFab.context, + R.anim.design_bottom_sheet_slide_out, + ) + animation.setAnimationListener( + object : Animation.AnimationListener { + override fun onAnimationStart(animation: Animation) {} + + override fun onAnimationEnd(animation: Animation) { + extendedFab.visibility = View.GONE + } - override fun onAnimationRepeat(animation: Animation) {} - }) + override fun onAnimationRepeat(animation: Animation) {} + }, + ) extendedFab.startAnimation(animation) } }