Skip to content

Commit 91b136d

Browse files
AndyScherzingerAndyScherzinger
authored
Merge pull request #2816 from nextcloud/renovate/com.github.nextcloud.android-common-ui-0.x
fix(deps): update dependency com.github.nextcloud.android-common:ui to v0.28.0
2 parents 9c4d7c0 + ca479cf commit 91b136d

File tree

6 files changed

+84
-20
lines changed

6 files changed

+84
-20
lines changed

‎app/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ dependencies {
119119
}
120120

121121
// Nextcloud SSO
122-
implementation 'com.github.nextcloud.android-common:ui:0.27.2'
122+
implementation 'com.github.nextcloud.android-common:ui:0.28.0'
123123
implementation 'com.github.nextcloud:Android-SingleSignOn:1.3.2'
124124
implementation "com.github.stefan-niedermann.android-commons:shared-preferences:$androidCommonsVersion"
125125
implementation "com.github.stefan-niedermann.android-commons:reactive-livedata:$androidCommonsVersion"

‎app/src/main/java/it/niedermann/owncloud/notes/branding/BrandedActivity.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ protected void onStart() {
3636
super.onStart();
3737

3838
final var typedValue = new TypedValue();
39-
getTheme().resolveAttribute(R.attr.colorAccent, typedValue, true);
39+
getTheme().resolveAttribute(R.attr.colorSecondary, typedValue, true);
4040
colorAccent = typedValue.data;
4141

4242
readBrandMainColorLiveData(this).observe(this, this::applyBrand);

‎app/src/main/java/it/niedermann/owncloud/notes/branding/BrandedFragment.kt‎

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,9 @@ import kotlinx.coroutines.launch
3131
* @see BrandingUtil for brand color resolution and application.
3232
* @see Branded for the interface definition related to branding behavior.
3333
*/
34-
abstract class BrandedFragment : Fragment(), Branded {
34+
abstract class BrandedFragment :
35+
Fragment(),
36+
Branded {
3537
@JvmField
3638
@ColorInt
3739
protected var colorAccent: Int = 0
@@ -55,16 +57,16 @@ abstract class BrandedFragment : Fragment(), Branded {
5557
val typedValue = TypedValue()
5658

5759
context.theme.resolveAttribute(
58-
com.google.android.material.R.attr.colorAccent,
60+
com.google.android.material.R.attr.colorSecondary,
5961
typedValue,
60-
true
62+
true,
6163
)
6264
colorAccent = typedValue.data
6365

6466
context.theme.resolveAttribute(
65-
com.google.android.material.R.attr.colorPrimary,
67+
com.google.android.material.R.attr.colorPrimaryContainer,
6668
typedValue,
67-
true
69+
true,
6870
)
6971
colorPrimary = typedValue.data
7072

@@ -75,7 +77,10 @@ abstract class BrandedFragment : Fragment(), Branded {
7577

7678
@Suppress("DEPRECATION")
7779
@Deprecated("Deprecated in Java")
78-
override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
80+
override fun onCreateOptionsMenu(
81+
menu: Menu,
82+
inflater: MenuInflater,
83+
) {
7984
super.onCreateOptionsMenu(menu, inflater)
8085
val utils = BrandingUtil.of(colorAccent, requireContext())
8186

‎app/src/main/java/it/niedermann/owncloud/notes/main/MultiSelectedActionModeCallback.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ public MultiSelectedActionModeCallback(
8080
this.fragmentManager = fragmentManager;
8181

8282
final TypedValue typedValue = new TypedValue();
83-
context.getTheme().resolveAttribute(com.google.android.material.R.attr.colorAccent, typedValue, true);
83+
context.getTheme().resolveAttribute(com.google.android.material.R.attr.colorSecondary, typedValue, true);
8484
colorAccent = typedValue.data;
8585
}
8686

‎app/src/main/java/it/niedermann/owncloud/notes/shared/util/ExtendedFabUtil.kt‎

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -25,18 +25,22 @@ object ExtendedFabUtil {
2525
extendedFab.hide()
2626
} else {
2727
if (extendedFab.animation == null) {
28-
val animation = AnimationUtils.loadAnimation(
29-
extendedFab.context,
30-
R.anim.abc_shrink_fade_out_from_bottom,
31-
)
32-
animation.setAnimationListener(object : Animation.AnimationListener {
33-
override fun onAnimationStart(animation: Animation) {}
34-
override fun onAnimationEnd(animation: Animation) {
35-
extendedFab.visibility = View.GONE
36-
}
28+
val animation =
29+
AnimationUtils.loadAnimation(
30+
extendedFab.context,
31+
R.anim.design_bottom_sheet_slide_out,
32+
)
33+
animation.setAnimationListener(
34+
object : Animation.AnimationListener {
35+
override fun onAnimationStart(animation: Animation) {}
36+
37+
override fun onAnimationEnd(animation: Animation) {
38+
extendedFab.visibility = View.GONE
39+
}
3740

38-
override fun onAnimationRepeat(animation: Animation) {}
39-
})
41+
override fun onAnimationRepeat(animation: Animation) {}
42+
},
43+
)
4044
extendedFab.startAnimation(animation)
4145
}
4246
}

‎gradle/verification-metadata.xml‎

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
<trusting group="androidx.collection"/>
2727
<trusting group="androidx.core"/>
2828
<trusting group="androidx.databinding"/>
29+
<trusting group="androidx.dynamicanimation" name="dynamicanimation" version="1.1.0"/>
2930
<trusting group="androidx.fragment"/>
3031
<trusting group="androidx.lifecycle"/>
3132
<trusting group="androidx.recyclerview" name="recyclerview-selection" version="1.2.0"/>
@@ -167,6 +168,7 @@
167168
<trusting group="com.google.dagger" name="dagger" version="2.55"/>
168169
<trusting group="com.google.dagger" name="dagger" version="2.56.2"/>
169170
<trusting group="com.google.dagger" name="dagger" version="2.57"/>
171+
<trusting group="com.google.dagger" name="dagger" version="2.57.1"/>
170172
</trusted-key>
171173
<trusted-key id="A33A0B49A4C1AB590B0A4DDC1364C5E2DF3E99C5" group="org.reactivestreams" name="reactive-streams" version="1.0.3"/>
172174
<trusted-key id="A413F67D71BEEC23ADD0CE0ACB43338E060CF9FA" group="org.jacoco"/>
@@ -746,6 +748,11 @@
746748
<sha256 value="fac6f6fd8fc046e3da445494983774e8746b571939254b166cf8b4bb50075e6d" origin="Generated by Gradle" reason="Artifact is not signed"/>
747749
</artifact>
748750
</component>
751+
<component group="androidx.compose" name="compose-bom" version="2025.08.01">
752+
<artifact name="compose-bom-2025.08.01.pom">
753+
<sha256 value="025f1b052472cebddcf034516233b0829b12da5a3ca8aef0a12392729a6cc7d7" origin="Generated by Gradle" reason="Artifact is not signed"/>
754+
</artifact>
755+
</component>
749756
<component group="androidx.compose.animation" name="animation" version="1.7.5">
750757
<artifact name="animation-1.7.5.module">
751758
<sha256 value="7c742bb407497fb4c322bd3d4abef83741ea6107a12168f579438303433497ff" origin="Generated by Gradle"/>
@@ -1519,6 +1526,22 @@
15191526
<sha256 value="e25665eff711bb3f6511e86a143f9f3bd2b46a7fe571bf9e114cfc299c1df307" origin="Generated by Gradle" reason="Artifact is not signed"/>
15201527
</artifact>
15211528
</component>
1529+
<component group="androidx.constraintlayout" name="constraintlayout" version="2.1.0">
1530+
<artifact name="constraintlayout-2.1.0.aar">
1531+
<sha256 value="a458a7562363bd59c209a7dea847326a0e2b26b37a883dc3e29065a79a1c788b" origin="Generated by Gradle" reason="Artifact is not signed"/>
1532+
</artifact>
1533+
<artifact name="constraintlayout-2.1.0.module">
1534+
<sha256 value="141acc6cf0330dd4e363072895c4b268c0b595f84d724e2e904ebce5f2b72e48" origin="Generated by Gradle" reason="Artifact is not signed"/>
1535+
</artifact>
1536+
</component>
1537+
<component group="androidx.constraintlayout" name="constraintlayout-core" version="1.0.0">
1538+
<artifact name="constraintlayout-core-1.0.0.jar">
1539+
<sha256 value="496c8c79664bd970c6a6be7a960a20dd157dfc5aa2f18e5b8333767ffbc59911" origin="Generated by Gradle" reason="Artifact is not signed"/>
1540+
</artifact>
1541+
<artifact name="constraintlayout-core-1.0.0.module">
1542+
<sha256 value="19ee496f66fc0559629454dd01d349f3d3c9595980b37368fcd91f147ed604db" origin="Generated by Gradle" reason="Artifact is not signed"/>
1543+
</artifact>
1544+
</component>
15221545
<component group="androidx.constraintlayout" name="constraintlayout-solver" version="2.0.1">
15231546
<artifact name="constraintlayout-solver-2.0.1.jar">
15241547
<sha256 value="b23732edbb3511d937fea1ffef047b0e6c001b50c1921f0d959fc384d706ec6a" origin="Generated by Gradle" reason="Artifact is not signed"/>
@@ -9438,6 +9461,14 @@
94389461
<sha256 value="4df0c90174e9d33ea17b7e9c1b34d7f531239a211792f044f4709cc3cbbf0263" origin="Generated by Gradle" reason="Artifact is not signed"/>
94399462
</artifact>
94409463
</component>
9464+
<component group="com.github.nextcloud.android-common" name="core" version="0.28.0">
9465+
<artifact name="core-0.28.0.aar">
9466+
<sha256 value="507585a13e32cfdd38488597ee98dfdf2a14a2f25c22993eb89dfe54696bc9c0" origin="Generated by Gradle"/>
9467+
</artifact>
9468+
<artifact name="core-0.28.0.module">
9469+
<sha256 value="5b1d94be7be13fc2b172a56c837c334d3eb45221c239b4381e2576c0f5210a66" origin="Generated by Gradle" reason="Artifact is not signed"/>
9470+
</artifact>
9471+
</component>
94419472
<component group="com.github.nextcloud.android-common" name="core" version="1b779645b4ee2095ab133a8c939056eb13331453">
94429473
<artifact name="core-1b779645b4ee2095ab133a8c939056eb13331453.aar">
94439474
<sha256 value="933d612d1324b21d2e7e04a890bb2c7afda4ffdbe91b76fdea625976f14ba1fb" origin="Generated by Gradle"/>
@@ -9566,6 +9597,14 @@
95669597
<sha256 value="525ef4e813f92a0ac25cf2e79fc140cbf179e5b4411e046430e094eb01d14717" origin="Generated by Gradle" reason="Artifact is not signed"/>
95679598
</artifact>
95689599
</component>
9600+
<component group="com.github.nextcloud.android-common" name="material-color-utilities" version="0.28.0">
9601+
<artifact name="material-color-utilities-0.28.0.jar">
9602+
<sha256 value="dde3d582afaec2e24b1079dcb82f1fff95cc6d65fb7483d50da2162c6f6051d6" origin="Generated by Gradle" reason="Artifact is not signed"/>
9603+
</artifact>
9604+
<artifact name="material-color-utilities-0.28.0.module">
9605+
<sha256 value="21673942e3b92170aaef0b945e05d93581c7eb2098e21b551049059f786dc438" origin="Generated by Gradle" reason="Artifact is not signed"/>
9606+
</artifact>
9607+
</component>
95699608
<component group="com.github.nextcloud.android-common" name="material-color-utilities" version="1b779645b4ee2095ab133a8c939056eb13331453">
95709609
<artifact name="material-color-utilities-1b779645b4ee2095ab133a8c939056eb13331453.jar">
95719610
<sha256 value="5453d81312aabd8eab812536b8efd113adca3b7bef6bb593c04a2b8a773e4162" origin="Generated by Gradle" reason="Artifact is not signed"/>
@@ -9698,6 +9737,14 @@
96989737
<sha256 value="991acaf0c50ddc5f7dadc1b34ac1ca2053e06b3830d026272841e787b3c2c988" origin="Generated by Gradle" reason="Artifact is not signed"/>
96999738
</artifact>
97009739
</component>
9740+
<component group="com.github.nextcloud.android-common" name="ui" version="0.28.0">
9741+
<artifact name="ui-0.28.0.aar">
9742+
<sha256 value="072daa1d7e081321e1bac8edabed58a753f96f133e869846e660a70f33aba69f" origin="Generated by Gradle"/>
9743+
</artifact>
9744+
<artifact name="ui-0.28.0.module">
9745+
<sha256 value="a88f8c36cefb6c7227993e7fcdd02a8f7d1124ec61ce101dd37443a34b96a8f4" origin="Generated by Gradle" reason="Artifact is not signed"/>
9746+
</artifact>
9747+
</component>
97019748
<component group="com.github.nextcloud.android-common" name="ui" version="1b779645b4ee2095ab133a8c939056eb13331453">
97029749
<artifact name="ui-1b779645b4ee2095ab133a8c939056eb13331453.aar">
97039750
<sha256 value="6a34b9c6e11d1ad2e6578421f9432997b62ca456e41ffcc0c2cbfaa508eb9f11" origin="Generated by Gradle"/>
@@ -10119,6 +10166,14 @@
1011910166
<sha256 value="9ddba12b5c80444c45413f043b34fd3127c2493c506a9db1ecbfe63039d83e34" origin="Generated by Gradle" reason="Artifact is not signed"/>
1012010167
</artifact>
1012110168
</component>
10169+
<component group="com.google.android.material" name="material" version="1.13.0">
10170+
<artifact name="material-1.13.0.aar">
10171+
<sha256 value="6d5e1cbb67c05bcdcbbf84005787dafd354a155f59a4d3800fd45fa7eb3689f5" origin="Generated by Gradle" reason="Artifact is not signed"/>
10172+
</artifact>
10173+
<artifact name="material-1.13.0.module">
10174+
<sha256 value="4c13d5e94f4ab4fa7c35acc5241182bf25985994583cd4d62b5fabbef7bc2772" origin="Generated by Gradle" reason="Artifact is not signed"/>
10175+
</artifact>
10176+
</component>
1012210177
<component group="com.google.api.grpc" name="proto-google-common-protos" version="2.17.0">
1012310178
<artifact name="proto-google-common-protos-2.17.0.jar">
1012410179
<sha256 value="4ef1fe0c327fc1521d1d753b0b1c4a875a54bd14ebded3afff0ca395320b6ea9" origin="Generated by Gradle"/>

0 commit comments

Comments
 (0)