Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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

Expand All @@ -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())

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
}
Expand Down
55 changes: 55 additions & 0 deletions gradle/verification-metadata.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
<trusting group="androidx.collection"/>
<trusting group="androidx.core"/>
<trusting group="androidx.databinding"/>
<trusting group="androidx.dynamicanimation" name="dynamicanimation" version="1.1.0"/>
<trusting group="androidx.fragment"/>
<trusting group="androidx.lifecycle"/>
<trusting group="androidx.recyclerview" name="recyclerview-selection" version="1.2.0"/>
Expand Down Expand Up @@ -167,6 +168,7 @@
<trusting group="com.google.dagger" name="dagger" version="2.55"/>
<trusting group="com.google.dagger" name="dagger" version="2.56.2"/>
<trusting group="com.google.dagger" name="dagger" version="2.57"/>
<trusting group="com.google.dagger" name="dagger" version="2.57.1"/>
</trusted-key>
<trusted-key id="A33A0B49A4C1AB590B0A4DDC1364C5E2DF3E99C5" group="org.reactivestreams" name="reactive-streams" version="1.0.3"/>
<trusted-key id="A413F67D71BEEC23ADD0CE0ACB43338E060CF9FA" group="org.jacoco"/>
Expand Down Expand Up @@ -746,6 +748,11 @@
<sha256 value="fac6f6fd8fc046e3da445494983774e8746b571939254b166cf8b4bb50075e6d" origin="Generated by Gradle" reason="Artifact is not signed"/>
</artifact>
</component>
<component group="androidx.compose" name="compose-bom" version="2025.08.01">
<artifact name="compose-bom-2025.08.01.pom">
<sha256 value="025f1b052472cebddcf034516233b0829b12da5a3ca8aef0a12392729a6cc7d7" origin="Generated by Gradle" reason="Artifact is not signed"/>
</artifact>
</component>
<component group="androidx.compose.animation" name="animation" version="1.7.5">
<artifact name="animation-1.7.5.module">
<sha256 value="7c742bb407497fb4c322bd3d4abef83741ea6107a12168f579438303433497ff" origin="Generated by Gradle"/>
Expand Down Expand Up @@ -1519,6 +1526,22 @@
<sha256 value="e25665eff711bb3f6511e86a143f9f3bd2b46a7fe571bf9e114cfc299c1df307" origin="Generated by Gradle" reason="Artifact is not signed"/>
</artifact>
</component>
<component group="androidx.constraintlayout" name="constraintlayout" version="2.1.0">
<artifact name="constraintlayout-2.1.0.aar">
<sha256 value="a458a7562363bd59c209a7dea847326a0e2b26b37a883dc3e29065a79a1c788b" origin="Generated by Gradle" reason="Artifact is not signed"/>
</artifact>
<artifact name="constraintlayout-2.1.0.module">
<sha256 value="141acc6cf0330dd4e363072895c4b268c0b595f84d724e2e904ebce5f2b72e48" origin="Generated by Gradle" reason="Artifact is not signed"/>
</artifact>
</component>
<component group="androidx.constraintlayout" name="constraintlayout-core" version="1.0.0">
<artifact name="constraintlayout-core-1.0.0.jar">
<sha256 value="496c8c79664bd970c6a6be7a960a20dd157dfc5aa2f18e5b8333767ffbc59911" origin="Generated by Gradle" reason="Artifact is not signed"/>
</artifact>
<artifact name="constraintlayout-core-1.0.0.module">
<sha256 value="19ee496f66fc0559629454dd01d349f3d3c9595980b37368fcd91f147ed604db" origin="Generated by Gradle" reason="Artifact is not signed"/>
</artifact>
</component>
<component group="androidx.constraintlayout" name="constraintlayout-solver" version="2.0.1">
<artifact name="constraintlayout-solver-2.0.1.jar">
<sha256 value="b23732edbb3511d937fea1ffef047b0e6c001b50c1921f0d959fc384d706ec6a" origin="Generated by Gradle" reason="Artifact is not signed"/>
Expand Down Expand Up @@ -9438,6 +9461,14 @@
<sha256 value="4df0c90174e9d33ea17b7e9c1b34d7f531239a211792f044f4709cc3cbbf0263" origin="Generated by Gradle" reason="Artifact is not signed"/>
</artifact>
</component>
<component group="com.github.nextcloud.android-common" name="core" version="0.28.0">
<artifact name="core-0.28.0.aar">
<sha256 value="507585a13e32cfdd38488597ee98dfdf2a14a2f25c22993eb89dfe54696bc9c0" origin="Generated by Gradle"/>
</artifact>
<artifact name="core-0.28.0.module">
<sha256 value="5b1d94be7be13fc2b172a56c837c334d3eb45221c239b4381e2576c0f5210a66" origin="Generated by Gradle" reason="Artifact is not signed"/>
</artifact>
</component>
<component group="com.github.nextcloud.android-common" name="core" version="1b779645b4ee2095ab133a8c939056eb13331453">
<artifact name="core-1b779645b4ee2095ab133a8c939056eb13331453.aar">
<sha256 value="933d612d1324b21d2e7e04a890bb2c7afda4ffdbe91b76fdea625976f14ba1fb" origin="Generated by Gradle"/>
Expand Down Expand Up @@ -9566,6 +9597,14 @@
<sha256 value="525ef4e813f92a0ac25cf2e79fc140cbf179e5b4411e046430e094eb01d14717" origin="Generated by Gradle" reason="Artifact is not signed"/>
</artifact>
</component>
<component group="com.github.nextcloud.android-common" name="material-color-utilities" version="0.28.0">
<artifact name="material-color-utilities-0.28.0.jar">
<sha256 value="dde3d582afaec2e24b1079dcb82f1fff95cc6d65fb7483d50da2162c6f6051d6" origin="Generated by Gradle" reason="Artifact is not signed"/>
</artifact>
<artifact name="material-color-utilities-0.28.0.module">
<sha256 value="21673942e3b92170aaef0b945e05d93581c7eb2098e21b551049059f786dc438" origin="Generated by Gradle" reason="Artifact is not signed"/>
</artifact>
</component>
<component group="com.github.nextcloud.android-common" name="material-color-utilities" version="1b779645b4ee2095ab133a8c939056eb13331453">
<artifact name="material-color-utilities-1b779645b4ee2095ab133a8c939056eb13331453.jar">
<sha256 value="5453d81312aabd8eab812536b8efd113adca3b7bef6bb593c04a2b8a773e4162" origin="Generated by Gradle" reason="Artifact is not signed"/>
Expand Down Expand Up @@ -9698,6 +9737,14 @@
<sha256 value="991acaf0c50ddc5f7dadc1b34ac1ca2053e06b3830d026272841e787b3c2c988" origin="Generated by Gradle" reason="Artifact is not signed"/>
</artifact>
</component>
<component group="com.github.nextcloud.android-common" name="ui" version="0.28.0">
<artifact name="ui-0.28.0.aar">
<sha256 value="072daa1d7e081321e1bac8edabed58a753f96f133e869846e660a70f33aba69f" origin="Generated by Gradle"/>
</artifact>
<artifact name="ui-0.28.0.module">
<sha256 value="a88f8c36cefb6c7227993e7fcdd02a8f7d1124ec61ce101dd37443a34b96a8f4" origin="Generated by Gradle" reason="Artifact is not signed"/>
</artifact>
</component>
<component group="com.github.nextcloud.android-common" name="ui" version="1b779645b4ee2095ab133a8c939056eb13331453">
<artifact name="ui-1b779645b4ee2095ab133a8c939056eb13331453.aar">
<sha256 value="6a34b9c6e11d1ad2e6578421f9432997b62ca456e41ffcc0c2cbfaa508eb9f11" origin="Generated by Gradle"/>
Expand Down Expand Up @@ -10119,6 +10166,14 @@
<sha256 value="9ddba12b5c80444c45413f043b34fd3127c2493c506a9db1ecbfe63039d83e34" origin="Generated by Gradle" reason="Artifact is not signed"/>
</artifact>
</component>
<component group="com.google.android.material" name="material" version="1.13.0">
<artifact name="material-1.13.0.aar">
<sha256 value="6d5e1cbb67c05bcdcbbf84005787dafd354a155f59a4d3800fd45fa7eb3689f5" origin="Generated by Gradle" reason="Artifact is not signed"/>
</artifact>
<artifact name="material-1.13.0.module">
<sha256 value="4c13d5e94f4ab4fa7c35acc5241182bf25985994583cd4d62b5fabbef7bc2772" origin="Generated by Gradle" reason="Artifact is not signed"/>
</artifact>
</component>
<component group="com.google.api.grpc" name="proto-google-common-protos" version="2.17.0">
<artifact name="proto-google-common-protos-2.17.0.jar">
<sha256 value="4ef1fe0c327fc1521d1d753b0b1c4a875a54bd14ebded3afff0ca395320b6ea9" origin="Generated by Gradle"/>
Expand Down
Loading