diff --git a/app/src/main/java/com/owncloud/android/ui/activity/DrawerActivity.java b/app/src/main/java/com/owncloud/android/ui/activity/DrawerActivity.java index f26047d581a3..bd992a780fe5 100644 --- a/app/src/main/java/com/owncloud/android/ui/activity/DrawerActivity.java +++ b/app/src/main/java/com/owncloud/android/ui/activity/DrawerActivity.java @@ -49,6 +49,7 @@ import com.google.android.material.button.MaterialButton; import com.google.android.material.navigation.NavigationView; import com.google.android.material.progressindicator.LinearProgressIndicator; +import com.nextcloud.android.common.ui.theme.utils.ColorRole; import com.nextcloud.client.account.User; import com.nextcloud.client.di.Injectable; import com.nextcloud.client.files.DeepLinkConstants; @@ -330,7 +331,9 @@ private void setupQuotaElement() { mQuotaProgressBar = (LinearProgressIndicator) findQuotaViewById(R.id.drawer_quota_ProgressBar); mQuotaTextPercentage = (TextView) findQuotaViewById(R.id.drawer_quota_percentage); mQuotaTextLink = (TextView) findQuotaViewById(R.id.drawer_quota_link); - viewThemeUtils.material.colorProgressBar(mQuotaProgressBar); + viewThemeUtils.material.colorProgressBar(mQuotaProgressBar, ColorRole.PRIMARY); + mQuotaProgressBar.setTrackStopIndicatorSize(0); + viewThemeUtils.platform.colorViewBackground(mQuotaView); } public void updateHeader() { @@ -860,10 +863,12 @@ private void setQuotaInformation(long usedSpace, long totalSpace, int relative, mQuotaProgressBar.setProgress(relative); if (relative < RELATIVE_THRESHOLD_WARNING) { - viewThemeUtils.material.colorProgressBar(mQuotaProgressBar); + viewThemeUtils.material.colorProgressBar(mQuotaProgressBar, ColorRole.PRIMARY); } else { - viewThemeUtils.material.colorProgressBar(mQuotaProgressBar, - getResources().getColor(R.color.infolevel_warning, getTheme())); + viewThemeUtils.material.colorProgressBar( + mQuotaProgressBar, + getResources().getColor(R.color.infolevel_warning, null) + ); } updateQuotaLink(); diff --git a/app/src/main/java/com/owncloud/android/ui/preview/PreviewImageActivity.kt b/app/src/main/java/com/owncloud/android/ui/preview/PreviewImageActivity.kt index fae01995f9c3..505951c20993 100644 --- a/app/src/main/java/com/owncloud/android/ui/preview/PreviewImageActivity.kt +++ b/app/src/main/java/com/owncloud/android/ui/preview/PreviewImageActivity.kt @@ -16,6 +16,7 @@ import android.view.MenuItem import android.view.View import androidx.activity.OnBackPressedCallback import androidx.core.content.ContextCompat +import androidx.core.graphics.drawable.toDrawable import androidx.drawerlayout.widget.DrawerLayout import androidx.localbroadcastmanager.content.LocalBroadcastManager import androidx.viewpager2.widget.ViewPager2 @@ -107,9 +108,7 @@ class PreviewImageActivity : updateActionBarTitleAndHomeButton(chosenFile) viewThemeUtils.files.setWhiteBackButton(this, it) it.setDisplayHomeAsUpEnabled(true) - it.setBackgroundDrawable( - ColorDrawable(ContextCompat.getColor(this, R.color.black)) - ) + it.setBackgroundDrawable(R.color.black.toDrawable()) } fullScreenAnchorView = window.decorView diff --git a/app/src/main/res/layout/drawer.xml b/app/src/main/res/layout/drawer.xml index a06a00330699..733ffd26e694 100644 --- a/app/src/main/res/layout/drawer.xml +++ b/app/src/main/res/layout/drawer.xml @@ -31,7 +31,7 @@ android:orientation="vertical" android:background="@color/appbar" android:paddingLeft="@dimen/drawer_content_horizontal_padding" - android:paddingTop="@dimen/standard_half_padding" + android:paddingTop="@dimen/standard_padding" android:paddingRight="@dimen/drawer_content_horizontal_padding" android:paddingBottom="@dimen/standard_padding" android:visibility="gone" diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 827abeebdd08..348d53471676 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -2,7 +2,7 @@ # SPDX-License-Identifier: AGPL-3.0-or-later [versions] -androidCommonLibraryVersion = "0.30.0" +androidCommonLibraryVersion = "0.31.0" androidGifDrawableVersion = "1.2.29" androidImageCropperVersion = "4.7.0" androidLibraryVersion = "827db94ca661d39ca7fae5c608eab1282b629b84" diff --git a/gradle/verification-keyring.keys b/gradle/verification-keyring.keys index 34ced1dd395c..62683d181b47 100644 --- a/gradle/verification-keyring.keys +++ b/gradle/verification-keyring.keys @@ -3242,6 +3242,50 @@ vCSIy8lzRw19ZO9G7qhjcHLc =vO0K -----END PGP PUBLIC KEY BLOCK----- +pub E2F38302C8075E3D +uid Gradle Inc. + +sub 1B80C80E07BC7190 +-----BEGIN PGP PUBLIC KEY BLOCK----- + +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 +=Rl7p +-----END PGP PUBLIC KEY BLOCK----- + pub E3822B59020A349D sub 9351716690874F25 sub 60EB70DDAAC2EC21 @@ -8903,57 +8947,3 @@ byp2Ws27l1oNhMexztBivHz1OLxGJY8odrCtuxK3JMllDdln/HHdwrp6h7SDRdxR 6llX74zIdctZVsii8eJHvA== =DZ0u -----END PGP PUBLIC KEY BLOCK----- - ------BEGIN PGP PUBLIC KEY BLOCK----- -Comment: Gradle Inc. - -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 -f7TkwC6aybc= -=B8WW ------END PGP PUBLIC KEY BLOCK----- diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index c9b892b9944d..8d39063257ad 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -64,6 +64,7 @@ + @@ -72,6 +73,7 @@ + @@ -284,6 +286,7 @@ + @@ -1437,6 +1440,11 @@ + + + + + @@ -3062,6 +3070,11 @@ + + + + + @@ -5054,6 +5067,14 @@ + + + + + + + + @@ -5182,6 +5203,14 @@ + + + + + + + + @@ -5310,6 +5339,14 @@ + + + + + + + + @@ -5438,6 +5475,14 @@ + + + + + + + + @@ -5566,6 +5611,14 @@ + + + + + + + + @@ -5694,6 +5747,14 @@ + + + + + + + + @@ -5822,6 +5883,14 @@ + + + + + + + + @@ -9596,6 +9665,11 @@ + + + + + @@ -9628,6 +9702,14 @@ + + + + + + + + @@ -9694,6 +9776,14 @@ + + + + + + + + @@ -9742,6 +9832,14 @@ + + + + + + + + @@ -10008,6 +10106,14 @@ + + + + + + + + @@ -10931,6 +11037,14 @@ + + + + + + + + @@ -11059,6 +11173,14 @@ + + + + + + + + @@ -11157,6 +11279,11 @@ + + + + + @@ -11202,6 +11329,14 @@ + + + + + + + + @@ -11300,6 +11435,11 @@ + + + + + @@ -11345,6 +11485,14 @@ + + + + + + + + @@ -11473,6 +11621,14 @@ + + + + + + + + @@ -11601,6 +11757,14 @@ + + + + + + + + @@ -11785,6 +11949,14 @@ + + + + + + + + @@ -11913,6 +12085,14 @@ + + + + + + + + @@ -12041,6 +12221,14 @@ + + + + + + + + @@ -12169,6 +12357,14 @@ + + + + + + + + @@ -12297,6 +12493,14 @@ + + + + + + + + @@ -12425,6 +12629,14 @@ + + + + + + + + @@ -12553,6 +12765,14 @@ + + + + + + + + @@ -12684,6 +12904,14 @@ + + + + + + + + @@ -12780,6 +13008,14 @@ + + + + + + + + @@ -12908,6 +13144,14 @@ + + + + + + + + @@ -13036,6 +13280,14 @@ + + + + + + + + @@ -13164,6 +13416,14 @@ + + + + + + + + @@ -13292,6 +13552,14 @@ + + + + + + + + @@ -13420,6 +13688,14 @@ + + + + + + + + @@ -13548,6 +13824,14 @@ + + + + + + + + @@ -13724,6 +14008,14 @@ + + + + + + + + @@ -13852,6 +14144,14 @@ + + + + + + + + @@ -13956,6 +14256,14 @@ + + + + + + + + @@ -13996,6 +14304,14 @@ + + + + + + + + @@ -14124,6 +14440,14 @@ + + + + + + + + @@ -14280,6 +14604,14 @@ + + + + + + + + @@ -14408,6 +14740,14 @@ + + + + + + + + @@ -14704,6 +15044,14 @@ + + + + + + + + @@ -15056,6 +15404,14 @@ + + + + + + + + @@ -15184,6 +15540,14 @@ + + + + + + + + @@ -15312,6 +15676,14 @@ + + + + + + + + @@ -15440,6 +15812,14 @@ + + + + + + + + @@ -15792,6 +16172,14 @@ + + + + + + + + @@ -15880,6 +16268,14 @@ + + + + + + + + @@ -15968,6 +16364,14 @@ + + + + + + + + @@ -16096,6 +16500,14 @@ + + + + + + + + @@ -16224,6 +16636,14 @@ + + + + + + + + @@ -16352,6 +16772,14 @@ + + + + + + + + @@ -16480,6 +16908,14 @@ + + + + + + + + @@ -16608,6 +17044,14 @@ + + + + + + + + @@ -16736,6 +17180,14 @@ + + + + + + + + @@ -16864,6 +17316,14 @@ + + + + + + + + @@ -16992,6 +17452,14 @@ + + + + + + + + @@ -17120,6 +17588,14 @@ + + + + + + + + @@ -17248,6 +17724,14 @@ + + + + + + + + @@ -17376,6 +17860,14 @@ + + + + + + + + @@ -17680,6 +18172,14 @@ + + + + + + + + @@ -17808,6 +18308,14 @@ + + + + + + + + @@ -17936,6 +18444,14 @@ + + + + + + + + @@ -20016,6 +20532,14 @@ + + + + + + + + @@ -20024,6 +20548,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + @@ -20164,6 +20712,14 @@ + + + + + + + + @@ -20172,6 +20728,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + @@ -20308,6 +20888,14 @@ + + + + + + + + @@ -20316,6 +20904,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + @@ -20626,6 +21238,14 @@ + + + + + + + + @@ -24028,6 +24648,14 @@ + + + + + + + + @@ -26311,6 +26939,14 @@ + + + + + + + + @@ -26375,6 +27011,14 @@ + + + + + + + + @@ -26439,6 +27083,14 @@ + + + + + + + + @@ -26503,6 +27155,14 @@ + + + + + + + + @@ -26567,6 +27227,14 @@ + + + + + + + + @@ -26631,6 +27299,14 @@ + + + + + + + + @@ -26695,6 +27371,14 @@ + + + + + + + + @@ -26759,6 +27443,14 @@ + + + + + + + + @@ -26823,6 +27515,14 @@ + + + + + + + + @@ -26887,6 +27587,14 @@ + + + + + + + + @@ -26951,6 +27659,14 @@ + + + + + + + + @@ -27015,6 +27731,14 @@ + + + + + + + + @@ -32452,6 +33176,17 @@ + + + + + + + + + + + @@ -32614,6 +33349,11 @@ + + + + +